Merge branch 'xanmod' into 'master'

sys-kernel/xanmod-kernel: add 6.1.15, 6.2.2

See uest src_prepare/src_prepare-overlay!364

sys-kernel/xanmod-kernel/Manifest

@@ -1,24 +1,20 @@
-DIST genpatches-5.15-93.base.tar.xz 3874100 BLAKE2B 3f9bd1a90de22824db823bead22ae777ebea551ebd183184ecd039f33def8db603694acbe3757352cff228eb2a28a8c31d362f2185b32f88edd19c4de6eedad1 SHA512 1d5c83f5f44ccee701755dc7732f80baa00e5b3f4137c9da8d81cd7fad0055df6b09dddb1cdd6287db6a43cd1b673aef3a543086138af72cad5218d2fef31860
-DIST genpatches-5.15-93.extras.tar.xz 3932 BLAKE2B 5bf45ac0d03e9fce3fad0ff4fa378cd3f29b903305e0e9119fab0304354764e5553aaa8a7c6af27af303243956b315a6d8275e9fb6cb59e365979dbdcfa7502f SHA512 42d9b8132903221eae0b0cf830d53e4f7783ecac00df31ec021d953a92759ab3b284d4e3867934453d973006d15ad9c40fd73069d073797b18a756acae6f963e
 DIST genpatches-5.15-99.base.tar.xz 4024008 BLAKE2B 82205380a55439dbe6f8605d09078d7a349ec60180204ced6c9902f340077c800cf515f3f513c69110eab37a8daa386a82ec4ba9e84dd02299ccc45379cdc659 SHA512 72033d94d3d509ecefb5a54e82906408802118cd985f617ccf7465e23d19363668159998dadb950bef58af11bab448110e6c753eb6eb7dd107feacbda4d67f3d
 DIST genpatches-5.15-99.extras.tar.xz 3932 BLAKE2B a78ae77735742abfdb7a622563ea1751b7da91516c6373f65a983e1e42bbe15915600528045ed6f9b413cc424506021367216abdfa0fbf5234ace650c55febbe SHA512 21671c1a8b7b3cd3a0e36a05b934c9b80c4aaef90ae8ff200572651f0559e23b7418a9df7b5a59118513cff566a2baf72c3fe4c273a38b4cefd64efd0973441c
-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-15.base.tar.xz 803732 BLAKE2B 5f43fb07787e9e861b54b4977acff47c13870b24cba98296538651c656e332be2bd194b91a67d68858bb7ddf116e0e97179c5c039c64b75f4392829d091ee387 SHA512 482cb110c5d218a0b0dd4dd828862d9cfb5044b5c90f75218dd7bbf266dba1a11af11ecd913029904d6de1d572d2cbb247b5bbf1c4bb5711eb9fb03b327aaa81
-DIST genpatches-6.1-15.extras.tar.xz 3808 BLAKE2B 8d7a78f6a1e8e6bbacace9cc067b1edd674611f7ba32ced894557cc48018ce708411828dcbbd71f8678f22ebf64c8913fe8c641d29bd46d7146198ebd1240f11 SHA512 0d53e3c9740cfe65b6168c624bcc99cbd16d3e196b50190be8aeeb8bf78d205dbed964e01b151a2ad03c2ad10bb4b74f84deeb4d42db4392fe52c337540e0dc6
 DIST genpatches-6.1-16.base.tar.xz 820936 BLAKE2B 91554b3c532c7ba9549291a2a6c3ae531922819d896e4a9e69ef36d09ec8a444d2ba0725af6ff213ea554e6fcc9a20ccf5adce1d8e17a3c4fa9c3174a0a228ca SHA512 7bee9944db4397cdbef1cde6083970c5290d9936a9ec17bd0d6b21ba7186eeaa0bb43703ec0974f5121e6cd424817727e6be3aa5980438dee4b27d9a9ff99456
 DIST genpatches-6.1-16.extras.tar.xz 3804 BLAKE2B 72e1824ad6d561359eb287c8f67d94b961c6054a4bbc66af9571caced021d6d3cf64d5d06be4977c22b4c1061b37b5f174db4713040faac069dd9e7b29fa2a6f SHA512 ac2c48ed858be0a2c844646d343de6994f1f8179b0369a6be554f1587369679b651304f967346aa1bf2f462ae62b1c8c0fcb5bca32ec12e2f6100a694aafc6b2
