[gentoo-commits] repo/gentoo:master commit in: sys-kernel/pf-sources/

["Joonas Niilola" <juippis@gentoo.org>]

commit:     1d88396d3125cfa6577dec9d9b915c04c4a9a25b
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 13 14:55:57 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Jul 13 15:13:53 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d88396d

sys-kernel/pf-sources: update HOMEPAGE, SRC_URI

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 sys-kernel/pf-sources/Manifest                  |  2 +-
 sys-kernel/pf-sources/pf-sources-5.18_p3.ebuild | 25 ++++++++++++++++++-------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/sys-kernel/pf-sources/Manifest b/sys-kernel/pf-sources/Manifest
index 291e08de966e..83c4bfba3922 100644
--- a/sys-kernel/pf-sources/Manifest
+++ b/sys-kernel/pf-sources/Manifest
@@ -7,6 +7,7 @@ DIST genpatches-5.18-1.base.tar.xz 3800 BLAKE2B 52cf33aea903e8783b554127936ebde6
 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-pf3.tar.gz 206979899 BLAKE2B e66670f81f55353f5850272316141833d5dfb804defd03bce2d1a84e404a2631cc5918714cb7dac75b4a9344d1cc597377bcdff94a034e5a544109e0ac2d12ae SHA512 85d9be125bc378ac5aada2f557e6636987c93a108bc7768ae3f314b03bdb4b2bfea66e4226ab04c6323464b3a299381356be49e85a458294fe3d39cd04ebed13
 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
@@ -14,7 +15,6 @@ DIST pf-sources-5.17_p5.patch 4028503 BLAKE2B c1694083cd03ee1312e12ff87d60d3b772
 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

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
 }