Merge branch 'master' into 'master'

sys-kernel/ck-sources: bump to 5.12.19

See merge request src_prepare/src_prepare-overlay!206

sys-kernel/ck-sources/Manifest

@@ -1,6 +1,6 @@
-DIST genpatches-5.6-15.base.tar.xz 292284 BLAKE2B 0d80ef60c429516c2888e18704a4deaf6d293f5e60179b4dff080b1aff0088c69d5629a2bef1f57ccd90ca694460f3d57cfde7ed3274d30e982b506edf2bb5f6 SHA512 afb1c877d5317881deda321c87aae3138b147b45aeb4af5c1c377d87c142626904db59a5b26758a9f873bd8760c26e305487156438a553c9dda11f3ed1801875
-DIST genpatches-5.6-15.experimental.tar.xz 13692 BLAKE2B f7db281753553775c290c985a70296274746b650798b3d0e3dccd7cde9981992d198115d3b6a611e0b7a8df5265c906d21f00820610a1bcb8e2d33ec162c9791 SHA512 0cd0048fa84a26eea32b00eaff0f1ce343d17582b18e590250fa2501febf58421f1582ce5860e0a853f4ac949876f23d82d33a0fab2b77f0ae13038675eb879f
-DIST genpatches-5.6-15.extras.tar.xz 1756 BLAKE2B b28a36cb3ccbfb9b79757e1684535eb8283157accdfa357d47ee8a699a4837f75f4aa0dfedfbac3d9e402b36bb669d8623f37b0c8b9dc24d095457a0da40ffe0 SHA512 107ab66357f3ae9183488fdf0d963561e1b862dedc0863310d78e6607c380c8dce54d555e1190b6aa8b09c1222e6fd137947b489e84e91a3bf3f98fa7d85df20
+DIST genpatches-5.12-22.base.tar.xz 1085632 BLAKE2B 328a25218394a93755d29335f0a827faaad2fc823bb25bf8ef36385eaf8b30427c4075bc0074969fe0923a975d88d7573fda0b8e1288e787f03afc6cc77d25ac SHA512 08a71f09955c92bd92f4c67a018349a9b1d7ac5e1dad7efa3f1cdd2968a4c82042308613069e5bb65a0c38f19d05db5a0ff25d17726809cf12ba018fff5bf564
+DIST genpatches-5.12-22.experimental.tar.xz 70168 BLAKE2B ad642f4dd65ab934f7ad5de9e30bd9aff1a52da5d32e958e753c73b19e8d9a7987a0181e5048c9e47675bcea2a1bd4df1e71f900eea976fd484560fabf332dcf SHA512 1169012901b5e5363242398fd3b6fbbef3db0d62df9d3c24e4e4336a6de917abb58f7d4be4c2ed064d697b6121d4833bbcefacdf2e3babb411960da5f4c46b5f
+DIST genpatches-5.12-22.extras.tar.xz 3420 BLAKE2B 61d7d8bf8c88a1f0ee16efd07dca0fcb82a48574dcf545421e5e8302128acd5e28fbcadc4d1a82f0b2049491988691e3f8b85c99d50ec1c81a4a4549c96b9651 SHA512 20a505a8247ba33f8c0c201b809b22073ec589f4d83b1089c6787afbe42760443a964fd12fbe2dc6ec778c6d3067db04d93ec098551ff9ed6e5030d5830fce9e
 DIST genpatches-5.7-3.base.tar.xz 22668 BLAKE2B a6cfc47a44bb38d6528061e7da78353bd07129c265fd0db6a5f467c1570d02602fc2f1998652724627ff58a43a6d9fda9e0f9b5e987baf2c0d2de7f20e2e93ee SHA512 d226c7fb4df4b8a86d8fd30e2c1720131c8420ef7d64a724697977a819526e192963a7167635b2266c976088967e4ac2f28a08f21732593de5170d5b660270e6
 DIST genpatches-5.7-3.experimental.tar.xz 13696 BLAKE2B 380f5f3c39b8d999e57162afa9dc64da5d9b5bc7680c2ea30c429f1475398f59edf6a9a68d6ebb7b34d4bd302885e750885c3bf4f4388e2dab4d06c5633b54c2 SHA512 4429b139ce3909564ee5a9d97c3da85d42f0d915225d8d2b7654f28b4403bb7217680f5fc0e3aaff829af4165da053c2d4beedbb2a5c7592f1541b5798d52d55
 DIST genpatches-5.7-3.extras.tar.xz 1764 BLAKE2B 682601ade4f6dddcb5dbed3e501f0aa9d6e76fb000d530bff9e9b70b8a41c77c7b1227d584271713ffd4d0d2996dfbcf26fe881a6cca64997078571a8aa8aaa4 SHA512 07c6087fcb46b8abeb8e1c62e1aa19f5a17564456de11749723ada2348a09e8cdf388ab0bdbdd341b664e32503a7ceb1195e15ab16fb3f9f15be5728918852bf
