commit:     0dc0f01fedc4c51ea1b7b9ebfbeec16ac4439cbd
Author:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 29 07:55:34 2015 +0000
Commit:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Sun Nov 29 07:56:50 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dc0f01f

app-emulation/xen-tools: clean old vns.: 4.5.1-r3, 4.6.0-r1

Package-Manager: portage-2.2.24

 app-emulation/xen-tools/Manifest                  |   2 -
 app-emulation/xen-tools/xen-tools-4.5.1-r3.ebuild | 458 ----------------------
 app-emulation/xen-tools/xen-tools-4.6.0-r1.ebuild | 458 ----------------------
 3 files changed, 918 deletions(-)

diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index e0d8fa6..ae27247 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -5,8 +5,6 @@ DIST seabios-1.8.2.tar.gz 538497 SHA256 
f59479307fdae840de398b75aacb2333c8eba24a
 DIST xen-4.2.5-upstream-patches-10.tar.xz 41428 SHA256 
b29ce85b049420838c3386b67184f4ba56794846d056837fa780ae89a80b40d0 SHA512 
9e8046e27506d864e2d69728897cbba3eea1dd5ca748a3febb722901c5a67cca2ab49bb420071292538bd0345023fa337eb2d176b9ca05ca6bce47562f6710ec
 WHIRLPOOL 
29e534ef6b951cf220a3a9476d1f76ac344bfc5c74998f2b472ec83cbe4781746298272e3c1fe8661a838cbc7d734d2730de6a1e9985b8a60f40c98f54449e2a
 DIST xen-4.2.5-upstream-patches-9.tar.xz 23208 SHA256 
2206e9a8aeeed207abbae995c5d2baa14d5f0da4120ae44f2de733ecf7ea5af1 SHA512 
8a2edaba48002449a521edf2ae078ffe1b3db4f491a85b063886a147a0be3ec7fdb819ce84c90cdae80ed34c10ab2d637506700be10052a67be6ef128fa40fb1
 WHIRLPOOL 
037820e0fad60d1f7ed054efa797585c992d08f1ffd533705c515ad289f8cdddc72b97f2a3d75ebd683c6bb6988d7285452b4f3cebbe9a879f701156e387ff3b
 DIST xen-4.2.5.tar.gz 15671925 SHA256 
3cf440866315e8085050eb0586f0447b6b47a08dbed6a72226bf5ed5d89ec567 SHA512 
42c0fc241952fc55fc44480fb6752b004b54ae40e946159ec047adf229b65cbfbd810271d01b064ad8fdbddb73c640dcdcb6bc19f91e8968829889c129920dac
 WHIRLPOOL 
762a91c0111892b33e6bd3e7f7714709b04697ad7c2b0919fef6cc9570a343a77fd5a2b82833e75dac9d12d4e41acdcf0743b0d593595910ddd326f5cd721368
-DIST xen-4.5.1-upstream-patches-0.tar.xz 18236 SHA256 
95910023cb99f11b4df6d57d82000bbd67714d4ed0700e152619c5b82c1bc6e5 SHA512 
531e5bbe6b9920a58361f11bb1bb6df65ebaf01e3af13f9aca018e8512727d950009257dfc9b3d0b0f847968da499cf9423716de8a04869cec6f92f5274462e2
 WHIRLPOOL 
3e6dda862d1bbe736b85422117148c3db91a308a58eb1476e27bbb7355ea7793269cdfc489697c9e5eea5f0ac5319df5c88f2707b10c9a96b8142927a4169819
-DIST xen-4.5.1.tar.gz 18410400 SHA256 
668c11d4fca67ac44329e369f810356eacd37b28d28fb96e66aac77f3c5e1371 SHA512 
9436243e26bc64bc836a179abdc3a6b1b6fa9d3f2170453092c18be71fa62e18cd4465a9154c0f28a7ac8d69d08361ba1defef240a51197f058c012c3855ba04
 WHIRLPOOL 
71d8559f86683dd9fb3eb09d3f602de227f281fbd3c8cc258bfdb67c425d9e7c4d21cb0284c123e4263262c1b821fea6d28109861ce60d627f6426d352808d99
 DIST xen-4.5.2.tar.gz 18416220 SHA256 
4c9e5dac4eea484974e9f76da2756c8e0973b4e884d28d37e955df9ebf00e7e8 SHA512 
e0ce01a5356c254bfde48fae0b0e005c42c1615a7ccf4c1ba7dcf90784777b53995e9a9ae4575e3f19ef341014b34cb8c06e39d68be359f7fd69830501a144dd
 WHIRLPOOL 
b50ce28e58d8419915f7f85de7ab23128719fa07c54f28165c4ba864ffe57230230fa7cb61dd2ed7608b8bc178a072124aedc30c61a45fb8b745fc616715219b
 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

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

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

Reply via email to