Merge branch 'master' into 'master'

Master

See merge request src_prepare/src_prepare-overlay!152

sys-kernel/liquorix-sources/Manifest

@@ -5,6 +5,7 @@ DIST genpatches-5.9-1.extras.tar.xz 1764 BLAKE2B 32d29f0448aef113ba9c9591c5d3b67
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.9.tar.xz 115507140 BLAKE2B e8d11472d63a9f8409ca12a2e8c97c6963a3d4516b5a398b627d6ece565584526f9b5a1377a2fa4bd184c09c7db94c987428bc5d52df0c788464a67e9e8d6dcb SHA512 d3d92ce4246bad74c9a784212f160d98449b1e8793970c2c308276568d852b8effe0528686bdb87d55d691f09a826abf7938d69bdd4759ce65ddd5c05ffe4eca
 DIST v5.10.10-lqx2.patch.xz 513472 BLAKE2B 10cc5638ab22aea7211d32a46d4e4b16c1d4e02c98667beadd0a058f6ed98ec747263c99e67a381b207e71368e3a70c095be694dcd877006d50ddb36bf888b1b SHA512 c2c1daa243d6520237b58981bb9225fa0f8065aa8267aae6908a8d5bfc8928a298b9793d6492ef98bdf79430e11a5ba91fd4acb4db2db99417bdae5cc9b896d1
+DIST v5.10.12-lqx1.patch.xz 543216 BLAKE2B 00792c5a9f11ae686de91958b832dcb0b94028bc8fbab62b098ab8aca7a3b99a604093ffc94afdda934358580202e38fbc3ad1a4ac04a85737574363ff850b9b SHA512 284cd1f483b5cf6ff69426eb1c1c87c5e2ea3c9b1d9a7ec272d0ad0f2375a7dddda540c6e75c3c33a98183c687b41af5c9f89c2df3091947dc187645ebd42f7e
 DIST v5.10.3-lqx1.patch.xz 133084 BLAKE2B a69e2a0635acbcba9cc7b8f63afb80614d49284b2b42c8aad06c2a9eb3041d1d420f096e734b1ec7bbc35f1286c38ce643a42c953e7d6f000babdd97e36830ac SHA512 661f7d716b8e34ef093138cb143a871233aba772e12bd49698f27479965003f244ecec566148275e5115942b656fdde2de3132e68652cd410c91082816bdeba5
 DIST v5.10.5-lqx1.patch.xz 334676 BLAKE2B b0cd14cd7a0bb373583bbb6e114b8c9cc9be2bc2bfd4ba76dbdcecc1a9005283969e06d0e49cdb7450a9be0b848ff73b0d3ac66030e5cc8082a398eb1abb536f SHA512 c3e8b51b77df1e8a2c76f63cf9e92b202b6ea0fa3499869ec3d8eb7cc38f7dbcc77654aa6af6749e14615128a706fa6b8607db31c046537c55cf8c69d3eec8b7
 DIST v5.10.6-lqx1.patch.xz 350852 BLAKE2B 1a49c3f8c7e1d0d18271f43c748decc61ed6b64fe70fda7ade63f860fd3fd385fb34efaea88f2a671ad4d3d67bca7ad9bbfbeaca96e83577c94655e2ba37f4b6 SHA512 6603808dd11b82a04988fa335e4b640101d70ddccc32fd9b1c112cc25ac59649d315df5d67b3a1b3362e8beb260882605d25659447bbaac0cd1c8d7dd50cdc84

sys-kernel/liquorix-sources/liquorix-sources-5.10.12.ebuild

@@ -0,0 +1,33 @@
+# Copyright 1999-2021 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"
+LQX_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="Liquorix sources including the Gentoo patchsets for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+
+LQX_URI="https://github.com/zen-kernel/zen-kernel/releases/download/v${PV}-lqx${LQX_VERSION}/v${PV}-lqx${LQX_VERSION}.patch.xz"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${LQX_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/v${PV}-lqx${LQX_VERSION}.patch.xz"
+UNIPATCH_STRICTORDER="yes"
+
+K_EXTRAEINFO="For more info on liquorix-sources, and for how to report problems, see: \
+${HOMEPAGE}, also go to #zen-sources on freenode"
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}

sys-kernel/xanmod-sources/Manifest

