Merge branch 'master' into 'master'

Master

See merge request src_prepare/src_prepare-overlay!123

sys-kernel/xanmod-sources/Manifest

@@ -4,9 +4,9 @@ DIST genpatches-5.9-1.base.tar.xz 4004 BLAKE2B 8a4577d42262fa901186acc60d28221d0
 DIST genpatches-5.9-1.extras.tar.xz 1764 BLAKE2B 32d29f0448aef113ba9c9591c5d3b671d00d07abde9f35f365b48168887913bb2da95a8a52b852453307cabb111115a26178be4cbcc016e53a26a31f783a9df7 SHA512 df007dc98c1acdd31773f7dcf8aeb22812aa55e5593e8509b6a8762f2dcf06c95d69ad7cdce992e7a5fe730754bef26242acdc4e4da51ee29206fabb86c9cb0e
 DIST linux-5.8.tar.xz 114459324 BLAKE2B 7bd97f8fa4527840754434414c07283e89731dc8ebb1e95fa5bc1469a60af1122582c0d3b6e262e77882f023190068df3537bd8b65964b3caa820bb2c8e579c7 SHA512 45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556
 DIST linux-5.9.tar.xz 115507140 BLAKE2B e8d11472d63a9f8409ca12a2e8c97c6963a3d4516b5a398b627d6ece565584526f9b5a1377a2fa4bd184c09c7db94c987428bc5d52df0c788464a67e9e8d6dcb SHA512 d3d92ce4246bad74c9a784212f160d98449b1e8793970c2c308276568d852b8effe0528686bdb87d55d691f09a826abf7938d69bdd4759ce65ddd5c05ffe4eca
-DIST patch-5.8.14-xanmod1.xz 685272 BLAKE2B fcaaedc19f187d36002ca24ae3729c6e65ea0e85e2b0c6ed1e09f96eed1ec1da0ed7ce4287420064f150c8f5152da63bb049d218f7227352cdd19cfcf26795ff SHA512 821bb213532d0e9d2511f2de4db9d64e873e4e0275a21b2a3d207ff02335f12dabbbdfa9ad348479d16da23042c0fa082ef8d8954d4a83e239083e7acc531e3b
 DIST patch-5.8.15-xanmod1.xz 723476 BLAKE2B 3edf59c77951b89557304e056d4e40b522f437b88882848b34635ded632f429f8e5a50f590f6260ebdc4cab79faf5d02bd108225787bcd8bcb46c03dbd68fd91 SHA512 87a58ce92ca1c8640b03225f52cad8d8b07ff021b76f59ae6374dc8f4e8c1586c3163a3f8ab95076bfa867ffe197af223a9402537359693c9e115758b3be67c4
 DIST patch-5.9.0-xanmod1.xz 81324 BLAKE2B ec9da3f3b01d40f7d26c4abeff787d74581374bdbffbca28fa8938468331bdf6bde782c4891df69a391695792ac8789546adc92aef68da13f551315ab8491743 SHA512 d0143778c948f0dbbab58e43430e3bb4091f8bb08d64bf17b497028431598b4f042488eb41e66b7c0335f4298233d290be95f543349b114440e5876099c7f441
 DIST patch-5.9.1-xanmod1.xz 86096 BLAKE2B e03b2a6c497239a39474c59a7e6239025085f4ed11e922cc2877f937137c68cc8205069fd160899e09f5475565fb4df7e826171bf7c7a99c64cb1f3ecc8a678b SHA512 7456122f2fcf2cc918077ca34ca839d05d6ace983358c24e7c0b705f326dbbdfe6d62a9b5559c9496f9ba140d772b2faeb2324852e67569a0c4303939076d7d8
 DIST patch-5.9.2-xanmod1.xz 310172 BLAKE2B 872feb482b7abe761aa8417d73e75e1a1c10f275d2787de3b8fdf18b15ce483d0b62f4483062a7b07d7262b4cc498ecb2c2f9bf4499c528f3b5aae898068e416 SHA512 19c3d1b1050f819a4fab344faf1d3b7050ed12eac9bc80e0e04a2e22d08593d016c1364746fdf88daa4f30a912b9c408e8bdc21ed40cdadf77c4635d09a42aa8
 DIST patch-5.9.3-xanmod1.xz 343824 BLAKE2B bc790e3202c4b386537f8a9cf64e641d3f20047f6705a5337ad6507938179545cdff7592cc0f2a1b84f9a7f3a7d347f67f44befd7125ad93c10af945fb0ed883 SHA512 41171b64bd66b6e13297d4227babbbc22a762c4145e28d6402b11aa5d75dbe7f3b309f728101b1bc4e4235b3b808936696431fe7a947913c4bb2a119176d1cd0
