Merge branch 'fixes' into 'master'

sys-kernel/xanmod-kernel: add 6.1.12

See uest src_prepare/src_prepare-overlay!357

sys-kernel/xanmod-kernel/Manifest

@@ -8,6 +8,8 @@ DIST genpatches-6.1-12.base.tar.xz 678732 BLAKE2B acc67136abb35e0d9985bb55002467
 DIST genpatches-6.1-12.extras.tar.xz 3804 BLAKE2B 59da490e3869e0b9c715453837cdae6d40b67156c966166e4d6f809e115eb9f621668a46f2632bd5eed894cdacaa5e85d26a5ef0467f95fcdeb3da3f9319a1da SHA512 d62321a73145f6275753245cad5d55b06e5fac89c7c7ed613a376c21181644e88bda7d3f7ee6f54c686bb0e534f6fdba3fdef8c9bcb06f15117276253b3a7e36
 DIST genpatches-6.1-13.base.tar.xz 739612 BLAKE2B 733d2ae5d8da2f92ea2acb01ef40b5bb49e621d80c5f2602790a0bcda197a52ac998374979d20347e545a70b8b8737365b3d9c2850ff8b24543dcefb6ce17641 SHA512 0b5495622526072e8dc7d3e5d81071340a133857c9e13afd128495809cdc7787318c2215fd996131ef050472847f207b074f3a0eec26b0b4aa45df4ef51f6a4c
 DIST genpatches-6.1-13.extras.tar.xz 3808 BLAKE2B 7781c242753f2bebd8f9bab0db85f38372b4b3d7111418f2ca6a027ac056eabfb2cc0f9da84d4befd6f3b5936d9424710e7e802e5c5e51ffddac3fb32505655a SHA512 175422ae5831f7aa07bad768809443da83af46bf2f256f7ea06bae0695899e47cb653f8bff2a3a9346e1b39680b318537e6c17f7851cdcdb8b7ca4f2ae380ca0
+DIST genpatches-6.1-14.base.tar.xz 774040 BLAKE2B 8e0866c762e2711b766cc75630d66c7c46221bdc47357a903c7e8506ad122b7b5ba84d102b19743d236ac5579b44d24f77b9f52f3c23695ab6a279cf7875e735 SHA512 6a753146013baf0b94d83abd690118517679d4d7dcf6e9f86cf8de35e24f80a792e9c0692f237098671c316d046d6f65f8d3512255e572daf6a8ca81853beca0
+DIST genpatches-6.1-14.extras.tar.xz 3804 BLAKE2B 7f016579b130c9a4f7a8ec946254dbd682f22e5654ae777d11b265dafe2b177a4c40c5a979a760a5bd6ed3dac057b90a3120c60b958f6b748ea4731b9a5f1ea6 SHA512 2807d359459dd11b9d3356fcac609dbfb8487e8c924cc543ef37698667b1c8b74cff7b015839ca0677cf1f96b566e0b5018c057b517275886ab500cd2ca49653
 DIST genpatches-6.1-9.base.tar.xz 544936 BLAKE2B 9152c33c4145f99daff4f436afcb621883d21fb05be5821a045b47be2880250d3ccf1210f3ecec0241ac41f57581da737053b86852760cd11efc524719fd0f6b SHA512 88b6bd131dfe53a51a9a0dab13ef2bfaa4818d4b0ab93e485346f96fe58a64b7338d9aa4483c751d9d1886818ee8700918721037b03f868a3b2cd9d5ecdd7799
 DIST genpatches-6.1-9.extras.tar.xz 3804 BLAKE2B e11fdd580ac842fdb0c947ac39afbbf09ba041adf25cbb8dd2ca5f648ea963bbb42b07f062fe8615daca8c3252423c99f69efbb80a6d22e58b963636f620b58c SHA512 8e21b5a9f17b41ebf8a107482f1a720d5e5c625046345ad71a4ca9d1f43e59e0fb8e7df1fbdc4777eec118d670d73d8ed3a3ea2e180f46c44bd828f46eaa8a1a
 DIST gentoo-kernel-config-g5.tar.gz 4503 BLAKE2B 165733068786f274ac3bec94e0e29a10992f5a1b188970b2f7195348bb98ddcbd5d4dd45131b00d41c6bfd0bdfdaff1069debdbac560f92b9d62d30812d830df SHA512 565f6a35b534ee2e34e05769c95ac532aa6cb8e27073aaa8292fa3d19af8329f812e8a2d2c5c2696ac0fc28858e4461cde1644d0499f2563de43903b7043f386
