gentoo resync : 28.04.2021

12 files changed, 316 insertions, 22 deletions

diff --git a/sys-kernel/pf-sources/Manifest b/sys-kernel/pf-sources/Manifest
index 5bcf7d7d9063..ee1fec82b641 100644
--- a/sys-kernel/pf-sources/Manifest
+++ b/sys-kernel/pf-sources/Manifest
@@ -1,13 +1,18 @@
 DIST 5020_BMQ-and-PDS-io-scheduler-v5.11-r2.patch 259433 BLAKE2B e3cc85db32795721d39962dfd3b72ac923b89da8a9125ef0e12ba199b3606cec9a2d99392c0b0f195b1557a25be2370be1efe3bab9a9e0c2e89e2e92eb86eccb SHA512 3e75edcb8c82222a5ff64d751cff1c9102ea5eabadda3ba6ae1369b2a1478d5f001776f7ce1b13425f5c2f7acdb1a8a117864ccb9aca6755188efaa4110dcb43
+DIST 5020_BMQ-and-PDS-io-scheduler-v5.12-r0.patch 268250 BLAKE2B cc843d32e3cc36cc850fadab2cd6bbde7b04b29e103f81473b6e53f70f678d6f5c82f90f5107296aa6cb54e53545e15487c5a2796498a38c9cfa00c93929f894 SHA512 7d96b7e9e1caa6681f5c662e58777c26f0c579ffa49ae08f92b72a609c582dc7d2a3514c3d2d8e708af7fd9b1d387991ae065db798c85cac7d139291d86f7c21
 DIST 5021_BMQ-and-PDS-gentoo-defaults-v5.11-r2.patch 348 BLAKE2B e81fa7e5157ad317babd4c636facb34b577c8cb850a77c945e94d62547ec687d61dbef3766e3772ba880e2b657bbbbf400a2d9c86efdced2dada7a108b4c1593 SHA512 192431f1b1c19e91d4fcf16e3a275151043c8f065eb5a909f68ff640108537f9d5105be9175a8eea12b0bbfc871ab1595f3e051e64c39bb2a32f8c75a1137bb3
+DIST 5021_BMQ-and-PDS-gentoo-defaults-v5.12-r0.patch 348 BLAKE2B 50ac91380b7221aa30ead9e842f038117b0f4ef4b6538b8f083a9f4467db23ab2f74643e65197dd9201da9b6cde17b192ed09e7d544ad095391c2cde6d9f2b8f SHA512 166a73397b133e20b92c37b72ae1edfe4cce017293b978b523980e28526950dfedf1081252191ff95462896a16ee790dadf55cda2edc49452b960079d89a6a9b
 DIST genpatches-5.10-1.base.tar.xz 3840 BLAKE2B 08ac1f83dc9a1cfc1d4cf0a3a5ab4c9d4686a80348247ec7cd1da6e49db92d6932a1864113f2631d5528a4ba732945b2afe73d03061bd3c532b3d1e4d9571999 SHA512 04356093c4df6a7ee0876b89be5b90f8bc90c920628e5fe69b5787ce82e003be05eaac142310f10f32d0549a6676af846734ae4ac188c2b96c2eca2cb0a6f4b0
 DIST genpatches-5.10-1.extras.tar.xz 1768 BLAKE2B e99d5d2137d5752845ba8284a0dd57620851c3620603e871973af5841b54e9bfdde92ea2408ddedb55355f2c954c80641b06098060043916d2483e10cfb8293a SHA512 0034e5ab57cccb2e969a3b9e1f674614ca853779c552c37be9c5afb0a37112bf8f2c30e1b21832d56320c70c1d622081b60369c6a86fa737a23c3ed953267453
 DIST genpatches-5.11-1.base.tar.xz 3440 BLAKE2B eb1e9a9f2060023cb410bf3db8c4f4fe283eff47f545a434dfc1edb98aa513940f30a2a88566422192b79f7ab36c607b9bc63253c067070d9a479d6318fd34b3 SHA512 a862fe33272bb6b0e4095c862c74361f015fc57316b9dbbdf2782f2e57c131fbe7fe9b9ba81c3d5a7d71788f2d56abdbd28f1c7571973c3f378cd05199c0421f
 DIST genpatches-5.11-1.extras.tar.xz 1772 BLAKE2B e6f8eae67db54099424f33e17bbfa66d36ae44c98d5f58969634a709a4b949a675a7ec1053eab4db4f745513d9730b68439ecf888e92f0fc9ef369822b39a388 SHA512 cf9d0ee27618b1b49322cefda8d85f66fd94820b9902948c8dd9a33d4e14acf511e7aabf611df5e070a4011e06d80164a512d124f5686b5b16fd81409098d8eb
