gentoo resync : 19.03.2019

6 files changed, 496 insertions, 96 deletions

diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 2c9cf96890ad..cbf9b3f3378c 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -1,4 +1,4 @@
-AUX gentoo-patches.conf 4405 BLAKE2B 0a289df9c9afa13ef14cbf5e501527bc067e53ecb0c61f3bf70e1c79feaeae725145b8023546564f47c64334375b4bf54bcf71841e4d380fb24e3c1d7cea6844 SHA512 2985136230ffccd344daaa63a58dfc44d497c77e60984c781e5453ddeddc4529082ad83deb53518bbcb2f4c96bac305706118f2a58184d4d90b8dedda5d2880e
+AUX gentoo-patches.conf 2162 BLAKE2B 42bd4aeb0a3ee1e6d6b66014b6ae88a23d1bf2549c316a9f1a65269215687780db334791c5ee65b3ca617b38c6c010c4e9b0d4c8fc87abc3dcd328eb6a174b92 SHA512 7b7d30b8957b99d98360be9e5faf655a08a774bcef41c064a519bde4e35a4415b0e4e617503d44282cb0c211b5c592b7efa670a4fcec85d4ef78e437928269eb
 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
@@ -19,14 +19,17 @@ DIST seabios-1.10.0.tar.gz 588213 BLAKE2B 254eb4572a1dac06020a545820efb53a130a02
 DIST seabios-1.12.0.tar.gz 613542 BLAKE2B f145c2db716996bfa9e5c014086ccfaa8ae96ebc158f34303b122b7bf209408c567665d8691364df8d8e886f63e0e72a3f3cd319dfa86ef581023201b5d94e53 SHA512 e52c5363e5bb37b5286e55545aa06bd126218f9d0e3a06ac2e189de68fe3de3256c11ca1bb13357a9c384d7e3af6284083ff3aa587688b5de04ef11b97bdfa27
 DIST xen-4.10.2-upstream-patches-1.tar.xz 31768 BLAKE2B 9205e5fa011426ae3eeaa19694d14ca233805be1e60326d53ec319de1fa28e3b30e7949d7d694ccc8f0e5ea77df580bb6cf22652ae1fd023fdc49b2d37dbce0a SHA512 38c2286d8c1e39d42c266c76d97b5321ca5fb931ebe33ff01c5210fdda4d64ccb39eb6463e756c5178ab7d1c8433a56668abf1dabf4b5b5e85823817d927cd33
 DIST xen-4.10.2.tar.gz 24697204 BLAKE2B b331d3ad8d7842446f7d2da5dd31560f636aa1408dd3cc8798dff35b868ef5a609d17e97ef4355e1e5aa825a5abc74103796f9a8015037f0a564ffcebd825722 SHA512 2e301b4d6eb106fcb52203bc1208c8fd1fc7bb5d795166c0f86e4085227050301f7daa6f21db440c47bc2ca2c7f87d9b96753cfdf3fa724e0416b5679b84c163
+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
 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
 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.10.3.ebuild 14163 BLAKE2B 2c315ecaa9970f3ff010821499dc824cba0b950b204f10c7c79fc3420d0913ad686f7872e70de8f774afeac7b4828594d2aeeb548b760ae7f9051f9cce08f3ae SHA512 504e6b107dbfce6932285c119dd59d7ecc81a5839d0e93f1a05d4788505e4c72bbf728e8e42da73e90af64f017a8c9160e22aa281deb7af226b89c72c14ceddb