+DIST patch-5.9.6-xanmod1.xz 473632 BLAKE2B 35f16a2cf5e22d50948956498a5cd94b8c18a2c839e810f3a55abe82e4dca5f29c80887589bc748abff09ba2cf4a00a02dfb8b9784b707827f9e5ed315cd28ae SHA512 c52e168d965270cef5d7ea3c14f0e5f2ff13367ea5b3eb740c8ba81b03825ee42c07d769bc7641b88a12b4dcb52886aa3117a5655cbfe58f8c68247e44ffee77

sys-kernel/zen-sources/Manifest

@@ -1,13 +1,9 @@
-DIST genpatches-5.8-1.base.tar.xz 4268 BLAKE2B c1c4959758d0bc28213e4fa5c73014bad00144a92d37ed4f576f45d4d578c470c61080d941358d16b426aa17893bd80c88734b65beaa0afd90baf5d78cd078f2 SHA512 534e92071e33fe03049b0f1f3ec7d3e670155a2fa6e93dd1bb8cd5ca0f817549fa9c0b6c5ca06020d7b3733d53204ad79d909d5fbcbc748f218a9f799cc3be6e
-DIST genpatches-5.8-1.extras.tar.xz 1764 BLAKE2B 35c7218e356715ab544b41a7a91e90ef8ab3ad6f318e0026e835eb007f07a48c82164928750d337d238c2717ebd609a075caa03acad92b538e70bacc131d772c SHA512 823feb9f57eef7b72f899c9655ccc2da285d66fba5ecb8e904f991d9d846f5894ae24b254917a430ad7b2358c8bb6aba8b82fb5d63081c8b54eb5c96f4c3354c
 DIST genpatches-5.9-1.base.tar.xz 4004 BLAKE2B 8a4577d42262fa901186acc60d28221d00e5c9140886705f018d9989f818d96ee4d9a6586b292e7b1d945bea9e2408e3161a73e0999defe1b7f99d0a339eb7be SHA512 d6ba1051f9561aa30d7b196336c34930285d613e8119b152f1d6cc447cb22db5ac07c25f89d4ceddf58c9370c42699d0250a31449be2da3c591896b0c87d8718
 DIST genpatches-5.9-1.extras.tar.xz 1764 BLAKE2B 32d29f0448aef113ba9c9591c5d3b671d00d07abde9f35f365b48168887913bb2da95a8a52b852453307cabb111115a26178be4cbcc016e53a26a31f783a9df7 SHA512 df007dc98c1acdd31773f7dcf8aeb22812aa55e5593e8509b6a8762f2dcf06c95d69ad7cdce992e7a5fe730754bef26242acdc4e4da51ee29206fabb86c9cb0e
-DIST linux-5.8.tar.xz 114459324 BLAKE2B 7bd97f8fa4527840754434414c07283e89731dc8ebb1e95fa5bc1469a60af1122582c0d3b6e262e77882f023190068df3537bd8b65964b3caa820bb2c8e579c7 SHA512 45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556
 DIST linux-5.9.tar.xz 115507140 BLAKE2B e8d11472d63a9f8409ca12a2e8c97c6963a3d4516b5a398b627d6ece565584526f9b5a1377a2fa4bd184c09c7db94c987428bc5d52df0c788464a67e9e8d6dcb SHA512 d3d92ce4246bad74c9a784212f160d98449b1e8793970c2c308276568d852b8effe0528686bdb87d55d691f09a826abf7938d69bdd4759ce65ddd5c05ffe4eca
