gentoo auto-resync : 07:08:2022 - 14:12:00

3 files changed, 14 insertions, 90 deletions

diff --git a/sys-kernel/pf-sources/Manifest b/sys-kernel/pf-sources/Manifest
index ee8454484aed..70c2d55e0b98 100644
--- a/sys-kernel/pf-sources/Manifest
+++ b/sys-kernel/pf-sources/Manifest
@@ -1,10 +1,11 @@
 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.18-pf3.tar.gz 206979899 BLAKE2B e66670f81f55353f5850272316141833d5dfb804defd03bce2d1a84e404a2631cc5918714cb7dac75b4a9344d1cc597377bcdff94a034e5a544109e0ac2d12ae SHA512 85d9be125bc378ac5aada2f557e6636987c93a108bc7768ae3f314b03bdb4b2bfea66e4226ab04c6323464b3a299381356be49e85a458294fe3d39cd04ebed13
-DIST linux-5.18-pf4.tar.gz 206956302 BLAKE2B 7eb7240792e2ab676facf7c3bae0811ec0db54c0d95d6ccd1ab60c50956e3fdb6cb4d5db3d77e5b08e7b18b78ffeebb5ac98d26ea4be0a7d04a49bc93421421d SHA512 b3b62618f0acb64f66369071eea503a0e894b3bb0c52941c738cc4ac7826a8327ddc32a27db02d493f3e022eacc18b1c7ed6d624b4a798e0773f17ee51f923fb
+DIST genpatches-5.19-1.base.tar.xz 4080 BLAKE2B 27fe512fd700cc6fc1946ebe0b39b423f35fbdce3b6c2181e1e1c197dccf436c6ba285b8bbf74500c80c64c486831a88f0f548cbd787d925eefafe740764a839 SHA512 8ff90b26202ddb80890ce8a33debbb8b6b85432412e7f76fdbdd98e257e9be23ffa5c03c81cb8482b7a35099083dec800f766354b5886d4f8f7647e3354f97b6
+DIST genpatches-5.19-1.extras.tar.xz 3772 BLAKE2B 1d418c3d5d328e9704ba10d7483cd562e511f345a5cc6799abc52e6cdeca20efa61417f62eaf7aae2078a8bb05c7dbabe4f4ddba7ad4221b458bd5c589f29b47 SHA512 479d957a3348485baf6504a08cf06b334938656701b15067512c0f48e530c2e87ca281ad3af6e55c75a53d2e9e584d94fc030ee82c538a97a85cea9a9c8fe214
 DIST linux-5.18-pf5.tar.gz 206988172 BLAKE2B ae5abdee064b429019d7aaa4801d0bf852ed94dfef3965486cbc58d084e68ab9276651297857c1e64d5430e8b17728d1ebd7db597afd7ed7580d100e84431921 SHA512 dde7c08750858a719c70ff332df67b73432ace56571c73dfb7af7bf4ab4d5b5fbfb94486ac97b4b95e252f51a3be125fdb05a3abdc1b7443fb45ca4074810996
+DIST linux-5.19-pf1.tar.gz 212145719 BLAKE2B 20264648efeac1589dfc76fc065860d9c7134661dd5ff1bb76996864ec7fee1f3cf6198d76da0d7cb5c1b9ca5fb1cccd2c63bb33e4d5fc9ba012c2cea8a38357 SHA512 eeef1d04add939a7826e7a25f5286606070e508c8ca4817a7e7616f947bdb1684819954d068e45964aa297df105a26dd996ee4662a182b3726010607df98edf7
 DIST prjc_v5.18-r2.patch 270353 BLAKE2B 15d7ed7a0eb6f7ad37feaf52ab7c383e1c7c3e72fb41a767c8d1151a0ad41255c216ede1e4938a041f3b628874ed61398c61dd7b0e0b62090730f2fd0f6a70db SHA512 25c558bd6281a09bb611c6cca68084b27d0f2e290d2c0575e88b6a94322fad86de6dbeda30eb77919edd5adff921ad445593d9478f115ec93fa2e4c7ed6b5c1e
