commit:     b48c2d2662337ed28190d32ad3898686959dccd5
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  4 10:22:01 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue Jul  5 16:20:56 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b48c2d26

app-emulation/xen-tools: add 4.16.1, 4.16.2_pre1

This introduces a new approach to handle Xen patching and versioning. 
SECURITY_VER and
OVMF_VER where dropped as those have not been used in a while. We now
consume the upstream patches from a repository called
xen-upstream-patches, which will ultimately be hosted by Gentoo
infra (e.g. available under gitweb.gentoo.org). The Gentoo patchset now
lives in a repository called xen-gentoo-patches, which will also be
hosted on Gentoo infra.

Furthermore we now follow upstreams versioning scheme. Previously we
would sell Xen 4.16.2-pre, which is from the staging-4.16 branch
containing security fixes, as Xen 4.16.1. To avoid confusion, we will
label the Xen versions as such, and Xen 4.16.1 will what is tagged
upstream as RELEASE-4.16.1 (+ the few Gentoo specific patches).

Closes: https://bugs.gentoo.org/845099
Bug: https://bugs.gentoo.org/850802
Closes: https://github.com/gentoo/gentoo/pull/25839
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 app-emulation/xen-tools/Manifest                   |   3 +
 app-emulation/xen-tools/xen-tools-4.16.1.ebuild    | 526 +++++++++++++++++++++
 .../xen-tools/xen-tools-4.16.2_pre1.ebuild         | 526 +++++++++++++++++++++
 3 files changed, 1055 insertions(+)

diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 07a4ccafb98e..a6c87e26bb87 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -10,5 +10,8 @@ DIST xen-4.15.2-upstream-patches-2.tar.xz 93208 BLAKE2B 
5b01953ba93551830e533cf7
 DIST xen-4.15.2.tar.gz 40773378 BLAKE2B 
7c3e3bb066505f9838cd7c56d85debc64e5ed32cf4d4edf699ff843db49bee916e6eb46d07e5cd9021c2644bba0628a2aa567f60ace26c6d7ee5922643e04104
 SHA512 
1cbf988fa8ed38b7ad724978958092ca0e5506e38c709c7d1af196fb8cb8ec0197a79867782761ef230b268624b3d7a0d5d0cd186f37d25f495085c71bf70d54
 DIST xen-4.16.0-upstream-patches-2.tar.xz 111668 BLAKE2B 
e8bbedb7cc50f7a6cb1a3869f0165cce3d02c33f04b935384e770aa5206e6aa6cb51329c5d69375391a8781ba23f20c35e06406d5164720d253b405a77f5aee9
 SHA512 
6b6770117e81ae407e3ded0e366b14f3fa2411cc93a95187db27548c3dd17a1f85e60fc3971b008693297ad97aa0c5fa7b4d88e01d67a972f39e51bf0a2cf39d
 DIST xen-4.16.0.tar.gz 44982322 BLAKE2B 
7e16a93b3f1131e2b10307fabc10641a9c5983173155b9a35eaf6ff317b6a747bccf6b8c87c06686830acc2c4bd3e19e5867eb443eabac9a1e4ee59124dfa87f
 SHA512 
2869ed90d1779c9754d7f2397f5fc67a655304d9c32953ac20655ef96cb154521d8fce9f23915ac0c91f984dc54f72c67e5e619e2da318b5997748f44cf21b87
+DIST xen-4.16.1.tar.gz 44964667 BLAKE2B 
190d9c330b5dcdd47bae26b6ef42111c9c63b71b8b92e20eae268054c6b40aaabadef78c0c9634cb3c3b1bde32a746cbb1404b5eed2a82ab829ba10632103856
 SHA512 
eeabba9c263cd2425bca083e32b5ebfc6c716c00553759c144fd4b6f64a89836b260787fa25ba22c1f5c4ea65aaad7c95b8c2c1070d3377b1c43c9517aa7032a
 DIST xen-gentoo-patches-23.tar.xz 20536 BLAKE2B 
0064f79f8794a21ab13047a4ee296e37efa616e16ca6cd65b31fdafeb458fd9b80f0443758343c8328b1901d7169618346becfe75f16dcaeff08fc975f1d08d5
 SHA512 
09248e17ff7865feb2a505169d62ee5c8c60bd672fa8c4c7c4e3a2e4af58bfad0379d37b395bab3e3393af8d53d882f56749dfeb560edeea6b7ab56c902a3c49
 DIST xen-gentoo-patches-24.tar.xz 20952 BLAKE2B 
