gentoo resync : 20.03.2022

6 files changed, 29 insertions, 52 deletions

diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 6e236dd4350e..3dfa561a2c78 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -1,13 +1,14 @@
-AUX xen-4.14-efi.patch 1969 BLAKE2B dec62e9b04ce23025443caa68df2fd69c50a3fdf650bf26047b28f3a72d1aa58124127274cd2c1373a4e133784b2691145c49c9a182bd635aa9c60bb1e45a0c1 SHA512 3e32aac5ba2ec371a3877d64532e8d134c3b4fe3a6644477ee8ecf56cbb8378b20f9d5d7415bec891d96910550a787848779c82ee4b9d57046f4c13235531ea0
 AUX xen-4.15-efi.patch 2181 BLAKE2B a06b944dea37c3dfdbe4344191ec4a286348f46bcccf1b5a75f061e55b961d767972456803b8c9aa15120b2b2497651495e903925bf93b04c483e0713d9117a9 SHA512 7ec52fc65b5b8a22877c941f0ab6f249ba1d7b40ad7d50d8f0ac793069cc0eb85b1e5394ce81adf60fa23b01ecc8ce983e6c508b8e0d22189dc46e2c1ad8c1b4
 AUX xen-4.15-flask.patch 400 BLAKE2B 68ee04b8b0923cbe7e2b93b834a23b465c9c8e63ae41bea98c8b4bce4ff59374534294b8c5cd5be30ea64d7c66caec54de0bc1bf70d80275d027b3a082ec2003 SHA512 146c6a161d3def5ab947264d6ac5932066f3124e25be14185ebd75eaa18932adcf35daf21edd051861cacd28b950b6a3ee5c5ac335ccc1d0e27b3242da5c4441
+AUX xen-4.16-efi.patch 696 BLAKE2B 2bc3db7286d7ea24c762e914012c71d3fe6dc4d8c47551c9c88282d67d896917c04456c607c155d8340d0b264a34830091309a1a28417dbfc585f26a9fc692ad SHA512 0c1f594ae6321af190cc205d2ebb8afbca53c2897302b630a6f0eee9ce43f591483c96cc4f8b8be5db78ee11451c724882e50bb4226359e784bbda520b090524
 AUX xen-4.16-no-symlink.patch 1044 BLAKE2B 3f5cb93403e3cd606a5eabb8b0e7facb3c95ae7f805c4bfa0e5a357342b845f6f260915f9eac46573bd9813fa602702df6254ad4b946fccb32cfea7514cc86b3 SHA512 0d1a8c8dbfdd57dac6d9732afcf4d0da1746ecbfa06689eb343b3d54167a784c9b9b65555f4cabd8f30a97692c511ee16c7787cdc3d335f7e39c2e3f8fc86ccf
-DIST xen-4.14.3-upstream-patches-2.tar.xz 28336 BLAKE2B 45666fd4aa81c5b8d3c13f5fa949f30a3c168c3ece0109f66092a93d1c2c204dda21afdb46357ca836f763cddaa66a9dbe895939294db36ed28a348e0d92d072 SHA512 c80c4e1cf6c5b870d3471b7430478f1180704d55b5327ef0748e2dc5c3bc03eee05003888160a802b439a6a11aa6bd047122f340ea0cdc1b6bfd71371090e827
-DIST xen-4.14.3.tar.gz 39982036 BLAKE2B 927fd2937f451567238702430cea3a6e5d2db70d5eef10f029bb1d6d030681573c851eb8076c8bad89c97c115f81a19ac8e46e78ca3f0e642565f7300c264ca1 SHA512 b462fcc1549f6e57f7f2a4fd10ce1e957a25a6a7c0319672b62699468f6c4330b9cd0cf2b0231b5cce94f4bb142a957eb8aa58aa0ffb5c85b37211d6b34ccf16
-DIST xen-4.15.1-upstream-patches-2.tar.xz 30180 BLAKE2B 675c13cfb4a6f47121dfe125ddea21d98e7e37563f63b91cde96cd92d94eff648eaa65426fec09833ad668102959948b2e684860631db2b5a2a53b2521a01069 SHA512 f0a6c0829068828ac400d67230d3066b2370a90303e537dd5e0761920ac0d584139b59244a72d9dcd2e4cb1a151ab80d3197ba908e642e13817b89b9a33c73fb
+DIST xen-4.15.1-upstream-patches-3.tar.xz 49644 BLAKE2B 261d45d726ba9b06a817fd4f4e9d2a83e516cd637f73dff50ccb9b046d562e14bee47fc64795c0406947fb06988679047a19e5851482fbf85701bcc495225258 SHA512 8d8b7e42f9a401f6d3a7cb87b980714aa14dadbeadb3a26f495b6a1892d1a04de244490255b589952f565d0a0b8c69fd527c0168d40e974e0f77cecda25e7cb3
 DIST xen-4.15.1.tar.gz 40800852 BLAKE2B 39475ea33f029fb0e84b82b4a2b13fd613bab01e3ef6c241dfede3d190ee9be53c99b62121d37d83b1e078764b3e4d88d1dfb99be1b5623691e56519850c6798 SHA512 8d3cbdf708f46477e32ee7cbd16a490c82efa855cecd84ee712b8680df4d69c987ba9ab00ff3851f627b98a8ebbc5dab71f92f142ed958ee2bc538bc792cd4b9
