diff --git a/app-emulation/qemu/qemu-2.5.0-r3.ebuild b/app-emulation/qemu/qemu-2.5.0-r3.ebuild
index 5d27b99d908b..5d591dd8f4b2 100644
--- a/app-emulation/qemu/qemu-2.5.0-r3.ebuild
+++ b/app-emulation/qemu/qemu-2.5.0-r3.ebuild
@@ -22,7 +22,7 @@ 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 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+	KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd"
 fi
 
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
diff --git a/app-portage/gentoolkit-dev/metadata.xml b/app-portage/gentoolkit-dev/metadata.xml
index 066615e40a6e..c0f5291db220 100644
--- a/app-portage/gentoolkit-dev/metadata.xml
+++ b/app-portage/gentoolkit-dev/metadata.xml
@@ -5,6 +5,10 @@
     <email>tools-portage@gentoo.org</email>
     <name>Gentoo Portage tools team</name>
   </maintainer>
+  <maintainer type="person">
+    <email>vapier@gentoo.org</email>
+    <description>Only ekeyword related bugs</description>
+  </maintainer>
   <longdescription>
 		Gentoolkit-dev is a collection of developer tools for the Gentoo distribution.
 	</longdescription>
diff --git a/dev-util/uncrustify/Manifest b/dev-util/uncrustify/Manifest
index feadfb60f526..f7aaa3d85fa4 100644
--- a/dev-util/uncrustify/Manifest
+++ b/dev-util/uncrustify/Manifest
@@ -1,2 +1,3 @@
 DIST uncrustify-0.59.tar.gz 983822 SHA256 3f2ba1ca15f7ed1cd0871d54a5dd4ecf006fd167a0fa0fe1d5d76c91106238b5 SHA512 eb228ecb63f777e90ecca44bdef2312fbca2cdbdf9dd899e1f67e9917265667584796b983050138bae39773ab2627e3c3035e519f64dfe51475f207a0e3af900 WHIRLPOOL 85d702e2968d6fbbce7f15fb23d2bbb5e2131f462076e82adf109c684c9b09410c409aa0d75114e7d5b8951d1dfdee80186d483e48d57c1e183d4c3a27bfa8b5
 DIST uncrustify-0.61.tar.gz 1143946 SHA256 1df0e5a2716e256f0a4993db12f23d10195b3030326fdf2e07f8e6421e172df9 SHA512 b6abd4ee2f22430c57cd47903674f0a5a37b86fe6604426248b24dda17f06fa2e6ca3877035874a31fa668fbf9c238f538813bcc7c1834bc349f94365714aedc WHIRLPOOL 1ad5dfc944910b6831f72f7be86b624273c44d535b359d13b017545c1259d3ed5d2eac7c2cb29f9abd2ecb24e26ea3b8cfd21c0454dd5562ac01a3274f104df7
+DIST uncrustify-0.62.tar.gz 1203764 SHA256 889a1544da42c861128153f2c006b9843065b6d11b63c834700eb489641e9ef3 SHA512 02ec50c8792eda4b9ca4fec92b64748fcaf3b5b7c0227df2b35aabb1c9a71f7cbb61037e31755c47939bd0268cfcd53be4f534fae0529ca72b675546b854bd87 WHIRLPOOL 46eb9d9faa4e4de7b0a741a20fe0ed60ee6ca20bd5f68b3f92e570e4e4bdcbbede0bc18d43d73cf3223c93cbcd931517725dae837d4f0003510cfd253b922903
diff --git a/dev-util/uncrustify/uncrustify-0.62.ebuild b/dev-util/uncrustify/uncrustify-0.62.ebuild
new file mode 100644
index 000000000000..9de89d8f4c74
--- /dev/null
+++ b/dev-util/uncrustify/uncrustify-0.62.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+if [[ $PV == *9999* ]]; then
+	EGIT_REPO_URI="git://github.com/uncrustify/uncrustify.git
+		https://github.com/uncrustify/uncrustify.git"
+	KEYWORDS=""
+	SRC_URI=""
+	inherit git-r3 autotools
+else
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+	SRC_URI="https://github.com/uncrustify/${PN}/archive/${P}.tar.gz"
+	S=${WORKDIR}/uncrustify-${P}
+fi
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-any-r1
+
+DESCRIPTION="C/C++/C#/D/Java/Pawn code indenter and beautifier"
+HOMEPAGE="http://uncrustify.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="test"
+
+DEPEND="test? ( ${PYTHON_DEPS} )"
+
+src_prepare() {
+	if [[ ${PV} == *9999* ]] ; then
+		eautoreconf
+	fi
+	default
+}
+
+python_test() {
+	cd tests
+	${EPYTHON} run_tests.py || die "tests failed"
+}
diff --git a/dev-util/uncrustify/uncrustify-9999.ebuild b/dev-util/uncrustify/uncrustify-9999.ebuild
index cf696e3ae8b0..9de89d8f4c74 100644
--- a/dev-util/uncrustify/uncrustify-9999.ebuild
+++ b/dev-util/uncrustify/uncrustify-9999.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 if [[ $PV == *9999* ]]; then
-	EGIT_REPO_URI="git://github.com/bengardner/uncrustify.git
-		https://github.com/bengardner/uncrustify.git"
+	EGIT_REPO_URI="git://github.com/uncrustify/uncrustify.git
+		https://github.com/uncrustify/uncrustify.git"
 	KEYWORDS=""
 	SRC_URI=""
-	inherit git-r3
+	inherit git-r3 autotools
 else
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+	SRC_URI="https://github.com/uncrustify/${PN}/archive/${P}.tar.gz"
+	S=${WORKDIR}/uncrustify-${P}
 fi
 
 PYTHON_COMPAT=( python2_7 )
@@ -28,6 +29,13 @@ IUSE="test"
 
 DEPEND="test? ( ${PYTHON_DEPS} )"
 
