commit:     d2afbcada16e07467ab83d2881a4c05050e67784
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 28 04:11:20 2016 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Mon Nov 28 04:11:20 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2afbcad

app-emulation/xen-tools: drop old vulnerable versions

Gentoo-Bug: 600382

Package-Manager: portage-2.3.2

 app-emulation/xen-tools/Manifest                  |   4 -
 app-emulation/xen-tools/xen-tools-4.6.3-r2.ebuild | 458 ----------------------
 app-emulation/xen-tools/xen-tools-4.6.4.ebuild    | 458 ----------------------
 app-emulation/xen-tools/xen-tools-4.7.0-r2.ebuild | 458 ----------------------
 app-emulation/xen-tools/xen-tools-4.7.1-r1.ebuild | 457 ---------------------
 app-emulation/xen-tools/xen-tools-4.7.1.ebuild    | 457 ---------------------
 6 files changed, 2292 deletions(-)

diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index a359398..6154ff8 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -1,11 +1,7 @@
 DIST ovmf-20151110.tar.bz2 27518370 SHA256 
74199f6b5c6f756881323242742c396c52096db5f61700a4eb839343f9ab0604 SHA512 
dda185af2fc0b9a8d5fc7e1e96db6aa31807782fe77d38491896164d125c30d2277db3d71a7dce7bbd569723b344b97dfebbc78ddddca0a095721f6b1ae3a1d3
 WHIRLPOOL 
145fb1c873cce96b81b269b44800987ca1b7350425b682fd5a5799648b0270c6c17bb337ad7e06650e6b66a9ac6eef8d9c9239f1478a687be4af187e60c3f3f5
 DIST seabios-1.8.2.tar.gz 538497 SHA256 
f59479307fdae840de398b75aacb2333c8eba24a5964d68c77e32ca6c987ee61 SHA512 
798d222d5f5725a805cde9e6000b5ce714d0551fd4a3c2642cc6e77b2bdab1a9e239939a358a23bbe0e00112f5ad70696c87d20b90655463c835541fc04e1a00
 WHIRLPOOL 
9cda0ad502a59dd718c543b759ac3fcf5acb4adee70c3da9bfea95ab188415acf6425827de77f45421ec3be8fd9e0c37fb486e62828217ba3e83f88d942a3f4a
-DIST xen-4.6.3.tar.gz 19707041 SHA256 
02badfce9a037bd1bd4a94210c1f6b85467746216c71795805102b514bcf1fc4 SHA512 
187a860b40c05139f22b8498a5fae1db173c3110d957147af29a56cb83b7111c9dc4946d65f9dffc847001fc01c5e9bf51886eaa1194bb9cfd0b6dbcd43a2c5c
 WHIRLPOOL 
f80fa73727218567b8d6c8d6bab9dfd577c4bb84ac737b084e4396128e8c4aa79776a277f73c283d5b12f17764b183b67fbf8596e240042dd0709f28cbab777e
 DIST xen-4.6.4.tar.gz 19709274 SHA256 
b795d5631a85fb68295361067195ecd00003656dacede4ec57533fce33ab5109 SHA512 
e6278061a16829628030579e115a500970ff575eb6796189bfa1e2d7a8cbbf8aec2c2bd04c77cdc87226d6cc5eaee59d6c62cacb4e74b06e1f1379734b872938
 WHIRLPOOL 
a982f7bbf2ba16781ac0f310ef27a32e9115596e91117609d22827bc1999facb12df4f33d1ba0b7015cbfae90a24302243d508e8c38ba45ea998341b76ba0567
-DIST xen-4.7.0.tar.gz 20702550 SHA256 
be5876144d49729572ae06142e0bb93f1c1f2695578141eff2931995add24623 SHA512 
2c52c8ef145dfab7d069e79318d5d631e1106a0ddc79d88b3bacf36c7f15cea67dccb704a245e785d2a1e42c6fb6c0ad74832f564aaeec025ad7b864031f0921
 WHIRLPOOL 
9725ac9fe94e78aab47b0534b5ee1a190106a773bf7d6204fed736abe7069b71937717b6680833736bd02a3a3a43f2eb2162fe7c0d992ddd47d12158b5d9835f
 DIST xen-4.7.1.tar.gz 20706864 SHA256 
e87f4b0575e78657ee23d31470a15ecf1ce8c3a92a771cda46bbcd4d0d671ffe SHA512 
eb03244f5fa7b54402fcc1d38f1e69c0ea4536d5ab2f9859b41b5e94920ad9db20fb146e3c3d3635e9ca1d12e93ce0429e57f24bf53d4a2c4b69babc76ec724e
 WHIRLPOOL 
5d7ba29ea58bdedb6a237f7cb1c0aacf361dc35ebb07ec8e55773e07b1f38c1b151615b526e14daeca7c2db235114bde0b6d124219e8818c6e529873b5151fec
-DIST xen-gentoo-patches-6.tar.xz 23864 SHA256 
96e774bd03c9df341fdb2f5d6cf231549c8d7a004c3c902c07b5cb690428d4c6 SHA512 
7f4966bb7dad02b213a3cbefcc312573039feaec964a2deaa6aa7f8fa488b6e31176834a4e2cf6ac380548f1b8251c7700d16d1cbc7b88fcee440f6cccd7f177
 WHIRLPOOL 
a41cae3441370e0e18fbf28ac7a780adfaa0d6af12dc62f1dfe90f52f01ebbd8055e3b5b399ae11602b29b8a206aafe2cbecb79948233bd072e73294468f3b08
 DIST xen-gentoo-patches-7.tar.xz 24148 SHA256 
859fb6b69125c0a1079b35a74bb004dce1b04827b05f056a746cc42c1b187557 SHA512 
faf2b0ecd67d545366e2af7e7ecab5f808d02354d07f23cbffe1c3cb80dbb5f88cc4aa140d928ad269612e55c41740ff5bf2af3f0a1f16e375d404c3ffa712b1
 WHIRLPOOL 
d75c35fa10dd1f1567a82c5d5cd7ddabc72def6d74ef7095b7bca9ce9adad2b6ff9c88b55bad7cdefe88da027e5c742f9b9dcafce457cf15f408ea35652546f6
 DIST xen-ovmf-patches-2.tar.xz 4344 SHA256 
495d61d718440057f8b0b54fb57061450dd764c6e87fe5f8bda1785bcddba770 SHA512 
0bdc83029a01b613f5c1ca029bd45aebe211c332f09db91a0cc7d6b6f85a81dbbfdc20c62f0d20e973ee41b155a6551a4fad518cb792e1d508bf070e23d6a1d3
 WHIRLPOOL 
8346d68fa5d2a8e8a5c007b55e2b85cf48df045cc8c4818f09c756d28a52dd856671f37b4a53478e9b96ca9d2eca0c67fd15f009a94d1d2dfed8e83e596d9633
-DIST xen-security-patches-16.tar.xz 7368 SHA256 
3301514f20cc106f75ad84a2352f573b8d807ddeedfc57d2d5fda8c13e63bc1b SHA512 
5d83107ce9972e8ab4c2aa3e6285c3cfae04b11768b7d55baf9cbe4a63fdf5175a0bbb7685641df15af4f98d6d095ff2b35b7c9fd6be6355a777547d8106874c
 WHIRLPOOL 
3747b209ca1fead0dc7e791caed040e033b52933695e190d97bbd3f4abba957dbfaafc84e11a7f51aeb45bad3884d8b341d136351db145985f27b152aa25aa79
 DIST xen-security-patches-17.tar.xz 9908 SHA256 
9fc679ddea420e3aeb2f7ba4bacbb4c192b6c15d5e62b40def16cdb9e376a032 SHA512 
4a5375caf5b928662b10c31ef5af2f9bd092b512d6fb1a0292b0389d3c7f5b062f7ed1401b6c5dbeb83d20418fd025bbca43e76d42c739c5a2809c6cfb59db16
 WHIRLPOOL 
fdda75869ece47a180fce27b3d060b2dfe06861958443c55fe8de31f7c673382c468eccda0c40c87953abae57e12b2c3979a84515fb66ba190b6f7cffe57eb2d

