gentoo auto-resync : 16:07:2022 - 13:45:35

6 files changed, 5 insertions, 241 deletions

diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 1e4908447621..6f8e6d7f2b55 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -1,11 +1,7 @@
 AUX README.gentoo 572 BLAKE2B 1284e49ac0bde0e1c1ad32b7dc200848c0837378224daed628036b5835998c9649574e2b91b4891a610188f01900922d3b2bb23fd6381682c3486bc83be9a9ef SHA512 d7312c11154b3446a66af5e11a9d8e1a30c29e42867b51a073f4460078c9a1b7acb94cea6d38bcd7fdafbb4384856cd11093f41eee1941ca43303a5e21765b03
-AUX gentoo-patches.conf 2606 BLAKE2B 7fe706c365038bf0c21a3001cd5f6f73be05302eb947f18a471375059095b563a7a880894d39521bca1acc99b15e7b2ab3d6214cd1dccc9b3dc2844c68eac4a8 SHA512 4cc22817195d8a125c9ead62c7dc1354b797f06db2d18f5d14821d67ab9235d99ac432ba2e0402f92563b6262a706a4f2163f3972a00142a29bb92748851ce97
 AUX stubs-32.h 537 BLAKE2B 456f57c4a4ba574c737f1b84b62a085d0290ebc8981a5f96fdebc16b6c86c801c5ca8dde135e803f46c5ec875fdd74770f6ed754880bc7af930b8ce1ce972fb7 SHA512 55308dbedaa91909a2213940f7a7b574cabe6b5a3104761a2a6f28d6aed00164544488c00cbf9d66a9a370a14c6b6d3a00434efd3ff0228cc8e4d81af19c0e68
 AUX xen-consoles.logrotate 63 BLAKE2B 4ae650876035d2815dbcacc6ed618c58cc61d9cfd9cde1b6c2f792cbf51898c577ef979443ad827fc82ced4d21ae24836883160b20d697965ef5377d50c2973c SHA512 ab2105c75cfe01768aecd5bcbb56269d63666e8a44e42b6a83aee87df6c84ee2f9ab249171c21b2e09f8fec2cae8318f6e87d160989398a3e7dd68db8d52c426
-AUX xen-tools-4.15.0-fix-xenstat-python-bindings.patch 850 BLAKE2B e0150d32e01ddda954b97eee9d4f0df97f01b710193e803c7db08776bee71b8a05b78ab1bec858c69834a3b61a7562dd25b6c78ad49dc9d5a68109ad171d17b7 SHA512 25df248f40d37be130f8601d5b7a0e21562c31e9d4e4b65af632048e7b29d63397434ce45afeee0eeb6686ed43f7b659427ca6e151cbd17007798058917abd7c
 AUX xen-tools-4.15.1-brotli-gcc11.patch 1283 BLAKE2B 846d0d3b687f576bcc737a53afe2885d9e8a261e3a23ee18a5871af2bafef6fa4208f1eeb557c843140021b2144d8c51c3e9682233dcff6a0b4148122eacb9ee SHA512 2c3426573db4ab27eb48aac5736c5094c7160893ad318ebf69a6caf64e20881a526658ff6f72cacc357b615c8795a777ebc897ba586f28fbbc08dca28caaaf0f