-EBUILD xen-tools-4.11.1.ebuild 14352 BLAKE2B f20965c22d604a9883c21990aa6a6a56fa2470ae6ba026209eed48a73d578780b0cf0f45751d9b7618d3b106851fb6943bdb748663f8933275372205d1717fb3 SHA512 c11fa59288b99da5a1efbf5483f25916debdb5d0b58900ee0518642a9cf8d513e87669b07aea2d2e56cafe4a290bab9ed36f5db36271486e098be0ee9e5049d2
-EBUILD xen-tools-4.12.0_rc2.ebuild 14459 BLAKE2B 6f2b6a9af415ea8402828468f0c37e26e113ab658cb6d363a6d7f0b489fb3612c05b348ec30fd0c3fb78cfd1477fd76b83bf3fdd2bb3ab492bd85f8654eb1cae SHA512 261f06612bc2d0e2703f02fb6e13a43ddd3babcda6fe89bc26215cd801c043b5530474e77bbd0d563ab6c5544f3229685f09d52726060435db43b9837b2b8ba4
+EBUILD xen-tools-4.10.3-r1.ebuild 14163 BLAKE2B a3f2e470146d5bfc0da08d8375b91d56baeafa0508e5b4cb782f1ef2fd27ecd3a4df75b505ae024274919f4c8f63e9d6718667258ace03aac5025dee025afcba SHA512 e12797dc20c1070e96ec5e610ad76152e8a8e7902398df33a378977f86d45863cdb1d6787709958930c96fbedae21b4a237d033366d537c446a6a04653101a71
+EBUILD xen-tools-4.10.3-r2.ebuild 14163 BLAKE2B b84f3ee41d97eae1319198c3d0a4dd661d382c697b6bd3bd10d384fa67fab00f4c16ec66d7c279789d108bf4e80d42727d78c878ab70447fd91e66465e2fac7b SHA512 84464e950763bfc1d8f48b7b4d0927df9343e41f218c4e525fe08d5852250069ea004924a5c9566edaa5e3b29da5c36f8a572a3b96153134c05168ccb897e000
+EBUILD xen-tools-4.11.1-r2.ebuild 14353 BLAKE2B 4776c2e41a5928b680a36fdecbe804572bc8c0cb887e9b739486ed9084b5508ab71407b50b9893caf1ce6e0286bfa5e609bc0e11b98925033b1892a43bbdee5f SHA512 fc3104227a722d1d48f3ec03c0ed9bd5e2a2f13c5d9a5d89c7025725a5ccb8310fefbbb70c8aef2603e123092f28c3f47a873f2b296c89da712bcbacba4150f1
+EBUILD xen-tools-4.12.0_rc5.ebuild 14418 BLAKE2B db154a219cb5804572ca1a9140927ac1c377072e6dc3126cb10faa507f97a44c5501a5215c59c5d143de9feb9c32725a0e7b1f5cd1afcfab206f49b56aba9648 SHA512 c26cda188e6343c04ee7522458826f184ce66439d0b065a3e3b0f6bd49d063f049993f07fb7bd1bc8d17b87f5ad204781f6155a9e1947265ef3dc4246db4ba57
 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 1bf40fcce797..234abc9b2ad0 100644
--- a/app-emulation/xen-tools/files/gentoo-patches.conf
+++ b/app-emulation/xen-tools/files/gentoo-patches.conf
@@ -1,76 +1,17 @@
-# Drop .config, fixes to gcc-4.6
-_gx001=" xen-4-fix_dotconfig-gcc.patch"
-_gx020=" xen-4.3-fix_dotconfig-gcc.patch"
-
-# Fix texi2html build error with new texi2html, qemu.doc.html
-_gx002=" xen-tools-4-docfix.patch"
-_gx003=" xen-tools-4-qemu-xen-doc.patch"
-
-_gx004=" xen-tools-4.2-pod-utf8-chars.patch"
-_gx005=" xen-tools-4.2-pod-docs.patch"
-_gx006=" xen-tools-4.2-pod-xl.patch"
-
-# Fix network broadcast on bridged networks
-_gx007=" xen-tools-3.4.0-network-bridge-broadcast.patch"
-
 # Bug 496708
-_gx008=" xen-tools-4-unbundle-ipxe.patch"
 _gx045=" xen-tools-4.10.1-unbundle-ipxe.patch"
