gentoo auto-resync : 13:07:2022 - 19:37:38

7 files changed, 20 insertions, 412 deletions

diff --git a/sys-kernel/pf-sources/Manifest b/sys-kernel/pf-sources/Manifest
index b8fb9e5545ef..ef0b0041eb23 100644
--- a/sys-kernel/pf-sources/Manifest
+++ b/sys-kernel/pf-sources/Manifest
@@ -1,30 +1,6 @@
-DIST 5021_BMQ-and-PDS-gentoo-defaults-5.15.patch 348 BLAKE2B 50ac91380b7221aa30ead9e842f038117b0f4ef4b6538b8f083a9f4467db23ab2f74643e65197dd9201da9b6cde17b192ed09e7d544ad095391c2cde6d9f2b8f SHA512 166a73397b133e20b92c37b72ae1edfe4cce017293b978b523980e28526950dfedf1081252191ff95462896a16ee790dadf55cda2edc49452b960079d89a6a9b
-DIST genpatches-5.16-1.base.tar.xz 3920 BLAKE2B e5749033cbb870b0fb43733b388a7b34a92c91cd4414587d9a6fe9cdd0352f4edb775ce2ae44af339f1bc773998c6df51ebc04d7e66714b19bec1a76ed9c88fc SHA512 9ec28a2171d1e28bc33cb28ba4b7250a02c052cb0b45bafc57d400202862dbffdb183880e5843424dd55d4026af3ddf6fc8dce16c4d4c4595f6a9f22963527ca
-DIST genpatches-5.16-1.extras.tar.xz 3780 BLAKE2B 59d482903c1eab9800ca9e9dad75bf4cc54d5676e44693f23a48e138bba8dea157f1ca9eb23fb081f8287fc62cc74746ec73504456d544958ef8d1f992fe9a33 SHA512 1271830d5c99c17ad7b00b9305f0cc9b02aafd3c798b8d1cee8eafd755191b30530f75207108b50429410ed581a1327cea5b866b150725399fba63eab9972235
-DIST genpatches-5.17-4.base.tar.xz 383992 BLAKE2B 2b3768d3095ed205a2a94494896cd4de9b516be63480bf67433a99819a783f52cd29862f1d5f513ec21dc7875a742a479648508ce5e3003ac6eab8d513b6cbbf SHA512 212bbcb00838b9910bb2da6bbae1579f575d0c9c5d4fcde0b401a685fa2004b21b606747e6bfea9f9d6e85d1fc54c62d75c7445f84e09466d3a32e2e0fcc3d3d
-DIST genpatches-5.17-4.extras.tar.xz 3796 BLAKE2B 0a0582a245794ce8fd6a472ed59a54d0f1e033e5741b7e2f6b41aadf07f3e05433cc2b4daacb507866a3bdeccf5f3ae08b6bbef23258620f584dcb309ac394c7 SHA512 4ec2216dc22443a06efb9c55b18d6734ca4e922a0901ef271e1f44d540d7dfa9bfe7f1ca5840fe2bf30a6a0dad584130d24257dbd603a5507c388ac6c29b2980
 DIST genpatches-5.18-1.base.tar.xz 3800 BLAKE2B 52cf33aea903e8783b554127936ebde68b1c2655567a27a6dff8b94df675cde779f940735824766d2267c7d09df970522ed3721b3fe661dc12e64c4b105b4c99 SHA512 461037cb2fc9246f1e778123a9fd58682ed2749c95acd8d30dddc1a31a66cc4961bb5b133a05fd6fb19aea1a83bf0be8a76f9e6422fb4d696010d248609534a7
 DIST genpatches-5.18-1.extras.tar.xz 3924 BLAKE2B b4c7e29f0237ae9e4e3300c8be75c0def63969e5c4dec52d4d5259a6b3b6d27406883e45d2ad4d0fe576a1285121037fb88fcdeab58a5fabbb58d4847cbfbbfe SHA512 0182a96feca475471d1dde2e8326067e98f8f43a6e9122e29635a52ae4ca56eaf6ac349b189a0198704c9adee62cbdbd2def7e90d2dad564c72bec2f8ff32ec9
