Merge branch 'xanmod' into 'master'

sys-kernel/xanmod-kernel: add 6.2.5, 6.1.18

See uest src_prepare/src_prepare-overlay!368

sys-kernel/xanmod-kernel/Manifest

@@ -2,15 +2,21 @@ DIST genpatches-6.1-18.base.tar.xz 833216 BLAKE2B f1b86487c82d4354347171df635192
 DIST genpatches-6.1-18.extras.tar.xz 3804 BLAKE2B f31c07ec6318b91e6e7eabeb62bc28af362fc097297b31521d464e298effbdf52cdb94b43a1811fc10ea3dc9387fa47501c4987d6709d73603ed15ac7949dd92 SHA512 8611f8cd72f54b7c4360d314eabcccfaa99722f568da32710a39f47ffd1770b14502130be5ce3d3a14a0bd93fc9fbb73f65a9c9636a8d0e9051892d1e5221ef7
 DIST genpatches-6.1-20.base.tar.xz 1052484 BLAKE2B 9599ee78ab289960d7d0c81db8d509a43f8dcb524163216af9c2bcd37eb1fe60b9c7e607faecd19974676c5cf863a4edbdc668b39ebb1f37fec98b1eceab42a5 SHA512 9e99a69ed5adc7fa8a33cab86ea187c42e888c6d768cd3d39d5491c8d96dec2fc5f4c11c02075b01de1530ac629e63876152ffa7643d3a3b899fd1655d67d1f0
 DIST genpatches-6.1-20.extras.tar.xz 3808 BLAKE2B 4d121cdba86a63a5564f44f2b33841ec07d456da813070f73cdc2b983b5fe466e92b845a6c4d0959aedfa3ee9a8c57fde08a84aa6a31926d43a5ac68d4c168df SHA512 8b17882ee84adda037433b2ab13aaa378812f6d6f3e87246c1befe54c0254d1261b3fbdd89410f133ea35e798bbca597e392222ba1bfc93bf87e645600609dc2
+DIST genpatches-6.1-22.base.tar.xz 1112816 BLAKE2B 4fb3e3e6b08b201856257c72e297428e8ce90bac110452cb47df21799e140d18d7bf82f4fa36c331c9a199e63b1305d151b77aaa2f9735dbd0a049b7eac7b433 SHA512 06cdf0df64e699c9ab3daa122b2daa9bda56e2fce0497665fbe2fa488c1208ab0d13f84648f3fc8627aa2a325095be9a115b2bc656b9228fc78e98068d4d8685
+DIST genpatches-6.1-22.extras.tar.xz 3804 BLAKE2B 6350caa854108959e150ba1537044b9c781b24b740c632f30d0ca4de54d795c45993623fd0822131cec50cc46182a76c036e5481bd4617ee3ffb5c9f82258050 SHA512 5a48e06b4f9fb94d53b7175850c1876edcd76ac45c1188d754a9963388a2df23d510f8a30116a47db45f06f1274e25c6897957783f0e8eeb3d0e20ea626052f0
 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 genpatches-6.2-5.base.tar.xz 297244 BLAKE2B d76f6189b57b3c81ea8d8cde4a4464539ecfd27f38790eb797758d2ca9f3c4f1e4906b8187faf515035ee220107e698d60d6687cf9d05e7805ba2e8a5a47ff7a SHA512 e0ab47321da0c7588b102d0c9af435bb23c0ea01915d1e9080216bb885f2dbd97ea0d885d2f72297dcfda18fee524dd2629533a4ee65ae72cde0651be38b962c
 DIST genpatches-6.2-5.extras.tar.xz 3804 BLAKE2B 23df3f3d54c5c9d0db420803bf45861111addf7bd23efd65a928345103e5fcaa34639c18c4c72911ff9d17cfacf50063802af75674d9c2839b0448185ca0eeb1 SHA512 5727b99aca295c425c5ab67e8e25b3e7ce0101542d60374d3f54abcf66f336d303ea529b683ec0d82da5ad471b5399eadad2fc8cc1dba3c3b13eff1735d1c12f