-EBUILD pf-sources-5.18_p3.ebuild 2630 BLAKE2B 2f5f6ecdc7145daa9bfc3a5215b36426c510255de78aee70b33dbc88509fa227dea386c3749a326c2564d1479c925ec2e6e595c6977dc9e114361523fe02144b SHA512 028345b5777fa5f2d3cb377a643e87abf2f5d72c4428643b014aa274a7594272eb5332a3ca2189d3355cbb59ca884e4bf283ce0477a61f366e4aa18517f9517d
-EBUILD pf-sources-5.18_p4.ebuild 2626 BLAKE2B 2b2320bb1a0caafc9d8a874174c83ebb1418604cf7df3757b677ad2f0ce1eadcd03fec031679b825b49d06e314a8d5a250c82e4703f7a635077a0bb44e5219f2 SHA512 19c892d20a45733a51bc0684d85d55a3f884b708be02e47b9931634bd6f90d58de3e05e4036beca7718719dd24ab987afd5c00bfd1b6dacc5becaf3427a66226
+DIST prjc_v5.19-r0.patch 271689 BLAKE2B 6bc109b462670602eba8ccba55cbcf9902402c627e40c62a3a574828847a518d84d35d30e786b2f1edd4365a3eaa3a2b358f20c013bb2789b30804c37fe12d45 SHA512 27011aa6586ca8c7ec953593f68289b437a7ddab841eb5e45dfca1fdfed5ddb59cf0e197703d4c62c2cd792fca9f2c97f341ffc5ee48a9ca3aff26f9505280ba
 EBUILD pf-sources-5.18_p5.ebuild 2797 BLAKE2B c0b8bfafb97b85d6e74fd0eecddd7bc915dd1935001288c9123fe08890e0f82e3c91aff441c2fec3a42e374548b5fc31e616ca72fb3b226eaea0773cac6ea421 SHA512 e88beb6362b6526327c28d8a19e04a10149fead1e12edc2a134aa749bd19dbc89e3e14338c64afc57eeea117b310ad5ffa1e2b26b44fdc32eb60715bf2d1ce8c
+EBUILD pf-sources-5.19_p1.ebuild 2797 BLAKE2B 2d3f13c1225bd222ddeda09b34e19e642db5eddc6ce330f6c371f0b2c9de6edf32e661cd82f86c10bf56003724d7d5e4c13d733bd8d573e49c8b04043cd3ed72 SHA512 5de55fe144ae59111ea58b9f0bd2afa3f7ae370512fb35d6769d524905a1a4274f4b031cc4e36c42eaa383ccc1bcbf29eacc85850841a2734312b0995ba1c9e3
 MISC metadata.xml 346 BLAKE2B aac642a4971d6bc11e22a4885e5a4cfdaa36287a97883ed22368729e1db9bbe1baa382fc542d6f89582a0e4f43d2e78419d09716f6d215477454b72dc365e2ec SHA512 94e6a97663111931e68e8af0656691776c39b4e8cc4e96c4a257a9617413ea238400096b15729b1e3b91d60e030c6eae3789401c444692d3bf7daa7c80e78a72
diff --git a/sys-kernel/pf-sources/pf-sources-5.18_p3.ebuild b/sys-kernel/pf-sources/pf-sources-5.18_p3.ebuild
deleted file mode 100644
index 6b411574afb8..000000000000
--- a/sys-kernel/pf-sources/pf-sources-5.18_p3.ebuild
+++ /dev/null
@@ -1,85 +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}"
-
-# https://gitlab.com/alfredchen/projectc/ revision for a major version,
-# e.g. prjc-v5.14-r2 = 2
-PRJC_R=2
-
-inherit kernel-2 optfeature
-detect_version
-
-DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches"
-HOMEPAGE="https://codeberg.org/pf-kernel/linux/wiki/README
-	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
-	https://gitlab.com/alfredchen/projectc/-/raw/master/${SHPV}/prjc_v${SHPV}-r${PRJC_R}.patch"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-S="${WORKDIR}/linux-${PFPV}"
-
-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}."
-
-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 pf-kernel 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() {
-	kernel-2_pkg_postinst
-
-	optfeature "userspace KSM helper" sys-process/uksmd
-}
diff --git a/sys-kernel/pf-sources/pf-sources-5.18_p4.ebuild b/sys-kernel/pf-sources/pf-sources-5.19_p1.ebuild
index 0227431b90ac..edc3b63a6ddd 100644
--- a/sys-kernel/pf-sources/pf-sources-5.18_p4.ebuild
+++ b/sys-kernel/pf-sources/pf-sources-5.19_p1.ebuild
@@ -30,7 +30,7 @@ PFPV="${PV/_p/-pf}"
 
 # https://gitlab.com/alfredchen/projectc/ revision for a major version,
 # e.g. prjc-v5.14-r2 = 2
-PRJC_R=2
+PRJC_R=0
 
 inherit kernel-2 optfeature
 detect_version
@@ -79,7 +79,15 @@ src_prepare() {
 }
 
 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
+}