app-emulation/xen-tools: drop old vulnerable versions
authorYixun Lan <dlan@gentoo.org>
Thu, 28 Jul 2016 16:44:19 +0000 (00:44 +0800)
committerYixun Lan <dlan@gentoo.org>
Thu, 28 Jul 2016 16:50:46 +0000 (00:50 +0800)
Gentoo-Bug: 588780

Package-Manager: portage-2.3.0

app-emulation/xen-tools/Manifest
app-emulation/xen-tools/xen-tools-4.6.0-r10.ebuild [deleted file]
app-emulation/xen-tools/xen-tools-4.6.0-r11.ebuild [deleted file]
app-emulation/xen-tools/xen-tools-4.6.0-r9.ebuild [deleted file]
app-emulation/xen-tools/xen-tools-4.6.1-r1.ebuild [deleted file]
app-emulation/xen-tools/xen-tools-4.6.1-r2.ebuild [deleted file]
app-emulation/xen-tools/xen-tools-4.6.1-r3.ebuild [deleted file]
app-emulation/xen-tools/xen-tools-4.6.1-r4.ebuild [deleted file]
app-emulation/xen-tools/xen-tools-4.6.1.ebuild [deleted file]
app-emulation/xen-tools/xen-tools-4.6.3.ebuild [deleted file]
app-emulation/xen-tools/xen-tools-4.7.0.ebuild [deleted file]

index f4a828a1053a2f9fbfc7aeaa7abe19814505545d..c614caa7a0564c338c2da9de7c0c24f0828f8185 100644 (file)
@@ -1,24 +1,7 @@
-DIST ovmf-20150629.tar.bz2 24265640 SHA256 9f316dc44e192fa9d5d7486cf1dae3f3094ab4f20f282f80d6251632c2cd6118 SHA512 b15a896b5222b920a500ec8a1eba5d670505441ffd02accf9b6c0deb9a12c1c5513a016f91eae5cb33f75ee9f28435dc957686e6ce8b5d0744c11a7d7262fffd WHIRLPOOL 8db4360dcb85f183dbd827f7381787c84065f94eaf746068b11ef7b30412b16cc0ba75effb04f01dea5f4f67967721f7aca11a2550035e95c59645c7964526ac
 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.0-upstream-patches-0.tar.xz 19280 SHA256 8ef2d139f86cb52d2208a17c974e5a85356183ee359ab4b91882067548806e0c SHA512 9fde8d9def1d75e50c10069af7f9fea4b5b6992b7089eb554e1e2a4c78dd080f2977128d0dd541eeb735b951e7d6614a07101f7703457e7743ac6b3be962cdfe WHIRLPOOL 861c7f150811912422f6f5eb77437744d1456740a43bef3dfd88a2e6d6836c0e8460b788ccd4f14a7144652d65a825c08aa984ec4240b2b1ac6d09237695d19d
-DIST xen-4.6.0.tar.gz 19694350 SHA256 6fa1c2431df55aa5950d248e6093b8c8c0f11c357a0adbd348a2186478e80909 SHA512 b4b02f306ffea360f539dd8c231b2f58c00c3638fdb665cb659c7291b475b40f1075bc59d49a6144767729e57b8bc40a1cfd9030d61de2b8fa4ac97d43655c2b WHIRLPOOL d3f01183440ca1875b6e850bd116db0c382383433e50c0902d3268e9e36b39d184fc65e925bdb5363ef4ca7a232fee15b4749c89baf789137b8a8248565c75a8
-DIST xen-4.6.1-upstream-patches-0.tar.xz 92472 SHA256 7b32cbd57571d838ec606c5bd2b98a51e14a6bcf44d2d61007c274fa3b6b5eb6 SHA512 2f8e9273601c70eac88fb9d94bcb607bc5ea76514f9cdee0e96309b9a9d78db881d94c57a518ad5cef398fa57274b9940ba1553d0984bb5504ca27b6b62a6003 WHIRLPOOL 9b2592f33587fc85b091fbfb357d4ab4914f39286f3207a0d8aebf26259f0ebd1eb7d6bede7da9a202427cf9c7d97c11c4c84c5f90584948b1f3c32fefac5164
-DIST xen-4.6.1.tar.gz 19693042 SHA256 44cc2fccba1e147ef4c8da0584ce0f24189c8743de0e3e9a9226da88ddb5f589 SHA512 f01a0b7874abf8b3a81432428d7ba2d5aceb9d75ae20310f8ef49a3a0df927720a51d49090f74fda7f374c779e121ad26da6966a6f2623ed1a7743b4c080427c WHIRLPOOL b4eec12118d602d1b41edee32ed7c0c61646974060bc44e3eedaf78f7c3015c151998f72573fd2bab1992263dd98f09992772334bae7826048d187de7ed022e5
 DIST xen-4.6.3.tar.gz 19707041 SHA256 02badfce9a037bd1bd4a94210c1f6b85467746216c71795805102b514bcf1fc4 SHA512 187a860b40c05139f22b8498a5fae1db173c3110d957147af29a56cb83b7111c9dc4946d65f9dffc847001fc01c5e9bf51886eaa1194bb9cfd0b6dbcd43a2c5c WHIRLPOOL f80fa73727218567b8d6c8d6bab9dfd577c4bb84ac737b084e4396128e8c4aa79776a277f73c283d5b12f17764b183b67fbf8596e240042dd0709f28cbab777e
 DIST xen-4.7.0.tar.gz 20702550 SHA256 be5876144d49729572ae06142e0bb93f1c1f2695578141eff2931995add24623 SHA512 2c52c8ef145dfab7d069e79318d5d631e1106a0ddc79d88b3bacf36c7f15cea67dccb704a245e785d2a1e42c6fb6c0ad74832f564aaeec025ad7b864031f0921 WHIRLPOOL 9725ac9fe94e78aab47b0534b5ee1a190106a773bf7d6204fed736abe7069b71937717b6680833736bd02a3a3a43f2eb2162fe7c0d992ddd47d12158b5d9835f