-#use system-seabios && epatch "${FILESDIR}"/${PN}-4-unbundle-seabios.patch
-
-# Fix bridge by idella4, bug #362575
-_gx009=" xen-tools-4.1.1-bridge.patch"
-
-# Conditional patch, fix in ebuild
-# Don't build ipxe with pie on hardened, Bug #360805
-#if gcc-specs-pie; then
-#	epatch "${FILESDIR}"/ipxe-nopie.patch
-#fi
-
-# Prevent double stripping of files at install
-_gx010=" xen-4.2.0-nostrip.patch"
-_gx024+=" xen-4.4-nostrip.patch"
-
-# fix jobserver in Makefile
-_gx011=" xen-4.2.0-jserver.patch"
-_gx021=" xen-4.3-jserver.patch"
-
-# add missing header, Bug #467200
-_gx012=" xen-4-ulong.patch"
-_gx013=" xen-tools-4.2-xen_disk_leak.patch"
-
-# Set dom0-min-mem to kb; Bug #472982
-_gx014=" xen-4.2-configsxp.patch"
-
-# Bug 463840
-_gx015=" xen-tools-4.2.2-install.patch"
-_gx016=" xen-tools-4.2.2-rt-link.patch"
 
 # Bug 379537
 _gx017=" fix-gold-ld.patch"
 
-# Bug 510976
-_gx018=" xen-tools-4.2.4-udev-rules.patch"
-
-# bundled seabios
-_gx019=" xen-tools-4-anti-seabios-download.patch"
-_gx032=" xen-tools-4.5-anti-seabios-download.patch"
-
 # Bug 477676
-_gx022=" xen-tools-4.3-ar-cc.patch"
 _gx038=" xen-tools-4.8-ar-cc.patch"
 
 # Prevent file collision with qemu package Bug 478064
-_gx023=" qemu-bridge.patch"
-_gx025=" xen-4.4-qemu-bridge.patch"
-_gx031=" xen-4.5-qemu-bridge.patch"
-_gx039=" xen-4.8-qemu-bridge.patch"
 _gx043=" xen-4.10-qemu-bridge.patch"
 _gx051=" xen-4.12-qemu-bridge.patch"
 #mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
 
-_gx026=" xen-tools-4.4-api-fix.patch"
-
 # Fix po file collision with app-emulation/qemu, while USE=qemu is enabled, Bug 508302
 _gx027=" xen-tools-4-qemu-fix-po-collision.patch"
 
@@ -80,40 +21,22 @@ _gx028=" xen-tools-4.4.1-tinfo.patch"
 # Don't download ovmf, use pre-released
 _gx029=" xen-tools-4-anti-ovmf-download.patch"
 
-# fix build err while using gcc-4.5.x, c99
-_gx033=" xen-tools-4.4.2-gcc99.patch"
-_gx034=" xen-tools-4.5.0-gcc99.patch"
-
-_gx035=" xen-tools-4.2-pod-docs-r1.patch"
-# disable stackcheck for hardened system, bug 569810
-_gx036=" xen-tools-4.6-no-stackcheck.patch"
-
 # increase stack to fix xenqemu err
 # https://lists.gnu.org/archive/html/qemu-devel/2016-09/msg03961.html
 _gx037=" xen-tools-4.6-increase-stack-size.patch"
 
-
-#Fix issues with zero-length records in migration v2"
-#https://xenbits.xen.org/gitweb/?p=people/andrewcoop/xen.git;a=shortlog;h=refs/heads/tools-fix-zero-length-records
-_gx040=" 0001-docs-Clarify-the-expected-behaviour-of-zero-length-r.patch
-	0003-tools-libxc-Avoid-generating-inappropriate-zero-leng.patch
-	0004-tools-python-Adjust-migration-v2-library-to-warn-abo.patch"
-
-_gx041=" 0002-tools-libxc-Tolerate-zero-length-records-in-migratio.patch"
-
 #Fix missing makedev(), major(), minor()
 _gx042=" xen-tools-4.8.2-makedev.patch"
 