@@ -10,7 +10,7 @@ DIST genpatches-5.7-4.extras.tar.xz 1764 BLAKE2B cb3b1a55e9dee36feaceb5049d4e525
 DIST genpatches-5.7-6.base.tar.xz 182364 BLAKE2B facff9299c5913596be8bba1dcab4b06e2ae697d66df645ac7c0e8aecfbea7788b4c4574cee69d4db3cf9c8f97c18be4af17f42ef4ec1fc7380b4936ab63cfa9 SHA512 68d3e2e70ac6838ad98b179e9b0694ce96ec0fefec98b497ed0fc689958d413f502915101ee9f38fff1fb5fb6b57d9e79d12870e280bcd84836cf30cd682a654
 DIST genpatches-5.7-6.experimental.tar.xz 13692 BLAKE2B e49fca2f4419aa0923f33ba38daab49faf105ef03849bfc59dc9efecc980aaf3ccb0e34a7755149b1e4841b884494b146659df49f44f5e2913973d4ada9d5e63 SHA512 f83f8485d4e3f2c0bc5faf6c59db6745e287db7f3eeb4d1db7a8c92b7492d9d1678069c67e89fec2ac63f831a8419855caf70f9e71efb7ebfa7c0e1461e37ab3
 DIST genpatches-5.7-6.extras.tar.xz 1764 BLAKE2B db13c787489b7b21d9848cbd0079683bc5a93a9ff4df09901bb00cf275183f0a367999fd9416ec97d36cbad6351b119bf6fb347f2fb645d4e515f3e6548e9f96 SHA512 acc190f9c6efe34f5b29a86d787ec047bf8df1d8b7c726fb79279f77b2cdb7a0bc777f353c9ecadec7414797f15562c36734a69e6bb2d4a5f05acddb659c4d12
-DIST linux-5.6.tar.xz 111785252 BLAKE2B 8dbe02a8ca7fd3dcf512a15c5d8098c1e7f94257e65173fed43fcc45480e4ab790df8cd39bbbb4e2a21dc9a00385bc9bbe98215a31e7f7e1d9c8f21cd8ace69e SHA512 80846fe2b4e4a7ff471d2dde28a8216ae807a3209f959e93d39ea4fc9a189ea28ec3db9d303b3fe15a28c2cb90e7446876678e93e23353c2d6f262e364a06bc9
+DIST linux-5.12.tar.xz 118112412 BLAKE2B 842d921b9a73d2aaade763dbd2ec67bdfe0275baa6d628b775f5c87574ad7dc86f0419afcd48c10c1235f4bffa16084243f2cf4556e6afcd391e975fe8ba530b SHA512 be03b6fee1d1ea8087b09874d27c0a602c0b04fd90ad38b975bd2c8455a07e83c29b56814aaf1389e82305fae0e4c2d1701075a7f0a7295dd28149f967ec5b3d
 DIST linux-5.7.tar.xz 112690468 BLAKE2B b2b71e231507429b178b6b89be546c4a3ee2757f5d2c58b6137d383f16034a587225a75a9dbca6a01a433056ebe078487132c224e909a2971c9634687e47b1d1 SHA512 45bde01593f6147c8c169b9e46b4b56eee998142552ae0ff82f1dd21b1fd54f3b32f6283f6bd77ea717d374672167849e468c157f235d2f12f7d7816e4623bf6
-DIST patch-5.6-ck1.xz 91240 BLAKE2B 20dba509c16cf41226414c2e70e2a3434573638bf93ce25786c2cd4663c98bfa04845cda780c750afbfa26918cffa394d905d16bd687d6145acb8dbd2489fdd0 SHA512 6c66592966e3a7799daa015352c6d906160a0f4d743952a299b83ba826c2a9a901a39ee289e99434128f0a21161cbb1af7b96a4079456d1ba2fd30db214e9068
+DIST patch-5.12-ck1.xz 96000 BLAKE2B c9f729ba1efe6f04e7b2c57d3999bc9675b577596dccb2f227e5b6e444285e1fdd270bf67c0fcf9f5808a4c3a4b1c7a5c13a76f754ad9b9447243ccbaf2ce6a3 SHA512 419bf56c139d90be6012c8eae44c797a3a59e706987ab1ff724cf7768fcc9519e98b40d06fa647b4b63e51ab0a6b2b1787950045b1e0500db62c976eeb8a32d7
 DIST patch-5.7-ck1.xz 91244 BLAKE2B 29b2530e91a7c0f75c47d75361a94ec92fec398cef1b3e213e97c8f9e0ed210711c4c63ae7717f59273105a83e30397cbd5b7252cb94c06d9b328a24c70ad444 SHA512 aaa97deda35d4abd94d79d2d3e10708f55a67fd4b83ca35c37af3fbe41b3f90aecfe91d05d4a4cede8609d30dba499ec61e3b943658b8962f6705628ba7380b5