-AUX xen-tools-4.15.1-edk2-python3.9.patch 1164 BLAKE2B cbb22fd2409bd5cc98563389a64eb64a1c00969d854cdffeaa3060f4fc897518b4e22aa1902c066b8cc9a4390f298ad74815ba3ecd3788b8dc3ec42c8f36901a SHA512 d1727dd9c74ec6250a4c118553f63b1b71c5629fa1b2dc19ce8fecaf8d97a00e717f6162b5ab62d5ea6a92235e25e66e9be46a3058fc1bbd6a9266ad092ee961
-AUX xen-tools-4.15.1-ocaml-4.12.patch 3605 BLAKE2B 0b9783d3d78c6e00710ec3edd7e6977dc3b2cb0f59933d678ddb64a3bebdaa269e62449666a72a6715c8358566b0f81db5f2e0bbc027ae0fbc1f6bc9a32a2130 SHA512 686c86ac3c80b80010a35aff5bafe96b91e1cb7eb58396fb29c611003cdbbc56764d76afded4c97420a04232344e35a4d55f7ffcaad973543c75e88506334842
 AUX xen-watchdog.initd 181 BLAKE2B b8529db36016b6f71520c1e4119a2ea5c4d3f52f2c77ccb5603efb67bcdd88b8273a359f6ae0df61763ea31a50bd8a0be775df5aabbd17c90e7928c8ed5b7c0e SHA512 5f6da91c0067b93f1b9f1a2f181caf34034896944ab26f5820e860336e3b3159a65e8a7f39ea273927d64d58a2fe4d918d2c3234f2b03ab0770e0c15d6dfe84b
 AUX xencommons.confd 109 BLAKE2B 6a2023a95cd1e411abe57c321e1c5f13096b51299817ce547e8ff042cbdbf859a5c1f50135e946fe650e0ec9221db3389ff50bc23f6d88d0c0fd1805b64786be SHA512 f0bbc9647cecc6cf806e3059960fbe39b23304d9ca0955fb261e1d320b9b9ce59e5b28cc4b5a9922295b31221f0cd8f0cccb405520e097a7b12dc6ddb3294c17
 AUX xencommons.initd 1451 BLAKE2B ef0cfa4fc7c4071b7a5822f4ad8983b9f7c386505e8b6967139c8921b002ff03a0a2be235060160d00d3890cffd15300b588c2b06a67a839df110c3737bbaee5 SHA512 1d25ae65ff073a5fc00aed2011af9e38f53d179dfadd06f791a4599c070a5ddbbf75d80b37e219b6de5d09e3466510c241311cbb018ef22cd3c97ce3b7c15b3c
@@ -27,10 +23,10 @@ DIST seabios-1.14.0.tar.gz 628985 BLAKE2B cc1126925dab1551a655680d20d06ebf28c12c
 DIST xen-4.15.3.tar.gz 40793144 BLAKE2B 33932d855a0502cfe2768a7c8ae19d7da285d70b4970d96fd703daf0ee24a77ad47a3d1b4bcf5f465aa81aa7eb7f9295bce96302b2149ca208fa662cd966d6af SHA512 c25903cc263891885ec76500488405226c8e025bb461d2bf0d590b9bd2d7ca5c2693de7ecc38b3655bfd6793cc96314826559f14a09cc139de8cfdbeb914cbd3
 DIST xen-4.16.1.tar.gz 44964667 BLAKE2B 190d9c330b5dcdd47bae26b6ef42111c9c63b71b8b92e20eae268054c6b40aaabadef78c0c9634cb3c3b1bde32a746cbb1404b5eed2a82ab829ba10632103856 SHA512 eeabba9c263cd2425bca083e32b5ebfc6c716c00553759c144fd4b6f64a89836b260787fa25ba22c1f5c4ea65aaad7c95b8c2c1070d3377b1c43c9517aa7032a
 DIST xen-gentoo-patches-4.15.3-gentoo-patchset-2.tar.bz2 4681 BLAKE2B 59fe5c2d5f3b975f281778ee96f8771debde7ae738636fc8294e7e2578dffc40938d8c48e4e94f0341762b2ba8e1b6769f71b7783322fb3b2a0a187bbf2b5104 SHA512 8540aa3631277fb652f90c53f6f5b4e9d119a7ed267dec96d7aecca4eac2c465ec3be32b0b82057e79f858cc8115bfdfbf2af5c4879a0be3f98ed68cbe64fdae
