diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index adfcb46bdd10..ce377e24ac95 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -1,4 +1,4 @@
-AUX gentoo-patches.conf 3408 SHA256 fac55eb64c30db0a7a252bd7144f265f436dcf26a9250d26dae35cc1309c44b7 SHA512 d3f35e81f9ec92e91a9a7fcd1f2a43d2c9b82b4353ea2f2b598250813477958b9cae381523dda046742214bbd63f128d256791337864d3ebf2978be550dad408 WHIRLPOOL f25c03d92856d5fe9c860171a74967d18a44b6bee6f52434f882386b025688f05c2deb0a52390538524fcb88726ec96b8a8f4536975fb560d5d45ab2a63f3a0f
+AUX gentoo-patches.conf 4118 SHA256 d546b2f6c97aec66218ffbbf7539a73a9ed6a0fd542e53a7170d6346350c8f50 SHA512 c52ae111b2eb915c48abea99d498d9e57780331a7c4e24f98c06b411c2d3c2cdbc156cede3408a4eda0023351ed8598096aaa9eed46a131b83bbfa5020bcf9e3 WHIRLPOOL d70d387df7279c8e6bc573d8e3b3b98713456369db9537fc971c6d3d63e6ed621779465591cfe13f9f42d67d896b41b84af5beb3910d74746e2e097e58d7c223
 AUX stubs-32.h 537 SHA256 4c903162da80cefd394404cb8cd9963a6ef6e3ad6c7adcbaa450a002d929bfc5 SHA512 55308dbedaa91909a2213940f7a7b574cabe6b5a3104761a2a6f28d6aed00164544488c00cbf9d66a9a370a14c6b6d3a00434efd3ff0228cc8e4d81af19c0e68 WHIRLPOOL 9c006e266bea6bb9d623e76011a4eac07c5fe4fdf76a041cc42a2289a7e9163988bad0fb2f458e300e45aabf9fb864ec764a496d7f89d58e57a506bac206a5f1
 AUX xen-consoles.logrotate 63 SHA256 0da87a4b9094f934e3de937e8ef8d3afc752e76793aa3d730182d0241e118b19 SHA512 ab2105c75cfe01768aecd5bcbb56269d63666e8a44e42b6a83aee87df6c84ee2f9ab249171c21b2e09f8fec2cae8318f6e87d160989398a3e7dd68db8d52c426 WHIRLPOOL be108bf298202851de434af513ac8c03a533e7621623c2a7e8f26d498074b3eec81b85b2ae29ad2ec67f4fe9937c88bd78c5f5e260793e7e69ec964d4adb989e
 AUX xencommons.confd 109 SHA256 e19b950b1bb4103f9006a0c2648a8d4bc890e2c67417de2700b82fb456802640 SHA512 f0bbc9647cecc6cf806e3059960fbe39b23304d9ca0955fb261e1d320b9b9ce59e5b28cc4b5a9922295b31221f0cd8f0cccb405520e097a7b12dc6ddb3294c17 WHIRLPOOL a8b7df6f9a8515b9c3c845379a3aa4424490972d5f882e8779a30fd2d44b77cb66deaa5c1496125ea7bc82e06044a485e14e904ad5c9c79222c008fb6ccc4e74
@@ -22,10 +22,13 @@ DIST xen-4.7.1.tar.gz 20706864 SHA256 e87f4b0575e78657ee23d31470a15ecf1ce8c3a92a
 DIST xen-4.8.0.tar.gz 22499917 SHA256 1e15c713ab7ba3bfda8b4a285ed973529364fd1100e6dd5a61f29583dc667b04 SHA512 70b95553f9813573b12e52999a4df8701dec430f23c36a8dc70d25a46bb4bc9234e5b7feb74a04062af4c8d6b6bcfe947d90b2b172416206812e54bac9797454 WHIRLPOOL 1296c25a05e3ab81730a2587ea1c07c7c022f05cfefc580224185c8d5fc9853531031c1292f69eff944ae2752492c4b95f13e160be3c449a7626aeadf1a21102
 DIST xen-gentoo-patches-7.tar.xz 24148 SHA256 859fb6b69125c0a1079b35a74bb004dce1b04827b05f056a746cc42c1b187557 SHA512 faf2b0ecd67d545366e2af7e7ecab5f808d02354d07f23cbffe1c3cb80dbb5f88cc4aa140d928ad269612e55c41740ff5bf2af3f0a1f16e375d404c3ffa712b1 WHIRLPOOL d75c35fa10dd1f1567a82c5d5cd7ddabc72def6d74ef7095b7bca9ce9adad2b6ff9c88b55bad7cdefe88da027e5c742f9b9dcafce457cf15f408ea35652546f6
 DIST xen-gentoo-patches-8.tar.xz 24732 SHA256 6e114f3d3bde31f8595a51bd67fafdbb56cbd60793bafad7061fcaaef67f36fb SHA512 05da32f8fca0a9a43d419c2edd01d0c4abe233c0a8cc02e18caf6490ae9938c4302e8e61f7c67339f5fddab412be69504e1f05de895b73ac8b540914745fefd9 WHIRLPOOL 43d5114f455d2465995e9a1bffe5fff1e722540994348d05a3bac5504a970ad6af447f783ddf271a183207c21e75a0b77b6aed0a8ec8c89446e99ec1b377bcbe
+DIST xen-gentoo-patches-9.tar.xz 27456 SHA256 67c410d12ef4628a8c0a931e5868b425f2eb4b2f0e307304a75384cbe509734b SHA512 9a797be9dd2392c34b3f6561c2274e116b4f5b114f4520dbbd0b51818c774479ceabb45aa916f93c1a2bc49787f4ca6e6c83bc743baa6bdeef91d77276b20f36 WHIRLPOOL c41cde532726bb55acd05d558b35d575b229d2ee64eba7438f7b196df313f0e44154148c1e47bf6e8c810667b3b237bcfa410371b4bb6f097b981f6b2637ead3
 DIST xen-ovmf-patches-2.tar.xz 4344 SHA256 495d61d718440057f8b0b54fb57061450dd764c6e87fe5f8bda1785bcddba770 SHA512 0bdc83029a01b613f5c1ca029bd45aebe211c332f09db91a0cc7d6b6f85a81dbbfdc20c62f0d20e973ee41b155a6551a4fad518cb792e1d508bf070e23d6a1d3 WHIRLPOOL 8346d68fa5d2a8e8a5c007b55e2b85cf48df045cc8c4818f09c756d28a52dd856671f37b4a53478e9b96ca9d2eca0c67fd15f009a94d1d2dfed8e83e596d9633
 DIST xen-security-patches-19.tar.xz 3336 SHA256 497a01fbd20fa45df19b41d337be0a87f4808101ac33cc9649461726abf43720 SHA512 d8a4a8ceeab9e2efedf880e7a2007b312a7f528cdb8fb1f748096621bbdc447ff8ee09b8fbe1aae657ccd7b2557e436cf60f6e70dcaef65e8959204e91f3ec57 WHIRLPOOL 26473bc9d7c2648f78f1fbf722e1ebcf42983d9d0e04d40f66eaad73c5a7ec232a397392dd5f66adb1258c571238a8faf0497ceb468674b93f7f86b91539f9b9
 EBUILD xen-tools-4.6.4-r4.ebuild 14037 SHA256 ff33ab9220a51a9c7b2ae39b5f55216352731f77f82b0210907bfae5f84c8e96 SHA512 489d69a500e177d655f93ef7fde2471619c6c9d414c7c2d1f68f0ef9cac61337e6f50aa15620f2fd751f091976266acec9a34159aae725f5131133a43c0c572c WHIRLPOOL a7a56e737ca484abe59b75c5b5e048f6acd9214c12490aed23f48447757db6c3876baeaee762c09a6df567016c3b8a286bb843efee0bfa73438165ff5ba7ae8e
 EBUILD xen-tools-4.7.1-r4.ebuild 14045 SHA256 8d24d51808193bc828484c17b58d8a4610acf9d35bdb219dc7f9b037a3fb7868 SHA512 59bd962277d47d9ddee5e8b04ef1a25441b6b5080e4ec8314df7e9468668b2255da1204d904460e582c154b82034c57c2ffc78459ec456d038ad1027b131acd9 WHIRLPOOL 51b4fcaa7b6b12509684c054e9511a5139239c9cbdae8c4365b5cf86105cf646ae5282000287fc41e92cf3704b5deb360e1a9bb524a425542ff27c5b475e404a
+EBUILD xen-tools-4.7.1-r5.ebuild 14046 SHA256 bf0abadad96df89c5001c5caf6733be4e0d697b32ef4893d217cf567de7e5f5e SHA512 23689090d53b8ae3c592b2203e4c35e1a448c979ed65c02d811f33e518e54620bfa16ba205c280a97522609835f19d3522433371b481aec2e46fb3882b832cfd WHIRLPOOL b3771b16ef8dc780ab86e2c25d66881d90735e4a083e7364ad7bd921fb642a7ba41aec1db3bbccc78bd793b62e7396352ce0b521ac90863d487078cb050b68dd
+EBUILD xen-tools-4.8.0-r1.ebuild 13969 SHA256 53276adb58374b5544926385505aa8452796eb5c372e987547a37346a9804472 SHA512 abfc8484a5301f5841c15b5fa48c351196849a0720d08b77939e3cdffb5ef32b84a0e016a6ff999ae1176e5da9a24ae8667fc55bdba1d1c0537469e11f20668b WHIRLPOOL a9a3fddab3afdf1fbc0f5bf5b07e79cf2126156670a161e3b2fcf4c3c8894090c505d01224839fabb900bf79bcb27181e217809ab80a88cd73ce51bde9972c1c
 EBUILD xen-tools-4.8.0.ebuild 13969 SHA256 181535d96c41f788c0fc09c3419aa630092c62c0a6882cd4035e680e18111bf5 SHA512 264fc3f5db462bce346f7a3032fd61cbbf14b3358fc7affec6db6453ccd9556f23aa2694d3518d3f3588f7d93cfd07f7937645906b10ac36d34ac9e0959f4049 WHIRLPOOL 3bf8fc6f6814739efd9c1c3c421801fae84c7521ee20fc9a64bd368cacbb33bd71192003aaf4e5603726fdd7ebceeb805d4ab42359ac68cb6c10f9f1d2642cb8
 MISC ChangeLog 22964 SHA256 15c6bdb3723570f38291c42047455516934b7d0e29969a0b7ac0176309d09509 SHA512 29a5c27e3fc0dba37b6b54a7834e39e34d3056d999b0a0ac0278607d7ac7adf7a924b054b941390c06643fabf873d559d627c0a026f1c6352c0732289ebf6707 WHIRLPOOL 2ecd5711ccdb9823c04cc4ed68392f8d1743c7070f34dbfe9bb0c264651bdf51d65210b4879e303ac550caf1fbd9ec6c2913feaaf5cfb96dd14b40e04af02a05
 MISC ChangeLog-2015 70841 SHA256 e2535b416e2777d7e80d7d96a388c50ab42fb18cd2dd242feb09e339726574ef SHA512 ea9f464a5cf37ce8e7872934f46794a23dec950d6de7d81610e3410356b9a9916dab7d6a7a114819ebe678517e60f53b3debb692383274c74e04adbb59368069 WHIRLPOOL fc0e6610406053b81d3d4258ca0f3117c552f3ab8a33ee282ba31aa69f8b07d196374c74b4f97a8f60422d53dae27fbd02e4cfea1940bc14b7b5ec995d825b07
