gentoo resync : 16.09.2021

3 files changed, 76 insertions, 2 deletions

diff --git a/sys-kernel/pf-sources/Manifest b/sys-kernel/pf-sources/Manifest
index 1b2ed10a568c..462ca6fe990e 100644
--- a/sys-kernel/pf-sources/Manifest
+++ b/sys-kernel/pf-sources/Manifest
@@ -24,10 +24,12 @@ DIST pf-sources-5.13_p4.patch 5640578 BLAKE2B fb3cbecbe1d6498e5fc6bab28ff7b75887
 DIST pf-sources-5.13_p5.patch 6877998 BLAKE2B 6f4cfe4c2c98d56309ce57b4cb0eaab1c59ecf6919e3c91cccd5d31421ca440d6333f7966ea53462d1a72e3769ef6ff8e5165376111b84f4484286fa46d69a6b SHA512 dd694c06721f3efffcbd1beca934bbea50012309165ce3c4f325ca5d168995409bf5f3ede670800059cc1941b216d7d50c28eb37250da4edfe6b2e17af834645
 DIST pf-sources-5.13_p6.patch 7070425 BLAKE2B bccbb3ea9777675b28f4ee5ddc1539188c8afe4facc6c4aa06beb11112e30846507414b0994c6b2e048180cb2eaedb612f772aebe16d70dea1f35f25cb30d81c SHA512 02928875462e3ae19df7a6d094f388be30a6b215e5fc2f5967fb570352351525f71c8b4fe60f6cc3179dbc5e7b2771979db90d9cfc89fb9e6c5501bc2c95bd41
 DIST pf-sources-5.14_p1.patch 3968070 BLAKE2B 8abeb3e0db3644e2b34cb3bf3b19d8eaab1bb1852964f26c6e5baedd24ad82760d352acee557e4b0af4fdfbc7ec05a497d966f98e3255d9f521a42958a12cd6d SHA512 c15ff5a30727983bfd8d1fc43be5efc31590e48b183cf0fa5bd46ea9c0ed4701cd1456d3b409b94bd1ee014e24be41667d85882074ffe4f3ffa07a16621c1796
+DIST pf-sources-5.14_p2.patch 4040142 BLAKE2B 6b41a69d8c9475ab5aab18de5cfc0e032197b8616e9aae40f0a7519ad58d1502502539139746e21c83295f3106350a403b6d677541f42b43d12ce60d4af619b4 SHA512 d22eeb8de3e31627d82edb1b95b42cf29d26b1f46898fbcb394ea22f7293824e8e0394253ac07d406ae1b51786707cb6845e8f466a01f2f347a79564c6450914
 DIST prjc_v5.13-r1.patch 258898 BLAKE2B 013be3c3e9b342268359ecbcc10c7b95c7fe3741d2b9058db87da59d40aa9b34db898d31f1f1a0dab80598cab313499d8083ccea141c5200b5593c9d44647de7 SHA512 ad9276a80e28eec461a307ad44a1ed5acebf810b14ce8c9e6f1dc211be6ed7e72f535175fb65f3115fa217f8b635122c65c2c002ff00ba458c867d8bb6257f36
 DIST prjc_v5.13-r2.patch 257231 BLAKE2B 943d3035035cdd1744ce0e075441224ffce04a1324dc9adfb355003b1fa6bcced1f63989845d1677ada0eac78f39b01d95d3fc7676c79b68858e8748c91b70d7 SHA512 1d9c80813e8f842b8b5da8b52e4348f329ef415b8cbef0a46f17eee64bf22fa8b1e443ae84ec9e7cf7ccff339d4b4bb2df9dfc894eea438e80f07446c82992db
 DIST prjc_v5.13-r3.patch 257137 BLAKE2B 22e05106ee91f104c69f8d11fa4072b28910b8202388a1778ac498f5128f8b93e6465c3e1ef0d9393aa5d01bfc226b3d6463fbba9e463305381a45cb5f015fa0 SHA512 d7dc67a9913d0d7723a616a11db2ab0798e65a6c2dfb99990bc2a4287c0c2e2eab72d17cdc3f93b884f006844f576379a9d8617b7e491dad278f3880d372bb17
 DIST prjc_v5.14-r0.patch 257363 BLAKE2B be92cdf72d285ded3f569f2423fa87b90d3e787e592ee3f8432ec758e3d6b6a4799f88cecfeced527d56fd68788b71f7064d289335f3d606c282a5b76383b0fe SHA512 a232b90e38db683aca55bfa29e6d9ef529c1999bcf8f8e58d36b8877cfd2b83c3d8e7447860fa29ca50b67bef73262e4e46df8220d204e579e97ae79caa3867d
