gentoo auto-resync : 16:01:2023 - 11:57:19

6 files changed, 11 insertions, 356 deletions

diff --git a/sys-kernel/pf-sources/Manifest b/sys-kernel/pf-sources/Manifest
index 2e7bb918f5d8..925d228af5e0 100644
--- a/sys-kernel/pf-sources/Manifest
+++ b/sys-kernel/pf-sources/Manifest
@@ -6,26 +6,20 @@ DIST genpatches-6.0-1.base.tar.xz 4076 BLAKE2B a6806af2473247e53034e0df58fc217a1
 DIST genpatches-6.0-1.extras.tar.xz 3804 BLAKE2B 973be072083e8f23fb0e39856864c5e061e071d651bff1ecd6dc9d429688a074d9ef78f255edf4479e95b5e60c78034ee969d12a2e65c4c6a5a382daa1aba419 SHA512 b00123c8f910367cf2c68cc8c6a70139644add4adb0aa96ae34bf7e93162a19020ef91f6bac631c257f885928640c4f847f8c32b940c192238304edcc83d0b5c
 DIST genpatches-6.1-1.base.tar.xz 4304 BLAKE2B f58a4e46ba85da5bee55c6fa14a57e7546813d167ac3d78fa8bfe4b386ce2240279b7c936094271cffbabd9f6eafd76a7bd609fb2136400cef2eaf443b452cd3 SHA512 310c97fb844db4ffd7272144d1d2d3d5fee1ecc31527ef3a6f0b67f0fbf1f3b7f9f9db9ae52f6e309cb7a8e0790019707db24db5db670d58179b7648c677c1d2
 DIST genpatches-6.1-1.extras.tar.xz 3804 BLAKE2B 62ee97ed9142b41f415129dfb12d10387561258c6798f055ef5c8767ca0f31b36d785045df4207f704ea37f6764a0fb6e6fb78859c0679ca5a75a5aa5fc458cd SHA512 21b8f5a44809a9866063fbac676df25db709105c702a5b90e5acb21f6a01f60d3a559d8398dba1ec2b0ade89b3a45b587933cb7ded0621d8e4aa13b4d4eb5daa
+DIST genpatches-6.1-8.base.tar.xz 477364 BLAKE2B 29fa8d45feed6333883e1f4733ace6ed52b5424aeeada3e71917a0e3d85f87a7b99f0863ff468e678ee5631c6e0f0dd7c3a0115a58d80512ac1a27d58a2df149 SHA512 d1f32215ced0ed39cc1c6d224b1a12ae3f80bcc19f1ea23189e853367ebc661c74d17d335bd615c2fc1f3c21271f6f170a35caa38194b2dfd09f78e405739ae0
+DIST genpatches-6.1-8.extras.tar.xz 3808 BLAKE2B af83b01895f1b3af4c0220a89b0dabc3642e578920475402c02dbe0300c520dbc621a2245eb66842addac48565c8b612198138c49491dca7909d594a9d2ef818 SHA512 22f9378bc7b4413d60672656c2e73bfbcc6debd10179a0eb2b523bceb5f3adeacecbd433ede3aa057143163a9cc2971d5023d73ac8187eaad59508dd229feba7
 DIST linux-5.18-pf5.tar.gz 206988172 BLAKE2B ae5abdee064b429019d7aaa4801d0bf852ed94dfef3965486cbc58d084e68ab9276651297857c1e64d5430e8b17728d1ebd7db597afd7ed7580d100e84431921 SHA512 dde7c08750858a719c70ff332df67b73432ace56571c73dfb7af7bf4ab4d5b5fbfb94486ac97b4b95e252f51a3be125fdb05a3abdc1b7443fb45ca4074810996
 DIST linux-5.19-pf6.tar.gz 212237665 BLAKE2B 7ecace44c0bff940009fdb1cd8924096cc4cc337688c7d73883a996bc191d40b9589efbca2e30ba413e1516b790ad48be4839f9d48bb8ad5c40d3f8549a63db1 SHA512 7f5e60c20ba577102818139b0eb61fff5d8b2f3ecdcd42e3ad116fdebdfa58da4f08dd151844cd6e1d764aad5f5a2254e4a1c5aad5b3628df9d03911a2cd8e3f
