diff --git a/app-antivirus/clamav-unofficial-sigs/Manifest b/app-antivirus/clamav-unofficial-sigs/Manifest
index 9860a612cd31..b714745ab384 100644
--- a/app-antivirus/clamav-unofficial-sigs/Manifest
+++ b/app-antivirus/clamav-unofficial-sigs/Manifest
@@ -1,3 +1,2 @@
 DIST clamav-unofficial-sigs-3.7.2.tar.gz 38549 SHA256 96e98e6e4434c5950fa9831c6a43236fed7eabae44beded16171305cf3f9bdb9 SHA512 ee07bf521cca229bc85acb887c8e520149955732797a9d220e24f09cb9e89f9bd189ad77dc781c03c60bdaaec2bfa91a6c96cf7a0b689759cddf3ff231b8b0a4 WHIRLPOOL af4925c8a9bb8c09472131f98026b809da13e122a530c4a48614014b8156a259d37303cb1042da98d0bd8b0f4abef3cd7c05f2d549f87e1b7cd533d4a8d4d188
-DIST clamav-unofficial-sigs-4.9.2.tar.gz 40301 SHA256 70e05f63add7e03d5af2dba6bcd31fda98646577798d99e6902e5f264c302e93 SHA512 46ec2e59c3838f4cff88562eacbd00ee1ad108f8f45500b9cde268c3d46bd3f6be68ff6136b7f3a4f6b628ff0b24f5dd10b2199e611b473acd7df82abf27b2c8 WHIRLPOOL 3029ee278629c3e8cf5471564e7ff054fc335e066d03653df82d07a87fa0dda76e41c5572c93fd0f28a434d002f3bdadd60043540378504c289333092aca412a
-DIST clamav-unofficial-sigs-5.3.2.tar.gz 113714 SHA256 3abe1c22133d879318cebc18d3224a820ea1747524425d4a2efd337749596589 SHA512 9db139bf64c51dd33c89b54d00cde5be939fa815d968f88e0e2d4ec4264e09e4f7bac0b5795d90800bc042498e1d271113e009fc4b6f925a8e81e915f0b1d5b4 WHIRLPOOL 63baf144d32eff715546643edb3182c26e7a51297dda7186fcf6aeef3dcfc8287ae6d71073718e96ac639e8974b83bfc5c2e74174b684642de22a580686fcf3d
+DIST clamav-unofficial-sigs-5.4.1.tar.gz 115798 SHA256 a6a455086db1ea102d9f714f8604bde1b3bb063c27e5cadd8ca456bf00673538 SHA512 333cbd6db88e634c60cab7477e091a80106d08f1e2a8ea6f0c7feba5c67a0eef09f10d34764c68eea4789cd373cb50b43a639c96f4a0ddabe44a5a0e12c7e50d WHIRLPOOL f851bd935a47270d5ca37449d6251669270c865b753819a6d8e3e5349ac0186eb349792409d4e173e775885da43cfbb7f1af73ed81367f7980fa69ba6c3bbb09
diff --git a/app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-4.9.2.ebuild b/app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-4.9.2.ebuild
deleted file mode 100644
index c10fab81db62..000000000000
--- a/app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-4.9.2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-DESCRIPTION="Download and install third-party clamav signatures"
-HOMEPAGE="https://github.com/extremeshok/${PN}"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# We need its user/group.
-DEPEND="app-antivirus/clamav"
-
-# The script relies on either net-misc/socat, or Perl's
-# IO::Socket::UNIX. We already depend on Perl, and Gentoo's Perl ships
-# with IO::Socket::UNIX, so we can leave out net-misc/socat here.
-RDEPEND="${DEPEND}
-	app-crypt/gnupg
-	dev-lang/perl
-	net-dns/bind-tools
-	net-misc/curl"
-
-src_prepare() {
-	# Fix the user/group in the config file to match the ones used by
-	# clamav.
-	local user_default="clam_user=\"clam\""
-	local user_gentoo="clam_user=\"clamav\""
-
-	local group_default="clam_group=\"clam\""
-	local group_gentoo="clam_group=\"clamav\""
-
-	# Log to someplace that (likely) already exists. Omit the
-	# "log_file_path" variable name so that we can reuse these patterns
-	# later to sed the logrotate file.
-	local log_default="/var/log/clamav-unofficial-sigs"
-	local log_gentoo="/var/log/clamav"
-
-	# clamd listens on a local socket by default. The clamd_socket
-	# setting needs to be uncommented in the configuration file for it
-	# to take effect.
-	local socket_default="#clamd_socket=\"/var/run/clamd.socket\""
-	local socket_gentoo="clamd_socket=\"/var/run/clamav/clamd.sock\""
-
-	# The clamav init script doesn't provide a "reload" command,
-	# so we reload very manually.
-	local reload_default="clamd_restart_opt=\"service clamd restart\""
-	local reload_gentoo="clamd_restart_opt=\"clamdscan --reload\""
-
-	sed -i -e "s~${user_default}~${user_gentoo}~" \
-		-e "s~${group_default}~${group_gentoo}~" \
-		-e "s~${log_default}~${log_gentoo}~" \
-		-e "s~${socket_default}~${socket_gentoo}~" \
-		-e "s~${reload_default}~${reload_gentoo}~" \
-		"${PN}.conf" \
-		|| die "failed to update paths in ${PN}.conf"
-
-	# Fix the log path and username in the logrotate file, too.
-	sed -i -e "s~${log_default}~${log_gentoo}~" \
-		-e "s~create 0644 clam clam~create 0640 clamav clamav~" \
-		"${PN}-logrotate" \
-		|| die "failed to update path and userin ${PN}-logrotate"
-
-	eapply_user
-}
-
-src_install() {
-	dosbin "${PN}.sh"
-
-	# The script's working directory (set in the conf file). By default,
-	# it runs as clamav/clamav.
-	diropts -m 0755 -o clamav -g clamav
-	dodir "/var/lib/${PN}"
-
-	insinto /etc/logrotate.d
-	doins "${PN}-logrotate"
-
-	insinto /etc
-	doins "${PN}.conf"
-
-	doman "${PN}.8"
-	dodoc README.md
-}
-
-pkg_postinst() {
-	elog ''
-	elog "You will need to select databases in /etc/${PN}.conf."
-	elog "For details, please see the ${PN}(8) manual page."
-	elog ''
-	elog 'An up-to-date description of the available Sanesecurity'
-	elog 'databases is available at,'
-	elog ''
-	elog '  http://sanesecurity.com/usage/signatures/'
-	elog ''
-}
diff --git a/app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-5.3.2.ebuild b/app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-5.4.1.ebuild
similarity index 100%
rename from app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-5.3.2.ebuild
rename to app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-5.4.1.ebuild
diff --git a/app-crypt/sbsigntool/Manifest b/app-crypt/sbsigntool/Manifest
index bbdd012f4e6c..f76e6f02b282 100644
--- a/app-crypt/sbsigntool/Manifest
+++ b/app-crypt/sbsigntool/Manifest
@@ -1 +1,3 @@
+DIST sbsigntool-0.8-ccan.tar.gz 113537 SHA256 8693929fff1138ed39d5387774da05355162f7275f5495638b55bfd258200e0b SHA512 6857096879f116f1802eb6b44789cbea7bb24440bc0f16503aeadf5f276fa45943f322f844dbb9abee717655205d82b830143be3a7f4424fd4146b9360674a09 WHIRLPOOL 4b577b5d959af7bc6a4bd29d877a293007286de56cd7a88ad144b23eb7d91dafe32ab095f4eede82fdbfd689f5df07d15232bdec186e0b38c580a496b76a27ae
+DIST sbsigntool-0.8.tar.gz 55537 SHA256 67a5df2818a424d0f76e8701562d9239fad88769421d8d2df733e5a98f119812 SHA512 ffc2661135dcdbdd218640f0a0657127c5519ade7ddaaa894898e382b4898829e5b877be51fce48bddd186667bf533f779cd5a323c79aad8b0e63b74f7a2c128 WHIRLPOOL 72693ff682cc2bcde9c166edc2532755da78c626504a1f830d1e1b04d855ee8c571e43110d6a30a763c4342de7f86603724636d1f38b2b91ea74e64555203872
 DIST sbsigntool_0.6.orig.tar.gz 212375 SHA256 84fb0c8f6fb1e79aa418a4f70a3139b38d5630043b28291c875f383e9b4294b8 SHA512 ed314d1cb7278cf5f27d4c3cd17f2195678419a7f9e47770429b6f95df35f7df035331e60c45970183ddd9b150a9b752f876c777929598b0525872b3255af95c WHIRLPOOL 3b86b9861f5e26586e8a9eb9bbf48adf1a12714b294f0acd605d53e37c27192006c6ecc81d31bf4f200f8e88508f38a52ef93e9e01e301c4245a11894227cecc
diff --git a/app-crypt/sbsigntool/metadata.xml b/app-crypt/sbsigntool/metadata.xml
index 9587e657a214..6234418898f3 100644
--- a/app-crypt/sbsigntool/metadata.xml
+++ b/app-crypt/sbsigntool/metadata.xml
@@ -5,6 +5,10 @@
 		<email>vapier@gentoo.org</email>
 		<description>do whatever</description>
 	</maintainer>
+	<maintainer type="person">
+		<email>tamiko@gentoo.org</email>
+		<description>yell at me if it breaks</description>
+	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">ubuntu</remote-id>
 	</upstream>
diff --git a/app-crypt/sbsigntool/sbsigntool-0.8.ebuild b/app-crypt/sbsigntool/sbsigntool-0.8.ebuild
new file mode 100644
index 000000000000..179f5b3b7081
--- /dev/null
+++ b/app-crypt/sbsigntool/sbsigntool-0.8.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils toolchain-funcs autotools-utils
+
+DESCRIPTION="Utilities for signing and verifying files for UEFI Secure Boot"
+HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/sbsigntools.git/"
+SRC_URI="https://kernel.googlesource.com/pub/scm/linux/kernel/git/jejb/sbsigntools.git/+archive/df8303a4e37e42cce36d8ef7d4ea4d75b1080e28.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~tamiko/distfiles/${P}-ccan.tar.gz"
+
+LICENSE="GPL-3 LGPL-3 LGPL-2.1 CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sys-apps/util-linux"
+DEPEND="${RDEPEND}
+	sys-apps/help2man
+	sys-boot/gnu-efi
+	sys-libs/binutils-libs
+	virtual/pkgconfig"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	local iarch
+	case ${ARCH} in
+		ia64)  iarch=ia64 ;;
+		x86)   iarch=ia32 ;;
+		amd64) iarch=x86_64 ;;
+		*)     die "unsupported architecture: ${ARCH}" ;;
+	esac
+	sed -i "/^EFI_ARCH=/s:=.*:=${iarch}:" configure.ac || die
+	sed -i 's/-m64$/& -march=x86-64/' tests/Makefile.am || die
+	sed -i "/^AR /s:=.*:= $(tc-getAR):" lib/ccan/Makefile.in || die #481480
+
+	AUTOTOOLS_IN_SOURCE_BUILD=1
+	AUTOTOOLS_AUTORECONF=true
+	autotools-utils_src_prepare
+}
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index 2b86755b8911..edd6bd97a15f 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -3,3 +3,4 @@ DIST neovim-0.1.1.tar.gz 7584560 SHA256 f39bcab23457c66ce0d67dcf8029743703f86041
 DIST neovim-0.1.2.tar.gz 7610804 SHA256 549881465eff82454660ae92d857d6ffa22383d45c94c46f3753fd1b0e699247 SHA512 dc03d92ff296f3ff55225d514479f1ac201a5a65eb8a6c02e71935ca44feb8ab15897b26a2ea46e53771f902c57b027d07e02f95673268ee060c6b77c4aa90e4 WHIRLPOOL ef1253249120c89c6efc15520263c889a9972df0c11e9353dedeee112c46ee9b92355fa3dabdf2d15cb7d0416681d1c8b55a9c02266048154f3afe104fdf4ff9
 DIST neovim-0.1.3.tar.gz 7636777 SHA256 7a86892d941b8829537ad46864b9a363d009ba56aeefdef2ee15ffa3eee5f92b SHA512 70c979fa06784cae4ded43c7fef7906c743729ed43a50003deec1d2ab7a800bfeab81c394893796a06d0f37811867062b2f766936c2a871f7d968b350729d4c8 WHIRLPOOL 1b3ccb589b3b2ee6d0e6bb1e2139c6ae508859637a0b075a6ccef5168386737713549abab37c7148d9d44d19be54a75587253144aaa1b4c5315408838cdaa4c5
 DIST neovim-0.1.4.tar.gz 7678847 SHA256 bb7e359eb83db20c5ec5984b470b249372b6dcd813ae2ccf72c01cce560f93e9 SHA512 e96e768703e4b842355a7543e5c9980b148b9b10cd032570fb420e3e1207102f9769fa6d36fba1d263ed9333d339eab387a196d4a8f724d89db2800097b89d37 WHIRLPOOL 6512b91931168c64fc34f626aeb409c8dc9612e00389a86c7fc07232fd8d26bd289d87dbbf8f01ac9297aa48c33682dc129ab936d0b24aee3c38627e863cc9e6
+DIST neovim-0.1.5.tar.gz 7813974 SHA256 f286ff7994ef1835272285425d65804063f112c91925fee3ef8865282a6d2b7e SHA512 3332b151d23b4f2b133b8f30f4af41686f7092cebbc7ab402b742be7b302bb6acbe9a01c2f475caad8d14a78dd3570109a5c447ab31f0b65ebf442631a31c6f9 WHIRLPOOL be7cd42978385c62af21cf06a48650e361454ff1c79aa783ed7a221e82d73bf3437a9876c9635f27639e3953fdfbe3ecb6958780341d0fbc80fb465ce50cdf29
diff --git a/app-editors/neovim/neovim-0.1.5.ebuild b/app-editors/neovim/neovim-0.1.5.ebuild
new file mode 100644
index 000000000000..f23db6ef499e
--- /dev/null
+++ b/app-editors/neovim/neovim-0.1.5.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils flag-o-matic
+
+DESCRIPTION="Vim-fork focused on extensibility and agility."
+HOMEPAGE="https://neovim.io"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://github.com/neovim/neovim.git"
+else
+	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="Apache-2.0 vim"
+SLOT="0"
+IUSE="+nvimpager perl python ruby +jemalloc"
+
+CDEPEND="dev-lang/luajit:2
+	>=dev-libs/libtermkey-0.17
+	>=dev-libs/libuv-1.2.0
+	>=dev-libs/msgpack-1.0.0
+	>=dev-libs/unibilium-1.1.1
+	dev-libs/libvterm
+	dev-lua/lpeg[luajit]
+	dev-lua/mpack[luajit]
+	jemalloc? ( dev-libs/jemalloc )
+"
+DEPEND="${CDEPEND}
+	virtual/libiconv
+	virtual/libintl"
+RDEPEND="${CDEPEND}
+	perl? ( dev-lang/perl )
+	python? ( dev-python/neovim-python-client )
+	ruby? ( dev-ruby/neovim-ruby-client )
+"
+
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+src_prepare() {
+	# use our system vim dir
+	sed -e '/^# define SYS_VIMRC_FILE/s|$VIM|'"${EPREFIX}"'/etc/vim|' \
+		-i src/nvim/globals.h || die
+
+	# add eclass to bash filetypes
+	sed -e 's|*.ebuild|*.ebuild,*.eclass|' -i runtime/filetype.vim || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	export USE_BUNDLED_DEPS=OFF
+	append-cflags "-Wno-error"
+	local mycmakeargs=(
+		$(cmake-utils_use_enable jemalloc JEMALLOC)
+		-DLIBUNIBILIUM_USE_STATIC=OFF
+		-DLIBTERMKEY_USE_STATIC=OFF
+		-DLIBVTERM_USE_STATIC=OFF
+		)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# install a default configuration file
+	insinto /etc/vim
+	doins "${FILESDIR}"/sysinit.vim
+
+	# conditionally install a symlink for nvimpager
+	if use nvimpager; then
+		dosym /usr/share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
+	fi
+}
diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild
index a9c90de93814..f23db6ef499e 100644
--- a/app-editors/neovim/neovim-9999.ebuild
+++ b/app-editors/neovim/neovim-9999.ebuild
@@ -17,7 +17,7 @@ fi
 
 LICENSE="Apache-2.0 vim"
 SLOT="0"
-IUSE="+nvimpager perl python +jemalloc"
+IUSE="+nvimpager perl python ruby +jemalloc"
 
 CDEPEND="dev-lang/luajit:2
 	>=dev-libs/libtermkey-0.17
@@ -34,7 +34,9 @@ DEPEND="${CDEPEND}
 	virtual/libintl"
 RDEPEND="${CDEPEND}
 	perl? ( dev-lang/perl )
-	python? ( dev-python/neovim-python-client )"
+	python? ( dev-python/neovim-python-client )
+	ruby? ( dev-ruby/neovim-ruby-client )
+"
 
 CMAKE_BUILD_TYPE=RelWithDebInfo
 
diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index 7e0827adf306..5d27f28049fa 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -1 +1,2 @@
 DIST mosquitto-1.4.8.tar.gz 326120 SHA256 d96eb5610e57cc3e273f4527d3f54358ab7711459941a9e64bc4d0a85c2acfda SHA512 4bad8683e98ec858468c53f85f53b42a4166667cebf665d11d3dabe604711f5031da007c8f6d6cb49b8bc91b87eb452bc1f8bfa6adf2d439d2223180b316f9bc WHIRLPOOL b2931c55f3e70316cb57ae180f361c1dedf67e86fec9f235aa3b817884e6af13b8b9b8dc83e375a877d85b1d423ea586ee0698b08af88873a1131d58b4ed402a
+DIST mosquitto-1.4.9.tar.gz 325712 SHA256 1df3ae07de40b80a74cd37a7b026895c544cdd3b42c9e0719ae91623aa98c58b SHA512 5994159d9a8da248a877f3032f36ca9a865d9b4efaafac329620864049992a77d414e02252cbbfef89ea2c37dc761b1885a89e19fc8e82b2a42d38f31e761d4d WHIRLPOOL c03a2c8254dce35bb56c243b17ab255e6d4f8210e73d6855d3abff5d3dcf976ca303082d902616ca4b6bf4ea9b2fcc69e52d3ccde7feac41d3ccf5809b157fed
diff --git a/app-misc/mosquitto/files/mosquitto-1.4.9-conditional-tests.patch b/app-misc/mosquitto/files/mosquitto-1.4.9-conditional-tests.patch
new file mode 100644
index 000000000000..12b4fc56bc3c
--- /dev/null
+++ b/app-misc/mosquitto/files/mosquitto-1.4.9-conditional-tests.patch
@@ -0,0 +1,43 @@
+--- a/test/broker/Makefile	2016-06-02 22:20:22.000000000 +0100
++++ b/test/broker/Makefile	2016-07-08 14:17:33.772666865 +0100
+@@ -63,6 +63,7 @@
+ 	./05-clean-session-qos1.py 
+ 
+ 06 :
++ifeq ($(WITH_BRIDGE),yes)
+ 	./06-bridge-reconnect-local-out.py
+ 	./06-bridge-br2b-disconnect-qos1.py
+ 	./06-bridge-br2b-disconnect-qos2.py
+@@ -70,6 +71,7 @@
+ 	./06-bridge-b2br-disconnect-qos2.py
+ 	./06-bridge-fail-persist-resend-qos1.py
+ 	./06-bridge-fail-persist-resend-qos2.py
++endif
+ 
+ 07 :
+ 	./07-will-qos0.py
+@@ -87,10 +89,12 @@
+ 	./08-ssl-connect-cert-auth-crl.py
+ 	./08-ssl-connect-identity.py
+ 	./08-ssl-connect-no-identity.py
++ifeq ($(WITH_BRIDGE),yes)
+ 	./08-ssl-bridge.py
+ 	./08-tls-psk-pub.py
+ 	./08-tls-psk-bridge.py
+ endif
++endif
+ 
+ 09 :
+ 	./09-plugin-auth-unpwd-success.py
+--- a/test/broker/c/Makefile	2016-02-14 14:36:55.000000000 +0000
++++ b/test/broker/c/Makefile	2016-05-05 09:40:31.440608209 +0100
+@@ -13,7 +13,9 @@
+ 	$(CC) ${CFLAGS} $^ -o $@ ../../../lib/libmosquitto.so.1
+ 
+ 08-tls-psk-bridge.test : 08-tls-psk-bridge.c
++ifeq ($(WITH_BRIDGE),yes)
+ 	$(CC) ${CFLAGS} $^ -o $@ ../../../lib/libmosquitto.so.1
++endif
+ 
+ 
+ reallyclean : clean
diff --git a/app-misc/mosquitto/mosquitto-1.4.9.ebuild b/app-misc/mosquitto/mosquitto-1.4.9.ebuild
new file mode 100644
index 000000000000..a9ebf1685599
--- /dev/null
+++ b/app-misc/mosquitto/mosquitto-1.4.9.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils systemd user python-any-r1
+
+DESCRIPTION="An Open Source MQTT v3 Broker"
+HOMEPAGE="http://mosquitto.org/"
+SRC_URI="http://mosquitto.org/files/source/${P}.tar.gz"
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bridge examples +persistence +srv ssl tcpd"
+
+RDEPEND="tcpd? ( sys-apps/tcp-wrappers )
+	ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	srv? ( net-dns/c-ares )"
+
+LIBDIR=$(get_libdir)
+QA_PRESTRIPPED="/usr/sbin/mosquitto
+	/usr/bin/mosquitto_passwd
+	/usr/bin/mosquitto_sub
+	/usr/bin/mosquitto_pub
+	/usr/${LIBDIR}/libmosquittopp.so.1
+	/usr/${LIBDIR}/libmosquitto.so.1"
+
+pkg_setup() {
+	enewgroup mosquitto
+	enewuser mosquitto -1 -1 -1 mosquitto
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-conditional-tests.patch"
+	if use persistence; then
+		sed -i -e "s:^#autosave_interval:autosave_interval:" \
+			-e "s:^#persistence false$:persistence true:" \
+			-e "s:^#persistence_file:persistence_file:" \
+			-e "s:^#persistence_location$:persistence_location /var/lib/mosquitto/:" \
+			mosquitto.conf || die
+	fi
+	python_setup
+	python_fix_shebang test
+}
+
+src_configure() {
+	makeopts=(
+		"LIB_SUFFIX=${LIBDIR:3}"
+		"WITH_BRIDGE=$(usex bridge)"
+		"WITH_PERSISTENCE=$(usex persistence)"
+		"WITH_SRV=$(usex srv)"
+		"WITH_TLS=$(usex ssl)"
+		"WITH_WRAP=$(usex tcpd)"
+	)
+	einfo "${makeopts[@]}"
+}
+
+src_compile() {
+	emake "${makeopts[@]}"
+}
+
+src_test() {
+	emake "${makeopts[@]}" test
+}
+
+src_install() {
+	emake "${makeopts[@]}" DESTDIR="${D}" prefix=/usr install
+	keepdir /var/lib/mosquitto
+	fowners mosquitto:mosquitto /var/lib/mosquitto
+	dodoc readme.md CONTRIBUTING.md ChangeLog.txt
+	doinitd "${FILESDIR}"/mosquitto
+	insinto /etc/mosquitto
+	doins mosquitto.conf
+	systemd_dounit "${FILESDIR}/mosquitto.service"
+
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		insinto "/usr/share/doc/${PF}/examples"
+		doins -r examples/*
+	fi
+}
+
+pkg_postinst() {
+	elog ""
+	elog "The Python module has been moved out of mosquitto."
+	elog "See http://mosquitto.org/documentation/python/"
+	elog ""
+	elog "To start the mosquitto daemon at boot, add it to the default runlevel with:"
+	elog ""
+	elog "    rc-update add mosquitto default"
+	elog "    or"
+	elog "    systemctl enable mosquitto"
+}
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 3adeae8b49b1..7460f6b3a4f9 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -2,3 +2,4 @@ DIST scribus-1.4.5.tar.bz2 78251228 SHA256 9f706f0561d26bb11bbe558690ae0507cd368
 DIST scribus-1.4.6.tar.xz 73601104 SHA256 21e336500d9edc9c90ccf73087e5ef3df59ec3e4a3cbfec15367bcd8d078a19a SHA512 74d8a89eb767535bcd8fe5e3c55d03709d59ff8fc5280005bcc2ad36cae1d37c8442ab85abaea86fdee9f351a901c86947231001324e2d8df00cbd8e5c18d1e3 WHIRLPOOL 5c2ee366cb53720b35ffec2f7e2db244105a95ed7b14c27cf4fab7636cbdf10c6a370c0a14f65f630cd8252b22a4a3ec4b5e592c71308f78269205a89ae56fb7
 DIST scribus-1.5.0.tar.xz 75867348 SHA256 a3dbe66d12719355d41ae7f2cac7a8c9d5599b12aeb5c038d939636f054e8e68 SHA512 3d3f311543019cf985e12d25d0a9bd2ea470679aee0f40d0aed4d2f1532ea3cdbd4d2e215e59b559b4301613fb71f738a348c56d09d3c6e32da0047d9e212065 WHIRLPOOL feae71d139724b4927c81cab5d13168a9e00383f9a7890484cf5ab62f001b266b4af954440bc7edc51eedb65c3ace4541a7fc0836b0f6237061d6d38371ac6ca
 DIST scribus-1.5.1.tar.xz 78032792 SHA256 1882e68713d91c2ab9d6ec7a251dbbe31a4438ee68e63e62d36770541e6f4a38 SHA512 36de951c5aa190f49486971cb08223a4de85ba256a89c2df4ab0fcaba16480065faf499306efa669c623a36a59fbe09aec0c0572b55ce3f9e4107bb54df9c443 WHIRLPOOL c081db19cb39968577f5af9224a87bb2d44caf322b2860c0e3ec9bd32142d6e5f0c1c998c87ee501a3de98f9311c7b543fdef880773bed2cfd290d03a877c9a9
+DIST scribus-1.5.2.tar.xz 74456064 SHA256 ec5eec23aeda655d3a761cffb85853dcd2ede3973b9e62a1b3c28bd1093c74f5 SHA512 c3531bc5ef97e1f7d026ec7cff872ff7a6ea36472c794b632bee1a84fdeea87deaa56e8b9c467fe8e6db694266efc9ec84d822e5feefd2f99b4469d08826cea4 WHIRLPOOL cc1cd41c725aaa240a064149c011cee31f04e738ea386285b75f31aeb200b9351e6e434ed517a2d600c1de694f2f3584012e9213b0fdf094a6497d04c14e3fb7
diff --git a/app-office/scribus/scribus-1.5.2.ebuild b/app-office/scribus/scribus-1.5.2.ebuild
new file mode 100644
index 000000000000..7a0f15c72bf1
--- /dev/null
+++ b/app-office/scribus/scribus-1.5.2.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="tk?"
+
+inherit cmake-utils fdo-mime flag-o-matic multilib python-single-r1
+
+DESCRIPTION="Desktop publishing (DTP) and layout program"
+HOMEPAGE="http://www.scribus.net/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts templates tk"
+
+#a=$((ls resources/translations/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'; ls resources/loremipsum/*xml | sed -e 's:\.: :g' -e 's:loremipsum\/: :g'| awk '{print $2}'; ls resources/dicts/hyph*dic | sed -e 's:\.: :g' -e 's:hyph_: :g' | awk '{print $2}'; ls resources/dicts/README_*txt | sed -e 's:_hyph::g' -e 's:\.: :g' -e 's:README_: :g' | awk '{print $2}') | sort | uniq); echo $a
+IUSE_LINGUAS=" af ar bg br ca ca_ES cs cs_CZ cy cy_GB da da_DK de de_1901 de_CH de_DE el en_AU en_EN en_GB en_US eo es es_ES et eu fi fi_FI fr gl he hr hu hu_HU ia id id_ID is is_IS it ja ko ku la lt lt_LT nb_NO nl nn_NO pl pl_PL pt pt_BR pt_PT ro ro_RO ru ru_RU_0 sa sk sk_SK sl sl_SI sq sr sv sv_SE th_TH tr uk uk_UA zh_CN zh_TW"
+IUSE+=" ${IUSE_LINGUAS// / linguas_}"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	tk? ( scripts )"
+
+# osg
+# couple of third_party libs bundled
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	app-text/libmspub
+	>=app-text/poppler-0.19.0:=
+	dev-libs/boost
+	dev-libs/hyphen
+	dev-libs/librevenge
+	dev-libs/libxml2
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtquickcontrols:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/lcms:2
+	media-libs/libcdr
+	media-libs/libpagemaker
+	media-libs/libpng:0
+	media-libs/libvisio
+	media-libs/tiff:0
+	net-print/cups
+	sys-libs/zlib[minizip]
+	virtual/jpeg:0=
+	>=x11-libs/cairo-1.10.0[X,svg]
+	boost? ( dev-libs/boost )
+	hunspell? ( app-text/hunspell )
+	graphicsmagick? ( media-gfx/graphicsmagick )
+	osg? ( dev-games/openscenegraph )
+	pdf? ( app-text/podofo:0= )
+	scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
+	tk? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
+"
+RDEPEND="${COMMON_DEPEND}
+	app-text/ghostscript-gpl"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.0-docdir.patch
+	)
+
+src_prepare() {
+	rm -r codegen/cheetah || die
+	cat > cmake/modules/FindZLIB.cmake <<- EOF
+	find_package(PkgConfig)
+	pkg_check_modules(ZLIB minizip zlib)
+	SET( ZLIB_LIBRARY \${ZLIB_LIBRARIES} )
+	SET( ZLIB_INCLUDE_DIR \${ZLIB_INCLUDE_DIRS} )
+	MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR )
+	EOF
+
+	sed \
+		-e "/^\s*unzip\.[ch]/d" \
+		-e "/^\s*ioapi\.[ch]/d" \
+		-i scribus/CMakeLists.txt Scribus.pro || die
+	rm scribus/ioapi.[ch] || die
+
+	sed \
+		-e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \
+		-i resources/templates/CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local lang langs
+	for lang in ${IUSE_LINGUAS}; do
+		if use linguas_${lang} || [[ ${lang} == "en" ]]; then
+			# From the CMakeLists.txt
+			# "#Bit of a hack, preprocess all the filenames to generate our language string, needed for -DWANT_GUI_LANG=en_GB;de_DE , etc"
+			langs+=";${lang}"
+		else
+			# Don't install localized documentation
+			sed -e "/${lang}/d" -i doc/CMakeLists.txt || die
+			safe_delete file ./resources/dicts/README_${lang}.txt
+			safe_delete file ./resources/dicts/README_hyph_${lang}.txt
+			safe_delete file ./resources/dicts/hyph_${lang}.dic
+			safe_delete file ./resources/loremipsum/${lang}.xml
+		fi
+	done
+
+	local mycmakeargs=(
+		-DHAVE_PYTHON=ON
+		-DPYTHON_INCLUDE_PATH="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+		-DWANT_DISTROBUILD=ON
+		-DDOCDIR="/usr/share/doc/${PF}/"
+		-DWANT_GUI_LANG="${langs#;};en"
+		$(cmake-utils_use_with pdf PODOFO)
+		$(cmake-utils_use_with boost)
+		$(cmake-utils_use_want graphicsmagick)
+		$(cmake-utils_use !osg WANT_NOOSG)
+		$(cmake-utils_use_want debug DEBUG)
+		$(cmake-utils_use_want minimal NOHEADERINSTALL)
+		$(cmake-utils_use_want hunspell HUNSPELL)
+		$(cmake-utils_use_want !examples NOEXAMPLES)
+		$(cmake-utils_use_want !templates NOTEMPLATES)
+		)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	local lang
+	for lang in ${IUSE_LINGUAS}; do
+		if ! use linguas_${lang}; then
+			safe_delete dir "${ED}"/usr/share/man/${lang}
+		fi
+	done
+
+	if ! use scripts; then
+		rm "${ED}"/usr/share/scribus/scripts/*.py || die
+	elif ! use tk; then
+		rm "${ED}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die
+	fi
+
+	use scripts && \
+		python_fix_shebang "${ED}"/usr/share/scribus/scripts && \
+		python_optimize "${ED}"/usr/share/scribus/scripts
+
+	mv "${ED}"/usr/share/doc/${PF}/{en,html} || die
+	ln -sf html "${ED}"/usr/share/doc/${PF}/en || die
+	cat >> "${T}"/COPYING <<- EOF
+	${PN} is licensed under the "${LICENSE}".
+	Please visit https://www.gnu.org/licenses/gpl-2.0.html for the complete license text.
+	EOF
+	dodoc "${T}"/COPYING
+	docompress -x /usr/share/doc/${PF}/en /usr/share/doc/${PF}/{AUTHORS,TRANSLATION,LINKS,COPYING}
+	doicon resources/iconsets/1_5_0/scribus.png
+	domenu scribus.desktop
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+safe_delete () {
+	case $1 in
+		dir)
+			if [[ -d "${2}" ]]; then
+				ebegin "Deleting ${2} recursively"
+				rm -r "${2}" || die
+				eend $?
+			fi
+			;;
+		file)
+			if [[ -f "${2}" ]]; then
+				ebegin "Deleting ${2}"
+				rm "${2}" || die
+				eend $?
+			fi
+			;;
+		*)
+			die "Wrong usage"
+	esac
+}
diff --git a/app-portage/metagen/metagen-0.6.5-r1.ebuild b/app-portage/metagen/metagen-0.6.5-r1.ebuild
index cb82b1962b35..136c66b2d5cc 100644
--- a/app-portage/metagen/metagen-0.6.5-r1.ebuild
+++ b/app-portage/metagen/metagen-0.6.5-r1.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 DEPEND=">=dev-python/jaxml-3.01[${PYTHON_USEDEP}]
 	|| (
-		( >=sys-apps/portage-2.3.0_rc1[${PYTHON_USEDEP}] app-portage/repoman )
+		( >=sys-apps/portage-2.3.0_rc1[${PYTHON_USEDEP}] app-portage/repoman[${PYTHON_USEDEP}] )
 		<sys-apps/portage-2.3.0_rc1[${PYTHON_USEDEP}]
 	)"
 RDEPEND="${DEPEND}"
diff --git a/app-portage/metagen/metagen-9999.ebuild b/app-portage/metagen/metagen-9999.ebuild
index dc2ab7147562..9bc2d9e64b7a 100644
--- a/app-portage/metagen/metagen-9999.ebuild
+++ b/app-portage/metagen/metagen-9999.ebuild
@@ -19,7 +19,7 @@ KEYWORDS=""
 IUSE=""
 DEPEND=">=dev-python/jaxml-3.01[${PYTHON_USEDEP}]
 	|| (
-		( >=sys-apps/portage-2.3.0_rc1[${PYTHON_USEDEP}] app-portage/repoman )
+		( >=sys-apps/portage-2.3.0_rc1[${PYTHON_USEDEP}] app-portage/repoman[${PYTHON_USEDEP}] )
 		<sys-apps/portage-2.3.0_rc1[${PYTHON_USEDEP}]
 	)"
 RDEPEND="${DEPEND}"
diff --git a/app-text/itex2mml/Manifest b/app-text/itex2mml/Manifest
index 73bc20f12632..734d6f9faceb 100644
--- a/app-text/itex2mml/Manifest
+++ b/app-text/itex2mml/Manifest
@@ -1 +1,2 @@
 DIST itexToMML-1.5.3.tar.gz 136968 SHA256 9b6fff992546efebff72ede2c17dcbee630312bfa3050f92ca4598b4b98a0dd3 SHA512 7fbd1fdf4d245500561ba1405d5c91d14b08c207c5f8ea7ef8dc45ab4aadd61a15e96cd2748b98bca59b4891505db1420feec59412258605116fb75df065e2a3 WHIRLPOOL a8a48c2415a0f2002ec0b642a732a6461deddf94598a94026a28eacd125da874dfd089553e1bdd393693107b0354fd6725246d2c7309c14923b9e8e771fa52a5
+DIST itexToMML-1.5.4.tar.gz 136951 SHA256 39be9e60a5167d2525947fa38a97fea049db99dd484aa3de472e0bb90162182e SHA512 7c974eb8b9a7f12aa87f2243a6608ac509a7e4bb8b2c2164065cea67c7e50e2f22f6d5fc829f629389ce603e70cca72e13060b03180a81de36338a66ea699e54 WHIRLPOOL b53f6d3346051af466130c67c2cf30d9cf521056ab9e2dfd36f636d541ae6f775894795a208be391cc7bd7cdd2fed77fefb8e9eba6809a9ef66090f931bc16ea
diff --git a/app-text/itex2mml/itex2mml-1.5.4.ebuild b/app-text/itex2mml/itex2mml-1.5.4.ebuild
new file mode 100644
index 000000000000..a0c3f2c6e283
--- /dev/null
+++ b/app-text/itex2mml/itex2mml-1.5.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="A LaTeX into XHTML/MathML converter"
+HOMEPAGE="http://golem.ph.utexas.edu/~distler/blog/itex2MML.html"
+SRC_URI="http://golem.ph.utexas.edu/~distler/blog/files/itexToMML-${PV}.tar.gz"
+LICENSE="|| ( GPL-2+ MPL-1.1 LGPL-2+ )"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/itexToMML/itex-src"
+
+src_compile() {
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dobin itex2MML
+	dodoc ../README
+}
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 6844360d0b2e..5cea4432a5d3 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,3 +1,4 @@
 DIST poppler-0.42.0.tar.xz 1674024 SHA256 9fef076ffe2a4f18a4e0da547d814ef5c5e6f8a283afe3387504a0bb1a418010 SHA512 ab8c86c28a2ac848bf118de7f20f57576ed4faa4ad06ae7d58590b951fb2b0ee8a728919ce2417592b467af7322c57ed0bff0288eced042fcf94a50d89c73c19 WHIRLPOOL 095986b44875847d471ecda35194eeb894051b689a754dc8ae55caa04100b4e2ebd57fe868008972502d27346eeb98699fa9660b414ececef4d0eafe53265736
 DIST poppler-0.45.0.tar.xz 1674464 SHA256 96dd1a6024bcdaa4530a3b49687db3d5c24ddfd072ccb37c6de0e42599728798 SHA512 b703bed35da3572801834740bf61d59b6a3ee3b88bc1b3181bde3472264be4f6b89ceacb56179d7093329946abd6ba2501acfaf209d4f543352ff9fd38c47f1b WHIRLPOOL 687b1ba816dbff1b0a69cb05914dd7fb161bfd8c0fa4e26b77bb0ad26e27f7d7d94085a1022716a8d7a7563145f0acead9fccbbd332959d0216b81b27f3632e8
 DIST poppler-0.46.0.tar.xz 1680940 SHA256 967d35d13d61dee2fee656b80efef9e388a9e752bc79b7123f15b49c7769e487 SHA512 c303875ae8082e8cd0332ecff82e52678393d0015d092aee6fec3cc191218f155aca049ce43996c255122f550aae53ed019bb7855291d117d0b9e25ab83e9caf WHIRLPOOL 332aa78ba5a905a1c1b1fa62b20e730c7e7cde91f0a6f3c0291f85ea35188d65e496db8145c4eca8b382e8be6061bf16201603a3654c83f8c9f40e142fef0e74
+DIST poppler-0.47.0.tar.xz 1682184 SHA256 b872e7228fc34a71ce4b47a5aea2a57ae67528818fa846e1e0eda089319bd242 SHA512 44b5b1546f66f1b95e1359f4fdf79458d902604dababbcc0ecb0d45ed90451680bb1f3b5e163bd17e16fda1b8656bec6c9072964f9d8f276cb38a7be95db63a5 WHIRLPOOL 1d7c0ad5e81fdbccc7e55f58ee94fd5ee9f905d94e8dfdde3ebb350e085d709e409aa6f981e0f0f12c73b9a6d94120250ba2be12a80adf7216e1fc11ec9e7ca8
diff --git a/app-text/poppler/poppler-0.47.0.ebuild b/app-text/poppler/poppler-0.47.0.ebuild
new file mode 100644
index 000000000000..df6663999aa7
--- /dev/null
+++ b/app-text/poppler/poppler-0.47.0.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils toolchain-funcs xdg-utils
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}"
+	SLOT="0/9999"
+else
+	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/63"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="https://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="cairo cairo-qt cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt4 qt5 tiff +utils"
+
+REQUIRED_USE="cairo-qt? ( qt4 )"
+
+# No test data provided
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=media-libs/fontconfig-2.6.0
+	>=media-libs/freetype-2.3.9
+	sys-libs/zlib
+	cairo? (
+		dev-libs/glib:2
+		>=x11-libs/cairo-1.10.0
+		introspection? ( >=dev-libs/gobject-introspection-1.32.1:= )
+	)
+	cairo-qt? ( >=x11-libs/cairo-1.10.0 )
+	curl? ( net-misc/curl )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lcms? ( media-libs/lcms:2 )
+	nss? ( >=dev-libs/nss-3.19:0 )
+	png? ( media-libs/libpng:0= )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtxml:5
+	)
+	tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	cjk? ( >=app-text/poppler-data-0.4.7 )
+"
+
+DOCS=(AUTHORS NEWS README README-XPDF TODO)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch"
+	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
+	"${FILESDIR}/${PN}-0.28.1-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.33.0-openjpeg2.patch"
+	"${FILESDIR}/${PN}-0.40-FindQt4.patch"
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# Clang doesn't grok this flag, the configure nicely tests that, but
+	# cmake just uses it, so remove it if we use clang
+	if [[ ${CC} == clang ]] ; then
+		sed -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die
+	fi
+
+	# Enable experimental patchset for subpixel font rendering using cairo
+	# backend for poppler-qt4 from https://github.com/giddie/poppler-qt4-cairo-backend.
+	if use cairo-qt; then
+		ewarn "Enabling unsupported, experimental cairo-qt patchset. Please do not report bugs."
+		epatch "${FILESDIR}/cairo-qt-experimental/0001-Cairo-backend-added-to-Qt4-wrapper.patch"
+		epatch "${FILESDIR}/cairo-qt-experimental/0002-Setting-default-Qt4-backend-to-Cairo.patch"
+		epatch "${FILESDIR}/cairo-qt-experimental/0003-Forcing-subpixel-rendering-in-Cairo-backend.patch"
+		epatch "${FILESDIR}/cairo-qt-experimental/0004-Enabling-slight-hinting-in-Cairo-Backend.patch"
+	fi
+}
+
+src_configure() {
+	xdg_environment_reset
+	local mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-DBUILD_QT4_TESTS=OFF
+		-DBUILD_QT5_TESTS=OFF
+		-DBUILD_CPP_TESTS=OFF
+		-DENABLE_SPLASH=ON
+		-DENABLE_ZLIB=ON
+		-DENABLE_ZLIB_UNCOMPRESS=OFF
+		-DENABLE_XPDF_HEADERS=ON
+		-DENABLE_LIBCURL="$(usex curl)"
+		-DENABLE_CPP="$(usex cxx)"
+		-DENABLE_UTILS="$(usex utils)"
+		-DSPLASH_CMYK=OFF
+		-DUSE_FIXEDPOINT=OFF
+		-DUSE_FLOAT=OFF
+		-DWITH_Cairo="$(usex cairo)"
+		-DWITH_GObjectIntrospection="$(usex introspection)"
+		-DWITH_JPEG="$(usex jpeg)"
+		-DWITH_NSS3="$(usex nss)"
+		-DWITH_PNG="$(usex png)"
+		-DWITH_Qt4="$(usex qt4)"
+		$(cmake-utils_use_find_package qt5 Qt5Core)
+		-DWITH_TIFF="$(usex tiff)"
+	)
+	if use jpeg2k; then
+		mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg2)
+	else
+		mycmakeargs+=(-DENABLE_LIBOPENJPEG=)
+	fi
+	if use lcms; then
+		mycmakeargs+=(-DENABLE_CMS=lcms2)
+	else
+		mycmakeargs+=(-DENABLE_CMS=)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# live version doesn't provide html documentation
+	if use cairo && use doc && [[ ${PV} != 9999 ]]; then
+		# For now install gtk-doc there
+		insinto /usr/share/gtk-doc/html/poppler
+		doins -r "${S}"/glib/reference/html/*
+	fi
+}
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 66382628578c..3f00437df826 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -2,4 +2,5 @@ DIST php-5.5.37.tar.bz2 13699851 SHA256 d2380ebe46caf17f2c4cd055867d00a82e6702dc
 DIST php-5.5.38.tar.xz 11077780 SHA256 cb527c44b48343c8557fe2446464ff1d4695155a95601083e5d1f175df95580f SHA512 c2cdb18b2c9edaeff66591e8f58f8ff488260f537cdf9ce09820c163f20ff5209c0def89343d429932c9506ad4ef3daacf224946dac1c59622501092483f30c6 WHIRLPOOL 4380c1daa39f04f90d1457152e366720b295e96aba6859625c6b375a3785b4e0f30fea590c1ee1edb439c2a405446526c702a003d68ea6c817ab8684068a7581
 DIST php-5.6.23.tar.bz2 14178077 SHA256 facd280896d277e6f7084b60839e693d4db68318bfc92085d3dc0251fd3558c7 SHA512 92be3685926f302223465e9673496971f0ee1b05c7b3a09682d4ef93a27b4c17e5c53c36acab15d26f38508f6d65bebe11a6f0f0fc98b27eafe95b02b4d9897d WHIRLPOOL 71375395742a83ec0f55bd7edf5eeff732e4db24f77f436f519ca81a2ceeb0bac65549ca1ffd34cb7b593771b5f4ccb984900841a20c1620a6121e4fa14ab086
 DIST php-5.6.24.tar.xz 12394980 SHA256 ed7c38c6dac539ade62e08118258f4dac0c49beca04d8603bee4e0ea6ca8250b SHA512 1849c58a8c6eeb3efc6b43f874314b146b4a32d886086bc1648fc84e6062148a9373dea9c3713587c3980df70a0e51bf6e5ab5a87b9eff57e54670c5c2ded86b WHIRLPOOL 4e6466444824640a246e8cd02f7da7bf72ff55c714729f7ed7581be63b2f1d87a0f5bf5dab5e09499fabc61d32162aa35cfb095f7e478f7454aacdec2465a7f5
-DIST php-7.0.9.tar.xz 12240712 SHA256 970c322ba3e472cb0264b8ba9d4d92e87918da5d0cca53c4aba2a70545b8626d SHA512 95bbc912191b0f53a28863c76c017b5f9bf18346041916fed566b9212bb4c46c79bab422b842b1a8eeb173ebfc3df8cf6faf3337a5712f10ef455a31343cc631 WHIRLPOOL f5d1f27d29e7c1b64bb9c37dfc198473b1a78a18d42f7dba24a619f3461ce85375b6debb5d761aaaa14facc4918c7ee0630a44afe31c9cc06c3a6d62ccd679f6
+DIST php-5.6.25.tar.xz 12406072 SHA256 7535cd6e20040ccec4594cc386c6f15c3f2c88f24163294a31068cf7dfe7f644 SHA512 43ab901a69e22ac42b676384c338c3b3a5cc8e8fb52cc85296d6880c4a3d079d9e0de151539d0c8549e8856d611f0d8b40c9cc338167a62560e14c939a409b68 WHIRLPOOL 46e593caeb8d59d29568dfdbf0a2d2ae7080a7d8b3e78a11f4116fa54e64e8cc7d8c93fdb40a63beb3ae0a6bd900b8d0dfd4889b858201717a86bcd45b8aee61
+DIST php-7.0.10.tar.xz 12474728 SHA256 348476ff7ba8d95a1e28e1059430c10470c5f8110f6d9133d30153dda4cdf56a SHA512 124fa1a5ef1bab39b04d03be965fbcfedf173542fa060288642573f60360ae8ed627827040dc6ed6a4c67bd66852ffea8d54743ac7922465e8f545478529c35d WHIRLPOOL 0c3c93810fb5fbcaa6b5b92b13f3698272e4c5c4d9d37f9265bd481a9998d5220cc6653ac4de4f80aea579e30e49654cecae6c9141d66e8249a9683fc03d8ef2
diff --git a/dev-lang/php/php-5.6.24-r2.ebuild b/dev-lang/php/php-5.6.25.ebuild
similarity index 100%
rename from dev-lang/php/php-5.6.24-r2.ebuild
rename to dev-lang/php/php-5.6.25.ebuild
diff --git a/dev-lang/php/php-7.0.9-r2.ebuild b/dev-lang/php/php-7.0.10.ebuild
similarity index 100%
rename from dev-lang/php/php-7.0.9-r2.ebuild
rename to dev-lang/php/php-7.0.10.ebuild
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index aa75c119c999..72f79ded95e2 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -1,6 +1,9 @@
 DIST rust-stage0-2016-03-18-235d774-linux-i386-0e0e4448b80d0a12b75485795244bb3857a0a7ef.tar.bz2 18489693 SHA256 36958fcd55387d7b1b86618111fa8660c1d488fe191e85ad9659c6470874322b SHA512 3e729e7c9340060c5eaa13b0420cc3b10eb968312bfceb4d072e5e16673a393c1b51b34b2c43f91953a2b44f0b0fe549215e5c284695d5a3626a3dc703693fd6 WHIRLPOOL 9a7064933b4387de6c6158c5a9645be1b3cd05d1cbd66c8e30a5efb63d08fd8aed8c5695e850fb3e3f92577b59fd2243b467d9ed509b913f652abddd206f68db
 DIST rust-stage0-2016-03-18-235d774-linux-x86_64-1273b6b6aed421c9e40c59f366d0df6092ec0397.tar.bz2 17950752 SHA256 a8ca657d78162a9f0a69a1ec8b0460e97259cdf2e6353ee256ae206876c9637e SHA512 77694229b9aca58eab866acf6d52f381d9b4faa8c7698c17b2de90fa396eba17f3e12411b2cc4639607f7418d1382365e15039fb4ed247158a7d5542ce3b8b59 WHIRLPOOL a58f3d9e8e319b4852513e4c172dc733f5080032eb6f2c33ddd9b336891586318761db0e6dcc3ff54113cc32ee256fd356a672cb50ae316ca4d1a7be3d5591d6
+DIST rustc-1.10.0-i686-unknown-linux-gnu.tar.gz 47134530 SHA256 019ee36468b92846691f96b56d980a4099f12cf1c5f74534a9d37e13122eb869 SHA512 0af9edc08d34189d99247169787133c78935cfae46489d4c42732d96a67878c221c9f2ad44a8ccf82781aecc4988e019fbb2825950eb08295d9c68a1d3c4a368 WHIRLPOOL aa8f36a3eeea4dbf24a6cbdc6ae402417b609279a445ffcaffc554c8c58559cd7390063d89accbab0acc874598c865ced420397e5002c9a5b4c15b462317f3f1
 DIST rustc-1.10.0-src.tar.gz 25967780 SHA256 a4015aacf4f6d8a8239253c4da46e7abaa8584f8214d1828d2ff0a8f56176869 SHA512 fdef0a4c458ce687ab2921fb879cf6f68ae7ec4d780e407fea80cb751d70d80e621fc37756358d8336383c24646d9e2869215b3591b2240904206df2e58a7e45 WHIRLPOOL daa9775e515f6466c7344518e2afff96d01f62bb15cb01e6d4889ec338189b9584f7f9b5d6d340e00aa995490a09eecad1c4db0d98e068e4256081724c668644
+DIST rustc-1.10.0-x86_64-unknown-linux-gnu.tar.gz 46533773 SHA256 4301f9a09f2b88ac1238d886dfa14d864be7401f4d8a31277303eebe0c7a56c3 SHA512 3b6c61c8c970c5244984df0c7d646d84984c8c1aaf804eda18820154cf09c5fea7fa77ac4cf779656ef4472029fe221b788a277a764de985bf5a0dc95a72f8c9 WHIRLPOOL f6f7ccc2ff9dd707d29f33a7252a41ec103914e016cfc383f1c7f37e6823fb32354ba599c7dd5f24f09ecd1436b40b16b6a23be44950fb2738b5cfa20d3dfcb9
+DIST rustc-1.11.0-src.tar.gz 26126471 SHA256 3685034a78e70637bdfa3117619f759f2481002fd9abbc78cc0f737c9974de6a SHA512 6ad050a02e3a3b48f205f5d5ed9393fd2a1a2237e5c78b3e51af8162f410b93a831ebe5980ce78c4d38c5a692395c7fec8442956497a5d21e9f7157404c6b5aa WHIRLPOOL f57ea2f42c97256427964f3a553207a2b587b1e4f1c2636c66d9c47f92a9de508a64ba8288ab3a80444d9dba1c59d545be876448a1f80f283c69a4cc3356da25
 DIST rustc-1.9.0-i686-unknown-linux-gnu.tar.gz 45887218 SHA256 2951dec835827974d03c7aafbf2c969f39bb530e1c200fd46f90bc01772fae39 SHA512 6d799a464f93aecb24ded4e9af634d7852f9930968814700e90353888657f9f556dda156455cb8cabca0e5f42c8d0f7864d43294687c8ce57518e21bebad99f7 WHIRLPOOL da145280c6558cd36d40450203fc61081282a64a2145b75998806964be731e91378e571a9c9b6b7fe1b488c6dd303105a9f47c0b1c6c77a6426ed1aaa0756df4
 DIST rustc-1.9.0-src.tar.gz 25859714 SHA256 b19b21193d7d36039debeaaa1f61cbf98787e0ce94bd85c5cbe2a59462d7cfcd SHA512 bb23d529daaea17cd6358057ad7c219b1bf2206331a9813520f9e3a519698f6d274a6c25f579dab9e8e48fe0c6e51e7eb473885cb1fb65128e715e06778b62f7 WHIRLPOOL 23393e5842d2af5bffaca34909be5293198a2ceedb3d6db55920e375e3860411cf51f5148264d9e172ec088f26706529f24ed05d97ca09387f0d25f90c23ed85
 DIST rustc-1.9.0-x86_64-unknown-linux-gnu.tar.gz 45246956 SHA256 d0704d10237c66c3efafa6f7e5570c59a1d3fe5c6d99487540f90ebb37cd84c4 SHA512 37a4c62f09e2b49cf7a898eeefd3843ef17f3dc433a4f55cb5c3d5c315effb9e0750c275bb0fc91e5ada6c42924af5c7f890874c5917d41a4723c60b209d1c0d WHIRLPOOL f3aeaaf9c93a177c2a944eaae994b5d3c6d2c31923d468bda16cce845e3ae87ac3747c2f025ec1e78054cc001d3c3abf629534f7b6b454e394192ead8e614d3d
diff --git a/dev-lang/rust/rust-1.11.0.ebuild b/dev-lang/rust/rust-1.11.0.ebuild
new file mode 100644
index 000000000000..81aa8d80eff3
--- /dev/null
+++ b/dev-lang/rust/rust-1.11.0.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-any-r1 versionator toolchain-funcs
+
+if [[ ${PV} = *beta* ]]; then
+	betaver=${PV//*beta}
+	BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
+	MY_P="rustc-beta"
+	SLOT="beta/${PV}"
+	SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.gz"
+	KEYWORDS=""
+else
+	ABI_VER="$(get_version_component_range 1-2)"
+	SLOT="stable/${ABI_VER}"
+	MY_P="rustc-${PV}"
+	SRC="${MY_P}-src.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+STAGE0_VERSION="1.$(($(get_version_component_range 2) - 1)).0"
+RUST_STAGE0_amd64="rustc-${STAGE0_VERSION}-x86_64-unknown-linux-gnu"
+RUST_STAGE0_x86="rustc-${STAGE0_VERSION}-i686-unknown-linux-gnu"
+
+DESCRIPTION="Systems programming language from Mozilla"
+HOMEPAGE="http://www.rust-lang.org/"
+
+SRC_URI="https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.gz
+	amd64? ( https://static.rust-lang.org/dist/${RUST_STAGE0_amd64}.tar.gz )
+	x86? ( https://static.rust-lang.org/dist/${RUST_STAGE0_x86}.tar.gz )
+"
+
+LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
+
+IUSE="clang debug doc libcxx +system-llvm"
+REQUIRED_USE="libcxx? ( clang )"
+
+RDEPEND="libcxx? ( sys-libs/libcxx )
+	system-llvm? ( >=sys-devel/llvm-3.8.1-r2:=[multitarget]
+		<sys-devel/llvm-3.9.0:=[multitarget] )
+"
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	>=dev-lang/perl-5.0
+	clang? ( sys-devel/clang )
+"
+
+PDEPEND=">=app-eselect/eselect-rust-0.3_pre20150425"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack "rustc-${PV}-src.tar.gz" || die
+	mkdir "${MY_P}/dl" || die
+	local stagename="RUST_STAGE0_${ARCH}"
+	local stage0="${!stagename}"
+	cp "${DISTDIR}/${stage0}.tar.gz" "${MY_P}/dl/" || die "cp stage0"
+}
+
+src_prepare() {
+	find mk -name '*.mk' -exec \
+		 sed -i -e "s/-Werror / /g" {} \; || die
+
+	eapply_user
+}
+
+src_configure() {
+	export CFG_DISABLE_LDCONFIG="notempty"
+
+	"${ECONF_SOURCE:-.}"/configure \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)/${P}" \
+		--mandir="${EPREFIX}/usr/share/${P}/man" \
+		--release-channel=${SLOT%%/*} \
+		--disable-manage-submodules \
+		--default-linker=$(tc-getBUILD_CC) \
+		--default-ar=$(tc-getBUILD_AR) \
+		--python=${EPYTHON} \
+		--disable-rpath \
+		$(use_enable clang) \
+		$(use_enable debug) \
+		$(use_enable debug llvm-assertions) \
+		$(use_enable !debug optimize) \
+		$(use_enable !debug optimize-cxx) \
+		$(use_enable !debug optimize-llvm) \
+		$(use_enable !debug optimize-tests) \
+		$(use_enable doc docs) \
+		$(use_enable libcxx libcpp) \
+		$(usex system-llvm "--llvm-root=${EPREFIX}/usr" " ") \
+		|| die
+}
+
+src_compile() {
+	emake VERBOSE=1
+}
+
+src_install() {
+	unset SUDO_USER
+
+	default
+
+	mv "${D}/usr/bin/rustc" "${D}/usr/bin/rustc-${PV}" || die
+	mv "${D}/usr/bin/rustdoc" "${D}/usr/bin/rustdoc-${PV}" || die
+	mv "${D}/usr/bin/rust-gdb" "${D}/usr/bin/rust-gdb-${PV}" || die
+
+	dodoc COPYRIGHT
+
+	dodir "/usr/share/doc/rust-${PV}/"
+	mv "${D}/usr/share/doc/rust"/* "${D}/usr/share/doc/rust-${PV}/" || die
+	rmdir "${D}/usr/share/doc/rust/" || die
+
+	cat <<-EOF > "${T}"/50${P}
+	LDPATH="/usr/$(get_libdir)/${P}"
+	MANPATH="/usr/share/${P}/man"
+	EOF
+	doenvd "${T}"/50${P}
+
+	cat <<-EOF > "${T}/provider-${P}"
+	/usr/bin/rustdoc
+	/usr/bin/rust-gdb
+	EOF
+	dodir /etc/env.d/rust
+	insinto /etc/env.d/rust
+	doins "${T}/provider-${P}"
+}
+
+pkg_postinst() {
+	eselect rust update --if-unset
+
+	elog "Rust installs a helper script for calling GDB now,"
+	elog "for your convenience it is installed under /usr/bin/rust-gdb-${PV}."
+
+	if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then
+		elog "install app-emacs/rust-mode to get emacs support for rust."
+	fi
+
+	if has_version app-editors/gvim || has_version app-editors/vim; then
+		elog "install app-vim/rust-mode to get vim support for rust."
+	fi
+
+	if has_version 'app-shells/zsh'; then
+		elog "install app-shells/rust-zshcomp to get zsh completion for rust."
+	fi
+}
+
+pkg_postrm() {
+	eselect rust unset --if-invalid
+}
diff --git a/dev-libs/snowball-stemmer/Manifest b/dev-libs/snowball-stemmer/Manifest
index dd109db0cd6d..c64fccad84a0 100644
--- a/dev-libs/snowball-stemmer/Manifest
+++ b/dev-libs/snowball-stemmer/Manifest
@@ -1,2 +1 @@
-DIST libstemmer_c-20091122.tgz 129207 SHA256 ad4e152379214480d599c86dd19421a36fce78cedd20fc324520c5bba0a512e7 SHA512 d1b2203dcc3d0f421526d3ec2f7e04889f93221222efe50501b4a1c7e74dfc51905141d4ada5a76feab5cec8dbc64f55dd55b53f6e89f658c67e72dc6667091d WHIRLPOOL 03baf5de80854a2726990d1f79e17a46342b0d8431a564805d78878bba1eba0c1aba6f4f53c64eb1a1946b50053632c32c9106305f0a53623068531f2b67b5c4
 DIST libstemmer_c-20140325.tgz 129506 SHA256 7694b0ec0a380670470587a559abb219c224b8047ed9e3078dccb8898a4a4afb SHA512 938eb12d4fe9e229f21536a6cb8a4322e0b664a7fbc15685e7ad46b4a6ccdfbefc55cc484f86bc738791d6f3e6d1b61ba777a4332a62cf76a8b0a5efd2c2762b WHIRLPOOL 24de2111859bc10c707e623d69ac13f4a5b5632a59ef2909657d0dde427b83ca73f8990dbd1f72a19ba6de0ab59f3a7503642ced6454e9888971c3e8884c66e9
diff --git a/dev-libs/snowball-stemmer/snowball-stemmer-0.20091122.ebuild b/dev-libs/snowball-stemmer/snowball-stemmer-0.20091122.ebuild
deleted file mode 100644
index 86c80cb31d2d..000000000000
--- a/dev-libs/snowball-stemmer/snowball-stemmer-0.20091122.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils versionator
-
-# The version number here has been added by Gentoo.
-# It is the date that http://snowball.tartarus.org/dist/libstemmer_c.tgz was
-# fetched.
-PVDATE=$(get_after_major_version)
-
-DESCRIPTION="This contains all you need to include the snowball stemming algorithms into a C project of your own"
-HOMEPAGE="http://snowball.tartarus.org/download.php"
-SRC_URI="mirror://gentoo/libstemmer_c-${PVDATE}.tgz"
-
-# This will probably be different if this ebuild ends up being used for both
-# Java and C.
-S="${WORKDIR}/libstemmer_c"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
-
-# This could be used to package both libstemmer_c and libstemmer_java together.
-IUSE="static-libs"
-
-src_prepare() {
-	epatch "${FILESDIR}/libstemmer_c-shared-library.patch"
-}
-
-src_compile() {
-	CC=$(tc-getCC) emake libstemmer.so stemwords || die "Make failed!"
-
-	if use static-libs; then
-		CC=$(tc-getCC) AR=$(tc-getAR) emake libstemmer.a || die "Make failed!"
-	fi
-}
-
-src_install() {
-	dodoc README
-
-	dobin stemwords
-
-	doheader include/libstemmer.h
-
-	dolib.so libstemmer.so.0d.0.0
-	dolib.so libstemmer.so.0d
-	dolib.so libstemmer.so
-
-	use static-libs && dolib.a libstemmer.a
-}
diff --git a/dev-libs/snowball-stemmer/snowball-stemmer-0.20140325.ebuild b/dev-libs/snowball-stemmer/snowball-stemmer-0.20140325.ebuild
index 4abf942afe61..7fd5a7b946db 100644
--- a/dev-libs/snowball-stemmer/snowball-stemmer-0.20140325.ebuild
+++ b/dev-libs/snowball-stemmer/snowball-stemmer-0.20140325.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,8 +11,8 @@ inherit eutils versionator
 # http://snowball.tartarus.org/dist/libstemmer_c.tgz.
 PVDATE=$(get_after_major_version)
 
-DESCRIPTION="This contains all you need to include the snowball stemming algorithms into a C project of your own"
-HOMEPAGE="http://snowball.tartarus.org/download.php"
+DESCRIPTION="All you need to include the snowball stemming algorithms into a C project"
+HOMEPAGE="https://snowballstem.org/"
 SRC_URI="https://dev.gentoo.org/~graaff/libstemmer_c-${PVDATE}.tgz"
 
 # This will probably be different if this ebuild ends up being used for both
diff --git a/dev-php/pecl-mailparse/pecl-mailparse-2.1.6-r3.ebuild b/dev-php/pecl-mailparse/pecl-mailparse-2.1.6-r3.ebuild
index 97a2d1cb8041..54d1edc6e712 100644
--- a/dev-php/pecl-mailparse/pecl-mailparse-2.1.6-r3.ebuild
+++ b/dev-php/pecl-mailparse/pecl-mailparse-2.1.6-r3.ebuild
@@ -11,7 +11,7 @@ USE_PHP="php5-5 php5-6"
 
 inherit php-ext-pecl-r3
 
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 
 DESCRIPTION="PHP extension for parsing RFC822 and RFC2045 (MIME) messages"
 LICENSE="PHP-2.02"
diff --git a/dev-php/pecl-mysqlnd_ms/Manifest b/dev-php/pecl-mysqlnd_ms/Manifest
index b6618b3b2808..b61c6376b0f5 100644
--- a/dev-php/pecl-mysqlnd_ms/Manifest
+++ b/dev-php/pecl-mysqlnd_ms/Manifest
@@ -1,2 +1 @@
-DIST mysqlnd_ms-1.5.2.tgz 385916 SHA256 22b9ba1afb36b3df11c1051c813bc07889c815d1d9993bb07ffda182665b472f SHA512 5ab888d683384e9d2b33df8d057cf438411b6506759a80b8bad79608bb4029abf77535ffc8472e8e478d5d456c2260b5dd4bc68396180a9ebfed45f90bdc8d7d WHIRLPOOL 6d3d8786c74d4dfac384af3ea9f0cd8664e99aeaa766806ef8319c955135ab57092c2db27ef615def5574ab05c5a8a4e8e1f7bff9888a4cd3b3fc660c623fbe0
 DIST pecl-mysqlnd_ms-1.6.0_pre20141127.tar.xz 320604 SHA256 2cb2df946f020bcfcec1ff40b6a273dbfe69955fabe348a4804fba6897d55382 SHA512 44ca22d41d1064fb7ad3545978facd73f4279611769ee450016e8325013129b4414c637f3cb621078d4cd8e46a3ea5b9f4f16a580f9ecf389c637606a8c50ec5 WHIRLPOOL 640586e0cfbbf584cb18b4e38fbee9a90e0b929120428ea319e66276216f341a1ded65f08306be43028c8c13e3131e1f3fc98987386ccd03be39210616af5560
diff --git a/dev-php/pecl-mysqlnd_ms/pecl-mysqlnd_ms-1.5.2-r1.ebuild b/dev-php/pecl-mysqlnd_ms/pecl-mysqlnd_ms-1.5.2-r1.ebuild
deleted file mode 100644
index 9ac4bd2d93e3..000000000000
--- a/dev-php/pecl-mysqlnd_ms/pecl-mysqlnd_ms-1.5.2-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PHP_EXT_NAME="mysqlnd_ms"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-# php5-6 fails to build
-USE_PHP="php5-5"
-
-inherit php-ext-pecl-r2
-
-KEYWORDS="~amd64"
-
-DESCRIPTION="A replication and load balancing plugin for the mysqlnd library"
-LICENSE="PHP-3"
-SLOT="0"
-IUSE=""
-
-# Specifying targets due to USE flag transition
-DEPEND="
-	php_targets_php5-5? ( || (
-				 dev-lang/php:5.5[-libmysqlclient,mysql]
-				 dev-lang/php:5.5[-libmysqlclient,mysqli]
-				)
-			)
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-python/guessit/guessit-9999.ebuild b/dev-python/guessit/guessit-9999.ebuild
index 1386e0f88f0f..f885402d501a 100644
--- a/dev-python/guessit/guessit-9999.ebuild
+++ b/dev-python/guessit/guessit-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 
 inherit distutils-r1 git-r3
 
@@ -21,7 +21,7 @@ RDEPEND="
 	>=dev-python/babelfish-0.5.5[${PYTHON_USEDEP}]
 	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
 	<dev-python/python-dateutil-2.5.2[${PYTHON_USEDEP}]
-	>=dev-python/rebulk-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/rebulk-0.7.3[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/jaraco-text/Manifest b/dev-python/jaraco-text/Manifest
index b46fc90e0312..1a749a4ee1d1 100644
--- a/dev-python/jaraco-text/Manifest
+++ b/dev-python/jaraco-text/Manifest
@@ -1,2 +1,2 @@
-DIST jaraco.text-1.6.3.tar.gz 5971 SHA256 47f4e0cb30a34c50e16d369bf80a5a5119dd0692d5379d5091edced46956e501 SHA512 3eb15f6142c5afbea5deabca08cc7b1fa53afa84a8cdc0b9d488c58901dac32c4a5f9e79e7d6606aaed3658fc3266f9db486c68f5353eb524dc604f2e4b2dc35 WHIRLPOOL 313d2ecad01aa516886116e61ae2c118f0b5b135feb21938166a8c9166763686510f7d7c4900e6acef7bfab33e0db264562d664f790df3b5ec633114c20fdd13
 DIST jaraco.text-1.7.tar.gz 7020 SHA256 10ae286a70f391ab7b787863a8b3f538a0e2901d3c6eeffc0c4b23c13e608c1d SHA512 b1418dc19b52e353da3b2a332ffbc9a4201c6696ecc962722e25fd6549c8748a9dbea2cf76f658111aa4e3fd411ee999b526fa4d8148259866dbe95ebc4cfa95 WHIRLPOOL 5f08fd96576dbda3aaca3aca047bafe72939f66f61882a513cbe7dec07c3a8a187aa7eae9f5aedfe9ee9f4d497aae3dd0c62039f3ae7321687b11ed34f975e43
+DIST jaraco.text-1.8.tar.gz 7364 SHA256 297f7e7ba5b450c58db95d56a31b6429cb3ee4724f379d13f738e0128974348c SHA512 7f13eee9553d7531bf2f51af1b1c7fbb9d778cf082e6eb49948fc0943b7eb5a0268ec51b363ae9e96df854e0af5e38fbc4a679c746160e422759c044d4a33654 WHIRLPOOL 3abfa1d9322084bd5810f696c37f108952ed690b3a486a40668bceea229985b266499ee0ea1c1a5d4b6ef165a742acc2aa5540f0ae445d5bdbcf0aaba69db948
diff --git a/dev-python/jaraco-text/jaraco-text-1.6.3.ebuild b/dev-python/jaraco-text/jaraco-text-1.8.ebuild
similarity index 70%
rename from dev-python/jaraco-text/jaraco-text-1.6.3.ebuild
rename to dev-python/jaraco-text/jaraco-text-1.8.ebuild
index ecd06c13068a..5d53c24bb4a7 100644
--- a/dev-python/jaraco-text/jaraco-text-1.6.3.ebuild
+++ b/dev-python/jaraco-text/jaraco-text-1.8.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 
@@ -16,12 +16,16 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
+IUSE="doc test"
 
 PDEPEND="dev-python/jaraco-collections[${PYTHON_USEDEP}]"
 RDEPEND="dev-python/jaraco-functools[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/rst-linker[${PYTHON_USEDEP}]
+	)
 	test? (
 		${RDEPEND}
 		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
@@ -31,17 +35,15 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
-python_prepare_all() {
-	if use test; then
-		if has_version "${CATEGORY}/${PN}"; then
-			die "Ensure $PN is not already installed or the test suite will fail"
-		elif ! has_version "dev-python/jaraco-collections"; then
-			die "Ensure dev-python/jaraco-collections is installed or the test suite will fail"
-		fi
-	fi
-	distutils-r1_python_prepare_all
+python_compile_all() {
+	use doc && esetup.py build_sphinx
 }
 
 python_test() {
 	PYTHONPATH=. py.test || die "tests failed with ${EPYTHON}"
 }
+
+python_install_all() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 03801f3a8388..3f571f7d99bf 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,15 +1,19 @@
 DIST numpy-1.10.1.tar.gz 4048478 SHA256 8b9f453f29ce96a14e625100d3dcf8926301d36c5f622623bf8820e748510858 SHA512 ea717bac913a8e63bf93822bddbfe7701a3de00051bf3c7020f5e22756987becb5a2f96a6a52a36fc7c2b856815a782e450099688ce86b21fa94b0076b9ef376 WHIRLPOOL 7671368bec55c7f53ffa78a509946acc998e6f4223da4f3429b82a5a38b5e0277a0f89773ec2335f8e46b5c695620a4119af5ab59734184054c31b11841de44b
 DIST numpy-1.10.2.tar.gz 4055005 SHA256 23a3befdf955db4d616f8bb77b324680a80a323e0c42a7e8d7388ef578d8ffa9 SHA512 040db49593f3c53c9b43301eacffc3b5817310f1dbb91fd650efcf5ba65ce7e217549dc5268bc56846f19f1a03dd19470989005aa176531af44d602b3546b007 WHIRLPOOL 30c4b365aac6623241afd72fc30d3a543183205eb23db1366937e39fc50dee862923dd249775fee67cce0199940a57ec1423f1cb0e65ff7c65764c7969d7a76f
 DIST numpy-1.10.4.tar.gz 4069996 SHA256 7356e98fbcc529e8d540666f5a919912752e569150e9a4f8d869c686f14c720b SHA512 57ace46e357d49be0efd904e5ceb9862c626c916987c8798a12de7ae1e06816ad8483439ac4619792a04889631b5998f2397dc601c78dea33a784b4831c19c79 WHIRLPOOL 76946c2543b1cade06d71f83fd507bd818c1090baa9c3ddda7d1f48d48ed23672c5d9de76db890df990c6d8b7b26b71d3ce733c448943ad4177374a957360d1c
+DIST numpy-1.11.0.tar.gz 4169494 SHA256 a1d1268d200816bfb9727a7a27b78d8e37ecec2e4d5ebd33eb64e2789e0db43e SHA512 92c1889397ad013e25da3a0657fc01e787d528fc19c29cc2acd286c3f07d41b984252583457b1b9259fc303afbe9694565cdcf5752eb4ecb950cc7a99ec1ad8b WHIRLPOOL 192c998f10e1642582f152392999436495cc153af9fe529cc67fe6f6f05b574db6659cb540341be25c5ff404afb79bf5c1a0b3f219943c8d366d927568016b9e
 DIST numpy-1.8.2.tar.gz 3792998 SHA256 6d487fc724780d66746bde264ea71f5cd77d3a39e52ee2b073dcaed63bc669db SHA512 996e6b8e2d42f223e44660f56bf73eb8ab124f400d89218f8f5e4d7c9860ada44a4d7c54526137b0695c7a10f36e8834fbf0d42b7cb20bcdb5d5c245d673385c WHIRLPOOL 0d3a05b1e3c0a1ceb0a7b4818406dbb45506e5f25bc2727d4ff44cc0a0520e6556b3c68ae24dbca37ba9d67ae2defbb3ff9c906d4c2635b29ed44452d70e8311
 DIST numpy-1.9.2.tar.gz 3986067 SHA256 325e5f2b0b434ecb6e6882c7e1034cc6cdde3eeeea87dbc482575199a6aeef2a SHA512 70470ebb9afef5dfd0c83ceb7a9d5f1b7a072b1a9b54b04f04f5ed50fbaedd5b4906bd500472268d478f94df9e749a88698b1ff30f2d80258e7f3fec040617d9 WHIRLPOOL 59f5dc52cb95c7ce80fec3a7feac6cfda1d149596bf6d95c18bd8314e31a8df494b2b470c4cc3d8c296c9fc11c718d70d5b9b5344337175ca75496504c0fd201
 DIST numpy-1.9.3.tar.gz 3984430 SHA256 c3b74d3b9da4ceb11f66abd21e117da8cf584b63a0efbd01a9b7e91b693fbbd6 SHA512 32531cd8d1480a50812454ef8e3b68c0f84b2a4bc5de0df1457070db7f6fd94cdb50e6479a85fa4d1dc569a10d28f6864d5069fcf2a32fa20fa8803476a3df8c WHIRLPOOL a0235594e793625d5e3cef57956f4710587158885f39d7d1267c9845b12fb1d39fb9987ec095720c2d285c7c726383a15471f3629b739b77186470e2c40ba093
 DIST numpy-html-1.10.1.zip 9663942 SHA256 4af48eb5abf2551f01d85aea7e9a99a30096777f02937dc185b16bb72a110366 SHA512 9d1f3619b801c88604a0495290da4ae8cfb4800257d549214363c554c1dc09a736425d594ed88f492afee6ae7c68fe5c166b9b3a8f24637ea41d67fd23b9d9f9 WHIRLPOOL d6c93e31e31c832fb21f117d03719e0375ee3d27fb6f7975bfcd12469df4a2ed0a25a16bd09a0e2113407446efc220e5bff534f7cd76a715c3d7df26c02f07a1
+DIST numpy-html-1.11.0.zip 9879611 SHA256 0244bff4b585ab417be963f492e69129e54bb83d630b463591f9e89c62807d85 SHA512 7bf416030c273c767a98d0f23adef0e5fd05f96f6bb911e32ec88821a5bc7c47a2799d33fb0706cb2d391ea6e47b3e0eef0d789eb1c0d81c982cfaa991a09822 WHIRLPOOL d7e81340aa1ec46c2b0d36b76e7a1e11ba7d1b39177a8168efe734936e1622808c8997a8cc22f773b9c3e17b51f5861e11eaf7fa89e9b0c61cae937ee7b5fdba
 DIST numpy-html-1.8.1.zip 9703711 SHA256 f7fc3af4dba7b40deabd1828a86ea2e2eb5b9fa17c7ebddd73ee4cb8625105b1 SHA512 1d52c657931f4eebb5325159444aedd969b201f5098855058f1ef632dc8677372d632291154ebc3db9869cdb8abf7eb820eade1a9edba2d6be1ae918cb38c071 WHIRLPOOL e502b1416bad4b189773ba98035dfbeed0dc251d8f9b76e336450f14e8425caf92d55d2b1c2cc5ef9eb2d33eb2bf7cd55e720c1b265e45539b195fea1d7f046c
 DIST numpy-html-1.9.1.zip 9839137 SHA256 12a24937f8273fcf79090c99b6c4154a0ecfc378386498cf2afe727ea171407c SHA512 647a6be9f93995aca14185e283a2b412678c6e8080fe4f14e7cc9ee63c28eebb64dea6bbe28f30ef6850a5565dd1e06928fd660ac762e9a91454d309eff96ed4 WHIRLPOOL 68c367fd0416d27b1cf43edf7ca48bc8845c02856bbbacdf63c88fe8bbffd5dd86fb3e5cdea8f669dd78adf7bcc4d184953048783802df323126c1b22baf8e92
 DIST numpy-ref-1.10.1.pdf 5382006 SHA256 72ae03348d0375ff2f18056efd04e815cc1d27b738d0685c80f5204a496bc279 SHA512 25085eb7cb80343abffe04ee01ea93603427913ba4443fbfdaa1ef1ad07a8642c47259d0bb1cb91a9059f786c03395bba76f608c6f0a2fd26d1afec4847d885c WHIRLPOOL d904d9b2824bfb08a0eeffeb37f7d646d003c39230d950d387e2ddc8e475a117b8305a0ce3dc479be72f010b1a868f22ddfde17e6c4cd7c56630bbdf09afb90e
+DIST numpy-ref-1.11.0.pdf 5310792 SHA256 a975923b98f4dbd5a4736ab1c74a1c6393f422e3d1f9184bae2f12f041e3ac3e SHA512 a6bed225428645382846fcd60bc7961a44b0dc24cbfab3b4d0a1cee53092860f9db6226faf6597241ad6b9d6034837aace11214e0fc0c338702a574a9acf28df WHIRLPOOL c8757da7b11e4c47813112870dc96868d7bc6886d9454c0d18c6f8cad12c00a2185288233ffc41b580e9e232a1eaa4a19776055cff017ae56ff483fff0da1af1
 DIST numpy-ref-1.8.1.pdf 5348248 SHA256 973851e66d0d5ab095f444f8aeb966fefe2dd544226395abbb110fc1b60f351d SHA512 340dd8f47430f24fea81bb3a8674e1a58f4290a9d1c5d64bac96d50b31a94a770e78381e42daf8b0a6a90cefe5cafe86b0c89f7cc7635a042a7e85eb74bdbdf5 WHIRLPOOL be13f88bb68944186c564a5c3789daededade240a26e7fb61c980a090249ab3a5b1f40805e97214168fbf0c099fb6b12d981ff313bace572f130023b29e7aaa7
 DIST numpy-ref-1.9.1.pdf 5318122 SHA256 3c8e5881a3460e1cc9da95fe2167044e8f832ab8e980c3606d1f353e7ac6dcee SHA512 5171bb22588117a53e0eac355520581f7817a7e7a099ae83bb73f2ac8248a60e139ae9719dc543b44f25ccf8319c9f149fec1bf5aa55d943fad06a8e6da0d9ba WHIRLPOOL 5c99daf3ae2e6bf235aed287682f1b96d5b6afc9d290f544a8baab892b39c9f6dd9f649abe3e103cc90c990d87e4d653d8157d774a8bd35eccc9cc6ac7a870f9
 DIST numpy-user-1.10.1.pdf 406114 SHA256 5180a5a1333365e474aabba9d6edd25276e79179fd708bb3989d95dc4e76215f SHA512 998bce3777944e7b366c619e968ac4b6cc4351cd2819d6ecba7f422e20b6cd4d7332a8dede4036cd12e85b24c4c3d973bd9ef2d407610369c2591fce990fa8f4 WHIRLPOOL 4b53256663840738d288d38c4151e01ecfb515ebd4f69bb4330f4c5589642b3392a0a300f3def53df6bee8746f127a3af0d284601f288f4c4292df8b6de39f71
+DIST numpy-user-1.11.0.pdf 555403 SHA256 7ea6d24169d9e19d20ff131378d2bb5cd8b41658f242c87a1ffc53c3ac2e4b59 SHA512 8287acea5f6981119dfe223ff9cd2fd14f504b9a70418426ab716b80aea670b30249fbd727664ebf72d6d0660a84a57ff027a42cfe67946a7737a4308eebd786 WHIRLPOOL c72ad351a7f5cbd9c123c9d28c8178c7e463ee74e547a415d65dd6a5854fed090d86f9daa088eb79b48ca40e71d0ced5bc7cf938f631aece1846ae7eea9879b4
 DIST numpy-user-1.8.1.pdf 408305 SHA256 be827f2d92ef86c3af7f59c623017e7bc23ee95c64f88e8c9871f3ad1f99b262 SHA512 9e646e89e7e67834fa596e43082b43842d1c59287d22fd8d20c9f0a1d3d56a518a08cc2c036de4972ad0d6d9d3c2f56e2210f76e7244d3f7547b5204d84d3c7c WHIRLPOOL bf4105093b208b35b1914e842821b8d289b46eb28f1fda110643f5970bbfafe801e9d148c5f535b43eba9a23e09d333e3aecd9a55b33e64827883d253477d19a
 DIST numpy-user-1.9.1.pdf 418111 SHA256 e1f6baed0b73f3d4b106c88924c083f9a519e860c1beb718830bf1aee1892232 SHA512 724302468a8e93daf70d379bb1ee7369953e297c40ea260f080b7aca3c9c81e619a81705bdfb2ea214da5b5325ec2b48e953eceeaa1d60c07593b00c35989f45 WHIRLPOOL f93ed20c5da7b379e3afcafab97c7eb60231ed4f73cebf18184e00b9a8a5a531fa32992f7f28f16d2714b3056c61153c29267c8c6b93cb100e06f53bced1bd6a
diff --git a/dev-python/numpy/numpy-1.11.0.ebuild b/dev-python/numpy/numpy-1.11.0.ebuild
new file mode 100644
index 000000000000..09d81ec18909
--- /dev/null
+++ b/dev-python/numpy/numpy-1.11.0.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_REQ_USE="threads(+)"
+
+FORTRAN_NEEDED=lapack
+
+inherit distutils-r1 flag-o-matic fortran-2 multiprocessing toolchain-funcs versionator
+
+DOC_PV="1.11.0"
+DOC_P="${PN}-${DOC_PV}"
+
+DESCRIPTION="Fast array and numerical python library"
+HOMEPAGE="http://www.numpy.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	doc? (
+		http://docs.scipy.org/doc/${DOC_P}/${PN}-html-${DOC_PV}.zip
+		http://docs.scipy.org/doc/${DOC_P}/${PN}-ref-${DOC_PV}.pdf
+		http://docs.scipy.org/doc/${DOC_P}/${PN}-user-${DOC_PV}.pdf
+	)"
+# It appears the docs haven't been upgraded, still @ 1.8.1
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc lapack test"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	lapack? ( virtual/cblas virtual/lapack )"
+DEPEND="${RDEPEND}
+	doc? ( app-arch/unzip )
+	lapack? ( virtual/pkgconfig )
+	test? ( >=dev-python/nose-1.0[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.10.2-no-hardcode-blas.patch
+)
+
+src_unpack() {
+	default
+	if use doc; then
+		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
+	fi
+}
+
+pc_incdir() {
+	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
+		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libdir() {
+	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
+		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libs() {
+	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
+		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
+		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
+		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
+}
+
+python_prepare_all() {
+	if use lapack; then
+		append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
+		local libdir="${EPREFIX}"/usr/$(get_libdir)
+		cat >> site.cfg <<-EOF
+			[blas]
+			include_dirs = $(pc_incdir cblas)
+			library_dirs = $(pc_libdir cblas blas):${libdir}
+			blas_libs = $(pc_libs cblas blas)
+			[lapack]
+			library_dirs = $(pc_libdir lapack):${libdir}
+			lapack_libs = $(pc_libs lapack)
+		EOF
+	else
+		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
+	fi
+
+	export CC="$(tc-getCC) ${CFLAGS}"
+
+	append-flags -fno-strict-aliasing
+
+	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
+	# with the subtle difference that we don't want to break Darwin where
+	# -shared is not a valid linker argument
+	if [[ ${CHOST} != *-darwin* ]]; then
+		append-ldflags -shared
+	fi
+
+	# only one fortran to link with:
+	# linking with cblas and lapack library will force
+	# autodetecting and linking to all available fortran compilers
+	append-fflags -fPIC
+	if use lapack; then
+		NUMPY_FCONFIG="config_fc --noopt --noarch"
+		# workaround bug 335908
+		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
+	fi
+
+	# don't version f2py, we will handle it.
+	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
+
+	# we don't have f2py-3.3
+	sed \
+		-e 's:test_f2py:_&:g' \
+		-i numpy/tests/test_scripts.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile \
+		$(usex python_targets_python3_5 "" "-j $(makeopts_jobs)") \
+		${NUMPY_FCONFIG}
+}
+
+python_test() {
+	distutils_install_for_testing --single-version-externally-managed --record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
+
+	cd "${TMPDIR}" || die
+
+	${EPYTHON} -c "
+import numpy, sys
+r = numpy.test(label='full', verbose=3)
+sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install ${NUMPY_FCONFIG}
+}
+
+python_install_all() {
+	DOCS+=( THANKS.txt )
+
+	if use doc; then
+		HTML_DOCS=( "${WORKDIR}"/html/. )
+		DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
+	fi
+
+	distutils-r1_python_install_all
+
+	docinto f2py
+	dodoc doc/f2py/*.txt
+	doman doc/f2py/f2py.1
+}
diff --git a/dev-python/rebulk/Manifest b/dev-python/rebulk/Manifest
index 576720f4d807..f5b1659524a1 100644
--- a/dev-python/rebulk/Manifest
+++ b/dev-python/rebulk/Manifest
@@ -1 +1,2 @@
 DIST rebulk-0.7.2.tar.gz 254345 SHA256 ee4c75819c6d0eeedb531fb22c214e50f303ccc4703f27db1f993cd082ed5a20 SHA512 2855b6f754dd258e5e0ba8264cd6993c08fed141fb8b61f88b43beadea9acfcfeb54443c8708fa98de44f2c199dd900e6c9669dc616713dd61d873779f1df2f5 WHIRLPOOL a814772e5d34d6890b1435d652992a9b898435c4075619660351988d1ba955723a8440b8bde6a0c3e6547a465a9b040d085059a7938509a4edc9d7a21318148a
+DIST rebulk-0.7.3.tar.gz 254565 SHA256 1ee0f672be5cfeed793d294c1cfc078c254fb0966af59191e4f6a0785b3b1697 SHA512 9d1241c9ea4ce595d6bcc9ffbe7d43f91e4368d8a687b2907473be2a19a95dcd94e1a04669f753633736a3e691c7aae777af9b6ae964b487c75f763a84841a87 WHIRLPOOL 79a14cabbde87363913167a6429af2065e6ecc830a5fb680cc9c1c47f3d547b2faf25a564874015b8d6493a649536d025a80951af0c97bbf1765a489f4077d99
diff --git a/dev-python/rebulk/rebulk-0.7.2.ebuild b/dev-python/rebulk/rebulk-0.7.2.ebuild
index 2ca258c5b034..aac7c2b85ef4 100644
--- a/dev-python/rebulk/rebulk-0.7.2.ebuild
+++ b/dev-python/rebulk/rebulk-0.7.2.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Python library that performs advanced searches in strings"
 HOMEPAGE="https://github.com/Toilal/rebulk https://pypi.python.org/pypi/rebulk"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-LICENSE="MIT"
+LICENSE="MIT Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
diff --git a/dev-python/rebulk/rebulk-0.7.3.ebuild b/dev-python/rebulk/rebulk-0.7.3.ebuild
new file mode 100644
index 000000000000..aac7c2b85ef4
--- /dev/null
+++ b/dev-python/rebulk/rebulk-0.7.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library that performs advanced searches in strings"
+HOMEPAGE="https://github.com/Toilal/rebulk https://pypi.python.org/pypi/rebulk"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	# Remove base64-encoded zip archive with pytest.
+	rm runtests.py || die
+
+	# Disable unconditional dependency on dev-python/pytest-runner.
+	sed -i -e "s|'pytest-runner'||g" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/rebulk/rebulk-9999.ebuild b/dev-python/rebulk/rebulk-9999.ebuild
index 3ae8e3b9a223..3eb36b6705b8 100644
--- a/dev-python/rebulk/rebulk-9999.ebuild
+++ b/dev-python/rebulk/rebulk-9999.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Python library that performs advanced searches in strings"
 HOMEPAGE="https://github.com/Toilal/rebulk https://pypi.python.org/pypi/rebulk"
 EGIT_REPO_URI="git://github.com/Toilal/${PN}.git"
 
-LICENSE="MIT"
+LICENSE="MIT Apache-2.0"
 SLOT="0"
 KEYWORDS=""
 IUSE="test"
diff --git a/dev-ruby/activeldap/Manifest b/dev-ruby/activeldap/Manifest
index 3a846425e334..756ff7685c92 100644
--- a/dev-ruby/activeldap/Manifest
+++ b/dev-ruby/activeldap/Manifest
@@ -1,2 +1 @@
-DIST activeldap-4.0.5.gem 224768 SHA256 bcae4c7eea8250c3daf819209c7f269d531dc7741c68e8e5d57cad2bc951a49d SHA512 bf311997d96e90af796e70870a8b24da884547d6f8db7658a5093470261e6fd70585bca527f21447397aee1f1baaa91c79117884efbf70f4d976adcde025db80 WHIRLPOOL ea5adf3256ff99478a2a2d4aa6e0d856c8e9c27a269a22fe6d1856439d40d869a563c789c5aa10a8b61da2d7bc7193ba93cae1bc51b598633bd2429ae3e124ba
 DIST activeldap-4.0.6.gem 225280 SHA256 2b3660db97d49569eb514d1ab81a01eb3bbed7427cb95f38fef53eac3227be3e SHA512 03053e3798b557c73c3a0918b72d1d3c2cada4da3475913ef17a6f9f2f1ac1e102052459ef1a6d8c25ce41382b64c1a3097ccba1c768497a33a3a971b9778d3b WHIRLPOOL 4a9d282c8042feeeda3119c524e42fe783fafb1c040e09a5e7099c3a934ace0db9babed286334d125ed6e162fcbfc2284398e883f1285ae56176affc65f3abbd
diff --git a/dev-ruby/activeldap/activeldap-4.0.5.ebuild b/dev-ruby/activeldap/activeldap-4.0.5.ebuild
deleted file mode 100644
index cb8ce1667cfa..000000000000
--- a/dev-ruby/activeldap/activeldap-4.0.5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.textile TODO doc/text/*"
-RUBY_FAKEGEM_EXTRAINSTALL="po"
-
-inherit ruby-fakegem
-
-MY_P="${P/ruby-/}"
-DESCRIPTION="ActiveLDAP provides an activerecord inspired object oriented interface to LDAP"
-HOMEPAGE="https://github.com/activeldap/activeldap"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~amd64"
-IUSE=""
-
-# Most tests require a live LDAP server to run.
-RESTRICT="test"
-
-ruby_add_rdepend "
-	>dev-ruby/activemodel-4.0.0:*
-	dev-ruby/locale
-	dev-ruby/ruby-gettext
-	dev-ruby/gettext_i18n_rails
-	|| ( >=dev-ruby/ruby-ldap-0.8.2 dev-ruby/ruby-net-ldap )"
-
-all_ruby_install() {
-	all_fakegem_install
-
-	dodoc doc/text/*
-
-	insinto /usr/share/doc/${PF}
-	doins -r examples
-}
diff --git a/dev-ruby/activeldap/activeldap-4.0.6.ebuild b/dev-ruby/activeldap/activeldap-4.0.6.ebuild
index cb8ce1667cfa..0bdec0289b23 100644
--- a/dev-ruby/activeldap/activeldap-4.0.6.ebuild
+++ b/dev-ruby/activeldap/activeldap-4.0.6.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby20 ruby21"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README.textile TODO doc/text/*"
diff --git a/dev-ruby/mechanize/Manifest b/dev-ruby/mechanize/Manifest
index 74025f8e7f2b..762a0b2cc01f 100644
--- a/dev-ruby/mechanize/Manifest
+++ b/dev-ruby/mechanize/Manifest
@@ -1,2 +1,3 @@
 DIST mechanize-2.7.3.gem 133120 SHA256 3de7f3c2799be07b2788c8226e73cf9120a04ae79602c5bab2de6287e4575302 SHA512 5a06f1e7a1c97f985f3011358061c631bcc69e3092082959f738670c9491f734bc6dbbca321018fa484ee493f2f251b8af0cf17602fe381d491ff3e18663f2eb WHIRLPOOL 661869f23fd4f0a60a9a58ba35fd02cd51a65af79c66f8ab04d18498feb20f200d2959351ff44bcb4385f0c947e3b47e1b3e046735021d60d502256df8c63f98
 DIST mechanize-2.7.4.gem 137216 SHA256 1799d05733a1176a32179a210345a555b9a2bba4d1e2977f17fdcdf114aa6dd2 SHA512 d5d0dd824f3c2cee9111a55bff7323ed280cdb8f585169e71f35adcc2b9805b019867f916b425b9bfd655eaf2453ce405e6a303369dce7aff9e0bf4bd297f8c5 WHIRLPOOL 005dbe4be81b5cacd471c69867fa52919cff78b36259270269985553328ae4258fc829656cf093067c6a690beb4b88571f482351654ca41b1d4221f1ebb0bc75
+DIST mechanize-2.7.5.gem 137216 SHA256 de042b0b2b75a53b078c8e71ba6cc24e1d2a8b4e42ec3c81f1efd5294c0f06b9 SHA512 0dfd000d8f58be3fc08e2d6e625128135d6fc2d22e899152f46f66c545c6ede0d1e7b798f4b7de2f96ccdcf7c47001a3946866d0d6a19f9faa946ade6a4bcf92 WHIRLPOOL cccd374862087454cbcc0e7093d7d183d12c76e899fe2e0b72d2ddd8fbc732aa05e7bddd999c27c86b660587d18a8d08a6c51d6c426c13d204204d62df2e32cd
diff --git a/dev-ruby/mechanize/mechanize-2.7.5.ebuild b/dev-ruby/mechanize/mechanize-2.7.5.ebuild
new file mode 100644
index 000000000000..cf8852d97f81
--- /dev/null
+++ b/dev-ruby/mechanize/mechanize-2.7.5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc EXAMPLES.rdoc GUIDE.rdoc README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby library used for automating interaction with websites"
+HOMEPAGE="https://github.com/sparklemotion/mechanize"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend ">=dev-ruby/hoe-3.7
+	test? ( dev-ruby/minitest:5 )"
+ruby_add_rdepend ">=dev-ruby/nokogiri-1.6
+	>=dev-ruby/net-http-digest_auth-1.1.1
+	>=dev-ruby/net-http-persistent-2.5.2
+	>=dev-ruby/ntlm-http-0.1.1
+	>=dev-ruby/webrobots-0.0.9
+	>=dev-ruby/http-cookie-1.0.2
+	>=dev-ruby/mime-types-1.17.2:*
+	>=dev-ruby/domain_name-0.5.1"
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc examples/* || die
+}
diff --git a/dev-ruby/msgpack/Manifest b/dev-ruby/msgpack/Manifest
index 8e7692e753be..f928e44e5eae 100644
--- a/dev-ruby/msgpack/Manifest
+++ b/dev-ruby/msgpack/Manifest
@@ -1,3 +1,4 @@
 DIST msgpack-0.7.4.gem 74752 SHA256 c4fa8f8d727877b3dc9f90dfe0fff0b012df5d49e6498c5a33a4ec03f9e2be72 SHA512 4e78df4abe0f9c91a67f66108ee4e8420651d8d23a6ec7de9241138fd1065ce723ad68648c0bd4572801f800363e7f1f34362312d8f861857ffcdfc7accd950a WHIRLPOOL e08f686772af7e549e3997dfa382c8f94b97fe40ce1de3cb6fbfda01286d1e55bc80854c82869e0a0d54125a855e3761ede25225e9c8b69f5e732581bf23593e
 DIST msgpack-0.7.5.gem 74752 SHA256 ccb200af9a4fafad22af4c23617a7d41c955d8de6973ee597ef27fb0bf7d0721 SHA512 a726cee1552f0f09b3586ce0589354e5df48777ddb036eae04181bb9e8bfc2612a87bd3b0f87e4052631bc5a951a4d31449f6774c6353a0a51ecccb0647525e4 WHIRLPOOL c5799ea7c1e26b6a24e48512ebe40f6759b6bc1654f6210e15e1f0ad983dc7b33ea2a7fb4656b5fb9bcf4d9f1b80dfb31e593307028c47430d78e403fc1461ce
 DIST msgpack-0.7.6.gem 74752 SHA256 8537beb868cc6e742488c54928961cd79694fa0ef5d10772dd3e3eaf62ccc2ba SHA512 9d30533175118c08f671015a99664e4798c845f63595495933b42f0fa95c160a6708e472da70baeb64537a704dd4768cdc9ab99a19045daabd92555b21f4e389 WHIRLPOOL 879e5b6b3fc6cd82d28cce5c4f91621437b2cfc34caf21bdbad5d1bf48d8f7719c97b7b1f96e5648ddc77cee679911c58711a8804dc30765f1ae3ff7f8e32f94
+DIST msgpack-1.0.0.gem 76800 SHA256 14a6f9fefc354f169ab016258677b25ae082cf8af9ff667166cc50679686f4bd SHA512 e87c267a67cc8d89dcc499570bf3316a84643acfbd045ec7a66990b3388e9305c068b7d5c759d35e52c9acb1172794399d2df4a3db4b7685978f3488ff1c3eca WHIRLPOOL f22e1319ec8a0bce18f0197efe84e528ffba70771607e369c9571ef3355dc605a19ed70e0cbba372ea9fee8cfb81bb317207d3cf940435a46f8ecd24b99af1ac
diff --git a/dev-ruby/msgpack/msgpack-1.0.0.ebuild b/dev-ruby/msgpack/msgpack-1.0.0.ebuild
new file mode 100644
index 000000000000..fc0ae75af735
--- /dev/null
+++ b/dev-ruby/msgpack/msgpack-1.0.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+RUBY_FAKEGEM_TASK_DOC="doc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="Binary-based efficient data interchange format for ruby binding"
+HOMEPAGE="http://msgpack.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86-fbsd"
+IUSE="doc"
+
+ruby_add_bdepend "doc? ( dev-ruby/yard )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' Rakefile || die
+
+	# Remove jruby-specific specs that are run also for other rubies.
+	rm -rf spec/jruby || die
+
+	sed -i -e '/git ls-files/d' msgpack.gemspec || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/${PN} extconf.rb || die "Configuration of extension failed."
+
+	# rb_num2int is not inlined on 32 bit arches but also not explicitly
+	# defined, bug 582968
+	sed -i -e 's:-Wl,--no-undefined::' ext/${PN}/Makefile || die
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/${PN}
+	cp ext/${PN}/msgpack$(get_modname) lib/${PN} || die "Unable to install msgpack library."
+}
diff --git a/dev-ruby/neovim-ruby-client/Manifest b/dev-ruby/neovim-ruby-client/Manifest
new file mode 100644
index 000000000000..c36313871a8c
--- /dev/null
+++ b/dev-ruby/neovim-ruby-client/Manifest
@@ -0,0 +1 @@
+DIST neovim-0.3.0.gem 32256 SHA256 daf9851c1733a5674b0d29c07ac038436686bb75ec4bff00922d7caf9cd4f9e5 SHA512 ba6494da2022b50942df22a91c54674bd66794c1a60f62c5c08886232f93a66465f9d696ce5a84399f09a1dfcb1eea4edc96f752770e23e47b041c32c4f0c594 WHIRLPOOL 8b09cfcdb13788876b0667769182d4f2d06c45612f91253311486325d823d007d8bc163130aeec4d962b70504192be1f0604cec8662539d4db007022adea54d4
diff --git a/dev-ruby/neovim-ruby-client/metadata.xml b/dev-ruby/neovim-ruby-client/metadata.xml
new file mode 100644
index 000000000000..d8772d4166ca
--- /dev/null
+++ b/dev-ruby/neovim-ruby-client/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tranquility@gentoo.org</email>
+		<name>Ole Reifschneider</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-ruby/neovim-ruby-client/neovim-ruby-client-0.3.0.ebuild b/dev-ruby/neovim-ruby-client/neovim-ruby-client-0.3.0.ebuild
new file mode 100644
index 000000000000..18d7bed9f1c4
--- /dev/null
+++ b/dev-ruby/neovim-ruby-client/neovim-ruby-client-0.3.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby21 ruby22 ruby23"
+
+RUBY_FAKEGEM_NAME="neovim"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby bindings for Neovim"
+HOMEPAGE="https://github.com/alexgenco/neovim-ruby"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+ruby_add_rdepend ">=dev-ruby/msgpack-1.0.0"
diff --git a/dev-ruby/net-http-persistent/net-http-persistent-2.9.4-r2.ebuild b/dev-ruby/net-http-persistent/net-http-persistent-2.9.4-r2.ebuild
index a75b3501ff7d..6942f2199f08 100644
--- a/dev-ruby/net-http-persistent/net-http-persistent-2.9.4-r2.ebuild
+++ b/dev-ruby/net-http-persistent/net-http-persistent-2.9.4-r2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
 
 RUBY_FAKEGEM_TASK_DOC="docs"
 RUBY_FAKEGEM_DOCDIR="doc"
@@ -27,4 +27,7 @@ ruby_add_bdepend "doc? ( dev-ruby/hoe )
 all_ruby_prepare() {
 	# due to hoe
 	sed -i -e "/license/d" Rakefile || die
+
+	# Avoid unsafe legacy SSL version
+	sed -i -e '/ssl_version =/ s/:SSLv3/:TLSv1_2/' test/test_net_http_persistent_ssl_reuse.rb || die
 }
diff --git a/dev-ruby/test-unit-rr/test-unit-rr-1.0.5.ebuild b/dev-ruby/test-unit-rr/test-unit-rr-1.0.5.ebuild
index f367b214127b..7b4ab9b42a41 100644
--- a/dev-ruby/test-unit-rr/test-unit-rr-1.0.5.ebuild
+++ b/dev-ruby/test-unit-rr/test-unit-rr-1.0.5.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
diff --git a/dev-util/cargo/Manifest b/dev-util/cargo/Manifest
index 25665ff45804..71f795946ff4 100644
--- a/dev-util/cargo/Manifest
+++ b/dev-util/cargo/Manifest
@@ -4,25 +4,31 @@ DIST bitflags-0.1.1.crate 8719 SHA256 2a6577517ecd0ee0934f48a7295a89aaef3e6dfafe
 DIST bufstream-0.1.1.crate 7437 SHA256 7e493de6a8aed51697088e36dc5245ea3edd34e6872e32c732e5f996ed5b23b2 SHA512 e1d378a5dd9d6b096f9b8d9de018c17652615ff373d1644b0978b74325f22fba2157ce0aa9fba423e1f452119af1485a72c2e44f7b3b8c5350dfd3f8f2e93436 WHIRLPOOL de26e042bbb6323946d8570c682fa9ea08292508910ca7c928206935d6c1f6c888d3cb04bf285f1404b59c109cf813cc79ecbc64a6d16dfabf72412aabfc6be9
 DIST cargo-0.10.0.tar.gz 553862 SHA256 1e73c038681fe308195427b71322a6350c65d3b8cbea199e45c7b672b4754e0e SHA512 5fd4b517f251299bb19ba49392d544d92a96eb7ffb30ee59ccfcf7debe87d619042966d2b6198e250a0d96c8bb8e9a68f2b23361312b825d633617486f0d9540 WHIRLPOOL 5b06cbce387953892f155f7cba71eb24d0bd2e12d0492e0a92daae5922c8e92503276585225c981c64c26399f546bcb932917f62351207fcac06a8ce89b2ab67
 DIST cargo-0.11.0.tar.gz 566557 SHA256 4f390d7ea3352a1ecafb53d1a2b98c2e195b81a5c652342a8b91672d9f1dde0a SHA512 deb7254541182b0035cda2d4aecc30c55555ddcfebd660004de9b45d5c799619cbf4e79142dddca9e0a8469558d8f0d5268ea53221e62ef13a26a717731e6553 WHIRLPOOL 756c402579a97d296a2b92fb1b88c773b0de9cd53c37f1f0fe3cd5bdd0a4cb83b28454956fa0e301fe59fac02baa13db4a4f43f3640d38aeb8b49038c1118d00
+DIST cargo-0.12.0.tar.gz 574902 SHA256 4080d76b56b8202f7df271b4bb7d7d22abea5ff8c261aef42e6e5d248ca5972b SHA512 6fba348b068c07d49a6a263f143b31c3dff1e0aa399b90193830ad1823a3c07c5097fb39ff09fcc7713e78e85cfa1b5d8825db75055c49e2c3237fe4bffad3bc WHIRLPOOL dceacc324bf167276c0f3163c1a476064362679220e0c310c97021e69b691d3c03fc6b6f967b66290c7c63512ca70ac78c09642585ef5f96264bffd50603c832
 DIST cargo-registry-13b4aa0e3062a3938ed958adccd49e62614f509b.tar.gz 1936818 SHA256 7b76689604ad8c0fc1978dd7c9cb5d01e7ab5e97d673b4595280db786b9b8014 SHA512 87d0d60eccd924769057f5ef6bb013409cfdb9d4c658e10a18caf3954f74b2bf725170d9cded36ece6c3cf4385a8b8c05e72f1882ece3579d4fb3bdda77b5348 WHIRLPOOL 2f0a7b1789ad2916d822e1ae9ef0b8bb7dbf8d73d82b3b90f68ea85b28a607e71ad3faa41d7100b56a438a33e91f2fe18921e793556e988adbd870047acc8204
 DIST cargo-registry-4472288863a48749e63cc32d94867b4f5cff8d8e.tar.gz 1971962 SHA256 54e92420a6a6733e4a75d48181dea80b11c6705809bef45b3a50923908d4ed7f SHA512 de91baeb312fa0db3eaca3dd262403e0fdd48ca2a39f995565c68c6490f4174314ab828c457fee4c3c31c1e7d017704c663cc694cfdbe2b092f3c1a5cf9660e6 WHIRLPOOL 4d2a1c9af422f42582ae8be89e09ab7e5e364ff611c0cccfe04127328a1d2cea9e83c849b76b540309dd3f78df9ebbb6a82a35bacc1f47ced2db551a45702a0c
+DIST cargo-registry-64a9f2f594cefc2ca652e0cecf7ce6e41c0279ee.tar.gz 2149630 SHA256 3c0f6e30fa266e39975e8b983d325f34c0d34e6b9bfb82ad93c625b33f2adc82 SHA512 57341ef04e747ddb67d1105b7599ad59fbb386b71ae885158c5163654d409933e086bc55cc5bc15735afdb1013e3fe127df474269073c9d800c598af026592cc WHIRLPOOL d2eb55b69f5fc7163672a43e626d475b1bf4d15ddf0a66e6a0b8fa7dce2deb7bf5ed4aa5754db5761d483b6516bf97c2ad6b70e887473e036272725e749f0c1b
 DIST cargo-snapshot-amd64-2016-03-21.tar.gz 4163903 SHA256 55ad9a8929303b4e06c18d0dd30b0d6296da784606d9c55cce98d5d7fc39a0b2 SHA512 475087ff1905fc42bd875488696d8f67fc68f9fb3e48ef9f25bbd6d8f949aa9a3984f61a8bd1741ce8c98e33c6910e020ea7fd5cb67cf2b7fc1703947561ae0e WHIRLPOOL ddda8983c38f238237fbb78fd8242e08df44c31bd0c29d2e75b53dcb0ecc601660f4c765b00e066781da6feb9ccccf8df494b99228b126f3cdd89d028253c2c5
 DIST cargo-snapshot-x86-2016-03-21.tar.gz 3889095 SHA256 b2a1c4c33fb9274771c8d830cd8ac07f7ae96af341fa30399d6929ffd6c8b425 SHA512 3c6d6a9c6ee2a93abec5c9c3d79f86a623db6429e192d028729279c07d5769548d6f716afbd8e984ab2f6449f75cd24efb32b87f97b6b90c0e7b3b25779e8624 WHIRLPOOL 8bafd298e6cf54d22c420859c105be98047b556802494d2ccf9b13b06837f85902cf61fd1846dcff3e527d0ce0ee188723f44f4cb598cc34e0fedb6c2f2b3d41
 DIST cmake-0.1.16.crate 10125 SHA256 eb61a8d3b65f8e0af52ac579923ec48bdd5ca4e335c0fde4071e5860eb650532 SHA512 80f8f33fc66402b1a5a31f993349d9c6a6237ebe461e1aa24064eb31328e7f5901303b5753d1f62ece0881de9f7c1c42077488ce682a3889a8a74642a8b84f84 WHIRLPOOL 5a02bbda79faa44f3e3696f490e146fabf1a3a06a5563ea53040fa949086c5469afb82b8cb49cc52c360f7c2a31587f30039a49717574189a0062e575658502f
 DIST crossbeam-0.2.8.crate 31266 SHA256 348228ce9f93d20ffc30c18e575f82fa41b9c8bf064806c65d41eba4771595a0 SHA512 5dfb05b1213993d9577190952ed854b397774f1f33704a418a5b2525e2d2c4c872c50858dbb5d7ff3ecabda91091adf99684e4ec21ea865a744307e764fd6e73 WHIRLPOOL e330dd241631ec9cbaf35e830d287cb398785f084cdfe067fea6f1675bbaa7ab6e69603fb32def59c72269920a951bc9a53b432007fc16f6ab8def3dfe203222
 DIST curl-0.2.18.crate 19455 SHA256 2a48b72c66a1b8fc6767fe4f3cda7d6b9bdfab8f3f168344b830eddbbe8e2da0 SHA512 077b937a95e08af81f857a9604e77afc7f06caebed854d3a8bf36d0fb90a4cec3d1ca728d616b3ef9b534582e913ae070ad10b1f3e898eb88b9d733da3feb3c7 WHIRLPOOL eb1647f7ae146b3ae7d695e58f2f0e66b46d0c629294a4b4884ecf0b6dcfe624c3a9363c5ec7dc63f174fc27ce1cead5ca2f175d64cfb749687ee8b11bfbd25f
 DIST curl-0.2.19.crate 19463 SHA256 48121fcaa9dc3564dea237c5b473967c682dcc1a5910312d7b9fc54fd5bcc188 SHA512 7cfb829367c8c37ee1e7031d8986507fb5aa5d2745a3d89540d4168cd700cf51814451b1f30f5ce3b225ab3ccd01347c3b06de148700ef4335ebbdebf141b354 WHIRLPOOL da3e4b7001c3f8055c653f49489f22b3ed80e95964bc7fd961ca12d4fd0b1cfa1dc4393f3de3f4da3ffc96f35f656d827460fb8b56fb0f7e2db64fdfe334f8e1
+DIST curl-0.3.0.crate 45799 SHA256 26fa2377bacffb278a472dcc2c742577316527d2a8ce588455127c6ff4521846 SHA512 fed2b1b35a81de1d5a9374b8529b6525dae3365367aa1baa7e7e907635ff2bab79726e9f3741ce3631b7f2f6d0854ce9ae04b48b569b7ac1308634fd7d888511 WHIRLPOOL db4a4120a3c684ee4fac654cb5840f82feae9255d95027da6dde6f908484e191e2cc493686fd68c90482b4e0dd194f54ed79998f29bb39148ca57f6792d9a241
 DIST curl-sys-0.1.34.crate 3374363 SHA256 93196668f75a947d849e1f2db9277223884ece3af169cbff3d36ceeeaf7736b0 SHA512 52946a51da827c514ee9aa2091c14a096734649e33721d5036b66435ae07771ed77861c1779f0b45c6640f216034ca3bd3ebd2ee846b60c7cb7667417eca3478 WHIRLPOOL 7011ff3081fef6716a0d511a6b84245c72f43966366f65aa54f1283e95bd2d4c63d184aae0f8e114b09962c2c8d880992865ce7db266f7d46a2800851d609bd6
+DIST curl-sys-0.2.0.crate 3126940 SHA256 780c1e295903f12cb0598d73703f850615f685eeeb4f2323fbd2911ef337da7e SHA512 1025105dbaa790b66691cef41ce0478e10feb0371b599bb9b302df6d5cdd14ecaa17c1c92ff2f907f73c9998618273b9d1b088c98c94822dd00b7ca3434dff18 WHIRLPOOL 7b1252cf1aed2b3b604f721f71bb1d8694383cdb94941e61cba1d3187b12b1aff28a7073dd48cffa7aaff583c3ac41173aed27abaa1c5f7042b0a009abfaa5ec
 DIST docopt-0.6.78.crate 40287 SHA256 55792ca5bb933e55a3e17888838883f854b029945310c9a0ea4f65ebda366155 SHA512 16e0c972a90a9f5efc8cfc0eaaa48cb8a4ef4c95f4b484b536933453f542097c18e02ab046a7f567bc610f425e9c5fb95f26fb2b3cf8cd2af44e88a0158f5601 WHIRLPOOL 693bee9f338645831d007a20eaa79bd554cad07711b717e734d0de58fc6eab9ee13b4b62b6116a864faded4eec5e2c530699ae36063ab5d9bf2a3e00db812acd
 DIST env_logger-0.3.2.crate 5144 SHA256 b6bbe7c0b619c81b9a1fd122ab3c7ef19a7b27cdba3c8486314b6f275ca211a4 SHA512 ad6c4da0f2bcf12fa770419bf21d8fb91654bf4527e9c13904f738a4b56e1a07a56ee5068e83939e15eef4354a0fa8981a7aba70ca3e6f1c3fa2658e2fa29630 WHIRLPOOL 09bad00e5b37e9a1260cc602d26b138566589b6e0efbb2abea312832bacd2825d942c2587158f6c365da8c6a78864acbb4b398ccf0cf922bd5669d5af6867c8b
 DIST filetime-0.1.10.crate 8884 SHA256 5363ab8e4139b8568a6237db5248646e5a8a2f89bd5ccb02092182b11fd3e922 SHA512 19245d71f60f144828adb6f9336adc5371e559decc8740338122327d28b7c548d011d9e6454b12475f0eb2db7dacdb1e2bfbef01311f59e8338f44d27c3345eb WHIRLPOOL 2af8d65033a9cef609d6688a32953c8ec9ac591ed6c357b62f86a028124d1a0c50199daadf839079771c00b4201971bacecc3928094fd77f9d4c872be8e01c10
 DIST flate2-0.2.13.crate 45773 SHA256 f9e6fc69e0509336ff58a2e5ab91c7a9629cb78bad26e67d8c4489f5a648addb SHA512 68b35b7e1e3a8c637497220be69add34fc63a98689545ff69c7ff51d34ea79388a781aed078566d55f262f34abf5ee1c63e56017b7a5240cf1144a9285a7ad82 WHIRLPOOL af6b03203d320c0d6c988b5521ef8b80565af5be0b33da4abb62d212621b381e5f81a3095a85f649b97ddea14d6ed47106365655dc3b6753edf6a6cc7f1d6fff
 DIST fs2-0.2.3.crate 12692 SHA256 a24f693fd93d04099962297dcdba0578b490d79ef26e0105204179520698bf91 SHA512 4164762069ef1035ea422b9894f2710cb6eeb11a579c6558cd0b1b3ec798b82a06e43c427011db72977937f27434733ca0336a6e92c93ccc8721a1629f53c804 WHIRLPOOL 3c634d19f5fcf700331126b02c3eaf6203765ef1739f7617f118ca97a59274f339603316a13660c832ed01af03349cb54fce7d31f383f675bb719d631a1f29b8
 DIST gcc-0.3.26.crate 21465 SHA256 3337bf4deec8dd33c331a62b59708f5b438779b8089b1888d56976ac2c325d3e SHA512 d05490df031078b79a97902a9283c7b62951453b9ddeb3f8bf612d13bf8ca8bcebb331dd69424323f7e55ada528db6ade28e7fb715ae4b1b9653abbe85b0bd22 WHIRLPOOL b60f22cc26fbf6d56297da26732bb52154c27a92f27724629c754b17c92d72a497eec15b3a2efee0b4c9f30e82e6433a94a10f045ed1b0733dc81dea6499ae27
+DIST gdi32-sys-0.1.1.crate 4886 SHA256 65256ec4dc2592e6f05bfc1ca3b956a4e0698aa90b1dff1f5687d55a5a3fd59a SHA512 36f23c174c3ecb2e5297b8d6ee5734e9e9afabf6088dcad71d96666a402132208dad2e78ac2de067b9706d4e4d99ed2bd0225d1d15440b639268394586d37c0c WHIRLPOOL 177f97c8f7509b2dc300f2e63f0229804370d086fb7098c778c6ade582892e3007a1844b0f3673f25e9d3a4577a24f7fbd7af2550f2b9bab0a90f6e487cfaf9e
 DIST git2-0.4.2.crate 113631 SHA256 1c663e06498eaced90ccd830ac23332b5b521b9a9ee82d095520b3394b5e9098 SHA512 00fe6cb1ea92e42688848a2dd996cf09756e39eb154fc822f7610c04f7f90d72ac045d773bf435c56443adfa659203b663e34d9ac01eb479d8c4d06b524a720d WHIRLPOOL be960957f7b0d149667459641114e9f1dcdffb0763762f930e0157fbadfd94b6643d8634887d60c577365b8fa8ae3e54e1a7296aa5880bce0be6798a3a31080a
 DIST git2-0.4.3.crate 115276 SHA256 c4f04d03627ebb8eac2b4e5f3411041583e86338ab98fcbb8f1c8e74d1f5eef7 SHA512 267cd096d8b5ed4c0196c4539c710041f75d550c571dedbfda35b0ce2fb90cc898cf88a8e8e96cf0d6fc377d9abfe6c79414d3122b7d8652cbd469ed6ee9bea6 WHIRLPOOL 9a8059047f8a7e42c5ad7f1600a4c93b11375a75d4b7d190ac2ea707d6a5515c1757ea0f5e0bca5cde6c1ca601e6ac30273ab0c031a567ca132eafab7ba70e71
 DIST git2-curl-0.4.0.crate 3810 SHA256 c13dafba61b79dc9fa45b40b0478a5196cab2b571a355128667fae951bb2d0cc SHA512 5472500d546050990c622059947e20363c8363463e82c4f523ccb6a276213afe4bce065af456600f8fe339c6c8b5064850024b268a2ae5a98f776ac48ed19542 WHIRLPOOL 825fef26f100b057d9723abc6504a573f7ab895d7ce48c99845719d471ac09fa50ba1055e3af4facbb3133080e9bbe15f67ed74b2e09eb47dd34b94afe170f99
 DIST git2-curl-0.4.1.crate 3805 SHA256 870f65fda2b83d780fffd7df723463edca29c807a1c84b451bace6b3b8f30d1a SHA512 87c164cf8c2d49c3579e1412ea3a17f12b89f78d37d5c83a04ee4f97adf9ec20900c3c460c9e3ad6a70ded2474270afa26c2fd284029731edd5e56ec542bec17 WHIRLPOOL c383267757881cc9f9f0dcc76a02fb36d83c62e1c9c96b620c4cd82b3b5cbed151a6e854a345959b609d29e9a6d811ad6d079b69cd7dee83be043985317c6f89
+DIST git2-curl-0.5.0.crate 4060 SHA256 3d5f766d804e3cf2b90e16ab77c3ddedcb1ca5d2456cadb7b3f907345f8c3498 SHA512 c88b5db20a2e718c89734bfbbd94e74c40cd118ed2775b30230a136707158370557cd09a452b592e6cabd04b5f524013f1dd0ec27410b29d805965f786e71396 WHIRLPOOL a9fb05966a8cbf63ddb23369c7f8c03249964860ec0c7439d9d2cd9f834a3c8440dc03eca3ab01033f45b87cac41e0b29cb4ae4b8ce0c70f9e5631384e8e2693
 DIST glob-0.2.11.crate 18065 SHA256 8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb SHA512 91a1a751bc4ed3b13154aa056180f2b8123c33627cbe972bdd7986fb0b6f1ef90e59abd4128d6e4db5e69523d757440c7df9b9721a61f5ea5a091ffc9843e10e WHIRLPOOL 5f9b80d74ffcda693a008367d73fa0646b1dd73068fcd0075227d15c9bfcc86a05fe8a34163fe9d12806ef10d35f27649459ae05de71abd3a044f99baae041d1
 DIST hamcrest-0.1.0.crate 4027 SHA256 27c180b409b988760a018e5cb5f0812bd67e87f40236e41d3b9375d3046e04ab SHA512 c343a36d346a1128628f31661d196cd9e91254a71b1d9d64f5ea4a16fb439b74032239985056b993b81f79cdf8a1a4e0e6f435c00b864ed2be8044c57a5f3d7d WHIRLPOOL ffb793b767cb97fb50237547709af92782e5903552ddb65b3e7827b8cfda9da2748b44ead5790af62a0ab5030805d030d13a7ec164695b12697714234a943e5a
 DIST idna-0.1.0.crate 234027 SHA256 1053236e00ce4f668aeca4a769a09b3bf5a682d802abd6f3cb39374f6b162c11 SHA512 a3bdcd7934c8f2823e8be7b467a829334ab53c71e225f2ae73b379db6bf47c8c8fb28d30900eb18c7ce79e9d9780d45babff3d7e77c20640001e6f6ad93b2424 WHIRLPOOL 9bfe69ec718606736b4844a6884872dfb2cf608b3a21494016abbcb44d08400c489a8f51f142b6892501073d3d67b634d6ab593c0282032f5be3ccbbc517db0f
@@ -57,6 +63,7 @@ DIST tempdir-0.3.4.crate 8469 SHA256 0b62933a3f96cd559700662c34f8bab881d9e354028
 DIST term-0.4.4.crate 35853 SHA256 3deff8a2b3b6607d6d7cc32ac25c0b33709453ca9cceac006caac51e963cf94a SHA512 df99c7273ca6f97ec3d9206f98601540d26370124a7a5404cc072bf2e6621bc48fa74101e60f29bea10869278401193648e253fc2029f4cf8e3c8303625b11f7 WHIRLPOOL 57de8f4d686d6806fd18a3de9ead347d2c4c8b63af5175d3c2df4e894ffe13b62caa93774bd320e3d2c42108849012071bce8c07414856af8374884661bd164a
 DIST time-0.1.34.crate 26771 SHA256 8c4aeaa1c95974f5763c3a5ac0db95a19793589bcea5d22e161b5587e3aad029 SHA512 6d16b2556bcbd1ca153f29061303c76fb606ca6e926767f58a8affc8926b6bb762cb11fffb42d2c234d5913a12de329ae9b0a96c7546373c036eb84c7154b872 WHIRLPOOL 683f39f2ddca741985cf76d4b737ef3f313d8d0fb0060ca710acf7e3ac1d3bd490cec8363732251a70fcc3fd404a3c0377a45d005be37993826301efe55af15b
 DIST toml-0.1.28.crate 42323 SHA256 fcd27a04ca509aff336ba5eb2abc58d456f52c4ff64d9724d88acb85ead560b6 SHA512 4b4af8fa2f9079259e2c4ebddde70e82f96603c4ec69a266394366671a5c42c61a6ea13fd51145a97c286ca48cbe731650065fac1c20822f818aff48f2a2b13c WHIRLPOOL 7746b110241648466382a1e73ccf7569ed996f49270e2552443f7ff23bbe4bae3fc22e87513239828387efb1ba984220957dabe6b70bbaee14463a38cbea6d75
+DIST toml-0.1.30.crate 45082 SHA256 0590d72182e50e879c4da3b11c6488dae18fccb1ae0c7a3eda18e16795844796 SHA512 e6d06f47750fea66705f7b7e34c396665c564dc7687a9d1ff5f56bb63f37aaa991c253a022f76aa8857e9b95dcb0c11d0246889df98d4c8aca34ba7e1fb97ae7 WHIRLPOOL 54546e97c4fd2054cd96787d504dffc752be7d139f119cf4cdcdd4141ce86f6cc7af21eefdb72743a919a6e848b6432e3d33e2bf7d46c92b7438596dd28e41d1
 DIST unicode-bidi-0.2.3.crate 1744003 SHA256 c1f7ceb96afdfeedee42bade65a0d585a6a0106f681b6749c8ff4daa8df30b3f SHA512 fb067746b4788c7110bc2687850dc11183c7e596453b42c0c4764c59c1686faf4d03a52b6c147c6578d88b8a2f3f1257d88010874b6ff0bb942b41e055c00a08 WHIRLPOOL cea3be7073b65971b303213f2eec72035c80b65bc306231e2af067ec58cfab3ce2d2a1b38a2e4a5a537a94e7458573b1cc7cc8b44aa3b62a2595ffc532343b11
 DIST unicode-normalization-0.1.2.crate 612931 SHA256 26643a2f83bac55f1976fb716c10234485f9202dcd65cfbdf9da49867b271172 SHA512 b6dc4316a875de59ee00f89ac0e9b255d0111dc2e2e45395ed726282502ab7b6cfcd56acff7f409b97a2f36d5278e16936359791be6bc8fba1213ca6c8a888df WHIRLPOOL 89b477db1efd9ff153140c485cce0d4c0457ccf30fa8ad765fe14a27e94f8506521b64dbbee7b300da2786e139738583ce255b78192534d63aac9d2fd833cc92
 DIST url-0.2.38.crate 48716 SHA256 cbaa8377a162d88e7d15db0cf110c8523453edcbc5bc66d2b6fffccffa34a068 SHA512 c9bd32c8a50de3a41b25197af8441007a6d552074beb7d1c5cd8bdd47548df19990010f735bfae64822df8454e26e9b08c6d5d633517109958c59e93f6d1b966 WHIRLPOOL a13a2e31f949343533461035e53dc9c44939eb84ec361ac546ff33668d3a2d1072887e641a833034e7f356cb8a810b4e3564f8a7921ad6c37bcbb0fcc2247c4b
diff --git a/dev-util/cargo/cargo-0.12.0.ebuild b/dev-util/cargo/cargo-0.12.0.ebuild
new file mode 100644
index 000000000000..8e7c7d527edf
--- /dev/null
+++ b/dev-util/cargo/cargo-0.12.0.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+CARGO_SNAPSHOT_DATE="2016-03-21"
+CARGO_INDEX_COMMIT="64a9f2f594cefc2ca652e0cecf7ce6e41c0279ee"
+CRATES="advapi32-sys-0.1.2
+aho-corasick-0.5.1
+bitflags-0.1.1
+bufstream-0.1.1
+cmake-0.1.16
+crossbeam-0.2.8
+curl-0.3.0
+curl-sys-0.2.0
+docopt-0.6.78
+env_logger-0.3.2
+filetime-0.1.10
+flate2-0.2.13
+fs2-0.2.3
+gcc-0.3.26
+gdi32-sys-0.1.1
+git2-0.4.3
+git2-curl-0.5.0
+glob-0.2.11
+hamcrest-0.1.0
+idna-0.1.0
+kernel32-sys-0.2.1
+libc-0.2.8
+libgit2-sys-0.4.3
+libressl-pnacl-sys-2.1.6
+libssh2-sys-0.1.37
+libz-sys-1.0.2
+log-0.3.5
+matches-0.1.2
+memchr-0.1.10
+miniz-sys-0.1.7
+miow-0.1.2
+net2-0.2.24
+nom-1.2.2
+num-0.1.31
+num_cpus-0.2.11
+openssl-sys-0.7.8
+pkg-config-0.3.8
+pnacl-build-helper-1.4.10
+rand-0.3.14
+regex-0.1.58
+regex-syntax-0.3.0
+rustc-serialize-0.3.18
+semver-0.2.3
+strsim-0.3.0
+tar-0.4.5
+tempdir-0.3.4
+term-0.4.4
+toml-0.1.30
+unicode-bidi-0.2.3
+unicode-normalization-0.1.2
+url-1.1.0
+user32-sys-0.1.2
+utf8-ranges-0.1.3
+winapi-0.2.6
+winapi-build-0.1.1
+"
+
+inherit cargo bash-completion-r1
+
+DESCRIPTION="The Rust's package manager"
+HOMEPAGE="http://crates.io"
+SRC_URI="https://github.com/rust-lang/cargo/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/rust-lang/crates.io-index/archive/${CARGO_INDEX_COMMIT}.tar.gz -> cargo-registry-${CARGO_INDEX_COMMIT}.tar.gz
+	$(cargo_crate_uris ${CRATES})
+	x86?   (
+		https://static.rust-lang.org/cargo-dist/${CARGO_SNAPSHOT_DATE}/cargo-nightly-i686-unknown-linux-gnu.tar.gz ->
+		cargo-snapshot-x86-${CARGO_SNAPSHOT_DATE}.tar.gz
+	)
+	amd64? (
+		https://static.rust-lang.org/cargo-dist/${CARGO_SNAPSHOT_DATE}/cargo-nightly-x86_64-unknown-linux-gnu.tar.gz ->
+		cargo-snapshot-amd64-${CARGO_SNAPSHOT_DATE}.tar.gz
+	)"
+
+RESTRICT="mirror"
+LICENSE="|| ( MIT Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="doc"
+
+COMMON_DEPEND="sys-libs/zlib
+	dev-libs/openssl:0=
+	net-libs/libssh2
+	net-libs/http-parser"
+RDEPEND="${COMMON_DEPEND}
+	!dev-util/cargo-bin
+	net-misc/curl[ssl]"
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/rust-1.1.0:stable
+	dev-util/cmake
+	sys-apps/coreutils
+	sys-apps/diffutils
+	sys-apps/findutils
+	sys-apps/sed"
+
+src_configure() {
+	# Cargo only supports these GNU triples:
+	# - Linux: <arch>-unknown-linux-gnu
+	# - MacOS: <arch>-apple-darwin
+	# - Windows: <arch>-pc-windows-gnu
+	# where <arch> could be 'x86_64' (amd64) or 'i686' (x86)
+	use amd64 && CTARGET="x86_64-unknown-linux-gnu"
+	use x86 && CTARGET="i686-unknown-linux-gnu"
+
+	# NOTE: 'disable-nightly' is used by crates (such as 'matches') to entirely
+	# skip their internal libraries that make use of unstable rustc features.
+	# Don't use 'enable-nightly' with a stable release of rustc as DEPEND,
+	# otherwise you could get compilation issues.
+	# see: github.com/gentoo/gentoo-rust/issues/13
+	local myeconfargs=(
+		--host=${CTARGET}
+		--build=${CTARGET}
+		--target=${CTARGET}
+		--enable-optimize
+		--disable-nightly
+		--disable-verify-install
+		--disable-debug
+		--disable-cross-tests
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# Building sources
+	export CARGO_HOME="${ECARGO_HOME}"
+	emake VERBOSE=1 PKG_CONFIG_PATH=""
+
+	# Building HTML documentation
+	use doc && emake doc
+}
+
+src_install() {
+	emake prepare-image-${CTARGET} IMGDIR_${CTARGET}="${ED}/usr"
+
+	# Install HTML documentation
+	use doc && HTML_DOCS=("target/doc")
+	einstalldocs
+
+	dobashcomp "${ED}"/usr/etc/bash_completion.d/cargo
+	rm -rf "${ED}"/usr/etc || die
+}
+
+src_test() {
+	# Running unit tests
+	# NOTE: by default 'make test' uses the copy of cargo (v0.0.1-pre-nighyly)
+	# from the installer snapshot instead of the version just built, so the
+	# ebuild needs to override the value of CFG_LOCAL_CARGO to avoid false
+	# positives from unit tests.
+	emake test \
+		CFG_ENABLE_OPTIMIZE=1 \
+		VERBOSE=1 \
+		CFG_LOCAL_CARGO="${WORKDIR}"/${P}/target/${CTARGET}/release/cargo
+}
diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index 1c94c4e21b74..95505dfd1e49 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -1,3 +1,4 @@
 DIST cppcheck-1.72.tar.bz2 1125775 SHA256 9460b184ff2d8dd15344f3e2f42f634c86e4dd3303e1e9b3f13dc67536aab420 SHA512 13b2348c97a3777feaad579f8620f18d90f6f934f92f5db712c7190af1f40042527500aefa4c8ccd348f7691b1c0d5f32115085c9385dec55460d5ba0804a410 WHIRLPOOL 790514f4b5b9c539a30daa691d268c6c5f1077743cde1af8834248eb4213224275e9f72cea46f3b378119a3d0944d7e8d63270c0cd47517c7f382c683a1938fe
 DIST cppcheck-1.73.tar.bz2 1147270 SHA256 36f68354734310203c285fac17aed47bb82131fc0487145b9c0386301cd5fe50 SHA512 a703cb47016982c27509bd46fa601b5baf359b0c44be188e2f5fe7d64b2accc392af5aa803a5e298b778f15b979585781ecd1459c8d2dd8b033f34cb1bad15a7 WHIRLPOOL 1ecbcd36f3ed36c0db3a9e6c99b730c164c5e4a680dfa1f6b3a84df5a9e4e7ca0ab902d34306dcaf12c9ffd686fbac4492f07b12b99d862d9152db6ffeac377c
 DIST cppcheck-1.74.tar.bz2 1151321 SHA256 c05b2f7e4619326f4cbdf6465d517cd0e37349e1221356470d75a97ca35fc254 SHA512 aa77747618ae16d796c428dc5931dc39bb51774dcdbea740c5cfc0f353c3b825c9673c84d0f2196cb8749f54c66f2d358f45b372aa5db9b057d3de740d852f01 WHIRLPOOL 07aa11a0e5478ea9c7eafa79359259d3570424d3a7dfd0ad2d623a69157d09fbdb2f72ce576d19db142d67a69b2b0663b7e37d42d2ea5781401eb6723123dd1b
+DIST cppcheck-1.75.tar.bz2 1152511 SHA256 57c70043c1330ed915cbd1a17ecc5408f2637a05062970508e990b1ba28760a0 SHA512 74116a7a2cd1c8c9a06c81f3f4de3de281f24ee30692729de5506dc7572ed694e55c32d1ad72196a9b95005e9f8d749bd82655323f8ff56051997c2ffc4ed57f WHIRLPOOL a42979e35041d382b1df755b0cdfb4c51951388d2b097856fa08b3ca6b39bdd99a13809a8b514b1fc0502ac0183a08e0f1ed742100e38a14ee2f7337ddda1f01
diff --git a/dev-util/cppcheck/cppcheck-1.75.ebuild b/dev-util/cppcheck/cppcheck-1.75.ebuild
new file mode 100644
index 000000000000..dfd60d72b059
--- /dev/null
+++ b/dev-util/cppcheck/cppcheck-1.75.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+
+inherit distutils-r1 eutils qt4-r2 toolchain-funcs flag-o-matic
+
+DESCRIPTION="static analyzer of C/C++ code"
+HOMEPAGE="http://cppcheck.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="htmlreport pcre qt4"
+
+RDEPEND="htmlreport? ( dev-python/pygments[${PYTHON_USEDEP}] )
+	>=dev-libs/tinyxml2-2
+	qt4? ( dev-qt/qtgui:4 )
+	pcre? ( dev-libs/libpcre )"
+DEPEND="${RDEPEND}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig"
+
+src_prepare() {
+	append-cxxflags -std=c++0x
+
+	# Drop bundled libs, patch Makefile generator and re-run it
+	rm -r externals/tinyxml || die
+	epatch "${FILESDIR}"/${PN}-1.75-tinyxml2.patch
+	tc-export CXX
+	emake dmake
+	./dmake || die
+
+	epatch_user
+}
+
+src_configure() {
+	if use pcre ; then
+		sed -e '/HAVE_RULES=/s:=no:=yes:' \
+			-i Makefile
+	fi
+	if use qt4 ; then
+		pushd gui
+		qt4-r2_src_configure
+		popd
+	fi
+}
+
+src_compile() {
+	export LIBS="$(pkg-config --libs tinyxml2)"
+	emake ${PN} man \
+		CFGDIR="${EROOT}usr/share/${PN}/cfg" \
+		DB2MAN="${EROOT}usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl"
+
+	if use qt4 ; then
+		pushd gui
+		qt4-r2_src_compile
+		popd
+	fi
+	if use htmlreport ; then
+		pushd htmlreport
+		distutils-r1_src_compile
+		popd
+	fi
+}
+
+src_test() {
+	# safe final version
+	mv -v ${PN}{,.final}
+	mv -v lib/library.o{,.final}
+	mv -v cli/cppcheckexecutor.o{,.final}
+	#trigger recompile with CFGDIR inside ${S}
+	emake check CFGDIR="${S}/cfg"
+	# restore
+	mv -v ${PN}{.final,}
+	mv -v lib/library.o{.final,}
+	mv -v cli/cppcheckexecutor.o{.final,}
+}
+
+src_install() {
+	# it's not autotools-based, so "${ED}" here, not "${D}", bug 531760
+	emake install DESTDIR="${ED}"
+
+	insinto "/usr/share/${PN}/cfg"
+	doins cfg/*.cfg
+	if use qt4 ; then
+		dobin gui/${PN}-gui
+		dodoc gui/{projectfile.txt,gui.${PN}}
+	fi
+	if use htmlreport ; then
+		pushd htmlreport
+		distutils-r1_src_install
+		popd
+		find "${D}" -name "*.egg-info" -delete
+	else
+		rm "${ED}/usr/bin/cppcheck-htmlreport" || die
+	fi
+	doman ${PN}.1
+	dodoc -r triage
+}
diff --git a/dev-util/cppcheck/cppcheck-9999.ebuild b/dev-util/cppcheck/cppcheck-9999.ebuild
index 937cc7f07e13..2c2c287ca4c9 100644
--- a/dev-util/cppcheck/cppcheck-9999.ebuild
+++ b/dev-util/cppcheck/cppcheck-9999.ebuild
@@ -31,7 +31,7 @@ src_prepare() {
 
 	# Drop bundled libs, patch Makefile generator and re-run it
 	rm -r externals/tinyxml || die
-	epatch "${FILESDIR}"/${PN}-9999-tinyxml2.patch
+	epatch "${FILESDIR}"/${PN}-1.75-tinyxml2.patch
 	tc-export CXX
 	emake dmake
 	./dmake || die
diff --git a/dev-util/cppcheck/files/cppcheck-9999-tinyxml2.patch b/dev-util/cppcheck/files/cppcheck-1.75-tinyxml2.patch
similarity index 100%
rename from dev-util/cppcheck/files/cppcheck-9999-tinyxml2.patch
rename to dev-util/cppcheck/files/cppcheck-1.75-tinyxml2.patch
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index a4d7b2f0aa9a..2abd62b111ec 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 22 Aug 2016 14:10:42 +0000
+Tue, 23 Aug 2016 06:10:35 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index a4d7b2f0aa9a..2abd62b111ec 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 22 Aug 2016 14:10:42 +0000
+Tue, 23 Aug 2016 06:10:35 +0000
diff --git a/metadata/md5-cache/app-antivirus/clamav-unofficial-sigs-4.9.2 b/metadata/md5-cache/app-antivirus/clamav-unofficial-sigs-4.9.2
deleted file mode 100644
index 56d1f0bf03e1..000000000000
--- a/metadata/md5-cache/app-antivirus/clamav-unofficial-sigs-4.9.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DEPEND=app-antivirus/clamav
-DESCRIPTION=Download and install third-party clamav signatures
-EAPI=6
-HOMEPAGE=https://github.com/extremeshok/clamav-unofficial-sigs
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=app-antivirus/clamav app-crypt/gnupg dev-lang/perl net-dns/bind-tools net-misc/curl
-SLOT=0
-SRC_URI=https://github.com/extremeshok/clamav-unofficial-sigs/archive/4.9.2.tar.gz -> clamav-unofficial-sigs-4.9.2.tar.gz
-_md5_=90f10de752778fd6010ac604f8d439cc
diff --git a/metadata/md5-cache/app-antivirus/clamav-unofficial-sigs-5.3.2 b/metadata/md5-cache/app-antivirus/clamav-unofficial-sigs-5.4.1
similarity index 88%
rename from metadata/md5-cache/app-antivirus/clamav-unofficial-sigs-5.3.2
rename to metadata/md5-cache/app-antivirus/clamav-unofficial-sigs-5.4.1
index 39e75df3cd91..a1895c2daa2a 100644
--- a/metadata/md5-cache/app-antivirus/clamav-unofficial-sigs-5.3.2
+++ b/metadata/md5-cache/app-antivirus/clamav-unofficial-sigs-5.4.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=app-antivirus/clamav app-crypt/gnupg dev-lang/perl net-dns/bind-tools || ( net-misc/wget net-misc/curl )
 SLOT=0
-SRC_URI=https://github.com/extremeshok/clamav-unofficial-sigs/archive/5.3.2.tar.gz -> clamav-unofficial-sigs-5.3.2.tar.gz
+SRC_URI=https://github.com/extremeshok/clamav-unofficial-sigs/archive/5.4.1.tar.gz -> clamav-unofficial-sigs-5.4.1.tar.gz
 _md5_=8886308133cdbb1452be233808077a33
diff --git a/metadata/md5-cache/app-crypt/sbsigntool-0.8 b/metadata/md5-cache/app-crypt/sbsigntool-0.8
new file mode 100644
index 000000000000..3d580f58aced
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/sbsigntool-0.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-apps/util-linux sys-apps/help2man sys-boot/gnu-efi sys-libs/binutils-libs virtual/pkgconfig
+DESCRIPTION=Utilities for signing and verifying files for UEFI Secure Boot
+EAPI=5
+HOMEPAGE=https://git.kernel.org/cgit/linux/kernel/git/jejb/sbsigntools.git/
+IUSE=libressl
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3 LGPL-3 LGPL-2.1 CC0-1.0
+RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-apps/util-linux
+SLOT=0
+SRC_URI=https://kernel.googlesource.com/pub/scm/linux/kernel/git/jejb/sbsigntools.git/+archive/df8303a4e37e42cce36d8ef7d4ea4d75b1080e28.tar.gz -> sbsigntool-0.8.tar.gz https://dev.gentoo.org/~tamiko/distfiles/sbsigntool-0.8-ccan.tar.gz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_md5_=ef33ab8593c38383ff74c75a0beff32e
diff --git a/metadata/md5-cache/app-editors/neovim-0.1.5 b/metadata/md5-cache/app-editors/neovim-0.1.5
new file mode 100644
index 000000000000..aefc1bb72c1d
--- /dev/null
+++ b/metadata/md5-cache/app-editors/neovim-0.1.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/luajit:2 >=dev-libs/libtermkey-0.17 >=dev-libs/libuv-1.2.0 >=dev-libs/msgpack-1.0.0 >=dev-libs/unibilium-1.1.1 dev-libs/libvterm dev-lua/lpeg[luajit] dev-lua/mpack[luajit] jemalloc? ( dev-libs/jemalloc ) virtual/libiconv virtual/libintl sys-devel/make >=dev-util/cmake-2.8.12
+DESCRIPTION=Vim-fork focused on extensibility and agility.
+EAPI=5
+HOMEPAGE=https://neovim.io
+IUSE=+nvimpager perl python ruby +jemalloc
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 vim
+RDEPEND=dev-lang/luajit:2 >=dev-libs/libtermkey-0.17 >=dev-libs/libuv-1.2.0 >=dev-libs/msgpack-1.0.0 >=dev-libs/unibilium-1.1.1 dev-libs/libvterm dev-lua/lpeg[luajit] dev-lua/mpack[luajit] jemalloc? ( dev-libs/jemalloc ) perl? ( dev-lang/perl ) python? ( dev-python/neovim-python-client ) ruby? ( dev-ruby/neovim-ruby-client )
+SLOT=0
+SRC_URI=https://github.com/neovim/neovim/archive/v0.1.5.tar.gz -> neovim-0.1.5.tar.gz
+_eclasses_=cmake-utils	022d8ca5c8887ca2d21e83b57f5c75ff	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=0a1520687989b00eae08f96483da91ed
diff --git a/metadata/md5-cache/app-editors/neovim-9999 b/metadata/md5-cache/app-editors/neovim-9999
index 1e05730e5a94..a47106ff0049 100644
--- a/metadata/md5-cache/app-editors/neovim-9999
+++ b/metadata/md5-cache/app-editors/neovim-9999
@@ -3,9 +3,9 @@ DEPEND=dev-lang/luajit:2 >=dev-libs/libtermkey-0.17 >=dev-libs/libuv-1.2.0 >=dev
 DESCRIPTION=Vim-fork focused on extensibility and agility.
 EAPI=5
 HOMEPAGE=https://neovim.io
-IUSE=+nvimpager perl python +jemalloc
+IUSE=+nvimpager perl python ruby +jemalloc
 LICENSE=Apache-2.0 vim
-RDEPEND=dev-lang/luajit:2 >=dev-libs/libtermkey-0.17 >=dev-libs/libuv-1.2.0 >=dev-libs/msgpack-1.0.0 >=dev-libs/unibilium-1.1.1 dev-libs/libvterm dev-lua/lpeg[luajit] dev-lua/mpack[luajit] jemalloc? ( dev-libs/jemalloc ) perl? ( dev-lang/perl ) python? ( dev-python/neovim-python-client )
+RDEPEND=dev-lang/luajit:2 >=dev-libs/libtermkey-0.17 >=dev-libs/libuv-1.2.0 >=dev-libs/msgpack-1.0.0 >=dev-libs/unibilium-1.1.1 dev-libs/libvterm dev-lua/lpeg[luajit] dev-lua/mpack[luajit] jemalloc? ( dev-libs/jemalloc ) perl? ( dev-lang/perl ) python? ( dev-python/neovim-python-client ) ruby? ( dev-ruby/neovim-ruby-client )
 SLOT=0
 _eclasses_=cmake-utils	022d8ca5c8887ca2d21e83b57f5c75ff	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	git-r3	00f60a84fc7b499c99edfe99caea9f95	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=da53c2a2c7d9d0307bfd2d7f7c30c164
+_md5_=0a1520687989b00eae08f96483da91ed
diff --git a/metadata/md5-cache/app-misc/mosquitto-1.4.9 b/metadata/md5-cache/app-misc/mosquitto-1.4.9
new file mode 100644
index 000000000000..fba94ed49b0e
--- /dev/null
+++ b/metadata/md5-cache/app-misc/mosquitto-1.4.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=tcpd? ( sys-apps/tcp-wrappers ) ssl? ( dev-libs/openssl:0= ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) srv? ( net-dns/c-ares ) virtual/pkgconfig
+DESCRIPTION=An Open Source MQTT v3 Broker
+EAPI=5
+HOMEPAGE=http://mosquitto.org/
+IUSE=bridge examples +persistence +srv ssl tcpd
+KEYWORDS=~amd64 ~x86
+LICENSE=EPL-1.0
+RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) ssl? ( dev-libs/openssl:0= )
+SLOT=0
+SRC_URI=http://mosquitto.org/files/source/mosquitto-1.4.9.tar.gz
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	user	c66cbe7502fe1161066eb947d15b79f6
+_md5_=c55a57a2ee853cd2faf7d5215607987b
diff --git a/metadata/md5-cache/app-office/scribus-1.5.2 b/metadata/md5-cache/app-office/scribus-1.5.2
new file mode 100644
index 000000000000..883e0d2381d5
--- /dev/null
+++ b/metadata/md5-cache/app-office/scribus-1.5.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/python-2.7.5-r2:2.7[tk?] >=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(+)] app-text/libmspub >=app-text/poppler-0.19.0:= dev-libs/boost dev-libs/hyphen dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 media-libs/libcdr media-libs/libpagemaker media-libs/libpng:0 media-libs/libvisio media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= >=x11-libs/cairo-1.10.0[X,svg] boost? ( dev-libs/boost ) hunspell? ( app-text/hunspell ) graphicsmagick? ( media-gfx/graphicsmagick ) osg? ( dev-games/openscenegraph ) pdf? ( app-text/podofo:0= ) scripts? ( dev-python/pillow[tk?,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(+)] ) tk? ( dev-python/pillow[tk?,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-qt/linguist-tools:5 virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12
+DESCRIPTION=Desktop publishing (DTP) and layout program
+EAPI=5
+HOMEPAGE=http://www.scribus.net/
+IUSE=+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts templates tk linguas_af linguas_ar linguas_bg linguas_br linguas_ca linguas_ca_ES linguas_cs linguas_cs_CZ linguas_cy linguas_cy_GB linguas_da linguas_da_DK linguas_de linguas_de_1901 linguas_de_CH linguas_de_DE linguas_el linguas_en_AU linguas_en_EN linguas_en_GB linguas_en_US linguas_eo linguas_es linguas_es_ES linguas_et linguas_eu linguas_fi linguas_fi_FI linguas_fr linguas_gl linguas_he linguas_hr linguas_hu linguas_hu_HU linguas_ia linguas_id linguas_id_ID linguas_is linguas_is_IS linguas_it linguas_ja linguas_ko linguas_ku linguas_la linguas_lt linguas_lt_LT linguas_nb_NO linguas_nl linguas_nn_NO linguas_pl linguas_pl_PL linguas_pt linguas_pt_BR linguas_pt_PT linguas_ro linguas_ro_RO linguas_ru linguas_ru_RU_0 linguas_sa linguas_sk linguas_sk_SK linguas_sl linguas_sl_SI linguas_sq linguas_sr linguas_sv linguas_sv_SE linguas_th_TH linguas_tr linguas_uk linguas_uk_UA linguas_zh_CN linguas_zh_TW python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/python-2.7.5-r2:2.7[tk?] >=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(+)] app-text/libmspub >=app-text/poppler-0.19.0:= dev-libs/boost dev-libs/hyphen dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 media-libs/libcdr media-libs/libpagemaker media-libs/libpng:0 media-libs/libvisio media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= >=x11-libs/cairo-1.10.0[X,svg] boost? ( dev-libs/boost ) hunspell? ( app-text/hunspell ) graphicsmagick? ( media-gfx/graphicsmagick ) osg? ( dev-games/openscenegraph ) pdf? ( app-text/podofo:0= ) scripts? ( dev-python/pillow[tk?,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(+)] ) tk? ( dev-python/pillow[tk?,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(+)] ) app-text/ghostscript-gpl
+REQUIRED_USE=python_targets_python2_7 tk? ( scripts )
+SLOT=0
+SRC_URI=mirror://sourceforge/project/scribus/scribus-devel/1.5.2/scribus-1.5.2.tar.xz
+_eclasses_=cmake-utils	022d8ca5c8887ca2d21e83b57f5c75ff	eutils	792f83d5ec9536cb5ccef375469d8bde	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=f822c9eda7b51eae63974614f1f0cd2e
diff --git a/metadata/md5-cache/app-portage/metagen-0.6.5-r1 b/metadata/md5-cache/app-portage/metagen-0.6.5-r1
index 75920779e078..1ce49f44c12d 100644
--- a/metadata/md5-cache/app-portage/metagen-0.6.5-r1
+++ b/metadata/md5-cache/app-portage/metagen-0.6.5-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/jaxml-3.01[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( ( >=sys-apps/portage-2.3.0_rc1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-portage/repoman ) <sys-apps/portage-2.3.0_rc1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=>=dev-python/jaxml-3.01[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( ( >=sys-apps/portage-2.3.0_rc1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-portage/repoman[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) <sys-apps/portage-2.3.0_rc1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=metadata.xml generator for ebuilds
 EAPI=5
 HOMEPAGE=https://cgit.gentoo.org/proj/metagen.git
 IUSE=python_targets_python2_7
 KEYWORDS=~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=>=dev-python/jaxml-3.01[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( ( >=sys-apps/portage-2.3.0_rc1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-portage/repoman ) <sys-apps/portage-2.3.0_rc1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=>=dev-python/jaxml-3.01[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( ( >=sys-apps/portage-2.3.0_rc1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-portage/repoman[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) <sys-apps/portage-2.3.0_rc1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://cgit.gentoo.org/proj/metagen.git/snapshot/metagen-0.6.5.tar.bz2
 _eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=3843f58a09246e60a9526c31789e1200
+_md5_=93054e2a11415383c3467f7392f043d3
diff --git a/metadata/md5-cache/app-portage/metagen-9999 b/metadata/md5-cache/app-portage/metagen-9999
index 3c6897eef562..490b26b8d41f 100644
--- a/metadata/md5-cache/app-portage/metagen-9999
+++ b/metadata/md5-cache/app-portage/metagen-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-python/jaxml-3.01[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( ( >=sys-apps/portage-2.3.0_rc1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-portage/repoman ) <sys-apps/portage-2.3.0_rc1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1
+DEPEND=>=dev-python/jaxml-3.01[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( ( >=sys-apps/portage-2.3.0_rc1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-portage/repoman[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) <sys-apps/portage-2.3.0_rc1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1
 DESCRIPTION=metadata.xml generator for ebuilds
 EAPI=5
 HOMEPAGE=https://cgit.gentoo.org/proj/metagen.git
 IUSE=python_targets_python2_7
 LICENSE=GPL-2
-RDEPEND=>=dev-python/jaxml-3.01[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( ( >=sys-apps/portage-2.3.0_rc1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-portage/repoman ) <sys-apps/portage-2.3.0_rc1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=>=dev-python/jaxml-3.01[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( ( >=sys-apps/portage-2.3.0_rc1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-portage/repoman[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) <sys-apps/portage-2.3.0_rc1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	792f83d5ec9536cb5ccef375469d8bde	git-r3	00f60a84fc7b499c99edfe99caea9f95	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=54d993a2ace31bed0d3e1543abf42c08
+_md5_=6e73c325ffb3b1aa8f932aa211a2ead8
diff --git a/metadata/md5-cache/app-text/itex2mml-1.5.4 b/metadata/md5-cache/app-text/itex2mml-1.5.4
new file mode 100644
index 000000000000..d9b81a9930fe
--- /dev/null
+++ b/metadata/md5-cache/app-text/itex2mml-1.5.4
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=A LaTeX into XHTML/MathML converter
+EAPI=5
+HOMEPAGE=http://golem.ph.utexas.edu/~distler/blog/itex2MML.html
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=|| ( GPL-2+ MPL-1.1 LGPL-2+ )
+SLOT=0
+SRC_URI=http://golem.ph.utexas.edu/~distler/blog/files/itexToMML-1.5.4.tar.gz
+_eclasses_=multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_md5_=d194d252643b4d8a3a59e3edd7f38b3e
diff --git a/metadata/md5-cache/app-text/poppler-0.47.0 b/metadata/md5-cache/app-text/poppler-0.47.0
new file mode 100644
index 000000000000..3d7504cc7a74
--- /dev/null
+++ b/metadata/md5-cache/app-text/poppler-0.47.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=media-libs/fontconfig-2.6.0 >=media-libs/freetype-2.3.9 sys-libs/zlib cairo? ( dev-libs/glib:2 >=x11-libs/cairo-1.10.0 introspection? ( >=dev-libs/gobject-introspection-1.32.1:= ) ) cairo-qt? ( >=x11-libs/cairo-1.10.0 ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12
+DESCRIPTION=PDF rendering library based on the xpdf-3.0 code base
+EAPI=6
+HOMEPAGE=https://poppler.freedesktop.org/
+IUSE=cairo cairo-qt cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt4 qt5 tiff +utils
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=>=media-libs/fontconfig-2.6.0 >=media-libs/freetype-2.3.9 sys-libs/zlib cairo? ( dev-libs/glib:2 >=x11-libs/cairo-1.10.0 introspection? ( >=dev-libs/gobject-introspection-1.32.1:= ) ) cairo-qt? ( >=x11-libs/cairo-1.10.0 ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) cjk? ( >=app-text/poppler-data-0.4.7 )
+REQUIRED_USE=cairo-qt? ( qt4 )
+RESTRICT=test
+SLOT=0/63
+SRC_URI=https://poppler.freedesktop.org/poppler-0.47.0.tar.xz
+_eclasses_=cmake-utils	022d8ca5c8887ca2d21e83b57f5c75ff	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=239fae290fbaef6dcd548ea2c7cd771c
diff --git a/metadata/md5-cache/dev-lang/php-5.6.24-r2 b/metadata/md5-cache/dev-lang/php-5.6.25
similarity index 99%
rename from metadata/md5-cache/dev-lang/php-5.6.24-r2
rename to metadata/md5-cache/dev-lang/php-5.6.25
index c2bb1383cdc1..855e623e6d70 100644
--- a/metadata/md5-cache/dev-lang/php-5.6.24-r2
+++ b/metadata/md5-cache/dev-lang/php-5.6.25
@@ -9,6 +9,6 @@ LICENSE=PHP-3
 RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( dev-libs/gmp:0 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0 ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) vpx? ( media-libs/libvpx ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
 REQUIRED_USE=cli? ( ^^ ( readline libedit ) ) truetype? ( gd ) vpx? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) libmysqlclient? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysql !mysqli ) sharedmem? ( !threads ) !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )
 SLOT=5.6
-SRC_URI=http://php.net/distributions/php-5.6.24.tar.xz
+SRC_URI=http://php.net/distributions/php-5.6.25.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ec4dede98f286615e28473a9824e4b5a
diff --git a/metadata/md5-cache/dev-lang/php-7.0.9-r2 b/metadata/md5-cache/dev-lang/php-7.0.10
similarity index 99%
rename from metadata/md5-cache/dev-lang/php-7.0.9-r2
rename to metadata/md5-cache/dev-lang/php-7.0.10
index 88ae70e7274b..c655b0d9663e 100644
--- a/metadata/md5-cache/dev-lang/php-7.0.9-r2
+++ b/metadata/md5-cache/dev-lang/php-7.0.10
@@ -9,6 +9,6 @@ LICENSE=PHP-3
 RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( dev-libs/gmp:0 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0 ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
 REQUIRED_USE=cli? ( ^^ ( readline libedit ) ) truetype? ( gd ) webp? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli ) sharedmem? ( !threads ) mysql? ( || ( mysqli pdo ) ) || ( cli cgi fpm apache2 embed phpdbg )
 SLOT=7.0
-SRC_URI=http://php.net/distributions/php-7.0.9.tar.xz
+SRC_URI=http://php.net/distributions/php-7.0.10.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0bb7c8cdcbacf310fd560b2f25417755
diff --git a/metadata/md5-cache/dev-lang/rust-1.11.0 b/metadata/md5-cache/dev-lang/rust-1.11.0
new file mode 100644
index 000000000000..c0dd08a1bd7d
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/rust-1.11.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=libcxx? ( sys-libs/libcxx ) system-llvm? ( >=sys-devel/llvm-3.8.1-r2:=[multitarget] <sys-devel/llvm-3.9.0:=[multitarget] ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/perl-5.0 clang? ( sys-devel/clang )
+DESCRIPTION=Systems programming language from Mozilla
+EAPI=6
+HOMEPAGE=http://www.rust-lang.org/
+IUSE=clang debug doc libcxx +system-llvm
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
+PDEPEND=>=app-eselect/eselect-rust-0.3_pre20150425
+RDEPEND=libcxx? ( sys-libs/libcxx ) system-llvm? ( >=sys-devel/llvm-3.8.1-r2:=[multitarget] <sys-devel/llvm-3.9.0:=[multitarget] )
+REQUIRED_USE=libcxx? ( clang )
+SLOT=stable/1.11
+SRC_URI=https://static.rust-lang.org/dist/rustc-1.11.0-src.tar.gz -> rustc-1.11.0-src.tar.gz amd64? ( https://static.rust-lang.org/dist/rustc-1.10.0-x86_64-unknown-linux-gnu.tar.gz ) x86? ( https://static.rust-lang.org/dist/rustc-1.10.0-i686-unknown-linux-gnu.tar.gz )
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=511f08ac5ba233954989985d8ddd91cc
diff --git a/metadata/md5-cache/dev-libs/snowball-stemmer-0.20091122 b/metadata/md5-cache/dev-libs/snowball-stemmer-0.20091122
deleted file mode 100644
index 3f34dc191d43..000000000000
--- a/metadata/md5-cache/dev-libs/snowball-stemmer-0.20091122
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=This contains all you need to include the snowball stemming algorithms into a C project of your own
-EAPI=5
-HOMEPAGE=http://snowball.tartarus.org/download.php
-IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
-LICENSE=BSD-2
-SLOT=0
-SRC_URI=mirror://gentoo/libstemmer_c-20091122.tgz
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c03e191bdb64bac2c2054d4750aed136
diff --git a/metadata/md5-cache/dev-libs/snowball-stemmer-0.20140325 b/metadata/md5-cache/dev-libs/snowball-stemmer-0.20140325
index 9a826d77aa69..8c05c804876b 100644
--- a/metadata/md5-cache/dev-libs/snowball-stemmer-0.20140325
+++ b/metadata/md5-cache/dev-libs/snowball-stemmer-0.20140325
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile install prepare
-DESCRIPTION=This contains all you need to include the snowball stemming algorithms into a C project of your own
+DESCRIPTION=All you need to include the snowball stemming algorithms into a C project
 EAPI=5
-HOMEPAGE=http://snowball.tartarus.org/download.php
+HOMEPAGE=https://snowballstem.org/
 IUSE=static-libs
 KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~graaff/libstemmer_c-20140325.tgz
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3c90030aac5149db028070fe7b861e18
+_md5_=623b83a93a3407a45d0f96993a27b3ae
diff --git a/metadata/md5-cache/dev-php/pecl-mailparse-2.1.6-r3 b/metadata/md5-cache/dev-php/pecl-mailparse-2.1.6-r3
index 6c98ca2f8943..6739c1c95bd8 100644
--- a/metadata/md5-cache/dev-php/pecl-mailparse-2.1.6-r3
+++ b/metadata/md5-cache/dev-php/pecl-mailparse-2.1.6-r3
@@ -4,11 +4,11 @@ DESCRIPTION=PHP extension for parsing RFC822 and RFC2045 (MIME) messages
 EAPI=6
 HOMEPAGE=http://pecl.php.net/mailparse
 IUSE=php_targets_php5-5 php_targets_php5-6
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=PHP-2.02
 RDEPEND=php_targets_php5-5? ( dev-lang/php:5.5[unicode] ) php_targets_php5-6? ( dev-lang/php:5.6[unicode] ) php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-6? ( dev-lang/php:5.6 )
 REQUIRED_USE=|| ( php_targets_php5-5 php_targets_php5-6 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/mailparse-2.1.6.tgz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	php-ext-pecl-r3	362ad55b4b4b63dd1cf7df6cbca082c3	php-ext-source-r3	3772105f27fbde7de9a8b3bfb48e1e41	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=3790e7670bf1a58c2db031eee55101a2
+_md5_=f22e5d23f6106f94b30569378c94305b
diff --git a/metadata/md5-cache/dev-php/pecl-mysqlnd_ms-1.5.2-r1 b/metadata/md5-cache/dev-php/pecl-mysqlnd_ms-1.5.2-r1
deleted file mode 100644
index 90f5b9e3e497..000000000000
--- a/metadata/md5-cache/dev-php/pecl-mysqlnd_ms-1.5.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=php_targets_php5-5? ( || ( dev-lang/php:5.5[-libmysqlclient,mysql] dev-lang/php:5.5[-libmysqlclient,mysqli] ) ) !<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 >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-5? ( dev-lang/php:5.5 )
-DESCRIPTION=A replication and load balancing plugin for the mysqlnd library
-EAPI=5
-HOMEPAGE=http://pecl.php.net/mysqlnd_ms
-IUSE=php_targets_php5-5
-KEYWORDS=~amd64
-LICENSE=PHP-3
-RDEPEND=php_targets_php5-5? ( || ( dev-lang/php:5.5[-libmysqlclient,mysql] dev-lang/php:5.5[-libmysqlclient,mysqli] ) ) php_targets_php5-5? ( dev-lang/php:5.5 )
-REQUIRED_USE=|| ( php_targets_php5-5 )
-SLOT=0
-SRC_URI=http://pecl.php.net/get/mysqlnd_ms-1.5.2.tgz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	php-ext-pecl-r2	738a8315cc641f854af2e615c618e70b	php-ext-source-r2	d3d06f8b11fb8481e555b58df7360663	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=b9f74ef520af3e040c48598b148bae9b
diff --git a/metadata/md5-cache/dev-python/guessit-9999 b/metadata/md5-cache/dev-python/guessit-9999
index 626451bf841f..74c62e1fb8f9 100644
--- a/metadata/md5-cache/dev-python/guessit-9999
+++ b/metadata/md5-cache/dev-python/guessit-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-python/babelfish-0.5.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-dateutil-2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/python-dateutil-2.5.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/rebulk-0.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( >=dev-python/pytest-2.7.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pytest-capturelog[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-vcs/git-1.8.2.1
+DEPEND=>=dev-python/babelfish-0.5.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-dateutil-2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/python-dateutil-2.5.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/rebulk-0.7.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( >=dev-python/pytest-2.7.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest-capturelog[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Python library for guessing information from video filenames
 EAPI=6
 HOMEPAGE=https://github.com/guessit-io/guessit https://pypi.python.org/pypi/guessit
-IUSE=test python_targets_python2_7 python_targets_python3_4
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
 LICENSE=LGPL-3
-RDEPEND=>=dev-python/babelfish-0.5.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-dateutil-2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/python-dateutil-2.5.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/rebulk-0.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
+RDEPEND=>=dev-python/babelfish-0.5.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-dateutil-2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/python-dateutil-2.5.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/rebulk-0.7.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 _eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	792f83d5ec9536cb5ccef375469d8bde	git-r3	00f60a84fc7b499c99edfe99caea9f95	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=b3b72953e173927061f5a5350b455adb
+_md5_=d8cc985753b49e7f0221e645be24f829
diff --git a/metadata/md5-cache/dev-python/jaraco-text-1.6.3 b/metadata/md5-cache/dev-python/jaraco-text-1.6.3
deleted file mode 100644
index cf03976e41e7..000000000000
--- a/metadata/md5-cache/dev-python/jaraco-text-1.6.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/setuptools_scm-1.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/jaraco-functools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pytest-2.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Text utilities used by other projects by developer jaraco
-EAPI=5
-HOMEPAGE=https://github.com/jaraco/jaraco.text
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-PDEPEND=dev-python/jaraco-collections[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-RDEPEND=dev-python/jaraco-functools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/j/jaraco.text/jaraco.text-1.6.3.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=f4666af4a49d0f903f052fc67b166f7b
diff --git a/metadata/md5-cache/dev-python/jaraco-text-1.8 b/metadata/md5-cache/dev-python/jaraco-text-1.8
new file mode 100644
index 000000000000..d4565f0bc837
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jaraco-text-1.8
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/setuptools_scm-1.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/rst-linker[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) test? ( dev-python/jaraco-functools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pytest-2.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Text utilities used by other projects by developer jaraco
+EAPI=6
+HOMEPAGE=https://github.com/jaraco/jaraco.text
+IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+PDEPEND=dev-python/jaraco-collections[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+RDEPEND=dev-python/jaraco-functools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/j/jaraco.text/jaraco.text-1.8.tar.gz
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=4eedace1a5240658e870804acf58212c
diff --git a/metadata/md5-cache/dev-python/numpy-1.11.0 b/metadata/md5-cache/dev-python/numpy-1.11.0
new file mode 100644
index 000000000000..b8279f5182d9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/numpy-1.11.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] lapack? ( virtual/cblas virtual/lapack ) doc? ( app-arch/unzip ) lapack? ( virtual/pkgconfig ) test? ( >=dev-python/nose-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] lapack? ( virtual/fortran )
+DESCRIPTION=Fast array and numerical python library
+EAPI=6
+HOMEPAGE=http://www.numpy.org/
+IUSE=doc lapack test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] lapack? ( virtual/cblas virtual/lapack ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] lapack? ( virtual/fortran )
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/n/numpy/numpy-1.11.0.tar.gz doc? ( http://docs.scipy.org/doc/numpy-1.11.0/numpy-html-1.11.0.zip http://docs.scipy.org/doc/numpy-1.11.0/numpy-ref-1.11.0.pdf http://docs.scipy.org/doc/numpy-1.11.0/numpy-user-1.11.0.pdf )
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	fortran-2	8200fc942c3b3c1fc75d4d5bfd0ba7a2	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=5b078acb59d27c5c7b17bc972fb40dae
diff --git a/metadata/md5-cache/dev-python/rebulk-0.7.2 b/metadata/md5-cache/dev-python/rebulk-0.7.2
index d6832125abb7..8a00257825ca 100644
--- a/metadata/md5-cache/dev-python/rebulk-0.7.2
+++ b/metadata/md5-cache/dev-python/rebulk-0.7.2
@@ -5,10 +5,10 @@ EAPI=6
 HOMEPAGE=https://github.com/Toilal/rebulk https://pypi.python.org/pypi/rebulk
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
 KEYWORDS=~amd64 ~x86
-LICENSE=MIT
+LICENSE=MIT Apache-2.0
 RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rebulk/rebulk-0.7.2.tar.gz
 _eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=83597aca762d293fbf957a25eb88a8b2
+_md5_=167d3ecb018f555db5b0dbeb4583e37f
diff --git a/metadata/md5-cache/dev-python/rebulk-0.7.3 b/metadata/md5-cache/dev-python/rebulk-0.7.3
new file mode 100644
index 000000000000..7b17d4c77172
--- /dev/null
+++ b/metadata/md5-cache/dev-python/rebulk-0.7.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Python library that performs advanced searches in strings
+EAPI=6
+HOMEPAGE=https://github.com/Toilal/rebulk https://pypi.python.org/pypi/rebulk
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT Apache-2.0
+RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/r/rebulk/rebulk-0.7.3.tar.gz
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=167d3ecb018f555db5b0dbeb4583e37f
diff --git a/metadata/md5-cache/dev-python/rebulk-9999 b/metadata/md5-cache/dev-python/rebulk-9999
index b3897a810b90..429b64e2f705 100644
--- a/metadata/md5-cache/dev-python/rebulk-9999
+++ b/metadata/md5-cache/dev-python/rebulk-9999
@@ -4,9 +4,9 @@ DESCRIPTION=Python library that performs advanced searches in strings
 EAPI=6
 HOMEPAGE=https://github.com/Toilal/rebulk https://pypi.python.org/pypi/rebulk
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-LICENSE=MIT
+LICENSE=MIT Apache-2.0
 RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 _eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	792f83d5ec9536cb5ccef375469d8bde	git-r3	00f60a84fc7b499c99edfe99caea9f95	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=a67f94493d04a9189414da28d1dc1966
+_md5_=de1b8af7fbf2af44bcf3fea52589871f
diff --git a/metadata/md5-cache/dev-ruby/activeldap-4.0.5 b/metadata/md5-cache/dev-ruby/activeldap-4.0.5
deleted file mode 100644
index 3eea5467af05..000000000000
--- a/metadata/md5-cache/dev-ruby/activeldap-4.0.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby20? ( >dev-ruby/activemodel-4.0.0:*[ruby_targets_ruby20] dev-ruby/locale[ruby_targets_ruby20] dev-ruby/ruby-gettext[ruby_targets_ruby20] dev-ruby/gettext_i18n_rails[ruby_targets_ruby20] || ( >=dev-ruby/ruby-ldap-0.8.2[ruby_targets_ruby20] dev-ruby/ruby-net-ldap[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( >dev-ruby/activemodel-4.0.0:*[ruby_targets_ruby21] dev-ruby/locale[ruby_targets_ruby21] dev-ruby/ruby-gettext[ruby_targets_ruby21] dev-ruby/gettext_i18n_rails[ruby_targets_ruby21] || ( >=dev-ruby/ruby-ldap-0.8.2[ruby_targets_ruby21] dev-ruby/ruby-net-ldap[ruby_targets_ruby21] ) ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
-DESCRIPTION=ActiveLDAP provides an activerecord inspired object oriented interface to LDAP
-EAPI=5
-HOMEPAGE=https://github.com/activeldap/activeldap
-IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 test test
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby20? ( >dev-ruby/activemodel-4.0.0:*[ruby_targets_ruby20] dev-ruby/locale[ruby_targets_ruby20] dev-ruby/ruby-gettext[ruby_targets_ruby20] dev-ruby/gettext_i18n_rails[ruby_targets_ruby20] || ( >=dev-ruby/ruby-ldap-0.8.2[ruby_targets_ruby20] dev-ruby/ruby-net-ldap[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( >dev-ruby/activemodel-4.0.0:*[ruby_targets_ruby21] dev-ruby/locale[ruby_targets_ruby21] dev-ruby/ruby-gettext[ruby_targets_ruby21] dev-ruby/gettext_i18n_rails[ruby_targets_ruby21] || ( >=dev-ruby/ruby-ldap-0.8.2[ruby_targets_ruby21] dev-ruby/ruby-net-ldap[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
-RESTRICT=test
-SLOT=4
-SRC_URI=mirror://rubygems/activeldap-4.0.5.gem
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2ccdc17553f96de074b7e8dae79d146c
diff --git a/metadata/md5-cache/dev-ruby/activeldap-4.0.6 b/metadata/md5-cache/dev-ruby/activeldap-4.0.6
index b919cabf41b8..c63ed8e7d085 100644
--- a/metadata/md5-cache/dev-ruby/activeldap-4.0.6
+++ b/metadata/md5-cache/dev-ruby/activeldap-4.0.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby20? ( >dev-ruby/activemodel-4.0.0:*[ruby_targets_ruby20] dev-ruby/locale[ruby_targets_ruby20] dev-ruby/ruby-gettext[ruby_targets_ruby20] dev-ruby/gettext_i18n_rails[ruby_targets_ruby20] || ( >=dev-ruby/ruby-ldap-0.8.2[ruby_targets_ruby20] dev-ruby/ruby-net-ldap[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( >dev-ruby/activemodel-4.0.0:*[ruby_targets_ruby21] dev-ruby/locale[ruby_targets_ruby21] dev-ruby/ruby-gettext[ruby_targets_ruby21] dev-ruby/gettext_i18n_rails[ruby_targets_ruby21] || ( >=dev-ruby/ruby-ldap-0.8.2[ruby_targets_ruby21] dev-ruby/ruby-net-ldap[ruby_targets_ruby21] ) ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DEPEND=test? ( ruby_targets_ruby20? ( >dev-ruby/activemodel-4.0.0:*[ruby_targets_ruby20] dev-ruby/locale[ruby_targets_ruby20] dev-ruby/ruby-gettext[ruby_targets_ruby20] dev-ruby/gettext_i18n_rails[ruby_targets_ruby20] || ( >=dev-ruby/ruby-ldap-0.8.2[ruby_targets_ruby20] dev-ruby/ruby-net-ldap[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( >dev-ruby/activemodel-4.0.0:*[ruby_targets_ruby21] dev-ruby/locale[ruby_targets_ruby21] dev-ruby/ruby-gettext[ruby_targets_ruby21] dev-ruby/gettext_i18n_rails[ruby_targets_ruby21] || ( >=dev-ruby/ruby-ldap-0.8.2[ruby_targets_ruby21] dev-ruby/ruby-net-ldap[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( >dev-ruby/activemodel-4.0.0:*[ruby_targets_ruby22] dev-ruby/locale[ruby_targets_ruby22] dev-ruby/ruby-gettext[ruby_targets_ruby22] dev-ruby/gettext_i18n_rails[ruby_targets_ruby22] || ( >=dev-ruby/ruby-ldap-0.8.2[ruby_targets_ruby22] dev-ruby/ruby-net-ldap[ruby_targets_ruby22] ) ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=ActiveLDAP provides an activerecord inspired object oriented interface to LDAP
 EAPI=5
 HOMEPAGE=https://github.com/activeldap/activeldap
-IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby20? ( >dev-ruby/activemodel-4.0.0:*[ruby_targets_ruby20] dev-ruby/locale[ruby_targets_ruby20] dev-ruby/ruby-gettext[ruby_targets_ruby20] dev-ruby/gettext_i18n_rails[ruby_targets_ruby20] || ( >=dev-ruby/ruby-ldap-0.8.2[ruby_targets_ruby20] dev-ruby/ruby-net-ldap[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( >dev-ruby/activemodel-4.0.0:*[ruby_targets_ruby21] dev-ruby/locale[ruby_targets_ruby21] dev-ruby/ruby-gettext[ruby_targets_ruby21] dev-ruby/gettext_i18n_rails[ruby_targets_ruby21] || ( >=dev-ruby/ruby-ldap-0.8.2[ruby_targets_ruby21] dev-ruby/ruby-net-ldap[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
+RDEPEND=ruby_targets_ruby20? ( >dev-ruby/activemodel-4.0.0:*[ruby_targets_ruby20] dev-ruby/locale[ruby_targets_ruby20] dev-ruby/ruby-gettext[ruby_targets_ruby20] dev-ruby/gettext_i18n_rails[ruby_targets_ruby20] || ( >=dev-ruby/ruby-ldap-0.8.2[ruby_targets_ruby20] dev-ruby/ruby-net-ldap[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( >dev-ruby/activemodel-4.0.0:*[ruby_targets_ruby21] dev-ruby/locale[ruby_targets_ruby21] dev-ruby/ruby-gettext[ruby_targets_ruby21] dev-ruby/gettext_i18n_rails[ruby_targets_ruby21] || ( >=dev-ruby/ruby-ldap-0.8.2[ruby_targets_ruby21] dev-ruby/ruby-net-ldap[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( >dev-ruby/activemodel-4.0.0:*[ruby_targets_ruby22] dev-ruby/locale[ruby_targets_ruby22] dev-ruby/ruby-gettext[ruby_targets_ruby22] dev-ruby/gettext_i18n_rails[ruby_targets_ruby22] || ( >=dev-ruby/ruby-ldap-0.8.2[ruby_targets_ruby22] dev-ruby/ruby-net-ldap[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://rubygems/activeldap-4.0.6.gem
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2ccdc17553f96de074b7e8dae79d146c
+_md5_=f7f1e476bdcaa8715f405e3cac3a3b89
diff --git a/metadata/md5-cache/dev-ruby/mechanize-2.7.5 b/metadata/md5-cache/dev-ruby/mechanize-2.7.5
new file mode 100644
index 000000000000..a3502b0d0878
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/mechanize-2.7.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby20? ( >=dev-ruby/hoe-3.7[ruby_targets_ruby20] test? ( dev-ruby/minitest:5[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( >=dev-ruby/hoe-3.7[ruby_targets_ruby21] test? ( dev-ruby/minitest:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( >=dev-ruby/hoe-3.7[ruby_targets_ruby22] test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby20? ( >=dev-ruby/nokogiri-1.6[ruby_targets_ruby20] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby20] >=dev-ruby/net-http-persistent-2.5.2[ruby_targets_ruby20] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby20] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby20] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby20] >=dev-ruby/mime-types-1.17.2:*[ruby_targets_ruby20] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.6[ruby_targets_ruby21] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby21] >=dev-ruby/net-http-persistent-2.5.2[ruby_targets_ruby21] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby21] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby21] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby21] >=dev-ruby/mime-types-1.17.2:*[ruby_targets_ruby21] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.6[ruby_targets_ruby22] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby22] >=dev-ruby/net-http-persistent-2.5.2[ruby_targets_ruby22] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby22] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby22] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby22] >=dev-ruby/mime-types-1.17.2:*[ruby_targets_ruby22] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DESCRIPTION=A Ruby library used for automating interaction with websites
+EAPI=5
+HOMEPAGE=https://github.com/sparklemotion/mechanize
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/nokogiri-1.6[ruby_targets_ruby20] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby20] >=dev-ruby/net-http-persistent-2.5.2[ruby_targets_ruby20] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby20] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby20] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby20] >=dev-ruby/mime-types-1.17.2:*[ruby_targets_ruby20] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.6[ruby_targets_ruby21] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby21] >=dev-ruby/net-http-persistent-2.5.2[ruby_targets_ruby21] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby21] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby21] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby21] >=dev-ruby/mime-types-1.17.2:*[ruby_targets_ruby21] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.6[ruby_targets_ruby22] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby22] >=dev-ruby/net-http-persistent-2.5.2[ruby_targets_ruby22] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby22] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby22] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby22] >=dev-ruby/mime-types-1.17.2:*[ruby_targets_ruby22] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby22] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+SLOT=0
+SRC_URI=mirror://rubygems/mechanize-2.7.5.gem
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=a063cd0617b47662eae2657c4a870138
diff --git a/metadata/md5-cache/dev-ruby/msgpack-1.0.0 b/metadata/md5-cache/dev-ruby/msgpack-1.0.0
new file mode 100644
index 000000000000..530c73f73297
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/msgpack-1.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby20? ( doc? ( dev-ruby/yard[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DESCRIPTION=Binary-based efficient data interchange format for ruby binding
+EAPI=5
+HOMEPAGE=http://msgpack.org/
+IUSE=doc elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86-fbsd
+LICENSE=Apache-2.0
+RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+SLOT=0
+SRC_URI=mirror://rubygems/msgpack-1.0.0.gem
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=63c18f380b18591bdbefb848738a0ffb
diff --git a/metadata/md5-cache/dev-ruby/neovim-ruby-client-0.3.0 b/metadata/md5-cache/dev-ruby/neovim-ruby-client-0.3.0
new file mode 100644
index 000000000000..73a940458941
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/neovim-ruby-client-0.3.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/msgpack-1.0.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/msgpack-1.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/msgpack-1.0.0[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DESCRIPTION=Ruby bindings for Neovim
+EAPI=5
+HOMEPAGE=https://github.com/alexgenco/neovim-ruby
+IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/msgpack-1.0.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/msgpack-1.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/msgpack-1.0.0[ruby_targets_ruby23] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+SLOT=0
+SRC_URI=mirror://rubygems/neovim-0.3.0.gem
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=b4ce89ca09bf826e84882a82ae4e04cf
diff --git a/metadata/md5-cache/dev-ruby/net-http-persistent-2.9.4-r2 b/metadata/md5-cache/dev-ruby/net-http-persistent-2.9.4-r2
index 688c116ecdb8..2d9122c49a56 100644
--- a/metadata/md5-cache/dev-ruby/net-http-persistent-2.9.4-r2
+++ b/metadata/md5-cache/dev-ruby/net-http-persistent-2.9.4-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby20? ( doc? ( dev-ruby/hoe[ruby_targets_ruby20] ) test? ( dev-ruby/hoe[ruby_targets_ruby20] dev-ruby/minitest[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/hoe[ruby_targets_ruby21] ) test? ( dev-ruby/hoe[ruby_targets_ruby21] dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/hoe[ruby_targets_ruby22] ) test? ( dev-ruby/hoe[ruby_targets_ruby22] dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=ruby_targets_ruby20? ( doc? ( dev-ruby/hoe[ruby_targets_ruby20] ) test? ( dev-ruby/hoe[ruby_targets_ruby20] dev-ruby/minitest[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/hoe[ruby_targets_ruby21] ) test? ( dev-ruby/hoe[ruby_targets_ruby21] dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/hoe[ruby_targets_ruby22] ) test? ( dev-ruby/hoe[ruby_targets_ruby22] dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/hoe[ruby_targets_ruby23] ) test? ( dev-ruby/hoe[ruby_targets_ruby23] dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Manages persistent connections using Net::HTTP plus a speed fix for Ruby 1.8
 EAPI=5
 HOMEPAGE=https://github.com/drbrain/net-http-persistent
-IUSE=doc test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=doc test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/net-http-persistent-2.9.4.gem
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=bb9ce59326c2fcf95978f1e30e02ba58
+_md5_=398460d265768c826a71dca71b134a02
diff --git a/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.5 b/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.5
index 136d04873ab0..49b092d4ad28 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.5
+++ b/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/rr-1.1.1[ruby_targets_ruby20] >=dev-ruby/test-unit-2.5.2[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rr-1.1.1[ruby_targets_ruby21] >=dev-ruby/test-unit-2.5.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rr-1.1.1[ruby_targets_ruby22] >=dev-ruby/test-unit-2.5.2[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/rr-1.1.1[ruby_targets_ruby20] >=dev-ruby/test-unit-2.5.2[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rr-1.1.1[ruby_targets_ruby21] >=dev-ruby/test-unit-2.5.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rr-1.1.1[ruby_targets_ruby22] >=dev-ruby/test-unit-2.5.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rr-1.1.1[ruby_targets_ruby23] >=dev-ruby/test-unit-2.5.2[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=RR adapter for Test::Unit
 EAPI=5
 HOMEPAGE=https://github.com/test-unit/test-unit-rr
-IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1+
-RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/rr-1.1.1[ruby_targets_ruby20] >=dev-ruby/test-unit-2.5.2[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rr-1.1.1[ruby_targets_ruby21] >=dev-ruby/test-unit-2.5.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rr-1.1.1[ruby_targets_ruby22] >=dev-ruby/test-unit-2.5.2[ruby_targets_ruby22] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/rr-1.1.1[ruby_targets_ruby20] >=dev-ruby/test-unit-2.5.2[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rr-1.1.1[ruby_targets_ruby21] >=dev-ruby/test-unit-2.5.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rr-1.1.1[ruby_targets_ruby22] >=dev-ruby/test-unit-2.5.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rr-1.1.1[ruby_targets_ruby23] >=dev-ruby/test-unit-2.5.2[ruby_targets_ruby23] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/test-unit-rr-1.0.5.gem
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1780bf5a3178203068749eccab78b519
+_md5_=5c9ee45ccaed3405fab0ee54068bb58b
diff --git a/metadata/md5-cache/dev-util/cargo-0.12.0 b/metadata/md5-cache/dev-util/cargo-0.12.0
new file mode 100644
index 000000000000..8db76b398514
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cargo-0.12.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test unpack
+DEPEND=sys-libs/zlib dev-libs/openssl:0= net-libs/libssh2 net-libs/http-parser >=dev-lang/rust-1.1.0:stable dev-util/cmake sys-apps/coreutils sys-apps/diffutils sys-apps/findutils sys-apps/sed
+DESCRIPTION=The Rust's package manager
+EAPI=6
+HOMEPAGE=http://crates.io
+IUSE=doc
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( MIT Apache-2.0 )
+RDEPEND=sys-libs/zlib dev-libs/openssl:0= net-libs/libssh2 net-libs/http-parser !dev-util/cargo-bin net-misc/curl[ssl]
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://github.com/rust-lang/cargo/archive/0.12.0.tar.gz -> cargo-0.12.0.tar.gz https://github.com/rust-lang/crates.io-index/archive/64a9f2f594cefc2ca652e0cecf7ce6e41c0279ee.tar.gz -> cargo-registry-64a9f2f594cefc2ca652e0cecf7ce6e41c0279ee.tar.gz https://crates.io/api/v1/crates/advapi32-sys/0.1.2/download -> advapi32-sys-0.1.2.crate https://crates.io/api/v1/crates/aho-corasick/0.5.1/download -> aho-corasick-0.5.1.crate https://crates.io/api/v1/crates/bitflags/0.1.1/download -> bitflags-0.1.1.crate https://crates.io/api/v1/crates/bufstream/0.1.1/download -> bufstream-0.1.1.crate https://crates.io/api/v1/crates/cmake/0.1.16/download -> cmake-0.1.16.crate https://crates.io/api/v1/crates/crossbeam/0.2.8/download -> crossbeam-0.2.8.crate https://crates.io/api/v1/crates/curl/0.3.0/download -> curl-0.3.0.crate https://crates.io/api/v1/crates/curl-sys/0.2.0/download -> curl-sys-0.2.0.crate https://crates.io/api/v1/crates/docopt/0.6.78/download -> docopt-0.6.78.crate https://crates.io/api/v1/crates/env_logger/0.3.2/download -> env_logger-0.3.2.crate https://crates.io/api/v1/crates/filetime/0.1.10/download -> filetime-0.1.10.crate https://crates.io/api/v1/crates/flate2/0.2.13/download -> flate2-0.2.13.crate https://crates.io/api/v1/crates/fs2/0.2.3/download -> fs2-0.2.3.crate https://crates.io/api/v1/crates/gcc/0.3.26/download -> gcc-0.3.26.crate https://crates.io/api/v1/crates/gdi32-sys/0.1.1/download -> gdi32-sys-0.1.1.crate https://crates.io/api/v1/crates/git2/0.4.3/download -> git2-0.4.3.crate https://crates.io/api/v1/crates/git2-curl/0.5.0/download -> git2-curl-0.5.0.crate https://crates.io/api/v1/crates/glob/0.2.11/download -> glob-0.2.11.crate https://crates.io/api/v1/crates/hamcrest/0.1.0/download -> hamcrest-0.1.0.crate https://crates.io/api/v1/crates/idna/0.1.0/download -> idna-0.1.0.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.1/download -> kernel32-sys-0.2.1.crate https://crates.io/api/v1/crates/libc/0.2.8/download -> libc-0.2.8.crate https://crates.io/api/v1/crates/libgit2-sys/0.4.3/download -> libgit2-sys-0.4.3.crate https://crates.io/api/v1/crates/libressl-pnacl-sys/2.1.6/download -> libressl-pnacl-sys-2.1.6.crate https://crates.io/api/v1/crates/libssh2-sys/0.1.37/download -> libssh2-sys-0.1.37.crate https://crates.io/api/v1/crates/libz-sys/1.0.2/download -> libz-sys-1.0.2.crate https://crates.io/api/v1/crates/log/0.3.5/download -> log-0.3.5.crate https://crates.io/api/v1/crates/matches/0.1.2/download -> matches-0.1.2.crate https://crates.io/api/v1/crates/memchr/0.1.10/download -> memchr-0.1.10.crate https://crates.io/api/v1/crates/miniz-sys/0.1.7/download -> miniz-sys-0.1.7.crate https://crates.io/api/v1/crates/miow/0.1.2/download -> miow-0.1.2.crate https://crates.io/api/v1/crates/net2/0.2.24/download -> net2-0.2.24.crate https://crates.io/api/v1/crates/nom/1.2.2/download -> nom-1.2.2.crate https://crates.io/api/v1/crates/num/0.1.31/download -> num-0.1.31.crate https://crates.io/api/v1/crates/num_cpus/0.2.11/download -> num_cpus-0.2.11.crate https://crates.io/api/v1/crates/openssl-sys/0.7.8/download -> openssl-sys-0.7.8.crate https://crates.io/api/v1/crates/pkg-config/0.3.8/download -> pkg-config-0.3.8.crate https://crates.io/api/v1/crates/pnacl-build-helper/1.4.10/download -> pnacl-build-helper-1.4.10.crate https://crates.io/api/v1/crates/rand/0.3.14/download -> rand-0.3.14.crate https://crates.io/api/v1/crates/regex/0.1.58/download -> regex-0.1.58.crate https://crates.io/api/v1/crates/regex-syntax/0.3.0/download -> regex-syntax-0.3.0.crate https://crates.io/api/v1/crates/rustc-serialize/0.3.18/download -> rustc-serialize-0.3.18.crate https://crates.io/api/v1/crates/semver/0.2.3/download -> semver-0.2.3.crate https://crates.io/api/v1/crates/strsim/0.3.0/download -> strsim-0.3.0.crate https://crates.io/api/v1/crates/tar/0.4.5/download -> tar-0.4.5.crate https://crates.io/api/v1/crates/tempdir/0.3.4/download -> tempdir-0.3.4.crate https://crates.io/api/v1/crates/term/0.4.4/download -> term-0.4.4.crate https://crates.io/api/v1/crates/toml/0.1.30/download -> toml-0.1.30.crate https://crates.io/api/v1/crates/unicode-bidi/0.2.3/download -> unicode-bidi-0.2.3.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.2/download -> unicode-normalization-0.1.2.crate https://crates.io/api/v1/crates/url/1.1.0/download -> url-1.1.0.crate https://crates.io/api/v1/crates/user32-sys/0.1.2/download -> user32-sys-0.1.2.crate https://crates.io/api/v1/crates/utf8-ranges/0.1.3/download -> utf8-ranges-0.1.3.crate https://crates.io/api/v1/crates/winapi/0.2.6/download -> winapi-0.2.6.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate x86? ( https://static.rust-lang.org/cargo-dist/2016-03-21/cargo-nightly-i686-unknown-linux-gnu.tar.gz -> cargo-snapshot-x86-2016-03-21.tar.gz ) amd64? ( https://static.rust-lang.org/cargo-dist/2016-03-21/cargo-nightly-x86_64-unknown-linux-gnu.tar.gz -> cargo-snapshot-amd64-2016-03-21.tar.gz )
+_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	cargo	21eab25085b426f4d1a975b85f624423	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_md5_=8007b03e6ff133556bfd31607f596088
diff --git a/metadata/md5-cache/dev-util/cppcheck-1.75 b/metadata/md5-cache/dev-util/cppcheck-1.75
new file mode 100644
index 000000000000..dcdc47e70eca
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cppcheck-1.75
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=htmlreport? ( dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=dev-libs/tinyxml2-2 qt4? ( dev-qt/qtgui:4 ) pcre? ( dev-libs/libpcre ) app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=static analyzer of C/C++ code
+EAPI=5
+HOMEPAGE=http://cppcheck.sourceforge.net
+IUSE=htmlreport pcre qt4 python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3
+RDEPEND=htmlreport? ( dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=dev-libs/tinyxml2-2 qt4? ( dev-qt/qtgui:4 ) pcre? ( dev-libs/libpcre ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://sourceforge/cppcheck/cppcheck-1.75.tar.bz2
+_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	qmake-utils	0a242e7177789b0028b4045f336dd4db	qt4-r2	d6c113024bb3086a1facc65cd338930e	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=dd609d5da5bc44f155d5da5335d29603
diff --git a/metadata/md5-cache/dev-util/cppcheck-9999 b/metadata/md5-cache/dev-util/cppcheck-9999
index 81281b94c87f..b0a4da52c018 100644
--- a/metadata/md5-cache/dev-util/cppcheck-9999
+++ b/metadata/md5-cache/dev-util/cppcheck-9999
@@ -9,4 +9,4 @@ RDEPEND=htmlreport? ( dev-python/pygments[python_targets_python2_7(-)?,python_ta
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	git-r3	00f60a84fc7b499c99edfe99caea9f95	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	qmake-utils	0a242e7177789b0028b4045f336dd4db	qt4-r2	d6c113024bb3086a1facc65cd338930e	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=fc15eae44a8399b320b30403afc24dbe
+_md5_=6b84f137736062f3f897a476f585da24
diff --git a/metadata/md5-cache/net-libs/zeromq-4.1.2 b/metadata/md5-cache/net-libs/zeromq-4.1.2
deleted file mode 100644
index f0da8c9c0ac4..000000000000
--- a/metadata/md5-cache/net-libs/zeromq-4.1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libsodium:= pgm? ( =net-libs/openpgm-5.2.122 ) sys-apps/util-linux pgm? ( virtual/pkgconfig ) !<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=A brokerless kernel
-EAPI=5
-HOMEPAGE=http://www.zeromq.org/
-IUSE=pgm static-libs test
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-3
-RDEPEND=dev-libs/libsodium:= pgm? ( =net-libs/openpgm-5.2.122 )
-SLOT=0/5
-SRC_URI=http://download.zeromq.org/zeromq-4.1.2.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=5d6e33d8dcbf9cb7db749273958d710b
diff --git a/metadata/md5-cache/net-libs/zeromq-4.1.3 b/metadata/md5-cache/net-libs/zeromq-4.1.3
deleted file mode 100644
index 6a9e2f437425..000000000000
--- a/metadata/md5-cache/net-libs/zeromq-4.1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libsodium:= pgm? ( =net-libs/openpgm-5.2.122 ) sys-apps/util-linux pgm? ( virtual/pkgconfig ) !<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=A brokerless kernel
-EAPI=5
-HOMEPAGE=http://www.zeromq.org/
-IUSE=pgm static-libs test
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-3
-RDEPEND=dev-libs/libsodium:= pgm? ( =net-libs/openpgm-5.2.122 )
-SLOT=0/5
-SRC_URI=http://download.zeromq.org/zeromq-4.1.3.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=5d6e33d8dcbf9cb7db749273958d710b
diff --git a/metadata/md5-cache/net-libs/zeromq-4.1.3-r1 b/metadata/md5-cache/net-libs/zeromq-4.1.3-r1
deleted file mode 100644
index d0a6ee3f4da4..000000000000
--- a/metadata/md5-cache/net-libs/zeromq-4.1.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libsodium:= pgm? ( =net-libs/openpgm-5.2.122 ) sys-apps/util-linux pgm? ( virtual/pkgconfig ) !<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=A brokerless kernel
-EAPI=5
-HOMEPAGE=http://www.zeromq.org/
-IUSE=pgm static-libs test
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-3
-RDEPEND=dev-libs/libsodium:= pgm? ( =net-libs/openpgm-5.2.122 )
-SLOT=0/5
-SRC_URI=http://download.zeromq.org/zeromq-4.1.3.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=3182ee3d900e8169ba6414fd518b8d58
diff --git a/metadata/md5-cache/net-libs/zeromq-4.1.5-r1 b/metadata/md5-cache/net-libs/zeromq-4.1.5-r1
new file mode 100644
index 000000000000..010a80db5e69
--- /dev/null
+++ b/metadata/md5-cache/net-libs/zeromq-4.1.5-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/libsodium:= pgm? ( =net-libs/openpgm-5.2.122 ) app-text/asciidoc app-text/xmlto sys-apps/util-linux pgm? ( virtual/pkgconfig ) !<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=A brokerless kernel
+EAPI=6
+HOMEPAGE=http://www.zeromq.org/
+IUSE=pgm static-libs test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-3
+RDEPEND=dev-libs/libsodium:= pgm? ( =net-libs/openpgm-5.2.122 )
+SLOT=0/5
+SRC_URI=https://github.com/zeromq/zeromq4-1/releases/download/v4.1.5/zeromq-4.1.5.tar.gz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_md5_=6bd7ce71fa4ebfbc95a7705dd4aab1a0
diff --git a/metadata/md5-cache/net-misc/ucarp-1.5.2-r5 b/metadata/md5-cache/net-misc/ucarp-1.5.2-r5
new file mode 100644
index 000000000000..2461459df828
--- /dev/null
+++ b/metadata/md5-cache/net-misc/ucarp-1.5.2-r5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst
+DEPEND=net-libs/libpcap nls? ( sys-devel/gettext )
+DESCRIPTION=Portable userland implementation of Common Address Redundancy Protocol (CARP)
+EAPI=5
+HOMEPAGE=http://www.ucarp.org
+IUSE=nls
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=net-libs/libpcap
+SLOT=0
+SRC_URI=ftp://ftp.ucarp.org/pub/ucarp/ucarp-1.5.2.tar.gz
+_md5_=211bf3d5a5bceea30b258f4dc944bbde
diff --git a/metadata/md5-cache/sys-devel/clang-9999 b/metadata/md5-cache/sys-devel/clang-9999
new file mode 100644
index 000000000000..3a548540df0b
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-9999
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
+DEPEND=~sys-devel/llvm-9999:=[debug=,multitarget?,video_cards_radeon?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<sys-devel/llvm-9999 >=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(+)] doc? ( dev-python/sphinx ) xml? ( virtual/pkgconfig ) !!<dev-python/configparser-3.3.0.2 >=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(+)] dev-util/ninja >=dev-util/cmake-3.4.3 >=dev-vcs/git-1.8.2.1
+DESCRIPTION=C language family frontend for LLVM
+EAPI=6
+HOMEPAGE=http://llvm.org/
+IUSE=debug default-compiler-rt default-libcxx +doc multitarget python +static-analyzer test xml video_cards_radeon elibc_musl kernel_FreeBSD abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7
+LICENSE=UoI-NCSA
+PDEPEND=default-compiler-rt? ( sys-libs/compiler-rt ) default-libcxx? ( sys-libs/libcxx )
+RDEPEND=~sys-devel/llvm-9999:=[debug=,multitarget?,video_cards_radeon?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<sys-devel/llvm-9999 >=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=python_targets_python2_7
+SLOT=0/9999
+_eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	cmake-utils	022d8ca5c8887ca2d21e83b57f5c75ff	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	git-r3	00f60a84fc7b499c99edfe99caea9f95	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=bd057323218149c83fb4658b61562348
diff --git a/metadata/md5-cache/sys-devel/clang-9999-r100 b/metadata/md5-cache/sys-devel/clang-9999-r100
deleted file mode 100644
index c333cb4c8c02..000000000000
--- a/metadata/md5-cache/sys-devel/clang-9999-r100
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=postinst postrm
-DESCRIPTION=C language family frontend for LLVM (meta-ebuild)
-EAPI=5
-HOMEPAGE=http://clang.llvm.org/
-IUSE=debug multitarget python +static-analyzer abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-LICENSE=UoI-NCSA
-RDEPEND=~sys-devel/llvm-9999[clang(-),debug=,multitarget?,python?,static-analyzer?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0/9999
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=123b644fa3c7f409a480492f9d75b6c9
diff --git a/metadata/md5-cache/sys-devel/llvm-3.5.0 b/metadata/md5-cache/sys-devel/llvm-3.5.0
index 3bbe4083dde0..1e061e0901d5 100644
--- a/metadata/md5-cache/sys-devel/llvm-3.5.0
+++ b/metadata/md5-cache/sys-devel/llvm-3.5.0
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 ) test? ( || ( py
 SLOT=0/3.5
 SRC_URI=http://llvm.org/releases/3.5.0/llvm-3.5.0.src.tar.xz clang? ( http://llvm.org/releases/3.5.0/compiler-rt-3.5.0.src.tar.xz http://llvm.org/releases/3.5.0/cfe-3.5.0.src.tar.xz http://llvm.org/releases/3.5.0/clang-tools-extra-3.5.0.src.tar.xz ) !doc? ( https://dev.gentoo.org/~voyageur/distfiles/llvm-3.5.0-manpages.tar.bz2 )
 _eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	prefix	99dcca42e6528d8fe3c214bf5731aaf2	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=0d546b2987cb7e5236bddc8aa01dd037
+_md5_=ed872b288ffba8b51754b86a1b1dab8e
diff --git a/metadata/md5-cache/sys-devel/llvm-3.5.2 b/metadata/md5-cache/sys-devel/llvm-3.5.2
index d498419de423..d98d7094dc37 100644
--- a/metadata/md5-cache/sys-devel/llvm-3.5.2
+++ b/metadata/md5-cache/sys-devel/llvm-3.5.2
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 ) test? ( || ( py
 SLOT=0/3.5
 SRC_URI=http://llvm.org/releases/3.5.2/llvm-3.5.2.src.tar.xz clang? ( http://llvm.org/releases/3.5.2/compiler-rt-3.5.2.src.tar.xz http://llvm.org/releases/3.5.2/cfe-3.5.2.src.tar.xz http://llvm.org/releases/3.5.2/clang-tools-extra-3.5.2.src.tar.xz ) !doc? ( https://dev.gentoo.org/~voyageur/distfiles/llvm-3.5.0-manpages.tar.bz2 )
 _eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	prefix	99dcca42e6528d8fe3c214bf5731aaf2	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=461e71080015ba4e44d3ed1a37418b21
+_md5_=819a983fc70ad7f8f17c0f171f6fe0e8
diff --git a/metadata/md5-cache/sys-devel/llvm-3.6.2 b/metadata/md5-cache/sys-devel/llvm-3.6.2
index 01edacd43060..5dbfd548a56a 100644
--- a/metadata/md5-cache/sys-devel/llvm-3.6.2
+++ b/metadata/md5-cache/sys-devel/llvm-3.6.2
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 ) test? ( || ( py
 SLOT=0/3.6
 SRC_URI=http://llvm.org/releases/3.6.2/llvm-3.6.2.src.tar.xz clang? ( http://llvm.org/releases/3.6.2/compiler-rt-3.6.2.src.tar.xz http://llvm.org/releases/3.6.2/cfe-3.6.2.src.tar.xz http://llvm.org/releases/3.6.2/clang-tools-extra-3.6.2.src.tar.xz ) !doc? ( https://dev.gentoo.org/~voyageur/distfiles/llvm-3.6.1-manpages.tar.bz2 )
 _eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	prefix	99dcca42e6528d8fe3c214bf5731aaf2	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=6d818c18888276f0dac1c927b21d96fa
+_md5_=b7240480e362328508258c28bb7f107e
diff --git a/metadata/md5-cache/sys-devel/llvm-3.7.1-r3 b/metadata/md5-cache/sys-devel/llvm-3.7.1-r3
index 3f83b3d1731b..d9a5735955d8 100644
--- a/metadata/md5-cache/sys-devel/llvm-3.7.1-r3
+++ b/metadata/md5-cache/sys-devel/llvm-3.7.1-r3
@@ -12,4 +12,4 @@ REQUIRED_USE=python_targets_python2_7 lldb? ( clang xml )
 SLOT=0/3.7.1
 SRC_URI=http://llvm.org/releases/3.7.1/llvm-3.7.1.src.tar.xz clang? ( http://llvm.org/releases/3.7.1/compiler-rt-3.7.1.src.tar.xz http://llvm.org/releases/3.7.1/cfe-3.7.1.src.tar.xz http://llvm.org/releases/3.7.1/clang-tools-extra-3.7.1.src.tar.xz ) lldb? ( http://llvm.org/releases/3.7.1/lldb-3.7.1.src.tar.xz ) !doc? ( http://dev.gentoo.org/~voyageur/distfiles/llvm-3.7.0-manpages.tar.bz2 )
 _eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	cmake-utils	022d8ca5c8887ca2d21e83b57f5c75ff	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	prefix	99dcca42e6528d8fe3c214bf5731aaf2	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=179bcc84ae92ba13203a013adee8e400
+_md5_=b1c702b552b7728687d14f7d7408136f
diff --git a/metadata/md5-cache/sys-devel/llvm-3.8.0-r3 b/metadata/md5-cache/sys-devel/llvm-3.8.0-r3
index 49a88e6460d2..018cdfee1a69 100644
--- a/metadata/md5-cache/sys-devel/llvm-3.8.0-r3
+++ b/metadata/md5-cache/sys-devel/llvm-3.8.0-r3
@@ -12,4 +12,4 @@ REQUIRED_USE=python_targets_python2_7 lldb? ( clang xml )
 SLOT=0/3.8.0
 SRC_URI=http://llvm.org/releases/3.8.0/llvm-3.8.0.src.tar.xz clang? ( http://llvm.org/releases/3.8.0/compiler-rt-3.8.0.src.tar.xz http://llvm.org/releases/3.8.0/cfe-3.8.0.src.tar.xz http://llvm.org/releases/3.8.0/clang-tools-extra-3.8.0.src.tar.xz ) lldb? ( http://llvm.org/releases/3.8.0/lldb-3.8.0.src.tar.xz ) !doc? ( http://dev.gentoo.org/~voyageur/distfiles/llvm-3.8.0-manpages.tar.bz2 )
 _eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	cmake-utils	022d8ca5c8887ca2d21e83b57f5c75ff	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	prefix	99dcca42e6528d8fe3c214bf5731aaf2	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=029d9aeec8e450325c100f8aa2eaec39
+_md5_=955b2959d15522159cbc74f7f018d620
diff --git a/metadata/md5-cache/sys-devel/llvm-3.8.1 b/metadata/md5-cache/sys-devel/llvm-3.8.1
index ab5bd59807e4..97c318024560 100644
--- a/metadata/md5-cache/sys-devel/llvm-3.8.1
+++ b/metadata/md5-cache/sys-devel/llvm-3.8.1
@@ -12,4 +12,4 @@ REQUIRED_USE=python_targets_python2_7 lldb? ( clang xml )
 SLOT=0/3.8.0
 SRC_URI=http://llvm.org/releases/3.8.1/llvm-3.8.1.src.tar.xz clang? ( http://llvm.org/releases/3.8.1/compiler-rt-3.8.1.src.tar.xz http://llvm.org/releases/3.8.1/cfe-3.8.1.src.tar.xz http://llvm.org/releases/3.8.1/clang-tools-extra-3.8.1.src.tar.xz ) lldb? ( http://llvm.org/releases/3.8.1/lldb-3.8.1.src.tar.xz ) !doc? ( http://dev.gentoo.org/~voyageur/distfiles/llvm-3.8.0-manpages.tar.bz2 )
 _eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	cmake-utils	022d8ca5c8887ca2d21e83b57f5c75ff	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	prefix	99dcca42e6528d8fe3c214bf5731aaf2	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=64e8b23ecb68979858720a01c17328e8
+_md5_=2d2bcc8ab35f9fd9e836e951bdc739b7
diff --git a/metadata/md5-cache/sys-devel/llvm-3.8.1-r2 b/metadata/md5-cache/sys-devel/llvm-3.8.1-r2
index 3c211f4acd1b..764942681629 100644
--- a/metadata/md5-cache/sys-devel/llvm-3.8.1-r2
+++ b/metadata/md5-cache/sys-devel/llvm-3.8.1-r2
@@ -12,4 +12,4 @@ REQUIRED_USE=python_targets_python2_7 lldb? ( clang xml )
 SLOT=0/3.8.0
 SRC_URI=http://llvm.org/releases/3.8.1/llvm-3.8.1.src.tar.xz clang? ( http://llvm.org/releases/3.8.1/compiler-rt-3.8.1.src.tar.xz http://llvm.org/releases/3.8.1/cfe-3.8.1.src.tar.xz http://llvm.org/releases/3.8.1/clang-tools-extra-3.8.1.src.tar.xz ) lldb? ( http://llvm.org/releases/3.8.1/lldb-3.8.1.src.tar.xz ) !doc? ( http://dev.gentoo.org/~voyageur/distfiles/llvm-3.8.0-manpages.tar.bz2 )
 _eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	cmake-utils	022d8ca5c8887ca2d21e83b57f5c75ff	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	prefix	99dcca42e6528d8fe3c214bf5731aaf2	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=180985a91770bf054d521281bd1c0f6c
+_md5_=29f2e99287412323267a1a66d800f7ad
diff --git a/metadata/md5-cache/sys-devel/llvm-9999 b/metadata/md5-cache/sys-devel/llvm-9999
index cbbadb09908e..47162049d735 100644
--- a/metadata/md5-cache/sys-devel/llvm-9999
+++ b/metadata/md5-cache/sys-devel/llvm-9999
@@ -1,13 +1,12 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
-DEPEND=sys-libs/zlib:0= clang? ( static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=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(+)] ) gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ocaml? ( >=dev-lang/ocaml-4.00.0:0= dev-ml/findlib dev-ml/ocaml-ctypes ) dev-lang/perl >=sys-devel/make-3.81 >=sys-devel/flex-2.5.4 >=sys-devel/bison-1.875d || ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5 ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx ) ) || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 ) kernel_Darwin? ( <sys-libs/libcxx-9999.9999 ) clang? ( xml? ( virtual/pkgconfig ) ) doc? ( dev-python/sphinx ) gold? ( sys-libs/binutils-libs ) libffi? ( virtual/pkgconfig ) lldb? ( dev-lang/swig ) !!<dev-python/configparser-3.3.0.2 ocaml? ( test? ( dev-ml/ounit ) ) >=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(+)] dev-util/ninja >=dev-util/cmake-3.4.3 >=dev-vcs/git-1.8.2.1
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=sys-libs/zlib:0= gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ocaml? ( >=dev-lang/ocaml-4.00.0:0= dev-ml/findlib dev-ml/ocaml-ctypes ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/perl || ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5 ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx ) ) || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 ) kernel_Darwin? ( <sys-libs/libcxx-9999.9999 ) doc? ( dev-python/sphinx ) gold? ( sys-libs/binutils-libs ) libffi? ( virtual/pkgconfig ) ocaml? ( test? ( dev-ml/ounit ) ) !!<dev-python/configparser-3.3.0.2 dev-util/ninja >=dev-util/cmake-3.4.3 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Low Level Virtual Machine
 EAPI=6
 HOMEPAGE=http://llvm.org/
-IUSE=clang debug default-compiler-rt default-libcxx +doc gold libedit +libffi lldb multitarget ncurses ocaml python +sanitize +static-analyzer test xml video_cards_radeon elibc_musl kernel_Darwin kernel_FreeBSD abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7
+IUSE=debug +doc gold libedit +libffi multitarget ncurses ocaml test video_cards_radeon elibc_musl kernel_Darwin python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 LICENSE=UoI-NCSA
-PDEPEND=clang? ( =sys-devel/clang-9999-r100 )
-RDEPEND=sys-libs/zlib:0= clang? ( static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=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(+)] ) gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ocaml? ( >=dev-lang/ocaml-4.00.0:0= dev-ml/findlib dev-ml/ocaml-ctypes ) clang? ( !<=sys-devel/clang-9999-r99 ) default-libcxx? ( sys-libs/libcxx ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
-REQUIRED_USE=python_targets_python2_7 lldb? ( clang xml )
+RDEPEND=sys-libs/zlib:0= gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ocaml? ( >=dev-lang/ocaml-4.00.0:0= dev-ml/findlib dev-ml/ocaml-ctypes ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0/9999
-_eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	cmake-utils	022d8ca5c8887ca2d21e83b57f5c75ff	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	git-r3	00f60a84fc7b499c99edfe99caea9f95	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=127c1c4265820dbcb854bd3c89a4738d
+_eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	cmake-utils	022d8ca5c8887ca2d21e83b57f5c75ff	distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	git-r3	00f60a84fc7b499c99edfe99caea9f95	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=262a7b79bca490ef0356837c8fd541a7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.18.40 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.18.40
new file mode 100644
index 000000000000..99f0c0cc6b95
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.18.40
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 3.18 kernel tree
+EAPI=5
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 freedist
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=3.18.40
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz mirror://gentoo/genpatches-3.18-40.base.tar.xz mirror://gentoo/genpatches-3.18-40.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.18-40.experimental.tar.xz )
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	kernel-2	1b3d95e7eae2df31644c46e06246f14a	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=98a6f2aa5a97221d7f6d23244c84aaf5
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-9999 b/metadata/md5-cache/sys-libs/compiler-rt-9999
new file mode 100644
index 000000000000..1f7cf7fedbfa
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/compiler-rt-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=~sys-devel/llvm-9999 !<sys-devel/llvm-9999 sanitize? ( >=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(+)] ) >=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(+)] dev-util/ninja >=dev-util/cmake-3.4.3 >=dev-vcs/git-1.8.2.1
+DESCRIPTION=Compiler runtime libraries for clang
+EAPI=6
+HOMEPAGE=http://llvm.org/
+IUSE=+sanitize python_targets_python2_7
+LICENSE=UoI-NCSA
+RDEPEND=~sys-devel/llvm-9999 !<sys-devel/llvm-9999 sanitize? ( >=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=python_targets_python2_7
+SLOT=0/9999
+_eclasses_=cmake-utils	022d8ca5c8887ca2d21e83b57f5c75ff	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	git-r3	00f60a84fc7b499c99edfe99caea9f95	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=0d99b85eda7befa6817294a8077e2f14
diff --git a/metadata/md5-cache/sys-power/acpilight-0_pre20160724 b/metadata/md5-cache/sys-power/acpilight-0_pre20160724
new file mode 100644
index 000000000000..a6f872e2b7af
--- /dev/null
+++ b/metadata/md5-cache/sys-power/acpilight-0_pre20160724
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst unpack
+DEPEND=virtual/pkgconfig
+DESCRIPTION=Replacement for xbacklight that uses the ACPI interface to set brightness
+EAPI=6
+HOMEPAGE=https://github.com/wavexx/acpilight/
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=virtual/udev python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !x11-apps/xbacklight
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=https://github.com/wavexx/acpilight/archive/4a15c2d3019aacd891e7d2151334e22b2cebe0ca.tar.gz -> acpilight-0_pre20160724.tar.gz
+_eclasses_=multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	udev	73058269b3e70e34e084fa3981282338	vcs-snapshot	2b65ecb2d0f91e4322c2ac8d673993bd
+_md5_=da00aa8c3730c7b0be14868f1963d567
diff --git a/metadata/md5-cache/x11-misc/xnots-0.2.1-r1 b/metadata/md5-cache/x11-misc/xnots-0.2.1-r1
index 72a2dac608bd..7ef11a505146 100644
--- a/metadata/md5-cache/x11-misc/xnots-0.2.1-r1
+++ b/metadata/md5-cache/x11-misc/xnots-0.2.1-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXrender x11-libs/libXrandr x11-libs/pango[X] virtual/pkgconfig x11-proto/xextproto x11-proto/renderproto x11-proto/randrproto
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXrender x11-libs/pango[X] virtual/pkgconfig x11-proto/randrproto x11-proto/renderproto x11-proto/xextproto
 DESCRIPTION=A desktop sticky note program for the unix geek
 EAPI=5
 HOMEPAGE=http://xnots.sourceforge.net https://github.com/thePalindrome/xnots
 IUSE=vim-syntax
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXrender x11-libs/libXrandr x11-libs/pango[X]
+RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXrender x11-libs/pango[X]
 SLOT=0
 SRC_URI=mirror://sourceforge/xnots/xnots-0.2.1.tar.gz
-_eclasses_=multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=a3261d151cf62be90a49b9217db79058
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_md5_=2cf2229185d62c8285f3a8d813cf8574
diff --git a/metadata/md5-cache/x11-misc/xnots-9999 b/metadata/md5-cache/x11-misc/xnots-9999
index 9d62d22f8f69..6c3507ac9c64 100644
--- a/metadata/md5-cache/x11-misc/xnots-9999
+++ b/metadata/md5-cache/x11-misc/xnots-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile install prepare unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXrender x11-libs/libXrandr x11-libs/pango[X] virtual/pkgconfig x11-proto/xextproto x11-proto/renderproto x11-proto/randrproto >=dev-vcs/git-1.8.2.1
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXrender x11-libs/pango[X] virtual/pkgconfig x11-proto/randrproto x11-proto/renderproto x11-proto/xextproto >=dev-vcs/git-1.8.2.1
 DESCRIPTION=A desktop sticky note program for the unix geek
 EAPI=5
 HOMEPAGE=http://xnots.sourceforge.net https://github.com/thePalindrome/xnots
 IUSE=vim-syntax
 LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXrender x11-libs/libXrandr x11-libs/pango[X]
+RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXrender x11-libs/pango[X]
 SLOT=0
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	git-r3	00f60a84fc7b499c99edfe99caea9f95	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=28a3520366150e4496ea4c7728d1410f
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	git-r3	00f60a84fc7b499c99edfe99caea9f95	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_md5_=01915b6c895c9da52911581d5e3ceee7
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index a4d7b2f0aa9a..2abd62b111ec 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 22 Aug 2016 14:10:42 +0000
+Tue, 23 Aug 2016 06:10:35 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 061cb1047f57..02b1fbe9b4e7 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Aug 22 14:09:47 UTC 2016
+Tue Aug 23 06:09:40 UTC 2016
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index f65dff842af3..8750a56c6119 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 22 Aug 2016 14:30:01 +0000
+Tue, 23 Aug 2016 06:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 87c7ab725783..34fa5ec5c962 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1471875001 Mon 22 Aug 2016 02:10:01 PM UTC
+1471932601 Tue 23 Aug 2016 06:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index a4d7b2f0aa9a..2abd62b111ec 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 22 Aug 2016 14:10:42 +0000
+Tue, 23 Aug 2016 06:10:35 +0000
diff --git a/net-libs/zeromq/Manifest b/net-libs/zeromq/Manifest
index 8100718e2711..d0f79d5ad3f2 100644
--- a/net-libs/zeromq/Manifest
+++ b/net-libs/zeromq/Manifest
@@ -2,6 +2,5 @@ DIST zeromq-2.2.0.tar.gz 1899104 SHA256 6e2f4183e5259eeb67025b00116d900491fb7158
 DIST zeromq-3.2.3.tar.gz 2072758 SHA256 e134c1aaf829dd77bca9dc0fa199ba31095a581bd0d3dda5fc59523b9f401238 SHA512 34ffb6aa645f62bd1158a8f2888bf92929ccf90917a6c50ed51ed1240732f498522e164d1536f26480c87ad5457fe614a93bf0e15f2f89b0b168e64a30de68ca WHIRLPOOL 14ba025abe6db59d6e8d1dd9df23f88e0171721bb046b9e2cf0cd7a5a6e9034980808d346fe10e755e367302cfbb670912576071345233148711815237fa176e
 DIST zeromq-3.2.5.tar.gz 2082960 SHA256 09653e56a466683edb2f87ee025c4de55b8740df69481b9d7da98748f0c92124 SHA512 3682204e5a47824d149968e62fbf9768134370e4f7debbbf8f2bfa24bdd0a781e50c4a9b4231af8a0c4bab61839169100525a91472448ef180a9672342e10a3f WHIRLPOOL a8afa70760fa1fa9382f4694beabfe50f5c8098b1f81d5c62c926cd3073fd25946f6b8d1236e903e6644a9fff783116e131f1f87a5b92d16a6e91e05bd7f6e75
 DIST zeromq-4.1.1.tar.gz 1383196 SHA256 43d61e5706b43946aad4a661400627bcde9c63cc25816d4749c67b64c3dab8db SHA512 6f626c89e573900d3b094ea6058693dee290eb9e4039a8a03d61d41b1d8976ed5596027ca76a43f371dbf86820edfbd56a84ecfab6864adfeee73035df7b5353 WHIRLPOOL b72f9118a0422bb2a6cc99e490085715739e7438fe88fb556b85e6da70a995c92ad0cdde296e02e31c02979458ad4bb6962ff0acd4f5642273659c29b43892e9
-DIST zeromq-4.1.2.tar.gz 1367275 SHA256 f9162ead6d68521e5154d871bac304f88857308bb02366b81bb588497a345927 SHA512 69f8992dabd1d2ae90b0f8fadf39d89eac054f6593e175432e35f0f8edd224bc588b015280ee2e9dd34c55269dd9daf4a4f275e547535b2a24ea0cb9617b2e80 WHIRLPOOL 59885d9b9d2267e26a2ff07be71bd360a64b649a6e6fa5243f7e99fcf88a9d4d0df562541d0dbabba25f07bb381c1f62c8371c4a16c911809e8295503e54ea01
-DIST zeromq-4.1.3.tar.gz 1372069 SHA256 61b31c830db377777e417235a24d3660a4bcc3f40d303ee58df082fcd68bf411 SHA512 2c993d18ea44e1cba890e024176af65b85b842ca4f8a22d319be4ace8388ab8828dd706b065f02754025bf271b1d7aa878c3f6655878248f7826452cb2a6134c WHIRLPOOL b22f2c8467976da27cb9a3cd14a498687328ec0978a95ccb383001cd184140adaf2878cb3c36db1afb1188ef88c756a21c6971ef69a12bc5f80789c16870ce8d
 DIST zeromq-4.1.4.tar.gz 1400012 SHA256 e99f44fde25c2e4cb84ce440f87ca7d3fe3271c2b8cfbc67d55e4de25e6fe378 SHA512 8a8cf4f52ad78dddfff104bfba0f80bbc12566920906a0fafb9fc340aa92f5577c2923cb2e5346c69835cd2ea1609647a8893c2883cd22c1f0340a720511460c WHIRLPOOL ef7a700ab732cb319dbc3647184710bcc0f7d265b92d3e97b5e3ae393a4e055d9530de48fadf369c705e68bcfbd4c4c592db1e1f081e6fbe18eff12a9d74a83c
+DIST zeromq-4.1.5.tar.gz 794853 SHA256 04aac57f081ffa3a2ee5ed04887be9e205df3a7ddade0027460b8042432bdbcf SHA512 b5098e7ea7fe7fdae75846a804d175bcb414a4f8212a15b9c1c2e52f3541aa603e773061db7ea92075e1f9f9be40572aba1c133b233a8ac2458bccf8427e407e WHIRLPOOL c87306413e7f8cad56fb53b135331d388ec4830a6eff63e4c4cf29bc4db7c819e628ebf7771dbf39b223ce0cc32f7bc725157475880582a0448ca8ab7112497f
diff --git a/net-libs/zeromq/metadata.xml b/net-libs/zeromq/metadata.xml
index 380a788c889f..28962275ceb8 100644
--- a/net-libs/zeromq/metadata.xml
+++ b/net-libs/zeromq/metadata.xml
@@ -1,16 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <upstream>
-    <maintainer>
-      <email>sustrik@fastmq.com</email>
-      <name>Martin Sustrik</name>
-    </maintainer>
-    <doc>http://zguide.zeromq.org/chapter:1</doc>
-    <bugs-to>https://github.com/zeromq/zeromq2/issues</bugs-to>
-    <!-- remote-id type="github">zeromq/zeromq2</remote-id-->
-  </upstream>
-  <longdescription lang="en">
+	<maintainer type="person">
+		<email>whissi@gentoo.org</email>
+		<name>Thomas Deutschmann</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>sustrik@fastmq.com</email>
+			<name>Martin Sustrik</name>
+		</maintainer>
+		<doc>http://zguide.zeromq.org/page:all</doc>
+		<bugs-to>https://github.com/zeromq/zeromq4-1/issues</bugs-to>
+		<remote-id type="github">zeromq/zeromq4-1</remote-id>
+	</upstream>
+	<longdescription lang="en">
 		The 0MQ lightweight messaging kernel is a library which
 		extends the standard socket interfaces with features
 		traditionally provided by specialised messaging middleware
@@ -19,10 +23,10 @@
 		(subscriptions), seamless access to multiple transport protocols
 		and more.
 	</longdescription>
-  <use>
-    <flag name="pgm">
-Build PGM (Pragmatic General Multicast)extention, a protocol for reliable 
-multicast transport of data over IP networks.
+	<use>
+		<flag name="pgm">
+			Build PGM (Pragmatic General Multicast)extention, a protocol for reliable 
+			multicast transport of data over IP networks.
 		</flag>
-  </use>
+	</use>
 </pkgmetadata>
diff --git a/net-libs/zeromq/zeromq-4.1.2.ebuild b/net-libs/zeromq/zeromq-4.1.2.ebuild
deleted file mode 100644
index eb52ba2e1cb6..000000000000
--- a/net-libs/zeromq/zeromq-4.1.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils
-
-DESCRIPTION="A brokerless kernel"
-HOMEPAGE="http://www.zeromq.org/"
-SRC_URI="http://download.zeromq.org/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/5"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="pgm static-libs test"
-
-RDEPEND="
-	dev-libs/libsodium:=
-	pgm? ( =net-libs/openpgm-5.2.122 )"
-DEPEND="${RDEPEND}
-	sys-apps/util-linux
-	pgm? ( virtual/pkgconfig )"
-
-src_prepare() {
-	einfo "Removing bundled OpenPGM library"
-	rm -fr "${S}"/foreign/openpgm/libpgm* || die
-	sed \
-		-e '/libzmq_werror=/s:yes:no:g' \
-		-i configure.ac || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=()
-	use pgm && myeconfargs+=( --with-system-pgm ) || myeconfargs+=( --without-pgm )
-	autotools-utils_src_configure
-}
-
-src_test() {
-	autotools-utils_src_test -j1
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	doman doc/*.[1-9]
-}
diff --git a/net-libs/zeromq/zeromq-4.1.3.ebuild b/net-libs/zeromq/zeromq-4.1.3.ebuild
deleted file mode 100644
index eb52ba2e1cb6..000000000000
--- a/net-libs/zeromq/zeromq-4.1.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils
-
-DESCRIPTION="A brokerless kernel"
-HOMEPAGE="http://www.zeromq.org/"
-SRC_URI="http://download.zeromq.org/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/5"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="pgm static-libs test"
-
-RDEPEND="
-	dev-libs/libsodium:=
-	pgm? ( =net-libs/openpgm-5.2.122 )"
-DEPEND="${RDEPEND}
-	sys-apps/util-linux
-	pgm? ( virtual/pkgconfig )"
-
-src_prepare() {
-	einfo "Removing bundled OpenPGM library"
-	rm -fr "${S}"/foreign/openpgm/libpgm* || die
-	sed \
-		-e '/libzmq_werror=/s:yes:no:g' \
-		-i configure.ac || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=()
-	use pgm && myeconfargs+=( --with-system-pgm ) || myeconfargs+=( --without-pgm )
-	autotools-utils_src_configure
-}
-
-src_test() {
-	autotools-utils_src_test -j1
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	doman doc/*.[1-9]
-}
diff --git a/net-libs/zeromq/zeromq-4.1.3-r1.ebuild b/net-libs/zeromq/zeromq-4.1.5-r1.ebuild
similarity index 57%
rename from net-libs/zeromq/zeromq-4.1.3-r1.ebuild
rename to net-libs/zeromq/zeromq-4.1.5-r1.ebuild
index 4b9f8b3e6dfa..6dc347309e20 100644
--- a/net-libs/zeromq/zeromq-4.1.3-r1.ebuild
+++ b/net-libs/zeromq/zeromq-4.1.5-r1.ebuild
@@ -1,26 +1,26 @@
-# 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
 
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils
+inherit autotools eutils
 
 DESCRIPTION="A brokerless kernel"
 HOMEPAGE="http://www.zeromq.org/"
-SRC_URI="http://download.zeromq.org/${P}.tar.gz"
+SRC_URI="https://github.com/zeromq/zeromq4-1/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0/5"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="pgm static-libs test"
 
 RDEPEND="
 	dev-libs/libsodium:=
 	pgm? ( =net-libs/openpgm-5.2.122 )"
 DEPEND="${RDEPEND}
+	app-text/asciidoc
+	app-text/xmlto
 	sys-apps/util-linux
 	pgm? ( virtual/pkgconfig )"
 
@@ -28,24 +28,22 @@ src_prepare() {
 	sed \
 		-e '/libzmq_werror=/s:yes:no:g' \
 		-i configure.ac || die
-	autotools-utils_src_prepare
+	default
+	eautoreconf
 }
 
 src_configure() {
 	local myeconfargs=(
+		--enable-shared
+		$(use_enable static-libs static)
 		--with-relaxed
 		--with-libsodium
 		$(use_with pgm)
 	)
-	autotools-utils_src_configure
-}
-
-src_test() {
-	autotools-utils_src_test -j1
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
-	autotools-utils_src_install
-
-	doman doc/*.[1-9]
+	default
+	prune_libtool_files
 }
diff --git a/net-misc/ucarp/files/ucarp.initd-r2 b/net-misc/ucarp/files/ucarp.initd-r2
new file mode 100644
index 000000000000..a9747e9fd3da
--- /dev/null
+++ b/net-misc/ucarp/files/ucarp.initd-r2
@@ -0,0 +1,58 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+description="UCARP is a portable implementation of the CARP protocol"
+description_logstatus="Logs the status of ${SVCNAME} to syslog"
+description_demote="Demotes ${SVCNAME} from master to backup"
+
+extra_started_commands="logstatus demote"
+
+command="/usr/sbin/ucarp"
+command_args="--interface=${UCARP_INTERFACE} \
+              --srcip=${UCARP_SOURCEADDRESS} \
+              --vhid=${UCARP_VHID} \
+              --passfile=${UCARP_PASSFILE} \
+              --addr=${UCARP_VIRTUALADDRESS} \
+              --upscript=${UCARP_UPSCRIPT} \
+              --downscript=${UCARP_DOWNSCRIPT} \
+              --xparam=${UCARP_VIRTUALPREFIX} \
+              ${UCARP_OPTS}"
+
+pidfile="/var/run/${SVCNAME}.pid"
+command_background="yes"
+
+required_files="${UCARP_PASSFILE} ${UCARP_UPSCRIPT} ${UCARP_DOWNSCRIPT}"
+
+depend() {
+        need net
+        use logger
+}
+
+start_pre() {
+        local required_vars='UCARP_INTERFACE UCARP_SOURCEADDRESS UCARP_VHID
+                             UCARP_PASSFILE UCARP_VIRTUALADDRESS UCARP_UPSCRIPT
+                             UCARP_DOWNSCRIPT UCARP_VIRTUALPREFIX'
+
+        local config_var=''
+        for config_var in $required_vars; do
+                if test -z  "$(eval echo \$$config_var)"; then
+                        eerror "Missing or empty config variable '$config_var'"
+                        ewarn  "You have to edit /etc/conf.d/${SVCNAME} first"
+                        return 1
+                fi
+        done
+}
+
+logstatus() {
+        ebegin "Logging status of ${SVCNAME} to syslog"
+        start-stop-daemon --signal SIGUSR1 --pidfile "${pidfile}"
+        eend $?
+}
+
+demote() {
+        ebegin "Demote ${SVCNAME} from master to backup"
+        start-stop-daemon --signal SIGUSR2 --pidfile "${pidfile}"
+        eend $?
+}
diff --git a/net-misc/ucarp/ucarp-1.5.2-r5.ebuild b/net-misc/ucarp/ucarp-1.5.2-r5.ebuild
new file mode 100644
index 000000000000..4af200c66169
--- /dev/null
+++ b/net-misc/ucarp/ucarp-1.5.2-r5.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+DESCRIPTION="Portable userland implementation of Common Address Redundancy Protocol (CARP)"
+HOMEPAGE="http://www.ucarp.org"
+SRC_URI="ftp://ftp.ucarp.org/pub/ucarp/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="nls"
+
+RDEPEND="net-libs/libpcap"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_configure() {
+	econf $(use_enable nls)
+}
+
+src_install() {
+	default
+
+	doman "${FILESDIR}"/ucarp.8
+
+	exeinto /usr/libexec/ucarp
+	newexe "${FILESDIR}"/vip-up-default.sh-r1 vip-up-default.sh
+	newexe "${FILESDIR}"/vip-down-default.sh-r1 vip-down-default.sh
+
+	keepdir /etc/ucarp
+
+	newinitd "${FILESDIR}"/ucarp.initd-r2 ucarp
+	newconfd "${FILESDIR}"/ucarp.confd ucarp
+}
+
+pkg_postinst() {
+	elog "The provided init script needs to be configured first."
+	elog "Edit /etc/conf.d/ucarp to suite your environment."
+	elog "You will also have to set a shared password within /etc/ucarp/ucarp.pass"
+	elog "or whatever file you have set \$UCARP_PASSFILE to."
+
+	elog "If you need more than one instance of ucarp running, simply symlink"
+	elog "the init script and create a copy of the init script configuration"
+	elog "which corresponds to the name of the init script."
+}
diff --git a/net-wireless/portapack-firmware/metadata.xml b/net-wireless/portapack-firmware/metadata.xml
index 27ce03d82346..19914bebe9fd 100644
--- a/net-wireless/portapack-firmware/metadata.xml
+++ b/net-wireless/portapack-firmware/metadata.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>zerochaos@gentoo.org</email>
+		<name>Rick Farina</name>
+		<description>maintainer</description>
+	</maintainer>
 	<longdescription lang="en">
 </longdescription>
 	<upstream>
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index a611bab28cb7..7b561e672a9a 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -2,6 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Gilles Dartiguelongue <eva@gentoo.org> (22 Aug 2016)
+# Missing keywords on dev-libs/gom - bug #521972
+media-libs/grilo test
+
 # Brian Evans <grknight@gentoo.org> (18 Aug 2016)
 # Allow jdbc on this arch
 dev-db/mariadb -jdbc
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index 26bb3b71df42..ab103609ce42 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -2,6 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Gilles Dartiguelongue <eva@gentoo.org> (22 Aug 2016)
+# Missing keywords on dev-libs/gom - bug #521972
+media-libs/grilo test
+
 # Alexandre Rostovtsev <tetromino@gentoo.org> (28 Jun 2016)
 # Missing keywords on app-text/gspell - bug #587368
 >=app-editors/gedit-3.20 spell
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 3679d97437a9..cc05585bc613 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -5,6 +5,12 @@
 # This file requires >=portage-2.1.1
 # New entries go on top.
 
+# Brian Evans <grknight@gentoo.org> (22 Aug 2016)
+# Depends on masked, end-of-life php versions
+=dev-libs/ossp-uuid-1.6.2-r4 php
+=dev-libs/xapian-bindings-1.2.22 php
+=www-servers/uwsgi-2.0.9 php
+
 # Gilles Dartiguelongue <eva@gentoo.org> (21 Aug 2016)
 # Needs a Gstreamer plugin from gst-plugins-bad that is not packaged to date
 media-plugins/grilo-plugins chromaprint
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 5d34ee4dc6d0..f9e637316d03 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -1,7 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Brian Evans <grknight@gentoo.org> (22 Aug 2016)
+# php 5.5 is end of life, masked for removal
+php_targets_php5-5
+
 # Brian Evans <grknight@gentoo.org> (2 Dec 2015)
 # php 5.4 is end of life, masked for removal
 php_targets_php5-4
diff --git a/profiles/package.mask b/profiles/package.mask
index 49fad5eff134..564593716c2e 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -30,6 +30,16 @@
 
 #--- END OF EXAMPLES ---
 
+# Brian Evans <grknight@gentoo.org> (22 Aug 2016)
+# PHP 5.5 has reached end of life and will no longer receive security updates.
+# Also include associated packages which do not work on newer versions
+# Removal in 90 days
+virtual/httpd-php:5.5
+dev-lang/php:5.5
+dev-php/pecl-http:0
+=dev-php/pecl-mailparse-2.1.6-r1
+
+
 # Pacho Ramos <pacho@gentoo.org> (21 Aug 2016)
 # Ugly buildsystem, hard to bump, orphan (#462670). Removal in a month.
 x11-misc/ardesia
@@ -207,8 +217,8 @@ www-client/dwb
 app-i18n/scim-skk
 
 # Pacho Ramos <pacho@gentoo.org> (21 Aug 2016)
-# This was merged in systemd, if you want to keep it, take it a maintain it
-# splitted (#556734). Removal in a month.
+# This was merged into sys-apps/systemd, USE=gnuefi (#556734).
+# Removal in a month.
 sys-boot/gummiboot
 
 # Pacho Ramos <pacho@gentoo.org> (21 Aug 2016)
@@ -306,8 +316,6 @@ media-video/coriander
 # Packages added without a maintainer:
 #591110
 dev-vcs/git-deps
-#591114
-net-wireless/portapack-firmware
 #591118
 app-arch/threadzip
 #591122
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 0e431662c5b0..f9b1bea1b4c8 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -7554,6 +7554,8 @@ sys-devel/binutils-apple:libcxx - Add support for libcxx
 sys-devel/binutils-apple:lto - Add support for Link-Time Optimization with LLVM
 sys-devel/binutils-apple:multitarget - Compile for non-standard target architectures (ppc and ppc64) -- experimental, Gentoo only
 sys-devel/binutils-hppa64:multitarget - Adds support to binutils for cross compiling (does not work with gas)
+sys-devel/clang:default-compiler-rt - Use compiler-rt instead of libgcc as the default rtlib for clang
+sys-devel/clang:default-libcxx - Use libc++ instead of libstdc++ as the default stdlib for clang
 sys-devel/clang:multitarget - Build all host targets (default: host only)
 sys-devel/clang:static-analyzer - Install the Clang static analyzer
 sys-devel/distcc:crossdev - Enable support for sys-devel/crossdev
@@ -7775,6 +7777,7 @@ sys-kernel/spl:debug-log - Enable additional diagnostics
 sys-kernel/tuxonice-sources:experimental - Apply experimental patches; for more information, see "https://wiki.gentoo.org/wiki/Project:Kernel/Experimental".
 sys-libs/binutils-libs:64-bit-bfd - Support 64-bit targets even on 32-bit hosts (is ignored on 64-bit hosts)
 sys-libs/binutils-libs:multitarget - Enable all possible targets in libbfd
+sys-libs/compiler-rt:sanitize - Build compiler-rt's sanitizers
 sys-libs/db:rpc - Enable rpc client/server
 sys-libs/freeipmi:nagios - Install a nagios plugin to check sensors' status.
 sys-libs/gdbm:berkdb - enable compatibility layer for UNIX-like dbm and ndbm interfaces
diff --git a/sys-devel/clang/clang-9999-r100.ebuild b/sys-devel/clang/clang-9999-r100.ebuild
deleted file mode 100644
index eb10ee5738d3..000000000000
--- a/sys-devel/clang/clang-9999-r100.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit multilib-build
-
-DESCRIPTION="C language family frontend for LLVM (meta-ebuild)"
-HOMEPAGE="http://clang.llvm.org/"
-SRC_URI=""
-
-LICENSE="UoI-NCSA"
-SLOT="0/${PV}"
-KEYWORDS=""
-IUSE="debug multitarget python +static-analyzer"
-
-RDEPEND="~sys-devel/llvm-${PV}[clang(-),debug=,multitarget?,python?,static-analyzer?,${MULTILIB_USEDEP}]"
-
-# Please keep this package around since it's quite likely that we'll
-# return to separate LLVM & clang ebuilds when the cmake build system
-# is complete.
-
-pkg_postinst() {
-	if has_version ">=dev-util/ccache-3.1.9-r2" ; then
-		#add ccache links as clang might get installed after ccache
-		"${EROOT}"/usr/bin/ccache-config --install-links
-	fi
-}
-
-pkg_postrm() {
-	if has_version ">=dev-util/ccache-3.1.9-r2" && [[ -z ${REPLACED_BY_VERSION} ]]; then
-		# --remove-links would remove all links, --install-links updates them
-		"${EROOT}"/usr/bin/ccache-config --install-links
-	fi
-}
diff --git a/sys-devel/clang/clang-9999.ebuild b/sys-devel/clang/clang-9999.ebuild
new file mode 100644
index 000000000000..ad0fcf330b52
--- /dev/null
+++ b/sys-devel/clang/clang-9999.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+CMAKE_MIN_VERSION=3.4.3
+PYTHON_COMPAT=( python2_7 )
+
+inherit check-reqs cmake-utils flag-o-matic git-r3 multilib-minimal \
+	python-single-r1 toolchain-funcs pax-utils
+
+DESCRIPTION="C language family frontend for LLVM"
+HOMEPAGE="http://llvm.org/"
+SRC_URI=""
+EGIT_REPO_URI="http://llvm.org/git/clang.git
+	https://github.com/llvm-mirror/clang.git"
+
+LICENSE="UoI-NCSA"
+SLOT="0/${PV%.*}"
+KEYWORDS=""
+IUSE="debug default-compiler-rt default-libcxx +doc multitarget python
+	+static-analyzer test xml video_cards_radeon elibc_musl kernel_FreeBSD"
+
+RDEPEND="
+	~sys-devel/llvm-${PV}:=[debug=,multitarget?,video_cards_radeon?,${MULTILIB_USEDEP}]
+	static-analyzer? ( dev-lang/perl:* )
+	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+	!<sys-devel/llvm-${PV}
+	${PYTHON_DEPS}"
+# configparser-3.2 breaks the build (3.3 or none at all are fine)
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx )
+	xml? ( virtual/pkgconfig )
+	!!<dev-python/configparser-3.3.0.2
+	${PYTHON_DEPS}"
+PDEPEND="
+	default-compiler-rt? ( sys-libs/compiler-rt )
+	default-libcxx? ( sys-libs/libcxx )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+pkg_pretend() {
+	local build_size=650
+
+	if use debug; then
+		ewarn "USE=debug is known to increase the size of package considerably"
+		ewarn "and cause the tests to fail."
+		ewarn
+
+		(( build_size *= 14 ))
+	elif is-flagq '-g?(gdb)?([1-9])'; then
+		ewarn "The C++ compiler -g option is known to increase the size of the package"
+		ewarn "considerably. If you run out of space, please consider removing it."
+		ewarn
+
+		(( build_size *= 10 ))
+	fi
+
+	# Multiply by number of ABIs :).
+	local abis=( $(multilib_get_enabled_abis) )
+	(( build_size *= ${#abis[@]} ))
+
+	local CHECKREQS_DISK_BUILD=${build_size}M
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	pkg_pretend
+
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	git-r3_fetch "http://llvm.org/git/clang-tools-extra.git
+		https://github.com/llvm-mirror/clang-tools-extra.git"
+	git-r3_fetch
+
+	git-r3_checkout http://llvm.org/git/clang-tools-extra.git \
+		"${S}"/tools/clang/tools/extra
+	git-r3_checkout
+}
+
+src_prepare() {
+	python_setup
+
+	# fix race condition between sphinx targets
+	eapply "${FILESDIR}"/9999/0001-cmake-Add-ordering-dep-between-HTML-Sphinx-docs-and-.patch
+	# automatically select active system GCC's libraries, bugs #406163 and #417913
+	# TODO: cross-linux tests broken by this one
+	eapply "${FILESDIR}"/9999/0002-driver-Support-obtaining-active-toolchain-from-gcc-c.patch
+	# use cmake checks for rlimits, rather than __has_include_next()
+	eapply "${FILESDIR}"/9999/0003-driver-Support-checking-for-rlimits-via-cmake-when-b.patch
+	# adjust llvm-lit search to match LLVM cmake macros
+	eapply "${FILESDIR}"/9999/0004-cmake-Adjust-llvm-lit-search-to-match-the-one-in-LLV.patch
+	# support overriding clang runtime install directory
+	eapply "${FILESDIR}"/9999/0005-cmake-Supporting-overriding-runtime-libdir-via-CLANG.patch
+	# support overriding LLVMgold.so plugin directory
+	eapply "${FILESDIR}"/9999/0006-cmake-Add-CLANG_GOLD_LIBDIR_SUFFIX-to-specify-loc-of.patch
+	# fix stand-alone doc build
+	eapply "${FILESDIR}"/9999/0007-cmake-Support-stand-alone-Sphinx-doxygen-doc-build.patch
+
+	# User patches
+	eapply_user
+
+	# Native libdir is used to hold LLVMgold.so
+	NATIVE_LIBDIR=$(get_libdir)
+}
+
+multilib_src_configure() {
+	local targets
+	if use multitarget; then
+		targets=all
+	else
+		targets='host;BPF'
+		use video_cards_radeon && targets+=';AMDGPU'
+	fi
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+		# install clang runtime straight into /usr/lib
+		-DCLANG_LIBDIR_SUFFIX=""
+		# specify host's binutils gold plugin path
+		-DCLANG_GOLD_LIBDIR_SUFFIX="${NATIVE_LIBDIR#lib}"
+
+		-DBUILD_SHARED_LIBS=ON
+		-DLLVM_TARGETS_TO_BUILD="${targets}"
+		# TODO: get them properly conditional
+		#-DLLVM_BUILD_TESTS=$(usex test)
+
+		-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml)
+		# libgomp support fails to find headers without explicit -I
+		# furthermore, it provides only syntax checking
+		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
+
+		# override default stdlib and rtlib
+		-DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "")
+		-DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "")
+
+		-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
+		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
+	)
+
+	if multilib_is_native_abi; then
+		mycmakeargs+=(
+			# TODO: docs don't work out-of-llvm
+			-DLLVM_BUILD_DOCS=$(usex doc)
+			-DLLVM_ENABLE_SPHINX=$(usex doc)
+			-DLLVM_ENABLE_DOXYGEN=OFF
+			-DCLANG_INSTALL_HTML="${EPREFIX}/usr/share/doc/${PF}/clang"
+			-DSPHINX_WARNINGS_AS_ERRORS=OFF
+		)
+	else
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_BUILD=OFF
+		)
+	fi
+
+	if tc-is-cross-compiler; then
+		[[ -x "/usr/bin/clang-tblgen" ]] \
+			|| die "/usr/bin/clang-tblgen not found or usable"
+		mycmakeargs+=(
+			-DCMAKE_CROSSCOMPILING=ON
+			-DCLANG_TABLEGEN=/usr/bin/clang-tblgen
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake-utils_src_make check-clang
+}
+
+src_install() {
+	# note: magic applied in multilib_src_install()!
+	CLANG_VERSION=4.0
+
+	MULTILIB_CHOST_TOOLS=(
+		/usr/bin/clang
+		/usr/bin/clang++
+		/usr/bin/clang-cl
+		/usr/bin/clang-${CLANG_VERSION}
+		/usr/bin/clang++-${CLANG_VERSION}
+		/usr/bin/clang-cl-${CLANG_VERSION}
+	)
+
+	MULTILIB_WRAPPED_HEADERS=(
+		/usr/include/clang/Config/config.h
+	)
+
+	multilib-minimal_src_install
+
+	# Remove unnecessary headers on FreeBSD, bug #417171
+	if use kernel_FreeBSD && use clang; then
+		rm "${ED}"usr/lib/clang/${PV}/include/{std,float,iso,limits,tgmath,varargs}*.h || die
+	fi
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+
+	# apply CHOST and CLANG_VERSION to clang executables
+	# they're statically linked so we don't have to worry about the lib
+	local clang_tools=( clang clang++ clang-cl )
+	local i
+
+	# cmake gives us:
+	# - clang-X.Y
+	# - clang -> clang-X.Y
+	# - clang++, clang-cl -> clang
+	# we want to have:
+	# - clang-X.Y
+	# - clang++-X.Y, clang-cl-X.Y -> clang-X.Y
+	# - clang, clang++, clang-cl -> clang*-X.Y
+	# so we need to fix the two tools
+	for i in "${clang_tools[@]:1}"; do
+		rm "${ED%/}/usr/bin/${i}" || die
+		dosym "clang-${CLANG_VERSION}" "/usr/bin/${i}-${CLANG_VERSION}"
+		dosym "${i}-${CLANG_VERSION}" "/usr/bin/${i}"
+	done
+
+	# now prepend ${CHOST} and let the multilib-build.eclass symlink it
+	if ! multilib_is_native_abi; then
+		# non-native? let's replace it with a simple wrapper
+		for i in "${clang_tools[@]}"; do
+			rm "${ED%/}/usr/bin/${i}-${CLANG_VERSION}" || die
+			cat > "${T}"/wrapper.tmp <<-_EOF_
+				#!${EPREFIX}/bin/sh
+				exec "${i}-${CLANG_VERSION}" $(get_abi_CFLAGS) "\${@}"
+			_EOF_
+			newbin "${T}"/wrapper.tmp "${i}-${CLANG_VERSION}"
+		done
+	fi
+}
+
+multilib_src_install_all() {
+	if use python ; then
+		pushd bindings/python/clang >/dev/null || die
+
+		python_moduleinto clang
+		python_domodule *.py
+
+		popd >/dev/null || die
+	fi
+
+	python_fix_shebang "${ED}"
+	if use static-analyzer; then
+		python_optimize "${ED}"usr/share/scan-view
+	fi
+}
+
+pkg_postinst() {
+	if ! has_version 'sys-libs/libomp'; then
+		elog "To enable OpenMP support in clang, install sys-libs/libomp."
+	fi
+}
diff --git a/sys-devel/clang/files/9999/0001-cmake-Add-ordering-dep-between-HTML-Sphinx-docs-and-.patch b/sys-devel/clang/files/9999/0001-cmake-Add-ordering-dep-between-HTML-Sphinx-docs-and-.patch
new file mode 100644
index 000000000000..35fc19da9847
--- /dev/null
+++ b/sys-devel/clang/files/9999/0001-cmake-Add-ordering-dep-between-HTML-Sphinx-docs-and-.patch
@@ -0,0 +1,27 @@
+From ec16b3f76a26a3a10b0272d012b306963fa93013 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 21 Aug 2016 23:24:19 +0200
+Subject: [PATCH 1/7] cmake: Add ordering dep between HTML Sphinx docs and
+ manpages
+
+---
+ docs/CMakeLists.txt | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
+index 13b79fdf..bd75b63 100644
+--- a/docs/CMakeLists.txt
++++ b/docs/CMakeLists.txt
+@@ -102,6 +102,9 @@ if (LLVM_ENABLE_SPHINX)
+     endif()
+     if (${SPHINX_OUTPUT_MAN})
+       add_sphinx_target(man clang)
++      if (${SPHINX_OUTPUT_HTML})
++        add_dependencies(docs-clang-html docs-clang-man)
++      endif()
+     endif()
+   endif()
+ endif()
+-- 
+2.9.3
+
diff --git a/sys-devel/clang/files/9999/0002-driver-Support-obtaining-active-toolchain-from-gcc-c.patch b/sys-devel/clang/files/9999/0002-driver-Support-obtaining-active-toolchain-from-gcc-c.patch
new file mode 100644
index 000000000000..6128cb938ab0
--- /dev/null
+++ b/sys-devel/clang/files/9999/0002-driver-Support-obtaining-active-toolchain-from-gcc-c.patch
@@ -0,0 +1,46 @@
+From 67025453e6c2373c8d761f6435e7fa4ddaacd8fa Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Fri, 5 Sep 2014 16:49:35 +0200
+Subject: [PATCH 2/7] driver: Support obtaining active toolchain from
+ gcc-config on Gentoo
+
+Author: Richard Yao <ryao@gentoo.org>
+Bug: https://bugs.gentoo.org/406163
+Bug: https://bugs.gentoo.org/417913
+---
+ lib/Driver/ToolChains.cpp | 19 +++++++++++++++++++
+ 1 file changed, 19 insertions(+)
+
+diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp
+index 68d5214..7689f86 100644
+--- a/lib/Driver/ToolChains.cpp
++++ b/lib/Driver/ToolChains.cpp
+@@ -1418,6 +1418,25 @@ void Generic_GCC::GCCInstallationDetector::init(
+     }
+   }
+ 
++  for (unsigned k = 0, ke = CandidateTripleAliases.size(); k < ke; ++k) {
++    llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> File =
++        llvm::MemoryBuffer::getFile(D.SysRoot + "/etc/env.d/gcc/config-" + CandidateTripleAliases[k].str());
++    if (File)
++    {
++      const std::string VersionText = File.get()->getBuffer().rsplit('-').second.substr(0,5).str();
++      const std::string GentooPath = D.SysRoot + "/usr/lib/gcc/" + CandidateTripleAliases[k].str() + "/" + VersionText;
++      if (llvm::sys::fs::exists(GentooPath + "/crtbegin.o"))
++      {
++        Version = GCCVersion::Parse(VersionText);
++        GCCInstallPath = GentooPath;
++        GCCParentLibPath = GCCInstallPath + "/../../..";
++        GCCTriple.setTriple(CandidateTripleAliases[k]);
++        IsValid = true;
++        return;
++      }
++    }
++  }
++
+   // Loop over the various components which exist and select the best GCC
+   // installation available. GCC installs are ranked by version number.
+   Version = GCCVersion::Parse("0.0.0");
+-- 
+2.9.3
+
diff --git a/sys-devel/clang/files/9999/0003-driver-Support-checking-for-rlimits-via-cmake-when-b.patch b/sys-devel/clang/files/9999/0003-driver-Support-checking-for-rlimits-via-cmake-when-b.patch
new file mode 100644
index 000000000000..16d63ec7f61c
--- /dev/null
+++ b/sys-devel/clang/files/9999/0003-driver-Support-checking-for-rlimits-via-cmake-when-b.patch
@@ -0,0 +1,84 @@
+From 27b65490c9764d18fa02274bbb4f75dd5a688506 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 21 Aug 2016 23:30:17 +0200
+Subject: [PATCH 3/7] driver: Support checking for rlimits via cmake (when
+ bootstrapping)
+
+Add a cmake check for sys/resource.h and replace the __has_include()
+check with its result, in order to make it possible to use rlimits when
+building with compilers not supporting __has_include() -- i.e. when
+bootstrapping.
+
+Patch: https://reviews.llvm.org/D23744
+---
+ CMakeLists.txt                      | 3 +++
+ include/clang/Config/config.h.cmake | 3 +++
+ tools/driver/cc1_main.cpp           | 8 +++-----
+ 3 files changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e6dde85..aee0d0a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -177,6 +177,9 @@ if (LIBXML2_FOUND)
+   set(CLANG_HAVE_LIBXML 1)
+ endif()
+ 
++include(CheckIncludeFile)
++check_include_file(sys/resource.h CLANG_HAVE_RLIMITS)
++
+ set(CLANG_RESOURCE_DIR "" CACHE STRING
+   "Relative directory from the Clang binary to its resource files.")
+ 
+diff --git a/include/clang/Config/config.h.cmake b/include/clang/Config/config.h.cmake
+index 9200ed9..9bf9ea5 100644
+--- a/include/clang/Config/config.h.cmake
++++ b/include/clang/Config/config.h.cmake
+@@ -35,6 +35,9 @@
+ /* Define if we have libxml2 */
+ #cmakedefine CLANG_HAVE_LIBXML ${CLANG_HAVE_LIBXML}
+ 
++/* Define if we have sys/resource.h (rlimits) */
++#cmakedefine CLANG_HAVE_RLIMITS ${CLANG_HAVE_RLIMITS}
++
+ /* The LLVM product name and version */
+ #define BACKEND_PACKAGE_STRING "${BACKEND_PACKAGE_STRING}"
+ 
+diff --git a/tools/driver/cc1_main.cpp b/tools/driver/cc1_main.cpp
+index b8cea41..45d44a0 100644
+--- a/tools/driver/cc1_main.cpp
++++ b/tools/driver/cc1_main.cpp
+@@ -15,6 +15,7 @@
+ 
+ #include "llvm/Option/Arg.h"
+ #include "clang/CodeGen/ObjectFilePCHContainerOperations.h"
++#include "clang/Config/config.h"
+ #include "clang/Driver/DriverDiagnostic.h"
+ #include "clang/Driver/Options.h"
+ #include "clang/Frontend/CompilerInstance.h"
+@@ -37,12 +38,9 @@
+ #include "llvm/Support/raw_ostream.h"
+ #include <cstdio>
+ 
+-#ifdef __has_include
+-#if __has_include(<sys/resource.h>)
+-#define HAVE_RLIMITS
++#ifdef CLANG_HAVE_RLIMITS
+ #include <sys/resource.h>
+ #endif
+-#endif
+ 
+ using namespace clang;
+ using namespace llvm::opt;
+@@ -73,7 +71,7 @@ void initializePollyPasses(llvm::PassRegistry &Registry);
+ }
+ #endif
+ 
+-#ifdef HAVE_RLIMITS
++#ifdef CLANG_HAVE_RLIMITS
+ // The amount of stack we think is "sufficient". If less than this much is
+ // available, we may be unable to reach our template instantiation depth
+ // limit and other similar limits.
+-- 
+2.9.3
+
diff --git a/sys-devel/clang/files/9999/0004-cmake-Adjust-llvm-lit-search-to-match-the-one-in-LLV.patch b/sys-devel/clang/files/9999/0004-cmake-Adjust-llvm-lit-search-to-match-the-one-in-LLV.patch
new file mode 100644
index 000000000000..bcf409c71b67
--- /dev/null
+++ b/sys-devel/clang/files/9999/0004-cmake-Adjust-llvm-lit-search-to-match-the-one-in-LLV.patch
@@ -0,0 +1,29 @@
+From d7bc0e05e8064e0c939db6c2fb6d215fd0340708 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 21 Aug 2016 23:30:39 +0200
+Subject: [PATCH 4/7] cmake: Adjust llvm-lit search to match the one in LLVM
+
+Adjust the system lit executable search to look for llvm-lit as that is
+the name used in AddLLVM.cmake installed by LLVM.
+
+Patch: https://reviews.llvm.org/D23745
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index aee0d0a..e95ab52 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -140,7 +140,7 @@ Please install Python or specify the PYTHON_EXECUTABLE CMake variable.")
+       endif()
+     else()
+       # Seek installed Lit.
+-      find_program(LLVM_LIT "lit.py" ${LLVM_MAIN_SRC_DIR}/utils/lit
++      find_program(LLVM_LIT "llvm-lit" ${LLVM_MAIN_SRC_DIR}/utils/lit
+         DOC "Path to lit.py")
+     endif()
+ 
+-- 
+2.9.3
+
diff --git a/sys-devel/clang/files/9999/0005-cmake-Supporting-overriding-runtime-libdir-via-CLANG.patch b/sys-devel/clang/files/9999/0005-cmake-Supporting-overriding-runtime-libdir-via-CLANG.patch
new file mode 100644
index 000000000000..da737c19811e
--- /dev/null
+++ b/sys-devel/clang/files/9999/0005-cmake-Supporting-overriding-runtime-libdir-via-CLANG.patch
@@ -0,0 +1,86 @@
+From 8864d8f9da1b30c9539e9dc0388c5d0dccca3a34 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 21 Aug 2016 23:31:06 +0200
+Subject: [PATCH 5/7] cmake: Supporting overriding runtime libdir via
+ CLANG_LIBDIR_SUFFIX
+
+Make it possible to override the value of CLANG_LIBDIR_SUFFIX, and use
+it uniformly to control install location of runtimes (i.e. lib/clang),
+therefore supporting sharing a common runtime between multiple multilib
+variants.
+
+Previously, CLANG_LIBDIR_SUFFIX was pinned to LLVM_LIBDIR_SUFFIX
+and used only to define runtime path in driver code. This patch extends
+its use to building and installing the runtime (the former is needed for
+tests to work correctly).
+
+The goal is to support install layout alike "LLVM_LIBDIR_SUFFIX=64
+CLANG_LIBDIR_SUFFIX=''" -- where all shared libraries would be installed
+into ABI-specific /usr/lib64, while runtime (that is common between
+multilib ABIs) would be installed into /usr/lib.
+
+Bug: https://llvm.org/bugs/show_bug.cgi?id=23792
+Patch: https://reviews.llvm.org/D23752
+---
+ CMakeLists.txt             | 5 +++--
+ lib/Headers/CMakeLists.txt | 4 ++--
+ runtime/CMakeLists.txt     | 4 ++--
+ 3 files changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e95ab52..67b85b5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -235,8 +235,9 @@ endif()
+ set(CLANG_VENDOR_UTI "org.llvm.clang" CACHE STRING
+   "Vendor-specific uti.")
+ 
+-# The libdir suffix must exactly match whatever LLVM's configuration used.
+-set(CLANG_LIBDIR_SUFFIX "${LLVM_LIBDIR_SUFFIX}")
++set(CLANG_LIBDIR_SUFFIX "${LLVM_LIBDIR_SUFFIX}" CACHE
++  STRING "Define suffix of library directory name for clang runtime (32/64)")
++set(CLANG_LIBRARY_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${CLANG_LIBDIR_SUFFIX})
+ 
+ set(CLANG_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+ set(CLANG_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
+diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txt
+index 600fece..86a70c5 100644
+--- a/lib/Headers/CMakeLists.txt
++++ b/lib/Headers/CMakeLists.txt
+@@ -88,7 +88,7 @@ set(files
+   xtestintrin.h
+   )
+ 
+-set(output_dir ${LLVM_LIBRARY_OUTPUT_INTDIR}/clang/${CLANG_VERSION}/include)
++set(output_dir ${CLANG_LIBRARY_OUTPUT_INTDIR}/clang/${CLANG_VERSION}/include)
+ 
+ # Generate arm_neon.h
+ clang_tablegen(arm_neon.h -gen-arm-neon
+@@ -118,7 +118,7 @@ install(
+   FILES ${files} ${CMAKE_CURRENT_BINARY_DIR}/arm_neon.h
+   COMPONENT clang-headers
+   PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+-  DESTINATION lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include)
++  DESTINATION lib${CLANG_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include)
+ 
+ if (NOT CMAKE_CONFIGURATION_TYPES) # don't add this for IDE's.
+   add_custom_target(install-clang-headers
+diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
+index 814857f..9348615 100644
+--- a/runtime/CMakeLists.txt
++++ b/runtime/CMakeLists.txt
+@@ -71,9 +71,9 @@ if(LLVM_BUILD_EXTERNAL_COMPILER_RT AND EXISTS ${COMPILER_RT_SRC_ROOT}/)
+                -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
+                -DLLVM_CONFIG_PATH=${LLVM_RUNTIME_OUTPUT_INTDIR}/llvm-config
+                -DLLVM_LIT_ARGS=${LLVM_LIT_ARGS}
+-               -DCOMPILER_RT_OUTPUT_DIR=${LLVM_LIBRARY_OUTPUT_INTDIR}/clang/${CLANG_VERSION}
++               -DCOMPILER_RT_OUTPUT_DIR=${CLANG_LIBRARY_OUTPUT_INTDIR}/clang/${CLANG_VERSION}
+                -DCOMPILER_RT_EXEC_OUTPUT_DIR=${LLVM_RUNTIME_OUTPUT_INTDIR}
+-               -DCOMPILER_RT_INSTALL_PATH:STRING=lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}
++               -DCOMPILER_RT_INSTALL_PATH:STRING=lib${CLANG_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}
+                -DCOMPILER_RT_INCLUDE_TESTS=${LLVM_INCLUDE_TESTS}
+                -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
+                -DLLVM_LIBDIR_SUFFIX=${LLVM_LIBDIR_SUFFIX}
+-- 
+2.9.3
+
diff --git a/sys-devel/clang/files/9999/0006-cmake-Add-CLANG_GOLD_LIBDIR_SUFFIX-to-specify-loc-of.patch b/sys-devel/clang/files/9999/0006-cmake-Add-CLANG_GOLD_LIBDIR_SUFFIX-to-specify-loc-of.patch
new file mode 100644
index 000000000000..18adcca8bad0
--- /dev/null
+++ b/sys-devel/clang/files/9999/0006-cmake-Add-CLANG_GOLD_LIBDIR_SUFFIX-to-specify-loc-of.patch
@@ -0,0 +1,64 @@
+From cf60af04f0ac2836f50d5a042acc89ef76e76a66 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 21 Aug 2016 23:31:28 +0200
+Subject: [PATCH 6/7] cmake: Add CLANG_GOLD_LIBDIR_SUFFIX to specify loc of
+ LLVMgold.so
+
+Add CLANG_GOLD_LIBDIR_SUFFIX that defaults to ${LLVM_LIBDIR_SUFFIX}
+and can be overriden if LLVMgold.so is installed elsewhere. The use case
+are multilib systems where binutils is 64-bit and clang is 32-bit,
+therefore the gold plugin is installed in 64-bit libdir while clang
+is not.
+
+Bug: https://llvm.org/bugs/show_bug.cgi?id=23793
+Patch: https://reviews.llvm.org/D23754
+---
+ CMakeLists.txt                      | 3 +++
+ include/clang/Config/config.h.cmake | 3 +++
+ lib/Driver/Tools.cpp                | 2 +-
+ 3 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 67b85b5..8ed8c10 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -239,6 +239,9 @@ set(CLANG_LIBDIR_SUFFIX "${LLVM_LIBDIR_SUFFIX}" CACHE
+   STRING "Define suffix of library directory name for clang runtime (32/64)")
+ set(CLANG_LIBRARY_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${CLANG_LIBDIR_SUFFIX})
+ 
++set(CLANG_GOLD_LIBDIR_SUFFIX "${LLVM_LIBDIR_SUFFIX}" CACHE
++  STRING "Define suffix of library directory name that contains LLVMgold.so (32/64)")
++
+ set(CLANG_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+ set(CLANG_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
+ 
+diff --git a/include/clang/Config/config.h.cmake b/include/clang/Config/config.h.cmake
+index 9bf9ea5..26e0e7e 100644
+--- a/include/clang/Config/config.h.cmake
++++ b/include/clang/Config/config.h.cmake
+@@ -20,6 +20,9 @@
+ /* Multilib suffix for libdir. */
+ #define CLANG_LIBDIR_SUFFIX "${CLANG_LIBDIR_SUFFIX}"
+ 
++/* Multilib suffix for libdir containing LLVMgold.so. */
++#define CLANG_GOLD_LIBDIR_SUFFIX "${CLANG_GOLD_LIBDIR_SUFFIX}"
++
+ /* Relative directory for resource files */
+ #define CLANG_RESOURCE_DIR "${CLANG_RESOURCE_DIR}"
+ 
+diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
+index a814df3..333a2e9 100644
+--- a/lib/Driver/Tools.cpp
++++ b/lib/Driver/Tools.cpp
+@@ -2007,7 +2007,7 @@ static void AddGoldPlugin(const ToolChain &ToolChain, const ArgList &Args,
+   // forward.
+   CmdArgs.push_back("-plugin");
+   std::string Plugin =
+-      ToolChain.getDriver().Dir + "/../lib" CLANG_LIBDIR_SUFFIX "/LLVMgold.so";
++      ToolChain.getDriver().Dir + "/../lib" CLANG_GOLD_LIBDIR_SUFFIX "/LLVMgold.so";
+   CmdArgs.push_back(Args.MakeArgString(Plugin));
+ 
+   // Try to pass driver level flags relevant to LTO code generation down to
+-- 
+2.9.3
+
diff --git a/sys-devel/clang/files/9999/0007-cmake-Support-stand-alone-Sphinx-doxygen-doc-build.patch b/sys-devel/clang/files/9999/0007-cmake-Support-stand-alone-Sphinx-doxygen-doc-build.patch
new file mode 100644
index 000000000000..0ecd5bc0e8c1
--- /dev/null
+++ b/sys-devel/clang/files/9999/0007-cmake-Support-stand-alone-Sphinx-doxygen-doc-build.patch
@@ -0,0 +1,64 @@
+From 8dd12df445c9a35f7b1c0202eb7c74b954b0980d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 21 Aug 2016 23:31:55 +0200
+Subject: [PATCH 7/7] cmake: Support stand-alone Sphinx & doxygen doc build
+
+Copy the necessary options and configuration checks from LLVM to clang,
+to support stand-alone documentation builds.
+
+Patch: https://reviews.llvm.org/D23758
+---
+ CMakeLists.txt | 37 +++++++++++++++++++++++++++++++++++++
+ 1 file changed, 37 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8ed8c10..3f34d8c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -162,6 +162,43 @@ Please install Python or specify the PYTHON_EXECUTABLE CMake variable.")
+     endif()
+   endif()
+ 
++  option (LLVM_BUILD_DOCS "Build the llvm documentation." OFF)
++  option (LLVM_INCLUDE_DOCS "Generate build targets for llvm documentation." ON)
++  option (LLVM_ENABLE_DOXYGEN "Use doxygen to generate llvm API documentation." OFF)
++  option (LLVM_ENABLE_SPHINX "Use Sphinx to generate llvm documentation." OFF)
++
++  if (LLVM_ENABLE_DOXYGEN)
++    message(STATUS "Doxygen enabled.")
++    find_package(Doxygen REQUIRED)
++
++    if (DOXYGEN_FOUND)
++      # If we find doxygen and we want to enable doxygen by default create a
++      # global aggregate doxygen target for generating llvm and any/all
++      # subprojects doxygen documentation.
++      if (LLVM_BUILD_DOCS)
++        add_custom_target(doxygen ALL)
++      endif()
++
++      option(LLVM_DOXYGEN_EXTERNAL_SEARCH "Enable doxygen external search." OFF)
++      if (LLVM_DOXYGEN_EXTERNAL_SEARCH)
++        set(LLVM_DOXYGEN_SEARCHENGINE_URL "" CACHE STRING "URL to use for external search.")
++        set(LLVM_DOXYGEN_SEARCH_MAPPINGS "" CACHE STRING "Doxygen Search Mappings")
++      endif()
++    endif()
++  else()
++    message(STATUS "Doxygen disabled.")
++  endif()
++
++  if (LLVM_ENABLE_SPHINX)
++    message(STATUS "Sphinx enabled.")
++    find_package(Sphinx REQUIRED)
++    if (LLVM_BUILD_DOCS)
++      add_custom_target(sphinx ALL)
++    endif()
++  else()
++    message(STATUS "Sphinx disabled.")
++  endif()
++
+   set( CLANG_BUILT_STANDALONE 1 )
+   set(BACKEND_PACKAGE_STRING "LLVM ${LLVM_PACKAGE_VERSION}")
+ else()
+-- 
+2.9.3
+
diff --git a/sys-devel/clang/metadata.xml b/sys-devel/clang/metadata.xml
index 28f455942a22..38b8ec4ab6ab 100644
--- a/sys-devel/clang/metadata.xml
+++ b/sys-devel/clang/metadata.xml
@@ -27,6 +27,8 @@ A simple and hackable code base
 A single unified parser for C, Objective C, C++, and Objective C++
 Conformance with C/C++/ObjC and their variants</longdescription>
 	<use>
+		<flag name="default-compiler-rt">Use compiler-rt instead of libgcc as the default rtlib for clang</flag>
+		<flag name="default-libcxx">Use libc++ instead of libstdc++ as the default stdlib for clang</flag>
 		<flag name="multitarget">Build all host targets (default: host only)</flag>
 		<flag name="static-analyzer">Install the Clang static analyzer</flag>
 	</use>
diff --git a/sys-devel/llvm/files/llvm-3.5.0-fix_LLVMExports_cmake.patch b/sys-devel/llvm/files/3.5.0/fix_LLVMExports_cmake.patch
similarity index 100%
rename from sys-devel/llvm/files/llvm-3.5.0-fix_LLVMExports_cmake.patch
rename to sys-devel/llvm/files/3.5.0/fix_LLVMExports_cmake.patch
diff --git a/sys-devel/llvm/files/clang-3.5-gentoo-install.patch b/sys-devel/llvm/files/3.5.2/clang/gentoo-install.patch
similarity index 100%
rename from sys-devel/llvm/files/clang-3.5-gentoo-install.patch
rename to sys-devel/llvm/files/3.5.2/clang/gentoo-install.patch
diff --git a/sys-devel/llvm/files/llvm-3.5.2-gcc-5.1.patch b/sys-devel/llvm/files/3.5.2/gcc-5.1.patch
similarity index 100%
rename from sys-devel/llvm/files/llvm-3.5.2-gcc-5.1.patch
rename to sys-devel/llvm/files/3.5.2/gcc-5.1.patch
diff --git a/sys-devel/llvm/files/llvm-3.5-gentoo-install.patch b/sys-devel/llvm/files/3.5.2/gentoo-install.patch
similarity index 100%
rename from sys-devel/llvm/files/llvm-3.5-gentoo-install.patch
rename to sys-devel/llvm/files/3.5.2/gentoo-install.patch
diff --git a/sys-devel/llvm/files/clang-3.6-fbsd-gcc49.patch b/sys-devel/llvm/files/3.6.2/clang/fbsd-gcc49.patch
similarity index 100%
rename from sys-devel/llvm/files/clang-3.6-fbsd-gcc49.patch
rename to sys-devel/llvm/files/3.6.2/clang/fbsd-gcc49.patch
diff --git a/sys-devel/llvm/files/llvm-3.5-gcc-4.9.patch b/sys-devel/llvm/files/3.6.2/gcc-4.9.patch
similarity index 100%
rename from sys-devel/llvm/files/llvm-3.5-gcc-4.9.patch
rename to sys-devel/llvm/files/3.6.2/gcc-4.9.patch
diff --git a/sys-devel/llvm/files/llvm-3.6-gentoo-install.patch b/sys-devel/llvm/files/3.6.2/gentoo-install.patch
similarity index 100%
rename from sys-devel/llvm/files/llvm-3.6-gentoo-install.patch
rename to sys-devel/llvm/files/3.6.2/gentoo-install.patch
diff --git a/sys-devel/llvm/files/llvm-3.2-nodoctargz.patch b/sys-devel/llvm/files/3.6.2/nodoctargz.patch
similarity index 100%
rename from sys-devel/llvm/files/llvm-3.2-nodoctargz.patch
rename to sys-devel/llvm/files/3.6.2/nodoctargz.patch
diff --git a/sys-devel/llvm/files/llvm-3.6.0-ocaml-ctypes-0.4.0.patch b/sys-devel/llvm/files/3.6.2/ocaml-ctypes-0.4.0.patch
similarity index 100%
rename from sys-devel/llvm/files/llvm-3.6.0-ocaml-ctypes-0.4.0.patch
rename to sys-devel/llvm/files/3.6.2/ocaml-ctypes-0.4.0.patch
diff --git a/sys-devel/llvm/files/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix.patch b/sys-devel/llvm/files/3.7.1/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch
similarity index 100%
rename from sys-devel/llvm/files/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix.patch
rename to sys-devel/llvm/files/3.7.1/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch
diff --git a/sys-devel/llvm/files/clang-3.7.1-ccc-analyzer-isystem.patch b/sys-devel/llvm/files/3.7.1/clang/ccc-analyzer-isystem.patch
similarity index 100%
rename from sys-devel/llvm/files/clang-3.7.1-ccc-analyzer-isystem.patch
rename to sys-devel/llvm/files/3.7.1/clang/ccc-analyzer-isystem.patch
diff --git a/sys-devel/llvm/files/clang-3.6-gentoo-install.patch b/sys-devel/llvm/files/3.7.1/clang/gentoo-install.patch
similarity index 100%
rename from sys-devel/llvm/files/clang-3.6-gentoo-install.patch
rename to sys-devel/llvm/files/3.7.1/clang/gentoo-install.patch
diff --git a/sys-devel/llvm/files/cmake/llvm-3.7.0-compiler_rt_arm_march_flags.patch b/sys-devel/llvm/files/3.7.1/compiler-rt/arm_march_flags.patch
similarity index 100%
rename from sys-devel/llvm/files/cmake/llvm-3.7.0-compiler_rt_arm_march_flags.patch
rename to sys-devel/llvm/files/3.7.1/compiler-rt/arm_march_flags.patch
diff --git a/sys-devel/llvm/files/compiler-rt-3.7-msan-fix.patch b/sys-devel/llvm/files/3.7.1/compiler-rt/msan-fix.patch
similarity index 100%
rename from sys-devel/llvm/files/compiler-rt-3.7-msan-fix.patch
rename to sys-devel/llvm/files/3.7.1/compiler-rt/msan-fix.patch
diff --git a/sys-devel/llvm/files/llvm-3.7-lldb_python.patch b/sys-devel/llvm/files/3.7.1/lldb/python.patch
similarity index 100%
rename from sys-devel/llvm/files/llvm-3.7-lldb_python.patch
rename to sys-devel/llvm/files/3.7.1/lldb/python.patch
diff --git a/sys-devel/llvm/files/cmake/llvm-3.7.0-lldb_tinfo.patch b/sys-devel/llvm/files/3.7.1/lldb/tinfo.patch
similarity index 100%
rename from sys-devel/llvm/files/cmake/llvm-3.7.0-lldb_tinfo.patch
rename to sys-devel/llvm/files/3.7.1/lldb/tinfo.patch
diff --git a/sys-devel/llvm/files/llvm-3.7.1-llvm-config-0.patch b/sys-devel/llvm/files/3.7.1/llvm-config-0.patch
similarity index 100%
rename from sys-devel/llvm/files/llvm-3.7.1-llvm-config-0.patch
rename to sys-devel/llvm/files/3.7.1/llvm-config-0.patch
diff --git a/sys-devel/llvm/files/llvm-3.7.1-llvm-config-1.patch b/sys-devel/llvm/files/3.7.1/llvm-config-1.patch
similarity index 100%
rename from sys-devel/llvm/files/llvm-3.7.1-llvm-config-1.patch
rename to sys-devel/llvm/files/3.7.1/llvm-config-1.patch
diff --git a/sys-devel/llvm/files/llvm-3.7.1-llvm-config-2.patch b/sys-devel/llvm/files/3.7.1/llvm-config-2.patch
similarity index 100%
rename from sys-devel/llvm/files/llvm-3.7.1-llvm-config-2.patch
rename to sys-devel/llvm/files/3.7.1/llvm-config-2.patch
diff --git a/sys-devel/llvm/files/llvm-3.7.1-llvm-config-3.patch b/sys-devel/llvm/files/3.7.1/llvm-config-3.patch
similarity index 100%
rename from sys-devel/llvm/files/llvm-3.7.1-llvm-config-3.patch
rename to sys-devel/llvm/files/3.7.1/llvm-config-3.patch
diff --git a/sys-devel/llvm/files/llvm-3.7-msan-fix.patch b/sys-devel/llvm/files/3.7.1/msan-fix.patch
similarity index 100%
rename from sys-devel/llvm/files/llvm-3.7-msan-fix.patch
rename to sys-devel/llvm/files/3.7.1/msan-fix.patch
diff --git a/sys-devel/llvm/files/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix-3.8.patch b/sys-devel/llvm/files/3.8.1/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch
similarity index 100%
rename from sys-devel/llvm/files/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix-3.8.patch
rename to sys-devel/llvm/files/3.8.1/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch
diff --git a/sys-devel/llvm/files/cmake/clang-0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch b/sys-devel/llvm/files/3.8.1/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
similarity index 100%
rename from sys-devel/llvm/files/cmake/clang-0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
rename to sys-devel/llvm/files/3.8.1/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
diff --git a/sys-devel/llvm/files/clang-3.8-abi-tag-support-mangler.patch b/sys-devel/llvm/files/3.8.1/clang/abi-tag-support-mangler.patch
similarity index 100%
rename from sys-devel/llvm/files/clang-3.8-abi-tag-support-mangler.patch
rename to sys-devel/llvm/files/3.8.1/clang/abi-tag-support-mangler.patch
diff --git a/sys-devel/llvm/files/clang-3.8-abi-tag-support-sema.patch b/sys-devel/llvm/files/3.8.1/clang/abi-tag-support-sema.patch
similarity index 100%
rename from sys-devel/llvm/files/clang-3.8-abi-tag-support-sema.patch
rename to sys-devel/llvm/files/3.8.1/clang/abi-tag-support-sema.patch
diff --git a/sys-devel/llvm/files/clang-3.4-darwin_prefix-include-paths.patch b/sys-devel/llvm/files/3.8.1/clang/darwin_prefix-include-paths.patch
similarity index 100%
rename from sys-devel/llvm/files/clang-3.4-darwin_prefix-include-paths.patch
rename to sys-devel/llvm/files/3.8.1/clang/darwin_prefix-include-paths.patch
diff --git a/sys-devel/llvm/files/clang-3.8-default-libs.patch b/sys-devel/llvm/files/3.8.1/clang/default-libs.patch
similarity index 100%
rename from sys-devel/llvm/files/clang-3.8-default-libs.patch
rename to sys-devel/llvm/files/3.8.1/clang/default-libs.patch
diff --git a/sys-devel/llvm/files/clang-3.8-gcc4.9-search-path.patch b/sys-devel/llvm/files/3.8.1/clang/gcc4.9-search-path.patch
similarity index 100%
rename from sys-devel/llvm/files/clang-3.8-gcc4.9-search-path.patch
rename to sys-devel/llvm/files/3.8.1/clang/gcc4.9-search-path.patch
diff --git a/sys-devel/llvm/files/clang-3.5-gentoo-runtime-gcc-detection-v3.patch b/sys-devel/llvm/files/3.8.1/clang/gentoo-runtime-gcc-detection-v3.patch
similarity index 100%
rename from sys-devel/llvm/files/clang-3.5-gentoo-runtime-gcc-detection-v3.patch
rename to sys-devel/llvm/files/3.8.1/clang/gentoo-runtime-gcc-detection-v3.patch
diff --git a/sys-devel/llvm/files/clang-3.8-musl-support.patch b/sys-devel/llvm/files/3.8.1/clang/musl-support.patch
similarity index 100%
rename from sys-devel/llvm/files/clang-3.8-musl-support.patch
rename to sys-devel/llvm/files/3.8.1/clang/musl-support.patch
diff --git a/sys-devel/llvm/files/cmake/compiler-rt-0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch b/sys-devel/llvm/files/3.8.1/compiler-rt/0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch
similarity index 100%
rename from sys-devel/llvm/files/cmake/compiler-rt-0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch
rename to sys-devel/llvm/files/3.8.1/compiler-rt/0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch
diff --git a/sys-devel/llvm/files/cmake/llvm-3.8.0-compiler_rt_arm_march_flags.patch b/sys-devel/llvm/files/3.8.1/compiler-rt/arm_march_flags.patch
similarity index 100%
rename from sys-devel/llvm/files/cmake/llvm-3.8.0-compiler_rt_arm_march_flags.patch
rename to sys-devel/llvm/files/3.8.1/compiler-rt/arm_march_flags.patch
diff --git a/sys-devel/llvm/files/clang-3.8-compiler-rt-fbsd.patch b/sys-devel/llvm/files/3.8.1/compiler-rt/fbsd.patch
similarity index 100%
rename from sys-devel/llvm/files/clang-3.8-compiler-rt-fbsd.patch
rename to sys-devel/llvm/files/3.8.1/compiler-rt/fbsd.patch
diff --git a/sys-devel/llvm/files/llvm-3.8-lldb_six.patch b/sys-devel/llvm/files/3.8.1/lldb/six.patch
similarity index 100%
rename from sys-devel/llvm/files/llvm-3.8-lldb_six.patch
rename to sys-devel/llvm/files/3.8.1/lldb/six.patch
diff --git a/sys-devel/llvm/files/llvm-3.8-llvm-config-r1.patch b/sys-devel/llvm/files/3.8.1/llvm-config-r1.patch
similarity index 100%
rename from sys-devel/llvm/files/llvm-3.8-llvm-config-r1.patch
rename to sys-devel/llvm/files/3.8.1/llvm-config-r1.patch
diff --git a/sys-devel/llvm/files/llvm-3.8-llvm-config.patch b/sys-devel/llvm/files/3.8.1/llvm-config.patch
similarity index 100%
rename from sys-devel/llvm/files/llvm-3.8-llvm-config.patch
rename to sys-devel/llvm/files/3.8.1/llvm-config.patch
diff --git a/sys-devel/llvm/files/llvm-3.8-musl-support.patch b/sys-devel/llvm/files/3.8.1/musl-env-support.patch
similarity index 100%
rename from sys-devel/llvm/files/llvm-3.8-musl-support.patch
rename to sys-devel/llvm/files/3.8.1/musl-env-support.patch
diff --git a/sys-devel/llvm/files/9999/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch b/sys-devel/llvm/files/9999/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch
new file mode 100644
index 000000000000..367a8a7794fe
--- /dev/null
+++ b/sys-devel/llvm/files/9999/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch
@@ -0,0 +1,71 @@
+From 2907883b3c504a08b98cf735ceaa8e438d20f37e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 21 Aug 2016 22:46:48 +0200
+Subject: [PATCH 01/10] cmake: Install OCaml modules into correct package
+ location
+
+Ensure that correct libdir is used for OCaml modules, and install them
+into dedicated llvm subdirectory rather than the top directory which is
+supposedly reserved for the standard library.
+
+Author: Mark Wright <gienah@gentoo.org>
+Bug: https://bugs.gentoo.org/559134
+Bug: https://bugs.gentoo.org/559624
+---
+ bindings/ocaml/backends/CMakeLists.txt | 2 +-
+ bindings/ocaml/llvm/CMakeLists.txt     | 2 +-
+ cmake/modules/AddOCaml.cmake           | 6 +++---
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/bindings/ocaml/backends/CMakeLists.txt b/bindings/ocaml/backends/CMakeLists.txt
+index a980638..9e5dc50 100644
+--- a/bindings/ocaml/backends/CMakeLists.txt
++++ b/bindings/ocaml/backends/CMakeLists.txt
+@@ -23,5 +23,5 @@ foreach(TARGET ${LLVM_TARGETS_TO_BUILD})
+     "${LLVM_LIBRARY_DIR}/ocaml/META.llvm_${TARGET}")
+ 
+   install(FILES "${LLVM_LIBRARY_DIR}/ocaml/META.llvm_${TARGET}"
+-          DESTINATION lib/ocaml)
++          DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml/llvm)
+ endforeach()
+diff --git a/bindings/ocaml/llvm/CMakeLists.txt b/bindings/ocaml/llvm/CMakeLists.txt
+index 4956fa4..c612f73 100644
+--- a/bindings/ocaml/llvm/CMakeLists.txt
++++ b/bindings/ocaml/llvm/CMakeLists.txt
+@@ -8,4 +8,4 @@ configure_file(
+   "${LLVM_LIBRARY_DIR}/ocaml/META.llvm")
+ 
+ install(FILES "${LLVM_LIBRARY_DIR}/ocaml/META.llvm"
+-        DESTINATION lib/ocaml)
++        DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml/llvm)
+diff --git a/cmake/modules/AddOCaml.cmake b/cmake/modules/AddOCaml.cmake
+index e3dd1d8..a16238e 100644
+--- a/cmake/modules/AddOCaml.cmake
++++ b/cmake/modules/AddOCaml.cmake
+@@ -137,7 +137,7 @@ function(add_ocaml_library name)
+   if( APPLE )
+     set(ocaml_rpath "@executable_path/../../lib")
+   elseif( UNIX )
+-    set(ocaml_rpath "\\$ORIGIN/../../lib")
++    set(ocaml_rpath "\\$ORIGIN/../../${CMAKE_INSTALL_LIBDIR}")
+   endif()
+   list(APPEND ocaml_flags "-ldopt" "-Wl,-rpath,${ocaml_rpath}")
+ 
+@@ -189,12 +189,12 @@ function(add_ocaml_library name)
+   endforeach()
+ 
+   install(FILES ${install_files}
+-          DESTINATION lib/ocaml)
++          DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml/llvm)
+   install(FILES ${install_shlibs}
+           PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
+                       GROUP_READ GROUP_EXECUTE
+                       WORLD_READ WORLD_EXECUTE
+-          DESTINATION lib/ocaml)
++          DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml/llvm)
+ 
+   foreach( install_file ${install_files} ${install_shlibs} )
+     get_filename_component(filename "${install_file}" NAME)
+-- 
+2.9.3
+
diff --git a/sys-devel/llvm/files/9999/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch b/sys-devel/llvm/files/9999/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch
new file mode 100644
index 000000000000..b90527a0e449
--- /dev/null
+++ b/sys-devel/llvm/files/9999/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch
@@ -0,0 +1,28 @@
+From 726806d9b4932287d67f9b6b112099648ea008b4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 21 Aug 2016 23:01:47 +0200
+Subject: [PATCH 02/10] cmake: Make OCaml docs dependent on LLVM_BUILD_DOCS
+
+Author: Bernard Cafarelli <voyageur@gentoo.org>
+Bug: https://bugs.gentoo.org/562008
+Patch: https://reviews.llvm.org/D23763
+---
+ docs/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
+index eaa1750..f2cd7e9 100644
+--- a/docs/CMakeLists.txt
++++ b/docs/CMakeLists.txt
+@@ -115,7 +115,7 @@ if (LLVM_ENABLE_SPHINX)
+ endif()
+ 
+ list(FIND LLVM_BINDINGS_LIST ocaml uses_ocaml)
+-if( NOT uses_ocaml LESS 0 )
++if( NOT uses_ocaml LESS 0 AND LLVM_BUILD_DOCS )
+   set(doc_targets
+         ocaml_llvm
+         ocaml_llvm_all_backends
+-- 
+2.9.3
+
diff --git a/sys-devel/llvm/files/cmake/0002-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch b/sys-devel/llvm/files/9999/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch
similarity index 78%
rename from sys-devel/llvm/files/cmake/0002-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch
rename to sys-devel/llvm/files/9999/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch
index 3e57f0dcaa68..76adf52fb94e 100644
--- a/sys-devel/llvm/files/cmake/0002-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch
+++ b/sys-devel/llvm/files/9999/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch
@@ -1,19 +1,20 @@
-From 2ec240a76253839cd1c5dc2e964f55698ae468fc Mon Sep 17 00:00:00 2001
+From 1251ac2021b768d3a56b4dc03212ea2fd12a34dd Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
 Date: Mon, 8 Jun 2015 06:43:00 +0200
-Subject: [PATCH 2/4] cmake: Support overriding Sphinx HTML doc install
+Subject: [PATCH 03/10] cmake: Support overriding Sphinx HTML doc install
  directory
 
 Provide ${PROJECT}_INSTALL_HTML variables (e.g. LLVM_INSTALL_HTML) to
 override Sphinx HTML doc install directory.
 
-Fixes: https://llvm.org/bugs/show_bug.cgi?id=23780
+Bug: https://llvm.org/bugs/show_bug.cgi?id=23780
+Patch: https://reviews.llvm.org/D23757
 ---
  cmake/modules/AddSphinxTarget.cmake | 8 ++++++--
  1 file changed, 6 insertions(+), 2 deletions(-)
 
 diff --git a/cmake/modules/AddSphinxTarget.cmake b/cmake/modules/AddSphinxTarget.cmake
-index 045dc23..9c9c444 100644
+index 045dc23..fac143f 100644
 --- a/cmake/modules/AddSphinxTarget.cmake
 +++ b/cmake/modules/AddSphinxTarget.cmake
 @@ -53,8 +53,12 @@ function (add_sphinx_target builder project)
@@ -26,11 +27,11 @@ index 045dc23..9c9c444 100644
 +        set(${project_upper}_INSTALL_HTML "share/doc/${project}/html"
 +            CACHE STRING "HTML documentation install directory for ${project}")
 +
-+        install(DIRECTORY "${SPHINX_BUILD_DIR}/"
++        install(DIRECTORY "${SPHINX_BUILD_DIR}/."
 +                DESTINATION "${${project_upper}_INSTALL_HTML}")
        else()
          message(WARNING Installation of ${builder} not supported)
        endif()
 -- 
-2.4.3
+2.9.3
 
diff --git a/sys-devel/llvm/files/cmake/0003-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch b/sys-devel/llvm/files/9999/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
similarity index 68%
rename from sys-devel/llvm/files/cmake/0003-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
rename to sys-devel/llvm/files/9999/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
index b1c74c69443f..94a81574d6ee 100644
--- a/sys-devel/llvm/files/cmake/0003-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
+++ b/sys-devel/llvm/files/9999/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
@@ -1,23 +1,24 @@
-From 4f7092ba05cccfeea7d26177d93f3d7a57d9bce2 Mon Sep 17 00:00:00 2001
+From 2f798e87c10a93235a00e95c38e736f9ff7e991b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
 Date: Mon, 8 Jun 2015 14:29:03 +0200
-Subject: [PATCH 3/4] cmake: Add an ordering dep between HTML & man Sphinx
+Subject: [PATCH 04/10] cmake: Add an ordering dep between HTML & man Sphinx
  targets
 
 Add a dependency between HTML & manpage Sphinx targets to prevent two
 instances of Sphinx from running in parallel, and therefore solves race
 conditions reusing the same doctree directory.
 
-Fixes: https://llvm.org/bugs/show_bug.cgi?id=23781
+Bug: https://llvm.org/bugs/show_bug.cgi?id=23781
+Patch: https://reviews.llvm.org/D23755
 ---
  docs/CMakeLists.txt | 3 +++
  1 file changed, 3 insertions(+)
 
 diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index da27627..63309a6 100644
+index f2cd7e9..179a65b 100644
 --- a/docs/CMakeLists.txt
 +++ b/docs/CMakeLists.txt
-@@ -100,6 +100,9 @@ if (LLVM_ENABLE_SPHINX)
+@@ -109,6 +109,9 @@ if (LLVM_ENABLE_SPHINX)
  
      if (${SPHINX_OUTPUT_MAN})
        add_sphinx_target(man llvm)
@@ -28,5 +29,5 @@ index da27627..63309a6 100644
  
    endif()
 -- 
-2.4.3
+2.9.3
 
diff --git a/sys-devel/llvm/files/cmake/0004-cmake-Do-not-install-libgtest.patch b/sys-devel/llvm/files/9999/0005-cmake-Do-not-install-libgtest.patch
similarity index 72%
rename from sys-devel/llvm/files/cmake/0004-cmake-Do-not-install-libgtest.patch
rename to sys-devel/llvm/files/9999/0005-cmake-Do-not-install-libgtest.patch
index 92ca2e47e81b..a24977c03140 100644
--- a/sys-devel/llvm/files/cmake/0004-cmake-Do-not-install-libgtest.patch
+++ b/sys-devel/llvm/files/9999/0005-cmake-Do-not-install-libgtest.patch
@@ -1,19 +1,21 @@
-From d9f80393cfd4e586242ac3efd4e6ba6b49ce39ae Mon Sep 17 00:00:00 2001
+From 1303993b5b9a4195ebe4930a8cd345c875e7f25c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
 Date: Tue, 9 Jun 2015 11:58:52 +0200
-Subject: [PATCH 4/4] cmake: Do not install libgtest
+Subject: [PATCH 05/10] cmake: Do not install libgtest
 
 libgtest is an internal test dependency, and should not be installed to
 the live system as a part of LLVM.
+
+Bug: http://llvm.org/bugs/show_bug.cgi?id=18341
 ---
  utils/unittest/CMakeLists.txt | 3 +++
  1 file changed, 3 insertions(+)
 
 diff --git a/utils/unittest/CMakeLists.txt b/utils/unittest/CMakeLists.txt
-index b34e22a..3fe5884 100644
+index c9a2cdd..bb4f667 100644
 --- a/utils/unittest/CMakeLists.txt
 +++ b/utils/unittest/CMakeLists.txt
-@@ -41,6 +41,9 @@ if (PTHREAD_LIBRARY_PATH)
+@@ -37,6 +37,9 @@ if (PTHREAD_LIBRARY_PATH)
    list(APPEND LIBS pthread)
  endif()
  
@@ -24,5 +26,5 @@ index b34e22a..3fe5884 100644
    googletest/src/gtest-all.cc
  
 -- 
-2.4.3
+2.9.3
 
diff --git a/sys-devel/llvm/files/9999/0006-cmake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch b/sys-devel/llvm/files/9999/0006-cmake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch
new file mode 100644
index 000000000000..8a2c091edfbf
--- /dev/null
+++ b/sys-devel/llvm/files/9999/0006-cmake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch
@@ -0,0 +1,28 @@
+From a2ecd4815d285281cb816e06b25dc0dc2a933073 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 21 Aug 2016 23:13:45 +0200
+Subject: [PATCH 06/10] cmake: Remove the CMAKE_BUILD_TYPE assertion
+
+---
+ CMakeLists.txt | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 894bc8c..453fcb8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -232,11 +232,6 @@ endif()
+ 
+ string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)
+ 
+-if (CMAKE_BUILD_TYPE AND
+-    NOT uppercase_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$")
+-  message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
+-endif()
+-
+ set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" )
+ 
+ set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')")
+-- 
+2.9.3
+
diff --git a/sys-devel/llvm/files/llvm-3.9-llvm-config.patch b/sys-devel/llvm/files/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
similarity index 68%
rename from sys-devel/llvm/files/llvm-3.9-llvm-config.patch
rename to sys-devel/llvm/files/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
index a1b0be92d337..968db45a0d7a 100644
--- a/sys-devel/llvm/files/llvm-3.9-llvm-config.patch
+++ b/sys-devel/llvm/files/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
@@ -1,8 +1,8 @@
-From 93133d777fd4c9d5e0f0cc563927f303f9527159 Mon Sep 17 00:00:00 2001
+From 2dba8c81db58d7dd62c67379eaa175498a4370f2 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
 Date: Sat, 20 Aug 2016 23:47:41 +0200
-Subject: [PATCH] llvm-config: Clean up exported values, update for shared
- linking
+Subject: [PATCH 07/10] llvm-config: Clean up exported values, update for
+ shared linking
 
 Gentoo-specific fixup for llvm-config, including:
 - wiping build-specific CFLAGS, CXXFLAGS,
@@ -24,7 +24,9 @@ diff --git a/tools/llvm-config/CMakeLists.txt b/tools/llvm-config/CMakeLists.txt
 index 744fa4e..593788a 100644
 --- a/tools/llvm-config/CMakeLists.txt
 +++ b/tools/llvm-config/CMakeLists.txt
-@@ -34,4 +34,8 @@ set(LLVM_OBJ_ROOT ${LLVM_BINARY_DIR})
+@@ -32,8 +32,12 @@ get_property(COMPILE_FLAGS TARGET llvm-config PROPERTY COMPILE_FLAGS)
+ set(LLVM_SRC_ROOT ${LLVM_MAIN_SRC_DIR})
+ set(LLVM_OBJ_ROOT ${LLVM_BINARY_DIR})
  set(LLVM_CPPFLAGS "${CMAKE_CPP_FLAGS} ${CMAKE_CPP_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}")
 -set(LLVM_CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}")
 -set(LLVM_CXXFLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${COMPILE_FLAGS} ${LLVM_DEFINITIONS}")
@@ -35,25 +37,42 @@ index 744fa4e..593788a 100644
 +set(LLVM_CFLAGS "${CMAKE_CPP_FLAGS} ${CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}")
 +set(LLVM_CXXFLAGS "${CMAKE_CPP_FLAGS} -std=c++11 ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}")
  set(LLVM_BUILD_SYSTEM cmake)
-@@ -48,3 +52,4 @@ set(LLVM_LDFLAGS "${CMAKE_CXX_LINK_FLAGS}")
+ set(LLVM_HAS_RTTI ${LLVM_CONFIG_HAS_RTTI})
+ set(LLVM_DYLIB_VERSION "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}${LLVM_VERSION_SUFFIX}")
+@@ -46,7 +50,8 @@ endif()
+ # Use the C++ link flags, since they should be a superset of C link flags.
+ set(LLVM_LDFLAGS "${CMAKE_CXX_LINK_FLAGS}")
  set(LLVM_BUILDMODE ${CMAKE_BUILD_TYPE})
 -set(LLVM_SYSTEM_LIBS ${SYSTEM_LIBS})
 +# We don't do static libs, so we don't need to supply any system-libs
 +set(LLVM_SYSTEM_LIBS "")
  if(BUILD_SHARED_LIBS)
+   set(LLVM_ENABLE_SHARED ON)
+ else()
 diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp
 index c63733f..ead11b9 100644
 --- a/tools/llvm-config/llvm-config.cpp
 +++ b/tools/llvm-config/llvm-config.cpp
-@@ -524,3 +524,4 @@ int main(int argc, char **argv) {
+@@ -522,7 +522,8 @@ int main(int argc, char **argv) {
+       } else if (Arg == "--host-target") {
+         OS << Triple::normalize(LLVM_DEFAULT_TARGET_TRIPLE) << '\n';
        } else if (Arg == "--build-mode") {
 -        OS << build_mode << '\n';
 +        // force Release since we force non-standard Gentoo build mode
 +        OS << "Release" << '\n';
        } else if (Arg == "--assertion-mode") {
-@@ -540,5 +540,9 @@ int main(int argc, char **argv) {
+ #if defined(NDEBUG)
+         OS << "OFF\n";
+@@ -538,9 +539,17 @@ int main(int argc, char **argv) {
+       } else if (Arg == "--shared-mode") {
+         PrintSharedMode = true;
        } else if (Arg == "--obj-root") {
-         OS << ActivePrefix << '\n';
+-        OS << ActivePrefix << '\n';
++        if (IsInDevelopmentTree) {
++          OS << ActivePrefix << '\n';
++        } else {
++          OS << "/dev/null\n";
++        }
        } else if (Arg == "--src-root") {
 -        OS << LLVM_SRC_ROOT << '\n';
 +        if (IsInDevelopmentTree) {
@@ -62,6 +81,8 @@ index c63733f..ead11b9 100644
 +          OS << "/dev/null\n";
 +        }
        } else if (Arg == "--link-shared") {
+         LinkMode = LinkModeShared;
+       } else if (Arg == "--link-static") {
 -- 
 2.9.3
 
diff --git a/sys-devel/llvm/files/llvm-3.8-soversion.patch b/sys-devel/llvm/files/9999/0008-cmake-Restore-SOVERSIONs-on-shared-libraries.patch
similarity index 74%
rename from sys-devel/llvm/files/llvm-3.8-soversion.patch
rename to sys-devel/llvm/files/9999/0008-cmake-Restore-SOVERSIONs-on-shared-libraries.patch
index 1a30643d6754..c333bc4b9627 100644
--- a/sys-devel/llvm/files/llvm-3.8-soversion.patch
+++ b/sys-devel/llvm/files/9999/0008-cmake-Restore-SOVERSIONs-on-shared-libraries.patch
@@ -1,17 +1,17 @@
-From 3da7d5f7f928aa2aa5e7436b27908bb7e7eb3cc1 Mon Sep 17 00:00:00 2001
+From 597ebcc28580a8532f6634e2a723901c3448b9ff Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
 Date: Mon, 28 Mar 2016 22:21:19 +0200
-Subject: [PATCH] cmake: Restore SOVERSIONs on shared libraries
+Subject: [PATCH 08/10] cmake: Restore SOVERSIONs on shared libraries
 
 ---
  cmake/modules/AddLLVM.cmake | 5 +++++
  1 file changed, 5 insertions(+)
 
 diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake
-index a829751..a7e0688 100644
+index 9590a1b..83a2359 100644
 --- a/cmake/modules/AddLLVM.cmake
 +++ b/cmake/modules/AddLLVM.cmake
-@@ -436,6 +436,11 @@ function(llvm_add_library name)
+@@ -445,6 +445,11 @@ function(llvm_add_library name)
          PREFIX ""
          )
      endif()
@@ -24,5 +24,5 @@ index a829751..a7e0688 100644
  
    if(ARG_MODULE OR ARG_SHARED)
 -- 
-2.7.4
+2.9.3
 
diff --git a/sys-devel/llvm/files/9999/0009-cmake-Use-system-llvm-lit-when-lit.py-does-not-exist.patch b/sys-devel/llvm/files/9999/0009-cmake-Use-system-llvm-lit-when-lit.py-does-not-exist.patch
new file mode 100644
index 000000000000..7245af07d2ec
--- /dev/null
+++ b/sys-devel/llvm/files/9999/0009-cmake-Use-system-llvm-lit-when-lit.py-does-not-exist.patch
@@ -0,0 +1,33 @@
+From bcdf2c49b7686046f8a9a5664f0e46117997baf4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 21 Aug 2016 23:19:40 +0200
+Subject: [PATCH 09/10] cmake: Use system llvm-lit when lit.py does not exist
+ in srcdir
+
+Modify the add_lit_target function to use lit.py from LLVM_MAIN_SRC_DIR
+only when one does exist there, and otherwise fall back to looking for
+system install of llvm-lit. This is based on a similar conditional in
+clang's CMakeLists.txt, and makes it possible to run clang's tests when
+built separately from LLVM with no access to the original sources.
+
+Patch: https://reviews.llvm.org/D23742
+---
+ cmake/modules/AddLLVM.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake
+index 83a2359..87540d5 100644
+--- a/cmake/modules/AddLLVM.cmake
++++ b/cmake/modules/AddLLVM.cmake
+@@ -1081,7 +1081,7 @@ function(add_lit_target target comment)
+   if (NOT CMAKE_CFG_INTDIR STREQUAL ".")
+     list(APPEND LIT_ARGS --param build_mode=${CMAKE_CFG_INTDIR})
+   endif ()
+-  if (LLVM_MAIN_SRC_DIR)
++  if(EXISTS ${LLVM_MAIN_SRC_DIR}/utils/lit/lit.py)
+     set (LIT_COMMAND ${PYTHON_EXECUTABLE} ${LLVM_MAIN_SRC_DIR}/utils/lit/lit.py)
+   else()
+     find_program(LIT_COMMAND llvm-lit)
+-- 
+2.9.3
+
diff --git a/sys-devel/llvm/files/9999/0010-lit-setup.py-Install-as-llvm-lit-as-cmake-expects-it.patch b/sys-devel/llvm/files/9999/0010-lit-setup.py-Install-as-llvm-lit-as-cmake-expects-it.patch
new file mode 100644
index 000000000000..53726aa3f5e9
--- /dev/null
+++ b/sys-devel/llvm/files/9999/0010-lit-setup.py-Install-as-llvm-lit-as-cmake-expects-it.patch
@@ -0,0 +1,30 @@
+From 242fd2cbad1075d4cc0e3a3b64652dbc766bd117 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 21 Aug 2016 23:20:11 +0200
+Subject: [PATCH 10/10] lit/setup.py: Install as llvm-lit (as cmake expects it)
+
+Modify the setup.py for lit to install the entry point as llvm-lit
+(instead of lit) since this is the name expected by functions in
+AddLLVM.cmake.
+
+Patch: https://reviews.llvm.org/D23743
+---
+ utils/lit/setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/utils/lit/setup.py b/utils/lit/setup.py
+index 10de6bb..c57e0aa 100644
+--- a/utils/lit/setup.py
++++ b/utils/lit/setup.py
+@@ -71,7 +71,7 @@ http://llvm.org/svn/llvm-project/llvm/trunk/utils/lit.
+     packages = find_packages(),
+     entry_points = {
+         'console_scripts': [
+-            'lit = lit:main',
++            'llvm-lit = lit:main',
+             ],
+         }
+ )
+-- 
+2.9.3
+
diff --git a/sys-devel/llvm/files/llvm-3.8-musl-fixes.patch b/sys-devel/llvm/files/9999/musl-fixes.patch
similarity index 100%
rename from sys-devel/llvm/files/llvm-3.8-musl-fixes.patch
rename to sys-devel/llvm/files/9999/musl-fixes.patch
diff --git a/sys-devel/llvm/files/cmake/compiler-rt-3.9-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch b/sys-devel/llvm/files/cmake/compiler-rt-3.9-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch
deleted file mode 100644
index a09de901024d..000000000000
--- a/sys-devel/llvm/files/cmake/compiler-rt-3.9-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 380b8faadc3fc66f9aa0528bd3578464b317c31e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 12 May 2016 08:25:48 +0200
-Subject: [PATCH] cmake: Install compiler-rt to a directory without libdir
- suffix
-
----
- cmake/base-config-ix.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/base-config-ix.cmake b/cmake/base-config-ix.cmake
-index 5d0502c..ce16ce9 100644
---- a/projects/compiler-rt/cmake/base-config-ix.cmake
-+++ b/projects/compiler-rt/cmake/base-config-ix.cmake
-@@ -18,7 +18,7 @@ if (NOT COMPILER_RT_STANDALONE_BUILD)
-   # Setup the paths where compiler-rt runtimes and headers should be stored.
-   set(COMPILER_RT_OUTPUT_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/clang/${CLANG_VERSION})
-   set(COMPILER_RT_EXEC_OUTPUT_DIR ${LLVM_RUNTIME_OUTPUT_INTDIR})
--  set(COMPILER_RT_INSTALL_PATH lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION})
-+  set(COMPILER_RT_INSTALL_PATH lib/clang/${CLANG_VERSION})
-   option(COMPILER_RT_INCLUDE_TESTS "Generate and build compiler-rt unit tests."
-          ${LLVM_INCLUDE_TESTS})
-   option(COMPILER_RT_ENABLE_WERROR "Fail and stop if warning is triggered"
--- 
-2.8.2
-
diff --git a/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-build_doc.patch b/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-build_doc.patch
deleted file mode 100644
index d53ce193ca25..000000000000
--- a/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-build_doc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur llvm-3.7.0.src.orig/docs/CMakeLists.txt llvm-3.7.0.src/docs/CMakeLists.txt
---- llvm-3.7.0.src.orig/docs/CMakeLists.txt	2015-08-18 18:48:44.000000000 +0200
-+++ llvm-3.7.0.src/docs/CMakeLists.txt	2015-10-12 14:40:00.985384589 +0200
-@@ -115,7 +115,7 @@
- endif()
- 
- list(FIND LLVM_BINDINGS_LIST ocaml uses_ocaml)
--if( NOT uses_ocaml LESS 0 )
-+if( NOT uses_ocaml LESS 0 AND LLVM_BUILD_DOCS )
-   set(doc_targets
-         ocaml_llvm
-         ocaml_llvm_all_backends
diff --git a/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-multilib.patch b/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-multilib.patch
deleted file mode 100644
index 024bad737de5..000000000000
--- a/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-multilib.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- llvm-3.7.0rc3.src-orig/cmake/modules/AddOCaml.cmake	2015-06-08 05:22:22.000000000 +1000
-+++ llvm-3.7.0rc3.src/cmake/modules/AddOCaml.cmake	2015-08-30 19:22:37.216580808 +1000
-@@ -131,7 +131,7 @@
-   if( APPLE )
-     set(ocaml_rpath "@executable_path/../../lib")
-   elseif( UNIX )
--    set(ocaml_rpath "\\$ORIGIN/../../lib")
-+    set(ocaml_rpath "\\$ORIGIN/../../${CMAKE_INSTALL_LIBDIR}")
-   endif()
-   list(APPEND ocaml_flags "-ldopt" "-Wl,-rpath,${ocaml_rpath}")
- 
-@@ -183,12 +183,12 @@
-   endforeach()
- 
-   install(FILES ${install_files}
--          DESTINATION lib/ocaml)
-+          DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml/llvm)
-   install(FILES ${install_shlibs}
-           PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
-                       GROUP_READ GROUP_EXECUTE
-                       WORLD_READ WORLD_EXECUTE
--          DESTINATION lib/ocaml)
-+          DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml/llvm)
- 
-   foreach( install_file ${install_files} ${install_shlibs} )
-     get_filename_component(filename "${install_file}" NAME)
---- llvm-3.7.0rc3.src-orig/bindings/ocaml/backends/CMakeLists.txt	2014-12-30 14:24:07.000000000 +1100
-+++ llvm-3.7.0rc3.src/bindings/ocaml/backends/CMakeLists.txt	2015-08-30 19:23:49.726583886 +1000
-@@ -23,5 +23,5 @@
-     "${LLVM_LIBRARY_DIR}/ocaml/META.llvm_${TARGET}")
- 
-   install(FILES "${LLVM_LIBRARY_DIR}/ocaml/META.llvm_${TARGET}"
--          DESTINATION lib/ocaml)
-+          DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml/llvm)
- endforeach()
---- llvm-3.7.0rc3.src-orig/bindings/ocaml/llvm/CMakeLists.txt	2014-12-30 14:24:07.000000000 +1100
-+++ llvm-3.7.0rc3.src/bindings/ocaml/llvm/CMakeLists.txt	2015-08-30 19:23:43.561583624 +1000
-@@ -8,4 +8,4 @@
-   "${LLVM_LIBRARY_DIR}/ocaml/META.llvm")
- 
- install(FILES "${LLVM_LIBRARY_DIR}/ocaml/META.llvm"
--        DESTINATION lib/ocaml)
-+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml/llvm)
diff --git a/sys-devel/llvm/files/cmake/llvm-3.8-allow_custom_cmake_build_types.patch b/sys-devel/llvm/files/cmake/llvm-3.8-allow_custom_cmake_build_types.patch
deleted file mode 100644
index e42c08a8dc9e..000000000000
--- a/sys-devel/llvm/files/cmake/llvm-3.8-allow_custom_cmake_build_types.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/CMakeLists.txt	2015-08-12 20:04:55.397881480 +0200
-+++ b/CMakeLists.txt	2015-08-12 20:05:06.625741113 +0200
-@@ -152,11 +152,6 @@
- 
- string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)
- 
--if (CMAKE_BUILD_TYPE AND
--    NOT uppercase_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$")
--  message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
--endif()
--
- set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" )
- 
- # They are used as destination of target generators.
diff --git a/sys-devel/llvm/files/llvm-3.7-llvm-config.patch b/sys-devel/llvm/files/llvm-3.7-llvm-config.patch
deleted file mode 100644
index 932c92b36cca..000000000000
--- a/sys-devel/llvm/files/llvm-3.7-llvm-config.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From 8a51e9673859eb3fb819f0d1dad5e2a60d1a3c0a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 2 Dec 2015 16:04:56 +0100
-Subject: [PATCH] llvm-config: Clean up exported values, update for shared
- linking
-
-Gentoo-specific fixup for llvm-config, including:
-- wiping build-specific CFLAGS, CXXFLAGS,
-- updating library suffixes for shared libs,
-- wiping --system-libs for shared linking,
-- banning --obj-root and --src-root due to no sources installed.
-
-Thanks to Steven Newbury for the initial patch.
-
-Bug: https://bugs.gentoo.org/565358
-Bug: https://bugs.gentoo.org/501684
----
- tools/llvm-config/CMakeLists.txt    |  11 ++++++++---
- tools/llvm-config/llvm-config.cpp   |  22 ++++++++++++++++------
- utils/llvm-build/llvmbuild/main.py  |   4 +++-
- 4 files changed, 27 insertions(+), 10 deletions(-)
-
-diff --git a/tools/llvm-config/CMakeLists.txt b/tools/llvm-config/CMakeLists.txt
-index edbd8c9..9a801bd 100644
---- a/tools/llvm-config/CMakeLists.txt
-+++ b/tools/llvm-config/CMakeLists.txt
-@@ -22,12 +22,17 @@ get_property(COMPILE_FLAGS TARGET llvm-config PROPERTY COMPILE_FLAGS)
- set(LLVM_SRC_ROOT ${LLVM_MAIN_SRC_DIR})
- set(LLVM_OBJ_ROOT ${LLVM_BINARY_DIR})
- set(LLVM_CPPFLAGS "${CMAKE_CPP_FLAGS} ${CMAKE_CPP_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}")
--set(LLVM_CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}")
--set(LLVM_CXXFLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${COMPILE_FLAGS} ${LLVM_DEFINITIONS}")
-+# Just use CMAKE_CPP_FLAGS for CFLAGS and CXXFLAGS, otherwise compiler
-+# specific flags will be set when we don't know what compiler will be used
-+# with external project utilising llvm-config.  C++ Standard is required.
-+# TODO: figure out if we can remove -std=c++11 and move it to revdeps.
-+set(LLVM_CFLAGS "${CMAKE_CPP_FLAGS} ${CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}")
-+set(LLVM_CXXFLAGS "${CMAKE_CPP_FLAGS} -std=c++11 ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}")
- # Use the C++ link flags, since they should be a superset of C link flags.
- set(LLVM_LDFLAGS "${CMAKE_CXX_LINK_FLAGS}")
- set(LLVM_BUILDMODE ${CMAKE_BUILD_TYPE})
--set(LLVM_SYSTEM_LIBS ${SYSTEM_LIBS})
-+# We don't do static libs, so we don't need to supply any system-libs
-+set(LLVM_SYSTEM_LIBS "")
- string(REPLACE ";" " " LLVM_TARGETS_BUILT "${LLVM_TARGETS_TO_BUILD}")
- configure_file(${BUILDVARIABLES_SRCPATH} ${BUILDVARIABLES_OBJPATH} @ONLY)
- 
-diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp
-index 879b9ab..d2c43fa 100644
---- a/tools/llvm-config/llvm-config.cpp
-+++ b/tools/llvm-config/llvm-config.cpp
-@@ -323,10 +323,19 @@ int main(int argc, char **argv) {
- #else
-         OS << "ON\n";
- #endif
--      } else if (Arg == "--obj-root") {
--        OS << ActivePrefix << '\n';
--      } else if (Arg == "--src-root") {
--        OS << LLVM_SRC_ROOT << '\n';
-+      } else if (Arg == "--obj-root" || Arg == "--src-root") {
-+        if (IsInDevelopmentTree) {
-+          if (Arg == "--obj-root") {
-+            OS << ActivePrefix << '\n';
-+          } else {
-+            OS << LLVM_SRC_ROOT << '\n';
-+          }
-+        } else {
-+          // sources are not installed
-+          llvm::errs() << "llvm-config: sources not installed, "
-+                       << Arg << " not available\n";
-+          exit(1);
-+        }
-       } else {
-         usage();
-       }
-@@ -360,8 +369,9 @@ int main(int argc, char **argv) {
-           OS << ActiveLibDir << '/' << Lib;
-         } else if (PrintLibs) {
-           // If this is a typical library name, include it using -l.
--          if (Lib.startswith("lib") && Lib.endswith(".a")) {
--            OS << "-l" << Lib.slice(3, Lib.size()-2);
-+          if (Lib.startswith("lib") && Lib.endswith(LTDL_SHLIB_EXT)) {
-+            // sizeof counts trailing NUL
-+            OS << "-l" << Lib.slice(3, Lib.size()-sizeof(LTDL_SHLIB_EXT)+1);
-             continue;
-           }
- 
-diff --git a/utils/llvm-build/llvmbuild/main.py b/utils/llvm-build/llvmbuild/main.py
-index 353741f..4ba5e91 100644
---- a/utils/llvm-build/llvmbuild/main.py
-+++ b/utils/llvm-build/llvmbuild/main.py
-@@ -393,6 +393,8 @@ subdirectories = %s
- //
- //===----------------------------------------------------------------------===//
- 
-+#include "llvm/Config/config.h"
-+
- """)
-         f.write('struct AvailableComponent {\n')
-         f.write('  /// The name of the component.\n')
-@@ -413,7 +415,7 @@ subdirectories = %s
-             if library_name is None:
-                 library_name_as_cstr = '0'
-             else:
--                library_name_as_cstr = '"lib%s.a"' % library_name
-+                library_name_as_cstr = '"lib%s" LTDL_SHLIB_EXT' % library_name
-             f.write('  { "%s", %s, %d, { %s } },\n' % (
-                 name, library_name_as_cstr, is_installed,
-                 ', '.join('"%s"' % dep
-
--- 
-2.6.3
-
diff --git a/sys-devel/llvm/llvm-3.5.0.ebuild b/sys-devel/llvm/llvm-3.5.0.ebuild
index d6019fc69e7d..e163d97b8623 100644
--- a/sys-devel/llvm/llvm-3.5.0.ebuild
+++ b/sys-devel/llvm/llvm-3.5.0.ebuild
@@ -143,18 +143,18 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.2-nodoctargz.patch
-	epatch "${FILESDIR}"/${PN}-3.5-gcc-4.9.patch
-	epatch "${FILESDIR}"/${PN}-3.5-gentoo-install.patch
+	epatch "${FILESDIR}"/3.6.2/nodoctargz.patch
+	epatch "${FILESDIR}"/3.6.2/gcc-4.9.patch
+	epatch "${FILESDIR}"/3.5.2/gentoo-install.patch
 
-	epatch "${FILESDIR}"/${P}-fix_LLVMExports_cmake.patch
+	epatch "${FILESDIR}"/3.5.0/fix_LLVMExports_cmake.patch
 
 	if use clang; then
 		# Automatically select active system GCC's libraries, bugs #406163 and #417913
-		epatch "${FILESDIR}"/clang-3.5-gentoo-runtime-gcc-detection-v3.patch
+		epatch "${FILESDIR}"/3.8.1/clang/gentoo-runtime-gcc-detection-v3.patch
 
-		epatch "${FILESDIR}"/clang-3.5-gentoo-install.patch
-		epatch "${FILESDIR}"/clang-3.4-darwin_prefix-include-paths.patch
+		epatch "${FILESDIR}"/3.5.2/clang/gentoo-install.patch
+		epatch "${FILESDIR}"/3.8.1/clang/darwin_prefix-include-paths.patch
 		eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp
 	fi
 
diff --git a/sys-devel/llvm/llvm-3.5.2.ebuild b/sys-devel/llvm/llvm-3.5.2.ebuild
index 6d3a5ce61fc8..e158a2d87306 100644
--- a/sys-devel/llvm/llvm-3.5.2.ebuild
+++ b/sys-devel/llvm/llvm-3.5.2.ebuild
@@ -144,19 +144,19 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.2-nodoctargz.patch
-	epatch "${FILESDIR}"/${PN}-3.5-gcc-4.9.patch
-	epatch "${FILESDIR}"/${PN}-3.5-gentoo-install.patch
-	epatch "${FILESDIR}"/${P}-gcc-5.1.patch
+	epatch "${FILESDIR}"/3.6.2/nodoctargz.patch
+	epatch "${FILESDIR}"/3.6.2/gcc-4.9.patch
+	epatch "${FILESDIR}"/3.5.2/gentoo-install.patch
+	epatch "${FILESDIR}"/3.5.2/gcc-5.1.patch
 	# Make ocaml warnings non-fatal, bug #537308
 	sed -e "/RUN/s/-warn-error A//" -i test/Bindings/Ocaml/*ml  || die
 
 	if use clang; then
 		# Automatically select active system GCC's libraries, bugs #406163 and #417913
-		epatch "${FILESDIR}"/clang-3.5-gentoo-runtime-gcc-detection-v3.patch
+		epatch "${FILESDIR}"/3.8.1/clang/gentoo-runtime-gcc-detection-v3.patch
 
-		epatch "${FILESDIR}"/clang-3.5-gentoo-install.patch
-		epatch "${FILESDIR}"/clang-3.4-darwin_prefix-include-paths.patch
+		epatch "${FILESDIR}"/3.5.2/clang/gentoo-install.patch
+		epatch "${FILESDIR}"/3.8.1/clang/darwin_prefix-include-paths.patch
 		eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp
 	fi
 
diff --git a/sys-devel/llvm/llvm-3.6.2.ebuild b/sys-devel/llvm/llvm-3.6.2.ebuild
index 3512fbb33752..c0bede20e36c 100644
--- a/sys-devel/llvm/llvm-3.6.2.ebuild
+++ b/sys-devel/llvm/llvm-3.6.2.ebuild
@@ -148,23 +148,23 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.2-nodoctargz.patch
-	epatch "${FILESDIR}"/${PN}-3.5-gcc-4.9.patch
-	epatch "${FILESDIR}"/${PN}-3.6-gentoo-install.patch
-	epatch "${FILESDIR}"/${PN}-3.6.0-ocaml-ctypes-0.4.0.patch
+	epatch "${FILESDIR}"/3.6.2/nodoctargz.patch
+	epatch "${FILESDIR}"/3.6.2/gcc-4.9.patch
+	epatch "${FILESDIR}"/3.6.2/gentoo-install.patch
+	epatch "${FILESDIR}"/3.6.2/ocaml-ctypes-0.4.0.patch
 	# Make ocaml warnings non-fatal, bug #537308
 	sed -e "/RUN/s/-warn-error A//" -i test/Bindings/OCaml/*ml  || die
 
 	if use clang; then
 		# Automatically select active system GCC's libraries, bugs #406163 and #417913
-		epatch "${FILESDIR}"/clang-3.5-gentoo-runtime-gcc-detection-v3.patch
+		epatch "${FILESDIR}"/3.8.1/clang/gentoo-runtime-gcc-detection-v3.patch
 
-		epatch "${FILESDIR}"/clang-3.6-gentoo-install.patch
-		epatch "${FILESDIR}"/clang-3.4-darwin_prefix-include-paths.patch
+		epatch "${FILESDIR}"/3.7.1/clang/gentoo-install.patch
+		epatch "${FILESDIR}"/3.8.1/clang/darwin_prefix-include-paths.patch
 		eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp
 
 		# Fix build fails with using gcc-4.9 on Gentoo/FreeBSD, bug #548444
-		epatch "${FILESDIR}"/clang-3.6-fbsd-gcc49.patch
+		epatch "${FILESDIR}"/3.6.2/clang/fbsd-gcc49.patch
 	fi
 
 	if use prefix && use clang; then
diff --git a/sys-devel/llvm/llvm-3.7.1-r3.ebuild b/sys-devel/llvm/llvm-3.7.1-r3.ebuild
index 5f6e18433df0..c35f38feca82 100644
--- a/sys-devel/llvm/llvm-3.7.1-r3.ebuild
+++ b/sys-devel/llvm/llvm-3.7.1-r3.ebuild
@@ -141,21 +141,21 @@ src_prepare() {
 	# Make ocaml warnings non-fatal, bug #537308
 	sed -e "/RUN/s/-warn-error A//" -i test/Bindings/OCaml/*ml  || die
 	# Fix libdir for ocaml bindings install, bug #559134
-	eapply "${FILESDIR}"/cmake/${PN}-3.7.0-ocaml-multilib.patch
+	eapply "${FILESDIR}"/9999/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch
 	# Do not build/install ocaml docs with USE=-doc, bug #562008
-	eapply "${FILESDIR}"/cmake/${PN}-3.7.0-ocaml-build_doc.patch
+	eapply "${FILESDIR}"/9999/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch
 
 	# Make it possible to override Sphinx HTML install dirs
 	# https://llvm.org/bugs/show_bug.cgi?id=23780
-	eapply "${FILESDIR}"/cmake/0002-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch
+	eapply "${FILESDIR}"/9999/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch
 
 	# Prevent race conditions with parallel Sphinx runs
 	# https://llvm.org/bugs/show_bug.cgi?id=23781
-	eapply "${FILESDIR}"/cmake/0003-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
+	eapply "${FILESDIR}"/9999/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
 
 	# Prevent installing libgtest
 	# https://llvm.org/bugs/show_bug.cgi?id=18341
-	eapply "${FILESDIR}"/cmake/0004-cmake-Do-not-install-libgtest.patch
+	eapply "${FILESDIR}"/9999/0005-cmake-Do-not-install-libgtest.patch
 
 	# Fix llvm-config for shared linking, sane flags and return values
 	# in order:
@@ -165,49 +165,49 @@ src_prepare() {
 	# - backported r260343 that fixes cross-compilation
 	# combination of backported upstream r252532 with our patch
 	# https://bugs.gentoo.org/show_bug.cgi?id=565358
-	eapply "${FILESDIR}"/llvm-3.7.1-llvm-config-0.patch
-	eapply "${FILESDIR}"/llvm-3.7.1-llvm-config-1.patch
-	eapply "${FILESDIR}"/llvm-3.7.1-llvm-config-2.patch
-	eapply "${FILESDIR}"/llvm-3.7.1-llvm-config-3.patch
+	eapply "${FILESDIR}"/3.7.1/llvm-config-0.patch
+	eapply "${FILESDIR}"/3.7.1/llvm-config-1.patch
+	eapply "${FILESDIR}"/3.7.1/llvm-config-2.patch
+	eapply "${FILESDIR}"/3.7.1/llvm-config-3.patch
 
 	# Fix msan with newer kernels, #569894
-	eapply "${FILESDIR}"/llvm-3.7-msan-fix.patch
+	eapply "${FILESDIR}"/3.7.1/msan-fix.patch
 
 	# disable use of SDK on OSX, bug #568758
 	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
 
 	if use clang; then
 		# Automatically select active system GCC's libraries, bugs #406163 and #417913
-		eapply "${FILESDIR}"/clang-3.5-gentoo-runtime-gcc-detection-v3.patch
+		eapply "${FILESDIR}"/3.8.1/clang/gentoo-runtime-gcc-detection-v3.patch
 
 		# Support gcc4.9 search paths
 		# https://github.com/llvm-mirror/clang/commit/af4db76e059c1a3
-		eapply "${FILESDIR}"/clang-3.8-gcc4.9-search-path.patch
+		eapply "${FILESDIR}"/3.8.1/clang/gcc4.9-search-path.patch
 
-		eapply "${FILESDIR}"/clang-3.6-gentoo-install.patch
+		eapply "${FILESDIR}"/3.7.1/clang/gentoo-install.patch
 
-		eapply "${FILESDIR}"/clang-3.4-darwin_prefix-include-paths.patch
+		eapply "${FILESDIR}"/3.8.1/clang/darwin_prefix-include-paths.patch
 		eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp
 
 		# Fix -isystem support in ccc-analyzer
-		eapply "${FILESDIR}"/clang-3.7.1-ccc-analyzer-isystem.patch
+		eapply "${FILESDIR}"/3.7.1/clang/ccc-analyzer-isystem.patch
 
 		sed -i -e "s^@EPREFIX@^${EPREFIX}^" \
 			tools/clang/tools/scan-build/scan-build || die
 
 		# Install clang runtime into /usr/lib/clang
 		# https://llvm.org/bugs/show_bug.cgi?id=23792
-		eapply "${FILESDIR}"/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix.patch
-		eapply "${FILESDIR}"/cmake/compiler-rt-0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch
+		eapply "${FILESDIR}"/3.7.1/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch
+		eapply "${FILESDIR}"/3.8.1/compiler-rt/0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch
 
 		# Do not force -march flags on arm platforms
 		# https://bugs.gentoo.org/show_bug.cgi?id=562706
-		eapply "${FILESDIR}"/cmake/${PN}-3.7.0-compiler_rt_arm_march_flags.patch
+		eapply "${FILESDIR}"/3.7.1/compiler-rt/arm_march_flags.patch
 
 		# Make it possible to override CLANG_LIBDIR_SUFFIX
 		# (that is used only to find LLVMgold.so)
 		# https://llvm.org/bugs/show_bug.cgi?id=23793
-		eapply "${FILESDIR}"/cmake/clang-0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
+		eapply "${FILESDIR}"/3.8.1/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
 
 		# Fix git-clang-format shebang, bug #562688
 		python_fix_shebang tools/clang/tools/clang-format/git-clang-format
@@ -215,7 +215,7 @@ src_prepare() {
 		pushd projects/compiler-rt >/dev/null || die
 
 		# Fix msan with newer kernels, compiler-rt part, #569894
-		eapply "${FILESDIR}"/compiler-rt-3.7-msan-fix.patch
+		eapply "${FILESDIR}"/3.7.1/compiler-rt/msan-fix.patch
 
 		# Fix WX sections, bug #421527
 		find lib/builtins -type f -name '*.S' -exec sed \
@@ -232,13 +232,13 @@ src_prepare() {
 			-i tools/lldb/scripts/Python/modules/CMakeLists.txt || die
 
 		# Fix Python paths, bugs #562436 and #562438
-		eapply "${FILESDIR}"/${PN}-3.7-lldb_python.patch
+		eapply "${FILESDIR}"/3.7.1/lldb/python.patch
 		sed -e "s/GENTOO_LIBDIR/$(get_libdir)/" \
 			-i tools/lldb/scripts/Python/finishSwigPythonLLDB.py || die
 
 		# Fix build with ncurses[tinfo], #560474
 		# http://llvm.org/viewvc/llvm-project?view=revision&revision=247842
-		eapply "${FILESDIR}"/cmake/${PN}-3.7.0-lldb_tinfo.patch
+		eapply "${FILESDIR}"/3.7.1/lldb/tinfo.patch
 	fi
 
 	# User patches
diff --git a/sys-devel/llvm/llvm-3.8.0-r3.ebuild b/sys-devel/llvm/llvm-3.8.0-r3.ebuild
index 98b01a89ef9f..5196fe41612c 100644
--- a/sys-devel/llvm/llvm-3.8.0-r3.ebuild
+++ b/sys-devel/llvm/llvm-3.8.0-r3.ebuild
@@ -142,32 +142,32 @@ src_prepare() {
 	# Make ocaml warnings non-fatal, bug #537308
 	sed -e "/RUN/s/-warn-error A//" -i test/Bindings/OCaml/*ml  || die
 	# Fix libdir for ocaml bindings install, bug #559134
-	eapply "${FILESDIR}"/cmake/${PN}-3.7.0-ocaml-multilib.patch
+	eapply "${FILESDIR}"/9999/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch
 	# Do not build/install ocaml docs with USE=-doc, bug #562008
-	eapply "${FILESDIR}"/cmake/${PN}-3.7.0-ocaml-build_doc.patch
+	eapply "${FILESDIR}"/9999/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch
 
 	# Make it possible to override Sphinx HTML install dirs
 	# https://llvm.org/bugs/show_bug.cgi?id=23780
-	eapply "${FILESDIR}"/cmake/0002-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch
+	eapply "${FILESDIR}"/9999/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch
 
 	# Prevent race conditions with parallel Sphinx runs
 	# https://llvm.org/bugs/show_bug.cgi?id=23781
-	eapply "${FILESDIR}"/cmake/0003-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
+	eapply "${FILESDIR}"/9999/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
 
 	# Prevent installing libgtest
 	# https://llvm.org/bugs/show_bug.cgi?id=18341
-	eapply "${FILESDIR}"/cmake/0004-cmake-Do-not-install-libgtest.patch
+	eapply "${FILESDIR}"/9999/0005-cmake-Do-not-install-libgtest.patch
 
 	# Allow custom cmake build types (like 'Gentoo')
-	eapply "${FILESDIR}"/cmake/${PN}-3.8-allow_custom_cmake_build_types.patch
+	eapply "${FILESDIR}"/9999/0006-cmake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch
 
 	# Fix llvm-config for shared linking and sane flags
 	# https://bugs.gentoo.org/show_bug.cgi?id=565358
-	eapply "${FILESDIR}"/llvm-3.8-llvm-config.patch
+	eapply "${FILESDIR}"/3.8.1/llvm-config.patch
 
 	# Restore SOVERSIONs for shared libraries
 	# https://bugs.gentoo.org/show_bug.cgi?id=578392
-	eapply "${FILESDIR}"/llvm-3.8-soversion.patch
+	eapply "${FILESDIR}"/9999/0008-cmake-Restore-SOVERSIONs-on-shared-libraries.patch
 
 	# disable use of SDK on OSX, bug #568758
 	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
@@ -177,13 +177,13 @@ src_prepare() {
 
 	if use clang; then
 		# Automatically select active system GCC's libraries, bugs #406163 and #417913
-		eapply "${FILESDIR}"/clang-3.5-gentoo-runtime-gcc-detection-v3.patch
+		eapply "${FILESDIR}"/3.8.1/clang/gentoo-runtime-gcc-detection-v3.patch
 
 		# Support gcc4.9 search paths
 		# https://github.com/llvm-mirror/clang/commit/af4db76e059c1a3
-		eapply "${FILESDIR}"/clang-3.8-gcc4.9-search-path.patch
+		eapply "${FILESDIR}"/3.8.1/clang/gcc4.9-search-path.patch
 
-		eapply "${FILESDIR}"/clang-3.4-darwin_prefix-include-paths.patch
+		eapply "${FILESDIR}"/3.8.1/clang/darwin_prefix-include-paths.patch
 		eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp
 
 		sed -i -e "s^@EPREFIX@^${EPREFIX}^" \
@@ -191,24 +191,24 @@ src_prepare() {
 
 		# Install clang runtime into /usr/lib/clang
 		# https://llvm.org/bugs/show_bug.cgi?id=23792
-		eapply "${FILESDIR}"/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix-3.8.patch
-		eapply "${FILESDIR}"/cmake/compiler-rt-0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch
+		eapply "${FILESDIR}"/3.8.1/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch
+		eapply "${FILESDIR}"/3.8.1/compiler-rt/0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch
 
 		# Do not force -march flags on arm platforms
 		# https://bugs.gentoo.org/show_bug.cgi?id=562706
-		eapply "${FILESDIR}"/cmake/${PN}-3.8.0-compiler_rt_arm_march_flags.patch
+		eapply "${FILESDIR}"/3.8.1/compiler-rt/arm_march_flags.patch
 
 		# Make it possible to override CLANG_LIBDIR_SUFFIX
 		# (that is used only to find LLVMgold.so)
 		# https://llvm.org/bugs/show_bug.cgi?id=23793
-		eapply "${FILESDIR}"/cmake/clang-0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
+		eapply "${FILESDIR}"/3.8.1/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
 
 		# Fix git-clang-format shebang, bug #562688
 		python_fix_shebang tools/clang/tools/clang-format/git-clang-format
 
 		# Fix 'stdarg.h' file not found on Gentoo/FreeBSD, bug #578064
 		# https://llvm.org/bugs/show_bug.cgi?id=26651
-		eapply "${FILESDIR}"/clang-3.8-compiler-rt-fbsd.patch
+		eapply "${FILESDIR}"/3.8.1/compiler-rt/fbsd.patch
 
 		pushd projects/compiler-rt >/dev/null || die
 
@@ -226,7 +226,7 @@ src_prepare() {
 		sed -e 's/add_subdirectory(readline)/#&/' \
 			-i tools/lldb/scripts/Python/modules/CMakeLists.txt || die
 		# Do not install bundled six module
-		eapply "${FILESDIR}"/${PN}-3.8-lldb_six.patch
+		eapply "${FILESDIR}"/3.8.1/lldb/six.patch
 	fi
 
 	# User patches
diff --git a/sys-devel/llvm/llvm-3.8.1-r2.ebuild b/sys-devel/llvm/llvm-3.8.1-r2.ebuild
index 2e78867f52cc..5fdffd0facb4 100644
--- a/sys-devel/llvm/llvm-3.8.1-r2.ebuild
+++ b/sys-devel/llvm/llvm-3.8.1-r2.ebuild
@@ -143,38 +143,38 @@ src_prepare() {
 	# Make ocaml warnings non-fatal, bug #537308
 	sed -e "/RUN/s/-warn-error A//" -i test/Bindings/OCaml/*ml  || die
 	# Fix libdir for ocaml bindings install, bug #559134
-	eapply "${FILESDIR}"/cmake/${PN}-3.7.0-ocaml-multilib.patch
+	eapply "${FILESDIR}"/9999/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch
 	# Do not build/install ocaml docs with USE=-doc, bug #562008
-	eapply "${FILESDIR}"/cmake/${PN}-3.7.0-ocaml-build_doc.patch
+	eapply "${FILESDIR}"/9999/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch
 
 	# Make it possible to override Sphinx HTML install dirs
 	# https://llvm.org/bugs/show_bug.cgi?id=23780
-	eapply "${FILESDIR}"/cmake/0002-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch
+	eapply "${FILESDIR}"/9999/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch
 
 	# Prevent race conditions with parallel Sphinx runs
 	# https://llvm.org/bugs/show_bug.cgi?id=23781
-	eapply "${FILESDIR}"/cmake/0003-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
+	eapply "${FILESDIR}"/9999/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
 
 	# Prevent installing libgtest
 	# https://llvm.org/bugs/show_bug.cgi?id=18341
-	eapply "${FILESDIR}"/cmake/0004-cmake-Do-not-install-libgtest.patch
+	eapply "${FILESDIR}"/9999/0005-cmake-Do-not-install-libgtest.patch
 
 	# Allow custom cmake build types (like 'Gentoo')
-	eapply "${FILESDIR}"/cmake/${PN}-3.8-allow_custom_cmake_build_types.patch
+	eapply "${FILESDIR}"/9999/0006-cmake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch
 
 	# Fix llvm-config for shared linking and sane flags
 	# https://bugs.gentoo.org/show_bug.cgi?id=565358
-	eapply "${FILESDIR}"/llvm-3.8-llvm-config-r1.patch
+	eapply "${FILESDIR}"/3.8.1/llvm-config-r1.patch
 
 	# Restore SOVERSIONs for shared libraries
 	# https://bugs.gentoo.org/show_bug.cgi?id=578392
-	eapply "${FILESDIR}"/llvm-3.8-soversion.patch
+	eapply "${FILESDIR}"/9999/0008-cmake-Restore-SOVERSIONs-on-shared-libraries.patch
 
 	# support building llvm against musl-libc
-	use elibc_musl && eapply "${FILESDIR}"/llvm-3.8-musl-fixes.patch
+	use elibc_musl && eapply "${FILESDIR}"/9999/musl-fixes.patch
 
 	# support "musl" as a valid environment type in llvm
-	eapply "${FILESDIR}"/llvm-3.8-musl-support.patch
+	eapply "${FILESDIR}"/3.8.1/musl-env-support.patch
 
 	# disable use of SDK on OSX, bug #568758
 	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
@@ -184,21 +184,21 @@ src_prepare() {
 
 	if use clang; then
 		# Automatically select active system GCC's libraries, bugs #406163 and #417913
-		eapply "${FILESDIR}"/clang-3.5-gentoo-runtime-gcc-detection-v3.patch
+		eapply "${FILESDIR}"/3.8.1/clang/gentoo-runtime-gcc-detection-v3.patch
 
 		# Support gcc4.9 search paths
 		# https://github.com/llvm-mirror/clang/commit/af4db76e059c1a3
-		eapply "${FILESDIR}"/clang-3.8-gcc4.9-search-path.patch
+		eapply "${FILESDIR}"/3.8.1/clang/gcc4.9-search-path.patch
 
-		eapply "${FILESDIR}"/clang-3.4-darwin_prefix-include-paths.patch
+		eapply "${FILESDIR}"/3.8.1/clang/darwin_prefix-include-paths.patch
 		eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp
 
 		pushd "${S}"/tools/clang >/dev/null || die
 		# be able to specify default values for -stdlib and -rtlib at build time
-		eapply "${FILESDIR}"/clang-3.8-default-libs.patch
+		eapply "${FILESDIR}"/3.8.1/clang/default-libs.patch
 
 		# enable clang to recognize musl-libc
-		eapply "${FILESDIR}"/clang-3.8-musl-support.patch
+		eapply "${FILESDIR}"/3.8.1/clang/musl-support.patch
 		popd >/dev/null || die
 
 		sed -i -e "s^@EPREFIX@^${EPREFIX}^" \
@@ -206,28 +206,28 @@ src_prepare() {
 
 		# Install clang runtime into /usr/lib/clang
 		# https://llvm.org/bugs/show_bug.cgi?id=23792
-		eapply "${FILESDIR}"/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix-3.8.patch
-		eapply "${FILESDIR}"/cmake/compiler-rt-0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch
+		eapply "${FILESDIR}"/3.8.1/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch
+		eapply "${FILESDIR}"/3.8.1/compiler-rt/0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch
 
 		# Do not force -march flags on arm platforms
 		# https://bugs.gentoo.org/show_bug.cgi?id=562706
-		eapply "${FILESDIR}"/cmake/${PN}-3.8.0-compiler_rt_arm_march_flags.patch
+		eapply "${FILESDIR}"/3.8.1/compiler-rt/arm_march_flags.patch
 
 		# Make it possible to override CLANG_LIBDIR_SUFFIX
 		# (that is used only to find LLVMgold.so)
 		# https://llvm.org/bugs/show_bug.cgi?id=23793
-		eapply "${FILESDIR}"/cmake/clang-0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
+		eapply "${FILESDIR}"/3.8.1/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
 
 		# Fix git-clang-format shebang, bug #562688
 		python_fix_shebang tools/clang/tools/clang-format/git-clang-format
 
 		# Fix 'stdarg.h' file not found on Gentoo/FreeBSD, bug #578064
 		# https://llvm.org/bugs/show_bug.cgi?id=26651
-		eapply "${FILESDIR}"/clang-3.8-compiler-rt-fbsd.patch
+		eapply "${FILESDIR}"/3.8.1/compiler-rt/fbsd.patch
 
 		# Backport abi-tag support, bug #571600
-		eapply "${FILESDIR}"/clang-3.8-abi-tag-support-sema.patch
-		eapply "${FILESDIR}"/clang-3.8-abi-tag-support-mangler.patch
+		eapply "${FILESDIR}"/3.8.1/clang/abi-tag-support-sema.patch
+		eapply "${FILESDIR}"/3.8.1/clang/abi-tag-support-mangler.patch
 
 		pushd projects/compiler-rt >/dev/null || die
 
@@ -245,7 +245,7 @@ src_prepare() {
 		sed -e 's/add_subdirectory(readline)/#&/' \
 			-i tools/lldb/scripts/Python/modules/CMakeLists.txt || die
 		# Do not install bundled six module
-		eapply "${FILESDIR}"/${PN}-3.8-lldb_six.patch
+		eapply "${FILESDIR}"/3.8.1/lldb/six.patch
 	fi
 
 	# User patches
diff --git a/sys-devel/llvm/llvm-3.8.1.ebuild b/sys-devel/llvm/llvm-3.8.1.ebuild
index cc7982bc6a0c..c00669d5db32 100644
--- a/sys-devel/llvm/llvm-3.8.1.ebuild
+++ b/sys-devel/llvm/llvm-3.8.1.ebuild
@@ -142,32 +142,32 @@ src_prepare() {
 	# Make ocaml warnings non-fatal, bug #537308
 	sed -e "/RUN/s/-warn-error A//" -i test/Bindings/OCaml/*ml  || die
 	# Fix libdir for ocaml bindings install, bug #559134
-	eapply "${FILESDIR}"/cmake/${PN}-3.7.0-ocaml-multilib.patch
+	eapply "${FILESDIR}"/9999/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch
 	# Do not build/install ocaml docs with USE=-doc, bug #562008
-	eapply "${FILESDIR}"/cmake/${PN}-3.7.0-ocaml-build_doc.patch
+	eapply "${FILESDIR}"/9999/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch
 
 	# Make it possible to override Sphinx HTML install dirs
 	# https://llvm.org/bugs/show_bug.cgi?id=23780
-	eapply "${FILESDIR}"/cmake/0002-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch
+	eapply "${FILESDIR}"/9999/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch
 
 	# Prevent race conditions with parallel Sphinx runs
 	# https://llvm.org/bugs/show_bug.cgi?id=23781
-	eapply "${FILESDIR}"/cmake/0003-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
+	eapply "${FILESDIR}"/9999/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
 
 	# Prevent installing libgtest
 	# https://llvm.org/bugs/show_bug.cgi?id=18341
-	eapply "${FILESDIR}"/cmake/0004-cmake-Do-not-install-libgtest.patch
+	eapply "${FILESDIR}"/9999/0005-cmake-Do-not-install-libgtest.patch
 
 	# Allow custom cmake build types (like 'Gentoo')
-	eapply "${FILESDIR}"/cmake/${PN}-3.8-allow_custom_cmake_build_types.patch
+	eapply "${FILESDIR}"/9999/0006-cmake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch
 
 	# Fix llvm-config for shared linking and sane flags
 	# https://bugs.gentoo.org/show_bug.cgi?id=565358
-	eapply "${FILESDIR}"/llvm-3.8-llvm-config.patch
+	eapply "${FILESDIR}"/3.8.1/llvm-config.patch
 
 	# Restore SOVERSIONs for shared libraries
 	# https://bugs.gentoo.org/show_bug.cgi?id=578392
-	eapply "${FILESDIR}"/llvm-3.8-soversion.patch
+	eapply "${FILESDIR}"/9999/0008-cmake-Restore-SOVERSIONs-on-shared-libraries.patch
 
 	# disable use of SDK on OSX, bug #568758
 	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
@@ -177,13 +177,13 @@ src_prepare() {
 
 	if use clang; then
 		# Automatically select active system GCC's libraries, bugs #406163 and #417913
-		eapply "${FILESDIR}"/clang-3.5-gentoo-runtime-gcc-detection-v3.patch
+		eapply "${FILESDIR}"/3.8.1/clang/gentoo-runtime-gcc-detection-v3.patch
 
 		# Support gcc4.9 search paths
 		# https://github.com/llvm-mirror/clang/commit/af4db76e059c1a3
-		eapply "${FILESDIR}"/clang-3.8-gcc4.9-search-path.patch
+		eapply "${FILESDIR}"/3.8.1/clang/gcc4.9-search-path.patch
 
-		eapply "${FILESDIR}"/clang-3.4-darwin_prefix-include-paths.patch
+		eapply "${FILESDIR}"/3.8.1/clang/darwin_prefix-include-paths.patch
 		eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp
 
 		sed -i -e "s^@EPREFIX@^${EPREFIX}^" \
@@ -191,24 +191,24 @@ src_prepare() {
 
 		# Install clang runtime into /usr/lib/clang
 		# https://llvm.org/bugs/show_bug.cgi?id=23792
-		eapply "${FILESDIR}"/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix-3.8.patch
-		eapply "${FILESDIR}"/cmake/compiler-rt-0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch
+		eapply "${FILESDIR}"/3.8.1/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch
+		eapply "${FILESDIR}"/3.8.1/compiler-rt/0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch
 
 		# Do not force -march flags on arm platforms
 		# https://bugs.gentoo.org/show_bug.cgi?id=562706
-		eapply "${FILESDIR}"/cmake/${PN}-3.8.0-compiler_rt_arm_march_flags.patch
+		eapply "${FILESDIR}"/3.8.1/compiler-rt/arm_march_flags.patch
 
 		# Make it possible to override CLANG_LIBDIR_SUFFIX
 		# (that is used only to find LLVMgold.so)
 		# https://llvm.org/bugs/show_bug.cgi?id=23793
-		eapply "${FILESDIR}"/cmake/clang-0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
+		eapply "${FILESDIR}"/3.8.1/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
 
 		# Fix git-clang-format shebang, bug #562688
 		python_fix_shebang tools/clang/tools/clang-format/git-clang-format
 
 		# Fix 'stdarg.h' file not found on Gentoo/FreeBSD, bug #578064
 		# https://llvm.org/bugs/show_bug.cgi?id=26651
-		eapply "${FILESDIR}"/clang-3.8-compiler-rt-fbsd.patch
+		eapply "${FILESDIR}"/3.8.1/compiler-rt/fbsd.patch
 
 		pushd projects/compiler-rt >/dev/null || die
 
@@ -226,7 +226,7 @@ src_prepare() {
 		sed -e 's/add_subdirectory(readline)/#&/' \
 			-i tools/lldb/scripts/Python/modules/CMakeLists.txt || die
 		# Do not install bundled six module
-		eapply "${FILESDIR}"/${PN}-3.8-lldb_six.patch
+		eapply "${FILESDIR}"/3.8.1/lldb/six.patch
 	fi
 
 	# User patches
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index c8a34ba3f9fa..1a7dc6815f93 100644
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-9999.ebuild
@@ -6,10 +6,11 @@ EAPI=6
 
 : ${CMAKE_MAKEFILE_GENERATOR:=ninja}
 CMAKE_MIN_VERSION=3.4.3
+DISTUTILS_OPTIONAL=1
 PYTHON_COMPAT=( python2_7 )
 
-inherit check-reqs cmake-utils eutils flag-o-matic git-r3 multilib \
-	multilib-minimal python-single-r1 toolchain-funcs pax-utils
+inherit check-reqs cmake-utils distutils-r1 flag-o-matic git-r3 \
+	multilib-minimal pax-utils toolchain-funcs
 
 DESCRIPTION="Low Level Virtual Machine"
 HOMEPAGE="http://llvm.org/"
@@ -20,17 +21,12 @@ EGIT_REPO_URI="http://llvm.org/git/llvm.git
 LICENSE="UoI-NCSA"
 SLOT="0/${PV%.*}"
 KEYWORDS=""
-IUSE="clang debug default-compiler-rt default-libcxx +doc gold libedit +libffi
-	lldb multitarget ncurses ocaml python +sanitize +static-analyzer test xml
-	video_cards_radeon elibc_musl kernel_Darwin kernel_FreeBSD"
+IUSE="debug +doc gold libedit +libffi multitarget ncurses ocaml test
+	video_cards_radeon elibc_musl kernel_Darwin"
 
-COMMON_DEPEND="
+# python is needed for llvm-lit (which is installed)
+RDEPEND="
 	sys-libs/zlib:0=
-	clang? (
-		static-analyzer? ( dev-lang/perl:* )
-		xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
-		${PYTHON_DEPS}
-	)
 	gold? ( >=sys-devel/binutils-2.22:*[cxx] )
 	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
 	libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
@@ -38,51 +34,31 @@ COMMON_DEPEND="
 	ocaml? (
 		>=dev-lang/ocaml-4.00.0:0=
 		dev-ml/findlib
-		dev-ml/ocaml-ctypes )"
+		dev-ml/ocaml-ctypes )
+	${PYTHON_DEPS}"
 # configparser-3.2 breaks the build (3.3 or none at all are fine)
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	dev-lang/perl
-	>=sys-devel/make-3.81
-	>=sys-devel/flex-2.5.4
-	>=sys-devel/bison-1.875d
 	|| ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5
 		( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx )
 	)
 	|| ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 )
 	kernel_Darwin? ( <sys-libs/libcxx-${PV%_rc*}.9999 )
-	clang? ( xml? ( virtual/pkgconfig ) )
 	doc? ( dev-python/sphinx )
 	gold? ( sys-libs/binutils-libs )
 	libffi? ( virtual/pkgconfig )
-	lldb? ( dev-lang/swig )
-	!!<dev-python/configparser-3.3.0.2
 	ocaml? ( test? ( dev-ml/ounit ) )
-	${PYTHON_DEPS}"
-RDEPEND="${COMMON_DEPEND}
-	clang? ( !<=sys-devel/clang-${PV}-r99 )
-	default-libcxx? ( sys-libs/libcxx )
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r2
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
-PDEPEND="clang? ( =sys-devel/clang-${PV}-r100 )"
-
-# pypy gives me around 1700 unresolved tests due to open file limit
-# being exceeded. probably GC does not close them fast enough.
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	lldb? ( clang xml )"
+	!!<dev-python/configparser-3.3.0.2"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 pkg_pretend() {
 	# in megs
-	# !clang !debug !multitarget -O2       400
-	# !clang !debug  multitarget -O2       550
-	#  clang !debug !multitarget -O2       950
-	#  clang !debug  multitarget -O2      1200
-	# !clang  debug  multitarget -O2      5G
-	#  clang !debug  multitarget -O0 -g  12G
-	#  clang  debug  multitarget -O2     16G
-	#  clang  debug  multitarget -O0 -g  14G
+	# !debug !multitarget -O2       400
+	# !debug  multitarget -O2       550
+	#  debug  multitarget -O2      5G
 
 	local build_size=550
-	use clang && build_size=1200
 
 	if use debug; then
 		ewarn "USE=debug is known to increase the size of package considerably"
@@ -108,106 +84,53 @@ pkg_pretend() {
 
 pkg_setup() {
 	pkg_pretend
-
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	if use clang; then
-		git-r3_fetch "http://llvm.org/git/compiler-rt.git
-			https://github.com/llvm-mirror/compiler-rt.git"
-		git-r3_fetch "http://llvm.org/git/clang.git
-			https://github.com/llvm-mirror/clang.git"
-		git-r3_fetch "http://llvm.org/git/clang-tools-extra.git
-			https://github.com/llvm-mirror/clang-tools-extra.git"
-	fi
-	if use lldb; then
-		git-r3_fetch "http://llvm.org/git/lldb.git
-			https://github.com/llvm-mirror/lldb.git"
-	fi
-	git-r3_fetch
-
-	if use clang; then
-		git-r3_checkout http://llvm.org/git/compiler-rt.git \
-			"${S}"/projects/compiler-rt
-		git-r3_checkout http://llvm.org/git/clang.git \
-			"${S}"/tools/clang
-		git-r3_checkout http://llvm.org/git/clang-tools-extra.git \
-			"${S}"/tools/clang/tools/extra
-	fi
-	if use lldb; then
-		git-r3_checkout http://llvm.org/git/lldb.git \
-			"${S}"/tools/lldb
-	fi
-	git-r3_checkout
 }
 
 src_prepare() {
+	# Python is needed to run tests using lit
 	python_setup
 
 	# Make ocaml warnings non-fatal, bug #537308
 	sed -e "/RUN/s/-warn-error A//" -i test/Bindings/OCaml/*ml  || die
 	# Fix libdir for ocaml bindings install, bug #559134
-	eapply "${FILESDIR}"/cmake/${PN}-3.7.0-ocaml-multilib.patch
+	eapply "${FILESDIR}"/9999/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch
 	# Do not build/install ocaml docs with USE=-doc, bug #562008
-	eapply "${FILESDIR}"/cmake/${PN}-3.7.0-ocaml-build_doc.patch
+	eapply "${FILESDIR}"/9999/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch
 
 	# Make it possible to override Sphinx HTML install dirs
 	# https://llvm.org/bugs/show_bug.cgi?id=23780
-	eapply "${FILESDIR}"/cmake/0002-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch
+	eapply "${FILESDIR}"/9999/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch
 
 	# Prevent race conditions with parallel Sphinx runs
 	# https://llvm.org/bugs/show_bug.cgi?id=23781
-	eapply "${FILESDIR}"/cmake/0003-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
+	eapply "${FILESDIR}"/9999/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
 
 	# Prevent installing libgtest
 	# https://llvm.org/bugs/show_bug.cgi?id=18341
-	eapply "${FILESDIR}"/cmake/0004-cmake-Do-not-install-libgtest.patch
+	eapply "${FILESDIR}"/9999/0005-cmake-Do-not-install-libgtest.patch
 
 	# Allow custom cmake build types (like 'Gentoo')
-	eapply "${FILESDIR}"/cmake/${PN}-3.8-allow_custom_cmake_build_types.patch
+	eapply "${FILESDIR}"/9999/0006-cmake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch
 
 	# Fix llvm-config for shared linking and sane flags
 	# https://bugs.gentoo.org/show_bug.cgi?id=565358
-	eapply "${FILESDIR}"/llvm-3.9-llvm-config.patch
+	eapply "${FILESDIR}"/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
 
 	# Restore SOVERSIONs for shared libraries
 	# https://bugs.gentoo.org/show_bug.cgi?id=578392
-	eapply "${FILESDIR}"/llvm-3.8-soversion.patch
+	eapply "${FILESDIR}"/9999/0008-cmake-Restore-SOVERSIONs-on-shared-libraries.patch
+
+	# Fix lit tests to find installed llvm-lit correctly
+	eapply "${FILESDIR}"/9999/0009-cmake-Use-system-llvm-lit-when-lit.py-does-not-exist.patch
+	# Install lit as llvm-lit (as expected by cmake)
+	eapply "${FILESDIR}"/9999/0010-lit-setup.py-Install-as-llvm-lit-as-cmake-expects-it.patch
 
 	# support building llvm against musl-libc
-	use elibc_musl && eapply "${FILESDIR}"/llvm-3.8-musl-fixes.patch
+	use elibc_musl && eapply "${FILESDIR}"/9999/musl-fixes.patch
 
 	# disable use of SDK on OSX, bug #568758
 	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
 
-	if use clang; then
-		# Automatically select active system GCC's libraries, bugs #406163 and #417913
-		eapply "${FILESDIR}"/clang-3.5-gentoo-runtime-gcc-detection-v3.patch
-
-		# Install clang runtime into /usr/lib/clang
-		# https://llvm.org/bugs/show_bug.cgi?id=23792
-		eapply "${FILESDIR}"/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix-3.8.patch
-		eapply "${FILESDIR}"/cmake/compiler-rt-3.9-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch
-
-		# Make it possible to override CLANG_LIBDIR_SUFFIX
-		# (that is used only to find LLVMgold.so)
-		# https://llvm.org/bugs/show_bug.cgi?id=23793
-		eapply "${FILESDIR}"/cmake/clang-0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
-
-		# Fix WX sections, bug #421527
-		find projects/compiler-rt/lib/builtins -type f -name '*.S' -exec sed \
-			-e '$a\\n#if defined(__linux__) && defined(__ELF__)\n.section .note.GNU-stack,"",%progbits\n#endif' \
-			-i {} + || die
-	fi
-
-	if use lldb; then
-		# Do not install dummy readline.so module from
-		# https://llvm.org/bugs/show_bug.cgi?id=18841
-		sed -e 's/add_subdirectory(readline)/#&/' \
-			-i tools/lldb/scripts/Python/modules/CMakeLists.txt || die
-	fi
-
 	# User patches
 	eapply_user
 
@@ -235,7 +158,6 @@ multilib_src_configure() {
 		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
 
 		-DBUILD_SHARED_LIBS=ON
-		-DLLVM_ENABLE_TIMESTAMPS=OFF
 		-DLLVM_TARGETS_TO_BUILD="${targets}"
 		-DLLVM_BUILD_TESTS=$(usex test)
 
@@ -255,31 +177,6 @@ multilib_src_configure() {
 		-DHAVE_HISTEDIT_H=$(usex libedit)
 	)
 
-	if use clang; then
-		mycmakeargs+=(
-			-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml)
-			# libgomp support fails to find headers without explicit -I
-			# furthermore, it provides only syntax checking
-			-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
-
-			# override default stdlib and rtlib
-			-DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "")
-			-DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "")
-
-			# compiler-rt's test cases depend on sanitizer
-			-DCOMPILER_RT_BUILD_SANITIZERS=$(usex sanitize)
-			-DCOMPILER_RT_INCLUDE_TESTS=$(usex sanitize)
-		)
-	fi
-
-	if use lldb; then
-		mycmakeargs+=(
-			-DLLDB_DISABLE_LIBEDIT=$(usex !libedit)
-			-DLLDB_DISABLE_CURSES=$(usex !ncurses)
-			-DLLDB_ENABLE_TERMINFO=$(usex ncurses)
-		)
-	fi
-
 	if ! multilib_is_native_abi || ! use ocaml; then
 		mycmakeargs+=(
 			-DOCAMLFIND=NO
@@ -303,56 +200,11 @@ multilib_src_configure() {
 			-DLLVM_INSTALL_UTILS=ON
 		)
 
-		if use clang; then
-			mycmakeargs+=(
-				-DCLANG_INSTALL_HTML="${EPREFIX}/usr/share/doc/${PF}/clang"
-			)
-		fi
-
 		if use gold; then
 			mycmakeargs+=(
 				-DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
 			)
 		fi
-
-		if use lldb; then
-			mycmakeargs+=(
-				-DLLDB_DISABLE_PYTHON=$(usex !python)
-			)
-		fi
-
-	else
-		if use clang; then
-			mycmakeargs+=(
-				# disable compiler-rt on non-native ABI because:
-				# 1. it fails to configure because of -m32
-				# 2. it is shared between ABIs so no point building
-				# it multiple times
-				-DLLVM_EXTERNAL_COMPILER_RT_BUILD=OFF
-				-DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_BUILD=OFF
-			)
-		fi
-		if use lldb; then
-			mycmakeargs+=(
-				# only run swig on native abi
-				-DLLDB_DISABLE_PYTHON=ON
-			)
-		fi
-	fi
-
-	if use clang; then
-		mycmakeargs+=(
-			-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
-			-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
-			-DCLANG_LIBDIR_SUFFIX="${NATIVE_LIBDIR#lib}"
-		)
-
-		# -- not needed when compiler-rt is built with host compiler --
-		# cmake passes host C*FLAGS to compiler-rt build
-		# which is performed using clang, so we need to filter out
-		# some flags clang does not support
-		# (if you know some more flags that don't work, let us know)
-		#filter-flags -msahf -frecord-gcc-switches
 	fi
 
 	if tc-is-cross-compiler; then
@@ -362,14 +214,6 @@ multilib_src_configure() {
 			-DCMAKE_CROSSCOMPILING=ON
 			-DLLVM_TABLEGEN=/usr/bin/llvm-tblgen
 		)
-
-		if use clang; then
-			[[ -x "/usr/bin/clang-tblgen" ]] \
-				|| die "/usr/bin/clang-tblgen not found or usable"
-			mycmakeargs+=(
-				-DCLANG_TABLEGEN=/usr/bin/clang-tblgen
-			)
-		fi
 	fi
 
 	cmake-utils_src_configure
@@ -389,15 +233,16 @@ multilib_src_compile() {
 		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests
 		pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests
 	fi
+
+	# Run setup.py for lit
+	cd "${S}"/utils/lit || die
+	distutils-r1_src_compile
 }
 
 multilib_src_test() {
 	# respect TMPDIR!
 	local -x LIT_PRESERVES_TMP=1
-	local test_targets=( check )
-	# clang tests won't work on non-native ABI because we skip compiler-rt
-	multilib_is_native_abi && use clang && test_targets+=( check-clang )
-	cmake-utils_src_make "${test_targets[@]}"
+	cmake-utils_src_make check
 }
 
 src_install() {
@@ -406,34 +251,14 @@ src_install() {
 	)
 
 	local MULTILIB_WRAPPED_HEADERS=(
-		/usr/include/llvm/Config/config.h
 		/usr/include/llvm/Config/llvm-config.h
 	)
 
-	if use clang; then
-		# note: magic applied in multilib_src_install()!
-		CLANG_VERSION=4.0
-
-		MULTILIB_CHOST_TOOLS+=(
-			/usr/bin/clang
-			/usr/bin/clang++
-			/usr/bin/clang-cl
-			/usr/bin/clang-${CLANG_VERSION}
-			/usr/bin/clang++-${CLANG_VERSION}
-			/usr/bin/clang-cl-${CLANG_VERSION}
-		)
-
-		MULTILIB_WRAPPED_HEADERS+=(
-			/usr/include/clang/Config/config.h
-		)
-	fi
-
 	multilib-minimal_src_install
 
-	# Remove unnecessary headers on FreeBSD, bug #417171
-	if use kernel_FreeBSD && use clang; then
-		rm "${ED}"usr/lib/clang/${PV}/include/{std,float,iso,limits,tgmath,varargs}*.h || die
-	fi
+	# Install lit
+	cd "${S}"/utils/lit || die
+	distutils-r1_src_install
 }
 
 multilib_src_install() {
@@ -450,41 +275,6 @@ multilib_src_install() {
 				"/usr/${CHOST}/binutils-bin/lib/bfd-plugins/LLVMgold.so"
 		fi
 	fi
-
-	# apply CHOST and CLANG_VERSION to clang executables
-	# they're statically linked so we don't have to worry about the lib
-	if use clang; then
-		local clang_tools=( clang clang++ clang-cl )
-		local i
-
-		# cmake gives us:
-		# - clang-X.Y
-		# - clang -> clang-X.Y
-		# - clang++, clang-cl -> clang
-		# we want to have:
-		# - clang-X.Y
-		# - clang++-X.Y, clang-cl-X.Y -> clang-X.Y
-		# - clang, clang++, clang-cl -> clang*-X.Y
-		# so we need to fix the two tools
-		for i in "${clang_tools[@]:1}"; do
-			rm "${ED%/}/usr/bin/${i}" || die
-			dosym "clang-${CLANG_VERSION}" "/usr/bin/${i}-${CLANG_VERSION}"
-			dosym "${i}-${CLANG_VERSION}" "/usr/bin/${i}"
-		done
-
-		# now prepend ${CHOST} and let the multilib-build.eclass symlink it
-		if ! multilib_is_native_abi; then
-			# non-native? let's replace it with a simple wrapper
-			for i in "${clang_tools[@]}"; do
-				rm "${ED%/}/usr/bin/${i}-${CLANG_VERSION}" || die
-				cat > "${T}"/wrapper.tmp <<-_EOF_
-					#!${EPREFIX}/bin/sh
-					exec "${i}-${CLANG_VERSION}" $(get_abi_CFLAGS) "\${@}"
-				_EOF_
-				newbin "${T}"/wrapper.tmp "${i}-${CLANG_VERSION}"
-			done
-		fi
-	fi
 }
 
 multilib_src_install_all() {
@@ -492,33 +282,4 @@ multilib_src_install_all() {
 	doins -r utils/vim/*/.
 	# some users may find it useful
 	dodoc utils/vim/vimrc
-
-	if use clang; then
-		pushd tools/clang >/dev/null || die
-
-		if use python ; then
-			pushd bindings/python/clang >/dev/null || die
-
-			python_moduleinto clang
-			python_domodule *.py
-
-			popd >/dev/null || die
-		fi
-
-		# AddressSanitizer symbolizer (currently separate)
-		dobin "${S}"/projects/compiler-rt/lib/asan/scripts/asan_symbolize.py
-
-		popd >/dev/null || die
-
-		python_fix_shebang "${ED}"
-		if use static-analyzer; then
-			python_optimize "${ED}"usr/share/scan-view
-		fi
-	fi
-}
-
-pkg_postinst() {
-	if use clang && ! has_version 'sys-libs/libomp'; then
-		elog "To enable OpenMP support in clang, install sys-libs/libomp."
-	fi
 }
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index e8cd71f8d5a4..7cad1faae2c5 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -49,6 +49,9 @@ DIST genpatches-3.18-38.extras.tar.xz 16192 SHA256 f30c135fd6b6d0739ea10fc5086d1
 DIST genpatches-3.18-39.base.tar.xz 1063424 SHA256 1b894c5766a8cb21c553e467668ec8b1295ff96f37b25b0a9ea750ced30c611a SHA512 523da4c6413204ce6dce46626359b50cd4c31988424fba8546ef3bbb75a3ce61af068dc35ddc1f240a177192b715cff62608f95ce3ac453a5eb84ff12c79fb7d WHIRLPOOL 10d90308afd912266a91e9dd4cfb724cf11f0dfd46103a832126cfc0728deb6f7a09516e9f5e8ab7fb64aa0fba9d06acf5645df42289867e29b42c6642a0c000
 DIST genpatches-3.18-39.experimental.tar.xz 61724 SHA256 196f3ad4cab22c70035584b49e308a6486d5cf0b5f6915f8c368e7d55fce4e73 SHA512 f91f1150630322067d37835e00c70b68dc58b9ca09f34900a9206103d3304bc83cf40ee4cada16ff6ca65148d67aafd3b2b2f298f96df1321f45e48200dfa766 WHIRLPOOL ea8a14dc9be196e250491cc76c08ed8eb470d8c406722c8cf0af14b16ee00a74edafddf7663095d99826d9240631fb312e14aff9614437699304cf7d72380bf4
 DIST genpatches-3.18-39.extras.tar.xz 16192 SHA256 2cd12e21f1fc9513d12d1dd9c42db1cc72a6140c6e7af4deec6abae0c3ee335f SHA512 04aab296a48a49c0228c4e22c0a4f2aa9390b66970f2975424b1d2ff4ecd3ee4448ec282de7ccf72e1828d1a29cd9ef213f2fbb81f178554fb1b0c1c2db2476c WHIRLPOOL 0d51d0fab944e7f38e0a5ed80dfafafc92e5ed2ba745a284ea97738d3ff6e20dc38863b8641c3c2316e0374ba15194ec85c6ee7fedb3e9fa245d16b40e7ed591
+DIST genpatches-3.18-40.base.tar.xz 1089632 SHA256 66615737fa4633df2b2061f6dbd09c4e67bbb503599ccc312f557e7a8af5928e SHA512 6ccc0994071328a732c00ef919317a97ded933175231de8f3edf8a3319d7885a2265822a6c64402221b4a45ee683c14042f88595442dc1f83c2e35a11f929f69 WHIRLPOOL 0a8da82756274dac9fa32f7b2c93a5321948e20d5af90e61cc801a60644b84e586e9df1c3f9bdfa3763356ccdfd716ff2e453b4c84192f416d994af77aa5f71c
+DIST genpatches-3.18-40.experimental.tar.xz 61756 SHA256 c54a6bf89a6ab07bb378942bd2926de7bad637672b6d68e3acb2bae8a0665818 SHA512 d400f35b0c8d2be08d61cafa72f460eefcb813052edef619ada875bf664273564bc40352a18d91506eb975a4a2b7e7b11827b0c93a3168965e1c8c20e3bca44d WHIRLPOOL 6d38e4083ecd2076c7436a25a7290f4265f31300ff1ae760a7ac6f5c5c1715bc5d80b7df7d11221c5aa157eb22b1ab1c854f3e0686eeb3d9ae209ac7bbbeef4c
+DIST genpatches-3.18-40.extras.tar.xz 16192 SHA256 f30c135fd6b6d0739ea10fc5086d12493b2075516d6f1ad5e6bd951c22908b44 SHA512 745f9c89ff751128a2276a9d54b3b75d4e392279ccb54eed871281cb615dae870b2d8f5f66bab4301b93828de9d9e5bfa1495d9876ee4d14b34ce6f0b0279a37 WHIRLPOOL 2178c15e32835634c6ca2556c79948c3fff8c44e414c932037b80f095602b95e4c448c6deb5a5970ca2942791715a4ce7583e37166599c5e7b87969f2aa82791
 DIST genpatches-3.4-95.base.tar.xz 1463092 SHA256 9863107c059d597e5126ec025b464d6af167125b6a72f02cfbdb462198d7a193 SHA512 7e0fb0c5ee1b60cc99d6ac233db551f65e2518d1133aa8c58dc33c3096a31e7ea73b7ac12b6f7072083a601a24d394e4594ee1615b8eb20173cde07b44db0b50 WHIRLPOOL afc6555e409152658bd919bff1e7828c1a86f4df146aefbce40e1a85740692c11f573863f7da8034c6da184ffc02c22854e2024cd8673d8891c966d0264222fa
 DIST genpatches-3.4-95.extras.tar.xz 18232 SHA256 93a4cf21c8ade507bcfb0500fb7b1e73e324a817b906e5060ff46be18bcd485f SHA512 12ae9f224970cc92eede0b87cca2db9b67d093fd0228105ad4fb4a3914206dba6d10299a5d6a0073521f03141456b4a5be795d54d9d3aa5ed346c014a8fc356b WHIRLPOOL 599c698e464ab7bfe641ca1fa2ddab6be087ea67dc055e43971908d2e860b150f8625335f3648ec9dc0553f6fb92928d8c2a3308c73744b73c39a02d3a6f014a
 DIST genpatches-4.1-20.base.tar.xz 452816 SHA256 74b7e3355fdd999b17ed0cd955a20551ddaa0cc4d8608f5b80d31f8059a79549 SHA512 fd2d6c1ce75c899254b944798d230144c25caa8e36103388fa4dd3aa1a1a9e310435b442535be13a933b16d1a142c125bd5e754fb4aa621573599c36b6ac4bfd WHIRLPOOL a22aa9175d0cdf315c345ab60655476b141a472c4ebe505838440402b1bd65802ab21e6ad897f7883bf2846b61b9b414b2f55af29ee9372ea30d62df3257fc73
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.18.40.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.18.40.ebuild
new file mode 100644
index 000000000000..086052763fc1
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-3.18.40.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="40"
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/sys-libs/compiler-rt/compiler-rt-9999.ebuild b/sys-libs/compiler-rt/compiler-rt-9999.ebuild
new file mode 100644
index 000000000000..7c93672c10f7
--- /dev/null
+++ b/sys-libs/compiler-rt/compiler-rt-9999.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+CMAKE_MIN_VERSION=3.4.3
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils git-r3 python-single-r1
+
+DESCRIPTION="Compiler runtime libraries for clang"
+HOMEPAGE="http://llvm.org/"
+SRC_URI=""
+EGIT_REPO_URI="http://llvm.org/git/compiler-rt.git
+	https://github.com/llvm-mirror/compiler-rt.git"
+
+LICENSE="UoI-NCSA"
+SLOT="0/${PV%.*}"
+KEYWORDS=""
+IUSE="+sanitize"
+
+RDEPEND="
+	~sys-devel/llvm-${PV}
+	!<sys-devel/llvm-${PV}
+	sanitize? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+src_configure() {
+	local clang_version=4.0.0
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		# used to find cmake modules
+		-DLLVM_LIBDIR_SUFFIX="${libdir#lib}"
+		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${clang_version}"
+
+		# TODO: tests do not support standalone builds
+		-DCOMPILER_RT_INCLUDE_TESTS=OFF
+		-DCOMPILER_RT_BUILD_SANITIZERS=$(usex sanitize)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	use sanitize && python_doscript "${S}"/lib/asan/scripts/asan_symbolize.py
+}
diff --git a/sys-libs/compiler-rt/metadata.xml b/sys-libs/compiler-rt/metadata.xml
new file mode 100644
index 000000000000..ea472dc6c742
--- /dev/null
+++ b/sys-libs/compiler-rt/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>llvm@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="sanitize">Build compiler-rt's sanitizers</flag>
+	</use>
+</pkgmetadata>
diff --git a/sys-power/acpilight/Manifest b/sys-power/acpilight/Manifest
new file mode 100644
index 000000000000..ba2fb478e83e
--- /dev/null
+++ b/sys-power/acpilight/Manifest
@@ -0,0 +1 @@
+DIST acpilight-0_pre20160724.tar.gz 2125 SHA256 d57f71561fd73289c3b81332c08619ac3edcc295bcfe7fd1840e512d00e0835b SHA512 a249f46afcb2f45c6f85769e4c6de1751da4cb432012db51b8682a7dc1454fe2cffbe5694ea18bdc275b4c302f911b68f104d3e7b4c8e9b8ac114cbecc91fc56 WHIRLPOOL 57a2f01a74046662102fe35715b161ef94ffb83db038547424d99f95cee3b432b2151fd7c7b7cde3b1dd19cfa339548c8c3b795c440dba24e48a31760b645c0a
diff --git a/sys-power/acpilight/acpilight-0_pre20160724.ebuild b/sys-power/acpilight/acpilight-0_pre20160724.ebuild
new file mode 100644
index 000000000000..f67bcb016e0c
--- /dev/null
+++ b/sys-power/acpilight/acpilight-0_pre20160724.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit python-r1 udev vcs-snapshot
+
+VCS_COMMIT="4a15c2d3019aacd891e7d2151334e22b2cebe0ca"
+DESCRIPTION="Replacement for xbacklight that uses the ACPI interface to set brightness"
+HOMEPAGE="https://github.com/wavexx/acpilight/"
+SRC_URI="https://github.com/wavexx/acpilight/archive/${VCS_COMMIT}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="virtual/udev
+	${PYTHON_DEPS}
+	!x11-apps/xbacklight"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+DOCS=( README.rst )
+
+src_install() {
+	python_foreach_impl python_doscript xbacklight
+	udev_dorules "${FILESDIR}"/90-backlight.rules
+	einstalldocs
+}
+
+pkg_postinst() {
+	udev_reload
+	einfo
+	elog "To use the xbacklight binary as a regular user, you must be a part of the video group"
+	einfo
+	elog "If this utility does not find any backlights to manipulate,"
+	elog "verify you have kernel support on the device and display driver enabled."
+	einfo
+}
diff --git a/sys-power/acpilight/files/90-backlight.rules b/sys-power/acpilight/files/90-backlight.rules
new file mode 100644
index 000000000000..9f5b1c893897
--- /dev/null
+++ b/sys-power/acpilight/files/90-backlight.rules
@@ -0,0 +1,2 @@
+SUBSYSTEM=="backlight", ACTION=="add", RUN+="/bin/chgrp video /sys/class/backlight/%k/brightness"
+SUBSYSTEM=="backlight", ACTION=="add", RUN+="/bin/chmod g+w /sys/class/backlight/%k/brightness"
diff --git a/sys-power/acpilight/metadata.xml b/sys-power/acpilight/metadata.xml
new file mode 100644
index 000000000000..1454e2174f47
--- /dev/null
+++ b/sys-power/acpilight/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>grknight@gentoo.org</email>
+    <name>Brian Evans</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/x11-misc/revelation/metadata.xml b/x11-misc/revelation/metadata.xml
index 097975e3adc2..8bf69628e798 100644
--- a/x11-misc/revelation/metadata.xml
+++ b/x11-misc/revelation/metadata.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <maintainer type="person">
+    <email>graaff@gentoo.org</email>
+  </maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xnots/xnots-0.2.1-r1.ebuild b/x11-misc/xnots/xnots-0.2.1-r1.ebuild
index ee11e5f09c33..92153b83810a 100644
--- a/x11-misc/xnots/xnots-0.2.1-r1.ebuild
+++ b/x11-misc/xnots/xnots-0.2.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-inherit toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="A desktop sticky note program for the unix geek"
 HOMEPAGE="http://xnots.sourceforge.net https://github.com/thePalindrome/xnots"
@@ -14,20 +14,26 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="vim-syntax"
 
-RDEPEND="x11-libs/libX11
+RDEPEND="
+	x11-libs/libX11
 	x11-libs/libXext
-	x11-libs/libXrender
 	x11-libs/libXrandr
-	x11-libs/pango[X]"
+	x11-libs/libXrender
+	x11-libs/pango[X]
+"
 
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	virtual/pkgconfig
-	x11-proto/xextproto
+	x11-proto/randrproto
 	x11-proto/renderproto
-	x11-proto/randrproto"
+	x11-proto/xextproto
+"
 
 src_prepare() {
 	sed -i -e 's|LICENCE||g' Makefile || die
+
+	append-cflags -std=gnu89
 }
 
 src_compile() {
diff --git a/x11-misc/xnots/xnots-9999.ebuild b/x11-misc/xnots/xnots-9999.ebuild
index d30b43eb9dc2..4615827f4fb6 100644
--- a/x11-misc/xnots/xnots-9999.ebuild
+++ b/x11-misc/xnots/xnots-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-inherit git-r3 toolchain-funcs
+inherit flag-o-matic git-r3 toolchain-funcs
 
 DESCRIPTION="A desktop sticky note program for the unix geek"
 HOMEPAGE="http://xnots.sourceforge.net https://github.com/thePalindrome/xnots"
@@ -13,20 +13,26 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="vim-syntax"
 
-RDEPEND="x11-libs/libX11
+RDEPEND="
+	x11-libs/libX11
 	x11-libs/libXext
-	x11-libs/libXrender
 	x11-libs/libXrandr
-	x11-libs/pango[X]"
+	x11-libs/libXrender
+	x11-libs/pango[X]
+"
 
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	virtual/pkgconfig
-	x11-proto/xextproto
+	x11-proto/randrproto
 	x11-proto/renderproto
-	x11-proto/randrproto"
+	x11-proto/xextproto
+"
 
 src_prepare() {
 	sed -i -e 's|LICENCE||g' Makefile || die
+
+	append-cflags -std=gnu89
 }
 
 src_compile() {