gentoo resync : 21.06.2020

3 files changed, 4 insertions, 51 deletions

diff --git a/sys-kernel/zen-sources/Manifest b/sys-kernel/zen-sources/Manifest
index 436a188991b7..a10c72d3e140 100644
--- a/sys-kernel/zen-sources/Manifest
+++ b/sys-kernel/zen-sources/Manifest
@@ -1,16 +1,11 @@
 DIST genpatches-5.4-1.base.tar.xz 4564 BLAKE2B 0282bad95cd003c90e92d33d2f114ca9e752f09fdbf1930c322bed578e8a71a16d48aeddd943f0a7e59df47c07ad95dd401251a1a5828eefe07c8e927cf021ef SHA512 0726fa7768c4ddf7ba73ef5eb0ea73b71ba03dab1252b7114864ea60af84d50b8354f1c1d70a0abf0c8c7460361417b14183f11f49aa9654808025a9d979da6d
 DIST genpatches-5.4-1.extras.tar.xz 1736 BLAKE2B 57df5cf8b4d96378408460be4be64900771b876a23d1e5798c97449bfcd28bea8aaf31482c614e7844106f29c9ae376c6ebef26e6c18e00a3f64bcb4e360d944 SHA512 5b9b6276f6ad6ad7ac33e14c3b06dbe943c57019332b0ee545ebf7325b7d6313db3ed6d35c46434c3c38420fb372141e63528e980aca87b90c4a39339851e80f
-DIST genpatches-5.5-1.base.tar.xz 3984 BLAKE2B aed3662231f2863f234ebdc3c615c8c7fa32c3b1301659388facef4354b148bd31a9978917dcced2081f157afa176df5cda2e11fa085e3599f68af65f8edfaec SHA512 bdbe3d72620418ad0245f7e7f4fec7960d302be4842c6a090440f8ffccc5f6a67fdf11e51da5a14b659ec7a003410f1374b70ece128455ffd8eaf13177a427ff
-DIST genpatches-5.5-1.extras.tar.xz 1744 BLAKE2B 78353a253969918f5c054768df01bf7d0a0887f5686f6b84a78f28a0c1ef49101f278c5140367a4547cce9932ec9e7dcff4b4fd8519bb9e9dd9b7d4764461877 SHA512 84815483c7c30e2258c1d246080c460177b8e3b6c49592a78c2a5d83798b703da845ee3f1f939da1e947dddced42fc83434ca162f8e5135c838877304e3a80cf
 DIST genpatches-5.6-1.base.tar.xz 4760 BLAKE2B b46600526a6117176153b24cd168d92be86117d6bf5f2653a6cbb229812395043e6cd4c8033f62fc042b9559a5e24f4694985c46ecd6262d53cd6bd6b8852f91 SHA512 1d7aec1b018aa30156995890f743b042ba448db3cc0a7c28c2616b08fcf3824c0eee2130ac3d331af4da1a646226d788e321a9500a748e98f029f55423c9f45d
 DIST genpatches-5.6-1.extras.tar.xz 1740 BLAKE2B bef3294d3bf392d14b4d55644d5d363fe575e3f777b793a2ffd6c6a2654ebf5f89c436d600f04166dc45dd130f2bb7fcb75778bc4171984ede083137ba7a2a5e SHA512 7bb2a574b7d7e7533cb9983477ad9b9c58a25262d0331397c3bfd95f469ffa7abf6ae7bd5ed328095f7e7365912629a52cbbbad1e9939bb4ba7bba6cd0a0e3ea
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
-DIST linux-5.5.tar.xz 110713660 BLAKE2B 36b990d3650c409652206c319c93c0cf68885334050bc286b479c8b844bc47354547e19eebb58caafb026b96d134f39f0c7ce38b4eebe9da7ea6d1610a1e2af2 SHA512 fa74fdabb5e63384a39e54da05b86a9ae9ea16179524b041fbbdffc7177e80b53600ae98d76be127ba216148f9dc55fe07ab20637e22c6d6030cb4aa09eb2f86
 DIST linux-5.6.tar.xz 111785252 BLAKE2B 8dbe02a8ca7fd3dcf512a15c5d8098c1e7f94257e65173fed43fcc45480e4ab790df8cd39bbbb4e2a21dc9a00385bc9bbe98215a31e7f7e1d9c8f21cd8ace69e SHA512 80846fe2b4e4a7ff471d2dde28a8216ae807a3209f959e93d39ea4fc9a189ea28ec3db9d303b3fe15a28c2cb90e7446876678e93e23353c2d6f262e364a06bc9
 DIST v5.4.15-zen1.patch.xz 908592 BLAKE2B 93a1b8e46e28b20d2f465df04c597b7da9c368532a89fc02a8059769b5f39b24b6d64acbcc88dabaa7f320c9c89705a01b3a96f8b3baa287ec60e3db4d9e1dcd SHA512 5aa5a4435e125d09a463d692bba95f247498818db157d68d75899d9031deb2aaa053a352831a843afad1241e83c25dcc5caf0243ee132696328a0d5ddcaab428