diff --git a/app-emulation/xen-tools/xen-tools-4.6.3-r2.ebuild 
b/app-emulation/xen-tools/xen-tools-4.6.3-r2.ebuild
deleted file mode 100644
index 2f9e306..00000000
--- a/app-emulation/xen-tools/xen-tools-4.6.3-r2.ebuild
+++ /dev/null
@@ -1,458 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='ncurses,xml,threads'
-
-inherit eutils bash-completion-r1 flag-o-matic multilib python-single-r1 
toolchain-funcs versionator
-
-MY_PV=${PV/_/-}
-MAJOR_V="$(get_version_component_range 1-2)"
-
-if [[ $PV == *9999 ]]; then
-       inherit git-r3
-       KEYWORDS=""
-       REPO="xen.git"
-       EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
-       S="${WORKDIR}/${REPO}"
-else
-       KEYWORDS="amd64 ~arm ~arm64 x86"
-       UPSTREAM_VER=
-       SECURITY_VER=16
-       # xen-tools's gentoo patches tarball
-       GENTOO_VER=6
-       # xen-tools's gentoo patches version which apply to this specific ebuild
-       GENTOO_GPV=0
-       # xen-tools ovmf's patches
-       OVMF_VER=2
-
-       SEABIOS_VER=1.8.2
-       # OVMF upstream 52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d
-       OVMF_PV=20151110
-
-       [[ -n ${UPSTREAM_VER} ]] && \
-               
UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz";
-       [[ -n ${SECURITY_VER} ]] && \
-               
SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz";
-       [[ -n ${GENTOO_VER} ]] && \
-               
GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz";
-       [[ -n ${OVMF_VER} ]] && \
-               
OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz";
-
-       
SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/xen-${MY_PV}.tar.gz
-       
http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
-       https://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
-       ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.bz2
-               ${OVMF_PATCHSET_URI} )
-       ${UPSTREAM_PATCHSET_URI}
-       ${SECURITY_PATCHSET_URI}
-       ${GENTOO_PATCHSET_URI}"
-
-       S="${WORKDIR}/xen-${MY_PV}"
-fi
-
-DESCRIPTION="Xen tools including QEMU and xl"
-HOMEPAGE="http://xen.org/";
-DOCS=( README docs/README.xen-bugtool )
-
-LICENSE="GPL-2"
-SLOT="0/${MAJOR_V}"
-# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get 
off his hands and) make
-# >=dev-lang/ocaml-4 stable
-# Masked in profiles/eapi-5-files instead
-IUSE="api custom-cflags debug doc flask hvm qemu ocaml ovmf +qemu-traditional 
+pam python pygrub screen sdl static-libs system-qemu system-seabios"
-
-REQUIRED_USE="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}]
-       x86? ( sys-devel/dev86
-               sys-power/iasl )
-       pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
-       ${PYTHON_DEPS}
-       api? ( dev-libs/libxml2
-               net-misc/curl )
-       ovmf? ( $(python_gen_impl_dep sqlite) )
-       !amd64? ( >=sys-apps/dtc-1.4.0 )
-       amd64? ( sys-devel/bin86
-               system-seabios? ( sys-firmware/seabios )
-               sys-firmware/ipxe
-               sys-devel/dev86
-               sys-power/iasl )
-       dev-lang/perl
-       app-misc/pax-utils
-       doc? (
-               app-doc/doxygen
-               dev-python/markdown[${PYTHON_USEDEP}]
-               dev-tex/latex2html[png,gif]
-               media-gfx/graphviz
-               dev-tex/xcolor
-               media-gfx/transfig
-               dev-texlive/texlive-latexextra
-               virtual/latex-base
-               dev-tex/latexmk
-               dev-texlive/texlive-latex
-               dev-texlive/texlive-pictures
-               dev-texlive/texlive-latexrecommended
-       )
-       hvm? ( x11-proto/xproto
-               !net-libs/libiscsi )
-       qemu? (
-               x11-libs/pixman
-               sdl? ( media-libs/libsdl[X] )
-       )
-       system-qemu? ( app-emulation/qemu[xen] )
-       ocaml? ( dev-ml/findlib
-               >=dev-lang/ocaml-4 )"
-
-RDEPEND="${COMMON_DEPEND}
-       sys-apps/iproute2[-minimal]
-       net-misc/bridge-utils
-       screen? (
-               app-misc/screen
-               app-admin/logrotate
-       )"
-
-# hvmloader is used to bootstrap a fully virtualized kernel
-# Approved by QA team in bug #144032
-QA_WX_LOAD="usr/lib/xen/boot/hvmloader
-       usr/share/qemu-xen/qemu/s390-ccw.img"
-
-RESTRICT="test"
-
-pkg_setup() {
-       python_setup
-       export "CONFIG_LOMOUNT=y"
-
-       #bug 522642, disable compile tools/tests
-       export "CONFIG_TESTS=n"
-
-       if has_version dev-libs/libgcrypt:0; then
-               export "CONFIG_GCRYPT=y"
-       fi
-
-       if [[ -z ${XEN_TARGET_ARCH} ]] ; then
-               if use x86 && use amd64; then
-                       die "Confusion! Both x86 and amd64 are set in your use 
flags!"
-               elif use x86; then
-                       export XEN_TARGET_ARCH="x86_32"
-               elif use amd64 ; then
-                       export XEN_TARGET_ARCH="x86_64"
-               elif use arm; then
-                       export XEN_TARGET_ARCH="arm32"
-               elif use arm64; then
-                       export XEN_TARGET_ARCH="arm64"
-               else
-                       die "Unsupported architecture!"
-               fi
-       fi
-}
-
-src_prepare() {
-       # Upstream's patchset
-       if [[ -n ${UPSTREAM_VER} ]]; then
-               einfo "Try to apply Xen Upstream patch set"
-               EPATCH_SUFFIX="patch" \
-               EPATCH_FORCE="yes" \
-               EPATCH_OPTS="-p1" \
-                       epatch "${WORKDIR}"/patches-upstream
-       fi
-
-       # Security patchset
-       if [[ -n ${SECURITY_VER} ]]; then
-       einfo "Try to apply Xen Security patch set"
-               # apply main xen patches
-               # Two parallel systems, both work side by side
-               # Over time they may concdense into one. This will suffice for 
now
-               EPATCH_SUFFIX="patch"
-               EPATCH_FORCE="yes"
-
-               source "${WORKDIR}"/patches-security/${PV}.conf
-
-               for i in ${XEN_SECURITY_MAIN}; do
-                       epatch "${WORKDIR}"/patches-security/xen/$i
-               done
-
-               # apply qemu-xen/upstream patches
-               pushd "${S}"/tools/qemu-xen/ > /dev/null
-               for i in ${XEN_SECURITY_QEMUU}; do
-                       epatch "${WORKDIR}"/patches-security/qemuu/$i
-               done
-               popd > /dev/null
-
-               # apply qemu-traditional patches
-               pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
-               for i in ${XEN_SECURITY_QEMUT}; do
-                       epatch "${WORKDIR}"/patches-security/qemut/$i
-               done
-               popd > /dev/null
-       fi
-
-       # move before Gentoo patch, one patch should apply to seabios, to fix 
gcc-4.5.x build err
-       mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
-       pushd tools/firmware/ > /dev/null
-       ln -s seabios-dir-remote seabios-dir || die
-       popd > /dev/null
-
-       # Gentoo's patchset
-       if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
-               einfo "Try to apply Gentoo specific patch set"
-               source "${FILESDIR}"/gentoo-patches.conf
-               _gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
-               for i in ${!_gpv}; do
-                       EPATCH_SUFFIX="patch" \
-                       EPATCH_FORCE="yes" \
-                               epatch "${WORKDIR}"/patches-gentoo/$i
-               done
-       fi
-
-       # Ovmf's patchset
-       if use ovmf; then
-               if [[ -n ${OVMF_VER} ]];then
-                       einfo "Try to apply Ovmf patch set"
-                       pushd "${WORKDIR}"/ovmf-*/ > /dev/null
-                       EPATCH_SUFFIX="patch" \
-                       EPATCH_FORCE="yes" \
-                       EPATCH_OPTS="-p1" \
-                               epatch "${WORKDIR}"/patches-ovmf
-                       popd > /dev/null
-               fi
-               mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
-       fi
-
-       mv tools/qemu-xen/qemu-bridge-helper.c 
tools/qemu-xen/xen-bridge-helper.c || die
-
-       # Fix texi2html build error with new texi2html, qemu.doc.html
-       sed -i -e "/texi2html -monolithic/s/-number//" 
tools/qemu-xen-traditional/Makefile || die
-
-       use api   || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i 
tools/Makefile || die
-       sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" 
PYTHON=$(PYTHON) subdirs-$@:' \
-                -i tools/firmware/Makefile || die
-
-       # Drop .config, fixes to gcc-4.6
-       sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't 
drop"
-
-       # if the user *really* wants to use their own custom-cflags, let them
-       if use custom-cflags; then
-               einfo "User wants their own CFLAGS - removing defaults"
-
-               # try and remove all the default cflags
-               find "${S}" \( -name Makefile -o -name Rules.mk -o -name 
Config.mk \) \
-                       -exec sed \
-                               -e 
's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
-                               -e 
's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
-                               -e 
's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
-                               -e 
's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-                               -e 
's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-                               -i {} + || die "failed to re-set custom-cflags"
-       else
-               unset CFLAGS
-               unset LDFLAGS
-               unset ASFLAGS
-               unset CPPFLAGS
-       fi
-
-       if ! use pygrub; then
-               sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
-       fi
-
-       if ! use python; then
-               sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
-       fi
-
-       if ! use hvm; then
-               sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile 
|| die
-       # Bug 351648
-       elif ! use x86 && ! has x86 $(get_all_abis); then
-               mkdir -p "${WORKDIR}"/extra-headers/gnu || die
-               touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
-               export CPATH="${WORKDIR}"/extra-headers
-       fi
-
-       if use qemu; then
-               if use sdl; then
-                       sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
-                               tools/Makefile || die
-               else
-                       sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 
--disable-sdl:" \
-                               tools/qemu-xen-traditional/xen-setup || die
-                       sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
-                               tools/Makefile || die
-               fi
-       else
-               # Don't bother with qemu, only needed for fully virtualised 
guests
-               sed -e "s:install-tools\: 
tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die
-       fi
-
-       # Reset bash completion dir; Bug 472438
-       sed -e "s:^BASH_COMPLETION_DIR ?= 
\$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
-               -i Config.mk || die
-       sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
-
-       # xencommons, Bug #492332, sed lighter weight than patching
-       sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
-               -i tools/hotplug/Linux/init.d/xencommons.in || die
-
-       # respect multilib, usr/lib/libcacard.so.0.0.0
-       sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
-               -i tools/qemu-xen/configure || die
-
-       #bug 518136, don't build 32bit exactuable for nomultilib profile
-       if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
-               sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
-       fi
-
-       # use /var instead of /var/lib, consistat with previous ebuild
-       sed -i -e   "/XEN_LOCK_DIR=/s/\$localstatedir/\/var/g" \
-               m4/paths.m4 configure tools/configure || die
-       # use /run instead of /var/run
-       sed -i -e   "/XEN_RUN_DIR=/s/\$localstatedir//g" \
-               m4/paths.m4 configure tools/configure || die
-
-       # uncomment lines in xl.conf
-       sed -e 's:^#autoballoon=:autoballoon=:' \
-               -e 's:^#lockfile=:lockfile=:' \
-               -e 's:^#vif.default.script=:vif.default.script=:' \
-               -i tools/examples/xl.conf  || die
-
-       # Bug #575868 converted to a sed statement, typo of one char
-       sed -e "s:granter’s:granter's:" -i xen/include/public/grant_table.h || 
die
-
-       epatch_user
-}
-
-src_configure() {
-       local myconf="--prefix=${PREFIX}/usr \
-               --libdir=${PREFIX}/usr/$(get_libdir) \
-               --libexecdir=${PREFIX}/usr/libexec \
-               --disable-werror \
-               --disable-xen \
-               --enable-tools \
-               --enable-docs \
-               $(use_with system-qemu) \
-               $(use_enable pam) \
-               $(use_enable api xenapi) \
-               $(use_enable ovmf) \
-               $(use_enable ocaml ocamltools) \
-               --with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
-               "
-
-       use system-seabios && myconf+=" 
--with-system-seabios=/usr/share/seabios/bios.bin"
-       use qemu || myconf+=" --with-system-qemu"
-       use amd64 && myconf+=" $(use_enable qemu-traditional)"
-       econf ${myconf}
-}
-
-src_compile() {
-       export VARTEXFONTS="${T}/fonts"
-       local myopt
-       use debug && myopt="${myopt} debug=y"
-
-       if test-flag-CC -fno-strict-overflow; then
-               append-flags -fno-strict-overflow
-       fi
-
-       emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" 
RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
-
-       use doc && emake -C docs txt html
-       emake -C docs man-pages
-}
-
-src_install() {
-       # Override auto-detection in the build system, bug #382573
-       export INITD_DIR=/tmp/init.d
-       export CONFIG_LEAF_DIR=../tmp/default
-
-       # Let the build system compile installed Python modules.
-       local PYTHONDONTWRITEBYTECODE
-       export PYTHONDONTWRITEBYTECODE
-
-       emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
-               XEN_PYTHON_NATIVE_INSTALL=y install-tools
-
-       # Fix the remaining Python shebangs.
-       python_fix_shebang "${D}"
-
-       # Remove RedHat-specific stuff
-       rm -rf "${D}"tmp || die
-
-       if use doc; then
-               emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
-
-               dohtml -r docs/
-               docinto pdf
-               dodoc ${DOCS[@]}
-               [ -d "${D}"/usr/share/doc/xen ] && mv 
"${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
-       fi
-
-       rm -rf "${D}"/usr/share/doc/xen/
-       doman docs/man?/*
-
-       newconfd "${FILESDIR}"/xendomains.confd xendomains
-       newconfd "${FILESDIR}"/xenstored.confd xenstored
-       newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
-       newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
-       newinitd "${FILESDIR}"/xenstored.initd xenstored
-       newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
-       newinitd "${FILESDIR}"/xencommons.initd xencommons
-       newconfd "${FILESDIR}"/xencommons.confd xencommons
-       newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
-       newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
-
-       if use screen; then
-               cat "${FILESDIR}"/xendomains-screen.confd >> 
"${D}"/etc/conf.d/xendomains || die
-               cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
-               keepdir /var/log/xen-consoles
-       fi
-
-       # For -static-libs wrt Bug 384355
-       if ! use static-libs; then
-               rm -f "${D}"usr/$(get_libdir)/*.a 
"${D}"usr/$(get_libdir)/ocaml/*/*.a
-       fi
-
-       # for xendomains
-       keepdir /etc/xen/auto
-
-       # Remove files failing QA AFTER emake installs them, avoiding seeking 
absent files
-       find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
-               -o -name openbios-ppc -o -name palcode-clipper \) -delete || die
-}
-
-pkg_postinst() {
-       elog "Official Xen Guide and the offical wiki page:"
-       elog "https://wiki.gentoo.org/wiki/Xen";
-       elog "http://wiki.xen.org/wiki/Main_Page";
-       elog ""
-       elog "Recommended to utilise the xencommons script to config sytem At 
boot"
-       elog "Add by use of rc-update on completion of the install"
-
-       if ! use hvm; then
-               echo
-               elog "HVM (VT-x and AMD-V) support has been disabled. If you 
need hvm"
-               elog "support enable the hvm use flag."
-               elog "An x86 or amd64 system is required to build HVM support."
-       fi
-
-       if use qemu; then
-               elog "The qemu-bridge-helper is renamed to the 
xen-bridge-helper in the in source"
-               elog "build of qemu.  This allows for app-emulation/qemu to be 
emerged concurrently"
-               elog "with the qemu capable xen.  It is up to the user to 
distinguish between and utilise"
-               elog "the qemu-bridge-helper and the xen-bridge-helper.  File 
bugs of any issues that arise"
-       fi
-}

