commit:     bc86a7c330fdcb74227f327b0c0dbfd498c5ff28
Author:     Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Tue Apr 16 13:33:15 2019 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Wed Apr 17 13:10:27 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc86a7c3

app-emulation/xen-tools: various improvments

Add upstream patches, fix REQUIRED_USE for qemu, sort
options.

Closes: https://github.com/gentoo/gentoo/pull/11708

Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com>
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 app-emulation/xen-tools/Manifest                   |  2 +-
 ...4.11.1-r3.ebuild => xen-tools-4.11.1-r4.ebuild} | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index a7a4b99ecae..ed94b37b0c5 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -6,7 +6,7 @@ DIST seabios-1.12.0.tar.gz 613542 BLAKE2B 
f145c2db716996bfa9e5c014086ccfaa8ae96e
 DIST seabios-rel-1.11.1.tar.gz 604125 BLAKE2B 
df2b7322f5169fb74e7f5dd3f680e7d8ad3e6f93e8b1376d15bbda8865458648a0d6086011a8a6549e7ad1794844878736441e70067580c0eb416e20ee038d95
 SHA512 
69622460475b54ba77a10509dae0ef46d9c733c6c8527ab56a4f2298534dcf1f7722eb501df873ab612222e5867e334c2831cc4c95dd23771aee10740acf0273
 DIST xen-4.10.3-upstream-patches-1.tar.xz 24064 BLAKE2B 
ec9339d00afd4057738a78165a82dbebbab73eb561984a049daff84dfb115c0550e67796bfa775d5e5a3a4576c4ea7db408d491fe745a68c412f93a04719c58d
 SHA512 
b3761acdb7a581d172e1e2b1e09406c4748eda3e25c81c19bb53b38e005d27e10ac64109870b47ce72372dc7b7c63ec3eca6156389c174f28ab4ad1c2b9e5634
 DIST xen-4.10.3.tar.gz 24695778 BLAKE2B 
50a9e31fb4cf587eeedb357fc710405a1cd4506174a38eb9b032a0cdd9b7f7343d98624ecb07cf605b1403664c7117cdc8f011290309caa18ca9604b4008b906
 SHA512 
030d23109ce4c0ebf50ade6841d5525a39032bcf8fd0599ccaa9502ff301c1f61f9c5f49233b41a5934a71228958febc1e529a9fc6822ba401a0c18c490ad412
-DIST xen-4.11.1-upstream-patches-0.tar.xz 45416 BLAKE2B 
3990dbf338c2aebe1cd601d7caccc6919352cc1f937677d447c3d2626143710bdfda7f1977e2ad7112abff9cad6bb660bc1b0993ca74b2eff51da6d4f4365813
 SHA512 
ecbc13e607581a6f9b4e318145afaa92ce641bda6fb12585408f61bcf24fa9b245004ad22150e109db5d38fcea38e6bdaf6bb2d6eaaf8e5d5fa8816b5a19e456
+DIST xen-4.11.1-upstream-patches-1.tar.xz 60048 BLAKE2B 
60d5960183433776c881696e9b50f800c2724c9815b3ebb6eb994d108ab4b3de92cf8d7ec79c86958e8811b19550f802c26326351d49f35391cfeb3e6a1d5e76
 SHA512 
788245219ed374b80423f01754abae457b36de098a0d568828af02142b55692e2df78eceb8cb2a11fc20e9ee59c2cebfea8ec1de0a9d6dc64f327a88cf6bf918
 DIST xen-4.11.1.tar.gz 25152217 BLAKE2B 
a8dfbeb3d490787725c589e1ce82dcbbcd0be7fb4743b38daf3a8704dffda34d1faabb07d74e01d2fab1572ce0b730c21192469317545e8b3edb3fae1130ef8c
 SHA512 
c1655c5decdaed95a2b9a99652318cfc72f6cfdae957cfe60d635f7787e8850f33e8fafc4c4b8d61fb579c9b9d93028a6382903e71808a0418b931e76d72a649
 DIST xen-4.12.0.tar.gz 26949697 BLAKE2B 