+DIST xen-4.15.2-upstream-patches-1.tar.xz 43148 BLAKE2B 0f5b43ecd32d3a91444e92387cec69bbfd4fa5bd182dfaf7e6fb9980fe6e6244e83e420e9c5f8eb525ffc073c0f473c05f4fa7d8bbe5a185fcd6fc33a16323a8 SHA512 83d9199811e529bbcda7f349fdbece15719f0678114640389fc674e62899aea1daece3ccbf667928825884924ea1085f448056f79728bfea75730a1ef0405d5c
+DIST xen-4.15.2.tar.gz 40773378 BLAKE2B 7c3e3bb066505f9838cd7c56d85debc64e5ed32cf4d4edf699ff843db49bee916e6eb46d07e5cd9021c2644bba0628a2aa567f60ace26c6d7ee5922643e04104 SHA512 1cbf988fa8ed38b7ad724978958092ca0e5506e38c709c7d1af196fb8cb8ec0197a79867782761ef230b268624b3d7a0d5d0cd186f37d25f495085c71bf70d54
+DIST xen-4.16.0-upstream-patches-1.tar.xz 61124 BLAKE2B 11cd00b93a7f4af24ebced7e450d38624e317eaa455e5aa7cd50bff09700b349e47016863bb0523a68a1113627ef1cd3c1e269504de50ed54bf71b1908bc0ba4 SHA512 ef624b11b4ecd3d1ea05050744f5b0d45b1eb3d87f5f0e8b89e6aa489cd50e99478a4ff59df151241963a8acc8601662bd1ccd63b586ebdde291e9bfad21c54f
 DIST xen-4.16.0.tar.gz 44982322 BLAKE2B 7e16a93b3f1131e2b10307fabc10641a9c5983173155b9a35eaf6ff317b6a747bccf6b8c87c06686830acc2c4bd3e19e5867eb443eabac9a1e4ee59124dfa87f SHA512 2869ed90d1779c9754d7f2397f5fc67a655304d9c32953ac20655ef96cb154521d8fce9f23915ac0c91f984dc54f72c67e5e619e2da318b5997748f44cf21b87