-DIST linux-5.16.tar.xz 123114100 BLAKE2B 07a90cc640ff89e1359c06cee8c38abd33e51f9b9a89833e31a1d2750526fda4a59e8884db3c1ea63df0a37f0d3de6b5a922b014b7313d8abce20d90ac08adcb SHA512 7a257dd576bc8493595ec7d6f3c9cb6e22c772a8b2dbe735d2485c4f5c56e26a08695546e7e0f1f1cd04a533f25e829361958d4da0b98bf0ba8094dd57a85aaf
-DIST linux-5.17.tar.xz 128399340 BLAKE2B 82dc4a45cc25c781ac67aa6ed1e4c369544154960f41c4634d47621f381159687a227054976d078524cda28884d395a15f7542fe44ca74ce98ca6ff54a81d6d0 SHA512 89f0a7ca69d20a539d4b612a7028a30a5e98b402e4b6b88516f14237e5da4b626d7929eab8b40fccc90766e8f3bae87e9858a19077ffad20d8204acf18794f5b
-DIST linux-5.18.tar.xz 129790264 BLAKE2B e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb SHA512 dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5
-DIST pf-sources-5.16_p5.patch 3607099 BLAKE2B 4b8659457862fb7c86215b19558b06dc66f8fd94362ac6030428e8a0c2a4bb99855ea55305bd086b39700c755ef6b245c91c2d0d3c7bc6d95a0226184740f82a SHA512 677843b205699feca6c932ad08b300756506b8d603bc2c636c0e1cda1cc344041aeec979c5846dc247361073e62034d00feaa62decc465a01ae827ccd3a03afa
-DIST pf-sources-5.16_p7.patch 4150817 BLAKE2B fd4217294d296852e56e693b37f7f758a2578a94a320c915f393aab764fc705195ae80cdc6445f59a65f773d94679baab4cee42dc7e1381ecae3a54acd3e7537 SHA512 4eb43313f6d402c4c6b32e4e1daf0e0433392c1fc000b510b17594a60894f2c77cc2acc1e0994a5158938609f87d175bf70f89f6f5442e3af29107bd5764b5ae
-DIST pf-sources-5.17_p5.patch 4028503 BLAKE2B c1694083cd03ee1312e12ff87d60d3b77252580581ec5595407da399862b598502e7a676cfda31cb1680821185da81ed296d67584a9e5a7a763c71de77091de8 SHA512 1c04798c3b53f7d835f1926538e82faaa07ad3b06b7f18b7652d81489f0ad74c416ad68951a71e7ba9e11c0899ec618434dc9c9ebbc7e1e961db9630d61c03b6
-DIST pf-sources-5.18-pf1-add_missing_includes.patch 1412 BLAKE2B 114dc25880c20a3e85b0a62ae7b97bfd5ca209e591122a9f45a6bc403ca6e514f0217927feeec2aa467a5df936a3dd5681a5f29db906aa1c8cd366cde86f8e46 SHA512 a6c10a698bde3be27f29d4301e0b633e677a46dd0af603119fd63ce282b4cfc2c49f6f74ffd1f52abcb8cbed8c449bb6ad6205395715b463631875a404300bd8
-DIST pf-sources-5.18_p1.patch 901718 BLAKE2B 6e38debba1d34c1ac96a36e3b822da8a953c81cfa6c33f5c0117cad51bc376e202d56270d3a7fb90e315d015c4ec2146aa1f10b486a91e47a78ee16a26946b70 SHA512 5dfc259108653a0b976bf68533dbdd11bfbf24b6c52a4bf757cb06789c91b1ac739b0da82b7b2da8fd1794083d04f97bbb9a0fbfb2bee9c5f025a7931fc10b40
-DIST pf-sources-5.18_p2.patch 2866009 BLAKE2B 2157ab316a0fc27909820b8ba3136ab0b3907230387e03aae05f9f125092aa8d1ffa67c2a8b3b5afba9356ef91bc14e9bc28511283edb551183c8bebc88f2738 SHA512 3d1bba278294e7954db56284b04e197316f57c6f43583215d966a03333cc2252f42c482206d9557761f5d5f114d69c06604f16723d6586c025d5176ff4bfee3e
-DIST pf-sources-5.18_p3.patch 3359909 BLAKE2B 7c7c5b1d1e657c3a5589903d18d1cfe677dc4798afd89067b7b8764c5636580aa6044943791ad5922896198d1cc78e5cc26ebbf10e60bb5277f61d7bfa04937f SHA512 fe6fc6eadc8a5aeffa21567f80fedb2406134bef00765a0e7605c50e90ae7a7e9d8c74eb52848c88b31dc6feefc9faa41df95d65caf184189ad681b5c0797df3
-DIST prjc-v5.16-4uo.patch 270113 BLAKE2B e88ec884ec8a539f9acc55844193d98c009d820bf18d8a6ca4dcb03d796897a15efc7006b35a736f31218895ffaf5cc83851a12f4db1b8e56b69ac8518347d02 SHA512 2f9eaef69d2125f6b23da3e597e2ed508266a93e3c3e1a0a04c1ba378448f8267a0985748b8de215c23fbbc62820a46da47671ff2e3ffd77f41bcca79cc11436
-DIST prjc-v5.16-5uo.patch 268223 BLAKE2B 3c0b89e36abaa95889d00abdbc8f3151fdd6fe0ed1e496730ed066ae22b68e5989c643441c69d733a920bf20149da6633e6a9e0b0062e997788919b10770eea0 SHA512 b95591e917d0b7b6b7fa7af62aac8f850aad7717e76f7ba17edfdb7ecbd53e31cf2c9409e1225f0aa6636564249c23a7f5c2bfc1e521cd1eec25a6e081b2122c
-DIST prjc_v5.17-r2.patch 269135 BLAKE2B 75c53846e39333523d53beefa4f1a2873d06595a701bd60ea6645f108dddfab7e5a543ff0e95a6b4bb43bd9eaa1e6e75c12a9926431b4e0fd22df7290c16b2b1 SHA512 05e826ebc234f93bd96c467ffe2e9f0b0876950fb5355f1c0a8470793b85834f5dc638e85b65b1c9558d086b0d620735837502478763882321f64aff66388065
-DIST prjc_v5.18-r0.patch 271872 BLAKE2B 587c8db594e5923cd61bbbcb1a8c738681c34b9e57c04fa5d4dd7418038db15b912a8104b39267576a114d5e69721a4e680f662c077efaa0a8f5992f3923c6d6 SHA512 7c27134da1ece56f92a3dd540bf4163c38f2fa47d2a01bf6d66358e337e1ad930b363bc25769b18e679d7845713605fde3f21c317c393a83de61bcf764a9a3fa
-DIST prjc_v5.18-r1.patch 270901 BLAKE2B 81000dd93c038389ab1bbe04e1e9706062244e70571da03388c2ab0d382bd817d86d8b12adfe607b49adf7bbab3624640a70ba6df2e97bd7f55f9d2def73e88f SHA512 1ae402b0fd4edec5d819e1a8cf0664b73de995f5b9975d2ffaf1f9d643713c539911cefbfb58c5952b27c6edc3ce3f572a3b83a1e491c3e35b15333f9222cd95
+DIST linux-5.18-pf3.tar.gz 206979899 BLAKE2B e66670f81f55353f5850272316141833d5dfb804defd03bce2d1a84e404a2631cc5918714cb7dac75b4a9344d1cc597377bcdff94a034e5a544109e0ac2d12ae SHA512 85d9be125bc378ac5aada2f557e6636987c93a108bc7768ae3f314b03bdb4b2bfea66e4226ab04c6323464b3a299381356be49e85a458294fe3d39cd04ebed13
 DIST prjc_v5.18-r2.patch 270353 BLAKE2B 15d7ed7a0eb6f7ad37feaf52ab7c383e1c7c3e72fb41a767c8d1151a0ad41255c216ede1e4938a041f3b628874ed61398c61dd7b0e0b62090730f2fd0f6a70db SHA512 25c558bd6281a09bb611c6cca68084b27d0f2e290d2c0575e88b6a94322fad86de6dbeda30eb77919edd5adff921ad445593d9478f115ec93fa2e4c7ed6b5c1e
