commit:     26163620744c671756183eafab972f935dc19be1
Author:     Tomáš Mózes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Mon Jul 12 10:16:50 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Jul 15 05:30:42 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26163620

app-emulation/xen-tools: drop vulnerable

Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-emulation/xen-tools/Manifest                   |   4 -
 app-emulation/xen-tools/files/gentoo-patches.conf  |  10 -
 app-emulation/xen-tools/xen-tools-4.13.3-r1.ebuild | 520 ---------------------
 3 files changed, 534 deletions(-)

diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 8b92236e06b..94d1bf72d56 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -2,14 +2,10 @@ DIST OpenSSL_1_1_1g.tar.gz 9975550 BLAKE2B 
22efa4ffe5d56a861bc4e2e1bc9a558e79265
 DIST berkeley-softfloat-b64af41c3276f97f0e181920400ee056b9c88037.tar.gz 148741 
BLAKE2B 
72014022926b636147e202d74c42df2ce9cfed00b91c275d5b2e0afbc5c68765445cbe7ac6389d7c2512bd1d45b0e16e999936552d09bbc733ab66c92968bd31
 SHA512 
8420c29faa7ff57e06d6758b03e81ca0630c59946bc031e8611f1449e23634cf901b502161f2c1423c0cff949b5481445e36a3aa53dc885b61ca2c673b3ba567
 DIST brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz 23855739 BLAKE2B 
7406ec5b29ac66afbcd7c1376bb3208f298d19b6592b2869c52173aa64947d58bd443f9a61c67deaf046be910a0e31c0b843e5508e97e0e1f5e7bce100d86904
 SHA512 
df8e90562c4fd7f0e787949df6bc4f5a165b39bd333f442d27874fe65640fbba268f9350d7113e6761a5acceb66d78e75f1a296e5a89b94574edf28109cdc812
 DIST edk2-06dc822d045c2bb42e497487935485302486e151.tar.gz 13192042 BLAKE2B 
81afa7fd5f6f14fff35baa3c6c64583fa21c7b793ed847a3362fd05a926bb4402db911f9f78f4ffd76a6de9b815171dfa245ae41afac3b022cd108597e8c1ac3
 SHA512 
a032a1496db7ddc32a7d6d1a7d5fe4122ab43b13547ec019855166d785f162268ad82ceb3c41efafe1687e73fc72599ee6852741652451e1cb329fd655c69b6c
-DIST ipxe-git-1dd56dbd11082fb622c2ed21cfaced4f47d798a6.tar.gz 3810726 BLAKE2B 
b95266ec7fcee5c27065ba999b023ded9eb42a3690555e626911493f1dc995927fa67071bdc6432b3995df82134f8c49ea0d72eaf407f455dd1e2675d5b8d844
 SHA512 
8120696ba6d79fd9189664deed9b0489825d8d1edf7b931023b3979b7b9f82248e5b808c4517036cd40a85442ddf51a8dcad3b05d7f3c3cc6650654d53da4050
 DIST ipxe-git-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz 3931642 BLAKE2B 
bf0b5d9ea1d44803bc5c4aa0bf9188636e292b226ab759f32e3c2bfa3f80dd3f546526b9a11c1f67193793ede5309bfa67bdce80aba62ccca54597dc6e7e4ba4
 SHA512 
0a63f83c9135d05c6bfe7c4d12da3ff76271e35305a4d5654bd5aefa9ee59f5363546c65820c42133deb0fb5a0a0bcaa9b1c48396f9f996acea0d492a5f03f33
-DIST seabios-1.12.0.tar.gz 613542 BLAKE2B 
f145c2db716996bfa9e5c014086ccfaa8ae96ebc158f34303b122b7bf209408c567665d8691364df8d8e886f63e0e72a3f3cd319dfa86ef581023201b5d94e53
 SHA512 