diff --git a/app-emulation/xen-tools/files/gentoo-patches.conf b/app-emulation/xen-tools/files/gentoo-patches.conf
index f3120f4d2621..8c7d58ef2836 100644
--- a/app-emulation/xen-tools/files/gentoo-patches.conf
+++ b/app-emulation/xen-tools/files/gentoo-patches.conf
@@ -89,6 +89,14 @@ _gx036=" xen-tools-4.6-no-stackcheck.patch"
 # https://lists.gnu.org/archive/html/qemu-devel/2016-09/msg03961.html
 _gx037=" xen-tools-4.6-increase-stack-size.patch"
 
+
+#Fix issues with zero-length records in migration v2"
+#https://xenbits.xen.org/gitweb/?p=people/andrewcoop/xen.git;a=shortlog;h=refs/heads/tools-fix-zero-length-records
+_gx040=" 0001-docs-Clarify-the-expected-behaviour-of-zero-length-r.patch
+	0003-tools-libxc-Avoid-generating-inappropriate-zero-leng.patch
+	0002-tools-libxc-Tolerate-zero-length-records-in-migratio.patch
+	0004-tools-python-Adjust-migration-v2-library-to-warn-abo.patch"
+
 # xen-tools-4.6.4 patches set
 _gpv_xen_tools_464_0="
 ${_gx008} ${_gx021}
@@ -120,6 +128,13 @@ ${_gx028} ${_gx029} ${_gx036}
 ${_gx037}
 "
 
+_gpv_xen_tools_471_2="
+${_gx008} ${_gx021}
+${_gx022} ${_gx017} ${_gx031}
+${_gx027} ${_gx032}
+${_gx028} ${_gx029} ${_gx036}
+${_gx037} ${_gx040}
+"
 # xen-tools-4.8.0 patches set
 _gpv_xen_tools_480_0="
 ${_gx008}
@@ -128,3 +143,10 @@ ${_gx027} ${_gx032}
 ${_gx028} ${_gx029}
 ${_gx037}
 "