-DIST xen-gentoo-patches-4.16.1-gentoo-patchset-1.tar.bz2 4351 BLAKE2B 1ba306fbc4a55aa1fea71139f7a900c8c363cf948f34a2aabd1ff6f8a68f2e632154ea0e0289580c84328b372c4f8cfdb2879bc63ae3ec163bfb29487783a758 SHA512 8d8198fbf8d9d4b46a83cf46c965448cb47b30438518a70c9b552c7cd1b23616e50f615206ddb18603e8482d19b25ccb611904c404d445898928ecf88051b70d
+DIST xen-gentoo-patches-4.16.1-gentoo-patchset-2.tar.bz2 5403 BLAKE2B 7fa3b4aa123b2deed260d02b8d34a35dd205207038edb92569278b25c6fe32e0f0e3857c07755553e047f0eb0d9fe7f8b0816e0f3d7f68aee7929afaf6611dfd SHA512 9e7d25640b24235acf756b031b8b7cee582dded65fe7b94a706c990232e9704d574036c3a9605f285e8e9534578d100a3f38719b27b22775f17ef8f68287997e
 DIST xen-upstream-patches-4.15.4-pre-patchset-0.1.tar.bz2 28980 BLAKE2B 5bdabed3bce4306fe5f656a965d1e537608c03b4706dc801a0b0b9649d001b875b1a2543c68c6b459483991570f0fbf2490a97ea1776761c9f61e9876f240fdf SHA512 4f6bbf0dab57ad58292f32fab55294b2eedd0442be7f62341a2df922a1d21880fe33cc29956ccbbb8b4aee4c10b38d4aa090e4db9496d6e0f5256e60999cad7d
 DIST xen-upstream-patches-4.16.2-pre-patchset-1.tar.bz2 56760 BLAKE2B 4c8030347f9e1ad3c2c4f440645656452daa1f087c34b8a3baba3cae1e7623a910e5727395e8c6f4a8573f3a37e58a318c485fa2f878c8e2f3240fb75cee0c03 SHA512 5e279845052addfbf7681ad5ccab9e692e4a1d69b73e51e1782e498f98217de77bfc4f5158307ee90164393edb023165e032b9f9f7123c0c614ee2336c021259
 EBUILD xen-tools-4.15.3.ebuild 16673 BLAKE2B 5564ae42258c6eb413b4b29730d6fa5823f4479dd8b483d2ef093ab1d1ae9e234d3b42bcfd1fdb1667f0584604cc54fcef76be6f2bb03e862fc8302053e89999 SHA512 9c774445827cca9995f488e1bd5ae37a6a3402774e45c62a984fc3331ba53f5546f664504fb487474e4dd856f541263dc1de1ffbd909b6a1318db24916e0dc65
 EBUILD xen-tools-4.15.4_pre.ebuild 16707 BLAKE2B abed0efd8aeafa933f1a94edefa27dcb0b0e4ff9537639742a4d492174ab14dd612329b125cdd561c5ff0b72d710c6d553ef8f1dde39824d24840271c9197bd1 SHA512 8c90c61f52e76b8d4ad2db5eb43a98f61868cf8dbb49bfb5bef3148368166191066c1874c7889ab5db6c92520b99fb7ac7fbe604592cd5025c08cf2677933ad7
-EBUILD xen-tools-4.16.2_pre2-r1.ebuild 16110 BLAKE2B f7f320b4a1bff2daf4a15af3f0014774b17c0da45baef1de66ba270480f78533738606bb4f1d1cdebb00a1836ed1700f69892ab2c6e42ecda5abd3f657d5e7d7 SHA512 7f72e87ae75123222f54731808117f26a50323fde8ae0de26fea2c1ba9735e1e6131e13da6f68b9bb8fdb574bd19f11f272a86ad38372ddd24dd7779b9f4d312
+EBUILD xen-tools-4.16.2_pre2-r1.ebuild 16148 BLAKE2B d53626119e8f6f6efc44635783acafeeea3ed1ada6ead928abac6a0444bc2b47c45c521d4690c4c42829ba54db008fe9f0fbfc71b3084a3e091ced94ff7157a3 SHA512 08c2b6cac8fabe23073e519a8168178b7b60661222792b3556c12817612b40bdcb7376ea228b9b848fb765ff8865af36b8eced1e14f97ac7ae616e722bb4bf20
 MISC metadata.xml 1562 BLAKE2B a619e34e6fec4c6ffc00fd098dc040c5bb464ed7f2032db2e933fada0614e82c21269175f37720a123404551474e2aeeb2728b405ff93f9b4d9d092d027e0839 SHA512 f45c793a4b4819f0e50501ddc85acdaf99e4d675530712f8dccfb5166d071ae8ed07917a61d56037d6ba3a54123f72f4512d8c11643ea8c6e507feb9d29594e7