+DIST prjc_v5.14-r1.patch 258914 BLAKE2B 12e7a488fcb97d394cb4062b4b5c6915aefd9fe93ad870d796b1207ec44b2cfe5f991574fdffac644f39389a1aac718e47e936b9ad32ec4b412adbe3a2884455 SHA512 876ec983722253f63a2da1f6eecc94fb687f5ccccb1c8d1955f732e2c8eec5239f163207d5ca3e7cb6c56b64b72d34df0ded606e12df9c1dd9a8c5a31581230a
 EBUILD pf-sources-5.11_p8.ebuild 2305 BLAKE2B d82fd3ea8f7f664fdaf64c6ff2c019f1b0653cb1be2f021e459b38d995e006b82cba24136ef0edacba783f6a03bd9a3ce761d8c49571ccca1976f370df4c6125 SHA512 fe5258be1c9275c3c0cf5899e8b3cce08b7e33863f26c782bcc88a5c0420a3303660621524679608d741c97290778cf9cbd460acc6122c2fcdd16a17b5b7d4f0
 EBUILD pf-sources-5.12_p6.ebuild 2760 BLAKE2B 9b45a1bec8a722502d3f91fb82f9c44654abd1d7df72b27f34ddd105a2b78ece01f9542efabada927743268aef5dbef6fb3b84fff35fc8c9dfe0c4c5edbabd46 SHA512 479dea03a3062b376134f7a23bfa64e84ee1f6f0e6691117843b05eed9019813a4c8206be8e85cf18044375515e67e72bfe9ac17ff4552236d84ca26930f9fd1
 EBUILD pf-sources-5.13_p2.ebuild 2258 BLAKE2B 057d9e0756294794903bd1f12eb2c6a970351b3556043c20fa49829f6fdacc1ad32e029c739cd1e7f4538cd8299d0fe10aac80d78aef3fa88b37baed7abde357 SHA512 b27deaec1354a5bb1f16d32cdc5626e2533324e303e547da722d8a9686c5b577cfb2e4c02d05724083f5d822d7e44ad1ad5de92bc946c769db38cdd098f3f917
@@ -36,4 +38,5 @@ EBUILD pf-sources-5.13_p4.ebuild 2258 BLAKE2B 268d5f704189c9778ee64c27885059608f
 EBUILD pf-sources-5.13_p5.ebuild 2258 BLAKE2B 268d5f704189c9778ee64c27885059608fb1e662a2dd154b3824a24cebd573255c7764e62c1786f611ecb0a89bf3de4c9d80ded09b9c3759b3ecde8326dc7441 SHA512 866fc6c11370ce91d81c3ee337a9c7c2009f2b9322bb2123f8643d439f473a1c596dc539c832bc558ca1aab71211ad0fd7b3d6da57c217871975f8c0549e46d7
 EBUILD pf-sources-5.13_p6.ebuild 2258 BLAKE2B 70d01125643ae392f74dcd0ecd615c462c4272ae1a0ec5739e8257a47c83c85ade98611163378b8104df3b398f4f5a76c52e035c9b57a56d66e451685640d31c SHA512 7ff0df01358b1cf2f72e70d74dd27350b21513168ea020bdb089152d7054f7457538ca6d275f7719aadd1065c029c3ee3563a3ffeb69def02a2d01b5f183336a
 EBUILD pf-sources-5.14_p1.ebuild 2258 BLAKE2B 39f5758effb38e8802d3dc42093f9e45fece0e44d5b0efdea9778eda51645e4b7b4595f175506bf57fb7b6029c3adddf07156ad8e45906c5129f25eb9839ac88 SHA512 15a4a46dea772329a1293cb441f4c3ecad2f8219870c724f1cc1de5bc9d92855e628ccd0c9cee0dd3caad4ed57656183e4586aa0c1d3b0ce04ec8434b32c19f6
-MISC metadata.xml 345 BLAKE2B 26083da0607ae4e301d8dd622cd9b0016630e1e70dd6197fb8b95912578015a13da38c8434df3cebdf13f22566a132ffa9ac2ee4a32ed482cf780c55327316da SHA512 4bbc43612402fe253b02894ae6bf290ae44082c98a48d31e3d822946a8709752d3c4fb9d338fdb6779d6b421e73073c67f5f951ef423728aaa5cc18ac7958b2e
+EBUILD pf-sources-5.14_p2.ebuild 2258 BLAKE2B 057d9e0756294794903bd1f12eb2c6a970351b3556043c20fa49829f6fdacc1ad32e029c739cd1e7f4538cd8299d0fe10aac80d78aef3fa88b37baed7abde357 SHA512 b27deaec1354a5bb1f16d32cdc5626e2533324e303e547da722d8a9686c5b577cfb2e4c02d05724083f5d822d7e44ad1ad5de92bc946c769db38cdd098f3f917
+MISC metadata.xml 346 BLAKE2B aac642a4971d6bc11e22a4885e5a4cfdaa36287a97883ed22368729e1db9bbe1baa382fc542d6f89582a0e4f43d2e78419d09716f6d215477454b72dc365e2ec SHA512 94e6a97663111931e68e8af0656691776c39b4e8cc4e96c4a257a9617413ea238400096b15729b1e3b91d60e030c6eae3789401c444692d3bf7daa7c80e78a72
diff --git a/sys-kernel/pf-sources/metadata.xml b/sys-kernel/pf-sources/metadata.xml
index c10c60b8af4d..6790e2145677 100644
--- a/sys-kernel/pf-sources/metadata.xml
+++ b/sys-kernel/pf-sources/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
     <email>juippis@gentoo.org</email>
diff --git a/sys-kernel/pf-sources/pf-sources-5.14_p2.ebuild b/sys-kernel/pf-sources/pf-sources-5.14_p2.ebuild
new file mode 100644
index 000000000000..8dbab3d94ab7
--- /dev/null
+++ b/sys-kernel/pf-sources/pf-sources-5.14_p2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 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"
+
+SHPV="${PV/_p*/}"
+
+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}-r1.patch
+	https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/5021_BMQ-and-PDS-gentoo-defaults-v5.12-r0.patch"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+S="${WORKDIR}/linux-${PVR}-pf"
+
+PATCHES=( "${DISTDIR}/${P}.patch"
+	"${DISTDIR}/prjc_v${SHPV}-r1.patch"
+	"${DISTDIR}/5021_BMQ-and-PDS-gentoo-defaults-v5.12-r0.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
+}