From df52bc9427714f27209633c8d0031aa69a49db89 Mon Sep 17 00:00:00 2001
From: root <root@sandbox.local.calculate.ru>
Date: Tue, 13 Dec 2016 12:03:45 +0300
Subject: [PATCH] Sync with portage [Tue Dec 13 12:03:45 MSK 2016].

---
 app-emulation/rkt/Manifest                    |   2 +
 app-emulation/rkt/rkt-1.21.0.ebuild           | 257 ++++++++++++++++++
 dev-ruby/annoy/Manifest                       |   2 +-
 dev-ruby/annoy/annoy-0.5.6-r1.ebuild          |   2 +-
 dev-ruby/buftok/Manifest                      |   2 +-
 dev-ruby/buftok/buftok-0.2.0-r1.ebuild        |   2 +-
 dev-ruby/fakefs/Manifest                      |   6 +-
 ...kefs-0.8.1.ebuild => fakefs-0.10.1.ebuild} |   6 +-
 dev-ruby/fakefs/fakefs-0.9.0.ebuild           |  43 ---
 dev-ruby/httpclient/Manifest                  |   6 +-
 dev-ruby/httpclient/httpclient-2.8.2.2.ebuild |  62 -----
 ...t-2.8.1.ebuild => httpclient-2.8.3.ebuild} |   2 +-
 dev-ruby/typhoeus/Manifest                    |   6 +-
 dev-ruby/typhoeus/typhoeus-1.0.1.ebuild       |  30 --
 ...eus-1.0.2.ebuild => typhoeus-1.1.2.ebuild} |   6 +-
 metadata/dtd/timestamp.chk                    |   2 +-
 metadata/glsa/glsa-201612-32.xml              |  51 ++++
 metadata/glsa/glsa-201612-33.xml              |  49 ++++
 metadata/glsa/glsa-201612-34.xml              |  51 ++++
 metadata/glsa/glsa-201612-35.xml              |  49 ++++
 metadata/glsa/glsa-201612-36.xml              |  52 ++++
 metadata/glsa/glsa-201612-37.xml              |  52 ++++
 metadata/glsa/glsa-201612-38.xml              |  49 ++++
 metadata/glsa/glsa-201612-39.xml              |  53 ++++
 metadata/glsa/glsa-201612-40.xml              |  56 ++++
 metadata/glsa/timestamp.chk                   |   2 +-
 metadata/md5-cache/app-emulation/rkt-1.21.0   |  15 +
 metadata/md5-cache/dev-ruby/annoy-0.5.6-r1    |  10 +-
 metadata/md5-cache/dev-ruby/buftok-0.2.0-r1   |  10 +-
 metadata/md5-cache/dev-ruby/fakefs-0.10.1     |  14 +
 metadata/md5-cache/dev-ruby/fakefs-0.8.1      |  14 -
 metadata/md5-cache/dev-ruby/fakefs-0.9.0      |  14 -
 .../md5-cache/dev-ruby/httpclient-2.8.2.2     |  14 -
 .../{httpclient-2.8.1 => httpclient-2.8.3}    |   6 +-
 metadata/md5-cache/dev-ruby/typhoeus-1.0.1    |  14 -
 metadata/md5-cache/dev-ruby/typhoeus-1.0.2    |  14 -
 metadata/md5-cache/dev-ruby/typhoeus-1.1.2    |  14 +
 metadata/news/timestamp.chk                   |   2 +-
 metadata/timestamp                            |   2 +-
 metadata/timestamp.calculate                  |  28 +-
 metadata/timestamp.chk                        |   2 +-
 metadata/timestamp.x                          |   2 +-
 metadata/xml-schema/timestamp.chk             |   2 +-
 43 files changed, 813 insertions(+), 264 deletions(-)
 create mode 100644 app-emulation/rkt/rkt-1.21.0.ebuild
 rename dev-ruby/fakefs/{fakefs-0.8.1.ebuild => fakefs-0.10.1.ebuild} (78%)
 delete mode 100644 dev-ruby/fakefs/fakefs-0.9.0.ebuild
 delete mode 100644 dev-ruby/httpclient/httpclient-2.8.2.2.ebuild
 rename dev-ruby/httpclient/{httpclient-2.8.1.ebuild => httpclient-2.8.3.ebuild} (92%)
 delete mode 100644 dev-ruby/typhoeus/typhoeus-1.0.1.ebuild
 rename dev-ruby/typhoeus/{typhoeus-1.0.2.ebuild => typhoeus-1.1.2.ebuild} (81%)
 create mode 100644 metadata/glsa/glsa-201612-32.xml
 create mode 100644 metadata/glsa/glsa-201612-33.xml
 create mode 100644 metadata/glsa/glsa-201612-34.xml
 create mode 100644 metadata/glsa/glsa-201612-35.xml
 create mode 100644 metadata/glsa/glsa-201612-36.xml
 create mode 100644 metadata/glsa/glsa-201612-37.xml
 create mode 100644 metadata/glsa/glsa-201612-38.xml
 create mode 100644 metadata/glsa/glsa-201612-39.xml
 create mode 100644 metadata/glsa/glsa-201612-40.xml
 create mode 100644 metadata/md5-cache/app-emulation/rkt-1.21.0
 create mode 100644 metadata/md5-cache/dev-ruby/fakefs-0.10.1
 delete mode 100644 metadata/md5-cache/dev-ruby/fakefs-0.8.1
 delete mode 100644 metadata/md5-cache/dev-ruby/fakefs-0.9.0
 delete mode 100644 metadata/md5-cache/dev-ruby/httpclient-2.8.2.2
 rename metadata/md5-cache/dev-ruby/{httpclient-2.8.1 => httpclient-2.8.3} (93%)
 delete mode 100644 metadata/md5-cache/dev-ruby/typhoeus-1.0.1
 delete mode 100644 metadata/md5-cache/dev-ruby/typhoeus-1.0.2
 create mode 100644 metadata/md5-cache/dev-ruby/typhoeus-1.1.2

diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
index 6e023f4da81f..c6bdc6b732e7 100644
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@@ -7,11 +7,13 @@ DIST qemu-2.7.0.tar.bz2 26867760 SHA256 326e739506ba690daf69fc17bd3913a6c313d992
 DIST rkt-1.18.0.tar.gz 3042834 SHA256 3897afeb743f77509cf7bfb484800e5b75eadb15f42bc0258e2e5b5598ae8290 SHA512 e47da81dde38f5c63cfd2955b1219c4339b51d5bf396042d7872893c5475f796b0279218380fa43ebe3ed7bbdfaf360ed286095193a279c364623dcbd8d9da14 WHIRLPOOL 409451eb50dfdd0726641ea843e48ebcc10629b6b6e85ce7ece4b1f6cb5b8586645f3990b0d9510ba6b7b3c0f0beb58f1c740e8cb5610fea675eb0c3ea1305a6
 DIST rkt-1.19.0.tar.gz 3071413 SHA256 49b5c1cc9a376a241e8b72b9702a911c3daa9187715e70fddbf2d267140b627a SHA512 0d14716de6cdb2bf6c7d8b1ddd4ae839f98cb05290a8d85f3ed7b604dce5250556d849909c21c51889c43f0779c20f76f708a83bb6ba2b2d7c1f1761cec22a0c WHIRLPOOL 4c0d99fd77444c992be0fc4be7461c8e34b7e26dd64f17f1468d8a0b93b4878d32ded7bcac96a01cf8d6c981bd1ed8b25fae9efde5574a8fb64c7e9f9b290f96
 DIST rkt-1.20.0.tar.gz 3315218 SHA256 3b0a08971cc22004fe8367f8d3e35d5f66fcd0191802b4e35c5c273c1f772096 SHA512 37c46a044838660eb22d74ff5cc16c7d9a29b178a5ccece97d484e4aebfd587a7558d665d2a2162adee859135330d4504a4dca60faf4ce5e3552633924c3b960 WHIRLPOOL 65c734f97f942886c7e7c6bcdc5a99bf3350b7f6286a015af57750c2b7d1282cd2c032d9bdc10d3209fb94c817fbc6f3cf1c8ea5307a820ba9a817d78afd38ca
+DIST rkt-1.21.0.tar.gz 3334473 SHA256 63eed8da954c24c1f9010e7513ee6ac21ffeaf63a648f9d5a0f9e9d3eb92fde5 SHA512 2723aab1aadbe7be0f7ce9c7f4e000c76d8c34d167b1157a08de7fb2248e4b73a7fc765ead557db495bab803f5d5c8d09e1d9441301396e18fa49b21a8c4c7ae WHIRLPOOL 11b28be68dd246ddafb5455becc64ea1b185d1128747dc51103ab692c34cd9157423164c4847be9e9a39338cb5ad6e2db3e588545378179b51a0ce58a1be1935
 DIST rkt-pxe-1192.0.0.img 233603403 SHA256 a6233ff4b91457181c3f9eed942af9df66161f5ae84256fbe2d08b5d184c35be SHA512 8e6e5311e209453992da80722229723854b66b983b31922ba68131dbf1c009989e3181ecd6fc9876d1e1eb1956f6463bb66d6ff9114904c4b6dca6c0474fcdee WHIRLPOOL 1d3b0914a38be7518f4f0abc6050aab82318a380bbb2b722671f5e1111aa11fa019ccbd029eaa7f8262bcef90ce159c36eb09dfb8911dd60c57637da4e00270e
 DIST rkt-pxe-1235.0.0.img 243713684 SHA256 988e4ad8e044dd8bff54cb5e0a34a1ed25cf7bc8cc241f1a90e3fe7f1412f315 SHA512 b19821c63b7b53a1aad3b6e279189f9ceed1f5db1a691d12a70eb7340cceb4c3fd4f7f61a913d9482aec5ce28740b9ee777f86a1ce54f597f50341d701372542 WHIRLPOOL f3905ce3a2a55a027197a2d11ca541323fdfd560d186b4a2c39a8f45e19811067d5de4fbd3656935b12787e1dec79d118d7a01d52a8ef7abd0dad4f38a222b1c
 DIST systemd-231.tar.gz 4381464 SHA256 899733ad6c157cedbb89aec4efe3bc824dcfd65a1d6f6bebc7b043f7924e39b4 SHA512 199fa33a0494d1d15f7fe3c796fe14913ad386766571d4d3fbb1cb1c446e04f6d06a965213be4c594a7183e810fc2fd4804fe14f64f21b0a1278b717889811c6 WHIRLPOOL 7779291e9fb9873cb1773b8583cf6d4b7dec837363ea89c4a73c1e397a76752b66f8b57d8fc4d9cef768cc1855b5e325ad88a8a69eb5380aa924e0a6dead41b1
 EBUILD rkt-1.18.0.ebuild 7600 SHA256 dbb4c31f49cc44c3991a4c1213375e051b34d48bd3f88c62123fba7e74ad9915 SHA512 9a6b4d24180221650d7dd2a2dbb91fb18b8d1501ae090282d4ba5c4578491417bf9a64c85a2b5bf2b4eb5fe9e10dd6fc720d5958497d85e9674f82c43c73d8f7 WHIRLPOOL 581d3366e14f1ed8d982e1e1d104670dae63fe6c8ca209e5b5d3b94637e86597be9c58ac244e31a47fd3eab282874b6db8744eb7ffa8cbbe002c67aee773fe86
 EBUILD rkt-1.19.0.ebuild 7941 SHA256 2030c999e618487446a33ca4a3d22b46bfe763b1e12322c04627d4d32897948b SHA512 b90b8a862500d0dd3a8db4de2a81a84f7208e19340316844d632ddf2e3bc91789edc24ee796477a9b79bcb3315c38ffa0f45691b45243af3e340258ea3e56a93 WHIRLPOOL 3f6169dbb8f925f0931650ff7950e2e894d92de74d707acd20f9eaf383701c940c2d009f79673ed6f7617eaf7cbf19751d65720c1044350d87e7f7b0d1531b2c
 EBUILD rkt-1.20.0.ebuild 7941 SHA256 369591bcc972658f63fd750035cd9613f15fa65d496fa3c37a9a624a0c9b200a SHA512 8287c213d4226dbae802dbdd4fed15d0f8f13d39240a999e290c0298c1d3a5044078932a27a45808cf6ef99dac740c553464e93cf1103ad28632b31fcc2ab843 WHIRLPOOL 0dcd2e221d36b5dfe2e35b537de181bcb9671947f0ff4c09be5e530b5643c8d3c41419136f350973b22b664c4d4b4f65626bcebb6c1033de4241a2170a777530
