gentoo resync : 11.05.2021

1 files changed, 28 insertions, 18 deletions

diff --git a/app-emulation/xen-tools/files/gentoo-patches.conf b/app-emulation/xen-tools/files/gentoo-patches.conf
index 56028e12ee1b..4b1aac4eae65 100644
--- a/app-emulation/xen-tools/files/gentoo-patches.conf
+++ b/app-emulation/xen-tools/files/gentoo-patches.conf
@@ -51,16 +51,6 @@ _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.13.2 patches set (v1)
-_gpv_xen_tools_4132_1="
-${_gx038}
-${_gx027}
-${_gx028} ${_gx029}
-${_gx037}
-${_gx053} ${_gx050} ${_gx051}
-${_gx054} ${_gx056}
-"
-
 # xen-tools-4.13.3 patches set
 _gpv_xen_tools_4133_0="
 ${_gx038}
@@ -71,12 +61,32 @@ ${_gx053} ${_gx050} ${_gx051}
 ${_gx054} ${_gx056}
 "
 
-# xen-tools-4.14.1 patches set
-_gpv_xen_tools_4141_0="
-${_gx039}
-${_gx027}
-${_gx028} ${_gx029}
-${_gx037}
-${_gx053} ${_gx050} ${_gx052}
-${_gx054} ${_gx056}
+# xen-tools-4.14.2 patches set
+_gpv_xen_tools_4142_0="
+	xen-tools-4.12.0-gcc8.patch
+	xen-tools-4.12.0-shim.patch
+	xen-tools-4.12.0-unbundle-ipxe.patch
+	xen-tools-4.12.2-libxenstat-makefile.patch
+	xen-tools-4.14-ar-cc.patch
+	xen-tools-4.14-qemu-bridge.patch
+	xen-tools-4.15.0-disable-werror.patch
+	xen-tools-4.15.0-gcc11.patch
+	xen-tools-4.4.1-tinfo.patch
+	xen-tools-4.6-increase-stack-size.patch
+	xen-tools-4-anti-ovmf-download.patch
+	xen-tools-4-qemu-fix-po-collision.patch
+"
+
+# xen-tools-4.15.0 patches set
+_gpv_xen_tools_4150_0="
+	xen-tools-4.14-ar-cc.patch
+	xen-tools-4.15.0-disable-werror.patch
+	xen-tools-4.15.0-gcc11.patch
+	xen-tools-4.15.0-libxenstat-makefile.patch
+	xen-tools-4.15.0-no-ld-no-pie.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
 "