+src_prepare() {
+	if [[ ${PV} == *9999* ]] ; then
+		eautoreconf
+	fi
+	default
+}
+
 python_test() {
 	cd tests
 	${EPYTHON} run_tests.py || die "tests failed"
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 7047e3c2824d..c2f62be5e393 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -4,13 +4,16 @@ DIST git-2.6.6.tar.xz 3822260 SHA256 8d53410d60f9c36b0f34c125076634d068c8d812f41
 DIST git-2.7.3-00-9831e92bfa833ee9c0ce464bbc2f941ae6c2698d-lose-name-path.patch 28198 SHA256 b6bf7d67b9cc4d34550a10933af63b665b136b869dbbe23ad3ece0d463f027f9 SHA512 3fd64b0d6b53d5b08b791195e6edc162db682fc8a1bafc04aab7a7a4e61e2db4b3b84d9f769e0d7756da2739bdd900e30a233c228706c39817e42e309c36684c WHIRLPOOL 7e1d9337d46222ea4ae2164429a6a220adb0f763bdde6722c0f2adf79789e092f5cfb74b932597b8d3971af4fc27dede1fea51b9cb72b44ec8e30bd78bdaaa8d
 DIST git-2.7.3.tar.xz 3909636 SHA256 89c467912d4740da2b40288f956251f0a1e276e28eecd28a6d776067103629b6 SHA512 f7acbf52d12f39d323bd90a82c7135aa2aacf2661f7087c71b41dbfbec688342e0a2fc061fc0f216848a538a0dbc4fce68e24ea2a26e747f5eb92f763fa5bc72 WHIRLPOOL 5cc261749f91c2e0b0509d2fac1bc7426b3ddcc37e859d4f524838e1dd471071ad430886751933bae57aafc20bdcf3f9a43f4c018cc9c89610134a5203b22447
 DIST git-2.7.4.tar.xz 3909636 SHA256 dee574defbe05ec7356a0842ddbda51315926f2fa7e39c2539f2c3dcc52e457b SHA512 82a646140834e909bf1748a017e86f37f0711c759fe0a6ad03529beb57c79742cb7bf77c2dba29ccd84fcf3d5f18ad9c85c00f002d3b257be42e058750423da7 WHIRLPOOL 74532038b6ba95a5354f43ebad00a9c159c495d46e7dc1b8a2a59f5a86e149538190d9800144a719dcc00e28cfea1039cd5dbfb67fd5aac5e7d0998d3231bae3
+DIST git-2.8.0.tar.xz 3969912 SHA256 9a099a4f1e68c0446800f0c538ce7d5d24bd5b4ee5d559317600cd407a59e74c SHA512 1b1f786d540efc96f89fdb5d6cc85db5ccc36fa03b066093e149ff491c349501806832279c09ed85afe7f248c6f183834b343e28ea8a9117499032569479c5fd WHIRLPOOL 7069717d84e045ca67af2ef79ca19ce447fb0ad3a63e6ba90903e8000213842a5812c673579be698266627f5236c0acc0957110e9b161f2fdf157f5ab1c0ee80
 DIST git-htmldocs-2.4.11.tar.xz 997132 SHA256 2764af41b319f4d11b29832de4bd05392f2887d9a1d3c56c864fb081920eac97 SHA512 d5d2abae9cc303fe8ebeb72ae7078d44db94610d549ca03afffcbbef8b611efda662677423d9ff97a0c7a2384bbd4c3468b01a2ecd7b68f4fdc89e62ad688eb4 WHIRLPOOL 66cd4fc754be7c103ca58a030d4799ba988792419a426e85a39805172e6329ec617b3561696dc74be36801cca0b17a26102a194a1a58d6c7b9ee1ab17752c4a6
 DIST git-htmldocs-2.5.5.tar.xz 1010216 SHA256 15de2f234cf419496399f7ad396709544d62537488a8e5200e6e34b0f1a685e7 SHA512 265ddf3835352f85eb2e2ee983eb8aaf37bc7b151968866bdb8b9bb6782cdb72dbd1fefe5d7f694a6825954d49bcf4c799e8bcb4e3b25e3f228f6f97f041fd9b WHIRLPOOL 90da44c0bdb6f9ff428d1673289e612936ed5f26110cd13d155c8cbef8433b13bd8b15cea88f967224a699e4c3a6ac41d70b67be1b25c4d35989879626eb10ad
 DIST git-htmldocs-2.6.6.tar.xz 1021856 SHA256 897fb0bc7e2eb67a4b582c963f337fda3a6ad2b23bca55e27f23f7d15bad7c5d SHA512 85dcd8514e1ba2cb591512a0003aedf25eafbf185ba1eed01f8adfd9eb467d29b17108e6b087183004004ab17301316d403cd6762619ac2a030a565ea5c776b3 WHIRLPOOL 3cd964f1d0164db98e97e0097813a620911adadd9c50837e23a5ca79eb0f2d988aa68317b5b79fa7b052900564657c36d050e75841a1018d5ff12e1299c01dc6
 DIST git-htmldocs-2.7.3.tar.xz 1031848 SHA256 f71f5e8e1a6103e83ea794f367bc419a1d14ba0f79ebacdc81b3b9430714adea SHA512 50de5d9d3c0f6d874a6a4bc3b247a1795b1bcf154a276b546f88c3b5f5fb2eb27212d207a4bb50c04cba36d8537853afd25816addfb87c9a50e18528d93586fe WHIRLPOOL 057d9bebfe51c29a0a7f689baa9873cb6a54feb1d2869c541396902b160379c9220c5de79a4cb59c6e804e5c7557c0fd141b89621b97d3b495dc6e0a77c67a9f
 DIST git-htmldocs-2.7.4.tar.xz 1032428 SHA256 3fae21e2e68104621ea1405be73192b46bf3ef29bbc248a81b1e7e6fcf5acfad SHA512 f05b7b8a4dd4abe23f7e51982e9c33026aa31610ac8640028aeae6b310b70b764aee9a81fa702ed0712ccf1b7ad897e06163eb5c5246c14f6cce7c5f4e462682 WHIRLPOOL 87fc486d182a4b72fd906105fefcc53b722c4ae6832b290cd6f759ac1eca7ebfbbe7c0e72c1d7b5ef3581d19d7576f1d0387d6e5b0a33d960d57f59ee61a7869
+DIST git-htmldocs-2.8.0.tar.xz 1038900 SHA256 515bee47dbb1f1c345eae394e14f82009865529aaf0c201301defee32512a7c6 SHA512 a3c8f474e049260e175edbb85a8ad8c7e44a6bdf56f143ad7c3c62ba23f56a43234fd0dc89b5ff031a17ee48884af27e5bd857f22835e5d076a4b410467cc4c1 WHIRLPOOL 5c7f88ce2aa44ed4f5bb0c78d8fef99f4c9987660e057b53df53427ac482b23c75b240468693cdf3b1b7b92e3481a6d4681ab10c1b8ed45c8cd28eef20565fda
 DIST git-manpages-2.4.11.tar.xz 373956 SHA256 0a1fff7650e635339f92985a47198f5f6664eda1c233c3cf48e92f22c3735db2 SHA512 78226baf1c8be28c456a84b06f403af9b918cd3e46218917cce18b3b9ce494600bf00014b818ca0dff9f675aca8b17cd9f7893c7063e218d719a9567e81d9040 WHIRLPOOL f8883ca7d327c378937f62287cbb515b5271cb8aeda18d32135f1c7ea71c9f39282fe55b191476f046de4815a994e4f6f98696d9353f0bfcca7994101398786c
 DIST git-manpages-2.5.5.tar.xz 378304 SHA256 41b66002436add0781618764c3f0c8222bac7d8a636f1d7e2994480b22369930 SHA512 bebcc04fa54080316d01f1bd1ba7b91a1712e6c6a6f95306d9f079cf5858cf0fb2ccea24c606153e9adb99e956c5dbae5a5c7a7a0ed8c643efdf5a5db599cda1 WHIRLPOOL e72873d3f1a404a311e643d89cf65996d884e794e468417272cdda494ef621f0ebf875faa17433e443fcece54608c59a3c094372101bf4342fadcf8395dabce8
 DIST git-manpages-2.6.6.tar.xz 381588 SHA256 0f64c1db015e3c74e56eef646a9fdd456cf043cae54714f404ad9b35ddb537a0 SHA512 bd8573f58bd988f78978041b88643e6d0af99ae0df4be6ec80db7de6e042970a23d9a153e84ddb8ffc538724b1482ff6dac7594462e28073067f54d040fdddfd WHIRLPOOL 3e8af6df1b96e3211c5799ace846dab331f30c1133c1d093e344b4576d8f588631e29187909b600112a9f7b42a0de63f56cec953e0d162cc49c2b6efeef0db53
 DIST git-manpages-2.7.3.tar.xz 384544 SHA256 9f088427c61a9e0a840007c7f50fc6f7caba36ac8c403460c49210983090496d SHA512 883441df049bfaf0f22cf9d17041125dc9c8f0e7d94efa7a4188a68c2242d1b4c3d34fd3bd3ecdd2af905ee2f8fb5fefd0ce6328dd76c665f7ec20e3b9c87d1b WHIRLPOOL 7ee013444665366ecb8f3df507a3c5af8a9f48d3185783a94db827b192c32ac6998157eb42bcbfe397f96d452451b2416c32e2dffbabc71062422e7c5e25c184
 DIST git-manpages-2.7.4.tar.xz 384460 SHA256 d04fd81ab8aa32efbe54acd27ab5c88ef4ab615313e4cdfa793dd0065899ce25 SHA512 1af6f0d9fc3945a5a215092caabd0963f3eaa35c5f3b0270861b625bf7bd88e4fdea9b3e50ce1b10c79a12ee2b06b203fab4aa9d566560535c1decf7b2d987cd WHIRLPOOL 38306b6e198336dd3c75a9fd032b636e0e43a3b75eba2746d2d42c3752cf7405b1f8572199748509974d68bfc77c74fbea52626884f9b509d8b593cefce4aad5
+DIST git-manpages-2.8.0.tar.xz 386684 SHA256 2945558be9e16de71a67f00fe3f6bdd8ca24977389a86ef9a077ce73612fb353 SHA512 67a0ddc1a8cec0d835f0889467315523020bb75460cffba39883528833b4e714496950738898c79d156a821db78d16bd76dff0bc7aa5eab8a0217862aa2672e8 WHIRLPOOL 23b172c736264086f27e93e6b7fc4c02941cce30b1936deaaa94a4bc9b0bdcc3d798986da564e6f2067f059b193ef97a62970563c4227005d1cfb99d9d5d1a60
diff --git a/dev-vcs/git/git-2.8.0.ebuild b/dev-vcs/git/git-2.8.0.ebuild
new file mode 100644
index 000000000000..d8bf7cd33bc8
--- /dev/null
+++ b/dev-vcs/git/git-2.8.0.ebuild
@@ -0,0 +1,672 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_COMPAT=( python2_7 )
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+EGIT_MASTER=pu
+PLOCALES="bg ca de fr is it ko pt_PT ru sv vi zh_CN"
+
+inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER=${MY_PV}
+
+DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
+HOMEPAGE="http://www.git-scm.com/"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI_SUFFIX="xz"
+	SRC_URI_GOOG="https://git-core.googlecode.com/files"
+	SRC_URI_KORG="mirror://kernel/software/scm/git"
+	SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			doc? (
+			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			)"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+
+# Common to both DEPEND and RDEPEND
+CDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
+	sys-libs/zlib
+	pcre? ( dev-libs/libpcre )
+	perl? ( dev-lang/perl:=[-build(-)] )
+	tk? ( dev-lang/tk:0= )
+	curl? (
+		net-misc/curl
+		webdav? ( dev-libs/expat )
+	)
+	emacs? ( virtual/emacs )
+	gnome-keyring? ( gnome-base/libgnome-keyring )"
+
+RDEPEND="${CDEPEND}
+	gpg? ( app-crypt/gnupg )
+	mediawiki? (
+		dev-perl/DateTime-Format-ISO8601
+		dev-perl/HTML-Tree
+		dev-perl/MediaWiki-API
+	)
+	perl? ( dev-perl/Error
+			dev-perl/Net-SMTP-SSL
+			dev-perl/Authen-SASL
+			cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) )
+			cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
+			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
+			)
+	python? ( gtk?
+	(
+		>=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
+		>=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
+	)
+		${PYTHON_DEPS} )"
+
+# This is how info docs are created with Git:
+#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
+#   .xml/docbook  --(docbook2texi.pl)--> .texi
+#   .texi         --(makeinfo)---------> .info
+DEPEND="${CDEPEND}
+	doc? (
+		app-text/asciidoc
+		app-text/docbook2X
+		sys-apps/texinfo
+		app-text/xmlto
+	)
+	nls? ( sys-devel/gettext )
+	test? (	app-crypt/gnupg	)"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+	DEPEND="${DEPEND}
+		app-text/asciidoc"
+fi
+
+SITEFILE=50${PN}-gentoo.el
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	cgi? ( perl )
+	cvs? ( perl )
+	mediawiki? ( perl )
+	mediawiki-experimental? ( mediawiki )
+	subversion? ( perl )
+	webdav? ( curl )
+	gtk? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+PATCHES=(
+	# bug #350330 - automagic CVS when we don't want it is bad.
+	"${FILESDIR}"/git-2.2.2-optional-cvs.patch
+
+	# install mediawiki perl modules also in vendor_dir
+	# hack, needs better upstream solution
+	"${FILESDIR}"/git-1.8.5-mw-vendor.patch
+
+	"${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
+
+	# Bug #493306, where FreeBSD 10.x merged libiconv into its libc.
+	"${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch
+)
+
+pkg_setup() {
+	if use subversion && has_version "dev-vcs/subversion[dso]"; then
+		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+		ewarn "have been warned."
+	fi
+	if use python ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+# This is needed because for some obscure reasons future calls to make don't
+# pick up these exports if we export them in src_unpack()
+exportmakeopts() {
+	local myopts
+
+	if use blksha1 ; then
+		myopts+=" BLK_SHA1=YesPlease"
+	elif use ppcsha1 ; then
+		myopts+=" PPC_SHA1=YesPlease"
+	fi
+
+	if use curl ; then
+		use webdav || myopts+=" NO_EXPAT=YesPlease"
+	else
+		myopts+=" NO_CURL=YesPlease"
+	fi
+
+	# broken assumptions, because of broken build system ...
+	myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
+	myopts+=" INSTALL=install TAR=tar"
+	myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
+	myopts+=" SANE_TOOL_PATH="
+	myopts+=" OLD_ICONV="
+	myopts+=" NO_EXTERNAL_GREP="
+
+	# For svn-fe
+	extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
+
+	# can't define this to null, since the entire makefile depends on it
+	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
+
+	use iconv \
+		|| myopts+=" NO_ICONV=YesPlease"
+	use nls \
+		|| myopts+=" NO_GETTEXT=YesPlease"
+	use tk \
+		|| myopts+=" NO_TCLTK=YesPlease"
+	use pcre \
+		&& myopts+=" USE_LIBPCRE=yes" \
+		&& extlibs+=" -lpcre"
+	use perl \
+		&& myopts+=" INSTALLDIRS=vendor" \
+		|| myopts+=" NO_PERL=YesPlease"
+	use python \
+		|| myopts+=" NO_PYTHON=YesPlease"
+	use subversion \
+		|| myopts+=" NO_SVN_TESTS=YesPlease"
+	use threads \
+		&& myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
+		|| myopts+=" NO_PTHREADS=YesPlease"
+	use cvs \
+		|| myopts+=" NO_CVS=YesPlease"
+# Disabled until ~m68k-mint can be keyworded again
+#	if [[ ${CHOST} == *-mint* ]] ; then
+#		myopts+=" NO_MMAP=YesPlease"
+#		myopts+=" NO_IPV6=YesPlease"
+#		myopts+=" NO_STRLCPY=YesPlease"
+#		myopts+=" NO_MEMMEM=YesPlease"
+#		myopts+=" NO_MKDTEMP=YesPlease"
+#		myopts+=" NO_MKSTEMPS=YesPlease"
+#	fi
+	if [[ ${CHOST} == ia64-*-hpux* ]]; then
+		myopts+=" NO_NSEC=YesPlease"
+	fi
+	if [[ ${CHOST} == *-*-aix* ]]; then
+		myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
+	fi
+	if [[ ${CHOST} == *-solaris* ]]; then
+		myopts+=" NEEDS_LIBICONV=YesPlease"
+	fi
+
+	has_version '>=app-text/asciidoc-8.0' \
+		&& myopts+=" ASCIIDOC8=YesPlease"
+	myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
+
+	# Bug 290465:
+	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
+	[[ "${CHOST}" == *-uclibc* ]] && \
+		myopts+=" NO_NSEC=YesPlease"
+
+	export MY_MAKEOPTS="${myopts}"
+	export EXTLIBS="${extlibs}"
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+		cd "${S}"
+		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		use doc && \
+			cd "${S}"/Documentation && \
+			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		cd "${S}"
+	else
+		git-2_src_unpack
+		cd "${S}"
+		#cp "${FILESDIR}"/GIT-VERSION-GEN .
+	fi
+
+}
+
+src_prepare() {
+	# add experimental patches to improve mediawiki support
+	# see patches for origin
+	if use mediawiki-experimental ; then
+		PATCHES+=(
+			"${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
+			"${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
+			"${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
+		)
+	fi
+
+	default
+
+	sed -i \
+		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
+		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
+		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
+		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
+		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		Makefile contrib/svn-fe/Makefile || die "sed failed"
+
+	# Never install the private copy of Error.pm (bug #296310)
+	sed -i \
+		-e '/private-Error.pm/s,^,#,' \
+		perl/Makefile.PL
+
+	# Fix docbook2texi command
+	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
+		Documentation/Makefile || die "sed failed"
+
+	# Fix git-subtree missing DESTDIR
+	sed -i \
+		-e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
+		-e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
+		contrib/subtree/Makefile
+}
+
+git_emake() {
+	# bug #326625: PERL_PATH, PERL_MM_OPT
+	# bug #320647: PYTHON_PATH
+	PYTHON_PATH=""
+	use python && PYTHON_PATH="${PYTHON}"
+	emake ${MY_MAKEOPTS} \
+		DESTDIR="${D}" \
+		OPTCFLAGS="${CFLAGS}" \
+		OPTLDFLAGS="${LDFLAGS}" \
+		OPTCC="$(tc-getCC)" \
+		OPTAR="$(tc-getAR)" \
+		prefix="${EPREFIX}"/usr \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		sysconfdir="${EPREFIX}"/etc \
+		PYTHON_PATH="${PYTHON_PATH}" \
+		PERL_MM_OPT="" \
+		GIT_TEST_OPTS="--no-color" \
+		V=1 \
+		"$@"
+	# This is the fix for bug #326625, but it also causes breakage, see bug
+	# #352693.
+	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
+}
+
+src_configure() {
+	exportmakeopts
+}
+
+src_compile() {
+	if use perl ; then
+	git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
+	git_emake perl/perl.mak || die "emake perl/perl.mak failed"
+	fi
+	git_emake || die "emake failed"
+
+	if use emacs ; then
+		elisp-compile contrib/emacs/git{,-blame}.el
+	fi
+
+	if use perl && use cgi ; then
+		git_emake \
+			gitweb \
+			|| die "emake gitweb (cgi) failed"
+	fi
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain"
+		git_emake || die "emake credential-osxkeychain"
+	fi
+
+	cd "${S}"/Documentation
+	if [[ ${PV} == *9999 ]] ; then
+		git_emake man \
+			|| die "emake man failed"
+		if use doc ; then
+			git_emake info html \
+				|| die "emake info html failed"
+		fi
+	else
+		if use doc ; then
+			git_emake info \
+				|| die "emake info html failed"
+		fi
+	fi
+
+	if use subversion ; then
+		cd "${S}"/contrib/svn-fe
+		# by defining EXTLIBS we override the detection for libintl and
+		# libiconv, bug #516168
+		local nlsiconv=
+		use nls && use !elibc_glibc && nlsiconv+=" -lintl"
+		use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
+		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
+		if use doc ; then
+			git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
+		fi
+		cd "${S}"
+	fi
+
+	if use gnome-keyring ; then
+		cd "${S}"/contrib/credential/gnome-keyring
+		git_emake || die "emake git-credential-gnome-keyring failed"
+	fi
+
+	cd "${S}"/contrib/subtree
+	git_emake
+	use doc && git_emake doc
+
+	if use mediawiki ; then
+		cd "${S}"/contrib/mw-to-git
+		git_emake
+	fi
+}
+
+src_install() {
+	git_emake \
+		install || \
+		die "make install failed"
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
+	fi
+
+	# Depending on the tarball and manual rebuild of the documentation, the
+	# manpages may exist in either OR both of these directories.
+	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+	dodoc README.md Documentation/{SubmittingPatches,CodingGuidelines}
+	use doc && dodir /usr/share/doc/${PF}/html
+	for d in / /howto/ /technical/ ; do
+		docinto ${d}
+		dodoc Documentation${d}*.txt
+		if use doc ; then
+			docinto ${d}/html
+			dodoc Documentation${d}*.html
+		fi
+	done
+	docinto /
+	# Upstream does not ship this pre-built :-(
+	use doc && doinfo Documentation/{git,gitman}.info
+
+	newbashcomp contrib/completion/git-completion.bash ${PN}
+	bashcomp_alias git gitk
+	# Not really a bash-completion file (bug #477920)
+	# but still needed uncompressed (bug #507480)
+	insinto /usr/share/${PN}
+	doins contrib/completion/git-prompt.sh
+
+	if use emacs ; then
+		elisp-install ${PN} contrib/emacs/git.{el,elc}
+		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
+		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
+		# don't add automatically to the load-path, so the sitefile
+		# can do a conditional loading
+		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+	fi
+
+	if use python && use gtk ; then
+		python_doscript "${S}"/contrib/gitview/gitview
+		dodoc "${S}"/contrib/gitview/gitview.txt
+	fi
+
+	#dobin contrib/fast-import/git-p4 # Moved upstream
+	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
+	newbin contrib/fast-import/import-tars.perl import-tars
+	exeinto /usr/libexec/git-core/
+	newexe contrib/git-resurrect.sh git-resurrect
+
+	# git-subtree
+	cd "${S}"/contrib/subtree
+	git_emake install || die "Failed to emake install git-subtree"
+	if use doc ; then
+		git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
+	fi
+	newdoc README README.git-subtree
+	dodoc git-subtree.txt
+	cd "${S}"
+
+	if use mediawiki ; then
+		cd "${S}"/contrib/mw-to-git
+		git_emake install
+		cd "${S}"
+	fi
+
+	# diff-highlight
+	dobin contrib/diff-highlight/diff-highlight
+	newdoc contrib/diff-highlight/README README.diff-highlight
+
+	# git-jump
+	exeinto /usr/libexec/git-core/
+	doexe contrib/git-jump/git-jump
+	newdoc contrib/git-jump/README git-jump.txt
+
+	# git-contacts
+	exeinto /usr/libexec/git-core/
+	doexe contrib/contacts/git-contacts
+	dodoc contrib/contacts/git-contacts.txt
+
+	if use gnome-keyring ; then
+		cd "${S}"/contrib/credential/gnome-keyring
+		dobin git-credential-gnome-keyring
+	fi
+
+	if use subversion ; then
+		cd "${S}"/contrib/svn-fe
+		dobin svn-fe
+		dodoc svn-fe.txt
+		if use doc ; then
+			doman svn-fe.1
+			docinto html
+			dodoc svn-fe.html
+		fi
+		cd "${S}"
+	fi
+
+	dodir /usr/share/${PN}/contrib
+	# The following are excluded:
+	# completion - installed above
+	# credential/gnome-keyring TODO
+	# diff-highlight - done above
+	# emacs - installed above
+	# examples - these are stuff that is not used in Git anymore actually
+	# git-jump - done above
+	# gitview - installed above
+	# p4import - excluded because fast-import has a better one
+	# patches - stuff the Git guys made to go upstream to other places
+	# persistent-https - TODO
+	# mw-to-git - TODO
+	# subtree - build  seperately
+	# svnimport - use git-svn
+	# thunderbird-patch-inline - fixes thunderbird
+	for i in \
+		buildsystems convert-objects fast-import \
+		hg-to-git hooks remotes2config.sh rerere-train.sh \
+		stats workdir \
+		; do
+		cp -rf \
+			"${S}"/contrib/${i} \
+			"${ED}"/usr/share/${PN}/contrib \
+			|| die "Failed contrib ${i}"
+	done
+
+	if use perl && use cgi ; then
+		# We used to install in /usr/share/${PN}/gitweb
+		# but upstream installs in /usr/share/gitweb
+		# so we will install a symlink and use their location for compat with other
+		# distros
+		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
+
+		# INSTALL discusses configuration issues, not just installation
+		docinto /
+		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
+		newdoc  "${S}"/gitweb/README README.gitweb
+
+		find "${ED}"/usr/lib64/perl5/ \
+			-name .packlist \
+			-exec rm \{\} \;
+	else
+		rm -rf "${ED}"/usr/share/gitweb
+	fi
+
+	if ! use subversion ; then
+		rm -f "${ED}"/usr/libexec/git-core/git-svn \
+			"${ED}"/usr/share/man/man1/git-svn.1*
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+	fi
+
+	if use !prefix ; then
+		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
+		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+		systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service"
+		systemd_dounit "${FILESDIR}/git-daemon.socket"
+	fi
+
+	perl_delete_localpod
+
+	# Remove disabled linguas
+	# we could remove sources in src_prepare, but install does not
+	# handle missing locale dir well
+	rm_loc() {
+		if [[ -e "${ED}/usr/share/locale/${1}" ]]; then
+			rm -r "${ED}/usr/share/locale/${1}" || die
+		fi
+	}
+	l10n_for_each_disabled_locale_do rm_loc
+}
+
+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
+	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/kde-apps/kdeedu-data/kdeedu-data-15.12.3.ebuild b/kde-apps/kdeedu-data/kdeedu-data-15.12.3-r1.ebuild
similarity index 62%
rename from kde-apps/kdeedu-data/kdeedu-data-15.12.3.ebuild
rename to kde-apps/kdeedu-data/kdeedu-data-15.12.3-r1.ebuild
index c58281912d06..313357037add 100644
--- a/kde-apps/kdeedu-data/kdeedu-data-15.12.3.ebuild
+++ b/kde-apps/kdeedu-data/kdeedu-data-15.12.3-r1.ebuild
@@ -2,14 +2,19 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_AUTODEPS="false"
 inherit kde5
 
 DESCRIPTION="Shared icons, artwork and data files for educational applications"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="$(add_frameworks_dep extra-cmake-modules)"
-RDEPEND=""
+DEPEND="
+	$(add_frameworks_dep extra-cmake-modules)
+	$(add_qt_dep qtcore)
+"
+RDEPEND="
+	!kde-apps/libkdeedu:4
+"
diff --git a/kde-apps/libkdeedu/Manifest b/kde-apps/libkdeedu/Manifest
index 0653a42e3144..5b9f7f58b433 100644
--- a/kde-apps/libkdeedu/Manifest
+++ b/kde-apps/libkdeedu/Manifest
@@ -1 +1,2 @@
+DIST libkdeedu-15.12.3.tar.xz 131252 SHA256 0c54de07eff4392f67563a902f9b0239419d657ee14f58926c56a6fa3c20b3c6 SHA512 c4514daabed4cc171da3ace2130e4cd3cb2e0265649ab0c22a49ee83954b3f406d7b594fb5b2bc40beeb9f717f6b08495ed66c149b73ec04a76a27fba09d6e4e WHIRLPOOL ceeb886973264fb465889fcde8a26bd66e7704ad36ed267f5f603c14c603c8a0001b88001a8f14b8924913df27286406c1e51f79818b822297680a73a48073f9
 DIST libkdeedu-4.14.3.tar.xz 218432 SHA256 fd6f2b83ab49f04036428462537c8f8bf7f88b8a492131db740c296ffc725ac4 SHA512 046b51774ca21c9453bb709c0d550c3626ca174a266b8a8a013697707e7f709e521d01c01c262181d6b470a6e16b2e856d31e35bf38b08632e1a73fbd05b0eb4 WHIRLPOOL c50c6212817ccd31259e2494b93fc687f99095e349408e1f67e8a689814bdf8999ed926e11d5201e80ce1863c26c5b39f82d43fdd2cc1597fd144ed0342ff869
diff --git a/kde-apps/libkdeedu/libkdeedu-15.12.3.ebuild b/kde-apps/libkdeedu/libkdeedu-15.12.3.ebuild
new file mode 100644
index 000000000000..a075cb863a8d
--- /dev/null
+++ b/kde-apps/libkdeedu/libkdeedu-15.12.3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde4-base
+
+DESCRIPTION="Common library for KDE educational apps"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+# 4 of 4 tests fail. Last checked for 4.6.1. Tests are fundamentally broken,
+# see bug 258857 for details.
+RESTRICT=test
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 95dca4093a10..e550fe3296f9 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 29 Mar 2016 07:09:01 +0000
+Tue, 29 Mar 2016 09:39:04 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index a10ad6e1cb71..e550fe3296f9 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 29 Mar 2016 07:09:02 +0000
+Tue, 29 Mar 2016 09:39:04 +0000
diff --git a/metadata/md5-cache/app-emulation/qemu-2.5.0-r3 b/metadata/md5-cache/app-emulation/qemu-2.5.0-r3
index fac6e64b0c4c..757f5eb4a69b 100644
--- a/metadata/md5-cache/app-emulation/qemu-2.5.0-r3
+++ b/metadata/md5-cache/app-emulation/qemu-2.5.0-r3
@@ -4,11 +4,11 @@ DESCRIPTION=QEMU + Kernel-based Virtual Machine userland tools
 EAPI=5
 HOMEPAGE=http://www.qemu.org http://www.linux-kvm.org
 IUSE=accessibility +aio alsa bluetooth +caps +curl debug +fdt glusterfs gnutls gtk gtk2 infiniband iscsi +jpeg kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png pulseaudio python rbd sasl +seccomp sdl sdl2 selinux smartcard snappy spice ssh static static-softmmu static-user systemtap tci test +threads usb usbredir +uuid vde +vhost-net virgl virtfs +vnc vte xattr xen xfs qemu_softmmu_targets_aarch64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_i386 qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_mipsel qemu_softmmu_targets_or32 qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_s390x qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_unicore32 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_ppcemb qemu_softmmu_targets_tricore qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_user_targets_aarch64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_i386 qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_mipsel qemu_user_targets_or32 qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_s390x qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_unicore32 qemu_user_targets_x86_64 qemu_user_targets_armeb qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_ppc64le qemu_user_targets_sparc32plus qemu_user_targets_tilegx python_targets_python2_7 +filecaps linguas_de_DE linguas_fr_FR linguas_hu linguas_it linguas_tr linguas_zh_CN
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd
 LICENSE=GPL-2 LGPL-2 BSD-2
 RDEPEND=!static-softmmu? ( qemu_softmmu_targets_aarch64? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle >=net-libs/gnutls-3.0 ) 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:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_alpha? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle >=net-libs/gnutls-3.0 ) 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:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_arm? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle >=net-libs/gnutls-3.0 ) 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:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_cris? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle >=net-libs/gnutls-3.0 ) 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:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_i386? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle >=net-libs/gnutls-3.0 ) 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:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_m68k? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle >=net-libs/gnutls-3.0 ) 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:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_microblaze? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle >=net-libs/gnutls-3.0 ) 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:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_microblazeel? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle >=net-libs/gnutls-3.0 ) 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:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_mips? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle >=net-libs/gnutls-3.0 ) 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:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_mips64? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle >=net-libs/gnutls-3.0 ) 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:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_mips64el? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle >=net-libs/gnutls-3.0 ) 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:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_mipsel? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle >=net-libs/gnutls-3.0 ) 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:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_or32? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle >=net-libs/gnutls-3.0 ) 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:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_ppc? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle >=net-libs/gnutls-3.0 ) 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:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_ppc64? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle >=net-libs/gnutls-3.0 ) 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:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_s390x? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle >=net-libs/gnutls-3.0 ) 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:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_sh4? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle >=net-libs/gnutls-3.0 ) 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:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_sh4eb? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle >=net-libs/gnutls-3.0 ) 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:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_sparc? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle >=net-libs/gnutls-3.0 ) 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:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_sparc64? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle >=net-libs/gnutls-3.0 ) 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:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_unicore32? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle >=net-libs/gnutls-3.0 ) 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:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_x86_64? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle >=net-libs/gnutls-3.0 ) 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:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_lm32? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle >=net-libs/gnutls-3.0 ) 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:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_moxie? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle >=net-libs/gnutls-3.0 ) 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:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_ppcemb? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle >=net-libs/gnutls-3.0 ) 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:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_tricore? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle >=net-libs/gnutls-3.0 ) 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:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_xtensa? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle >=net-libs/gnutls-3.0 ) 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:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_xtensaeb? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle >=net-libs/gnutls-3.0 ) 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:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) ) !static-user? ( qemu_user_targets_aarch64? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) ) qemu_user_targets_alpha? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) ) qemu_user_targets_arm? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) ) qemu_user_targets_cris? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) ) qemu_user_targets_i386? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) ) qemu_user_targets_m68k? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) ) qemu_user_targets_microblaze? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) ) qemu_user_targets_microblazeel? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) ) qemu_user_targets_mips? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) ) qemu_user_targets_mips64? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) ) qemu_user_targets_mips64el? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) ) qemu_user_targets_mipsel? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) ) qemu_user_targets_or32? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) ) qemu_user_targets_ppc? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) ) qemu_user_targets_ppc64? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) ) qemu_user_targets_s390x? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) ) qemu_user_targets_sh4? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) ) qemu_user_targets_sh4eb? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) ) qemu_user_targets_sparc? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) ) qemu_user_targets_sparc64? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) ) qemu_user_targets_unicore32? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) ) qemu_user_targets_x86_64? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) ) qemu_user_targets_armeb? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) ) qemu_user_targets_mipsn32? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) ) qemu_user_targets_mipsn32el? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) ) qemu_user_targets_ppc64abi32? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) ) qemu_user_targets_ppc64le? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) ) qemu_user_targets_sparc32plus? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) ) qemu_user_targets_tilegx? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) ) ) qemu_softmmu_targets_i386? ( >=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 ) ) qemu_softmmu_targets_x86_64? ( >=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 ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xen? ( app-emulation/xen-tools:= ) selinux? ( sec-policy/selinux-qemu )
 REQUIRED_USE=|| ( python_targets_python2_7 ) 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 )
 SLOT=0
 SRC_URI=http://wiki.qemu-project.org/download/qemu-2.5.0.tar.bz2
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	fcaps	6a1091a98b1dde01cc26ab3252da1a9b	flag-o-matic	d270fa247153df66074f795fa42dba3e	l10n	714aaf78929eade946da5eaff7d2001a	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	udev	73058269b3e70e34e084fa3981282338	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=70715c2e43a1f9343998c06882a16384
+_md5_=5ea9bf38aa6cdfde65d7bb48c1677022
diff --git a/metadata/md5-cache/dev-util/uncrustify-0.62 b/metadata/md5-cache/dev-util/uncrustify-0.62
new file mode 100644
index 000000000000..790298f3b9eb
--- /dev/null
+++ b/metadata/md5-cache/dev-util/uncrustify-0.62
@@ -0,0 +1,12 @@
+DEFINED_PHASES=prepare setup
+DEPEND=test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=C/C++/C#/D/Java/Pawn code indenter and beautifier
+EAPI=6
+HOMEPAGE=http://uncrustify.sourceforge.net/
+IUSE=test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://github.com/uncrustify/uncrustify/archive/uncrustify-0.62.tar.gz
+_eclasses_=multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=19834a82ad32ce1b145f945e63fd8e28
diff --git a/metadata/md5-cache/dev-util/uncrustify-9999 b/metadata/md5-cache/dev-util/uncrustify-9999
index dfb28982ae92..f05ef6839cc0 100644
--- a/metadata/md5-cache/dev-util/uncrustify-9999
+++ b/metadata/md5-cache/dev-util/uncrustify-9999
@@ -1,10 +1,10 @@
-DEFINED_PHASES=setup unpack
-DEPEND=test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) >=dev-vcs/git-1.8.2.1
+DEFINED_PHASES=prepare setup unpack
+DEPEND=test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) >=dev-vcs/git-1.8.2.1 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=C/C++/C#/D/Java/Pawn code indenter and beautifier
-EAPI=5
+EAPI=6
 HOMEPAGE=http://uncrustify.sourceforge.net/
 IUSE=test
 LICENSE=GPL-2
 SLOT=0
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	git-r3	ef66dfc3db09f327af21cf32f140fb2b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=ef197a041550e2c4a1a7ba285fc589c7
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	git-r3	ef66dfc3db09f327af21cf32f140fb2b	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=19834a82ad32ce1b145f945e63fd8e28
diff --git a/metadata/md5-cache/dev-vcs/git-2.8.0 b/metadata/md5-cache/dev-vcs/git-2.8.0
new file mode 100644
index 000000000000..8127be7eb4d9
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/git-2.8.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=!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 ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
+DESCRIPTION=GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team
+EAPI=6
+HOMEPAGE=http://www.git-scm.com/
+IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test linguas_bg linguas_ca linguas_de linguas_fr linguas_is linguas_it linguas_ko linguas_pt_PT linguas_ru linguas_sv linguas_vi linguas_zh_CN python_targets_python2_7
+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
+LICENSE=GPL-2
+RDEPEND=!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 ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 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_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] )
+REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://git-core.googlecode.com/files/git-2.8.0.tar.xz mirror://kernel/software/scm/git/git-2.8.0.tar.xz https://git-core.googlecode.com/files/git-manpages-2.8.0.tar.xz mirror://kernel/software/scm/git/git-manpages-2.8.0.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.8.0.tar.xz https://git-core.googlecode.com/files/git-htmldocs-2.8.0.tar.xz )
+_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	l10n	714aaf78929eade946da5eaff7d2001a	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=ea92c008fb17528704715eb92663dede
diff --git a/metadata/md5-cache/kde-apps/kdeedu-data-15.12.3 b/metadata/md5-cache/kde-apps/kdeedu-data-15.12.3-r1
similarity index 73%
rename from metadata/md5-cache/kde-apps/kdeedu-data-15.12.3
rename to metadata/md5-cache/kde-apps/kdeedu-data-15.12.3-r1
index e2996c177724..3e54f1ae8665 100644
--- a/metadata/md5-cache/kde-apps/kdeedu-data-15.12.3
+++ b/metadata/md5-cache/kde-apps/kdeedu-data-15.12.3-r1
@@ -1,12 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/extra-cmake-modules-5.17.0:5 sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/extra-cmake-modules-5.17.0:5 >=dev-qt/qtcore-5.4.2:5 sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Shared icons, artwork and data files for educational applications
-EAPI=5
+EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
+RDEPEND=!kde-apps/libkdeedu:4
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.3/src/kdeedu-data-15.12.3.tar.xz
 _eclasses_=cmake-utils	e79d341200cba811b41cc0728403c48d	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	kde5	2c634c3184d93b30aaf7f8a2d2099e58	kde5-functions	d990f9ccc19050947d06f18846186f7a	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=443aaa690496bebb5bc3a3ec01070057