+DIST genpatches-5.12-1.base.tar.xz 3440 BLAKE2B 642d0cf2382de42feb6b5942f6449000b1b638ab80e0a4dec4a70c17201806f20e6e83542e11b44841fbf5806bced3b6ea3fb5f516846ca502eb22ceb4202f77 SHA512 27f023e4533601910c2bb5ba65171e7c0092f5b20fe76711c3bdb9b171bb9ed47dff2e5911d904dc97d28be181d48a74cc0960d8b77eba0b4cf84f05ba7c108a
+DIST genpatches-5.12-1.extras.tar.xz 1772 BLAKE2B 3de99462690e77f87a30d211f7fc14937b41123739c28b1aeea2935383766685a5befa631cfc19afe583db9ca0aafa2ce4140a327707161e73ab14135e837432 SHA512 67c1d650540e50079264e66ce072e546f9001f776188760f794514f6edf78b85e115710b031573bd6cdd53aa599fa9afb743272dac19817a83df5f97354fef3c
 DIST genpatches-5.9-1.base.tar.xz 4004 BLAKE2B 8a4577d42262fa901186acc60d28221d00e5c9140886705f018d9989f818d96ee4d9a6586b292e7b1d945bea9e2408e3161a73e0999defe1b7f99d0a339eb7be SHA512 d6ba1051f9561aa30d7b196336c34930285d613e8119b152f1d6cc447cb22db5ac07c25f89d4ceddf58c9370c42699d0250a31449be2da3c591896b0c87d8718
 DIST genpatches-5.9-1.extras.tar.xz 1764 BLAKE2B 32d29f0448aef113ba9c9591c5d3b671d00d07abde9f35f365b48168887913bb2da95a8a52b852453307cabb111115a26178be4cbcc016e53a26a31f783a9df7 SHA512 df007dc98c1acdd31773f7dcf8aeb22812aa55e5593e8509b6a8762f2dcf06c95d69ad7cdce992e7a5fe730754bef26242acdc4e4da51ee29206fabb86c9cb0e
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.11.tar.xz 117619104 BLAKE2B 81300c27bd5476387a83123aaeb4163c73eb61e9245806c23660cb5e6a4fa88ffc9def027031335fa0270fc4080506cd415990014364e3a98b9d2e8c58a29524 SHA512 a567ec133018bb5ec00c60281479b466c26e02137a93a9c690e83997947df02b6fd94e76e8df748f6d70ceb58a19bacc3b1467de10b7a1fad2763db32b3f1330
+DIST linux-5.12.tar.xz 118112412 BLAKE2B 842d921b9a73d2aaade763dbd2ec67bdfe0275baa6d628b775f5c87574ad7dc86f0419afcd48c10c1235f4bffa16084243f2cf4556e6afcd391e975fe8ba530b SHA512 be03b6fee1d1ea8087b09874d27c0a602c0b04fd90ad38b975bd2c8455a07e83c29b56814aaf1389e82305fae0e4c2d1701075a7f0a7295dd28149f967ec5b3d
 DIST linux-5.9.tar.xz 115507140 BLAKE2B e8d11472d63a9f8409ca12a2e8c97c6963a3d4516b5a398b627d6ece565584526f9b5a1377a2fa4bd184c09c7db94c987428bc5d52df0c788464a67e9e8d6dcb SHA512 d3d92ce4246bad74c9a784212f160d98449b1e8793970c2c308276568d852b8effe0528686bdb87d55d691f09a826abf7938d69bdd4759ce65ddd5c05ffe4eca
 DIST pf-sources-5.10_p12.patch 5244822 BLAKE2B ca004890e20a07864e858bf1834265f125d1a1a7130ecd2f4a1718b4be61dd8dbfd6c4ca7f5740219afc83f1a4645d159d57b546937bcabec59511abe3d78e58 SHA512 5aa8f303798f93e5ad2042878fa15f5ab717ad265fc6db5d35e2b429cf240ce57f042ff8c2c0ac442e552a4925093e1550f1405caffcce648b46140fb809266b
 DIST pf-sources-5.11_p1.patch 2710131 BLAKE2B 67a3528d1c59f24af9f09bc669e736d41394041874e07ebaa68bba8393d98b6094f3c733f1f395cb0a816f418702934d7ac828fceabebcec187526ca378929f4 SHA512 0bc79a5eb093c0b072826098b78894d59bab2bb8107221c9727c4aebb839b2e4d066c2f4918614bfbf4e3af210a6d1852189303f9ebf338f2e5038f166d4dfb0
