Merge branch 'xanmod' into 'master'

sys-kernel/xanmod-kernel: add 6.1.28, 6.3.2

See uest src_prepare/src_prepare-overlay!388

sys-kernel/xanmod-kernel/Manifest

@@ -4,6 +4,8 @@ DIST genpatches-6.1-31.base.tar.xz 1473456 BLAKE2B 2bee72cc97ba8a27bab8f69ab11ca
 DIST genpatches-6.1-31.extras.tar.xz 3812 BLAKE2B 2d599eba0488cce5ff711080e61cc94aef9265c710c5b68ca7badb4a13147cf8f19e4660988321a0f929a3d3a9dd78adf30f905d4eeb63de4e45f41bc5063fd3 SHA512 87db9b58bb212c5182927012b95d04628dec1cb884cf52b83c566fc52262a5684dcea298260233f8a02974b30640f538754893b2c87cb34a71b5d7674b482ae2
 DIST genpatches-6.1-32.base.tar.xz 1474460 BLAKE2B 43060d16a84ca2c65ef9d7447747e6b857423134fd518e05c3c052bf5c664c9a0f8af97b84e7d911c84766cf478b71695537a3c56a367589bf37adaac032a7e0 SHA512 cf8bd867d09b68a197368c546ffa4c626b1c30f0f7a63138129d3abe8a0479c88717dff6ea0a79c53d7f108d2a1fedc433b7b2088e20f082be921701e5d7d790
 DIST genpatches-6.1-32.extras.tar.xz 3808 BLAKE2B b697db5da31e471ab0af978e722c12ca2d8c5cc371f1d4c2d11c5816b34b479e6ac17f1cd9ab26826bacb065e0a254e18b767c9cfcc12fb16c40f9d73aa1e3d9 SHA512 9113f7505f8dd5a535e2550863dc8d69a6961fc4180d5a7b77206a397db570571f083e39f6be87da072b588e4a2d1b9c1e4b2a725172c9a799b3dc8e88542f66
+DIST genpatches-6.1-33.base.tar.xz 1668040 BLAKE2B 60823b42a19d54af313039f75bbd4656414201e11b088c49c3d1c01405da82f9bb933ffbcaecd19a9d2b414553754733059b667f458c4d78fb0e4d46c02157b7 SHA512 2cd6755b1b01fc58a2a4f9a0b5c15c3e2ee5ac74bbf67c01ee4d543e6df30ee35f01bb23aab8e4b7fa0e36fbcb6cbf5e07bae6ab21010d12441d34ea802085fb
+DIST genpatches-6.1-33.extras.tar.xz 3812 BLAKE2B 4c0552c0cd447cff8e1725dbcabe9ae02be41f432805b6e5e9fd360c6a0d745b5bb5d0dd5c7b36a3e0468622dcf89d3d7fcf47f0b1b1735f76ca281764c928ed SHA512 fc1efc3695e71daf5d3445758ba0af5a8714c22b9d3788f59bba0e4383dadc91ebb14e3114aa711b270c2734f3bd8355b6b7e98c9b81580b9da8c9ffe6207cae
 DIST genpatches-6.2-13.base.tar.xz 700552 BLAKE2B 53187881831a5ee8ac1581d78d89b56d5e6cbd45a1267f294312fbd648818530f029280b6face5c1c7f7c6d2c13c5e3fc6d1747f4abea8b2065f960a42a45d2e SHA512 2ca287f97bb3c01291eb5faa1de40827d014547e2cbb5063e77597e027f58672a262bcc51f1f2111cb5621f75b59c61a3cfa40f30fe8bc923136f8de3dd3e1ca
 DIST genpatches-6.2-13.extras.tar.xz 3812 BLAKE2B 2e0620c2c03f6775a4ee7d29aeace0ed2474edf371bdea0aff7ec8b11db0804641ba4d2cb1993fdd7936ad6075c1b7de0bca6c055327b25f17a74d4f3a9d5d4c SHA512 5a146e403f04c1b8fec69ff2824f4d0b446fea895126839aacc511b47b4eadcfcf61ced441e3886ad4fc018379b029305d72a99d34d98ef1fdf486e28e888ce2
 DIST genpatches-6.2-14.base.tar.xz 737376 BLAKE2B a31157486ed656f479c36a1d728627ba1361656e8a2d8a2dcaee0ee59e6edd6c046ad7799d2458e42990d53ea9893e49f26447a380b0c5bb02f8033e8ed3fc1b SHA512 126b365b3d5dd435e3ce8eac2b030bdeb227c3047d9b7182a289adc3746fd35f6454f08fa9ac323b83544d2ed614d9d1c1da569c74d8c61c50b14ab358ce4115
