app-emulation/xen-tools: bump to 4.12.0_rc5

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Tomáš Mózes <hydrapolic@gmail.com>
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>

diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 38da60cfc91448362ff840a42388792a3ece7187..e9e943ca04e93efd84b9fe347623595fd1aade41 100644 (file)
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -8,6 +8,7 @@ DIST xen-4.10.3.tar.gz 24695778 BLAKE2B 50a9e31fb4cf587eeedb357fc710405a1cd45061
 DIST xen-4.11.1-upstream-patches-0.tar.xz 45416 BLAKE2B 3990dbf338c2aebe1cd601d7caccc6919352cc1f937677d447c3d2626143710bdfda7f1977e2ad7112abff9cad6bb660bc1b0993ca74b2eff51da6d4f4365813 SHA512 ecbc13e607581a6f9b4e318145afaa92ce641bda6fb12585408f61bcf24fa9b245004ad22150e109db5d38fcea38e6bdaf6bb2d6eaaf8e5d5fa8816b5a19e456
 DIST xen-4.11.1.tar.gz 25152217 BLAKE2B a8dfbeb3d490787725c589e1ce82dcbbcd0be7fb4743b38daf3a8704dffda34d1faabb07d74e01d2fab1572ce0b730c21192469317545e8b3edb3fae1130ef8c SHA512 c1655c5decdaed95a2b9a99652318cfc72f6cfdae957cfe60d635f7787e8850f33e8fafc4c4b8d61fb579c9b9d93028a6382903e71808a0418b931e76d72a649
 DIST xen-4.12.0-rc4.tar.gz 26954470 BLAKE2B 355582acac6f1600ee4da05eb1e0b9cb11b6d3e47c0fe5b3a9247ae2441e9abb5358040acbd9421c58aa6379660cbda93b82a391b5452001666db43db67b39ce SHA512 71207638f768f5bcc05988f74cdbe26bacf707e3a8da8dadce89d2e33617f0c0f244c98855f21b8916df6c7646f1039de2685ac6f5e6e33994d662b06b81833b
+DIST xen-4.12.0-rc5.tar.gz 26514850 BLAKE2B 41985dc33175bee8bddc4da0ec3b4da9f8cf3ebe580406011db47a27a8740566c1ace6e906d3385f73fee9b6cd572b0f3292381ac72a696fc15d020eb982ad02 SHA512 3d7fb254503c412a3c37782f7c75d093a1d43553dc110338d8dc00df0c6be4c8825cebf7f0519731e49263cef38d07ef48c18f073926d7eaf30abe64b13c52cb
 DIST xen-gentoo-patches-14.tar.xz 36244 BLAKE2B 94b751df0ae9a49d1c52ec5fa835d4a040ccb6a4a0f63ef6ef628191163ce7dbd47d4e3b2dbb1cf6cf6c8b368bea4267ff989754482c4794209a80eae9313c25 SHA512 8a23aeddbcf80c049da36e3ef9d797c16996b45be21b56f46f3c9c3833a7c1028fd9ed56fc8053faeb78db21076608de2eb32908e1ae1285f4f200ace40c8c2d
 DIST xen-gentoo-patches-15.tar.xz 36508 BLAKE2B 10b89597159916781f02e1d0f285317f7319cb26562c4e94f9a755637e31f26dd7e00fe250ceaa71ca140191c2fb76e6c889942dd2f33e0347d65b66734060c8 SHA512 60ba45d95a7f0fa34532395491de221998cf1c7d1aec6cacb8fdc163d31a79ef57a32ef9f2495a5ae10b5d4c9bc5bd43ce6c965ceb5d13291c462501bd419681
 DIST xen-gentoo-patches-16.tar.xz 36980 BLAKE2B a59fcb221a915e39fbbc463fa8b1ca1ef00007654936cc17f64853d91737478a6f78480a3e459b07b8c3ddcc81ab9400beb9ea3906750ba69864d1b97db349d2 SHA512 7727e5c7f4ef997eea830618bc26b26f3a99539a1c702264132401e41a328b384346a06b6721f18e3056fc91a2d2d2bf6320e0ae3c79432c7458a24a0d269c56