@@ -15,12 +20,20 @@ DIST pf-sources-5.11_p2.patch 2720760 BLAKE2B db2ccb4449d6ed2d545c15ef82b99d581e
 DIST pf-sources-5.11_p3.patch 3932843 BLAKE2B 655d68a6cced89aeab7b71cb67d0469567201766f378371e0e6c933fb4ac48317e27c5a148dc70117550c4f09c2b8d4c7690f5f0d88754d80fe8ca9ab9bc2415 SHA512 3b1444baa42a737166c1ce7b40d616123b2df197f9f6fc3041fded977f760627603656fbb6f41c12ad008ec724d96ae81664bbaedda4f3759aec50cb5820776b
 DIST pf-sources-5.11_p4.patch 4443076 BLAKE2B 294d1eb3ec09de6c5d6011913a8d831185a424a85e3bc6d245bd3ef4fe6b50d8e2b64decf398c153435de0b24c2417a7076ae854424201ce61cfdbbdedf4565f SHA512 3a14d63039e1a3701493d17b164364ef3c9167333e16aa8202b2967eebfaab3bd0c233b1e09af44a190a86a1b5599ee339f9ae06298c77404e7f99c6f9f14df7
 DIST pf-sources-5.11_p5.patch 4598966 BLAKE2B 8dc474e83816d698bceeba123ceef1c6d33eba551ff85cdc121d51eb2cfc4b81fd1b7fcb63a5254560b978368ec1b24bd9c49cef38432ba3ef956399f4d4e7f2 SHA512 296dda2e6fa1fdc8706ba1547122982e261f0bde82b80c423a2bd5f7b63d98113a75912fd64c630add18eb00f9d77dd1ebf3a0ebd33db985b30484b058d50547
