diff --git a/sys-kernel/chromeos-sources/chromeos-sources-9999.ebuild b/sys-kernel/chromeos-sources/chromeos-sources-9999.ebuild
index 3414101ce..2e2f5d124 100644
--- a/sys-kernel/chromeos-sources/chromeos-sources-9999.ebuild
+++ b/sys-kernel/chromeos-sources/chromeos-sources-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 K_SECURITY_UNSUPPORTED="1"
 K_DEBLOB_AVAILABLE="1"
diff --git a/sys-kernel/minipli-sources/Manifest b/sys-kernel/minipli-sources/Manifest
deleted file mode 100644
index 7a79579c6..000000000
--- a/sys-kernel/minipli-sources/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST genpatches-4.9-76.base.tar.xz 1416656 BLAKE2B ff07be80dfac7f2c8a51e525bdda14f95afcdd93dde5a455f771c9a664a8023577e5f52343401420afc963e0d26c97dfe23cefd53517865e542f9d78d2e70471 SHA512 fea0bc6766c95d97bc4d1360d9eb3afbd6ead6c8bb6e6fb8c937117587b87b7a82c983273d026e8ecf99aa816b1ab9af742d551cc12fca055b0f032b3ee3ea8a
-DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c5954c4611158ca99e71cc0da2e051272eabf27d5887df4a7cb4a5dd66ff993077c11d2221e92d300a0b48d7 SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
-DIST v4.9.74-unofficial_grsec-20180103130648.diff 8818052 BLAKE2B df083f110303db16bb96c69580d4ec45d073db2130c38eb1fbd1bfeea04fedd68ff211171fa139121802b47e11ef0756d189d2b329a579a8188e791c65566345 SHA512 efe50054649c3bc464c92e23233c91457fe2709e24aa5781856e1c1cbbc6164db88129c320f6f4fd1f871184df8d5aa0dd51065c71222ed3cf9854f6c437cc45
diff --git a/sys-kernel/minipli-sources/files/grsec-wifi-injection-4.9.patch b/sys-kernel/minipli-sources/files/grsec-wifi-injection-4.9.patch
deleted file mode 100644
index ae4aaca93..000000000
--- a/sys-kernel/minipli-sources/files/grsec-wifi-injection-4.9.patch
+++ /dev/null
@@ -1,130 +0,0 @@
---- a/net/mac80211/cfg.c
-+++ b/net/mac80211/cfg.c
-@@ -580,7 +580,8 @@ static int ieee80211_set_monitor_channel
- 			ret = ieee80211_vif_use_channel(sdata, chandef,
- 					IEEE80211_CHANCTX_EXCLUSIVE);
- 		}
--	} else if (local_read(&local->open_count) == local->monitors) {
-+       // Patch: Always allow channel change, even if a normal virtual interface is present
-+       } else /*if (local_read(&local->open_count) == local->monitors)*/ {
- 		local->_oper_chandef = *chandef;
- 		ieee80211_hw_config(local, 0);
- 	}
---- a/net/mac80211/tx.c
-+++ b/net/mac80211/tx.c
-@@ -795,11 +795,19 @@ ieee80211_tx_h_sequence(struct ieee80211
- 
- 	/*
- 	 * Packet injection may want to control the sequence
--	 * number, if we have no matching interface then we
--	 * neither assign one ourselves nor ask the driver to.
-+	 * number, so if an injected packet is found, skip
-+	 * renumbering it. Also make the packet NO_ACK to avoid
-+	 * excessive retries (ACKing and retrying should be
-+	 * handled by the injecting application).
-+	 * FIXME This may break hostapd and some other injectors.
-+	 * This should be done using a radiotap flag.
- 	 */
--	if (unlikely(info->control.vif->type == NL80211_IFTYPE_MONITOR))
-+	if (unlikely((info->flags & IEEE80211_TX_CTL_INJECTED) &&
-+	   !(tx->sdata->u.mntr.flags & MONITOR_FLAG_COOK_FRAMES))) {
-+		if (!ieee80211_has_morefrags(hdr->frame_control))
-+			info->flags |= IEEE80211_TX_CTL_NO_ACK;
- 		return TX_CONTINUE;
-+	}
- 
- 	if (unlikely(ieee80211_is_ctl(hdr->frame_control)))
- 		return TX_CONTINUE;
-@@ -1659,7 +1667,10 @@ void ieee80211_xmit(struct ieee80211_sub
- 		}
- 	}
- 
--	ieee80211_set_qos_hdr(sdata, skb);
-+        // Don't overwrite QoS header in monitor mode
-+        if (likely(info->control.vif->type != NL80211_IFTYPE_MONITOR)) {
-+            ieee80211_set_qos_hdr(sdata, skb);
-+        }
- 	ieee80211_tx(sdata, sta, skb, false);
- }
- 
---- a/net/wireless/chan.c
-+++ b/net/wireless/chan.c
-@@ -857,8 +857,10 @@ int cfg80211_set_monitor_channel(struct
- {
- 	if (!rdev->ops->set_monitor_channel)
- 		return -EOPNOTSUPP;
--	if (!cfg80211_has_monitors_only(rdev))
--		return -EBUSY;
-+	// Always allow user to change channel, even if there is another normal
-+	// virtual interface using the device.
-+	//if (!cfg80211_has_monitors_only(rdev))
-+	//	return -EBUSY;
- 
- 	return rdev_set_monitor_channel(rdev, chandef);
- }
---- a/drivers/net/wireless/zydas/zd1211rw/zd_mac.c
-+++ b/drivers/net/wireless/zydas/zd1211rw/zd_mac.c
-@@ -242,14 +242,19 @@ void zd_mac_clear(struct zd_mac *mac)
- static int set_rx_filter(struct zd_mac *mac)
- {
- 	unsigned long flags;
--	u32 filter = STA_RX_FILTER;
-+	struct zd_ioreq32 ioreqs[] = {
-+		{CR_RX_FILTER, STA_RX_FILTER},
-+		{ CR_SNIFFER_ON, 0U },
-+	};
- 
- 	spin_lock_irqsave(&mac->lock, flags);
--	if (mac->pass_ctrl)
--		filter |= RX_FILTER_CTRL;
-+	if (mac->pass_ctrl) {
-+		ioreqs[0].value |= 0xFFFFFFFF;
-+		ioreqs[1].value = 0x1;
-+	}
- 	spin_unlock_irqrestore(&mac->lock, flags);
- 
--	return zd_iowrite32(&mac->chip, CR_RX_FILTER, filter);
-+	return zd_iowrite32a(&mac->chip, ioreqs, ARRAY_SIZE(ioreqs));
- }
- 
- static int set_mac_and_bssid(struct zd_mac *mac)
-@@ -1057,7 +1062,8 @@ int zd_mac_rx(struct ieee80211_hw *hw, c
- 	/* Caller has to ensure that length >= sizeof(struct rx_status). */
- 	status = (struct rx_status *)
- 		(buffer + (length - sizeof(struct rx_status)));
--	if (status->frame_status & ZD_RX_ERROR) {
-+	if ((status->frame_status & ZD_RX_ERROR) || 
-+		(status->frame_status & ~0x21)) {
- 		if (mac->pass_failed_fcs &&
- 				(status->frame_status & ZD_RX_CRC32_ERROR)) {
- 			stats.flag |= RX_FLAG_FAILED_FCS_CRC;
-@@ -1400,7 +1406,7 @@ struct ieee80211_hw *zd_mac_alloc_hw(str
- 	ieee80211_hw_set(hw, MFP_CAPABLE);
- 	ieee80211_hw_set(hw, HOST_BROADCAST_PS_BUFFERING);
- 	ieee80211_hw_set(hw, RX_INCLUDES_FCS);
--	ieee80211_hw_set(hw, SIGNAL_UNSPEC);
-+	ieee80211_hw_set(hw, SIGNAL_DBM);
- 
- 	hw->wiphy->interface_modes =
- 		BIT(NL80211_IFTYPE_MESH_POINT) |
---- a/drivers/net/wireless/realtek/rtl818x/rtl8187/dev.c
-+++ b/drivers/net/wireless/realtek/rtl818x/rtl8187/dev.c
-@@ -251,8 +251,17 @@ static void rtl8187_tx(struct ieee80211_
- 	flags |= RTL818X_TX_DESC_FLAG_NO_ENC;
- 
- 	flags |= ieee80211_get_tx_rate(dev, info)->hw_value << 24;
-+
-+	// When this flag is set the firmware waits untill ALL fragments have
-+	// reached the USB device. Then it sends the first fragment and waits
-+	// for ACKS's. Of course in monitor mode it won't detect these ACK's.
- 	if (ieee80211_has_morefrags(tx_hdr->frame_control))
--		flags |= RTL818X_TX_DESC_FLAG_MOREFRAG;
-+	{
-+		// If info->control.vif is NULL it's most likely in monitor mode
-+		if (likely(info->control.vif != NULL && info->control.vif->type != NL80211_IFTYPE_MONITOR)) {
-+			flags |= RTL818X_TX_DESC_FLAG_MOREFRAG;
-+		}
-+	}
- 
- 	/* HW will perform RTS-CTS when only RTS flags is set.
- 	 * HW will perform CTS-to-self when both RTS and CTS flags are set.
diff --git a/sys-kernel/minipli-sources/minipli-sources-4.9.74.ebuild b/sys-kernel/minipli-sources/minipli-sources-4.9.74.ebuild
deleted file mode 100644
index d90abbdb9..000000000
--- a/sys-kernel/minipli-sources/minipli-sources-4.9.74.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base"
-#K_GENPATCHES_VER="76"
-#K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="20180103130648"
-HGPV_URI="https://github.com/minipli/linux-unofficial_grsec/releases/download/v${PV}-unofficial_grsec/v${PV}-unofficial_grsec-${HGPV}.diff"
-
-OLD_GENPATCHES_URI="https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-4.9-76.base.tar.xz"
-
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${OLD_GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/v${PV}-unofficial_grsec-${HGPV}.diff"
-UNIPATCH_EXCLUDE="
-	1500_XATTR_USER_PREFIX.patch
-	1520_CVE-2017-6074-dccp-skb-freeing-fix.patch
-	2900_dev-root-proc-mount-fix.patch"
-
-DESCRIPTION="Unofficial forward ports of the last publicly available grsecurity patch"
-HOMEPAGE="https://github.com/minipli/linux-unofficial_grsec"
-IUSE="deblob injection"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-src_prepare(){
-	#apply hardened-adapted patch
-	#section: b/net/mac80211/cfg.c
-	use injection && epatch "${FILESDIR}/grsec-wifi-injection-4.9.patch"
-	eapply_user
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-3.1*"
-
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
-	ewarn "It is strongly recommended that the following command is issued"
-	ewarn "prior to booting a ${PF} kernel for the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}"
-	ewarn
-}
diff --git a/sys-kernel/odroid-sources/odroid-sources-9999.ebuild b/sys-kernel/odroid-sources/odroid-sources-9999.ebuild
deleted file mode 100644
index 4adc9c780..000000000
--- a/sys-kernel/odroid-sources/odroid-sources-9999.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-ETYPE="sources"
-CKV='3.8.99'
-inherit kernel-2 git-r3
-detect_version
-
-DESCRIPTION="Linux kernel source for the ODROID-[UX]2 products"
-HOMEPAGE="https://github.com/hardkernel/linux"
-EGIT_REPO_URI="https://github.com/hardkernel/linux.git"
-EGIT_BRANCH="odroid-3.8.y"
-EGIT_CHECKOUT_DIR="${WORKDIR}/linux-${KV_FULL}"
-
-#unsupported
-KEYWORDS=""
-IUSE="deblob"
diff --git a/sys-kernel/odroidxu-sources/odroidxu-sources-9999.ebuild b/sys-kernel/odroidxu-sources/odroidxu-sources-9999.ebuild
deleted file mode 100644
index 4c0cad78c..000000000
--- a/sys-kernel/odroidxu-sources/odroidxu-sources-9999.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-ETYPE="sources"
-CKV='3.4.99'
-inherit kernel-2 git-r3
-detect_version
-
-DESCRIPTION="Linux kernel source for the ODROIDXU products"
-HOMEPAGE="https://github.com/hardkernel/linux"
-EGIT_REPO_URI="https://github.com/hardkernel/linux.git"
-EGIT_BRANCH="odroidxu-3.4.y"
-EGIT_CHECKOUT_DIR="${WORKDIR}/linux-${KV_FULL}"
-
-#unsupported
-KEYWORDS=""
-IUSE="deblob"
diff --git a/sys-kernel/wireless-testing/wireless-testing-9999.ebuild b/sys-kernel/wireless-testing/wireless-testing-9999.ebuild
index e4208bb9d..8a4a3185f 100644
--- a/sys-kernel/wireless-testing/wireless-testing-9999.ebuild
+++ b/sys-kernel/wireless-testing/wireless-testing-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-CKV="4.19.0_pre"
+EAPI=8
+CKV="5.18.0_pre"
 ETYPE="sources"
 inherit kernel-2 git-r3