sys-kernel/ck-sources/ck-sources-5.12.19.ebuild

@@ -4,9 +4,9 @@
 EAPI="6"
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="15"
+K_GENPATCHES_VER="22"
 K_SECURITY_UNSUPPORTED="1"
-K_NOSETEXTRAVERSION="1"
+K_NOSETEXTRAVERSION="ck1"
 
 inherit kernel-2-src-prepare-overlay
 detect_version
@@ -20,5 +20,6 @@ DESCRIPTION="Con Kolivas sources including the Gentoo patchsets for the ${KV_MAJ
 CK_URI="http://ck.kolivas.org/patches/${KV_MAJOR}.0/${KV_MAJOR}.${KV_MINOR}/${KV_MAJOR}.${KV_MINOR}-ck1/patch-${KV_MAJOR}.${KV_MINOR}-ck1.xz"
 SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI}"
 
-UNIPATCH_LIST="${DISTDIR}/patch-${KV_MAJOR}.${KV_MINOR}-ck1.xz"
+UNIPATCH_LIST="${DISTDIR}/patch-${KV_MAJOR}.${KV_MINOR}-ck1.xz
+	"${FILESDIR}"/version.5.12.patch"
 UNIPATCH_STRICTORDER="yes"

sys-kernel/ck-sources/files/version.5.12.patch

@@ -0,0 +1,22 @@
+--- Makefile	2021-07-27 01:04:03.426240485 +0200
++++ Makefile1	2021-07-27 01:05:52.471071116 +0200
+@@ -2,7 +2,7 @@
+ VERSION = 5
+ PATCHLEVEL = 12
+ SUBLEVEL = 19
+-EXTRAVERSION =
++EXTRAVERSION =-ck1
+ NAME = Frozen Wasteland
+
+ # *DOCUMENTATION*
+@@ -18,10 +18,6 @@
+ PHONY := __all
+ __all:
+
+-CKVERSION = -ck1
+-CKNAME = MuQSS Powered
+-EXTRAVERSION := $(EXTRAVERSION)$(CKVERSION)
+-
+ # We are using a recursive build, so we need to do a little thinking
+ # to get the ordering right.
+ #

sys-kernel/ck-sources/metadata.xml

@@ -1,6 +1,14 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>theevilskeleton@riseup.net</email>
+		<name>TheEvilSkeleton</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>hedmoo@yahoo.com</email>
+		<name>Andreas Westman Dorcsak</name>
+	</maintainer>
   <use>
     <flag name="experimental">Apply experimental patches; for more information, see "https://wiki.gentoo.org/wiki/Project:Kernel/Experimental".</flag>
   </use>

sys-kernel/xanmod-sources/Manifest

@@ -4,9 +4,9 @@ DIST genpatches-5.13-1.base.tar.xz 3840 BLAKE2B 5843b75d53225fb5f3ad278a69884c70
 DIST genpatches-5.13-1.extras.tar.xz 3412 BLAKE2B a93dc7964a3b26817e6a561b314e93958d887a08a519a8a8b1bf2e4bb78790ed03a217a54cb6d9b2af6f7a2f4e78f8a0fbebe2aac0c34c1c9b0ed884db3bbbb7 SHA512 f4470e1f4d72ef0d54b6b0bd6c427f722ffac8de9e8b0a29b69e032ce71d9c18ae447fa855bf4e9e45cd2084f0b7837d0514aebfd18f6a04a7a88a191e966435
 DIST linux-5.12.tar.xz 118112412 BLAKE2B 842d921b9a73d2aaade763dbd2ec67bdfe0275baa6d628b775f5c87574ad7dc86f0419afcd48c10c1235f4bffa16084243f2cf4556e6afcd391e975fe8ba530b SHA512 be03b6fee1d1ea8087b09874d27c0a602c0b04fd90ad38b975bd2c8455a07e83c29b56814aaf1389e82305fae0e4c2d1701075a7f0a7295dd28149f967ec5b3d
 DIST linux-5.13.tar.xz 119297284 BLAKE2B 9c4c12e2394dec064adff51f7ccdf389192eb27ba7906db5eda543afe3d04afca6b9ea0848a057571bf2534eeb98e1e3a67734deff82c0d3731be205ad995668 SHA512 a8edf97e9d38a49f1be2bde1e29ad96274bb2c6f7e8a2bebaa1161dd4df9cabcbaec4ff644c45bee94f86ae47725087d6deed0cd954209cec717621d137db85e