+DIST pf-sources-5.11_p6.patch 5055069 BLAKE2B 75ea4ce13e12762c282c51f07a4bf4553dccd864a004b6af3b2e4531795e0d05d510ca22f890344d692a63f177888a094e265282527ebfb6ef1ce3f11f192205 SHA512 68454152046bde1f412d2c2da8c30d9e57d856f28b2efc88b0038235fac04ddb32e009d2ea4bd75364fa6d17336ea445bf0fa5487846ec81f790add33544d214
+DIST pf-sources-5.11_p7.patch 5538351 BLAKE2B 112f27ae4c640b5398dea06eb85b3f88518e9dfc94bcf104114cdd7d8a33a85c2decf32a696d8ce648c344cdf018af0b588b11785cb33394394a32f38b1d52db SHA512 f957283309a6d2116c0f130e59e944baf3b91d72991e5f74317e8badc6962153deccf4ba376fc33ff50ddae2d6f1b1f2d3419c68a036ec8fc68e94cfcd11c789
+DIST pf-sources-5.11_p8.patch 5688583 BLAKE2B 5d845677efd1d6ac95282d24223c7aa26d33ea74670b37184fda20dded42b5de1c4b4fd06f29afb12c8fd3372feb208b7d655c1dba3b60cfd1f4dc5cecfe5116 SHA512 62105aa308543ae5bb2e79be77dd77f3d4d3430669423c6e9e528acb114edf3b3a3cdcc2371ea566a6a51dbc16ebfba64187dabf485a96dea7c0127162173675
+DIST pf-sources-5.12_p1.patch 2785321 BLAKE2B 6010dcc736c6e068cb5aed9df790df6795f8b85f4169b9b6b66eb020f0e1821cd29630f421842c172f52fb41e4ac94f1671d506ec3f72f0bc883adbadd258302 SHA512 a861f3f96205de0c86a506bfd470116eeaabc8ec574e1940572abdfe166e16539f2fe874af5a0ea234741e5385e88491a49ba390a5493efc2fcc0c0283b43aa6
 DIST pf-sources-5.9_p7.patch 3027972 BLAKE2B 9247ea63b30f9d42d79303b73a900d468a71e703333932f7f15ae697cdba52c46358297023e037226c219fad5df912fb5d21e6f4b7190556ca799fa84924480e SHA512 c69e14f59bf98944b3329c65b7e2c271d74a756bc8c890130bf3cc68b4b96d31f1c33c4edb128580fcaefeb6e42dd04b1eb3d7f071b2d58bc764d26322bda8cd