@@ -12,12 +14,16 @@ DIST genpatches-6.3-2.base.tar.xz 8036 BLAKE2B 754d46f15ab113a1bae41d154b47c4cde
 DIST genpatches-6.3-2.extras.tar.xz 3808 BLAKE2B 6eccde5d3591804ef50d800dc7ec4cb8b2192d805832cde3496c519bf4ff0f9eef62a76f1e77677df66a054ed1f1efe341f71b8f86b185b10145de8200bc2c70 SHA512 8d79b8c2eed3c962a4c8fda80934720a2ee1436d4e42d762d3f945972537491f415aa6b3615f7a81a727bbb239cd0277ecfb18c83a90ba57252674bf135b35f8
 DIST genpatches-6.3-3.base.tar.xz 9340 BLAKE2B e163214c2f648a410b6253caf1cd2fa60beff29341cfba23674cf41712e11893c1f9574a1bfc4df797e69900a3a3f18e65399f5be720c58ab32c5780a41891c4 SHA512 8d308cac9a26c32688588fc8aa34f6798f5c0334fa01f3b813922ab46f0d53cde6c94a5c71817f929c5fd4f96741380da1d97c6ba6a3a5091549651c32fc99c9
 DIST genpatches-6.3-3.extras.tar.xz 3804 BLAKE2B 53064668f5f323d3146f16e96a7864ec41048fcc632aad93ce2c5e2b81f496e9b3f50c7730adfb8d4032d69c7277002419bd17d2698c4a1c4fa97ff86bb56411 SHA512 b24a3dee17f10bb60674792522ac6c39ad891bfd46e0c710fef554eb7393446c0071cac74f46507f9ffb206c798bbf881c2690743c33cd40dedcb41ded592a88
+DIST genpatches-6.3-4.base.tar.xz 243812 BLAKE2B bcd9f63e6015b075a589becbb6246cb208f214f97f443a27258c103dabc2983de04283bd596c041f5c615dc7bed9d28032b4b9e1887ee4f2840dca3bb8506f9e SHA512 3e6bf8f25f7f5ea54c795cfefea83010dcbc6480a054b69ac90d3187ecdb819d19d26e3df09e8c2b9f166e4ca488062672041e7130ac7c0984c0c34e786f4982
+DIST genpatches-6.3-4.extras.tar.xz 3808 BLAKE2B fdc95b7e9b191bc5eb19215cc1a381723242344a47d8e7a6ceb460d49fcbcabff2016a9ee0fde254e2461b54e145b2db2d5add045da1392fc86f1b11d2aa5c68 SHA512 f28b91dd378c42b1f170e29d851d8c7dc78b6b07243231b7b784ec596949abc8ade382025632e2999e395a28c3f38c56e2a439d5e62065af019cb25a21a29104
 DIST gentoo-kernel-config-g7.tar.gz 4625 BLAKE2B 72ba0d038ee34ca5eb26d43bd373735aef3a50d02b414993ea05485e49d83d46df98a6cb0f6f3170a8ec0c99b557432fd9a11cbb92ff7c2837625a7f4469831e SHA512 2d74a8ca9f5402b4290ed93cd3ddba04a7f2ff42c8d8d3f2cbbe22fc20daa0fca119368daa8af39b7a26b1b99e4e3187c3c5d95886a651675ad94ff98d686628
 DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68
 DIST linux-6.2.tar.xz 136430892 BLAKE2B 05b63254734ea685db437cb1c00a6da63eee74d7e99f4ed2d074aaa01ac4487813ab297d337a6855cdbcbb33346b631c4256ee3b06191adfb1be3615a56bdd6d SHA512 a01bee0b968b95183934fe3504516be7ef5811944a061f5aed05ecebaa27b5eb64e33232fd0a8dd622b3c8743bfe462ef7e464d381734d111a0ad6a6d9f66ddd
 DIST linux-6.3.tar.xz 136891752 BLAKE2B f1887c8924efa8d0cb14c4e604affd0b0168bcf20f56a37c027405c7bc11aba822a43fcb38ccb55a81a26f747d00e1ab5a6554818affbf1e1c7ef5220150fc69 SHA512 768979440f4907ba64d4481b383d6101faf208f27a0b897156123aa278c5743fe3c4f61945b2541429c532d45382aaee8899ea9d44a1d2895bfbb79bfd937f65
 DIST patch-6.1.26-xanmod1.xz 1532292 BLAKE2B 888ccedcf6350f0eb303ec1609cc02950b5412f8a9ad0ae9e44f5d27ab295d8bf34a909348c5866ac0738dc6e2b70f72abd7403dd9b3750627637e1c70408601 SHA512 f2a8bfabdb08cb45f7278e3c048efee2f0a782dfd9c0a4572ad0dc04ddda65bced6b47d37acd2a3bf6d808c659f4a82b379dfcb9ea5816681071eadf65e87d7a
 DIST patch-6.1.27-xanmod1.xz 1537624 BLAKE2B 994b4e5864b4181bc3b37fe8f8e5172cae932b59383a0d176eb5d0f0780c91eec9d92d10f61464848eb99418a747483f40cb15aa4c9c6bcbff6fbc910de9b1ff SHA512 b67961ad60969d9cdc4ea24bd005360a178e73db34528f82fcdaba5e992a0ba67d4e686632c73509bc627f3e695245d97c004c3207b2a03e9f53c02931a3eac4