-DIST xen-gentoo-patches-4.tar.xz 23632 SHA256 5cdb0f93ee32d0a5fc4fc7282270ace73acfdc4df694f7b29c1135180d902049 SHA512 3006ce4cd67e80a9f79d9ba3814a64704b0d762159a439a140b1ec0a2699473cd5537950f0913b55f8f7e3d0fd2e9861f3199793120d8d2502aa3f8ef7816c8f WHIRLPOOL 4a921103df2825ccd8b0481708e7cd692fa45d5aadae286c1522c144a1576920e7d3567648565bb9af85bb6bb597ea9d0ec04ea6abd2115db4caf7e739717b1a
 DIST xen-gentoo-patches-6.tar.xz 23864 SHA256 96e774bd03c9df341fdb2f5d6cf231549c8d7a004c3c902c07b5cb690428d4c6 SHA512 7f4966bb7dad02b213a3cbefcc312573039feaec964a2deaa6aa7f8fa488b6e31176834a4e2cf6ac380548f1b8251c7700d16d1cbc7b88fcee440f6cccd7f177 WHIRLPOOL a41cae3441370e0e18fbf28ac7a780adfaa0d6af12dc62f1dfe90f52f01ebbd8055e3b5b399ae11602b29b8a206aafe2cbecb79948233bd072e73294468f3b08
-DIST xen-ovmf-patches-1.tar.xz 4724 SHA256 d14e98e62c78c9f4b8a7e7b4a04de6dabf300f393eff44154d06f93aa43d7703 SHA512 a17467762f6d92018ff9bce783ce148039f23159405e801ec2aef4c3db72c3976c6f1e41d8c2a2cb704a9654556a2050302f284cfe8e32f28f393b8e2c6d2f1c WHIRLPOOL de53ad07f20aa14fe76d974db92d5b6808f0a2dd26a627b818914990add7adad8e6135d42641819dc22947031981c5815bae5aeeed0f28785c90beda0a6ff6c8
 DIST xen-ovmf-patches-2.tar.xz 4344 SHA256 495d61d718440057f8b0b54fb57061450dd764c6e87fe5f8bda1785bcddba770 SHA512 0bdc83029a01b613f5c1ca029bd45aebe211c332f09db91a0cc7d6b6f85a81dbbfdc20c62f0d20e973ee41b155a6551a4fad518cb792e1d508bf070e23d6a1d3 WHIRLPOOL 8346d68fa5d2a8e8a5c007b55e2b85cf48df045cc8c4818f09c756d28a52dd856671f37b4a53478e9b96ca9d2eca0c67fd15f009a94d1d2dfed8e83e596d9633