diff --git a/app-emulation/xen-tools/files/gentoo-patches.conf b/app-emulation/xen-tools/files/gentoo-patches.conf
index 1c541bb0e841cff0d8c6a7081ae4cbdb85857c44..a099e2134f476358c5832d99eb4255bc3f816f31 100644 (file)
--- a/app-emulation/xen-tools/files/gentoo-patches.conf
+++ b/app-emulation/xen-tools/files/gentoo-patches.conf
@@ -115,6 +115,7 @@ _gx050=" xen-tools-4.12.0-shim.patch"
 _gx047=" xen-tools-4.10.1-gcc8.patch"
 _gx048=" xen-tools-4.11.1-gcc8.patch"
 _gx052=" xen-tools-4.10.3-gcc8.patch"
+_gx053=" xen-tools-4.12.0-gcc8.patch"
 
 # Fix pdf document generation, bug #650396
 _gx049=" xen-tools-4.10.1-pdfdoc.patch"
@@ -160,10 +161,10 @@ ${_gx049}
 "
 
 # xen-tools-4.12.0 patches set
-_gpv_xen_tools_4120_rc4_0="
+_gpv_xen_tools_4120_rc5_0="
 ${_gx038}
 ${_gx027}
 ${_gx028} ${_gx029}
 ${_gx037} ${_gx042}
-${_gx048} ${_gx050} ${_gx051}
+${_gx053} ${_gx050} ${_gx051}
 "

diff --git a/app-emulation/xen-tools/xen-tools-4.11.1-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.12.0_rc5.ebuild
similarity index 98%
rename from app-emulation/xen-tools/xen-tools-4.11.1-r1.ebuild
rename to app-emulation/xen-tools/xen-tools-4.12.0_rc5.ebuild
index fa4b312cb48b3e156c483b8b8fb089208c73124a..36e89e49a6952253b95327ffef3a692f983e9b58 100644 (file)
--- a/app-emulation/xen-tools/xen-tools-4.11.1-r1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.12.0_rc5.ebuild
@@ -16,17 +16,18 @@ if [[ $PV == *9999 ]]; then
        EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
        S="${WORKDIR}/${REPO}"
 else
-       KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-       UPSTREAM_VER=0
+       #KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+       KEYWORDS=""
+       UPSTREAM_VER=
        SECURITY_VER=
        # xen-tools's gentoo patches tarball
-       GENTOO_VER=14
+       GENTOO_VER=16
        # xen-tools's gentoo patches version which apply to this specific ebuild
        GENTOO_GPV=0
        # xen-tools ovmf's patches
        OVMF_VER=3
 
-       SEABIOS_VER=1.10.0
+       SEABIOS_VER=1.12.0
        # OVMF upstream 5920a9d16b1ab887c2858224316a98e961d71b05
        OVMF_PV=20170321
 
@@ -42,7 +43,7 @@ else
                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
-       http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
+       https://www.seabios.org/downloads/seabios-${SEABIOS_VER}.tar.gz
        https://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
        ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.xz
                ${OVMF_PATCHSET_URI} )
@@ -55,7 +56,7 @@ fi
 
 DESCRIPTION="Xen tools including QEMU and xl"
 HOMEPAGE="https://www.xenproject.org"
-DOCS=( README docs/README.xen-bugtool )
+DOCS=( README )
 
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
@@ -130,6 +131,7 @@ RDEPEND="${COMMON_DEPEND}
 # 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
 "
@@ -350,6 +352,7 @@ src_configure() {
                --disable-xen \
                --enable-tools \
                --enable-docs \
+               --with-system-ipxe=${PREFIX}/usr/share/ipxe \
                $(use_enable pam) \
                $(use_enable api xenapi) \
                $(use_enable ovmf) \