+_md5_=9933061f5699c7a9d101fab17c9865e8
diff --git a/metadata/md5-cache/kde-apps/libkdeedu-15.12.3 b/metadata/md5-cache/kde-apps/libkdeedu-15.12.3
new file mode 100644
index 000000000000..28ef10af5dcb
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkdeedu-15.12.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.3:4[aqua=]
+DESCRIPTION=Common library for KDE educational apps
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug aqua
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!kde-base/libkdeedu:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.3:4[aqua=]
+RESTRICT=test
+SLOT=4/15.12
+SRC_URI=mirror://kde/stable/applications/15.12.3/src/libkdeedu-15.12.3.tar.xz
+_eclasses_=cmake-utils	e79d341200cba811b41cc0728403c48d	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	kde4-base	98acb5fdc583ece9b41bbe16d2a05585	kde4-functions	88bc45dff8c885002aca6e4c0adbe541	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=e7b5e34b6798fe836bea1ee466bc49f2
diff --git a/metadata/md5-cache/net-im/mcabber-1.0.2 b/metadata/md5-cache/net-im/mcabber-1.0.2
new file mode 100644
index 000000000000..9663c562197e
--- /dev/null
+++ b/metadata/md5-cache/net-im/mcabber-1.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=crypt? ( >=app-crypt/gpgme-1.0.0 ) otr? ( >=net-libs/libotr-3.1.0 ) aspell? ( app-text/aspell ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) idn? ( net-dns/libidn ) spell? ( app-text/enchant ) dev-libs/glib:2 sys-libs/ncurses:0= >=net-libs/loudmouth-1.4.3-r1[ssl?] virtual/pkgconfig
+DESCRIPTION=A small Jabber console client with various features, like MUC, SSL, PGP
+EAPI=5
+HOMEPAGE=http://mcabber.com/
+IUSE=aspell crypt idn modules otr spell ssl vim-syntax linguas_cs linguas_de linguas_fr linguas_it linguas_nl linguas_pl linguas_ru linguas_uk
+KEYWORDS=~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=crypt? ( >=app-crypt/gpgme-1.0.0 ) otr? ( >=net-libs/libotr-3.1.0 ) aspell? ( app-text/aspell ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) idn? ( net-dns/libidn ) spell? ( app-text/enchant ) dev-libs/glib:2 sys-libs/ncurses:0= >=net-libs/loudmouth-1.4.3-r1[ssl?]
+SLOT=0
+SRC_URI=http://mcabber.com/files/mcabber-1.0.2.tar.bz2
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=715b76832c2c7bf2ba789033e93f91e6
diff --git a/metadata/md5-cache/net-libs/nodejs-4.1.1 b/metadata/md5-cache/net-libs/nodejs-4.1.1
deleted file mode 100644
index 0e5b59942dca..000000000000
--- a/metadata/md5-cache/net-libs/nodejs-4.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=icu? ( >=dev-libs/icu-55:= ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=net-libs/http-parser-2.5:= >=dev-libs/libuv-1.6.1:= >=dev-libs/openssl-1.0.2d:=[-bindist]
-DESCRIPTION=Evented IO for V8 Javascript
-EAPI=5
-HOMEPAGE=http://nodejs.org/
-IUSE=debug icu +npm snapshot +ssl python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~x86 ~x64-macos
-LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=icu? ( >=dev-libs/icu-55:= ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=net-libs/http-parser-2.5:= >=dev-libs/libuv-1.6.1:= >=dev-libs/openssl-1.0.2d:=[-bindist]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=http://nodejs.org/dist/v4.1.1/node-v4.1.1.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=6409435476ab6bb2b5412599ea798c2a
diff --git a/metadata/md5-cache/net-libs/nodejs-4.2.2 b/metadata/md5-cache/net-libs/nodejs-4.2.2
deleted file mode 100644
index 6fd7d63f741f..000000000000
--- a/metadata/md5-cache/net-libs/nodejs-4.2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=icu? ( >=dev-libs/icu-55:= ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=net-libs/http-parser-2.5:= >=dev-libs/libuv-1.6.1:= >=dev-libs/openssl-1.0.2d:0=[-bindist] sys-libs/zlib
-DESCRIPTION=Evented IO for V8 Javascript
-EAPI=5
-HOMEPAGE=http://nodejs.org/
-IUSE=debug icu +npm snapshot +ssl python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~x86 ~x64-macos
-LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=icu? ( >=dev-libs/icu-55:= ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=net-libs/http-parser-2.5:= >=dev-libs/libuv-1.6.1:= >=dev-libs/openssl-1.0.2d:0=[-bindist] sys-libs/zlib
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=http://nodejs.org/dist/v4.2.2/node-v4.2.2.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=5d61a05019e07eec6515664193ebedf5
diff --git a/metadata/md5-cache/net-libs/nodejs-5.6.0-r1 b/metadata/md5-cache/net-libs/nodejs-4.4.1
similarity index 54%
rename from metadata/md5-cache/net-libs/nodejs-5.6.0-r1
rename to metadata/md5-cache/net-libs/nodejs-4.4.1
index 88f8ed17678a..3fbfe589ba31 100644
--- a/metadata/md5-cache/net-libs/nodejs-5.6.0-r1
+++ b/metadata/md5-cache/net-libs/nodejs-4.4.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=icu? ( >=dev-libs/icu-56:= ) npm? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) >=net-libs/http-parser-2.6.1:= >=dev-libs/libuv-1.8.0:= >=dev-libs/openssl-1.0.2f:0=[-bindist] sys-libs/zlib >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] !!net-libs/iojs test? ( net-misc/curl )
+DEPEND=icu? ( >=dev-libs/icu-55:= ) npm? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) >=net-libs/http-parser-2.5.2:= >=dev-libs/libuv-1.8.0:= >=dev-libs/openssl-1.0.2g:0=[-bindist] sys-libs/zlib >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] test? ( net-misc/curl )
 DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
