From f06528e6fdcf0a5cd8e0f6238c3f67ae47d3ae24 Mon Sep 17 00:00:00 2001
From: projectmoon <projectmoon@agnos.is>
Date: Wed, 8 Mar 2023 20:51:57 +0000
Subject: [PATCH] sys-kernel/libre-kernel: drop versions

---
 sys-kernel/libre-kernel/Manifest              |  12 --
 .../libre-kernel-5.15.75-r3.ebuild            | 138 ----------------
 .../libre-kernel-5.15.77-r1.ebuild            | 150 ------------------
 .../libre-kernel/libre-kernel-5.15.77.ebuild  | 138 ----------------
 .../libre-kernel/libre-kernel-5.15.80.ebuild  | 150 ------------------
 .../libre-kernel/libre-kernel-5.15.83.ebuild  | 150 ------------------
 .../libre-kernel/libre-kernel-5.15.85.ebuild  | 150 ------------------
 .../libre-kernel/libre-kernel-5.15.88.ebuild  | 150 ------------------
 .../libre-kernel/libre-kernel-6.1.12.ebuild   | 150 ------------------
 9 files changed, 1188 deletions(-)
 delete mode 100644 sys-kernel/libre-kernel/libre-kernel-5.15.75-r3.ebuild
 delete mode 100644 sys-kernel/libre-kernel/libre-kernel-5.15.77-r1.ebuild
 delete mode 100644 sys-kernel/libre-kernel/libre-kernel-5.15.77.ebuild
 delete mode 100644 sys-kernel/libre-kernel/libre-kernel-5.15.80.ebuild
 delete mode 100644 sys-kernel/libre-kernel/libre-kernel-5.15.83.ebuild
 delete mode 100644 sys-kernel/libre-kernel/libre-kernel-5.15.85.ebuild
 delete mode 100644 sys-kernel/libre-kernel/libre-kernel-5.15.88.ebuild
 delete mode 100644 sys-kernel/libre-kernel/libre-kernel-6.1.12.ebuild

diff --git a/sys-kernel/libre-kernel/Manifest b/sys-kernel/libre-kernel/Manifest
index 35dfe0e..6f77a8a 100644
--- a/sys-kernel/libre-kernel/Manifest
+++ b/sys-kernel/libre-kernel/Manifest
@@ -2,21 +2,9 @@ DIST genpatches-5.15-98.base.tar.xz 4003192 BLAKE2B 79d4fb60a5192137571109ffaefd
 DIST genpatches-5.15-98.extras.tar.xz 3932 BLAKE2B 4e5dd4f8ba6d14764a6546cf7e64dffb3ddcc77678b7d96d2498917f30561792c904c635b0fce7191b7c0c65549fa769e89befffbea5e53a3cef64c673937c20 SHA512 337d95159432cba3b85511cf80c350a8a2f67c65b72a90b26ddc98c01d2d8de70d9b6067e0573c5c339a5bf64973d10c06b42001ee19a7add3d672e4577d0622
 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 gentoo-kernel-config-g1.tar.gz 4283 BLAKE2B 44dd51ec45ebc71bffcd6d85a2fefba053f7bce8035057f0bbe928e24816ad4ba03c9bf67dcfcd6d6d1833c0a2ea93e0fd486c2093664dc41ccce316e1e60588 SHA512 3a45f28df9d457df0fe0d185da8b10f4e35f49dad75075e041e8cf3cf6972fecc8145cd557b0bf3a8dea20ddffae0194f88e61c1e5098fa0a5ca301d40aeea2e
 DIST gentoo-kernel-config-g6.tar.gz 4562 BLAKE2B ad9e1b28f84916f12cd8b21feb2f4396d3d63f4cfae3e6b6fe93f919c98b0b4523b205711ab7acafa7121360f696eecb63b9f162dd12950e56dab1429cc13633 SHA512 d180122eb00d40126ea7d79224559904eb0ea574314f9a8d6be6b10f0f6a49f526eba1366ae8cd0a4fe23cd8ff5e292c8cab7e856a2c915d4162b75a03f8076b
 DIST kernel-x86_64-fedora.config.5.15.19 223286 BLAKE2B 239995703c01dcb6d179133dd115bc0a57872c07d7a08afaf4d92cf6d78f0c17b19487b5b399ac7fdde5d460fa7931628147817a569fef2c3a62951c96054bdf SHA512 9bee4aff7e5ef4ada57bee7496aaf47b8fdd5c936c4c9b580660d130db0678eaecdebdbcab0dfcaf5c17a71f6419069840db10f5886806b6fc810f8a3619554f
 DIST kernel-x86_64-fedora.config.6.1.7-gentoo 228685 BLAKE2B e68236ccc1d51b2aff850eda9f3197b7ea95b8a88716bc7b07dad30348a86fdbb99a948060300dddae73ca82267d851d357f1c9547a9dcefae1364deebdbd124 SHA512 42bec2ddb9cf7eb6e84bbdeb23eb98dc11c9cea41f6134b776010c6b36833b520a290f0ef0145379de15c7f7834398fa5e3aaabd7258d7d4e89567faa09eeb4c