+DIST genpatches-6.1-18.base.tar.xz 833216 BLAKE2B f1b86487c82d4354347171df635192a6276a4d0a9561a415270a85caa46401e4b9089f847346cbf441f8c6a4d4012234d83b31fca5797cc6296010f225392990 SHA512 155207127c1c58b2497788d5b7541ba1872fefea3d2c7804356e5bb6d28dae2f0400dbab44cf39b847f89e7a058710b8528059d75f0e92b63d3d37fd0a515ca8
+DIST genpatches-6.1-18.extras.tar.xz 3804 BLAKE2B f31c07ec6318b91e6e7eabeb62bc28af362fc097297b31521d464e298effbdf52cdb94b43a1811fc10ea3dc9387fa47501c4987d6709d73603ed15ac7949dd92 SHA512 8611f8cd72f54b7c4360d314eabcccfaa99722f568da32710a39f47ffd1770b14502130be5ce3d3a14a0bd93fc9fbb73f65a9c9636a8d0e9051892d1e5221ef7
 DIST genpatches-6.2-2.base.tar.xz 9540 BLAKE2B dce2bb1156f0e9a7ca19b618d13729908001939d6ec6361ca6619808a120e61900b5f4de97b2bef0e63aef81a83c7e2a0d736f3c344d9a610eb5c6a21baeb111 SHA512 50aabf4c24dbf13595556314b2ba8f1d0219355bc79c0fddf05ef7a6d244fe3c54f95c733e02fbc032a582495c59688f415af5b62b3401b436cbb5f0ef3aa9ac
 DIST genpatches-6.2-2.extras.tar.xz 3804 BLAKE2B cdbf51c28ff1c3b974665f558ec774eb70874a3941b97f966ee90642f3a1c8732333348e891156a40455c8b80c2a2002fdf1515403eca7b8d075c28b09a2ed78 SHA512 cba0fe9b3d13f3b1f6ee413a44698694ef6b009918dfda76e4d8402e66f1e857bf889fd4eb7ae093e864f7015eb3fe14aa704a5a3b68b0b92ca494bfc4b43a71
-DIST gentoo-kernel-config-g5.tar.gz 4503 BLAKE2B 165733068786f274ac3bec94e0e29a10992f5a1b188970b2f7195348bb98ddcbd5d4dd45131b00d41c6bfd0bdfdaff1069debdbac560f92b9d62d30812d830df SHA512 565f6a35b534ee2e34e05769c95ac532aa6cb8e27073aaa8292fa3d19af8329f812e8a2d2c5c2696ac0fc28858e4461cde1644d0499f2563de43903b7043f386
+DIST genpatches-6.2-3.base.tar.xz 15336 BLAKE2B 83e56e5e3827f023ca320a1fac19a204f7a92a78a237d3eb0e7dd36103ad179e27eb6cbee0c3a26cd26c64c23b09a2bb9357789b6660c10064bb9c0fe0419c43 SHA512 61c907010958ebf43a0c4718057503ebf0ca6b68c92d25319d3c7423bc509fa2ed83492b6d065d42bd0e97b8055d6101ff0a1c75143132216fe806d1ce15f630
+DIST genpatches-6.2-3.extras.tar.xz 3808 BLAKE2B 1e89bfe1dc8432a382cf21fd409cce660d6ee35be2ecf91f19d9a6ed9b2843e104789d350456ae0281c7b8eb921b53390a10e6415cdd2dcaade99950a5719770 SHA512 3414bf976f1e61563a3adbf4ffaeab885428c8bf51d401d0a04b6d6837f864c479262eac145fba0dc6ba19cae128f0df52d116fa310609c84ff4fcc1e35cd543
 DIST gentoo-kernel-config-g6.tar.gz 4562 BLAKE2B ad9e1b28f84916f12cd8b21feb2f4396d3d63f4cfae3e6b6fe93f919c98b0b4523b205711ab7acafa7121360f696eecb63b9f162dd12950e56dab1429cc13633 SHA512 d180122eb00d40126ea7d79224559904eb0ea574314f9a8d6be6b10f0f6a49f526eba1366ae8cd0a4fe23cd8ff5e292c8cab7e856a2c915d4162b75a03f8076b
 DIST gentoo-kernel-config-g7.tar.gz 4625 BLAKE2B 72ba0d038ee34ca5eb26d43bd373735aef3a50d02b414993ea05485e49d83d46df98a6cb0f6f3170a8ec0c99b557432fd9a11cbb92ff7c2837625a7f4469831e SHA512 2d74a8ca9f5402b4290ed93cd3ddba04a7f2ff42c8d8d3f2cbbe22fc20daa0fca119368daa8af39b7a26b1b99e4e3187c3c5d95886a651675ad94ff98d686628
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68
 DIST linux-6.2.tar.xz 136430892 BLAKE2B 05b63254734ea685db437cb1c00a6da63eee74d7e99f4ed2d074aaa01ac4487813ab297d337a6855cdbcbb33346b631c4256ee3b06191adfb1be3615a56bdd6d SHA512 a01bee0b968b95183934fe3504516be7ef5811944a061f5aed05ecebaa27b5eb64e33232fd0a8dd622b3c8743bfe462ef7e464d381734d111a0ad6a6d9f66ddd
