Merge branch 'master' into 'master'

sys-kernel/liquorix-sources: bump to 5.11.3

See merge request src_prepare/src_prepare-overlay!158

sys-kernel/liquorix-sources/Manifest

@@ -4,9 +4,9 @@ DIST genpatches-5.11-1.base.tar.xz 3440 BLAKE2B eb1e9a9f2060023cb410bf3db8c4f4fe
 DIST genpatches-5.11-1.extras.tar.xz 1772 BLAKE2B e6f8eae67db54099424f33e17bbfa66d36ae44c98d5f58969634a709a4b949a675a7ec1053eab4db4f745513d9730b68439ecf888e92f0fc9ef369822b39a388 SHA512 cf9d0ee27618b1b49322cefda8d85f66fd94820b9902948c8dd9a33d4e14acf511e7aabf611df5e070a4011e06d80164a512d124f5686b5b16fd81409098d8eb
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.11.tar.xz 117619104 BLAKE2B 81300c27bd5476387a83123aaeb4163c73eb61e9245806c23660cb5e6a4fa88ffc9def027031335fa0270fc4080506cd415990014364e3a98b9d2e8c58a29524 SHA512 a567ec133018bb5ec00c60281479b466c26e02137a93a9c690e83997947df02b6fd94e76e8df748f6d70ceb58a19bacc3b1467de10b7a1fad2763db32b3f1330
-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.14-lqx1.patch.xz 591956 BLAKE2B 9aa7eab7b55d2f9e02f336ca70877b204bdbb106d0d02457459ea8408effdd179c12def01575410e16db987fee7cb79cc17d520a5f80712119402253619f3541 SHA512 42ee30f7d4253f47b814493b0ea22a971f564fea7fa66180d02d23d6fba0e6c44a5d76764da35f46dfd739b3a72bc41cee57296ae1871f3738d8c2c1fd5a4c6d
 DIST v5.10.17-lqx1.patch.xz 663712 BLAKE2B bedecf8374be91f54279561c06170e991c0aa1b576049bf3796ced38ec90dbab774348a403bf4db8bbb06c9704172b5520fbed5462afaf5f6d85b7331d66b578 SHA512 9b1cc517e81a366c5da5c721dd409c7a5d8347e801285559db7bb04e614645c2e27a11ece838e29be9cbd722444a9132270bee0c44259a8f37764bc8bee510ce
 DIST v5.11.1-lqx1.patch.xz 169392 BLAKE2B 68011ef65da7b4209b1693d2fb135953a7f058006f9e4349b76a28c25f2ef9f18a8aa33ede42a68cec5d406592ae39fcc3d3cba052237e878ef2475c64bf42cb SHA512 7935dd78517574eb40454823e6275d683764f0b7599b76e7de9bf457ee502f2ede639dbe63b5e5c57e4d626d2dc1154433cf3f9c5b93a474922ca8d4e4cbe134
 DIST v5.11.2-lqx1.patch.xz 172692 BLAKE2B 2412b22eddf7adb9ad5113ae534dac7f8d79d91d6c6c1614f8bbca01f7b56cddb961fdf21e54e6b22ff3c9842c141004dfba6b04d7343b755214b48a99077082 SHA512 fcee31a48107dae8f00128d81cf5f647a91231c83293b8e9a79eb1d869e1c923c61de350ff2941a74ae3c7f4f18c3f9815160eaa3c6afb3fc7e47d4b8d82ba7d
+DIST v5.11.3-lqx1.patch.xz 394620 BLAKE2B d248961e69c98cc609c3ba10e52f163b1e3814513bb5af861bc3a53fda9ada72bd977c6ccc4d3e78926b1ad4980b0d37576fa75c40541952e6616b1adf715587 SHA512 ee319057a64498e7352e73250173b23cbe2680fecf22af43ef9b78b920655038cde1d552c2470d09e666fc3f723700e88221e23eed77cf9fe7ba43b48ab2aa13

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