9175cc9054e4a2b5c34df89a4efd667f86b4861bef9c3310bf431d041f710a7cb265b4d34a76ab18a17a3121392942d2e5d76c5044eb9b957d4255af889fe69a
 SHA512 
0ce366dcac607c9b592c5e9c0f40652eef743913b246bed4b0c380b8d59ac23a6adcd05befec37fc799a61476f47df76d4911cbf1da6ceb51441c546bf2464de
 DIST xen-gentoo-patches-16.tar.xz 36980 BLAKE2B 
a59fcb221a915e39fbbc463fa8b1ca1ef00007654936cc17f64853d91737478a6f78480a3e459b07b8c3ddcc81ab9400beb9ea3906750ba69864d1b97db349d2
 SHA512 
7727e5c7f4ef997eea830618bc26b26f3a99539a1c702264132401e41a328b384346a06b6721f18e3056fc91a2d2d2bf6320e0ae3c79432c7458a24a0d269c56

diff --git a/app-emulation/xen-tools/xen-tools-4.11.1-r3.ebuild 
b/app-emulation/xen-tools/xen-tools-4.11.1-r4.ebuild
similarity index 97%
rename from app-emulation/xen-tools/xen-tools-4.11.1-r3.ebuild
rename to app-emulation/xen-tools/xen-tools-4.11.1-r4.ebuild
index 04a72b80ad3..b197b31b8ed 100644
--- a/app-emulation/xen-tools/xen-tools-4.11.1-r3.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.11.1-r4.ebuild
@@ -17,10 +17,10 @@ if [[ $PV == *9999 ]]; then
        S="${WORKDIR}/${REPO}"
 else
        KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-       UPSTREAM_VER=0
+       UPSTREAM_VER=1
        SECURITY_VER=
        # xen-tools's gentoo patches tarball
-       GENTOO_VER=16
+       GENTOO_VER=17
        # xen-tools's gentoo patches version which apply to this specific ebuild
        GENTOO_GPV=0
        # xen-tools ovmf's patches
@@ -60,13 +60,13 @@ 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 custom-cflags debug doc flask hvm ocaml ovmf +pam pygrub python 
+qemu +qemu-traditional screen sdl static-libs system-qemu system-seabios"
+IUSE="api custom-cflags debug doc flask +hvm ocaml ovmf +pam pygrub python 
+qemu +qemu-traditional screen sdl static-libs system-qemu system-seabios"
 
 REQUIRED_USE="
        ${PYTHON_REQUIRED_USE}
-       pygrub? ( python )
        ovmf? ( hvm )
-       ^^ ( qemu system-qemu )"
+       pygrub? ( python )
+       ?? ( qemu system-qemu )"
 
 COMMON_DEPEND="
        sys-apps/pciutils
@@ -93,10 +93,10 @@ DEPEND="${COMMON_DEPEND}
                )
        !amd64? ( >=sys-apps/dtc-1.4.0 )
        amd64? ( sys-devel/bin86
-               system-seabios? ( sys-firmware/seabios )
-               sys-firmware/ipxe
                sys-devel/dev86
-               sys-power/iasl )
+               sys-firmware/ipxe[qemu]
+               sys-power/iasl
+               system-seabios? ( sys-firmware/seabios ) )
        dev-lang/perl
        app-misc/pax-utils
        doc? (
@@ -246,7 +246,7 @@ src_prepare() {
        # 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
+       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
 
@@ -353,10 +353,10 @@ src_configure() {
                --disable-xen \
                --enable-tools \
                --enable-docs \
-               $(use_enable pam) \
                $(use_enable api xenapi) \
-               $(use_enable ovmf) \
+               $(use_enable pam) \
                $(use_enable ocaml ocamltools) \
+               $(use_enable ovmf) \
                --with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
                "
 

Reply via email to