292ea384f007a9615ca840068c45cd0e37a63a59e596c9c87a278a0136805327c85f5e5576eac751e40bda616559e413b396d313d43f2d36d904f09a41b0d302
 SHA512 
26b7344cea40ef44d1eaec330465071c96ee27a5b0ca91f787fc80c6801abed47cab9050a40ef80f20471a7cd9ee0dc7aaa46b16e5af7d0e50643ccc7d3a828b
+DIST xen-gentoo-patches-4.16.1-gentoo-patchset-0.tar.gz 5289 BLAKE2B 
4946056ee631ec0fa4d29f1cd643f66b491ef3ea049755d10d7b8e189f02816b990e53bffbeeeae0a61fb4e20aa877f5903a8aadfb26d0c78566a0e9fde540c7
 SHA512 
59d4101879bd18e828349db3814a9082b85c5ba8203ce98e5082491a9ede9c832a02ac7e4d7a0a51a52e38b72e5cce1eea6a09d6c5202e96bfe2aa4d47e12e65
+DIST xen-upstream-patches-4.16.2-pre-patchset-0.tar.gz 46026 BLAKE2B 
57bca21962c9a451316f486f5db94e9c1b98b5e029a15dbd702007d573fe02571e648866c9ddbc293e53ceb5de92122b13d21e28c8879d918129134725c9ff91
 SHA512 
f665640fc686dfc5f718531601f66e3f30c4c8c7cb78293b6a615fe9f53a3763f2c864642a19336bb077d432b776ab1c9fa39e6fa5857ca3360e4d1b1ce63f50

diff --git a/app-emulation/xen-tools/xen-tools-4.16.1.ebuild 
b/app-emulation/xen-tools/xen-tools-4.16.1.ebuild
new file mode 100644
index 000000000000..dc73508d5fc5
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-4.16.1.ebuild
@@ -0,0 +1,526 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE='ncurses,xml,threads(+)'
+
+inherit bash-completion-r1 flag-o-matic multilib python-single-r1 
toolchain-funcs
+
+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"
+
+       SEABIOS_VER="1.14.0"
+       EDK2_COMMIT="7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5"
+       EDK2_OPENSSL_VERSION="1_1_1j"
+       EDK2_SOFTFLOAT_COMMIT="b64af41c3276f97f0e181920400ee056b9c88037"
+       EDK2_BROTLI_COMMIT="666c3280cc11dc433c303d79a83d4ffbdd12cc8d"
+       IPXE_COMMIT="3c040ad387099483102708bb1839110bc788cefb"
+
+       XEN_PRE_PATCHSET_NUM=
+       XEN_GENTOO_PATCHSET_NUM=0
+       XEN_PRE_VERSION_BASE=
+
+       XEN_BASE_PV="${PV}"
+       if [[ -n "${XEN_PRE_VERSION_BASE}" ]]; then
+               XEN_BASE_PV="${XEN_PRE_VERSION_BASE}"
+       fi
+
+       SRC_URI="
+       
https://downloads.xenproject.org/release/xen/${XEN_BASE_PV}/xen-${XEN_BASE_PV}.tar.gz
+       https://www.seabios.org/downloads/seabios-${SEABIOS_VER}.tar.gz
+       ipxe? ( 
https://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
+       )
+       "
+
+       if [[ -n "${XEN_PRE_PATCHSET_NUM}" ]]; then
+               XEN_UPSTREAM_PATCHES_TAG="$(ver_cut 
1-3)-pre-patchset-${XEN_PRE_PATCHSET_NUM}"
+               
XEN_UPSTREAM_PATCHES_NAME="xen-upstream-patches-${XEN_UPSTREAM_PATCHES_TAG}"
+               SRC_URI+=" 
https://github.com/Flowdalic/xen-upstream-patches/archive/refs/tags/${XEN_UPSTREAM_PATCHES_TAG}.tar.gz
 -> ${XEN_UPSTREAM_PATCHES_NAME}.tar.gz"
