commit:     a22492996fbd06012fe0c5611fd69962b6c4b22f
Author:     Tomáš Mózes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Sun Jun 14 01:20:59 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Jun 17 15:25:19 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2249299

app-emulation/xen-tools: bump to 4.14.0-rc1

Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com>
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 app-emulation/xen-tools/Manifest                   |   3 +
 app-emulation/xen-tools/files/gentoo-patches.conf  |  12 +
 .../xen-tools/xen-tools-4.14.0_rc1.ebuild          | 506 +++++++++++++++++++++
 3 files changed, 521 insertions(+)

diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 6bbfb5aca01..7f0b70c0abb 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -6,11 +6,14 @@ DIST ipxe-git-1dd56dbd11082fb622c2ed21cfaced4f47d798a6.tar.gz 
3810726 BLAKE2B b9
 DIST ipxe-git-d2063b7693e0e35db97b2264aa987eb6341ae779.tar.gz 3792227 BLAKE2B 
720ac29ab3187d7abaec33823dda967caab7eea9631123a7619d2f83d3ad6c7bb47db01665a4c54548fe367866606936d36690a06ecf42323b9bd0ef00e41569
 SHA512 
2b4ae8e65cd678dbb376f24001294eb54aead8d66456e06fc270dec178d90b282c1eb19731234d8b458054e49c5b8b8c4a89345c63ed0a4dafaf205e642b00b7
 DIST seabios-1.12.0.tar.gz 613542 BLAKE2B 
f145c2db716996bfa9e5c014086ccfaa8ae96ebc158f34303b122b7bf209408c567665d8691364df8d8e886f63e0e72a3f3cd319dfa86ef581023201b5d94e53
 SHA512 
e52c5363e5bb37b5286e55545aa06bd126218f9d0e3a06ac2e189de68fe3de3256c11ca1bb13357a9c384d7e3af6284083ff3aa587688b5de04ef11b97bdfa27
 DIST seabios-1.12.1.tar.gz 613450 BLAKE2B 
cb926b650c41a9962db407945cb5b6558079b061bd61f32ea56aedf0d37a00d10ad4434acbe717ffbc0dd1d1c0767304af8e640a53b0fc3784969dfa1590f681
 SHA512 
58755ce842adcb99c0f2f3ebbf9ec6d4a5072753966ab46805a96db1570847b109a90e6e03d61f9088ef877ca8ba96a8006777dc38ec434fce6b487f6c1f91d0
+DIST seabios-1.13.0.tar.gz 620952 BLAKE2B 
460a7dd2b2775b981bbd890ed0a50fe905794c68b0b895799667dd1378bb84125712330c2f6945112709d42cfb7b01196c7fff99051e44b6211d47d19531cfae
 SHA512 
7f158badf7deecc2998eab2a08f3615dfe5a7c0a51323f7b4568a4d1280935bc32bb466c8226d87d2ca7e13f9f117ff0092befcc0699bc31c5018e84754e8393
 DIST xen-4.12.2-upstream-patches-0.tar.xz 3976 BLAKE2B 
4527b5699b13e1b5bed9b82b67c7a3ddfbe39dc69f63b3bb1fda81cb315c6d78a34441219b8d4ae3d95ae2bc52ef0779410b65813212fa07867061fcb2b599ac
 SHA512 
462de147b0474ca8e051219b41b088f25eb4be3962cde399403be5fbcfd4747054f84bf8c732ba8d86c1ba1980c518b67cd8e4f342e4120dd8bf6594d185a92e
 DIST xen-4.12.2.tar.gz 26985135 BLAKE2B 
530821011a6dd0ac0a99fb135ff5311eb8e975c3791818093b5e250eed7854d153de6d4340197f9b949c0ad2c3d7b2b7180deb42bc71748ff70ff6fad195269d
 SHA512 
7d9e7921271830c9eadf1bb8eca1aec20d343ad7475b0dc3165ef6d681759e7cb70739f8d9f85622a23aef960988820e822267fb198b12ee3dd657ad6164069f
 DIST xen-4.12.3-upstream-patches-0.tar.xz 7236 BLAKE2B 
d795e2be6f1edb31f1d794912328c4d3673eb800464d99c5ae867d189d0ea2b4cbac0c8bcda7790ae40742f6bf79308eb624b4f67d1c7f12cc64be6d8c920b84
 SHA512 
de5723d4fd547845ca9a876f8535e720f7bd790e48dbf1d92397d60a285ef88a31cad276b1a01a4fa8946cefb15d69c8a3a00da5113b6e5e2655b871be076adf
 DIST xen-4.12.3.tar.gz 26985230 BLAKE2B 
403de519a552f1cd49e5a85b63f48df1b7a47ff8381385860b67df32af0b33be1c13c92ca2234e4479b7f415e711e0f46c396c3f62dfb5b2465d2991723cf6ef
 SHA512 
7bbf4e752477f18143ac9a62fb633b1fbe115a1a9b03d0132f33dfca025bc9b76d9c2e9b66a3e407d14aff161b940b1a82e3e3ca43213798e9dd38b6970194e0
 DIST xen-4.13.1-upstream-patches-0.tar.xz 7156 BLAKE2B 
246b30cd8bc0ee8853a4e85ae0140d0ae52e69f3e4220bd97af8564491cf8285a7a592cd1392467a30acf6947733c8af355c110a44cb565927fb4f0bb7867113
 SHA512 