-EBUILD pf-sources-5.16_p5.ebuild 2441 BLAKE2B d6ea446131c080743575d6c3d5283b6b4660b136d26ccbc217f03e927d0aab96f14926f5e8573cd41fdab84edddebfbac910d2fa0778eb4e7f6704a6e9f1760d SHA512 2d11d387f753ceb52cdf90c6713c3e787fac708bbbb8ebe4258489f78ef0b67ed9d056caae9097d5cc42a88b3516ab50c4550a9bee85bef7c62156fa50fd7632
-EBUILD pf-sources-5.16_p7.ebuild 2441 BLAKE2B fa39f4529b501c0ffc0af0268a8bf560f4bb8e9fd81979c553a2db2dc4df438154ad6b76d261e865a0dc9cdb5ea09ddc8d9a4a535a811d8758ae5d0575318ff9 SHA512 8b3e46cc15019ee1629af0a078e33eb7ba1081706505ee21cc667248db774f72342de69d644d22a91a5fcd039863cb7451d3477447158074b8b5c2bb8c32285b
-EBUILD pf-sources-5.17_p5.ebuild 2361 BLAKE2B a2db2cc237fce760625fa41c0a9d52fe8aa7d42842c76842aa764b68d634afe417057cec3a5025205f6e6283d877e13fce78ce9052a48bc48f8f5e607e078c52 SHA512 3a0f7f8854d442431bdf159e75f9cbbcabde9c3d910e14401c096143feeaa60e9ec32f29acb5f0ed44afc91a7ca311a8db6215873800b4e1de0727bffa42a6e9
-EBUILD pf-sources-5.18_p1.ebuild 2450 BLAKE2B ec0b7cbf9e03cfbbbe75096b6c62451439550b25f1298fd2fcf569376895e37dbddc99befe53e0df8e4b50a52c8752c2611a9ef2b2fccce53de56594c7f4021a SHA512 257a3e250ebd8b8eb127e1421227994e23d425867077e6a14c4772b9b5b0935b865c854437cb448119d90afa39f5c0697dfdb48632de7fb920ca55d6af2bffe6
-EBUILD pf-sources-5.18_p2.ebuild 2241 BLAKE2B d91f6cdeaad32eb8609b6fd4f7dd14202295e5213a08d05e6c20a1850c51f2a8fa0b76a5a18292f562fef038836aba3a2882028011365333c389a26243d5e876 SHA512 cfb34e8c546e081b2ae96c58d2f11bdfe16f2f07dc85a3941da7e305e9c270f4ebc9af9313d3da6e3ca3c4b7a3753cd625eec59b59fe08aa685d41a1cd793c98
-EBUILD pf-sources-5.18_p3.ebuild 2241 BLAKE2B ce6baede15da02109ba7e7bab040ee80cd386ad59ae9c5c3673396875c0da756501f045a4329869983393487756ee33aba521ebe51722a3e533275b97d1d4442 SHA512 d30676f2c3614246e256d6aec1548a4cd74b94d5d054cfd4bbc7c59ccf708fe44df49da9b119f83884c5aae6049c42aea26e1e41a71b3353e7ed6dad16e0902e
+EBUILD pf-sources-5.18_p3.ebuild 2634 BLAKE2B c7e98fd9815286925fa205f7697c7ed7f44d82bdfaeef1e3f3b19b7c6a8ab72d9bef92f52372c7b273118b2cc16c25ea92d0f772ddf09f3b1c56e3db92f4c07b SHA512 e0913a5eda7778b68636fbbaa4842c62199c1aaecde27eb4f0e6843b7a447afd5394179ab9c695ef0d10f37c1b454904f8fbe03438b8119c20839f4521e2a3b7
 MISC metadata.xml 346 BLAKE2B aac642a4971d6bc11e22a4885e5a4cfdaa36287a97883ed22368729e1db9bbe1baa382fc542d6f89582a0e4f43d2e78419d09716f6d215477454b72dc365e2ec SHA512 94e6a97663111931e68e8af0656691776c39b4e8cc4e96c4a257a9617413ea238400096b15729b1e3b91d60e030c6eae3789401c444692d3bf7daa7c80e78a72