e52c5363e5bb37b5286e55545aa06bd126218f9d0e3a06ac2e189de68fe3de3256c11ca1bb13357a9c384d7e3af6284083ff3aa587688b5de04ef11b97bdfa27
 DIST seabios-1.14.0.tar.gz 628985 BLAKE2B 
cc1126925dab1551a655680d20d06ebf28c12c386500d1ee4df9e1a99403b4c5bc6a66c2cc5ef58b4c3d6d7226f35007506a6a1855c2cf2742469dcb7aba05bb
 SHA512 
215c42f59425f8abd062be7b11fc0e39c977cee5001a2381551b0f851ac337d0dd53c065267e6dee0e710ffd700fa635f9007b89da8dfce0f47122c984ee8146
-DIST xen-4.13.3.tar.gz 39044539 BLAKE2B 
5d0e57c76e12e1b86b78bbf561e947d70b9569a24412617a640346d2358b141a2741e7a3be454df52d198ad63e58b1519288de62330417c70e72445703f3fac2
 SHA512 
622127d824b9c49b57282a887fb404e0bad05ff60bccade82e4e0e9b5ad975ff9aa1fba83392e6d8379e9a15340e8ae9785c0913eb11027816e4600432eea6b6
 DIST xen-4.14.2-upstream-patches-0.tar.xz 23304 BLAKE2B 
954e0a49e5c3ec122aefe52afe328f440b8a4c8db966e0fa91e0b6d6cb3c0462b75fb99b3e7392811bd2e680cd7945e8a4d68317245fd42fdf0ad6cab33fbc68
 SHA512 
64d243f0c8acfec87812e4d78e3d8b24a86315824853f4f3b17122b7119425d180650695bc12e1a30f5b30c6ef684be7c08b2bc677ca2f0668d0335d92e2bf78
 DIST xen-4.14.2.tar.gz 39973157 BLAKE2B 
db5d3570f79e0fd97872f5e5dd57a4eb39e005728387bfef3b51fabe1c693cfd8108d09b1026f5a5a7eb79de71be6f4af36d252f7e0b35a65a1567b7949e3e29
 SHA512 
83c9333b70dbee3e29c6bf08e5ad030676e6c4a32b976f3f5e6a8f8d0dd9e4898bac88dd8e1c9d2ad3509cebb5d212e1745f9392a469d7afeb841d79801ccf39
 DIST xen-4.15.0-upstream-patches-1.tar.xz 35180 BLAKE2B 
eb3b2a44b717a04daa4a2f158040cce78b42cba5a72c437d7b2f8f1237b808f6f13c2140d82e95056818db6c0eb706ebd7dead822a6a4e689e5d5e7c83523fdb
 SHA512 
a7cfe2dbc82b15c48fa781a77b3ca1622fc2feac3874bf17cf56e82be46e9817913f94992e0e1a1cd2be2e719d4abb9a15744c8a1017e30c0d5c01d7db64dbb5
 DIST xen-4.15.0.tar.gz 40785399 BLAKE2B 
8b0530f5516c39656506f4bb705952da0555a8ab7f47323473b171caeb7692f3107e9d94f13171d40576600064589eed35f4d210af02db4cc4706dd4fc202100
 SHA512 
93683b8a97387ca5f003c635a11d163e61c87dbdc9a03081f9155fe87b49f1dfa74ce243fcd5e04dc009353a36e2375b786f1ebde828b5951a094cd64197b4c7
-DIST xen-gentoo-patches-21.tar.xz 18280 BLAKE2B 
95446da72fc16cb82e4e51df8796c64db05a30894a351a98dbd6700ce354c34956ca09a1af98125a4e56c337936e8fae296d806519b8afa23a82b078aa0db8f1
 SHA512 
3cffac162606a09b10b47dca604f167897e6ac8d153411d3464ef29a7a4d46ac5b92340884cb21279cb2d053b131f1ea5cb2111e3e9a21b3298b5ab3320ee34d
 DIST xen-gentoo-patches-23.tar.xz 20536 BLAKE2B 