-EBUILD xen-4.14.3-r2.ebuild 4408 BLAKE2B 46ca07316dd866afdfe43386665acc3552c5ebc0c8d289d1f59c752f2be948122cc550c2e8fa2583cc1ef172f6e5026d6c16bdcd57bbc9b72f1bf917c65b2a68 SHA512 2afd50d4c3c6bee62a6fc8eb17f90caf400906dc8f7fa3a99610d22680eb7e5192a8a83e24ef5d703c04a94e50d72ed4758d9e97a2b89d1a931a304b9639d745
-EBUILD xen-4.15.1-r2.ebuild 4408 BLAKE2B f2870cf9b704b5871d61fac799e0ffdc59d914fbcd49d67e6c5125d5f2f4094ae32ff6987c0bb7371de8271d5292c720e5f1a8c263c05c3abda1ca562565b600 SHA512 46624811280430ff388cc6089d60b5142d96a7b22f2e09b02b1ceef0f476997a1755146b9eabef84ff8d8165c059cff76efa753273dedef51a692e91a9f543d0
-EBUILD xen-4.16.0-r1.ebuild 4485 BLAKE2B 6dbaccad0866a01d32e99286568423e558b3e19252c939ddba1017eaa9c5b0e946a95a30ef6b67e89702415aa0d079e65095f0a216d39afb20f6bbf4053b94fd SHA512 eaacd8e41fd113090270e868fa99c1681d62057bf6edae7d4f0348757994a20a51e90b2f513d2fa0e2055032a8e605ef29c26bc7f2f368d8856c38805e91c4d6
+EBUILD xen-4.15.1-r3.ebuild 4408 BLAKE2B 8f72ece7a8fbc12f62409f98b5064feedcde24969010a1c7fdc84eb0421a317e05ca9066531b3dccf430a78414866d0e33e8d883ff8e8e4a4cdc720aeb7d6093 SHA512 ec445722ff6f1b6bdaa568f36a4ffb643ce35f72df8d5fc4c05c4016deb9582ece7e01010edaadecc645d84373eebc5030d139fa291fb23288eecac0d0fe3555
+EBUILD xen-4.15.2-r1.ebuild 4410 BLAKE2B e2e423d9007e7b5ddeedcd93805703fbdf535ae9c49e954347ce9db1dfe7b02eb340db1925dddb0683f2c5bd037f4b99a7696ca5247b90f7a2d0f7b27f84e157 SHA512 9f72d6dc897f3c8b6d6cfb1c58612754be21a63c67ea022b6c982566f1e441424ecaadbe8445aa1d43782da5cbd4fc71efc88345a7e08d6c1b31ea2c2ee5713a
+EBUILD xen-4.16.0-r4.ebuild 4530 BLAKE2B cf4b20851fbcf1a890c5585534ec2e3ec511235ac87bc8fe523907c48166a2d91e543deadb3c3833ca5bc8396fb4f8166e22e60e21563dd62eca03343175361e SHA512 2b90652ae245142d0ef43c0f31bc4f6930a91d984804fcd9eb3f42ac8eb04b4d9fc9e2e115432567a1727c50c56f88dd3db594870e441cba8bf0ecb6b2417919
 MISC metadata.xml 773 BLAKE2B 3d0c64f8bfaf753ee92681f9da2dfabd6196952b5694244b806cb6cdac02fedd10d8c8defb4f4211664e135cce38c671f543faab58575ae2d603efcb9b2a48b8 SHA512 16993794d7f578562112533f97bb76d1a2fafd0dce038dbd879a4a65d5fc893251f1d188cdc1a2b9f955a27581f76a26409cc0c90706c86514c05e81501966b9
