gentoo resync : 19.03.2019

4 files changed, 10 insertions, 9 deletions

diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 65e4c0ce0913..ef1398842423 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -1,12 +1,13 @@
 AUX xen-4.6-efi.patch 1954 BLAKE2B c027aff764e83eef957241827980559ccfeec5525bf0ce6b6b2d38db565fd0f24b21609c1d497934ef823d42116eaf96799b45314f11f57a9238ab21f1255a00 SHA512 361af33159cf49626e92d2815fd4422ea5b1d696a32ce2695ce75205fbbfb89d96b64a8af7332fffdc4a4390000bf52d3730403dfc2334af0da0bea59d58b689
 DIST xen-4.10.2-upstream-patches-2.tar.xz 37800 BLAKE2B ecf4c1a97a1d76eef925e79fd25a654695a954f81bf8a5884cd4b1007714c888d6d7e19839556c457cf49a2f20ee88d5689a0287ffd7b16487dac676b3386daf SHA512 e9212efd65827286b729b08eded4bd6deda4a9f0b72af26bf0d106a111dddd1b56e51154d3e2a2ee4b38fcf4e8a81f30ffe2a6b711b9261e50e5954447d30e60
 DIST xen-4.10.2.tar.gz 24697204 BLAKE2B b331d3ad8d7842446f7d2da5dd31560f636aa1408dd3cc8798dff35b868ef5a609d17e97ef4355e1e5aa825a5abc74103796f9a8015037f0a564ffcebd825722 SHA512 2e301b4d6eb106fcb52203bc1208c8fd1fc7bb5d795166c0f86e4085227050301f7daa6f21db440c47bc2ca2c7f87d9b96753cfdf3fa724e0416b5679b84c163
-DIST xen-4.10.3-upstream-patches-0.tar.xz 3908 BLAKE2B db09278352cd532df5ad84e6e2bf8626c6f98e45bc2f00f627e6ba307024c903614681d25f36869c2b4b0539e985dab4a5f76fc53393a1a4e9cc14dba548c22b SHA512 97ab362b57ccaf477eae40eee84fcbe1947228c03a3430cf98db760adb2efe863d32d29646a2233ab6270c6e14989527362d0aaf7ba84cf9586dac90cb0200b7
+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.tar.gz 25152217 BLAKE2B a8dfbeb3d490787725c589e1ce82dcbbcd0be7fb4743b38daf3a8704dffda34d1faabb07d74e01d2fab1572ce0b730c21192469317545e8b3edb3fae1130ef8c SHA512 c1655c5decdaed95a2b9a99652318cfc72f6cfdae957cfe60d635f7787e8850f33e8fafc4c4b8d61fb579c9b9d93028a6382903e71808a0418b931e76d72a649
-DIST xen-4.12-rc2.tar.gz 26932109 BLAKE2B a774d0a8b70df6c373396ace1abf1fbed643473e31196b757c2272b692bcd9f96ad9b2c6ff054312d24d081b83a7893ca0ab90a5f7fedb5a7001aa9b06275338 SHA512 e492f618bfa81394c5adc092912490761edb17d2d34882c1848bad1faa9cbc317d7c771d39d6d5b48c461b79d596af4f8001bf34b64e8d632f7afa8dd41676f7
+DIST xen-4.12.0-rc5.tar.gz 26514850 BLAKE2B 41985dc33175bee8bddc4da0ec3b4da9f8cf3ebe580406011db47a27a8740566c1ace6e906d3385f73fee9b6cd572b0f3292381ac72a696fc15d020eb982ad02 SHA512 3d7fb254503c412a3c37782f7c75d093a1d43553dc110338d8dc00df0c6be4c8825cebf7f0519731e49263cef38d07ef48c18f073926d7eaf30abe64b13c52cb
 EBUILD xen-4.10.2-r2.ebuild 4795 BLAKE2B 2c8d72c915de0ea49d415f74653bcea64f8cbac1def72f526198ae5f3923dcf8a4011aef11cd310b36021bf5cedbe9116cd0402373380ec0ebb84aec8ff6c383 SHA512 31277e30c73c775d581804e15bbe1cd5a863a7633534f06547fc520cbf7ac296cafcccf0c3a3e290bb0c42a72d5b0270b5c34ab725d8687760187e821596a9eb