-DIST linux-6.0-pf1.tar.gz 218275822 BLAKE2B bb283adca2398ef3e09a9c02e5a6609f898c765cc322376e5621c736a2b38832e1e13bc53fc3b21b1dae8214bd039ce43be57e97e7b129624124e58cd1123f51 SHA512 e97c449693b5702e18560c86a65dac2022828d2d57a8734a3cd26b304f8c0d5aa5773041701c8bd5a63b31481191b501070ad9d811a08382e8c846517a7930e0
-DIST linux-6.0-pf2.tar.gz 218282377 BLAKE2B 753efa1e2e05255540301f9bbf9aa85eff8eb2c45c9092e9b9e09e288df626c93bab2621af6ee1758631ea7759890dc69a124201bde5151b429885a014cf782e SHA512 faa581fa6d3deda5ee67a82f49e19e7680f134fc198a50bd8a37bbe495c70663bea8e5887615e0d4315ef8086359c9da74fb3ecc222170a06f5b7702f6b2f8da
-DIST linux-6.0-pf3.tar.gz 218344594 BLAKE2B e71a0c0a9bd67f34610a59858c911b5a10c858baad18b18d459f973ce7499d194aebb5d3a8827e50eeab40bcd88e6e22a17903b534f6ef11e62febb0ead8a4b5 SHA512 9e075a088bc85eafaf24426f70ee46291b0e67b295598b20d6fa69e395cc13c41ecd36ef424ad08f3af814af3f3b3ac533e57dd8581ce016825bf6f87ee6aafe
-DIST linux-6.0-pf4.tar.gz 218368702 BLAKE2B d6585d02938abd1bc587dc5d6c3597bc8b961c0c7c05d2be906c46cc6d2872d5aafb9579ba8df485c1c270c0ee0f2c8e7d7ac68d431be02942aac40fe402df20 SHA512 29c63beee17c273b356be32dab73817c9c576c8bc3df65cc531dd38d2c0d640b239d5908f514d50eac4fee4bdc6e0e40c909cb6bd09acfa1d9f914bfddbc3423
-DIST linux-6.0-pf5.tar.gz 218385127 BLAKE2B 21dcb503b10decda6c02f6613f022d0f300be6366afcc205cd8b84f929f384822801d1eabe69a7b88b81218ade4d465e977fd2eb9a7d41d9c5665cbf43d8c08b SHA512 1711d15dbcd77d838a2b7c710debbb0c9ddcbee16922c35df85169dd61d028b6a2e62ca202488350dc4f4f512d6d2b2a3c70a6c269d114e2886c892be4caf327
 DIST linux-6.0-pf6.tar.gz 218406147 BLAKE2B b084ffd751a3be9043ab0c306623c2ede6597fa024d72e959778a6185c83410aae7e165bd008bbbd0eddc5066d65ad342afaa4f66669190995ea1ab5a3f0b0e8 SHA512 99b766969216a0692d475a15dd6ecf36c29852e6702585c8c47f4d18516301f98c8f1aed3515ba65872e5628118fc84ddcbc8bdc816e7f4e94ce139dbe6c5035
 DIST linux-6.1-pf1.tar.gz 220692376 BLAKE2B 4d5eb13df0d433057a7b7a6c347c44f42f3edbd8cf714258d274f8c65226e9ac09b80d583088678b25865dc73c2c29085949731b425e8529a5022c590d94220e SHA512 8b54d6b79e21fd89e64faac7502d846f9b1a1f6a1ad52f3bb3ead6074f7fe8e9fa531b8fa06a22372127a66da0c0234fb114a9f707e6512e3643328173ec1729
 DIST linux-6.1-pf2.tar.gz 220718450 BLAKE2B 54ce340573f6c0144db3a77355553a49607b83ef7fe5fda308d4eb4d04c5b5014ea9241f8e17e7c2bd89b7f10567a14814d027fe1826d78f4182127a1ebfa825 SHA512 db7d28834ea60e38873823c3a83e1f6a128d34f0a698a728052cde50cee7c5f40a8b41e0ec53e069887fe4b72ea3837a5adc4deee4036e8c6bda084cac0d806b