-EBUILD pf-sources-5.10_p12.ebuild 1983 BLAKE2B e83387ab0da8b543b8acbea44c29e92e07c0a08d1fe7aa24b94f7aba2f7bcc153460f4c3238e939e7dfa989bee9a6167c73cff4d7c3a0582940bcdf2336ec827 SHA512 c068d8bae5b15a25de07aaf6cb14879600d4a7d30dc824cd05e97e120bad86211538c6a4e268347a1cc1d8b576863c55e61ee3198fdd16b3540701967bfad078
-EBUILD pf-sources-5.11_p1.ebuild 1983 BLAKE2B e83387ab0da8b543b8acbea44c29e92e07c0a08d1fe7aa24b94f7aba2f7bcc153460f4c3238e939e7dfa989bee9a6167c73cff4d7c3a0582940bcdf2336ec827 SHA512 c068d8bae5b15a25de07aaf6cb14879600d4a7d30dc824cd05e97e120bad86211538c6a4e268347a1cc1d8b576863c55e61ee3198fdd16b3540701967bfad078
-EBUILD pf-sources-5.11_p2.ebuild 1983 BLAKE2B e83387ab0da8b543b8acbea44c29e92e07c0a08d1fe7aa24b94f7aba2f7bcc153460f4c3238e939e7dfa989bee9a6167c73cff4d7c3a0582940bcdf2336ec827 SHA512 c068d8bae5b15a25de07aaf6cb14879600d4a7d30dc824cd05e97e120bad86211538c6a4e268347a1cc1d8b576863c55e61ee3198fdd16b3540701967bfad078
-EBUILD pf-sources-5.11_p3.ebuild 1983 BLAKE2B e83387ab0da8b543b8acbea44c29e92e07c0a08d1fe7aa24b94f7aba2f7bcc153460f4c3238e939e7dfa989bee9a6167c73cff4d7c3a0582940bcdf2336ec827 SHA512 c068d8bae5b15a25de07aaf6cb14879600d4a7d30dc824cd05e97e120bad86211538c6a4e268347a1cc1d8b576863c55e61ee3198fdd16b3540701967bfad078
-EBUILD pf-sources-5.11_p4.ebuild 1983 BLAKE2B e83387ab0da8b543b8acbea44c29e92e07c0a08d1fe7aa24b94f7aba2f7bcc153460f4c3238e939e7dfa989bee9a6167c73cff4d7c3a0582940bcdf2336ec827 SHA512 c068d8bae5b15a25de07aaf6cb14879600d4a7d30dc824cd05e97e120bad86211538c6a4e268347a1cc1d8b576863c55e61ee3198fdd16b3540701967bfad078
-EBUILD pf-sources-5.11_p5.ebuild 2332 BLAKE2B 4898760322112decb9b923262aa135ba6f9ebd11e35441dab3e9344e3e75c98d2f4f90e0d75ee28a4b052078e7b5d55bc88c977dd20e38242c6e49d21425900f SHA512 41e5a9c87344b00a54685cf30a3c08142e08bad575c4fb517526a405666cd8068b8140a5ee1c79faaa811a623675ea8a195b69cf386d364e883e86463559727e
-EBUILD pf-sources-5.9_p7.ebuild 1958 BLAKE2B 45ad93609aef6566468c1365734aa1a42c563a0fcf87135c1f6cdec8af3c637ce3434c69e55f75ccebed12de28250b61bf15d7c2f961c1effc1dc6e03c37cad8 SHA512 b669acb26f1c7a745a99e23107b8b0cc327b3b66044f7934a962281f78bb3cc31bfc0ec3b0ee20f9180d5e9f86822febad923c9337cb552626f194bfa9fb3c9f
+EBUILD pf-sources-5.10_p12.ebuild 1956 BLAKE2B 766738ea4460211f97ce61460a834e35215511ed63f252053d725bd16295e734fbbfe7044dfc598ebcdf19db1cff47ac5a9289a16c8f0ddef3e0e5a7075e2ed5 SHA512 4c5be584a0b6db1a0aacc690cb67ccad426c069d689eddcfdd9fca777ffee441b576a14d2edffaa3150ae542f05d55b3be0037e382a293470ec58457aed65e00
+EBUILD pf-sources-5.11_p1.ebuild 1956 BLAKE2B 766738ea4460211f97ce61460a834e35215511ed63f252053d725bd16295e734fbbfe7044dfc598ebcdf19db1cff47ac5a9289a16c8f0ddef3e0e5a7075e2ed5 SHA512 4c5be584a0b6db1a0aacc690cb67ccad426c069d689eddcfdd9fca777ffee441b576a14d2edffaa3150ae542f05d55b3be0037e382a293470ec58457aed65e00
+EBUILD pf-sources-5.11_p2.ebuild 1956 BLAKE2B 766738ea4460211f97ce61460a834e35215511ed63f252053d725bd16295e734fbbfe7044dfc598ebcdf19db1cff47ac5a9289a16c8f0ddef3e0e5a7075e2ed5 SHA512 4c5be584a0b6db1a0aacc690cb67ccad426c069d689eddcfdd9fca777ffee441b576a14d2edffaa3150ae542f05d55b3be0037e382a293470ec58457aed65e00
+EBUILD pf-sources-5.11_p3.ebuild 1956 BLAKE2B 766738ea4460211f97ce61460a834e35215511ed63f252053d725bd16295e734fbbfe7044dfc598ebcdf19db1cff47ac5a9289a16c8f0ddef3e0e5a7075e2ed5 SHA512 4c5be584a0b6db1a0aacc690cb67ccad426c069d689eddcfdd9fca777ffee441b576a14d2edffaa3150ae542f05d55b3be0037e382a293470ec58457aed65e00
+EBUILD pf-sources-5.11_p4.ebuild 1956 BLAKE2B 766738ea4460211f97ce61460a834e35215511ed63f252053d725bd16295e734fbbfe7044dfc598ebcdf19db1cff47ac5a9289a16c8f0ddef3e0e5a7075e2ed5 SHA512 4c5be584a0b6db1a0aacc690cb67ccad426c069d689eddcfdd9fca777ffee441b576a14d2edffaa3150ae542f05d55b3be0037e382a293470ec58457aed65e00
+EBUILD pf-sources-5.11_p5.ebuild 2305 BLAKE2B d82fd3ea8f7f664fdaf64c6ff2c019f1b0653cb1be2f021e459b38d995e006b82cba24136ef0edacba783f6a03bd9a3ce761d8c49571ccca1976f370df4c6125 SHA512 fe5258be1c9275c3c0cf5899e8b3cce08b7e33863f26c782bcc88a5c0420a3303660621524679608d741c97290778cf9cbd460acc6122c2fcdd16a17b5b7d4f0
+EBUILD pf-sources-5.11_p6.ebuild 2305 BLAKE2B d82fd3ea8f7f664fdaf64c6ff2c019f1b0653cb1be2f021e459b38d995e006b82cba24136ef0edacba783f6a03bd9a3ce761d8c49571ccca1976f370df4c6125 SHA512 fe5258be1c9275c3c0cf5899e8b3cce08b7e33863f26c782bcc88a5c0420a3303660621524679608d741c97290778cf9cbd460acc6122c2fcdd16a17b5b7d4f0
+EBUILD pf-sources-5.11_p7.ebuild 2305 BLAKE2B d82fd3ea8f7f664fdaf64c6ff2c019f1b0653cb1be2f021e459b38d995e006b82cba24136ef0edacba783f6a03bd9a3ce761d8c49571ccca1976f370df4c6125 SHA512 fe5258be1c9275c3c0cf5899e8b3cce08b7e33863f26c782bcc88a5c0420a3303660621524679608d741c97290778cf9cbd460acc6122c2fcdd16a17b5b7d4f0
+EBUILD pf-sources-5.11_p8.ebuild 2305 BLAKE2B d82fd3ea8f7f664fdaf64c6ff2c019f1b0653cb1be2f021e459b38d995e006b82cba24136ef0edacba783f6a03bd9a3ce761d8c49571ccca1976f370df4c6125 SHA512 fe5258be1c9275c3c0cf5899e8b3cce08b7e33863f26c782bcc88a5c0420a3303660621524679608d741c97290778cf9cbd460acc6122c2fcdd16a17b5b7d4f0
+EBUILD pf-sources-5.12_p1.ebuild 2323 BLAKE2B 419cd340106f1ae9b7985e74c97e437868a841e8d59a021442df835c6db371321e1ee59713b2a69b08c17622b58234afcc81123279515bf8a6fc9d818eb1f087 SHA512 f224f798a50227e391968e07136b14a869e5f49eef4f42d44fd227ea1f17cebfa26b90da6811662a97d89049ff5245b63c58e5b315b5c70870978f9e4a55f980
+EBUILD pf-sources-5.9_p7.ebuild 1931 BLAKE2B d4078db28cec85fce53decefee620f24fe27f1bdb1b55d9a317661fcdc7d696c68fafe2cf83635deb7524f6ad3a11cf651f8751b6d760818bc2607fe853aa9a9 SHA512 e844c6f1f67b7bffa763809088e0843209f095e4d8b7beb44da19cd63d1e224053ee2785a01449f35aff53c55547bac4b37235ea366a70119c0cc34f5e67a01a
 MISC metadata.xml 345 BLAKE2B 26083da0607ae4e301d8dd622cd9b0016630e1e70dd6197fb8b95912578015a13da38c8434df3cebdf13f22566a132ffa9ac2ee4a32ed482cf780c55327316da SHA512 4bbc43612402fe253b02894ae6bf290ae44082c98a48d31e3d822946a8709752d3c4fb9d338fdb6779d6b421e73073c67f5f951ef423728aaa5cc18ac7958b2e