-DIST patch-5.12.12-xanmod1.xz 1176556 BLAKE2B bb4233633838c89b3be5e1753a89b94aed110af7cf279d03f8708eda938a7ce34ec09a5250233582ab797e16d08544fb8995908511ca0cf4762a8626eb2a2973 SHA512 d4996d6f22f0de24169a3632109efb0314f435f7b7d4c45daad4a170c51a848aa9df661026f7d336b2ea325b403762d448fac63ecbc2624ed282b4f102bf0d22
 DIST patch-5.12.13-xanmod1.xz 1219548 BLAKE2B 3f45d3ca63291510cd2ebb317a5db28e5020ba2707a40b0e5088deef4ce87dc60456c10925621b43781e7291f2d8528998ba163a1a09151064fd119586e308fe SHA512 238c5ab60013f3b5acbd56e7e4525e02f0b578c78c78f3194846315679b84e807cf033c516df920092a2d5cbb4c971de19da90bff1871e8aa7f225c946bbdd39
 DIST patch-5.13.0-xanmod2.xz 317328 BLAKE2B 4fd751c44fabb3b6e7d23f2a532f0f197478d1b99bb95a6ec70d255805ec29d1fceb1701f864c661ab2984a9413ab025b22ce41f836f9d695d76a9e7c29ab38a SHA512 2b20b781509aec44ce82d4faa6b8a03309fc3e053dd3f410825128a74889d84ae2f48bb3385104f70c5b9675de0a318d811ccf48a05bb0174e659950f00decdd
 DIST patch-5.13.1-xanmod1.xz 317896 BLAKE2B ab7e42e5b895beb69341eb309e502e8dab0c31d10f9d9eb1696a93780bfb3b6f5520cd5b560e873ec0160b1875b8c92a12998e2a31447c8cfad3ce81c86f243c SHA512 ba646c3208b661a3171593f58aba279a0665bcba558d393023e10c585fbe98104a5cffa30ba9541f1c390b297775d785f1518960fe4c651724bb2d17cb6d9c76
 DIST patch-5.13.2-xanmod1.xz 543572 BLAKE2B d7c4b2ab0f80fd6bea08e5ce5746bec49d9b5b07f91fb9e67c68d69ba1e31b7c7d3d3081cbb3d9eb46bf73cc0da5be7b8f65ea1a08b311ef47fdba48ef69b60d SHA512 1c85261cd7dd24b198c21d9fe1339cc3709fd47c2dd86dc2606b17139eb9695fe3cfb0900e947fbebfd6e67f065c25673b3acf474c27f66b0a06942080d10165
 DIST patch-5.13.5-xanmod1.xz 817536 BLAKE2B 1cee555d7edbf5c2e0a757db43e7cb2307bec0267b6a074aad7f831a4c8b6bedc918c1aaa1f81bb9e86b097a82c2c89a21b9ca8e82f0ec24ee59708d4b391b7d SHA512 318e95c989bc696a585c15f50457f16f24cd2401eb7242e165e43da94621804bf1d799a2bd575e655e128d12b5a863492f5e191a8155d8821e9edcf19894c32c
+DIST patch-5.13.6-xanmod2.xz 871620 BLAKE2B f5d46cde84599cd99ac6e38f9755163caa5a94635a6af76f1f9d8f98e52002f112f790ceafe0cb050e278f950030a51416ecad00084417061b3029ebcec145da SHA512 56c4aca3c37cde6b1198a06d35f5968a8f257473340e6ec8ba703134a3529b4d278be1a3fee34df9bc662a4ea24c7e00caa651ff0f5b2405220bf2fb7ed047ff

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

@@ -14,7 +14,7 @@ DESCRIPTION="Full XanMod sources with cacule option and including the Gentoo pat
 HOMEPAGE="https://xanmod.org"
 LICENSE+=" CDDL"
 KEYWORDS="~amd64"
-XANMOD_VERSION="1"
+XANMOD_VERSION="2"
 XANMOD_URI="https://github.com/xanmod/linux/releases/download/"
 SRC_URI="
 	${KERNEL_BASE_URI}/linux-${KV_MAJOR}.${KV_MINOR}.tar.xz