@@ -7,7 +7,7 @@ K_WANT_GENPATCHES="base extras"
 K_GENPATCHES_VER="1"
 K_SECURITY_UNSUPPORTED="1"
 K_NOSETEXTRAVERSION="1"
-LQX_VERSION="2"
+LQX_VERSION="1"
 
 inherit kernel-2-src-prepare-overlay
 detect_version

sys-kernel/xanmod-sources/Manifest

@@ -4,8 +4,6 @@ DIST genpatches-5.11-1.base.tar.xz 3440 BLAKE2B eb1e9a9f2060023cb410bf3db8c4f4fe
 DIST genpatches-5.11-1.extras.tar.xz 1772 BLAKE2B e6f8eae67db54099424f33e17bbfa66d36ae44c98d5f58969634a709a4b949a675a7ec1053eab4db4f745513d9730b68439ecf888e92f0fc9ef369822b39a388 SHA512 cf9d0ee27618b1b49322cefda8d85f66fd94820b9902948c8dd9a33d4e14acf511e7aabf611df5e070a4011e06d80164a512d124f5686b5b16fd81409098d8eb
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.11.tar.xz 117619104 BLAKE2B 81300c27bd5476387a83123aaeb4163c73eb61e9245806c23660cb5e6a4fa88ffc9def027031335fa0270fc4080506cd415990014364e3a98b9d2e8c58a29524 SHA512 a567ec133018bb5ec00c60281479b466c26e02137a93a9c690e83997947df02b6fd94e76e8df748f6d70ceb58a19bacc3b1467de10b7a1fad2763db32b3f1330
-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.14-xanmod1-cacule.xz 565148 BLAKE2B da0dd2cbc2e33787b078e0ce710d7f6a006691c7b4e555be997a92c8530609a34462e8adff949eb218d3b8cf6ee335df2fc82591cc5c58c8fa824871d633d52b SHA512 0e861857ab861f0981d31e5394af28ce2e4791ab86ce8ddf556526a8d2d4598176f77b9f6f737f2e217d4831b209ad85acf62e0d25801db0210a6e5312d88fef
@@ -13,3 +11,4 @@ DIST patch-5.10.14-xanmod1.xz 557856 BLAKE2B 00ef644d4ae76f90e78c94c244f17d19576
 DIST patch-5.11.0-xanmod1.xz 110924 BLAKE2B 1a8ba61a55a8111e836383a0df5e45649d67352128e13001a66cb223f4fb378b4c9f686cd74da0f3baf93551a665a1284f563331a3ecdb683252960fbc979c28 SHA512 c32eb1817ff42906d7b5986a8771f1213f908b4aa74736faf673291550a3def97a99064e2ccadcb75d250f20b1df3a84002d15b475a9ea7deccdc17dc267f0c3
 DIST patch-5.11.1-xanmod1.xz 115624 BLAKE2B ac78602a0163c22f5b3e63a4c0c190e5ed01ec8a46653ec73bf1b656833e701867f77d38458f475ac194c8538f9290ef884c5b33e6736860f5ab751bb1396f77 SHA512 8c67006af22b69702ffd2de62fec6a202d824313e9e3d6516bb8c83bffd1125507b5cbcaebdd002a09f92492a47051755f71bd8576cdb717d5284a4dcec4f5cb
 DIST patch-5.11.2-xanmod1.xz 119096 BLAKE2B 065240dbe21286bf3f3d146cc8bb19d253796ec0e8a2089c0c080fa3ca1aaecaaf1ffe7a5c60a3a8621df5018af4ae6e684655647e66a542ce09a62c6e8a276e SHA512 fd2744e2b6b07ceeac345dce48ffd03e3e815792446aafdf7d8c18101e159c69e4e9e5f6bca949b2a68a7b922004620f8b8c89590612b50d3fec54de590f5025
+DIST patch-5.11.3-xanmod1.xz 362932 BLAKE2B 100724d51a3d907aefb3be32255e1f1b0945a37155ed626dc784704fa5f494783a5cee48c2e92d008fa5a9302edee960011558215e4b3d39375d6a2da5e01390 SHA512 7f3f2299fb5b9e17ff921005940beba8f9459ebe286a3c3b081d4a18e0048ccd990ad2ad80ab35d456debcaa5367e08392670b8df4f3004df9fa49164a934e75