0064f79f8794a21ab13047a4ee296e37efa616e16ca6cd65b31fdafeb458fd9b80f0443758343c8328b1901d7169618346becfe75f16dcaeff08fc975f1d08d5
 SHA512 
09248e17ff7865feb2a505169d62ee5c8c60bd672fa8c4c7c4e3a2e4af58bfad0379d37b395bab3e3393af8d53d882f56749dfeb560edeea6b7ab56c902a3c49

diff --git a/app-emulation/xen-tools/files/gentoo-patches.conf 
b/app-emulation/xen-tools/files/gentoo-patches.conf
index 4b1aac4eae6..d8c6e67b10c 100644
--- a/app-emulation/xen-tools/files/gentoo-patches.conf
+++ b/app-emulation/xen-tools/files/gentoo-patches.conf
@@ -51,16 +51,6 @@ _gx056=" xen-tools-4.12.2-libxenstat-makefile.patch"
 # Fix building with gcc 10, bug #722930
 _gx060=" xen-tools-4.13.0-gcc10.patch"
 
-# xen-tools-4.13.3 patches set
-_gpv_xen_tools_4133_0="
-${_gx038}
-${_gx027}
-${_gx028} ${_gx029}
-${_gx037}
-${_gx053} ${_gx050} ${_gx051}
-${_gx054} ${_gx056}
-"
-
 # xen-tools-4.14.2 patches set
 _gpv_xen_tools_4142_0="
        xen-tools-4.12.0-gcc8.patch