+DIST linux-6.1-pf3.tar.gz 220765042 BLAKE2B 0a52e6d6dbc8f18957ed3348f33edc8df0df7a30700cbc11792f0e668bc613f842ac0d92fcb45a9093aa9a893e3df0f05e16afce3f7734f8f41f7dd33083c72f SHA512 d1a0077d13600d7b684c59158e7994eeca6d9f8864eed40279b2fcfbb7cae627c1eab4d7e9a403d352409493b9fe82c037bd1f710578a13527505a41051bdf05
 DIST prjc-519-r1-vd-test.patch 274504 BLAKE2B 87950689ffe97134100aa91d0ff89acd6f4e93b626ad7ab08af464a49457f16526cae7b863d53213dd129d47b6f97b3407ae7027b02656d9eba85942241e8d3f SHA512 d652b6060400329d051257fedee5d9f37a70554ab722e93a15f294d1c6229bfa227941461147e0128178b02875cdf838e0d71e89884d8c01e7549ee482213b71
 DIST prjc_v5.18-r2.patch 270353 BLAKE2B 15d7ed7a0eb6f7ad37feaf52ab7c383e1c7c3e72fb41a767c8d1151a0ad41255c216ede1e4938a041f3b628874ed61398c61dd7b0e0b62090730f2fd0f6a70db SHA512 25c558bd6281a09bb611c6cca68084b27d0f2e290d2c0575e88b6a94322fad86de6dbeda30eb77919edd5adff921ad445593d9478f115ec93fa2e4c7ed6b5c1e
 EBUILD pf-sources-5.18_p5.ebuild 2781 BLAKE2B a377fa1820f637bcab95c220e00375dc8a0f009ad728088a37e1f46c5c4c3931c9a4b9fa86d05130440d12e29534468adb488b54f8b7c1975546594d16f7a28d SHA512 4e0acd60313555185dc11e1d6310c3c4d7bdea8acb4256e9ffd985a001c72949a3065fbfa7830bc66827d56961fa523300827613bf5653ac359420f08172a62e
 EBUILD pf-sources-5.19_p6.ebuild 2914 BLAKE2B 6a50cb772f1df3b86ac95eda89939fd9279d5bc24f1288596e129c562617c3c72263e8232bd01bb256276cee52436293cbb31a57ecbdacb90ce0680f735a323d SHA512 94c52843f36b4067fcca6da8d78c2e0603e09ccf16fcaa107dfee0155e4e92033ff69fea35223130a5d1010df867201a33c1f02c2cbbcf22b8314753cb692954