-DIST v5.8.14-zen1.patch.xz 720476 BLAKE2B 54075951adf88c652c828cea27734baef479e76402677d8a2070b3cd33a7af1b32097c852ef9eb8951e73f2d21b4a6d7f03e368e8607aef651e1acfcccb4fe5c SHA512 e3b6b6874f44ed486a0bd0695052f76539eb848b267d05b0f384db77911f6ec277e2210b993d2b6fbc3a44978776096c6e72a9bd0167454cd1f69f5e211d1d27
-DIST v5.9-zen1.patch.xz 37952 BLAKE2B 0dd98ce2620d56ea0ed3a360a127f46f67da5c720e8ff5617684d66f3dfaee8729aa4be10cd1f106684a2d7a6c7b2bc2415285db8765ef2ae53384534c22db0d SHA512 c84fa6336edfd0ccaf307a01612e1c37de8aa0089e19ab5ece2d0cacd435c34149e3d8ab12c5b35bb19dcb2e231c7d1b94f71a013d3cb49313255818af00ee13
 DIST v5.9.1-zen2.patch.xz 46968 BLAKE2B 3f745ae790e4175581a3bbeabd33b84dbeec6654c73490d0b139c13064270a48423271fa23b1b3a5b5c3391fb8027f17ccc5a6be4152e3124afd60b9506d805d SHA512 7d9af59491007a390a46ad072d39b5b7fc457b5b4651ddd8b78657b9f0ce875bf916f7a4cf759e8799eea05b4fedd1fe0ce8d291ab3f81c6d6b82487c60f9616
 DIST v5.9.2-zen1.patch.xz 290236 BLAKE2B d1c04aa5cc8810013f8a8d5ce1244fc7a8868ce09bc445faf77971e99bcfc55d19b801f442d203acab461e26875318a236b12838794b3e7c3534b11152c76b6b SHA512 d7f66b47c4a1374be99c258cd9728fbaaa82053e92b5a1433079d5e34baee3d2ec912bd8771b42b92a663f3278e545737dc7c040975d693737b5151094e4d3da
 DIST v5.9.3-zen1.patch.xz 325644 BLAKE2B 46805e2848cf920ab73b6293f972382318b841ebb77e33914de169d3435828328cfe7c0bcc15b35c8d3f85b153f221a6264710f8a0b3014a75b2b27b1751f8d4 SHA512 f1b58edfe5f92885b0bb69651e03fab5153cf2a4880f9d2c6f290aade4815060632f84641661235ec3925b5276cff2244771a1171f7442a5c4fe6fa99109c31a
 DIST v5.9.4-zen1.patch.xz 325664 BLAKE2B 1da879a2fb3766f6387183e01147d2d347d7f7f680de683c2f562383f311c22686448a2f858ce4be49efd59b9cbab5e9b098438d5abaa31e0cd59e323ede3af7 SHA512 45fc0b8fe297445e983f1f461cde266171f5eafe1939f2fe1b2fba3a4b22dd1780e4460bf926834e8047ae0483683183ada547d1097f95914aedc7fd76a7872f
 DIST v5.9.5-zen1.patch.xz 566168 BLAKE2B f05d216a92eab873ad4942a8e542201cc23449458f2ee77549bc819eda9472ee80075dd04d58296d82b80b82f0d642b20376ba9e33a65bea5aed65d2561107cf SHA512 b6a6e3e676d78c6e197b220ad6fb49d2a5b11a4a264aa77a9094d887134c5cf11f57a112e2bf03d99c910b240d3d3e2ae624c82873375d0cd863532416aeed18
+DIST v5.9.6-zen1.patch.xz 566280 BLAKE2B 0aa74fe697723e95240257818892c509194be34864d93573bfdbb0fd91d8d697624f3d6d86d50c901c7252e36dfb0daa7e793606ba9d95d6d429d2a6e59995b0 SHA512 f11ea4724e202eb32d13eff7b6b990ca1c20ce36d90cd6390b46fd57f8f7c8d07f8890c18035352acd3a389d8cd7e1da33f4d303d7393595cab528010cf4966b

sys-kernel/zen-sources/zen-sources-5.9.0.ebuild

@@ -1,32 +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"
-ZEN_VERSION="1"
-inherit kernel-2-src-prepare-overlay
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-HOMEPAGE="https://github.com/zen-kernel"
-IUSE=""
-
-DESCRIPTION="Zen sources including the Gentoo patchsets for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-
-ZEN_URI="https://github.com/zen-kernel/zen-kernel/releases/download/v5.9-zen${ZEN_VERSION}/v5.9-zen${ZEN_VERSION}.patch.xz"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${ZEN_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/v5.9-zen${ZEN_VERSION}.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_postrm() {
-	kernel-2_pkg_postrm
-}