+               
XEN_UPSTREAM_PATCHES_DIR="${WORKDIR}/${XEN_UPSTREAM_PATCHES_NAME}"
+       fi
+       if [[ -n "${XEN_GENTOO_PATCHSET_NUM}" ]]; then
+               XEN_GENTOO_PATCHES_TAG="$(ver_cut 1-3 
${XEN_BASE_PV})-gentoo-patchset-${XEN_GENTOO_PATCHSET_NUM}"
+               
XEN_GENTOO_PATCHES_NAME="xen-gentoo-patches-${XEN_GENTOO_PATCHES_TAG}"
+               SRC_URI+=" 
https://github.com/Flowdalic/xen-gentoo-patches/archive/refs/tags/${XEN_GENTOO_PATCHES_TAG}.tar.gz
 -> ${XEN_GENTOO_PATCHES_NAME}.tar.gz"
+               XEN_GENTOO_PATCHES_DIR="${WORKDIR}/${XEN_GENTOO_PATCHES_NAME}"
+       fi
+fi
+
+DESCRIPTION="Xen tools including QEMU and xl"
+HOMEPAGE="https://xenproject.org";
+DOCS=( README )
+
+S="${WORKDIR}/xen-$(ver_cut 1-3 ${XEN_BASE_PV})"
+
+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 +hvm +ipxe lzma ocaml ovmf pygrub python +qemu 
+qemu-traditional +rombios screen selinux sdl static-libs system-ipxe 
system-qemu system-seabios systemd zstd"
+
+REQUIRED_USE="
+       ${PYTHON_REQUIRED_USE}
+       ipxe? ( rombios )
+       ovmf? ( hvm )
+       pygrub? ( python )
+       rombios? ( hvm )
+       system-ipxe? ( rombios )
+       ?? ( ipxe system-ipxe )
+       ?? ( qemu system-qemu )"
+
+COMMON_DEPEND="
+       lzma? ( app-arch/xz-utils )
+       qemu? (
+               dev-libs/glib:2
+               sys-libs/pam
+       )
+       zstd? ( app-arch/zstd )
+       app-arch/bzip2
+       app-arch/zstd
+       dev-libs/libnl:3
+       dev-libs/lzo:2
+       dev-libs/yajl
+       sys-apps/util-linux
+       sys-fs/e2fsprogs
+       sys-libs/ncurses
+       sys-libs/zlib
+       ${PYTHON_DEPS}
+"
+
+RDEPEND="${COMMON_DEPEND}
+       sys-apps/iproute2[-minimal]
+       net-misc/bridge-utils
+       screen? (
+               app-misc/screen
+               app-admin/logrotate
+       )
+       selinux? ( sec-policy/selinux-xen )"
+
+DEPEND="${COMMON_DEPEND}
+       app-misc/pax-utils
+       >=sys-kernel/linux-headers-4.11
+       x11-libs/pixman
+       $(python_gen_cond_dep '
+               dev-python/lxml[${PYTHON_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 ) )
+       arm64? ( sys-power/iasl
+               rombios? ( sys-devel/bin86 sys-devel/dev86 ) )
+       doc? (
+               app-text/ghostscript-gpl
+               app-text/pandoc
+               $(python_gen_cond_dep '
+                       dev-python/markdown[${PYTHON_USEDEP}]
+               ')
+               dev-texlive/texlive-latexextra
+               media-gfx/transfig
+       )
+       hvm? ( x11-base/xorg-proto )
+       qemu? (
+               app-arch/snappy:=
+               dev-util/meson
+               sdl? (
+                       media-libs/libsdl[X]
+                       media-libs/libsdl2[X]
+               )
+       )
+       system-qemu? ( app-emulation/qemu[xen] )
+       ocaml? ( dev-ml/findlib
+               dev-lang/ocaml[ocamlopt] )
+       python? ( >=dev-lang/swig-4.0.0 )"
+
+BDEPEND="dev-lang/perl
+       sys-devel/bison
+       sys-devel/gettext"
+
+# 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/libexec/xen/boot/ovmf.bin
+       usr/libexec/xen/boot/xen-shim
+       usr/share/qemu-xen/qemu/hppa-firmware.img
+       usr/share/qemu-xen/qemu/opensbi-riscv32-generic-fw_dynamic.elf
+       usr/share/qemu-xen/qemu/opensbi-riscv64-generic-fw_dynamic.elf
+       usr/share/qemu-xen/qemu/s390-ccw.img
+       usr/share/qemu-xen/qemu/u-boot.e500
+"
+
+QA_EXECSTACK="
+       usr/share/qemu-xen/qemu/hppa-firmware.img
+"
+
+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-storage-daemon
+       usr/libexec/xen/bin/qemu-system-i386
+       usr/libexec/xen/bin/virtfs-proxy-helper
+       usr/libexec/xen/boot/ovmf.bin
+       usr/libexec/xen/boot/xen-shim
+       usr/libexec/xen/libexec/qemu-pr-helper
+       usr/libexec/xen/libexec/virtfs-proxy-helper
+       usr/libexec/xen/libexec/virtiofsd
+       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() {
+       # 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
+
+       if [[ -v XEN_UPSTREAM_PATCHES_DIR ]]; then
+               eapply "${XEN_UPSTREAM_PATCHES_DIR}"
+       fi
+
+       if [[ -v XEN_GENTOO_PATCHES_DIR ]]; then
+               eapply "${XEN_GENTOO_PATCHES_DIR}"
+       fi
+
+       if use ovmf; then
+               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
+
+               # Bug #816987
+               pushd 
tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli > 
/dev/null
+                       eapply "${FILESDIR}/${PN}-4.15.1-brotli-gcc11.patch"
+               popd > /dev/null
+
+               pushd 
tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli
 > /dev/null
+                       eapply "${FILESDIR}/${PN}-4.15.1-brotli-gcc11.patch"
+               popd > /dev/null
+       fi
+
+       # ipxe
+       if use ipxe; then
+               cp "${DISTDIR}/ipxe-git-${IPXE_COMMIT}.tar.gz" 
tools/firmware/etherboot/ipxe.tar.gz || die
+
+               # gcc 11
+               cp 
"${XEN_GENTOO_PATCHES_DIR}/ipxe/${PN}-4.15.0-ipxe-gcc11.patch" 
tools/firmware/etherboot/patches/ipxe-gcc11.patch || die
+               echo ipxe-gcc11.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
+
+       # 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      :=.*;BASH_COMPLETION_DIR := 
$(get_bashcompdir);" \
+               -i config/Paths.mk.in || 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
+
+       # disable docker (Bug #732970)
+       sed -e "s:\$\$source/configure:\0 --disable-containers:" \
+               -i tools/Makefile || die
+
+       # disable abi-dumper (Bug #791172)
+       sed -e 's/$(ABI_DUMPER) /echo /g' \
+               -i tools/libs/libs.mk || die
+
+       # Remove -Werror
+       find . -type f \( -name Makefile -o -name "*.mk" \) \
+                -exec sed -i \
+                -e 's/-Werror //g' \
+                -e '/^CFLAGS *+= -Werror$/d' \
+                -e 's/, "-Werror"//' \
+                {} + || die
+
+       default
+}
+
+src_configure() {
+       local myconf=(
+               --libdir="${EPREFIX}/usr/$(get_libdir)"
+               --libexecdir="${EPREFIX}/usr/libexec"
+               --localstatedir="${EPREFIX}/var"
+               --disable-golang
+               --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 rombios)
+               $(use_enable systemd)
+               --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
+
+       # bug #845099
+       if use ipxe; then
+               local -x NO_WERROR=1
+       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/libs/stat/bindings/swig/python/xenstat.py"
+               python_domodule 
"${S}/tools/libs/stat/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
+}

diff --git a/app-emulation/xen-tools/xen-tools-4.16.2_pre1.ebuild 
b/app-emulation/xen-tools/xen-tools-4.16.2_pre1.ebuild
new file mode 100644
index 000000000000..8e3c152ee863
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-4.16.2_pre1.ebuild
@@ -0,0 +1,526 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE='ncurses,xml,threads(+)'
+
+inherit bash-completion-r1 flag-o-matic multilib python-single-r1 
toolchain-funcs
+
+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"
+
+       SEABIOS_VER="1.14.0"
+       EDK2_COMMIT="7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5"
+       EDK2_OPENSSL_VERSION="1_1_1j"
+       EDK2_SOFTFLOAT_COMMIT="b64af41c3276f97f0e181920400ee056b9c88037"
+       EDK2_BROTLI_COMMIT="666c3280cc11dc433c303d79a83d4ffbdd12cc8d"
+       IPXE_COMMIT="3c040ad387099483102708bb1839110bc788cefb"
+
+       XEN_PRE_PATCHSET_NUM=0
+       XEN_GENTOO_PATCHSET_NUM=0
+       XEN_PRE_VERSION_BASE=4.16.1
+
+       XEN_BASE_PV="${PV}"
+       if [[ -n "${XEN_PRE_VERSION_BASE}" ]]; then
+               XEN_BASE_PV="${XEN_PRE_VERSION_BASE}"
+       fi
+
+       SRC_URI="
+       
https://downloads.xenproject.org/release/xen/${XEN_BASE_PV}/xen-${XEN_BASE_PV}.tar.gz
+       https://www.seabios.org/downloads/seabios-${SEABIOS_VER}.tar.gz
+       ipxe? ( 
https://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
+       )
+       "
+
+       if [[ -n "${XEN_PRE_PATCHSET_NUM}" ]]; then
+               XEN_UPSTREAM_PATCHES_TAG="$(ver_cut 
1-3)-pre-patchset-${XEN_PRE_PATCHSET_NUM}"
+               
XEN_UPSTREAM_PATCHES_NAME="xen-upstream-patches-${XEN_UPSTREAM_PATCHES_TAG}"
+               SRC_URI+=" 
https://github.com/Flowdalic/xen-upstream-patches/archive/refs/tags/${XEN_UPSTREAM_PATCHES_TAG}.tar.gz
 -> ${XEN_UPSTREAM_PATCHES_NAME}.tar.gz"
+               
XEN_UPSTREAM_PATCHES_DIR="${WORKDIR}/${XEN_UPSTREAM_PATCHES_NAME}"
+       fi
+       if [[ -n "${XEN_GENTOO_PATCHSET_NUM}" ]]; then
+               XEN_GENTOO_PATCHES_TAG="$(ver_cut 1-3 
${XEN_BASE_PV})-gentoo-patchset-${XEN_GENTOO_PATCHSET_NUM}"
+               
XEN_GENTOO_PATCHES_NAME="xen-gentoo-patches-${XEN_GENTOO_PATCHES_TAG}"
+               SRC_URI+=" 
https://github.com/Flowdalic/xen-gentoo-patches/archive/refs/tags/${XEN_GENTOO_PATCHES_TAG}.tar.gz
 -> ${XEN_GENTOO_PATCHES_NAME}.tar.gz"