+EBUILD rkt-1.21.0.ebuild 7941 SHA256 369591bcc972658f63fd750035cd9613f15fa65d496fa3c37a9a624a0c9b200a SHA512 8287c213d4226dbae802dbdd4fed15d0f8f13d39240a999e290c0298c1d3a5044078932a27a45808cf6ef99dac740c553464e93cf1103ad28632b31fcc2ab843 WHIRLPOOL 0dcd2e221d36b5dfe2e35b537de181bcb9671947f0ff4c09be5e530b5643c8d3c41419136f350973b22b664c4d4b4f65626bcebb6c1033de4241a2170a777530
 MISC ChangeLog 7837 SHA256 630e290106917852b9c583edc74c8d39866c67a364a03a91e774b358bc99e2aa SHA512 7d0c544ac143a1dfbba810863ac48149158c76f0cd5a193aab1d98798837bec51c2f0eef0e59bdfb87e9fb1f2350cad741c6fbe5766e04d0bc4c4b810019d622 WHIRLPOOL 89c57144861a9c3704e4468887d7d5f91e1948630a6dfd7a20db4f3d89cb4b8da0c3731d024e526f7c2f5c8a2b505729d5bb29f3f6bedcf22234e852413b4da4
 MISC metadata.xml 1468 SHA256 da602dafea8bc6a9f51415e55758c77df8a25affb5b33a0a179076c672c85c89 SHA512 e0548fddd59d422eb04b0b18b98b273d0f3d39465c91539fdfce71583388a6651e878725cf196b0c74efa42b489c44b12e4671e28b3f16d76a16fb8184c3da1a WHIRLPOOL caa1d09b248e7f226bc32aaf21591746e27ef04b2f5c9313cc1e43706fdf2b795abace41ee8584b7ee1e9dd2d7ef9671f87c91915429218bf18234e9dbdbffc4
