[gentoo-commits] repo/gentoo:master commit in: app-emulation/xen-tools/, app-emulation/xen-tools/files/

[Yixun Lan]

commit:     ad60ab6a173e6a46c64bdb18aae3a9ac1881728f
Author:     Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Fri Mar 29 11:18:59 2019 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Wed Apr  3 04:55:28 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad60ab6a

app-emulation/xen-tools: bump to 4.12.0

Package-Manager: Portage-2.3.62, Repoman-2.3.12
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 +-
 app-emulation/xen-tools/files/gentoo-patches.conf                  | 2 +-
 .../{xen-tools-4.12.0_rc5.ebuild => xen-tools-4.12.0.ebuild}       | 7 +++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 7b9fd93efb0..7c6b2177429 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -5,6 +5,6 @@ DIST xen-4.10.3-upstream-patches-1.tar.xz 24064 BLAKE2B 
ec9339d00afd4057738a7816
 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.tar.gz 25152217 BLAKE2B 
a8dfbeb3d490787725c589e1ce82dcbbcd0be7fb4743b38daf3a8704dffda34d1faabb07d74e01d2fab1572ce0b730c21192469317545e8b3edb3fae1130ef8c
 SHA512 
c1655c5decdaed95a2b9a99652318cfc72f6cfdae957cfe60d635f7787e8850f33e8fafc4c4b8d61fb579c9b9d93028a6382903e71808a0418b931e76d72a649
-DIST xen-4.12.0-rc5.tar.gz 26514850 BLAKE2B 
41985dc33175bee8bddc4da0ec3b4da9f8cf3ebe580406011db47a27a8740566c1ace6e906d3385f73fee9b6cd572b0f3292381ac72a696fc15d020eb982ad02
 SHA512 
3d7fb254503c412a3c37782f7c75d093a1d43553dc110338d8dc00df0c6be4c8825cebf7f0519731e49263cef38d07ef48c18f073926d7eaf30abe64b13c52cb
+DIST xen-4.12.0.tar.gz 26949697 BLAKE2B 
9175cc9054e4a2b5c34df89a4efd667f86b4861bef9c3310bf431d041f710a7cb265b4d34a76ab18a17a3121392942d2e5d76c5044eb9b957d4255af889fe69a
 SHA512 
0ce366dcac607c9b592c5e9c0f40652eef743913b246bed4b0c380b8d59ac23a6adcd05befec37fc799a61476f47df76d4911cbf1da6ceb51441c546bf2464de
 DIST xen-gentoo-patches-16.tar.xz 36980 BLAKE2B 
a59fcb221a915e39fbbc463fa8b1ca1ef00007654936cc17f64853d91737478a6f78480a3e459b07b8c3ddcc81ab9400beb9ea3906750ba69864d1b97db349d2
 SHA512 
7727e5c7f4ef997eea830618bc26b26f3a99539a1c702264132401e41a328b384346a06b6721f18e3056fc91a2d2d2bf6320e0ae3c79432c7458a24a0d269c56
 DIST xen-ovmf-patches-3.tar.xz 4208 BLAKE2B 
0df8f85667a33c91cbfd86c59aec2ae65eca892b45d66eed76f793a52e2748989bc2785861f8bfdf94235ef7a6c0be6572c6e6cce9695469e40f0facd0ce3947
 SHA512 
abe001053ca702138bbcdd6bea14e2daae5c785f862d6a15001ca894c8ed8617f0c5dc439c6f54a41433b988acf57c71911af1db074aa76732c39d98622a3b5b

diff --git a/app-emulation/xen-tools/files/gentoo-patches.conf 
b/app-emulation/xen-tools/files/gentoo-patches.conf
index 6a6654a4a33..8b3a7b89fb0 100644
--- a/app-emulation/xen-tools/files/gentoo-patches.conf
+++ b/app-emulation/xen-tools/files/gentoo-patches.conf
@@ -72,7 +72,7 @@ ${_gx049}
 "
 
 # xen-tools-4.12.0 patches set
-_gpv_xen_tools_4120_rc5_0="
+_gpv_xen_tools_4120_0="
 ${_gx038}
 ${_gx027}
 ${_gx028} ${_gx029}

diff --git a/app-emulation/xen-tools/xen-tools-4.12.0_rc5.ebuild 
b/app-emulation/xen-tools/xen-tools-4.12.0.ebuild
similarity index 99%
rename from app-emulation/xen-tools/xen-tools-4.12.0_rc5.ebuild
rename to app-emulation/xen-tools/xen-tools-4.12.0.ebuild
index 36e89e49a69..6b2195b87b8 100644
--- a/app-emulation/xen-tools/xen-tools-4.12.0_rc5.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.12.0.ebuild
@@ -16,8 +16,7 @@ if [[ $PV == *9999 ]]; then
        EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
        S="${WORKDIR}/${REPO}"
 else
-       #KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-       KEYWORDS=""
+       KEYWORDS="~amd64 ~arm ~arm64 ~x86"
        UPSTREAM_VER=
        SECURITY_VER=
        # xen-tools's gentoo patches tarball
@@ -340,6 +339,10 @@ src_prepare() {
        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
 }