-DIST v5.5.13-zen1.patch.xz 817020 BLAKE2B 7f12655d61fac261db026fd4d4057c442158b03e6d11666da06911a956f193e1dabfc8bda39adb8fa99b8ca10f13a491d90a54430528cfce6dd866116985eba5 SHA512 12b221470ae127ca884549c925d9a3bbfa16ce5b1573dc8af8906d92bffe87abddd735a409e8f1c088881ac50f0bf8d599af2c507faf44e148638865e6c7ad08
-DIST v5.6.9-zen1.patch.xz 447224 BLAKE2B 06e665e1da05f1b72ac8615d2b8b4fc4faf6aae6b9e97cec7d6b028f38baa9920cd87c276f319a837437536ecc3ec123e577ea3aca1d22b63f53b21272919846 SHA512 bfbd143b951e63d005009bf362844a2b19f321b5d0674ec9f4a5d1f00cbeb30be0ee26b66ecaa05403da9b23750c7df60264766121fcc901cd61fd5a1dd72ecf
+DIST v5.6.15-zen2.patch.xz 601992 BLAKE2B 079681771e83914d2b46020f077781af0ba3946c9f0ecceec62dac3f407edac39c1e9ad840560d71f44162a90151ebedd9e19b7975f62f73c2bbe450dbcb1496 SHA512 eaa0227301f83166a520429f26d8794a6921e9b042d45d74f1d2a1a5a7323ebe3edefbf4cef3317e621db49602641d37081607cba4269fa76b2844badb81b47b
 EBUILD zen-sources-5.4.15.ebuild 1122 BLAKE2B 1a431d849dfcbce48364408c1d512a7a2b708ccf552f5dc92b4fb4d5df84bbc3646817a4a288230068ce8214dd4be93b624e9e4f12a6f200f45fa7db3747cf36 SHA512 3743f12f89e2c2b71bab144fdd96921dc1b87432493994ca3717827a515616d0c79ca39ee6d9ed21a621412bbf2cb870d9b0f643eff63e25b6d6b654863036f2
