gentoo resync : 16.02.1018

3 files changed, 6 insertions, 5 deletions

diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 7b6328df1fd2..d3c9b301f46e 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -1,4 +1,4 @@
-AUX gentoo-patches.conf 4593 BLAKE2B 2bb97a5fc4c66a9789faf93e272751bf2051d2f8698555368deee1fbd524d2f4ac511206d72aa5dffcf190382a14b5f30273e7270ed9e13d6f291713d62b4298 SHA512 57fe07914a8a0f8a15e826946456a40777152c8fc36de303b2815dbe0258851eb4571a339a9770d3cd72c6a164efc0ca9ef3cd3a63d0d2b8f5d45524ea2307e9
+AUX gentoo-patches.conf 4593 BLAKE2B 704f67950be2f9fd3553b747fcb04b13754375b342c6809fe21c458bbcf2e67ce8bdb96f8fa3f861ca2602989920a9bde4d953c013fd5ab44c511d5932350284 SHA512 d7e3dc89b390039ae373552734d71bfb971d7dc761c245b4611090d4e7746839112ce79b5048d01f4472437149e50780bb72fd469e6a9c400fe2385d7d2f3521
 AUX stubs-32.h 537 BLAKE2B 456f57c4a4ba574c737f1b84b62a085d0290ebc8981a5f96fdebc16b6c86c801c5ca8dde135e803f46c5ec875fdd74770f6ed754880bc7af930b8ce1ce972fb7 SHA512 55308dbedaa91909a2213940f7a7b574cabe6b5a3104761a2a6f28d6aed00164544488c00cbf9d66a9a370a14c6b6d3a00434efd3ff0228cc8e4d81af19c0e68
 AUX xen-consoles.logrotate 63 BLAKE2B 4ae650876035d2815dbcacc6ed618c58cc61d9cfd9cde1b6c2f792cbf51898c577ef979443ad827fc82ced4d21ae24836883160b20d697965ef5377d50c2973c SHA512 ab2105c75cfe01768aecd5bcbb56269d63666e8a44e42b6a83aee87df6c84ee2f9ab249171c21b2e09f8fec2cae8318f6e87d160989398a3e7dd68db8d52c426
 AUX xen-watchdog.initd 181 BLAKE2B b8529db36016b6f71520c1e4119a2ea5c4d3f52f2c77ccb5603efb67bcdd88b8273a359f6ae0df61763ea31a50bd8a0be775df5aabbd17c90e7928c8ed5b7c0e SHA512 5f6da91c0067b93f1b9f1a2f181caf34034896944ab26f5820e860336e3b3159a65e8a7f39ea273927d64d58a2fe4d918d2c3234f2b03ab0770e0c15d6dfe84b
@@ -22,12 +22,12 @@ DIST xen-4.10.2.tar.gz 24697204 BLAKE2B b331d3ad8d7842446f7d2da5dd31560f636aa140
 DIST xen-4.11.0-upstream-patches-2.tar.xz 83788 BLAKE2B 3f612492827a1408a3ba058c64b8b9562f7415d19f15241257b7b6754aed472e37538bfed2a017c6664b276f43a1e9c5f87b60454b2eaa0613c84edeb035a28d SHA512 cddc270f2fddbf75f33b45496f5db4586b5463d65fa3604e9df48c116231f088551213c2a021f2b0ad329f7290b36bfdd577cda506c359311c65e897cdf50bd1
 DIST xen-4.11.0.tar.gz 25131533 BLAKE2B 892639b8bcd9b9956104e4d5137ffd88e17f92d965fa967b4af8d74a4fddcc21c6971c53026e0fb5ce833ab2c25c68f827abcac0b7b1dcebc21dca645c465573 SHA512 33d431c194f10d5ee767558404a1f80a66b3df019012b0bbd587fcbc9524e1bba7ea04269020ce891fe9d211d2f81c63bf78abedcdbe1595aee26251c803a50a
 DIST xen-4.11.1.tar.gz 25152217 BLAKE2B a8dfbeb3d490787725c589e1ce82dcbbcd0be7fb4743b38daf3a8704dffda34d1faabb07d74e01d2fab1572ce0b730c21192469317545e8b3edb3fae1130ef8c SHA512 c1655c5decdaed95a2b9a99652318cfc72f6cfdae957cfe60d635f7787e8850f33e8fafc4c4b8d61fb579c9b9d93028a6382903e71808a0418b931e76d72a649