diff --git a/app-emulation/xen-tools/files/gentoo-patches.conf b/app-emulation/xen-tools/files/gentoo-patches.conf
deleted file mode 100644
index d6fce26a06c0..000000000000
--- a/app-emulation/xen-tools/files/gentoo-patches.conf
+++ /dev/null
@@ -1,87 +0,0 @@
-# Bug 496708
-_gx045=" xen-tools-4.10.1-unbundle-ipxe.patch"
-_gx054=" xen-tools-4.12.0-unbundle-ipxe.patch"
-
-# Bug 379537
-_gx017=" fix-gold-ld.patch"
-
-# Bug 477676
-_gx038=" xen-tools-4.8-ar-cc.patch"
-_gx039=" xen-tools-4.14-ar-cc.patch"
-
-# Prevent file collision with qemu package Bug 478064
-_gx043=" xen-4.10-qemu-bridge.patch"
-_gx051=" xen-4.12-qemu-bridge.patch"
-_gx052=" xen-tools-4.14-qemu-bridge.patch"
-#mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
-
-# Fix po file collision with app-emulation/qemu, while USE=qemu is enabled, Bug 508302
-_gx027=" xen-tools-4-qemu-fix-po-collision.patch"
-
-# Fix build failure with ncurses[tinfo], bug 526526
-_gx028=" xen-tools-4.4.1-tinfo.patch"
-
-# Don't download ovmf, use pre-released
-_gx029=" xen-tools-4-anti-ovmf-download.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 missing makedev(), major(), minor()
-_gx042=" xen-tools-4.8.2-makedev.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
-_gx048=" xen-tools-4.11.1-gcc8.patch"
-_gx053=" xen-tools-4.12.0-gcc8.patch"
-
-# Fix building with gcc 9, bug #689082
-_gx055=" xen-tools-4.11.2-gcc9.patch"
-
-# Fix pdf document generation, bug #650396
-_gx049=" xen-tools-4.10.1-pdfdoc.patch"
-
-# Add xenstat python-binding, Gento Bug #711066
-_gx056=" xen-tools-4.12.2-libxenstat-makefile.patch"
-
-# Fix building with gcc 10, bug #722930
-_gx060=" xen-tools-4.13.0-gcc10.patch"
-
-# xen-tools-4.15.1 patches set
-_gpv_xen_tools_4151_0="
-	xen-tools-4.14-ar-cc.patch
-	xen-tools-4.15.0-disable-werror.patch
-	xen-tools-4.15.0-libxenstat-makefile.patch
-	xen-tools-4.15.0-qemu-bridge.patch
-	xen-tools-4.15.0-unbundle-ipxe.patch
-	xen-tools-4.4.1-tinfo.patch
-	xen-tools-4-anti-ovmf-download.patch
-	xen-tools-4-qemu-fix-po-collision.patch
-"
-
-# xen-tools-4.15.2 patches set
-_gpv_xen_tools_4152_0="
-	xen-tools-4.14-ar-cc.patch
-	xen-tools-4.15.0-disable-werror.patch
-	xen-tools-4.15.0-libxenstat-makefile.patch
-	xen-tools-4.15.0-qemu-bridge.patch
-	xen-tools-4.15.0-unbundle-ipxe.patch
-	xen-tools-4.4.1-tinfo.patch
-	xen-tools-4-anti-ovmf-download.patch
-	xen-tools-4-qemu-fix-po-collision.patch
-"
-
-# xen-tools-4.16.0 patches set
-_gpv_xen_tools_4160_0="
-	xen-tools-4.14-ar-cc.patch
-	xen-tools-4.15.0-disable-werror.patch
-	xen-tools-4.15.0-unbundle-ipxe.patch
-	xen-tools-4.16.0-qemu-bridge.patch
-	xen-tools-4.16.0-xenstat.patch
-	xen-tools-4.4.1-tinfo.patch
-	xen-tools-4-anti-ovmf-download.patch
-"
diff --git a/app-emulation/xen-tools/files/xen-tools-4.15.0-fix-xenstat-python-bindings.patch b/app-emulation/xen-tools/files/xen-tools-4.15.0-fix-xenstat-python-bindings.patch
deleted file mode 100644
index 3547b7346eed..000000000000
--- a/app-emulation/xen-tools/files/xen-tools-4.15.0-fix-xenstat-python-bindings.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/tools/libs/stat/Makefile  2021-07-01 19:32:50.696318503 +0200
-+++ b/tools/libs/stat/Makefile  2021-07-01 00:16:15.102473301 +0200
-@@ -51,12 +51,13 @@
- .PHONY: uninstall-bindings
- uninstall-bindings: uninstall-perl-bindings uninstall-python-bindings
- 
--$(BINDINGS): $(SHLIB) $(SHLIB_LINKS) include/xenstat.h
-+$(BINDINGS): $(SHLIB) $(SHLIB_LINKS) ../../include/xenstat.h
- 
--SWIG_FLAGS=-module xenstat -Iinclude -I.
-+SWIG_FLAGS=-module xenstat -Iinclude -I. -I../../include/
- 
- # Python bindings
- PYTHON_FLAGS=`$(PYTHON) -c 'import distutils.sysconfig; print("-I" + distutils.sysconfig.get_python_inc(True) + " " + distutils.sysconfig.get_config_var("BLDLIBRARY"))'`
-+PYTHON_FLAGS+=-Wno-error=missing-prototypes -fPIC -lxenstat
- $(PYMOD): $(PYSRC)
- $(PYSRC): bindings/swig/xenstat.i
-        swig -python $(SWIG_FLAGS) -outdir $(@D) -o $(PYSRC) $<
diff --git a/app-emulation/xen-tools/files/xen-tools-4.15.1-edk2-python3.9.patch b/app-emulation/xen-tools/files/xen-tools-4.15.1-edk2-python3.9.patch
deleted file mode 100644
index a1f8d155434e..000000000000
--- a/app-emulation/xen-tools/files/xen-tools-4.15.1-edk2-python3.9.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Python/Common/Misc.py
-index ad556710802e..4be7957138a5 100755
---- a/BaseTools/Source/Python/Common/Misc.py
-+++ b/BaseTools/Source/Python/Common/Misc.py
-@@ -1635,7 +1635,7 @@ def __init__(self, PeFile):
-         ByteArray = array.array('B')