@@ -3,6 +3,8 @@ DIST genpatches-5.10-1.extras.tar.xz 1768 BLAKE2B e99d5d2137d5752845ba8284a0dd57
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST patch-5.10.10-xanmod1-cacule.xz 459912 BLAKE2B dfc0ee7527298412346aef8330fdb3a450f9f7a6ba5b3f53c3a5d0ecbf1400e36d99ede4b0aa8497669647409d8d9489bddf42d5eb1c176e57c4e06f3fb1d363 SHA512 d5183d07069ef81b74571ad704374cd6a1bdbb70ce0ab86e57d06cf38488364f1c10bc0c24a8b279cef3da603c1eba8f001f0160d9bc469d898768511172bef5
 DIST patch-5.10.10-xanmod1.xz 452512 BLAKE2B 3c826cce43695439430a687d85eb2bcb73fff532f116c26171b4ec4e30c1eb1e6057ce91f2de17170ac2e53d85e62099741bad47cadaef0f3a062f2ff91e696c SHA512 0fcc0996232ea2ddff8a278d103629b8853be9f644014e2e74433e93c54509586bd63fbce466424bb48689575a5d59dbc78eb16fc2e3b7260bdb9507607773f0
+DIST patch-5.10.12-xanmod1-cacule.xz 515924 BLAKE2B ff36fe9df894a179372de5ee3c891a8be66949ad8fba964cde731f2d4976872004473ad67a407abb4ac230e7447dadbfd08d7ed92e3e53dbcf7e593dfa603613 SHA512 ca1e155bb57fce0446fccde5b86de41fe0e13a6c7a873573445ded2d9ef5bdc2ce23991fcc2a4afe8cb4f5772e00aeda9a7294257816616fc971bd4b0056e60e
+DIST patch-5.10.12-xanmod1.xz 508588 BLAKE2B 273cef83b87d0a772db73683a5decc40addccd70e9d301b6fcc6da1d89e55c7df5af4d99135906daa4095e39d4dbb1561190ffbd3544d8899b581d6d7f3f8269 SHA512 5c13f2af2f8ee1f970ae5863069f2a1ba738b928aec13b9fe353aba8a1bf06860d8f8ff38986a7188034c20f0051ebad50021c8561e0dd8ebdd0712dddf9b2ba
 DIST patch-5.10.4-xanmod1-cacule.xz 286452 BLAKE2B fb2f5c389a1e0810837292bd476c1f57d202e8b22eb8e9fe4895a9954070442635f1a1e8f53b55a28b09a3702d319f43003d4762f1772ef9dfca11984d5323f2 SHA512 07ad37cb2e186874b6c78278abc9653a200cbc95ce1229ff2b93425afa14eeaacd96d9dd8da4141d341b2f2dba9de0d6b6c47922a6f713a325d9caef0a231466
 DIST patch-5.10.4-xanmod1.xz 279076 BLAKE2B 49074b019705d001bf04358bf010dc0957c2b8917a38bc2e19a4e3a42ce5ce3820c0f9f60f7472c906244f91136d9412ebfe9774d4a0102692ab1560e344c89d SHA512 3f86b65fa856aa2e56255051efc2f523a0361435b8fc10d0f63dfa3bbda5021330278bf1952d971501dfd2c86e945a1c7c0b9af068a7f8d75053d10730319754
 DIST patch-5.10.5-xanmod1-cacule.xz 338976 BLAKE2B 327af0edc5d62efdda58490dac449edfe0035e3eb6fa87726a38a549da12e416e2b501987fa258111425b2639b1a5468e8108cb791b5479f4de9e4eef8c85e4f SHA512 38c2a3f533d960b2bf1b2a42967ad56bb5692941a9531fe262fa96bc81c6fe923ab09dc7d7d0c9a009c074ec1fd17dc00b43400f16757e7ac9a8e8953b66eecd

sys-kernel/xanmod-sources/xanmod-sources-5.10.12.ebuild

@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="1"
+K_SECURITY_UNSUPPORTED="1"
+K_NOSETEXTRAVERSION="1"
+ETYPE="sources"
+inherit kernel-2-src-prepare-overlay
+detect_version
+
+DESCRIPTION="Full XanMod sources with cacule option and including the Gentoo patchset "
+HOMEPAGE="https://xanmod.org"
+LICENSE+=" CDDL"
+KEYWORDS="~amd64"
+IUSE="cacule"
+XANMOD_VERSION="1"
+XANMOD_URI="https://github.com/xanmod/linux/releases/download/"
+SRC_URI="
+	${KERNEL_BASE_URI}/linux-${KV_MAJOR}.${KV_MINOR}.tar.xz
+	cacule? ( ${XANMOD_URI}/${OKV}-xanmod${XANMOD_VERSION}-cacule/patch-${OKV}-xanmod${XANMOD_VERSION}-cacule.xz  )
+	!cacule? ( ${XANMOD_URI}/${OKV}-xanmod${XANMOD_VERSION}/patch-${OKV}-xanmod${XANMOD_VERSION}.xz  )
+	${GENPATCHES_URI}
+"
+
+src_unpack() {
+UNIPATCH_LIST_DEFAULT=""
+	if use cacule; then
+		UNIPATCH_LIST="${DISTDIR}/patch-${OKV}-xanmod${XANMOD_VERSION}-cacule.xz "
+	else
+		UNIPATCH_LIST="${DISTDIR}/patch-${OKV}-xanmod${XANMOD_VERSION}.xz "
+	fi
+	kernel-2-src-prepare-overlay_src_unpack
+}
+
+src_prepare() {
+
+	if use cacule; then
+		eapply "${FILESDIR}/localversion.patch"
+	fi
+
+	kernel-2-src-prepare-overlay_src_prepare
+
+	rm "${S}"/.config || die
+
+}
+
+pkg_postinst() {
+	elog "MICROCODES"
+	elog "Use xanmod-sources with microcodes"
+	elog "Read https://wiki.gentoo.org/wiki/Intel_microcode"
+}