diff --git a/app-emulation/xen-tools/xen-tools-4.6.4.ebuild 
b/app-emulation/xen-tools/xen-tools-4.6.4.ebuild
deleted file mode 100644
index 62d7661..00000000
--- a/app-emulation/xen-tools/xen-tools-4.6.4.ebuild
+++ /dev/null
@@ -1,458 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='ncurses,xml,threads'
-
-inherit eutils bash-completion-r1 flag-o-matic multilib python-single-r1 
toolchain-funcs versionator
-
-MY_PV=${PV/_/-}
-MAJOR_V="$(get_version_component_range 1-2)"
-
-if [[ $PV == *9999 ]]; then
-       inherit git-r3
-       KEYWORDS=""
-       REPO="xen.git"
-       EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
-       S="${WORKDIR}/${REPO}"
-else
-       KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-       UPSTREAM_VER=
-       SECURITY_VER=
-       # xen-tools's gentoo patches tarball
-       GENTOO_VER=6
-       # xen-tools's gentoo patches version which apply to this specific ebuild
-       GENTOO_GPV=0
-       # xen-tools ovmf's patches
-       OVMF_VER=2
-
-       SEABIOS_VER=1.8.2
-       # OVMF upstream 52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d
-       OVMF_PV=20151110
-
-       [[ -n ${UPSTREAM_VER} ]] && \
-               
UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz";
-       [[ -n ${SECURITY_VER} ]] && \
-               
SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz";
-       [[ -n ${GENTOO_VER} ]] && \
-               
GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz";
-       [[ -n ${OVMF_VER} ]] && \
-               
OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz";
-
-       
SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/xen-${MY_PV}.tar.gz
-       
http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
-       https://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
-       ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.bz2
-               ${OVMF_PATCHSET_URI} )
-       ${UPSTREAM_PATCHSET_URI}
-       ${SECURITY_PATCHSET_URI}
-       ${GENTOO_PATCHSET_URI}"
-
-       S="${WORKDIR}/xen-${MY_PV}"
-fi
-
-DESCRIPTION="Xen tools including QEMU and xl"
-HOMEPAGE="http://xen.org/";
-DOCS=( README docs/README.xen-bugtool )
-
-LICENSE="GPL-2"
-SLOT="0/${MAJOR_V}"
-# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get 
off his hands and) make
-# >=dev-lang/ocaml-4 stable
-# Masked in profiles/eapi-5-files instead
-IUSE="api custom-cflags debug doc flask hvm qemu ocaml ovmf +qemu-traditional 
+pam python pygrub screen sdl static-libs system-qemu system-seabios"
-
-REQUIRED_USE="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}]
-       x86? ( sys-devel/dev86
-               sys-power/iasl )
-       pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
-       ${PYTHON_DEPS}
-       api? ( dev-libs/libxml2
-               net-misc/curl )
-       ovmf? ( $(python_gen_impl_dep sqlite) )
-       !amd64? ( >=sys-apps/dtc-1.4.0 )
-       amd64? ( sys-devel/bin86
-               system-seabios? ( sys-firmware/seabios )
-               sys-firmware/ipxe
-               sys-devel/dev86
-               sys-power/iasl )
-       dev-lang/perl
-       app-misc/pax-utils
-       doc? (
-               app-doc/doxygen
-               dev-python/markdown[${PYTHON_USEDEP}]
-               dev-tex/latex2html[png,gif]
-               media-gfx/graphviz
-               dev-tex/xcolor
-               media-gfx/transfig
-               dev-texlive/texlive-latexextra
-               virtual/latex-base
-               dev-tex/latexmk
-               dev-texlive/texlive-latex
-               dev-texlive/texlive-pictures
-               dev-texlive/texlive-latexrecommended
-       )
-       hvm? ( x11-proto/xproto
-               !net-libs/libiscsi )
-       qemu? (
-               x11-libs/pixman
-               sdl? ( media-libs/libsdl[X] )
-       )
-       system-qemu? ( app-emulation/qemu[xen] )
-       ocaml? ( dev-ml/findlib
-               >=dev-lang/ocaml-4 )"
-
-RDEPEND="${COMMON_DEPEND}
-       sys-apps/iproute2[-minimal]
-       net-misc/bridge-utils
-       screen? (
-               app-misc/screen
-               app-admin/logrotate
-       )"
-
-# hvmloader is used to bootstrap a fully virtualized kernel
-# Approved by QA team in bug #144032
-QA_WX_LOAD="usr/lib/xen/boot/hvmloader
-       usr/share/qemu-xen/qemu/s390-ccw.img"
-
-RESTRICT="test"
-
-pkg_setup() {
-       python_setup
-       export "CONFIG_LOMOUNT=y"
-
-       #bug 522642, disable compile tools/tests
-       export "CONFIG_TESTS=n"
-
-       if has_version dev-libs/libgcrypt:0; then
-               export "CONFIG_GCRYPT=y"
-       fi
-
-       if [[ -z ${XEN_TARGET_ARCH} ]] ; then
-               if use x86 && use amd64; then
-                       die "Confusion! Both x86 and amd64 are set in your use 
flags!"
-               elif use x86; then
-                       export XEN_TARGET_ARCH="x86_32"
-               elif use amd64 ; then
-                       export XEN_TARGET_ARCH="x86_64"
-               elif use arm; then
-                       export XEN_TARGET_ARCH="arm32"
-               elif use arm64; then
-                       export XEN_TARGET_ARCH="arm64"
-               else
-                       die "Unsupported architecture!"
-               fi
-       fi
-}
-
-src_prepare() {
-       # Upstream's patchset
-       if [[ -n ${UPSTREAM_VER} ]]; then
-               einfo "Try to apply Xen Upstream patch set"
-               EPATCH_SUFFIX="patch" \
-               EPATCH_FORCE="yes" \
-               EPATCH_OPTS="-p1" \
-                       epatch "${WORKDIR}"/patches-upstream
-       fi
-
-       # Security patchset
-       if [[ -n ${SECURITY_VER} ]]; then
-       einfo "Try to apply Xen Security patch set"
-               # apply main xen patches
-               # Two parallel systems, both work side by side
-               # Over time they may concdense into one. This will suffice for 
now
-               EPATCH_SUFFIX="patch"
-               EPATCH_FORCE="yes"
-
-               source "${WORKDIR}"/patches-security/${PV}.conf
-
-               for i in ${XEN_SECURITY_MAIN}; do
-                       epatch "${WORKDIR}"/patches-security/xen/$i
-               done
-
-               # apply qemu-xen/upstream patches
-               pushd "${S}"/tools/qemu-xen/ > /dev/null
-               for i in ${XEN_SECURITY_QEMUU}; do
-                       epatch "${WORKDIR}"/patches-security/qemuu/$i
-               done
-               popd > /dev/null
-
-               # apply qemu-traditional patches
-               pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
-               for i in ${XEN_SECURITY_QEMUT}; do
-                       epatch "${WORKDIR}"/patches-security/qemut/$i
-               done
-               popd > /dev/null
-       fi
-
-       # move before Gentoo patch, one patch should apply to seabios, to fix 
gcc-4.5.x build err
-       mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
-       pushd tools/firmware/ > /dev/null
-       ln -s seabios-dir-remote seabios-dir || die
-       popd > /dev/null
-
-       # Gentoo's patchset
-       if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
-               einfo "Try to apply Gentoo specific patch set"
-               source "${FILESDIR}"/gentoo-patches.conf
-               _gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
-               for i in ${!_gpv}; do
-                       EPATCH_SUFFIX="patch" \
-                       EPATCH_FORCE="yes" \
-                               epatch "${WORKDIR}"/patches-gentoo/$i
-               done
-       fi
-
-       # Ovmf's patchset
-       if use ovmf; then
-               if [[ -n ${OVMF_VER} ]];then
-                       einfo "Try to apply Ovmf patch set"
-                       pushd "${WORKDIR}"/ovmf-*/ > /dev/null
-                       EPATCH_SUFFIX="patch" \
-                       EPATCH_FORCE="yes" \
-                       EPATCH_OPTS="-p1" \
-                               epatch "${WORKDIR}"/patches-ovmf
-                       popd > /dev/null
-               fi
-               mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
-       fi
-
-       mv tools/qemu-xen/qemu-bridge-helper.c 
tools/qemu-xen/xen-bridge-helper.c || die
-
-       # Fix texi2html build error with new texi2html, qemu.doc.html
-       sed -i -e "/texi2html -monolithic/s/-number//" 
tools/qemu-xen-traditional/Makefile || die
-
-       use api   || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i 
tools/Makefile || die
-       sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" 
PYTHON=$(PYTHON) subdirs-$@:' \
-                -i tools/firmware/Makefile || die
-
-       # Drop .config, fixes to gcc-4.6
-       sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't 
drop"
-
-       # if the user *really* wants to use their own custom-cflags, let them
-       if use custom-cflags; then
-               einfo "User wants their own CFLAGS - removing defaults"
-
-               # try and remove all the default cflags
-               find "${S}" \( -name Makefile -o -name Rules.mk -o -name 
Config.mk \) \
-                       -exec sed \
-                               -e 
's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
-                               -e 
's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
-                               -e 
's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
-                               -e 
's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-                               -e 
's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-                               -i {} + || die "failed to re-set custom-cflags"
-       else
-               unset CFLAGS
-               unset LDFLAGS
-               unset ASFLAGS
-               unset CPPFLAGS
-       fi
-
-       if ! use pygrub; then
-               sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
-       fi
-
-       if ! use python; then
-               sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
-       fi
-
-       if ! use hvm; then
-               sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile 
|| die
-       # Bug 351648
-       elif ! use x86 && ! has x86 $(get_all_abis); then
-               mkdir -p "${WORKDIR}"/extra-headers/gnu || die
-               touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
-               export CPATH="${WORKDIR}"/extra-headers
-       fi
-
-       if use qemu; then
-               if use sdl; then
-                       sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
-                               tools/Makefile || die
-               else
-                       sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 
--disable-sdl:" \
-                               tools/qemu-xen-traditional/xen-setup || die
-                       sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
-                               tools/Makefile || die
-               fi
-       else
-               # Don't bother with qemu, only needed for fully virtualised 
guests
-               sed -e "s:install-tools\: 
tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die
-       fi
-
-       # Reset bash completion dir; Bug 472438
-       sed -e "s:^BASH_COMPLETION_DIR ?= 
\$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
-               -i Config.mk || die
-       sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
-
-       # xencommons, Bug #492332, sed lighter weight than patching
-       sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
-               -i tools/hotplug/Linux/init.d/xencommons.in || die
-
-       # respect multilib, usr/lib/libcacard.so.0.0.0
-       sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
-               -i tools/qemu-xen/configure || die
-
-       #bug 518136, don't build 32bit exactuable for nomultilib profile
-       if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
-               sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
-       fi
-
-       # use /var instead of /var/lib, consistat with previous ebuild
-       sed -i -e   "/XEN_LOCK_DIR=/s/\$localstatedir/\/var/g" \
-               m4/paths.m4 configure tools/configure || die
-       # use /run instead of /var/run
-       sed -i -e   "/XEN_RUN_DIR=/s/\$localstatedir//g" \
-               m4/paths.m4 configure tools/configure || die
-
-       # uncomment lines in xl.conf
-       sed -e 's:^#autoballoon=:autoballoon=:' \
-               -e 's:^#lockfile=:lockfile=:' \
-               -e 's:^#vif.default.script=:vif.default.script=:' \
-               -i tools/examples/xl.conf  || die
-
-       # Bug #575868 converted to a sed statement, typo of one char
-       sed -e "s:granter’s:granter's:" -i xen/include/public/grant_table.h || 
die
-
-       epatch_user
-}
-
-src_configure() {
-       local myconf="--prefix=${PREFIX}/usr \
-               --libdir=${PREFIX}/usr/$(get_libdir) \
-               --libexecdir=${PREFIX}/usr/libexec \
-               --disable-werror \
-               --disable-xen \
-               --enable-tools \
-               --enable-docs \
-               $(use_with system-qemu) \
-               $(use_enable pam) \
-               $(use_enable api xenapi) \
-               $(use_enable ovmf) \
-               $(use_enable ocaml ocamltools) \
-               --with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
-               "
-
-       use system-seabios && myconf+=" 
--with-system-seabios=/usr/share/seabios/bios.bin"
-       use qemu || myconf+=" --with-system-qemu"
-       use amd64 && myconf+=" $(use_enable qemu-traditional)"
-       econf ${myconf}
-}
-
-src_compile() {
-       export VARTEXFONTS="${T}/fonts"
-       local myopt
-       use debug && myopt="${myopt} debug=y"
-
-       if test-flag-CC -fno-strict-overflow; then
-               append-flags -fno-strict-overflow
-       fi
-
-       emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" 
RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
-
-       use doc && emake -C docs txt html
-       emake -C docs man-pages
-}
-
-src_install() {
-       # Override auto-detection in the build system, bug #382573
-       export INITD_DIR=/tmp/init.d
-       export CONFIG_LEAF_DIR=../tmp/default
-
-       # Let the build system compile installed Python modules.
-       local PYTHONDONTWRITEBYTECODE
-       export PYTHONDONTWRITEBYTECODE
-
-       emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
-               XEN_PYTHON_NATIVE_INSTALL=y install-tools
-
-       # Fix the remaining Python shebangs.
-       python_fix_shebang "${D}"
-
-       # Remove RedHat-specific stuff
-       rm -rf "${D}"tmp || die
-
-       if use doc; then
-               emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
-
-               dohtml -r docs/
-               docinto pdf
-               dodoc ${DOCS[@]}
-               [ -d "${D}"/usr/share/doc/xen ] && mv 
"${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
-       fi
-
-       rm -rf "${D}"/usr/share/doc/xen/
-       doman docs/man?/*
-
-       newconfd "${FILESDIR}"/xendomains.confd xendomains
-       newconfd "${FILESDIR}"/xenstored.confd xenstored
-       newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
-       newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
-       newinitd "${FILESDIR}"/xenstored.initd xenstored
-       newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
-       newinitd "${FILESDIR}"/xencommons.initd xencommons
-       newconfd "${FILESDIR}"/xencommons.confd xencommons
-       newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
-       newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
-
-       if use screen; then
-               cat "${FILESDIR}"/xendomains-screen.confd >> 
"${D}"/etc/conf.d/xendomains || die
-               cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
-               keepdir /var/log/xen-consoles
-       fi
-
-       # For -static-libs wrt Bug 384355
-       if ! use static-libs; then
-               rm -f "${D}"usr/$(get_libdir)/*.a 
"${D}"usr/$(get_libdir)/ocaml/*/*.a
-       fi
-
-       # for xendomains
-       keepdir /etc/xen/auto
-
-       # Remove files failing QA AFTER emake installs them, avoiding seeking 
absent files
-       find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
-               -o -name openbios-ppc -o -name palcode-clipper \) -delete || die
-}
-
-pkg_postinst() {
-       elog "Official Xen Guide and the offical wiki page:"
-       elog "https://wiki.gentoo.org/wiki/Xen";
-       elog "http://wiki.xen.org/wiki/Main_Page";
-       elog ""
-       elog "Recommended to utilise the xencommons script to config sytem At 
boot"
-       elog "Add by use of rc-update on completion of the install"
-
-       if ! use hvm; then
-               echo
-               elog "HVM (VT-x and AMD-V) support has been disabled. If you 
need hvm"
-               elog "support enable the hvm use flag."
-               elog "An x86 or amd64 system is required to build HVM support."
-       fi
-
-       if use qemu; then
-               elog "The qemu-bridge-helper is renamed to the 
xen-bridge-helper in the in source"
-               elog "build of qemu.  This allows for app-emulation/qemu to be 
emerged concurrently"
-               elog "with the qemu capable xen.  It is up to the user to 
distinguish between and utilise"
-               elog "the qemu-bridge-helper and the xen-bridge-helper.  File 
bugs of any issues that arise"
-       fi
-}