-# Fix building with glibc 2.27, bug #648182
-_gx044=" xen-tools-4.9-glibc-memfd.patch"
-
 # Disable failing shim
 _gx046=" xen-tools-4.10.1-shim.patch"
 _gx050=" xen-tools-4.12.0-shim.patch"
 
 # Fix building with gcc 8, bug #657388
 _gx047=" xen-tools-4.10.1-gcc8.patch"
-_gx048=" xen-tools-4.11.0-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"
@@ -138,6 +61,16 @@ ${_gx045} ${_gx046} ${_gx047}
 ${_gx049}
 "
 
+# xen-tools-4.10.3 patches set r1
+_gpv_xen_tools_4103_1="
+${_gx038} ${_gx017} ${_gx043}
+${_gx027}
+${_gx028} ${_gx029}
+${_gx037} ${_gx042}
+${_gx045} ${_gx046} ${_gx052}
+${_gx049}
+"
+
 # xen-tools-4.11.1 patches set
 _gpv_xen_tools_4111_0="
 ${_gx038} ${_gx017} ${_gx043}
@@ -149,10 +82,10 @@ ${_gx049}
 "
 
 # xen-tools-4.12.0 patches set
-_gpv_xen_tools_4120_rc2_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.10.3.ebuild b/app-emulation/xen-tools/xen-tools-4.10.3-r1.ebuild
index f8e1a14db295..2f949b56d4ce 100644
--- a/app-emulation/xen-tools/xen-tools-4.10.3.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.10.3-r1.ebuild
@@ -16,8 +16,8 @@ if [[ $PV == *9999 ]]; then
 	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
 	S="${WORKDIR}/${REPO}"
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-	UPSTREAM_VER=
+	KEYWORDS="amd64 ~arm ~arm64 ~x86"
+	UPSTREAM_VER=1
 	SECURITY_VER=
 	# xen-tools's gentoo patches tarball
 	GENTOO_VER=14