sys-kernel/zen-sources/Manifest

@@ -2,7 +2,7 @@ DIST genpatches-5.10-1.base.tar.xz 3840 BLAKE2B 08ac1f83dc9a1cfc1d4cf0a3a5ab4c9d
 DIST genpatches-5.10-1.extras.tar.xz 1768 BLAKE2B e99d5d2137d5752845ba8284a0dd57620851c3620603e871973af5841b54e9bfdde92ea2408ddedb55355f2c954c80641b06098060043916d2483e10cfb8293a SHA512 0034e5ab57cccb2e969a3b9e1f674614ca853779c552c37be9c5afb0a37112bf8f2c30e1b21832d56320c70c1d622081b60369c6a86fa737a23c3ed953267453
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST v5.10.10-zen1.patch.xz 538040 BLAKE2B 2c0ceaebd78107adf1f062a866a6ecb7cc7defcf7eb00ac9287974a6417da2431100c5bc3b23ee4ad47a2478c31c5843de32b73b64ab7928c8df019aec2fb77f SHA512 ee719511e43fa0c799a8b342254125f10cf88fd32999d63d8eb904e76b45d53af22722dd14fd3c36556713a39569266d69551278939b752580360c52ea6a3750
-DIST v5.10.2-zen1.patch.xz 38964 BLAKE2B 8596998d6cb2362b71194f6c8091fe61669698efea857f9438e4afebb521c9c3be298f94a280401109b9ba75f75245a751453fcb5ab8571aca7a2317c434bad5 SHA512 9b9eb8e9453efb6404933cc44264762790e79b6fabc56cee14cc7d8659b6be8089100d4ebb3af3e414fea2db2aa6de9118c5366ea171e02265c7fb2afe2a7605
+DIST v5.10.12-zen1.patch.xz 603272 BLAKE2B e24391f8e718384b97acbb542b74544bafcdff028fffd303e50f5b3eeac80c519520ffa357824865fd5f1a5907786099f58be735ae59f02dee71bcad78740b32 SHA512 04e0298a686916448329d3e98e454dbf53fcba85ae4513af6390c6ae9687e63938859dcc908e90b171ef91d451d5adbe6934df331888aa01ae85f98f14bb5057
 DIST v5.10.3-zen1.patch.xz 52312 BLAKE2B 157e08bc74a55c6e6e86895100ef09380251d86be436cd19ea06c7d6a49ad8dced5e128e863bf3f63c8334191c3e460617b4d9c68cbee49cf9781ede77dcf3a0 SHA512 8b274276a6b5c64a105e36a5456edef6a5a2a4419c4fcb6a2b6548bd8fca2f0ffa523e3105bd2486f17cb8460ae22226bc34b18783298da4b9cb322e92ef7356
 DIST v5.10.4-zen1.patch.xz 349804 BLAKE2B bb50930e24ed9028bd2518056e4e5eea503f4d3d6153d65e04adb22c660cd42e10c64a13a7c10248c7bfc51f4ef36350c7f7f8aeb2c434fed750d9c8175252bb SHA512 cbec1f3e12a0601bd018d90a52e16dd9b225e4d8675435722afa613ea98eb33c1bcce3d631dcc18b7a6f046c0fa12be0acf2bbb9a09d5e259f2ab325ada46148
 DIST v5.10.6-zen1.patch.xz 387460 BLAKE2B 0e42109335d0c8d7344b8afc3addbe20c92952eea536df4db0152607dcc97d7de142124f9cb0c22c52af01bd6c117cdc69c51f36725c0f2ab2d51165a2390a28 SHA512 3ba03f703521083e629911ebf980545daa34d73aba30aed8e7355eb315d89728f322df0a3791663fa5fbe398bbd1d10951518d81126e077cf50c9fa1d34563dd

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

@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"