@@ -17,6 +19,7 @@ DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b
 DIST patch-5.15.89-xanmod1.xz 3764184 BLAKE2B 6ff9c3868de23b38e0c6083082d584b307ddb68f17300606c0eb3ab2967a22479f45f135403e5c8f270aeb6faee9e1a4e62e2cf73e322128fe25b96ce8087327 SHA512 1780a8726e2db4777c7e5ec27db9613d72e76e20f01c7fee766fd2d7c77a3133cd3409bf7b6c1b5beaa9647c6d26fdeff422e71a9a27ca68bd5e6c9e941bf4f2
 DIST patch-6.1.10-xanmod1.xz 786832 BLAKE2B f2f1ffa561e195feb2549513da5b0bbc7ae20ecbb57f4768278a04ef7d294ecb30255c899ec2d6e5f6020911243347c557fa0a303b1366090c08140ab04fd48c SHA512 48ff9f0bc63f6f14c40ca2b8cd724a6b3fca4469dac69c705f7e514dc1a593b326adc8a4dd440a5a0898837beb7aad4e6ee5aa34b2dbbce9f59fdc44a45e7fb7
 DIST patch-6.1.11-xanmod1.xz 845144 BLAKE2B 8c2bde691fbc3d37bcdf26f4d8b22f09728ef1184ea331fbdd96e2b86e61b8d57fe9cb64b016db65cbe2bf93fca5e1ebfad0eb63717b447bdcc0f244d541fd38 SHA512 26ea9172fafffdf9534e192d9b02f8ab8c8e52682854a701da29af259b7014f36033e46833bb9d4d278ff6f2126c860dbc7fa7f502d51b8e297778f7675fc4a7
+DIST patch-6.1.12-xanmod1.xz 876952 BLAKE2B 95b2b5b717cd58b242a9426d24b2aab1548eb72eaf507886cb9f33047aa1dcd444a22536fad0404e85ad3d8c3a07db2b7bab5b0c508fe0ee5b93cbb5e98174b3 SHA512 94b628bf43d56ed7354d7b860c4b9fc9293a261e8b14d2e138240888b18f287735fc7f2d54433b5404ede78dbb80b003432ed92be13cee844b13fa2fc215018b
 DIST patch-6.1.7-xanmod1.xz 662656 BLAKE2B 3268d00fefdfdb015da11d58aa525ef729c1ed10459a865049ea9745a7560efb2d88f8a2b0dc8be5864985198c6e5deee236909ae8047e4714fccc3ec2cc47d8 SHA512 d2d232ea441ac5e1775ad26a863523847811f9c651d835c6d517fc11bcdf4f8e0fc84d83a581ea65e3604ae2f414a9bb8aba069fbea420de966f2968db8da2e2
 DIST patch-6.1.8-xanmod1.xz 721480 BLAKE2B a028edef2835a53c7e1b0e21767f6c4b52bf5b120b72338c59f421c47ff597575d0d037c9ea3ce1e045636d9d4ce555bb4b9625a53b176b8699c6681c0dd97e9 SHA512 560526367cd9feffca62d6a7ad97a5dfb5572e2a22d74cb5427bd356678196d9b5ac77d9deaf018e0e2552ed78b0a8db2e42e9995e9873c0b11f9efd18b9795a
 DIST patch-6.1.9-xanmod1.xz 781316 BLAKE2B b54d4266935c7ae021016ace77b36cf686177f1ab47182f52690cdbc025c53ecd010b4804e26ad5572bdfd86cabe6012c0af521009ddc3a9739a0c41aadd2129 SHA512 693e8d6bbc27e071fb46df1f472870c4ba35a6fcd1794dc526af724988136208cde1d93e6b05cc18fce6ece728c660339889d99b6a773cb294435ce006f1ca87

sys-kernel/xanmod-kernel/xanmod-kernel-6.1.12.ebuild

@@ -0,0 +1,78 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
+GENTOO_CONFIG_VER=g6
+
+DESCRIPTION="Linux kernel built with XanMod and Gentoo patches"
+HOMEPAGE="https://www.kernel.org/ https://xanmod.org/"
+SRC_URI="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/xanmod/linux/releases/download/${PV}-xanmod1/patch-${PV}-xanmod1.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="-* ~amd64"
+IUSE="debug"
+
+RDEPEND="
+	!sys-kernel/xanmod-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+"
+
+src_prepare() {
+	# Remove linux-stable patches (see 0000_README)
+	find "${WORKDIR}" -maxdepth 1 -name "1[0-4][0-9][0-9]*.patch" -exec rm {} + || die
+
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/patch-${PV}-xanmod1
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${S}/CONFIGS/xanmod/gcc/config_x86-64-v1" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	rm "${S}/localversion" || die
+	local myversion="-xanmod1-dist"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}

virtual/dist-kernel/dist-kernel-6.1.12.ebuild

@@ -0,0 +1,21 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+		~sys-kernel/xanmod-kernel-${PV}
+		~sys-kernel/xanmod-kernel-bin-${PV}
+		)"