diff --git a/sys-kernel/pf-sources/pf-sources-5.10_p12.ebuild b/sys-kernel/pf-sources/pf-sources-5.10_p12.ebuild
index 223e79a03a51..b51842937478 100644
--- a/sys-kernel/pf-sources/pf-sources-5.10_p12.ebuild
+++ b/sys-kernel/pf-sources/pf-sources-5.10_p12.ebuild
@@ -61,6 +61,5 @@ src_prepare() {
 pkg_postinst() {
 	kernel-2_pkg_postinst
 
-	elog "Optional features:"
-	optfeature "Userspace KSM helper" sys-process/uksmd
+	optfeature "userspace KSM helper" sys-process/uksmd
 }
diff --git a/sys-kernel/pf-sources/pf-sources-5.11_p1.ebuild b/sys-kernel/pf-sources/pf-sources-5.11_p1.ebuild
index 223e79a03a51..b51842937478 100644
--- a/sys-kernel/pf-sources/pf-sources-5.11_p1.ebuild
+++ b/sys-kernel/pf-sources/pf-sources-5.11_p1.ebuild
@@ -61,6 +61,5 @@ src_prepare() {
 pkg_postinst() {
 	kernel-2_pkg_postinst
 
-	elog "Optional features:"
-	optfeature "Userspace KSM helper" sys-process/uksmd
+	optfeature "userspace KSM helper" sys-process/uksmd
 }
diff --git a/sys-kernel/pf-sources/pf-sources-5.11_p2.ebuild b/sys-kernel/pf-sources/pf-sources-5.11_p2.ebuild
index 223e79a03a51..b51842937478 100644
--- a/sys-kernel/pf-sources/pf-sources-5.11_p2.ebuild
+++ b/sys-kernel/pf-sources/pf-sources-5.11_p2.ebuild
@@ -61,6 +61,5 @@ src_prepare() {
 pkg_postinst() {
 	kernel-2_pkg_postinst
 
-	elog "Optional features:"
-	optfeature "Userspace KSM helper" sys-process/uksmd
+	optfeature "userspace KSM helper" sys-process/uksmd
 }
diff --git a/sys-kernel/pf-sources/pf-sources-5.11_p3.ebuild b/sys-kernel/pf-sources/pf-sources-5.11_p3.ebuild
index 223e79a03a51..b51842937478 100644
--- a/sys-kernel/pf-sources/pf-sources-5.11_p3.ebuild
+++ b/sys-kernel/pf-sources/pf-sources-5.11_p3.ebuild
@@ -61,6 +61,5 @@ src_prepare() {
 pkg_postinst() {
 	kernel-2_pkg_postinst
 
-	elog "Optional features:"
-	optfeature "Userspace KSM helper" sys-process/uksmd
+	optfeature "userspace KSM helper" sys-process/uksmd
 }
diff --git a/sys-kernel/pf-sources/pf-sources-5.11_p4.ebuild b/sys-kernel/pf-sources/pf-sources-5.11_p4.ebuild
index 223e79a03a51..b51842937478 100644
--- a/sys-kernel/pf-sources/pf-sources-5.11_p4.ebuild
+++ b/sys-kernel/pf-sources/pf-sources-5.11_p4.ebuild
@@ -61,6 +61,5 @@ src_prepare() {
 pkg_postinst() {
 	kernel-2_pkg_postinst
 
-	elog "Optional features:"
-	optfeature "Userspace KSM helper" sys-process/uksmd
+	optfeature "userspace KSM helper" sys-process/uksmd
 }
diff --git a/sys-kernel/pf-sources/pf-sources-5.11_p5.ebuild b/sys-kernel/pf-sources/pf-sources-5.11_p5.ebuild
index 0c2ef327c94c..892784a56e6c 100644
--- a/sys-kernel/pf-sources/pf-sources-5.11_p5.ebuild
+++ b/sys-kernel/pf-sources/pf-sources-5.11_p5.ebuild
@@ -68,6 +68,5 @@ src_prepare() {
 pkg_postinst() {
 	kernel-2_pkg_postinst
 
-	elog "Optional features:"
-	optfeature "Userspace KSM helper" sys-process/uksmd
+	optfeature "userspace KSM helper" sys-process/uksmd
 }
diff --git a/sys-kernel/pf-sources/pf-sources-5.11_p6.ebuild b/sys-kernel/pf-sources/pf-sources-5.11_p6.ebuild
new file mode 100644
index 000000000000..892784a56e6c
--- /dev/null
+++ b/sys-kernel/pf-sources/pf-sources-5.11_p6.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# 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://dev.gentoo.org/~mpagano/genpatches/trunk/${SHPV}/5020_BMQ-and-PDS-io-scheduler-v${SHPV}-r2.patch
+	https://dev.gentoo.org/~mpagano/genpatches/trunk/${SHPV}/5021_BMQ-and-PDS-gentoo-defaults-v${SHPV}-r2.patch"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+S="${WORKDIR}/linux-${PVR}-pf"
+
+PATCHES=( "${DISTDIR}/${P}.patch"
+	"${DISTDIR}/5020_BMQ-and-PDS-io-scheduler-v${SHPV}-r2.patch"
+	"${DISTDIR}/5021_BMQ-and-PDS-gentoo-defaults-v${SHPV}-r2.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.11_p7.ebuild b/sys-kernel/pf-sources/pf-sources-5.11_p7.ebuild
new file mode 100644
index 000000000000..892784a56e6c
--- /dev/null
+++ b/sys-kernel/pf-sources/pf-sources-5.11_p7.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# 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://dev.gentoo.org/~mpagano/genpatches/trunk/${SHPV}/5020_BMQ-and-PDS-io-scheduler-v${SHPV}-r2.patch
+	https://dev.gentoo.org/~mpagano/genpatches/trunk/${SHPV}/5021_BMQ-and-PDS-gentoo-defaults-v${SHPV}-r2.patch"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+S="${WORKDIR}/linux-${PVR}-pf"
+
+PATCHES=( "${DISTDIR}/${P}.patch"
+	"${DISTDIR}/5020_BMQ-and-PDS-io-scheduler-v${SHPV}-r2.patch"
+	"${DISTDIR}/5021_BMQ-and-PDS-gentoo-defaults-v${SHPV}-r2.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.11_p8.ebuild b/sys-kernel/pf-sources/pf-sources-5.11_p8.ebuild
new file mode 100644
index 000000000000..892784a56e6c
--- /dev/null
+++ b/sys-kernel/pf-sources/pf-sources-5.11_p8.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# 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://dev.gentoo.org/~mpagano/genpatches/trunk/${SHPV}/5020_BMQ-and-PDS-io-scheduler-v${SHPV}-r2.patch
+	https://dev.gentoo.org/~mpagano/genpatches/trunk/${SHPV}/5021_BMQ-and-PDS-gentoo-defaults-v${SHPV}-r2.patch"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+S="${WORKDIR}/linux-${PVR}-pf"
+
+PATCHES=( "${DISTDIR}/${P}.patch"
+	"${DISTDIR}/5020_BMQ-and-PDS-io-scheduler-v${SHPV}-r2.patch"
+	"${DISTDIR}/5021_BMQ-and-PDS-gentoo-defaults-v${SHPV}-r2.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.12_p1.ebuild b/sys-kernel/pf-sources/pf-sources-5.12_p1.ebuild
new file mode 100644
index 000000000000..7e09f4442745
--- /dev/null
+++ b/sys-kernel/pf-sources/pf-sources-5.12_p1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# 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://raw.githubusercontent.com/GKernelCI/linux-patches/${SHPV}/5020_BMQ-and-PDS-io-scheduler-v${SHPV}-r0.patch
+	https://raw.githubusercontent.com/GKernelCI/linux-patches/${SHPV}/5021_BMQ-and-PDS-gentoo-defaults-v${SHPV}-r0.patch"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+S="${WORKDIR}/linux-${PVR}-pf"
+
+PATCHES=( "${DISTDIR}/${P}.patch"
+	"${DISTDIR}/5020_BMQ-and-PDS-io-scheduler-v${SHPV}-r0.patch"
+	"${DISTDIR}/5021_BMQ-and-PDS-gentoo-defaults-v${SHPV}-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
+}
diff --git a/sys-kernel/pf-sources/pf-sources-5.9_p7.ebuild b/sys-kernel/pf-sources/pf-sources-5.9_p7.ebuild
index f2344adc15dc..3535b5a2333a 100644
--- a/sys-kernel/pf-sources/pf-sources-5.9_p7.ebuild
+++ b/sys-kernel/pf-sources/pf-sources-5.9_p7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -62,6 +62,5 @@ src_prepare() {
 pkg_postinst() {
 	kernel-2_pkg_postinst
 
-	elog "Optional features:"
-	optfeature "Userspace KSM helper" sys-process/uksmd
+	optfeature "userspace KSM helper" sys-process/uksmd
 }