diff --git a/app-emulation/xen-tools/xen-tools-4.7.0-r2.ebuild 
b/app-emulation/xen-tools/xen-tools-4.7.0-r2.ebuild
deleted file mode 100644
index 1a68db7..00000000
--- a/app-emulation/xen-tools/xen-tools-4.7.0-r2.ebuild
+++ /dev/null
@@ -1,458 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='ncurses,xml,threads'
-
-inherit eutils bash-completion-r1 flag-o-matic multilib python-single-r1 
toolchain-funcs versionator
-
-MY_PV=${PV/_/-}
-MAJOR_V="$(get_version_component_range 1-2)"
-
-if [[ $PV == *9999 ]]; then
-       inherit git-r3
-       KEYWORDS=""
-       REPO="xen.git"
-       EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
-       S="${WORKDIR}/${REPO}"
-else
-       KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-       UPSTREAM_VER=
-       SECURITY_VER=16
-       # xen-tools's gentoo patches tarball
-       GENTOO_VER=6
-       # xen-tools's gentoo patches version which apply to this specific ebuild
-       GENTOO_GPV=0
-       # xen-tools ovmf's patches
-       OVMF_VER=2
-
-       SEABIOS_VER=1.8.2
-       # OVMF upstream 52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d
-       OVMF_PV=20151110
-
-       [[ -n ${UPSTREAM_VER} ]] && \
-               
UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz";
-       [[ -n ${SECURITY_VER} ]] && \
-               
SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz";
-       [[ -n ${GENTOO_VER} ]] && \
-               
GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz";
-       [[ -n ${OVMF_VER} ]] && \
-               
OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz";
-
-       
SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/xen-${MY_PV}.tar.gz
-       
http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
-       https://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
-       ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.bz2
-               ${OVMF_PATCHSET_URI} )
-       ${UPSTREAM_PATCHSET_URI}
-       ${SECURITY_PATCHSET_URI}
-       ${GENTOO_PATCHSET_URI}"
-
-       S="${WORKDIR}/xen-${MY_PV}"
-fi
-
-DESCRIPTION="Xen tools including QEMU and xl"
-HOMEPAGE="http://xen.org/";
-DOCS=( README docs/README.xen-bugtool )
-
-LICENSE="GPL-2"
-SLOT="0/${MAJOR_V}"
-# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get 
off his hands and) make
-# >=dev-lang/ocaml-4 stable
-# Masked in profiles/eapi-5-files instead
-IUSE="api custom-cflags debug doc flask hvm qemu ocaml ovmf +qemu-traditional 
+pam python pygrub screen sdl static-libs system-qemu system-seabios"
-
-REQUIRED_USE="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}]
-       x86? ( sys-devel/dev86
-               sys-power/iasl )
-       pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
-       ${PYTHON_DEPS}
-       api? ( dev-libs/libxml2
-               net-misc/curl )
-       ovmf? ( $(python_gen_impl_dep sqlite) )
-       !amd64? ( >=sys-apps/dtc-1.4.0 )
-       amd64? ( sys-devel/bin86
-               system-seabios? ( sys-firmware/seabios )
-               sys-firmware/ipxe
-               sys-devel/dev86
-               sys-power/iasl )
-       dev-lang/perl
-       app-misc/pax-utils
-       doc? (
-               app-doc/doxygen
-               dev-python/markdown[${PYTHON_USEDEP}]
-               dev-tex/latex2html[png,gif]
-               media-gfx/graphviz
-               dev-tex/xcolor
-               media-gfx/transfig
-               dev-texlive/texlive-latexextra
-               virtual/latex-base
-               dev-tex/latexmk
-               dev-texlive/texlive-latex
-               dev-texlive/texlive-pictures
-               dev-texlive/texlive-latexrecommended
-       )
-       hvm? ( x11-proto/xproto
-               !net-libs/libiscsi )
-       qemu? (
-               x11-libs/pixman
-               sdl? ( media-libs/libsdl[X] )
-       )
-       system-qemu? ( app-emulation/qemu[xen] )
-       ocaml? ( dev-ml/findlib
-               >=dev-lang/ocaml-4 )"
-
-RDEPEND="${COMMON_DEPEND}
-       sys-apps/iproute2[-minimal]
-       net-misc/bridge-utils
-       screen? (
-               app-misc/screen
-               app-admin/logrotate
-       )"
-
-# hvmloader is used to bootstrap a fully virtualized kernel
-# Approved by QA team in bug #144032
-QA_WX_LOAD="usr/lib/xen/boot/hvmloader
-       usr/share/qemu-xen/qemu/s390-ccw.img"
-
-RESTRICT="test"
-
-pkg_setup() {
-       python_setup
-       export "CONFIG_LOMOUNT=y"
-
-       #bug 522642, disable compile tools/tests
-       export "CONFIG_TESTS=n"
-
-       if has_version dev-libs/libgcrypt:0; then
-               export "CONFIG_GCRYPT=y"
-       fi
-
-       if [[ -z ${XEN_TARGET_ARCH} ]] ; then
-               if use x86 && use amd64; then
-                       die "Confusion! Both x86 and amd64 are set in your use 
flags!"
-               elif use x86; then
-                       export XEN_TARGET_ARCH="x86_32"
-               elif use amd64 ; then
-                       export XEN_TARGET_ARCH="x86_64"
-               elif use arm; then
-                       export XEN_TARGET_ARCH="arm32"
-               elif use arm64; then
-                       export XEN_TARGET_ARCH="arm64"
-               else
-                       die "Unsupported architecture!"
-               fi
-       fi
-}
-
-src_prepare() {
-       # Upstream's patchset
-       if [[ -n ${UPSTREAM_VER} ]]; then
-               einfo "Try to apply Xen Upstream patch set"
-               EPATCH_SUFFIX="patch" \
-               EPATCH_FORCE="yes" \
-               EPATCH_OPTS="-p1" \
-                       epatch "${WORKDIR}"/patches-upstream
-       fi
-
-       # Security patchset
-       if [[ -n ${SECURITY_VER} ]]; then
-       einfo "Try to apply Xen Security patch set"
-               # apply main xen patches
-               # Two parallel systems, both work side by side
-               # Over time they may concdense into one. This will suffice for 
now
-               EPATCH_SUFFIX="patch"
-               EPATCH_FORCE="yes"
-
-               source "${WORKDIR}"/patches-security/${PV}.conf
-
-               for i in ${XEN_SECURITY_MAIN}; do
-                       epatch "${WORKDIR}"/patches-security/xen/$i
-               done
-
-               # apply qemu-xen/upstream patches
-               pushd "${S}"/tools/qemu-xen/ > /dev/null
-               for i in ${XEN_SECURITY_QEMUU}; do
-                       epatch "${WORKDIR}"/patches-security/qemuu/$i
-               done
-               popd > /dev/null
-
-               # apply qemu-traditional patches
-               pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
-               for i in ${XEN_SECURITY_QEMUT}; do
-                       epatch "${WORKDIR}"/patches-security/qemut/$i
-               done
-               popd > /dev/null
-       fi
-
-       # move before Gentoo patch, one patch should apply to seabios, to fix 
gcc-4.5.x build err
-       mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
-       pushd tools/firmware/ > /dev/null
-       ln -s seabios-dir-remote seabios-dir || die
-       popd > /dev/null
-
-       # Gentoo's patchset
-       if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
-               einfo "Try to apply Gentoo specific patch set"
-               source "${FILESDIR}"/gentoo-patches.conf
-               _gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
-               for i in ${!_gpv}; do
-                       EPATCH_SUFFIX="patch" \
-                       EPATCH_FORCE="yes" \
-                               epatch "${WORKDIR}"/patches-gentoo/$i
-               done
-       fi
-
-       # Ovmf's patchset
-       if use ovmf; then
-               if [[ -n ${OVMF_VER} ]];then
-                       einfo "Try to apply Ovmf patch set"
-                       pushd "${WORKDIR}"/ovmf-*/ > /dev/null
-                       EPATCH_SUFFIX="patch" \
-                       EPATCH_FORCE="yes" \
-                       EPATCH_OPTS="-p1" \
-                               epatch "${WORKDIR}"/patches-ovmf
-                       popd > /dev/null
-               fi
-               mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
-       fi
-
-       mv tools/qemu-xen/qemu-bridge-helper.c 
tools/qemu-xen/xen-bridge-helper.c || die
-
-       # Fix texi2html build error with new texi2html, qemu.doc.html
-       sed -i -e "/texi2html -monolithic/s/-number//" 
tools/qemu-xen-traditional/Makefile || die
-
-       use api   || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i 
tools/Makefile || die
-       sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" 
PYTHON=$(PYTHON) subdirs-$@:' \
-                -i tools/firmware/Makefile || die
-
-       # Drop .config, fixes to gcc-4.6
-       sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't 
drop"
-
-       # if the user *really* wants to use their own custom-cflags, let them
-       if use custom-cflags; then
-               einfo "User wants their own CFLAGS - removing defaults"
-
-               # try and remove all the default cflags
-               find "${S}" \( -name Makefile -o -name Rules.mk -o -name 
Config.mk \) \
-                       -exec sed \
-                               -e 
's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
-                               -e 
's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
-                               -e 
's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
-                               -e 
's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-                               -e 
's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-                               -i {} + || die "failed to re-set custom-cflags"
-       else
-               unset CFLAGS
-               unset LDFLAGS
-               unset ASFLAGS
-               unset CPPFLAGS
-       fi
-
-       if ! use pygrub; then
-               sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
-       fi
-
-       if ! use python; then
-               sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
-       fi
-
-       if ! use hvm; then
-               sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile 
|| die
-       # Bug 351648
-       elif ! use x86 && ! has x86 $(get_all_abis); then
-               mkdir -p "${WORKDIR}"/extra-headers/gnu || die
-               touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
-               export CPATH="${WORKDIR}"/extra-headers
-       fi
-
-       if use qemu; then
-               if use sdl; then
-                       sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
-                               tools/Makefile || die
-               else
-                       sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 
--disable-sdl:" \
-                               tools/qemu-xen-traditional/xen-setup || die
-                       sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
-                               tools/Makefile || die
-               fi
-       else
-               # Don't bother with qemu, only needed for fully virtualised 
guests
-               sed -e "s:install-tools\: 
tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die
-       fi
-
-       # Reset bash completion dir; Bug 472438
-       sed -e "s:^BASH_COMPLETION_DIR ?= 
\$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
-               -i Config.mk || die
-       sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
-
-       # xencommons, Bug #492332, sed lighter weight than patching
-       sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
-               -i tools/hotplug/Linux/init.d/xencommons.in || die
-
-       # respect multilib, usr/lib/libcacard.so.0.0.0
-       sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
-               -i tools/qemu-xen/configure || die
-
-       #bug 518136, don't build 32bit exactuable for nomultilib profile
-       if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
-               sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
-       fi
-
-       # use /var instead of /var/lib, consistat with previous ebuild
-       sed -i -e   "/XEN_LOCK_DIR=/s/\$localstatedir/\/var/g" \
-               m4/paths.m4 configure tools/configure || die
-       # use /run instead of /var/run
-       sed -i -e   "/XEN_RUN_DIR=/s/\$localstatedir//g" \
-               m4/paths.m4 configure tools/configure || die
-
-       # uncomment lines in xl.conf
-       sed -e 's:^#autoballoon=:autoballoon=:' \
-               -e 's:^#lockfile=:lockfile=:' \
-               -e 's:^#vif.default.script=:vif.default.script=:' \
-               -i tools/examples/xl.conf  || die
-
-       # Bug #575868 converted to a sed statement, typo of one char
-       sed -e "s:granter’s:granter's:" -i xen/include/public/grant_table.h || 
die
-
-       epatch_user
-}
-
-src_configure() {
-       local myconf="--prefix=${PREFIX}/usr \
-               --libdir=${PREFIX}/usr/$(get_libdir) \
-               --libexecdir=${PREFIX}/usr/libexec \
-               --disable-werror \
-               --disable-xen \
-               --enable-tools \
-               --enable-docs \
-               $(use_with system-qemu) \
-               $(use_enable pam) \
-               $(use_enable api xenapi) \
-               $(use_enable ovmf) \
-               $(use_enable ocaml ocamltools) \
-               --with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
-               "
-
-       use system-seabios && myconf+=" 
--with-system-seabios=/usr/share/seabios/bios.bin"
-       use qemu || myconf+=" --with-system-qemu"
-       use amd64 && myconf+=" $(use_enable qemu-traditional)"
-       econf ${myconf}
-}
-
-src_compile() {
-       export VARTEXFONTS="${T}/fonts"
-       local myopt
-       use debug && myopt="${myopt} debug=y"
-
-       if test-flag-CC -fno-strict-overflow; then
-               append-flags -fno-strict-overflow
-       fi
-
-       emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" 
RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
-
-       use doc && emake -C docs txt html
-       emake -C docs man-pages
-}
-
-src_install() {
-       # Override auto-detection in the build system, bug #382573
-       export INITD_DIR=/tmp/init.d
-       export CONFIG_LEAF_DIR=../tmp/default
-
-       # Let the build system compile installed Python modules.
-       local PYTHONDONTWRITEBYTECODE
-       export PYTHONDONTWRITEBYTECODE
-
-       emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
-               XEN_PYTHON_NATIVE_INSTALL=y install-tools
-
-       # Fix the remaining Python shebangs.
-       python_fix_shebang "${D}"
-
-       # Remove RedHat-specific stuff
-       rm -rf "${D}"tmp || die
-
-       if use doc; then
-               emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
-
-               dohtml -r docs/
-               docinto pdf
-               dodoc ${DOCS[@]}
-               [ -d "${D}"/usr/share/doc/xen ] && mv 
"${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
-       fi
-
-       rm -rf "${D}"/usr/share/doc/xen/
-       doman docs/man?/*
-
-       newconfd "${FILESDIR}"/xendomains.confd xendomains
-       newconfd "${FILESDIR}"/xenstored.confd xenstored
-       newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
-       newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
-       newinitd "${FILESDIR}"/xenstored.initd xenstored
-       newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
-       newinitd "${FILESDIR}"/xencommons.initd xencommons
-       newconfd "${FILESDIR}"/xencommons.confd xencommons
-       newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
-       newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
-
-       if use screen; then
-               cat "${FILESDIR}"/xendomains-screen.confd >> 
"${D}"/etc/conf.d/xendomains || die
-               cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
-               keepdir /var/log/xen-consoles
-       fi
-
-       # For -static-libs wrt Bug 384355
-       if ! use static-libs; then
-               rm -f "${D}"usr/$(get_libdir)/*.a 
"${D}"usr/$(get_libdir)/ocaml/*/*.a
-       fi
-
-       # for xendomains
-       keepdir /etc/xen/auto
-
-       # Remove files failing QA AFTER emake installs them, avoiding seeking 
absent files
-       find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
-               -o -name openbios-ppc -o -name palcode-clipper \) -delete || die
-}
-
-pkg_postinst() {
-       elog "Official Xen Guide and the offical wiki page:"
-       elog "https://wiki.gentoo.org/wiki/Xen";
-       elog "http://wiki.xen.org/wiki/Main_Page";
-       elog ""
-       elog "Recommended to utilise the xencommons script to config sytem At 
boot"
-       elog "Add by use of rc-update on completion of the install"
-
-       if ! use hvm; then
-               echo
-               elog "HVM (VT-x and AMD-V) support has been disabled. If you 
need hvm"
-               elog "support enable the hvm use flag."
-               elog "An x86 or amd64 system is required to build HVM support."
-       fi
-
-       if use qemu; then
-               elog "The qemu-bridge-helper is renamed to the 
xen-bridge-helper in the in source"
-               elog "build of qemu.  This allows for app-emulation/qemu to be 
emerged concurrently"
-               elog "with the qemu capable xen.  It is up to the user to 
distinguish between and utilise"
-               elog "the qemu-bridge-helper and the xen-bridge-helper.  File 
bugs of any issues that arise"
-       fi
-}