-         ByteArray.fromfile(PeObject, 4)

-         # PE signature should be 'PE\0\0'

--        if ByteArray.tostring() != b'PE\0\0':

-+        if ByteArray.tolist() != [ord('P'), ord('E'), 0, 0]:

-             self.ErrorInfo = self.FileName + ' has no valid PE signature PE00'

-             return

- 

-diff --git a/BaseTools/Source/Python/AutoGen/UniClassObject.py b/BaseTools/Source/Python/AutoGen/UniClassObject.py
-index b2895f7e5c63..883c2356e0ca 100644
---- a/BaseTools/Source/Python/AutoGen/UniClassObject.py
-+++ b/BaseTools/Source/Python/AutoGen/UniClassObject.py
-@@ -152,7 +152,7 @@ def encode(self, input, errors='strict'):
- 

- TheUcs2Codec = Ucs2Codec()

- def Ucs2Search(name):

--    if name == 'ucs-2':

-+    if name in ['ucs-2', 'ucs_2']:

-         return codecs.CodecInfo(

-             name=name,

-             encode=TheUcs2Codec.encode,

diff --git a/app-emulation/xen-tools/files/xen-tools-4.15.1-ocaml-4.12.patch b/app-emulation/xen-tools/files/xen-tools-4.15.1-ocaml-4.12.patch
deleted file mode 100644
index b06a7f195bfa..000000000000
--- a/app-emulation/xen-tools/files/xen-tools-4.15.1-ocaml-4.12.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 2d1a35f1e6c2113a6322fdb758a198608c90e4bd Mon Sep 17 00:00:00 2001
-From: Costin Lupu <costin.lupu@cs.pub.ro>
-Date: Tue, 8 Jun 2021 15:35:29 +0300
-Subject: [PATCH] tools/ocaml: Fix redefinition errors
-
-If PAGE_SIZE is already defined in the system (e.g. in /usr/include/limits.h
-header) then gcc will trigger a redefinition error because of -Werror. This
-patch replaces usage of PAGE_* macros with XC_PAGE_* macros in order to avoid
-confusion between control domain page granularity (PAGE_* definitions) and
-guest domain page granularity (which is what we are dealing with here).
-
-Same issue applies for redefinitions of Val_none and Some_val macros which
-can be already define in the OCaml system headers (e.g.
-/usr/lib/ocaml/caml/mlvalues.h).
-
-Signed-off-by: Costin Lupu <costin.lupu@cs.pub.ro>
-Reviewed-by: Julien Grall <jgrall@amazon.com>
-Acked-by: Ian Jackson <iwj@xenproject.org>
-Tested-by: Dario Faggioli <dfaggioli@suse.com>
----
- tools/ocaml/libs/xc/xenctrl_stubs.c            | 10 ++++------
- tools/ocaml/libs/xentoollog/xentoollog_stubs.c |  4 ++++
- tools/ocaml/libs/xl/xenlight_stubs.c           |  4 ++++
- 3 files changed, 12 insertions(+), 6 deletions(-)
-
-diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c
-index 6e4bc567f5..a6756c4a8c 100644
---- a/tools/ocaml/libs/xc/xenctrl_stubs.c
-+++ b/tools/ocaml/libs/xc/xenctrl_stubs.c
-@@ -37,14 +37,12 @@
- 
- #include "mmap_stubs.h"
- 
--#define PAGE_SHIFT		12
--#define PAGE_SIZE               (1UL << PAGE_SHIFT)
--#define PAGE_MASK               (~(PAGE_SIZE-1))
--
- #define _H(__h) ((xc_interface *)(__h))
- #define _D(__d) ((uint32_t)Int_val(__d))
- 
-+#ifndef Val_none
- #define Val_none (Val_int(0))
-+#endif
- 
- #define string_of_option_array(array, index) \
- 	((Field(array, index) == Val_none) ? NULL : String_val(Field(Field(array, index), 0)))
-@@ -819,7 +817,7 @@ CAMLprim value stub_xc_domain_memory_increase_reservation(value xch,
- 	CAMLparam3(xch, domid, mem_kb);
- 	int retval;
- 
--	unsigned long nr_extents = ((unsigned long)(Int64_val(mem_kb))) >> (PAGE_SHIFT - 10);
-+	unsigned long nr_extents = ((unsigned long)(Int64_val(mem_kb))) >> (XC_PAGE_SHIFT - 10);
- 
- 	uint32_t c_domid = _D(domid);
- 	caml_enter_blocking_section();
-@@ -925,7 +923,7 @@ CAMLprim value stub_pages_to_kib(value pages)
- {
- 	CAMLparam1(pages);
- 
--	CAMLreturn(caml_copy_int64(Int64_val(pages) << (PAGE_SHIFT - 10)));
-+	CAMLreturn(caml_copy_int64(Int64_val(pages) << (XC_PAGE_SHIFT - 10)));
- }
- 
- 
-diff --git a/tools/ocaml/libs/xentoollog/xentoollog_stubs.c b/tools/ocaml/libs/xentoollog/xentoollog_stubs.c
-index bf64b211c2..e4306a0c2f 100644
---- a/tools/ocaml/libs/xentoollog/xentoollog_stubs.c
-+++ b/tools/ocaml/libs/xentoollog/xentoollog_stubs.c
-@@ -53,8 +53,12 @@ static char * dup_String_val(value s)
- #include "_xtl_levels.inc"
- 
- /* Option type support as per http://www.linux-nantes.org/~fmonnier/ocaml/ocaml-wrapping-c.php */
-+#ifndef Val_none
- #define Val_none Val_int(0)
-+#endif
-+#ifndef Some_val
- #define Some_val(v) Field(v,0)
-+#endif
- 
- static value Val_some(value v)
- {
-diff --git a/tools/ocaml/libs/xl/xenlight_stubs.c b/tools/ocaml/libs/xl/xenlight_stubs.c
-index 352a00134d..45b8af61c7 100644
---- a/tools/ocaml/libs/xl/xenlight_stubs.c
-+++ b/tools/ocaml/libs/xl/xenlight_stubs.c
-@@ -227,8 +227,12 @@ static value Val_string_list(libxl_string_list *c_val)
- }
- 
- /* Option type support as per http://www.linux-nantes.org/~fmonnier/ocaml/ocaml-wrapping-c.php */
-+#ifndef Val_none
- #define Val_none Val_int(0)
-+#endif
-+#ifndef Some_val
- #define Some_val(v) Field(v,0)
-+#endif
- 
- static value Val_some(value v)
- {
--- 
-2.30.2
-
diff --git a/app-emulation/xen-tools/xen-tools-4.16.2_pre2-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.16.2_pre2-r1.ebuild
index 87a3b970d5b0..bea81cf832c0 100644
--- a/app-emulation/xen-tools/xen-tools-4.16.2_pre2-r1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.16.2_pre2-r1.ebuild
@@ -24,7 +24,7 @@ else
 	IPXE_COMMIT="3c040ad387099483102708bb1839110bc788cefb"
 
 	XEN_PRE_PATCHSET_NUM=1
-	XEN_GENTOO_PATCHSET_NUM=1
+	XEN_GENTOO_PATCHSET_NUM=2
 	XEN_PRE_VERSION_BASE=4.16.1
 
 	XEN_BASE_PV="${PV}"
@@ -265,11 +265,11 @@ src_prepare() {
 
 		# Bug #816987
 		pushd tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli > /dev/null
-			eapply "${FILESDIR}/${PN}-4.15.1-brotli-gcc11.patch"
+			eapply "${XEN_GENTOO_PATCHES_DIR}/ovmf/${PN}-4.15.1-brotli-gcc11.patch"
 		popd > /dev/null
 
 		pushd tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli > /dev/null
-			eapply "${FILESDIR}/${PN}-4.15.1-brotli-gcc11.patch"
+			eapply "${XEN_GENTOO_PATCHES_DIR}/ovmf/${PN}-4.15.1-brotli-gcc11.patch"
 		popd > /dev/null
 	fi