+DIST genpatches-6.2-7.base.tar.xz 376376 BLAKE2B af978aac1a4f3c836e5223c25b7d24557044aed7a03b9ec0313cb86f5f5238e795ec2b88cf6ebe800d4ff86cad7f755b26f9d4deda87761ef73007ddd9ec678e SHA512 96373f80389db5b4a414794292278246eecacde3016ac80a35fb25382284c60f8d09d53096c05f7609dee00236698591aa881462d039e0c958aa32b080e2edb2
+DIST genpatches-6.2-7.extras.tar.xz 3808 BLAKE2B fec1e138d4601bdb4b6ac339bdbfcaab85b3b3dc74f8afb1a326fb519300e795f709bce695be0a98ed5efcd43dc585ce33c8cff09cc7bda48e28aa935928cdb3 SHA512 9ec16349c7db00b38ea19bfda59c3bf436e1bd4b23ab6eaea09ba7ed979b45506418f899832d7dce41158143d0d5adb97530f517a95364aa261bb25818166cfa
 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-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68
 DIST linux-6.2.tar.xz 136430892 BLAKE2B 05b63254734ea685db437cb1c00a6da63eee74d7e99f4ed2d074aaa01ac4487813ab297d337a6855cdbcbb33346b631c4256ee3b06191adfb1be3615a56bdd6d SHA512 a01bee0b968b95183934fe3504516be7ef5811944a061f5aed05ecebaa27b5eb64e33232fd0a8dd622b3c8743bfe462ef7e464d381734d111a0ad6a6d9f66ddd
 DIST patch-6.1.15-xanmod1.xz 932888 BLAKE2B c0546cac82c72bb786b4310cf0070a1595abe8ac835ccadb4536e66e3487c367802ff953f146df85cb7bd85570a90fe6e2e1a35c9941a6965d19c4f5ac613f64 SHA512 6adc8220c26bd0899d60a6a3379b251c7d2bfe38f60e94d3887cff96e81155c2702d1d659dfbb4956e9c13fb18a162d31817897d0a00e569ac8a545c2dd9bc30
 DIST patch-6.1.16-xanmod1.xz 1145904 BLAKE2B bfb50ecb70e7ca9d60064bc02c8bc4e8068a50ada2b17138c823ff97ffd688b8515d83bc28a5c1bbbbf978cc9e322ed9533ddca8763a55dd770cd67039d6802c SHA512 97a237f002d46b2c8062ee602533893d7bf2c0f9fbcc7a3940cc6cac7c92af40af5b6504d1441247178bba6dec94ed36e0df682fe8be835070b68a209557671f
+DIST patch-6.1.18-xanmod1.xz 1202112 BLAKE2B 59e3dd49da0f81e600237323804c40a112c9cf85af50a839b3b1154bb303e9aaa5ccdf3a5f798402aaebb6f033327be2600677f66f248c0ddef38e68941beaf3 SHA512 cee3c25958d845a173e7396283f4285062b187f7556dfafae8bbe45f3c1b63593ea5bd5ee5afda6584812bbe37d84c9230f9b015a729866670f3e13663e094ac
 DIST patch-6.2.2-xanmod1.xz 148456 BLAKE2B 9f760cb8ae516a06fd666c0401405b0d33fd3a0c5c7211f7f73cdfb220b376cab28d21af7d08d74c42951b2ab91cb9ce2de70f17ad441546605a75d1dbe344c6 SHA512 50e13b703384c38a5694d8ebedfeade89da9b32390d4d59446278172063569d5504e0c91978aab072f618cd3f2c56c061284d5545ff6a8120eb4c54fa8aa79ac
 DIST patch-6.2.3-xanmod1.xz 429200 BLAKE2B abf004f3a5fc3faba6f7810d5334ed276227bd34f571118351bbd917806ffa63fa9d7fd34aa269fbd0f4c7436e3b2f5b711c540a37a7d4e4d1b036122db26517 SHA512 d43e18eb8c9b88e672d4a7309e2e647121687514d605f7fd96e99a57bf50574b4eb96e986eacb54ef20e7d038036aa31229cafa2bddfc66dda1dfedb55ec609f
+DIST patch-6.2.5-xanmod1.xz 505220 BLAKE2B 8dc6066996a7cb7d4bd08b2e595a8285a7d0b1d0b4641f91b0cf2c86155aacd009db0dc63c02ea1ecddf77846c217eded53c5aeae17b8c0b078affb0726e39d1 SHA512 b170923099bbccc9b68e54ff1cd626e0b3efcd32b26765fbbfc3918aee93acda1e340f87326997bcf615739429b10f9c1d024925031b6f6ecb6f70f8d91fb7ae

sys-kernel/xanmod-kernel/xanmod-kernel-6.1.18.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##*.} + 4 ))
+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.2.5.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.18.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.2.5.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}
+		)"