+               XEN_GENTOO_PATCHES_DIR="${WORKDIR}/${XEN_GENTOO_PATCHES_NAME}"
+       fi
+fi
+
+DESCRIPTION="Xen tools including QEMU and xl"
+HOMEPAGE="https://xenproject.org";
+DOCS=( README )
+
+S="${WORKDIR}/xen-$(ver_cut 1-3 ${XEN_BASE_PV})"
+
+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 +hvm +ipxe lzma ocaml ovmf pygrub python +qemu 
+qemu-traditional +rombios screen selinux sdl static-libs system-ipxe 
system-qemu system-seabios systemd zstd"
+
+REQUIRED_USE="
+       ${PYTHON_REQUIRED_USE}
+       ipxe? ( rombios )
+       ovmf? ( hvm )
+       pygrub? ( python )
+       rombios? ( hvm )
+       system-ipxe? ( rombios )
+       ?? ( ipxe system-ipxe )
+       ?? ( qemu system-qemu )"
+
+COMMON_DEPEND="
+       lzma? ( app-arch/xz-utils )
+       qemu? (
+               dev-libs/glib:2
+               sys-libs/pam
+       )
+       zstd? ( app-arch/zstd )
+       app-arch/bzip2
+       app-arch/zstd
+       dev-libs/libnl:3
+       dev-libs/lzo:2
+       dev-libs/yajl
+       sys-apps/util-linux
+       sys-fs/e2fsprogs
+       sys-libs/ncurses
+       sys-libs/zlib
+       ${PYTHON_DEPS}
+"
+
+RDEPEND="${COMMON_DEPEND}
+       sys-apps/iproute2[-minimal]
+       net-misc/bridge-utils
+       screen? (
+               app-misc/screen
+               app-admin/logrotate
+       )
+       selinux? ( sec-policy/selinux-xen )"
+
+DEPEND="${COMMON_DEPEND}
+       app-misc/pax-utils
+       >=sys-kernel/linux-headers-4.11
+       x11-libs/pixman
+       $(python_gen_cond_dep '
+               dev-python/lxml[${PYTHON_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 ) )
+       arm64? ( sys-power/iasl
+               rombios? ( sys-devel/bin86 sys-devel/dev86 ) )
+       doc? (
+               app-text/ghostscript-gpl
+               app-text/pandoc
+               $(python_gen_cond_dep '
+                       dev-python/markdown[${PYTHON_USEDEP}]
+               ')
+               dev-texlive/texlive-latexextra
+               media-gfx/transfig
+       )
+       hvm? ( x11-base/xorg-proto )
+       qemu? (
+               app-arch/snappy:=
+               dev-util/meson
+               sdl? (
+                       media-libs/libsdl[X]
+                       media-libs/libsdl2[X]
+               )
+       )
+       system-qemu? ( app-emulation/qemu[xen] )
+       ocaml? ( dev-ml/findlib
+               dev-lang/ocaml[ocamlopt] )
+       python? ( >=dev-lang/swig-4.0.0 )"
+
+BDEPEND="dev-lang/perl
+       sys-devel/bison
+       sys-devel/gettext"
+
+# 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/libexec/xen/boot/ovmf.bin
+       usr/libexec/xen/boot/xen-shim
+       usr/share/qemu-xen/qemu/hppa-firmware.img
+       usr/share/qemu-xen/qemu/opensbi-riscv32-generic-fw_dynamic.elf
+       usr/share/qemu-xen/qemu/opensbi-riscv64-generic-fw_dynamic.elf
+       usr/share/qemu-xen/qemu/s390-ccw.img
+       usr/share/qemu-xen/qemu/u-boot.e500
+"
+
+QA_EXECSTACK="
+       usr/share/qemu-xen/qemu/hppa-firmware.img
+"
+
+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-storage-daemon
+       usr/libexec/xen/bin/qemu-system-i386
+       usr/libexec/xen/bin/virtfs-proxy-helper
+       usr/libexec/xen/boot/ovmf.bin
+       usr/libexec/xen/boot/xen-shim
+       usr/libexec/xen/libexec/qemu-pr-helper
+       usr/libexec/xen/libexec/virtfs-proxy-helper
+       usr/libexec/xen/libexec/virtiofsd
+       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() {
+       # 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
+
+       if [[ -v XEN_UPSTREAM_PATCHES_DIR ]]; then
+               eapply "${XEN_UPSTREAM_PATCHES_DIR}"
+       fi
+
+       if [[ -v XEN_GENTOO_PATCHES_DIR ]]; then
+               eapply "${XEN_GENTOO_PATCHES_DIR}"
+       fi
+
+       if use ovmf; then
+               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
+
+               # Bug #816987
+               pushd 
tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli > 
/dev/null
+                       eapply "${FILESDIR}/${PN}-4.15.1-brotli-gcc11.patch"
+               popd > /dev/null
+
+               pushd 
tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli
 > /dev/null
+                       eapply "${FILESDIR}/${PN}-4.15.1-brotli-gcc11.patch"
+               popd > /dev/null
+       fi
+
+       # ipxe
+       if use ipxe; then
+               cp "${DISTDIR}/ipxe-git-${IPXE_COMMIT}.tar.gz" 
tools/firmware/etherboot/ipxe.tar.gz || die
+
+               # gcc 11
+               cp 
"${XEN_GENTOO_PATCHES_DIR}/ipxe/${PN}-4.15.0-ipxe-gcc11.patch" 
tools/firmware/etherboot/patches/ipxe-gcc11.patch || die
+               echo ipxe-gcc11.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
+
+       # 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      :=.*;BASH_COMPLETION_DIR := 
$(get_bashcompdir);" \
+               -i config/Paths.mk.in || 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
+
+       # disable docker (Bug #732970)
+       sed -e "s:\$\$source/configure:\0 --disable-containers:" \
+               -i tools/Makefile || die
+
+       # disable abi-dumper (Bug #791172)
+       sed -e 's/$(ABI_DUMPER) /echo /g' \
+               -i tools/libs/libs.mk || die
+
+       # Remove -Werror
+       find . -type f \( -name Makefile -o -name "*.mk" \) \
+                -exec sed -i \
+                -e 's/-Werror //g' \
+                -e '/^CFLAGS *+= -Werror$/d' \
+                -e 's/, "-Werror"//' \
+                {} + || die
+
+       default
+}
+
+src_configure() {
+       local myconf=(
+               --libdir="${EPREFIX}/usr/$(get_libdir)"
+               --libexecdir="${EPREFIX}/usr/libexec"
+               --localstatedir="${EPREFIX}/var"
+               --disable-golang
+               --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 rombios)
+               $(use_enable systemd)
+               --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
+
+       # bug #845099
+       if use ipxe; then
+               local -x NO_WERROR=1
+       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/libs/stat/bindings/swig/python/xenstat.py"
+               python_domodule 
"${S}/tools/libs/stat/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