sys-kernel/xanmod-sources/metadata.xml

@@ -11,7 +11,6 @@
 	</maintainer>
 	<use>
 		<flag name="cacule"> CacULE is a newer version of Cachy. The CacULE CPU scheduler is based on interactivity score mechanism. The interactivity score is inspired by the ULE scheduler (FreeBSD scheduler). </flag>
-		<flag name="experimental"> adding experimental patches for CacULE. </flag>
 	</use>
 	<upstream>
 		<remote-id type="github">xanmod/linux</remote-id>

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

@@ -14,36 +14,22 @@ DESCRIPTION="Full XanMod sources with cacule option and including the Gentoo pat
 HOMEPAGE="https://xanmod.org"
 LICENSE+=" CDDL"
 KEYWORDS="~amd64"
-IUSE="cacule experimental"
 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  )
+	${XANMOD_URI}/${OKV}-xanmod${XANMOD_VERSION}/patch-${OKV}-xanmod${XANMOD_VERSION}.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
-
-	if use experimental ; then
-		eapply "${FILESDIR}/no_reset_on_migration.patch"
-	fi
-
 	kernel-2-src-prepare-overlay_src_prepare
 
 	rm "${S}"/.config || die

sys-kernel/zen-sources/Manifest

@@ -9,3 +9,4 @@ DIST v5.10.12-zen1.patch.xz 603272 BLAKE2B e24391f8e718384b97acbb542b74544bafcdf
 DIST v5.10.14-zen1.patch.xz 655668 BLAKE2B efd0d1d0e95f556a69e64379a079c776fa2e9000f5d9274d998b8dd3ab2f0f7be2173fb716468e2b901c7f5ae64b5660639b7ad58818208d5af5270aa5dbdc33 SHA512 e51bd453f33a4070c19c0d2180df6bdb9379bb6a14543a98d1b7a51cd421ad47ef391b4ee9993450c607d16dc41e63f10a3265640e09b59c42ad88d5bd35b937
 DIST v5.11-zen1.patch.xz 65512 BLAKE2B daa2d6f88e99dea76882f9e66046ccc54620ad3aa07bbf54987f92fefad051465bdfaefd53ca9603f9090b2c35e9a13a24b2d11a92c5c2b252c9e5acda231069 SHA512 e651745f947e589acfa86e1513fa2784d150500697182bd16a4eb35352d7d0f8515ede7b6e1cba9af8ced93c5a6cdb739023365159a62cb2b2b8acc6cb08b3ea
 DIST v5.11.2-zen1.patch.xz 177868 BLAKE2B 6c2fcb87c5d27353954b67f67c579c264c3a1eab382a60858fb294f773860c67f7183f153747ddde29958ad87a59043a4a8c38459938ef2788c65a8be2e1dc9c SHA512 70c5fa9de76259eaeb6db918dbd9aef029f2397c63195b636f48e31362344371bf5a228233deba3a5cf8ac791527e8f6575f0c353cfb3b4f3954587c0f5b1978
+DIST v5.11.3-zen1.patch.xz 418348 BLAKE2B d9970ca6ee2511903ebfbcdd71ae5c5c730cff7a438110ed2a472df272fea48c31f4e03ac041aaf2d788af9f2465d9c5f6f5d6a7c9d0b21a3aff300a223a1313 SHA512 0d24416a920d74c88e64f8c0427d87aeb83937f7b941c6d9aa2b1fdc3180e92b389ca68b7985d814dfad776e597dc0da1b96bf968f6c8ef5ed4590dbcb48c59c

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

@@ -0,0 +1,32 @@
+# 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"
+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/v${PV}-zen${ZEN_VERSION}/v${PV}-zen${ZEN_VERSION}.patch.xz"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${ZEN_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/v${PV}-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
+}