diff --git a/sys-kernel/pf-sources/pf-sources-5.16_p5.ebuild b/sys-kernel/pf-sources/pf-sources-5.16_p5.ebuild
deleted file mode 100644
index 17e4cb3993fe..000000000000
--- a/sys-kernel/pf-sources/pf-sources-5.16_p5.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# 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*/}"
-
-# https://gitlab.com/alfredchen/projectc/ revision for a major version,
-# e.g. prjc-v5.14-r2 = 2
-PRJC_R=4
-
-inherit kernel-2 optfeature
-detect_version
-
-DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches"
-HOMEPAGE="https://gitlab.com/post-factum/pf-kernel/-/wikis/README
-	https://dev.gentoo.org/~mpagano/genpatches/"
-SRC_URI="${KERNEL_URI}
-	https://github.com/pfactum/pf-kernel/compare/v${SHPV}...v${SHPV}-pf${PV/*_p/}.diff -> ${P}.patch
-	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
-	https://dev.gentoo.org/~juippis/patches/pf-sources/${SHPV}/prjc-v${SHPV}-${PRJC_R}uo.patch
-	https://dev.gentoo.org/~mpagano/genpatches/trunk/5.15/5021_BMQ-and-PDS-gentoo-defaults.patch -> 5021_BMQ-and-PDS-gentoo-defaults-5.15.patch"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-S="${WORKDIR}/linux-${PVR}-pf"
-
-PATCHES=( "${DISTDIR}/${P}.patch"
-	"${DISTDIR}/prjc-v${SHPV}-${PRJC_R}uo.patch"
-	"${DISTDIR}/5021_BMQ-and-PDS-gentoo-defaults-5.15.patch" )
-
-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_prepare() {
-	# kernel-2_src_prepare doesn't apply PATCHES().
-	default
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	optfeature "userspace KSM helper" sys-process/uksmd
-}
diff --git a/sys-kernel/pf-sources/pf-sources-5.16_p7.ebuild b/sys-kernel/pf-sources/pf-sources-5.16_p7.ebuild
deleted file mode 100644
index 1db6666cdd0e..000000000000
--- a/sys-kernel/pf-sources/pf-sources-5.16_p7.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# 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*/}"
-
-# https://gitlab.com/alfredchen/projectc/ revision for a major version,
-# e.g. prjc-v5.14-r2 = 2
-PRJC_R=5
-
-inherit kernel-2 optfeature
-detect_version
-
-DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches"
-HOMEPAGE="https://gitlab.com/post-factum/pf-kernel/-/wikis/README
-	https://dev.gentoo.org/~mpagano/genpatches/"
-SRC_URI="${KERNEL_URI}
-	https://github.com/pfactum/pf-kernel/compare/v${SHPV}...v${SHPV}-pf${PV/*_p/}.diff -> ${P}.patch
-	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
-	https://dev.gentoo.org/~juippis/patches/pf-sources/${SHPV}/prjc-v${SHPV}-${PRJC_R}uo.patch
-	https://dev.gentoo.org/~mpagano/genpatches/trunk/5.15/5021_BMQ-and-PDS-gentoo-defaults.patch -> 5021_BMQ-and-PDS-gentoo-defaults-5.15.patch"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-S="${WORKDIR}/linux-${PVR}-pf"
-
-PATCHES=( "${DISTDIR}/${P}.patch"
-	"${DISTDIR}/prjc-v${SHPV}-${PRJC_R}uo.patch"
-	"${DISTDIR}/5021_BMQ-and-PDS-gentoo-defaults-5.15.patch" )
-
-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_prepare() {
-	# kernel-2_src_prepare doesn't apply PATCHES().
-	default
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	optfeature "userspace KSM helper" sys-process/uksmd
-}
diff --git a/sys-kernel/pf-sources/pf-sources-5.17_p5.ebuild b/sys-kernel/pf-sources/pf-sources-5.17_p5.ebuild
deleted file mode 100644
index a6549e4455e1..000000000000
--- a/sys-kernel/pf-sources/pf-sources-5.17_p5.ebuild
+++ /dev/null
@@ -1,77 +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="4"
-
-# -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*/}"
-
-# https://gitlab.com/alfredchen/projectc/ revision for a major version,
-# e.g. prjc-v5.14-r2 = 2
-PRJC_R=2
-
-# These is already patched via -pf patch set.
-UNIPATCH_EXCLUDE="1000_linux-${SHPV}.1.patch 1001_linux-${SHPV}.2.patch"
-
-inherit kernel-2 optfeature
-detect_version
-
-DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches"
-HOMEPAGE="https://gitlab.com/post-factum/pf-kernel/-/wikis/README
-	https://dev.gentoo.org/~mpagano/genpatches/"
-SRC_URI="${KERNEL_URI}
-	https://github.com/pfactum/pf-kernel/compare/v${SHPV}...v${SHPV}-pf${PV/*_p/}.diff -> ${P}.patch
-	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
-	https://gitlab.com/alfredchen/projectc/-/raw/master/${SHPV}/prjc_v${SHPV}-r${PRJC_R}.patch"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-S="${WORKDIR}/linux-${PVR}-pf"
-
-PATCHES=( "${DISTDIR}/${P}.patch"
-	"${DISTDIR}/prjc_v${SHPV}-r${PRJC_R}.patch" )
-
-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_prepare() {
-	# kernel-2_src_prepare doesn't apply PATCHES().
-	default
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	optfeature "userspace KSM helper" sys-process/uksmd
-}
diff --git a/sys-kernel/pf-sources/pf-sources-5.18_p1.ebuild b/sys-kernel/pf-sources/pf-sources-5.18_p1.ebuild
deleted file mode 100644
index 65b7a7549c2d..000000000000
--- a/sys-kernel/pf-sources/pf-sources-5.18_p1.ebuild
+++ /dev/null
@@ -1,76 +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*/}"
-
-# https://gitlab.com/alfredchen/projectc/ revision for a major version,
-# e.g. prjc-v5.14-r2 = 2
-PRJC_R=0
-
-inherit kernel-2 optfeature
-detect_version
-
-DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches"
-HOMEPAGE="https://gitlab.com/post-factum/pf-kernel/-/wikis/README
-	https://dev.gentoo.org/~mpagano/genpatches/"
-SRC_URI="${KERNEL_URI}
-	https://github.com/pfactum/pf-kernel/compare/v${SHPV}...v${SHPV}-pf${PV/*_p/}.diff -> ${P}.patch
-	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
-	https://gitlab.com/alfredchen/projectc/-/raw/master/${SHPV}/prjc_v${SHPV}-r${PRJC_R}.patch
-	https://gitlab.com/torvic9/linux-stable/-/commit/7d83680518b4c6a5dcd92f25f0e455ae5ed17a7e.patch -> pf-sources-5.18-pf1-add_missing_includes.patch"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-S="${WORKDIR}/linux-${PVR}-pf"
-
-PATCHES=( "${DISTDIR}/${P}.patch"
-	"${DISTDIR}/prjc_v${SHPV}-r${PRJC_R}.patch" 
-	"${DISTDIR}/pf-sources-5.18-pf1-add_missing_includes.patch" )
-
-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_prepare() {
-	# kernel-2_src_prepare doesn't apply PATCHES().
-	default
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	optfeature "userspace KSM helper" sys-process/uksmd
-}
diff --git a/sys-kernel/pf-sources/pf-sources-5.18_p2.ebuild b/sys-kernel/pf-sources/pf-sources-5.18_p2.ebuild
deleted file mode 100644
index 57784c65731a..000000000000
--- a/sys-kernel/pf-sources/pf-sources-5.18_p2.ebuild
+++ /dev/null
@@ -1,74 +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*/}"
-
-# https://gitlab.com/alfredchen/projectc/ revision for a major version,
-# e.g. prjc-v5.14-r2 = 2
-PRJC_R=1
-
-inherit kernel-2 optfeature
-detect_version
-
-DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches"
-HOMEPAGE="https://gitlab.com/post-factum/pf-kernel/-/wikis/README
-	https://dev.gentoo.org/~mpagano/genpatches/"
-SRC_URI="${KERNEL_URI}
-	https://github.com/pfactum/pf-kernel/compare/v${SHPV}...v${SHPV}-pf${PV/*_p/}.diff -> ${P}.patch
-	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
-	https://gitlab.com/alfredchen/projectc/-/raw/master/${SHPV}/prjc_v${SHPV}-r${PRJC_R}.patch"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-S="${WORKDIR}/linux-${PVR}-pf"
-
-PATCHES=( "${DISTDIR}/${P}.patch"
-	"${DISTDIR}/prjc_v${SHPV}-r${PRJC_R}.patch" )
-
-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_prepare() {
-	# kernel-2_src_prepare doesn't apply PATCHES().
-	default
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	optfeature "userspace KSM helper" sys-process/uksmd
-}
diff --git a/sys-kernel/pf-sources/pf-sources-5.18_p3.ebuild b/sys-kernel/pf-sources/pf-sources-5.18_p3.ebuild
index cd9fc6cae356..b8ebece4d989 100644
--- a/sys-kernel/pf-sources/pf-sources-5.18_p3.ebuild
+++ b/sys-kernel/pf-sources/pf-sources-5.18_p3.ebuild
@@ -25,6 +25,9 @@ K_WANT_GENPATCHES="base extras"
 # major kernel version, e.g. 5.14
 SHPV="${PV/_p*/}"
 