-DIST linux-libre-5.15.75-gnu.tar.xz 119675216 BLAKE2B 7b5658c5516062eeba00fdd02e20c135b2d693a48b2d73afa98bd3f0e58be67213f722a2707c43db48db75d8f015ebd824b19b74c3b9193c00af8dd58f21ea23 SHA512 c5fbb755500692a12e859218b0e5a3c42336be073b234b543a865d30f95af0854634b9a7454fb15c08c3635cec44af7f5a24c54945345fb6bbafb0805fa808c8
-DIST linux-libre-5.15.77-gnu.tar.xz 119696132 BLAKE2B c4a16a82a886c82954480f6063693edde3202e2c4981f40692c603d9917f5b39825b4b9c097c462ea42f3ae524a0aa5018fcd18c93ca908493e2aad6d18e5f7d SHA512 1b7309dd89ffc365722cdf2e0c0a8ed19ff769e22a90fd3a8b3fadc6d6a6dc442bf203c7cef075631b94d560144b3167a2f430fb27bf9c49946498917315aeb9
-DIST linux-libre-5.15.77-gnu.tar.xz.sign 195 BLAKE2B ba41ae8c34c9f53a9a9b7bb8ec67c990c4a30168bcab79b7deb15b99615aa257f4dd48a7ff59db40b6d32ce87b155aa5a56eb663c999f1c91d04441bc8db39aa SHA512 988464375ee5f41fcac07f0ecaa1194e9332cfa1f134f6b1427ddfadf31bbd71f3d51efa8ccc87a927011bc5d9e95791cdf0399a9464b8e5d4f85e83acab8e3c
-DIST linux-libre-5.15.80-gnu.tar.xz 119711916 BLAKE2B e86e7e77ad8268c5fb442f993f4775188541aa6029bcb15925bad23921766c2d5fd9cd04f991c59f98700af207950eccf24459e8b339f852f9ce4a87691987b8 SHA512 d249b5d258156a25a3892138a7dd59b51e238997827979320e382dbd55c93c6ab2b890b65a6e671cee3bd61af567202413440e8a39d5f7ad628dc80b321c2e60
-DIST linux-libre-5.15.80-gnu.tar.xz.sign 195 BLAKE2B ff3d6479d9ecd99572a60bd9d0dd0eaa8913e455b877c5b30666a8b73f69b51762f87aab2b529629688ae5f5f572858e6d472e5f872920d70a57d4ff372f212e SHA512 caa2e50ce8d3210339fb4ca191d9ad8dce83622e8bc190d7597d685b89994ea87a8462b496a07aba3ba2bd37b464845dd7b5799acf350dd4a315ec5918866332
-DIST linux-libre-5.15.83-gnu.tar.xz 119716144 BLAKE2B 8c5f14017687f5af9f82c4c85293436633f3ce31a3592346ae7f57f5e2250a26630dbd3b05eb354e467b93c5ddd6d245e35448ceb27cf030b268d821e65baed1 SHA512 82ec18c9584ea81c2fced0b1f9706ff97386aba32acca3e9ef6432abeed1178618de4afe8dfd9ccab2b2854b44fc61c6ab1f6c7707a521e36b92a9198797e52b
-DIST linux-libre-5.15.83-gnu.tar.xz.sign 195 BLAKE2B b5571b9b528c8108a9c46b7e1fd3693a3f293a499eaa69ebaab5442a2419f81b05f1bcc647e441a3fc87b74dfe38d258e4ed54fa91a1646af67bc090b5cd88b6 SHA512 a4cbe554176646445756dcf7d1cb720dd53f2dec62e907c817a1f4a450983b4c002408c7e277ed8522136223c1ba1bc486711139cca5d9ae5e030023cc18dfaa
-DIST linux-libre-5.15.85-gnu.tar.xz 119691756 BLAKE2B 1f87b850883eac963ca81acfb40a16e67274a1e48c9d465af2d322857b7c419b6250c6c546d015f10d2803a9727d97d6b15d5ceeeffd96bfd12869783c0884d5 SHA512 db95e2128ca72c59692b0084dafa1dc5bdfe0c3ec58b986dc90fd3e1459679a64564a002ab6b74432778f5b09f29cc5ff2ae25ff790fe69f377ebfce0b347416
-DIST linux-libre-5.15.85-gnu.tar.xz.sign 195 BLAKE2B a125f7eb8373cc8c0d6737365c22b3a9b89374168024cac4942f782f78bbe7d9e997442ff9eb8dd6248f3c5fbcd1789a7bdb402d26fe840f0c33568882bdb23d SHA512 39b97fb8f76189559bcdbfdfefc34cfb55648a213013f373a4cf413be12e897e5a7db63341c40be1c0db65892a630eca36155302ce3fa97a7622093a20c69d07
-DIST linux-libre-5.15.88-gnu.tar.xz 119731844 BLAKE2B 5f939758e98c1a47d96b728a5445f3eed65a8442d85a2c3da434b01eb063a2dfca6d32095cb9c65eebb29d9cda75f0d863a302ed1c5460f96962292dce1396cb SHA512 fbf8e8406c269d20baa0b1a97ceac8bbe8f240fcd9f2978957d9a560d420f2890de307b1d5fb628f34123f53643a04c6a486f4054ca50fd1014d6f050c11a06d
-DIST linux-libre-5.15.88-gnu.tar.xz.sign 195 BLAKE2B dfbe0feee9e4e84bc45994b232a74859b3e764e41a0d10b097fc201534d3c1fe04b4746576eaa7bb2d7828ab8850ac915bb6f3186689e4474ec7fe639aea06ce SHA512 8d59ac0dc76b739acb7bb855addc11b3d02af7eb22c51f2672986af8d39ac18bdbce47a2b8a8f71827985f17f002e3b0ba152de8d1d84520fa4ea72427e216bb
 DIST linux-libre-5.15.94-gnu.tar.xz 119739516 BLAKE2B 6d7c7d624991b79a021a5aa8c3c7b829b218ce9cb146f3f508f9fe97c3d738e9c1f02e38ea5928d02a8812f294335b81a2b03ff70039b641554dbfa4569ef7d1 SHA512 02c21e2cf83bf90b2c086ba92407a80be17468f55b7e7877dbd6eb89d90d100dfdb7bfea8776f5738a1335953aeba67dc581383674c1a28f4f6c458b27f652d6
 DIST linux-libre-5.15.94-gnu.tar.xz.sign 195 BLAKE2B 84e3688cb26f529785a02a9104aa9f6dd059ff266e550340f09c7c4b916fedfbd63b80c4f634ab97c2ee6b88f864cf0a022d61eb2d30cf9b9201daee65ad5bca SHA512 35282cf99ffef053a1b05126371f70d0b24c16c95e579111f4118e4b2b1c72cbabd1393d2b8d092b62517f7c1c05ab997c2ec51ad0159701d03e715c190095c2
 DIST linux-libre-6.1.12-gnu.tar.xz 127116060 BLAKE2B 2d8f457e23d954a1d2bd1c312369ca2ab6fa2c03b1758e78c82d5cc40eec8c5c3b5cb79c6fb168dca44a4ea6837801bb47a91e6b4b437ab6087adbb1b38914d1 SHA512 27c8f3e12e5f95681ef17f8fc698b7a319c69c734154c62437e43f997565f7f0fb3ccce9dd114bc23ccaa4580833a201d45ea744d568bf473b8ef76f6f91c988