diff --git a/app-emulation/rkt/rkt-1.21.0.ebuild b/app-emulation/rkt/rkt-1.21.0.ebuild
new file mode 100644
index 000000000000..97a036e13b2d
--- /dev/null
+++ b/app-emulation/rkt/rkt-1.21.0.ebuild
@@ -0,0 +1,257 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit bash-completion-r1 autotools flag-o-matic systemd toolchain-funcs user
+
+KEYWORDS="~amd64"
+
+PXE_VERSION="1235.0.0"
+PXE_SYSTEMD_VERSION="v231"
+KVM_LINUX_VERSION="4.8.6"
+KVMTOOL_VERSION="1cd6f516264ad2ad83fad3dc1264d6ff4bcd17b2"
+QEMU_VERSION="v2.7.0"
+PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
+PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
+
+SRC_URI_KVM="mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
+	${PXE_URI} -> ${PXE_FILE}
+"
+
+SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
+rkt_stage1_kvm_lkvm? (
+	https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
+	${SRC_URI_KVM}
+)
+rkt_stage1_kvm_qemu? (
+	http://wiki.qemu-project.org/download/qemu-${QEMU_VERSION#v}.tar.bz2
+	${SRC_URI_KVM}
+)
+rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
+
+DESCRIPTION="rkt is an App Container runtime for Linux"
+HOMEPAGE="https://github.com/coreos/rkt"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+# The rkt_stage1_kvm flag has been replaced by the rkt_stage1_kvm_lkvm and rkt_stage1_kvm_qemu flags
+IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_kvm_lkvm rkt_stage1_kvm_qemu rkt_stage1_src +actool systemd"
+REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm_lkvm rkt_stage1_kvm_qemu rkt_stage1_src ) rkt_stage1_host? ( systemd ) !rkt_stage1_kvm"
+
+# Some tests fail.
+# rkt_stage1_src needs to copy /bin/mount, which requires root privileges during src_compile
+RESTRICT="test rkt_stage1_src? ( userpriv )"
+
+DEPEND=">=dev-lang/go-1.5
+	app-arch/cpio
+	app-crypt/trousers
+	sys-fs/squashfs-tools
+	dev-perl/Capture-Tiny
+	rkt_stage1_src? ( >=sys-apps/util-linux-2.27 )
+	rkt_stage1_kvm_qemu? (
+		sys-apps/attr[static-libs(+)]
+		sys-libs/libcap[static-libs(+)]
+		sys-libs/zlib[static-libs(+)]
+		>=x11-libs/pixman-0.28.0[static-libs(+)]
+	)"
+
+RDEPEND="!app-emulation/rocket
+	rkt_stage1_host? ( systemd? (
+		>=sys-apps/systemd-222
+		app-shells/bash:0
+	) )"
+
+BUILDDIR="build-${P}"
+STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
+
+pkg_setup() {
+	enewgroup rkt-admin
+	enewgroup rkt
+}
+
+src_unpack() {
+	local x
+	for x in ${A}; do
+		case ${x} in
+			*.img|linux-*) continue ;;
+			kvmtool-*)
+				mkdir kvmtool || die
+				pushd kvmtool >/dev/null || die
+				unpack ${x}
+				popd >/dev/null || die
+				;;
+			*)
+				unpack ${x}
+		esac
+	done
+}
+
+src_prepare() {
+	eapply_user
+
+	# This patch breaks linux kernel cc-option checks when the
+	# compiler doesn't recognize the -no-pie option.
+	rm stage1/usr_from_kvm/kernel/patches/0002-for-debian-gcc.patch || die
+
+	# avoid sdjournal include for bug 595874
+	if ! use systemd; then
+		sed -e "s/^\\(LOCAL_DIST_SRC_FILTER := .*\\)'$/\\1|api_service'/" \
+			-i rkt/rkt.mk || die
+	fi
+
+	sed -e 's|^RKT_REQ_PROG(\[GIT\],.*|#\0|' -i configure.ac || die
+
+	# disable git fetch of systemd
+	sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
+'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
+'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
+'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
+'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
+
+	# disable git fetch of kvmtool
+	sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
+'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
+'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
+'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
+'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
+'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
+
+	# disable git fetch of qemu
+	sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(shell echo "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'")),)\n\n'\
+'$(call forward-vars, get_qemu_sources, QEMU_SRCDIR)\n'\
+'get_qemu_sources: | $(QEMU_TMPDIR)\n'\
+'\tmv "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'" "$(QEMU_SRCDIR)"\n\n'\
+'$(QEMU_CLONE_STAMP): get_qemu_sources\n\n'\
+'else ifneq ($(wildcard $(QEMU_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' \
+	-e 's|QEMU_CONFIGURATION_OPTS :=|\0 --disable-bzip2 --disable-libssh2 --disable-opengl|' \
+	-i stage1/usr_from_kvm/qemu.mk || die
+
+	# disable fetch of kernel sources
+	sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
+		-i stage1/usr_from_kvm/kernel.mk || die
+
+	if use rkt_stage1_host; then
+		# Make systemdUnitsPath consistent with host
+		sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
+			-i stage1/init/init.go || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	local flavors hypervisors myeconfargs=(
+		--with-stage1-default-images-directory="/usr/share/rkt"
+		--with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
+	)
+
+	use systemd || myeconfargs+=( --enable-sdjournal=no )
+
+	# enable flavors (first is default)
+	use rkt_stage1_host && flavors+=",host"
+	use rkt_stage1_src && flavors+=",src"
+	use rkt_stage1_coreos && flavors+=",coreos"
+	use rkt_stage1_fly && flavors+=",fly"
+	{ use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; } && flavors+=",kvm"
+	myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
+
+	if use rkt_stage1_src; then
+		myeconfargs+=(
+			--with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
+			--with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
+		)
+	fi
+
+	if use rkt_stage1_coreos || use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
+		myeconfargs+=(
+			--with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
+			--with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
+		)
+	fi
+
+	if use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
+		use rkt_stage1_kvm_lkvm && hypervisors+=",lkvm"
+		use rkt_stage1_kvm_qemu && hypervisors+=",qemu"
+		myeconfargs+=( --with-stage1-kvm-hypervisors="${hypervisors#,}" )
+	fi
+
+	# Go's 6l linker does not support PIE, disable so cgo binaries
+	# which use 6l+gcc for linking can be built correctly.
+	if gcc-specs-pie; then
+		append-ldflags -nopie
+	fi
+
+	export CC=$(tc-getCC)
+	export CGO_ENABLED=1
+	export CGO_CFLAGS="${CFLAGS}"
+	export CGO_CPPFLAGS="${CPPFLAGS}"
+	export CGO_CXXFLAGS="${CXXFLAGS}"
+	export CGO_LDFLAGS="${LDFLAGS}"
+	export BUILDDIR
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	local arch=${ARCH}
+	case ${arch} in
+		amd64) arch=x86_64;;
+	esac
+	ARCH=${arch} emake V=3
+	ARCH=${arch} emake V=3 bash-completion
+}
+
+src_install() {
+	dodoc README.md
+	use doc && dodoc -r Documentation
+	use examples && dodoc -r examples
+	use actool && dobin "${S}/${BUILDDIR}/tools/actool"
+
+	dobin "${S}/${BUILDDIR}/target/bin/rkt"
+
+	insinto /usr/share/rkt
+	doins "${S}/${BUILDDIR}/target/bin/"*.aci
+
+	# create symlink for default stage1 image path
+	if use rkt_stage1_host; then
+		dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
+	elif use rkt_stage1_src; then
+		dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
+	elif use rkt_stage1_coreos; then
+		dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
+	elif use rkt_stage1_fly; then
+		dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
+	elif use rkt_stage1_kvm_lkvm; then
+		dosym stage1-kvm-lkvm.aci "${STAGE1_DEFAULT_LOCATION}"
+	elif use rkt_stage1_kvm_qemu; then
+		dosym stage1-kvm-qemu.aci "${STAGE1_DEFAULT_LOCATION}"
+	fi
+
+	systemd_dounit "${S}"/dist/init/systemd/*.service \
+		"${S}"/dist/init/systemd/*.timer \
+		"${S}"/dist/init/systemd/*.socket
+
+	insinto /usr/lib/tmpfiles.d
+	doins "${S}"/dist/init/systemd/tmpfiles.d/*
+
+	newbashcomp "${S}"/dist/bash_completion/rkt.bash rkt
+
+	keepdir /etc/${PN}
+	fowners :rkt-admin /etc/${PN}
+	fperms 2775 /etc/${PN}
+}
diff --git a/dev-ruby/annoy/Manifest b/dev-ruby/annoy/Manifest
index a2623fd8d5fb..1bbfebbc8fc8 100644
--- a/dev-ruby/annoy/Manifest
+++ b/dev-ruby/annoy/Manifest
@@ -1,5 +1,5 @@
 DIST annoy-0.5.6.gem 9728 SHA256 f45924069fbc6996693fc06618f4bc28b7e80e68d4625ab198efea89eb8d34b7 SHA512 6cade9d766fa315042ba04922bba315157872a25bc2c7e5ea428c1f2343045d0a5d400dc8eade20f650f2cc6a64492020ef608d355963c09c5e6e8d454d3cc8f WHIRLPOOL 007f39780a900648f992455873da150387b0821ecac60634431bed71bcd550a3645e9b6313161f087a3909bee351bf0374c43ec423a81b75c200c654a9162a96
-EBUILD annoy-0.5.6-r1.ebuild 547 SHA256 f443ff37d95bce8931efcbfeb588c39c5f7ee777e3792fcd6aaf809119efa0d4 SHA512 1b08526f95d60e4144a05b0c82f43719226ce4e0abc71e4fdd2aad889814f5ec1b23dbc02dce90c2c97162f620022681dd7670827509e0ed79166d138fa09ad8 WHIRLPOOL 5da423904468dea1998995191f3ce1de846e1e7d8e64e32270f116dcad95998ffe97e3520312e5e2744e70afdf1af402b3effd89460ecfe7e52fbb6742a97b49
+EBUILD annoy-0.5.6-r1.ebuild 554 SHA256 5b584b7ac3c4598a212986cc945e1c2c1c2dd7096c957476cf9d9ebe0945d7c8 SHA512 f4d71e7ef9d5cf04f4f0319dd8fd4ebd829ee64fa62dba86f4f92955f3c5a7219b9a98e2a98f1097833ec82cbea78d58da50433d3c82c3ec47c448c359ffa929 WHIRLPOOL 76e1614cb84848bc0ab741c891741248c979693f3290f4cf0b7e17c7ff59618d52e7750e9db2ab6625f65933127e12de9bed2ddcfd9a873c110c9fb5c76037d3
 MISC ChangeLog 2550 SHA256 efcc271b587952f61e6a81f646e6d73c3f04a85a0d692f1493193d4d1af98625 SHA512 9a5e14448d8e492fac720b612813fefa6ce36e492e1f7d1eb47b0076107c6b0c70bd36d3f95332e5ab8a18fe70bebb3f5378d013e065abd689ac2272d744b439 WHIRLPOOL 97c962cd93a944cad6e1f2bc90c2dfa9e770a31e61ffb1dd1d0fdfd4fa9bd30cd6b2f8ac4343e24f1ab91c28e60c7797543ebc5039c06fa7eb574c666c17c25d
 MISC ChangeLog-2015 1128 SHA256 87759864b97e9409eccd621f0ffc0c95c4b07529db5f186a12e59ac22ff84afd SHA512 a02d76e7533e6053d9080cc84f3c44fe58a746d2e83c5c38b7a8489b163ee45a45bd07b8a4526bba570ab8681922fb6eb95326dfcd190f6ff07bf9926b232557 WHIRLPOOL 8fff336f5ffbb090c773cb6a4a88d7eeb7ba2b212d8b20af52aaaef0ca1d81cf7ff42af06a11a36d5a96d2e65fe04e08c043768bb656bfbcb8b64c366d934015
 MISC metadata.xml 247 SHA256 1236c1552dc683658bd5bc3c5f880b71d9dfa13025edab4a0f8973f9eaa6bcf5 SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09 WHIRLPOOL c1aa829db3553d79fe71a8bf79fd6ea24e9fff4e591a4ade3c05e2a97b0df352170fbce76450c0402ec6d8998951c2f3eb3e198ac4638c0e0882208b9f4d8fc8
diff --git a/dev-ruby/annoy/annoy-0.5.6-r1.ebuild b/dev-ruby/annoy/annoy-0.5.6-r1.ebuild
index 5070349437a4..3d7a21c134aa 100644
--- a/dev-ruby/annoy/annoy-0.5.6-r1.ebuild
+++ b/dev-ruby/annoy/annoy-0.5.6-r1.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-ruby/buftok/Manifest b/dev-ruby/buftok/Manifest
index 72b09fba3c98..0ec7b7afdf97 100644
--- a/dev-ruby/buftok/Manifest
+++ b/dev-ruby/buftok/Manifest
@@ -1,5 +1,5 @@
 DIST buftok-0.2.0.gem 8192 SHA256 bad760334631e15b8eea608468709d3265e087703b5af0532f6583e277f0fae7 SHA512 2be11c56b49254f16cadfd8abc7c414a16a54b32ec416402a4c87be72c2ce9c524aaa17ede9bb3535555191f2a7b1d7d863199db5b4af8874880bcd16d3c3b45 WHIRLPOOL f8c9af11d15c8831bab5b4f2f273588ddca81e257dedf74b8d09851ad400897d6f71fd22c5cbeadbf492dfe18c911b2ad2d42ff7dbfe6553dfc4fe60f087735e
-EBUILD buftok-0.2.0-r1.ebuild 479 SHA256 c8a95d4eb99f34bf52b6339c93042c914275cb857a5c1fe2b7e8b8a59fb6be1d SHA512 6277b15b3dd8f2d037d2d1ba9c248594527f1d3122f9a10d813b089fdb34a537384e4b4662603bd98a294308ad4beb95cfcfc61e203a4e09f423cea3462ddada WHIRLPOOL 68af87f116ebcfea9b85c5098c6319a3947a9790b2e72296ae8e49d246fb8547f9d9013e1936a62b539a6553a7c2cd59e56f6d03f7f4cb19dc905fba47325d5e
+EBUILD buftok-0.2.0-r1.ebuild 486 SHA256 7015f70786786763e3d3b35aaa9f63454527439999f6e04748e22940581799b7 SHA512 c6d8a99640e72ed73eabffa5f179c27a48dcb9ef83484d2adad69ac65c0db6735a10945c1ccc1960695152ac506afdd0e31aa850856198db37549e89e6bf2682 WHIRLPOOL c11a72917df69dff7fa8e4f581b436b115522f1964b4edd10d4c837dc1553e6a062b0a24f2faa9707633297f6040161bcacd6541309341b8fe2af77fe3819bf5
 MISC ChangeLog 2723 SHA256 05f36fabe20949684e0a41abed0efdf1e5c20962661498dc05107806bc66c3b2 SHA512 3bf3adbaf251623d9fa1eb30996e0a1915d046fc61fe5567549934b6c1d2658cae9eeaf6d1be34a0f66568c75dd3038c2f384166670232619d6c3f45bf7126ea WHIRLPOOL 8bd61ede333ba05751527e6631c32e6e4d61e36e5e8c423165dba152610e9ac69f366a66e50e7d2dc191b5d960609767312d2bbe88cd2fc29d845a5278a2f234
 MISC ChangeLog-2015 703 SHA256 b5755f10b570a9d4e6d03279cd5000f2d45a3a4570ff02ecad0dd579e2cee323 SHA512 820c5688bc86c2743d26621fd903c24d270753225fc48261bec07c995e323dea9f7f1064e079ae00352b557251594545a04aa186ac0d4af51783e710ff00a94b WHIRLPOOL 241628e3488d772c577c06af1fe24311d0a235904aa2fe5b277a66bbc59405053b4b1736b43d79dc51e0015ff50fb0f1b66d30b0d4a592576dc677e067c182c6
 MISC metadata.xml 339 SHA256 aa52656f00345de9b995538dad1d1def094023e2aaca493307fda6a8bbd67960 SHA512 8901a4d1934605e2927f1f3e7a51e1e05c638b3ec6c9a027ce21f06570630af8a642973890adfe7bdfdd1624be28798424d66c5d4696121a89a257d2ce5bb52d WHIRLPOOL 577eaab5e90489f2071345ea8c176ef32c810895e9b240e76bb7747a19994f27570d6830cbb80eaf22a90a99ec1c70b4abae5fd081aef40b8d7941e430304357
diff --git a/dev-ruby/buftok/buftok-0.2.0-r1.ebuild b/dev-ruby/buftok/buftok-0.2.0-r1.ebuild
index 15ffa0423e33..7307b10c78e2 100644
--- a/dev-ruby/buftok/buftok-0.2.0-r1.ebuild
+++ b/dev-ruby/buftok/buftok-0.2.0-r1.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
 
 RUBY_FAKEGEM_EXTRADOC="CONTRIBUTING.md README.md"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/fakefs/Manifest b/dev-ruby/fakefs/Manifest
index 5a6b8a20c180..0e28f869cf1e 100644
--- a/dev-ruby/fakefs/Manifest
+++ b/dev-ruby/fakefs/Manifest
@@ -1,13 +1,11 @@
 DIST fakefs-0.10.0.tar.gz 44042 SHA256 fe7344afd8f329eb4155fdbe6110393ccb698fc3ec4b1294d3c2f93c1139a707 SHA512 f195320947e612ff148eeca2ca918201c6de7046caa3db90a5b011a9605347fe1e17563195ede19ba64fa96958de6204d55f45aa76cd8858d4926a4da0e3aea8 WHIRLPOOL 3b5c0b6fdd469875bf9f7166e4f854b5131c48417469f59fd49533477a22635e6b9c23b32ffe39c0b91aadf437a43c5350ff70abc52c6aa4f93900aa83b688e9
+DIST fakefs-0.10.1.tar.gz 44083 SHA256 5b0b1746f7ee8eafa4a8b045a37fa120ffe1f0adc10d0f94fe95b01f085ae9db SHA512 e15fc500839a9040715d7af8c16caab7102cb16563451b70232cc22049c0fd3c77703688cbf7a051c96d412607032c6d8f6664c8dd94a68821e15c57276d228d WHIRLPOOL b8c006570e0d2535bb14b52a66fc2bda05561234d7241d2d86bdecc9b8c19243525e9aa15968890f70cfa1d30446ee7e97d6e8e7225c88db3265717a095d0953
 DIST fakefs-0.6.0.gem 41984 SHA256 43a668e9a436654d66eff7e896793800b4b8d87c3ecd5a6a84e23fb52580150e SHA512 8c0eac75103e1917551e2f5e74a5324d5a606e7692a8e4c49c9b97e2b5005bd381073a5780a8e6d1fb661a1bb4a67e56c29ce98cd2e2e62cce22602c30e4225f WHIRLPOOL c1a520c9cf3913e727ef570367d238e2ec88eb8d41789d1d33e9227a5a5dd9c62f4a462374066e1e5b5c5ac8bb0f738e6513b4d4182c20969178a82f90aa2739
-DIST fakefs-0.8.1.tar.gz 42214 SHA256 b0b997e740045c47aece10fc24fdf5549886e8167acac19e65b65496bfa58d5e SHA512 1b729ece33b56eb8ae5e9cd2632f9e75adc318fbd34c9180bbe71853b96303563fd0cf8cc420ef8a8a5dd591bad4350be1efcb9847d9449531b4a4b3776017c5 WHIRLPOOL 279e6fc2a83d2214fe5710e289e75a772549f3d3e28a6405b22734430e1218e0117104acbce74699646a834300dd1685b2a5395626ff66dae96db010faee798e
-DIST fakefs-0.9.0.tar.gz 42557 SHA256 ad04fdd2700564a5c3483274b3ae7d56c286f69ffc73bdeae4f28fecf0c1c592 SHA512 a54a11692017dba1a07609f59be29095a2175838c4946602c25fcb030d511ccec9ac33118c8a96f86cc8793d13d0ae4566fb0a9d3531b67df86b91b07077d03b WHIRLPOOL f5be70a34a41bda398e89cbf3b009d2c30bd0318b740c29cd3d7a803efe3772bcc975ad8b7ce2614d8213e40eb2e3f6aaebedf66026a1792a4b860c743898109
 DIST fakefs-0.9.2.tar.gz 42792 SHA256 ee101189b93b96ef6980d10e6320294641488691e4ab9b6057169f3fd1fc43fa SHA512 ba68f9d240d54379ba8b16dcb3e375b586c50f78a081a916151d21af2d6d8b61471fdc842ad91d1390e8dcf54b0744e95ba4794a5ebc915858886ec47f9dbb8a WHIRLPOOL 60362f90e57abee6bfa6b8ecc833b6ff62558b7b14efe8f0c084b244e961511c839446f1f16bc7b1c1361c8cdc5031993083cac4a9aab6ed081f8fea5e6275be
 DIST fakefs-0.9.3.tar.gz 43920 SHA256 e08987f90f800a686a911ea1c93eb56054b1722fb2a9d21e9a5351134c881743 SHA512 d1973f599d8721aeabc65c45e9de0342cba94fb095379234fc7fc80be8459a98aa7c491e9bd112b036df77fdbdf3069d0ac2d1132a9592a9a776cac7881ef4c0 WHIRLPOOL 50aceb78ba99136e7b2a5524910b034d3a8daada1353ae9309ed47d9e29ac6700b71e4a4800697fbc89c140e1303580474c3f2bebac24f472895006789a0d1e3
 EBUILD fakefs-0.10.0.ebuild 1067 SHA256 0bcf0dc773326a5780207642e63c050a6c0b06a410f32c0707d5934b24425e77 SHA512 f878f0f2359bb66edec263a4fa5a370997da64c07015f12a7c191c953ebbf358a4c9cd8d23bd3d61fe8048e01c9ff209f8e703265a307535491db99fc199268b WHIRLPOOL 2fbe161c8c5c268a19125b45652c64a6b732726ce02570886238012747c9031f199d3940f07b916b522e4303474b90e160d67a6fc957b8e28f2e9d1ce98f0640
+EBUILD fakefs-0.10.1.ebuild 1067 SHA256 0bcf0dc773326a5780207642e63c050a6c0b06a410f32c0707d5934b24425e77 SHA512 f878f0f2359bb66edec263a4fa5a370997da64c07015f12a7c191c953ebbf358a4c9cd8d23bd3d61fe8048e01c9ff209f8e703265a307535491db99fc199268b WHIRLPOOL 2fbe161c8c5c268a19125b45652c64a6b732726ce02570886238012747c9031f199d3940f07b916b522e4303474b90e160d67a6fc957b8e28f2e9d1ce98f0640
 EBUILD fakefs-0.6.0-r1.ebuild 817 SHA256 ce81340ed357f8696dec24c95e7a7157209d35a7c298ee4df0d00d729badbd2d SHA512 2ea2d30a0700d0eaaf44ca5a0c62247c4e225bd3f9d9d20c2a457b8913dffbf910a2db9b194ad7304b4849df933a58ee87177501e8702f0a300ad0c300e7a713 WHIRLPOOL 8818eb25e187aabe866905797df750f302e862dc3b4b6d9256a7aa0e166165777311f767098a76155b70acd0bd9b09873080ccf34cc38bb75703e7f431732f73
-EBUILD fakefs-0.8.1.ebuild 1077 SHA256 22967638c33ba9e78cdc02872fb403260fd12ca5caa02eebeac988ab606a5170 SHA512 45c5d48be15dfdf74e88fa37b1ec260a0b5655d7410884fedce332ba67456d73706eb34ae4ca4e177b6975d6e17f1103fa44629eac41a4e566d787b787195369 WHIRLPOOL 66064036eeea654eabedc3494ffecb6c8f3e2cef72b7b4321261fe08dc57cdce490bce477166a37fcdddb752200f3172b4cdf15bdea97d305d06f1cbcccd88d7
-EBUILD fakefs-0.9.0.ebuild 1077 SHA256 22967638c33ba9e78cdc02872fb403260fd12ca5caa02eebeac988ab606a5170 SHA512 45c5d48be15dfdf74e88fa37b1ec260a0b5655d7410884fedce332ba67456d73706eb34ae4ca4e177b6975d6e17f1103fa44629eac41a4e566d787b787195369 WHIRLPOOL 66064036eeea654eabedc3494ffecb6c8f3e2cef72b7b4321261fe08dc57cdce490bce477166a37fcdddb752200f3172b4cdf15bdea97d305d06f1cbcccd88d7
 EBUILD fakefs-0.9.2.ebuild 1071 SHA256 257f7026eb7c7d93410826c71a9b97f0d2ed6522cdd3615145acf6d1a3a7c706 SHA512 ce3790d0cd083d2cbae5d91fd5de74c5c77c9971fe0e76292c21891b57ed57fcc35b5996f359e172edf645cf62f494276326f315b68dae594a9be7c7a875345a WHIRLPOOL a09584ad7a834326f3025a0209010662c9712630f14be84012d0950c9e8a669839d9f256b3f7f7b28a621bd194baf3c7e3b1ed338a8721337e7a38eba749b15d
 EBUILD fakefs-0.9.3.ebuild 1062 SHA256 31fe8ce59ec463223b51236bf78e41a746edf698abcbc988f074bc250a46ab88 SHA512 ce0ad8c7b766187a9b75cb7ced87a45cdcc9fd2c8523a2d7f2968602401df5c31547b636f1c61a05d2224b15820829a87ef6a94a57ebafdcdeda00de4de6b339 WHIRLPOOL 264c24e170c8bda89fc859986df2f44b3234e69beea1e3f2ee1096b471da1b76722426b0cee8ebd5b39fa4665609a740fe59bf5e47e9801889f9d85b5be2b10c
 MISC ChangeLog 4503 SHA256 07c95013ba7a19f9e8dc028379f7d623c397dc13de5f590aeafca9f543e3cd8e SHA512 4759223b8c6a5a8d5320c46db20eebe6fbc6902d84aed9f2d0c430bd88719cded8069357bef77cd15c7fa9eda47875b482abc96d3a1d33b16e423ddbf3342bb4 WHIRLPOOL fe1ef1814e7d0127334e8aca4209d37a5a73c2df6346b445319cdc01546709b617df82dd2566f82c5055390981e582e11e1c19884dea3a7f402c9b5e65f508f0
diff --git a/dev-ruby/fakefs/fakefs-0.8.1.ebuild b/dev-ruby/fakefs/fakefs-0.10.1.ebuild
similarity index 78%
rename from dev-ruby/fakefs/fakefs-0.8.1.ebuild
rename to dev-ruby/fakefs/fakefs-0.10.1.ebuild
index 8421e36a40c7..690298824709 100644
--- a/dev-ruby/fakefs/fakefs-0.8.1.ebuild
+++ b/dev-ruby/fakefs/fakefs-0.10.1.ebuild
@@ -4,12 +4,12 @@
 
 EAPI=5
 
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CONTRIBUTORS README.markdown"
+RUBY_FAKEGEM_EXTRADOC="CONTRIBUTORS README.md"
 
 inherit ruby-fakegem eutils
 
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/defunkt/fakefs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/fakefs/fakefs-0.9.0.ebuild b/dev-ruby/fakefs/fakefs-0.9.0.ebuild
deleted file mode 100644
index 8421e36a40c7..000000000000
--- a/dev-ruby/fakefs/fakefs-0.9.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CONTRIBUTORS README.markdown"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="A fake filesystem. Use it in your tests"
-HOMEPAGE="https://github.com/defunkt/fakefs"
-SRC_URI="https://github.com/defunkt/fakefs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/rspec-3.1:3
-		>=dev-ruby/minitest-5.5
-	)"
-
-all_ruby_prepare() {
-	# Remove bundler
-	rm Gemfile || die
-
-	# Avoid unneeded minitest-rg dependency.
-	sed -i -e '1igem "minitest", "~>5.5"' \
-		-e '/minitest\/rg/ s:^:#:' test/test_helper.rb || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	${RUBY} -Ilib:.:test -e 'Dir["test/**/*_test.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/httpclient/Manifest b/dev-ruby/httpclient/Manifest
index 820016ba03a6..3b5c38547c62 100644
--- a/dev-ruby/httpclient/Manifest
+++ b/dev-ruby/httpclient/Manifest
@@ -1,11 +1,9 @@
 DIST httpclient-2.7.1.tgz 457036 SHA256 d176c5177745d60434a05c3d85497f9a56c725aa6f9ee98ac14349f9ffe05cfc SHA512 960770fe351a82e4008ca706bc0f1c7ba255b67dcbcc2984b1f76b78bdb9236b799dbd81c98d706a6a3755677b8d11fe7d7dd5b3af6afaaf901d70d999a09ea2 WHIRLPOOL d6c70683f702c2b749d56ff011beb24e8b4d77acab6f587986e44ecd6a3c6ac73059b4080715b97b750d773c1c13bf4abcb91a0748087e233b0509b2592daa1d
-DIST httpclient-2.8.1.tgz 458466 SHA256 a3852b8ecea14abc28c61fef734a473f7c7866c9d6853723165f91e69f9eb24b SHA512 3c90d741563047f5664d375b7228c94a7c6872b063feb01ae5820bb8e8794c92e59e660e239e9ea03a5fbee355771da13b8f1d8028f252e2d15424421a7e1230 WHIRLPOOL 92d74577d11b886aab52376d54cb94b058c26b354e551b738cc9cca5e8564ebe4af29d00227c52501faf26d3772af66d12323256830c49a84b492731a49893c0
-DIST httpclient-2.8.2.2.tgz 460627 SHA256 4f2c3ae4db46737ad1ec09d1e0e5e8e70011a5ec9825352f1b3bbd01335b80ba SHA512 606b88934528a43b004c21a6f62ad3f3412b01f50c8e8e2cac634903ff5a248b95d1b2f29f3e7203b320836e4acbd2b7c115fd729af0faa0320ff96090089352 WHIRLPOOL 1d310f7b09cf203248137dd75693050ae02880aa5f0772089568fe488c7cbbed52b473e07aff3ff2387ce6019768c045722c93f6c8830f97136dfcc3b708f01c
 DIST httpclient-2.8.2.4.tgz 462907 SHA256 82c4a08d35f905a3031cdbdaaf838303cd90aaec7edfa12247c0f649c0dba397 SHA512 c225f302e6bd1f08fc089c202d4d870999ae9ef4bf1df416fb7f06b1732f50b9a7c69a5b73f1ee2f963665d5d436c243830555f8d42c60ac536abbae72b693a5 WHIRLPOOL 732c1c2ad18d47e0c424fc5922ab919f98e0df2e1f369ca43b212334f64944428caaafdaaee9b4f6e6952833282268d818f61211158579407074538faf7415cf
+DIST httpclient-2.8.3.tgz 464624 SHA256 647f054736dbe5357eeb722e837b6e30d7ed60939302145cd6099eca3ab8810b SHA512 b65b5adb97af069d7ff6b6f4cccd6a42c6d9c88b797e9495768fe1f36a6bd93defe50190edc201de5e39c4e306ba0bd17a8ff2f8eba4d636dacafa06c172967d WHIRLPOOL 63a290d7cca6389eb3d947aa4245b8c88c53020c2afd6695fcdf74e0e4119986f235a3c02c19855772f7cf2dd977329e54cf062a6640b51eb01bf5fc5a3fea48
 EBUILD httpclient-2.7.1.ebuild 1749 SHA256 c57c700ebcfa6ea4dfcbe60c1043e3b60125da82c22ed0f2cae765426d25b006 SHA512 47eca03380fd37db31290134f867c123f9ba2a0eab7259e7dfca06401df0fa054880ff06788b891d4e2c8d95009bc0ae6591bbe20852928badfae40f55cb3892 WHIRLPOOL 90952a69c24ae7089cf74be633072824cbf9d8429b6f32be2ca63eb4c531ed651b324ba8456fe2e10979ee956724cda4793f68a542a04320cba5dd676ed71ace
-EBUILD httpclient-2.8.1.ebuild 1759 SHA256 350d3d161e592b1877eecdfd53a7048252d707cf618e0c77a686f3e99ed10f67 SHA512 5d83eb29e28f0ed7309066197b6d554492521e14343bf1fe4f51b2fa118522c0ddf8c595e31652a45b41f7439b168ba7505dc53c941fce7d9713c4a2e8ae566f WHIRLPOOL 47047cb30bbc12d790baebfa765a1e2d76ba952990b698fcb4334096e3d285c2d6233bae116a0a7689df1791aa73936f8307524486ef43b86804d6143d52b91d
-EBUILD httpclient-2.8.2.2.ebuild 1759 SHA256 350d3d161e592b1877eecdfd53a7048252d707cf618e0c77a686f3e99ed10f67 SHA512 5d83eb29e28f0ed7309066197b6d554492521e14343bf1fe4f51b2fa118522c0ddf8c595e31652a45b41f7439b168ba7505dc53c941fce7d9713c4a2e8ae566f WHIRLPOOL 47047cb30bbc12d790baebfa765a1e2d76ba952990b698fcb4334096e3d285c2d6233bae116a0a7689df1791aa73936f8307524486ef43b86804d6143d52b91d
 EBUILD httpclient-2.8.2.4.ebuild 1766 SHA256 5fe59af8d940f6fde704778949d5b06a32368c4a36fdd6da56f3ad8adeb0014a SHA512 55d0f3b9f7441d73fd3142861ea5ff026c0656c67bf2b34b11b46a20bb0ce6397c2ea67cc6f4f3741742bae51c63267d758b0f14899a0011e717c808f9eb3d19 WHIRLPOOL 88fc9a1ef7942d281bc334e2534fc8c37d4b00ec34060aeedc1b069f32c53660b880e3cb5472c3e3e09bd0d0c126b2a7c639f32158502fa3ae0a31390118f5db
+EBUILD httpclient-2.8.3.ebuild 1766 SHA256 5fe59af8d940f6fde704778949d5b06a32368c4a36fdd6da56f3ad8adeb0014a SHA512 55d0f3b9f7441d73fd3142861ea5ff026c0656c67bf2b34b11b46a20bb0ce6397c2ea67cc6f4f3741742bae51c63267d758b0f14899a0011e717c808f9eb3d19 WHIRLPOOL 88fc9a1ef7942d281bc334e2534fc8c37d4b00ec34060aeedc1b069f32c53660b880e3cb5472c3e3e09bd0d0c126b2a7c639f32158502fa3ae0a31390118f5db
 MISC ChangeLog 6167 SHA256 59f06e8cfd962c902a6d222f386a43ba373ee7e3a69dc27c894d21cd75d2c5ba SHA512 8ae025a70b2c1ee8f40e6864d6afdf9f754491913bb50063d2d7c2aa259220aa21a80fe9db51e75c28c9e8f6cde31b8388aaed4c4edd979abc5201acd44e5ad5 WHIRLPOOL c4afe93a9591d78a103d335e90f1d865cfad6859587a0051e35dd020de01aed4ced239ccfbed3b8113ad40ecb72a0d7245998ddf207b2e446a34d8ddbb00ca37
 MISC ChangeLog-2015 9318 SHA256 8f561f41a84bbf8d8f1d12cb42d78b236fa74f6a90f97c37fd33a0e18c88ee61 SHA512 bcd5833884089f7c22efffcb2a1e945134795106a89a7f1ed99ea1c7420de75c124ae0278ca934a5a033b2685cef261331cc5ccadf475a1e788cc2e6e7c34b8e WHIRLPOOL ba89fce112fdd30e0365fa4c353d6f4dff34b052f374d135b8f32d6accbe744abbe9b0347d2162a84902318ae076fb63897b58d6c079592173c261f380f1f19a
 MISC metadata.xml 341 SHA256 c8ef8fc9dbc84ee9501fea85eb115d7156480efbb1861c268aae763246e06746 SHA512 04d6c137c27403e7512feab47cd105f6cef456af315ec05b5204022eb9a8b7eda358f3ef4a19ff457770b3898c6395055880f5a162477f15d0948b148c902288 WHIRLPOOL c7c6e542edcf562d3c239c213bc87d9677368b154862acd2856693ab93ff6a37edc106e17598c26c42400b1013e16dea3fbb1a22908554f61db5667518b956c6
diff --git a/dev-ruby/httpclient/httpclient-2.8.2.2.ebuild b/dev-ruby/httpclient/httpclient-2.8.2.2.ebuild
deleted file mode 100644
index 51d6422578df..000000000000
--- a/dev-ruby/httpclient/httpclient-2.8.2.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_TEST="-Ilib test"
-RUBY_FAKEGEM_TASK_DOC="doc"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="httpclient.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="'httpclient' gives something like the functionality of libwww-perl (LWP) in Ruby"
-HOMEPAGE="https://github.com/nahi/httpclient"
-SRC_URI="https://github.com/nahi/httpclient/archive/v${PV}.tar.gz -> ${P}.tgz"
-
-LICENSE="Ruby"
-SLOT="0"
-
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="${RDEPEND}
-	!dev-ruby/http-access2"
-
-ruby_add_rdepend "virtual/ruby-ssl"
-
-ruby_add_bdepend "doc? ( dev-ruby/rdoc )"
-ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/http-cookie )"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '/[bB]undler/s:^:#:' Rakefile || die
-
-	# Fix documentation task
-	sed -i -e 's/README.txt/README.md/' Rakefile || die
-
-	# Remove mandatory CI reports since we don't need this for testing.
-	sed -i -e '/reporter/s:^:#:' Rakefile || die
-
-	# Remove mandatory simplecov dependency
-	sed -i -e '/[Ss]imple[Cc]ov/ s:^:#:' test/helper.rb || die
-
-	# Comment out test requiring network access that makes assumptions
-	# about the environment, bug 395155
-	sed -i -e '/test_async_error/,/^  end/ s:^:#:' test/test_httpclient.rb || die
-
-	# Skip tests using rack-ntlm which is not packaged. Weirdly these
-	# only fail on jruby.
-	rm test/test_auth.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'gem "test-unit"; Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/httpclient/httpclient-2.8.1.ebuild b/dev-ruby/httpclient/httpclient-2.8.3.ebuild
similarity index 92%
rename from dev-ruby/httpclient/httpclient-2.8.1.ebuild
rename to dev-ruby/httpclient/httpclient-2.8.3.ebuild
index 51d6422578df..940c845d1fd1 100644
--- a/dev-ruby/httpclient/httpclient-2.8.1.ebuild
+++ b/dev-ruby/httpclient/httpclient-2.8.3.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://github.com/nahi/httpclient/archive/v${PV}.tar.gz -> ${P}.tgz"
 LICENSE="Ruby"
 SLOT="0"
 
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="${RDEPEND}
diff --git a/dev-ruby/typhoeus/Manifest b/dev-ruby/typhoeus/Manifest
index a6f36abf9b14..38cb81860146 100644
--- a/dev-ruby/typhoeus/Manifest
+++ b/dev-ruby/typhoeus/Manifest
@@ -1,11 +1,9 @@
 DIST typhoeus-0.6.9.gem 49152 SHA256 5979555fd430ebec72ab1f5630e8f7679979fb21984d8d9dfe3008d4f91794c8 SHA512 5063d3217f35db29d216327b6eed10d6613d018c496935e78aa8e2b10ec21f3372df11fe48155b45387767d5572efa93e74afb0bb9b10782d28e87dead0294a4 WHIRLPOOL a20d25696804d2d444fa6df145360056dd6170ace42a8cab0a84aa425ae7306173331db8ace402f4a1c596925ee8d52702bc91c967f943361a2a852170b03917
-DIST typhoeus-1.0.1.gem 52224 SHA256 a9bee66ddb7ba039690baf4a5b26ba2bac09ec534dc1c923791b23f3fc9baabc SHA512 805aced5843a1a0d62691ddec78be1cb7f8dbc8d5ca630b8448f925eb379d52b6de53e460ccb24af29d834ef2a9f13690efaceb4709b11ffb4e67aac4da26863 WHIRLPOOL 6c161679a4fced598f9312b811575be97a4dd9c50e7e628d0973ec06fe56c045e238be0e1f620e127ab1a303afb70e46bf2d1fbbc0a29f9ab06d42eeb8c7bfb4
-DIST typhoeus-1.0.2.gem 52736 SHA256 88903b95e42285aee59dcd8a32501afde90e5785aeb2bf883300e1bd9955be78 SHA512 0624154c9456f8b1587629f8ad1cfc75a60cf896d7272eecf653ffb35f6769979ac751bc65636d67d3a6339f5a6320398b8ee78ac979f9ba2cbd2d6e44988c0a WHIRLPOOL 2ab10f90e46565ebc59a9c1b20167f53a2ab7b8e330fcb1a18912cf9a5922bb1db7c290a8c272ec3c03e021f239a2c0578329344cea7f7b68e6dc3593c5761e6
 DIST typhoeus-1.1.0.gem 53248 SHA256 7cd206c6e446c5f3f17da7962a3dc656058e254ead7af907da817e7ddaa4bba9 SHA512 5bf65faa69d981e998455e5a82578255bbad9e3f02c26a1d998a91dffb4ba904710869396f9f10c6df8d4d26bd4618e2d3f6aed5069bb1f850bbe558e4609aa1 WHIRLPOOL 8cb9fb900416c381bc72ab6f610c9e74ccd459be6cd1f053d71136b888b4be56693b20b3f0123839688aa7a4c39c16b2a057cdc0912c53c8a6dea22526b83e14
+DIST typhoeus-1.1.2.gem 54784 SHA256 80f41502bef74e19f6e251a96c4a9511b45e88018cbb1639f92edf731c1d866d SHA512 1fc1ab1c2c15f1d324858a19f137b8b39a26d3b4938b7b09c7ea88e99bc1c08afb060710464221ff3af327322bc8354ed3486069420d189ba5cab91c76abfdea WHIRLPOOL ee7cf4a4248c9bf3063f308fc98fb6689b0b1680702c298f6ad51dd7578c1100ac8a86bb30a62a19654996bd0f9a10ea518f0353a30c82690e9689039912860a
 EBUILD typhoeus-0.6.9.ebuild 705 SHA256 b4e1427887e12ce48616ce7ae61fc8022b8b5149abb32d60cd7a254ec020479c SHA512 2c9affed43351973975cc009b4a56367ec23d650d32262e2e8a28a5f9d03e211d4a4c0e64882d8805449306a8c6dfbbc884d7c928114c894a2b60170931e9de9 WHIRLPOOL 9b57077696e407d5913ee172421df3674c2eb0d9a03dfd0b2431797bc7940cd9afba4d04a653da53980b6f47bafe06213d62234063419192d2bba05e0379db03
-EBUILD typhoeus-1.0.1.ebuild 706 SHA256 60f8f34614d897e147922b89e4ac31b8dc4489b3a581413df011c97eb4f77d5e SHA512 21ac291ef0115308c4475dcc019d86417eaf8f42e98aac16df3e3ccd3cf0795f4b19d71ffb09bfac038910c61fde1a207b887329259264998c7f77f3aed83536 WHIRLPOOL fc3f6184d9cbbb5b8ab35d44168bf3b20772d95ee7d7e6228de5e6503e60f71d7c2d8af55a8c9405ebc099c390114ac56b2c6b6694c51140a7d3a6ab3eeb4f14
-EBUILD typhoeus-1.0.2.ebuild 706 SHA256 124d500f394131a32cc8b7ad050ca18ea7066f5b2f29c3e852f8e89b2c024b56 SHA512 7632ee2596aa3ad55ef52cd67e0c3d7e16a2913ab5cf7538a3b68169db5613fd76b3c4cbbaee502f27905032138cc40fa8cce3ac94ffcd8e6c9ad55d9514d979 WHIRLPOOL 7a9ff5dcdfff13758176b047b76f78fbddc2e22e5b7029a7dbeb1cf35c29961a5c0254ae898c529f1368e5eeaf8cc3d55bb3eca1e4fca48dbeb6815ea6ec534a
 EBUILD typhoeus-1.1.0.ebuild 706 SHA256 124d500f394131a32cc8b7ad050ca18ea7066f5b2f29c3e852f8e89b2c024b56 SHA512 7632ee2596aa3ad55ef52cd67e0c3d7e16a2913ab5cf7538a3b68169db5613fd76b3c4cbbaee502f27905032138cc40fa8cce3ac94ffcd8e6c9ad55d9514d979 WHIRLPOOL 7a9ff5dcdfff13758176b047b76f78fbddc2e22e5b7029a7dbeb1cf35c29961a5c0254ae898c529f1368e5eeaf8cc3d55bb3eca1e4fca48dbeb6815ea6ec534a
+EBUILD typhoeus-1.1.2.ebuild 736 SHA256 af306fd72604cd0ffc6a3a3b2fc59e8349602f2bfd8bc6c974490ec597d54ec4 SHA512 c8d6c3d09f244621e062428f5a77fc1ec4f8c9e839e69b609f34c6e937f9f4681ed41b11b48ea2d1a4136303fb4c76b2dd7ab335c08b60ad1345c10f50db8d0b WHIRLPOOL 8e1370aebd4aeef31e1bd6126764bf68bc2f4e925aa68e45aa0105dda6f6406bb9bb92c036d896be982d9c4b78ddb0bc25c40c0d4cb0298ac4512b0f211a212f
 MISC ChangeLog 4496 SHA256 4b74ecc2a76003b14e8720634cbb43cac6647ef02547d1726c6947282860341f SHA512 5d86d040c3b84428cd1857e6614d97bf26c8a27011e02fd1efcc6f25204005538f835e772c9acb591ef44f660517a90e26375603e2ada7f6d265a6601b20b06d WHIRLPOOL 9634f3ac311dd45de4c49c01d8e860706210a0d2b24455c40160c94888184be5c66427eae4193578e384feb51617d9ffb5c37ae6bd6361263cd88f2a08ed95be
 MISC ChangeLog-2015 627 SHA256 cbeaf3f70123a1f9ad77527acf5eef6a60b3eeb7cff59af3e39f7af2caa4e183 SHA512 5ed4bcedfffbf64ba18dce76e4f95589b8aa8547d79d91881bfdbaeb601830199411e2627e5b35c397873cabc2653312654798d52f6ee5f131a9c8306709af95 WHIRLPOOL 938cdfe92cfb3c2d0ac2bf2b2f1882c293f09b52208fc2f102eee1b1a5eb4699a3238531987beee65361ee074a2045792ba5445d69267a05dbd9a29ee4e18c28
 MISC metadata.xml 326 SHA256 9ce20cdb2de2ea8f953461b24d2eb272e151def774350e25330f48ba40f08acd SHA512 4af1cba66ffeb556cc3198494b99fa41b10dc9171ab2b7eeab8e6f786141c95a2da60901b4f033e7113630cb0a6a64bfa628f048ddf3f922fa803866556e0678 WHIRLPOOL 4f58cbcf85324baec10c8f07e531ab589640a58120ea16ba49700c97b234faf8399555e705cd98284edb5f0e0b28528214e7bef8bb75d5b4abfd73a28c63576e
diff --git a/dev-ruby/typhoeus/typhoeus-1.0.1.ebuild b/dev-ruby/typhoeus/typhoeus-1.0.1.ebuild
deleted file mode 100644
index 112a41923a26..000000000000
--- a/dev-ruby/typhoeus/typhoeus-1.0.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md UPGRADE.md"
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Runs HTTP requests in parallel while cleanly encapsulating handling logic"
-HOMEPAGE="http://rubygems.org/gems/typhoeus/"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/ethon-0.8.0"
-
-ruby_add_bdepend "test? ( dev-ruby/json >=dev-ruby/faraday-0.9 >=dev-ruby/sinatra-1.3 )"
-
-all_ruby_prepare() {
-	sed -e '/bundler/I s:^:#:' -i Rakefile spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/typhoeus/typhoeus-1.0.2.ebuild b/dev-ruby/typhoeus/typhoeus-1.1.2.ebuild
similarity index 81%
rename from dev-ruby/typhoeus/typhoeus-1.0.2.ebuild
rename to dev-ruby/typhoeus/typhoeus-1.1.2.ebuild
index 95f5ea0e62a0..2d15ab403375 100644
--- a/dev-ruby/typhoeus/typhoeus-1.0.2.ebuild
+++ b/dev-ruby/typhoeus/typhoeus-1.1.2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md UPGRADE.md"
 RUBY_FAKEGEM_TASK_DOC=""
@@ -14,7 +14,7 @@ RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 inherit ruby-fakegem
 
 DESCRIPTION="Runs HTTP requests in parallel while cleanly encapsulating handling logic"
-HOMEPAGE="http://rubygems.org/gems/typhoeus/"
+HOMEPAGE="https://github.com/typhoeus/typhoeus"
 
 LICENSE="Ruby"
 SLOT="0"
@@ -23,7 +23,7 @@ IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/ethon-0.9.0"
 
-ruby_add_bdepend "test? ( dev-ruby/json >=dev-ruby/faraday-0.9 >=dev-ruby/sinatra-1.3 )"
+ruby_add_bdepend "test? ( dev-ruby/json >=dev-ruby/faraday-0.9 >=dev-ruby/sinatra-1.3 >=dev-ruby/redis-3.0 )"
 
 all_ruby_prepare() {
 	sed -e '/bundler/I s:^:#:' -i Rakefile spec/spec_helper.rb || die
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 10220a48e8c8..eb89fad6ee6b 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 13 Dec 2016 05:13:22 +0000
+Tue, 13 Dec 2016 08:13:23 +0000
diff --git a/metadata/glsa/glsa-201612-32.xml b/metadata/glsa/glsa-201612-32.xml
new file mode 100644
index 000000000000..1d75ea1e19d8
--- /dev/null
+++ b/metadata/glsa/glsa-201612-32.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201612-32">
+  <title>elfutils: Heap-based buffer overflow</title>
+  <synopsis>A heap-based buffer overflow vulnerability in elfutils might allow
+    remote attackers to execute arbitrary code. 
+  </synopsis>
+  <product type="ebuild">elfutils</product>
+  <announced>December 13, 2016</announced>
+  <revised>December 13, 2016: 2</revised>
+  <bug>507246</bug>
+  <access>remote</access>
+  <affected>
+    <package name="dev-libs/elfutils" auto="yes" arch="*">
+      <unaffected range="ge">0.159</unaffected>
+      <vulnerable range="lt">0.159</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Elfutils provides a library and utilities to access, modify and analyse
+      ELF objects.
+    </p>
+  </background>
+  <description>
+    <p>An integer overflow, in the check_section function of dwarf_begin_elf.c,
+      in the libdw library can lead to a heap-based buffer overflow.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker could entice a user to open a specially crafted file,
+      possibly resulting in the execution of arbitrary code with the privileges
+      of the process or a Denial of Service condition.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All elfutils users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=dev-libs/elfutils-0.159"
+    </code>
+  </resolution>
+  <references>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-0172">CVE-2014-0172</uri>
+  </references>
+  <metadata tag="requester" timestamp="Tue, 22 Nov 2016 14:55:36 +0000">whissi</metadata>
+  <metadata tag="submitter" timestamp="Tue, 13 Dec 2016 06:58:39 +0000">whissi</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-201612-33.xml b/metadata/glsa/glsa-201612-33.xml
new file mode 100644
index 000000000000..f6bece071bb7
--- /dev/null
+++ b/metadata/glsa/glsa-201612-33.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201612-33">
+  <title>GPL Ghostscript: User-assisted execution of arbitrary code</title>
+  <synopsis>An integer overflow in GPL Ghostscript may allow remote attackers
+    to execute arbitrary code.
+  </synopsis>
+  <product type="ebuild">ghostscript-gpl</product>
+  <announced>December 13, 2016</announced>
+  <revised>December 13, 2016: 2</revised>
+  <bug>556316</bug>
+  <access>remote</access>
+  <affected>
+    <package name="app-text/ghostscript-gpl" auto="yes" arch="*">
+      <unaffected range="ge">9.09</unaffected>
+      <vulnerable range="lt">9.09</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Ghostscript is an interpreter for the PostScript language and for PDF.</p>
+  </background>
+  <description>
+    <p>An integer overflow flaw was discovered that leads to an out-of-bounds
+      read and write in gs_ttf.ps.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker could entice a user to open a specially crafted file,
+      possibly resulting in the execution of arbitrary code with the privileges
+      of the process or a Denial of Service condition.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All GPL Ghostscript users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=app-text/ghostscript-gpl-9.09"
+    </code>
+  </resolution>
+  <references>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-3228">CVE-2015-3228</uri>
+  </references>
+  <metadata tag="requester" timestamp="Tue, 22 Nov 2016 15:13:30 +0000">whissi</metadata>
+  <metadata tag="submitter" timestamp="Tue, 13 Dec 2016 06:58:50 +0000">whissi</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-201612-34.xml b/metadata/glsa/glsa-201612-34.xml
new file mode 100644
index 000000000000..20b5a3cecbc9
--- /dev/null
+++ b/metadata/glsa/glsa-201612-34.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201612-34">
+  <title>systemd: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in systemd, the worst of
+    which may allow execution of arbitrary code.
+  </synopsis>
+  <product type="ebuild">systemd</product>
+  <announced>December 13, 2016</announced>
+  <revised>December 13, 2016: 2</revised>
+  <bug>486904</bug>
+  <access>local, remote</access>
+  <affected>
+    <package name="sys-apps/systemd" auto="yes" arch="*">
+      <unaffected range="ge">208</unaffected>
+      <vulnerable range="lt">208</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>A system and service manager.</p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in systemd. Please review
+      the CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>An attacker could possibly execute arbitrary code with the privileges of
+      the process, cause a Denial of Service condition, or gain escalated
+      privileges.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All systemd users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=sys-apps/systemd-208"
+    </code>
+  </resolution>
+  <references>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2013-4391">CVE-2013-4391</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2013-4393">CVE-2013-4393</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2013-4394">CVE-2013-4394</uri>
+  </references>
+  <metadata tag="requester" timestamp="Wed, 23 Nov 2016 20:50:18 +0000">whissi</metadata>
+  <metadata tag="submitter" timestamp="Tue, 13 Dec 2016 06:59:01 +0000">whissi</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-201612-35.xml b/metadata/glsa/glsa-201612-35.xml
new file mode 100644
index 000000000000..adb930ee5736
--- /dev/null
+++ b/metadata/glsa/glsa-201612-35.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201612-35">
+  <title>XStream: Remote execution of arbitrary code</title>
+  <synopsis>A vulnerability in XStream may allow remote attackers to execute
+    arbitrary code.
+  </synopsis>
+  <product type="ebuild">xstream</product>
+  <announced>December 13, 2016</announced>
+  <revised>December 13, 2016: 2</revised>
+  <bug>497652</bug>
+  <access>remote</access>
+  <affected>
+    <package name="dev-java/xstream" auto="yes" arch="*">
+      <unaffected range="ge">1.4.8-r1</unaffected>
+      <vulnerable range="lt">1.4.8-r1</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>XStream is a simple library to serialize objects to XML and back again.</p>
+  </background>
+  <description>
+    <p>It was found that XStream would deserialize arbitrary user-supplied XML
+      content, thus representing objects of any type.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker could pass a specially crafted XML document to
+      XStream, possibly resulting in the execution of arbitrary code with the
+      privileges of the process or a Denial of Service condition.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All XStream users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=dev-java/xstream-1.4.8-r1"
+    </code>
+  </resolution>
+  <references>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2013-7285">CVE-2013-7285</uri>
+  </references>
+  <metadata tag="requester" timestamp="Tue, 29 Nov 2016 21:29:45 +0000">whissi</metadata>
+  <metadata tag="submitter" timestamp="Tue, 13 Dec 2016 06:59:12 +0000">whissi</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-201612-36.xml b/metadata/glsa/glsa-201612-36.xml
new file mode 100644
index 000000000000..d6f4b40b3474
--- /dev/null
+++ b/metadata/glsa/glsa-201612-36.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201612-36">
+  <title>TigerVNC: Integer overflow</title>
+  <synopsis>An integer overflow in TigerVNC might allow remote attackers to
+    execute
+    arbitrary code.
+  </synopsis>
+  <product type="ebuild">tigervnc</product>
+  <announced>December 13, 2016</announced>
+  <revised>December 13, 2016: 2</revised>
+  <bug>534714</bug>
+  <access>remote</access>
+  <affected>
+    <package name="net-misc/tigervnc" auto="yes" arch="*">
+      <unaffected range="ge">1.4.2</unaffected>
+      <vulnerable range="lt">1.4.2</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>TigerVNC is a high-performance VNC server/client.</p>
+  </background>
+  <description>
+    <p>TigerVNC is impacted by the same vulnerability as found in
+      CVE-2014-6051. An integer overflow, leading to a heap-based buffer
+      overflow, was found in the way screen sizes were handled.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker, utilizing a malicious VNC server, could execute
+      arbitrary code with the privileges of the user running the client, or
+      cause a Denial of Service condition.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All TigerVNC users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=net-misc/tigervnc-1.4.2"
+    </code>
+  </resolution>
+  <references>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-6051">CVE-2014-6051</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-8240">CVE-2014-8240</uri>
+  </references>
+  <metadata tag="requester" timestamp="Tue, 29 Nov 2016 21:39:43 +0000">whissi</metadata>
+  <metadata tag="submitter" timestamp="Tue, 13 Dec 2016 06:59:26 +0000">whissi</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-201612-37.xml b/metadata/glsa/glsa-201612-37.xml
new file mode 100644
index 000000000000..bb1b9944d5b6
--- /dev/null
+++ b/metadata/glsa/glsa-201612-37.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201612-37">
+  <title>Pixman: Buffer overflow</title>
+  <synopsis>A buffer overflow in Pixman might allow remote attackers to execute
+    arbitrary code.
+  </synopsis>
+  <product type="ebuild">pixman</product>
+  <announced>December 13, 2016</announced>
+  <revised>December 13, 2016: 2</revised>
+  <bug>561526</bug>
+  <access>remote</access>
+  <affected>
+    <package name="x11-libs/pixman" auto="yes" arch="*">
+      <unaffected range="ge">0.32.8</unaffected>
+      <vulnerable range="lt">0.32.8</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Pixman is a pixel manipulation library.</p>
+  </background>
+  <description>
+    <p>In pixman-general, careless computations done with the ‘dest_buffer’
+      pointer may overflow, failing the buffer upper limit check.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker could possibly cause a Denial of Service condition, or
+      execute arbitrary code with the privileges of the process.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Pixman users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=x11-libs/pixman-0.32.8"
+    </code>
+  </resolution>
+  <references>
+    <uri link="http://lists.x.org/archives/xorg-announce/2015-September/002637.html">
+      Pixman 0.32.8 Release Notes
+    </uri>
+  </references>
+  <metadata tag="requester" timestamp="Thu, 25 Feb 2016 08:11:30 +0000">
+    BlueKnight
+  </metadata>
+  <metadata tag="submitter" timestamp="Tue, 13 Dec 2016 06:59:37 +0000">whissi</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-201612-38.xml b/metadata/glsa/glsa-201612-38.xml
new file mode 100644
index 000000000000..e03177a6fd78
--- /dev/null
+++ b/metadata/glsa/glsa-201612-38.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201612-38">
+  <title>Botan: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in Botan, the worst of
+    which allows remote attackers to execute arbitrary code.
+  </synopsis>
+  <product type="ebuild">botan</product>
+  <announced>December 13, 2016</announced>
+  <revised>December 13, 2016: 2</revised>
+  <bug>574034</bug>
+  <access>remote</access>
+  <affected>
+    <package name="dev-libs/botan" auto="yes" arch="*">
+      <unaffected range="ge">1.10.12</unaffected>
+      <vulnerable range="lt">1.10.12</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Botan (Japanese for peony) is a cryptography library written in C++11.</p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in Botan. Please review
+      the CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker could possibly execute arbitrary code with the
+      privileges of the process, or cause a Denial of Service condition.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Botan users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=dev-libs/botan-1.10.12"
+    </code>
+  </resolution>
+  <references>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-2194">CVE-2016-2194</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-2195">CVE-2016-2195</uri>
+  </references>
+  <metadata tag="requester" timestamp="Tue, 29 Nov 2016 22:26:17 +0000">whissi</metadata>
+  <metadata tag="submitter" timestamp="Tue, 13 Dec 2016 06:59:50 +0000">whissi</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-201612-39.xml b/metadata/glsa/glsa-201612-39.xml
new file mode 100644
index 000000000000..73380626dc0f
--- /dev/null
+++ b/metadata/glsa/glsa-201612-39.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201612-39">
+  <title>Bash: Arbitrary code execution</title>
+  <synopsis>A vulnerability in Bash could potentially lead to arbitrary code
+    execution.
+  </synopsis>
+  <product type="ebuild">bash</product>
+  <announced>December 13, 2016</announced>
+  <revised>December 13, 2016: 2</revised>
+  <bug>594496</bug>
+  <access>remote</access>
+  <affected>
+    <package name="app-shells/bash" auto="yes" arch="*">
+      <unaffected range="ge">4.3_p46-r1</unaffected>
+      <vulnerable range="lt">4.3_p46-r1</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Bash is the standard GNU Bourne Again SHell.</p>
+  </background>
+  <description>
+    <p>A vulnerability was found in the way Bash expands $HOSTNAME. Injecting
+      malicious code into $HOSTNAME could cause it to run each time Bash
+      expands \h in the prompt string.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker controlling the system’s hostname (i.e. via DHCP)
+      could possibly execute arbitrary code with the privileges of the process,
+      or cause a Denial of
+      Service condition.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Bash users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=app-shells/bash-4.3_p46-r1"
+    </code>
+  </resolution>
+  <references>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-0634">CVE-2016-0634</uri>
+  </references>
+  <metadata tag="requester" timestamp="Fri, 23 Sep 2016 02:45:43 +0000">
+    BlueKnight
+  </metadata>
+  <metadata tag="submitter" timestamp="Tue, 13 Dec 2016 07:00:09 +0000">whissi</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-201612-40.xml b/metadata/glsa/glsa-201612-40.xml
new file mode 100644
index 000000000000..25f2052b4ec0
--- /dev/null
+++ b/metadata/glsa/glsa-201612-40.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201612-40">
+  <title>SQUASHFS: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in SQUASHFS, the worst of
+    which may allow execution of arbitrary code.
+  </synopsis>
+  <product type="ebuild">squashfs-tools</product>
+  <announced>December 13, 2016</announced>
+  <revised>December 13, 2016: 2</revised>
+  <bug>427356</bug>
+  <access>remote</access>
+  <affected>
+    <package name="squashfs-tools" auto="yes" arch="*">
+      <unaffected range="ge">4.3</unaffected>
+      <vulnerable range="lt">4.3</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Squashfs is a compressed read-only filesystem for Linux. Squashfs is
+      intended for general read-only filesystem use, for archival use (i.e. in
+      cases where a .tar.gz file may be used), and in constrained block
+      device/memory systems (e.g. embedded systems) where low overhead is
+      needed.
+    </p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in SQUASHFS. Please review
+      the CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker could entice a user to open a specially crafted .sqsh
+      file using unsquashfs; possibly resulting in the execution of arbitrary
+      code with the privileges of the process, or a Denial of Service
+      condition.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All squashfs-tools users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=squashfs-tools-4.3"
+    </code>
+  </resolution>
+  <references>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-4024">CVE-2012-4024</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-4025">CVE-2012-4025</uri>
+  </references>
+  <metadata tag="requester" timestamp="Tue, 29 Nov 2016 23:27:04 +0000">whissi</metadata>
+  <metadata tag="submitter" timestamp="Tue, 13 Dec 2016 07:00:20 +0000">whissi</metadata>
+</glsa>
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 10220a48e8c8..eb89fad6ee6b 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 13 Dec 2016 05:13:22 +0000
+Tue, 13 Dec 2016 08:13:23 +0000
diff --git a/metadata/md5-cache/app-emulation/rkt-1.21.0 b/metadata/md5-cache/app-emulation/rkt-1.21.0
new file mode 100644
index 000000000000..750c75ce983a
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/rkt-1.21.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup unpack
+DEPEND=>=dev-lang/go-1.5 app-arch/cpio app-crypt/trousers sys-fs/squashfs-tools dev-perl/Capture-Tiny rkt_stage1_src? ( >=sys-apps/util-linux-2.27 ) rkt_stage1_kvm_qemu? ( sys-apps/attr[static-libs(+)] sys-libs/libcap[static-libs(+)] sys-libs/zlib[static-libs(+)] >=x11-libs/pixman-0.28.0[static-libs(+)] ) !<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 virtual/pkgconfig
+DESCRIPTION=rkt is an App Container runtime for Linux
+EAPI=6
+HOMEPAGE=https://github.com/coreos/rkt
+IUSE=doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_kvm_lkvm rkt_stage1_kvm_qemu rkt_stage1_src +actool systemd
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=!app-emulation/rocket rkt_stage1_host? ( systemd? ( >=sys-apps/systemd-222 app-shells/bash:0 ) )
+REQUIRED_USE=|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm_lkvm rkt_stage1_kvm_qemu rkt_stage1_src ) rkt_stage1_host? ( systemd ) !rkt_stage1_kvm
+RESTRICT=test rkt_stage1_src? ( userpriv )
+SLOT=0
+SRC_URI=https://github.com/coreos/rkt/archive/v1.21.0.tar.gz -> rkt-1.21.0.tar.gz rkt_stage1_coreos? ( http://alpha.release.core-os.net/amd64-usr/1235.0.0/coreos_production_pxe_image.cpio.gz -> rkt-pxe-1235.0.0.img ) rkt_stage1_kvm_lkvm? ( https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/1cd6f516264ad2ad83fad3dc1264d6ff4bcd17b2.tar.gz -> kvmtool-1cd6f516264ad2ad83fad3dc1264d6ff4bcd17b2.tar.gz mirror://kernel/linux/kernel/v4.x/linux-4.8.6.tar.xz http://alpha.release.core-os.net/amd64-usr/1235.0.0/coreos_production_pxe_image.cpio.gz -> rkt-pxe-1235.0.0.img ) rkt_stage1_kvm_qemu? ( http://wiki.qemu-project.org/download/qemu-2.7.0.tar.bz2 mirror://kernel/linux/kernel/v4.x/linux-4.8.6.tar.xz http://alpha.release.core-os.net/amd64-usr/1235.0.0/coreos_production_pxe_image.cpio.gz -> rkt-pxe-1235.0.0.img ) rkt_stage1_src? ( https://github.com/systemd/systemd/archive/v231.tar.gz -> systemd-231.tar.gz )
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87
+_md5_=383398887958725b4d9b705c2f4139c3
diff --git a/metadata/md5-cache/dev-ruby/annoy-0.5.6-r1 b/metadata/md5-cache/dev-ruby/annoy-0.5.6-r1
index c76c8f7ee154..425c92d82b91 100644
--- a/metadata/md5-cache/dev-ruby/annoy-0.5.6-r1
+++ b/metadata/md5-cache/dev-ruby/annoy-0.5.6-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/highline-1.5.0[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? ( 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/highline-1.5.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/highline-1.5.0[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/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_ruby23? ( doc? ( dev-ruby/rdoc[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=Like your annoying friend that asks you questions all the time
 EAPI=5
 HOMEPAGE=http://solutious.com/
-IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/highline-1.5.0[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/highline-1.5.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/highline-1.5.0[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/annoy-0.5.6.gem
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	e7d26f9077ef49f07eaa5d0c7758fe7b	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2dfa7ecd1bd923167f687503e4aca935
+_md5_=9ed7021e991e05110817d4bfb7f84484
diff --git a/metadata/md5-cache/dev-ruby/buftok-0.2.0-r1 b/metadata/md5-cache/dev-ruby/buftok-0.2.0-r1
index 1ade9f047faf..a0fcb5682e77 100644
--- a/metadata/md5-cache/dev-ruby/buftok-0.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/buftok-0.2.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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] ) )
+DEPEND=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? ( 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=Statefully split input data by a specifiable token
 EAPI=5
 HOMEPAGE=https://github.com/sferik/buftok
-IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64
 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/buftok-0.2.0.gem
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	e7d26f9077ef49f07eaa5d0c7758fe7b	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=bdf7084f3a2dd0897ac0501b6cc0c2f6
+_md5_=f3b3d98c31c22c7a2a51b765705dca91
diff --git a/metadata/md5-cache/dev-ruby/fakefs-0.10.1 b/metadata/md5-cache/dev-ruby/fakefs-0.10.1
new file mode 100644
index 000000000000..bd392fd274e9
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/fakefs-0.10.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby20? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby20] >=dev-ruby/minitest-5.5[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby21] >=dev-ruby/minitest-5.5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby22] >=dev-ruby/minitest-5.5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby23] >=dev-ruby/minitest-5.5[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/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_ruby23? ( doc? ( dev-ruby/rdoc[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=A fake filesystem. Use it in your tests
+EAPI=5
+HOMEPAGE=https://github.com/defunkt/fakefs
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~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_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=https://github.com/defunkt/fakefs/archive/v0.10.1.tar.gz -> fakefs-0.10.1.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	e7d26f9077ef49f07eaa5d0c7758fe7b	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=756af2dd26a64e77063210a94a684dc7
diff --git a/metadata/md5-cache/dev-ruby/fakefs-0.8.1 b/metadata/md5-cache/dev-ruby/fakefs-0.8.1
deleted file mode 100644
index 89dbfeedfe41..000000000000
--- a/metadata/md5-cache/dev-ruby/fakefs-0.8.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby20? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby20] >=dev-ruby/minitest-5.5[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby21] >=dev-ruby/minitest-5.5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby22] >=dev-ruby/minitest-5.5[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? ( 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 fake filesystem. Use it in your tests
-EAPI=5
-HOMEPAGE=https://github.com/defunkt/fakefs
-IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~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 )
-SLOT=0
-SRC_URI=https://github.com/defunkt/fakefs/archive/v0.8.1.tar.gz -> fakefs-0.8.1.tar.gz
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	e7d26f9077ef49f07eaa5d0c7758fe7b	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=366e557fc40fe394cfb2a519c0699962
diff --git a/metadata/md5-cache/dev-ruby/fakefs-0.9.0 b/metadata/md5-cache/dev-ruby/fakefs-0.9.0
deleted file mode 100644
index 37400862d3b7..000000000000
--- a/metadata/md5-cache/dev-ruby/fakefs-0.9.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby20? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby20] >=dev-ruby/minitest-5.5[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby21] >=dev-ruby/minitest-5.5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby22] >=dev-ruby/minitest-5.5[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? ( 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 fake filesystem. Use it in your tests
-EAPI=5
-HOMEPAGE=https://github.com/defunkt/fakefs
-IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~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 )
-SLOT=0
-SRC_URI=https://github.com/defunkt/fakefs/archive/v0.9.0.tar.gz -> fakefs-0.9.0.tar.gz
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	e7d26f9077ef49f07eaa5d0c7758fe7b	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=366e557fc40fe394cfb2a519c0699962
diff --git a/metadata/md5-cache/dev-ruby/httpclient-2.8.2.2 b/metadata/md5-cache/dev-ruby/httpclient-2.8.2.2
deleted file mode 100644
index b44e86a0bb1a..000000000000
--- a/metadata/md5-cache/dev-ruby/httpclient-2.8.2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby20? ( virtual/ruby-ssl[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) ) 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_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/test-unit[ruby_targets_ruby20] dev-ruby/http-cookie[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/test-unit[ruby_targets_ruby21] dev-ruby/http-cookie[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit[ruby_targets_ruby22] dev-ruby/http-cookie[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit[ruby_targets_ruby23] dev-ruby/http-cookie[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='httpclient' gives something like the functionality of libwww-perl (LWP) in Ruby
-EAPI=5
-HOMEPAGE=https://github.com/nahi/httpclient
-IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=Ruby
-RDEPEND=!dev-ruby/http-access2 ruby_targets_ruby20? ( virtual/ruby-ssl[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[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=https://github.com/nahi/httpclient/archive/v2.8.2.2.tar.gz -> httpclient-2.8.2.2.tgz
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	e7d26f9077ef49f07eaa5d0c7758fe7b	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=72d5f52eff799e6519ced41b85db6561
diff --git a/metadata/md5-cache/dev-ruby/httpclient-2.8.1 b/metadata/md5-cache/dev-ruby/httpclient-2.8.3
similarity index 93%
rename from metadata/md5-cache/dev-ruby/httpclient-2.8.1
rename to metadata/md5-cache/dev-ruby/httpclient-2.8.3
index ab682831d72d..6259d0fbd51e 100644
--- a/metadata/md5-cache/dev-ruby/httpclient-2.8.1
+++ b/metadata/md5-cache/dev-ruby/httpclient-2.8.3
@@ -4,11 +4,11 @@ DESCRIPTION='httpclient' gives something like the functionality of libwww-perl (
 EAPI=5
 HOMEPAGE=https://github.com/nahi/httpclient
 IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=Ruby
 RDEPEND=!dev-ruby/http-access2 ruby_targets_ruby20? ( virtual/ruby-ssl[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[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=https://github.com/nahi/httpclient/archive/v2.8.1.tar.gz -> httpclient-2.8.1.tgz
+SRC_URI=https://github.com/nahi/httpclient/archive/v2.8.3.tar.gz -> httpclient-2.8.3.tgz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	e7d26f9077ef49f07eaa5d0c7758fe7b	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=72d5f52eff799e6519ced41b85db6561
+_md5_=7a35a1e82d9080fa698dc6057aacc0a7
diff --git a/metadata/md5-cache/dev-ruby/typhoeus-1.0.1 b/metadata/md5-cache/dev-ruby/typhoeus-1.0.1
deleted file mode 100644
index ee3c3d59336c..000000000000
--- a/metadata/md5-cache/dev-ruby/typhoeus-1.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/ethon-0.8.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ethon-0.8.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ethon-0.8.0[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/json[ruby_targets_ruby20] >=dev-ruby/faraday-0.9[ruby_targets_ruby20] >=dev-ruby/sinatra-1.3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/json[ruby_targets_ruby21] >=dev-ruby/faraday-0.9[ruby_targets_ruby21] >=dev-ruby/sinatra-1.3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/json[ruby_targets_ruby22] >=dev-ruby/faraday-0.9[ruby_targets_ruby22] >=dev-ruby/sinatra-1.3[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/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_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=Runs HTTP requests in parallel while cleanly encapsulating handling logic
-EAPI=5
-HOMEPAGE=http://rubygems.org/gems/typhoeus/
-IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
-KEYWORDS=~amd64
-LICENSE=Ruby
-RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/ethon-0.8.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ethon-0.8.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ethon-0.8.0[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/typhoeus-1.0.1.gem
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	e7d26f9077ef49f07eaa5d0c7758fe7b	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=14652fc51b11956b76746dcc5c25a491
diff --git a/metadata/md5-cache/dev-ruby/typhoeus-1.0.2 b/metadata/md5-cache/dev-ruby/typhoeus-1.0.2
deleted file mode 100644
index 966a04052fc2..000000000000
--- a/metadata/md5-cache/dev-ruby/typhoeus-1.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/ethon-0.9.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ethon-0.9.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ethon-0.9.0[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/json[ruby_targets_ruby20] >=dev-ruby/faraday-0.9[ruby_targets_ruby20] >=dev-ruby/sinatra-1.3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/json[ruby_targets_ruby21] >=dev-ruby/faraday-0.9[ruby_targets_ruby21] >=dev-ruby/sinatra-1.3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/json[ruby_targets_ruby22] >=dev-ruby/faraday-0.9[ruby_targets_ruby22] >=dev-ruby/sinatra-1.3[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/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_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=Runs HTTP requests in parallel while cleanly encapsulating handling logic
-EAPI=5
-HOMEPAGE=http://rubygems.org/gems/typhoeus/
-IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
-KEYWORDS=~amd64
-LICENSE=Ruby
-RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/ethon-0.9.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ethon-0.9.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ethon-0.9.0[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/typhoeus-1.0.2.gem
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	e7d26f9077ef49f07eaa5d0c7758fe7b	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=08933bf28e790c5047d56cab420e021f
diff --git a/metadata/md5-cache/dev-ruby/typhoeus-1.1.2 b/metadata/md5-cache/dev-ruby/typhoeus-1.1.2
new file mode 100644
index 000000000000..bc4d99fcb721
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/typhoeus-1.1.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/ethon-0.9.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ethon-0.9.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ethon-0.9.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ethon-0.9.0[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/json[ruby_targets_ruby20] >=dev-ruby/faraday-0.9[ruby_targets_ruby20] >=dev-ruby/sinatra-1.3[ruby_targets_ruby20] >=dev-ruby/redis-3.0[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/json[ruby_targets_ruby21] >=dev-ruby/faraday-0.9[ruby_targets_ruby21] >=dev-ruby/sinatra-1.3[ruby_targets_ruby21] >=dev-ruby/redis-3.0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/json[ruby_targets_ruby22] >=dev-ruby/faraday-0.9[ruby_targets_ruby22] >=dev-ruby/sinatra-1.3[ruby_targets_ruby22] >=dev-ruby/redis-3.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/json[ruby_targets_ruby23] >=dev-ruby/faraday-0.9[ruby_targets_ruby23] >=dev-ruby/sinatra-1.3[ruby_targets_ruby23] >=dev-ruby/redis-3.0[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? ( 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=Runs HTTP requests in parallel while cleanly encapsulating handling logic
+EAPI=5
+HOMEPAGE=https://github.com/typhoeus/typhoeus
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+KEYWORDS=~amd64
+LICENSE=Ruby
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/ethon-0.9.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ethon-0.9.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ethon-0.9.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ethon-0.9.0[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/typhoeus-1.1.2.gem
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	e7d26f9077ef49f07eaa5d0c7758fe7b	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=65a228a212171d6eafacbfa352131aba
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 10220a48e8c8..eb89fad6ee6b 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 13 Dec 2016 05:13:22 +0000
+Tue, 13 Dec 2016 08:13:23 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index a2c26dab6654..aedba0028ecf 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Dec 13 05:09:34 UTC 2016
+Tue Dec 13 08:09:33 UTC 2016
diff --git a/metadata/timestamp.calculate b/metadata/timestamp.calculate
index 7e60a3139626..8fcc0d342884 100644
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@@ -2073,6 +2073,7 @@
 1607012158 ./app-emulation/s6-overlay/s6-overlay-1.18.1.3.ebuild
 1602220137 ./app-emulation/libcacard/libcacard-0.1.2.ebuild
 1601270628 ./app-emulation/libcacard/libcacard-2.5.1.ebuild
+1612131022 ./app-emulation/rkt/rkt-1.21.0.ebuild
 1611192347 ./app-emulation/rkt/rkt-1.18.0.ebuild
 1611280452 ./app-emulation/rkt/rkt-1.20.0.ebuild
 1611200308 ./app-emulation/rkt/rkt-1.19.0.ebuild
@@ -33374,18 +33375,16 @@
 1611031004 ./dev-ruby/ruby-oembed/ruby-oembed-0.10.1.ebuild
 1601040918 ./dev-ruby/rqrcode/rqrcode-0.9.0.ebuild
 1612021027 ./dev-ruby/rqrcode/rqrcode-0.10.1.ebuild
-1606300819 ./dev-ruby/fakefs/fakefs-0.9.0.ebuild
 1610060902 ./dev-ruby/fakefs/fakefs-0.9.2.ebuild
+1612130946 ./dev-ruby/fakefs/fakefs-0.10.1.ebuild
 1607212237 ./dev-ruby/fakefs/fakefs-0.6.0-r1.ebuild
 1611131016 ./dev-ruby/fakefs/fakefs-0.10.0.ebuild
 1610170823 ./dev-ruby/fakefs/fakefs-0.9.3.ebuild
-1603100848 ./dev-ruby/fakefs/fakefs-0.8.1.ebuild
 1603290101 ./dev-ruby/ruby-inifile/ruby-inifile-2.0.0-r2.ebuild
 1606280738 ./dev-ruby/rb-readline-r7/rb-readline-r7-0.5.2.0.ebuild
 1611061734 ./dev-ruby/ruby-gnome2/ruby-gnome2-3.0.7.ebuild
 1606251221 ./dev-ruby/ruby-gnome2/ruby-gnome2-3.0.8.ebuild
-1602280923 ./dev-ruby/typhoeus/typhoeus-1.0.1.ebuild
-1604300818 ./dev-ruby/typhoeus/typhoeus-1.0.2.ebuild
+1612130934 ./dev-ruby/typhoeus/typhoeus-1.1.2.ebuild
 1608051819 ./dev-ruby/typhoeus/typhoeus-0.6.9.ebuild
 1607240942 ./dev-ruby/typhoeus/typhoeus-1.1.0.ebuild
 1602240945 ./dev-ruby/pdf-reader/pdf-reader-1.4.0.ebuild
@@ -33395,7 +33394,7 @@
 1609281117 ./dev-ruby/unf_ext/unf_ext-0.0.7.2.ebuild
 1610311458 ./dev-ruby/hashicorp-checkpoint/hashicorp-checkpoint-0.1.4-r1.ebuild
 1601201019 ./dev-ruby/hashicorp-checkpoint/hashicorp-checkpoint-0.1.4.ebuild
-1603090053 ./dev-ruby/buftok/buftok-0.2.0-r1.ebuild
+1612130934 ./dev-ruby/buftok/buftok-0.2.0-r1.ebuild
 1609080220 ./dev-ruby/afm/afm-0.2.2.ebuild
 1604270812 ./dev-ruby/archive-tar-minitar/archive-tar-minitar-0.5.4-r2.ebuild
 1602162236 ./dev-ruby/rb-gsl/rb-gsl-1.16.0.6.ebuild
@@ -33424,7 +33423,7 @@
 1606051059 ./dev-ruby/pg/pg-0.17.1-r1.ebuild
 1606051059 ./dev-ruby/pg/pg-0.18.4.ebuild
 1607180948 ./dev-ruby/pg/pg-0.18.4-r1.ebuild
-1603090012 ./dev-ruby/annoy/annoy-0.5.6-r1.ebuild
+1612130934 ./dev-ruby/annoy/annoy-0.5.6-r1.ebuild
 1607300706 ./dev-ruby/rex-random_identifier/rex-random_identifier-0.1.0-r1.ebuild
 1608130928 ./dev-ruby/arel-helpers/arel-helpers-2.3.0.ebuild
 1610120749 ./dev-ruby/roadie/roadie-3.2.0.ebuild
@@ -34309,9 +34308,8 @@
 1603170329 ./dev-ruby/flickraw/flickraw-0.9.8.ebuild
 1604091138 ./dev-ruby/ruby-dict/ruby-dict-0.9.4-r4.ebuild
 1609281117 ./dev-ruby/httpclient/httpclient-2.8.2.4.ebuild
-1608090802 ./dev-ruby/httpclient/httpclient-2.8.1.ebuild
+1612130942 ./dev-ruby/httpclient/httpclient-2.8.3.ebuild
 1607061206 ./dev-ruby/httpclient/httpclient-2.7.1.ebuild
-1608190900 ./dev-ruby/httpclient/httpclient-2.8.2.2.ebuild
 1607241636 ./dev-ruby/calendar_date_select/calendar_date_select-2.1.2.ebuild
 1606130736 ./dev-ruby/hashie/hashie-3.4.4.ebuild
 1608051513 ./dev-ruby/hashie/hashie-3.4.4-r1.ebuild
@@ -41401,6 +41399,7 @@
 1611300909 metadata/md5-cache/app-emulation/diskimage-builder-1.23.0
 1610221339 metadata/md5-cache/app-emulation/vmware-tools-9.2.3.1031769
 1610221339 metadata/md5-cache/app-emulation/libguestfs-appliance-1.26.0-r1
+1612131038 metadata/md5-cache/app-emulation/rkt-1.21.0
 1611050408 metadata/md5-cache/app-emulation/libguestfs-1.28.3
 1611120138 metadata/md5-cache/app-emulation/virtualbox-4.3.38
 1610300115 metadata/md5-cache/app-emulation/virtualbox-modules-5.1.6
@@ -72528,7 +72527,6 @@
 1611131809 metadata/md5-cache/dev-ruby/test-unit-rr-1.0.5
 1611131808 metadata/md5-cache/dev-ruby/bunny-2.5.0
 1611131809 metadata/md5-cache/dev-ruby/rubygems-2.6.6
-1611131808 metadata/md5-cache/dev-ruby/httpclient-2.8.1
 1611131809 metadata/md5-cache/dev-ruby/rinku-1.7.3
 1611131809 metadata/md5-cache/dev-ruby/netrc-0.11.0
 1611131808 metadata/md5-cache/dev-ruby/domain_name-0.5.20160615
@@ -72547,7 +72545,6 @@
 1611131809 metadata/md5-cache/dev-ruby/trollop-2.0
 1611131808 metadata/md5-cache/dev-ruby/mechanize-2.7.5
 1611131809 metadata/md5-cache/dev-ruby/tzinfo-0.3.44
-1611131808 metadata/md5-cache/dev-ruby/fakefs-0.8.1
 1611131809 metadata/md5-cache/dev-ruby/ruby-clutter-gtk-3.0.7
 1611131808 metadata/md5-cache/dev-ruby/blankslate-2.1.2.4
 1611131808 metadata/md5-cache/dev-ruby/deep_merge-1.0.1
@@ -72598,7 +72595,6 @@
 1611131808 metadata/md5-cache/dev-ruby/activemodel-4.1.16
 1611131809 metadata/md5-cache/dev-ruby/ruby-gstreamer-2.2.4
 1611131808 metadata/md5-cache/dev-ruby/actionview-4.2.6
-1611131808 metadata/md5-cache/dev-ruby/fakefs-0.9.0
 1611131809 metadata/md5-cache/dev-ruby/travis-1.8.2-r1
 1611131809 metadata/md5-cache/dev-ruby/sexp_processor-4.7.0
 1611131809 metadata/md5-cache/dev-ruby/prawn-1.3.0
@@ -72651,7 +72647,7 @@
 1611131808 metadata/md5-cache/dev-ruby/cmdparse-3.0.1
 1612081110 metadata/md5-cache/dev-ruby/facter-3.4.1
 1611131808 metadata/md5-cache/dev-ruby/jmespath-1.3.0
-1611131808 metadata/md5-cache/dev-ruby/annoy-0.5.6-r1
+1612131008 metadata/md5-cache/dev-ruby/annoy-0.5.6-r1
 1611131809 metadata/md5-cache/dev-ruby/webmock-1.24.6
 1611131808 metadata/md5-cache/dev-ruby/hiera-eyaml-2.1.0
 1611131809 metadata/md5-cache/dev-ruby/sanitize-2.1.0
@@ -72962,7 +72958,6 @@
 1611131809 metadata/md5-cache/dev-ruby/twitter-text-1.14.0
 1611131809 metadata/md5-cache/dev-ruby/snmplib-1.2.0-r1
 1611131809 metadata/md5-cache/dev-ruby/ruby_dep-1.4.0
-1611131809 metadata/md5-cache/dev-ruby/typhoeus-1.0.1
 1611131809 metadata/md5-cache/dev-ruby/sawyer-0.7.0
 1611131808 metadata/md5-cache/dev-ruby/highline-1.7.6
 1611131809 metadata/md5-cache/dev-ruby/twitter-5.16.0
@@ -73126,6 +73121,7 @@
 1611131808 metadata/md5-cache/dev-ruby/hashie-2.1.2-r1
 1611131808 metadata/md5-cache/dev-ruby/git-1.2.9.1
 1611131809 metadata/md5-cache/dev-ruby/rails-dom-testing-1.0.7-r1
+1612131008 metadata/md5-cache/dev-ruby/httpclient-2.8.3
 1611131809 metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.0.8
 1611131808 metadata/md5-cache/dev-ruby/did_you_mean-1.0.1
 1611131809 metadata/md5-cache/dev-ruby/ruby-feedparser-0.9.4
@@ -73172,6 +73168,7 @@
 1611131809 metadata/md5-cache/dev-ruby/sparklines-0.5.2-r6
 1611131808 metadata/md5-cache/dev-ruby/kissfft-0.0.2
 1611131808 metadata/md5-cache/dev-ruby/hoe-3.14.1
+1612131008 metadata/md5-cache/dev-ruby/typhoeus-1.1.2
 1611131808 metadata/md5-cache/dev-ruby/bunny-2.6.0
 1611131809 metadata/md5-cache/dev-ruby/notify-0.5.2-r1
 1611131808 metadata/md5-cache/dev-ruby/combustion-0.5.5
@@ -73270,7 +73267,7 @@
 1611131809 metadata/md5-cache/dev-ruby/wirble-0.1.3-r4
 1611261039 metadata/md5-cache/dev-ruby/selenium-webdriver-3.0.2
 1611131809 metadata/md5-cache/dev-ruby/rspec-rails-3.5.1
-1611131808 metadata/md5-cache/dev-ruby/buftok-0.2.0-r1
+1612131008 metadata/md5-cache/dev-ruby/buftok-0.2.0-r1
 1611131808 metadata/md5-cache/dev-ruby/instantiator-0.0.7
 1611131809 metadata/md5-cache/dev-ruby/rex-arch-0.1.1
 1611131809 metadata/md5-cache/dev-ruby/roadie-3.1.1
@@ -73315,7 +73312,6 @@
 1611131808 metadata/md5-cache/dev-ruby/coffee-rails-4.1.1-r2
 1611131809 metadata/md5-cache/dev-ruby/rspec-3.4.0
 1611131809 metadata/md5-cache/dev-ruby/pygments_rb-0.6.2
-1611131809 metadata/md5-cache/dev-ruby/typhoeus-1.0.2
 1611131809 metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.0.7
 1611131809 metadata/md5-cache/dev-ruby/right_http_connection-1.3.0-r1
 1611131809 metadata/md5-cache/dev-ruby/prawn-2.1.0
@@ -73472,7 +73468,6 @@
 1611131808 metadata/md5-cache/dev-ruby/listen-3.1.1-r1
 1611281009 metadata/md5-cache/dev-ruby/timers-4.1.2
 1611131809 metadata/md5-cache/dev-ruby/mimemagic-0.3.2
-1611131808 metadata/md5-cache/dev-ruby/httpclient-2.8.2.2
 1611131808 metadata/md5-cache/dev-ruby/flexmock-2.3.2
 1611131809 metadata/md5-cache/dev-ruby/nokogumbo-1.4.7
 1611131808 metadata/md5-cache/dev-ruby/memoist-0.15.0
@@ -73571,6 +73566,7 @@
 1611131808 metadata/md5-cache/dev-ruby/dotenv-2.1.0
 1611131808 metadata/md5-cache/dev-ruby/forwardable-extended-2.6.0
 1611131808 metadata/md5-cache/dev-ruby/coffee-script-source-1.10.0
+1612131008 metadata/md5-cache/dev-ruby/fakefs-0.10.1
 1611131809 metadata/md5-cache/dev-ruby/ruby-vte3-3.0.8-r1
 1611131809 metadata/md5-cache/dev-ruby/niceogiri-1.1.2
 1611131809 metadata/md5-cache/dev-ruby/shotgun-0.9.1
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index bb54af6fda1a..fd17ae4eb1fa 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 13 Dec 2016 05:35:01 +0000
+Tue, 13 Dec 2016 08:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 57fdfc8c7cc3..9b46a34c04a6 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1481605801 Tue 13 Dec 2016 05:10:01 AM UTC
+1481616601 Tue 13 Dec 2016 08:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 10220a48e8c8..eb89fad6ee6b 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 13 Dec 2016 05:13:22 +0000
+Tue, 13 Dec 2016 08:13:23 +0000