+# Replace "_p" with "-pf"
+PFPV="${PV/_p/-pf}"
+
 # https://gitlab.com/alfredchen/projectc/ revision for a major version,
 # e.g. prjc-v5.14-r2 = 2
 PRJC_R=2
@@ -33,20 +36,18 @@ inherit kernel-2 optfeature
 detect_version
 
 DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches"
-HOMEPAGE="https://gitlab.com/post-factum/pf-kernel/-/wikis/README
+HOMEPAGE="https://codeberg.org/pf-kernel/linux/wiki/README
 	https://dev.gentoo.org/~mpagano/genpatches/"
-SRC_URI="${KERNEL_URI}
-	https://github.com/pfactum/pf-kernel/compare/v${SHPV}...v${SHPV}-pf${PV/*_p/}.diff -> ${P}.patch
+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
 	https://gitlab.com/alfredchen/projectc/-/raw/master/${SHPV}/prjc_v${SHPV}-r${PRJC_R}.patch"
 
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
-S="${WORKDIR}/linux-${PVR}-pf"
+S="${WORKDIR}/linux-${PFPV}"
 
-PATCHES=( "${DISTDIR}/${P}.patch"
-	"${DISTDIR}/prjc_v${SHPV}-r${PRJC_R}.patch" )
+PATCHES=( "${DISTDIR}/prjc_v${SHPV}-r${PRJC_R}.patch" )
 
 K_EXTRAEINFO="For more info on pf-sources and details on how to report problems,
 	see: ${HOMEPAGE}."
@@ -62,8 +63,18 @@ pkg_setup() {
 	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 pf-kernel linux-${PFPV} || die "Failed to move source directory"
+}
+
 src_prepare() {
-	# kernel-2_src_prepare doesn't apply PATCHES().
+	# kernel-2_src_prepare doesn't apply PATCHES(). And with pf-sources's move to Codeberg, we need
+	# to manually eapply the genpatches too.
+	eapply "${WORKDIR}"/*.patch
 	default
 }