diff --git a/sys-kernel/libre-kernel/libre-kernel-5.15.75-r3.ebuild b/sys-kernel/libre-kernel/libre-kernel-5.15.75-r3.ebuild
deleted file mode 100644
index 13f78af..0000000
--- a/sys-kernel/libre-kernel/libre-kernel-5.15.75-r3.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors, projectmoon
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit kernel-build
-
-BASE_VER="$(ver_cut 1).$(ver_cut 2).$(ver_cut 3)"
-RESTRICT="mirror"
-
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.15.19
-CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
-GENTOO_CONFIG_VER=g1
-
-DESCRIPTION="GNU Linux-libre kernel built from upstream sources"
-HOMEPAGE="https://www.fsfla.org/ikiwiki/selibre/linux-libre/"
-SRC_URI+="
-	https://linux-libre.fsfla.org/pub/linux-libre/releases/${BASE_VER}-gnu/linux-libre-${BASE_VER}-gnu.tar.xz
-	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-"
-
-# Workdir is named linux-PV.
-MY_P=linux-${PV}
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="amd64"
-IUSE="debug"
-
-BDEPEND="
-	debug? ( dev-util/pahole )
-"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}
-"
-
-pkg_pretend() {
-	if has_version -d sys-kernel/linux-firmware[redistributable]; then
-		ewarn "sys-kernel/linux-firmware was found installed on your system,"
-		ewarn "but it is configured to install non-Free firmware files."
-		ewarn "The non-Free firmware files may be required for some hardware"
-		ewarn "work. The Linux-libre kernel cannot load non-Free firmware."
-		ewarn "To install only the Free firmware, set the -redistributable"
-		ewarn "USE flag on sys-kernel/linux-firmware."
-
-		if use initramfs; then
-			elog
-			elog "If you decide to change or remove linux-firmware later, you"
-			elog "can rebuild the initramfs via issuing a command equivalent to:"
-			elog
-			elog "    emerge --config ${CATEGORY}/${PN}:${SLOT}"
-		fi
-	else
-		if ! has_version -d sys-kernel/linux-firmware; then
-			ewarn "sys-kernel/linux-firmware[-redistributable] not found installed"
-			ewarn "on your system. This package provides various firmware files that"
-			ewarn "may be needed for your hardware to work.  If in doubt, it is recommended"
-			ewarn "to pause or abort the build process and install it before"
-			ewarn "resuming."
-
-			if use initramfs; then
-				elog
-				elog "If you decide to install linux-firmware later, you can rebuild"
-				elog "the initramfs via issuing a command equivalent to:"
-				elog
-				elog "    emerge --config ${CATEGORY}/${PN}:${SLOT}"
-			fi
-		fi
-	fi
-}
-
-src_unpack() {
-	default
-}
-
-src_prepare() {
-	default
-
-	local biendian=false
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		ppc)
-			# assume powermac/powerbook defconfig
-			# we still package.use.force savedconfig
-			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	sed -i 's/EXTRAVERSION = -gnu/EXTRAVERSION = /' "${S}"/Makefile || die 'could not remove EXTRAVERSION'
-	local myversion="-gnu-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
-	)
-
-	# this covers ppc64 and aarch64_be only for now
-	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
-		merge_configs+=( "${dist_conf_path}/big-endian.config" )
-	fi
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/libre-kernel/libre-kernel-5.15.77-r1.ebuild b/sys-kernel/libre-kernel/libre-kernel-5.15.77-r1.ebuild
deleted file mode 100644
index f61bff4..0000000
--- a/sys-kernel/libre-kernel/libre-kernel-5.15.77-r1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors, projectmoon
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit kernel-build verify-sig
-
-BASE_VER="$(ver_cut 1).$(ver_cut 2).$(ver_cut 3)"
-RESTRICT="mirror"
-
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.15.19
-CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
-GENTOO_CONFIG_VER=g1
-
-DESCRIPTION="GNU Linux-libre kernel built from upstream sources"
-HOMEPAGE="https://www.fsfla.org/ikiwiki/selibre/linux-libre/"
-SRC_URI+="
-	https://git.agnos.is/projectmoon/projectmoon-overlay-files/media/branch/main/sys-kernel/libre-kernel/linux-libre-${BASE_VER}-gnu.tar.xz
-	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	verify-sig? (
-		https://git.agnos.is/projectmoon/projectmoon-overlay-files/media/branch/main/sys-kernel/libre-kernel/linux-libre-${BASE_VER}-gnu.tar.xz.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-"
-
-# Workdir is named linux-PV.
-MY_P=linux-${PV}
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="amd64"
-IUSE="debug"
-
-BDEPEND="
-	debug? ( dev-util/pahole )
-	verify-sig? ( sec-keys/openpgp-keys-linux-libre )
-"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linux-libre.asc
-
-pkg_pretend() {
-	if has_version -d sys-kernel/linux-firmware[redistributable]; then
-		ewarn "sys-kernel/linux-firmware was found installed on your system,"
-		ewarn "but it is configured to install non-Free firmware files."
-		ewarn "The non-Free firmware files may be required for some hardware"
-		ewarn "work. The Linux-libre kernel cannot load non-Free firmware."
-		ewarn "To install only the Free firmware, set the -redistributable"
-		ewarn "USE flag on sys-kernel/linux-firmware."
-
-		if use initramfs; then
-			elog
-			elog "If you decide to change or remove linux-firmware later, you"
-			elog "can rebuild the initramfs via issuing a command equivalent to:"
-			elog
-			elog "    emerge --config ${CATEGORY}/${PN}:${SLOT}"
-		fi
-	else
-		if ! has_version -d sys-kernel/linux-firmware; then
-			ewarn "sys-kernel/linux-firmware[-redistributable] not found installed"
-			ewarn "on your system. This package provides various firmware files that"
-			ewarn "may be needed for your hardware to work.  If in doubt, it is recommended"
-			ewarn "to pause or abort the build process and install it before"
-			ewarn "resuming."
-
-			if use initramfs; then
-				elog
-				elog "If you decide to install linux-firmware later, you can rebuild"
-				elog "the initramfs via issuing a command equivalent to:"
-				elog
-				elog "    emerge --config ${CATEGORY}/${PN}:${SLOT}"
-			fi
-		fi
-	fi
-}
-
-src_unpack() {
-	if use verify-sig; then
-		FILE="${DISTDIR}"/linux-libre-${PV}-gnu.tar.xz
-		SIGFILE="${DISTDIR}"/linux-libre-${PV}-gnu.tar.xz.sign
-		verify-sig_verify_detached $FILE $SIGFILE
-	fi
-
-	default
-}
-
-src_prepare() {
-	default
-
-	local biendian=false
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		ppc)
-			# assume powermac/powerbook defconfig
-			# we still package.use.force savedconfig
-			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	sed -i 's/EXTRAVERSION = -gnu/EXTRAVERSION = /' "${S}"/Makefile || die 'could not remove EXTRAVERSION'
-	local myversion="-gnu-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
-	)
-
-	# this covers ppc64 and aarch64_be only for now
-	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
-		merge_configs+=( "${dist_conf_path}/big-endian.config" )
-	fi
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/libre-kernel/libre-kernel-5.15.77.ebuild b/sys-kernel/libre-kernel/libre-kernel-5.15.77.ebuild
deleted file mode 100644
index 13f78af..0000000
--- a/sys-kernel/libre-kernel/libre-kernel-5.15.77.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors, projectmoon
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit kernel-build
-
-BASE_VER="$(ver_cut 1).$(ver_cut 2).$(ver_cut 3)"
-RESTRICT="mirror"
-
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.15.19
-CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
-GENTOO_CONFIG_VER=g1
-
-DESCRIPTION="GNU Linux-libre kernel built from upstream sources"
-HOMEPAGE="https://www.fsfla.org/ikiwiki/selibre/linux-libre/"
-SRC_URI+="
-	https://linux-libre.fsfla.org/pub/linux-libre/releases/${BASE_VER}-gnu/linux-libre-${BASE_VER}-gnu.tar.xz
-	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-"
-
-# Workdir is named linux-PV.
-MY_P=linux-${PV}
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="amd64"
-IUSE="debug"
-
-BDEPEND="
-	debug? ( dev-util/pahole )
-"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}
-"
-
-pkg_pretend() {
-	if has_version -d sys-kernel/linux-firmware[redistributable]; then
-		ewarn "sys-kernel/linux-firmware was found installed on your system,"
-		ewarn "but it is configured to install non-Free firmware files."
-		ewarn "The non-Free firmware files may be required for some hardware"
-		ewarn "work. The Linux-libre kernel cannot load non-Free firmware."
-		ewarn "To install only the Free firmware, set the -redistributable"
-		ewarn "USE flag on sys-kernel/linux-firmware."
-
-		if use initramfs; then
-			elog
-			elog "If you decide to change or remove linux-firmware later, you"
-			elog "can rebuild the initramfs via issuing a command equivalent to:"
-			elog
-			elog "    emerge --config ${CATEGORY}/${PN}:${SLOT}"
-		fi
-	else
-		if ! has_version -d sys-kernel/linux-firmware; then
-			ewarn "sys-kernel/linux-firmware[-redistributable] not found installed"
-			ewarn "on your system. This package provides various firmware files that"
-			ewarn "may be needed for your hardware to work.  If in doubt, it is recommended"
-			ewarn "to pause or abort the build process and install it before"
-			ewarn "resuming."
-
-			if use initramfs; then
-				elog
-				elog "If you decide to install linux-firmware later, you can rebuild"
-				elog "the initramfs via issuing a command equivalent to:"
-				elog
-				elog "    emerge --config ${CATEGORY}/${PN}:${SLOT}"
-			fi
-		fi
-	fi
-}
-
-src_unpack() {
-	default
-}
-
-src_prepare() {
-	default
-
-	local biendian=false
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		ppc)
-			# assume powermac/powerbook defconfig
-			# we still package.use.force savedconfig
-			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	sed -i 's/EXTRAVERSION = -gnu/EXTRAVERSION = /' "${S}"/Makefile || die 'could not remove EXTRAVERSION'
-	local myversion="-gnu-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
-	)
-
-	# this covers ppc64 and aarch64_be only for now
-	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
-		merge_configs+=( "${dist_conf_path}/big-endian.config" )
-	fi
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/libre-kernel/libre-kernel-5.15.80.ebuild b/sys-kernel/libre-kernel/libre-kernel-5.15.80.ebuild
deleted file mode 100644
index f61bff4..0000000
--- a/sys-kernel/libre-kernel/libre-kernel-5.15.80.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors, projectmoon
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit kernel-build verify-sig
-
-BASE_VER="$(ver_cut 1).$(ver_cut 2).$(ver_cut 3)"
-RESTRICT="mirror"
-
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.15.19
-CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
-GENTOO_CONFIG_VER=g1
-
-DESCRIPTION="GNU Linux-libre kernel built from upstream sources"
-HOMEPAGE="https://www.fsfla.org/ikiwiki/selibre/linux-libre/"
-SRC_URI+="
-	https://git.agnos.is/projectmoon/projectmoon-overlay-files/media/branch/main/sys-kernel/libre-kernel/linux-libre-${BASE_VER}-gnu.tar.xz
-	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	verify-sig? (
-		https://git.agnos.is/projectmoon/projectmoon-overlay-files/media/branch/main/sys-kernel/libre-kernel/linux-libre-${BASE_VER}-gnu.tar.xz.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-"
-
-# Workdir is named linux-PV.
-MY_P=linux-${PV}
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="amd64"
-IUSE="debug"
-
-BDEPEND="
-	debug? ( dev-util/pahole )
-	verify-sig? ( sec-keys/openpgp-keys-linux-libre )
-"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linux-libre.asc
-
-pkg_pretend() {
-	if has_version -d sys-kernel/linux-firmware[redistributable]; then
-		ewarn "sys-kernel/linux-firmware was found installed on your system,"
-		ewarn "but it is configured to install non-Free firmware files."
-		ewarn "The non-Free firmware files may be required for some hardware"
-		ewarn "work. The Linux-libre kernel cannot load non-Free firmware."
-		ewarn "To install only the Free firmware, set the -redistributable"
-		ewarn "USE flag on sys-kernel/linux-firmware."
-
-		if use initramfs; then
-			elog
-			elog "If you decide to change or remove linux-firmware later, you"
-			elog "can rebuild the initramfs via issuing a command equivalent to:"
-			elog
-			elog "    emerge --config ${CATEGORY}/${PN}:${SLOT}"
-		fi
-	else
-		if ! has_version -d sys-kernel/linux-firmware; then
-			ewarn "sys-kernel/linux-firmware[-redistributable] not found installed"
-			ewarn "on your system. This package provides various firmware files that"
-			ewarn "may be needed for your hardware to work.  If in doubt, it is recommended"
-			ewarn "to pause or abort the build process and install it before"
-			ewarn "resuming."
-
-			if use initramfs; then
-				elog
-				elog "If you decide to install linux-firmware later, you can rebuild"
-				elog "the initramfs via issuing a command equivalent to:"
-				elog
-				elog "    emerge --config ${CATEGORY}/${PN}:${SLOT}"
-			fi
-		fi
-	fi
-}
-
-src_unpack() {
-	if use verify-sig; then
-		FILE="${DISTDIR}"/linux-libre-${PV}-gnu.tar.xz
-		SIGFILE="${DISTDIR}"/linux-libre-${PV}-gnu.tar.xz.sign
-		verify-sig_verify_detached $FILE $SIGFILE
-	fi
-
-	default
-}
-
-src_prepare() {
-	default
-
-	local biendian=false
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		ppc)
-			# assume powermac/powerbook defconfig
-			# we still package.use.force savedconfig
-			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	sed -i 's/EXTRAVERSION = -gnu/EXTRAVERSION = /' "${S}"/Makefile || die 'could not remove EXTRAVERSION'
-	local myversion="-gnu-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
-	)
-
-	# this covers ppc64 and aarch64_be only for now
-	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
-		merge_configs+=( "${dist_conf_path}/big-endian.config" )
-	fi
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/libre-kernel/libre-kernel-5.15.83.ebuild b/sys-kernel/libre-kernel/libre-kernel-5.15.83.ebuild
deleted file mode 100644
index f61bff4..0000000
--- a/sys-kernel/libre-kernel/libre-kernel-5.15.83.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors, projectmoon
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit kernel-build verify-sig
-
-BASE_VER="$(ver_cut 1).$(ver_cut 2).$(ver_cut 3)"
-RESTRICT="mirror"
-
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.15.19
-CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
-GENTOO_CONFIG_VER=g1
-
-DESCRIPTION="GNU Linux-libre kernel built from upstream sources"
-HOMEPAGE="https://www.fsfla.org/ikiwiki/selibre/linux-libre/"
-SRC_URI+="
-	https://git.agnos.is/projectmoon/projectmoon-overlay-files/media/branch/main/sys-kernel/libre-kernel/linux-libre-${BASE_VER}-gnu.tar.xz
-	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	verify-sig? (
-		https://git.agnos.is/projectmoon/projectmoon-overlay-files/media/branch/main/sys-kernel/libre-kernel/linux-libre-${BASE_VER}-gnu.tar.xz.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-"
-
-# Workdir is named linux-PV.
-MY_P=linux-${PV}
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="amd64"
-IUSE="debug"
-
-BDEPEND="
-	debug? ( dev-util/pahole )
-	verify-sig? ( sec-keys/openpgp-keys-linux-libre )
-"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linux-libre.asc
-
-pkg_pretend() {
-	if has_version -d sys-kernel/linux-firmware[redistributable]; then
-		ewarn "sys-kernel/linux-firmware was found installed on your system,"
-		ewarn "but it is configured to install non-Free firmware files."
-		ewarn "The non-Free firmware files may be required for some hardware"
-		ewarn "work. The Linux-libre kernel cannot load non-Free firmware."
-		ewarn "To install only the Free firmware, set the -redistributable"
-		ewarn "USE flag on sys-kernel/linux-firmware."
-
-		if use initramfs; then
-			elog
-			elog "If you decide to change or remove linux-firmware later, you"
-			elog "can rebuild the initramfs via issuing a command equivalent to:"
-			elog
-			elog "    emerge --config ${CATEGORY}/${PN}:${SLOT}"
-		fi
-	else
-		if ! has_version -d sys-kernel/linux-firmware; then
-			ewarn "sys-kernel/linux-firmware[-redistributable] not found installed"
-			ewarn "on your system. This package provides various firmware files that"
-			ewarn "may be needed for your hardware to work.  If in doubt, it is recommended"
-			ewarn "to pause or abort the build process and install it before"
-			ewarn "resuming."
-
-			if use initramfs; then
-				elog
-				elog "If you decide to install linux-firmware later, you can rebuild"
-				elog "the initramfs via issuing a command equivalent to:"
-				elog
-				elog "    emerge --config ${CATEGORY}/${PN}:${SLOT}"
-			fi
-		fi
-	fi
-}
-
-src_unpack() {
-	if use verify-sig; then
-		FILE="${DISTDIR}"/linux-libre-${PV}-gnu.tar.xz
-		SIGFILE="${DISTDIR}"/linux-libre-${PV}-gnu.tar.xz.sign
-		verify-sig_verify_detached $FILE $SIGFILE
-	fi
-
-	default
-}
-
-src_prepare() {
-	default
-
-	local biendian=false
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		ppc)
-			# assume powermac/powerbook defconfig
-			# we still package.use.force savedconfig
-			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	sed -i 's/EXTRAVERSION = -gnu/EXTRAVERSION = /' "${S}"/Makefile || die 'could not remove EXTRAVERSION'
-	local myversion="-gnu-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
-	)
-
-	# this covers ppc64 and aarch64_be only for now
-	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
-		merge_configs+=( "${dist_conf_path}/big-endian.config" )
-	fi
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/libre-kernel/libre-kernel-5.15.85.ebuild b/sys-kernel/libre-kernel/libre-kernel-5.15.85.ebuild
deleted file mode 100644
index f61bff4..0000000
--- a/sys-kernel/libre-kernel/libre-kernel-5.15.85.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors, projectmoon
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit kernel-build verify-sig
-
-BASE_VER="$(ver_cut 1).$(ver_cut 2).$(ver_cut 3)"
-RESTRICT="mirror"
-
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.15.19
-CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
-GENTOO_CONFIG_VER=g1
-
-DESCRIPTION="GNU Linux-libre kernel built from upstream sources"
-HOMEPAGE="https://www.fsfla.org/ikiwiki/selibre/linux-libre/"
-SRC_URI+="
-	https://git.agnos.is/projectmoon/projectmoon-overlay-files/media/branch/main/sys-kernel/libre-kernel/linux-libre-${BASE_VER}-gnu.tar.xz
-	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	verify-sig? (
-		https://git.agnos.is/projectmoon/projectmoon-overlay-files/media/branch/main/sys-kernel/libre-kernel/linux-libre-${BASE_VER}-gnu.tar.xz.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-"
-
-# Workdir is named linux-PV.
-MY_P=linux-${PV}
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="amd64"
-IUSE="debug"
-
-BDEPEND="
-	debug? ( dev-util/pahole )
-	verify-sig? ( sec-keys/openpgp-keys-linux-libre )
-"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linux-libre.asc
-
-pkg_pretend() {
-	if has_version -d sys-kernel/linux-firmware[redistributable]; then
-		ewarn "sys-kernel/linux-firmware was found installed on your system,"
-		ewarn "but it is configured to install non-Free firmware files."
-		ewarn "The non-Free firmware files may be required for some hardware"
-		ewarn "work. The Linux-libre kernel cannot load non-Free firmware."
-		ewarn "To install only the Free firmware, set the -redistributable"
-		ewarn "USE flag on sys-kernel/linux-firmware."
-
-		if use initramfs; then
-			elog
-			elog "If you decide to change or remove linux-firmware later, you"
-			elog "can rebuild the initramfs via issuing a command equivalent to:"
-			elog
-			elog "    emerge --config ${CATEGORY}/${PN}:${SLOT}"
-		fi
-	else
-		if ! has_version -d sys-kernel/linux-firmware; then
-			ewarn "sys-kernel/linux-firmware[-redistributable] not found installed"
-			ewarn "on your system. This package provides various firmware files that"
-			ewarn "may be needed for your hardware to work.  If in doubt, it is recommended"
-			ewarn "to pause or abort the build process and install it before"
-			ewarn "resuming."
-
-			if use initramfs; then
-				elog
-				elog "If you decide to install linux-firmware later, you can rebuild"
-				elog "the initramfs via issuing a command equivalent to:"
-				elog
-				elog "    emerge --config ${CATEGORY}/${PN}:${SLOT}"
-			fi
-		fi
-	fi
-}
-
-src_unpack() {
-	if use verify-sig; then
-		FILE="${DISTDIR}"/linux-libre-${PV}-gnu.tar.xz
-		SIGFILE="${DISTDIR}"/linux-libre-${PV}-gnu.tar.xz.sign
-		verify-sig_verify_detached $FILE $SIGFILE
-	fi
-
-	default
-}
-
-src_prepare() {
-	default
-
-	local biendian=false
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		ppc)
-			# assume powermac/powerbook defconfig
-			# we still package.use.force savedconfig
-			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	sed -i 's/EXTRAVERSION = -gnu/EXTRAVERSION = /' "${S}"/Makefile || die 'could not remove EXTRAVERSION'
-	local myversion="-gnu-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
-	)
-
-	# this covers ppc64 and aarch64_be only for now
-	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
-		merge_configs+=( "${dist_conf_path}/big-endian.config" )
-	fi
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/libre-kernel/libre-kernel-5.15.88.ebuild b/sys-kernel/libre-kernel/libre-kernel-5.15.88.ebuild
deleted file mode 100644
index f61bff4..0000000
--- a/sys-kernel/libre-kernel/libre-kernel-5.15.88.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors, projectmoon
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit kernel-build verify-sig
-
-BASE_VER="$(ver_cut 1).$(ver_cut 2).$(ver_cut 3)"
-RESTRICT="mirror"
-
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.15.19
-CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
-GENTOO_CONFIG_VER=g1
-
-DESCRIPTION="GNU Linux-libre kernel built from upstream sources"
-HOMEPAGE="https://www.fsfla.org/ikiwiki/selibre/linux-libre/"
-SRC_URI+="
-	https://git.agnos.is/projectmoon/projectmoon-overlay-files/media/branch/main/sys-kernel/libre-kernel/linux-libre-${BASE_VER}-gnu.tar.xz
-	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	verify-sig? (
-		https://git.agnos.is/projectmoon/projectmoon-overlay-files/media/branch/main/sys-kernel/libre-kernel/linux-libre-${BASE_VER}-gnu.tar.xz.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-"
-
-# Workdir is named linux-PV.
-MY_P=linux-${PV}
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="amd64"
-IUSE="debug"
-
-BDEPEND="
-	debug? ( dev-util/pahole )
-	verify-sig? ( sec-keys/openpgp-keys-linux-libre )
-"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linux-libre.asc
-
-pkg_pretend() {
-	if has_version -d sys-kernel/linux-firmware[redistributable]; then
-		ewarn "sys-kernel/linux-firmware was found installed on your system,"
-		ewarn "but it is configured to install non-Free firmware files."
-		ewarn "The non-Free firmware files may be required for some hardware"
-		ewarn "work. The Linux-libre kernel cannot load non-Free firmware."
-		ewarn "To install only the Free firmware, set the -redistributable"
-		ewarn "USE flag on sys-kernel/linux-firmware."
-
-		if use initramfs; then
-			elog
-			elog "If you decide to change or remove linux-firmware later, you"
-			elog "can rebuild the initramfs via issuing a command equivalent to:"
-			elog
-			elog "    emerge --config ${CATEGORY}/${PN}:${SLOT}"
-		fi
-	else
-		if ! has_version -d sys-kernel/linux-firmware; then
-			ewarn "sys-kernel/linux-firmware[-redistributable] not found installed"
-			ewarn "on your system. This package provides various firmware files that"
-			ewarn "may be needed for your hardware to work.  If in doubt, it is recommended"
-			ewarn "to pause or abort the build process and install it before"
-			ewarn "resuming."
-
-			if use initramfs; then
-				elog
-				elog "If you decide to install linux-firmware later, you can rebuild"
-				elog "the initramfs via issuing a command equivalent to:"
-				elog
-				elog "    emerge --config ${CATEGORY}/${PN}:${SLOT}"
-			fi
-		fi
-	fi
-}
-
-src_unpack() {
-	if use verify-sig; then
-		FILE="${DISTDIR}"/linux-libre-${PV}-gnu.tar.xz
-		SIGFILE="${DISTDIR}"/linux-libre-${PV}-gnu.tar.xz.sign
-		verify-sig_verify_detached $FILE $SIGFILE
-	fi
-
-	default
-}
-
-src_prepare() {
-	default
-
-	local biendian=false
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		ppc)
-			# assume powermac/powerbook defconfig
-			# we still package.use.force savedconfig
-			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	sed -i 's/EXTRAVERSION = -gnu/EXTRAVERSION = /' "${S}"/Makefile || die 'could not remove EXTRAVERSION'
-	local myversion="-gnu-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
-	)
-
-	# this covers ppc64 and aarch64_be only for now
-	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
-		merge_configs+=( "${dist_conf_path}/big-endian.config" )
-	fi
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/libre-kernel/libre-kernel-6.1.12.ebuild b/sys-kernel/libre-kernel/libre-kernel-6.1.12.ebuild
deleted file mode 100644
index f61bff4..0000000
--- a/sys-kernel/libre-kernel/libre-kernel-6.1.12.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors, projectmoon
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit kernel-build verify-sig
-
-BASE_VER="$(ver_cut 1).$(ver_cut 2).$(ver_cut 3)"
-RESTRICT="mirror"
-
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.15.19
-CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
-GENTOO_CONFIG_VER=g1
-
-DESCRIPTION="GNU Linux-libre kernel built from upstream sources"
-HOMEPAGE="https://www.fsfla.org/ikiwiki/selibre/linux-libre/"
-SRC_URI+="
-	https://git.agnos.is/projectmoon/projectmoon-overlay-files/media/branch/main/sys-kernel/libre-kernel/linux-libre-${BASE_VER}-gnu.tar.xz
-	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	verify-sig? (
-		https://git.agnos.is/projectmoon/projectmoon-overlay-files/media/branch/main/sys-kernel/libre-kernel/linux-libre-${BASE_VER}-gnu.tar.xz.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-"
-
-# Workdir is named linux-PV.
-MY_P=linux-${PV}
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="amd64"
-IUSE="debug"
-
-BDEPEND="
-	debug? ( dev-util/pahole )
-	verify-sig? ( sec-keys/openpgp-keys-linux-libre )
-"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linux-libre.asc
-
-pkg_pretend() {
-	if has_version -d sys-kernel/linux-firmware[redistributable]; then
-		ewarn "sys-kernel/linux-firmware was found installed on your system,"
-		ewarn "but it is configured to install non-Free firmware files."
-		ewarn "The non-Free firmware files may be required for some hardware"
-		ewarn "work. The Linux-libre kernel cannot load non-Free firmware."
-		ewarn "To install only the Free firmware, set the -redistributable"
-		ewarn "USE flag on sys-kernel/linux-firmware."
-
-		if use initramfs; then
-			elog
-			elog "If you decide to change or remove linux-firmware later, you"
-			elog "can rebuild the initramfs via issuing a command equivalent to:"
-			elog
-			elog "    emerge --config ${CATEGORY}/${PN}:${SLOT}"
-		fi
-	else
-		if ! has_version -d sys-kernel/linux-firmware; then
-			ewarn "sys-kernel/linux-firmware[-redistributable] not found installed"
-			ewarn "on your system. This package provides various firmware files that"
-			ewarn "may be needed for your hardware to work.  If in doubt, it is recommended"
-			ewarn "to pause or abort the build process and install it before"
-			ewarn "resuming."
-
-			if use initramfs; then
-				elog
-				elog "If you decide to install linux-firmware later, you can rebuild"
-				elog "the initramfs via issuing a command equivalent to:"
-				elog
-				elog "    emerge --config ${CATEGORY}/${PN}:${SLOT}"
-			fi
-		fi
-	fi
-}
-
-src_unpack() {
-	if use verify-sig; then
-		FILE="${DISTDIR}"/linux-libre-${PV}-gnu.tar.xz
-		SIGFILE="${DISTDIR}"/linux-libre-${PV}-gnu.tar.xz.sign
-		verify-sig_verify_detached $FILE $SIGFILE
-	fi
-
-	default
-}
-
-src_prepare() {
-	default
-
-	local biendian=false
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		ppc)
-			# assume powermac/powerbook defconfig
-			# we still package.use.force savedconfig
-			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	sed -i 's/EXTRAVERSION = -gnu/EXTRAVERSION = /' "${S}"/Makefile || die 'could not remove EXTRAVERSION'
-	local myversion="-gnu-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
-	)
-
-	# this covers ppc64 and aarch64_be only for now
-	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
-		merge_configs+=( "${dist_conf_path}/big-endian.config" )
-	fi
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}