gentoo resync : 15.06.2021

3 files changed, 7 insertions, 6 deletions

diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 3001ae064014..145a2350c53d 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -2,10 +2,11 @@ AUX xen-4.11-efi.patch 1971 BLAKE2B b24f9315cff7f2de2a945088363429b9f4dd7a4101d3
 AUX xen-4.14-efi.patch 1969 BLAKE2B dec62e9b04ce23025443caa68df2fd69c50a3fdf650bf26047b28f3a72d1aa58124127274cd2c1373a4e133784b2691145c49c9a182bd635aa9c60bb1e45a0c1 SHA512 3e32aac5ba2ec371a3877d64532e8d134c3b4fe3a6644477ee8ecf56cbb8378b20f9d5d7415bec891d96910550a787848779c82ee4b9d57046f4c13235531ea0
 AUX xen-4.15-efi.patch 2181 BLAKE2B a06b944dea37c3dfdbe4344191ec4a286348f46bcccf1b5a75f061e55b961d767972456803b8c9aa15120b2b2497651495e903925bf93b04c483e0713d9117a9 SHA512 7ec52fc65b5b8a22877c941f0ab6f249ba1d7b40ad7d50d8f0ac793069cc0eb85b1e5394ce81adf60fa23b01ecc8ce983e6c508b8e0d22189dc46e2c1ad8c1b4
 DIST xen-4.13.3.tar.gz 39044539 BLAKE2B 5d0e57c76e12e1b86b78bbf561e947d70b9569a24412617a640346d2358b141a2741e7a3be454df52d198ad63e58b1519288de62330417c70e72445703f3fac2 SHA512 622127d824b9c49b57282a887fb404e0bad05ff60bccade82e4e0e9b5ad975ff9aa1fba83392e6d8379e9a15340e8ae9785c0913eb11027816e4600432eea6b6
+DIST xen-4.14.2-upstream-patches-0.tar.xz 23304 BLAKE2B 954e0a49e5c3ec122aefe52afe328f440b8a4c8db966e0fa91e0b6d6cb3c0462b75fb99b3e7392811bd2e680cd7945e8a4d68317245fd42fdf0ad6cab33fbc68 SHA512 64d243f0c8acfec87812e4d78e3d8b24a86315824853f4f3b17122b7119425d180650695bc12e1a30f5b30c6ef684be7c08b2bc677ca2f0668d0335d92e2bf78
 DIST xen-4.14.2.tar.gz 39973157 BLAKE2B db5d3570f79e0fd97872f5e5dd57a4eb39e005728387bfef3b51fabe1c693cfd8108d09b1026f5a5a7eb79de71be6f4af36d252f7e0b35a65a1567b7949e3e29 SHA512 83c9333b70dbee3e29c6bf08e5ad030676e6c4a32b976f3f5e6a8f8d0dd9e4898bac88dd8e1c9d2ad3509cebb5d212e1745f9392a469d7afeb841d79801ccf39
-DIST xen-4.15.0-upstream-patches-0.tar.xz 15744 BLAKE2B e2abb68524a7c190db8d91beb79731aea5290e82f54fb21218739dab666f6f5ea85c203575ec248b46830f1862408d50d3ceea1104fcd9325babfccf3574c515 SHA512 f1a2800d15a61f08eda4d6bafaead95a9d72cc9e4d90a19278d89c696b7e2d5d6353b28dba7ed0eb0c9aeb8604d3697db6a8f4ac38047e2510279d88181752f9
+DIST xen-4.15.0-upstream-patches-1.tar.xz 35180 BLAKE2B eb3b2a44b717a04daa4a2f158040cce78b42cba5a72c437d7b2f8f1237b808f6f13c2140d82e95056818db6c0eb706ebd7dead822a6a4e689e5d5e7c83523fdb SHA512 a7cfe2dbc82b15c48fa781a77b3ca1622fc2feac3874bf17cf56e82be46e9817913f94992e0e1a1cd2be2e719d4abb9a15744c8a1017e30c0d5c01d7db64dbb5
 DIST xen-4.15.0.tar.gz 40785399 BLAKE2B 8b0530f5516c39656506f4bb705952da0555a8ab7f47323473b171caeb7692f3107e9d94f13171d40576600064589eed35f4d210af02db4cc4706dd4fc202100 SHA512 93683b8a97387ca5f003c635a11d163e61c87dbdc9a03081f9155fe87b49f1dfa74ce243fcd5e04dc009353a36e2375b786f1ebde828b5951a094cd64197b4c7
 EBUILD xen-4.13.3.ebuild 4461 BLAKE2B da41c70eb656b08ed46b7f6147c6b2d4b68368a0c3b0fe0bcb35d5ac279007158420b1035dc0ba6ab37565dc5345062bcb3689d932bed686bb240e06ac255ea8 SHA512 fbbb200018af4aa700e27890eff7d949f47c60187d815dd682f093b2364c78e33d194c5e66c19be09cb3f5d5be91f61e5c47782b3bfaab94aa3a29e572b22fe8