-DIST xen-4.12.0-rc1.tar.gz 26926475 BLAKE2B 19ca3a4a6ffd1537c72f35e1092e86d217fabd218568fa4206ad4e42789b8cbb8a7e9a932ef515563f288f366026a32c158858fe2f99507441f665dfb66555fc SHA512 0d6bde8931794efed972ec951143d2532b6195d6e150d731b5c8d7d7bb107724531be7ed6ae13dd9bc1e98ad02033e1aa6c7b5c33f15f04fbcb98a6b0099b417
+DIST xen-4.12-rc2.tar.gz 26932109 BLAKE2B a774d0a8b70df6c373396ace1abf1fbed643473e31196b757c2272b692bcd9f96ad9b2c6ff054312d24d081b83a7893ca0ab90a5f7fedb5a7001aa9b06275338 SHA512 e492f618bfa81394c5adc092912490761edb17d2d34882c1848bad1faa9cbc317d7c771d39d6d5b48c461b79d596af4f8001bf34b64e8d632f7afa8dd41676f7
 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-ovmf-patches-3.tar.xz 4208 BLAKE2B 0df8f85667a33c91cbfd86c59aec2ae65eca892b45d66eed76f793a52e2748989bc2785861f8bfdf94235ef7a6c0be6572c6e6cce9695469e40f0facd0ce3947 SHA512 abe001053ca702138bbcdd6bea14e2daae5c785f862d6a15001ca894c8ed8617f0c5dc439c6f54a41433b988acf57c71911af1db074aa76732c39d98622a3b5b
 EBUILD xen-tools-4.10.2-r1.ebuild 13961 BLAKE2B 8ece04061371ab20e76d186cc41779fcf16d4f89cc012c20125dac0757c1683af00548eef37280a84ec28308c4693664f782224deed737d843d445510fd66bb5 SHA512 575f6e6cb7eb30e3a1362ee026e8cc420d1f34237a641901a1d999e185f9907f7d4769f841a2f63fee615187c116edb40168d02d93e6abb6cfc1ea10e597d68b
 EBUILD xen-tools-4.11.0-r3.ebuild 14011 BLAKE2B d6f25b322ac37231862f42368475936d77c64f69f71b2fa840819192dd528a47ba173a278937153deba79548fd94f66aa01f75d40b9819a61f838d01fece003d SHA512 34a825e9884b55826c5ac6eeab82053dc6c40a76f5ed7a095b08893964c6ba84e1c2a39985d37af2c0117ef86f145d97dd7dcd6bf9bee1f4f5ad08e0556a9b5e
 EBUILD xen-tools-4.11.1.ebuild 14241 BLAKE2B 148e1920a00ecb89dfd472490146f6ab97792b48e6435672d8d9b09e10d53e27c521dda5665177f13051d7cbc217713112a73e3dccafd8be7c97149d0b31b1c0 SHA512 dbfd731c16ab4e3ee3fd1bb8a401a40a8bfe3175dfbaa740bad49df4cd1b04551e2e28dbbfc323bd74b86a1e7d666af69cccbbab797b8e04db523750b51057fa
-EBUILD xen-tools-4.12.0_rc1.ebuild 14414 BLAKE2B d1102dd08f5e40b086471c56fa4f7d3610e9e97d07969ca48f2b521649d1098f2e2d21cb3d72593e9f44a9f6f1f54d89fd421aac79ca329b0d6270eef6b8b54c SHA512 e475c7efd953e160cebe432688f321a9ea20a208c6ab365ed68967e3f4e745018e24ef4c720e63102f43a5742c619fecf526ad16936ef59ef61c9bf289cf463a
+EBUILD xen-tools-4.12.0_rc2.ebuild 14459 BLAKE2B 6f2b6a9af415ea8402828468f0c37e26e113ab658cb6d363a6d7f0b489fb3612c05b348ec30fd0c3fb78cfd1477fd76b83bf3fdd2bb3ab492bd85f8654eb1cae SHA512 261f06612bc2d0e2703f02fb6e13a43ddd3babcda6fe89bc26215cd801c043b5530474e77bbd0d563ab6c5544f3229685f09d52726060435db43b9837b2b8ba4
 MISC metadata.xml 1267 BLAKE2B 8b9111b781201a51e373b606c888440fe42630f9cb08a43a4bb5a512456f57e7bb4e4f2af0a23d4cbf75489ba01efbc38820a6881317f16a459c96f8717d2b52 SHA512 c4e947a8cff20e4c5e77f5764fe26ee86a5674cc24ba2eedb7867476f9805ca47b895fcee92e8f353bb4bce877d32832318f8f7fd9514103fb2a963d6ea74647
diff --git a/app-emulation/xen-tools/files/gentoo-patches.conf b/app-emulation/xen-tools/files/gentoo-patches.conf
index 3a0129235ec6..0f3035221673 100644
--- a/app-emulation/xen-tools/files/gentoo-patches.conf
+++ b/app-emulation/xen-tools/files/gentoo-patches.conf
@@ -159,7 +159,7 @@ ${_gx049}
 "
 
 # xen-tools-4.12.0 patches set
-_gpv_xen_tools_4120_rc1_0="
+_gpv_xen_tools_4120_rc2_0="
 ${_gx038}
 ${_gx027}
 ${_gx028} ${_gx029}
diff --git a/app-emulation/xen-tools/xen-tools-4.12.0_rc1.ebuild b/app-emulation/xen-tools/xen-tools-4.12.0_rc2.ebuild
index 240450ba102e..6a0337a64557 100644
--- a/app-emulation/xen-tools/xen-tools-4.12.0_rc1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.12.0_rc2.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE='ncurses,xml,threads'
 
 inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs
 
-MY_PV=${PV/_/-}
+MY_PV=${PV/.0_/-}
 
 if [[ $PV == *9999 ]]; then
 	inherit git-r3
@@ -131,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
 "