Sync with portage [Mon Jun 15 15:56:05 MSK 2015].

9 years ago · 74a8545551
parent 3ad9358e05
commit 74a8545551
117 changed files with 1916 additions and 1375 deletions
--- a/app-cdr/cdemu-daemon/metadata.xml
+++ b/app-cdr/cdemu-daemon/metadata.xml
@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>tetromino@gentoo.org</email>
-  <name>Alexandre Rostovtsev</name>
-</maintainer>
+  <maintainer>
+    <email>tetromino@gentoo.org</email>
+    <name>Alexandre Rostovtsev</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">cdemu</remote-id>
+  </upstream>
 </pkgmetadata>
--- a/app-cdr/cdemu/metadata.xml
+++ b/app-cdr/cdemu/metadata.xml
@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>tetromino@gentoo.org</email>
-  <name>Alexandre Rostovtsev</name>
-</maintainer>
-<use>
-  <flag name='cdemu-daemon'>Pull <pkg>app-cdr/cdemu-daemon</pkg> dependency, useful in chroot environment (bug #315491). Do not disable until you know what you are doing.</flag>
-</use>
+  <maintainer>
+    <email>tetromino@gentoo.org</email>
+    <name>Alexandre Rostovtsev</name>
+  </maintainer>
+  <use>
+    <flag name="cdemu-daemon">Pull <pkg>app-cdr/cdemu-daemon</pkg> dependency, useful in chroot environment (bug #315491). Do not disable until you know what you are doing.</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">cdemu</remote-id>
+  </upstream>
 </pkgmetadata>
--- a/app-editors/juffed/metadata.xml
+++ b/app-editors/juffed/metadata.xml
@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>qt</herd>
+	<upstream>
+		<remote-id type="sourceforge">juffed</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-emulation/xen-pvgrub/xen-pvgrub-4.5.0-r1.ebuild
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.5.0-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.5.0-r1.ebuild,v 1.4 2015/06/09 07:22:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.5.0-r1.ebuild,v 1.5 2015/06/15 10:31:22 idella4 Exp $

 EAPI=5

@ -27,7 +27,7 @@ DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest
 HOMEPAGE="http://xen.org/"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 -x86"
 IUSE="custom-cflags"

 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@ -3,12 +3,16 @@ DIST seabios-1.6.3.2.tar.gz 422376 SHA256 888aafe37ef3d1f502a73518a5e4dd0e9373ce
 DIST seabios-1.7.3.1.tar.gz 463801 SHA256 e1f5845c3fa01a9280421d587dcd866273d5d6c0002b9fe70a6736e56ef5c36f SHA512 6b2c376f6c2644e1ecad687079fc8ec63eb064b82ec3ac2d24f4ec7b56432c7ed69d41539e7b212aa134368272198bdaf50fed23637a29fcf1e653db008b2009 WHIRLPOOL 8e37ef66722580b9db67c5b98282e23074847eadbdd2db5ed8b999d25c1ce7cbe9ab54fbbb15d2985f403e18e6b2fa2ea36d87ce46ec30b0e5bbbc0f69623007
 DIST seabios-1.7.5.tar.gz 537566 SHA256 858d9eda4ad91efa1c45a5a401d560ef9ca8dd172f03b0a106f06661c252dc51 SHA512 ecf5fb9ac44dde6e4ac00baa6c920dde51b923f23dd74e62c5a02eceaf235e57b885975c5a8bd0927e268115c72bd1143a080fdfd4eff4e168ebeaa30436280e WHIRLPOOL 5e1e99b3bd82a8607c5986fde4592c7437bec4bd78abd5873710f6c431d075436725e8d0d32e9f0dd2921c9d84b8613108b21d31c5309a73e337ead7adf35e90
 DIST xen-4.2.5-upstream-patches-8.tar.xz 22468 SHA256 611257c09593cd125dd5c822e44f493f8b64baf3c4a2b7c9a9d092c53f8e0595 SHA512 bb2ec5f3ec8a7f32a5017b586d31d368fcbc400d394a77b427efc08b9802bd8280d61df597755624837326addaf957c8715d585653fd6faa64f6abe7c2507b01 WHIRLPOOL 26412d7ba5703180ae20fe5423a313cada4903f3236389854fb13cb9d193d5d137f8bbb71db2bc4b1397a57bf4e66538445dc63cc708b537b0f247026bc38b7d
+DIST xen-4.2.5-upstream-patches-9.tar.xz 23208 SHA256 2206e9a8aeeed207abbae995c5d2baa14d5f0da4120ae44f2de733ecf7ea5af1 SHA512 8a2edaba48002449a521edf2ae078ffe1b3db4f491a85b063886a147a0be3ec7fdb819ce84c90cdae80ed34c10ab2d637506700be10052a67be6ef128fa40fb1 WHIRLPOOL 037820e0fad60d1f7ed054efa797585c992d08f1ffd533705c515ad289f8cdddc72b97f2a3d75ebd683c6bb6988d7285452b4f3cebbe9a879f701156e387ff3b
 DIST xen-4.2.5.tar.gz 15671925 SHA256 3cf440866315e8085050eb0586f0447b6b47a08dbed6a72226bf5ed5d89ec567 SHA512 42c0fc241952fc55fc44480fb6752b004b54ae40e946159ec047adf229b65cbfbd810271d01b064ad8fdbddb73c640dcdcb6bc19f91e8968829889c129920dac WHIRLPOOL 762a91c0111892b33e6bd3e7f7714709b04697ad7c2b0919fef6cc9570a343a77fd5a2b82833e75dac9d12d4e41acdcf0743b0d593595910ddd326f5cd721368
 DIST xen-4.4.2-upstream-patches-1.tar.xz 20156 SHA256 2680f5015477f132b308ad77de9a2eb5ec1c696debd5584c8e3f9358a6bf348f SHA512 ea14def52e865e35b75ffea2a8233919f7cb97d1832e258e2b9d78642ceb089fa8bcc46bca757407ade744d9c55669daaa55a7a896aa9223bd5f57aa242fc330 WHIRLPOOL bf8351ac9f098a9ca48e158751b505e8bec4ea2fe163790850ddba24cd29f00616dc984f16ef2514c45aa6d8a46030caf71fa8e01412e8f05dbb0f3dd008efe5
+DIST xen-4.4.2-upstream-patches-2.tar.xz 21064 SHA256 39ba1235c4e87b43fc979a939f7f2bab9436d517c9d22fa372c549ae7a92e35f SHA512 e3ffe41431c35382d67a874e1af919f93c47cfb8b85500b2812a64b630ff5a96dae177245c1e2c00f121bb55ff067e4356b016596c8cd6f6d49cde8816fd7e5e WHIRLPOOL 518a7490e741e0fce64329e4e78cae5ebc1d2a1facf4547977b2770de8c68fc003db7ccd1192bee3c0f1e50abec36f85f70b26b31c85f4e17006792571550c1b
 DIST xen-4.4.2.tar.gz 18137195 SHA256 cd53592e86669e5e8c4d4a731b0199e8af17d8eadbb8f26dbb69f1b751259204 SHA512 7dae2a1d601d5c65c350ea9fe9870551ec53dff47b6ebe56e99285fd1112aa1cba3a2594e294b871defcf43fb7fccace9f18910e69f02dfce162d7bf453eb07b WHIRLPOOL 2dfe3de5fd800d2172ad2c95117e0646c6b2045cfcb9fa5eccc46b695f1c58aa861bf2a591f78db5baf5a89894b3fa26dc1ba63cb0d57f87be4df5c445c82a94
 DIST xen-4.5.0-upstream-patches-5.tar.xz 63804 SHA256 b6f1f1fb799a8480d2fa17625d5d43b143f54722152978fdfdd13b0dfa7db33f SHA512 a234b97ddb63bfb72a5a34ad13a5d6f694d35d4efd6ed0c20380c240022eb3e7c7f12451ecc24f32bf7fe7578cfe3da8ccd4718bd9d445d120e4c5d65bb7a2ad WHIRLPOOL ff50b5c0ce237b88d56a535070d89b8c8d10bce4a1feddf0698b4112cdd9ff76bc4bf33bc7f1c4cb719e4090560b437342ec18b6f517dacb3ed0432f3ec68f08
+DIST xen-4.5.0-upstream-patches-6.tar.xz 67084 SHA256 de1d331b18c0d15a1d438e29da27e48e6fa2b34282079710ddc2c36693ac897d SHA512 7f9f128e6aaf9002065acb1985fb29e36ac3c3cdc75625bad0f0719995dc99b421ae080ab3c401c3a5fb6f3de400f15d01817760312151df5eb3724ac5e0540a WHIRLPOOL b9ae4e184e5d3f2ca7eadef8914b6c7af13761da21d5a72fdc035db8193b1984fed76a38c4d90f0df42570f91f4b15f77c095b89d4bea525984adb74ece2631e
 DIST xen-4.5.0.tar.gz 18404933 SHA256 5bdb40e2b28d2eeb541bd71a9777f40cbe2ae444b987521d33f099541a006f3b SHA512 31621fbaf621ad350125d03366ecff4dec5d810b0c1242ca0e28788f7556ac1443d7ee9247e1f76dec07e148e0b4ae16d08a7c10101bb78d6529375f3e40998e WHIRLPOOL 4a77588a4aa4846cfbf9493ab20bd2f293c55a941a5639fdd166a43f284cc0cc7218969def755a1acd89e640181bdd862fff0b566cfb8e628d73deeb6369c924
 DIST xen-gentoo-patches-1.tar.xz 23044 SHA256 dcff35bbc4b6946473c9b55ad595a5fea88e8dac1bd977cbe18a644b2cced2e0 SHA512 a4c66382d44112e7be09711e3ecf0f8ebd9a30b29e04d8aca536430172bdd111ab8bab7700433e0dc35165f876eb7e9cd2e554d74ce2a166fb2dfd4de482cb7a WHIRLPOOL d0443e1501ac813ac3226df32a6b050c03302c3d74e3b3bd1293ab4ad929b5c314cc0eac13505ce8a826ee357117e8eeaf0713fd8b9c55f40296966fda082c2e
 DIST xen-gentoo-patches-4.tar.xz 23632 SHA256 5cdb0f93ee32d0a5fc4fc7282270ace73acfdc4df694f7b29c1135180d902049 SHA512 3006ce4cd67e80a9f79d9ba3814a64704b0d762159a439a140b1ec0a2699473cd5537950f0913b55f8f7e3d0fd2e9861f3199793120d8d2502aa3f8ef7816c8f WHIRLPOOL 4a921103df2825ccd8b0481708e7cd692fa45d5aadae286c1522c144a1576920e7d3567648565bb9af85bb6bb597ea9d0ec04ea6abd2115db4caf7e739717b1a
 DIST xen-ovmf-patches-0.tar.xz 4356 SHA256 cd192a98114e534ce7454dc7ea45a42cea7ca83899d01fc8d695e2b110fdeaaf SHA512 03b844040ebad1a18d759418b0107d56feb9b8095291b7da1d36eb3409041764ad4bfd87679176b820221180e1038f6fad4314e8ad877096c052505de6339cf8 WHIRLPOOL e5c0aca3c786d905ad13f4d58a3b9b78260350df3dbe769ea6b66ac409e25ea0a368f9554c9da9b1a3f6f01ea1540038893b496fa5e637b18007076f8d305ee6
 DIST xen-security-patches-2.tar.xz 15272 SHA256 361e828275e3c32333ae6e6e7fce3bd926334f0d89103d762b3a75ac7a4ec3c0 SHA512 3942ec23adc8e28ed2a4162a591da16a96cf7890534558cfcaf4c1530c1dd2324a0417735b6f05843f904c5bb6e5ccb443381e5b9a6647af79d5eec2380453b3 WHIRLPOOL 77106b93e8ccdfcf0d67d6eaf97ecc22e30664878c7a85b03f986ac565e23749408ab1de93dd9bbea154c05dc209cc63b48cd9d9da9074ed4fbb53eff506c4fb
+DIST xen-security-patches-3.tar.xz 17028 SHA256 fb6301beb9a5c2d1e5d4de8783d8670e382b1bef48ec61e73d2d9be6901d289f SHA512 787fee8f7822577c6de91c4cf4d56d0e73ce46bac5524537ff66a718b6d7eae9d362265515743e8577b2c75f2841baed9837f71467b3b7b91a3111220da5f236 WHIRLPOOL 5c136289e654776bf918fe125fbecba7dac0929b236f7ae8158026a6bd6be12bc786a5ec96cb4022c18a5e7ffde82155deb57eb9639600e4c42c9c209f4a2ed6
--- a/app-emulation/xen-tools/xen-tools-4.2.5-r7.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.2.5-r7.ebuild
@ -0,0 +1,370 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.5-r7.ebuild,v 1.1 2015/06/15 08:52:11 dlan Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='xml,threads'
+
+if [[ $PV == *9999 ]]; then
+	KEYWORDS=""
+	REPO="xen-unstable.hg"
+	EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
+	S="${WORKDIR}/${REPO}"
+	live_eclass="mercurial"
+else
+	KEYWORDS="~amd64 ~x86"
+	UPSTREAM_VER=9
+	SECURITY_VER=3
+	# xen-tools's gentoo patches tarball
+	GENTOO_VER=1
+	# xen-tools's gentoo patches version which apply to this specific ebuild
+	GENTOO_GPV=0
+	SEABIOS_VER=1.6.3.2
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
+
+	SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
+	http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
+	http://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
+	${UPSTREAM_PATCHSET_URI}
+	${SECURITY_PATCHSET_URI}
+	${GENTOO_PATCHSET_URI}"
+	S="${WORKDIR}/xen-${PV}"
+fi
+
+inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass}
+
+DESCRIPTION="Xend daemon and tools"
+HOMEPAGE="http://xen.org/"
+DOCS=( README docs/README.xen-bugtool )
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="api custom-cflags debug doc flask hvm qemu ocaml pygrub screen static-libs system-seabios"
+
+REQUIRED_USE="hvm? ( qemu )
+	${PYTHON_REQUIRED_USE}"
+
+DEPEND="dev-libs/lzo:2
+	dev-libs/glib:2
+	dev-libs/yajl
+	dev-libs/libgcrypt:0
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pypam[${PYTHON_USEDEP}]
+	sys-libs/zlib
+	sys-power/iasl
+	system-seabios? ( sys-firmware/seabios )
+	sys-firmware/ipxe
+	dev-ml/findlib
+	hvm? ( media-libs/libsdl )
+	${PYTHON_DEPS}
+	api? ( dev-libs/libxml2
+		net-misc/curl )
+	${PYTHON_DEPS}
+	pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} )
+	sys-devel/bin86
+	sys-devel/dev86
+	dev-lang/perl
+	app-misc/pax-utils
+	doc? (
+		app-doc/doxygen
+		dev-tex/latex2html[png,gif]
+		media-gfx/transfig
+		media-gfx/graphviz
+		dev-tex/xcolor
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+		dev-tex/latexmk
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-pictures
+		dev-texlive/texlive-latexrecommended
+	)
+	hvm? (  x11-proto/xproto
+		!net-libs/libiscsi )"
+RDEPEND="sys-apps/iproute2
+	net-misc/bridge-utils
+	ocaml? ( >=dev-lang/ocaml-4 )
+	screen? (
+		app-misc/screen
+		app-admin/logrotate
+	)
+	virtual/udev"
+
+# hvmloader is used to bootstrap a fully virtualized kernel
+# Approved by QA team in bug #144032
+QA_WX_LOAD="usr/lib/xen/boot/hvmloader"
+
+RESTRICT="test"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	export "CONFIG_LOMOUNT=y"
+
+	#bug 522642, disable compile tools/tests
+	export "CONFIG_TESTS=n"
+
+	if has_version dev-libs/libgcrypt:0; then
+		export "CONFIG_GCRYPT=y"
+	fi
+
+	if use qemu; then
+		export "CONFIG_IOEMU=y"
+	else
+		export "CONFIG_IOEMU=n"
+	fi
+
+	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64 ; then
+			export XEN_TARGET_ARCH="x86_64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+
+	use api     && export "LIBXENAPI_BINDINGS=y"
+	use flask   && export "FLASK_ENABLE=y"
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		einfo "Try to apply Xen Upstream patcheset"
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-upstream
+	fi
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+		einfo "Try to apply Xen Security patcheset"
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}/patches-security/${PV}"
+	fi
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
+		einfo "Try to apply Gentoo specific patcheset"
+		source "${FILESDIR}"/gentoo-patches.conf
+		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
+		for i in ${!_gpv}; do
+			EPATCH_SUFFIX="patch" \
+			EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches-gentoo/$i
+		done
+	fi
+
+	use system-seabios && epatch "${WORKDIR}"/patches-gentoo/${PN}-4-unbundle-seabios.patch
+
+	if gcc-specs-pie; then
+		epatch "${WORKDIR}"/patches-gentoo/ipxe-nopie.patch
+	fi
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+
+		# try and remove all the default cflags
+		find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
+			-exec sed \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+				-i {} + || die "failed to re-set custom-cflags"
+	fi
+
+	if ! use pygrub; then
+		sed -e '/^SUBDIRS-$(PYTHON_TOOLS) += pygrub$/d' -i tools/Makefile || die
+	fi
+
+	# Disable hvm support on systems that don't support x86_32 binaries.
+	if ! use hvm; then
+		sed -e '/^CONFIG_IOEMU := y$/d' -i config/*.mk || die
+		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
+	# Bug 351648
+	elif ! use x86 && ! has x86 $(get_all_abis); then
+		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
+		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
+		export CPATH="${WORKDIR}"/extra-headers
+	fi
+
+	# Don't bother with qemu, only needed for fully virtualised guests
+	if ! use qemu; then
+		sed -e "/^CONFIG_IOEMU := y$/d" -i config/*.mk || die
+		sed -e "s:install-tools\: tools/ioemu-dir:install-tools\: :g" -i Makefile || die
+	fi
+
+	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
+	pushd tools/firmware/ > /dev/null
+	ln -s seabios-dir-remote seabios-dir || die
+	popd > /dev/null
+
+	# Reset bash completion dir; Bug 472438
+	sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
+		-i Config.mk || die
+	sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
+
+	# Bug 445986
+	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' -i tools/firmware/Makefile || die
+
+	# fix QA warning, create /var/run/, /var/lock dynamically
+	sed -i -e "/\$(INSTALL_DIR) \$(DESTDIR)\$(XEN_RUN_DIR)/d" \
+		tools/libxl/Makefile || die
+
+	sed -i -e "/\/var\/run\//d" \
+		tools/xenstore/Makefile \
+		tools/pygrub/Makefile || die
+
+	sed -i -e "/\/var\/lock\/subsys/d" \
+		tools/Makefile || die
+
+	# xencommons, Bug #492332, sed lighter weight than patching
+	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
+		-i tools/hotplug/Linux/init.d/xencommons || die
+
+	epatch_user
+}
+
+src_compile() {
+	export VARTEXFONTS="${T}/fonts"
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	use custom-cflags || unset CFLAGS
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	unset LDFLAGS
+	unset CFLAGS
+	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
+
+	use doc && emake -C docs txt html
+	emake -C docs man-pages
+}
+
+src_install() {
+	# Override auto-detection in the build system, bug #382573
+	export INITD_DIR=/tmp/init.d
+	export CONFIG_LEAF_DIR=../tmp/default
+
+	# Let the build system compile installed Python modules.
+	local PYTHONDONTWRITEBYTECODE
+	export PYTHONDONTWRITEBYTECODE
+
+	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" install-tools \
+		XEN_PYTHON_NATIVE_INSTALL=y install-tools
+	# Fix the remaining Python shebangs.
+	python_fix_shebang "${ED}"
+
+	# Remove RedHat-specific stuff
+	rm -rf "${D}"tmp || die
+
+	# uncomment lines in xl.conf
+	sed -e 's:^#autoballoon=1:autoballoon=1:' \
+		-e 's:^#lockfile="/var/lock/xl":lockfile="/var/lock/xl":' \
+		-e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \
+		-i tools/examples/xl.conf  || die
+
+	if use doc; then
+		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
+
+		dohtml -r docs/
+		docinto pdf
+		dodoc ${DOCS[@]}
+		[ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
+	fi
+
+	rm -rf "${D}"/usr/share/doc/xen/
+	doman docs/man?/*
+
+	newconfd "${FILESDIR}"/xendomains.confd xendomains
+	newconfd "${FILESDIR}"/xenstored.confd xenstored
+	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
+	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
+	newinitd "${FILESDIR}"/xenstored.initd xenstored
+	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
+	newinitd "${FILESDIR}"/xencommons.initd xencommons
+	newconfd "${FILESDIR}"/xencommons.confd xencommons
+
+	if use screen; then
+		cat "${FILESDIR}"/xendomains-screen.confd >> "${ED}"/etc/conf.d/xendomains || die
+		cp "${FILESDIR}"/xen-consoles.logrotate "${ED}"/etc/xen/ || die
+		keepdir /var/log/xen-consoles
+	fi
+
+	if [[ "${ARCH}" == 'amd64' ]] && use qemu; then
+		mkdir -p "${D}"usr/$(get_libdir)/xen/bin || die
+		mv "${D}"usr/lib/xen/bin/qemu* "${D}"usr/$(get_libdir)/xen/bin/ || die
+	fi
+
+	# For -static-libs wrt Bug 384355
+	if ! use static-libs; then
+		rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
+	fi
+
+	# xend expects these to exist
+	keepdir /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen
+
+	# for xendomains
+	keepdir /etc/xen/auto
+
+	# Temp QA workaround
+	dodir "$(get_udevdir)"
+	mv "${D}"/etc/udev/* "${D}/$(get_udevdir)"
+	rm -rf "${D}"/etc/udev
+
+	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
+	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
+		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the offical wiki page:"
+	elog "http://www.gentoo.org/doc/en/xen-gu"${D}"usr/ide.xml"
+	elog "http://wiki.xen.org/wiki/Main_Page"
+	elog ""
+	elog "Recommended to utilise the xencommons script to config sytem at boot."
+	elog "Add by use of rc-update on completion of the install"
+
+	# TODO: we need to have the current Python slot here.
+	if ! has_version "dev-lang/python[ncurses]"; then
+		echo
+		ewarn "NB: Your dev-lang/python is built without USE=ncurses."
+		ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py."
+	fi
+
+	if has_version "sys-apps/iproute2[minimal]"; then
+		echo
+		ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking"
+		ewarn "will not work until you rebuild iproute2 without USE=minimal."
+	fi
+
+	if ! use hvm; then
+		echo
+		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
+		elog "support enable the hvm use flag."
+		elog "An x86 or amd64 system is required to build HVM support."
+	fi
+
+	if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then
+		echo
+		elog "xensv is broken upstream (Gentoo bug #142011)."
+		elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed."
+	fi
+}
--- a/app-emulation/xen-tools/xen-tools-4.4.2-r4.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.4.2-r4.ebuild
@ -0,0 +1,447 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.4.2-r4.ebuild,v 1.1 2015/06/15 08:52:11 dlan Exp $
+
+EAPI=5
+
+MY_PV=${PV/_/-}
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='xml,threads'
+
+if [[ $PV == *9999 ]]; then
+	KEYWORDS=""
+	REPO="xen-unstable.hg"
+	EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
+	S="${WORKDIR}/${REPO}"
+	live_eclass="mercurial"
+else
+	KEYWORDS="~amd64 ~arm ~x86"
+	UPSTREAM_VER=2
+	SECURITY_VER=3
+	# xen-tools's gentoo patches tarball
+	GENTOO_VER=4
+	# xen-tools's gentoo patches version which apply to this specific ebuild
+	GENTOO_GPV=1
+	# xen-tools ovmf's patches
+	OVMF_VER=0
+
+	SEABIOS_VER=1.7.3.1
+	OVMF_PV=20131208
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	[[ -n ${OVMF_VER} ]] && \
+		OVMF_PATCHSET_URI="http://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
+	http://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
+	ovmf? ( http://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.bz2
+		${OVMF_PATCHSET_URI} )
+	${UPSTREAM_PATCHSET_URI}
+	${SECURITY_PATCHSET_URI}
+	${GENTOO_PATCHSET_URI}"
+	S="${WORKDIR}/xen-${MY_PV}"
+fi
+
+inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass}
+
+DESCRIPTION="Xend daemon and tools"
+HOMEPAGE="http://xen.org/"
+DOCS=( README docs/README.xen-bugtool )
+
+LICENSE="GPL-2"
+SLOT="0"
+# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
+# >=dev-lang/ocaml-4 stable
+# Masked in profiles/eapi-5-files instead
+IUSE="api custom-cflags debug doc flask hvm qemu ocaml ovmf +pam python pygrub screen static-libs system-qemu system-seabios"
+
+REQUIRED_USE="hvm? ( || ( qemu system-qemu ) )
+	${PYTHON_REQUIRED_USE}
+	pygrub? ( python )
+	ovmf? ( hvm )
+	qemu? ( !system-qemu )"
+
+COMMON_DEPEND="
+	dev-libs/lzo:2
+	dev-libs/glib:2
+	dev-libs/yajl
+	dev-libs/libaio
+	dev-libs/libgcrypt:0
+	sys-libs/zlib
+"
+
+DEPEND="${COMMON_DEPEND}
+	dev-python/lxml[${PYTHON_USEDEP}]
+	pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
+	hvm? ( media-libs/libsdl )
+	${PYTHON_DEPS}
+	api? ( dev-libs/libxml2
+		net-misc/curl )
+	pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} )
+	ovmf? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/sqlite} )
+	arm? ( >=sys-apps/dtc-1.4.0 )
+	!arm? ( sys-devel/bin86
+		system-seabios? ( sys-firmware/seabios )
+		sys-firmware/ipxe
+		sys-devel/dev86
+		sys-power/iasl )
+	dev-lang/perl
+	app-misc/pax-utils
+	dev-python/markdown[${PYTHON_USEDEP}]
+	doc? (
+		app-doc/doxygen
+		dev-tex/latex2html[png,gif]
+		media-gfx/graphviz
+		dev-tex/xcolor
+		media-gfx/transfig
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+		dev-tex/latexmk
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-pictures
+		dev-texlive/texlive-latexrecommended
+	)
+	hvm? ( x11-proto/xproto
+		!net-libs/libiscsi )
+	qemu? ( x11-libs/pixman )
+	system-qemu? ( app-emulation/qemu[xen] )
+	ocaml? ( dev-ml/findlib
+		>=dev-lang/ocaml-4 )"
+
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/iproute2
+	net-misc/bridge-utils
+	screen? (
+		app-misc/screen
+		app-admin/logrotate
+	)
+	virtual/udev"
+
+# hvmloader is used to bootstrap a fully virtualized kernel
+# Approved by QA team in bug #144032
+QA_WX_LOAD="usr/lib/xen/boot/hvmloader
+	usr/share/qemu-xen/qemu/s390-ccw.img"
+
+RESTRICT="test"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	export "CONFIG_LOMOUNT=y"
+
+	#bug 522642, disable compile tools/tests
+	export "CONFIG_TESTS=n"
+
+	if has_version dev-libs/libgcrypt:0; then
+		export "CONFIG_GCRYPT=y"
+	fi
+
+	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64 ; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		einfo "Try to apply Xen Upstream patcheset"
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-upstream
+	fi
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+		einfo "Try to apply Xen Security patcheset"
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}/patches-security/${PV}"
+	fi
+
+	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
+	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
+	pushd tools/firmware/ > /dev/null
+	ln -s seabios-dir-remote seabios-dir || die
+	popd > /dev/null
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
+		einfo "Try to apply Gentoo specific patcheset"
+		source "${FILESDIR}"/gentoo-patches.conf
+		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
+		for i in ${!_gpv}; do
+			EPATCH_SUFFIX="patch" \
+			EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches-gentoo/$i
+		done
+	fi
+
+	# Ovmf's patchset
+	if [[ -n ${OVMF_VER} ]] && use ovmf; then
+		einfo "Try to apply Ovmf patcheset"
+		pushd "${WORKDIR}"/ovmf-*/ > /dev/null
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-ovmf
+		popd > /dev/null
+		mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
+	fi
+
+	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
+
+	# Fix texi2html build error with new texi2html, qemu.doc.html
+	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
+
+	use api   || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
+	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
+		 -i tools/firmware/Makefile || die
+
+	# Drop .config, fixes to gcc-4.6
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+
+		# try and remove all the default cflags
+		find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
+			-exec sed \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+				-i {} + || die "failed to re-set custom-cflags"
+	fi
+
+	if ! use pygrub; then
+		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
+	fi
+
+	if ! use python; then
+		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
+	fi
+
+	if ! use hvm; then
+		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
+	# Bug 351648
+	elif ! use x86 && ! has x86 $(get_all_abis); then
+		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
+		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
+		export CPATH="${WORKDIR}"/extra-headers
+	fi
+
+	# Don't bother with qemu, only needed for fully virtualised guests
+	if ! use qemu; then
+		sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die
+	fi
+
+	# Reset bash completion dir; Bug 472438
+	sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
+		-i Config.mk || die
+	sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
+
+	# xencommons, Bug #492332, sed lighter weight than patching
+	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
+		-i tools/hotplug/Linux/init.d/xencommons || 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
+
+	# Bug 477884, 518136
+	if [[ "${ARCH}" == 'amd64' ]]; then
+		sed -i -e "/LIBEXEC =/s|/lib/xen/bin|/$(get_libdir)/xen/bin|" config/StdGNU.mk || die
+	fi
+
+	# fix QA warning, create /var/run/, /var/lock dynamically
+	sed -i -e "/\$(INSTALL_DIR) \$(DESTDIR)\$(XEN_RUN_DIR)/d" \
+		tools/libxl/Makefile || die
+
+	sed -i -e "/\/var\/run\//d" \
+		tools/xenstore/Makefile \
+		tools/pygrub/Makefile || die
+
+	sed -i -e "/\/var\/lock\/subsys/d" \
+		tools/Makefile || die
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf="--prefix=/usr \
+		--libdir=/usr/$(get_libdir) \
+		--disable-werror \
+		--disable-xen \
+		--enable-tools \
+		--enable-docs \
+		$(use_with system-qemu) \
+		$(use_enable pam) \
+		$(use_enable api xenapi) \
+		$(use_enable ovmf) \
+		$(use_enable ocaml ocamltools) \
+		"
+	# disable qemu-traditional for arm, fail to build
+	use arm || myconf+=" --enable-qemu-traditional"
+	use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
+	use qemu || myconf+=" --with-system-qemu"
+	econf ${myconf}
+}
+
+src_compile() {
+	export VARTEXFONTS="${T}/fonts"
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	use custom-cflags || unset CFLAGS
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	unset LDFLAGS
+	unset CFLAGS
+	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
+
+	use doc && emake -C docs txt html
+	emake -C docs man-pages
+}
+
+src_install() {
+	# Override auto-detection in the build system, bug #382573
+	export INITD_DIR=/tmp/init.d
+	export CONFIG_LEAF_DIR=../tmp/default
+
+	# Let the build system compile installed Python modules.
+	local PYTHONDONTWRITEBYTECODE
+	export PYTHONDONTWRITEBYTECODE
+
+	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
+		XEN_PYTHON_NATIVE_INSTALL=y install-tools
+
+	# Fix the remaining Python shebangs.
+	python_fix_shebang "${D}"
+
+	# Remove RedHat-specific stuff
+	rm -rf "${D}"tmp || die
+
+	# uncomment lines in xl.conf
+	sed -e 's:^#autoballoon=1:autoballoon=1:' \
+		-e 's:^#lockfile="/var/lock/xl":lockfile="/var/lock/xl":' \
+		-e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \
+		-i tools/examples/xl.conf  || die
+
+	if use doc; then
+		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
+
+		dohtml -r docs/
+		docinto pdf
+		dodoc ${DOCS[@]}
+		[ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
+	fi
+
+	rm -rf "${D}"/usr/share/doc/xen/
+	doman docs/man?/*
+
+	newconfd "${FILESDIR}"/xendomains.confd xendomains
+	newconfd "${FILESDIR}"/xenstored.confd xenstored
+	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
+	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
+	newinitd "${FILESDIR}"/xenstored.initd xenstored
+	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
+	newinitd "${FILESDIR}"/xencommons.initd xencommons
+	newconfd "${FILESDIR}"/xencommons.confd xencommons
+	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
+
+	# xend expects these to exist
+	keepdir /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen
+
+	# for xendomains
+	keepdir /etc/xen/auto
+
+	# Temp QA workaround
+	dodir "$(get_udevdir)"
+	mv "${D}"/etc/udev/* "${D}/$(get_udevdir)"
+	rm -rf "${D}"/etc/udev
+
+	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
+	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
+		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the offical wiki page:"
+	elog "https://wiki.gentoo.org/wiki/Xen"
+	elog "http://wiki.xen.org/wiki/Main_Page"
+	elog ""
+	elog "Recommended to utilise the xencommons script to config sytem At boot"
+	elog "Add by use of rc-update on completion of the install"
+
+	# TODO: we need to have the current Python slot here.
+	if ! has_version "dev-lang/python[ncurses]"; then
+		echo
+		ewarn "NB: Your dev-lang/python is built without USE=ncurses."
+		ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py."
+	fi
+
+	if has_version "sys-apps/iproute2[minimal]"; then
+		echo
+		ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking"
+		ewarn "will not work until you rebuild iproute2 without USE=minimal."
+	fi
+
+	if ! use hvm; then
+		echo
+		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
+		elog "support enable the hvm use flag."
+		elog "An x86 or amd64 system is required to build HVM support."
+	fi
+
+	if use qemu; then
+		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
+		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
+		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
+		elog "the qemu-bridge-helper and the xen-bridge-helper.  File bugs of any issues that arise"
+	fi
+
+	if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then
+		echo
+		elog "xensv is broken upstream (Gentoo bug #142011)."
+		elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed."
+	fi
+}
--- a/app-emulation/xen-tools/xen-tools-4.5.0-r6.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.5.0-r6.ebuild
@ -0,0 +1,437 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.5.0-r6.ebuild,v 1.1 2015/06/15 08:52:11 dlan Exp $
+
+EAPI=5
+
+MY_PV=${PV/_/-}
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='xml,threads'
+
+if [[ $PV == *9999 ]]; then
+	KEYWORDS=""
+	REPO="xen-unstable.hg"
+	EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
+	S="${WORKDIR}/${REPO}"
+	live_eclass="mercurial"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 -x86"
+	UPSTREAM_VER=6
+	SECURITY_VER=3
+	# xen-tools's gentoo patches tarball
+	GENTOO_VER=4
+	# xen-tools's gentoo patches version which apply to this specific ebuild
+	GENTOO_GPV=1
+	# xen-tools ovmf's patches
+	OVMF_VER=0
+
+	SEABIOS_VER=1.7.5
+	OVMF_PV=20131208
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	[[ -n ${OVMF_VER} ]] && \
+		OVMF_PATCHSET_URI="http://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
+	http://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
+	ovmf? ( http://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.bz2
+		${OVMF_PATCHSET_URI} )
+	${UPSTREAM_PATCHSET_URI}
+	${SECURITY_PATCHSET_URI}
+	${GENTOO_PATCHSET_URI}"
+	S="${WORKDIR}/xen-${MY_PV}"
+fi
+
+inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass}
+
+DESCRIPTION="Xend daemon and tools"
+HOMEPAGE="http://xen.org/"
+DOCS=( README docs/README.xen-bugtool )
+
+LICENSE="GPL-2"
+SLOT="0"
+# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
+# >=dev-lang/ocaml-4 stable
+# Masked in profiles/eapi-5-files instead
+IUSE="api custom-cflags debug doc flask hvm qemu ocaml ovmf +pam python pygrub screen static-libs system-qemu system-seabios"
+
+REQUIRED_USE="hvm? ( || ( qemu system-qemu ) )
+	${PYTHON_REQUIRED_USE}
+	pygrub? ( python )
+	ovmf? ( hvm )
+	qemu? ( !system-qemu )"
+
+COMMON_DEPEND="
+	dev-libs/lzo:2
+	dev-libs/glib:2
+	dev-libs/yajl
+	dev-libs/libaio
+	dev-libs/libgcrypt:0
+	sys-libs/zlib
+"
+
+DEPEND="${COMMON_DEPEND}
+	dev-python/lxml[${PYTHON_USEDEP}]
+	pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
+	hvm? ( media-libs/libsdl )
+	${PYTHON_DEPS}
+	api? ( dev-libs/libxml2
+		net-misc/curl )
+	pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} )
+	ovmf? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/sqlite} )
+	!amd64? ( >=sys-apps/dtc-1.4.0 )
+	amd64? ( sys-devel/bin86
+		system-seabios? ( sys-firmware/seabios )
+		sys-firmware/ipxe
+		sys-devel/dev86
+		sys-power/iasl )
+	dev-lang/perl
+	app-misc/pax-utils
+	dev-python/markdown[${PYTHON_USEDEP}]
+	doc? (
+		app-doc/doxygen
+		dev-tex/latex2html[png,gif]
+		media-gfx/graphviz
+		dev-tex/xcolor
+		media-gfx/transfig
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+		dev-tex/latexmk
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-pictures
+		dev-texlive/texlive-latexrecommended
+	)
+	hvm? ( x11-proto/xproto
+		!net-libs/libiscsi )
+	qemu? ( x11-libs/pixman )
+	system-qemu? ( app-emulation/qemu[xen] )
+	ocaml? ( dev-ml/findlib
+		>=dev-lang/ocaml-4 )"
+
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/iproute2
+	net-misc/bridge-utils
+	screen? (
+		app-misc/screen
+		app-admin/logrotate
+	)
+	virtual/udev"
+
+# hvmloader is used to bootstrap a fully virtualized kernel
+# Approved by QA team in bug #144032
+QA_WX_LOAD="usr/lib/xen/boot/hvmloader
+	usr/share/qemu-xen/qemu/s390-ccw.img"
+
+RESTRICT="test"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	export "CONFIG_LOMOUNT=y"
+
+	#bug 522642, disable compile tools/tests
+	export "CONFIG_TESTS=n"
+
+	if has_version dev-libs/libgcrypt:0; then
+		export "CONFIG_GCRYPT=y"
+	fi
+
+	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64 ; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		einfo "Try to apply Xen Upstream patcheset"
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-upstream
+	fi
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+		einfo "Try to apply Xen Security patcheset"
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}/patches-security/${PV}"
+	fi
+
+	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
+	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
+	pushd tools/firmware/ > /dev/null
+	ln -s seabios-dir-remote seabios-dir || die
+	popd > /dev/null
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
+		einfo "Try to apply Gentoo specific patcheset"
+		source "${FILESDIR}"/gentoo-patches.conf
+		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
+		for i in ${!_gpv}; do
+			EPATCH_SUFFIX="patch" \
+			EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches-gentoo/$i
+		done
+	fi
+
+	# Ovmf's patchset
+	if [[ -n ${OVMF_VER} ]] && use ovmf; then
+		einfo "Try to apply Ovmf patcheset"
+		pushd "${WORKDIR}"/ovmf-*/ > /dev/null
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-ovmf
+		popd > /dev/null
+		mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
+	fi
+
+	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
+
+	# Fix texi2html build error with new texi2html, qemu.doc.html
+	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
+
+	use api   || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
+	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
+		 -i tools/firmware/Makefile || die
+
+	# Drop .config, fixes to gcc-4.6
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+
+		# try and remove all the default cflags
+		find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
+			-exec sed \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+				-i {} + || die "failed to re-set custom-cflags"
+	fi
+
+	if ! use pygrub; then
+		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
+	fi
+
+	if ! use python; then
+		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
+	fi
+
+	if ! use hvm; then
+		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
+	# Bug 351648
+	elif ! use x86 && ! has x86 $(get_all_abis); then
+		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
+		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
+		export CPATH="${WORKDIR}"/extra-headers
+	fi
+
+	# Don't bother with qemu, only needed for fully virtualised guests
+	if ! use qemu; then
+		sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die
+	fi
+
+	# Reset bash completion dir; Bug 472438
+	sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
+		-i Config.mk || die
+	sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
+
+	# xencommons, Bug #492332, sed lighter weight than patching
+	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
+		-i tools/hotplug/Linux/init.d/xencommons.in || die
+
+	# respect multilib, usr/lib/libcacard.so.0.0.0
+	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
+		-i tools/qemu-xen/configure || die
+
+	#bug 518136, don't build 32bit exactuable for nomultilib profile
+	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
+		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
+	fi
+
+	# use /var instead of /var/lib, consistat with previous ebuild
+	sed -i -e   "/XEN_LOCK_DIR=/s/\$localstatedir/\/var/g" \
+		m4/paths.m4 configure tools/configure || die
+	# use /run instead of /var/run
+	sed -i -e   "/XEN_RUN_DIR=/s/\$localstatedir//g" \
+		m4/paths.m4 configure tools/configure || die
+
+	# uncomment lines in xl.conf
+	sed -e 's:^#autoballoon=:autoballoon=:' \
+		-e 's:^#lockfile=:lockfile=:' \
+		-e 's:^#vif.default.script=:vif.default.script=:' \
+		-i tools/examples/xl.conf  || die
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf="--prefix=${PREFIX}/usr \
+		--libdir=${PREFIX}/usr/$(get_libdir) \
+		--libexecdir=${PREFIX}/usr/libexec \
+		--disable-werror \
+		--disable-xen \
+		--enable-tools \
+		--enable-docs \
+		$(use_with system-qemu) \
+		$(use_enable pam) \
+		$(use_enable api xenapi) \
+		$(use_enable ovmf) \
+		$(use_enable ocaml ocamltools) \
+		"
+	use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
+	use qemu || myconf+=" --with-system-qemu"
+	use amd64 && myconf+=" --enable-qemu-traditional"
+	econf ${myconf}
+}
+
+src_compile() {
+	export VARTEXFONTS="${T}/fonts"
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	use custom-cflags || unset CFLAGS
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	unset LDFLAGS
+	unset CFLAGS
+	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
+
+	use doc && emake -C docs txt html
+	emake -C docs man-pages
+}
+
+src_install() {
+	# Override auto-detection in the build system, bug #382573
+	export INITD_DIR=/tmp/init.d
+	export CONFIG_LEAF_DIR=../tmp/default
+
+	# Let the build system compile installed Python modules.
+	local PYTHONDONTWRITEBYTECODE
+	export PYTHONDONTWRITEBYTECODE
+
+	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
+		XEN_PYTHON_NATIVE_INSTALL=y install-tools
+
+	# Fix the remaining Python shebangs.
+	python_fix_shebang "${D}"
+
+	# Remove RedHat-specific stuff
+	rm -rf "${D}"tmp || die
+
+	if use doc; then
+		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
+
+		dohtml -r docs/
+		docinto pdf
+		dodoc ${DOCS[@]}
+		[ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
+	fi
+
+	rm -rf "${D}"/usr/share/doc/xen/
+	doman docs/man?/*
+
+	newconfd "${FILESDIR}"/xendomains.confd xendomains
+	newconfd "${FILESDIR}"/xenstored.confd xenstored
+	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
+	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
+	newinitd "${FILESDIR}"/xenstored.initd xenstored
+	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
+	newinitd "${FILESDIR}"/xencommons.initd xencommons
+	newconfd "${FILESDIR}"/xencommons.confd xencommons
+	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
+	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
+
+	if use screen; then
+		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
+		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
+		keepdir /var/log/xen-consoles
+	fi
+
+	# For -static-libs wrt Bug 384355
+	if ! use static-libs; then
+		rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
+	fi
+
+	# for xendomains
+	keepdir /etc/xen/auto
+
+	# Temp QA workaround
+	dodir "$(get_udevdir)"
+	mv "${D}"/etc/udev/* "${D}/$(get_udevdir)"
+	rm -rf "${D}"/etc/udev
+
+	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
+	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
+		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the offical wiki page:"
+	elog "https://wiki.gentoo.org/wiki/Xen"
+	elog "http://wiki.xen.org/wiki/Main_Page"
+	elog ""
+	elog "Recommended to utilise the xencommons script to config sytem At boot"
+	elog "Add by use of rc-update on completion of the install"
+
+	# TODO: we need to have the current Python slot here.
+	if ! has_version "dev-lang/python[ncurses]"; then
+		echo
+		ewarn "NB: Your dev-lang/python is built without USE=ncurses."
+		ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py."
+	fi
+
+	if has_version "sys-apps/iproute2[minimal]"; then
+		echo
+		ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking"
+		ewarn "will not work until you rebuild iproute2 without USE=minimal."
+	fi
+
+	if ! use hvm; then
+		echo
+		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
+		elog "support enable the hvm use flag."
+		elog "An x86 or amd64 system is required to build HVM support."
+	fi
+
+	if use qemu; then
+		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
+		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
+		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
+		elog "the qemu-bridge-helper and the xen-bridge-helper.  File bugs of any issues that arise"
+	fi
+
+	if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then
+		echo
+		elog "xensv is broken upstream (Gentoo bug #142011)."
+		elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed."
+	fi
+}
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@ -1,11 +1,11 @@
 DIST xen-4.2.5-upstream-patches-7.tar.xz 22492 SHA256 d672bd1be49f9312eef7229d6ab199b21423df6d99ee99732d0386d8c5239dba SHA512 c7c917b8333073646680f66a5e5395a65f40d28bd1ceefaa327a391f4bf8b3569f763754db14beff1c0c975076f9393cb61869ff9d9bfa9d7942406d411b01d1 WHIRLPOOL 8ffd11a7fe4c6113a76fc06434a778da8375b741b9ffe4371c4ceb3ea50b07fe3e545752db5f4340f243432a6fd250590b08895975111d80f791e5daa76b590d
-DIST xen-4.2.5-upstream-patches-8.tar.xz 22468 SHA256 611257c09593cd125dd5c822e44f493f8b64baf3c4a2b7c9a9d092c53f8e0595 SHA512 bb2ec5f3ec8a7f32a5017b586d31d368fcbc400d394a77b427efc08b9802bd8280d61df597755624837326addaf957c8715d585653fd6faa64f6abe7c2507b01 WHIRLPOOL 26412d7ba5703180ae20fe5423a313cada4903f3236389854fb13cb9d193d5d137f8bbb71db2bc4b1397a57bf4e66538445dc63cc708b537b0f247026bc38b7d
+DIST xen-4.2.5-upstream-patches-9.tar.xz 23208 SHA256 2206e9a8aeeed207abbae995c5d2baa14d5f0da4120ae44f2de733ecf7ea5af1 SHA512 8a2edaba48002449a521edf2ae078ffe1b3db4f491a85b063886a147a0be3ec7fdb819ce84c90cdae80ed34c10ab2d637506700be10052a67be6ef128fa40fb1 WHIRLPOOL 037820e0fad60d1f7ed054efa797585c992d08f1ffd533705c515ad289f8cdddc72b97f2a3d75ebd683c6bb6988d7285452b4f3cebbe9a879f701156e387ff3b
 DIST xen-4.2.5.tar.gz 15671925 SHA256 3cf440866315e8085050eb0586f0447b6b47a08dbed6a72226bf5ed5d89ec567 SHA512 42c0fc241952fc55fc44480fb6752b004b54ae40e946159ec047adf229b65cbfbd810271d01b064ad8fdbddb73c640dcdcb6bc19f91e8968829889c129920dac WHIRLPOOL 762a91c0111892b33e6bd3e7f7714709b04697ad7c2b0919fef6cc9570a343a77fd5a2b82833e75dac9d12d4e41acdcf0743b0d593595910ddd326f5cd721368
 DIST xen-4.4.2-upstream-patches-0.tar.xz 16468 SHA256 1a05c1555f9e868e0e9358cb94ed23afbde170c346977fe8f515dc090107fec9 SHA512 8ff91288d6852219061ca6961fd6e156b313af4e0ce8903eb08b1f4dc7312ac549843cccb5f8b6cba7172f55163de407a98925ed6254a52a29f7c275c180bec5 WHIRLPOOL 9b83edb137edcfd5b530a115afcf28e8b0a2a460291728646cb83ebca79c7280ffd4de45ac1523771b703dab0024dcc35044b40cb7249f13ef954d018b512216
-DIST xen-4.4.2-upstream-patches-1.tar.xz 20156 SHA256 2680f5015477f132b308ad77de9a2eb5ec1c696debd5584c8e3f9358a6bf348f SHA512 ea14def52e865e35b75ffea2a8233919f7cb97d1832e258e2b9d78642ceb089fa8bcc46bca757407ade744d9c55669daaa55a7a896aa9223bd5f57aa242fc330 WHIRLPOOL bf8351ac9f098a9ca48e158751b505e8bec4ea2fe163790850ddba24cd29f00616dc984f16ef2514c45aa6d8a46030caf71fa8e01412e8f05dbb0f3dd008efe5
+DIST xen-4.4.2-upstream-patches-2.tar.xz 21064 SHA256 39ba1235c4e87b43fc979a939f7f2bab9436d517c9d22fa372c549ae7a92e35f SHA512 e3ffe41431c35382d67a874e1af919f93c47cfb8b85500b2812a64b630ff5a96dae177245c1e2c00f121bb55ff067e4356b016596c8cd6f6d49cde8816fd7e5e WHIRLPOOL 518a7490e741e0fce64329e4e78cae5ebc1d2a1facf4547977b2770de8c68fc003db7ccd1192bee3c0f1e50abec36f85f70b26b31c85f4e17006792571550c1b
 DIST xen-4.4.2.tar.gz 18137195 SHA256 cd53592e86669e5e8c4d4a731b0199e8af17d8eadbb8f26dbb69f1b751259204 SHA512 7dae2a1d601d5c65c350ea9fe9870551ec53dff47b6ebe56e99285fd1112aa1cba3a2594e294b871defcf43fb7fccace9f18910e69f02dfce162d7bf453eb07b WHIRLPOOL 2dfe3de5fd800d2172ad2c95117e0646c6b2045cfcb9fa5eccc46b695f1c58aa861bf2a591f78db5baf5a89894b3fa26dc1ba63cb0d57f87be4df5c445c82a94
 DIST xen-4.5.0-upstream-patches-4.tar.xz 48856 SHA256 91957fdc53a69e09deba5b307c9c9aa400793267eab2a7ad45d7fe8f69310f47 SHA512 15ae3df9cdaf76c8029a7c39fbc6a2614bf6ef5398518ee9624055a56b4b4293dcfc746f9fdbde11fdb57f5fa3a51d2d51ef30c14e0c5c37134ae9254a244c41 WHIRLPOOL 35a9a0919a466b4129d089ad6742ccf2ced91f249146c127c847a04cda413f8f7c94c89ad27f983d2d7c93a225185fd28054a422ac7879144ebbbe26b6e6103b
-DIST xen-4.5.0-upstream-patches-5.tar.xz 63804 SHA256 b6f1f1fb799a8480d2fa17625d5d43b143f54722152978fdfdd13b0dfa7db33f SHA512 a234b97ddb63bfb72a5a34ad13a5d6f694d35d4efd6ed0c20380c240022eb3e7c7f12451ecc24f32bf7fe7578cfe3da8ccd4718bd9d445d120e4c5d65bb7a2ad WHIRLPOOL ff50b5c0ce237b88d56a535070d89b8c8d10bce4a1feddf0698b4112cdd9ff76bc4bf33bc7f1c4cb719e4090560b437342ec18b6f517dacb3ed0432f3ec68f08
+DIST xen-4.5.0-upstream-patches-6.tar.xz 67084 SHA256 de1d331b18c0d15a1d438e29da27e48e6fa2b34282079710ddc2c36693ac897d SHA512 7f9f128e6aaf9002065acb1985fb29e36ac3c3cdc75625bad0f0719995dc99b421ae080ab3c401c3a5fb6f3de400f15d01817760312151df5eb3724ac5e0540a WHIRLPOOL b9ae4e184e5d3f2ca7eadef8914b6c7af13761da21d5a72fdc035db8193b1984fed76a38c4d90f0df42570f91f4b15f77c095b89d4bea525984adb74ece2631e
 DIST xen-4.5.0.tar.gz 18404933 SHA256 5bdb40e2b28d2eeb541bd71a9777f40cbe2ae444b987521d33f099541a006f3b SHA512 31621fbaf621ad350125d03366ecff4dec5d810b0c1242ca0e28788f7556ac1443d7ee9247e1f76dec07e148e0b4ae16d08a7c10101bb78d6529375f3e40998e WHIRLPOOL 4a77588a4aa4846cfbf9493ab20bd2f293c55a941a5639fdd166a43f284cc0cc7218969def755a1acd89e640181bdd862fff0b566cfb8e628d73deeb6369c924
 DIST xen-security-patches-1.tar.xz 4228 SHA256 0a8bbc3eae72b908801b3445a4513d2fc976ec181c7f02d1a70f76026490dcfe SHA512 7a2271b4d0bd7dcdf2ebaf692157ed69c4c49b7251f7917100d5a22db780a9c7eb66e67dc52261d1d1438d290366f2a6d1cd72f56637cd5b130c22580f47b4d0 WHIRLPOOL 390c649e3ab9335518bbc492335e820f70c0d69bf75963485925b7671c936db5040a01e28f02dd67630ebd49735b2a228670f1db5817d83c578e7611e37c86f9
-DIST xen-security-patches-2.tar.xz 15272 SHA256 361e828275e3c32333ae6e6e7fce3bd926334f0d89103d762b3a75ac7a4ec3c0 SHA512 3942ec23adc8e28ed2a4162a591da16a96cf7890534558cfcaf4c1530c1dd2324a0417735b6f05843f904c5bb6e5ccb443381e5b9a6647af79d5eec2380453b3 WHIRLPOOL 77106b93e8ccdfcf0d67d6eaf97ecc22e30664878c7a85b03f986ac565e23749408ab1de93dd9bbea154c05dc209cc63b48cd9d9da9074ed4fbb53eff506c4fb
+DIST xen-security-patches-3.tar.xz 17028 SHA256 fb6301beb9a5c2d1e5d4de8783d8670e382b1bef48ec61e73d2d9be6901d289f SHA512 787fee8f7822577c6de91c4cf4d56d0e73ce46bac5524537ff66a718b6d7eae9d362265515743e8577b2c75f2841baed9837f71467b3b7b91a3111220da5f236 WHIRLPOOL 5c136289e654776bf918fe125fbecba7dac0929b236f7ae8158026a6bd6be12bc786a5ec96cb4022c18a5e7ffde82155deb57eb9639600e4c42c9c209f4a2ed6
--- a/app-emulation/xen/xen-4.2.5-r11.ebuild
+++ b/app-emulation/xen/xen-4.2.5-r11.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.2.5-r10.ebuild,v 1.1 2015/06/03 10:07:25 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.2.5-r11.ebuild,v 1.1 2015/06/15 08:47:07 dlan Exp $

 EAPI=5

@ -14,8 +14,8 @@ if [[ $PV == *9999 ]]; then
 	live_eclass="mercurial"
 else
 	KEYWORDS="~amd64 ~x86"
-	UPSTREAM_VER=8
-	SECURITY_VER=2
+	UPSTREAM_VER=9
+	SECURITY_VER=3
 	GENTOO_VER=

 	[[ -n ${UPSTREAM_VER} ]] && \
--- a/app-emulation/xen/xen-4.4.2-r4.ebuild
+++ b/app-emulation/xen/xen-4.4.2-r4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.4.2-r3.ebuild,v 1.1 2015/06/03 10:07:25 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.4.2-r4.ebuild,v 1.1 2015/06/15 08:47:07 dlan Exp $

 EAPI=5

@ -15,8 +15,8 @@ if [[ $PV == *9999 ]]; then
 	live_eclass="git-2"
 else
 	KEYWORDS="~amd64 ~arm -x86"
-	UPSTREAM_VER=1
-	SECURITY_VER=2
+	UPSTREAM_VER=2
+	SECURITY_VER=3
 	GENTOO_VER=

 	[[ -n ${UPSTREAM_VER} ]] && \
--- a/app-emulation/xen/xen-4.5.0-r6.ebuild
+++ b/app-emulation/xen/xen-4.5.0-r6.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.5.0-r6.ebuild,v 1.3 2015/06/09 07:22:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.5.0-r6.ebuild,v 1.4 2015/06/15 08:47:07 dlan Exp $

 EAPI=5

@ -14,7 +14,7 @@ if [[ $PV == *9999 ]]; then
 	EGIT_REPO_URI="git://xenbits.xen.org/${PN}.git"
 	live_eclass="git-2"
 else
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 -x86"
 	UPSTREAM_VER=4
 	SECURITY_VER=1
 	GENTOO_VER=
--- a/app-emulation/xen/xen-4.5.0-r8.ebuild
+++ b/app-emulation/xen/xen-4.5.0-r8.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.5.0-r7.ebuild,v 1.1 2015/06/03 10:07:25 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.5.0-r8.ebuild,v 1.1 2015/06/15 08:47:07 dlan Exp $

 EAPI=5

@ -15,8 +15,8 @@ if [[ $PV == *9999 ]]; then
 	live_eclass="git-2"
 else
 	KEYWORDS="~arm ~arm64 ~amd64"
-	UPSTREAM_VER=5
-	SECURITY_VER=2
+	UPSTREAM_VER=6
+	SECURITY_VER=3
 	GENTOO_VER=

 	[[ -n ${UPSTREAM_VER} ]] && \
--- a/app-portage/kportagetray/metadata.xml
+++ b/app-portage/kportagetray/metadata.xml
@ -11,4 +11,8 @@
 		<email>wizzleby@gmail.com</email>
 		<name>Locke Shinseiko (Wizzleby)</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">kportagetray</remote-id>
+		<remote-id type="gitorious">kportagetray</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-text/bibletime/metadata.xml
+++ b/app-text/bibletime/metadata.xml
@ -2,10 +2,13 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>theology</herd>
-<longdescription>
+	<longdescription>
 BibleTime is a Bible study application for Linux. It is based on the 
 K Desktop Environment and uses the SWORD programming library to work 
 with Bible texts, commentaries, dictionaries and books provided by 
 the Crosswire Bible Society.
 </longdescription>
+	<upstream>
+		<remote-id type="sourceforge">bibletime</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-text/ebook-tools/metadata.xml
+++ b/app-text/ebook-tools/metadata.xml
@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+	<herd>kde</herd>
+	<upstream>
+		<remote-id type="sourceforge">ebook-tools</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-text/jabref/files/jabref-2.4-build.xml.patch
+++ b/app-text/jabref/files/jabref-2.4-build.xml.patch
@ -1,35 +0,0 @@
--- build.xml	2008-09-17 22:45:35.000000000 +0200
-+++ build.xml	2008-09-17 22:46:39.000000000 +0200
-@@ -171,7 +171,7 @@
- 
- 	<!-- Run the JPF Code Generator -->
- 	<target name="generate" unless="needsNoRegenerate">
-		<java classname="net.sf.jabref.plugin.util.CodeGenerator" fork="true">
-+		<java classname="net.sf.jabref.plugin.util.CodeGenerator" fork="true" failonerror="true">
- 			<arg value="${plugin.dir}" />
- 			<classpath refid="codegenerator" />
- 		</java>
-@@ -217,7 +217,7 @@
- 	</target>
- 
- 	<!-- Jars up project -->
-	<target name="jars" depends="build, unjarlib">
-+	<target name="jars" depends="build">
- 		<mkdir dir="${build.lib}" />
- 		<mkdir dir="${build.tmp}" />
- 		<jar destfile="${build.lib}/${build.jar}">
-@@ -403,6 +403,7 @@
- 
- 
- 	<target name="osxjar">
-+		<taskdef name="jarbundler" classpath="${lib.dir}/jarbundler-1.4.jar" classname="com.loomcom.ant.tasks.jarbundler.JarBundler" />
- 		<jarbundler dir="${build.lib}" name="JabRef" mainclass="net.sf.jabref.JabRef" jars="${build.lib}/${build.jar}" icon="${images.dir}/JabRef-Logo.icns" version="${jabref.version}" jvmversion="1.4+" stubfile="${lib.dir}/JavaApplicationStub" />
- 	</target>
- 
-@@ -611,6 +612,5 @@
- 		</jalopy>
- 	</target>
- 
-	<taskdef name="jarbundler" classpath="${lib.dir}/jarbundler-1.4.jar" classname="com.loomcom.ant.tasks.jarbundler.JarBundler" />
- 
- </project>
--- a/app-text/jabref/jabref-2.10-r2.ebuild
+++ b/app-text/jabref/jabref-2.10-r2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/jabref-2.10-r2.ebuild,v 1.2 2015/06/14 18:00:13 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/jabref-2.10-r2.ebuild,v 1.3 2015/06/15 11:49:54 nicolasbock Exp $

 EAPI=5

@ -20,13 +20,14 @@ KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc"

 COMMON_DEP="
-	dev-java/antlr:3
+	dev-java/antlr:0
+	dev-java/antlr:4
 	dev-java/fontbox:1.7
 	dev-java/jempbox:1.7
 	dev-java/log4j:0
 	dev-java/spin:0
 	dev-java/microba:0
-	>=dev-java/glazedlists-1.8.0
+	>=dev-java/glazedlists-1.8.0:0
 	"

 DEPEND="
@ -57,7 +58,7 @@ java_prepare() {
 }

 src_compile() {
-	local EXTERNAL_JARS="antlr-3,fontbox-1.7,jempbox-1.7,log4j,spin,microba,glazedlists"
+	local EXTERNAL_JARS="antlr,antlr-4,fontbox-1.7,jempbox-1.7,log4j,spin,microba,glazedlists"
 	local CLASSPATH="$(java-pkg_getjars --with-dependencies ${EXTERNAL_JARS})"
 	eant \
 		-Dgentoo.classpath=${CLASSPATH} \
--- a/app-text/podofo/metadata.xml
+++ b/app-text/podofo/metadata.xml
@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>zmedico@gentoo.org</email></maintainer>
-<use>
-	<flag name='boost'>Add support for boost</flag>
-</use>
+	<maintainer>
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="boost">Add support for boost</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">podofo</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/dev-cpp/clucene/metadata.xml
+++ b/dev-cpp/clucene/metadata.xml
@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>kde</herd>
+	<upstream>
+		<remote-id type="sourceforge">clucene</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/dev-java/jcs/jcs-2.0.ebuild
+++ b/dev-java/jcs/jcs-2.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jcs/jcs-2.0.ebuild,v 1.1 2015/06/14 14:38:41 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jcs/jcs-2.0.ebuild,v 1.2 2015/06/15 09:54:25 monsieurp Exp $

 EAPI=5
 JAVA_PKG_IUSE="test doc source"
@ -16,12 +16,13 @@ SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/commons/${PN}/source/

 LICENSE="Apache-2.0"
 SLOT="2.0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="admin"

 CDEPEND="dev-java/jisp:2.5
 	dev-db/hsqldb:0
-	dev-java/xmlrpc:0
+	dev-java/log4j:0
+	dev-java/xmlrpc:3
 	dev-java/commons-lang:0
 	dev-java/commons-dbcp:0
 	dev-java/commons-pool:0
@ -39,9 +40,10 @@ S="${WORKDIR}/${MY_P}"

 JAVA_ANT_REWRITE_CLASSPATH="true"
 EANT_GENTOO_CLASSPATH="
-	xmlrpc
+	xmlrpc-3
 	hsqldb
 	jisp-2.5
+	log4j
 	commons-lang
 	commons-pool
 	commons-dbcp
--- a/dev-java/jfreesvg/metadata.xml
+++ b/dev-java/jfreesvg/metadata.xml
@ -10,4 +10,7 @@
 			Enable debugging during compilation.
 		</flag>
 	</use>
+	<upstream>
+		<remote-id type="sourceforge">jfreegraphics2d</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@ -1,11 +1,7 @@
 DIST apache-tomcat-4.1.36-src.tar.gz 3715200 SHA256 51f9139f10cd865fc331cf5def49faa718ab4a510790af3582b4189a48a5b951 SHA512 f2f36fbad5114c8a74154602249280226b839cbb75b2a584d6a6efbc11dcd2a5e27a67ee9b7ca2f12689cabfe1110035f95b27690ce6c304bbbb6389dfa97cd2 WHIRLPOOL 8188e2ed1aba7337b00e971e347594d897e01f6ea25d9e86e641cea4a1f2c68e4b9e594dd57f773447e81066bcb3377130c05ae7608fe9d9dc36a28bd89d515f
 DIST apache-tomcat-5.5.27-src.tar.gz 7382057 SHA256 90bc8abcddda604e855c37035653b1e24b31c2f09b7a29235e92d65025f7a334 SHA512 32c605aad92b7d554b9e0f28a4d3e707b3cbfc0661a969eb2479512517f8e9e8848b820132d711c41f5c0fa863028b38e1fa903e7c0205599e9e58a86ab4733a WHIRLPOOL d3bca642fd8d5ad73dadf8864ebd0a75146adc805c298d0fd5ad26ab2d4d93293a9ea83d4190e64accd3a7cd38bebc1580dcc266f9a81c4472bacb37598acef7
 DIST apache-tomcat-5.5.34-src.tar.gz 3720299 SHA256 a52e7f2abf0fbdd9665ca398d2b39f99b80683b0ee43c72751390e88dcd6114d SHA512 4c8616f839a3c413ffef45b7b6876f123cbda37f4029db96ac1c8f259a75f0d65cdb5709468d89e731e5436b011dac4ee3e9dc397adfc9ad4d0b1bc462c8e519 WHIRLPOOL 25e987b58af5535914b666a5bb8691146d68b2287796ba25b8a5f792df08f55901a7ea3f419602207f7a8168302b080592bde5f4aeb67b58f40e5da00b8049ad
-DIST apache-tomcat-6.0.41-src.tar.gz 3591370 SHA256 6def26d6eefb168a0968400d53dc08939284570ca850a0c4740398e9b645ff3c SHA512 605b33fb48772af3d34f33082d30c6791308c8ce6c52607a0e8e97b353ecd1a768a400ed65abcf2701381fff7e61d4d83a887140d4eebf753551e26dcef58e5d WHIRLPOOL c70f397308c051287d5de77e2c66b70d6003dd015cc0ba236599c09f5046bc6d5f0f03ddb672c7c9267ec860491ad7144104ede3e599a064776a931f9babfddd
-DIST apache-tomcat-6.0.43-src.tar.gz 3595710 SHA256 ef32da195dc0f070c5f8d1c48b02a213cc69b680ec735f1297ef0d8ca62e75be SHA512 f2cb32e6d01e8841e4ea43cae0b495f988eb590649047627eea31411b7eac9d8a5d5747fb986d577946430c656c1e926a75b850bc7f59ec1b86c632fdb7af7e8 WHIRLPOOL 6c6ffe58a9c2bd162aa7d6b60248304fedd51724c602d9387ae2759a8218eedf93a85b40e18bb2e46de2b245c412d32ca941109045f8e5b898546f9b4cc7602f
 DIST apache-tomcat-6.0.44-src.tar.gz 3447711 SHA256 c6f01526d58f2ba7b9da496e959d9e68cc49183006077704ab91c36ebebf5a4a SHA512 0d6a1539b28fa8ca3442557889d7d21cc523b18136f6998820ba13f41420536aba65ce78bac526002ee1dd86df3cbc80d9f043a3f765d7cf0b79e58e516030be WHIRLPOOL c65e704466191a0f98ec777e95dda889599ff6a545e7c013fd04bc0b72e0d0edf4491415f243d6a4de60cf76abe5c13ffbcc6d98f78b51490f7b7b43b24ecb97
-DIST apache-tomcat-7.0.56-src.tar.gz 4648164 SHA256 d51fd6b596fbcf418eddeff721f23b6109ec4d8085ba111580dbdeaa007c5b59 SHA512 f283ec2cd806ea1ac5372efc667e75687ea637185b1b74b396cf46379248da09c9a8bbdd1f4e37e84d91ed142f80a1185816fc5215e199df2ff25dded13cacff WHIRLPOOL cf63cd6e4888585f3dd9e4659f993f48e3a08f8c220414fe8f9dac9389a1456d49878b4a39674646fd6a9ad3df4259272005ccf40ead53ab51a196bee4150a93
-DIST apache-tomcat-7.0.57-src.tar.gz 4651308 SHA256 07962d20f2ce051c3e4fbdbd65a15d87d07553e7ee1542547a5ce0c201743c64 SHA512 fad8c296c2191c0168bf841b4b7c649b06900aa1b8b12d895fdaa1963f5a2b08fedb71f614cba1269b405892392daea0850c85360fb4fda2ea36311f8e8c563a WHIRLPOOL 9c938fdc419f989d9a2bc7618e9c68c0ee96b1dfaa94822d995818975c9217b7ff80c28b31cc6e9dea47d4097a2c61325e8075d4f313bc6415aa535361933741
 DIST apache-tomcat-7.0.59-src.tar.gz 4687344 SHA256 3a1dedda4019db87464fca3aeb4e800a538f0baee96d8b14c9d64967b0d2ea44 SHA512 acc322eee1446dd1bff72910ae9f40a62f88332ee69d6057b3c684e2abf8f28e6df6ab9505900f0b0cf7a5e2e0e80e64b0a790b3b78594ce595ce897706b4bcb WHIRLPOOL 4948964c1746e6ee912ac72c901ba271793610f402bf082455d104e2e8d6dbfa0bf5371d42d48d8ad7c826271fa60d989119a01e700497099022d0cf3564fdff
 DIST apache-tomcat-8.0.22-src.tar.gz 4862888 SHA256 a7f1e511e10019217ec2ae91705886092ab5487e6e1c0d709023a472996ccb2b SHA512 7f6a0df1f2718021e0ece8034dad43286c0c2b3a83dfa125de78e4de8f576b0bfa7ebf67d31c5b8bac451a6b09144632283f499adac9b10aadcab634502c8b9a WHIRLPOOL e74dd5df9dabe5b2277901dd4507c4404f5fce63b0ed6c2069646c386a0fde7879293affe35997f27666c9e256d1d0b0b6e8fca5b78441306285649d80b27b71
 DIST apache-tomcat-8.0.23-src.tar.gz 4868650 SHA256 6293713e78da9bb803060c8ddff982f8f7aef5a2e4b325340088493ce9957ba4 SHA512 cc83194b2847fc2db5448d548c7e65a1198cda02726b070f913a762d324152315886fba09532b879e26d15ec57e04057cc30b3a686b2a2307d6447d17f84e16c WHIRLPOOL b0559a4ef1b4c1f0683e4cce976d31db175d3c4f4d2b809b127e1074d49a6bf764366cc3e91f9a0818afd6de35e662a7aab89866dfd2e61673327c50535bff88
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.41.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.41.ebuild
@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.41.ebuild,v 1.7 2015/06/03 16:28:19 monsieurp Exp $
-
-EAPI="5"
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_A="apache-${P}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 2.5/JSP API 2.1 implementation"
-HOMEPAGE="http://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-6/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2.5"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.5"
-RDEPEND=">=virtual/jre-1.5"
-
-S="${WORKDIR}/${MY_P}/"
-
-java_prepare() {
-	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
-	rm */*/build.xml
-}
-
-src_install() {
-	java-pkg_dojar "${S}"/output/build/lib/*.jar
-	use source && java-pkg_dosrc java/javax/servlet/
-}
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.43.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.43.ebuild
@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.43.ebuild,v 1.3 2015/06/03 16:28:19 monsieurp Exp $
-
-EAPI="5"
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_A="apache-${P}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 2.5/JSP API 2.1 implementation"
-HOMEPAGE="http://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-6/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2.5"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.5"
-RDEPEND=">=virtual/jre-1.5"
-
-S="${WORKDIR}/${MY_P}/"
-
-java_prepare() {
-	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
-	rm */*/build.xml
-}
-
-src_install() {
-	java-pkg_dojar "${S}"/output/build/lib/*.jar
-	use source && java-pkg_dosrc java/javax/servlet/
-}
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.56.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.56.ebuild
@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.56.ebuild,v 1.7 2015/06/03 16:28:19 monsieurp Exp $
-
-EAPI="5"
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_A="apache-${P}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 3.0/JSP API 2.2 implementation"
-HOMEPAGE="http://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="3.0"
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}/${MY_P}/"
-
-java_prepare() {
-	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
-	rm -fR */*/build.xml
-	einfo "Removing bundled jars and classes"
-	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
-}
-
-src_install() {
-	java-pkg_dojar "${S}"/output/build/lib/*.jar
-	use source && java-pkg_dosrc java/javax/servlet/
-}
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.57.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.57.ebuild
@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.57.ebuild,v 1.4 2015/06/03 16:28:19 monsieurp Exp $
-
-EAPI="5"
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_A="apache-${P}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 3.0/JSP API 2.2 implementation"
-HOMEPAGE="http://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="3.0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}/${MY_P}/"
-
-java_prepare() {
-	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
-	rm -fR */*/build.xml ||die
-	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} + || die
-}
-
-src_install() {
-	java-pkg_dojar "${S}"/output/build/lib/*.jar
-	use source && java-pkg_dosrc java/javax/servlet/
-}
--- a/dev-lang/tcl/tcl-8.5.17-r100.ebuild
+++ b/dev-lang/tcl/tcl-8.5.17-r100.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.17-r100.ebuild,v 1.3 2015/03/17 18:46:05 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.17-r100.ebuild,v 1.4 2015/06/15 09:28:13 jlec Exp $

 # this ebuild is only for the libtcl8.5.so SONAME for ABI compat

@ -19,9 +19,9 @@ SLOT="8.5"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="debug threads"

-RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	!=dev-lang/tcl-8.5*:0"
 DEPEND="${RDEPEND}
-	!=dev-lang/tcl-8.5*:0
 	"

 SPARENT="${WORKDIR}/${MY_P}"
--- a/dev-libs/libdbusmenu-qt/metadata.xml
+++ b/dev-libs/libdbusmenu-qt/metadata.xml
@ -6,4 +6,7 @@
  <maintainer>
    <email>ayatana-bugs@gentoo.org</email>
  </maintainer>
+  <upstream>
+    <remote-id type="launchpad">ubuntu</remote-id>
+  </upstream>
 </pkgmetadata>
--- a/dev-libs/libmirage/metadata.xml
+++ b/dev-libs/libmirage/metadata.xml
@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>tetromino@gentoo.org</email>
-  <name>Alexandre Rostovtsev</name>
-</maintainer>
+  <maintainer>
+    <email>tetromino@gentoo.org</email>
+    <name>Alexandre Rostovtsev</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">cdemu</remote-id>
+  </upstream>
 </pkgmetadata>
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@ -3,3 +3,4 @@ DIST libuv-0.11.29.tar.gz 486768 SHA256 fac45e72c2df30ddc9cbdf5002fc1363281d0e43
 DIST libuv-1.1.0.tar.gz 1010640 SHA256 e4ff513c18a6322898972b0b6ce986445bcd2c13710f4a46b10baf80b28599cf SHA512 2d801b8b12e6f9b179f62084d1c260b6443ae34523c12dbea8317ff34aa0a76f3df2ee38fb161aa6fd4092b6280a53c7ed599d04eb7ed0d250c1e60b4e584dea WHIRLPOOL 6d6b3eea2ddb54322d20125f1a0a61b8a00b1771ccb8bc0d7829229cabb3e363adc6f85b2d1ae2f506410a543c92404df9f545a57805ac278fab560d5a24de5e
 DIST libuv-1.4.2.tar.gz 1017992 SHA256 b9e424f69db0d1c3035c5f871cd9d7a3f4bace0a4db3e974bdbfa0cf95f6b741 SHA512 a2ee23d957b4b2c486c01a8ca0814cb42853d3496edcf2c39228fe9259317699954bd222abbcc4e7fda81b936ecfd64be3472230b319e8caab8e4bba0c835ced WHIRLPOOL 53727ec56b274523e445b23160a6a42d8b7fdf5b298480f0819a0cd4a19d811b59d00756eec2c9d69a34d8add96ff6103b44752df06d1346a13f2c979f52cc4a
 DIST libuv-1.5.0.tar.gz 1023438 SHA256 f9c6ad4b7a2c90d93c8e09d2e739bb46d199639c4d884ba30323359521b09367 SHA512 b6f6e685e66b72a0439eda35297fe5f98db598abd83deff0e9f614ef1f52ffc36717ded5e28aa2c32054c52f396ae826651c04e958f13e409a701558d777cee6 WHIRLPOOL aea128f28d336160cb2b616cd5a6dd479504be612d7b805c6bdcee529530dfb49b9bace254df9bbfceccdaed1086589defc94888b99657709c79299a13aa47e4
+DIST libuv-1.6.1.tar.gz 1027771 SHA256 f558ede285878d6a69f6a6d43b5df0241f3c35d62ac989477bdbd418badd83d7 SHA512 3fe53352de312666c02ee6523bd0da3e8a8fb1704eb8c5016490ad3a2275aa1a529123e00173ea626afc284d9863cf5cb5ef4a114655c55925f46632ca5ad0d3 WHIRLPOOL 0ea59068acdc9c9a86521a5ae61148f182d14f39643b1c6df523e79faa249d5a6ab2bbb964bef6a0aff9bbf67d4119a801848421d0029a8f11d1a698213619a4
--- a/dev-libs/libuv/libuv-1.6.1.ebuild
+++ b/dev-libs/libuv/libuv-1.6.1.ebuild
@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libuv/libuv-1.6.1.ebuild,v 1.1 2015/06/15 11:43:24 mgorny Exp $
+
+EAPI=5
+
+inherit autotools-utils eutils multilib multilib-minimal
+
+DESCRIPTION="Cross-platform asychronous I/O"
+HOMEPAGE="https://github.com/libuv/libuv"
+SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD BSD-2 ISC MIT"
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+DEPEND="sys-devel/libtool
+	virtual/pkgconfig[${MULTILIB_USEDEP}]"
+
+src_prepare() {
+	echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \
+		> m4/libuv-extra-automake-flags.m4 || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		cc_cv_cflags__g=no
+		$(use_enable static-libs static)
+	)
+	autotools-utils_src_configure
+}
+
+multilib_src_test() {
+	mkdir test || die
+	cp -pPR "${S}"/test/fixtures test/fixtures || die
+	default
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files
+}
--- a/dev-python/configclass/metadata.xml
+++ b/dev-python/configclass/metadata.xml
@ -4,5 +4,6 @@
 	<herd>python</herd>
 	<upstream>
 		<remote-id type="pypi">configclass</remote-id>
+		<remote-id type="github">schettino72/configclass</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/dev-python/jsonmerge/metadata.xml
+++ b/dev-python/jsonmerge/metadata.xml
@ -3,6 +3,7 @@
 <pkgmetadata>
 	<upstream>
 		<remote-id type="pypi">jsonmerge</remote-id>
+		<remote-id type="github">omergertel/jsonmerge</remote-id>
 	</upstream>
 	<maintainer>
 		<email>zmedico@gentoo.org</email>
--- a/dev-python/mergedict/metadata.xml
+++ b/dev-python/mergedict/metadata.xml
@ -4,5 +4,6 @@
 	<herd>python</herd>
 	<upstream>
 		<remote-id type="pypi">configclass</remote-id>
+		<remote-id type="github">schettino72/mergedict</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/dev-python/pyformance/metadata.xml
+++ b/dev-python/pyformance/metadata.xml
@ -4,6 +4,7 @@
 	<herd>python</herd>
 	<upstream>
 		<remote-id type="pypi">pyformance</remote-id>
+		<remote-id type="github">omergertel/pyformance</remote-id>
 	</upstream>
 	<maintainer>
 		<email>zmedico@gentoo.org</email>
--- a/dev-python/txaio/metadata.xml
+++ b/dev-python/txaio/metadata.xml
@ -2,4 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>
+	<upstream>
+		<remote-id type="pypi">txaio</remote-id>
+		<remote-id type="github">tavendo/txaio</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/dev-tex/latex-beamer/metadata.xml
+++ b/dev-tex/latex-beamer/metadata.xml
@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+	<herd>tex</herd>
+	<upstream>
+		<remote-id type="bitbucket">rivanvx/beamer</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/dev-tex/latex2rtf/metadata.xml
+++ b/dev-tex/latex2rtf/metadata.xml
@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+	<herd>tex</herd>
+	<upstream>
+		<remote-id type="sourceforge">latex2rtf</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/dev-tex/latexdiff/metadata.xml
+++ b/dev-tex/latexdiff/metadata.xml
@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>tex</herd>
+	<upstream>
+		<remote-id type="github">ftilmann/latexdiff</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/dev-tex/minted/metadata.xml
+++ b/dev-tex/minted/metadata.xml
@ -5,4 +5,7 @@
  <maintainer>
    <email>sci@gentoo.org</email>
  </maintainer>
+  <upstream>
+    <remote-id type="github">gpoore/minted</remote-id>
+  </upstream>
 </pkgmetadata>
--- a/dev-tex/pgf/metadata.xml
+++ b/dev-tex/pgf/metadata.xml
@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+	<herd>tex</herd>
+	<upstream>
+		<remote-id type="sourceforge">pgf</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/dev-tex/prosper/metadata.xml
+++ b/dev-tex/prosper/metadata.xml
@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+	<herd>tex</herd>
+	<upstream>
+		<remote-id type="sourceforge">prosper</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/dev-tex/qtexengine/metadata.xml
+++ b/dev-tex/qtexengine/metadata.xml
@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
  <herd>qt</herd>
+  <upstream>
+    <remote-id type="sourceforge">qtiplot.berlios</remote-id>
+  </upstream>
 </pkgmetadata>
--- a/dev-tex/texmfind/metadata.xml
+++ b/dev-tex/texmfind/metadata.xml
@ -22,5 +22,7 @@
 		good chunk of) the texmf-files that can be installed from the main
 		portage tree.
 	</longdescription>
+	<upstream>
+		<remote-id type="launchpad">texmfind</remote-id>
+	</upstream>
 </pkgmetadata>
-
--- a/dev-tex/texpower/metadata.xml
+++ b/dev-tex/texpower/metadata.xml
@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>tex</herd>
+	<upstream>
+		<remote-id type="sourceforge">texpower</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/dev-tex/translator/metadata.xml
+++ b/dev-tex/translator/metadata.xml
@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+	<herd>tex</herd>
+	<upstream>
+		<remote-id type="sourceforge">latex-beamer</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/dev-util/a8/metadata.xml
+++ b/dev-util/a8/metadata.xml
@ -6,5 +6,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">a8</remote-id>
+		<remote-id type="github">aliafshar/a8</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/dev-util/aap/metadata.xml
+++ b/dev-util/aap/metadata.xml
@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>vim</herd>
+	<herd>vim</herd>
+	<upstream>
+		<remote-id type="sourceforge">a-a-p</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/dev-util/ald/metadata.xml
+++ b/dev-util/ald/metadata.xml
@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>dev-tools</herd>
+	<herd>dev-tools</herd>
+	<upstream>
+		<remote-id type="sourceforge">ald</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/dev-util/android-tools/metadata.xml
+++ b/dev-util/android-tools/metadata.xml
@ -5,6 +5,8 @@
 		<bugs-to>https://code.google.com/p/android/issues/list</bugs-to>
 		<changelog>https://android.googlesource.com/platform/system/core.git/+log/HEAD</changelog>
 		<doc>https://android.googlesource.com/platform/system/core.git/+/master/adb/OVERVIEW.TXT</doc>
+		<remote-id type="github">android/platform_system_core</remote-id>
+		<remote-id type="launchpad">ubuntu</remote-id>
 	</upstream>
 	<maintainer>
 		<email>zmedico@gentoo.org</email>
--- a/dev-util/apitrace/metadata.xml
+++ b/dev-util/apitrace/metadata.xml
@ -9,4 +9,7 @@
 		<flag name="cli">Enable command line interface</flag>
 		<flag name="egl">Enable EGL support</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">apitrace/apitrace</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/dev-util/appdata-tools/metadata.xml
+++ b/dev-util/appdata-tools/metadata.xml
@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+	<herd>gnome</herd>
 	<maintainer>
 		<email>polynomial-c@gentoo.org</email>
 		<name>Lars Wendler</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">hughsie/appdata-tools</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/dev-util/aruba/metadata.xml
+++ b/dev-util/aruba/metadata.xml
@ -1,5 +1,10 @@
-<?xml version = '1.0' encoding = 'UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>graaff@gentoo.org</email></maintainer>
+	<maintainer>
+		<email>graaff@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">cucumber/aruba</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/dev-util/astyle/metadata.xml
+++ b/dev-util/astyle/metadata.xml
@ -30,4 +30,7 @@
  files. These can be used from a command line, or it can be incorporated as 
  classes in another C++ program.  
  </longdescription>
+  <upstream>
+    <remote-id type="sourceforge">astyle</remote-id>
+  </upstream>
 </pkgmetadata>
--- a/dev-util/atomic-install/metadata.xml
+++ b/dev-util/atomic-install/metadata.xml
@ -11,5 +11,6 @@
 			<name>Michał Górny</name>
 		</maintainer>
 		<bugs-to>https://github.com/mgorny/atomic-install/issues/</bugs-to>
+		<remote-id type="github">mgorny/atomic-install</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/dev-util/bakefile/metadata.xml
+++ b/dev-util/bakefile/metadata.xml
@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>wxwidgets</herd>
+	<herd>wxwidgets</herd>
+	<upstream>
+		<remote-id type="sourceforge">bakefile</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/dev-util/bam/metadata.xml
+++ b/dev-util/bam/metadata.xml
@ -4,5 +4,7 @@
 	<maintainer>
 		<email>maintainer-needed@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">downloads/matricks</remote-id>
+	</upstream>
 </pkgmetadata>
-
--- a/dev-util/bbe/metadata.xml
+++ b/dev-util/bbe/metadata.xml
@ -5,4 +5,7 @@
 		<email>billie@gentoo.org</email>
 		<name>Daniel Pielmeier</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">bbe-</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/dev-util/bdelta/metadata.xml
+++ b/dev-util/bdelta/metadata.xml
@ -7,4 +7,7 @@
    <description>Primary Maintainer</description>
  </maintainer>
  <herd>tools-portage</herd>
+  <upstream>
+    <remote-id type="github">jjwhitney/BDelta</remote-id>
+  </upstream>
 </pkgmetadata>
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Mon, 15 Jun 2015 08:37:02 +0000
+Mon, 15 Jun 2015 12:07:07 +0000
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Mon, 15 Jun 2015 08:37:02 +0000
+Mon, 15 Jun 2015 12:07:07 +0000
--- a/metadata/md5-cache/app-emulation/xen-4.2.5-r11
+++ b/metadata/md5-cache/app-emulation/xen-4.2.5-r11
@ -10,6 +10,6 @@ PDEPEND=~app-emulation/xen-tools-4.2.5
 REQUIRED_USE=flask? ( xsm )
 RESTRICT=test
 SLOT=0
-SRC_URI=http://bits.xensource.com/oss-xen/release/4.2.5/xen-4.2.5.tar.gz http://dev.gentoo.org/~dlan/distfiles/xen-4.2.5-upstream-patches-8.tar.xz http://dev.gentoo.org/~dlan/distfiles/xen-security-patches-2.tar.xz
+SRC_URI=http://bits.xensource.com/oss-xen/release/4.2.5/xen-4.2.5.tar.gz http://dev.gentoo.org/~dlan/distfiles/xen-4.2.5-upstream-patches-9.tar.xz http://dev.gentoo.org/~dlan/distfiles/xen-security-patches-3.tar.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=caa2807f24f516e98838e4e1a6ed570e
+_md5_=f63df54d39f6b81e4394a28a45d61429
--- a/metadata/md5-cache/app-emulation/xen-4.4.2-r4
+++ b/metadata/md5-cache/app-emulation/xen-4.4.2-r4
@ -10,6 +10,6 @@ PDEPEND=~app-emulation/xen-tools-4.4.2
 REQUIRED_USE=flask? ( xsm ) arm? ( debug )
 RESTRICT=test
 SLOT=0
-SRC_URI=http://bits.xensource.com/oss-xen/release/4.4.2/xen-4.4.2.tar.gz http://dev.gentoo.org/~dlan/distfiles/xen-4.4.2-upstream-patches-1.tar.xz http://dev.gentoo.org/~dlan/distfiles/xen-security-patches-2.tar.xz
+SRC_URI=http://bits.xensource.com/oss-xen/release/4.4.2/xen-4.4.2.tar.gz http://dev.gentoo.org/~dlan/distfiles/xen-4.4.2-upstream-patches-2.tar.xz http://dev.gentoo.org/~dlan/distfiles/xen-security-patches-3.tar.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=20fb461894d41357a9d4d304e0109639
+_md5_=8dff16c8df2cbf3b56abd54706dbed49
--- a/metadata/md5-cache/app-emulation/xen-4.5.0-r6
+++ b/metadata/md5-cache/app-emulation/xen-4.5.0-r6
@ -4,7 +4,7 @@ DESCRIPTION=The Xen virtual machine monitor
 EAPI=5
 HOMEPAGE=http://xen.org/
 IUSE=custom-cflags debug efi flask xsm
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm ~arm64 -x86
 LICENSE=GPL-2
 PDEPEND=~app-emulation/xen-tools-4.5.0
 REQUIRED_USE=flask? ( xsm ) arm? ( debug )
@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://bits.xensource.com/oss-xen/release/4.5.0/xen-4.5.0.tar.gz http://dev.gentoo.org/~dlan/distfiles/xen-4.5.0-upstream-patches-4.tar.xz http://dev.gentoo.org/~dlan/distfiles/xen-security-patches-1.tar.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=4c982d3f02f779f4e324d7dc97a85d8f
+_md5_=d68bababd3d9bbf9f8796f4285495fd5
--- a/metadata/md5-cache/app-emulation/xen-4.5.0-r8
+++ b/metadata/md5-cache/app-emulation/xen-4.5.0-r8
@ -10,6 +10,6 @@ PDEPEND=~app-emulation/xen-tools-4.5.0
 REQUIRED_USE=flask? ( xsm ) arm? ( debug )
 RESTRICT=test
 SLOT=0
-SRC_URI=http://bits.xensource.com/oss-xen/release/4.5.0/xen-4.5.0.tar.gz http://dev.gentoo.org/~dlan/distfiles/xen-4.5.0-upstream-patches-5.tar.xz http://dev.gentoo.org/~dlan/distfiles/xen-security-patches-2.tar.xz
+SRC_URI=http://bits.xensource.com/oss-xen/release/4.5.0/xen-4.5.0.tar.gz http://dev.gentoo.org/~dlan/distfiles/xen-4.5.0-upstream-patches-6.tar.xz http://dev.gentoo.org/~dlan/distfiles/xen-security-patches-3.tar.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=8c0b8cbceb2584cafc4812bfb7054c7d
+_md5_=53f2f8cb2ac3173f8313e7daa915b717
--- a/metadata/md5-cache/app-emulation/xen-pvgrub-4.5.0-r1
+++ b/metadata/md5-cache/app-emulation/xen-pvgrub-4.5.0-r1
@ -4,11 +4,11 @@ DESCRIPTION=allows to boot Xen domU kernels from a menu.lst laying inside guest
 EAPI=5
 HOMEPAGE=http://xen.org/
 IUSE=custom-cflags python_targets_python2_7
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 -x86
 LICENSE=GPL-2
 RDEPEND=>=app-emulation/xen-4.2.1
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://bits.xensource.com/oss-xen/release/4.5.0/xen-4.5.0.tar.gz mirror://gnu-alpha/grub/grub-0.97.tar.gz http://xenbits.xensource.com/xen-extfiles/zlib-1.2.3.tar.gz ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/pciutils-2.2.9.tar.bz2 http://xenbits.xensource.com/xen-extfiles/lwip-1.3.0.tar.gz http://xenbits.xensource.com/xen-extfiles/newlib/newlib-1.16.0.tar.gz http://xenbits.xensource.com/xen-extfiles/polarssl-1.1.4-gpl.tgz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=2a67e81c3a6e50ee6d56e1b5e1321ff6
+_md5_=7d4420db6ca720a697d6229bed6fc840
--- a/metadata/md5-cache/app-emulation/xen-tools-4.2.5-r7
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.2.5-r7
@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst prepare setup
+DEPEND=dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libgcrypt:0 dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/pypam[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] sys-libs/zlib sys-power/iasl system-seabios? ( sys-firmware/seabios ) sys-firmware/ipxe dev-ml/findlib hvm? ( media-libs/libsdl ) >=dev-lang/python-2.7.5-r2:2.7[xml,threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] api? ( dev-libs/libxml2 net-misc/curl ) >=dev-lang/python-2.7.5-r2:2.7[xml,threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] pygrub? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) sys-devel/bin86 sys-devel/dev86 dev-lang/perl app-misc/pax-utils doc? ( app-doc/doxygen dev-tex/latex2html[png,gif] media-gfx/transfig media-gfx/graphviz dev-tex/xcolor dev-texlive/texlive-latexextra virtual/latex-base dev-tex/latexmk dev-texlive/texlive-latex dev-texlive/texlive-pictures dev-texlive/texlive-latexrecommended ) hvm? ( x11-proto/xproto !net-libs/libiscsi ) virtual/pkgconfig
+DESCRIPTION=Xend daemon and tools
+EAPI=5
+HOMEPAGE=http://xen.org/
+IUSE=api custom-cflags debug doc flask hvm qemu ocaml pygrub screen static-libs system-seabios python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-apps/iproute2 net-misc/bridge-utils ocaml? ( >=dev-lang/ocaml-4 ) screen? ( app-misc/screen app-admin/logrotate ) virtual/udev
+REQUIRED_USE=hvm? ( qemu ) python_targets_python2_7
+RESTRICT=test
+SLOT=0
+SRC_URI=http://bits.xensource.com/oss-xen/release/4.2.5/xen-4.2.5.tar.gz http://code.coreboot.org/p/seabios/downloads/get/seabios-1.6.3.2.tar.gz http://dev.gentoo.org/~dlan/distfiles/seabios-1.6.3.2.tar.gz http://dev.gentoo.org/~dlan/distfiles/xen-4.2.5-upstream-patches-9.tar.xz http://dev.gentoo.org/~dlan/distfiles/xen-security-patches-3.tar.xz http://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-1.tar.xz
+_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438
+_md5_=14510f131cdd6fe767960d20f60dce53
--- a/metadata/md5-cache/app-emulation/xen-tools-4.4.2-r4
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.4.2-r4
@ -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_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] pam? ( dev-python/pypam[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) hvm? ( media-libs/libsdl ) >=dev-lang/python-2.7.5-r2:2.7[xml,threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] api? ( dev-libs/libxml2 net-misc/curl ) pygrub? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) ovmf? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) arm? ( >=sys-apps/dtc-1.4.0 ) !arm? ( sys-devel/bin86 system-seabios? ( sys-firmware/seabios ) sys-firmware/ipxe sys-devel/dev86 sys-power/iasl ) dev-lang/perl app-misc/pax-utils dev-python/markdown[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] doc? ( app-doc/doxygen dev-tex/latex2html[png,gif] media-gfx/graphviz dev-tex/xcolor media-gfx/transfig dev-texlive/texlive-latexextra virtual/latex-base dev-tex/latexmk dev-texlive/texlive-latex dev-texlive/texlive-pictures dev-texlive/texlive-latexrecommended ) hvm? ( x11-proto/xproto !net-libs/libiscsi ) qemu? ( x11-libs/pixman ) system-qemu? ( app-emulation/qemu[xen] ) ocaml? ( dev-ml/findlib >=dev-lang/ocaml-4 ) virtual/pkgconfig
+DESCRIPTION=Xend daemon and tools
+EAPI=5
+HOMEPAGE=http://xen.org/
+IUSE=api custom-cflags debug doc flask hvm qemu ocaml ovmf +pam python pygrub screen static-libs system-qemu system-seabios python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~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 net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate ) virtual/udev
+REQUIRED_USE=hvm? ( || ( qemu system-qemu ) ) python_targets_python2_7 pygrub? ( python ) ovmf? ( hvm ) qemu? ( !system-qemu )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://bits.xensource.com/oss-xen/release/4.4.2/xen-4.4.2.tar.gz http://code.coreboot.org/p/seabios/downloads/get/seabios-1.7.3.1.tar.gz http://dev.gentoo.org/~dlan/distfiles/seabios-1.7.3.1.tar.gz ovmf? ( http://dev.gentoo.org/~dlan/distfiles/ovmf-20131208.tar.bz2 http://dev.gentoo.org/~dlan/distfiles/xen-ovmf-patches-0.tar.xz ) http://dev.gentoo.org/~dlan/distfiles/xen-4.4.2-upstream-patches-2.tar.xz http://dev.gentoo.org/~dlan/distfiles/xen-security-patches-3.tar.xz http://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-4.tar.xz
+_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438
+_md5_=ac380e37c112945ffe756b1971112814
--- a/metadata/md5-cache/app-emulation/xen-tools-4.5.0-r6
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.5.0-r6
@ -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_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] pam? ( dev-python/pypam[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) hvm? ( media-libs/libsdl ) >=dev-lang/python-2.7.5-r2:2.7[xml,threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] api? ( dev-libs/libxml2 net-misc/curl ) pygrub? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) ovmf? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) !amd64? ( >=sys-apps/dtc-1.4.0 ) amd64? ( sys-devel/bin86 system-seabios? ( sys-firmware/seabios ) sys-firmware/ipxe sys-devel/dev86 sys-power/iasl ) dev-lang/perl app-misc/pax-utils dev-python/markdown[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] doc? ( app-doc/doxygen dev-tex/latex2html[png,gif] media-gfx/graphviz dev-tex/xcolor media-gfx/transfig dev-texlive/texlive-latexextra virtual/latex-base dev-tex/latexmk dev-texlive/texlive-latex dev-texlive/texlive-pictures dev-texlive/texlive-latexrecommended ) hvm? ( x11-proto/xproto !net-libs/libiscsi ) qemu? ( x11-libs/pixman ) system-qemu? ( app-emulation/qemu[xen] ) ocaml? ( dev-ml/findlib >=dev-lang/ocaml-4 ) virtual/pkgconfig
+DESCRIPTION=Xend daemon and tools
+EAPI=5
+HOMEPAGE=http://xen.org/
+IUSE=api custom-cflags debug doc flask hvm qemu ocaml ovmf +pam python pygrub screen 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 net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate ) virtual/udev
+REQUIRED_USE=hvm? ( || ( qemu system-qemu ) ) python_targets_python2_7 pygrub? ( python ) ovmf? ( hvm ) qemu? ( !system-qemu )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://bits.xensource.com/oss-xen/release/4.5.0/xen-4.5.0.tar.gz http://code.coreboot.org/p/seabios/downloads/get/seabios-1.7.5.tar.gz http://dev.gentoo.org/~dlan/distfiles/seabios-1.7.5.tar.gz ovmf? ( http://dev.gentoo.org/~dlan/distfiles/ovmf-20131208.tar.bz2 http://dev.gentoo.org/~dlan/distfiles/xen-ovmf-patches-0.tar.xz ) http://dev.gentoo.org/~dlan/distfiles/xen-4.5.0-upstream-patches-6.tar.xz http://dev.gentoo.org/~dlan/distfiles/xen-security-patches-3.tar.xz http://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-4.tar.xz
+_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438
+_md5_=7d6dc5c07f8ec3d7e9ed692955a21ca7
--- a/metadata/md5-cache/app-text/jabref-2.10-r2
+++ b/metadata/md5-cache/app-text/jabref-2.10-r2
@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 dev-java/antlr:3 dev-java/fontbox:1.7 dev-java/jempbox:1.7 dev-java/log4j:0 dev-java/spin:0 dev-java/microba:0 >=dev-java/glazedlists-1.8.0 >=dev-java/java-config-2.2.0 >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
+DEPEND=>=virtual/jdk-1.6 dev-java/antlr:0 dev-java/antlr:4 dev-java/fontbox:1.7 dev-java/jempbox:1.7 dev-java/log4j:0 dev-java/spin:0 dev-java/microba:0 >=dev-java/glazedlists-1.8.0:0 >=dev-java/java-config-2.2.0 >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
 DESCRIPTION=Java GUI for managing BibTeX and other bibliographies
 EAPI=5
 HOMEPAGE=http://jabref.sourceforge.net/
 IUSE=doc elibc_FreeBSD elibc_FreeBSD elibc_FreeBSD
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.6 dev-java/antlr:3 dev-java/fontbox:1.7 dev-java/jempbox:1.7 dev-java/log4j:0 dev-java/spin:0 dev-java/microba:0 >=dev-java/glazedlists-1.8.0 >=dev-java/java-config-2.2.0
+RDEPEND=>=virtual/jre-1.6 dev-java/antlr:0 dev-java/antlr:4 dev-java/fontbox:1.7 dev-java/jempbox:1.7 dev-java/log4j:0 dev-java/spin:0 dev-java/microba:0 >=dev-java/glazedlists-1.8.0:0 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/jabref/JabRef-2.10-src.tar.bz2
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4a7c80c1feba48616b58c79d977e084c	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=d05200b3f34f3105d3346ca649e10cb8
+_md5_=502701c6f364f629c30cb4754bb34cb9
--- a/metadata/md5-cache/dev-java/jcs-2.0
+++ b/metadata/md5-cache/dev-java/jcs-2.0
@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/ant-junit:0 ) dev-java/jisp:2.5 dev-db/hsqldb:0 dev-java/xmlrpc:0 dev-java/commons-lang:0 dev-java/commons-dbcp:0 dev-java/commons-pool:0 dev-java/commons-logging:0 dev-java/commons-httpclient:3 java-virtuals/servlet-api:3.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
+DEPEND=>=virtual/jdk-1.6 test? ( dev-java/ant-junit:0 ) dev-java/jisp:2.5 dev-db/hsqldb:0 dev-java/log4j:0 dev-java/xmlrpc:3 dev-java/commons-lang:0 dev-java/commons-dbcp:0 dev-java/commons-pool:0 dev-java/commons-logging:0 dev-java/commons-httpclient:3 java-virtuals/servlet-api:3.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
 DESCRIPTION=JCS is a distributed caching system written in Java for server-side Java applications
 EAPI=5
 HOMEPAGE=http://commons.apache.org/jcs/
 IUSE=admin elibc_FreeBSD test doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 dev-java/jisp:2.5 dev-db/hsqldb:0 dev-java/xmlrpc:0 dev-java/commons-lang:0 dev-java/commons-dbcp:0 dev-java/commons-pool:0 dev-java/commons-logging:0 dev-java/commons-httpclient:3 java-virtuals/servlet-api:3.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+RDEPEND=>=virtual/jre-1.6 dev-java/jisp:2.5 dev-db/hsqldb:0 dev-java/log4j:0 dev-java/xmlrpc:3 dev-java/commons-lang:0 dev-java/commons-dbcp:0 dev-java/commons-pool:0 dev-java/commons-logging:0 dev-java/commons-httpclient:3 java-virtuals/servlet-api:3.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.0
 SRC_URI=http://apache.mirrors.ovh.net/ftp.apache.org/dist/commons/jcs/source/commons-jcs-dist-2.0-beta-1-src.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4a7c80c1feba48616b58c79d977e084c	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=fefe5e0c3b77bca58a7d74c0429ff173
+_md5_=b789d3a7e1ba1a8c4435946f5cce22f5
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.41
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.41
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat's Servlet API 2.5/JSP API 2.1 implementation
-EAPI=5
-HOMEPAGE=http://tomcat.apache.org/
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=2.5
-SRC_URI=mirror://apache/tomcat/tomcat-6/v6.0.41/src/apache-tomcat-6.0.41-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4a7c80c1feba48616b58c79d977e084c	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=7996c510d4f0087eb7e713b535b007ac
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.43
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.43
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat's Servlet API 2.5/JSP API 2.1 implementation
-EAPI=5
-HOMEPAGE=http://tomcat.apache.org/
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=2.5
-SRC_URI=mirror://apache/tomcat/tomcat-6/v6.0.43/src/apache-tomcat-6.0.43-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4a7c80c1feba48616b58c79d977e084c	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=b82a0d0d08a0e573e943d49f046d22c1
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.56
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.56
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat's Servlet API 3.0/JSP API 2.2 implementation
-EAPI=5
-HOMEPAGE=http://tomcat.apache.org/
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=amd64 ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=3.0
-SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.56/src/apache-tomcat-7.0.56-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4a7c80c1feba48616b58c79d977e084c	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=b5ef6cf5e5beba21c71e077655955b38
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.57
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.57
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat's Servlet API 3.0/JSP API 2.2 implementation
-EAPI=5
-HOMEPAGE=http://tomcat.apache.org/
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=3.0
-SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.57/src/apache-tomcat-7.0.57-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4a7c80c1feba48616b58c79d977e084c	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=7147a47672ded8ea81d1a2eb424e1443
--- a/metadata/md5-cache/dev-lang/tcl-8.5.17-r100
+++ b/metadata/md5-cache/dev-lang/tcl-8.5.17-r100
@ -6,8 +6,8 @@ HOMEPAGE=http://www.tcl.tk/
 IUSE=debug threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris
 LICENSE=tcltk
-RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !=dev-lang/tcl-8.5*:0
 SLOT=8.5
 SRC_URI=mirror://sourceforge/tcl/tcl8.5.17-src.tar.gz
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=65fc50c4fdea01c5e89e9a00e57bce50
+_md5_=32d59e5c9d1d268273c5697a832e912f
--- a/metadata/md5-cache/dev-libs/libuv-1.6.1
+++ b/metadata/md5-cache/dev-libs/libuv-1.6.1
@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/libtool virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Cross-platform asychronous I/O
+EAPI=5
+HOMEPAGE=https://github.com/libuv/libuv
+IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD BSD-2 ISC MIT
+SLOT=0/1
+SRC_URI=https://github.com/libuv/libuv/archive/v1.6.1.tar.gz -> libuv-1.6.1.tar.gz
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=dd6607f476c11d40efefc0c1487ad210
--- a/metadata/md5-cache/net-firewall/shorewall-4.6.10.1
+++ b/metadata/md5-cache/net-firewall/shorewall-4.6.10.1
@ -9,6 +9,6 @@ LICENSE=GPL-2
 RDEPEND=>=net-firewall/iptables-1.4.20 >=sys-apps/iproute2-3.8.0[-minimal] >=sys-devel/bc-1.06.95 ipv4? ( >=dev-lang/perl-5.16 virtual/perl-Digest-SHA ) ipv6? ( >=dev-perl/Socket6-0.230.0 >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) lite6? ( >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) init? ( >=sys-apps/coreutils-8.20 ) !net-firewall/shorewall-core !net-firewall/shorewall6 !net-firewall/shorewall-lite !net-firewall/shorewall6-lite !net-firewall/shorewall-init !<sys-apps/systemd-214
 REQUIRED_USE=ipv6? ( ipv4 ) || ( ipv4 lite4 lite6 )
 SLOT=0
-SRC_URI=http://www.shorewall.net/pub/shorewall/4.6/shorewall-4.6.9/shorewall-core-4.6.9.tar.bz2 ipv4? ( http://www.shorewall.net/pub/shorewall/4.6/shorewall-4.6.9/shorewall-4.6.9.tar.bz2 ) ipv6? ( http://www.shorewall.net/pub/shorewall/4.6/shorewall-4.6.9/shorewall6-4.6.9.tar.bz2 ) lite4? ( http://www.shorewall.net/pub/shorewall/4.6/shorewall-4.6.9/shorewall-lite-4.6.9.tar.bz2 ) lite6? ( http://www.shorewall.net/pub/shorewall/4.6/shorewall-4.6.9/shorewall6-lite-4.6.9.tar.bz2 ) init? ( http://www.shorewall.net/pub/shorewall/4.6/shorewall-4.6.9/shorewall-init-4.6.9.tar.bz2 ) doc? ( http://www.shorewall.net/pub/shorewall/4.6/shorewall-4.6.9/shorewall-docs-html-4.6.9.tar.bz2 )
+SRC_URI=http://www.shorewall.net/pub/shorewall/4.6/shorewall-4.6.10/shorewall-core-4.6.10.1.tar.bz2 ipv4? ( http://www.shorewall.net/pub/shorewall/4.6/shorewall-4.6.10/shorewall-4.6.10.1.tar.bz2 ) ipv6? ( http://www.shorewall.net/pub/shorewall/4.6/shorewall-4.6.10/shorewall6-4.6.10.1.tar.bz2 ) lite4? ( http://www.shorewall.net/pub/shorewall/4.6/shorewall-4.6.10/shorewall-lite-4.6.10.1.tar.bz2 ) lite6? ( http://www.shorewall.net/pub/shorewall/4.6/shorewall-4.6.10/shorewall6-lite-4.6.10.1.tar.bz2 ) init? ( http://www.shorewall.net/pub/shorewall/4.6/shorewall-4.6.10/shorewall-init-4.6.10.1.tar.bz2 ) doc? ( http://www.shorewall.net/pub/shorewall/4.6/shorewall-4.6.10/shorewall-docs-html-4.6.10.1.tar.bz2 )
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	8cbc678e083c23e4ad546ca6509cf304	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=dd7024e685922b8f366b80cf3bc088e8
+_md5_=873a8d9045d1c954fad686fb4c8b3741
--- a/metadata/md5-cache/net-libs/iojs-2.3.0
+++ b/metadata/md5-cache/net-libs/iojs-2.3.0
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=icu? ( dev-libs/icu ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] !bundled-libs? ( >=net-libs/http-parser-2.5 >=dev-libs/libuv-1.6.1 >=dev-libs/openssl-1.0.2c[-bindist] ) !!net-libs/nodejs
+DESCRIPTION=An npm compatible platform originally based on node.js
+EAPI=5
+HOMEPAGE=http://iojs.org/
+IUSE=bundled-libs debug icu +npm snapshot +ssl python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~x86 ~x64-macos
+LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
+RDEPEND=icu? ( dev-libs/icu ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] !bundled-libs? ( >=net-libs/http-parser-2.5 >=dev-libs/libuv-1.6.1 >=dev-libs/openssl-1.0.2c[-bindist] )
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=http://iojs.org/dist/v2.3.0/iojs-v2.3.0.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=295afd3a6845ab2dcf4954944b801e4c
--- a/metadata/md5-cache/net-proxy/shadowsocks-libev-2.2.1
+++ b/metadata/md5-cache/net-proxy/shadowsocks-libev-2.2.1
@ -9,6 +9,6 @@ LICENSE=GPL-3+
 RDEPEND=openssl? ( dev-libs/openssl:= ) polarssl? ( net-libs/polarssl )
 REQUIRED_USE=^^ ( openssl polarssl )
 SLOT=0
-SRC_URI=https://github.com/shadowsocks/shadowsocks-libev/archive/v2.1.4.tar.gz -> shadowsocks-libev-2.1.4.tar.gz
+SRC_URI=https://github.com/shadowsocks/shadowsocks-libev/archive/v2.2.1.tar.gz -> shadowsocks-libev-2.2.1.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=c3b0b4d4957812dca5bfa67d3b230dc4
+_md5_=fdea33999b7b0806e4626bf87642bda0
--- a/metadata/md5-cache/sys-cluster/vzctl-4.9.2
+++ b/metadata/md5-cache/sys-cluster/vzctl-4.9.2
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare unpack
+DEPEND=net-firewall/iptables sys-apps/ed >=sys-apps/iproute2-3.3.0 >=sys-fs/vzquota-3.1 ploop? ( >=sys-cluster/ploop-1.13 sys-block/parted sys-fs/quota dev-libs/libxml2 ) >=dev-libs/libcgroup-0.38 vzmigrate? ( net-misc/openssh net-misc/rsync[xattr,acl] app-arch/tar[xattr,acl] net-misc/bridge-utils virtual/awk ) virtual/udev sys-apps/attr virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=OpenVZ ConTainers control utility
+EAPI=5
+HOMEPAGE=http://openvz.org/
+IUSE=+ploop +vzmigrate
+KEYWORDS=~amd64 ~ppc64 ~x86 -amd64-fbsd -sparc-fbsd -x86-fbsd
+LICENSE=GPL-2
+RDEPEND=net-firewall/iptables sys-apps/ed >=sys-apps/iproute2-3.3.0 >=sys-fs/vzquota-3.1 ploop? ( >=sys-cluster/ploop-1.13 sys-block/parted sys-fs/quota dev-libs/libxml2 ) >=dev-libs/libcgroup-0.38 vzmigrate? ( net-misc/openssh net-misc/rsync[xattr,acl] app-arch/tar[xattr,acl] net-misc/bridge-utils virtual/awk ) virtual/udev sys-apps/attr
+SLOT=0
+SRC_URI=http://download.openvz.org/utils/vzctl/4.9.2/src/vzctl-4.9.2.tar.bz2
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438
+_md5_=fbfbb78df558878d9fe08e79a0205927
--- a/metadata/md5-cache/sys-kernel/git-sources-4.1_rc8
+++ b/metadata/md5-cache/sys-kernel/git-sources-4.1_rc8
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=>=sys-devel/patch-2.7.4 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=The very latest -git version of the Linux kernel
+EAPI=5
+HOMEPAGE=http://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 freedist
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.1_rc8
+SRC_URI=mirror://kernel/linux/kernel/v4.x/testing/patch-4.1-rc8.xz mirror://kernel/linux/kernel/v4.x/linux-4.0.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=c1ae910cf0bb5cbb529e7377b29b1b70
--- a/metadata/md5-cache/sys-process/criu-1.4
+++ b/metadata/md5-cache/sys-process/criu-1.4
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test
-DEPEND=<dev-libs/protobuf-c-1 app-text/asciidoc app-text/xmlto
-DESCRIPTION=utility to checkpoint/restore a process tree
-EAPI=5
-HOMEPAGE=http://criu.org/
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=<dev-libs/protobuf-c-1
-RESTRICT=test
-SLOT=0
-SRC_URI=http://download.openvz.org/criu/criu-1.4.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	linux-info	8cbc678e083c23e4ad546ca6509cf304	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=fdd5aabd7f3e781382cfefc4ba0fe7b3
--- a/metadata/md5-cache/sys-process/criu-1.5.1
+++ b/metadata/md5-cache/sys-process/criu-1.5.1
@ -9,6 +9,6 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/protobuf-c setproctitle? ( dev-libs/libbsd )
 RESTRICT=test
 SLOT=0
-SRC_URI=http://download.openvz.org/criu/criu-1.5.1.tar.bz2
+SRC_URI=http://download.openvz.org/criu/criu-1.6.tar.bz2
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	linux-info	8cbc678e083c23e4ad546ca6509cf304	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=49badb66a20a72f80ccf3d020f1a9b68
+_md5_=8a46d98ebdb6d9caf9527c34b0adfa12
--- a/metadata/md5-cache/www-servers/tomcat-6.0.41
+++ b/metadata/md5-cache/www-servers/tomcat-6.0.41
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=dev-java/eclipse-ecj:3.7 ~dev-java/tomcat-servlet-api-6.0.41 extra-webapps? ( dev-java/jakarta-jstl:0 ) >=virtual/jdk-1.5 >=dev-java/ant-core-1.8.1:0 test? ( dev-java/ant-junit:0 dev-java/junit:4 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat Servlet-2.5/JSP-2.1 Container
-EAPI=4
-HOMEPAGE=http://tomcat.apache.org/
-IUSE=extra-webapps elibc_FreeBSD source test elibc_FreeBSD
-KEYWORDS=amd64 ppc ppc64 x86 ~x86-fbsd
-LICENSE=Apache-2.0
-RDEPEND=dev-java/eclipse-ecj:3.7 ~dev-java/tomcat-servlet-api-6.0.41 extra-webapps? ( dev-java/jakarta-jstl:0 ) !<dev-java/tomcat-native-1.1.20 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=6
-SRC_URI=mirror://apache/tomcat/tomcat-6/v6.0.41/src/apache-tomcat-6.0.41-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4a7c80c1feba48616b58c79d977e084c	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=9e2369b9f3ab047a888c01cb7118831e
--- a/metadata/md5-cache/www-servers/tomcat-6.0.43
+++ b/metadata/md5-cache/www-servers/tomcat-6.0.43
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=dev-java/eclipse-ecj:3.7 ~dev-java/tomcat-servlet-api-6.0.43 extra-webapps? ( dev-java/jakarta-jstl:0 ) >=virtual/jdk-1.5 >=dev-java/ant-core-1.8.1:0 test? ( dev-java/ant-junit:0 dev-java/junit:4 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat Servlet-2.5/JSP-2.1 Container
-EAPI=4
-HOMEPAGE=http://tomcat.apache.org/
-IUSE=extra-webapps elibc_FreeBSD source test elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
-LICENSE=Apache-2.0
-RDEPEND=dev-java/eclipse-ecj:3.7 ~dev-java/tomcat-servlet-api-6.0.43 extra-webapps? ( dev-java/jakarta-jstl:0 ) !<dev-java/tomcat-native-1.1.20 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=6
-SRC_URI=mirror://apache/tomcat/tomcat-6/v6.0.43/src/apache-tomcat-6.0.43-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4a7c80c1feba48616b58c79d977e084c	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=b96c7764c4f1604a1c1013c476c960ab
--- a/metadata/md5-cache/www-servers/tomcat-7.0.56
+++ b/metadata/md5-cache/www-servers/tomcat-7.0.56
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=dev-java/eclipse-ecj:4.4 ~dev-java/tomcat-servlet-api-7.0.56 extra-webapps? ( dev-java/jakarta-jstl:0 ) websockets? ( >=virtual/jdk-1.6 ) !websockets? ( >=virtual/jdk-1.6 ) >=dev-java/ant-core-1.8.1:0 test? ( dev-java/ant-junit:0 dev-java/junit:4 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat Servlet-3.0/JSP-2.2 Container
-EAPI=5
-HOMEPAGE=http://tomcat.apache.org/
-IUSE=extra-webapps websockets elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=dev-java/eclipse-ecj:4.4 ~dev-java/tomcat-servlet-api-7.0.56 extra-webapps? ( dev-java/jakarta-jstl:0 ) !<dev-java/tomcat-native-1.1.24 websockets? ( >=virtual/jre-1.6 ) !websockets? ( >=virtual/jre-1.6 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=7
-SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.56/src/apache-tomcat-7.0.56-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4a7c80c1feba48616b58c79d977e084c	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=730afadd804a226af6eb17e21106a1ef
--- a/metadata/md5-cache/www-servers/tomcat-7.0.57
+++ b/metadata/md5-cache/www-servers/tomcat-7.0.57
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=dev-java/eclipse-ecj:4.4 ~dev-java/tomcat-servlet-api-7.0.57 extra-webapps? ( dev-java/jakarta-jstl:0 ) websockets? ( >=virtual/jdk-1.7 ) !websockets? ( >=virtual/jdk-1.6 ) >=dev-java/ant-core-1.8.1:0 test? ( dev-java/ant-junit:0 dev-java/junit:4 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat Servlet-3.0/JSP-2.2 Container
-EAPI=5
-HOMEPAGE=http://tomcat.apache.org/
-IUSE=extra-webapps websockets elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=dev-java/eclipse-ecj:4.4 ~dev-java/tomcat-servlet-api-7.0.57 extra-webapps? ( dev-java/jakarta-jstl:0 ) websockets? ( >=virtual/jre-1.7 ) !websockets? ( >=virtual/jre-1.6 ) !<dev-java/tomcat-native-1.1.24 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=7
-SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.57/src/apache-tomcat-7.0.57-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4a7c80c1feba48616b58c79d977e084c	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=a0edb86a7badbce8b99762f2c7114acc
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@ -1 +1 @@
-Mon, 15 Jun 2015 08:37:05 +0000
+Mon, 15 Jun 2015 12:07:10 +0000
--- a/metadata/timestamp
+++ b/metadata/timestamp
@ -1 +1 @@
-Mon Jun 15 08:37:02 UTC 2015
+Mon Jun 15 12:07:07 UTC 2015
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@ -1 +1 @@
-Mon, 15 Jun 2015 09:00:01 +0000
+Mon, 15 Jun 2015 12:30:01 +0000
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@ -1 +1 @@
-1434357301 Mon 15 Jun 2015 08:35:01 AM UTC
+1434369901 Mon 15 Jun 2015 12:05:01 PM UTC
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@ -1,18 +1,18 @@
 DIST shorewall-4.5.21.10.tar.bz2 489469 SHA256 961331ba61e5e6dccc106e43685e45f19bf1e155502067c88e18ecf94c2a794f SHA512 bdc673b999c99624c61caa1239ac3a58c4d85743179de05ed5fe947e755fc4b01425da34b67cb5e6db693c62bf25e316517f1473b450a1d76887e69e4e384682 WHIRLPOOL 04a7afd30d79d6360ec325e7df06ffd6e911d938382a4c0c331312ddf6951d6564f5a0452b244095309fe4ce00b1c72838b0ef76e198e137c153a617dc22e8e5
 DIST shorewall-4.5.21.9.tar.bz2 489618 SHA256 a1fc41abcba3181235e217a5da53bb25d11e6cdeef49dde82a0daeb2bb305fc6 SHA512 137eb33f63a25533f90150de5cd246f47e5072f838f8e42b044bd6a620bce767f8cb2b9da995fcfb61e37ab6774ea97819f6f7408f669539917b419262a68496 WHIRLPOOL be464ef64e06b35ff9fdf74e9b6a8c88b8de1aa766ec3bf2a7ccf9b69731ba23dc638047f5ad44f451ab93e093458f8f88d7b16201d61bbdfce40075f9ef25be
+DIST shorewall-4.6.10.1.tar.bz2 496061 SHA256 de527474f5bac6bf59678321c604748c48efe28a897d339a2187a45e3efed8ef SHA512 a5ef4783ff04b6faaa2e25d1da57ca3c46860960859dad5cd3b8d3cb252626b1db39c35767b226333f10db7b08b0fb18c0c09cd4eaf14586cb02b1a4259b571d WHIRLPOOL 26ebb72e769d5ca7489f718cabdb1f9cfb78e2acd514329c7036edcafe27f159ffa4cdadeeb1cee43619f748474fcc7a614011147976abb14cf627503a542e3f
 DIST shorewall-4.6.6.2.tar.bz2 485880 SHA256 db41744e6303e031e29be531dbedd4191624c4a70f9e23fa0b450e26953708f4 SHA512 9b37430a51b84e16d6fec3bbe0581ff18d1f8f15defd4d73ac6a13cd68eebe063da129a9b422079a433f5d4b3bcd7c0800d844cb05bf0ef0c41aa36fe57915f2 WHIRLPOOL 09c90c5871c546d8e396bca32e1a2b8b1a7041653330b74930c415bfe2b94ff24ac4c34f38644c6b539495a277410c59c3816f396f86060754bd4247fb622194
-DIST shorewall-4.6.9.tar.bz2 490734 SHA256 6f9e83b7753ae5acfda74dc985599a34551f1f43ed5f61079db5d2eabcc4620b SHA512 8040bc6f11c7a0b8c813ccd3fccfa074a752a79aa0985d9e49ae0b12cfc4bdef214a667fa11fc7a831334b34de53dd5ffd84796d4d7fc68accb27a0f1a8c8fc0 WHIRLPOOL e13d41acbc307a5219a600cacdd804ab2c310238d1682325ae468202b8519e77ff1b3979c3cc820b12459a2bf7e446c1fe29638dfef33efea8c7f590d1c18501
+DIST shorewall-core-4.6.10.1.tar.bz2 58247 SHA256 5af804f39f4480685e995080dc8913d4af61af70d5a478dd00bbf0593851b44d SHA512 1028e0bf950aecbc77c6c263ab8351fb8ff90b6077a0d6bf7c0d882559f5d8644ce0f2c6aec6dd3614d90a319277763460909e345e1e004cf8ea1f548e369284 WHIRLPOOL 0a0834eb355e05679b5809a18dd0749c6c06ac3130a9ab375587c7e6134042c01762775ac136f0396c051f4ac4b2f379141d111760929a42da6f00656a96e120
 DIST shorewall-core-4.6.6.2.tar.bz2 54127 SHA256 764c8c22f619cdfd61eebd77e9f271a168515d44c4578b85af44921cc1f3b675 SHA512 bab5a8f1bb17a5273a5eadb734ad378a8b617b9a8be47a2a825f941d20c5161c88ce87dae285ebbbdbb21fe18c2e8cc5eff9b1097daef2d8def37c2eced05d6a WHIRLPOOL 8fd70565cfe0c6abc946cb41fc5cb1eca9ccc613fb4898f07b92f878fedd6293bc40e0aaf7c4af11f3e67ba47b341f471d69700e3edc0cc9426b4aad3bf38fb3
-DIST shorewall-core-4.6.9.tar.bz2 56988 SHA256 4f9b5362a925290130cfd50707ff8a376046e6dae97c7e6d62ac93223fc7277d SHA512 6b5982b5ef27f987cef3c0dd47ea73a21e3998f803a0ba3af4baf94525bae1c4ba867d2c13e02f1e2194f7fb4de032ef49a8c36ca2e215b3a7f5da3a170f45c4 WHIRLPOOL aa8baa992ed08e29582ada02a79bdec6678047cfa42fb021a3f14199cec229ab897356597b5564ca14abdebefc2bd7640bf972d64c11ee805326e70cf3a1297b
 DIST shorewall-docs-html-4.5.21.10.tar.bz2 4146174 SHA256 cdbc5f3654f7cfb6f0c3b3750a7174df8fa0590dfe34df055300140b3eb13192 SHA512 94852cc094d6a485cacc4023a2819431f1bfd80b8cbcab29981c422fdff9dfee90697ae8a9bda7ded3a8be03db516bdd5f4bcc4b83e7d01bc433a8c88d23731a WHIRLPOOL 6f02d0e3255dd1e31a43193f67f9b957546a6ae574631e61364f81244bee887e7f21c38f412fa21cde77b3d89aaf0e14e43909683db0c9c32edeb455c20b998e
 DIST shorewall-docs-html-4.5.21.9.tar.bz2 4146065 SHA256 9056c22b8232d8276cc53a6eb74940bab42a250c670cb5baa42c75cfb89efdef SHA512 48b2c692ba59b7ec74307909e43a95104e212c9b8e21af7f0dd9f3438ac4f24a6fd2bcc6517966681517aef03beaa8faf03efd74406966d97b68cb416be8551b WHIRLPOOL f68cba7ecaf8c541e58d26c157914bff2d90cd9deae30af7323ca69c68d028217133f53e597bf383191aee83fab29203d233b3cd1e75e4cf08d9e17308dc25e4
+DIST shorewall-docs-html-4.6.10.1.tar.bz2 4185752 SHA256 eeaec18b7f8663f0b836b76d140d3fad7871075de90f18ccc7b9fbda1538a787 SHA512 1bf1b3f5745d54af3af5f9bb6417c661e2bde8028d699aed4c4fcbe7cf301b8eadfed7be5e9bfdd677659c362d1e757eee13cd1b497a0c6837c179883c33e3a8 WHIRLPOOL 937fc4f76174f615de86eaa08690ebbe42f658154320d3e9972cbb0bcaa461e11fdaf5390f517f5d2f905aa5996ecb7399ca07d1767f647a49d33b1220e8d547
 DIST shorewall-docs-html-4.6.6.2.tar.bz2 4178931 SHA256 89c6b3baba42bd3a4d7f67ccfbae395fec4054412bf636ff60a889dc2f5edc57 SHA512 63686a59eb6fe6330b036800dc99758bdfaecc1e67cf95c4dd3cc014db2e96a17a76d8cf92d1f44582990b34b53d062327c850187bc0a83e4d2369ac7e03d032 WHIRLPOOL 31eacfe0c6ea3dac32c24de0c5d01214f3ce4e2b95306e3d6e4165a636a7f6f225fedc741d19fa995c148a2758ec08439da0d5e1cd654483e2e5be4f21a5dfda
-DIST shorewall-docs-html-4.6.9.tar.bz2 4182974 SHA256 203cc1f7eb569d8237929d703e61b0cfa39b20b80fa2315592807dbe15d04ef5 SHA512 117326adb5f850f39877564638ef115bbc42d1a393c760f0f941ea76c3f33fd7c83f31e6c7cfc658a30811d5f0e35c4673e82ee9d09e309872e7463bf5773422 WHIRLPOOL 053fe81885dde56ea5b546c4a1409c9d7f75738cb9dea26b38601edb11040ea378a2ccf0d8439004e820dbe0596e74244fb78adf698a4f30cc48dd1da1a457be
+DIST shorewall-init-4.6.10.1.tar.bz2 37674 SHA256 c3948dbe48230358eb4d5a370a44b247f4a6e6f28b1c4853be23d9abda79f6ba SHA512 71507a9c27f9a8286f82567f731714fe5a6f5b21f1f3f27f3a3ba9171301361948bef9824a9a45445d65f74039c4dca3ffc83e74a6ffd33783d1528ad581578e WHIRLPOOL 23c886b1015c6430d819d3010b8cdc587d88054f55b8092238438310562affdaead265a40a74dd888d1c939367afafa0ebecfe8946ceb202bab126ca2232cd97
 DIST shorewall-init-4.6.6.2.tar.bz2 34467 SHA256 361374cd8f52cec0f807e07a7a100da4627595c7c80c2d75d050ccee1a342e67 SHA512 760eb593c53e89622c6efafe8a46f43956aa606853f26c9a5402ca43eabbf1243a2dd3c2d64cc4a1e70da54bd0fb86de31c0f5dc14aefd0540b37745c243fb48 WHIRLPOOL 64953fab35a4a95ece8757b786a301caefbb47bd70821b61c48bfbbb445ebb3f434ca87ac5808bdf691a5469d2e2e3dd47b8857f272267790282ad8bbeb8b3b9
-DIST shorewall-init-4.6.9.tar.bz2 36417 SHA256 0409c98a776121e917eb7c8ff37d807dd50fc092a7b82ff96c46025ecbd90ca9 SHA512 16c85d571f19b3723032df0398ec732432cedce75b1530bf3c1a86f31c1880500760f809db57b2b3f6d0bcb4ec2b499bb94b6d0bdb77fc2f5d11b7ff3d0947e2 WHIRLPOOL 3b64ed7b1e2958bb45ed33d95efe912caa9ed6d6013a8222c27df3e5b1e088cafbd9bb36a521a1bc9c59e8c3e0d7d062198e5f987ccdda4af08a0c18f4c89db0
+DIST shorewall-lite-4.6.10.1.tar.bz2 53535 SHA256 9944da74b9496fe29afe6ebab8f4a37cfb24a6a701282231dd6916831e064c38 SHA512 79347ae6c62e8f039efb2a21b10fd33d08831b6595b64fb4806cc5fd812216d295b73c859db775c0c19cd7c8bdfe67f21042db0d0b47ba47ab6b430d1d522659 WHIRLPOOL 593b8872ea0ff95c5847c51c9c3c312329017cbd7e96efcd39bf1a41a32ef3e99a29deb797a4260422d1bfd86ef4ca72b25024b7d2f5e4e17464df1f3f25571a
 DIST shorewall-lite-4.6.6.2.tar.bz2 48495 SHA256 6bd25fa1066da5272fa9bcc7a8a6041462eda682895cd000afce354bf42d9ebe SHA512 3c073b7531448c2d704bbdd0a7ad0287948d8969c371954f05a3cc276e6fcaaca907c554f4549c26aff2256d393fcc53221e7a1f93ac058cf519dc55c822104d WHIRLPOOL 1743c799022ab2a5ed1d86155f917120b44963c064d75b4168ea48b4e0b19970ccd1d944eb22eef0ea96f0abf396d60420508bda3f2cc30a33207c2edd12b27d
-DIST shorewall-lite-4.6.9.tar.bz2 52121 SHA256 13f7698a56b200c4550c3875874ee295e8b34e473dabeca705b2453cb92c3b3f SHA512 7a01ad5e4732608669980c9e607902c7574df9ab7ca6f787133bb9af06d0d041ff5ecf30425e146f4f1200668d7c38ef75290001c06cdc2febbc63020b4598e6 WHIRLPOOL 82311156dc99f215e9972f29895274606d2d1cafa6511f440871dad943884dbfcf5a0799df5726ccd69ec175140bf059162ce8d148ead3c33f52a6f388aeeba0
+DIST shorewall6-4.6.10.1.tar.bz2 231553 SHA256 1a2e303e9361fccf393ebfe512cf8d770b522f6b65a0a125a5e4aa0b28dd6e0c SHA512 acb678bd84e68d72f5dafd00d03feedefc8b954f7df9a4e6d57c70647ad2b046f7145c7b5de729d8bf1258a036587a687ee41170add2a50a411675be61de7d3d WHIRLPOOL a3451ff58bc32f4d720f5b8c6db226ac924cf0179084f351b7b35773f011c1b0b5feff2e9544a7b198995d297637e210b80adfb483db198e186b24a1954d2cc1
 DIST shorewall6-4.6.6.2.tar.bz2 225643 SHA256 b475473eaf9d4a8b4067214f8fa14f1c1d97cdb77c180abd9e22dfdea6b9f637 SHA512 a448e6367459fe06ff2869e45d06a3ff31ce5c7a6766920ad8367e251f8380ccf9cc62333d011f79baa7d3d97efb42fcadf1c6aecce124f2a3b94c15d3454db9 WHIRLPOOL 7f1fc2288983cb779872098362d98c7820164207dcbbcdf63d0fbec4b8fb2190724fde10f071f51ad51ba3f8f10282ecba5ba4f4b976ffa816da39935c336c54
-DIST shorewall6-4.6.9.tar.bz2 228263 SHA256 fdf5e619483877b66318839729abb181cb7a16fe6df20ac2e8b37570fae72120 SHA512 e176f00f60f5f06d7b644f1d6e55e80b7213d99e27a23f92a4c6e4d1eb6b736934589ab15694fdd5a3dec2cd4bd6bc020b5bf600cdf5e823fffa59dc003688ce WHIRLPOOL bf6093d75911e45bdbade155c9e241fdaff0dabd21ff5fcab6bc6c65867fd136dbda57ccdc8f6753f24f097d3b57a0d72582c00ba9b3368a211823fb5654b00f
+DIST shorewall6-lite-4.6.10.1.tar.bz2 52669 SHA256 ce19583541f5eb39acad33099af087d030374d467eb64aa4415ac9b18e65c5a8 SHA512 a33ab4b2397864329f35e6352606b13d04fb8ada17777c98d75bc685411bcf9453bf452d3a0b6699c537081483347c542bdfa547d71ca4c0c41967ccd755fd2e WHIRLPOOL ff3ef6e3ad68f69f47e71553061e845ed125735c1c6986180835397c8148386349a0317debf592917ec5ed0734c3af461c5161d9a061c6b8a6ff5c81d52743f0
 DIST shorewall6-lite-4.6.6.2.tar.bz2 47909 SHA256 a7a6de15ea84a0486c9ed92492fcd6f731f2c4ce71f06ce3c59f3abf3780ae86 SHA512 0d5b0fc3d166cfdd58978e1d6b36e2ac19a0d10b5b59bbf2fa62e79040e636d72256b120df14a7d8111dc39d24ac218758feb07c5fb2119aa61e51f78c567597 WHIRLPOOL c02c11ca0f578022daf96b2c594a7f62d042cf875c7c35682eaa2b312416446239c21c9af31f965536761a081015d73ae49b553c7cc08850955378d1cfb76af7
-DIST shorewall6-lite-4.6.9.tar.bz2 51290 SHA256 548c217a3bf7a4dae88ebecfa0057ccbbe015cb8d99a6e1aaa99c08bf95f234e SHA512 2eb02ac10e71aca329f08867a033e064e2ca958716c1e1a5e29d0fde12d3b00431182b07c4dee499955c57e541359f76f81f6efa21d1d8f948ed406f63cfbd65 WHIRLPOOL de5121bc3e7d8fc58a19b680143c1e66c6dcb61194d5805bac8e8bf8fd65a39eb1e57726845c091ba206ee61994b89a4bd601e5c8f402dbd79497805e05ce2c4
--- a/net-firewall/shorewall/files/4.6/shorewall-init-01_remove-ipset-functionality-r1.patch
+++ b/net-firewall/shorewall/files/4.6/shorewall-init-01_remove-ipset-functionality-r1.patch
@ -0,0 +1,28 @@
+diff -rupN old/shorewall-init-4.6.10.1/shorewall-init new/shorewall-init-4.6.10.1/shorewall-init
+--- old/shorewall-init-4.6.10.1/shorewall-init	2015-06-09 20:02:00.000000000 +0200
+++ new/shorewall-init-4.6.10.1/shorewall-init	2015-06-14 17:16:17.396424059 +0200
+@@ -78,10 +78,6 @@ shorewall_start () {
+ 	fi
+     done
+ 
+-    if [ -n "$SAVE_IPSETS" -a -f "$SAVE_IPSETS" ]; then
+-	ipset -R < "$SAVE_IPSETS"
+-    fi
+-
+     return 0
+ }
+ 
+@@ -99,13 +95,6 @@ shorewall_stop () {
+ 	fi
+     done
+ 
+-    if [ -n "$SAVE_IPSETS" ]; then
+-	mkdir -p $(dirname "$SAVE_IPSETS")
+-	if ipset -S > "${SAVE_IPSETS}.tmp"; then
+-	    grep -qE -- '^(-N|create )' "${SAVE_IPSETS}.tmp" && mv -f "${SAVE_IPSETS}.tmp" "$SAVE_IPSETS"
+-	fi
+-    fi
+-
+     return 0
+ }
+ 
--- a/net-firewall/shorewall/shorewall-4.6.10.1.ebuild
+++ b/net-firewall/shorewall/shorewall-4.6.10.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-4.6.9.ebuild,v 1.1 2015/05/25 02:52:22 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-4.6.10.1.ebuild,v 1.1 2015/06/15 11:47:22 mgorny Exp $

 EAPI="5"

@ -224,7 +224,7 @@ src_prepare() {
 		eprefixify "${S}"/${MY_PN_INIT}/init.gentoo.sh

 		cd "${S}"/${MY_PN_INIT}
-		epatch "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-init-01_remove-ipset-functionality.patch
+		epatch "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-init-01_remove-ipset-functionality-r1.patch
 		cd "${S}"
 	fi

--- a/net-fs/libnfs/libnfs-9999.ebuild
+++ b/net-fs/libnfs/libnfs-9999.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/libnfs/libnfs-9999.ebuild,v 1.7 2014/11/11 11:26:16 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/libnfs/libnfs-9999.ebuild,v 1.8 2015/06/15 11:39:00 vapier Exp $

 EAPI="5"

@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-2 autotools-utils
 else
 	SRC_URI="https://github.com/sahlberg/${PN}/archive/${P}.tar.gz"
-	KEYWORDS="~arm ~amd64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 	inherit autotools-utils
 fi

--- a/net-libs/iojs/Manifest
+++ b/net-libs/iojs/Manifest
@ -12,3 +12,4 @@ DIST iojs-v2.0.1.tar.xz 11702524 SHA256 aa9f1d385e79689cb0c8311a607a726daafd6027
 DIST iojs-v2.0.2.tar.xz 11900380 SHA256 afab3752cf9143a13784cd9d9c38b0ff5fd4aa77dffded2f5c3742c42b9743a2 SHA512 18166f3427d91269431f56f93407653c52fe0d9cbe846322a6d56f43af4a2bf1d66e49a2f179a390e76077608f5ff842a0f90588477b2d1c931e98346bbcb550 WHIRLPOOL e9829c1f14b69d9a035566663d983ea9778b92d47cf31844aa2afa4672e78b6f5f0b2ab8ae13e30c45740d2a14760d1d8c046f1e2ca8fc2da7f8ec25ae805989
 DIST iojs-v2.1.0.tar.xz 11976228 SHA256 b9bb7fb626a0f0f0babb3b042f61eba55ff0dec4645682fbb36b5bab13d5dd29 SHA512 66c06f2482faf9be2585a718a144cbbaceca3498e823659147c2b8592b073a9b49afd9e708df5057a905fea13e65c3c421d537418fa2891345b76c65a486fc70 WHIRLPOOL 76c0a1ec5b820c3b97ec760ecdb79fd4bd782e3a9fd04c9cc289f1e9e6c6cf900bc3f041f135fed094c2634f8d37db4485257c25a1cfdd997b74f5e715ba9354
 DIST iojs-v2.2.1.tar.xz 11985012 SHA256 26cce6e3581185ef3b1fe486a86ba9e18d611f6dfe439cfcbcfc8e639436a5bd SHA512 6ca0e93b1c5ebb05213d19341bf60087d1b362537e6cfee216b2166e95fec7bb7b98b716d21bf0e51e28f27fb27b0c48ecd045c6b28c0d5d9a474a49e28dc7c5 WHIRLPOOL fb494b97f773fedc3a997b4ddfb66ee5ed51dfa9a4e1cf4cce15cc8e7639f850367f87037307955769049df68464c6194fc996b8bede28b7acae422b45dc159a
+DIST iojs-v2.3.0.tar.xz 12044508 SHA256 bca702877c2672151ee898992e8e88f07eb14c221bc261ed9613e1107e9b9a3e SHA512 628f94e6ba363b0e5c4945e83020c59455e0b5cdd1d5c72401298dca80dcd00d1593a044e3b61ad49de4ec0151ca310e70ce20cc560d95f19c67efef5fe78ba4 WHIRLPOOL 415b9056ea93a8ac26e0f2cf9248614cf1df50a75d710b644385a680684c7a45d71d675842a892f3acfd106895f0ab1d3f2694b0bee8357b9af2d31c6bdadac4
--- a/net-libs/iojs/iojs-2.3.0.ebuild
+++ b/net-libs/iojs/iojs-2.3.0.ebuild
@ -0,0 +1,137 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/iojs/iojs-2.3.0.ebuild,v 1.1 2015/06/15 11:53:24 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+MY_PV="v${PV}"
+MY_P="${PN}-${MY_PV}"
+
+inherit flag-o-matic pax-utils python-single-r1 toolchain-funcs
+
+DESCRIPTION="An npm compatible platform originally based on node.js"
+HOMEPAGE="http://iojs.org/"
+SRC_URI="http://iojs.org/dist/${MY_PV}/${MY_P}.tar.xz"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+IUSE="bundled-libs debug icu +npm snapshot +ssl"
+
+RDEPEND="icu? ( dev-libs/icu )
+	${PYTHON_DEPS}
+	!bundled-libs? (
+		>=net-libs/http-parser-2.5
+		>=dev-libs/libuv-1.6.1
+		>=dev-libs/openssl-1.0.2c[-bindist]
+	)"
+DEPEND="${RDEPEND}
+	!!net-libs/nodejs"
+S="${WORKDIR}/${MY_P}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+pkg_pretend() {
+	if ! test-flag-CXX -std=c++11 ; then
+		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
+	fi
+}
+
+src_prepare() {
+	tc-export CC CXX PKG_CONFIG
+	export V=1 # Verbose build
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# http://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# make sure we use python2.* while using gyp
+	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
+	sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die
+	sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die
+
+	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
+	# seem sandbox related either (invoking it from a sandbox works fine).
+	# The issue is that no stdin handle is openened when asked for one.
+	# It doesn't really belong upstream , so it'll just be removed until someone
+	# with more gentoo-knowledge than me (jbergstroem) figures it out.
+	rm test/parallel/test-stdout-close-unref.js || die
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+}
+
+src_configure() {
+	local myconf=()
+	local myarch=""
+	use bundled-libs || myconf+=( --shared-openssl --shared-libuv --shared-http-parser --shared-zlib )
+	use npm || myconf+=( --without-npm )
+	use icu && myconf+=( --with-intl=system-icu )
+	use snapshot && myconf+=( --with-snapshot )
+	use ssl || myconf+=( --without-ssl )
+	use debug && myconf+=( --debug )
+
+	case ${ABI} in
+		x86) myarch="ia32";;
+		amd64) myarch="x64";;
+		x32) myarch="x32";;
+		arm) myarch="arm";;
+		arm64) myarch="arm64";;
+		*) die "Unrecognized ARCH ${ARCH}";;
+	esac
+
+	"${PYTHON}" configure \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		--without-dtrace \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out mksnapshot
+	pax-mark m "out/${BUILDTYPE}/mksnapshot"
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	emake install DESTDIR="${ED}" PREFIX=/usr
+	use npm && dodoc -r "${LIBDIR}"/node_modules/npm/html
+	rm -rf "${LIBDIR}"/node_modules/npm/{doc,html} || die
+	find "${LIBDIR}"/node_modules -type f -name "LICENSE*" -or -name "LICENCE*" -delete || die
+
+	# set up a symlink structure that npm expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	pax-mark -m "${ED}"/usr/bin/iojs
+}
+
+src_test() {
+	out/${BUILDTYPE}/cctest || die
+	declare -xl TESTTYPE="${BUILDTYPE}"
+	"${PYTHON}" tools/test.py --mode=${TESTTYPE} -J message parallel sequential || die
+}
+
+pkg_postinst() {
+	einfo "When using node-gyp to install native modules, you can avoid"
+	einfo "having to download the full tarball by doing the following:"
+	einfo ""
+	einfo "node-gyp --nodedir /usr/include/node <command>"
+}
--- a/net-proxy/shadowsocks-libev/Manifest
+++ b/net-proxy/shadowsocks-libev/Manifest
@ -1,2 +1,2 @@
-DIST shadowsocks-libev-2.1.4.tar.gz 2488477 SHA256 d4e665e375224ba1d4844b97e7263491ce07a60f08c9cb55c3128a6d3aad13e7 SHA512 236fadcae423e462fb47991617177b9d580c328b588e8bcb2314ab68c56702c387c7592117350b7fe966299b6a0c9504db8be363a02aad1852f87153ce1b4d35 WHIRLPOOL 63a5c909b7e2eb33fc8cec125988d299eef6f01ccaba815158245b7010cf63ec800a4bcff097ca7a2cff2df5a1e3e5fab12c71a88ae3df7c1a6d168685dea9d0
 DIST shadowsocks-libev-2.2.0.tar.gz 2492372 SHA256 49688f39649f0f61e323ddba8b02daa5dfe88bf2e051ed91181d266fe824df69 SHA512 d5e9d7b563a2584173fb60aefb8510207d48e6e7ac8b84959bd3452688f7dda2584a837d08a97036799ad855e015737e100ab180d3df84b3a75dba2a03ebd910 WHIRLPOOL a68de1cbef63712c6fa6cb93779344da0c14a1bc23f01fdd78b1059453c5076cb4407512eef1be8c71d24df374366cbdd8bf07dc658802e17d61af30e6994bc2
+DIST shadowsocks-libev-2.2.1.tar.gz 2492392 SHA256 c8013bc56e507855913dd8972f3c629c1b0c58a7012c4c459186d7f6a0cfe953 SHA512 34209a0b86cf261bc544d2622015662918dc51f4e2bea115644653b20cede7b87360111b10d5dc194a3115099ae4256bf455472e0ed3da9af316a23d304c9bfc WHIRLPOOL b4bcc80edb33816ace40455670b5b243ec8d7d9018a11675a152767069b70aad2150260753e5e305e3921730c4d4b1c49f216f4f1179c682a8b18018bac11740
--- a/Show More
+++ b/Show More