-EAPI=6
+EAPI=5
 HOMEPAGE=https://nodejs.org/
-IUSE=cpu_flags_x86_sse2 debug doc icu +npm +snapshot +ssl test python_targets_python2_7
+IUSE=cpu_flags_x86_sse2 debug icu +npm snapshot +ssl test python_targets_python2_7
 KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~x64-macos
 LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=icu? ( >=dev-libs/icu-56:= ) npm? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) >=net-libs/http-parser-2.6.1:= >=dev-libs/libuv-1.8.0:= >=dev-libs/openssl-1.0.2f:0=[-bindist] sys-libs/zlib
+RDEPEND=icu? ( >=dev-libs/icu-55:= ) npm? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) >=net-libs/http-parser-2.5.2:= >=dev-libs/libuv-1.8.0:= >=dev-libs/openssl-1.0.2g:0=[-bindist] sys-libs/zlib
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
-SRC_URI=https://nodejs.org/dist/v5.6.0/node-v5.6.0.tar.xz
-_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=fe6d981399eb570b192e98b8dec5c245
+SRC_URI=https://nodejs.org/dist/v4.4.1/node-v4.4.1.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=84d8eaf6d5ece92c83ae418809f0d0ac
diff --git a/metadata/md5-cache/net-libs/nodejs-5.0.0 b/metadata/md5-cache/net-libs/nodejs-5.0.0
deleted file mode 100644
index 9706ee914ec6..000000000000
--- a/metadata/md5-cache/net-libs/nodejs-5.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=icu? ( >=dev-libs/icu-55:= ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=net-libs/http-parser-2.5:= >=dev-libs/libuv-1.6.1:= >=dev-libs/openssl-1.0.2d:0=[-bindist] sys-libs/zlib
-DESCRIPTION=Evented IO for V8 Javascript
-EAPI=5
-HOMEPAGE=http://nodejs.org/
-IUSE=debug icu +npm snapshot +ssl python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~x86 ~x64-macos
-LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=icu? ( >=dev-libs/icu-55:= ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=net-libs/http-parser-2.5:= >=dev-libs/libuv-1.6.1:= >=dev-libs/openssl-1.0.2d:0=[-bindist] sys-libs/zlib
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=http://nodejs.org/dist/v5.0.0/node-v5.0.0.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=5d61a05019e07eec6515664193ebedf5
diff --git a/metadata/md5-cache/net-libs/nodejs-5.3.0 b/metadata/md5-cache/net-libs/nodejs-5.3.0
deleted file mode 100644
index a5f69cf45872..000000000000
--- a/metadata/md5-cache/net-libs/nodejs-5.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=icu? ( >=dev-libs/icu-55:= ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=net-libs/http-parser-2.5:= >=dev-libs/libuv-1.6.1:= >=dev-libs/openssl-1.0.2d:0=[-bindist] sys-libs/zlib
-DESCRIPTION=Evented IO for V8 Javascript
-EAPI=5
-HOMEPAGE=http://nodejs.org/
-IUSE=debug icu +npm snapshot +ssl python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~x86 ~x64-macos
-LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=icu? ( >=dev-libs/icu-55:= ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=net-libs/http-parser-2.5:= >=dev-libs/libuv-1.6.1:= >=dev-libs/openssl-1.0.2d:0=[-bindist] sys-libs/zlib
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=http://nodejs.org/dist/v5.3.0/node-v5.3.0.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=5d61a05019e07eec6515664193ebedf5
diff --git a/metadata/md5-cache/net-libs/nodejs-5.4.1 b/metadata/md5-cache/net-libs/nodejs-5.4.1
deleted file mode 100644
index c5fd030a41bb..000000000000
--- a/metadata/md5-cache/net-libs/nodejs-5.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=icu? ( >=dev-libs/icu-55:= ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=net-libs/http-parser-2.5:= >=dev-libs/libuv-1.6.1:= >=dev-libs/openssl-1.0.2d:0=[-bindist] sys-libs/zlib
-DESCRIPTION=Evented IO for V8 Javascript
-EAPI=5
-HOMEPAGE=http://nodejs.org/
-IUSE=debug icu +npm snapshot +ssl python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~x86 ~x64-macos
-LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=icu? ( >=dev-libs/icu-55:= ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=net-libs/http-parser-2.5:= >=dev-libs/libuv-1.6.1:= >=dev-libs/openssl-1.0.2d:0=[-bindist] sys-libs/zlib
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=http://nodejs.org/dist/v5.4.1/node-v5.4.1.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=5d61a05019e07eec6515664193ebedf5
diff --git a/metadata/md5-cache/net-libs/nodejs-5.7.1 b/metadata/md5-cache/net-libs/nodejs-5.9.1
similarity index 85%
rename from metadata/md5-cache/net-libs/nodejs-5.7.1
rename to metadata/md5-cache/net-libs/nodejs-5.9.1
index f57e890afc7d..209b69387478 100644
--- a/metadata/md5-cache/net-libs/nodejs-5.7.1
+++ b/metadata/md5-cache/net-libs/nodejs-5.9.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=icu? ( >=dev-libs/icu-56:= ) npm? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) >=net-libs/http-parser-2.6.2:= >=dev-libs/libuv-1.8.0:= >=dev-libs/openssl-1.0.2f:0=[-bindist] sys-libs/zlib >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] !!net-libs/iojs test? ( net-misc/curl )
+DEPEND=icu? ( >=dev-libs/icu-56:= ) npm? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) >=net-libs/http-parser-2.6.2:= >=dev-libs/libuv-1.8.0:= >=dev-libs/openssl-1.0.2g:0=[-bindist] sys-libs/zlib >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] test? ( net-misc/curl )
 DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
 EAPI=6
 HOMEPAGE=https://nodejs.org/
 IUSE=cpu_flags_x86_sse2 debug doc icu +npm +snapshot +ssl test python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~x86 ~x64-macos
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~x64-macos
 LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=icu? ( >=dev-libs/icu-56:= ) npm? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) >=net-libs/http-parser-2.6.2:= >=dev-libs/libuv-1.8.0:= >=dev-libs/openssl-1.0.2f:0=[-bindist] sys-libs/zlib
+RDEPEND=icu? ( >=dev-libs/icu-56:= ) npm? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) >=net-libs/http-parser-2.6.2:= >=dev-libs/libuv-1.8.0:= >=dev-libs/openssl-1.0.2g:0=[-bindist] sys-libs/zlib
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
-SRC_URI=https://nodejs.org/dist/v5.7.1/node-v5.7.1.tar.xz
+SRC_URI=https://nodejs.org/dist/v5.9.1/node-v5.9.1.tar.xz
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=3cb131ab25fa6a2baf656b9ae51de569
+_md5_=41cf5b39f705c75357b6640c80fa0799
diff --git a/metadata/md5-cache/net-p2p/i2p-0.9.22 b/metadata/md5-cache/net-p2p/i2p-0.9.22
deleted file mode 100644
index a52063832ed3..000000000000
--- a/metadata/md5-cache/net-p2p/i2p-0.9.22
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=dev-java/jrobin:0 dev-java/slf4j-api:0 dev-java/java-service-wrapper:0 dev-java/eclipse-ecj:* dev-libs/gmp:* nls? ( sys-devel/gettext ) >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2 virtual/pkgconfig
-DESCRIPTION=A privacy-centric, anonymous network.
-EAPI=5
-HOMEPAGE=https://geti2p.net
-IUSE=nls elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-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
-RDEPEND=dev-java/jrobin:0 dev-java/slf4j-api:0 dev-java/java-service-wrapper:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0
-SLOT=0
-SRC_URI=https://download.i2p2.de/releases/0.9.22/i2psource_0.9.22.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ef2fea5b12b5062c68b2c9a00187e038
diff --git a/metadata/md5-cache/net-p2p/i2p-0.9.22-r1 b/metadata/md5-cache/net-p2p/i2p-0.9.22-r1
deleted file mode 100644
index d050d7c75403..000000000000
--- a/metadata/md5-cache/net-p2p/i2p-0.9.22-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=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 dev-java/eclipse-ecj:* dev-libs/gmp:* nls? ( sys-devel/gettext ) >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2 virtual/pkgconfig
-DESCRIPTION=A privacy-centric, anonymous network.
-EAPI=5
-HOMEPAGE=https://geti2p.net
-IUSE=nls elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-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
-RDEPEND=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 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0
-SLOT=0
-SRC_URI=https://download.i2p2.de/releases/0.9.22/i2psource_0.9.22.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c7115025975c00690c2adbe106821ad1
diff --git a/metadata/md5-cache/net-p2p/i2p-0.9.23 b/metadata/md5-cache/net-p2p/i2p-0.9.23
deleted file mode 100644
index 0352f40bd80b..000000000000
--- a/metadata/md5-cache/net-p2p/i2p-0.9.23
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=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 dev-java/eclipse-ecj:* dev-libs/gmp:* nls? ( sys-devel/gettext ) >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2 virtual/pkgconfig
-DESCRIPTION=A privacy-centric, anonymous network.
-EAPI=5
-HOMEPAGE=https://geti2p.net
-IUSE=nls elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-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
-RDEPEND=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 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0
-SLOT=0
-SRC_URI=https://download.i2p2.de/releases/0.9.23/i2psource_0.9.23.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=175aadb370f40aa911b2afbd1622abf7
diff --git a/metadata/md5-cache/net-p2p/i2p-0.9.24 b/metadata/md5-cache/net-p2p/i2p-0.9.24
deleted file mode 100644
index 1cea808f3fb4..000000000000
--- a/metadata/md5-cache/net-p2p/i2p-0.9.24
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=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 dev-java/eclipse-ecj:* dev-libs/gmp:* nls? ( sys-devel/gettext ) >=virtual/jdk-1.7 >=dev-java/java-config-2.2.0 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2 virtual/pkgconfig
-DESCRIPTION=A privacy-centric, anonymous network.
-EAPI=5
-HOMEPAGE=https://geti2p.net
-IUSE=nls elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-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
-RDEPEND=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 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0
-SLOT=0
-SRC_URI=https://download.i2p2.de/releases/0.9.24/i2psource_0.9.24.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e987f1bac4f8de643e22b41b32c0578a
diff --git a/metadata/md5-cache/net-p2p/i2p-0.9.24-r1 b/metadata/md5-cache/net-p2p/i2p-0.9.24-r2
similarity index 97%
rename from metadata/md5-cache/net-p2p/i2p-0.9.24-r1
rename to metadata/md5-cache/net-p2p/i2p-0.9.24-r2
index af272eaf6d71..ac1971077170 100644
--- a/metadata/md5-cache/net-p2p/i2p-0.9.24-r1
+++ b/metadata/md5-cache/net-p2p/i2p-0.9.24-r2
@@ -10,4 +10,4 @@ RDEPEND=dev-java/bcprov:1.50 dev-java/jrobin:0 dev-java/slf4j-api:0 dev-java/tom
 SLOT=0
 SRC_URI=https://download.i2p2.de/releases/0.9.24/i2psource_0.9.24.tar.bz2
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=78a69178c6c46bfe73b76ea6115d9fd1
+_md5_=ff45a2caaf2eb681b21dd1fb79a69c59
diff --git a/metadata/md5-cache/net-p2p/i2p-0.9.25 b/metadata/md5-cache/net-p2p/i2p-0.9.25-r1
similarity index 97%
rename from metadata/md5-cache/net-p2p/i2p-0.9.25
rename to metadata/md5-cache/net-p2p/i2p-0.9.25-r1
index e47cf01dc609..4ffec2bd9a3f 100644
--- a/metadata/md5-cache/net-p2p/i2p-0.9.25
+++ b/metadata/md5-cache/net-p2p/i2p-0.9.25-r1
@@ -10,4 +10,4 @@ RDEPEND=dev-java/bcprov:1.50 dev-java/jrobin:0 dev-java/slf4j-api:0 dev-java/tom
 SLOT=0
 SRC_URI=https://download.i2p2.de/releases/0.9.25/i2psource_0.9.25.tar.bz2
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a10614ecf801ea8c0a9c5128aa4a1f64
+_md5_=9d503cb16bf80b8f8a1a4e1f87ce3786
diff --git a/metadata/md5-cache/sys-auth/pam-pgsql-0.7.3.2 b/metadata/md5-cache/sys-auth/pam-pgsql-0.7.3.2
new file mode 100644
index 000000000000..b0ddcc559654
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/pam-pgsql-0.7.3.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst
+DEPEND=virtual/pam >=dev-db/postgresql-8.0:= >=dev-libs/libgcrypt-1.2.0:0=
+DESCRIPTION=pam module to authenticate users via PostgreSQL
+EAPI=5
+HOMEPAGE=http://sourceforge.net/projects/pam-pgsql/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/pam >=dev-db/postgresql-8.0:= >=dev-libs/libgcrypt-1.2.0:0=
+SLOT=0
+SRC_URI=mirror://sourceforge/pam-pgsql/pam-pgsql-0.7.3.2.tar.gz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=5af6d9aea7fbb88ddd005d24acdd940a
diff --git a/metadata/md5-cache/sys-infiniband/librdmacm-1.0.16 b/metadata/md5-cache/sys-infiniband/librdmacm-1.0.16
new file mode 100644
index 000000000000..c2741583aedb
--- /dev/null
+++ b/metadata/md5-cache/sys-infiniband/librdmacm-1.0.16
@@ -0,0 +1,12 @@
+DEFINED_PHASES=unpack
+DEPEND=sys-infiniband/libibverbs:3.5 >=app-arch/rpm2targz-9.0.0.3g
+DESCRIPTION=OpenIB userspace RDMA CM library
+EAPI=4
+HOMEPAGE=http://www.openfabrics.org/
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=|| ( GPL-2 BSD-2 )
+RDEPEND=sys-infiniband/libibverbs:3.5 !sys-infiniband/openib-userspace !sys-infiniband/librdmacm:0 !sys-infiniband/librdmacm:1.5.4.1 !sys-infiniband/librdmacm:3.12
+SLOT=3.5
+SRC_URI=https://www.openfabrics.org/downloads/OFED/ofed-3.5/OFED-3.5-rc2.tgz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	openib	88d3cf78b98b3ff627670687fcb1c7e4	rpm	3e120fdd74b358f9fb42b825a6558f61	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=2e2d629b02c0cf121f35a3c52be2e9b7
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index a10ad6e1cb71..e550fe3296f9 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 29 Mar 2016 07:09:02 +0000
+Tue, 29 Mar 2016 09:39:04 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index bc090e24ff90..e5ebc008d733 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Mar 29 07:08:11 UTC 2016
+Tue Mar 29 09:38:14 UTC 2016
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 43b048455c46..214e513708f6 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 29 Mar 2016 07:30:01 +0000
+Tue, 29 Mar 2016 10:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 3ef5e910bfbf..a9088750e686 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1459235403 Tue 29 Mar 2016 07:10:03 AM UTC
+1459244401 Tue 29 Mar 2016 09:40:01 AM UTC
diff --git a/net-im/mcabber/Manifest b/net-im/mcabber/Manifest
index c94c1a9b4522..e326bca9160a 100644
--- a/net-im/mcabber/Manifest
+++ b/net-im/mcabber/Manifest
@@ -2,3 +2,4 @@ DIST mcabber-0.10.2_p20131025.tar.gz 399025 SHA256 90f4e583a7ea929abcd243dc970d6
 DIST mcabber-0.10.3.tar.bz2 612153 SHA256 77466138496cc26db125145cc28dc4fc0df79827143b922dfb9f02eb0dc7fa6d SHA512 3f4c83dbe99f1e1981a89d2a9cdfbaf96b265aaabe133e41d562491557e0acc2d780ae88aa3e45eca9088318ef7d7b284f1df445d2b5afb139d5a247e111bc10 WHIRLPOOL 7139d7b44837026276b269f5d911486bc898ef4c72d0cec2ada066636f284c00205b207241024d4311a82f7eb6a83590dbf402167dec4441e477f6166a7595b5
 DIST mcabber-1.0.0.tar.bz2 602173 SHA256 5476bcba395e0b9527823f5a9bce725151756f685ce2dcf6fad3dbe50a157032 SHA512 bad8af15ed984ac0a568ea497464a3fa9b3ba3dea51cdd4042361be10783bba3578859ced532cd2c1cf19588fc42bdd561486b9fce6ed2da86a509e29c26c497 WHIRLPOOL f9eba52f2686f0571947e006ce825378be7f00db8192988e5a071a86160c48b113609fe4f539d61191378348333763c24e013f5bc69863f4b41a54264313e3f8
 DIST mcabber-1.0.1.tar.bz2 604661 SHA256 579a45a2bc944455012ca9b308f7f3454efabbe0c36c6723af761aa1f3092d93 SHA512 23b268fb0c4e5ce0f28333d2b35fa8b6ead819359c0e2a633158bdcb637040c23deb2ca54d7d1a98a8a8fa37323bfe078371e790b5809af76fe9b940529f728c WHIRLPOOL 9e5a2478a5bc7c8d35526bb81178842e04a5367b23cd7ec8dfa303069a6ad75ae74411977b9f354d3758c80a6ed578a4caf4c21cdb5322feece818d50e053a6b