+_gpv_xen_tools_480_1="
+${_gx008}
+${_gx038} ${_gx017} ${_gx039}
+${_gx027} ${_gx032}
+${_gx028} ${_gx029}
+${_gx037} ${_gx040}
+"
diff --git a/app-emulation/xen-tools/xen-tools-4.7.1-r5.ebuild b/app-emulation/xen-tools/xen-tools-4.7.1-r5.ebuild
new file mode 100644
index 000000000000..38d08166216a
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-4.7.1-r5.ebuild
@@ -0,0 +1,460 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='ncurses,xml,threads'
+
+inherit eutils bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs versionator
+
+MY_PV=${PV/_/-}
+MAJOR_V="$(get_version_component_range 1-2)"
+
+if [[ $PV == *9999 ]]; then
+	inherit git-r3
+	KEYWORDS=""
+	REPO="xen.git"
+	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
+	S="${WORKDIR}/${REPO}"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	UPSTREAM_VER=0
+	SECURITY_VER=19
+	# xen-tools's gentoo patches tarball
+	GENTOO_VER=9
+	# xen-tools's gentoo patches version which apply to this specific ebuild
+	GENTOO_GPV=2
+	# xen-tools ovmf's patches
+	OVMF_VER=2
+
+	SEABIOS_VER=1.8.2
+	# OVMF upstream 52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d
+	OVMF_PV=20151110
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	[[ -n ${OVMF_VER} ]] && \
+		OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
+
+	SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/xen-${MY_PV}.tar.gz
+	http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
+	https://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
+	ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.bz2
+		${OVMF_PATCHSET_URI} )
+	${UPSTREAM_PATCHSET_URI}
+	${SECURITY_PATCHSET_URI}
+	${GENTOO_PATCHSET_URI}"
+
+	S="${WORKDIR}/xen-${MY_PV}"
+fi
+
+DESCRIPTION="Xen tools including QEMU and xl"
+HOMEPAGE="http://xen.org/"
+DOCS=( README docs/README.xen-bugtool )
+
+LICENSE="GPL-2"
+SLOT="0/${MAJOR_V}"
+# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
+# >=dev-lang/ocaml-4 stable
+# Masked in profiles/eapi-5-files instead
+IUSE="api custom-cflags debug doc flask hvm +qemu ocaml ovmf +qemu-traditional +pam python pygrub screen sdl static-libs system-qemu system-seabios"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	pygrub? ( python )
+	ovmf? ( hvm )
+	^^ ( qemu system-qemu )"
+
+COMMON_DEPEND="
+	dev-libs/lzo:2
+	dev-libs/glib:2
+	dev-libs/yajl
+	dev-libs/libaio
+	dev-libs/libgcrypt:0
+	sys-libs/zlib
+"
+
+DEPEND="${COMMON_DEPEND}
+	dev-python/lxml[${PYTHON_USEDEP}]
+	x86? ( sys-devel/dev86
+		sys-power/iasl )
+	pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
+	${PYTHON_DEPS}
+	api? ( dev-libs/libxml2
+		net-misc/curl )
+	ovmf? (
+		!arm? ( dev-lang/nasm )
+		$(python_gen_impl_dep sqlite)
+		)
+	!amd64? ( >=sys-apps/dtc-1.4.0 )
+	amd64? ( sys-devel/bin86
+		system-seabios? ( sys-firmware/seabios )
+		sys-firmware/ipxe
+		sys-devel/dev86
+		sys-power/iasl )
+	dev-lang/perl
+	app-misc/pax-utils
+	doc? (
+		app-doc/doxygen
+		dev-python/markdown[${PYTHON_USEDEP}]
+		dev-tex/latex2html[png,gif]
+		media-gfx/graphviz
+		dev-tex/xcolor
+		media-gfx/transfig
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+		dev-tex/latexmk
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-pictures
+		dev-texlive/texlive-latexrecommended
+	)
+	hvm? ( x11-proto/xproto
+		!net-libs/libiscsi )
+	qemu? (
+		x11-libs/pixman
+		sdl? ( media-libs/libsdl[X] )
+	)
+	system-qemu? ( app-emulation/qemu[xen] )
+	ocaml? ( dev-ml/findlib
+		>=dev-lang/ocaml-4 )"
+
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/iproute2[-minimal]
+	net-misc/bridge-utils
+	screen? (
+		app-misc/screen
+		app-admin/logrotate
+	)"
+
+# hvmloader is used to bootstrap a fully virtualized kernel
+# Approved by QA team in bug #144032
+QA_WX_LOAD="usr/lib/xen/boot/hvmloader
+	usr/share/qemu-xen/qemu/s390-ccw.img"
+
+RESTRICT="test"
+
+pkg_setup() {
+	python_setup
+	export "CONFIG_LOMOUNT=y"
+
+	#bug 522642, disable compile tools/tests
+	export "CONFIG_TESTS=n"
+
+	if has_version dev-libs/libgcrypt:0; then
+		export "CONFIG_GCRYPT=y"
+	fi
+
+	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64 ; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		einfo "Try to apply Xen Upstream patch set"
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-upstream
+	fi
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+	einfo "Try to apply Xen Security patch set"
+		# apply main xen patches
+		# Two parallel systems, both work side by side
+		# Over time they may concdense into one. This will suffice for now
+		EPATCH_SUFFIX="patch"
+		EPATCH_FORCE="yes"
+
+		source "${WORKDIR}"/patches-security/${PV}.conf
+
+		for i in ${XEN_SECURITY_MAIN}; do
+			epatch "${WORKDIR}"/patches-security/xen/$i
+		done
+
+		# apply qemu-xen/upstream patches
+		pushd "${S}"/tools/qemu-xen/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUU}; do
+			epatch "${WORKDIR}"/patches-security/qemuu/$i
+		done
+		popd > /dev/null
+
+		# apply qemu-traditional patches
+		pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUT}; do
+			epatch "${WORKDIR}"/patches-security/qemut/$i
+		done
+		popd > /dev/null
+	fi
+
+	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
+	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
+	pushd tools/firmware/ > /dev/null
+	ln -s seabios-dir-remote seabios-dir || die
+	popd > /dev/null
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
+		einfo "Try to apply Gentoo specific patch set"
+		source "${FILESDIR}"/gentoo-patches.conf
+		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
+		for i in ${!_gpv}; do
+			EPATCH_SUFFIX="patch" \
+			EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches-gentoo/$i
+		done
+	fi
+
+	# Ovmf's patchset
+	if use ovmf; then
+		if [[ -n ${OVMF_VER} ]];then
+			einfo "Try to apply Ovmf patch set"
+			pushd "${WORKDIR}"/ovmf-*/ > /dev/null
+			EPATCH_SUFFIX="patch" \
+			EPATCH_FORCE="yes" \
+			EPATCH_OPTS="-p1" \
+				epatch "${WORKDIR}"/patches-ovmf
+			popd > /dev/null
+		fi
+		mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
+	fi
+
+	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
+
+	# Fix texi2html build error with new texi2html, qemu.doc.html
+	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
+
+	use api   || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
+	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
+		 -i tools/firmware/Makefile || die
+
+	# Drop .config, fixes to gcc-4.6
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+
+		# try and remove all the default cflags
+		find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
+			-exec sed \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+				-i {} + || die "failed to re-set custom-cflags"
+	else
+		unset CFLAGS
+		unset LDFLAGS
+		unset ASFLAGS
+		unset CPPFLAGS
+	fi
+
+	if ! use pygrub; then
+		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
+	fi
+
+	if ! use python; then
+		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
+	fi
+
+	if ! use hvm; then
+		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
+	# Bug 351648
+	elif ! use x86 && ! has x86 $(get_all_abis); then
+		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
+		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
+		export CPATH="${WORKDIR}"/extra-headers
+	fi
+
+	if use qemu; then
+		if use sdl; then
+			sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
+				tools/Makefile || die
+		else
+			sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
+				tools/qemu-xen-traditional/xen-setup || die
+			sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
+				tools/Makefile || die
+		fi
+	else
+		# Don't bother with qemu, only needed for fully virtualised guests
+		sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die
+	fi
+
+	# Reset bash completion dir; Bug 472438
+	sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
+		-i Config.mk || die
+	sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
+
+	# xencommons, Bug #492332, sed lighter weight than patching
+	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
+		-i tools/hotplug/Linux/init.d/xencommons.in || die
+
+	# respect multilib, usr/lib/libcacard.so.0.0.0
+	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
+		-i tools/qemu-xen/configure || die
+
+	#bug 518136, don't build 32bit exactuable for nomultilib profile
+	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
+		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
+	fi
+
+	# use /var instead of /var/lib, consistat with previous ebuild
+	sed -i -e   "/XEN_LOCK_DIR=/s/\$localstatedir/\/var/g" \
+		m4/paths.m4 configure tools/configure || die
+	# use /run instead of /var/run
+	sed -i -e   "/XEN_RUN_DIR=/s/\$localstatedir//g" \
+		m4/paths.m4 configure tools/configure || die
+
+	# uncomment lines in xl.conf
+	sed -e 's:^#autoballoon=:autoballoon=:' \
+		-e 's:^#lockfile=:lockfile=:' \
+		-e 's:^#vif.default.script=:vif.default.script=:' \
+		-i tools/examples/xl.conf  || die
+
+	# Bug #575868 converted to a sed statement, typo of one char
+	sed -e "s:granter’s:granter's:" -i xen/include/public/grant_table.h || die
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf="--prefix=${PREFIX}/usr \
+		--libdir=${PREFIX}/usr/$(get_libdir) \
+		--libexecdir=${PREFIX}/usr/libexec \
+		--disable-werror \
+		--disable-xen \
+		--enable-tools \
+		--enable-docs \
+		$(use_enable pam) \
+		$(use_enable api xenapi) \
+		$(use_enable ovmf) \
+		$(use_enable ocaml ocamltools) \
+		--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
+		"
+
+	use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
+	use system-qemu && myconf+=" --with-system-qemu=/usr/bin/qemu-system-x86_64"
+	use amd64 && myconf+=" $(use_enable qemu-traditional)"
+	econf ${myconf}
+}
+
+src_compile() {
+	export VARTEXFONTS="${T}/fonts"
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
+
+	use doc && emake -C docs txt html
+	emake -C docs man-pages
+}
+
+src_install() {
+	# Override auto-detection in the build system, bug #382573
+	export INITD_DIR=/tmp/init.d
+	export CONFIG_LEAF_DIR=../tmp/default
+
+	# Let the build system compile installed Python modules.
+	local PYTHONDONTWRITEBYTECODE
+	export PYTHONDONTWRITEBYTECODE
+
+	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
+		XEN_PYTHON_NATIVE_INSTALL=y install-tools
+
+	# Fix the remaining Python shebangs.
+	python_fix_shebang "${D}"
+
+	# Remove RedHat-specific stuff
+	rm -rf "${D}"tmp || die
+
+	if use doc; then
+		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
+
+		dohtml -r docs/
+		docinto pdf
+		dodoc ${DOCS[@]}
+		[ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
+	fi
+
+	rm -rf "${D}"/usr/share/doc/xen/
+	doman docs/man?/*
+
+	newconfd "${FILESDIR}"/xendomains.confd xendomains
+	newconfd "${FILESDIR}"/xenstored.confd xenstored
+	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
+	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
+	newinitd "${FILESDIR}"/xenstored.initd xenstored
+	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
+	newinitd "${FILESDIR}"/xencommons.initd xencommons
+	newconfd "${FILESDIR}"/xencommons.confd xencommons
+	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
+	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
+
+	if use screen; then
+		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
+		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
+		keepdir /var/log/xen-consoles
+	fi
+
+	# For -static-libs wrt Bug 384355
+	if ! use static-libs; then
+		rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
+	fi
+
+	# for xendomains
+	keepdir /etc/xen/auto
+
+	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
+	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
+		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the offical wiki page:"
+	elog "https://wiki.gentoo.org/wiki/Xen"
+	elog "http://wiki.xen.org/wiki/Main_Page"
+	elog ""
+	elog "Recommended to utilise the xencommons script to config sytem At boot"
+	elog "Add by use of rc-update on completion of the install"
+
+	if ! use hvm; then
+		echo
+		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
+		elog "support enable the hvm use flag."
+		elog "An x86 or amd64 system is required to build HVM support."
+	fi
+
+	if use qemu; then
+		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
+		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
+		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
+		elog "the qemu-bridge-helper and the xen-bridge-helper.  File bugs of any issues that arise"
+	fi
+}
diff --git a/app-emulation/xen-tools/xen-tools-4.8.0-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.8.0-r1.ebuild
new file mode 100644
index 000000000000..13be2a8e4a4e
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-4.8.0-r1.ebuild
@@ -0,0 +1,456 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='ncurses,xml,threads'
+
+inherit eutils bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs versionator
+
+MY_PV=${PV/_/-}
+MAJOR_V="$(get_version_component_range 1-2)"
+
+if [[ $PV == *9999 ]]; then
+	inherit git-r3
+	KEYWORDS=""
+	REPO="xen.git"
+	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
+	S="${WORKDIR}/${REPO}"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	UPSTREAM_VER=
+	SECURITY_VER=
+	# xen-tools's gentoo patches tarball
+	GENTOO_VER=9
+	# xen-tools's gentoo patches version which apply to this specific ebuild
+	GENTOO_GPV=1
+	# xen-tools ovmf's patches
+	OVMF_VER=2
+
+	SEABIOS_VER=1.10.0
+	# OVMF upstream 52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d
+	OVMF_PV=20151110
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	[[ -n ${OVMF_VER} ]] && \
+		OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
+
+	SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/xen-${MY_PV}.tar.gz
+	http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
+	https://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
+	ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.bz2
+		${OVMF_PATCHSET_URI} )
+	${UPSTREAM_PATCHSET_URI}
+	${SECURITY_PATCHSET_URI}
+	${GENTOO_PATCHSET_URI}"
+
+	S="${WORKDIR}/xen-${MY_PV}"
+fi
+
+DESCRIPTION="Xen tools including QEMU and xl"
+HOMEPAGE="http://xen.org/"
+DOCS=( README docs/README.xen-bugtool )
+
+LICENSE="GPL-2"
+SLOT="0/${MAJOR_V}"
+# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
+# >=dev-lang/ocaml-4 stable
+# Masked in profiles/eapi-5-files instead
+IUSE="api custom-cflags debug doc flask hvm +qemu ocaml ovmf +qemu-traditional +pam python pygrub screen sdl static-libs system-qemu system-seabios"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	pygrub? ( python )
+	ovmf? ( hvm )
+	^^ ( qemu system-qemu )"
+
+COMMON_DEPEND="
+	dev-libs/lzo:2
+	dev-libs/glib:2
+	dev-libs/yajl
+	dev-libs/libaio
+	dev-libs/libgcrypt:0
+	sys-libs/zlib
+"
+
+DEPEND="${COMMON_DEPEND}
+	dev-python/lxml[${PYTHON_USEDEP}]
+	x86? ( sys-devel/dev86
+		sys-power/iasl )
+	pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
+	${PYTHON_DEPS}
+	api? ( dev-libs/libxml2
+		net-misc/curl )
+	ovmf? (
+		!arm? ( dev-lang/nasm )
+		$(python_gen_impl_dep sqlite)
+		)
+	!amd64? ( >=sys-apps/dtc-1.4.0 )
+	amd64? ( sys-devel/bin86
+		system-seabios? ( sys-firmware/seabios )
+		sys-firmware/ipxe
+		sys-devel/dev86
+		sys-power/iasl )
+	dev-lang/perl
+	app-misc/pax-utils
+	doc? (
+		app-doc/doxygen
+		dev-python/markdown[${PYTHON_USEDEP}]
+		dev-tex/latex2html[png,gif]
+		media-gfx/graphviz
+		dev-tex/xcolor
+		media-gfx/transfig
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+		dev-tex/latexmk
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-pictures
+		dev-texlive/texlive-latexrecommended
+	)
+	hvm? ( x11-proto/xproto
+		!net-libs/libiscsi )
+	qemu? (
+		x11-libs/pixman
+		sdl? ( media-libs/libsdl[X] )
+	)
+	system-qemu? ( app-emulation/qemu[xen] )
+	ocaml? ( dev-ml/findlib
+		>=dev-lang/ocaml-4 )"
+
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/iproute2[-minimal]
+	net-misc/bridge-utils
+	screen? (
+		app-misc/screen
+		app-admin/logrotate
+	)"
+
+# hvmloader is used to bootstrap a fully virtualized kernel
+# Approved by QA team in bug #144032
+QA_WX_LOAD="usr/lib/xen/boot/hvmloader
+	usr/share/qemu-xen/qemu/s390-ccw.img"
+
+RESTRICT="test"
+
+pkg_setup() {
+	python_setup
+	export "CONFIG_LOMOUNT=y"
+
+	#bug 522642, disable compile tools/tests
+	export "CONFIG_TESTS=n"
+
+	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64 ; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		einfo "Try to apply Xen Upstream patch set"
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-upstream
+	fi
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+	einfo "Try to apply Xen Security patch set"
+		# apply main xen patches
+		# Two parallel systems, both work side by side
+		# Over time they may concdense into one. This will suffice for now
+		EPATCH_SUFFIX="patch"
+		EPATCH_FORCE="yes"
+
+		source "${WORKDIR}"/patches-security/${PV}.conf
+
+		for i in ${XEN_SECURITY_MAIN}; do
+			epatch "${WORKDIR}"/patches-security/xen/$i
+		done
+
+		# apply qemu-xen/upstream patches
+		pushd "${S}"/tools/qemu-xen/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUU}; do
+			epatch "${WORKDIR}"/patches-security/qemuu/$i
+		done
+		popd > /dev/null
+
+		# apply qemu-traditional patches
+		pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUT}; do
+			epatch "${WORKDIR}"/patches-security/qemut/$i
+		done
+		popd > /dev/null
+	fi
+
+	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
+	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
+	pushd tools/firmware/ > /dev/null
+	ln -s seabios-dir-remote seabios-dir || die
+	popd > /dev/null
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
+		einfo "Try to apply Gentoo specific patch set"
+		source "${FILESDIR}"/gentoo-patches.conf
+		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
+		for i in ${!_gpv}; do
+			EPATCH_SUFFIX="patch" \
+			EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches-gentoo/$i
+		done
+	fi
+
+	# Ovmf's patchset
+	if use ovmf; then
+		if [[ -n ${OVMF_VER} ]];then
+			einfo "Try to apply Ovmf patch set"
+			pushd "${WORKDIR}"/ovmf-*/ > /dev/null
+			EPATCH_SUFFIX="patch" \
+			EPATCH_FORCE="yes" \
+			EPATCH_OPTS="-p1" \
+				epatch "${WORKDIR}"/patches-ovmf
+			popd > /dev/null
+		fi
+		mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
+	fi
+
+	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
+
+	# Fix texi2html build error with new texi2html, qemu.doc.html
+	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
+
+	use api   || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
+	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
+		 -i tools/firmware/Makefile || die
+
+	# Drop .config, fixes to gcc-4.6
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+
+		# try and remove all the default cflags
+		find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
+			-exec sed \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+				-i {} + || die "failed to re-set custom-cflags"
+	else
+		unset CFLAGS
+		unset LDFLAGS
+		unset ASFLAGS
+		unset CPPFLAGS
+	fi
+
+	if ! use pygrub; then
+		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
+	fi
+
+	if ! use python; then
+		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
+	fi
+
+	if ! use hvm; then
+		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
+	# Bug 351648
+	elif ! use x86 && ! has x86 $(get_all_abis); then
+		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
+		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
+		export CPATH="${WORKDIR}"/extra-headers
+	fi
+
+	if use qemu; then
+		if use sdl; then
+			sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
+				tools/Makefile || die
+		else
+			sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
+				tools/qemu-xen-traditional/xen-setup || die
+			sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
+				tools/Makefile || die
+		fi
+	else
+		# Don't bother with qemu, only needed for fully virtualised guests
+		sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die
+	fi
+
+	# Reset bash completion dir; Bug 472438
+	sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
+		-i Config.mk || die
+	sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
+
+	# xencommons, Bug #492332, sed lighter weight than patching
+	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
+		-i tools/hotplug/Linux/init.d/xencommons.in || die
+
+	# respect multilib, usr/lib/libcacard.so.0.0.0
+	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
+		-i tools/qemu-xen/configure || die
+
+	#bug 518136, don't build 32bit exactuable for nomultilib profile
+	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
+		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
+	fi
+
+	# use /var instead of /var/lib, consistat with previous ebuild
+	sed -i -e   "/XEN_LOCK_DIR=/s/\$localstatedir/\/var/g" \
+		m4/paths.m4 configure tools/configure || die
+	# use /run instead of /var/run
+	sed -i -e   "/XEN_RUN_DIR=/s/\$localstatedir//g" \
+		m4/paths.m4 configure tools/configure || die
+
+	# uncomment lines in xl.conf
+	sed -e 's:^#autoballoon=:autoballoon=:' \
+		-e 's:^#lockfile=:lockfile=:' \
+		-e 's:^#vif.default.script=:vif.default.script=:' \
+		-i tools/examples/xl.conf  || die
+
+	# Bug #575868 converted to a sed statement, typo of one char
+	sed -e "s:granter’s:granter's:" -i xen/include/public/grant_table.h || die
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf="--prefix=${PREFIX}/usr \
+		--libdir=${PREFIX}/usr/$(get_libdir) \
+		--libexecdir=${PREFIX}/usr/libexec \
+		--disable-werror \
+		--disable-xen \
+		--enable-tools \
+		--enable-docs \
+		$(use_enable pam) \
+		$(use_enable api xenapi) \
+		$(use_enable ovmf) \
+		$(use_enable ocaml ocamltools) \
+		--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
+		"
+
+	use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
+	use system-qemu && myconf+=" --with-system-qemu=/usr/bin/qemu-system-x86_64"
+	use amd64 && myconf+=" $(use_enable qemu-traditional)"
+	econf ${myconf}
+}
+
+src_compile() {
+	export VARTEXFONTS="${T}/fonts"
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
+
+	use doc && emake -C docs txt html
+	emake -C docs man-pages
+}
+
+src_install() {
+	# Override auto-detection in the build system, bug #382573
+	export INITD_DIR=/tmp/init.d
+	export CONFIG_LEAF_DIR=../tmp/default
+
+	# Let the build system compile installed Python modules.
+	local PYTHONDONTWRITEBYTECODE
+	export PYTHONDONTWRITEBYTECODE
+
+	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
+		XEN_PYTHON_NATIVE_INSTALL=y install-tools
+
+	# Fix the remaining Python shebangs.
+	python_fix_shebang "${D}"
+
+	# Remove RedHat-specific stuff
+	rm -rf "${D}"tmp || die
+
+	if use doc; then
+		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
+
+		dohtml -r docs/
+		docinto pdf
+		dodoc ${DOCS[@]}
+		[ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
+	fi
+
+	rm -rf "${D}"/usr/share/doc/xen/
+	doman docs/man?/*
+
+	newconfd "${FILESDIR}"/xendomains.confd xendomains
+	newconfd "${FILESDIR}"/xenstored.confd xenstored
+	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
+	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
+	newinitd "${FILESDIR}"/xenstored.initd xenstored
+	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
+	newinitd "${FILESDIR}"/xencommons.initd xencommons
+	newconfd "${FILESDIR}"/xencommons.confd xencommons
+	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
+	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
+
+	if use screen; then
+		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
+		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
+		keepdir /var/log/xen-consoles
+	fi
+
+	# For -static-libs wrt Bug 384355
+	if ! use static-libs; then
+		rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
+	fi
+
+	# for xendomains
+	keepdir /etc/xen/auto
+
+	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
+	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
+		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the offical wiki page:"
+	elog "https://wiki.gentoo.org/wiki/Xen"
+	elog "http://wiki.xen.org/wiki/Main_Page"
+	elog ""
+	elog "Recommended to utilise the xencommons script to config sytem At boot"
+	elog "Add by use of rc-update on completion of the install"
+
+	if ! use hvm; then
+		echo
+		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
+		elog "support enable the hvm use flag."
+		elog "An x86 or amd64 system is required to build HVM support."
+	fi
+
+	if use qemu; then
+		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
+		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
+		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
+		elog "the qemu-bridge-helper and the xen-bridge-helper.  File bugs of any issues that arise"
+	fi
+}
diff --git a/dev-ruby/ox/Manifest b/dev-ruby/ox/Manifest
index e2a639bb16df..22890516898e 100644
--- a/dev-ruby/ox/Manifest
+++ b/dev-ruby/ox/Manifest
@@ -1,9 +1,11 @@
 DIST ox-2.4.3.tar.gz 189105 SHA256 df757234b810fefcda98603f76f98b30d6192919b05bad3eacca617badcab529 SHA512 c9e3b88dc5c9893d55d5740f7a13709a29618b56169ab7278ad910bbb279fdb47dc2e6562444e792402ddf830e6318b00cbbf100660268baf56f67f9950f18a9 WHIRLPOOL 810fc842ce0b8939a6afd51875de7d0d05b62c0c14dde1ab506906ecda134474d1c99b834b584ea26c8f5e66855bd2a8f650555bc3f6562060e31d3baaac2f14
 DIST ox-2.4.4.tar.gz 189087 SHA256 38d3ea29c89828b8f96beb25e65af0401053ec009f4ebc74b6a84348afe9114a SHA512 83a043941c6cb2acaba1d2568d7166f844f0ed269deb49319be4fb275d79cd12ef53ddf6c531fb16647d76bb254801a6b25fc146ba5ced75e116051b6f639757 WHIRLPOOL c0c9ab40e0e785bc38200ba613d696e9b7c6d096b94765172aef79f19fda12fefd8480448774b4ad954018900f7fcde53fbe53965066f9168e3888bea0c8c256
 DIST ox-2.4.5.tar.gz 189176 SHA256 3d443b0bfd5670654698226e0a11ba7fba1c4213c19e838b465290bfa4cb8fee SHA512 5cca2abe7ea58d9f9957db4728f60e03dd5625b9201d4b9a8971aef78a7c5a74945afdf81a7a6d3523c59c073e58f6314990e8962afaeb562378fb748bfdef86 WHIRLPOOL 9659475014064ba3b7e981eb41694dda186bc6f8187fc2abdb8d0d36ef5b06beb4b0be28dec55196969c9d26e8e89dfae896cd801b98c150ee3381c597354414
+DIST ox-2.4.7.tar.gz 189737 SHA256 51678519b0ef773f9431dce99775bb2eb9cf9c2e4f3992859522961bab2395fd SHA512 73caa4ed9d71c6b1adf138c930c36efefc32e79bf6222cd076d5fa80f2240c41b658c5493abbaf693670f0f4b18eaf95b8ed1f0a55c15e9fbef352d0c52dfa7e WHIRLPOOL 7c25cdc6dc730ef589356aa602f6853ca33ef7cd743c3bd19d4cc00a10ea2a1b16fa84b90796b084c04fcdfdc14bfb91b59c5072d8219b36fb8e1f03e6a58633
 EBUILD ox-2.4.3.ebuild 709 SHA256 a39e4e032ddea01edf272c13ded339ee6553b257c3eb5ed67408ff822980f6cf SHA512 2511c763751d44a29eb524edb8921381d2a07dde6337cb458e69a54c6fb5d0b72a3ed45373c888eaf6514679fd69ec7830569688a041b3c5659aba5faa38f2e0 WHIRLPOOL e128b52977a1d61b84f20c7e4fed752c23436283a371c9a83d90a97f27d5650e117f59ac36661b67f55edcaccf1b278cfaab3ee77f9fcf8e743df0cbef1b403b
 EBUILD ox-2.4.4.ebuild 709 SHA256 a39e4e032ddea01edf272c13ded339ee6553b257c3eb5ed67408ff822980f6cf SHA512 2511c763751d44a29eb524edb8921381d2a07dde6337cb458e69a54c6fb5d0b72a3ed45373c888eaf6514679fd69ec7830569688a041b3c5659aba5faa38f2e0 WHIRLPOOL e128b52977a1d61b84f20c7e4fed752c23436283a371c9a83d90a97f27d5650e117f59ac36661b67f55edcaccf1b278cfaab3ee77f9fcf8e743df0cbef1b403b
 EBUILD ox-2.4.5.ebuild 709 SHA256 a39e4e032ddea01edf272c13ded339ee6553b257c3eb5ed67408ff822980f6cf SHA512 2511c763751d44a29eb524edb8921381d2a07dde6337cb458e69a54c6fb5d0b72a3ed45373c888eaf6514679fd69ec7830569688a041b3c5659aba5faa38f2e0 WHIRLPOOL e128b52977a1d61b84f20c7e4fed752c23436283a371c9a83d90a97f27d5650e117f59ac36661b67f55edcaccf1b278cfaab3ee77f9fcf8e743df0cbef1b403b
+EBUILD ox-2.4.7.ebuild 709 SHA256 a39e4e032ddea01edf272c13ded339ee6553b257c3eb5ed67408ff822980f6cf SHA512 2511c763751d44a29eb524edb8921381d2a07dde6337cb458e69a54c6fb5d0b72a3ed45373c888eaf6514679fd69ec7830569688a041b3c5659aba5faa38f2e0 WHIRLPOOL e128b52977a1d61b84f20c7e4fed752c23436283a371c9a83d90a97f27d5650e117f59ac36661b67f55edcaccf1b278cfaab3ee77f9fcf8e743df0cbef1b403b
 MISC ChangeLog 4691 SHA256 7acb4ad04f3420c2c753e1f378b9a23387e8e4a8a84c2e28d04240d5e403aaec SHA512 dac3aab0327ce2a102416158f23f53fd2f5c3bb5c9bc4055c3eb13561d58a718b88a87a73810261bb41c868900d700f91ece67218e8e19d5fdeb65a123317353 WHIRLPOOL 05bcde592d81d08b1c705555533df2b05dca2aed0e0f5cfd9f9ea27b8c96dd15c0441993251cbad55890debaa97dec72b270da162c8921a35b43d88a7312eea7
 MISC ChangeLog-2015 2670 SHA256 8dfcf507db2c78575e9c96c9509c59f68b961b866ae6dd86d611f2926f90acb7 SHA512 ced0b9e623c13061be189158c2e1975afc7460fa8a5caef637a8c3eacd7ede2ee7a252e6eab195a8c60762217466966261cd9dd141a079015c527852e4f66cb7 WHIRLPOOL 4c48f60d1d29ad76afd2595d99f18d3ddaf14f0f99ae3d1d42582c5ca58204d8f0eff276af03ad7a1597ad4bdd2d1aac935598c9d77545670c56d2aae7f762f1
 MISC metadata.xml 336 SHA256 2063553c8f252efc036f24b4e437d6baf2243945008ae0183df44a2aed1e7991 SHA512 43b8b42cb09fe73a49e0db49671effd91859d2b9001fc3e51761a1b51b245e83a719ddddd100ecfeb92910baa06690b2cc0bd52db0afc872e007c4be9616908e WHIRLPOOL 790766fd56f3a6bcba1d6719a528247973c614487be8a8dacb530c7d3cb220c728bfc71c43ecd32eec78270df6a4094f23ef4e638f5e65d0d21b8337c0be9e71
diff --git a/dev-ruby/ox/ox-2.4.7.ebuild b/dev-ruby/ox/ox-2.4.7.ebuild
new file mode 100644
index 000000000000..71373194215b
--- /dev/null
+++ b/dev-ruby/ox/ox-2.4.7.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_TASK_DOC=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A fast XML parser and Object marshaller"
+HOMEPAGE="http://www.ohler.com/ox/ https://github.com/ohler55/ox"
+SRC_URI="https://github.com/ohler55/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+
+KEYWORDS="~amd64 ~ppc64 ~x86"
+SLOT="0"
+IUSE=""
+
+each_ruby_configure() {
+	${RUBY} -Cext/ox extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/ox
+	cp ext/ox/ox$(get_modname) lib/ox/ || die
+}
+
+each_ruby_test() {
+	${RUBY} test/tests.rb || die
+}
diff --git a/dev-ruby/psych/Manifest b/dev-ruby/psych/Manifest
index 6df5b7254d49..cce18276062d 100644
--- a/dev-ruby/psych/Manifest
+++ b/dev-ruby/psych/Manifest
@@ -1,9 +1,11 @@
 DIST psych-2.1.1.tar.gz 132735 SHA256 c98c173060042b9a4740e553d4cc8da01a688564c40bccdaef9859d698161cad SHA512 d4e26004153dc66179194c83800b8d8a3d1230efe1ee16c6f9939d87365f6d3707d9988e95c513e4411661cfa704aef067df23cc44f9172b428a0575ea893f6b WHIRLPOOL 06f072f563dec2a7249ed3d32254c61582f786f21a4b65f5bf01242f25a9a3534f6f069712204d22d3b540b87ded71a647ce2047f845de4a25dbfb322c38027e
 DIST psych-2.2.0.tar.gz 133402 SHA256 97936452a7c246a3e1c813c3d0066504255da867a13978aea8f7e507988e4f19 SHA512 b8abbb99d2ee3bd0213ddd410485a7b3ef80a1497535ce0a922211b0ac0baca501b83c2deb2e2cee3644c29a2f550b6199af104b9eaf5d822ae592563d0cd362 WHIRLPOOL 1f17eadab16cbcb9cb170b6ba5f405d539f2b911912dddbba74fc44f816b1256d1f04d5ee75909617fa9f87dd5f05a63f23bbf6439dc2b8d3bd1681a25f065cf
 DIST psych-2.2.1.tar.gz 133482 SHA256 a80d5455657de0348106f8bf585448415231016ca653497e9f00249b0b1c99af SHA512 4a79a5e5ba32482b9fd0467bb272d38ffebf8e8f621dc93b75d0848ba1b9b658e4d318c01fef7fe317c27d81b280cb6d4288112d29c9ae43768ecfc9ad7e19da WHIRLPOOL c045b84224ebfe7d1c183d15c049e4833ed73c225112e4ac548911d902888f3a544cfe9ca558d746568b1bac5cb94c2a16ceb3f8f78bb9f2d1a65b53e54c3dd6
+DIST psych-2.2.2.tar.gz 133468 SHA256 e7b05fbb50733a69f2759b6657c2c1c1c545744cfb15549b0392a02b1aed6bed SHA512 671a3e6ff60b765f997a193b63fedd34ce11022b749b0c9bda0f18f84ded5972d614981e5ce5a15690795cd96d0840c0963dd4258c16ac61eb48e3c59e82abee WHIRLPOOL 402a0c513fa44ff05a0c19d06f6744f500fdc90c883be1c77300d1a06835213223a2a7fdd00c6f20f90f45d17c215f0a0aba6ab9f1347de29409333612836f04
 EBUILD psych-2.1.1-r1.ebuild 1078 SHA256 4e34349aa6d7de5086b42d9c7d3b05e495d5cba5383cb39bc93d05d11326708f SHA512 ce6602f52ae65069eff4cf0851515f596dfa85fb1cd144dd58c5b0000fa8e325936db2e95c7fcd8a672924c931c88455ed944c6b2a298a6f47305687b5067de2 WHIRLPOOL 196a36830c0e5a409c61e0cc2646b6e66e0c38372ec77fb52fe66408326c118013b631d2e059a18dc85fe948dea09247a669afdbe84443f36829ba399b3f39dd
 EBUILD psych-2.2.0.ebuild 1076 SHA256 fe5c1403a5c512146f1fed00f912a43fc08c08c3aa9a718a2987b425bd8fee11 SHA512 e63a80a647d3caf0f27fbc228ee63f89b23a0238af63d0f5b843d6157ec255e8574743b1fc39dc7bbd16d41bf93f14ef29d5d05c3ec7d295692e7717dc6ed7ef WHIRLPOOL 5905591aedd6aafdffe879f5ee6d667d8fad8e2eaf71a0830ab96273faad2bb108e85419b8621c0bb4580504c40dc0ca65525ca24d7e74c09377d533eb6c7de1
 EBUILD psych-2.2.1.ebuild 1076 SHA256 fe5c1403a5c512146f1fed00f912a43fc08c08c3aa9a718a2987b425bd8fee11 SHA512 e63a80a647d3caf0f27fbc228ee63f89b23a0238af63d0f5b843d6157ec255e8574743b1fc39dc7bbd16d41bf93f14ef29d5d05c3ec7d295692e7717dc6ed7ef WHIRLPOOL 5905591aedd6aafdffe879f5ee6d667d8fad8e2eaf71a0830ab96273faad2bb108e85419b8621c0bb4580504c40dc0ca65525ca24d7e74c09377d533eb6c7de1
+EBUILD psych-2.2.2.ebuild 1076 SHA256 fe5c1403a5c512146f1fed00f912a43fc08c08c3aa9a718a2987b425bd8fee11 SHA512 e63a80a647d3caf0f27fbc228ee63f89b23a0238af63d0f5b843d6157ec255e8574743b1fc39dc7bbd16d41bf93f14ef29d5d05c3ec7d295692e7717dc6ed7ef WHIRLPOOL 5905591aedd6aafdffe879f5ee6d667d8fad8e2eaf71a0830ab96273faad2bb108e85419b8621c0bb4580504c40dc0ca65525ca24d7e74c09377d533eb6c7de1
 MISC ChangeLog 4605 SHA256 f12c1f8001435147ea18011276ca564674f352d6949f643e411eef24836aca26 SHA512 da43dd2e4e9fe8aae33fe6a7ffcb30732a5a2994e255521234ef5fcc346fff05136d58f033a2a569261bb7534b580e4ff119ad01fa31cd45584264c2bc78f482 WHIRLPOOL cc2e615c0bac62addb14aa537bbb448d71ce87142335ce3dcc67cd9da7de2d4a6e051f6a614058dc2e99a5cdb5d5825e4fe53ab798a4321fe380dba24418162f
 MISC ChangeLog-2015 1601 SHA256 ef9255b5d931f674d7d729da1f0f68351b9661aab339f903e4397d6d6afe2a2f SHA512 2bfd068e52eb72605f52924de08d70880fc6565c0443ef5dd68fb999e0f2f9d8a96b3f85b85fb048b4ac834f7b9670df2a056eb832e19846ee697fa7bf752752 WHIRLPOOL b0e989a65b45edaf2c0ca9d583943520ef6da7cad64fdc820361a9dc1f9b3fc028a8773ecf0b79b34bd1f9326ffba71d90e0a618c904c6d10683539215512dc0
 MISC metadata.xml 342 SHA256 63df250f774eed2a4a75cdc2a1f05c98cf51b82c9ea31aaf8aa8b953fcf3b949 SHA512 d1246a904cc4a3185ba2d91dcc6be5230461555cb57d71f1715c163caf5f8954937cbf58ddd71647a0662b65e59e917dc2dcf59d2ce92e9d8e600a3818422ca0 WHIRLPOOL 2222e6f8e8fd3b5dea149fa9432e4772749ce7afe3cf259ff38c8055a1dbf98d1481098865f60209cecae186044a3196f476de2c803473487ba3ef81c6e13c05
diff --git a/dev-ruby/psych/psych-2.2.2.ebuild b/dev-ruby/psych/psych-2.2.2.ebuild
new file mode 100644
index 000000000000..2726cf04a579
--- /dev/null
+++ b/dev-ruby/psych/psych-2.2.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="A libyaml wrapper for Ruby"
+HOMEPAGE="https://github.com/tenderlove/psych"
+SRC_URI="https://github.com/tenderlove/psych/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND+=" >=dev-libs/libyaml-0.1.7"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
+
+all_ruby_prepare() {
+	sed -i -e '1igem "minitest", "~>5.0"' test/psych/helper.rb || die
+	sed -i -e '/s.files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/${PN} extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/${PN}
+	cp ext/${PN}/${PN}$(get_modname) lib/ || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:test/${PN}:. -e "Dir['test/psych/**/test_*.rb'].each {|f| require f}" || die
+}
diff --git a/dev-ruby/rdoc/Manifest b/dev-ruby/rdoc/Manifest
index ff9fd4c194a0..e255028f24ab 100644
--- a/dev-ruby/rdoc/Manifest
+++ b/dev-ruby/rdoc/Manifest
@@ -6,7 +6,7 @@ DIST rdoc-5.0.0.tar.gz 701335 SHA256 bf7b8be4afbec4f4fe38ed2d5cb4bbcccf7c4c72885
 EBUILD rdoc-4.2.0.ebuild 2809 SHA256 2dd452e3db988e003d502e8daaced2a8cad6df6bdf1e7697ef37c4c85bb7804e SHA512 29aaf0a0b44085be6d9fd0f76d82d5ecf0147f5102d2f5f9f326fdc65bef32128b5b96e0d1f4ca28df420547cd14b848085a03a7d42bf8e2646b839fc8826fc5 WHIRLPOOL 04e735d3830bd6b36ae9a657581fc4241c282dcdf9a6e313a779ceb378bb13f1ea1f52dd79b84741ac4b7cad83650dce1bf3b09bdd26b22fa41c2bc7d14cdc3f
 EBUILD rdoc-4.2.2.ebuild 2720 SHA256 e28ee99afa6ee441f704de3190ced57ff2e53d4e3e72217e605b6edeb5e39731 SHA512 37cc8daeb173b20b2f734a174e8597167a6b6399b39e877a4d2ebafd216b927dd3874c3230088af8721826e8d85d8cd28ee28f88fa00f76cb0352f19712392fd WHIRLPOOL 8d14a4a15f9926b13bc1042992fca8592ed0974575dd7c4f150f156ba6bb5652e49e7a19ad6046dd55ed91e52f0e763e112f00a5370a7e2a135a987b40b5c70c
 EBUILD rdoc-4.3.0.ebuild 2720 SHA256 e28ee99afa6ee441f704de3190ced57ff2e53d4e3e72217e605b6edeb5e39731 SHA512 37cc8daeb173b20b2f734a174e8597167a6b6399b39e877a4d2ebafd216b927dd3874c3230088af8721826e8d85d8cd28ee28f88fa00f76cb0352f19712392fd WHIRLPOOL 8d14a4a15f9926b13bc1042992fca8592ed0974575dd7c4f150f156ba6bb5652e49e7a19ad6046dd55ed91e52f0e763e112f00a5370a7e2a135a987b40b5c70c
-EBUILD rdoc-5.0.0.ebuild 2396 SHA256 fec4103227c553dabbee92fba0a88487655e84ea9942198eb41b4dda5b37ba93 SHA512 09dc6c5f348df81c64e9204a5d23aa79fd074229bed2455239262db9b3a367b0a12641081c09be575db67f3036e4e08a6383adff5b5f087f9fc6fc6106c51f2a WHIRLPOOL a370f0a4ecfd6964dba9138812e5af9f45adadc7f2dc380b207c7537bc987c82d03dcfd7159c6275d0b76d48810d04a0a6bf7557d4675deb3a3b23f78e8fef89
+EBUILD rdoc-5.0.0.ebuild 2328 SHA256 029248d574d91e2adcec40d31b2c9a6745aa685405e13b4923835cd01f60fcf2 SHA512 4f15866276e0d85147cf54f876ff75f7f4ae863b170f023468ba82ab955c08fade308f37a1efd52a171a3273cca06ea38a83524ace0e04e783d9817694147e67 WHIRLPOOL 44d5bc020900e7c06060467e12d6807a960687ae329c4c44b373c08338631eb9cf427120a3c18a5a806d3be896bb7cb468778d4df04ccad23ed7b034fe9c7297
 MISC ChangeLog 7375 SHA256 11b8af1ae6136408f49085a04bd69da9d94cdc174ec3327c4ed08f501da89d06 SHA512 4d50340ba1c608edc89232038ecaef85287bccf4bc23634a4949245ff2b4c921c2de42fd16d38706b466718de20702a027c8f75634a932dbef673ea3673b8419 WHIRLPOOL 46f2bc8b24b5572e948c147f27e7a3234953f6301d299c712190f53f99a98a71efa0b103e7855274ba5d77bdcb0e2a6efb5288f17adc0e77bac1ed4c2b86a074
 MISC ChangeLog-2015 1169 SHA256 eb79450fb0018c43b243f325a52773abe90a10e7f709bd58e683d05b387ace05 SHA512 1b6af8635b601ef0865cd3e0766451ef5962ac068b280698886959c9f0d4b63da129a12e2f8b880389b5f801b374535f6b7d2e8d43bd9400c7a61587009c4494 WHIRLPOOL 813efe039bf038e3701e74da75d4fbfc1bdb403dcb67c1608984e99f3f27a8d906a34788ebd51b8a2c8420bbd9ed66afb6413584615266d3d4936aa7db542588
 MISC metadata.xml 335 SHA256 3d7aab0feada3fed8251ff4b84acc0ffbd490216eecb1e73ad3d9a2fcacdfc82 SHA512 3421081016cb99570f9ce9f775097669cd40a709efbbb3c76a20947717bc40d886195a5fda889407d1c436a387c126e07def1eeae01edff53c490ea9c630e992 WHIRLPOOL bfc4d6dc6360f545c3be0caa3af67cd8cdffe66e507320b7bb7a5675c1f19abbe0bb01329b974e4e58cc4d79aca394490a376505e2c81fc57c2997cb738bb671
diff --git a/dev-ruby/rdoc/rdoc-5.0.0.ebuild b/dev-ruby/rdoc/rdoc-5.0.0.ebuild
index acfd43a61598..666988505a0c 100644
--- a/dev-ruby/rdoc/rdoc-5.0.0.ebuild
+++ b/dev-ruby/rdoc/rdoc-5.0.0.ebuild
@@ -36,11 +36,9 @@ all_ruby_prepare() {
 	# Other packages also have use for a nonexistent directory, bug 321059
 	sed -i -e 's#/nonexistent#/nonexistent_rdoc_tests#g' test/test_rdoc*.rb || die
 
-	# Remove unavailable and unneeded isolate plugin for Hoe
-	sed -i -e '/isolate/d' Rakefile || die
-
-	# Remove licenses line from Hoe definitions so we also use older versions.
-	sed -i -e '/licenses/ s:^:#:' Rakefile || die
+	# Avoid unneeded dependency on bundler, bug 603696
+	sed -i -e '/bundler/ s:^:#:' \
+		-e 's/Bundler::GemHelper.gemspec.full_name/"rdoc"/' Rakefile || die
 
 	# Remove test that is depending on the locale, which we can't garantuee.
 	sed -i -e '/def test_encode_with/,/^  end/ s:^:#:' test/test_rdoc_options.rb || die
diff --git a/dev-ruby/request_store/Manifest b/dev-ruby/request_store/Manifest
index e44cec5f5d34..28ebd859c73e 100644
--- a/dev-ruby/request_store/Manifest
+++ b/dev-ruby/request_store/Manifest
@@ -1,8 +1,6 @@
 DIST request_store-1.0.5.gem 6656 SHA256 70adb9485eb22113bd165e259b929a449dfe2d2410a880566f06df6a164fc1cf SHA512 0d69ebdb8d3f6df11f89780c250b5fcc702258e19d7fbf8e2273614ecc220ee25e059a596a8a7e39bcc426f8d834cab38c161c0c1a800cc7ebdba3daa810e727 WHIRLPOOL e3dc2ff0d349019aff440a371f6444e7703dc3481636a6e3e9d09b9cfbd153d6a887bae94d3b07a9fc67fadc4acc79e5848cdb5cdc8e3c30d224b524e47361c7
-DIST request_store-1.3.0.gem 8704 SHA256 766e6b0202e42b9abc93a90b33f73abcac3cac8be231b202fbefae6bdfdc83ef SHA512 4eae63825ddb6e4211606fd5937494934e0f0c703e9d4e34c66c6fa456ff06fd69008c935f5bf0a64437bda0984210c34d7628ca631b1915a7c15e6ec2ba2aba WHIRLPOOL ac3391aa2855962724e67ecbcee47bf7eb79648926c30d78454dd98314623d8574ce2dfa13d4172bda13281f371609c159257b7c380b28408118918750f829bb
 DIST request_store-1.3.1.gem 8704 SHA256 fb0bbd9b8514a87ae092191fc56b882d8dd5485828568a1d838c703e16e849ed SHA512 67e3be519e33a58c5bb45437dee3a77ff298cc228066af1b101b72a3ffe95844d065370942db696eeff57a781e0be9eed2d80ac8b99a4d4592eec1b33345ab63 WHIRLPOOL a94bbcb72f07e7c9a1899efa74e6bcf19b9375944000a65f9b2d6d81a223b8b93712c0e3d2deeff12c9eb24cc41b23865e0f5d16fd2b34103785583d13a6b96d
-EBUILD request_store-1.0.5.ebuild 473 SHA256 ea857d79fb13b12fd9e32526fc6882d6f6094c3d068c6eccc1308d1377584dab SHA512 13ec5c588bcbf4a84ebc03658f2ac5fb1887ed593506ac333cb96bf09d3687c1d3ff7a8a501f8f592f609f56af8746b4f23e60d2486c3249a7f06a2a54885902 WHIRLPOOL b292fbf2e1ae3bad8d73f2b787afebbf1a58a520705261795ac175487958662a4dc66bda2a2013b181c333430cf5ad0c6d58c4efd3e5a823474a44ef6c1e527a
-EBUILD request_store-1.3.0.ebuild 482 SHA256 83d7c142ae29d56f866e89a1e28a6ba800997e39d3e0f578ab319234fc5acd6d SHA512 2d5b1f9bcfaf21c25271b4a193c70275794741038809a742563d7715e8d9f1780018b1d3cccf1fe04cc750287d68a3b686b93bc647d7e622799c00acaeeeae78 WHIRLPOOL b7099411df5fa7ac8b419ce0c4c807f8359cc4e6b6ea7646b2a84e8e6992276046f611ebc713566d862184be7c83620d4d8cf14e96a8e0a31cfb98654e762c98
+EBUILD request_store-1.0.5.ebuild 480 SHA256 3d65345fba0eaca7f5cf5233e543cc8733c735f9b788413fd5b7a5e5b7e5ab01 SHA512 a5b931e10c21a1be2be4909892a177f7395edea5f546296338a49d243b90119d5cc65dd7996af721d5c46ab10ef5a52af65e5782fa0d5e1b1b700b2d7113c28a WHIRLPOOL 06040517446bc22e365b2b3a5b56dcc1aac90b85d0399dc4e4ed803803dd8f3cb4f8654c25e0b29c1c8ce778b2e574f65aa5b0d95c94d6969bcd67ff8f51ffb5
 EBUILD request_store-1.3.1.ebuild 482 SHA256 83d7c142ae29d56f866e89a1e28a6ba800997e39d3e0f578ab319234fc5acd6d SHA512 2d5b1f9bcfaf21c25271b4a193c70275794741038809a742563d7715e8d9f1780018b1d3cccf1fe04cc750287d68a3b686b93bc647d7e622799c00acaeeeae78 WHIRLPOOL b7099411df5fa7ac8b419ce0c4c807f8359cc4e6b6ea7646b2a84e8e6992276046f611ebc713566d862184be7c83620d4d8cf14e96a8e0a31cfb98654e762c98
 MISC ChangeLog 3636 SHA256 02e0e919738a2cad2886a49ca62ce4cb926bf11603f84a3190285bc4f4d975df SHA512 b7970fd7b4da597079085d0163b45cdcdccd34b1ab7663c64a44039b8c3f97502b2dbd2a723cbd9a24dc8049f114c5b92f7e89671d154c932832885b8f7f12e9 WHIRLPOOL 4919d139859ec326f838d1075a8bfa19a3fa5a4179609e3655dea045fd75aa372263bbb35ca925b0198ae21d36799b2c85909cdd1d04a77b0e47762b29aa2aa5
 MISC ChangeLog-2015 700 SHA256 11f774175cc14a4b6c2e0e8be4d54d387c64d17ec61b8218bcf41e2f2f3cd431 SHA512 7f20f38d91287610f73b69138a96f74154e6744a703f83511abe39b1df1bc8459ed9f692c3d1918a1d39df45db5b3532a8df7b08d0d2635754f9260d96eed44b WHIRLPOOL 5506e0110e1cdd88007432e856ffd3c8b596288c55964822bb43c58f3539b9dc0421771118fdba77e5527e3870738cd7cd90d0d1d2db2c6298294a0270982ac8
diff --git a/dev-ruby/request_store/request_store-1.0.5.ebuild b/dev-ruby/request_store/request_store-1.0.5.ebuild
index 8b8f93714135..932e1aa25be8 100644
--- a/dev-ruby/request_store/request_store-1.0.5.ebuild
+++ b/dev-ruby/request_store/request_store-1.0.5.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/request_store/request_store-1.3.0.ebuild b/dev-ruby/request_store/request_store-1.3.0.ebuild
deleted file mode 100644
index c45b7b559cd6..000000000000
--- a/dev-ruby/request_store/request_store-1.3.0.ebuild
+++ /dev/null
@@ -1,23 +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_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Per-request global storage for Rack"
-HOMEPAGE="https://github.com/steveklabnik/request_store"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e "/bundler/ s:^:#:" Rakefile || die
-}
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 645dcfa828e4..52790d572953 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 26 Dec 2016 05:13:12 +0000
+Mon, 26 Dec 2016 06:43:13 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 645dcfa828e4..52790d572953 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 26 Dec 2016 05:13:12 +0000
+Mon, 26 Dec 2016 06:43:13 +0000
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.7.1-r5 b/metadata/md5-cache/app-emulation/xen-tools-4.7.1-r5
new file mode 100644
index 000000000000..81296f989855
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.7.1-r5
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] x86? ( sys-devel/dev86 sys-power/iasl ) pam? ( dev-python/pypam[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) >=dev-lang/python-2.7.5-r2:2.7[ncurses,xml,threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] api? ( dev-libs/libxml2 net-misc/curl ) ovmf? ( !arm? ( dev-lang/nasm ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) ) !amd64? ( >=sys-apps/dtc-1.4.0 ) amd64? ( sys-devel/bin86 system-seabios? ( sys-firmware/seabios ) sys-firmware/ipxe sys-devel/dev86 sys-power/iasl ) dev-lang/perl app-misc/pax-utils doc? ( app-doc/doxygen dev-python/markdown[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-tex/latex2html[png,gif] media-gfx/graphviz dev-tex/xcolor media-gfx/transfig dev-texlive/texlive-latexextra virtual/latex-base dev-tex/latexmk dev-texlive/texlive-latex dev-texlive/texlive-pictures dev-texlive/texlive-latexrecommended ) hvm? ( x11-proto/xproto !net-libs/libiscsi ) qemu? ( x11-libs/pixman sdl? ( media-libs/libsdl[X] ) ) system-qemu? ( app-emulation/qemu[xen] ) ocaml? ( dev-ml/findlib >=dev-lang/ocaml-4 )
+DESCRIPTION=Xen tools including QEMU and xl
+EAPI=5
+HOMEPAGE=http://xen.org/
+IUSE=api custom-cflags debug doc flask hvm +qemu ocaml ovmf +qemu-traditional +pam python pygrub screen sdl static-libs system-qemu system-seabios python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib sys-apps/iproute2[-minimal] net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate )
+REQUIRED_USE=python_targets_python2_7 pygrub? ( python ) ovmf? ( hvm ) ^^ ( qemu system-qemu )
+RESTRICT=test
+SLOT=0/4.7
+SRC_URI=http://bits.xensource.com/oss-xen/release/4.7.1/xen-4.7.1.tar.gz http://code.coreboot.org/p/seabios/downloads/get/seabios-1.8.2.tar.gz https://dev.gentoo.org/~dlan/distfiles/seabios-1.8.2.tar.gz ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-20151110.tar.bz2 https://dev.gentoo.org/~dlan/distfiles/xen-ovmf-patches-2.tar.xz ) https://dev.gentoo.org/~dlan/distfiles/xen-4.7.1-upstream-patches-0.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-security-patches-19.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-9.tar.xz
+_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=a61d692cefcbd768e0d40977f1c874ea
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.8.0-r1 b/metadata/md5-cache/app-emulation/xen-tools-4.8.0-r1
new file mode 100644
index 000000000000..cc57b83e9f7a
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.8.0-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] x86? ( sys-devel/dev86 sys-power/iasl ) pam? ( dev-python/pypam[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) >=dev-lang/python-2.7.5-r2:2.7[ncurses,xml,threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] api? ( dev-libs/libxml2 net-misc/curl ) ovmf? ( !arm? ( dev-lang/nasm ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) ) !amd64? ( >=sys-apps/dtc-1.4.0 ) amd64? ( sys-devel/bin86 system-seabios? ( sys-firmware/seabios ) sys-firmware/ipxe sys-devel/dev86 sys-power/iasl ) dev-lang/perl app-misc/pax-utils doc? ( app-doc/doxygen dev-python/markdown[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-tex/latex2html[png,gif] media-gfx/graphviz dev-tex/xcolor media-gfx/transfig dev-texlive/texlive-latexextra virtual/latex-base dev-tex/latexmk dev-texlive/texlive-latex dev-texlive/texlive-pictures dev-texlive/texlive-latexrecommended ) hvm? ( x11-proto/xproto !net-libs/libiscsi ) qemu? ( x11-libs/pixman sdl? ( media-libs/libsdl[X] ) ) system-qemu? ( app-emulation/qemu[xen] ) ocaml? ( dev-ml/findlib >=dev-lang/ocaml-4 )
+DESCRIPTION=Xen tools including QEMU and xl
+EAPI=5
+HOMEPAGE=http://xen.org/
+IUSE=api custom-cflags debug doc flask hvm +qemu ocaml ovmf +qemu-traditional +pam python pygrub screen sdl static-libs system-qemu system-seabios python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib sys-apps/iproute2[-minimal] net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate )
+REQUIRED_USE=python_targets_python2_7 pygrub? ( python ) ovmf? ( hvm ) ^^ ( qemu system-qemu )
+RESTRICT=test
+SLOT=0/4.8
+SRC_URI=http://bits.xensource.com/oss-xen/release/4.8.0/xen-4.8.0.tar.gz http://code.coreboot.org/p/seabios/downloads/get/seabios-1.10.0.tar.gz https://dev.gentoo.org/~dlan/distfiles/seabios-1.10.0.tar.gz ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-20151110.tar.bz2 https://dev.gentoo.org/~dlan/distfiles/xen-ovmf-patches-2.tar.xz ) https://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-9.tar.xz
+_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=d5bdce61b741bdacc3887a407e0f4deb
diff --git a/metadata/md5-cache/dev-ruby/ox-2.4.7 b/metadata/md5-cache/dev-ruby/ox-2.4.7
new file mode 100644
index 000000000000..54d82da5ea79
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ox-2.4.7
@@ -0,0 +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_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=A fast XML parser and Object marshaller
+EAPI=5
+HOMEPAGE=http://www.ohler.com/ox/ https://github.com/ohler55/ox
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=BSD
+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/ohler55/ox/archive/v2.4.7.tar.gz -> ox-2.4.7.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_=ee353fb684f2c466821fd5c9eda20850
diff --git a/metadata/md5-cache/dev-ruby/psych-2.2.2 b/metadata/md5-cache/dev-ruby/psych-2.2.2
new file mode 100644
index 000000000000..812129c2b5c0
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/psych-2.2.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=dev-libs/libyaml-0.1.7 ruby_targets_ruby20? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest: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? ( 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=A libyaml wrapper for Ruby
+EAPI=5
+HOMEPAGE=https://github.com/tenderlove/psych
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc 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_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/tenderlove/psych/archive/v2.2.2.tar.gz -> psych-2.2.2.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_=b289611288713c684f78245da0523812
diff --git a/metadata/md5-cache/dev-ruby/rdoc-5.0.0 b/metadata/md5-cache/dev-ruby/rdoc-5.0.0
index 182b3da407e4..f02add73fdfa 100644
--- a/metadata/md5-cache/dev-ruby/rdoc-5.0.0
+++ b/metadata/md5-cache/dev-ruby/rdoc-5.0.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ru
 SLOT=0
 SRC_URI=https://github.com/rdoc/rdoc/archive/v5.0.0.tar.gz -> rdoc-5.0.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_=fb3b29f4a5a274b78d83df4eadcd5ba0
+_md5_=6f6786d8fc862fc9777715e28b72ea67
diff --git a/metadata/md5-cache/dev-ruby/request_store-1.0.5 b/metadata/md5-cache/dev-ruby/request_store-1.0.5
index 58ca0c7885be..1e3d7cdf3d52 100644
--- a/metadata/md5-cache/dev-ruby/request_store-1.0.5
+++ b/metadata/md5-cache/dev-ruby/request_store-1.0.5
@@ -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? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+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? ( 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/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=Per-request global storage for Rack
 EAPI=5
 HOMEPAGE=https://github.com/steveklabnik/request_store
-IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~x86
 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=1.0.5
 SRC_URI=mirror://rubygems/request_store-1.0.5.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_=8f63332f9831e495e3ea5860900df6ff
+_md5_=6c621a505aea5ae0f8c7da51a159d7d8
diff --git a/metadata/md5-cache/dev-ruby/request_store-1.3.0 b/metadata/md5-cache/dev-ruby/request_store-1.3.0
deleted file mode 100644
index ee727f87fee7..000000000000
--- a/metadata/md5-cache/dev-ruby/request_store-1.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-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_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? ( 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=Per-request global storage for Rack
-EAPI=5
-HOMEPAGE=https://github.com/steveklabnik/request_store
-IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~amd64 ~x86
-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=mirror://rubygems/request_store-1.3.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_=f3240456532d89a9bf3ea46cc3c053e0
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 645dcfa828e4..52790d572953 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 26 Dec 2016 05:13:12 +0000
+Mon, 26 Dec 2016 06:43:13 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 2e32bde82072..e52f86754cc6 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Dec 26 05:09:23 UTC 2016
+Mon Dec 26 06:39:23 UTC 2016
diff --git a/metadata/timestamp.calculate b/metadata/timestamp.calculate
index 4bdcda0da939..ad66d4a63dc6 100644
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@@ -2095,6 +2095,8 @@
 1607112251 ./app-emulation/runc/runc-9999.ebuild
 1612120220 ./app-emulation/spice-vdagent/spice-vdagent-0.17.0.ebuild
 1508222225 ./app-emulation/spice-vdagent/spice-vdagent-0.16.0.ebuild
+1612260909 ./app-emulation/xen-tools/xen-tools-4.8.0-r1.ebuild
+1612260909 ./app-emulation/xen-tools/xen-tools-4.7.1-r5.ebuild
 1612131818 ./app-emulation/xen-tools/xen-tools-4.6.4-r4.ebuild
 1612080619 ./app-emulation/xen-tools/xen-tools-4.8.0.ebuild
 1612202034 ./app-emulation/xen-tools/xen-tools-4.7.1-r4.ebuild
@@ -33227,7 +33229,7 @@
 1603282232 ./dev-ruby/amq-client/amq-client-1.0.4.ebuild
 1610021214 ./dev-ruby/rdoc/rdoc-4.2.0.ebuild
 1608051116 ./dev-ruby/rdoc/rdoc-4.2.2.ebuild
-1612251258 ./dev-ruby/rdoc/rdoc-5.0.0.ebuild
+1612260917 ./dev-ruby/rdoc/rdoc-5.0.0.ebuild
 1611060939 ./dev-ruby/rdoc/rdoc-4.3.0.ebuild
 1603080844 ./dev-ruby/activesupport/activesupport-4.2.6.ebuild
 1611031739 ./dev-ruby/activesupport/activesupport-5.0.0.1.ebuild
@@ -33863,9 +33865,8 @@
 1605070741 ./dev-ruby/hiera/hiera-3.1.2.ebuild
 1603080014 ./dev-ruby/coderay/coderay-1.1.1.ebuild
 1610021220 ./dev-ruby/coderay/coderay-1.1.0-r2.ebuild
-1605100118 ./dev-ruby/request_store/request_store-1.0.5.ebuild
+1612260857 ./dev-ruby/request_store/request_store-1.0.5.ebuild
 1604030923 ./dev-ruby/request_store/request_store-1.3.1.ebuild
-1601171942 ./dev-ruby/request_store/request_store-1.3.0.ebuild
 1604220807 ./dev-ruby/ruby-tcpwrap/ruby-tcpwrap-0.6-r3.ebuild
 1612080933 ./dev-ruby/ragol/ragol-1.0.1-r2.ebuild
 1605200757 ./dev-ruby/execjs/execjs-2.7.0.ebuild
@@ -34393,6 +34394,7 @@
 1608170820 ./dev-ruby/ruby-shout/ruby-shout-2.2.2.ebuild
 1611140932 ./dev-ruby/psych/psych-2.2.0.ebuild
 1612110940 ./dev-ruby/psych/psych-2.2.1.ebuild
+1612260850 ./dev-ruby/psych/psych-2.2.2.ebuild
 1609080748 ./dev-ruby/psych/psych-2.1.1-r1.ebuild
 1611291040 ./dev-ruby/qed/qed-2.9.2.ebuild
 1603300829 ./dev-ruby/fattr/fattr-2.3.0.ebuild
@@ -34450,6 +34452,7 @@
 1607212237 ./dev-ruby/GeoRuby/GeoRuby-2.2.1-r2.ebuild
 1612181035 ./dev-ruby/GeoRuby/GeoRuby-2.5.2.ebuild
 1608100830 ./dev-ruby/ox/ox-2.4.4.ebuild
+1612260852 ./dev-ruby/ox/ox-2.4.7.ebuild
 1607060827 ./dev-ruby/ox/ox-2.4.3.ebuild
 1609120758 ./dev-ruby/ox/ox-2.4.5.ebuild
 1609110952 ./dev-ruby/debug_inspector/debug_inspector-0.0.2.ebuild
@@ -41169,6 +41172,7 @@
 1612221138 metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.0.30
 1610221339 metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-4.3.38.106717
 1611060208 metadata/md5-cache/app-emulation/crossover-bin-14.1.4-r1
+1612260938 metadata/md5-cache/app-emulation/xen-tools-4.8.0-r1
 1611200339 metadata/md5-cache/app-emulation/rkt-1.19.0
 1612181708 metadata/md5-cache/app-emulation/cloud-init-0.7.7
 1603210606 metadata/md5-cache/app-emulation/crossover-office-pro-bin-7.1.0
@@ -41346,6 +41350,7 @@
 1610221339 metadata/md5-cache/app-emulation/docker-registry-2.5.0
 1612151938 metadata/md5-cache/app-emulation/xe-guest-utilities-6.2.0_p1120
 1610230138 metadata/md5-cache/app-emulation/winetricks-99999999
+1612260938 metadata/md5-cache/app-emulation/xen-tools-4.7.1-r5
 1611060208 metadata/md5-cache/app-emulation/crossover-bin-14.0.3-r1
 1610280508 metadata/md5-cache/app-emulation/qemu-guest-agent-2.5.0
 1612030809 metadata/md5-cache/app-emulation/virt-viewer-5.0
@@ -72377,7 +72382,7 @@
 1612081009 metadata/md5-cache/dev-ruby/ragol-1.0.1-r2
 1611131808 metadata/md5-cache/dev-ruby/listen-3.0.8
 1612212209 metadata/md5-cache/dev-ruby/rrdtool-bindings-1.6.0
-1612251309 metadata/md5-cache/dev-ruby/rdoc-5.0.0
+1612260938 metadata/md5-cache/dev-ruby/rdoc-5.0.0
 1611131809 metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.9
 1611131809 metadata/md5-cache/dev-ruby/rspec-support-3.4.0
 1611131809 metadata/md5-cache/dev-ruby/roadie-3.2.0
@@ -72890,7 +72895,6 @@
 1612191008 metadata/md5-cache/dev-ruby/bson-4.2.0
 1611131809 metadata/md5-cache/dev-ruby/ruby-gettext-3.2.2
 1611131809 metadata/md5-cache/dev-ruby/net-ssh-3.0.2
-1611131809 metadata/md5-cache/dev-ruby/request_store-1.3.0
 1611131808 metadata/md5-cache/dev-ruby/bundler-audit-0.4.0
 1611131809 metadata/md5-cache/dev-ruby/sshkit-1.11.4
 1611131809 metadata/md5-cache/dev-ruby/pry-0.10.3
@@ -73047,6 +73051,7 @@
 1611131808 metadata/md5-cache/dev-ruby/hike-2.1.2
 1611131808 metadata/md5-cache/dev-ruby/asciimath-1.0.2
 1612041009 metadata/md5-cache/dev-ruby/cri-2.7.1
+1612260909 metadata/md5-cache/dev-ruby/ox-2.4.7
 1611131809 metadata/md5-cache/dev-ruby/method_source-0.8.2-r3
 1611131808 metadata/md5-cache/dev-ruby/listen-3.0.6
 1611131809 metadata/md5-cache/dev-ruby/metasploit_data_models-2.0.0
@@ -73415,6 +73420,7 @@
 1612240308 metadata/md5-cache/dev-ruby/redis-3.3.2
 1611131809 metadata/md5-cache/dev-ruby/session-3.2.0
 1612191039 metadata/md5-cache/dev-ruby/trollop-2.1.2
+1612260909 metadata/md5-cache/dev-ruby/psych-2.2.2
 1612260239 metadata/md5-cache/dev-ruby/rspec-rails-3.5.2-r1
 1611131809 metadata/md5-cache/dev-ruby/unf-0.1.4
 1611271209 metadata/md5-cache/dev-ruby/capistrano-2.15.5-r2
@@ -73559,7 +73565,7 @@
 1611131808 metadata/md5-cache/dev-ruby/ffi-1.9.10-r1
 1611131808 metadata/md5-cache/dev-ruby/http_parser_rb-0.6.0-r1
 1611131809 metadata/md5-cache/dev-ruby/ruby2ruby-2.3.0
-1611131809 metadata/md5-cache/dev-ruby/request_store-1.0.5
+1612260909 metadata/md5-cache/dev-ruby/request_store-1.0.5
 1611131809 metadata/md5-cache/dev-ruby/slop-4.4.1
 1611131809 metadata/md5-cache/dev-ruby/paint-1.0.1
 1611131809 metadata/md5-cache/dev-ruby/patron-0.5.0-r1
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index dfb30840861e..aad5220db321 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 26 Dec 2016 05:30:01 +0000
+Mon, 26 Dec 2016 07:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index ab94f60989a6..e1f2950c8931 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1482729001 Mon 26 Dec 2016 05:10:01 AM UTC
+1482734401 Mon 26 Dec 2016 06:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 645dcfa828e4..52790d572953 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 26 Dec 2016 05:13:12 +0000
+Mon, 26 Dec 2016 06:43:13 +0000