Merge branch 'master' into 'master'

sys-kernel/ck-sources add patch

See merge request src_prepare/src_prepare-overlay!32

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

@@ -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.patch"
 UNIPATCH_STRICTORDER="yes"

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

@@ -0,0 +1,22 @@
+--- Makefile1	2020-06-23 22:09:58.010001390 +0200
++++ Makefile	2020-06-23 21:59:13.000000000 +0200
+@@ -2,7 +2,7 @@
+ VERSION = 5
+ PATCHLEVEL = 7
+ SUBLEVEL = 5
+-EXTRAVERSION =
++EXTRAVERSION =-ck1
+ NAME = Kleptomaniac Octopus
+ 
+ # *DOCUMENTATION*
+@@ -15,10 +15,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.
+ #