+DIST mcabber-1.0.2.tar.bz2 604995 SHA256 e7143891ea6c6ec2f3008c25c13506121d83d15aa83640827aea3b66a8761fde SHA512 e7d8f54f0f5cbcd685d6ada49c29fbc3af3315d5727a7a6babcc0aae49880f0cc1df48a1ceec78caeb17822c26f8c00aae23df2565336d92c4e388c8cebb4263 WHIRLPOOL 8903b6e77f645202357f00868733633abed220f05260d29e30bc0396abf64f94fe0c69c84cae7f9c6c6ebfbe3d64f4d4be970dfe51593c84ca582fccfb4d7c2a
diff --git a/net-im/mcabber/mcabber-1.0.2.ebuild b/net-im/mcabber/mcabber-1.0.2.ebuild
new file mode 100644
index 000000000000..3fc2a585428e
--- /dev/null
+++ b/net-im/mcabber/mcabber-1.0.2.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit flag-o-matic autotools-utils
+
+DESCRIPTION="A small Jabber console client with various features, like MUC, SSL, PGP"
+HOMEPAGE="http://mcabber.com/"
+#REV="a18e1b488f1c"
+#SRC_URI="http://mcabber.com/hg/index.cgi/archive/${REV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="http://mcabber.com/files/${P}.tar.bz2"
+
+#S=${WORKDIR}/${PN}-${REV}/${PN}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+IUSE="aspell crypt idn modules otr spell ssl vim-syntax"
+
+LANGS="cs de fr it nl pl ru uk"
+# localized help versions are installed only, when LINGUAS var is set
+for i in ${LANGS}; do
+	IUSE="${IUSE} linguas_${i}"
+done;
+
+RDEPEND="crypt? ( >=app-crypt/gpgme-1.0.0 )
+	otr? ( >=net-libs/libotr-3.1.0 )
+	aspell? ( app-text/aspell )
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+	idn? ( net-dns/libidn  )
+	spell? ( app-text/enchant )
+	dev-libs/glib:2
+	sys-libs/ncurses:0=
+	>=net-libs/loudmouth-1.4.3-r1[ssl?]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+## autotools-utils.eclass settings
+AUTOTOOLS_AUTORECONF="1"
+AUTOTOOLS_IN_SOURCE_BUILD="1"
+DOCS=( AUTHORS ChangeLog NEWS README TODO mcabberrc.example doc/README_PGP.txt )
+PATCHES=(
+	"${FILESDIR}/${PN}-0.10.3-vim-ftdetect.patch"
+)
+
+pkg_setup() {
+	if use aspell && use spell; then
+		ewarn "NOTE: You have both USE flags 'aspell' and 'spell' enabled, enchant (USE flag 'spell') will be preferred."
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable crypt gpgme) \
+		$(use_enable otr) \
+		$(use_enable aspell) \
+		$(use_enable spell enchant) \
+		$(use_enable modules) \
+		$(use_with idn libidn)
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	# clean unneeded language documentation
+	for i in ${LANGS}; do
+		use linguas_${i} || rm -rf "${ED}"/usr/share/${PN}/help/${i}
+	done
+
+	# contrib themes
+	insinto /usr/share/${PN}/themes
+	doins "${S}"/contrib/themes/*
+
+	# contrib generic scripts
+	exeinto /usr/share/${PN}/scripts
+	doexe "${S}"/contrib/*.{pl,py}
+
+	# contrib event scripts
+	exeinto /usr/share/${PN}/scripts/events
+	doexe "${S}"/contrib/events/*
+
+	if use vim-syntax; then
+		cd contrib/vim/ || die
+
+		insinto /usr/share/vim/vimfiles/syntax
+		doins mcabber_log-syntax.vim
+
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins mcabber_log-ftdetect.vim
+	fi
+}
+
+pkg_postinst() {
+	elog
+	elog "MCabber requires you to create a subdirectory .mcabber in your home"
+	elog "directory and to place a configuration file there."
+	elog "An example mcabberrc was installed as part of the documentation."
+	elog "To create a new mcabberrc based on the example mcabberrc, execute the"
+	elog "following commands:"
+	elog
+	elog "  mkdir -p ~/.mcabber"
+	elog "  bzcat ${EROOT}usr/share/doc/${PF}/mcabberrc.example.bz2 >~/.mcabber/mcabberrc"
+	elog
+	elog "Then edit ~/.mcabber/mcabberrc with your favorite editor."
+	elog
+	elog "See the CONFIGURATION FILE and FILES sections of the mcabber"
+	elog "manual page (section 1) for more information."
+	elog
+	elog "From version 0.9.0 on, MCabber supports PGP encryption of messages."
+	elog "See README_PGP.txt for details."
+	echo
+	einfo "Check out ${EROOT}usr/share/${PN} for contributed themes and event scripts."
+	echo
+}
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 0b47e63a5d95..0dbe90ed6066 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,13 +1,8 @@
 DIST node-v0.12.10.tar.gz 19572955 SHA256 edbd3710512ec7518a3de4cabf9bfee6d12f278eef2e4b53422c7b063f6b976d SHA512 d217f52dfedb5355df89b9c726f6bc68e53a713e6e005a66beefdbd20666b55770bab2eca6f39275aa1a64aca922a2a78808900ebaa4005eb21042a915413a7b WHIRLPOOL 4fe3e370cc645672590483e4b388a37a82fb04dfbbcf16a7a9cc2c1a47600e650ae5712133b205c3067180305a61e76fde9a7b78ad53d25f8f07b97e86271751
 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-v4.4.0.tar.xz 13107524 SHA256 6ae44ae9a9cd1f102ca7f3ea09ca6223afe88fab4911f1bf21c9da2a1e795f1d SHA512 4bb1f660c5a80fffb3399c4465c311bd13c2f78e65fc9aaa7df96d3c2db5d3b3de3b4be9f50040065fa1889ad247a2949a84a6d9044301a636ebb8baf73edd4d WHIRLPOOL 50b126fc3a7b8b6be693334375b4704217b4e6f00e7e32404a17ebad512e3cc72434f00863a1e69bb85e01859054faac7bb5c2d25889b8ef131191a388528e0c
-DIST node-v5.0.0.tar.xz 12863764 SHA256 cf4f261618e19517c8cbf2fdde00d0b5160e271760abee00f387b11a0b3ca834 SHA512 5b07af6b77a25924e3028257a511f035df943b854c694168e24c20f6aa735cde72546fc231d63a491367e16232ee9b6622d1f748624bf3e99e0d0468528e96c3 WHIRLPOOL 8958da059e0bc8e196d9b5f1b079f6d1927a3707b466fdc6e87ece676f981a7f22c4fa485bdb6de9879305cf2deb578d49840dee6d69d1cddba698e070b19923
-DIST node-v5.3.0.tar.xz 12776504 SHA256 e5115ee78c31ac3af0f2b3553aa84fff2f49ae59bd6e01e11d78ce86c544569e SHA512 f65773c35ce774bc6fe242f8627e5786f441f0286f7d272e854e2e2d6b927d5f368c366ff52dd780f7817fedf3935ec25e78ed3f81d4613495663eb81e2afbb1 WHIRLPOOL 5f270ed6fe35dba091bd75e6ad9de419c781fc6f919915a4117b8c0bbb2ea11a05369a9149e4f69614de508ff109eb94b24bdafc0832e91e055f01b0ef214c67
-DIST node-v5.4.1.tar.xz 12812444 SHA256 4e7d3fdfeac85c46ddaef0224695620f218e7a178e97d6e210d6d643483f1d53 SHA512 9803478d502bf11bfc77e56109568b0f64186826be35a9b36b47b63ec744595db128955e6f7bec7eb4db39e85afdd364b1215427954ce33ab67689ff03a5bc57 WHIRLPOOL 87f791f4f0722a2d3bcb630d22548f395ac0e86dedc37849caab2d63bc43bad2621058f95eb2b31b1f3b01ec8585c0731c969a1f0167d95495008b44f3b69066
-DIST node-v5.6.0.tar.xz 13311288 SHA256 588341e466ac72f6b8e9fa500f04edf149f7d4e8141c4175c495d6d1484405e3 SHA512 ef38d9ce708b8283b7f7441a0c2787e64c0602fb50542b4ccd29e705f879626adf2c1d89a9040af55b1f00b6e45d1d87ca829bf6816768933af9b5661f654aa7 WHIRLPOOL 6b5dcd85a74b47554400a6ff62e4001bb04b9063987571ac4434116d807d04ee58a0ca622973ff4b81c064e4ec1b0cd2f881680eb7f1ced5aeda745bf48538ab
-DIST node-v5.7.1.tar.xz 13191096 SHA256 029ed8aeb997c68d1a901cd837af02d24b6b5e20a4ff93bed090fd289f91a9a1 SHA512 11b38722f1bb4c8310d66304541b6a644c453b770d562c0f172391b1234a304493ed39ddbd6790f0f98d3fa72a0be2ac0ae292d67604178a108217276530a463 WHIRLPOOL 6a7ea4bbfb0418912b4505a09a926b3a518368142e77bbddf78e325d719180254c6157ef46851eee61469749e1eb9dbd671960544b9cb0f8264f8c13d3542a1c
+DIST node-v4.4.1.tar.xz 13112424 SHA256 3a37c89a3ac965688f9e6557579993b73eee44195a5fd53fded03a667d3d6a0a SHA512 53b479085a6f43b5932c75729b21a3efa67534ce6c10445c2ba66492a0e3f12d8e5de8d75bd583239b68f3d5ac1b639d45fd43d631d8a5ef013e25bff0fdab22 WHIRLPOOL d9cee2193a0f94f17ab84722ffb9999f156014cbe0b83bd138d5404ec543a3398bb4d1b965940b19230cf069337dfb5e0159aae3e694137e09261133ae2e2fdd
 DIST node-v5.8.0.tar.xz 13214028 SHA256 c1246d473d6650ca02ab168eaf840e9edda82a4190ff08165fc44a7b381a9361 SHA512 ab23b90714be2efc937da2fe11457f266e4bb392da9856e548012d1812546ecebf4b49546d82c595b15d4c78835df612681a2bbd62dd925e1db204a19b6a09ce WHIRLPOOL 5f6dfdaf1e87ae79f92c9b075dec03287b896b05a4bc1c477404f571f25672ca8512a5cb88e602923135e2fd0ee27aea12bcb1349a6a5f2ac52b8855512f44b2
 DIST node-v5.9.0.tar.xz 13223372 SHA256 9bdf2f8e44a721df459dfad0072a8ac46f11c05d25fc33dc0dc9c522827e34bb SHA512 d0ec18fbb497d91d1520362af4a882357e1d6b33c3ae0e6cbb9697e1d1f4504361f8d6aeeada6a959b2bb190a81b5f118a66c768421344dcb6aebda512a24fa7 WHIRLPOOL 0f895fcc9e2fb82d203e80cf3166f9f524fb4e82ae2d5b1706a5dfe0db08588b474a32294c7865198cde116f228e60a6dfd3f1a965549792c884db7b44fca690
+DIST node-v5.9.1.tar.xz 13226192 SHA256 668067077dfceb3d2039d0df693fec6aa20b920d01a42b53dc61d4aa91e0ae55 SHA512 34774d88eda775bdf153a76bd02b26c499e4a9ef47d8e94ad7b66d360d04891b45ce8f211833ca69e8c0a786ca36424b0c620a90b1fbc6d5afc77d20f4b5fadb WHIRLPOOL d666aa6fd4d577f7a6f89c3bfa75e62a0281e0dd7592373f384bfe01fa2dcbf81156bf6a21fc2097d48d5024a39057713c2593f4609c70ff8f84090471b073a9
diff --git a/net-libs/nodejs/nodejs-4.2.2.ebuild b/net-libs/nodejs/nodejs-4.2.2.ebuild
deleted file mode 100644
index 73c1cdb094b2..000000000000
--- a/net-libs/nodejs/nodejs-4.2.2.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-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}"
-
-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-4.1.1.ebuild b/net-libs/nodejs/nodejs-4.4.1.ebuild
similarity index 76%
rename from net-libs/nodejs/nodejs-4.1.1.ebuild
rename to net-libs/nodejs/nodejs-4.4.1.ebuild
index ed3202bc3047..5512f9190e7b 100644
--- a/net-libs/nodejs/nodejs-4.1.1.ebuild
+++ b/net-libs/nodejs/nodejs-4.4.1.ebuild
@@ -5,32 +5,38 @@
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
 
 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"
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+SRC_URI="https://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"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+IUSE="cpu_flags_x86_sse2 debug icu +npm snapshot +ssl test"
 
 RDEPEND="icu? ( >=dev-libs/icu-55:= )
+	npm? ( ${PYTHON_DEPS} )
+	>=net-libs/http-parser-2.5.2:=
+	>=dev-libs/libuv-1.8.0:=
+	>=dev-libs/openssl-1.0.2g:0=[-bindist]
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	>=net-libs/http-parser-2.5:=
-	>=dev-libs/libuv-1.6.1:=
-	>=dev-libs/openssl-1.0.2d:=[-bindist]"
-DEPEND="${RDEPEND}"
+	test? ( net-misc/curl )"
 
 S="${WORKDIR}/node-v${PV}"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 pkg_pretend() {
-	if ! test-flag-CXX -std=c++11 ; then
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
 		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
-	fi
 }
 
 src_prepare() {
@@ -61,19 +67,6 @@ src_prepare() {
 	# 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
@@ -139,8 +132,7 @@ src_install() {
 
 src_test() {
 	out/${BUILDTYPE}/cctest || die
-	declare -xl TESTTYPE="${BUILDTYPE}"
-	"${PYTHON}" tools/test.py --mode=${TESTTYPE} -J message parallel sequential || die
+	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
 }
 
 pkg_postinst() {
diff --git a/net-libs/nodejs/nodejs-5.0.0.ebuild b/net-libs/nodejs/nodejs-5.0.0.ebuild
deleted file mode 100644
index 73c1cdb094b2..000000000000
--- a/net-libs/nodejs/nodejs-5.0.0.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-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}"
-
-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.3.0.ebuild b/net-libs/nodejs/nodejs-5.3.0.ebuild
deleted file mode 100644
index 73c1cdb094b2..000000000000
--- a/net-libs/nodejs/nodejs-5.3.0.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-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}"
-
-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.4.1.ebuild b/net-libs/nodejs/nodejs-5.4.1.ebuild
deleted file mode 100644
index 73c1cdb094b2..000000000000
--- a/net-libs/nodejs/nodejs-5.4.1.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-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}"
-
-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.7.1.ebuild b/net-libs/nodejs/nodejs-5.7.1.ebuild
deleted file mode 100644
index 3a04fa75cc12..000000000000
--- a/net-libs/nodejs/nodejs-5.7.1.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-SRC_URI="https://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="cpu_flags_x86_sse2 debug doc icu +npm +snapshot +ssl test"
-
-RDEPEND="icu? ( >=dev-libs/icu-56:= )
-	npm? ( ${PYTHON_DEPS} )
-	>=net-libs/http-parser-2.6.2:=
-	>=dev-libs/libuv-1.8.0:=
-	>=dev-libs/openssl-1.0.2f:0=[-bindist]
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	!!net-libs/iojs
-	test? ( net-misc/curl )"
-
-S="${WORKDIR}/node-v${PV}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-PATCHES=(
-	"${FILESDIR}"/gentoo-global-npm-config.patch
-)
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
-		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
-}
-
-src_prepare() {
-	tc-export CC CXX PKG_CONFIG
-	export V=1
-	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 writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || 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
-
-	# 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
-
-	default
-}
-
-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
-
-	use doc && emake doc
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	emake install DESTDIR="${ED}"
-	pax-mark -m "${ED}"usr/bin/node
-
-	# set up a symlink structure that node-gyp 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
-
-	if use doc; then
-		# Patch docs to make them offline readable
-		for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do
-			sed -i '/fonts.googleapis.com/ d' $i;
-		done
-		# Install docs!
-		dohtml -r "${S}"/out/doc/api/*
-	fi
-
-	if use npm; then
-		dodir /etc/npm
-
-		# Install bash completion for `npm`
-		# We need to temporarily replace default config path since
-		# npm otherwise tries to write outside of the sandbox
-		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
-		sed -i -e "s|'/etc'|'${D}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(emktemp)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${D}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
-
-pkg_postinst() {
-	einfo "The global npm config lives in /etc/npm. This deviates slightly"
-	einfo "from upstream which otherwise would have it live in /usr/etc/."
-	einfo ""
-	einfo "Protip: When using node-gyp to install native modules, you can"
-	einfo "avoid having to download extras by doing the following:"
-	einfo "$ node-gyp --nodedir /usr/include/node <command>"
-}
diff --git a/net-libs/nodejs/nodejs-5.6.0-r1.ebuild b/net-libs/nodejs/nodejs-5.9.1.ebuild
similarity index 98%
rename from net-libs/nodejs/nodejs-5.6.0-r1.ebuild
rename to net-libs/nodejs/nodejs-5.9.1.ebuild
index 913f2cf04d98..deb2fc3b73f8 100644
--- a/net-libs/nodejs/nodejs-5.6.0-r1.ebuild
+++ b/net-libs/nodejs/nodejs-5.9.1.ebuild
@@ -20,13 +20,12 @@ IUSE="cpu_flags_x86_sse2 debug doc icu +npm +snapshot +ssl test"
 
 RDEPEND="icu? ( >=dev-libs/icu-56:= )
 	npm? ( ${PYTHON_DEPS} )
-	>=net-libs/http-parser-2.6.1:=
+	>=net-libs/http-parser-2.6.2:=
 	>=dev-libs/libuv-1.8.0:=
-	>=dev-libs/openssl-1.0.2f:0=[-bindist]
+	>=dev-libs/openssl-1.0.2g:0=[-bindist]
 	sys-libs/zlib"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	!!net-libs/iojs
 	test? ( net-misc/curl )"
 
 S="${WORKDIR}/node-v${PV}"
diff --git a/net-p2p/i2p/Manifest b/net-p2p/i2p/Manifest
index c2dfc5b30a92..1504c9cc1987 100644
--- a/net-p2p/i2p/Manifest
+++ b/net-p2p/i2p/Manifest
@@ -1,4 +1,2 @@
-DIST i2psource_0.9.22.tar.bz2 24338146 SHA256 91ac91f7a3e202d248f5294f4951f6b7d8b9bde32991adf7a813ae1bb9188898 SHA512 0fdcd0369f79cc143c449774cb205d2fb4fa5ad32e0b5bd3ed0dee5b24402cc21b1c5650d535518e68aaa98cee5380bf0af041df8b3e1724698aebf61cfb5583 WHIRLPOOL bd36ce760f7a7b942651de576662b3fadbf19bbdb84a020a16783689f3ae4919bf9441762f2d951ed1c02781e62131370b5cc36cd257c187185862901454e971
-DIST i2psource_0.9.23.tar.bz2 24427211 SHA256 24e303f2af1b7b14ed3a6e17cc7d1b6432ec99d8d00246a88486922941c72345 SHA512 1697ee03c5b09c7653f4e30e976062908e0c0ece7ee9651979384fce0d5c887d7cfbd841522d31203f23d7f5dc97d8f8ef238784199b22fe5452299587038f82 WHIRLPOOL a2141b8d9d5f8b552e354678294364bedde9cef5aa39aa95a06dbe19f5f7996b6d5eb0e1b43ad8ce5c2f9e20dc4dda792b994004a95ea1dc83c5541f46de5b89
 DIST i2psource_0.9.24.tar.bz2 24468215 SHA256 134481ae5ef934a411545330d1b22e768189c424a65db47058db0f7d9cf51e7d SHA512 9029ea06640a937385499fd308232f2c3b04308cc834e2e2491a567c47be4aa128d509b2058735cb8cf088a0b9273b418efbca05d70944ef9e95c3d15d96a47a WHIRLPOOL d7211cf46bf4bbaa54340de0dadcb255f2321d75b3d968401612c1bc0926f91f1d248e634c97c8d6948f78cd4a68c9a79ca4a65102e205a56c704a2409416cf3
 DIST i2psource_0.9.25.tar.bz2 24652935 SHA256 daaac2b5a5a6b5bbd4b805f76e14f6a7c201dfd7c1cf43c98e182d2e657d1236 SHA512 a50f00d9ad32993da30529339e3ffd425d5e97d5120d9e4e446f6fa7ac0cbb6ee4f35c013b0815802ff6c72e188b00d408c7fa398c8ee1ae71be57383a1411f6 WHIRLPOOL a851f6505155201d872774407dc71c9dd03a4683b3ce35d2fff74fd3f7f17d12cc1cc72dfcc2c7c4f0d82b86333bd0424066ae41330e603ba07872d56c257e27
diff --git a/net-p2p/i2p/i2p-0.9.22-r1.ebuild b/net-p2p/i2p/i2p-0.9.22-r1.ebuild
deleted file mode 100644
index c1b1f028a529..000000000000
--- a/net-p2p/i2p/i2p-0.9.22-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 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
deleted file mode 100644
index 879f6320e1ce..000000000000
--- a/net-p2p/i2p/i2p-0.9.22.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"
-
-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/i2p-0.9.23.ebuild b/net-p2p/i2p/i2p-0.9.23.ebuild
deleted file mode 100644
index bfe7595503bd..000000000000
--- a/net-p2p/i2p/i2p-0.9.23.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 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() {
-	java-pkg-2_pkg_setup
-
-	enewgroup i2p
-	enewuser i2p -1 -1 /var/lib/i2p i2p -m
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}" || die
-	java-ant_rewrite-classpath
-}
-
-src_prepare() {
-	java-pkg-2_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
-
-	#epatch "${FILESDIR}/${P}_fix-encoding.patch"
-}
-
-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}/${P}_initd" i2p
-	systemd_newunit "${FILESDIR}"/i2p.service i2p.service
-
-	# setup user
-	dodir /var/lib/i2p/.i2p
-	fowners -R i2p:i2p /var/lib/i2p/.i2p
-}
-
-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"
-
-	ewarn 'Currently, the i2p team do not enforce to use ECDSA keys. But it is more and'
-	ewarn 'more pushed. To help the network, you are recommended to have either:'
-	ewarn '  dev-java/icedtea[-sunec,nss]'
-	ewarn '  dev-java/oracle-jre-bin'
-	ewarn '  dev-java/oracle-jdk-bin'
-}
diff --git a/net-p2p/i2p/i2p-0.9.24-r1.ebuild b/net-p2p/i2p/i2p-0.9.24-r2.ebuild
similarity index 99%
rename from net-p2p/i2p/i2p-0.9.24-r1.ebuild
rename to net-p2p/i2p/i2p-0.9.24-r2.ebuild
index c265d9100679..f0f48b09a001 100644
--- a/net-p2p/i2p/i2p-0.9.24-r1.ebuild
+++ b/net-p2p/i2p/i2p-0.9.24-r2.ebuild
@@ -45,6 +45,7 @@ RDEPEND="${CDEPEND}
 
 EANT_BUILD_TARGET="pkg"
 EANT_GENTOO_CLASSPATH="java-service-wrapper,jrobin,slf4j-api,tomcat-jstl-impl,tomcat-jstl-spec,bcprov-1.50"
+JAVA_ANT_ENCODING="UTF-8"
 
 I2P_ROOT='/usr/share/i2p'
 I2P_CONFIG_HOME='/var/lib/i2p'
diff --git a/net-p2p/i2p/i2p-0.9.24.ebuild b/net-p2p/i2p/i2p-0.9.24.ebuild
deleted file mode 100644
index dd695e9894ca..000000000000
--- a/net-p2p/i2p/i2p-0.9.24.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils java-pkg-2 java-ant-2 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.7"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.7"
-
-EANT_BUILD_TARGET="pkg"
-EANT_GENTOO_CLASSPATH="java-service-wrapper,jrobin,slf4j-api,tomcat-jstl-impl,tomcat-jstl-spec,bcprov-1.50"
-
-I2P_ROOT='/usr/share/i2p'
-I2P_CONFIG_HOME='/var/lib/i2p'
-I2P_CONFIG_DIR="${I2P_HOME}/.i2p"
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-
-	enewgroup i2p
-	enewuser i2p -1 -1 "${I2P_CONFIG_HOME}" i2p -m
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}" || die
-	java-ant_rewrite-classpath
-}
-
-src_prepare() {
-	java-pkg-2_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
-
-	# add libs
-	epatch "${FILESDIR}/${P}_add-libs.patch"
-
-	# avoid auto starting browser
-	sed -i 's|clientApp.4.startOnLoad=true|clientApp.4.startOnLoad=false|' \
-		clients.config || die
-
-	# replace paths as the installer would
-	sed -i "s|%INSTALL_PATH|${I2P_ROOT}|" \
-		eepget i2prouter runplain.sh  || die
-	sed -i "s|\$INSTALL_PATH|${I2P_ROOT}|" wrapper.config || die
-	sed -i "s|%SYSTEM_java_io_tmpdir|${I2P_CONFIG_DIR}|" \
-		i2prouter runplain.sh || die
-	sed -i "s|%USER_HOME|${I2P_CONFIG_HOME}|" i2prouter || die
-
-	# 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_ROOT}/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_ROOT}/i2psvc"
-	dosym "${I2P_ROOT}/i2prouter" /usr/bin/i2prouter
-	dosym "${I2P_ROOT}/eepget" /usr/bin/eepget
-
-	# Install main files and basic documentation
-	exeinto "${I2P_ROOT}"
-	insinto "${I2P_ROOT}"
-	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}/${P}_initd" i2p
-	systemd_newunit "${FILESDIR}"/i2p.service i2p.service
-
-	# setup user
-	dodir "${I2P_CONFIG_DIR}"
-	fowners -R i2p:i2p "${I2P_CONFIG_DIR}"
-}
-
-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"
-
-	ewarn 'Currently, the i2p team do not enforce to use ECDSA keys. But it is more and'
-	ewarn 'more pushed. To help the network, you are recommended to have either:'
-	ewarn '  dev-java/icedtea[-sunec,nss]'
-	ewarn '  dev-java/oracle-jre-bin'
-	ewarn '  dev-java/oracle-jdk-bin'
-}
diff --git a/net-p2p/i2p/i2p-0.9.25.ebuild b/net-p2p/i2p/i2p-0.9.25-r1.ebuild
similarity index 99%
rename from net-p2p/i2p/i2p-0.9.25.ebuild
rename to net-p2p/i2p/i2p-0.9.25-r1.ebuild
index 8e00d27ce0ac..e25d09f184ad 100644
--- a/net-p2p/i2p/i2p-0.9.25.ebuild
+++ b/net-p2p/i2p/i2p-0.9.25-r1.ebuild
@@ -48,6 +48,7 @@ RDEPEND="${CDEPEND}
 
 EANT_BUILD_TARGET="pkg"
 EANT_GENTOO_CLASSPATH="java-service-wrapper,jrobin,slf4j-api,tomcat-jstl-impl,tomcat-jstl-spec,bcprov-1.50"
+JAVA_ANT_ENCODING="UTF-8"
 
 I2P_ROOT='/usr/share/i2p'
 I2P_CONFIG_HOME='/var/lib/i2p'
diff --git a/sys-auth/pam-pgsql/Manifest b/sys-auth/pam-pgsql/Manifest
index fea7b50d33cf..5cdfa6242467 100644
--- a/sys-auth/pam-pgsql/Manifest
+++ b/sys-auth/pam-pgsql/Manifest
@@ -1,2 +1,3 @@
 DIST pam-pgsql-0.7.3.1.tar.gz 301678 SHA256 c9327e7636e81a2d2bbaf4f017edbd9319a08df1654c9d1875e6f933750548dd SHA512 dd8fe042ce8c6b46376430875953a8404ee1184d5603d7100de489a92569c71afe4e0f0324be8fcc309e3c84424a16303df61d64672ce615a59ba8508d8660b7 WHIRLPOOL 40033f0a506351c8facfd00b2e22c19eef0ca2922972b458e8c89456a442890ab967ec36855e395452122612fa2dd4dcf4825564d0e947bf4c97ab340ac127e1
+DIST pam-pgsql-0.7.3.2.tar.gz 712533 SHA256 c4f9c22ec3a37fb6d8b201cc7d48c743a68ceb91773e386caa2269b63b0679ca SHA512 d5766e56a13b0b4762fba10d624d12f130f2675f1f1772eaaf275b599f44adcf98287c2636462ba3faf46af139eb1bd157918c0c783040796562f37dec17a6d9 WHIRLPOOL 769d59de074b7dff56b44f046b5b4ab3d02a70c9a5b27227fba712847ab932dba6f73f68a119c82bd8d27b6e564be1411081cccd31c16e39a87410a39c44ad61
 DIST pam-pgsql-0.7.3.tar.gz 302305 SHA256 0d1f4c2ca220a746b8750fa9c4c019e4129e16312b2cb46c78ef282dc018571b SHA512 38fc64562ef00ebc3737451d4854891ad360a78716848e7b101e3805661c6319fa4b9ca19996b76cc6bc91afca66ff8aef84006dbc8e112aa4e601fc8ee2bcc4 WHIRLPOOL f3c5f7548a62c97a3e77f7f4deda886ac3ab8f761ad98b59777c6b1b4ac0a1a722c40955faeebb4e57833ddaf9a740af946e8a8317b80b27b3a018128f850a3e
diff --git a/sys-auth/pam-pgsql/pam-pgsql-0.7.3.2.ebuild b/sys-auth/pam-pgsql/pam-pgsql-0.7.3.2.ebuild
new file mode 100644
index 000000000000..fe75efd7bfad
--- /dev/null
+++ b/sys-auth/pam-pgsql/pam-pgsql-0.7.3.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils pam
+
+DESCRIPTION="pam module to authenticate users via PostgreSQL"
+HOMEPAGE="http://sourceforge.net/projects/pam-pgsql/"
+
+if [[ ${PV} == *_p* ]]; then
+	SRC_URI="http://www.flameeyes.eu/gentoo-distfiles/${P}.tar.gz"
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+fi
+
+RDEPEND="virtual/pam
+	>=dev-db/postgresql-8.0:=
+	>=dev-libs/libgcrypt-1.2.0:0="
+DEPEND="${RDEPEND}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/security \
+		--libdir=/$(get_libdir) \
+		--docdir=/usr/share/doc/${PF}
+}
+
+src_compile() {
+	emake pammoddir="$(getpam_mod_dir)" || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" pammoddir="$(getpam_mod_dir)" install
+	find "${ED}" -name '*.la' -delete
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "Please see the documentation and configuration examples in the"
+		elog "documentation directory at /usr/share/doc/${PF}."
+		elog ""
+		elog "Please note that the default configuration file in Gentoo has been"
+		elog "moved to /etc/security/pam-pgsql.conf to follow the other PAM modules."
+	fi
+}
diff --git a/sys-infiniband/librdmacm/Manifest b/sys-infiniband/librdmacm/Manifest
index a6c7bd74e5e8..ca457c585395 100644
--- a/sys-infiniband/librdmacm/Manifest
+++ b/sys-infiniband/librdmacm/Manifest
@@ -1 +1,2 @@
 DIST OFED-3.12-rc1.tgz 22055476 SHA256 14ca8a2b0d68e3ee9a37f475fa9eecd9a5ffd6055135f9d4d9db8319843a94dc SHA512 9f834d6982ab7e8ab47a8b5c958ab2e4c238ef983e47798e7f06655f69672ea1e996297939b381f26ed8c39552f6e62156173d5ddd2f0a7b6cad6aecdd973944 WHIRLPOOL 5a64b1d952890ea0e72e0ca93654a0fabc8f871475b05fcbe3b214ddfe4836f6b92d4fbc9e0f0d79acfe69d8c8d219b2c467c23654021e23eaf85ae6825ea4a9
+DIST OFED-3.5-rc2.tgz 18600237 SHA256 b267cea49bf72790843e6b08e26c10a6954d7736a8b93deed1e632772f4f5fff SHA512 deb83c3417ac60bd5d4c6ac1cadf93d6a34a55ca58365b54bb0c3a8230ba6a7f13e0257515dac0170cc4ab46b558519c86e6c01f7fa49550162feed0b0ea2e89 WHIRLPOOL e6843593fbe4937ffcf600be9cb3dee78e14cbeb4c411a4b64076b1194653cbcb9d4bc6cbd52ad77ac9c6b14d4dd2cdafa4364bfe6924b55896844042aa4d9cd
diff --git a/sys-infiniband/librdmacm/librdmacm-1.0.16.ebuild b/sys-infiniband/librdmacm/librdmacm-1.0.16.ebuild
new file mode 100644
index 000000000000..e57b14d78eca
--- /dev/null
+++ b/sys-infiniband/librdmacm/librdmacm-1.0.16.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+OFED_VER="3.5"
+OFED_RC="1"
+OFED_RC_VER="2"
+OFED_SUFFIX="1"
+
+inherit eutils openib
+
+DESCRIPTION="OpenIB userspace RDMA CM library"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE=""
+
+DEPEND="sys-infiniband/libibverbs:${SLOT}"
+RDEPEND="${DEPEND}
+			!sys-infiniband/openib-userspace"
+block_other_ofed_versions