diff --git a/app-emulation/xen/files/xen-4.14-efi.patch b/app-emulation/xen/files/xen-4.14-efi.patch
deleted file mode 100644
index 351e17843523..000000000000
--- a/app-emulation/xen/files/xen-4.14-efi.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/xen/Makefile b/xen/Makefile
-index 0ade7f9..46c25d9 100644
---- a/xen/Makefile
-+++ b/xen/Makefile
-@@ -272,9 +272,17 @@ _install: Z=$(CONFIG_XEN_INSTALL_SUFFIX)
- _install: $(TARGET)$(CONFIG_XEN_INSTALL_SUFFIX)
- 	[ -d $(D)$(BOOT_DIR) ] || $(INSTALL_DIR) $(D)$(BOOT_DIR)
- 	$(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_FULLVERSION)$(Z)
--	ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z)
--	ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z)
--	ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)$(Z)
-+
-+	if [ 'x$(EFI_VENDOR)' == 'x' ]; then \
-+		ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z); \
-+		ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z); \
-+		ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)$(Z); \
-+	else \
-+		$(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z); \
-+		$(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z); \
-+		$(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)$(Z); \
-+	fi;
-+
- 	[ -d "$(D)$(DEBUG_DIR)" ] || $(INSTALL_DIR) $(D)$(DEBUG_DIR)
- 	$(INSTALL_DATA) $(TARGET)-syms $(D)$(DEBUG_DIR)/$(T)-syms-$(XEN_FULLVERSION)
- 	$(INSTALL_DATA) $(TARGET)-syms.map $(D)$(DEBUG_DIR)/$(T)-syms-$(XEN_FULLVERSION).map
-diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile
-index 07eeefb..6b1c16b 100644
---- a/xen/arch/x86/Makefile
-+++ b/xen/arch/x86/Makefile
-@@ -163,7 +163,7 @@ note.o: $(TARGET)-syms
- 		--rename-section=.data=.note.gnu.build-id -S $@.bin $@
- 	rm -f $@.bin
- 
--EFI_LDFLAGS = $(patsubst -m%,-mi386pep,$(XEN_LDFLAGS)) --subsystem=10
-+EFI_LDFLAGS = -mi386pep $(patsubst -m%,-mi386pep,$(LDFLAGS)) --subsystem=10
- EFI_LDFLAGS += --image-base=$(1) --stack=0,0 --heap=0,0 --strip-debug
- EFI_LDFLAGS += --section-alignment=0x200000 --file-alignment=0x20
- EFI_LDFLAGS += --major-image-version=$(XEN_VERSION)
diff --git a/app-emulation/xen/files/xen-4.16-efi.patch b/app-emulation/xen/files/xen-4.16-efi.patch
new file mode 100644
index 000000000000..0de5575fc9e1
--- /dev/null
+++ b/app-emulation/xen/files/xen-4.16-efi.patch
@@ -0,0 +1,12 @@
+diff -urN a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile
+--- a/xen/arch/x86/Makefile	2021-11-30 06:42:42.000000000 -0500
++++ b/xen/arch/x86/Makefile	2022-02-17 07:43:06.597244620 -0500
+@@ -127,7 +127,7 @@
+ CFLAGS-$(XEN_BUILD_EFI) += -DXEN_BUILD_EFI
+ 
+ # Check if the linker supports PE.
+-EFI_LDFLAGS = $(patsubst -m%,-mi386pep,$(XEN_LDFLAGS)) --subsystem=10
++EFI_LDFLAGS = -mi386pep $(patsubst -m%,-mi386pep,$(XEN_LDFLAGS)) --subsystem=10
+ XEN_BUILD_PE := $(if $(XEN_BUILD_EFI),$(call ld-option,$(EFI_LDFLAGS) --image-base=0x100000000 -o efi/check.efi efi/check.o))
+ # If the above failed, it may be merely because of the linker not dealing well
+ # with debug info. Try again with stripping it.
diff --git a/app-emulation/xen/xen-4.15.1-r2.ebuild b/app-emulation/xen/xen-4.15.1-r3.ebuild
index c47eb7e424a0..35c94dfb83e9 100644
--- a/app-emulation/xen/xen-4.15.1-r2.ebuild
+++ b/app-emulation/xen/xen-4.15.1-r3.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]]; then
 	SRC_URI=""
 else
 	KEYWORDS="amd64 ~arm -x86"
-	UPSTREAM_VER=2
+	UPSTREAM_VER=3
 	SECURITY_VER=
 	GENTOO_VER=
 
diff --git a/app-emulation/xen/xen-4.14.3-r2.ebuild b/app-emulation/xen/xen-4.15.2-r1.ebuild
index 177dc0282e93..1b6ea137fc9b 100644
--- a/app-emulation/xen/xen-4.14.3-r2.ebuild
+++ b/app-emulation/xen/xen-4.15.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit flag-o-matic mount-boot python-any-r1 toolchain-funcs
 
@@ -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=2
+	KEYWORDS="~amd64 ~arm -x86"
+	UPSTREAM_VER=1
 	SECURITY_VER=
 	GENTOO_VER=
 
@@ -95,7 +95,7 @@ src_prepare() {
 	[[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
 
 	# Symlinks do not work on fat32 volumes
-	eapply "${FILESDIR}"/${PN}-4.14-efi.patch
+	eapply "${FILESDIR}"/${PN}-4.15-efi.patch
 
 	# Enable XSM-FLASK
 	use flask && eapply "${FILESDIR}"/${PN}-4.15-flask.patch
diff --git a/app-emulation/xen/xen-4.16.0-r1.ebuild b/app-emulation/xen/xen-4.16.0-r4.ebuild
index ea9f254e98d2..3bd91d3024b8 100644
--- a/app-emulation/xen/xen-4.16.0-r1.ebuild
+++ b/app-emulation/xen/xen-4.16.0-r4.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]]; then
 	SRC_URI=""
 else
 	KEYWORDS="~amd64 ~arm -x86"
-	UPSTREAM_VER=
+	UPSTREAM_VER=1
 	SECURITY_VER=
 	GENTOO_VER=
 
@@ -93,6 +93,8 @@ src_prepare() {
 	# Gentoo's patchset
 	[[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
 
+	eapply "${FILESDIR}"/${PN}-4.16-efi.patch
+
 	# Symlinks do not work on fat32 volumes # 829765
 	if ! use boot-symlinks || use efi; then
 		eapply "${FILESDIR}"/${PN}-4.16-no-symlink.patch