9059de696cb984c1891b5a87d1832562aa34b6568a21867c6744b603180f2b628905c81031f3c7c24867122d07432906750e0cfc6ca2fdacd31b82d35488455f
 DIST xen-4.13.1.tar.gz 39024612 BLAKE2B 
efff138699fac2c14fad2e0dfd4535ebd744577df3dddccc2a589b81a76f24fc81c75e295f4cd33ca2e820929417b22d714504b576cb0737a563037bd56b6a95
 SHA512 
b56d20704155d98d803496cba83eb928e0f986a750831cd5600fc88d0ae772fe1456571654375054043d2da8daca255cc98385ebf08b1b1a75ecf7f4b7a0ee90
+DIST xen-4.14.0-rc1.tar.gz 39946385 BLAKE2B 
af4d4d0d205b76d7cfb954c4c8ef95afbab7209de522691a875e3b2fc55d843ba6b1d71c693a472dbcf8cdf6b4cf4aa8f27065fdcf06145a50e6708fe63ea0e2
 SHA512 
90442feb6e5f1e853c337972217762e4c4ea44719275de74211bf0e7101746c33e0e437db544d03b5528d75b2e5bc97468b448e587ca0345b38b850f2aa393e9
 DIST xen-gentoo-patches-20.tar.xz 17376 BLAKE2B 
909795f611a089ab1eee86db5f034cec963c831873b3088f0682cdb7ec5284e75a4d49a5a1c93ee7a7e7ba3a899648b38928a1c7b726e019c2a90b66e31fee4a
 SHA512 
d06b846ccb8c488f7155437cdf220533fc2d23ad13b0a2bd4d69d68938c4858fdb961c9e59f57c5228368b4e60dbbdf81ec15b77ecb0639bbf475333f8bf4b97
 DIST xen-gentoo-patches-21.tar.xz 18280 BLAKE2B 
95446da72fc16cb82e4e51df8796c64db05a30894a351a98dbd6700ce354c34956ca09a1af98125a4e56c337936e8fae296d806519b8afa23a82b078aa0db8f1
 SHA512 
3cffac162606a09b10b47dca604f167897e6ac8d153411d3464ef29a7a4d46ac5b92340884cb21279cb2d053b131f1ea5cb2111e3e9a21b3298b5ab3320ee34d
+DIST xen-gentoo-patches-22.tar.xz 18764 BLAKE2B 
e0da49b39fbc6b689db47e40a4fbb4f6568644fe192b114cce01b0406cba4bf23339ad1bf39b972f895df004916827b6e774f97fc079aeb8ac436763efda5fc3
 SHA512 
5b7959af4ed30edd2526698ab60a86353e35d9dc48dc941b6df7659a7c4904260461e0decbd8d788542bd69384736f2175861d4943c3738618d20788b19ea9b1

diff --git a/app-emulation/xen-tools/files/gentoo-patches.conf 
b/app-emulation/xen-tools/files/gentoo-patches.conf
index a5dea9bc4b4..5ef7519e224 100644
--- a/app-emulation/xen-tools/files/gentoo-patches.conf
+++ b/app-emulation/xen-tools/files/gentoo-patches.conf
@@ -7,10 +7,12 @@ _gx017=" fix-gold-ld.patch"
 
 # Bug 477676
 _gx038=" xen-tools-4.8-ar-cc.patch"
+_gx039=" xen-tools-4.14-ar-cc.patch"
 
 # Prevent file collision with qemu package Bug 478064
 _gx043=" xen-4.10-qemu-bridge.patch"
 _gx051=" xen-4.12-qemu-bridge.patch"
+_gx052=" xen-tools-4.14-qemu-bridge.patch"
 #mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || 
die
 
 # Fix po file collision with app-emulation/qemu, while USE=qemu is enabled, 
Bug 508302
@@ -80,3 +82,13 @@ ${_gx053} ${_gx050} ${_gx051}
 ${_gx054} ${_gx056}
 ${_gx060}
 "
+
+# xen-tools-4.14.0 patches set
+_gpv_xen_tools_4140_rc1_0="
+${_gx039}
+${_gx027}
+${_gx028} ${_gx029}
+${_gx037}
+${_gx053} ${_gx050} ${_gx052}
+${_gx054} ${_gx056}
+"

diff --git a/app-emulation/xen-tools/xen-tools-4.14.0_rc1.ebuild 
b/app-emulation/xen-tools/xen-tools-4.14.0_rc1.ebuild
new file mode 100644
index 00000000000..d629c533489
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-4.14.0_rc1.ebuild
@@ -0,0 +1,506 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..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"
+       KEYWORDS=""
+       UPSTREAM_VER=
+       SECURITY_VER=
+       # xen-tools's gentoo patches tarball
+       GENTOO_VER=22
+       # 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.13.0"
+       EDK2_COMMIT="20d2e5a125e34fc8501026613a71549b2a1a3e54"
+       EDK2_OPENSSL_VERSION="1_1_1b"
+       EDK2_SOFTFLOAT_COMMIT="b64af41c3276f97f0e181920400ee056b9c88037"
+       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";
+       [[ -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://github.com/qemu/seabios/archive/rel-${SEABIOS_VER}.tar.gz -> 
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
+               ${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-rel-${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
+               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 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
+
+       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