-DIST xen-qemu-patches-0.tar.gz 3224 SHA256 ff1ac02a6d91e4abdbe069e1bb75d0b798deff5c2c72d1efb5459c72f4278f00 SHA512 4fd0c663a733436188aca364e927ac430d9bbef9859da65c074d7fd66c330645b05ff1f3e849f4581dfcd7054801d65edcff8445c1c63c2725f11e3903415af0 WHIRLPOOL 5504d7ffbd3c1970026c1f43252d9c76f10c5448ede247719e2698aa8f8e93b20e4cc353da5582b3b6887fb3fd7d1e13765f664ea60daeb6020f052eaca9b9f4
-DIST xen-qemu-patches-2.tar.gz 4690 SHA256 5850513c6c6e1c68da7a04526bfc3f7ee049b1c5cbcd370d2dfcee94b49f84e9 SHA512 fb1adcccffdd53193699287049da719f826ab8ab819130e7747cb6de9f6f9446fde223e26772a6ee7380ee0691acffac2c970691583ef6cb06f3c597acac824e WHIRLPOOL ea6dc377c69261246d68342b0bf33bdcd07447f1d3547862da10dd0e72d0a6d96fcdfb5df422e88fd7119a6edc7c8990f02d33bbb4c401534aba55b287ac63fe
-DIST xen-qemu-patches-3.tar.gz 7866 SHA256 40ec7e127c149d25f783f050c693776db4f5ded7b488fba3be4b88c85c33d981 SHA512 ca1c5a10c986dcc6e39fbcb606493532203f051d622fbd7318b4c6f69b686889d81c143c7eaf7c91b1e925aa4f7667fb8f80d887ac2b45172a9db4c4231e7feb WHIRLPOOL 1aee478c6eb39fd204a0b88c02770a304765f7dba979bdebd4dd882c77b947038219aab99be95010c308207eb18d276c127c1bb5c69c62e0ef2bbb618fd99e17
-DIST xen-qemu-patches-4.tar.gz 5231 SHA256 6ffc66654045ce6aa4f228e1a39025a0cdce613815c114d28d1c14499d25eb0d SHA512 b2cbf25a9ceec947f4c5ca7d77c8fb3b443bffc3c48c8c6fb50d72a795f86e5cc40fb2637e378fea048ee8094aebd96e5d056289d9538e5f19ed36b9e7d70431 WHIRLPOOL 2d73c793eaf00ca0f8a79f18e2b1e95931000989265d7a3bb4f6bccb2407619ddfbdfc28fcec03f37a18554352ea4dc6500de8ef6a72f2a991cff3495e66e4fc
-DIST xen-security-patches-01.tar.gz 4683 SHA256 ca1e565180aff5485f217735faa24bea2f7fc821d5c5a506d1854291681fdc28 SHA512 538d5df0c3b5b5277613af3a3fc11aa46a16cfdfdc88488da5020e3ad38580b8cdb12778e251c4b41c6b5cfe37d8266a599b8b15b4032491c0689e442b388847 WHIRLPOOL a22492288fa04919c60d9e7e15181bc7eb05f457b0aad0e8ece172443fd4208d4bdeb692ef713b99aa83eb030caf3dfcf1236b5d8de13e152b93096aa2e869b8
-DIST xen-security-patches-10.tar.gz 13289 SHA256 8937b3c0045f83ac0685ce129c99be8ab035f2ed92605d0c1100d4f898d978a3 SHA512 698963479149bd63695b3ffd7d108b798ce6c694560f2908b639f3a1b00d37d4994fbc1e0e21aaba1f3a113653d5b37c28679bc1d97d75a805844345c9c070c0 WHIRLPOOL 8c2433c35499819906abf5cb8898dac23cbf7523cc4b4e9291e696eb2871971a7300d3f54865ac32738a1b67c1de18e227085f14c5717b60ec951d5038fa0493
-DIST xen-security-patches-12.tar.xz 5172 SHA256 1d3c238cbefc243a17770722895f6bc725e807641a93908d3e4002b26e4f2a8b SHA512 06f80b12c30d18f84e880ffb529fe2b90e7ade1cb3479d2fbc21447cf2c5d50c7ba3a14ddd0b31f63e87af520bf80812158e4097e657f8316bdb5f8b443c9828 WHIRLPOOL 49b776cf3d1d05758dfe9ce9f5f5cb0573eaec5f1273648eedb04b408587bb3cfe8838ea551a29423cc30622c7426e852740138fa2795898f25c22de148f91c9
 DIST xen-security-patches-14.tar.xz 4036 SHA256 2ac238d2c63b77d7f36c48cac5e1ce062229fc8cbabe5ba0f359f1014bfd0572 SHA512 51849687b10fe73c7bdee9d9243f33d386c3dce112b6c1392f5a1583922371d17ac5f7b8e6b0152aeb34160d4ad4a88d975337a8bbf73a51c24065ec129bf2cf WHIRLPOOL 3c18fdcc4db107c57b7ee4d8b261f3d390b21530aadcb0a0381d8228d87cbb67bf97103749f44b2993ab164c806026b23a43d10d3c534fe583554916633c13a4