diff --git a/app-emulation/xen-tools/xen-tools-4.7.1-r1.ebuild 
b/app-emulation/xen-tools/xen-tools-4.7.1-r1.ebuild
deleted file mode 100644
index a8a7372..00000000
--- a/app-emulation/xen-tools/xen-tools-4.7.1-r1.ebuild
+++ /dev/null
@@ -1,457 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='ncurses,xml,threads'
-
-inherit eutils bash-completion-r1 flag-o-matic multilib python-single-r1 
toolchain-funcs versionator
-
-MY_PV=${PV/_/-}
-MAJOR_V="$(get_version_component_range 1-2)"
-
-if [[ $PV == *9999 ]]; then
-       inherit git-r3
-       KEYWORDS=""
-       REPO="xen.git"
-       EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
-       S="${WORKDIR}/${REPO}"
-else
-       KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-       UPSTREAM_VER=
-       SECURITY_VER=17
-       # xen-tools's gentoo patches tarball
-       GENTOO_VER=7
-       # xen-tools's gentoo patches version which apply to this specific ebuild
-       GENTOO_GPV=1
-       # xen-tools ovmf's patches
-       OVMF_VER=2
-
-       SEABIOS_VER=1.8.2
-       # OVMF upstream 52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d
-       OVMF_PV=20151110
-
-       [[ -n ${UPSTREAM_VER} ]] && \
-               
UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz";
-       [[ -n ${SECURITY_VER} ]] && \
-               
SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz";
-       [[ -n ${GENTOO_VER} ]] && \
-               
GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz";
-       [[ -n ${OVMF_VER} ]] && \
-               
OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz";
-
-       
SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/xen-${MY_PV}.tar.gz
-       
http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
-       https://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
-       ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.bz2
-               ${OVMF_PATCHSET_URI} )
-       ${UPSTREAM_PATCHSET_URI}
-       ${SECURITY_PATCHSET_URI}
-       ${GENTOO_PATCHSET_URI}"
-
-       S="${WORKDIR}/xen-${MY_PV}"
-fi
-
-DESCRIPTION="Xen tools including QEMU and xl"
-HOMEPAGE="http://xen.org/";
-DOCS=( README docs/README.xen-bugtool )
-
-LICENSE="GPL-2"
-SLOT="0/${MAJOR_V}"
-# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get 
off his hands and) make
-# >=dev-lang/ocaml-4 stable
-# Masked in profiles/eapi-5-files instead
-IUSE="api custom-cflags debug doc flask hvm qemu ocaml ovmf +qemu-traditional 
+pam python pygrub screen sdl static-libs system-qemu system-seabios"
-
-REQUIRED_USE="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}]
-       x86? ( sys-devel/dev86
-               sys-power/iasl )
-       pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
-       ${PYTHON_DEPS}
-       api? ( dev-libs/libxml2
-               net-misc/curl )
-       ovmf? ( $(python_gen_impl_dep sqlite) )
-       !amd64? ( >=sys-apps/dtc-1.4.0 )
-       amd64? ( sys-devel/bin86
-               system-seabios? ( sys-firmware/seabios )
-               sys-firmware/ipxe
-               sys-devel/dev86
-               sys-power/iasl )
-       dev-lang/perl
-       app-misc/pax-utils
-       doc? (
-               app-doc/doxygen
-               dev-python/markdown[${PYTHON_USEDEP}]
-               dev-tex/latex2html[png,gif]
-               media-gfx/graphviz
-               dev-tex/xcolor
-               media-gfx/transfig
-               dev-texlive/texlive-latexextra
-               virtual/latex-base
-               dev-tex/latexmk
-               dev-texlive/texlive-latex
-               dev-texlive/texlive-pictures
-               dev-texlive/texlive-latexrecommended
-       )
-       hvm? ( x11-proto/xproto
-               !net-libs/libiscsi )
-       qemu? (
-               x11-libs/pixman
-               sdl? ( media-libs/libsdl[X] )
-       )
-       system-qemu? ( app-emulation/qemu[xen] )
-       ocaml? ( dev-ml/findlib
-               >=dev-lang/ocaml-4 )"
-
-RDEPEND="${COMMON_DEPEND}
-       sys-apps/iproute2[-minimal]
-       net-misc/bridge-utils
-       screen? (
-               app-misc/screen
-               app-admin/logrotate
-       )"
-
-# hvmloader is used to bootstrap a fully virtualized kernel
-# Approved by QA team in bug #144032
-QA_WX_LOAD="usr/lib/xen/boot/hvmloader
-       usr/share/qemu-xen/qemu/s390-ccw.img"
-
-RESTRICT="test"
-
-pkg_setup() {
-       python_setup
-       export "CONFIG_LOMOUNT=y"
-
-       #bug 522642, disable compile tools/tests
-       export "CONFIG_TESTS=n"
-
-       if has_version dev-libs/libgcrypt:0; then
-               export "CONFIG_GCRYPT=y"
-       fi
-
-       if [[ -z ${XEN_TARGET_ARCH} ]] ; then
-               if use x86 && use amd64; then
-                       die "Confusion! Both x86 and amd64 are set in your use 
flags!"
-               elif use x86; then
-                       export XEN_TARGET_ARCH="x86_32"
-               elif use amd64 ; then
-                       export XEN_TARGET_ARCH="x86_64"
-               elif use arm; then
-                       export XEN_TARGET_ARCH="arm32"
-               elif use arm64; then
-                       export XEN_TARGET_ARCH="arm64"
-               else
-                       die "Unsupported architecture!"
-               fi
-       fi
-}
-
-src_prepare() {
-       # Upstream's patchset
-       if [[ -n ${UPSTREAM_VER} ]]; then
-               einfo "Try to apply Xen Upstream patch set"
-               EPATCH_SUFFIX="patch" \
-               EPATCH_FORCE="yes" \
-               EPATCH_OPTS="-p1" \
-                       epatch "${WORKDIR}"/patches-upstream
-       fi
-
-       # Security patchset
-       if [[ -n ${SECURITY_VER} ]]; then
-       einfo "Try to apply Xen Security patch set"
-               # apply main xen patches
-               # Two parallel systems, both work side by side
-               # Over time they may concdense into one. This will suffice for 
now
-               EPATCH_SUFFIX="patch"
-               EPATCH_FORCE="yes"
-
-               source "${WORKDIR}"/patches-security/${PV}.conf
-
-               for i in ${XEN_SECURITY_MAIN}; do
-                       epatch "${WORKDIR}"/patches-security/xen/$i
-               done
-
-               # apply qemu-xen/upstream patches
-               pushd "${S}"/tools/qemu-xen/ > /dev/null
-               for i in ${XEN_SECURITY_QEMUU}; do
-                       epatch "${WORKDIR}"/patches-security/qemuu/$i
-               done
-               popd > /dev/null
-
-               # apply qemu-traditional patches
-               pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
-               for i in ${XEN_SECURITY_QEMUT}; do
-                       epatch "${WORKDIR}"/patches-security/qemut/$i
-               done
-               popd > /dev/null
-       fi
-
-       # move before Gentoo patch, one patch should apply to seabios, to fix 
gcc-4.5.x build err
-       mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
-       pushd tools/firmware/ > /dev/null
-       ln -s seabios-dir-remote seabios-dir || die
-       popd > /dev/null
-
-       # Gentoo's patchset
-       if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
-               einfo "Try to apply Gentoo specific patch set"
-               source "${FILESDIR}"/gentoo-patches.conf
-               _gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
-               for i in ${!_gpv}; do
-                       EPATCH_SUFFIX="patch" \
-                       EPATCH_FORCE="yes" \
-                               epatch "${WORKDIR}"/patches-gentoo/$i
-               done
-       fi
-
-       # Ovmf's patchset
-       if use ovmf; then
-               if [[ -n ${OVMF_VER} ]];then
-                       einfo "Try to apply Ovmf patch set"
-                       pushd "${WORKDIR}"/ovmf-*/ > /dev/null
-                       EPATCH_SUFFIX="patch" \
-                       EPATCH_FORCE="yes" \
-                       EPATCH_OPTS="-p1" \
-                               epatch "${WORKDIR}"/patches-ovmf
-                       popd > /dev/null
-               fi
-               mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
-       fi
-
-       mv tools/qemu-xen/qemu-bridge-helper.c 
tools/qemu-xen/xen-bridge-helper.c || die
-
-       # Fix texi2html build error with new texi2html, qemu.doc.html
-       sed -i -e "/texi2html -monolithic/s/-number//" 
tools/qemu-xen-traditional/Makefile || die
-
-       use api   || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i 
tools/Makefile || die
-       sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" 
PYTHON=$(PYTHON) subdirs-$@:' \
-                -i tools/firmware/Makefile || die
-
-       # Drop .config, fixes to gcc-4.6
-       sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't 
drop"
-
-       # if the user *really* wants to use their own custom-cflags, let them
-       if use custom-cflags; then
-               einfo "User wants their own CFLAGS - removing defaults"
-
-               # try and remove all the default cflags
-               find "${S}" \( -name Makefile -o -name Rules.mk -o -name 
Config.mk \) \
-                       -exec sed \
-                               -e 
's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
-                               -e 
's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
-                               -e 
's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
-                               -e 
's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-                               -e 
's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-                               -i {} + || die "failed to re-set custom-cflags"
-       else
-               unset CFLAGS
-               unset LDFLAGS
-               unset ASFLAGS
-               unset CPPFLAGS
-       fi
-
-       if ! use pygrub; then
-               sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
-       fi
-
-       if ! use python; then
-               sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
-       fi
-
-       if ! use hvm; then
-               sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile 
|| die
-       # Bug 351648
-       elif ! use x86 && ! has x86 $(get_all_abis); then
-               mkdir -p "${WORKDIR}"/extra-headers/gnu || die
-               touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
-               export CPATH="${WORKDIR}"/extra-headers
-       fi
-
-       if use qemu; then
-               if use sdl; then
-                       sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
-                               tools/Makefile || die
-               else
-                       sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 
--disable-sdl:" \
-                               tools/qemu-xen-traditional/xen-setup || die
-                       sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
-                               tools/Makefile || die
-               fi
-       else
-               # Don't bother with qemu, only needed for fully virtualised 
guests
-               sed -e "s:install-tools\: 
tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die
-       fi
-
-       # Reset bash completion dir; Bug 472438
-       sed -e "s:^BASH_COMPLETION_DIR ?= 
\$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
-               -i Config.mk || die
-       sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
-
-       # xencommons, Bug #492332, sed lighter weight than patching
-       sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
-               -i tools/hotplug/Linux/init.d/xencommons.in || die
-
-       # respect multilib, usr/lib/libcacard.so.0.0.0
-       sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
-               -i tools/qemu-xen/configure || die
-
-       #bug 518136, don't build 32bit exactuable for nomultilib profile
-       if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
-               sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
-       fi
-
-       # use /var instead of /var/lib, consistat with previous ebuild
-       sed -i -e   "/XEN_LOCK_DIR=/s/\$localstatedir/\/var/g" \
-               m4/paths.m4 configure tools/configure || die
-       # use /run instead of /var/run
-       sed -i -e   "/XEN_RUN_DIR=/s/\$localstatedir//g" \
-               m4/paths.m4 configure tools/configure || die
-
-       # uncomment lines in xl.conf
-       sed -e 's:^#autoballoon=:autoballoon=:' \
-               -e 's:^#lockfile=:lockfile=:' \
-               -e 's:^#vif.default.script=:vif.default.script=:' \
-               -i tools/examples/xl.conf  || die
-
-       # Bug #575868 converted to a sed statement, typo of one char
-       sed -e "s:granter’s:granter's:" -i xen/include/public/grant_table.h || 
die
-
-       epatch_user
-}
-
-src_configure() {
-       local myconf="--prefix=${PREFIX}/usr \
-               --libdir=${PREFIX}/usr/$(get_libdir) \
-               --libexecdir=${PREFIX}/usr/libexec \
-               --disable-werror \
-               --disable-xen \
-               --enable-tools \
-               --enable-docs \
-               $(use_enable pam) \
-               $(use_enable api xenapi) \
-               $(use_enable ovmf) \
-               $(use_enable ocaml ocamltools) \
-               --with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
-               "
-
-       use system-seabios && myconf+=" 
--with-system-seabios=/usr/share/seabios/bios.bin"
-       use system-qemu && myconf+=" 
--with-system-qemu=/usr/bin/qemu-system-x86_64"
-       use amd64 && myconf+=" $(use_enable qemu-traditional)"
-       econf ${myconf}
-}
-
-src_compile() {
-       export VARTEXFONTS="${T}/fonts"
-       local myopt
-       use debug && myopt="${myopt} debug=y"
-
-       if test-flag-CC -fno-strict-overflow; then
-               append-flags -fno-strict-overflow
-       fi
-
-       emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" 
RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
-
-       use doc && emake -C docs txt html
-       emake -C docs man-pages
-}
-
-src_install() {
-       # Override auto-detection in the build system, bug #382573
-       export INITD_DIR=/tmp/init.d
-       export CONFIG_LEAF_DIR=../tmp/default
-
-       # Let the build system compile installed Python modules.
-       local PYTHONDONTWRITEBYTECODE
-       export PYTHONDONTWRITEBYTECODE
-
-       emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
-               XEN_PYTHON_NATIVE_INSTALL=y install-tools
-
-       # Fix the remaining Python shebangs.
-       python_fix_shebang "${D}"
-
-       # Remove RedHat-specific stuff
-       rm -rf "${D}"tmp || die
-
-       if use doc; then
-               emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
-
-               dohtml -r docs/
-               docinto pdf
-               dodoc ${DOCS[@]}
-               [ -d "${D}"/usr/share/doc/xen ] && mv 
"${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
-       fi
-
-       rm -rf "${D}"/usr/share/doc/xen/
-       doman docs/man?/*
-
-       newconfd "${FILESDIR}"/xendomains.confd xendomains
-       newconfd "${FILESDIR}"/xenstored.confd xenstored
-       newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
-       newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
-       newinitd "${FILESDIR}"/xenstored.initd xenstored
-       newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
-       newinitd "${FILESDIR}"/xencommons.initd xencommons
-       newconfd "${FILESDIR}"/xencommons.confd xencommons
-       newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
-       newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
-
-       if use screen; then
-               cat "${FILESDIR}"/xendomains-screen.confd >> 
"${D}"/etc/conf.d/xendomains || die
-               cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
-               keepdir /var/log/xen-consoles
-       fi
-
-       # For -static-libs wrt Bug 384355
-       if ! use static-libs; then
-               rm -f "${D}"usr/$(get_libdir)/*.a 
"${D}"usr/$(get_libdir)/ocaml/*/*.a
-       fi
-
-       # for xendomains
-       keepdir /etc/xen/auto
-
-       # Remove files failing QA AFTER emake installs them, avoiding seeking 
absent files
-       find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
-               -o -name openbios-ppc -o -name palcode-clipper \) -delete || die
-}
-
-pkg_postinst() {
-       elog "Official Xen Guide and the offical wiki page:"
-       elog "https://wiki.gentoo.org/wiki/Xen";
-       elog "http://wiki.xen.org/wiki/Main_Page";
-       elog ""
-       elog "Recommended to utilise the xencommons script to config sytem At 
boot"
-       elog "Add by use of rc-update on completion of the install"
-
-       if ! use hvm; then
-               echo
-               elog "HVM (VT-x and AMD-V) support has been disabled. If you 
need hvm"
-               elog "support enable the hvm use flag."
-               elog "An x86 or amd64 system is required to build HVM support."
-       fi
-
-       if use qemu; then
-               elog "The qemu-bridge-helper is renamed to the 
xen-bridge-helper in the in source"
-               elog "build of qemu.  This allows for app-emulation/qemu to be 
emerged concurrently"
-               elog "with the qemu capable xen.  It is up to the user to 
distinguish between and utilise"
-               elog "the qemu-bridge-helper and the xen-bridge-helper.  File 
bugs of any issues that arise"
-       fi
-}