-EBUILD xen-4.14.2.ebuild 4592 BLAKE2B d2b05087450b38ac3d58079fc965374b751a83b1a4f83d4a36fab014114f19b6f58802f8102b419bc6c3d74fd722b3e2a378b52dc521137a455a6ec124fa48b3 SHA512 10e739e2f53753ca7b794924b0a3b25b32133b7d7b81c60e3bbff83edf3b34c101fe10023aa70465d6954a888f179f760150f3d3d5b2e9a9386c78db463e4291
-EBUILD xen-4.15.0.ebuild 4593 BLAKE2B 378bda1e7af00a455bb4e8064724b4e919d7df997621594f03c80ea56da920663ebc590949ffc5498d2011057f70f427dbd8d9c89e6422effdc9cf2628827006 SHA512 f66ee9ad8a3b5fb012a45da8c0bb3edf73331c217b7b87117036c0cb4148d39be346604e0aba50b3e8928da29be3bd2bfd37a2176e4427eaa175a4ca617ead08
+EBUILD xen-4.14.2-r1.ebuild 4592 BLAKE2B a2864d4f2deab4f806b673a0e129bcee9b3142cd859d7c1293a8638d2122534439a042feab690e634e75deeb7c8afc7a94dd9188447faea283a59f2eec453537 SHA512 ff083e3655f2fa78b2f0f1c286298f56e96ab259ea9dce2389fd38dc0c2ad9ad0da2eadc966ebbbf8efefb6dc05445b969fabacb376ea30f72b339ece6d0b0d1
+EBUILD xen-4.15.0-r1.ebuild 4593 BLAKE2B 5000db5af318b142a4909265d0670602956cf098b1307379e2dbfc0d3edb36bd7c6429f0355d34065d2aa9148bbd77d0d1cb8333fe0d7ce5fd2d9d2d398eccd5 SHA512 084ba7c9cce964b200c65b05a43bd548d3fa541f39e0b7403a6f006a40415ed457cb25fdcb8b5ab9b12f97878a0d9a4897443eec1439bb66c0d4a6fe4b69cd44
 MISC metadata.xml 675 BLAKE2B aee4c4775c388078e51a97212be21fee3ddd4771121a129b7ddf0e2454dc3bd91f4fa1a2ce2a2057c655a0d32ae9631c9fd29a77a247601867949be4aa79de26 SHA512 f77204ce3cffb9c453c779de4cb7e41591972c5b59567a88d02ba079bd6f827d4aec23d9ce7c28b3affcadd370858cb1e66f6448b32e0dfb795af6a1be8598d2
diff --git a/app-emulation/xen/xen-4.14.2.ebuild b/app-emulation/xen/xen-4.14.2-r1.ebuild
index 93ea93f278af..180a6f76adba 100644
--- a/app-emulation/xen/xen-4.14.2.ebuild
+++ b/app-emulation/xen/xen-4.14.2-r1.ebuild
@@ -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=
+	KEYWORDS="amd64 ~arm -x86"
+	UPSTREAM_VER=0
 	SECURITY_VER=
 	GENTOO_VER=
 
diff --git a/app-emulation/xen/xen-4.15.0.ebuild b/app-emulation/xen/xen-4.15.0-r1.ebuild
index eaf463b8786b..7b6e9f60c2a7 100644
--- a/app-emulation/xen/xen-4.15.0.ebuild
+++ b/app-emulation/xen/xen-4.15.0-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]]; then
 	SRC_URI=""
 else
 	KEYWORDS="~amd64 ~arm -x86"
-	UPSTREAM_VER=0
+	UPSTREAM_VER=1
 	SECURITY_VER=
 	GENTOO_VER=