diff --git a/app-emulation/xen-tools/xen-tools-4.13.3-r1.ebuild 
b/app-emulation/xen-tools/xen-tools-4.13.3-r1.ebuild
deleted file mode 100644
index 56e600d9a96..00000000000
--- a/app-emulation/xen-tools/xen-tools-4.13.3-r1.ebuild
+++ /dev/null
@@ -1,520 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE='ncurses,xml,threads(+)'
-
-inherit bash-completion-r1 flag-o-matic multilib python-single-r1 
toolchain-funcs
-
-MY_PV=${PV/_/-}
-
-if [[ ${PV} == *9999 ]]; then
-       inherit git-r3
-       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=21
-       # xen-tools's gentoo patches version which apply to this specific ebuild
-       GENTOO_GPV=0
-       # xen-tools ovmf's patches
-       OVMF_VER=
-
-       SEABIOS_VER="1.12.0"
-       EDK2_COMMIT="06dc822d045c2bb42e497487935485302486e151"
-       EDK2_OPENSSL_VERSION="1_1_1g"
-       EDK2_SOFTFLOAT_COMMIT="b64af41c3276f97f0e181920400ee056b9c88037"
-       EDK2_BROTLI_COMMIT="666c3280cc11dc433c303d79a83d4ffbdd12cc8d"
-       IPXE_COMMIT="1dd56dbd11082fb622c2ed21cfaced4f47d798a6"
-
-       [[ -n ${UPSTREAM_VER} ]] && \
-               
UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz
-               
https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${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
-               
https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${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
-               
https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${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="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz
-       https://www.seabios.org/downloads/seabios-${SEABIOS_VER}.tar.gz
-       ipxe? ( 
http://xenbits.xen.org/xen-extfiles/ipxe-git-${IPXE_COMMIT}.tar.gz )
-       ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz 
-> edk2-${EDK2_COMMIT}.tar.gz
-               
https://github.com/openssl/openssl/archive/OpenSSL_${EDK2_OPENSSL_VERSION}.tar.gz
-               
https://github.com/ucb-bar/berkeley-softfloat-3/archive/${EDK2_SOFTFLOAT_COMMIT}.tar.gz
 -> berkeley-softfloat-${EDK2_SOFTFLOAT_COMMIT}.tar.gz
-               
https://github.com/google/brotli/archive/${EDK2_BROTLI_COMMIT}.tar.gz -> 
brotli-${EDK2_BROTLI_COMMIT}.tar.gz
-               ${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="https://www.xenproject.org";
-DOCS=( README )
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-# 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 debug doc flask +hvm +ipxe ocaml ovmf +pam pygrub python +qemu 
+qemu-traditional +rombios screen sdl static-libs system-ipxe system-qemu 
system-seabios"
-
-REQUIRED_USE="
-       ${PYTHON_REQUIRED_USE}
-       ipxe? ( rombios )
-       ovmf? ( hvm )
-       pygrub? ( python )
-       rombios? ( hvm )
-       system-ipxe? ( rombios )
-       ?? ( ipxe system-ipxe )
-       ?? ( qemu system-qemu )"
-
-COMMON_DEPEND="
-       sys-apps/pciutils
-       dev-libs/lzo:2
-       dev-libs/glib:2
-       dev-libs/yajl
-       dev-libs/libaio
-       dev-libs/libgcrypt:0
-       sys-libs/zlib
-       ${PYTHON_DEPS}
-"
-
-DEPEND="${COMMON_DEPEND}
-       >=sys-kernel/linux-headers-4.11
-       $(python_gen_cond_dep '
-               dev-python/lxml[${PYTHON_MULTI_USEDEP}]
-               pam? ( dev-python/pypam[${PYTHON_MULTI_USEDEP}] )
-       ')
-       x86? ( sys-devel/dev86
-               system-ipxe? ( sys-firmware/ipxe[qemu] )
-               sys-power/iasl )
-       api? ( dev-libs/libxml2
-               net-misc/curl )
-
-       ovmf? (
-               !arm? ( !arm64? ( dev-lang/nasm ) )
-               $(python_gen_impl_dep sqlite)
-               )
-       !amd64? ( >=sys-apps/dtc-1.4.0 )
-       amd64? ( sys-power/iasl
-               system-seabios? ( sys-firmware/seabios )
-               system-ipxe? ( sys-firmware/ipxe[qemu] )
-               rombios? ( sys-devel/bin86 sys-devel/dev86 ) )
-       dev-lang/perl
-       app-misc/pax-utils
-       doc? (
-               app-text/ghostscript-gpl
-               app-text/pandoc
-               $(python_gen_cond_dep '
-                       dev-python/markdown[${PYTHON_MULTI_USEDEP}]
-               ')
-               dev-texlive/texlive-latexextra
-               media-gfx/transfig
-       )
-       hvm? ( x11-base/xorg-proto )
-       qemu? (
-               app-arch/snappy:=
-               x11-libs/pixman
-               sdl? (
-                       media-libs/libsdl[X]
-                       media-libs/libsdl2[X]
-               )
-       )
-       system-qemu? ( app-emulation/qemu[xen] )
-       ocaml? ( dev-ml/findlib
-               >=dev-lang/ocaml-4 )
-       python? ( >=dev-lang/swig-4.0.0 )"
-
-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/libexec/xen/boot/hvmloader
-       usr/share/qemu-xen/qemu/hppa-firmware.img
-       usr/share/qemu-xen/qemu/s390-ccw.img
-       usr/share/qemu-xen/qemu/u-boot.e500
-"
-
-QA_PREBUILT="
-       usr/libexec/xen/bin/elf2dmp
-       usr/libexec/xen/bin/ivshmem-client
-       usr/libexec/xen/bin/ivshmem-server
-       usr/libexec/xen/bin/qemu-edid
-       usr/libexec/xen/bin/qemu-img
-       usr/libexec/xen/bin/qemu-io
-       usr/libexec/xen/bin/qemu-keymap
-       usr/libexec/xen/bin/qemu-nbd
-       usr/libexec/xen/bin/qemu-pr-helper
-       usr/libexec/xen/bin/qemu-system-i386
-       usr/libexec/xen/bin/virtfs-proxy-helper
-       usr/libexec/xen/libexec/xen-bridge-helper
-       usr/share/qemu-xen/qemu/s390-ccw.img
-       usr/share/qemu-xen/qemu/s390-netboot.img
-       usr/share/qemu-xen/qemu/u-boot.e500
-"
-
-RESTRICT="test"
-
-pkg_setup() {
-       python_setup
-       export "CONFIG_LOMOUNT=y"
-
-       #bug 522642, disable compile tools/tests
-       export "CONFIG_TESTS=n"
-
-       if [[ -z ${XEN_TARGET_ARCH} ]] ; then
-               if use x86 && use amd64; then
-                       die "Confusion! Both x86 and amd64 are set in your use 
flags!"
-               elif use x86; then
-                       export XEN_TARGET_ARCH="x86_32"
-               elif use amd64 ; then
-                       export XEN_TARGET_ARCH="x86_64"
-               elif use arm; then
-                       export XEN_TARGET_ARCH="arm32"
-               elif use arm64; then
-                       export XEN_TARGET_ARCH="arm64"
-               else
-                       die "Unsupported architecture!"
-               fi
-       fi
-}
-
-src_prepare() {
-       local i
-
-       # Upstream's patchset
-       if [[ -n ${UPSTREAM_VER} ]]; then
-               einfo "Try to apply Xen Upstream patch set"
-               eapply "${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 || die
-
-               for i in ${XEN_SECURITY_MAIN}; do
-                       eapply "${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
-                       eapply "${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
-                       eapply "${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 || die
-               _gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
-               for i in ${!_gpv}; do
-                       eapply "${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}"/edk2-*/ > /dev/null
-                       eapply "${WORKDIR}"/patches-ovmf
-                       popd > /dev/null
-               fi
-               mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die
-               rm -r 
tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
-               rm -r 
tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3
 || die
-               rm -r 
tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die
-               rm -r 
tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli
 || die
-               mv ../openssl-OpenSSL_${EDK2_OPENSSL_VERSION} 
tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
-               mv ../berkeley-softfloat-3-${EDK2_SOFTFLOAT_COMMIT} 
tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3
 || die
-               cp -r ../brotli-${EDK2_BROTLI_COMMIT} 
tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die
-               cp -r ../brotli-${EDK2_BROTLI_COMMIT} 
tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli
 || die
-               cp tools/firmware/ovmf-makefile 
tools/firmware/ovmf-dir-remote/Makefile || die
-       fi
-
-       # ipxe
-       if use ipxe; then
-               cp "${DISTDIR}/ipxe-git-${IPXE_COMMIT}.tar.gz" 
tools/firmware/etherboot/_ipxe.tar.gz || die
-
-               # gcc 10
-               cp 
"${WORKDIR}/patches-gentoo/xen-tools-4.13.0-ipxe-gcc10.patch" 
tools/firmware/etherboot/patches/ipxe-gcc10.patch || die
-               echo ipxe-gcc10.patch >> 
tools/firmware/etherboot/patches/series || 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"
-
-       # drop flags
-       unset CFLAGS
-       unset LDFLAGS
-       unset ASFLAGS
-       unset CPPFLAGS
-
-       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 -i '/SUBDIRS-$(CONFIG_QEMU_XEN)/s/^/#/g' tools/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
-
-       # fix bashishm
-       sed -e '/Usage/s/\$//g' \
-               -i tools/hotplug/Linux/init.d/xendriverdomain.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
-
-       # 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
-
-       # disable capstone (Bug #673474)
-       sed -e "s:\$\$source/configure:\0 --disable-capstone:" \
-               -i tools/Makefile || die
-
-       # disable glusterfs
-       sed -e "s:\$\$source/configure:\0 --disable-glusterfs:" \
-               -i tools/Makefile || die
-
-       # disable jpeg automagic
-       sed -e "s:\$\$source/configure:\0 --disable-vnc-jpeg:" \
-               -i tools/Makefile || die
-
-       # disable png automagic
-       sed -e "s:\$\$source/configure:\0 --disable-vnc-png:" \
-               -i tools/Makefile || die
-
-       default
-}
-
-src_configure() {
-       local myconf="--prefix=${PREFIX}/usr \
-               --libdir=${PREFIX}/usr/$(get_libdir) \
-               --libexecdir=${PREFIX}/usr/libexec \
-               --localstatedir=${EPREFIX}/var \
-               --disable-werror \
-               --disable-xen \
-               --enable-tools \
-               --enable-docs \
-               $(use_enable api xenapi) \
-               $(use_enable ipxe) \
-               $(usex system-ipxe '--with-system-ipxe=/usr/share/ipxe' '') \
-               $(use_enable ocaml ocamltools) \
-               $(use_enable ovmf) \
-               $(use_enable pam) \
-               $(use_enable rombios) \
-               --with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
-               "
-
-       use system-seabios && myconf+=" 
--with-system-seabios=/usr/share/seabios/bios.bin"
-       use system-qemu && myconf+=" 
--with-system-qemu=/usr/bin/qemu-system-x86_64"
-       use amd64 && myconf+=" $(use_enable qemu-traditional)"
-       tc-ld-disable-gold # Bug 669570
-       econf ${myconf}
-}
-
-src_compile() {
-       local myopt
-       use debug && myopt="${myopt} debug=y"
-       use python && myopt="${myopt} XENSTAT_PYTHON_BINDINGS=y"
-
-       if test-flag-CC -fno-strict-overflow; then
-               append-flags -fno-strict-overflow
-       fi
-
-       emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" 
RANLIB="$(tc-getRANLIB)" build-tools ${myopt}
-
-       if use doc; then
-               emake -C docs build
-       else
-               emake -C docs man-pages
-       fi
-}
-
-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
-
-       # Created at runtime
-       rm -rv "${ED}/var/run" || die
-
-       # 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
-               dodoc -r docs/{pdf,txt}
-       else
-               emake -C docs DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" 
install-man-pages # Bug 668032
-       fi
-       dodoc ${DOCS[@]}
-
-       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-r1 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
-       newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog
-
-       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
-
-       keepdir /var/lib/xen/dump
-       keepdir /var/lib/xen/xenpaging
-       keepdir /var/lib/xenstored
-       keepdir /var/log/xen
-
-       if use python; then
-               python_domodule 
"${S}/tools/xenstat/libxenstat/bindings/swig/python/xenstat.py"
-               python_domodule 
"${S}/tools/xenstat/libxenstat/bindings/swig/python/_xenstat.so"
-       fi
-
-       python_optimize
-}
-
-pkg_postinst() {
-       elog "Official Xen Guide and the offical wiki page:"
-       elog "https://wiki.gentoo.org/wiki/Xen";
-       elog "https://wiki.xen.org/wiki/Main_Page";
-       elog ""
-       elog "Recommended to utilise the xencommons script to config system at 
boot"
-       elog "Add by use of rc-update on completion of the install"
-
-       if ! use hvm; then
-               echo
-               elog "HVM (VT-x and AMD-V) support has been disabled. If you 
need hvm"
-               elog "support enable the hvm use flag."
-               elog "An x86 or amd64 system is required to build HVM support."
-       fi
-
-       if use qemu; then
-               elog "The qemu-bridge-helper is renamed to the 
xen-bridge-helper in the in source"
-               elog "build of qemu.  This allows for app-emulation/qemu to be 
emerged concurrently"
-               elog "with the qemu capable xen.  It is up to the user to 
distinguish between and utilise"
-               elog "the qemu-bridge-helper and the xen-bridge-helper. File 
bugs of any issues that arise"
-       fi
-}

Reply via email to