diff --git a/app-emulation/xen-tools/xen-tools-4.7.1.ebuild 
b/app-emulation/xen-tools/xen-tools-4.7.1.ebuild
deleted file mode 100644
index e5a6cdb..00000000
--- a/app-emulation/xen-tools/xen-tools-4.7.1.ebuild
+++ /dev/null
@@ -1,457 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='ncurses,xml,threads'
-
-inherit eutils bash-completion-r1 flag-o-matic multilib python-single-r1 
toolchain-funcs versionator
-
-MY_PV=${PV/_/-}
-MAJOR_V="$(get_version_component_range 1-2)"
-
-if [[ $PV == *9999 ]]; then
-       inherit git-r3
-       KEYWORDS=""
-       REPO="xen.git"
-       EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
-       S="${WORKDIR}/${REPO}"
-else
-       KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-       UPSTREAM_VER=
-       SECURITY_VER=
-       # xen-tools's gentoo patches tarball
-       GENTOO_VER=6
-       # xen-tools's gentoo patches version which apply to this specific ebuild
-       GENTOO_GPV=0
-       # xen-tools ovmf's patches
-       OVMF_VER=2
-
-       SEABIOS_VER=1.8.2
-       # OVMF upstream 52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d
-       OVMF_PV=20151110
-
-       [[ -n ${UPSTREAM_VER} ]] && \
-               
UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz";
-       [[ -n ${SECURITY_VER} ]] && \
-               
SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz";
-       [[ -n ${GENTOO_VER} ]] && \
-               
GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz";
-       [[ -n ${OVMF_VER} ]] && \
-               
OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz";
-
-       
SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/xen-${MY_PV}.tar.gz
-       
http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
-       https://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
-       ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.bz2
-               ${OVMF_PATCHSET_URI} )
-       ${UPSTREAM_PATCHSET_URI}
-       ${SECURITY_PATCHSET_URI}
-       ${GENTOO_PATCHSET_URI}"
-
-       S="${WORKDIR}/xen-${MY_PV}"
-fi
-
-DESCRIPTION="Xen tools including QEMU and xl"
-HOMEPAGE="http://xen.org/";
-DOCS=( README docs/README.xen-bugtool )
-
-LICENSE="GPL-2"
-SLOT="0/${MAJOR_V}"
-# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get 
off his hands and) make
-# >=dev-lang/ocaml-4 stable
-# Masked in profiles/eapi-5-files instead
-IUSE="api custom-cflags debug doc flask hvm qemu ocaml ovmf +qemu-traditional 
+pam python pygrub screen sdl static-libs system-qemu system-seabios"
-
-REQUIRED_USE="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}]
-       x86? ( sys-devel/dev86
-               sys-power/iasl )
-       pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
-       ${PYTHON_DEPS}
-       api? ( dev-libs/libxml2
-               net-misc/curl )
-       ovmf? ( $(python_gen_impl_dep sqlite) )
-       !amd64? ( >=sys-apps/dtc-1.4.0 )
-       amd64? ( sys-devel/bin86
-               system-seabios? ( sys-firmware/seabios )
-               sys-firmware/ipxe
-               sys-devel/dev86
-               sys-power/iasl )
-       dev-lang/perl
-       app-misc/pax-utils
-       doc? (
-               app-doc/doxygen
-               dev-python/markdown[${PYTHON_USEDEP}]
-               dev-tex/latex2html[png,gif]
-               media-gfx/graphviz
-               dev-tex/xcolor
-               media-gfx/transfig
-               dev-texlive/texlive-latexextra
-               virtual/latex-base
-               dev-tex/latexmk
-               dev-texlive/texlive-latex
-               dev-texlive/texlive-pictures
-               dev-texlive/texlive-latexrecommended
-       )
-       hvm? ( x11-proto/xproto
-               !net-libs/libiscsi )
-       qemu? (
-               x11-libs/pixman
-               sdl? ( media-libs/libsdl[X] )
-       )
-       system-qemu? ( app-emulation/qemu[xen] )
-       ocaml? ( dev-ml/findlib
-               >=dev-lang/ocaml-4 )"
-
-RDEPEND="${COMMON_DEPEND}
-       sys-apps/iproute2[-minimal]
-       net-misc/bridge-utils
-       screen? (
-               app-misc/screen
-               app-admin/logrotate
-       )"
-
-# hvmloader is used to bootstrap a fully virtualized kernel
-# Approved by QA team in bug #144032
-QA_WX_LOAD="usr/lib/xen/boot/hvmloader
-       usr/share/qemu-xen/qemu/s390-ccw.img"
-
-RESTRICT="test"
-
-pkg_setup() {
-       python_setup
-       export "CONFIG_LOMOUNT=y"
-
-       #bug 522642, disable compile tools/tests
-       export "CONFIG_TESTS=n"
-
-       if has_version dev-libs/libgcrypt:0; then
-               export "CONFIG_GCRYPT=y"
-       fi
-
-       if [[ -z ${XEN_TARGET_ARCH} ]] ; then
-               if use x86 && use amd64; then
-                       die "Confusion! Both x86 and amd64 are set in your use 
flags!"
-               elif use x86; then
-                       export XEN_TARGET_ARCH="x86_32"
-               elif use amd64 ; then
-                       export XEN_TARGET_ARCH="x86_64"
-               elif use arm; then
-                       export XEN_TARGET_ARCH="arm32"
-               elif use arm64; then
-                       export XEN_TARGET_ARCH="arm64"
-               else
-                       die "Unsupported architecture!"
-               fi
-       fi
-}
-
-src_prepare() {
-       # Upstream's patchset
-       if [[ -n ${UPSTREAM_VER} ]]; then
-               einfo "Try to apply Xen Upstream patch set"
-               EPATCH_SUFFIX="patch" \
-               EPATCH_FORCE="yes" \
-               EPATCH_OPTS="-p1" \
-                       epatch "${WORKDIR}"/patches-upstream
-       fi
-
-       # Security patchset
-       if [[ -n ${SECURITY_VER} ]]; then
-       einfo "Try to apply Xen Security patch set"
-               # apply main xen patches
-               # Two parallel systems, both work side by side
-               # Over time they may concdense into one. This will suffice for 
now
-               EPATCH_SUFFIX="patch"
-               EPATCH_FORCE="yes"
-
-               source "${WORKDIR}"/patches-security/${PV}.conf
-
-               for i in ${XEN_SECURITY_MAIN}; do
-                       epatch "${WORKDIR}"/patches-security/xen/$i
-               done
-
-               # apply qemu-xen/upstream patches
-               pushd "${S}"/tools/qemu-xen/ > /dev/null
-               for i in ${XEN_SECURITY_QEMUU}; do
-                       epatch "${WORKDIR}"/patches-security/qemuu/$i
-               done
-               popd > /dev/null
-
-               # apply qemu-traditional patches
-               pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
-               for i in ${XEN_SECURITY_QEMUT}; do
-                       epatch "${WORKDIR}"/patches-security/qemut/$i
-               done
-               popd > /dev/null
-       fi
-
-       # move before Gentoo patch, one patch should apply to seabios, to fix 
gcc-4.5.x build err
-       mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
-       pushd tools/firmware/ > /dev/null
-       ln -s seabios-dir-remote seabios-dir || die
-       popd > /dev/null
-
-       # Gentoo's patchset
-       if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
-               einfo "Try to apply Gentoo specific patch set"
-               source "${FILESDIR}"/gentoo-patches.conf
-               _gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
-               for i in ${!_gpv}; do
-                       EPATCH_SUFFIX="patch" \
-                       EPATCH_FORCE="yes" \
-                               epatch "${WORKDIR}"/patches-gentoo/$i
-               done
-       fi
-
-       # Ovmf's patchset
-       if use ovmf; then
-               if [[ -n ${OVMF_VER} ]];then
-                       einfo "Try to apply Ovmf patch set"
-                       pushd "${WORKDIR}"/ovmf-*/ > /dev/null
-                       EPATCH_SUFFIX="patch" \
-                       EPATCH_FORCE="yes" \
-                       EPATCH_OPTS="-p1" \
-                               epatch "${WORKDIR}"/patches-ovmf
-                       popd > /dev/null
-               fi
-               mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
-       fi
-
-       mv tools/qemu-xen/qemu-bridge-helper.c 
tools/qemu-xen/xen-bridge-helper.c || die
-
-       # Fix texi2html build error with new texi2html, qemu.doc.html
-       sed -i -e "/texi2html -monolithic/s/-number//" 
tools/qemu-xen-traditional/Makefile || die
-
-       use api   || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i 
tools/Makefile || die
-       sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" 
PYTHON=$(PYTHON) subdirs-$@:' \
-                -i tools/firmware/Makefile || die
-
-       # Drop .config, fixes to gcc-4.6
-       sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't 
drop"
-
-       # if the user *really* wants to use their own custom-cflags, let them
-       if use custom-cflags; then
-               einfo "User wants their own CFLAGS - removing defaults"
-
-               # try and remove all the default cflags
-               find "${S}" \( -name Makefile -o -name Rules.mk -o -name 
Config.mk \) \
-                       -exec sed \
-                               -e 
's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
-                               -e 
's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
-                               -e 
's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
-                               -e 
's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-                               -e 
's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-                               -i {} + || die "failed to re-set custom-cflags"
-       else
-               unset CFLAGS
-               unset LDFLAGS
-               unset ASFLAGS
-               unset CPPFLAGS
-       fi
-
-       if ! use pygrub; then
-               sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
-       fi
-
-       if ! use python; then
-               sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
-       fi
-
-       if ! use hvm; then
-               sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile 
|| die
-       # Bug 351648
-       elif ! use x86 && ! has x86 $(get_all_abis); then
-               mkdir -p "${WORKDIR}"/extra-headers/gnu || die
-               touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
-               export CPATH="${WORKDIR}"/extra-headers
-       fi
-
-       if use qemu; then
-               if use sdl; then
-                       sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
-                               tools/Makefile || die
-               else
-                       sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 
--disable-sdl:" \
-                               tools/qemu-xen-traditional/xen-setup || die
-                       sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
-                               tools/Makefile || die
-               fi
-       else
-               # Don't bother with qemu, only needed for fully virtualised 
guests
-               sed -e "s:install-tools\: 
tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die
-       fi
-
-       # Reset bash completion dir; Bug 472438
-       sed -e "s:^BASH_COMPLETION_DIR ?= 
\$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
-               -i Config.mk || die
-       sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
-
-       # xencommons, Bug #492332, sed lighter weight than patching
-       sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
-               -i tools/hotplug/Linux/init.d/xencommons.in || die
-
-       # respect multilib, usr/lib/libcacard.so.0.0.0
-       sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
-               -i tools/qemu-xen/configure || die
-
-       #bug 518136, don't build 32bit exactuable for nomultilib profile
-       if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
-               sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
-       fi
-
-       # use /var instead of /var/lib, consistat with previous ebuild
-       sed -i -e   "/XEN_LOCK_DIR=/s/\$localstatedir/\/var/g" \
-               m4/paths.m4 configure tools/configure || die
-       # use /run instead of /var/run
-       sed -i -e   "/XEN_RUN_DIR=/s/\$localstatedir//g" \
-               m4/paths.m4 configure tools/configure || die
-
-       # uncomment lines in xl.conf
-       sed -e 's:^#autoballoon=:autoballoon=:' \
-               -e 's:^#lockfile=:lockfile=:' \
-               -e 's:^#vif.default.script=:vif.default.script=:' \
-               -i tools/examples/xl.conf  || die
-
-       # Bug #575868 converted to a sed statement, typo of one char
-       sed -e "s:granter’s:granter's:" -i xen/include/public/grant_table.h || 
die
-
-       epatch_user
-}
-
-src_configure() {
-       local myconf="--prefix=${PREFIX}/usr \
-               --libdir=${PREFIX}/usr/$(get_libdir) \
-               --libexecdir=${PREFIX}/usr/libexec \
-               --disable-werror \
-               --disable-xen \
-               --enable-tools \
-               --enable-docs \
-               $(use_enable pam) \
-               $(use_enable api xenapi) \
-               $(use_enable ovmf) \
-               $(use_enable ocaml ocamltools) \
-               --with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
-               "
-
-       use system-seabios && myconf+=" 
--with-system-seabios=/usr/share/seabios/bios.bin"
-       use system-qemu && myconf+=" 
--with-system-qemu=/usr/bin/qemu-system-x86_64"
-       use amd64 && myconf+=" $(use_enable qemu-traditional)"
-       econf ${myconf}
-}
-
-src_compile() {
-       export VARTEXFONTS="${T}/fonts"
-       local myopt
-       use debug && myopt="${myopt} debug=y"
-
-       if test-flag-CC -fno-strict-overflow; then
-               append-flags -fno-strict-overflow
-       fi
-
-       emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" 
RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
-
-       use doc && emake -C docs txt html
-       emake -C docs man-pages
-}
-
-src_install() {
-       # Override auto-detection in the build system, bug #382573
-       export INITD_DIR=/tmp/init.d
-       export CONFIG_LEAF_DIR=../tmp/default
-
-       # Let the build system compile installed Python modules.
-       local PYTHONDONTWRITEBYTECODE
-       export PYTHONDONTWRITEBYTECODE
-
-       emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
-               XEN_PYTHON_NATIVE_INSTALL=y install-tools
-
-       # Fix the remaining Python shebangs.
-       python_fix_shebang "${D}"
-
-       # Remove RedHat-specific stuff
-       rm -rf "${D}"tmp || die
-
-       if use doc; then
-               emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
-
-               dohtml -r docs/
-               docinto pdf
-               dodoc ${DOCS[@]}
-               [ -d "${D}"/usr/share/doc/xen ] && mv 
"${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
-       fi
-
-       rm -rf "${D}"/usr/share/doc/xen/
-       doman docs/man?/*
-
-       newconfd "${FILESDIR}"/xendomains.confd xendomains
-       newconfd "${FILESDIR}"/xenstored.confd xenstored
-       newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
-       newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
-       newinitd "${FILESDIR}"/xenstored.initd xenstored
-       newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
-       newinitd "${FILESDIR}"/xencommons.initd xencommons
-       newconfd "${FILESDIR}"/xencommons.confd xencommons
-       newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
-       newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
-
-       if use screen; then
-               cat "${FILESDIR}"/xendomains-screen.confd >> 
"${D}"/etc/conf.d/xendomains || die
-               cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
-               keepdir /var/log/xen-consoles
-       fi
-
-       # For -static-libs wrt Bug 384355
-       if ! use static-libs; then
-               rm -f "${D}"usr/$(get_libdir)/*.a 
"${D}"usr/$(get_libdir)/ocaml/*/*.a
-       fi
-
-       # for xendomains
-       keepdir /etc/xen/auto
-
-       # Remove files failing QA AFTER emake installs them, avoiding seeking 
absent files
-       find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
-               -o -name openbios-ppc -o -name palcode-clipper \) -delete || die
-}
-
-pkg_postinst() {
-       elog "Official Xen Guide and the offical wiki page:"
-       elog "https://wiki.gentoo.org/wiki/Xen";
-       elog "http://wiki.xen.org/wiki/Main_Page";
-       elog ""
-       elog "Recommended to utilise the xencommons script to config sytem At 
boot"
-       elog "Add by use of rc-update on completion of the install"
-
-       if ! use hvm; then
-               echo
-               elog "HVM (VT-x and AMD-V) support has been disabled. If you 
need hvm"
-               elog "support enable the hvm use flag."
-               elog "An x86 or amd64 system is required to build HVM support."
-       fi
-
-       if use qemu; then
-               elog "The qemu-bridge-helper is renamed to the 
xen-bridge-helper in the in source"
-               elog "build of qemu.  This allows for app-emulation/qemu to be 
emerged concurrently"
-               elog "with the qemu capable xen.  It is up to the user to 
distinguish between and utilise"
-               elog "the qemu-bridge-helper and the xen-bridge-helper.  File 
bugs of any issues that arise"
-       fi
-}

Reply via email to