diff --git a/app-emulation/xen-tools/xen-tools-4.10.3-r2.ebuild b/app-emulation/xen-tools/xen-tools-4.10.3-r2.ebuild
new file mode 100644
index 000000000000..f0965d4e365d
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-4.10.3-r2.ebuild
@@ -0,0 +1,464 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='ncurses,xml,threads'
+
+inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs
+
+MY_PV=${PV/_/-}
+
+if [[ $PV == *9999 ]]; then
+	inherit git-r3
+	REPO="xen.git"
+	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
+	S="${WORKDIR}/${REPO}"
+else
+	KEYWORDS="amd64 ~arm ~arm64 ~x86"
+	UPSTREAM_VER=1
+	SECURITY_VER=
+	# xen-tools's gentoo patches tarball
+	GENTOO_VER=16
+	# xen-tools's gentoo patches version which apply to this specific ebuild
+	GENTOO_GPV=1
+	# xen-tools ovmf's patches
+	OVMF_VER=3
+
+	SEABIOS_VER=1.10.0
+	# OVMF upstream 5920a9d16b1ab887c2858224316a98e961d71b05
+	OVMF_PV=20170321
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz
+		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz
+		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	[[ -n ${OVMF_VER} ]] && \
+		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://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} )
+	${UPSTREAM_PATCHSET_URI}
+	${SECURITY_PATCHSET_URI}
+	${GENTOO_PATCHSET_URI}"
+
+	S="${WORKDIR}/xen-${MY_PV}"
+fi
+
+DESCRIPTION="Xen tools including QEMU and xl"
+HOMEPAGE="https://www.xenproject.org"
+DOCS=( README docs/README.xen-bugtool )
+
+LICENSE="GPL-2"
+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"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	pygrub? ( python )
+	ovmf? ( hvm )
+	^^ ( qemu system-qemu )"
+
+COMMON_DEPEND="
+	sys-apps/pciutils
+	dev-libs/lzo:2
+	dev-libs/glib:2
+	dev-libs/yajl
+	dev-libs/libaio
+	dev-libs/libgcrypt:0
+	sys-libs/zlib
+	${PYTHON_DEPS}
+"
+
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-4.11
+	dev-python/lxml[${PYTHON_USEDEP}]
+	x86? ( sys-devel/dev86
+		sys-power/iasl )
+	pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
+	api? ( dev-libs/libxml2
+		net-misc/curl )
+	ovmf? (
+		!arm? ( !arm64? ( dev-lang/nasm ) )
+		$(python_gen_impl_dep sqlite)
+		)
+	!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 )
+	dev-lang/perl
+	app-misc/pax-utils
+	doc? (
+		app-text/ghostscript-gpl
+		app-text/pandoc
+		dev-python/markdown[${PYTHON_USEDEP}]
+		dev-texlive/texlive-latexextra
+		media-gfx/transfig
+	)
+	hvm? ( x11-base/xorg-proto )
+	qemu? (
+		app-arch/snappy:=
+		x11-libs/pixman
+		sdl? ( media-libs/libsdl[X] )
+	)
+	system-qemu? ( app-emulation/qemu[xen] )
+	ocaml? ( dev-ml/findlib
+		>=dev-lang/ocaml-4 )"
+
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/iproute2[-minimal]
+	net-misc/bridge-utils
+	screen? (
+		app-misc/screen
+		app-admin/logrotate
+	)"
+
+# hvmloader is used to bootstrap a fully virtualized kernel
+# Approved by QA team in bug #144032
+QA_WX_LOAD="
+	usr/libexec/xen/boot/hvmloader
+	usr/share/qemu-xen/qemu/s390-ccw.img
+	usr/share/qemu-xen/qemu/u-boot.e500
+"
+
+QA_PREBUILT="
+	usr/libexec/xen/bin/ivshmem-client
+	usr/libexec/xen/bin/ivshmem-server
+	usr/libexec/xen/bin/qemu-img
+	usr/libexec/xen/bin/qemu-io
+	usr/libexec/xen/bin/qemu-nbd
+	usr/libexec/xen/bin/qemu-system-i386
+	usr/libexec/xen/bin/virtfs-proxy-helper
+	usr/libexec/xen/libexec/xen-bridge-helper
+	usr/share/qemu-xen/qemu/s390-ccw.img
+	usr/share/qemu-xen/qemu/s390-netboot.img
+	usr/share/qemu-xen/qemu/u-boot.e500
+"
+
+RESTRICT="test"
+
+pkg_setup() {
+	python_setup
+	export "CONFIG_LOMOUNT=y"
+
+	#bug 522642, disable compile tools/tests
+	export "CONFIG_TESTS=n"
+
+	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64 ; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+}
+
+src_prepare() {
+	local i
+
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		einfo "Try to apply Xen Upstream patch set"
+		eapply "${WORKDIR}"/patches-upstream
+	fi
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+	einfo "Try to apply Xen Security patch set"
+		# apply main xen patches
+		# Two parallel systems, both work side by side
+		# Over time they may concdense into one. This will suffice for now
+		EPATCH_SUFFIX="patch"
+		EPATCH_FORCE="yes"
+
+		source "${WORKDIR}"/patches-security/${PV}.conf || die
+
+		for i in ${XEN_SECURITY_MAIN}; do
+			eapply "${WORKDIR}"/patches-security/xen/$i
+		done
+
+		# apply qemu-xen/upstream patches
+		pushd "${S}"/tools/qemu-xen/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUU}; do
+			eapply "${WORKDIR}"/patches-security/qemuu/$i
+		done
+		popd > /dev/null
+
+		# apply qemu-traditional patches
+		pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUT}; do
+			eapply "${WORKDIR}"/patches-security/qemut/$i
+		done
+		popd > /dev/null
+	fi
+
+	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
+	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
+	pushd tools/firmware/ > /dev/null
+	ln -s seabios-dir-remote seabios-dir || die
+	popd > /dev/null
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
+		einfo "Try to apply Gentoo specific patch set"
+		source "${FILESDIR}"/gentoo-patches.conf || die
+		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
+		for i in ${!_gpv}; do
+			eapply "${WORKDIR}"/patches-gentoo/$i
+		done
+	fi
+
+	# Ovmf's patchset
+	if use ovmf; then
+		if [[ -n ${OVMF_VER} ]];then
+			einfo "Try to apply Ovmf patch set"
+			pushd "${WORKDIR}"/ovmf-*/ > /dev/null
+			eapply "${WORKDIR}"/patches-ovmf
+			popd > /dev/null
+		fi
+		mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
+	fi
+
+	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
+
+	# 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
+	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
+		-i tools/firmware/Makefile || die
+
+	# Drop .config, fixes to gcc-4.6
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+
+		# try and remove all the default cflags
+		find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
+			-exec sed \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+				-i {} + || die "failed to re-set custom-cflags"
+	else
+		unset CFLAGS
+		unset LDFLAGS
+		unset ASFLAGS
+		unset CPPFLAGS
+	fi
+
+	if ! use pygrub; then
+		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
+	fi
+
+	if ! use python; then
+		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
+	fi
+
+	if ! use hvm; then
+		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
+	# Bug 351648
+	elif ! use x86 && ! has x86 $(get_all_abis); then
+		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
+		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
+		export CPATH="${WORKDIR}"/extra-headers
+	fi
+
+	if use qemu; then
+		if use sdl; then
+			sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
+				tools/Makefile || die
+		else
+			sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
+				tools/qemu-xen-traditional/xen-setup || die
+			sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
+				tools/Makefile || die
+		fi
+	else
+		# Don't bother with qemu, only needed for fully virtualised guests
+		sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die
+	fi
+
+	# Reset bash completion dir; Bug 472438
+	sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
+		-i Config.mk || die
+	sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
+
+	# xencommons, Bug #492332, sed lighter weight than patching
+	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
+		-i tools/hotplug/Linux/init.d/xencommons.in || die
+
+	# fix bashishm
+	sed -e '/Usage/s/\$//g' \
+		-i tools/hotplug/Linux/init.d/xendriverdomain.in || die
+
+	# respect multilib, usr/lib/libcacard.so.0.0.0
+	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
+		-i tools/qemu-xen/configure || die
+
+	#bug 518136, don't build 32bit exactuable for nomultilib profile
+	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
+		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
+	fi
+
+	# uncomment lines in xl.conf
+	sed -e 's:^#autoballoon=:autoballoon=:' \
+		-e 's:^#lockfile=:lockfile=:' \
+		-e 's:^#vif.default.script=:vif.default.script=:' \
+		-i tools/examples/xl.conf  || die
+
+	default
+}
+
+src_configure() {
+	local myconf="--prefix=${PREFIX}/usr \
+		--libdir=${PREFIX}/usr/$(get_libdir) \
+		--libexecdir=${PREFIX}/usr/libexec \
+		--localstatedir=${EPREFIX}/var \
+		--disable-werror \
+		--disable-xen \
+		--enable-tools \
+		--enable-docs \
+		$(use_enable pam) \
+		$(use_enable api xenapi) \
+		$(use_enable ovmf) \
+		$(use_enable ocaml ocamltools) \
+		--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
+		"
+
+	use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
+	use system-qemu && myconf+=" --with-system-qemu=/usr/bin/qemu-system-x86_64"
+	use amd64 && myconf+=" $(use_enable qemu-traditional)"
+	tc-ld-disable-gold # Bug 669570
+	econf ${myconf}
+}
+
+src_compile() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" build-tools ${myopt}
+
+	if use doc; then
+		emake -C docs build
+	else
+		emake -C docs man-pages
+	fi
+}
+
+src_install() {
+	# Override auto-detection in the build system, bug #382573
+	export INITD_DIR=/tmp/init.d
+	export CONFIG_LEAF_DIR=../tmp/default
+
+	# Let the build system compile installed Python modules.
+	local PYTHONDONTWRITEBYTECODE
+	export PYTHONDONTWRITEBYTECODE
+
+	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
+		XEN_PYTHON_NATIVE_INSTALL=y install-tools
+
+	# Created at runtime
+	rm -rv "${ED%/}/var/run" || die
+
+	# Fix the remaining Python shebangs.
+	python_fix_shebang "${D}"
+
+	# Remove RedHat-specific stuff
+	rm -rf "${D}"tmp || die
+
+	if use doc; then
+		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
+		dodoc -r docs/{pdf,txt}
+	else
+		emake -C docs DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-man-pages # Bug 668032
+	fi
+	dodoc ${DOCS[@]}
+
+	newconfd "${FILESDIR}"/xendomains.confd xendomains
+	newconfd "${FILESDIR}"/xenstored.confd xenstored
+	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
+	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
+	newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored
+	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
+	newinitd "${FILESDIR}"/xencommons.initd xencommons
+	newconfd "${FILESDIR}"/xencommons.confd xencommons
+	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
+	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
+	newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog
+
+	if use screen; then
+		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
+		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
+		keepdir /var/log/xen-consoles
+	fi
+
+	# For -static-libs wrt Bug 384355
+	if ! use static-libs; then
+		rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
+	fi
+
+	# for xendomains
+	keepdir /etc/xen/auto
+
+	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
+	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
+		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
+
+	keepdir /var/lib/xen/dump
+	keepdir /var/lib/xen/xenpaging
+	keepdir /var/lib/xenstored
+	keepdir /var/log/xen
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the offical wiki page:"
+	elog "https://wiki.gentoo.org/wiki/Xen"
+	elog "https://wiki.xen.org/wiki/Main_Page"
+	elog ""
+	elog "Recommended to utilise the xencommons script to config system at boot"
+	elog "Add by use of rc-update on completion of the install"
+
+	if ! use hvm; then
+		echo
+		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
+		elog "support enable the hvm use flag."
+		elog "An x86 or amd64 system is required to build HVM support."
+	fi
+
+	if use qemu; then
+		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
+		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
+		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
+		elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise"
+	fi
+}
diff --git a/app-emulation/xen-tools/xen-tools-4.11.1.ebuild b/app-emulation/xen-tools/xen-tools-4.11.1-r2.ebuild
index 2b0aeec7f834..c6d51462da39 100644
--- a/app-emulation/xen-tools/xen-tools-4.11.1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.11.1-r2.ebuild
@@ -17,10 +17,10 @@ if [[ $PV == *9999 ]]; then
 	S="${WORKDIR}/${REPO}"
 else
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-	UPSTREAM_VER=
+	UPSTREAM_VER=0
 	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
diff --git a/app-emulation/xen-tools/xen-tools-4.12.0_rc2.ebuild b/app-emulation/xen-tools/xen-tools-4.12.0_rc5.ebuild
index 6a0337a64557..36e89e49a695 100644
--- a/app-emulation/xen-tools/xen-tools-4.12.0_rc2.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.12.0_rc5.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/.0_/-}
+MY_PV=${PV/_/-}
 
 if [[ $PV == *9999 ]]; then
 	inherit git-r3
@@ -21,7 +21,7 @@ else
 	UPSTREAM_VER=
 	SECURITY_VER=
 	# xen-tools's gentoo patches tarball
-	GENTOO_VER=15
+	GENTOO_VER=16
 	# xen-tools's gentoo patches version which apply to this specific ebuild
 	GENTOO_GPV=0
 	# xen-tools ovmf's patches
@@ -43,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} )
@@ -56,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)"