-EBUILD xen-4.10.3.ebuild 4796 BLAKE2B f653a6ad08d02979ae08574e30ec1e5f32022f9837c3f0fad1ebda5a9a421bfe55025b9446181d3f3ec70749000d21591924ca7afb97a1253494d6517e638ade SHA512 76671cb83ea9303bae0a8b6c1acdca345a1727fc57465261620ab2fd06472ed48f60a993cabe405e3a3a462cdb5dc37a0e0dce36591164084c3cf4832686b2b3
-EBUILD xen-4.11.1.ebuild 4795 BLAKE2B 4d7362604ab1be1541cbca8f47d43d2b1dfade482ff4ead1ca0fe43d2078a69312f8b86205970d5bd103b5142bb54175a664b096c84fb97fe3ab055f4c77c319 SHA512 2e7dcff4c8eb9fefd05eecd333fa7a3e61cf886882d96b97a38325f9a2595a5fe61ce0a49bb877655f061a0d4cd4646dfd21a07095d38a9bf557020703ce1822
-EBUILD xen-4.12.0_rc2.ebuild 4811 BLAKE2B 92f0a4f36b6c2a75a5998199660a1a7449b0410f1a22d8b1ce50981089dad21dcdc0a4f073539d0f169c6132f580f31bebce919af4a7fcc29a5678c241b8b3e8 SHA512 49e22a57e75e043df13b4b610389ae2fc81df908ed96c797e36f725dc373202ac3664765cac23ef8397e3c4ada953a7230dc743a637d2e9124f838b3a4681a22
+EBUILD xen-4.10.3-r1.ebuild 4795 BLAKE2B f1b5a6416aa0157162eda97a4d889f46325b51144d9aba769832ec7f503d7ee4cd74c580fdb6b61c51894abb9fb2761eef80183c6c4666fb65e1295aaf08c510 SHA512 6d82456c23ea10b238edb48920d5bc00ac262b2593415dd6f1528336487c036b100c0f8fe00afc109dd9dbdeede9909d1c7d8f2e0423e586f5746af280b8fc6c
+EBUILD xen-4.11.1-r1.ebuild 4796 BLAKE2B f653a6ad08d02979ae08574e30ec1e5f32022f9837c3f0fad1ebda5a9a421bfe55025b9446181d3f3ec70749000d21591924ca7afb97a1253494d6517e638ade SHA512 76671cb83ea9303bae0a8b6c1acdca345a1727fc57465261620ab2fd06472ed48f60a993cabe405e3a3a462cdb5dc37a0e0dce36591164084c3cf4832686b2b3
+EBUILD xen-4.12.0_rc5.ebuild 4809 BLAKE2B 5692f78d0cf4823ae463a28234752062fd374e2c6a341fc1cb2d047dfff4bdf57adbacb19eae0079ea6d89a6b75edcdc096def0eb38da662e848b4e00d3f1909 SHA512 6e963265f7f0a2c60a882d10868c23a45a6d5d48acfe9f228ec470d68d4de5c3f85272796798fdb3e676d195a32f072cda351693296cde8ac28c87d063fd62bc
 MISC metadata.xml 417 BLAKE2B 5713c8e5f27d56714938b7d2bed096c3b3f9fbb0ad9bce2bb3240e4a8556134cfc88efe0e2c7feb2e9cc722c11800e8433afa0d03746b05998909dd976230225 SHA512 2708f84b8a1508eebc96539993ae1bde4b921d4401229c221e2bee9a0cd643fdf1f854fcbba6033ed68667d0efb00c25222f4c68535a96f2200084d8d8759946
diff --git a/app-emulation/xen/xen-4.11.1.ebuild b/app-emulation/xen/xen-4.10.3-r1.ebuild
index b990fabd8b21..c776b7262c64 100644
--- a/app-emulation/xen/xen-4.11.1.ebuild
+++ b/app-emulation/xen/xen-4.10.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,8 +15,8 @@ if [[ $PV == *9999 ]]; then
 	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
 	SRC_URI=""
 else
-	KEYWORDS="~amd64 ~arm -x86"
-	UPSTREAM_VER=
+	KEYWORDS="amd64 ~arm -x86"
+	UPSTREAM_VER=1
 	SECURITY_VER=
 	GENTOO_VER=
 
diff --git a/app-emulation/xen/xen-4.10.3.ebuild b/app-emulation/xen/xen-4.11.1-r1.ebuild
index 18215b62c1d6..18215b62c1d6 100644
--- a/app-emulation/xen/xen-4.10.3.ebuild
+++ b/app-emulation/xen/xen-4.11.1-r1.ebuild
diff --git a/app-emulation/xen/xen-4.12.0_rc2.ebuild b/app-emulation/xen/xen-4.12.0_rc5.ebuild
index 1b413cfd7a98..0feb6edbf07d 100644
--- a/app-emulation/xen/xen-4.12.0_rc2.ebuild
+++ b/app-emulation/xen/xen-4.12.0_rc5.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 
 inherit flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs
 
-MY_PV=${PV/.0_/-}
+MY_PV=${PV/_/-}
 MY_P=${PN}-${MY_PV}
 
 if [[ $PV == *9999 ]]; then