-EBUILD pf-sources-6.0_p1.ebuild 2525 BLAKE2B 75aa743f70c2eebbf98fec6b047c40da783064f773ded51d04f5d90e1130956e5201a7f5892b0bbc877839b28d77c91fce37519d2fb385da63373b8edd41c20f SHA512 4d41c9ef99a4e163ca57501fc70504b84583a3b218a28a7a3b18d9da94d10835f67be2b4d41b20063176d4493c738c60ddc652685f36c84fa7fda89fe12befb7
-EBUILD pf-sources-6.0_p2.ebuild 2525 BLAKE2B 75aa743f70c2eebbf98fec6b047c40da783064f773ded51d04f5d90e1130956e5201a7f5892b0bbc877839b28d77c91fce37519d2fb385da63373b8edd41c20f SHA512 4d41c9ef99a4e163ca57501fc70504b84583a3b218a28a7a3b18d9da94d10835f67be2b4d41b20063176d4493c738c60ddc652685f36c84fa7fda89fe12befb7
-EBUILD pf-sources-6.0_p3.ebuild 2525 BLAKE2B 75aa743f70c2eebbf98fec6b047c40da783064f773ded51d04f5d90e1130956e5201a7f5892b0bbc877839b28d77c91fce37519d2fb385da63373b8edd41c20f SHA512 4d41c9ef99a4e163ca57501fc70504b84583a3b218a28a7a3b18d9da94d10835f67be2b4d41b20063176d4493c738c60ddc652685f36c84fa7fda89fe12befb7
-EBUILD pf-sources-6.0_p4.ebuild 2525 BLAKE2B 75aa743f70c2eebbf98fec6b047c40da783064f773ded51d04f5d90e1130956e5201a7f5892b0bbc877839b28d77c91fce37519d2fb385da63373b8edd41c20f SHA512 4d41c9ef99a4e163ca57501fc70504b84583a3b218a28a7a3b18d9da94d10835f67be2b4d41b20063176d4493c738c60ddc652685f36c84fa7fda89fe12befb7
-EBUILD pf-sources-6.0_p5.ebuild 2525 BLAKE2B 75aa743f70c2eebbf98fec6b047c40da783064f773ded51d04f5d90e1130956e5201a7f5892b0bbc877839b28d77c91fce37519d2fb385da63373b8edd41c20f SHA512 4d41c9ef99a4e163ca57501fc70504b84583a3b218a28a7a3b18d9da94d10835f67be2b4d41b20063176d4493c738c60ddc652685f36c84fa7fda89fe12befb7
 EBUILD pf-sources-6.0_p6.ebuild 2525 BLAKE2B 75aa743f70c2eebbf98fec6b047c40da783064f773ded51d04f5d90e1130956e5201a7f5892b0bbc877839b28d77c91fce37519d2fb385da63373b8edd41c20f SHA512 4d41c9ef99a4e163ca57501fc70504b84583a3b218a28a7a3b18d9da94d10835f67be2b4d41b20063176d4493c738c60ddc652685f36c84fa7fda89fe12befb7
 EBUILD pf-sources-6.1_p1.ebuild 2525 BLAKE2B 75aa743f70c2eebbf98fec6b047c40da783064f773ded51d04f5d90e1130956e5201a7f5892b0bbc877839b28d77c91fce37519d2fb385da63373b8edd41c20f SHA512 4d41c9ef99a4e163ca57501fc70504b84583a3b218a28a7a3b18d9da94d10835f67be2b4d41b20063176d4493c738c60ddc652685f36c84fa7fda89fe12befb7
 EBUILD pf-sources-6.1_p2.ebuild 2525 BLAKE2B b65bde480d4c533212cdede619cb66b90f884fa3d8b800f4b41ce35074c572fabf7d909ed92a2fc43424e5da21b902fcbd526a34fc7281b2d3c993b5b65aad79 SHA512 ead6cb42e0415447414fe1856e536fe8512ef5d6b18afc6cd1fdbabd9650bf1ce32ba4fabcdb6a84254e97ded5f21692115842ba328f3b12152700eb9a5d10d4
+EBUILD pf-sources-6.1_p3.ebuild 2830 BLAKE2B 25f23abfcc0012e6d9221dc21098e85f1aa05405aed73f60fc8ff66c8dd0b51a630840ecc0fc5ee9be6a7c472d0b31a6c0bf0e022b05d09e2a3f48c2c018692a SHA512 6afd4091ea245270ea483fc71fa73936068c7c7eea8d384932918844626cd95934748b19ce9699def30167e4273afad263980daca8b347cbc6e48386526389c5
 MISC metadata.xml 346 BLAKE2B aac642a4971d6bc11e22a4885e5a4cfdaa36287a97883ed22368729e1db9bbe1baa382fc542d6f89582a0e4f43d2e78419d09716f6d215477454b72dc365e2ec SHA512 94e6a97663111931e68e8af0656691776c39b4e8cc4e96c4a257a9617413ea238400096b15729b1e3b91d60e030c6eae3789401c444692d3bf7daa7c80e78a72