-DIST patch-5.15.89-xanmod1.xz 3764184 BLAKE2B 6ff9c3868de23b38e0c6083082d584b307ddb68f17300606c0eb3ab2967a22479f45f135403e5c8f270aeb6faee9e1a4e62e2cf73e322128fe25b96ce8087327 SHA512 1780a8726e2db4777c7e5ec27db9613d72e76e20f01c7fee766fd2d7c77a3133cd3409bf7b6c1b5beaa9647c6d26fdeff422e71a9a27ca68bd5e6c9e941bf4f2
 DIST patch-5.15.95-xanmod1.xz 3884148 BLAKE2B 5acb781f7050b7398a7051b5369a1d6ab00e4e96510e6ffeed223769dc684a369a608048cf7de85c72c518c3cf8ae79d7af1f3574981418f5fa09be702c7486b SHA512 920e8f07cc98321ff344cbc96f5a25398e3d45027d1f638f4bfa62cbfa5d86d3a42ba329da69bfed1660d34f8179628e78dd5e4f6bf402208150f493626b261a
-DIST patch-6.1.12-xanmod1.xz 876952 BLAKE2B 95b2b5b717cd58b242a9426d24b2aab1548eb72eaf507886cb9f33047aa1dcd444a22536fad0404e85ad3d8c3a07db2b7bab5b0c508fe0ee5b93cbb5e98174b3 SHA512 94b628bf43d56ed7354d7b860c4b9fc9293a261e8b14d2e138240888b18f287735fc7f2d54433b5404ede78dbb80b003432ed92be13cee844b13fa2fc215018b
-DIST patch-6.1.13-xanmod1.xz 905068 BLAKE2B b141036bd8549f2774f1c25791b33cf433c3accb50dd0bfa4b71de9de406c663bb1ec8ab3587d2103aec46df0ab919a7210277c85d416a43bfb88a422394846e SHA512 dc9f686f3529bfd3ce433fea4bdeeca4d2c77b195dbf0eb47076ab101e2502fd338d16404084f1406f50f22fe553ba32e4ba519afbe6370401d53e08291d39be
 DIST patch-6.1.14-xanmod1.xz 921564 BLAKE2B dc501a20432eacb5e5c1eae02153971f94b60bbe1506b421c39dafe806e75a9415720b8f85afe3e9d775ab467fbd46f5d9b9a2d2af57679f121fe96b111fb7bb SHA512 f642ddca49add99cccebb7fbe23883f32fc13bf403d10191fa0b37a60a7c2a6bac39a861bf94a10329e93b7fffba50c2cc94fe210035d0233df98a74f57b5267
+DIST patch-6.1.15-xanmod1.xz 932888 BLAKE2B c0546cac82c72bb786b4310cf0070a1595abe8ac835ccadb4536e66e3487c367802ff953f146df85cb7bd85570a90fe6e2e1a35c9941a6965d19c4f5ac613f64 SHA512 6adc8220c26bd0899d60a6a3379b251c7d2bfe38f60e94d3887cff96e81155c2702d1d659dfbb4956e9c13fb18a162d31817897d0a00e569ac8a545c2dd9bc30
 DIST patch-6.2.1-xanmod1.xz 143196 BLAKE2B 22f59b22f3638702c25bbfd7bbf2d4898bbed2b35f5517b869f417fba32faeeea4b2e51a463e69125819e85d555b1b62f5920b00fc27aa2799731ed1425a6c59 SHA512 47b40d6e444ea5beef7bf59367898bf48cacd028c49ad4b900fc7dcc3fdc960197f5a445fd89850b9191c401138edc891315de6306ff3737d0f6df0b089d71c2
+DIST patch-6.2.2-xanmod1.xz 148456 BLAKE2B 9f760cb8ae516a06fd666c0401405b0d33fd3a0c5c7211f7f73cdfb220b376cab28d21af7d08d74c42951b2ab91cb9ce2de70f17ad441546605a75d1dbe344c6 SHA512 50e13b703384c38a5694d8ebedfeade89da9b32390d4d59446278172063569d5504e0c91978aab072f618cd3f2c56c061284d5545ff6a8120eb4c54fa8aa79ac

sys-kernel/xanmod-kernel/xanmod-kernel-6.1.13.ebuild

@@ -1,78 +0,0 @@
-# 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/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~alicef/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.1.15.ebuild

@@ -6,7 +6,7 @@ EAPI=8
 inherit kernel-build
 
 MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
 GENTOO_CONFIG_VER=g6
 
 DESCRIPTION="Linux kernel built with XanMod and Gentoo patches"

sys-kernel/xanmod-kernel/xanmod-kernel-6.2.2.ebuild

@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,8 +6,8 @@ EAPI=8
 inherit kernel-build
 
 MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
-GENTOO_CONFIG_VER=g5
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
+GENTOO_CONFIG_VER=g7
 
 DESCRIPTION="Linux kernel built with XanMod and Gentoo patches"
 HOMEPAGE="https://www.kernel.org/ https://xanmod.org/"
@@ -54,7 +54,7 @@ src_prepare() {
 	# prepare the default config
 	case ${ARCH} in
 		amd64)
-			cp "${S}/CONFIGS/xanmod/gcc/config" .config || die
+			cp "${S}/CONFIGS/xanmod/gcc/config_x86-64-v1" .config || die
 			;;
 		*)
 			die "Unsupported arch ${ARCH}"

virtual/dist-kernel/dist-kernel-6.1.13.ebuild

@@ -1,21 +0,0 @@
-# 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}
-		)"