-EBUILD zen-sources-5.5.13.ebuild 1122 BLAKE2B 1a431d849dfcbce48364408c1d512a7a2b708ccf552f5dc92b4fb4d5df84bbc3646817a4a288230068ce8214dd4be93b624e9e4f12a6f200f45fa7db3747cf36 SHA512 3743f12f89e2c2b71bab144fdd96921dc1b87432493994ca3717827a515616d0c79ca39ee6d9ed21a621412bbf2cb870d9b0f643eff63e25b6d6b654863036f2
-EBUILD zen-sources-5.6.9.ebuild 1181 BLAKE2B b47680fc9f7dc46de4d3f25b55c5cf243f48ed587aefc3f9e396b309d06e28f64f7835d61c7922c2f77ba1caba2d7466b201552434b35816cc394f83dffee6be SHA512 548065504ff9b6edca0afd2281111d7743de0b366f95a5a728e8f7d7f8256f65fbfbb38890be09ba18f1aa44ccd7af5a5951ae13eb1584b754a70b762da64837
+EBUILD zen-sources-5.6.15.ebuild 1181 BLAKE2B 46b9be53c62b03ae42000268d1d67fe15b39ad18993b31f2f9105c943bbc167324b0dc3b50679f906e30b119fd1d8b1f4381f29c67eaa18a7859d8e8c2f350a2 SHA512 7db5e03b7bc50f2cb05fcff62eb54fa68e282587c4567792024b077dbbff0697ddc97fe02e4c2c77ab30eac3c3ad0cb078d1260861957e2d273da9a1085dee78
 MISC metadata.xml 403 BLAKE2B b007ba7583bf43c622ac26808e1511274e1586c18b7d35e97f7e32d2c7b224e5eb89fe0dfacd6d71cf8367b4ce2c5967d0158abb706b1633218a95996fc70f34 SHA512 9655d79b7a09271fa0ba35435a727bec7dfd46b01d97a3e0a4d9fdd87ebf4ce66ca7093ee8cbb0812ba5ff0a64fe750db353824127e7d8aa731a1a95efdfd8f4
diff --git a/sys-kernel/zen-sources/zen-sources-5.5.13.ebuild b/sys-kernel/zen-sources/zen-sources-5.5.13.ebuild
deleted file mode 100644
index c3dce435487e..000000000000
--- a/sys-kernel/zen-sources/zen-sources-5.5.13.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="1"
-K_SECURITY_UNSUPPORTED="1"
-K_NOSETEXTRAVERSION="1"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://github.com/zen-kernel"
-IUSE=""
-
-DESCRIPTION="The Zen Kernel Live Sources"
-
-ZEN_URI="https://github.com/zen-kernel/zen-kernel/releases/download/v${PV}-zen1/v${PV}-zen1.patch.xz"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${ZEN_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/v${PV}-zen1.patch.xz"
-UNIPATCH_STRICTORDER="yes"
-
-K_EXTRAEINFO="For more info on zen-sources, and for how to report problems, see: \
-${HOMEPAGE}, also go to #zen-sources on freenode"
-
-pkg_setup() {
-	ewarn
-	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "If you need support, please contact the zen developers directly."
-	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
-	ewarn "the ebuilds. Thank you."
-	ewarn
-	kernel-2_pkg_setup
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/zen-sources/zen-sources-5.6.9.ebuild b/sys-kernel/zen-sources/zen-sources-5.6.15.ebuild
index 25d2b018f1ba..1a14062aae49 100644
--- a/sys-kernel/zen-sources/zen-sources-5.6.9.ebuild
+++ b/sys-kernel/zen-sources/zen-sources-5.6.15.ebuild
@@ -18,10 +18,10 @@ IUSE=""
 
 DESCRIPTION="The Zen Kernel Live Sources"
 
-ZEN_URI="https://github.com/zen-kernel/zen-kernel/releases/download/v${PV}-zen1/v${PV}-zen1.patch.xz"
+ZEN_URI="https://github.com/zen-kernel/zen-kernel/releases/download/v${PV}-zen2/v${PV}-zen2.patch.xz"
 SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${ZEN_URI}"
 
-UNIPATCH_LIST="${DISTDIR}/v${PV}-zen1.patch.xz"
+UNIPATCH_LIST="${DISTDIR}/v${PV}-zen2.patch.xz"
 UNIPATCH_EXCLUDE="2400_iwlwifi-PHY_SKU-NVM-3168-fix.patch"
 UNIPATCH_STRICTORDER="yes"