Merge branch 'xanmod_bump' into 'master'

bump xanmod-kernel to 5.18.4 and drop 5.17.7 and 5.17.8

See merge request src_prepare/src_prepare-overlay!279

sys-kernel/xanmod-kernel/Manifest

@@ -1,12 +1,7 @@
-DIST genpatches-5.17-11.base.tar.xz 684208 BLAKE2B 1c1f7a450a1f30d18f8e3eb7cb2db8b170f503a1b17343b25130408725f08c6ce0db7fe91eddb1b8d562bee0b6e60360baca4429aa09ffc1e7257b531ea6ed4e SHA512 5e0f2c89b93bd492c49d36627e6c6ded98e49f210e4c4880f84717e4248b711b5bce3d0db04ae78a29a01a47b3a2ae3ae5949cc02d755a22d63e6b7117477398
-DIST genpatches-5.17-11.extras.tar.xz 3932 BLAKE2B 8f65276ac101924b918379e84da046a8fc56ba293ebf5c9ace449917e58400ef8ed5cd947d9de558ed95735996eba42e01053c8e71f1a3782696e1ddccfe22fc SHA512 d7baa2bbcf982ede22dbc06dd1a452759c876357ee65750b21bf5a6b22939e5a924311c6e2315f222a65386ec028399d5c82eb0a1b8a215757bcaad1d83b001a
-DIST genpatches-5.17-12.base.tar.xz 685640 BLAKE2B 3a662f399b18c9ecf54feb6688b706e2d2529d8c6ff763767d0539475ee23d11bdd76dd236da639f70600c2669b1e6796580a5dfd3d4c5c9491d79e5fd199b48 SHA512 2f360dae9c7f5d298224364fe02dbdc99006308a476b989715111b77710c4c805c018ae95c8c699db34776f74b24e326b5dcb90f4795d0696cf1c40e8d4cbcc3
-DIST genpatches-5.17-12.extras.tar.xz 3932 BLAKE2B 3c0b16365f2ddce7aa5323413a19ca1b37fce7cef2d0ce15e47b54dc3450f6cd62ec64d5913ae2817c302ee4fc2556f9e6316a7272aafcd558fc309b3c00e369 SHA512 4eeb7ee2649edf630e70f82584c278b4f6758e2937c3b067575286a3353883baedbbbe578222bfa187674d953b036ee2f1c89d001030efb1db6057f6d264f9ee
 DIST genpatches-5.18-4.base.tar.xz 51808 BLAKE2B f9a33dabb82687789f6f778b1eea29e29d1ff8601954f6125530cd98a88b9469c3255c0858c767806580b018be9a4bde23805240d266f0b8cb52a3031bbc836c SHA512 7ddcff3c89328b0fa1c25fffd595f13b2ab9569d9387a503937c7f58f44e0ab4fdda53b260a476316c85e9459a439be03cf875683b594a6a3b10c4320d2a274e
 DIST genpatches-5.18-4.extras.tar.xz 3924 BLAKE2B 9d555b98ccc35b3d42caf7fabd46756b18ca121a80b041a1a44799f283cd6062e0023618cf94867baebb7ab9c71b8a812f75beded436eaaab79ac52674e8242e SHA512 d9b75f29090f45b801fb94f7bca4d5ef9458d243ea5719059a427f45ab045be1696856dae9c47b43f08c70024de5e29e08bcf78179f684cbec797063be97987a
+DIST genpatches-5.18-7.base.tar.xz 431972 BLAKE2B f35163850c12f2610d487c7ed42b80b1f88b982f10476124d6e19b942ef1e2a012100325ff98807fa3664adc62116e843cc584d068335767c374d29d24f33b76 SHA512 9967d15c984f731dbfe7fb7c9bdb1270678efb565bccde88dd9c4bde6b3e93720d52c96db943110e07aa257401431e9bdc9f4149f9bd1cd983605ce369277d0c
+DIST genpatches-5.18-7.extras.tar.xz 3920 BLAKE2B dac0cba1f0a14780c6b8af044fc505466671360b06bc15c3ea1dc4b69ed1ab3978030d68d8417b52b972e7567dea8e42cdf3894b7bd86420bfdff3e7afb075b7 SHA512 cf97f18c7bd726494c0091303101ab3bee99cd9243a681eab4460c4f0c9edd5b03e23be3295a828f2eaee0af35d033eb8bd468dae2d981afba5af47a7ac20020
 DIST gentoo-kernel-config-g1.tar.gz 4283 BLAKE2B 44dd51ec45ebc71bffcd6d85a2fefba053f7bce8035057f0bbe928e24816ad4ba03c9bf67dcfcd6d6d1833c0a2ea93e0fd486c2093664dc41ccce316e1e60588 SHA512 3a45f28df9d457df0fe0d185da8b10f4e35f49dad75075e041e8cf3cf6972fecc8145cd557b0bf3a8dea20ddffae0194f88e61c1e5098fa0a5ca301d40aeea2e