diff --git a/sys-kernel/pf-sources/pf-sources-6.0_p2.ebuild b/sys-kernel/pf-sources/pf-sources-6.0_p2.ebuild
deleted file mode 100644
index 9ec71e1c1611..000000000000
--- a/sys-kernel/pf-sources/pf-sources-6.0_p2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Define what default functions to run
-ETYPE="sources"
-
-# No 'experimental' USE flag provided, but we still want to use genpatches
-K_EXP_GENPATCHES_NOUSE="1"
-
-# Just get basic genpatches, -pf patch set already includes vanilla-linux updates
-K_GENPATCHES_VER="1"
-
-# -pf already sets EXTRAVERSION to kernel Makefile
-K_NOSETEXTRAVERSION="1"
-
-# Not supported by the Gentoo security team
-K_SECURITY_UNSUPPORTED="1"
-
-# We want the very basic patches from gentoo-sources, experimental patch is
-# already included in pf-sources
-K_WANT_GENPATCHES="base extras"
-
-# major kernel version, e.g. 5.14
-SHPV="${PV/_p*/}"
-
-# Replace "_p" with "-pf"
-PFPV="${PV/_p/-pf}"
-
-inherit kernel-2 optfeature
-detect_version
-
-DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches"
-HOMEPAGE="https://pfkernel.natalenko.name/
-	https://dev.gentoo.org/~mpagano/genpatches/"
-SRC_URI="https://codeberg.org/pf-kernel/linux/archive/v${PFPV}.tar.gz -> linux-${PFPV}.tar.gz
-	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${SHPV}-${K_GENPATCHES_VER}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${SHPV}-${K_GENPATCHES_VER}.extras.tar.xz"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-S="${WORKDIR}/linux-${PFPV}"
-
-K_EXTRAEINFO="For more info on pf-sources and details on how to report problems,
-	see: ${HOMEPAGE}."
-
-pkg_setup() {
-	ewarn ""
-	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "If you need support, please contact the pf developers directly."
-	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
-	ewarn "the ebuilds. Thank you."
-	ewarn ""
-
-	kernel-2_pkg_setup
-}
-
-src_unpack() {
-	# Since the Codeberg-hosted pf-sources include full kernel sources, we need to manually override
-	# the src_unpack phase because kernel-2_src_unpack() does a lot of unwanted magic here.
-	unpack ${A}
-
-	mv linux linux-${PFPV} || die "Failed to move source directory"
-}
-
-src_prepare() {
-	# kernel-2_src_prepare doesn't apply PATCHES(). After pf-sources moved to Codeberg, we need
-	# to manually eapply the genpatches too.
-	eapply "${WORKDIR}"/*.patch
-	default
-}
-
-pkg_postinst() {
-	# Fixes "wrongly" detected directory name, bgo#862534.
-	local KV_FULL="${PFPV}"
-	kernel-2_pkg_postinst
-
-	optfeature "userspace KSM helper" sys-process/uksmd
-}
-
-pkg_postrm() {
-	# Same here, bgo#862534.
-	local KV_FULL="${PFPV}"
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/pf-sources/pf-sources-6.0_p3.ebuild b/sys-kernel/pf-sources/pf-sources-6.0_p3.ebuild
deleted file mode 100644
index 9ec71e1c1611..000000000000
--- a/sys-kernel/pf-sources/pf-sources-6.0_p3.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Define what default functions to run
-ETYPE="sources"
-
-# No 'experimental' USE flag provided, but we still want to use genpatches
-K_EXP_GENPATCHES_NOUSE="1"
-
-# Just get basic genpatches, -pf patch set already includes vanilla-linux updates
-K_GENPATCHES_VER="1"
-
-# -pf already sets EXTRAVERSION to kernel Makefile
-K_NOSETEXTRAVERSION="1"
-
-# Not supported by the Gentoo security team
-K_SECURITY_UNSUPPORTED="1"
-
-# We want the very basic patches from gentoo-sources, experimental patch is
-# already included in pf-sources
-K_WANT_GENPATCHES="base extras"
-
-# major kernel version, e.g. 5.14
-SHPV="${PV/_p*/}"
-
-# Replace "_p" with "-pf"
-PFPV="${PV/_p/-pf}"
-
-inherit kernel-2 optfeature
-detect_version
-
-DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches"
-HOMEPAGE="https://pfkernel.natalenko.name/
-	https://dev.gentoo.org/~mpagano/genpatches/"
-SRC_URI="https://codeberg.org/pf-kernel/linux/archive/v${PFPV}.tar.gz -> linux-${PFPV}.tar.gz
-	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${SHPV}-${K_GENPATCHES_VER}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${SHPV}-${K_GENPATCHES_VER}.extras.tar.xz"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-S="${WORKDIR}/linux-${PFPV}"
-
-K_EXTRAEINFO="For more info on pf-sources and details on how to report problems,
-	see: ${HOMEPAGE}."
-
-pkg_setup() {
-	ewarn ""
-	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "If you need support, please contact the pf developers directly."
-	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
-	ewarn "the ebuilds. Thank you."
-	ewarn ""
-
-	kernel-2_pkg_setup
-}
-
-src_unpack() {
-	# Since the Codeberg-hosted pf-sources include full kernel sources, we need to manually override
-	# the src_unpack phase because kernel-2_src_unpack() does a lot of unwanted magic here.
-	unpack ${A}
-
-	mv linux linux-${PFPV} || die "Failed to move source directory"
-}
-
-src_prepare() {
-	# kernel-2_src_prepare doesn't apply PATCHES(). After pf-sources moved to Codeberg, we need
-	# to manually eapply the genpatches too.
-	eapply "${WORKDIR}"/*.patch
-	default
-}
-
-pkg_postinst() {
-	# Fixes "wrongly" detected directory name, bgo#862534.
-	local KV_FULL="${PFPV}"
-	kernel-2_pkg_postinst
-
-	optfeature "userspace KSM helper" sys-process/uksmd
-}
-
-pkg_postrm() {
-	# Same here, bgo#862534.
-	local KV_FULL="${PFPV}"
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/pf-sources/pf-sources-6.0_p4.ebuild b/sys-kernel/pf-sources/pf-sources-6.0_p4.ebuild
deleted file mode 100644
index 9ec71e1c1611..000000000000
--- a/sys-kernel/pf-sources/pf-sources-6.0_p4.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Define what default functions to run
-ETYPE="sources"
-
-# No 'experimental' USE flag provided, but we still want to use genpatches
-K_EXP_GENPATCHES_NOUSE="1"
-
-# Just get basic genpatches, -pf patch set already includes vanilla-linux updates
-K_GENPATCHES_VER="1"
-
-# -pf already sets EXTRAVERSION to kernel Makefile
-K_NOSETEXTRAVERSION="1"
-
-# Not supported by the Gentoo security team
-K_SECURITY_UNSUPPORTED="1"
-
-# We want the very basic patches from gentoo-sources, experimental patch is
-# already included in pf-sources
-K_WANT_GENPATCHES="base extras"
-
-# major kernel version, e.g. 5.14
-SHPV="${PV/_p*/}"
-
-# Replace "_p" with "-pf"
-PFPV="${PV/_p/-pf}"
-
-inherit kernel-2 optfeature
-detect_version
-
-DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches"
-HOMEPAGE="https://pfkernel.natalenko.name/
-	https://dev.gentoo.org/~mpagano/genpatches/"
-SRC_URI="https://codeberg.org/pf-kernel/linux/archive/v${PFPV}.tar.gz -> linux-${PFPV}.tar.gz
-	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${SHPV}-${K_GENPATCHES_VER}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${SHPV}-${K_GENPATCHES_VER}.extras.tar.xz"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-S="${WORKDIR}/linux-${PFPV}"
-
-K_EXTRAEINFO="For more info on pf-sources and details on how to report problems,
-	see: ${HOMEPAGE}."
-
-pkg_setup() {
-	ewarn ""
-	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "If you need support, please contact the pf developers directly."
-	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
-	ewarn "the ebuilds. Thank you."
-	ewarn ""
-
-	kernel-2_pkg_setup
-}
-
-src_unpack() {
-	# Since the Codeberg-hosted pf-sources include full kernel sources, we need to manually override
-	# the src_unpack phase because kernel-2_src_unpack() does a lot of unwanted magic here.
-	unpack ${A}
-
-	mv linux linux-${PFPV} || die "Failed to move source directory"
-}
-
-src_prepare() {
-	# kernel-2_src_prepare doesn't apply PATCHES(). After pf-sources moved to Codeberg, we need
-	# to manually eapply the genpatches too.
-	eapply "${WORKDIR}"/*.patch
-	default
-}
-
-pkg_postinst() {
-	# Fixes "wrongly" detected directory name, bgo#862534.
-	local KV_FULL="${PFPV}"
-	kernel-2_pkg_postinst
-
-	optfeature "userspace KSM helper" sys-process/uksmd
-}
-
-pkg_postrm() {
-	# Same here, bgo#862534.
-	local KV_FULL="${PFPV}"
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/pf-sources/pf-sources-6.0_p5.ebuild b/sys-kernel/pf-sources/pf-sources-6.0_p5.ebuild
deleted file mode 100644
index 9ec71e1c1611..000000000000
--- a/sys-kernel/pf-sources/pf-sources-6.0_p5.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Define what default functions to run
-ETYPE="sources"
-
-# No 'experimental' USE flag provided, but we still want to use genpatches
-K_EXP_GENPATCHES_NOUSE="1"
-
-# Just get basic genpatches, -pf patch set already includes vanilla-linux updates
-K_GENPATCHES_VER="1"
-
-# -pf already sets EXTRAVERSION to kernel Makefile
-K_NOSETEXTRAVERSION="1"
-
-# Not supported by the Gentoo security team
-K_SECURITY_UNSUPPORTED="1"
-
-# We want the very basic patches from gentoo-sources, experimental patch is
-# already included in pf-sources
-K_WANT_GENPATCHES="base extras"
-
-# major kernel version, e.g. 5.14
-SHPV="${PV/_p*/}"
-
-# Replace "_p" with "-pf"
-PFPV="${PV/_p/-pf}"
-
-inherit kernel-2 optfeature
-detect_version
-
-DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches"
-HOMEPAGE="https://pfkernel.natalenko.name/
-	https://dev.gentoo.org/~mpagano/genpatches/"
-SRC_URI="https://codeberg.org/pf-kernel/linux/archive/v${PFPV}.tar.gz -> linux-${PFPV}.tar.gz
-	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${SHPV}-${K_GENPATCHES_VER}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${SHPV}-${K_GENPATCHES_VER}.extras.tar.xz"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-S="${WORKDIR}/linux-${PFPV}"
-
-K_EXTRAEINFO="For more info on pf-sources and details on how to report problems,
-	see: ${HOMEPAGE}."
-
-pkg_setup() {
-	ewarn ""
-	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "If you need support, please contact the pf developers directly."
-	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
-	ewarn "the ebuilds. Thank you."
-	ewarn ""
-
-	kernel-2_pkg_setup
-}
-
-src_unpack() {
-	# Since the Codeberg-hosted pf-sources include full kernel sources, we need to manually override
-	# the src_unpack phase because kernel-2_src_unpack() does a lot of unwanted magic here.
-	unpack ${A}
-
-	mv linux linux-${PFPV} || die "Failed to move source directory"
-}
-
-src_prepare() {
-	# kernel-2_src_prepare doesn't apply PATCHES(). After pf-sources moved to Codeberg, we need
-	# to manually eapply the genpatches too.
-	eapply "${WORKDIR}"/*.patch
-	default
-}
-
-pkg_postinst() {
-	# Fixes "wrongly" detected directory name, bgo#862534.
-	local KV_FULL="${PFPV}"
-	kernel-2_pkg_postinst
-
-	optfeature "userspace KSM helper" sys-process/uksmd
-}
-
-pkg_postrm() {
-	# Same here, bgo#862534.
-	local KV_FULL="${PFPV}"
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/pf-sources/pf-sources-6.0_p1.ebuild b/sys-kernel/pf-sources/pf-sources-6.1_p3.ebuild
index 9ec71e1c1611..c89c143c51da 100644
--- a/sys-kernel/pf-sources/pf-sources-6.0_p1.ebuild
+++ b/sys-kernel/pf-sources/pf-sources-6.1_p3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ ETYPE="sources"
 K_EXP_GENPATCHES_NOUSE="1"
 
 # Just get basic genpatches, -pf patch set already includes vanilla-linux updates
-K_GENPATCHES_VER="1"
+K_GENPATCHES_VER="8"
 
 # -pf already sets EXTRAVERSION to kernel Makefile
 K_NOSETEXTRAVERSION="1"
@@ -65,6 +65,11 @@ src_unpack() {
 }
 
 src_prepare() {
+	# When genpatches basic version is bumped, it also includes vanilla linux updates. Those are also included
+	# in the -pf patch set, so need to remove the vanilla linux patches.
+	find "${WORKDIR}"/ -type f -name '100*linux*patch' -delete ||
+		die "Failed to delete vanilla linux patches in src_prepare."
+
 	# kernel-2_src_prepare doesn't apply PATCHES(). After pf-sources moved to Codeberg, we need
 	# to manually eapply the genpatches too.
 	eapply "${WORKDIR}"/*.patch