+DIST patch-6.1.28-xanmod1.xz 1718432 BLAKE2B 38863fbad0f87ae5db2036f6295166858c2cb17857e3ca5134f3d8cad6d35807e06ff99fd18869efb8a1aa305d121fb88dd2986270da6d704b907efb69e9090e SHA512 e651b4f4a1994f94fc5762f3913028ce33e2bf2451b04f124b6b3fffed9455c6e0125d1e6e402be95be33524f94e9a55247b07611a4647310b72bfa540de2797
 DIST patch-6.2.11-xanmod1.xz 815444 BLAKE2B cdb16e8786691e74713fb2e2dc33274c4eba1836cfa9d5f44964c2cbcf6e5d87eafc5068446baf9983658e6621947eabef39223a0768b04c2c1e1102a5e1c69b SHA512 34f68f18aa91434d97d502b81653929b3f38b666df6730ac0409f8732e22c893df7bd713beec018a42004412804ddc3f73b72bcc1e3ea2f275d6a8ef58c1e5a9
 DIST patch-6.2.12-xanmod1.xz 848996 BLAKE2B 39ed5c48700471cacc97686e0230db2b8200a5f3cf8c9bbe0ad494d5f36a8fbf9878d112634dd1c514a1e540b31a163c9eaeeee4f573991092dc12d0e2c818a7 SHA512 9a2c9e6567db4aee7f4fe1b7d16f40c45d17f8696ca9cf513965271a5465551932418d272ce75aed34bbd1bfaa1dfa609d99953f7af633ee6a8e415b84e3ec4e
 DIST patch-6.3.1-xanmod1.xz 150420 BLAKE2B 8a45bfabebf667fa045d33ff192a623591e2ab2ae66046d40de60176c5e81fcce8f630c05b2470c17a50aa38c920f8b23d689d6afeab69e5f516ebc4b7618c94 SHA512 5c8ea87cba4f4b795ea01a2d7091ec3fe915923a4e451ba210de21445952a3d9e2b9c2ce203c12a06111857732bb858495fa206dcf9255d138694ac2e75ec47a
+DIST patch-6.3.2-xanmod1.xz 381424 BLAKE2B 28c27c98d16d1b482522bacce79833e7a10fa83c46410abe9e6f56752773d312b770f5f677bc74fc17bfa451ebf4d91dcc50025f19740ec64824b6ac98ba885b SHA512 8b81a92ad3812b17108d6e9ca3a52e85cd270b7c1695702a710a7609ed2d7575b90326254c00dd4442def619b3275ca90772719aae974bb90d2ad99faba8de13

sys-kernel/xanmod-kernel/xanmod-kernel-6.1.28.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##*.} + 5 ))
+GENTOO_CONFIG_VER=g7
+
+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[@]}"
+}

sys-kernel/xanmod-kernel/xanmod-kernel-6.3.2.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=g7
+
+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.28.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}
+		)"

virtual/dist-kernel/dist-kernel-6.3.2.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}
+		)"