-DIST kernel-x86_64-fedora.config.5.17.3-gentoo 219028 BLAKE2B a8a3e2f31315d6aaf19c6771db94a3549379fd48a33b29b00d0311a36325ba8e9f124b5962a447aa8bf63b01f714298f4fca7ff071db165f183ce9023e2b4cf2 SHA512 8c7937310b8e9cbaefe4d6910595df373edfea5a56e439671583c98a752eb5d9029bcb32178ea6b09e6847e55e71dd9ab94e0adb149626ce04c8a9e8f6d7a145
-DIST linux-5.17.8-xanmod1.tar.gz 202313860 BLAKE2B b97779f3898c20c5db978464895d3459dac189b1be7e6cf9d3cbc2bf9272e07f320378575a8149fa5b27f456d3bb718fad2346198ade86da1a850ddd295f9365 SHA512 58528fdc5ae2613b80daf831c38cb4861a9b50ced150b2624d3df8a257d7106c1a698a5fb62d5c4a0c066fe689ac8f1d0e4b4e7586a7d326b61700f16d5f85c1
-DIST linux-5.17.tar.xz 128399340 BLAKE2B 82dc4a45cc25c781ac67aa6ed1e4c369544154960f41c4634d47621f381159687a227054976d078524cda28884d395a15f7542fe44ca74ce98ca6ff54a81d6d0 SHA512 89f0a7ca69d20a539d4b612a7028a30a5e98b402e4b6b88516f14237e5da4b626d7929eab8b40fccc90766e8f3bae87e9858a19077ffad20d8204acf18794f5b
 DIST linux-5.18.2-xanmod1.tar.gz 207126257 BLAKE2B 24f84b5f125994b3339193ed82fc0f1d4d1a959c33d05e988b6108bef1007415f6d03854dfe240c3a76821f768bc4aad6dc19b47ed059c1c5aea9ca3cb028dd8 SHA512 b444825e1901ccef281ce5b34f0e7d13d53acd135912363b41bc868305a3fa75fa5bcb76b0537c649d82ba7063275ddefdba421f24ac40af36a7c55105a7557c
-DIST patch-5.17.7-xanmod1.xz 830980 BLAKE2B c82af72bcf873e4a0d97ccdef2a474dd9345ab508e49052ede232277a39ac783a8e9af91a7b134bdf73cc292f30b5460e3c3ce07e09fb0ca539c1c26b76a14ec SHA512 d04fa88053fc9bada86646abd7d2ab6e34004444d8c1711e9469fae571660b29433fb27133ba3e137146c7b0fadab5df7b84de2f2b55d4e4239ef85ab5283943
+DIST linux-5.18.4-xanmod1.tar.gz 207164026 BLAKE2B d159eb399f26a51acf33257b04a57fe28d555c2afa86b2ea0e18c27a9d9a55616b20edf7839ad903d51ffae3ea1481ead09f56ae89a68f31746bb91d0ca95c09 SHA512 0b6b5d58d5e27e60c19445c3a45fbc2fef62eab12f00f17112f0d16e8036ef654f463231c1902c992adad23335d1da72d2965553d0fffb22eb58ffc94f8b0381

sys-kernel/xanmod-kernel/xanmod-kernel-5.17.7.ebuild

@@ -1,93 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
-CONFIG_VER=5.17.3-gentoo
-GENTOO_CONFIG_VER=g1
-
-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
-	amd64? (
-		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="-* ~amd64"
-IUSE="debug hardened"
-
-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" | xargs rm || die
-
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-		"${WORKDIR}"/patch-${PV}-xanmod1
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	rm "${S}/localversion" || die
-	local myversion="-xanmod1-dist"
-	use hardened && myversion+="-hardened"
-	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
-	)
-	if use hardened; then
-		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
-
-		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
-
-		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
-			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
-		fi
-	fi
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}

sys-kernel/xanmod-kernel/xanmod-kernel-5.18.4.ebuild

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

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