-DIST xen-security-patches-7.tar.xz 22604 SHA256 e831c71f830316f452eb8645a5e7ca497264587aa8b353945fd9535f485166e3 SHA512 051769f4118f5c6d5d961759f547526d3fb0e86a4c1dee265a7f0224f10a88e2217b5b5fcf8dbfc706a1ec3c8d1632ab688d3f70dfd89d830261dc7391dd41c2 WHIRLPOOL 8e6dfb4e1700a07e3e3207b67afaddc5d6aa6fd84db9b3e76bd9ff54f682740fed01070e5860bb5378d50903d5777b55dff88eb3444d45bdd63dba657889393d
-DIST xen-security-patches-9.tar.gz 9793 SHA256 2167d7bc2a631cf13d5b49c9577dbc8d128517e8ecbf90ef85c38f52ab3187aa SHA512 42f4997f35cc06333584a9a3c65366493094b60a6c67928b6165f3fb7d35d3a8f9dc0c3eadd4522de0d99bcc8511afba1d5e543396399b37983eb547abedca44 WHIRLPOOL 8abb68b4ac10fbc2b590c8a29cd2474d5392d3958542dad7f21ba4ad51c7541bb1686ed2629323e214c3e72b0de7212f25a4681f653d4179404c9f4c53e3d83a
-DIST xen-upstream-patches-0.tar.gz 2297 SHA256 bf21272ad029391d30bf31896efcadc75267538f6c7de5d239453f19659d58ee SHA512 3f5d60aaebd181bddab4dd02e0064de2f75672f44a687a7331fa40e81d56763fea84504081a449d11403b21ad0ba2dac075f0b1796809ef8d16e244f6be99e3d WHIRLPOOL 4ebe79c8f2ea1c45e88e59941e477ed5639dbca3fe95c9a67e07afb0f4b6fb8b7fea8e58422d7c8f906299e4f37c14b4db15200997e5a92b647df98fa93e10c7
diff --git a/app-emulation/xen-tools/xen-tools-4.6.0-r10.ebuild b/app-emulation/xen-tools/xen-tools-4.6.0-r10.ebuild
deleted file mode 100644 (file)
index 8e879dc..0000000
+++ /dev/null
@@ -1,469 +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 ~x86"
-       UPSTREAM_VER=0
-       SECURITY_VER=7
-       # vars set to reflect https://dev.gentoo.org/~idella4/
-       # first instance of UPS_VER (usptream ver)
-       UPS_VER=0
-       SEC_VER=10
-       QEMU_VER=0
-       # xen-tools's gentoo patches tarball
-       GENTOO_VER=4
-       # xen-tools's gentoo patches version which apply to this specific ebuild
-       GENTOO_GPV=0
-       # xen-tools ovmf's patches
-       OVMF_VER=1
-
-       SEABIOS_VER=1.8.2
-       OVMF_PV=20150629
-
-       [[ -n ${UPSTREAM_VER} ]] && \
-               UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz
-               https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-upstream-patches-${UPS_VER}.tar.gz"
-       [[ -n ${SECURITY_VER} ]] && \
-               SECURITY_PATCHSET_URI="https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz
-               https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-security-patches-${SEC_VER}.tar.gz
-               https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-qemu-patches-${QEMU_VER}.tar.gz"
-       [[ -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 +pam +qemu-traditional 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-single-r1_pkg_setup
-       export "CONFIG_LOMOUNT=y"
-
-       #bug 522642, disable compile tools/tests
-       export "CONFIG_TESTS=n"
-
-       if has_version dev-libs/libgcrypt:0; then
-               export "CONFIG_GCRYPT=y"
-       fi
-
-       if [[ -z ${XEN_TARGET_ARCH} ]] ; then
-               if use x86 && use amd64; then
-                       die "Confusion! Both x86 and amd64 are set in your use flags!"
-               elif use x86; then
-                       export XEN_TARGET_ARCH="x86_32"
-               elif use amd64 ; then
-                       export XEN_TARGET_ARCH="x86_64"
-               elif use arm; then
-                       export XEN_TARGET_ARCH="arm32"
-               elif use arm64; then
-                       export XEN_TARGET_ARCH="arm64"
-               else
-                       die "Unsupported architecture!"
-               fi
-       fi
-}
-
-src_prepare() {
-       # Upstream's patchset
-       if [[ -n ${UPSTREAM_VER} ]]; then
-               einfo "Try to apply Xen Upstream patch set"
-               EPATCH_SUFFIX="patch" \
-               EPATCH_FORCE="yes" \
-               EPATCH_OPTS="-p1" \
-                       epatch "${WORKDIR}"/patches-upstream \
-                               "${WORKDIR}"/libexec.patch
-       fi
-
-       # Security patchset
-       if [[ -n ${SECURITY_VER} ]]; then
-               einfo "Try to apply Xen Security patch set"
-               source "${WORKDIR}"/patches-security/${PV}.conf
-               # 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"
-               for i in ${XEN_SECURITY_MAIN}; do
-                       epatch "${WORKDIR}"/patches-security/xen/$i
-               done
-
-               for i in "${WORKDIR}"/xen-sec/xsa*.patch; do
-                       epatch $i
-               done
-
-               # 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
-               for i in "${WORKDIR}"/qemu-patches/qemut/xsa*.patch; do
-                       epatch $i
-               done
-               popd > /dev/null
-
-               # 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
-               for i in "${WORKDIR}"/qemu-patches/qemuu/xsa*.patch; do
-                       epatch $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 [[ -n ${OVMF_VER} ]] && use ovmf; 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
-               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
-
-       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.0-r11.ebuild b/app-emulation/xen-tools/xen-tools-4.6.0-r11.ebuild
deleted file mode 100644 (file)
index 0ce7a84..0000000
+++ /dev/null
@@ -1,469 +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 ~x86"
-       UPSTREAM_VER=0
-       SECURITY_VER=7
-       # vars set to reflect https://dev.gentoo.org/~idella4/
-       # first instance of UPS_VER (usptream ver)
-       UPS_VER=0
-       SEC_VER=10
-       QEMU_VER=3
-       # xen-tools's gentoo patches tarball
-       GENTOO_VER=4
-       # xen-tools's gentoo patches version which apply to this specific ebuild
-       GENTOO_GPV=0
-       # xen-tools ovmf's patches
-       OVMF_VER=1
-
-       SEABIOS_VER=1.8.2
-       OVMF_PV=20150629
-
-       [[ -n ${UPSTREAM_VER} ]] && \
-               UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz
-               https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-upstream-patches-${UPS_VER}.tar.gz"
-       [[ -n ${SECURITY_VER} ]] && \
-               SECURITY_PATCHSET_URI="https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz
-               https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-security-patches-${SEC_VER}.tar.gz
-               https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-qemu-patches-${QEMU_VER}.tar.gz"
-       [[ -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 +pam +qemu-traditional 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-single-r1_pkg_setup
-       export "CONFIG_LOMOUNT=y"
-
-       #bug 522642, disable compile tools/tests
-       export "CONFIG_TESTS=n"
-
-       if has_version dev-libs/libgcrypt:0; then
-               export "CONFIG_GCRYPT=y"
-       fi
-
-       if [[ -z ${XEN_TARGET_ARCH} ]] ; then
-               if use x86 && use amd64; then
-                       die "Confusion! Both x86 and amd64 are set in your use flags!"
-               elif use x86; then
-                       export XEN_TARGET_ARCH="x86_32"
-               elif use amd64 ; then
-                       export XEN_TARGET_ARCH="x86_64"
-               elif use arm; then
-                       export XEN_TARGET_ARCH="arm32"
-               elif use arm64; then
-                       export XEN_TARGET_ARCH="arm64"
-               else
-                       die "Unsupported architecture!"
-               fi
-       fi
-}
-
-src_prepare() {
-       # Upstream's patchset
-       if [[ -n ${UPSTREAM_VER} ]]; then
-               einfo "Try to apply Xen Upstream patch set"
-               EPATCH_SUFFIX="patch" \
-               EPATCH_FORCE="yes" \
-               EPATCH_OPTS="-p1" \
-                       epatch "${WORKDIR}"/patches-upstream \
-                               "${WORKDIR}"/libexec.patch
-       fi
-
-       # Security patchset
-       if [[ -n ${SECURITY_VER} ]]; then
-               einfo "Try to apply Xen Security patch set"
-               source "${WORKDIR}"/patches-security/${PV}.conf
-               # 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"
-               for i in ${XEN_SECURITY_MAIN}; do
-                       epatch "${WORKDIR}"/patches-security/xen/$i
-               done
-
-               for i in "${WORKDIR}"/xen-sec/xsa*.patch; do
-                       epatch $i
-               done
-
-               # 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
-               for i in "${WORKDIR}"/qemu-patches/qemut/xsa*.patch; do
-                       epatch $i
-               done
-               popd > /dev/null
-
-               # 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
-               for i in "${WORKDIR}"/qemu-patches/qemuu/xsa*.patch; do
-                       epatch $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 [[ -n ${OVMF_VER} ]] && use ovmf; 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
-               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
-
-       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.0-r9.ebuild b/app-emulation/xen-tools/xen-tools-4.6.0-r9.ebuild
deleted file mode 100644 (file)
index 92486da..0000000
+++ /dev/null
@@ -1,469 +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=0
-       SECURITY_VER=7
-       # vars set to reflect https://dev.gentoo.org/~idella4/
-       # first instance of UPS_VER (usptream ver)
-       UPS_VER=0
-       SEC_VER=9
-       QEMU_VER=0
-       # xen-tools's gentoo patches tarball
-       GENTOO_VER=4
-       # xen-tools's gentoo patches version which apply to this specific ebuild
-       GENTOO_GPV=0
-       # xen-tools ovmf's patches
-       OVMF_VER=1
-
-       SEABIOS_VER=1.8.2
-       OVMF_PV=20150629
-
-       [[ -n ${UPSTREAM_VER} ]] && \
-               UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz
-               https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-upstream-patches-${UPS_VER}.tar.gz"
-       [[ -n ${SECURITY_VER} ]] && \
-               SECURITY_PATCHSET_URI="https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz
-               https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-security-patches-${SEC_VER}.tar.gz
-               https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-qemu-patches-${QEMU_VER}.tar.gz"
-       [[ -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 +pam +qemu-traditional 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-single-r1_pkg_setup
-       export "CONFIG_LOMOUNT=y"
-
-       #bug 522642, disable compile tools/tests
-       export "CONFIG_TESTS=n"
-
-       if has_version dev-libs/libgcrypt:0; then
-               export "CONFIG_GCRYPT=y"
-       fi
-
-       if [[ -z ${XEN_TARGET_ARCH} ]] ; then
-               if use x86 && use amd64; then
-                       die "Confusion! Both x86 and amd64 are set in your use flags!"
-               elif use x86; then
-                       export XEN_TARGET_ARCH="x86_32"
-               elif use amd64 ; then
-                       export XEN_TARGET_ARCH="x86_64"
-               elif use arm; then
-                       export XEN_TARGET_ARCH="arm32"
-               elif use arm64; then
-                       export XEN_TARGET_ARCH="arm64"
-               else
-                       die "Unsupported architecture!"
-               fi
-       fi
-}
-
-src_prepare() {
-       # Upstream's patchset
-       if [[ -n ${UPSTREAM_VER} ]]; then
-               einfo "Try to apply Xen Upstream patch set"
-               EPATCH_SUFFIX="patch" \
-               EPATCH_FORCE="yes" \
-               EPATCH_OPTS="-p1" \
-                       epatch "${WORKDIR}"/patches-upstream \
-                               "${WORKDIR}"/libexec.patch
-       fi
-
-       # Security patchset
-       if [[ -n ${SECURITY_VER} ]]; then
-               einfo "Try to apply Xen Security patch set"
-               source "${WORKDIR}"/patches-security/${PV}.conf
-               # 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"
-               for i in ${XEN_SECURITY_MAIN}; do
-                       epatch "${WORKDIR}"/patches-security/xen/$i
-               done
-
-               for i in "${WORKDIR}"/xen-sec/xsa*.patch; do
-                       epatch $i
-               done
-
-               # 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
-               for i in "${WORKDIR}"/qemu-patches/qemut/xsa*.patch; do
-                       epatch $i
-               done
-               popd > /dev/null
-
-               # 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
-               for i in "${WORKDIR}"/qemu-patches/qemuu/xsa*.patch; do
-                       epatch $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 [[ -n ${OVMF_VER} ]] && use ovmf; 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
-               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
-
-       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.1-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.6.1-r1.ebuild
deleted file mode 100644 (file)
index ecf2593..0000000
+++ /dev/null
@@ -1,474 +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=
-       # vars set to reflect https://dev.gentoo.org/~idella4/
-       # first instance of UPS_VER (usptream ver)
-       UPS_VER=
-       SEC_VER=
-       QEMU_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
-               https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-upstream-patches-${UPS_VER}.tar.gz"
-       [[ -n ${SECURITY_VER} ]] && \
-               SECURITY_PATCHSET_URI="https://dev.gentoo.org/~idella4/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.gz
-               https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-qemu-patches-${QEMU_VER}.tar.gz"
-       [[ -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-single-r1_pkg_setup
-       export "CONFIG_LOMOUNT=y"
-
-       #bug 522642, disable compile tools/tests
-       export "CONFIG_TESTS=n"
-
-       if has_version dev-libs/libgcrypt:0; then
-               export "CONFIG_GCRYPT=y"
-       fi
-
-       if [[ -z ${XEN_TARGET_ARCH} ]] ; then
-               if use x86 && use amd64; then
-                       die "Confusion! Both x86 and amd64 are set in your use flags!"
-               elif use x86; then
-                       export XEN_TARGET_ARCH="x86_32"
-               elif use amd64 ; then
-                       export XEN_TARGET_ARCH="x86_64"
-               elif use arm; then
-                       export XEN_TARGET_ARCH="arm32"
-               elif use arm64; then
-                       export XEN_TARGET_ARCH="arm64"
-               else
-                       die "Unsupported architecture!"
-               fi
-       fi
-}
-
-src_prepare() {
-       # Upstream's patchset
-       if [[ -n ${UPSTREAM_VER} ]]; then
-               einfo "Try to apply Xen Upstream patch set"
-               EPATCH_SUFFIX="patch" \
-               EPATCH_FORCE="yes" \
-               EPATCH_OPTS="-p1" \
-                       epatch "${WORKDIR}"/patches-upstream \
-                               "${WORKDIR}"/libexec.patch
-       fi
-
-       # Security patchset
-       if [[ -n ${SECURITY_VER} ]]; then
-               einfo "Try to apply Xen Security patch set"
-               source "${WORKDIR}"/patches-security/${PV}.conf
-               # 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"
-               for i in ${XEN_SECURITY_MAIN}; do
-                       epatch "${WORKDIR}"/patches-security/xen/$i
-               done
-
-               for i in "${WORKDIR}"/xen-sec/xsa*.patch; do
-                       epatch $i
-               done
-
-               # 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
-               for i in "${WORKDIR}"/qemu-patches/qemut/xsa*.patch; do
-                       epatch $i
-               done
-               popd > /dev/null
-
-               # 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
-               for i in "${WORKDIR}"/qemu-patches/qemuu/xsa*.patch; do
-                       epatch $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.1-r2.ebuild b/app-emulation/xen-tools/xen-tools-4.6.1-r2.ebuild
deleted file mode 100644 (file)
index 1d23c9f..0000000
+++ /dev/null
@@ -1,449 +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=2
-       # vars set to reflect https://dev.gentoo.org/~idella4/
-       # first instance of UPS_VER (usptream ver)
-       UPS_VER=
-       SEC_VER=
-       QEMU_VER=2
-       # 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
-               https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-upstream-patches-${UPS_VER}.tar.gz"
-       [[ -n ${SECURITY_VER} ]] && \
-               SECURITY_PATCHSET_URI="https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-qemu-patches-${QEMU_VER}.tar.gz"
-#              SECURITY_PATCHSET_URI="https://dev.gentoo.org/~idella4/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.gz
-       [[ -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-single-r1_pkg_setup
-       export "CONFIG_LOMOUNT=y"
-
-       #bug 522642, disable compile tools/tests
-       export "CONFIG_TESTS=n"
-
-       if has_version dev-libs/libgcrypt:0; then
-               export "CONFIG_GCRYPT=y"
-       fi
-
-       if [[ -z ${XEN_TARGET_ARCH} ]] ; then
-               if use x86 && use amd64; then
-                       die "Confusion! Both x86 and amd64 are set in your use flags!"
-               elif use x86; then
-                       export XEN_TARGET_ARCH="x86_32"
-               elif use amd64 ; then
-                       export XEN_TARGET_ARCH="x86_64"
-               elif use arm; then
-                       export XEN_TARGET_ARCH="arm32"
-               elif use arm64; then
-                       export XEN_TARGET_ARCH="arm64"
-               else
-                       die "Unsupported architecture!"
-               fi
-       fi
-}
-
-src_prepare() {
-       # Upstream's patchset
-       if [[ -n ${UPSTREAM_VER} ]]; then
-               einfo "Try to apply Xen Upstream patch set"
-               EPATCH_SUFFIX="patch" \
-               EPATCH_FORCE="yes" \
-               EPATCH_OPTS="-p1" \
-                       epatch "${WORKDIR}"/patches-upstream \
-                               "${WORKDIR}"/libexec.patch
-       fi
-
-       # Security patchset
-       if [[ -n ${QEMU_VER} ]]; then
-               # 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
-               for i in "${WORKDIR}"/qemu-patches/qemuu/xsa*.patch; do
-                       epatch $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.1-r3.ebuild b/app-emulation/xen-tools/xen-tools-4.6.1-r3.ebuild
deleted file mode 100644 (file)
index 1a0afb5..0000000
+++ /dev/null
@@ -1,469 +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=01
-       # vars set to reflect https://dev.gentoo.org/~idella4/
-       # first instance of UPS_VER (usptream ver)
-       UPS_VER=
-       SEC_VER=
-       QEMU_VER=4
-       # 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
-               https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-upstream-patches-${UPS_VER}.tar.gz"
-       [[ -n ${SECURITY_VER} ]] && \
-               SECURITY_PATCHSET_URI="https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-qemu-patches-${QEMU_VER}.tar.gz
-               https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.gz"
-       [[ -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 \
-                               "${WORKDIR}"/libexec.patch
-       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"
-
-               for i in "${WORKDIR}"/xen-sec/xsa*.patch; do
-                       epatch $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
-
-               for i in "${WORKDIR}"/qemu-patches/qemuu/xsa*.patch; do
-                       epatch $i
-               done
-               popd > /dev/null
-
-               # apply qemu-traditional patches
-               pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
-
-               for i in "${WORKDIR}"/qemu-patches/qemut/*.patch; do
-                       epatch $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.1-r4.ebuild b/app-emulation/xen-tools/xen-tools-4.6.1-r4.ebuild
deleted file mode 100644 (file)
index 0b7d40f..0000000
+++ /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=0
-       SECURITY_VER=12
-       # 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.1.ebuild b/app-emulation/xen-tools/xen-tools-4.6.1.ebuild
deleted file mode 100644 (file)
index a63bbda..0000000
+++ /dev/null
@@ -1,475 +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=
-       # vars set to reflect https://dev.gentoo.org/~idella4/
-       # first instance of UPS_VER (usptream ver)
-       UPS_VER=
-       SEC_VER=
-       QEMU_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
-               https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-upstream-patches-${UPS_VER}.tar.gz"
-       [[ -n ${SECURITY_VER} ]] && \
-               SECURITY_PATCHSET_URI="https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz
-               https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-security-patches-${SEC_VER}.tar.gz
-               https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-qemu-patches-${QEMU_VER}.tar.gz"
-       [[ -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-single-r1_pkg_setup
-       export "CONFIG_LOMOUNT=y"
-
-       #bug 522642, disable compile tools/tests
-       export "CONFIG_TESTS=n"
-
-       if has_version dev-libs/libgcrypt:0; then
-               export "CONFIG_GCRYPT=y"
-       fi
-
-       if [[ -z ${XEN_TARGET_ARCH} ]] ; then
-               if use x86 && use amd64; then
-                       die "Confusion! Both x86 and amd64 are set in your use flags!"
-               elif use x86; then
-                       export XEN_TARGET_ARCH="x86_32"
-               elif use amd64 ; then
-                       export XEN_TARGET_ARCH="x86_64"
-               elif use arm; then
-                       export XEN_TARGET_ARCH="arm32"
-               elif use arm64; then
-                       export XEN_TARGET_ARCH="arm64"
-               else
-                       die "Unsupported architecture!"
-               fi
-       fi
-}
-
-src_prepare() {
-       # Upstream's patchset
-       if [[ -n ${UPSTREAM_VER} ]]; then
-               einfo "Try to apply Xen Upstream patch set"
-               EPATCH_SUFFIX="patch" \
-               EPATCH_FORCE="yes" \
-               EPATCH_OPTS="-p1" \
-                       epatch "${WORKDIR}"/patches-upstream \
-                               "${WORKDIR}"/libexec.patch
-       fi
-
-       # Security patchset
-       if [[ -n ${SECURITY_VER} ]]; then
-               einfo "Try to apply Xen Security patch set"
-               source "${WORKDIR}"/patches-security/${PV}.conf
-               # 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"
-               for i in ${XEN_SECURITY_MAIN}; do
-                       epatch "${WORKDIR}"/patches-security/xen/$i
-               done
-
-               for i in "${WORKDIR}"/xen-sec/xsa*.patch; do
-                       epatch $i
-               done
-
-               # 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
-               for i in "${WORKDIR}"/qemu-patches/qemut/xsa*.patch; do
-                       epatch $i
-               done
-               popd > /dev/null
-
-               # 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
-               for i in "${WORKDIR}"/qemu-patches/qemuu/xsa*.patch; do
-                       epatch $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.3.ebuild b/app-emulation/xen-tools/xen-tools-4.6.3.ebuild
deleted file mode 100644 (file)
index 62d7661..0000000
+++ /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.ebuild b/app-emulation/xen-tools/xen-tools-4.7.0.ebuild
deleted file mode 100644 (file)
index 62d7661..0000000
+++ /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
-}