gentoo resync : 06.04.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-04-06 22:33:41 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-04-06 22:33:41 +0100
commit: e68d405c5d712af4387159df07e226217bdda049 (patch)
tree: 009ab0f3d427f0813e62930d71802cb054c07e30 /sec-policy
parent: 401101f9c8077911929d3f2b60a37098460a5d89 (diff)
748 files changed, 5270 insertions, 522 deletions
diff --git a/sec-policy/Manifest.gz b/sec-policy/Manifest.gz
index 9e0e0821de49..516ade6953c5 100644
--- a/sec-policy/Manifest.gz
+++ b/sec-policy/Manifest.gz
diff --git a/sec-policy/apparmor-profiles/Manifest b/sec-policy/apparmor-profiles/Manifest
index 883f423211da..77c80b48e1b0 100644
--- a/sec-policy/apparmor-profiles/Manifest
+++ b/sec-policy/apparmor-profiles/Manifest
@@ -3,4 +3,4 @@ DIST apparmor-3.0.3.tar.gz 7790012 BLAKE2B aada9c32c2cde4a110cbd1d626ec00b08e29e
 EBUILD apparmor-profiles-3.0.1.ebuild 620 BLAKE2B 307cbe904ff2dcc267dab13b478c89cbb449c3eeeb4d4e3fc972c1ce3abf6ae8e86d3eb66fa9926f9856d3357ea0f0a0ca11d9fe5c33a0b1637a2910b1586011 SHA512 c334bb3c8b135a46a58db08f16dd9a9532c79d6f29e3d960263792243d412322d95676722db10ce752fd5f0faccd5cdc25e765d8615fd65a6b4af5b388b04fe9
 EBUILD apparmor-profiles-3.0.3.ebuild 620 BLAKE2B d8417dfd634195ca24f80c1e7fd45691cdecf57e014fe2881a49eb703181a4c8f5ab023250f44097e28d4ef6b44aff4327ddd7356c1ea9203a74000e81bb86bb SHA512 dc5df58d8825ca3c34c9981b10860ad5ff5557a0ca3adaf70aceb1678aaaf02ece807a83492ff84b057ecbb1e543c71b04422420d8e627830eb71b57453552eb
 EBUILD apparmor-profiles-9999.ebuild 731 BLAKE2B 21d9b23294a71fcb480aba7c64f33a133038a3171b6c4bd3999ea30489788def582d9ab1cdde85424753d0c66280488fc2c88421222973405efdcaaad7faa030 SHA512 8ebe8207d72e3b06bf32cafa49e78e52b29a9d4fcae3fcfb87c605281ebf88e836317957635691d440a069e30705e44d9f51abe636069eb79483b2091f23da62
-MISC metadata.xml 410 BLAKE2B 220c545add2a0fb45a95c28e09ef0472ae92a0faebfb03effa69a8e202e137367756355c389c8d59e8d5d87a45e6df336a8424cf3c631d89595311d7095f049b SHA512 cff4f2dc12a85268da9fe6ce889a85d68669e7c940017f7617f7566c274394a8e145993c5e9d00c838acd0d41b2c82a7fee661bc31f9e5c54a2547f42ac7a98c
+MISC metadata.xml 442 BLAKE2B f38f58b9dd0a309fcdcc3777cc497167fc8c6e313e78b148673b112c9408f8842d1d63891737ec5fb8754720d03c54336733a94aa429a4238900f02144cf732d SHA512 8e3c31f63edbdda6f04ebd7358fac18ae8d1a739af83b1a6aadec7c13f1649646c273d7bbfacce6a1d8920a165797cb48431a108481750680491c24126e404ef
diff --git a/sec-policy/apparmor-profiles/metadata.xml b/sec-policy/apparmor-profiles/metadata.xml
index f7b28ab4f352..22230f2666f5 100644
--- a/sec-policy/apparmor-profiles/metadata.xml
+++ b/sec-policy/apparmor-profiles/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<maintainer type="person">
 		<email>kensington@gentoo.org</email>
+		<name>Michael Palimaka</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>hardened@gentoo.org</email>
diff --git a/sec-policy/selinux-abrt/Manifest b/sec-policy/selinux-abrt/Manifest
index c22566159be1..9f6663fec2a6 100644
--- a/sec-policy/selinux-abrt/Manifest
+++ b/sec-policy/selinux-abrt/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-abrt-2.20200818-r2.ebuild 273 BLAKE2B a1330f8593a8bc2d45c48936cf0f0649af6b8c6c7a5962715964dcaa94c4c7dce79d1cfdbdaa9d5d570b516b979afd2e2064e67b26833830a783eb60f34846eb SHA512 7a3a3717cfb951d386fea2e80dc5be87706f923cb633923cedfb187e8d571d8f4bfd02e99f09780052e803b3792a64d047dfaba4af79ed2fe979aee1eaf39c2b
 EBUILD selinux-abrt-2.20210203-r1.ebuild 273 BLAKE2B a1330f8593a8bc2d45c48936cf0f0649af6b8c6c7a5962715964dcaa94c4c7dce79d1cfdbdaa9d5d570b516b979afd2e2064e67b26833830a783eb60f34846eb SHA512 7a3a3717cfb951d386fea2e80dc5be87706f923cb633923cedfb187e8d571d8f4bfd02e99f09780052e803b3792a64d047dfaba4af79ed2fe979aee1eaf39c2b
 EBUILD selinux-abrt-2.20210908-r1.ebuild 273 BLAKE2B a1330f8593a8bc2d45c48936cf0f0649af6b8c6c7a5962715964dcaa94c4c7dce79d1cfdbdaa9d5d570b516b979afd2e2064e67b26833830a783eb60f34846eb SHA512 7a3a3717cfb951d386fea2e80dc5be87706f923cb633923cedfb187e8d571d8f4bfd02e99f09780052e803b3792a64d047dfaba4af79ed2fe979aee1eaf39c2b
-EBUILD selinux-abrt-2.20220106-r1.ebuild 277 BLAKE2B 3fd6cf016c440e5d2a9aef56019e4a04dc286c55be8d61e511025d912dbfa93823bb1242251e0fe827b2b52597ea76fc0e6bb910df274650b6ad250e534136a9 SHA512 c1df2f16b22a15dd27460447836ce16e44a2f07472c3082124b7d2eb9335e53ee91d81150c1fa999ae80bd521e0b738b18c7ee29b193a00d72bbb194b108c2d3
+EBUILD selinux-abrt-2.20220106-r1.ebuild 275 BLAKE2B d5efb71e7896c419085426fe5e3e883e3115f496b4576c07d9dc061dd18e03219bd4cf4609c04cab60e910c4970baf9d4abdbf41c7beaf8b4602037bb9419ace SHA512 62922b94e0841e496269e5204de3fbcb9a6820725119a78c73daf8ba7f69a857d03419cd716b7536829a977df40710b1ef1bcb2bf32329cba240c46dccf85e80
+EBUILD selinux-abrt-2.20220106-r2.ebuild 277 BLAKE2B 3fd6cf016c440e5d2a9aef56019e4a04dc286c55be8d61e511025d912dbfa93823bb1242251e0fe827b2b52597ea76fc0e6bb910df274650b6ad250e534136a9 SHA512 c1df2f16b22a15dd27460447836ce16e44a2f07472c3082124b7d2eb9335e53ee91d81150c1fa999ae80bd521e0b738b18c7ee29b193a00d72bbb194b108c2d3
 EBUILD selinux-abrt-9999.ebuild 277 BLAKE2B dac6b690aa8d264ff7a3bd532098cfba01a4d1bfa51e3c7ba398e1c7c0d3f1fd7e314d3d161f972c22a36e04becc297a08eb26c26053d8f36a987f237be1227f SHA512 51d0b0f8b3dcc0fa8b4a050c97e52e0eddbfe8fcc684bf832fcb8d3f8797dc2245244d2a5a92ccc78d7752edd525a767a62b71b0472766b96237d5a0aa105ec0
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-abrt/selinux-abrt-2.20220106-r1.ebuild b/sec-policy/selinux-abrt/selinux-abrt-2.20220106-r1.ebuild
index 7a7f78199fd8..b20db056eac1 100644
--- a/sec-policy/selinux-abrt/selinux-abrt-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-abrt/selinux-abrt-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for abrt"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-prelink/selinux-prelink-2.20220106-r1.ebuild b/sec-policy/selinux-abrt/selinux-abrt-2.20220106-r2.ebuild
index fa02a680e02a..7a7f78199fd8 100644
--- a/sec-policy/selinux-prelink/selinux-prelink-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-abrt/selinux-abrt-2.20220106-r2.ebuild
@@ -4,11 +4,11 @@
 EAPI="7"
 
 IUSE=""
-MODS="prelink"
+MODS="abrt"
 
 inherit selinux-policy-2
 
-DESCRIPTION="SELinux policy for prelink"
+DESCRIPTION="SELinux policy for abrt"
 
 if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
diff --git a/sec-policy/selinux-accountsd/Manifest b/sec-policy/selinux-accountsd/Manifest
index e605b62e3bb8..a5b49978e6ce 100644
--- a/sec-policy/selinux-accountsd/Manifest
+++ b/sec-policy/selinux-accountsd/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-accountsd-2.20200818-r2.ebuild 376 BLAKE2B 757b050821545a491fdbf44d95c05a6b4f20c74b24b120b74380c0b207d5fb31bdc72182b5f124b89d79985ce7d60c0683fbb912594aff72920759b82cd263e6 SHA512 4baf543f45e9ae9979ffadca49c09ca7af796d1680f3eb25b7a2d4b428ea6253b7aff9fc9b7a17890f0a913cd06d532f8c3e6125d9726e9359a6382faa15bf90
 EBUILD selinux-accountsd-2.20210203-r1.ebuild 376 BLAKE2B 757b050821545a491fdbf44d95c05a6b4f20c74b24b120b74380c0b207d5fb31bdc72182b5f124b89d79985ce7d60c0683fbb912594aff72920759b82cd263e6 SHA512 4baf543f45e9ae9979ffadca49c09ca7af796d1680f3eb25b7a2d4b428ea6253b7aff9fc9b7a17890f0a913cd06d532f8c3e6125d9726e9359a6382faa15bf90
 EBUILD selinux-accountsd-2.20210908-r1.ebuild 376 BLAKE2B 757b050821545a491fdbf44d95c05a6b4f20c74b24b120b74380c0b207d5fb31bdc72182b5f124b89d79985ce7d60c0683fbb912594aff72920759b82cd263e6 SHA512 4baf543f45e9ae9979ffadca49c09ca7af796d1680f3eb25b7a2d4b428ea6253b7aff9fc9b7a17890f0a913cd06d532f8c3e6125d9726e9359a6382faa15bf90
-EBUILD selinux-accountsd-2.20220106-r1.ebuild 380 BLAKE2B 173b5b872fbeea571c87fb2f3348da9007f81b863ad685e94fb9dc4025ae1793f258b6c6946e58e0a9649f685c511524a7bc838e335fd620554cf49415c5fc4d SHA512 c087c76809c126393ec676012bf32721a41519a640c3de9f5ca12287d19247836d4bf411446b9a536d8c152b8f962dc9ebbdcf76899422e7836f0992259afb49
+EBUILD selinux-accountsd-2.20220106-r1.ebuild 378 BLAKE2B 987aa68438f061606669e5afa3a46f030d94122354d5acbf121a67434ebbf28b2e836b99f60019ff908befc4f0f7665b30e0b1a11287c220b2bc5fac6c14d96f SHA512 3bfc076a256d9488305678c02d6dde6a415297626b4ebc94317fc7f832d65d4c8c9c735f34621c3e766396e111e95dd0f9552d823be0c622153bc397ea75f4a7
+EBUILD selinux-accountsd-2.20220106-r2.ebuild 380 BLAKE2B 173b5b872fbeea571c87fb2f3348da9007f81b863ad685e94fb9dc4025ae1793f258b6c6946e58e0a9649f685c511524a7bc838e335fd620554cf49415c5fc4d SHA512 c087c76809c126393ec676012bf32721a41519a640c3de9f5ca12287d19247836d4bf411446b9a536d8c152b8f962dc9ebbdcf76899422e7836f0992259afb49
 EBUILD selinux-accountsd-9999.ebuild 380 BLAKE2B f1b6eecb9fd54dc1c5c067bb1d5ac7ff14def1156d2d8f9238dc1f0cd69e0bc9f9c6e5399d02ea3545c1e3f82f5439359560b8b4f28ad442dcaf9be457a55d1e SHA512 0bbcfafb49480d0611690b44adfde78f9c28f14549a15e3a41f5179acc5c6d6437e1343a896ae838e2711b16ed4a26ec138d1b74bd4f4bf3077992432b8aa011
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-accountsd/selinux-accountsd-2.20220106-r1.ebuild b/sec-policy/selinux-accountsd/selinux-accountsd-2.20220106-r1.ebuild
index 43578222ebd3..77a2c2e26001 100644
--- a/sec-policy/selinux-accountsd/selinux-accountsd-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-accountsd/selinux-accountsd-2.20220106-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for accountsd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-accountsd/selinux-accountsd-2.20220106-r2.ebuild b/sec-policy/selinux-accountsd/selinux-accountsd-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..43578222ebd3
--- /dev/null
+++ b/sec-policy/selinux-accountsd/selinux-accountsd-2.20220106-r2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="accountsd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for accountsd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+
+DEPEND="${DEPEND}
+	sec-policy/selinux-dbus
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-dbus
+"
diff --git a/sec-policy/selinux-acct/Manifest b/sec-policy/selinux-acct/Manifest
index 6edda73b1c51..53d4a5be9817 100644
--- a/sec-policy/selinux-acct/Manifest
+++ b/sec-policy/selinux-acct/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-acct-2.20200818-r2.ebuild 273 BLAKE2B a6acb6dc27bc5075b822e653840b0f705980c642430f6408cb1380688915e0aeeefc820015bda14fc07f89dce788b889872965f5dbfbfefa3170dd09ff995bdf SHA512 bd8355d44638ca55c760b8285fa8dfbd2a6aeef1f042a34fb3efa22711a23765fb026d237d20f44756cee71a50a671eae66a9e6fd6ea979eb66dfa6341fd98cc
 EBUILD selinux-acct-2.20210203-r1.ebuild 273 BLAKE2B a6acb6dc27bc5075b822e653840b0f705980c642430f6408cb1380688915e0aeeefc820015bda14fc07f89dce788b889872965f5dbfbfefa3170dd09ff995bdf SHA512 bd8355d44638ca55c760b8285fa8dfbd2a6aeef1f042a34fb3efa22711a23765fb026d237d20f44756cee71a50a671eae66a9e6fd6ea979eb66dfa6341fd98cc
 EBUILD selinux-acct-2.20210908-r1.ebuild 273 BLAKE2B a6acb6dc27bc5075b822e653840b0f705980c642430f6408cb1380688915e0aeeefc820015bda14fc07f89dce788b889872965f5dbfbfefa3170dd09ff995bdf SHA512 bd8355d44638ca55c760b8285fa8dfbd2a6aeef1f042a34fb3efa22711a23765fb026d237d20f44756cee71a50a671eae66a9e6fd6ea979eb66dfa6341fd98cc
-EBUILD selinux-acct-2.20220106-r1.ebuild 277 BLAKE2B 5c429ae605a8d121db08c1b5ab9b06373f15158d45b6b8112dc9a6b6cd0c6b46e0b71c8c07d8d5907619570d1865a27c0065e4f69efa97aa3981423d15bcb950 SHA512 da2a1f2c903d3fe184f14f8f7f43b06cdee0b7425135b4d606adfe15e4f00e4a05729a1ab2ce5483237cbeb479a4d13dd1745a4477ebf34385863842b8c08d7d
+EBUILD selinux-acct-2.20220106-r1.ebuild 275 BLAKE2B c21af0d7e72cd152a30ec9d3715ae6cfa2d42b81b0ff0cddf2a45fada0a52d60882b30c66ee416f5d221673501043593105776651b3f4dab4b8937daca401fd6 SHA512 1b88dcdbb21aae63f0b02a704182a382b6e12a2c3469f30cd0ac0e552bdbed51f0f4e03832420b444e538164e7eb906e3c96ac67e2018bcdaaa991e136c1728d
+EBUILD selinux-acct-2.20220106-r2.ebuild 277 BLAKE2B 5c429ae605a8d121db08c1b5ab9b06373f15158d45b6b8112dc9a6b6cd0c6b46e0b71c8c07d8d5907619570d1865a27c0065e4f69efa97aa3981423d15bcb950 SHA512 da2a1f2c903d3fe184f14f8f7f43b06cdee0b7425135b4d606adfe15e4f00e4a05729a1ab2ce5483237cbeb479a4d13dd1745a4477ebf34385863842b8c08d7d
 EBUILD selinux-acct-9999.ebuild 277 BLAKE2B fa143c1bd2fab769c0cde9f842f74062a968e0fe44f9d75f867381e3856fd42b870f4ffd458b1be03e1308e0ad8457a9bc40ce28f84a0f7a015d1c11c24e7721 SHA512 eb9437ed55eb026c9efb889c4d8e9abf73754b4930efedbe3a2fd6f1f8279fa76e485ed79ef7a227bc7907aea1584e1231414cf375dd6cc8ae72484e09c1f36d
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-acct/selinux-acct-2.20220106-r1.ebuild b/sec-policy/selinux-acct/selinux-acct-2.20220106-r1.ebuild
index 8a33da95cdb9..15daeab2692e 100644
--- a/sec-policy/selinux-acct/selinux-acct-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-acct/selinux-acct-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for acct"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-prelink/selinux-prelink-9999.ebuild b/sec-policy/selinux-acct/selinux-acct-2.20220106-r2.ebuild
index 4aea99dbd1f2..8a33da95cdb9 100644
--- a/sec-policy/selinux-prelink/selinux-prelink-9999.ebuild
+++ b/sec-policy/selinux-acct/selinux-acct-2.20220106-r2.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
 IUSE=""
-MODS="prelink"
+MODS="acct"
 
 inherit selinux-policy-2
 
-DESCRIPTION="SELinux policy for prelink"
+DESCRIPTION="SELinux policy for acct"
 
 if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
diff --git a/sec-policy/selinux-afs/Manifest b/sec-policy/selinux-afs/Manifest
index 58aa868e924a..9cf2814b6fda 100644
--- a/sec-policy/selinux-afs/Manifest
+++ b/sec-policy/selinux-afs/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-afs-2.20200818-r2.ebuild 271 BLAKE2B 17efb9541015369c9c906a19b9be5653f9f44c182616fb46d20249b035e475b664b4ecf9beb12d1fefbb8d55f955b1d780d5137e5d549ae382a9ef346e191ea1 SHA512 71eeefd198145dc8aec7611362995afb009adc0c473f1839bb0c267a1d75358e231b5974dd7d4da227071b51b026ca0c2a3608636e08f8dcc8a6b89a648304d6
 EBUILD selinux-afs-2.20210203-r1.ebuild 271 BLAKE2B 17efb9541015369c9c906a19b9be5653f9f44c182616fb46d20249b035e475b664b4ecf9beb12d1fefbb8d55f955b1d780d5137e5d549ae382a9ef346e191ea1 SHA512 71eeefd198145dc8aec7611362995afb009adc0c473f1839bb0c267a1d75358e231b5974dd7d4da227071b51b026ca0c2a3608636e08f8dcc8a6b89a648304d6
 EBUILD selinux-afs-2.20210908-r1.ebuild 271 BLAKE2B 17efb9541015369c9c906a19b9be5653f9f44c182616fb46d20249b035e475b664b4ecf9beb12d1fefbb8d55f955b1d780d5137e5d549ae382a9ef346e191ea1 SHA512 71eeefd198145dc8aec7611362995afb009adc0c473f1839bb0c267a1d75358e231b5974dd7d4da227071b51b026ca0c2a3608636e08f8dcc8a6b89a648304d6
-EBUILD selinux-afs-2.20220106-r1.ebuild 275 BLAKE2B 99eff31d63b353bd1f9e052d466475c85464e61b069a57eb32b0d0dc1a26eb4427ea07ba431e65a552fdf80b9b9eccc17ca27a9fdf517a811fd11cd6f78ac9ce SHA512 0377f08d677e7292cdac76fe82afb0eddf01a34a58432dd073101afc9d6959de831ecfde3dc8324788db08c516ccefaf711af794a9061e0efd859310ed1fa75d
+EBUILD selinux-afs-2.20220106-r1.ebuild 273 BLAKE2B 50655c90f289c94c92572b379f60e27ea5c75f3e28ad2929c36f098f7a653845cc2d2dfb3d2f4c2e58ff9ce6f5ff5a32ee70c501d2646a7a05c818ad051f0dbf SHA512 5fc39b521039e0ee94d291fb55a11fb84aa24ee61e180bae6ed7c027854e1fc772fb4a09f6d8527e29d224f5b6f7ea036710c6c392a2ac48796f13f14cf1d7f8
+EBUILD selinux-afs-2.20220106-r2.ebuild 275 BLAKE2B 99eff31d63b353bd1f9e052d466475c85464e61b069a57eb32b0d0dc1a26eb4427ea07ba431e65a552fdf80b9b9eccc17ca27a9fdf517a811fd11cd6f78ac9ce SHA512 0377f08d677e7292cdac76fe82afb0eddf01a34a58432dd073101afc9d6959de831ecfde3dc8324788db08c516ccefaf711af794a9061e0efd859310ed1fa75d
 EBUILD selinux-afs-9999.ebuild 275 BLAKE2B 0a29b9343fd9cc8b6a8b8fea60eb4b774712fda687917ffde2421294c113325c2d4802e199973ccdd51768d6a323f7fad1a56ff79038a520bf705339bf043586 SHA512 832fe2e4269b6be33dd68375d70ea595b983153a39e23d5613a3a3a5aae9c71edf1ea959b63e0a2801baa65549b48e3ff119a57fc3d9417ec7a1c090753351fb
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-afs/selinux-afs-2.20220106-r1.ebuild b/sec-policy/selinux-afs/selinux-afs-2.20220106-r1.ebuild
index 872bb84fa32a..f8051b548bc5 100644
--- a/sec-policy/selinux-afs/selinux-afs-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-afs/selinux-afs-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for afs"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-prelink/selinux-prelink-2.20200818-r2.ebuild b/sec-policy/selinux-afs/selinux-afs-2.20220106-r2.ebuild
index fdb199ea6b62..872bb84fa32a 100644
--- a/sec-policy/selinux-prelink/selinux-prelink-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-afs/selinux-afs-2.20220106-r2.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
 IUSE=""
-MODS="prelink"
+MODS="afs"
 
 inherit selinux-policy-2
 
-DESCRIPTION="SELinux policy for prelink"
+DESCRIPTION="SELinux policy for afs"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
 fi
diff --git a/sec-policy/selinux-aide/Manifest b/sec-policy/selinux-aide/Manifest
index a49384d5ba89..62623d2909b2 100644
--- a/sec-policy/selinux-aide/Manifest
+++ b/sec-policy/selinux-aide/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-aide-2.20200818-r2.ebuild 273 BLAKE2B 884e9c57b9539ba0d8b7b7d80054006b84318d8b34d31411ce0fd05e09d1ac3d2a9926e185e6aa620e81fc6eecf1b57f1026bb0eacb92c93a97d3996798555c7 SHA512 0db6543be2eb9115cbafcafedda986c6e935af7c22f5fa4db1a6081f449df45d46708bbbc337c97f20f55f57391f6f40421a0a4fd63295929f94a0fed0834d72
 EBUILD selinux-aide-2.20210203-r1.ebuild 273 BLAKE2B 884e9c57b9539ba0d8b7b7d80054006b84318d8b34d31411ce0fd05e09d1ac3d2a9926e185e6aa620e81fc6eecf1b57f1026bb0eacb92c93a97d3996798555c7 SHA512 0db6543be2eb9115cbafcafedda986c6e935af7c22f5fa4db1a6081f449df45d46708bbbc337c97f20f55f57391f6f40421a0a4fd63295929f94a0fed0834d72
 EBUILD selinux-aide-2.20210908-r1.ebuild 273 BLAKE2B 884e9c57b9539ba0d8b7b7d80054006b84318d8b34d31411ce0fd05e09d1ac3d2a9926e185e6aa620e81fc6eecf1b57f1026bb0eacb92c93a97d3996798555c7 SHA512 0db6543be2eb9115cbafcafedda986c6e935af7c22f5fa4db1a6081f449df45d46708bbbc337c97f20f55f57391f6f40421a0a4fd63295929f94a0fed0834d72
-EBUILD selinux-aide-2.20220106-r1.ebuild 277 BLAKE2B 7e962ef04a3c35c58278f2f59b17913c73580d81f6e7be7ae8faa191dd443c2dc7e83994b0238104570a9dbafc1adfc744b7a0d41dcec6f55e74212a3e35d6e7 SHA512 d5685f37f22006bf0d6f1adb9eb7e6fc210973ee443b73de10483e42b4a60e5292d0c52a8e8935fa89625904b3da6525d120641ad5a97fc9a3449f42d1531dc2
+EBUILD selinux-aide-2.20220106-r1.ebuild 275 BLAKE2B c6aa96f53de2d5cdfe1e19018f74a105396a263ce17cb3966fc564f347af12b4c33189be23236934a9fd77d7f02fb8ba921bb10687c0cddc6212df9ea370809c SHA512 f3ecaabf7bdba2213a18a4f63a55aca1fb15522c9127f68eee27b99ea40f34878b2659bcdae4a72debcb00da6ede0218c3599896d2d0058654d5a8ec86ed7aa1
+EBUILD selinux-aide-2.20220106-r2.ebuild 277 BLAKE2B 7e962ef04a3c35c58278f2f59b17913c73580d81f6e7be7ae8faa191dd443c2dc7e83994b0238104570a9dbafc1adfc744b7a0d41dcec6f55e74212a3e35d6e7 SHA512 d5685f37f22006bf0d6f1adb9eb7e6fc210973ee443b73de10483e42b4a60e5292d0c52a8e8935fa89625904b3da6525d120641ad5a97fc9a3449f42d1531dc2
 EBUILD selinux-aide-9999.ebuild 277 BLAKE2B 2b8e5bd98f0a4381f5a1d8e7a514425b5ba4dfde060f22bdc5cdcd1a35373e9195d94f5654df3b40337288aa90df78b6809f8b3378941a34f4d92ee714f7945b SHA512 fbf9bbfa1c91e339aa4d7d0722fcc7170838b98f86569851d2fd903370c4f03c46af48a4da92e267675b988f73a63982fb6d7e1e3e82e7992f923653720e065c
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-aide/selinux-aide-2.20220106-r1.ebuild b/sec-policy/selinux-aide/selinux-aide-2.20220106-r1.ebuild
index 0793f861e95f..c167f2b8fa5d 100644
--- a/sec-policy/selinux-aide/selinux-aide-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-aide/selinux-aide-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for aide"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-prelink/selinux-prelink-2.20210203-r1.ebuild b/sec-policy/selinux-aide/selinux-aide-2.20220106-r2.ebuild
index fdb199ea6b62..0793f861e95f 100644
--- a/sec-policy/selinux-prelink/selinux-prelink-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-aide/selinux-aide-2.20220106-r2.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
 IUSE=""
-MODS="prelink"
+MODS="aide"
 
 inherit selinux-policy-2
 
-DESCRIPTION="SELinux policy for prelink"
+DESCRIPTION="SELinux policy for aide"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
 fi
diff --git a/sec-policy/selinux-alsa/Manifest b/sec-policy/selinux-alsa/Manifest
index f183588bbf30..555cb51e1a5c 100644
--- a/sec-policy/selinux-alsa/Manifest
+++ b/sec-policy/selinux-alsa/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-alsa-2.20200818-r2.ebuild 273 BLAKE2B 761b910ff6a90534eacb15d45fe535d7d4b37ee389d38f422671a38cadbf4428911bd4770f4b4ed731b9437fa027380530fe85fb570621bec68b7ede280a0c75 SHA512 62f301edd8f40feaee9f6ea9946285df1492fa2700453dc5eb1e6b71f3fcf51dabb776795a3a72f357789cf558f198256bf9996552252e86495b59847f9f5726
 EBUILD selinux-alsa-2.20210203-r1.ebuild 273 BLAKE2B 761b910ff6a90534eacb15d45fe535d7d4b37ee389d38f422671a38cadbf4428911bd4770f4b4ed731b9437fa027380530fe85fb570621bec68b7ede280a0c75 SHA512 62f301edd8f40feaee9f6ea9946285df1492fa2700453dc5eb1e6b71f3fcf51dabb776795a3a72f357789cf558f198256bf9996552252e86495b59847f9f5726
 EBUILD selinux-alsa-2.20210908-r1.ebuild 273 BLAKE2B 761b910ff6a90534eacb15d45fe535d7d4b37ee389d38f422671a38cadbf4428911bd4770f4b4ed731b9437fa027380530fe85fb570621bec68b7ede280a0c75 SHA512 62f301edd8f40feaee9f6ea9946285df1492fa2700453dc5eb1e6b71f3fcf51dabb776795a3a72f357789cf558f198256bf9996552252e86495b59847f9f5726
-EBUILD selinux-alsa-2.20220106-r1.ebuild 277 BLAKE2B 9c0f97f20fcc5f5d88be81ebbc0f05262961127627dedc375498c890df44ca8bb319a6c0fa0a9275b752fe7e01a81901ce99bfca2c6578c005d7f43dfe4ecc55 SHA512 630d5ff685b0235afad1ed93be13cac23bec35028550e3f306d7949b4321e09ae5ed7ec685600f2b669cf5b4d8a88541d91d04281c91e53854efaa1987bbc988
+EBUILD selinux-alsa-2.20220106-r1.ebuild 275 BLAKE2B e29eca005db38fc11b25a64ebe46d69fb713c621a00073be7675f9f9726f4c8e92bc67ca3aba9ca43e38c3e8298a26dbaeef34206f025f24f4a8dc9afd84441e SHA512 bb9e1fd0243638484dc83b98cd33cb8526e2a0ff6309becb598625a83475d7f644ca82da38bbe9555283d6234781f1be2691725a5a2528a9bdc5c97ef6b277c3
+EBUILD selinux-alsa-2.20220106-r2.ebuild 277 BLAKE2B 9c0f97f20fcc5f5d88be81ebbc0f05262961127627dedc375498c890df44ca8bb319a6c0fa0a9275b752fe7e01a81901ce99bfca2c6578c005d7f43dfe4ecc55 SHA512 630d5ff685b0235afad1ed93be13cac23bec35028550e3f306d7949b4321e09ae5ed7ec685600f2b669cf5b4d8a88541d91d04281c91e53854efaa1987bbc988
 EBUILD selinux-alsa-9999.ebuild 277 BLAKE2B 4496352376317ab122cc4a8bd77d9334543482f842aab0cf04b18d11e1db4a99fc1c95a43b7e44d5c6f5daa13a473b9f9c5c15ae04aa5b401475f34c8e00c9fc SHA512 58cec3d981285428fbb83bab222ceb3d8349e6625845d918385dac3c362ac0c5bea91145aaa497f58cc3f1569843a6f5f013b5178cfbb529ce8190f2154b7fc2
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-alsa/selinux-alsa-2.20220106-r1.ebuild b/sec-policy/selinux-alsa/selinux-alsa-2.20220106-r1.ebuild
index 53f73231409c..e92c9c38b070 100644
--- a/sec-policy/selinux-alsa/selinux-alsa-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-alsa/selinux-alsa-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for alsa"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-alsa/selinux-alsa-2.20220106-r2.ebuild b/sec-policy/selinux-alsa/selinux-alsa-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..53f73231409c
--- /dev/null
+++ b/sec-policy/selinux-alsa/selinux-alsa-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="alsa"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for alsa"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-amanda/Manifest b/sec-policy/selinux-amanda/Manifest
index 7cccd7d521a3..2e7dcdfe462c 100644
--- a/sec-policy/selinux-amanda/Manifest
+++ b/sec-policy/selinux-amanda/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-amanda-2.20200818-r2.ebuild 371 BLAKE2B c19c816f7445e320ce0d4e740d121c818cf43cee75c5033517548c6f00234b441aec5fac807223fa00f46fb97ec246cb72b3afb9407958683dee4fe9934cdddb SHA512 9e5850c7f8a1a2c1291bd88b4988da1bd2ef1924855e917528bc6666cd2a5b4fe3faed83f3d1e996ff42c881c97e3d07b67b738c007e664940a64934dd6c89a9
 EBUILD selinux-amanda-2.20210203-r1.ebuild 371 BLAKE2B c19c816f7445e320ce0d4e740d121c818cf43cee75c5033517548c6f00234b441aec5fac807223fa00f46fb97ec246cb72b3afb9407958683dee4fe9934cdddb SHA512 9e5850c7f8a1a2c1291bd88b4988da1bd2ef1924855e917528bc6666cd2a5b4fe3faed83f3d1e996ff42c881c97e3d07b67b738c007e664940a64934dd6c89a9
 EBUILD selinux-amanda-2.20210908-r1.ebuild 371 BLAKE2B c19c816f7445e320ce0d4e740d121c818cf43cee75c5033517548c6f00234b441aec5fac807223fa00f46fb97ec246cb72b3afb9407958683dee4fe9934cdddb SHA512 9e5850c7f8a1a2c1291bd88b4988da1bd2ef1924855e917528bc6666cd2a5b4fe3faed83f3d1e996ff42c881c97e3d07b67b738c007e664940a64934dd6c89a9
-EBUILD selinux-amanda-2.20220106-r1.ebuild 375 BLAKE2B 15763477fe135e1618023fc80b931fa1baa994640eb041064d4fbab6a2eb3dbb89b8405b73e798bd8b615209143aea93d435bf6e1485a23ba5c6010521fc1496 SHA512 06778357bc2657239af5f33498d1ef8ce6bc623f1bd7068ee35608ab72003a81bd87c89fd6649582ee24684b35d3add67216475915fffa50064bdc382ba9e15d
+EBUILD selinux-amanda-2.20220106-r1.ebuild 373 BLAKE2B 69277bee3096987545fd9cdc40d33242a44b62ee989f96a92871a2325c056b5c2cb9afcd4bca38b313b11db36f1cb275c583cf763c918b40e0c990d3be59476c SHA512 707cc4904c01d9ceb7b544b67f7d45263e5b8a5f3813596a0ff7a025b14cfef981d67bf881321eec378cd85f1eadafa0ea73fc8c7ef6b0eeeff2ab3ce62f5d91
+EBUILD selinux-amanda-2.20220106-r2.ebuild 375 BLAKE2B 15763477fe135e1618023fc80b931fa1baa994640eb041064d4fbab6a2eb3dbb89b8405b73e798bd8b615209143aea93d435bf6e1485a23ba5c6010521fc1496 SHA512 06778357bc2657239af5f33498d1ef8ce6bc623f1bd7068ee35608ab72003a81bd87c89fd6649582ee24684b35d3add67216475915fffa50064bdc382ba9e15d
 EBUILD selinux-amanda-9999.ebuild 375 BLAKE2B 8ee7b143e47dc5bdc3c0f970c6735e3a0a5ba33254988c225b5966cb53b77d554709b30663743c8b18ae5ef5852ec591b4edddd09439635b0aa74c9387fdfbc2 SHA512 b8168733c0086b8a8f54b9aee79ae671093863adaa0136ef96297bcca4de46256543cd36c44ac128cb9d8f5f3c52fede394f5f8065d733c655373069921b5e44
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-amanda/selinux-amanda-2.20220106-r1.ebuild b/sec-policy/selinux-amanda/selinux-amanda-2.20220106-r1.ebuild
index 9bff1463fa49..62cbddc9234c 100644
--- a/sec-policy/selinux-amanda/selinux-amanda-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-amanda/selinux-amanda-2.20220106-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for amanda"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-inetd
diff --git a/sec-policy/selinux-amanda/selinux-amanda-2.20220106-r2.ebuild b/sec-policy/selinux-amanda/selinux-amanda-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..9bff1463fa49
--- /dev/null
+++ b/sec-policy/selinux-amanda/selinux-amanda-2.20220106-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="amanda"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for amanda"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-inetd
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-inetd
+"
diff --git a/sec-policy/selinux-amavis/Manifest b/sec-policy/selinux-amavis/Manifest
index 038379551d6c..6bc5fd47f4f0 100644
--- a/sec-policy/selinux-amavis/Manifest
+++ b/sec-policy/selinux-amavis/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-amavis-2.20200818-r2.ebuild 277 BLAKE2B 82f60974437d7b6501fd01b0761075fc9b08fc99babb902a7a52ea3737c82b7e5c9d68be2c333efd0d6e336096b089374adb72c7fe95020122461ef6f1f3a326 SHA512 c766db716a75c7aa68159fb3ad90d6319cbc8412aa572deb56f64aeaaf161dd9bf5572251c6833ed005435c3b86caf67a40770d6dc75f182d7f1122ac5004a3f
 EBUILD selinux-amavis-2.20210203-r1.ebuild 277 BLAKE2B 82f60974437d7b6501fd01b0761075fc9b08fc99babb902a7a52ea3737c82b7e5c9d68be2c333efd0d6e336096b089374adb72c7fe95020122461ef6f1f3a326 SHA512 c766db716a75c7aa68159fb3ad90d6319cbc8412aa572deb56f64aeaaf161dd9bf5572251c6833ed005435c3b86caf67a40770d6dc75f182d7f1122ac5004a3f
 EBUILD selinux-amavis-2.20210908-r1.ebuild 277 BLAKE2B 82f60974437d7b6501fd01b0761075fc9b08fc99babb902a7a52ea3737c82b7e5c9d68be2c333efd0d6e336096b089374adb72c7fe95020122461ef6f1f3a326 SHA512 c766db716a75c7aa68159fb3ad90d6319cbc8412aa572deb56f64aeaaf161dd9bf5572251c6833ed005435c3b86caf67a40770d6dc75f182d7f1122ac5004a3f
-EBUILD selinux-amavis-2.20220106-r1.ebuild 281 BLAKE2B d146c61fd1cd37d45cbdf958fe5fc0e6b59dcb6dc339292beb8c4783736929a1bd27114e60c48764d9388c2ed906251b9be90e028471314ab4816fc44c4e12e1 SHA512 6092ce312dda003108ebd50197413b41caf296d09bdbb25fea49263356f6d69dd5b76b8193435fb41d797306ca1b4a06ab909d543368559acd5f3faa1bb42ba2
+EBUILD selinux-amavis-2.20220106-r1.ebuild 279 BLAKE2B 58b232585a70a75589ecda635902f9775102ebe746138c5286c13b607f610fd41aa78e7a22465711b6595f8f9f081fb77355158a0780d7e1ac8a8f8466be448e SHA512 420cc385074b4397c36be404770d0969b00bf3e3f78fd237a03de0dc6b1645fc5a3b3cfa97a0c316fda7c20e4ab86a770339a3cb530f12bbdc3a92c1680676f6
+EBUILD selinux-amavis-2.20220106-r2.ebuild 281 BLAKE2B d146c61fd1cd37d45cbdf958fe5fc0e6b59dcb6dc339292beb8c4783736929a1bd27114e60c48764d9388c2ed906251b9be90e028471314ab4816fc44c4e12e1 SHA512 6092ce312dda003108ebd50197413b41caf296d09bdbb25fea49263356f6d69dd5b76b8193435fb41d797306ca1b4a06ab909d543368559acd5f3faa1bb42ba2
 EBUILD selinux-amavis-9999.ebuild 281 BLAKE2B 554abc6c90e7093ac3f4530b8f4aef100d2094903ac9afb949263f155c22bcd92106ebc49f862a4471df7082e99a4feeb1c5ac6efa4799c620d989ee4e2cc8d0 SHA512 3122ec1020a66357b2165a8bc3c3c04ee4fa8fef6ce66d4c4c00ad746e56eef6ada7a90cc5d7e17cbdb3c0b0ef2f35fd09b603bc858d8778ce7544a2b4544e0a
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-amavis/selinux-amavis-2.20220106-r1.ebuild b/sec-policy/selinux-amavis/selinux-amavis-2.20220106-r1.ebuild
index 8ad321142c93..d499841b47fd 100644
--- a/sec-policy/selinux-amavis/selinux-amavis-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-amavis/selinux-amavis-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for amavis"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-amavis/selinux-amavis-2.20220106-r2.ebuild b/sec-policy/selinux-amavis/selinux-amavis-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..8ad321142c93
--- /dev/null
+++ b/sec-policy/selinux-amavis/selinux-amavis-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="amavis"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for amavis"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-android/Manifest b/sec-policy/selinux-android/Manifest
index c882282ed7e5..fcc2cff341d1 100644
--- a/sec-policy/selinux-android/Manifest
+++ b/sec-policy/selinux-android/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-android-2.20200818-r2.ebuild 428 BLAKE2B 125f83855bf13fae22d66cb64b8828613d24a557f1f351719cebfd82ee72a0b0ff6b958ce1934237dbf1d7fa07d9b38c00849eb6ee11852af34123ff2fbf62d4 SHA512 6f37312f94ee9d60167e79ecbb6a9580cf8ff3429d21d9dc1c7aedea011f64a507d4d02e649048ba5dea7e7302e1291ac4cba5de1867b3f0060f55e970885b5d
 EBUILD selinux-android-2.20210203-r1.ebuild 428 BLAKE2B 125f83855bf13fae22d66cb64b8828613d24a557f1f351719cebfd82ee72a0b0ff6b958ce1934237dbf1d7fa07d9b38c00849eb6ee11852af34123ff2fbf62d4 SHA512 6f37312f94ee9d60167e79ecbb6a9580cf8ff3429d21d9dc1c7aedea011f64a507d4d02e649048ba5dea7e7302e1291ac4cba5de1867b3f0060f55e970885b5d
 EBUILD selinux-android-2.20210908-r1.ebuild 428 BLAKE2B 125f83855bf13fae22d66cb64b8828613d24a557f1f351719cebfd82ee72a0b0ff6b958ce1934237dbf1d7fa07d9b38c00849eb6ee11852af34123ff2fbf62d4 SHA512 6f37312f94ee9d60167e79ecbb6a9580cf8ff3429d21d9dc1c7aedea011f64a507d4d02e649048ba5dea7e7302e1291ac4cba5de1867b3f0060f55e970885b5d
-EBUILD selinux-android-2.20220106-r1.ebuild 432 BLAKE2B 99912b040e60a573fa927b439c171bc7ff11b70c9dea4a507c3dd3406878e7bf68cc9d4d46753b6ad566c5c34bc6b657e29b5a8cc67802c563bb20f5dc927a4d SHA512 c5d8e66f0bd59a66c0cc1fb0d2d0d6d7fe3e36537a9191d334a3849b0691abf139e6b82eb453be8a3610978926e55d7a503ecfc5cfb44722475adcfd470c97ef
+EBUILD selinux-android-2.20220106-r1.ebuild 430 BLAKE2B 0b3f821fe886e05e87effb55474dbb5a67ff419c18d0a8372db176ca31527471d57f8de7b5ecad3bc8040ef6e88bd27b1cf276cd0a970b5eaf62b0ed04bce03b SHA512 a100fdce9f240c1e63673f72ce5ed4e50346bd279960375dc7b70397aa130ee78490ce4ce53e46ca47be003daf55e59e51b0cdfeb822c15e5b517d7939fec5c6
+EBUILD selinux-android-2.20220106-r2.ebuild 432 BLAKE2B 99912b040e60a573fa927b439c171bc7ff11b70c9dea4a507c3dd3406878e7bf68cc9d4d46753b6ad566c5c34bc6b657e29b5a8cc67802c563bb20f5dc927a4d SHA512 c5d8e66f0bd59a66c0cc1fb0d2d0d6d7fe3e36537a9191d334a3849b0691abf139e6b82eb453be8a3610978926e55d7a503ecfc5cfb44722475adcfd470c97ef
 EBUILD selinux-android-9999.ebuild 432 BLAKE2B e63bd85b2868b0cd5b1460226cbf5b92ee5361906204ca2818ae603cb43050d7589f899a624324a836c0b06bd880702adcaf2497000577f0620e8a6f561e3a85 SHA512 bda4b287dc6d05c4080fefaba18c9a71f7f3762fda152ca9ffaba619d2337977161bbb8f14289d4354c7f0aa9b11271436211616e0845dc49df76e2938ebc97f
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-android/selinux-android-2.20220106-r1.ebuild b/sec-policy/selinux-android/selinux-android-2.20220106-r1.ebuild
index 91fda2fd825c..9045eac71e26 100644
--- a/sec-policy/selinux-android/selinux-android-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-android/selinux-android-2.20220106-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for android"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-android/selinux-android-2.20220106-r2.ebuild b/sec-policy/selinux-android/selinux-android-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..91fda2fd825c
--- /dev/null
+++ b/sec-policy/selinux-android/selinux-android-2.20220106-r2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="android"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for android"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+
+DEPEND="${DEPEND}
+	sec-policy/selinux-java
+	sec-policy/selinux-xserver
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-java
+	sec-policy/selinux-xserver
+"
diff --git a/sec-policy/selinux-apache/Manifest b/sec-policy/selinux-apache/Manifest
index aa786cfbaf99..8ac0ced69d6f 100644
--- a/sec-policy/selinux-apache/Manifest
+++ b/sec-policy/selinux-apache/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-apache-2.20200818-r2.ebuild 377 BLAKE2B 10528e180ebfdd4d9fad7c78fad41b1b6fc1e2a20802a44683bdc7c986c92ba581e9675744a65e921cad9d42310456a4669675d0b513c05e7a7b3ad86c67ba5d SHA512 1e7511c803b1ad79fdfb73699a423e5795873a16fe40adc1e9641f218f3f094ca26682cbffb8ecb534cedaabd62adf1eb615af63e9be28eb8d1aa852b789d8de
 EBUILD selinux-apache-2.20210203-r1.ebuild 377 BLAKE2B 10528e180ebfdd4d9fad7c78fad41b1b6fc1e2a20802a44683bdc7c986c92ba581e9675744a65e921cad9d42310456a4669675d0b513c05e7a7b3ad86c67ba5d SHA512 1e7511c803b1ad79fdfb73699a423e5795873a16fe40adc1e9641f218f3f094ca26682cbffb8ecb534cedaabd62adf1eb615af63e9be28eb8d1aa852b789d8de
 EBUILD selinux-apache-2.20210908-r1.ebuild 377 BLAKE2B 10528e180ebfdd4d9fad7c78fad41b1b6fc1e2a20802a44683bdc7c986c92ba581e9675744a65e921cad9d42310456a4669675d0b513c05e7a7b3ad86c67ba5d SHA512 1e7511c803b1ad79fdfb73699a423e5795873a16fe40adc1e9641f218f3f094ca26682cbffb8ecb534cedaabd62adf1eb615af63e9be28eb8d1aa852b789d8de
-EBUILD selinux-apache-2.20220106-r1.ebuild 381 BLAKE2B fcfbf140e2ef61ee36f951a409731467ee408d292d0d299b0c9c46ce2a1c1ed63ac53b95f9f028ef9a2306a0511df394838297a56e2912f06cce89a02f38fec0 SHA512 89df27fda702f5190fe95d4b6457a3212d587aca08f605e900e010f45d1d8f9d9bc795712122951ecd644176bb057d6764c9e81586fe21ca4e408d0731d0b6a0
+EBUILD selinux-apache-2.20220106-r1.ebuild 379 BLAKE2B 422eab16b62af8907a21bbc0f36d15766b3b1c772c24f2c43c76bc64293cd7056aa5b05bc93af5204fad09d1382ac1d8b4307ad1ba9e189e3c797ed3b41274dc SHA512 ce9b27e183571522bbf905b3575717f25c587c70416dd9c4941ae7e32d9eb48da7a93255a313aea07197f0bf155138cdb0a7380d308c13a441ec691456edee37
+EBUILD selinux-apache-2.20220106-r2.ebuild 381 BLAKE2B fcfbf140e2ef61ee36f951a409731467ee408d292d0d299b0c9c46ce2a1c1ed63ac53b95f9f028ef9a2306a0511df394838297a56e2912f06cce89a02f38fec0 SHA512 89df27fda702f5190fe95d4b6457a3212d587aca08f605e900e010f45d1d8f9d9bc795712122951ecd644176bb057d6764c9e81586fe21ca4e408d0731d0b6a0
 EBUILD selinux-apache-9999.ebuild 381 BLAKE2B 1f2d6deea6cba6a753c559a5925f7c741124eb69ca28f3643e8fc78b7b42533118534b81e924f032a4de857a83b041c67b2755b336e409e452e5430cd4b9c888 SHA512 f9e16b7be121cf12ca511c6ae7acc62122c7714fabea8b53f0bab1016cd16449c869bdfaf1fb2cd3b9f611ffe66be879a8c08d33dae56e7d402ad8cf6b544187
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-apache/selinux-apache-2.20220106-r1.ebuild b/sec-policy/selinux-apache/selinux-apache-2.20220106-r1.ebuild
index 53bce5d0dedb..138722d129e7 100644
--- a/sec-policy/selinux-apache/selinux-apache-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-apache/selinux-apache-2.20220106-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for apache"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-kerberos
diff --git a/sec-policy/selinux-apache/selinux-apache-2.20220106-r2.ebuild b/sec-policy/selinux-apache/selinux-apache-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..53bce5d0dedb
--- /dev/null
+++ b/sec-policy/selinux-apache/selinux-apache-2.20220106-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="apache"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for apache"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-kerberos
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-kerberos
+"
diff --git a/sec-policy/selinux-apcupsd/Manifest b/sec-policy/selinux-apcupsd/Manifest
index 1490b43db555..387e7883d37d 100644
--- a/sec-policy/selinux-apcupsd/Manifest
+++ b/sec-policy/selinux-apcupsd/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-apcupsd-2.20200818-r2.ebuild 375 BLAKE2B d1c0db8572c150a45e19888096843835b61a06380d7916b015428c3a71b920a1a77c4e651b285e6929b79bd3bbd4796093522e13e3abb6e016b9aa1bca2f8f22 SHA512 fe5334d19a870e798913607363f5d169fd4a4ffbfc38b97ab3ef1adb2370816a7eeaf499a629edfaa44869ad3a2cb376f8ab05292259e4e92c42aab718c404e7
 EBUILD selinux-apcupsd-2.20210203-r1.ebuild 375 BLAKE2B d1c0db8572c150a45e19888096843835b61a06380d7916b015428c3a71b920a1a77c4e651b285e6929b79bd3bbd4796093522e13e3abb6e016b9aa1bca2f8f22 SHA512 fe5334d19a870e798913607363f5d169fd4a4ffbfc38b97ab3ef1adb2370816a7eeaf499a629edfaa44869ad3a2cb376f8ab05292259e4e92c42aab718c404e7
 EBUILD selinux-apcupsd-2.20210908-r1.ebuild 375 BLAKE2B d1c0db8572c150a45e19888096843835b61a06380d7916b015428c3a71b920a1a77c4e651b285e6929b79bd3bbd4796093522e13e3abb6e016b9aa1bca2f8f22 SHA512 fe5334d19a870e798913607363f5d169fd4a4ffbfc38b97ab3ef1adb2370816a7eeaf499a629edfaa44869ad3a2cb376f8ab05292259e4e92c42aab718c404e7
-EBUILD selinux-apcupsd-2.20220106-r1.ebuild 379 BLAKE2B ece82d0fee45eea6221198592c87112b1b0daa4b7d7c43f75b6c4e1d9fbf011b7b707293519e85534d3180c792d46e9ef00779bee938b2e84d985d6168ff66c8 SHA512 1ff2780f87bcc70f9d4de34ee1f9ad6f885b4a10b9044206f1131b698ad53daaf7762112030e71a1ffe1c5e5f104810a92fd0501152df002f0237492d9af5177
+EBUILD selinux-apcupsd-2.20220106-r1.ebuild 377 BLAKE2B 77fbbda4d76e51b5d191ee5f44b99644eb5c8d723fb02b4929a591e9629a42575ebfaac9adaf58190943d86628877d11a766a9b48a15dfe67bd1b3ade1fd0586 SHA512 ff0675a7c8fc1794decf954c95df6501761f0b25b7c9550c882a2a7e77d14b8b608001838d89ab1587393b27355016f578b222df7c46cf7140938d137f0eff74
+EBUILD selinux-apcupsd-2.20220106-r2.ebuild 379 BLAKE2B ece82d0fee45eea6221198592c87112b1b0daa4b7d7c43f75b6c4e1d9fbf011b7b707293519e85534d3180c792d46e9ef00779bee938b2e84d985d6168ff66c8 SHA512 1ff2780f87bcc70f9d4de34ee1f9ad6f885b4a10b9044206f1131b698ad53daaf7762112030e71a1ffe1c5e5f104810a92fd0501152df002f0237492d9af5177
 EBUILD selinux-apcupsd-9999.ebuild 379 BLAKE2B e93ef3a9e06f2660096eda8313559cf4a11ec77659c6e353155d2baa9a261d5fb97c44ac3e9b301822d1c483e815d9d0b9dc29f136488d7387f31784050c51aa SHA512 dd68a3686b7f3fecd11ee9eee515c0f72d79e52c12eae0c9798d83edb2394b4e6fa69f472c182230f41a01f1e2cbb84ea6cb0ab9dffb78514b4fa48c87378cc2
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20220106-r1.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20220106-r1.ebuild
index 0df45f316e8b..f8d677a80980 100644
--- a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20220106-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for apcupsd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20220106-r2.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..0df45f316e8b
--- /dev/null
+++ b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20220106-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="apcupsd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for apcupsd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-apm/Manifest b/sec-policy/selinux-apm/Manifest
index db6ff3415bef..f045097827be 100644
--- a/sec-policy/selinux-apm/Manifest
+++ b/sec-policy/selinux-apm/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-apm-2.20200818-r2.ebuild 806 BLAKE2B df14d430712cb7bb2247df33925a999377319fda89c8bd127d62a15ee5f6ae28a3bae06359d35a61e54aa99674a4d8644b4cc5d71d2c1e2671348a395f265bfc SHA512 03c899a2fddbb208803d06e629582130cc29d8b9f5cf180152778f3b850d532f1882a4c9e7a271681837fa39abb89299c0f71417379fdfbcc5c99e1a4926a52d
 EBUILD selinux-apm-2.20210203-r1.ebuild 806 BLAKE2B df14d430712cb7bb2247df33925a999377319fda89c8bd127d62a15ee5f6ae28a3bae06359d35a61e54aa99674a4d8644b4cc5d71d2c1e2671348a395f265bfc SHA512 03c899a2fddbb208803d06e629582130cc29d8b9f5cf180152778f3b850d532f1882a4c9e7a271681837fa39abb89299c0f71417379fdfbcc5c99e1a4926a52d
 EBUILD selinux-apm-2.20210908-r1.ebuild 806 BLAKE2B df14d430712cb7bb2247df33925a999377319fda89c8bd127d62a15ee5f6ae28a3bae06359d35a61e54aa99674a4d8644b4cc5d71d2c1e2671348a395f265bfc SHA512 03c899a2fddbb208803d06e629582130cc29d8b9f5cf180152778f3b850d532f1882a4c9e7a271681837fa39abb89299c0f71417379fdfbcc5c99e1a4926a52d
-EBUILD selinux-apm-2.20220106-r1.ebuild 810 BLAKE2B 1ab91269f263dfcc4854bb97433bf91446ab873eb2da0b30fc30b58ba6d4b690781357141895ca543415d3042f0cba82334da28b16b1a4ef9f34b521d6e70a61 SHA512 2dbe4e3d381c125f0caa241a038b55c8350e026688c706c1ebb9a14ce7b949eaf4673e53efc78f54e8d6a5da580276c86341429667a5dad1bdce9f52873bc4f6
+EBUILD selinux-apm-2.20220106-r1.ebuild 808 BLAKE2B 9084fa623bfa21f9cf5fe8ecdce0526e05e5a1868d2cf2e4f00fcfab5444832334b24d9a91b1f63cdd7d3f6123ed1fed8df4acdde1b76a6a43c57af2d4cb9a5c SHA512 ace20d4d9b25bd54a4d29839614c9b531e4aabf0ea34a931283b39c0babc48747b102ae7ae55ceec68569855070a617a55b759bea35fbb1f2a1222a4fe4900b9
+EBUILD selinux-apm-2.20220106-r2.ebuild 810 BLAKE2B 1ab91269f263dfcc4854bb97433bf91446ab873eb2da0b30fc30b58ba6d4b690781357141895ca543415d3042f0cba82334da28b16b1a4ef9f34b521d6e70a61 SHA512 2dbe4e3d381c125f0caa241a038b55c8350e026688c706c1ebb9a14ce7b949eaf4673e53efc78f54e8d6a5da580276c86341429667a5dad1bdce9f52873bc4f6
 EBUILD selinux-apm-9999.ebuild 810 BLAKE2B 7b14a2e8e6c8a32960cf2ed1efcbc0028eada5ad3a044e0fa1c71ef2a8b74befe15776e1d5cfac91508c2eff54680f537dba78f09ba6d8436327682e479d466a SHA512 51d5404809faad2c547daaec9dcdcf48b2e83be2ffe7f7cba4df10d524fcea61c2e11c31939616db4e702375313d1615754976225961a4d9730983060265ac7e
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-apm/selinux-apm-2.20220106-r1.ebuild b/sec-policy/selinux-apm/selinux-apm-2.20220106-r1.ebuild
index 97146fc67fc6..84974ca8dc81 100644
--- a/sec-policy/selinux-apm/selinux-apm-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-apm/selinux-apm-2.20220106-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for acpi"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
 
 pkg_postinst() {
diff --git a/sec-policy/selinux-apm/selinux-apm-2.20220106-r2.ebuild b/sec-policy/selinux-apm/selinux-apm-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..97146fc67fc6
--- /dev/null
+++ b/sec-policy/selinux-apm/selinux-apm-2.20220106-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="acpi"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for acpi"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+
+pkg_postinst() {
+	# "apm" module got renamed to "acpi", must remove apm first
+	# the contexts are okay even tho the modules are not
+	# replaced in the same command (doesnt become unlabeled_t)
+	for i in ${POLICY_TYPES}; do
+		if semodule -s "${i}" -l | grep apm >/dev/null 2>&1; then
+			semodule -s "${i}" -r apm
+		fi
+	done
+	selinux-policy-2_pkg_postinst
+}
+
+pkg_postrm() {
+	for i in ${POLICY_TYPES}; do
+		if semodule -s "${i}" -l | grep apm >/dev/null 2>&1; then
+			semodule -s "${i}" -r apm
+		fi
+	done
+	selinux-policy-2_pkg_postrm
+}
diff --git a/sec-policy/selinux-arpwatch/Manifest b/sec-policy/selinux-arpwatch/Manifest
index cca00a291e3d..15ff4b948453 100644
--- a/sec-policy/selinux-arpwatch/Manifest
+++ b/sec-policy/selinux-arpwatch/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-arpwatch-2.20200818-r2.ebuild 281 BLAKE2B 95283818382d8fc0e55c48ba5fae52b62dd0b404682b1d61c7174373a993f20a5bab3e7fdad8d1219f978f8cdba311dad58df9bd4562091c62b1df36588d4135 SHA512 8ca9b94911c9936928feebda8faee036a7efeaaac3cc65ecd015cb6c53a6e6a895cec7e9cab717e898f121e68b890ed088cac88d663eb9376da51e2c6f3a2e7d
 EBUILD selinux-arpwatch-2.20210203-r1.ebuild 281 BLAKE2B 95283818382d8fc0e55c48ba5fae52b62dd0b404682b1d61c7174373a993f20a5bab3e7fdad8d1219f978f8cdba311dad58df9bd4562091c62b1df36588d4135 SHA512 8ca9b94911c9936928feebda8faee036a7efeaaac3cc65ecd015cb6c53a6e6a895cec7e9cab717e898f121e68b890ed088cac88d663eb9376da51e2c6f3a2e7d
 EBUILD selinux-arpwatch-2.20210908-r1.ebuild 281 BLAKE2B 95283818382d8fc0e55c48ba5fae52b62dd0b404682b1d61c7174373a993f20a5bab3e7fdad8d1219f978f8cdba311dad58df9bd4562091c62b1df36588d4135 SHA512 8ca9b94911c9936928feebda8faee036a7efeaaac3cc65ecd015cb6c53a6e6a895cec7e9cab717e898f121e68b890ed088cac88d663eb9376da51e2c6f3a2e7d
-EBUILD selinux-arpwatch-2.20220106-r1.ebuild 285 BLAKE2B 64414138499acbea9f39b7b7b04bf45c482dc4e4cbde7982a165fcb4aed7bfbae7b5095ff9ea271943eabfae1537e652c566077d7e1aa433a83c6adf145e4c68 SHA512 572daab2f88753dcad199247ad5d86a74ca2f06412ffd70432ea4adc6e46a266b60b98d815270054548597bb00f9f9f5e0d65158be40f371ea7349c3dddf7534
+EBUILD selinux-arpwatch-2.20220106-r1.ebuild 283 BLAKE2B f3b9a2fbfb70db1a293a228e5e052cda49f44aa9c4de0139e8d45556838415071f195851b1dbf767ce96a01138cb9823435ac773c02375531ea49e4bbe1039cf SHA512 b31cf12fbd158d10827860be8eb86816a4a438c5ad089f43f3c0f4ee20193b58642f81d91d51770e9a52dec75f33f427e279f4d14ec9e9edd82d2187071e8806
+EBUILD selinux-arpwatch-2.20220106-r2.ebuild 285 BLAKE2B 64414138499acbea9f39b7b7b04bf45c482dc4e4cbde7982a165fcb4aed7bfbae7b5095ff9ea271943eabfae1537e652c566077d7e1aa433a83c6adf145e4c68 SHA512 572daab2f88753dcad199247ad5d86a74ca2f06412ffd70432ea4adc6e46a266b60b98d815270054548597bb00f9f9f5e0d65158be40f371ea7349c3dddf7534
 EBUILD selinux-arpwatch-9999.ebuild 285 BLAKE2B 8cb1b243cbfac31cd0f7ab90ee7ae1b908e538c86a737818dfac0bed7ff4fe325ba91b47f798c7fb79e7d153720a2803fbde144ab52db01f5d780e76d173f42c SHA512 4ca9924b316fbfbe0ebbf0ca75fab9fbad73f9deec43fac181d26e9d2164ab30cb8f48495d26b16e4ed108dab559f6367659a98b3db82abd31eb47079aa6c2d2
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20220106-r1.ebuild b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20220106-r1.ebuild
index 75f60fe0d929..56833a436c4a 100644
--- a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for arpwatch"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20220106-r2.ebuild b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..75f60fe0d929
--- /dev/null
+++ b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="arpwatch"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for arpwatch"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-asterisk/Manifest b/sec-policy/selinux-asterisk/Manifest
index f447fe92554c..d10c108627b9 100644
--- a/sec-policy/selinux-asterisk/Manifest
+++ b/sec-policy/selinux-asterisk/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-asterisk-2.20200818-r2.ebuild 281 BLAKE2B 448bd2c4dc098e67b620f6a7fe6f3944373601ab326a041971f170319a0648c6e697ea421c40d8c76dbc3926868027ed5e3b53976ae6dea2aae872353b58dd69 SHA512 4713fa38f4f27b6a88002147d04c19fd05472269bdaed2de10f29e00bfffa0c2503ee88e5bd60ddc270ad16b1d1aa9ecbe3329dbc3538923e5ecd1d5cd55698a
 EBUILD selinux-asterisk-2.20210203-r1.ebuild 281 BLAKE2B 448bd2c4dc098e67b620f6a7fe6f3944373601ab326a041971f170319a0648c6e697ea421c40d8c76dbc3926868027ed5e3b53976ae6dea2aae872353b58dd69 SHA512 4713fa38f4f27b6a88002147d04c19fd05472269bdaed2de10f29e00bfffa0c2503ee88e5bd60ddc270ad16b1d1aa9ecbe3329dbc3538923e5ecd1d5cd55698a
 EBUILD selinux-asterisk-2.20210908-r1.ebuild 281 BLAKE2B 448bd2c4dc098e67b620f6a7fe6f3944373601ab326a041971f170319a0648c6e697ea421c40d8c76dbc3926868027ed5e3b53976ae6dea2aae872353b58dd69 SHA512 4713fa38f4f27b6a88002147d04c19fd05472269bdaed2de10f29e00bfffa0c2503ee88e5bd60ddc270ad16b1d1aa9ecbe3329dbc3538923e5ecd1d5cd55698a
-EBUILD selinux-asterisk-2.20220106-r1.ebuild 285 BLAKE2B d133ee765ce83c62d9932da6068e68ae42ebada642e945d61f5e5c005c737555403c3e8b5596c93cb057671ff3179f01bad3f16181a0a84becc347042d4f113c SHA512 362251192f744cb5fddc5d86fe66712792b49f6d0e9698282125577025265201e4ea1771f89c463019fd17ae16e5f56a24c167b776f280177a5e86e6c41cb15c
+EBUILD selinux-asterisk-2.20220106-r1.ebuild 283 BLAKE2B 7aa6f4726a3dbd376ce5276ff7d9f64733cc8db362f77176bf5245795fb14c23fb0407fea1fc4c3fd688c760c38363c53dfe03abc3ada2db1e6d45f8e2f3d3c9 SHA512 b5dd53a159b1bb1dcc01208414d8e30453a949d583c07d09371d9648af83f6a375a9eb29c5d9d3786f895d7ffc698a40e7291fa4c7df990f7f794108cd8fb03f
+EBUILD selinux-asterisk-2.20220106-r2.ebuild 285 BLAKE2B d133ee765ce83c62d9932da6068e68ae42ebada642e945d61f5e5c005c737555403c3e8b5596c93cb057671ff3179f01bad3f16181a0a84becc347042d4f113c SHA512 362251192f744cb5fddc5d86fe66712792b49f6d0e9698282125577025265201e4ea1771f89c463019fd17ae16e5f56a24c167b776f280177a5e86e6c41cb15c
 EBUILD selinux-asterisk-9999.ebuild 285 BLAKE2B 8c85d58aa3de8dfa4d7091462ee4f03d1aa67a066b275644553b946bac7f0e596701ff22ab31690432313b50191b873b774b23da01e36c4d07698aa0971bb7ac SHA512 943415c9d0fdddf28d261f59b59bc0965735f6ef2ed477c59efdcd3c0b73dcbbead0ddbe2bd9958a125e788eed1208ad4f7bd40efd20bbea157cab5f198bd555
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-asterisk/selinux-asterisk-2.20220106-r1.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-2.20220106-r1.ebuild
index 210ad1c63044..ae612907df8a 100644
--- a/sec-policy/selinux-asterisk/selinux-asterisk-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-asterisk/selinux-asterisk-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for asterisk"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-asterisk/selinux-asterisk-2.20220106-r2.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..210ad1c63044
--- /dev/null
+++ b/sec-policy/selinux-asterisk/selinux-asterisk-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="asterisk"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for asterisk"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-at/Manifest b/sec-policy/selinux-at/Manifest
index f26845a22fd8..abc79c7c3bdd 100644
--- a/sec-policy/selinux-at/Manifest
+++ b/sec-policy/selinux-at/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-at-2.20200818-r2.ebuild 269 BLAKE2B 3aeae9103a940f65886952acbe9106ba3b6b411fb333087579a257333ced37ec20369c71a28013d24c2c4f4259761a006ff3e01a57fb5c0ba1fbd77f2768f049 SHA512 031308527317504ad78e7816168b571f96755b5a0a9aa54f0a9b1e6fe8c75e20f6cda85fb20c5e9bf2bc9198a0a403d988abe8e75e4bb6ef24213912ebad94b2
 EBUILD selinux-at-2.20210203-r1.ebuild 269 BLAKE2B 3aeae9103a940f65886952acbe9106ba3b6b411fb333087579a257333ced37ec20369c71a28013d24c2c4f4259761a006ff3e01a57fb5c0ba1fbd77f2768f049 SHA512 031308527317504ad78e7816168b571f96755b5a0a9aa54f0a9b1e6fe8c75e20f6cda85fb20c5e9bf2bc9198a0a403d988abe8e75e4bb6ef24213912ebad94b2
 EBUILD selinux-at-2.20210908-r1.ebuild 269 BLAKE2B 3aeae9103a940f65886952acbe9106ba3b6b411fb333087579a257333ced37ec20369c71a28013d24c2c4f4259761a006ff3e01a57fb5c0ba1fbd77f2768f049 SHA512 031308527317504ad78e7816168b571f96755b5a0a9aa54f0a9b1e6fe8c75e20f6cda85fb20c5e9bf2bc9198a0a403d988abe8e75e4bb6ef24213912ebad94b2
-EBUILD selinux-at-2.20220106-r1.ebuild 273 BLAKE2B 0093713af12ef42a3d07ac47d45b4d27a2bfe6d7eff6531097f2de7b538e77fc9d0ac874f9bb45b77edcb12c5e2bf6b402e632fccd1ed7c5b0ab201a04f73139 SHA512 4de514825bc7c1ca592ce338a5ffd7cd2e24c84a90a0e415a803050de3b4d4f66c8743f1a508448249645bddcd6f72f2066744a45637508f884e6826f297118f
+EBUILD selinux-at-2.20220106-r1.ebuild 271 BLAKE2B bd75e4ac912d9a94032b0d3f2459e3a1ab401e8ad20c56080e81ccb21a791567414d0fe45a4e311c52976e09ed8ab4f0e54c4bb45590a681caa5c29a0c46c82e SHA512 b8da632a66bc377bb93c805ea1219634f41acaa116835c0f40faba623cd58ded949a0d819560d55dc355578324c0830e6fd6ffac98b815e2b175c3e6e41b2dc0
+EBUILD selinux-at-2.20220106-r2.ebuild 273 BLAKE2B 0093713af12ef42a3d07ac47d45b4d27a2bfe6d7eff6531097f2de7b538e77fc9d0ac874f9bb45b77edcb12c5e2bf6b402e632fccd1ed7c5b0ab201a04f73139 SHA512 4de514825bc7c1ca592ce338a5ffd7cd2e24c84a90a0e415a803050de3b4d4f66c8743f1a508448249645bddcd6f72f2066744a45637508f884e6826f297118f
 EBUILD selinux-at-9999.ebuild 273 BLAKE2B 013ab4ace96511dc3ea440dc0240006de36c4442af45429bb524737513cb1930701af82dd3dfc8cce8f38985cece8ee9e8b9b88700d7ac5e9ee43ab6706e8b67 SHA512 e121261542a6ccaa4a66220c53a78c5c0fa4a5b449d0c48a0038688c64e8374d943c64d6300b217366198908389a0f35d87fb769e697d9204ca1adb950511af3
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-at/selinux-at-2.20220106-r1.ebuild b/sec-policy/selinux-at/selinux-at-2.20220106-r1.ebuild
index f0615197cc52..c79f14d5e46d 100644
--- a/sec-policy/selinux-at/selinux-at-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-at/selinux-at-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for at"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-at/selinux-at-2.20220106-r2.ebuild b/sec-policy/selinux-at/selinux-at-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..f0615197cc52
--- /dev/null
+++ b/sec-policy/selinux-at/selinux-at-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="at"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for at"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-automount/Manifest b/sec-policy/selinux-automount/Manifest
index f4486cf5a2cb..befc30dd4116 100644
--- a/sec-policy/selinux-automount/Manifest
+++ b/sec-policy/selinux-automount/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-automount-2.20200818-r2.ebuild 283 BLAKE2B c7fd45c3df23d2e083459dc19d2f2623b08fd67775fbcfd07f882e1d87160bc105dce8b96e484597a6d94808bf381be0fb511709abead2ec86ffe7cf78bcb7ae SHA512 d05dca920fe759ffa66a59125ad6fdec486642bc990e4db60d8306d2170c9afb3c476e179234400c2d03c81dfc0118b8736b9749c71916880307aeb7a5390143
 EBUILD selinux-automount-2.20210203-r1.ebuild 283 BLAKE2B c7fd45c3df23d2e083459dc19d2f2623b08fd67775fbcfd07f882e1d87160bc105dce8b96e484597a6d94808bf381be0fb511709abead2ec86ffe7cf78bcb7ae SHA512 d05dca920fe759ffa66a59125ad6fdec486642bc990e4db60d8306d2170c9afb3c476e179234400c2d03c81dfc0118b8736b9749c71916880307aeb7a5390143
 EBUILD selinux-automount-2.20210908-r1.ebuild 283 BLAKE2B c7fd45c3df23d2e083459dc19d2f2623b08fd67775fbcfd07f882e1d87160bc105dce8b96e484597a6d94808bf381be0fb511709abead2ec86ffe7cf78bcb7ae SHA512 d05dca920fe759ffa66a59125ad6fdec486642bc990e4db60d8306d2170c9afb3c476e179234400c2d03c81dfc0118b8736b9749c71916880307aeb7a5390143
-EBUILD selinux-automount-2.20220106-r1.ebuild 287 BLAKE2B 18b4b307eb7e42072ffdd0361ee9481095d362676df032f4856da6c02929e2033406a60d4351d60bf16e4596ed8e41e09aa8a01d6c14c2d9d09d2f6936ac8114 SHA512 2887b5ae974049cebb56b29564be4f6db64eb1fdda95391271adab0d1f243396b262628597574c1c4ce03729ae5bf70be5da5469dd52e28ad8383bd216caf6d3
+EBUILD selinux-automount-2.20220106-r1.ebuild 285 BLAKE2B 2c3a2825e3dd5806e464ee18fe0024d16687032a9732553245910d74874e0fd4ce5730bae1c66ffcde8a44fdaf50223f8f9f4a3691da0b6af72a86dcd6083d14 SHA512 643ee68b0ae8acb114674271915768ecd3b6f8664f614a6ef1aaa10f3ce84ddae549062c6a0e593b8c556df1883b7b7762fe3087b4960c5b1e39807c2c399885
+EBUILD selinux-automount-2.20220106-r2.ebuild 287 BLAKE2B 18b4b307eb7e42072ffdd0361ee9481095d362676df032f4856da6c02929e2033406a60d4351d60bf16e4596ed8e41e09aa8a01d6c14c2d9d09d2f6936ac8114 SHA512 2887b5ae974049cebb56b29564be4f6db64eb1fdda95391271adab0d1f243396b262628597574c1c4ce03729ae5bf70be5da5469dd52e28ad8383bd216caf6d3
 EBUILD selinux-automount-9999.ebuild 287 BLAKE2B 457da559d97ae5188ceab412ab817fe84bdd410b262453b65536cb63469408cb1037e16a91891d78cd56b1036d57f010df21a1afe63036124ec764d26560f94b SHA512 412b8778a3676d6741100421e1b1092a46c50fcc47718d0758664dad5556dd7dd967fcac7bed9626aa92dd7c4c2614998b06ecaffc29e4f621bf84204a4d2ae9
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-automount/selinux-automount-2.20220106-r1.ebuild b/sec-policy/selinux-automount/selinux-automount-2.20220106-r1.ebuild
index 5ab17db44ce5..5cf57d4b0f21 100644
--- a/sec-policy/selinux-automount/selinux-automount-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-automount/selinux-automount-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for automount"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-automount/selinux-automount-2.20220106-r2.ebuild b/sec-policy/selinux-automount/selinux-automount-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..5ab17db44ce5
--- /dev/null
+++ b/sec-policy/selinux-automount/selinux-automount-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="automount"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for automount"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-avahi/Manifest b/sec-policy/selinux-avahi/Manifest
index 169c5a8ddd8d..ec87232bb388 100644
--- a/sec-policy/selinux-avahi/Manifest
+++ b/sec-policy/selinux-avahi/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-avahi-2.20200818-r2.ebuild 275 BLAKE2B ed3d9bb0d73b78b32530132f2d0767cf85fe7f87fa360b54d8e2c1c84a41fc51c114f20b32c23dd11b6946d91f4ee784f0c777b30d1876d1558a7a4b6e2dd920 SHA512 6b56fda9c86022d077c470f0a11f3aabbaa3a5086038c563620a35144105aa7c4e56ffab4790f46978161e8da11e13e90dab8c1cf0440fe7751fa1753679c9eb
 EBUILD selinux-avahi-2.20210203-r1.ebuild 275 BLAKE2B ed3d9bb0d73b78b32530132f2d0767cf85fe7f87fa360b54d8e2c1c84a41fc51c114f20b32c23dd11b6946d91f4ee784f0c777b30d1876d1558a7a4b6e2dd920 SHA512 6b56fda9c86022d077c470f0a11f3aabbaa3a5086038c563620a35144105aa7c4e56ffab4790f46978161e8da11e13e90dab8c1cf0440fe7751fa1753679c9eb
 EBUILD selinux-avahi-2.20210908-r1.ebuild 275 BLAKE2B ed3d9bb0d73b78b32530132f2d0767cf85fe7f87fa360b54d8e2c1c84a41fc51c114f20b32c23dd11b6946d91f4ee784f0c777b30d1876d1558a7a4b6e2dd920 SHA512 6b56fda9c86022d077c470f0a11f3aabbaa3a5086038c563620a35144105aa7c4e56ffab4790f46978161e8da11e13e90dab8c1cf0440fe7751fa1753679c9eb
-EBUILD selinux-avahi-2.20220106-r1.ebuild 279 BLAKE2B a69d49dfeeff20548653dcbd1c04e79aec9ffa9a950640ed94cfd7f50de63e38023d0e4961398a941941ef8fea823579e24f015ba0bf391424392da2bc3b56c4 SHA512 5c4c7dc18594287403370916da0583f9c4905607614603108c837b44f9d06620487a77b9b9b8d9b490038c8b814ef2a614654ad65bb222b6a5ebdae47c4f1f2d
+EBUILD selinux-avahi-2.20220106-r1.ebuild 277 BLAKE2B 3e5de3ff7e5acf06572687c595ac67d24c25f66ea4e06a2d4da7348624c6908ec87328737d0351eb504dab6c9d3904f869da59d14c3078750d36e595da140c08 SHA512 40d62549f070dc86a1d65c5c24f12cd8028d4574a5571157537f71b8462e502d3a3dba7cce90458de1e04f77ffa0b6ca831a7f49ddec68fe0aaa977a3b3a25ec
+EBUILD selinux-avahi-2.20220106-r2.ebuild 279 BLAKE2B a69d49dfeeff20548653dcbd1c04e79aec9ffa9a950640ed94cfd7f50de63e38023d0e4961398a941941ef8fea823579e24f015ba0bf391424392da2bc3b56c4 SHA512 5c4c7dc18594287403370916da0583f9c4905607614603108c837b44f9d06620487a77b9b9b8d9b490038c8b814ef2a614654ad65bb222b6a5ebdae47c4f1f2d
 EBUILD selinux-avahi-9999.ebuild 279 BLAKE2B 020e8177b0effe4dc8a17976a83e13e034f1f64659fdcc68b1aa4823371b7701e64aa0eeb78a37cea288a047e9d12c23cef1685d75f0c6f7651db47db099422b SHA512 73e0e6c785b705ca00dc0e68003f1f5c5ff5e9d41938f152cd1915d480a80127fead13127d7c6e72def1070032f67a7d9dee6c00a0e722d3d2ddbc1936cddef3
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-avahi/selinux-avahi-2.20220106-r1.ebuild b/sec-policy/selinux-avahi/selinux-avahi-2.20220106-r1.ebuild
index 3830ba8d0124..b69fbd092c60 100644
--- a/sec-policy/selinux-avahi/selinux-avahi-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-avahi/selinux-avahi-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for avahi"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-avahi/selinux-avahi-2.20220106-r2.ebuild b/sec-policy/selinux-avahi/selinux-avahi-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..3830ba8d0124
--- /dev/null
+++ b/sec-policy/selinux-avahi/selinux-avahi-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="avahi"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for avahi"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-awstats/Manifest b/sec-policy/selinux-awstats/Manifest
index b851f81de6dc..8eb092cc31f7 100644
--- a/sec-policy/selinux-awstats/Manifest
+++ b/sec-policy/selinux-awstats/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-awstats-2.20200818-r2.ebuild 375 BLAKE2B 9cc3830331c9c5f8286ac008d9f6ed077d7cee9f08237e62e204c1a3b0b52a7104498799808951c5eff09cd12feb37b598b03b531b6dd28e6b41f8df3f0134ef SHA512 bba7cc5e99948d77097291b6f6f8b5117d0e5b4dfb78e501c97546a4641c3c32f5d825ad8ef022ebfbba989ec2494a6db7c9bb6e8f1fd6a5f775f8b30ffa45fd
 EBUILD selinux-awstats-2.20210203-r1.ebuild 375 BLAKE2B 9cc3830331c9c5f8286ac008d9f6ed077d7cee9f08237e62e204c1a3b0b52a7104498799808951c5eff09cd12feb37b598b03b531b6dd28e6b41f8df3f0134ef SHA512 bba7cc5e99948d77097291b6f6f8b5117d0e5b4dfb78e501c97546a4641c3c32f5d825ad8ef022ebfbba989ec2494a6db7c9bb6e8f1fd6a5f775f8b30ffa45fd
 EBUILD selinux-awstats-2.20210908-r1.ebuild 375 BLAKE2B 9cc3830331c9c5f8286ac008d9f6ed077d7cee9f08237e62e204c1a3b0b52a7104498799808951c5eff09cd12feb37b598b03b531b6dd28e6b41f8df3f0134ef SHA512 bba7cc5e99948d77097291b6f6f8b5117d0e5b4dfb78e501c97546a4641c3c32f5d825ad8ef022ebfbba989ec2494a6db7c9bb6e8f1fd6a5f775f8b30ffa45fd
-EBUILD selinux-awstats-2.20220106-r1.ebuild 379 BLAKE2B 2c7b7cd9e595095891932d8b3b23cb519d658a30ff2846a70cbad3a7bcb66bb07cdf39d59762cdb0aedbc4b70f69e26b9a60fa740ced9697363eb4696eb50865 SHA512 d870b606c1bcece355771e6428629fcda00e22f4d6c5aac432e048369de49c25661391e0e568b60fffca816b6f4ca13536c1348ca96c63b45bb516a7591b49f8
+EBUILD selinux-awstats-2.20220106-r1.ebuild 377 BLAKE2B 217ad738e29fcc29c76c0a49be5ce8860c158454504bb0d0df88c9f56fa7843745fc7c281dc6f6a3fd05b60faafaede40b0d90cd2bc16c4702b807b03ccf1ac0 SHA512 1606067925e56221b385c2176b1676f2e6432bafbee4483bae363a749c1980b89649be09eaa01990d4e9896baa6f5934b7382626df31b2f23bedf7da1456aac6
+EBUILD selinux-awstats-2.20220106-r2.ebuild 379 BLAKE2B 2c7b7cd9e595095891932d8b3b23cb519d658a30ff2846a70cbad3a7bcb66bb07cdf39d59762cdb0aedbc4b70f69e26b9a60fa740ced9697363eb4696eb50865 SHA512 d870b606c1bcece355771e6428629fcda00e22f4d6c5aac432e048369de49c25661391e0e568b60fffca816b6f4ca13536c1348ca96c63b45bb516a7591b49f8
 EBUILD selinux-awstats-9999.ebuild 379 BLAKE2B a04a8e4a3085b77b89fe473341f8490fb3ab32e18064f6424f58daed67a550824f617993b37d64b89be7c656c924986ddaa205af76d0556fa227cf8cfe8e1b6e SHA512 a350af719fc1b332697037f8a60ba0029f152d153f1e009ec97c0a9773fe38fb36ade54495fe1d6116bf2a965a55f1b0f8d73e9a0c326225b095b33a76450ee1
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-awstats/selinux-awstats-2.20220106-r1.ebuild b/sec-policy/selinux-awstats/selinux-awstats-2.20220106-r1.ebuild
index 539e884341a4..d0e3ea2d175e 100644
--- a/sec-policy/selinux-awstats/selinux-awstats-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-awstats/selinux-awstats-2.20220106-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for awstats"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-awstats/selinux-awstats-2.20220106-r2.ebuild b/sec-policy/selinux-awstats/selinux-awstats-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..539e884341a4
--- /dev/null
+++ b/sec-policy/selinux-awstats/selinux-awstats-2.20220106-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="awstats"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for awstats"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-backup/Manifest b/sec-policy/selinux-backup/Manifest
index 464ca529bc47..1cb00d24590a 100644
--- a/sec-policy/selinux-backup/Manifest
+++ b/sec-policy/selinux-backup/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-backup-2.20200818-r2.ebuild 290 BLAKE2B e8af0001f52eb59c3fce2cc8d3a1a4374a6d94161e07a06923547235083061cd07c22ab219894f1d7b7c8b91bcec2dadd76082ddb54e63eb99870ca207107184 SHA512 568fb5d903c3ccf3f9b2a3386ee81c39b94ab61566f6b09d7cfd25cc89dbe8bec52f9e4f32b315f5e7d05468962fdac5d56857df140e709f95e01dd8dbb9b3a5
 EBUILD selinux-backup-2.20210203-r1.ebuild 290 BLAKE2B e8af0001f52eb59c3fce2cc8d3a1a4374a6d94161e07a06923547235083061cd07c22ab219894f1d7b7c8b91bcec2dadd76082ddb54e63eb99870ca207107184 SHA512 568fb5d903c3ccf3f9b2a3386ee81c39b94ab61566f6b09d7cfd25cc89dbe8bec52f9e4f32b315f5e7d05468962fdac5d56857df140e709f95e01dd8dbb9b3a5
 EBUILD selinux-backup-2.20210908-r1.ebuild 290 BLAKE2B e8af0001f52eb59c3fce2cc8d3a1a4374a6d94161e07a06923547235083061cd07c22ab219894f1d7b7c8b91bcec2dadd76082ddb54e63eb99870ca207107184 SHA512 568fb5d903c3ccf3f9b2a3386ee81c39b94ab61566f6b09d7cfd25cc89dbe8bec52f9e4f32b315f5e7d05468962fdac5d56857df140e709f95e01dd8dbb9b3a5
-EBUILD selinux-backup-2.20220106-r1.ebuild 294 BLAKE2B 6d7f5c8abadf0e10e42b0381ca57edc0bf4803390cf0a3321c8dc81f85217fa58e575ab78210557c8ea6be44cda48b5ea2432a6ad5c06970ac364c12677bd57a SHA512 711759ef320109df3909149245a919f11468f7a328e1110747ae8be49f9a517ad391c1e666fdddc30c1e8f4a92f1558585b97f0cc3f20f202ae911d7e6b524d1
+EBUILD selinux-backup-2.20220106-r1.ebuild 292 BLAKE2B 0d58a2a21f52331590ef70c21fddb720b9f35b0e39441f147afad059df1753f9fac25a7b3223492eacf6cae633b364b555669affc39b3708288fe1ccbfa44fbb SHA512 b3ace5853157ace80a3482db77b05bd61449f8e84c577ba3328b205fa741176462ae43b5413787f674da48c50c7c38db578d0300fc95d9585aedc6362eaac361
+EBUILD selinux-backup-2.20220106-r2.ebuild 294 BLAKE2B 6d7f5c8abadf0e10e42b0381ca57edc0bf4803390cf0a3321c8dc81f85217fa58e575ab78210557c8ea6be44cda48b5ea2432a6ad5c06970ac364c12677bd57a SHA512 711759ef320109df3909149245a919f11468f7a328e1110747ae8be49f9a517ad391c1e666fdddc30c1e8f4a92f1558585b97f0cc3f20f202ae911d7e6b524d1
 EBUILD selinux-backup-9999.ebuild 294 BLAKE2B 771aa77e0ceae4ef71d9fabde7d1bf589bb9eb0fc0453d35762c66209ed277b389a5e3d13d25049c16cbae1a7a01b991d3b70fad7cf5a13de7cc9fea7b6cca68 SHA512 bff8a907b953b6d27770b967d1c68a5dba1f3b36dba42adc6c953a9b94d365fad3ae54c8f654b477a3d171161ffbbe0e55f90560217da86a92fff7ad9b6be803
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-backup/selinux-backup-2.20220106-r1.ebuild b/sec-policy/selinux-backup/selinux-backup-2.20220106-r1.ebuild
index 4e33836dadf9..4a3cabae1b75 100644
--- a/sec-policy/selinux-backup/selinux-backup-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-backup/selinux-backup-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for generic backup apps"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-backup/selinux-backup-2.20220106-r2.ebuild b/sec-policy/selinux-backup/selinux-backup-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..4e33836dadf9
--- /dev/null
+++ b/sec-policy/selinux-backup/selinux-backup-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="backup"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for generic backup apps"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-bacula/Manifest b/sec-policy/selinux-bacula/Manifest
index 521ff95d7a06..0b7aa35e0097 100644
--- a/sec-policy/selinux-bacula/Manifest
+++ b/sec-policy/selinux-bacula/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-bacula-2.20200818-r2.ebuild 277 BLAKE2B 05a020e0ad479d7f68993a30c1e2b5e281ad8e084ed2f2619680e81b237bc2794ef43376ac8bcb972d27eb09d27f0344d3e4dba6e0aadfbcef66dd02c95c7648 SHA512 9f7a6de7fe29f4c9227cc4fd1b6c699aad74ed2fce3fe27d286cf65df67d614916ac509da937352378144a08c27b2c4329e8af135b2bbced752186b4fe03f066
 EBUILD selinux-bacula-2.20210203-r1.ebuild 277 BLAKE2B 05a020e0ad479d7f68993a30c1e2b5e281ad8e084ed2f2619680e81b237bc2794ef43376ac8bcb972d27eb09d27f0344d3e4dba6e0aadfbcef66dd02c95c7648 SHA512 9f7a6de7fe29f4c9227cc4fd1b6c699aad74ed2fce3fe27d286cf65df67d614916ac509da937352378144a08c27b2c4329e8af135b2bbced752186b4fe03f066
 EBUILD selinux-bacula-2.20210908-r1.ebuild 277 BLAKE2B 05a020e0ad479d7f68993a30c1e2b5e281ad8e084ed2f2619680e81b237bc2794ef43376ac8bcb972d27eb09d27f0344d3e4dba6e0aadfbcef66dd02c95c7648 SHA512 9f7a6de7fe29f4c9227cc4fd1b6c699aad74ed2fce3fe27d286cf65df67d614916ac509da937352378144a08c27b2c4329e8af135b2bbced752186b4fe03f066
-EBUILD selinux-bacula-2.20220106-r1.ebuild 281 BLAKE2B 29adf679e08dff6d226a094afbb48a482242a2811a925cfe3e0a5f0a278035ef84d248c57826d494ab05314a8e1ccc84db628d0d4328199ea373abae86d508e0 SHA512 c64c5a9a3e01a5b9fd56fd58f4a2c40edd07438ccabbde76ea51c60a6cf75440e414ac01e21700fd3598e43e34b34f711ea5c35ceae297140868fc74c6dab27c
+EBUILD selinux-bacula-2.20220106-r1.ebuild 279 BLAKE2B 3403266df565e7126286131e67a84943845bb1ec4ee949497321707a17a295ff25d9c7d1a0e3c1e45acef623956a54bae16c0f304b0ee6db31a2f6fd73d7fd48 SHA512 1cd7d378c40248ce0ed3a6d43bb537f8765f132b8380bd189f0857aa96a65ea205cdc4a8b11bf4911ae8d9b8f840b97453720da484c160c576abbcbc5d4dd9b6
+EBUILD selinux-bacula-2.20220106-r2.ebuild 281 BLAKE2B 29adf679e08dff6d226a094afbb48a482242a2811a925cfe3e0a5f0a278035ef84d248c57826d494ab05314a8e1ccc84db628d0d4328199ea373abae86d508e0 SHA512 c64c5a9a3e01a5b9fd56fd58f4a2c40edd07438ccabbde76ea51c60a6cf75440e414ac01e21700fd3598e43e34b34f711ea5c35ceae297140868fc74c6dab27c
 EBUILD selinux-bacula-9999.ebuild 281 BLAKE2B 6f84d32bf75b7d7ddbbd22268565405b724751d367ec0c67eeb0ecbe6ba5efa0ef34cd63ebc8307581f1fe1629ddc2f5a7eac97db9f98a6c3ed192d725ced33f SHA512 a47de95e2a4f98080286ab7d666bb3f34d6c825dcff7feeef3d1963ce9e8b4cfc5432e69999efda926adc2d9126a0d253ef2a4d4acdcffb54068c25b7d2869c0
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-bacula/selinux-bacula-2.20220106-r1.ebuild b/sec-policy/selinux-bacula/selinux-bacula-2.20220106-r1.ebuild
index a37c76d6390f..0e69efa7961a 100644
--- a/sec-policy/selinux-bacula/selinux-bacula-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-bacula/selinux-bacula-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for bacula"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-bacula/selinux-bacula-2.20220106-r2.ebuild b/sec-policy/selinux-bacula/selinux-bacula-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..a37c76d6390f
--- /dev/null
+++ b/sec-policy/selinux-bacula/selinux-bacula-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="bacula"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for bacula"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-base-policy/Manifest b/sec-policy/selinux-base-policy/Manifest
index 73f2a2078bda..121d09564671 100644
--- a/sec-policy/selinux-base-policy/Manifest
+++ b/sec-policy/selinux-base-policy/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-base-policy-2.20200818-r2.ebuild 3858 BLAKE2B cc4fa5dfe2400aced0d9c9c979a96961051db58b2ad64ced1eb2c894681af47d03f08979170e6baa2183fb59fa6b9b58228f26d20ac1d516c757a2ad5becda88 SHA512 051673659fd4d140152853db2281fa18d5d8d8dc6acaca930d953dd7241b55f383b648e8aa3b95e4c833347bdbd51aa6ddd7091a75ae95bf84a2a3f5057eb808
 EBUILD selinux-base-policy-2.20210203-r1.ebuild 4195 BLAKE2B 60c82839d39e6edde5e5ee8447696e0397828c6758b1d16e1323f45c1ce2b3d0df933095a1740d905fdb8fcfcf580115cedb6e4d52fef0abee818ccb23cc1ae0 SHA512 9f723ef8959da2be0433bc79aaad6f0287b70605ef847198fec1636ad33bd1b2328d24cb5dfa2db40c6dbeff67ab1e1f19a00d36031c15f5ea2d8904deebc63e
 EBUILD selinux-base-policy-2.20210908-r1.ebuild 4195 BLAKE2B 60c82839d39e6edde5e5ee8447696e0397828c6758b1d16e1323f45c1ce2b3d0df933095a1740d905fdb8fcfcf580115cedb6e4d52fef0abee818ccb23cc1ae0 SHA512 9f723ef8959da2be0433bc79aaad6f0287b70605ef847198fec1636ad33bd1b2328d24cb5dfa2db40c6dbeff67ab1e1f19a00d36031c15f5ea2d8904deebc63e
-EBUILD selinux-base-policy-2.20220106-r1.ebuild 4199 BLAKE2B 4a50c4bd60d4e9fde28d45bc3e9773e6644b2c470b1043de8cd03a050f92bc2f85d70157746e94977cc91967e563470e092622e2c6ce478b1f82b2b1bf33eb28 SHA512 608421fb0a4e82a85948d7f340afad637d02fef0b69521d1442b69f11d92f95caf0d258b2d138eb0687aedb4c443173656291b174accdea345e968c79cb263d7
+EBUILD selinux-base-policy-2.20220106-r1.ebuild 4197 BLAKE2B ff65dd39b07964c4718cd2d8eca287b6450de1be8c73f0f86902a4197f8452fd0008b5b793490c519846d7357ecaa11c3ff5023204f2236d2c3dfaaaad74d662 SHA512 0be3221c627cec14b7975b9a1b3d012a23eafc76ca77cb99448a37a742c3fe58240834959bbea608652f1598b239d8dc78c47c87b880e04d3752419352cd4123
+EBUILD selinux-base-policy-2.20220106-r2.ebuild 4199 BLAKE2B 4a50c4bd60d4e9fde28d45bc3e9773e6644b2c470b1043de8cd03a050f92bc2f85d70157746e94977cc91967e563470e092622e2c6ce478b1f82b2b1bf33eb28 SHA512 608421fb0a4e82a85948d7f340afad637d02fef0b69521d1442b69f11d92f95caf0d258b2d138eb0687aedb4c443173656291b174accdea345e968c79cb263d7
 EBUILD selinux-base-policy-9999.ebuild 4199 BLAKE2B 4a50c4bd60d4e9fde28d45bc3e9773e6644b2c470b1043de8cd03a050f92bc2f85d70157746e94977cc91967e563470e092622e2c6ce478b1f82b2b1bf33eb28 SHA512 608421fb0a4e82a85948d7f340afad637d02fef0b69521d1442b69f11d92f95caf0d258b2d138eb0687aedb4c443173656291b174accdea345e968c79cb263d7
 MISC metadata.xml 535 BLAKE2B db3aa01f5f57a5d30b7a39721a569bd2efe77a87701fb4e5d4e64ead0d13b4055dc5224bb7c95bf261e623163a59c18da5500d8da77b3de07801dcb13a9d4077 SHA512 592e02632b459156a686aa752bdcd04c00b6de8029831e39c2bf7c2e9a5e7886d8ebf0a5d16cbe1f6878428ce4e266dc676bf80657d018d204304d1113af7fcf
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20220106-r1.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20220106-r1.ebuild
index c6f79d31df40..54fe8db8729a 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20220106-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_${PV/./_}/refpolicy-${PV}.tar.bz2
 			https://dev.gentoo.org/~perfinion/patches/${PN}/patchbundle-${PN}-${PVR}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
 
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux"
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20220106-r2.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..c6f79d31df40
--- /dev/null
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20220106-r2.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="${SELINUX_GIT_REPO:-https://anongit.gentoo.org/git/proj/hardened-refpolicy.git}"
+	EGIT_BRANCH="${SELINUX_GIT_BRANCH:-master}"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/refpolicy"
+
+	inherit git-r3
+else
+	SRC_URI="https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_${PV/./_}/refpolicy-${PV}.tar.bz2
+			https://dev.gentoo.org/~perfinion/patches/${PN}/patchbundle-${PN}-${PVR}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux"
+DESCRIPTION="SELinux policy for core modules"
+
+IUSE="systemd +unconfined"
+
+PDEPEND="unconfined? ( sec-policy/selinux-unconfined )"
+DEPEND="=sec-policy/selinux-base-${PVR}[systemd?]"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	sys-apps/checkpolicy
+	sys-devel/m4"
+
+MODS="application authlogin bootloader clock consoletype cron dmesg fstools getty hostname init iptables libraries locallogin logging lvm miscfiles modutils mount mta netutils nscd portage raid rsync selinuxutil setrans ssh staff storage su sysadm sysnetwork systemd tmpfiles udev userdomain usermanage unprivuser xdg"
+DEL_MODS="hotplug"
+LICENSE="GPL-2"
+SLOT="0"
+S="${WORKDIR}/"
+
+# Code entirely copied from selinux-eclass (cannot inherit due to dependency on
+# itself), when reworked reinclude it. Only postinstall (where -b base.pp is
+# added) needs to remain then.
+
+pkg_pretend() {
+	for i in ${POLICY_TYPES}; do
+		if [[ "${i}" == "targeted" ]] && ! use unconfined; then
+			die "If you use POLICY_TYPES=targeted, then USE=unconfined is mandatory."
+		fi
+	done
+}
+
+src_prepare() {
+	local modfiles
+
+	if [[ ${PV} != 9999* ]]; then
+		einfo "Applying SELinux policy updates ... "
+		eapply -p0 "${WORKDIR}/0001-full-patch-against-stable-release.patch"
+	fi
+
+	eapply_user
+
+	# Collect only those files needed for this particular module
+	for i in ${MODS}; do
+		modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.te) $modfiles"
+		modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.fc) $modfiles"
+	done
+
+	for i in ${DEL_MODS}; do
+		[[ "${MODS}" != *${i}* ]] || die "Duplicate module in MODS and DEL_MODS: ${i}"
+	done
+
+	for i in ${POLICY_TYPES}; do
+		mkdir "${S}"/${i} || die "Failed to create directory ${S}/${i}"
+		cp "${S}"/refpolicy/doc/Makefile.example "${S}"/${i}/Makefile \
+			|| die "Failed to copy Makefile.example to ${S}/${i}/Makefile"
+
+		cp ${modfiles} "${S}"/${i} \
+			|| die "Failed to copy the module files to ${S}/${i}"
+	done
+}
+
+src_compile() {
+	for i in ${POLICY_TYPES}; do
+		emake NAME=$i SHAREDIR="${SYSROOT%/}/usr/share/selinux" -C "${S}"/${i}
+	done
+}
+
+src_install() {
+	local BASEDIR="/usr/share/selinux"
+
+	for i in ${POLICY_TYPES}; do
+		for j in ${MODS}; do
+			einfo "Installing ${i} ${j} policy package"
+			insinto ${BASEDIR}/${i}
+			doins "${S}"/${i}/${j}.pp
+		done
+	done
+}
+
+pkg_postinst() {
+	# Set root path and don't load policy into the kernel when cross compiling
+	local root_opts=""
+	if [[ "${ROOT}" != "" ]]; then
+		root_opts="-p ${ROOT} -n"
+	fi
+
+	# Override the command from the eclass, we need to load in base as well here
+	local COMMAND="-i base.pp"
+	if has_version "<sys-apps/policycoreutils-2.5"; then
+		COMMAND="-b base.pp"
+	fi
+
+	for i in ${MODS}; do
+		COMMAND="${COMMAND} -i ${i}.pp"
+	done
+
+	for i in ${POLICY_TYPES}; do
+		einfo "Inserting the following modules, with base, into the $i module store: ${MODS}"
+
+		cd "${ROOT}/usr/share/selinux/${i}"
+
+		semodule ${root_opts} -s ${i} ${COMMAND}
+
+		for mod in ${DEL_MODS}; do
+			if semodule ${root_opts} -s ${i} -l | grep -q "\b${mod}\b"; then
+				einfo "Removing obsolete ${i} ${mod} policy package"
+				semodule ${root_opts} -s ${i} -r ${mod}
+			fi
+		done
+	done
+
+	# Don't relabel when cross compiling
+	if [[ "${ROOT}" == "" ]]; then
+		# Relabel depending packages
+		local PKGSET="";
+		if [[ -x /usr/bin/qdepends ]] ; then
+			PKGSET=$(/usr/bin/qdepends -Cq -r -Q ${CATEGORY}/${PN} | grep -v 'sec-policy/selinux-');
+		elif [[ -x /usr/bin/equery ]] ; then
+			PKGSET=$(/usr/bin/equery -Cq depends ${CATEGORY}/${PN} | grep -v 'sec-policy/selinux-');
+		fi
+		if [[ -n "${PKGSET}" ]] ; then
+			rlpkg ${PKGSET};
+		fi
+	fi
+}
diff --git a/sec-policy/selinux-base/Manifest b/sec-policy/selinux-base/Manifest
index c502d2458f50..ebf3819bd2b1 100644
--- a/sec-policy/selinux-base/Manifest
+++ b/sec-policy/selinux-base/Manifest
@@ -4,6 +4,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -11,6 +12,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-base-2.20200818-r2.ebuild 4080 BLAKE2B c948789e28d2be05711bed82023f38de8132aa772fd91c0b737d9a7af11c88141b5d621722954db7a2e70a5723be20b92149faa0127d6cddad49c6a19cf7b9d7 SHA512 6f6bacfe68190de235c3c73c27f5eb496fc9fe2cec6f7d590373b1db6a4db4c5f529bd96c4d6bc691f4f1ea28bb76e18d2ffd237ea4d82d6ef8595773e6e465c
 EBUILD selinux-base-2.20210203-r1.ebuild 4175 BLAKE2B b6563e5a560c210fa0fd64e22aca74a196da14dce351a00d6b717df4f64d404e66efe16abefe8d115ce6cefac2753f3a83b2ebae1e56a367a19ee026a3b0d57d SHA512 f168b6284e490325e6ce8f4a35bee900ce4af5b328fe644e2c91192e2912c8b228d046e215c3293032ce5aaf782c322df87a001fa44ad04fd20061b55a67c7a7
 EBUILD selinux-base-2.20210908-r1.ebuild 4175 BLAKE2B b6563e5a560c210fa0fd64e22aca74a196da14dce351a00d6b717df4f64d404e66efe16abefe8d115ce6cefac2753f3a83b2ebae1e56a367a19ee026a3b0d57d SHA512 f168b6284e490325e6ce8f4a35bee900ce4af5b328fe644e2c91192e2912c8b228d046e215c3293032ce5aaf782c322df87a001fa44ad04fd20061b55a67c7a7
-EBUILD selinux-base-2.20220106-r1.ebuild 4179 BLAKE2B bc1c425cea121d1daa7767b0395984abaebc039b6eba516c41cd9f4865886c889ca933f5b56eb1b99a778df7914337fb1d6e17052a06c17c283d7de2d86904e7 SHA512 b3929519b18a9ef91f82187b9362ff079db3efe7238b5af737dadfda1d7800081205e6a1122eac477e9b49ee6fceb7dac918d40c7c5e08dac1c4866b70a15486
+EBUILD selinux-base-2.20220106-r1.ebuild 4177 BLAKE2B 8977045de111c35f0e24ce366b112dcbb7b61f589018c8f3ac6dc90dd2fd14b86355330865675b56b8a06c17c4ec4f7e5575b98e4d617ade3bab2a69bdc3493e SHA512 8e2ac1ef563170533b76f9f6851da7546bb8a5a85a2c1e0161b3f0baceffae3650b1a0435df80b5d61bc5feb67d45ee33d8007a88237939a616b9c8281afcdf5
+EBUILD selinux-base-2.20220106-r2.ebuild 4179 BLAKE2B bc1c425cea121d1daa7767b0395984abaebc039b6eba516c41cd9f4865886c889ca933f5b56eb1b99a778df7914337fb1d6e17052a06c17c283d7de2d86904e7 SHA512 b3929519b18a9ef91f82187b9362ff079db3efe7238b5af737dadfda1d7800081205e6a1122eac477e9b49ee6fceb7dac918d40c7c5e08dac1c4866b70a15486
 EBUILD selinux-base-9999.ebuild 4179 BLAKE2B f34f34c4723b1fb40998ff1f9e84948fd9e478d13fab867892b07d17cb01ddfeae613f62b449d4173caefce607683601fa4517384d1e89a71b595967e7a7a345 SHA512 f9959a6aaa90914a6c0d705a2e318a21858b967980e694a3fda0a03393d107a0ac26cf1e0c3ef891f5276ad54c27f787445e732af70fd279a2eb925e459d0ab5
 MISC metadata.xml 745 BLAKE2B 7079a3d2e3455a9261439f607e4590fa2199ec642805127ab8f8b4876a1f642022f1ce636e6304db686baed0e05fc209007f2043e121618b31f1d0a4d23a3349 SHA512 9e17f2409d9ca252b2f2871e6a1028d1ec862c7ea27e0d0a10f07807061b4171f65d4b3673bc79451c0cd167944bcf78fcb37a7db43f66b2f21ff7f765aa8421
diff --git a/sec-policy/selinux-base/selinux-base-2.20220106-r1.ebuild b/sec-policy/selinux-base/selinux-base-2.20220106-r1.ebuild
index 659fad659691..ec2f07463379 100644
--- a/sec-policy/selinux-base/selinux-base-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-base/selinux-base-2.20220106-r1.ebuild
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_${PV/./_}/refpolicy-${PV}.tar.bz2
 			https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-${PVR}.tar.bz2"
 
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
 
 IUSE="doc +unknown-perms systemd +ubac +unconfined"
diff --git a/sec-policy/selinux-base/selinux-base-2.20220106-r2.ebuild b/sec-policy/selinux-base/selinux-base-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..659fad659691
--- /dev/null
+++ b/sec-policy/selinux-base/selinux-base-2.20220106-r2.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_REQ_USE="xml"
+inherit python-any-r1
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="${SELINUX_GIT_REPO:-https://anongit.gentoo.org/git/proj/hardened-refpolicy.git}"
+	EGIT_BRANCH="${SELINUX_GIT_BRANCH:-master}"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/refpolicy"
+
+	inherit git-r3
+else
+	SRC_URI="https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_${PV/./_}/refpolicy-${PV}.tar.bz2
+			https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-${PVR}.tar.bz2"
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+
+IUSE="doc +unknown-perms systemd +ubac +unconfined"
+
+DESCRIPTION="Gentoo base policy for SELinux"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux"
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND=">=sys-apps/policycoreutils-2.8"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=sys-apps/checkpolicy-2.8
+	sys-devel/m4"
+
+S=${WORKDIR}/
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]]; then
+		einfo "Applying SELinux policy updates ... "
+		eapply -p0 "${WORKDIR}/0001-full-patch-against-stable-release.patch"
+	fi
+
+	eapply_user
+
+	cd "${S}/refpolicy" || die
+	emake bare
+}
+
+src_configure() {
+	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
+
+	# Update the SELinux refpolicy capabilities based on the users' USE flags.
+	if use unknown-perms; then
+		sed -i -e '/^UNK_PERMS/s/deny/allow/' "${S}/refpolicy/build.conf" \
+			|| die "Failed to allow Unknown Permissions Handling"
+		sed -i -e '/^UNK_PERMS/s/deny/allow/' "${S}/refpolicy/Makefile" \
+			|| die "Failed to allow Unknown Permissions Handling"
+	fi
+
+	if ! use ubac; then
+		sed -i -e '/^UBAC/s/y/n/' "${S}/refpolicy/build.conf" \
+			|| die "Failed to disable User Based Access Control"
+	fi
+
+	if use systemd; then
+		sed -i -e '/^SYSTEMD/s/n/y/' "${S}/refpolicy/build.conf" \
+			|| die "Failed to enable SystemD"
+	fi
+
+	echo "DISTRO = gentoo" >> "${S}/refpolicy/build.conf" || die
+
+	# Prepare initial configuration
+	cd "${S}/refpolicy" || die
+	emake conf
+
+	# Setup the policies based on the types delivered by the end user.
+	# These types can be "targeted", "strict", "mcs" and "mls".
+	for i in ${POLICY_TYPES}; do
+		cp -a "${S}/refpolicy" "${S}/${i}" || die
+		cd "${S}/${i}" || die
+
+		sed -i -e "/= module/d" "${S}/${i}/policy/modules.conf" || die
+
+		sed -i -e '/^QUIET/s/n/y/' -e "/^NAME/s/refpolicy/$i/" \
+			"${S}/${i}/build.conf" || die "build.conf setup failed."
+
+		if [[ "${i}" == "mls" ]] || [[ "${i}" == "mcs" ]];
+		then
+			# MCS/MLS require additional settings
+			sed -i -e "/^TYPE/s/standard/${i}/" "${S}/${i}/build.conf" \
+				|| die "failed to set type to mls"
+		fi
+
+		if [ "${i}" == "targeted" ]; then
+			sed -i -e '/root/d' -e 's/user_u/unconfined_u/' \
+			"${S}/${i}/config/appconfig-standard/seusers" \
+			|| die "targeted seusers setup failed."
+		fi
+
+		if [ "${i}" != "targeted" ] && [ "${i}" != "strict" ] && use unconfined; then
+			sed -i -e '/root/d' -e 's/user_u/unconfined_u/' \
+			"${S}/${i}/config/appconfig-${i}/seusers" \
+			|| die "policy seusers setup failed."
+		fi
+	done
+}
+
+src_compile() {
+	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
+
+	for i in ${POLICY_TYPES}; do
+		cd "${S}/${i}" || die
+		emake base
+		if use doc; then
+			emake html
+		fi
+	done
+}
+
+src_install() {
+	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
+
+	for i in ${POLICY_TYPES}; do
+		cd "${S}/${i}" || die
+
+		emake DESTDIR="${D}" install
+		emake DESTDIR="${D}" install-headers
+
+		echo "run_init_t" > "${D}/etc/selinux/${i}/contexts/run_init_type" || die
+
+		echo "textrel_shlib_t" >> "${D}/etc/selinux/${i}/contexts/customizable_types" || die
+
+		# libsemanage won't make this on its own
+		keepdir "/etc/selinux/${i}/policy"
+
+		if use doc; then
+			docinto ${i}/html
+			dodoc -r doc/html/*;
+		fi
+
+		insinto /usr/share/selinux/devel;
+		doins doc/policy.xml;
+
+	done
+
+	docinto /
+	dodoc doc/Makefile.example doc/example.{te,fc,if}
+
+	doman man/man8/*.8;
+
+	insinto /etc/selinux
+	doins "${FILESDIR}/config"
+
+	insinto /usr/share/portage/config/sets
+	doins "${FILESDIR}/selinux.conf"
+}
diff --git a/sec-policy/selinux-bind/Manifest b/sec-policy/selinux-bind/Manifest
index d3676761b15c..6ff1b85d0e77 100644
--- a/sec-policy/selinux-bind/Manifest
+++ b/sec-policy/selinux-bind/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-bind-2.20200818-r2.ebuild 273 BLAKE2B c36d2b370e97ec65cfe9ac6ded942fb1a2ab0fea98c093e109a3959039657e642bc9045dae9536e9a816781c2d2da2513f880f0ba624f2ddccb360beeef8ba6c SHA512 28cfcec9bd5d32ec8eb9e3920983455f9ce1039acfa154c10c00bf23c9cd25d43386ae25fa96657beccf6d8493c73288879934e8c7b342516646452c1424fc97
 EBUILD selinux-bind-2.20210203-r1.ebuild 273 BLAKE2B c36d2b370e97ec65cfe9ac6ded942fb1a2ab0fea98c093e109a3959039657e642bc9045dae9536e9a816781c2d2da2513f880f0ba624f2ddccb360beeef8ba6c SHA512 28cfcec9bd5d32ec8eb9e3920983455f9ce1039acfa154c10c00bf23c9cd25d43386ae25fa96657beccf6d8493c73288879934e8c7b342516646452c1424fc97
 EBUILD selinux-bind-2.20210908-r1.ebuild 273 BLAKE2B c36d2b370e97ec65cfe9ac6ded942fb1a2ab0fea98c093e109a3959039657e642bc9045dae9536e9a816781c2d2da2513f880f0ba624f2ddccb360beeef8ba6c SHA512 28cfcec9bd5d32ec8eb9e3920983455f9ce1039acfa154c10c00bf23c9cd25d43386ae25fa96657beccf6d8493c73288879934e8c7b342516646452c1424fc97
-EBUILD selinux-bind-2.20220106-r1.ebuild 277 BLAKE2B 3c28f8e32263c72e5b6d92da78303ac9eed6a42ae46193719f9d0bc973a8d455116ff5af4f39a432a549b64c130a1193582ec9f41075f49133e00091c1d67b65 SHA512 85d8b5b10dc5c6575aac40929bbeaba993b0fbc91ed58b2f943cccc93bada58854f3730d350fe691478e5b2736323ed0aef9c1db8113e0bb5954390a5e0bf0f7
+EBUILD selinux-bind-2.20220106-r1.ebuild 275 BLAKE2B 50ed20efb82a8c76e0ed920e894ab5b3731e6e7189e23862900ac5804766591035c35f4fac9b32101f6f1753f60169ecc71af64a3494fc87a515394855b13d93 SHA512 f3dd5710acea322d5e5591e4003f09e2f841868b72b6e8f001cb8cfaae601b162b7e348c34a31f390403cd9392952b74e78ddad394955c5947ef45be2c26706c
+EBUILD selinux-bind-2.20220106-r2.ebuild 277 BLAKE2B 3c28f8e32263c72e5b6d92da78303ac9eed6a42ae46193719f9d0bc973a8d455116ff5af4f39a432a549b64c130a1193582ec9f41075f49133e00091c1d67b65 SHA512 85d8b5b10dc5c6575aac40929bbeaba993b0fbc91ed58b2f943cccc93bada58854f3730d350fe691478e5b2736323ed0aef9c1db8113e0bb5954390a5e0bf0f7
 EBUILD selinux-bind-9999.ebuild 277 BLAKE2B 87b2d76309d75420735bb8b81f2d44d99235c188d29c65b576fe1ebca2004a83cc9cbf141f7ac0b9857166c7c2239a313c17a32c8a6f366015c36cbfd5cc5f9a SHA512 2edeee5d7ddbed215eff5f0ca0548268dc6f450259f3263b56f137712db6914386ddf388b366546f4f6c9bbb899065db936288f4a2f9d0089622d72bfbe77bc5
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-bind/selinux-bind-2.20220106-r1.ebuild b/sec-policy/selinux-bind/selinux-bind-2.20220106-r1.ebuild
index 843b48cc5213..12e4f948b088 100644
--- a/sec-policy/selinux-bind/selinux-bind-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-bind/selinux-bind-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for bind"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-bind/selinux-bind-2.20220106-r2.ebuild b/sec-policy/selinux-bind/selinux-bind-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..843b48cc5213
--- /dev/null
+++ b/sec-policy/selinux-bind/selinux-bind-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="bind"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for bind"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-bitcoin/Manifest b/sec-policy/selinux-bitcoin/Manifest
index 4bc579631105..cf12139b9449 100644
--- a/sec-policy/selinux-bitcoin/Manifest
+++ b/sec-policy/selinux-bitcoin/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-bitcoin-2.20200818-r2.ebuild 279 BLAKE2B c54b66061d97107fb8a321900c01a90df660f1ee93e1e274ac9937155fdd36c510a9768eed79dc428e04418cd62df883de7053bc353b1b0cd649bd820840e498 SHA512 5a2e0fa74b0d5ac6b3f31d6339ed6620b83a94d4a6cc8060f3afd3351f3b3e2f9f0ce2372b7597f76b7bc11dcd97a813108ab3b541e0a9513d9148f63d127042
 EBUILD selinux-bitcoin-2.20210203-r1.ebuild 279 BLAKE2B c54b66061d97107fb8a321900c01a90df660f1ee93e1e274ac9937155fdd36c510a9768eed79dc428e04418cd62df883de7053bc353b1b0cd649bd820840e498 SHA512 5a2e0fa74b0d5ac6b3f31d6339ed6620b83a94d4a6cc8060f3afd3351f3b3e2f9f0ce2372b7597f76b7bc11dcd97a813108ab3b541e0a9513d9148f63d127042
 EBUILD selinux-bitcoin-2.20210908-r1.ebuild 279 BLAKE2B c54b66061d97107fb8a321900c01a90df660f1ee93e1e274ac9937155fdd36c510a9768eed79dc428e04418cd62df883de7053bc353b1b0cd649bd820840e498 SHA512 5a2e0fa74b0d5ac6b3f31d6339ed6620b83a94d4a6cc8060f3afd3351f3b3e2f9f0ce2372b7597f76b7bc11dcd97a813108ab3b541e0a9513d9148f63d127042
-EBUILD selinux-bitcoin-2.20220106-r1.ebuild 283 BLAKE2B 7dfc6d9fe142ac4e94e1fb169b0859343fb33f517c8d7a2fa9721a832b054a5118b3d6ab204342dc41d2bf5753e1e770a515da7ac2685473a08651f7bc9ecaab SHA512 3bfcb5e9712f267f5d64613c6497aa4eb5ffc5913698768b31057f800fe1843e26b42a096cb24e0d1c0d931a1d0204eb095acb95643764098eaa2217711c7202
+EBUILD selinux-bitcoin-2.20220106-r1.ebuild 281 BLAKE2B 02ed2a0ae52f3283455a65bd25cfd5991dfbfcde491f54d74a41c558838e740a6a26740db079a28bb59e2dfcf51d5a07b30b6fe3f54cbe47df66a25e6006cc58 SHA512 f9c97721d51f51f4cf26382f71441913b6e09bbccd01ec6f8806f9f4de45f765e4f7649972e07288670020abdb5a048f5bf59a860c0d0fed947d3d602f4df5a0
+EBUILD selinux-bitcoin-2.20220106-r2.ebuild 283 BLAKE2B 7dfc6d9fe142ac4e94e1fb169b0859343fb33f517c8d7a2fa9721a832b054a5118b3d6ab204342dc41d2bf5753e1e770a515da7ac2685473a08651f7bc9ecaab SHA512 3bfcb5e9712f267f5d64613c6497aa4eb5ffc5913698768b31057f800fe1843e26b42a096cb24e0d1c0d931a1d0204eb095acb95643764098eaa2217711c7202
 EBUILD selinux-bitcoin-9999.ebuild 283 BLAKE2B dd43d43edb1a4365159d25668f52e9087093f9ed2022b75b22f814639a7d4ced5f3b894f5b89a888b7f510a24ca65f9cd83ec1f54359274d206c36d447728d0f SHA512 3874ed788fe0bd5e85d4a11fb83be3b4c53be6e864ff8e533af1e70a0d1e4c555bc2f952e16d1d5dd449014c77067805ca284b64ba5accdb35a540b28c9befa1
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20220106-r1.ebuild b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20220106-r1.ebuild
index 69b91cb7c097..dc39811f17d3 100644
--- a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for bitcoin"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20220106-r2.ebuild b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..69b91cb7c097
--- /dev/null
+++ b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="bitcoin"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for bitcoin"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-bitlbee/Manifest b/sec-policy/selinux-bitlbee/Manifest
index 71d6469e8648..a391d4126e1f 100644
--- a/sec-policy/selinux-bitlbee/Manifest
+++ b/sec-policy/selinux-bitlbee/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-bitlbee-2.20200818-r2.ebuild 374 BLAKE2B 819a9949fd574184a712a9b9ed9bb06636f899a7d7f4051e5c008fed96795d5a2fd6e7379519a9e56e8f13899018f1fb742a79ae036eb7e428d15de3a78fd3f3 SHA512 7aa33ddbc0e4e716160cf2b2f58ba8c8fc174ae430ef81ce3a84c0b60f152021c74c7effc986a50503b39f3e187c50ad8e2aced663b523e78d8934658bc6ac80
 EBUILD selinux-bitlbee-2.20210203-r1.ebuild 374 BLAKE2B 819a9949fd574184a712a9b9ed9bb06636f899a7d7f4051e5c008fed96795d5a2fd6e7379519a9e56e8f13899018f1fb742a79ae036eb7e428d15de3a78fd3f3 SHA512 7aa33ddbc0e4e716160cf2b2f58ba8c8fc174ae430ef81ce3a84c0b60f152021c74c7effc986a50503b39f3e187c50ad8e2aced663b523e78d8934658bc6ac80
 EBUILD selinux-bitlbee-2.20210908-r1.ebuild 374 BLAKE2B 819a9949fd574184a712a9b9ed9bb06636f899a7d7f4051e5c008fed96795d5a2fd6e7379519a9e56e8f13899018f1fb742a79ae036eb7e428d15de3a78fd3f3 SHA512 7aa33ddbc0e4e716160cf2b2f58ba8c8fc174ae430ef81ce3a84c0b60f152021c74c7effc986a50503b39f3e187c50ad8e2aced663b523e78d8934658bc6ac80
-EBUILD selinux-bitlbee-2.20220106-r1.ebuild 378 BLAKE2B 65538463aaee0e287e8d29c50c6cf847b0f7e87c7e35ff93d652d70b8ba410b6cd0fd6889b0f9a7520bea45088ac7b7d87fe725851ba6c24426c0e0636d34a85 SHA512 ddac84840fef74a47af0d10464219da3f97924f2e29e77136ed515f522136ca9cee51aa4e6ffe802be47a67d363c928999853ffad0947fb2b490ed19990736f5
+EBUILD selinux-bitlbee-2.20220106-r1.ebuild 376 BLAKE2B 7e30df1774bc790060ed3b3b2c1a0bbe2469679815f01ba208509953d60e90e908cc1564547c3efe17628b082bc8289173441b9ad2a810a83dcea60448f47a73 SHA512 3ad41b2da6d2a8a42a1b578a12e25557019a63b20f3e854286002d3ecb67b3f1e25afa50b91033bd8ad08bcdec2b8b522cff6f1d995b352d986144de653d7af9
+EBUILD selinux-bitlbee-2.20220106-r2.ebuild 378 BLAKE2B 65538463aaee0e287e8d29c50c6cf847b0f7e87c7e35ff93d652d70b8ba410b6cd0fd6889b0f9a7520bea45088ac7b7d87fe725851ba6c24426c0e0636d34a85 SHA512 ddac84840fef74a47af0d10464219da3f97924f2e29e77136ed515f522136ca9cee51aa4e6ffe802be47a67d363c928999853ffad0947fb2b490ed19990736f5
 EBUILD selinux-bitlbee-9999.ebuild 378 BLAKE2B 62f904c3e7a5f7761e3ff01d40351fbf52a7e67868ca463a045d040534358f05f792a0eae71f8051d1f6efd247e61200833698fc6864b4af914267476577f9b8 SHA512 f8fde5314fcec6a62a4548be30ce3db0554419dd61c2648eb8c8b23a6f0ca1dd63acdc44326e5732d41184c7c1fc1d48a72813a3d8a71df62218cab3e1094831
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20220106-r1.ebuild b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20220106-r1.ebuild
index d05b1f920b12..636b6b287b29 100644
--- a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20220106-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for bitlbee"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20220106-r2.ebuild b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..d05b1f920b12
--- /dev/null
+++ b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20220106-r2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="bitlbee"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for bitlbee"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+
+DEPEND="${DEPEND}
+	sec-policy/selinux-inetd
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-inetd
+"
diff --git a/sec-policy/selinux-bluetooth/Manifest b/sec-policy/selinux-bluetooth/Manifest
index 74711efe7ccf..bc04cca4246c 100644
--- a/sec-policy/selinux-bluetooth/Manifest
+++ b/sec-policy/selinux-bluetooth/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-bluetooth-2.20200818-r2.ebuild 283 BLAKE2B eb0d0c9715139bdf2fc1ef97f3ddd3b6b451768a9b7bb02b033ed71861155939770e3a9df82942ca04c4d5cc8209c406fd6d8e4921873d69b837f55db44f143f SHA512 73551579bc4d0939717469adb6e5bc9cefc32d51a09def83a412d920142e501deea2755b512034f86f71fcddc3274ea9fc9b3352b99a4a5ed1a19f1dd8ac3bc0
 EBUILD selinux-bluetooth-2.20210203-r1.ebuild 283 BLAKE2B eb0d0c9715139bdf2fc1ef97f3ddd3b6b451768a9b7bb02b033ed71861155939770e3a9df82942ca04c4d5cc8209c406fd6d8e4921873d69b837f55db44f143f SHA512 73551579bc4d0939717469adb6e5bc9cefc32d51a09def83a412d920142e501deea2755b512034f86f71fcddc3274ea9fc9b3352b99a4a5ed1a19f1dd8ac3bc0
 EBUILD selinux-bluetooth-2.20210908-r1.ebuild 283 BLAKE2B eb0d0c9715139bdf2fc1ef97f3ddd3b6b451768a9b7bb02b033ed71861155939770e3a9df82942ca04c4d5cc8209c406fd6d8e4921873d69b837f55db44f143f SHA512 73551579bc4d0939717469adb6e5bc9cefc32d51a09def83a412d920142e501deea2755b512034f86f71fcddc3274ea9fc9b3352b99a4a5ed1a19f1dd8ac3bc0
-EBUILD selinux-bluetooth-2.20220106-r1.ebuild 287 BLAKE2B 41f94a02232e543c36ddc652974cd8bcbd8cab2174589fba021c1c8feba0a6a0652407d52e98eccec768788bca61b1118c16752f6d60290ebcc97ffc37bdbaaa SHA512 5cbd45dbde5e05b7158fbb1d48b36f9edb2a78e89c4fdc146644bbab46f8817364850d1d29f01094afccc657dfbed4014132c6c1b0d37a8ae2f2721a9a380bc0
+EBUILD selinux-bluetooth-2.20220106-r1.ebuild 285 BLAKE2B 942388e3713ba3ae641f2c1f72f6abd0228989f1ee5c22e4c1f44ee856dba0d693d88cc805f8e2bce3c9d1b502b8f54c16863659bc9dd9b685a54feb522febeb SHA512 844c05022fef69c0fd20f17dd5d5f67a3c6644adbe4668fb8a0ef43cbafa1eca32b51fdb6ab7c41df443d73ad623ce428c3a08afa4ee86bb65c8f3d1ca79d4b3
+EBUILD selinux-bluetooth-2.20220106-r2.ebuild 287 BLAKE2B 41f94a02232e543c36ddc652974cd8bcbd8cab2174589fba021c1c8feba0a6a0652407d52e98eccec768788bca61b1118c16752f6d60290ebcc97ffc37bdbaaa SHA512 5cbd45dbde5e05b7158fbb1d48b36f9edb2a78e89c4fdc146644bbab46f8817364850d1d29f01094afccc657dfbed4014132c6c1b0d37a8ae2f2721a9a380bc0
 EBUILD selinux-bluetooth-9999.ebuild 287 BLAKE2B 686eaf83437840f89432ff3fcc9d1bfa7b51f4de43893c2e90e033ee5ca80f4ecbffce2a7f30613e518602ebcc537c16199f1e641b32ee9aef868abd0a223f08 SHA512 d6da894019c761c42b285b8aa32801112a2e14f23d38db0e9f6603a70effc950fe5d799457f17e7faf7a4c515200e8dc9dcd81974640df691b085f87babd95c5
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20220106-r1.ebuild b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20220106-r1.ebuild
index 2d5883febb28..053a9cb39290 100644
--- a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for bluetooth"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20220106-r2.ebuild b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..2d5883febb28
--- /dev/null
+++ b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="bluetooth"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for bluetooth"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-brctl/Manifest b/sec-policy/selinux-brctl/Manifest
index ace61555869b..7a79d89730de 100644
--- a/sec-policy/selinux-brctl/Manifest
+++ b/sec-policy/selinux-brctl/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-brctl-2.20200818-r2.ebuild 275 BLAKE2B 6aa6eb52536191a32eeac75783a77d4b63761070b9d8a67b424d0cea424c3f6741ebc420746c2ea3805df3a09abd8f7e2a757f57517ca91a9f614dd08947e2b3 SHA512 c63f160f45a3031f0fcd91dd6e9983d11c48ad3e0b3301777c0b642d1a63fa7d5502a3509512e5f52e8321bb0e98ab408ce464e43cbcfb6c9097150763580aa4
 EBUILD selinux-brctl-2.20210203-r1.ebuild 275 BLAKE2B 6aa6eb52536191a32eeac75783a77d4b63761070b9d8a67b424d0cea424c3f6741ebc420746c2ea3805df3a09abd8f7e2a757f57517ca91a9f614dd08947e2b3 SHA512 c63f160f45a3031f0fcd91dd6e9983d11c48ad3e0b3301777c0b642d1a63fa7d5502a3509512e5f52e8321bb0e98ab408ce464e43cbcfb6c9097150763580aa4
 EBUILD selinux-brctl-2.20210908-r1.ebuild 275 BLAKE2B 6aa6eb52536191a32eeac75783a77d4b63761070b9d8a67b424d0cea424c3f6741ebc420746c2ea3805df3a09abd8f7e2a757f57517ca91a9f614dd08947e2b3 SHA512 c63f160f45a3031f0fcd91dd6e9983d11c48ad3e0b3301777c0b642d1a63fa7d5502a3509512e5f52e8321bb0e98ab408ce464e43cbcfb6c9097150763580aa4
-EBUILD selinux-brctl-2.20220106-r1.ebuild 279 BLAKE2B f9c5b877c8910ab93e99dc2a46c9e766ad65b09e3581cde81da42f646d7b1708da3a09aa6946e292d1afaa59674fbf0704489f7bd90d23c2c768d6cc8f809b0a SHA512 caa7099d0ae0c9738a6f960738390146ea1d449a6e1bbc7ae5a5b7ad4105c49715c94d30902439f952a0f0b8021fa90ec6d614b328f45db88be1d1868c6c1647
+EBUILD selinux-brctl-2.20220106-r1.ebuild 277 BLAKE2B 4af20606119f4df71c8ef7dbc750d31b09895f2eab62b78de743f511fcca07660be2b355dd5175e2588be6a828062bd7128c829d8071e0fc63ca5e1966a1b9fd SHA512 5c3f32442c36938b7e13c12a30fbc13a93814a285a51b9cce442f0cb5d785db1b2d2e668af45cba44b587131529b7bbefeac6bc8193e6f8b094a69e1f0b711c8
+EBUILD selinux-brctl-2.20220106-r2.ebuild 279 BLAKE2B f9c5b877c8910ab93e99dc2a46c9e766ad65b09e3581cde81da42f646d7b1708da3a09aa6946e292d1afaa59674fbf0704489f7bd90d23c2c768d6cc8f809b0a SHA512 caa7099d0ae0c9738a6f960738390146ea1d449a6e1bbc7ae5a5b7ad4105c49715c94d30902439f952a0f0b8021fa90ec6d614b328f45db88be1d1868c6c1647
 EBUILD selinux-brctl-9999.ebuild 279 BLAKE2B 60b2553c2a95e60851dcb4ae6fccef3af3549d55147301a814ecd21ddbdcde1a32f4b07429086747087ea7914a340eabb585019ff7bdfb99a7dae7240bdf03b6 SHA512 611ccfb4edbcfdc969ca66b5a9d164a64acec03971eab9934984a668f50656a6a240fd35c0c5de5025cfc861ff7f1ed960c404648a36cedca1ad6fadb5598d31
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-brctl/selinux-brctl-2.20220106-r1.ebuild b/sec-policy/selinux-brctl/selinux-brctl-2.20220106-r1.ebuild
index fbafdd1e91f8..de7b4dfd7295 100644
--- a/sec-policy/selinux-brctl/selinux-brctl-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-brctl/selinux-brctl-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for brctl"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-brctl/selinux-brctl-2.20220106-r2.ebuild b/sec-policy/selinux-brctl/selinux-brctl-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..fbafdd1e91f8
--- /dev/null
+++ b/sec-policy/selinux-brctl/selinux-brctl-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="brctl"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for brctl"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-cachefilesd/Manifest b/sec-policy/selinux-cachefilesd/Manifest
index 176624610ff1..0a75d29219f6 100644
--- a/sec-policy/selinux-cachefilesd/Manifest
+++ b/sec-policy/selinux-cachefilesd/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-cachefilesd-2.20200818-r2.ebuild 287 BLAKE2B 7a42ffd7e4eee978f248337002bd24f3f0ec0254366c3ff33f9fe90198d83125578aa7c1cf09fa0da2cb4a541724d5fa57523c814798abb879abfd9c588d77c5 SHA512 423b2bfc791fb8002bc56787c713f2fcf53b0ccc5c73b72ea62e0166526d7c8708558e2246454cd0286343871783610ef7e2c6a9687168eabf838a985e0f3b6b
 EBUILD selinux-cachefilesd-2.20210203-r1.ebuild 287 BLAKE2B 7a42ffd7e4eee978f248337002bd24f3f0ec0254366c3ff33f9fe90198d83125578aa7c1cf09fa0da2cb4a541724d5fa57523c814798abb879abfd9c588d77c5 SHA512 423b2bfc791fb8002bc56787c713f2fcf53b0ccc5c73b72ea62e0166526d7c8708558e2246454cd0286343871783610ef7e2c6a9687168eabf838a985e0f3b6b
 EBUILD selinux-cachefilesd-2.20210908-r1.ebuild 287 BLAKE2B 7a42ffd7e4eee978f248337002bd24f3f0ec0254366c3ff33f9fe90198d83125578aa7c1cf09fa0da2cb4a541724d5fa57523c814798abb879abfd9c588d77c5 SHA512 423b2bfc791fb8002bc56787c713f2fcf53b0ccc5c73b72ea62e0166526d7c8708558e2246454cd0286343871783610ef7e2c6a9687168eabf838a985e0f3b6b
-EBUILD selinux-cachefilesd-2.20220106-r1.ebuild 291 BLAKE2B 9f2fbd3108b805c07259ce8bd2b91b46b8c1d7473cfd8b9331ca22d10fc7a00f6c5bf45cd638d5446a5258bf5689e47c7110a6c489e2df31696e4e3261535f5b SHA512 f87a53fe780c4f42999f83e3906a35fabaf1cf9701fb8709900a3f4a7a59e2b8528cb988820f367a55e33f0eb334b0b9dcb8278a16931673219e0d7d7cf8485c
+EBUILD selinux-cachefilesd-2.20220106-r1.ebuild 289 BLAKE2B 546d9a809ae158fa4e07a2990af846fe81f235240e0e446f21e4854649718b6da7957f01c17957a08783dbd9248c748f8a6cea08dd7173bdee0663c8870a26a5 SHA512 0e959a1ac40b49a538df72428008a7694c362d897826cab95e6a261d8c43947d090cd6ea8fcfc3db9fc682ccc160b5f9086096b04558672cf5f2be98c2a0a1ac
+EBUILD selinux-cachefilesd-2.20220106-r2.ebuild 291 BLAKE2B 9f2fbd3108b805c07259ce8bd2b91b46b8c1d7473cfd8b9331ca22d10fc7a00f6c5bf45cd638d5446a5258bf5689e47c7110a6c489e2df31696e4e3261535f5b SHA512 f87a53fe780c4f42999f83e3906a35fabaf1cf9701fb8709900a3f4a7a59e2b8528cb988820f367a55e33f0eb334b0b9dcb8278a16931673219e0d7d7cf8485c
 EBUILD selinux-cachefilesd-9999.ebuild 291 BLAKE2B 8e2eb359c78ae42d0f8b3aae2ec01cea8530c86d2fd95c585fb7b4c44b102852fed09031bbd721d257aa8de4aecdd423672a43bd128248a198f10d7e3d1ce9f9 SHA512 30b5af4d39e69efe49eebeb7e19b269682ca291eaf82598e49b8529cedec19e5c988d7ef95d2872abe112c029d1eb1801d00a326a6dbf5e336c19013b44a9f7a
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20220106-r1.ebuild b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20220106-r1.ebuild
index 1e23e446adcd..e3e460c31c20 100644
--- a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cachefilesd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20220106-r2.ebuild b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..1e23e446adcd
--- /dev/null
+++ b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="cachefilesd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cachefilesd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-calamaris/Manifest b/sec-policy/selinux-calamaris/Manifest
index fccf8ae1bbd5..3276024338b3 100644
--- a/sec-policy/selinux-calamaris/Manifest
+++ b/sec-policy/selinux-calamaris/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-calamaris-2.20200818-r2.ebuild 283 BLAKE2B 7837ff0fe6e961f8f552e3ec426d1ea969a9c82211b4ca8ce5cb5645d00723fe9e34e48690f7d9f710a9ec0ee96227aefc2bcfd3c447ccaabf9bf88aacae0167 SHA512 4928b53fe94df5423d130194b7ce98e565f4588a96d4cfa0149cd44280cdb450238d537e69173166eb5e835893376b4497bd090ae4aa464221bd89838621932e
 EBUILD selinux-calamaris-2.20210203-r1.ebuild 283 BLAKE2B 7837ff0fe6e961f8f552e3ec426d1ea969a9c82211b4ca8ce5cb5645d00723fe9e34e48690f7d9f710a9ec0ee96227aefc2bcfd3c447ccaabf9bf88aacae0167 SHA512 4928b53fe94df5423d130194b7ce98e565f4588a96d4cfa0149cd44280cdb450238d537e69173166eb5e835893376b4497bd090ae4aa464221bd89838621932e
 EBUILD selinux-calamaris-2.20210908-r1.ebuild 283 BLAKE2B 7837ff0fe6e961f8f552e3ec426d1ea969a9c82211b4ca8ce5cb5645d00723fe9e34e48690f7d9f710a9ec0ee96227aefc2bcfd3c447ccaabf9bf88aacae0167 SHA512 4928b53fe94df5423d130194b7ce98e565f4588a96d4cfa0149cd44280cdb450238d537e69173166eb5e835893376b4497bd090ae4aa464221bd89838621932e
-EBUILD selinux-calamaris-2.20220106-r1.ebuild 287 BLAKE2B 997126008694f9913635d2f2a8e4f68f9608643031ec1c3b77254d227c2a20fa19633272eef5cfa5305b9bad16a00cf0980b4e86346c481438de2293569e1ec6 SHA512 11199436749e6b199a35754ad0f87a6a3007d852ec51c411b3a7397ed5f467ea5e225ebdefd242cc53b9f51763c21779a27215207892d957baf664100a2a3b5a
+EBUILD selinux-calamaris-2.20220106-r1.ebuild 285 BLAKE2B 56587936b5fe59bf5e13d5a379f4eb22a9f78e33baa254c2d4a41a741a2622dcddb9875ddc260ba05b6fed91bc7dbf05586be80b5975f2d4ea46f4be2433b3db SHA512 203edfad31f82786a1e2f0e507c5cbbcf14ab508e08f0914b03b4c3a4979e4f77e8e7d3aa3083ccedf3f669afed117f20120695dc10cca8388723b5bc5726079
+EBUILD selinux-calamaris-2.20220106-r2.ebuild 287 BLAKE2B 997126008694f9913635d2f2a8e4f68f9608643031ec1c3b77254d227c2a20fa19633272eef5cfa5305b9bad16a00cf0980b4e86346c481438de2293569e1ec6 SHA512 11199436749e6b199a35754ad0f87a6a3007d852ec51c411b3a7397ed5f467ea5e225ebdefd242cc53b9f51763c21779a27215207892d957baf664100a2a3b5a
 EBUILD selinux-calamaris-9999.ebuild 287 BLAKE2B 3e7effb0b1594f489d676aacf2f7c68088a171a167d79ceb44076aafe63d2fd6c7945f5b86eb6f4bcd1505d6b218a3a797e948708da046eafd7d60c387785f18 SHA512 754b60a99cc259eefc69deec8d31f6bfbdafafb6c47e4cd10b02813b7e5e30218a3c94612cde5be9a56fcf53931f1734311357591feb8857648da2fa567f4745
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-calamaris/selinux-calamaris-2.20220106-r1.ebuild b/sec-policy/selinux-calamaris/selinux-calamaris-2.20220106-r1.ebuild
index e74ffd9e03c5..17d37af432ac 100644
--- a/sec-policy/selinux-calamaris/selinux-calamaris-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-calamaris/selinux-calamaris-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for calamaris"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-calamaris/selinux-calamaris-2.20220106-r2.ebuild b/sec-policy/selinux-calamaris/selinux-calamaris-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..e74ffd9e03c5
--- /dev/null
+++ b/sec-policy/selinux-calamaris/selinux-calamaris-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="calamaris"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for calamaris"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-canna/Manifest b/sec-policy/selinux-canna/Manifest
index 24402742faa5..0b76f3bf2d74 100644
--- a/sec-policy/selinux-canna/Manifest
+++ b/sec-policy/selinux-canna/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-canna-2.20200818-r2.ebuild 275 BLAKE2B e1488d96b0e8e2f852f002f23c51db22f6a33a94bb6660579f1231624f28305d73d7d1197f2cf672703d5abc56a4a1ec090381e293e5cf4ea58d1b7aed9a27f4 SHA512 c46068cc86c157eab096b27f02a14d16ef58120c9c0f09d4b15b28a6b5f21c9b3745b33dfb299fafc8fbca374d8649e21064dfd1505dd4c42e647c247478bc3f
 EBUILD selinux-canna-2.20210203-r1.ebuild 275 BLAKE2B e1488d96b0e8e2f852f002f23c51db22f6a33a94bb6660579f1231624f28305d73d7d1197f2cf672703d5abc56a4a1ec090381e293e5cf4ea58d1b7aed9a27f4 SHA512 c46068cc86c157eab096b27f02a14d16ef58120c9c0f09d4b15b28a6b5f21c9b3745b33dfb299fafc8fbca374d8649e21064dfd1505dd4c42e647c247478bc3f
 EBUILD selinux-canna-2.20210908-r1.ebuild 275 BLAKE2B e1488d96b0e8e2f852f002f23c51db22f6a33a94bb6660579f1231624f28305d73d7d1197f2cf672703d5abc56a4a1ec090381e293e5cf4ea58d1b7aed9a27f4 SHA512 c46068cc86c157eab096b27f02a14d16ef58120c9c0f09d4b15b28a6b5f21c9b3745b33dfb299fafc8fbca374d8649e21064dfd1505dd4c42e647c247478bc3f
-EBUILD selinux-canna-2.20220106-r1.ebuild 279 BLAKE2B 4cbf10049af5dbc0289326941d19547109bf75a83933f431b5fe674cb1a051f8f13d19883e0ca155919534b923e08ed94c0f2e559ade3ac017262d5477336a88 SHA512 43f3a6730d19294edbab8f5f92d4836ed8665d9e6039caac80e0e307a6851269be6904d31a49c82478551f85d42ff34dd77594eef8338a97fb7af69232ca3898
+EBUILD selinux-canna-2.20220106-r1.ebuild 277 BLAKE2B 0144140de551e3aed1986aa721c40f3abf41bd2133f8a4730928f50ffe7674c69dddc52ac661abdf06455378aa8672494b2daa212ef05144ad59507c4ed415f1 SHA512 610f8bc7a6c070dbb925f58c080fb33045534da998f8bea6b9bd0014a610fd1ac5e4e817a8f3328fb19ef41913ece85d8f3cd641ad25a9ef6d0164947771f7c9
+EBUILD selinux-canna-2.20220106-r2.ebuild 279 BLAKE2B 4cbf10049af5dbc0289326941d19547109bf75a83933f431b5fe674cb1a051f8f13d19883e0ca155919534b923e08ed94c0f2e559ade3ac017262d5477336a88 SHA512 43f3a6730d19294edbab8f5f92d4836ed8665d9e6039caac80e0e307a6851269be6904d31a49c82478551f85d42ff34dd77594eef8338a97fb7af69232ca3898
 EBUILD selinux-canna-9999.ebuild 279 BLAKE2B 6f5dc72c69ed647d5235244b179d965ba5f9ffeb44276f33caf9390134d61e25466ba48e175438b2fa6fab05613a7b96c9e359589d9146e518eca9d50aa669e4 SHA512 9da43b8bed78370b35cd5c40f9aef997f793714e14a4f1ac44a46d41ce015827408d27745c0e9c887fa0732193ac92249b721d0853557bf6021844f56aa06fca
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-canna/selinux-canna-2.20220106-r1.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20220106-r1.ebuild
index 0e69575efd52..f48c88439aa0 100644
--- a/sec-policy/selinux-canna/selinux-canna-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-canna/selinux-canna-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for canna"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-canna/selinux-canna-2.20220106-r2.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..0e69575efd52
--- /dev/null
+++ b/sec-policy/selinux-canna/selinux-canna-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="canna"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for canna"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-cdrecord/Manifest b/sec-policy/selinux-cdrecord/Manifest
index 4ecf8fcccaea..db2ec3e496e9 100644
--- a/sec-policy/selinux-cdrecord/Manifest
+++ b/sec-policy/selinux-cdrecord/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-cdrecord-2.20200818-r2.ebuild 281 BLAKE2B 1e2522d77ff313dae03ce34eeea4d20ddad6b092350a3e44802de6ab8c641ada7619bc04d229076bcb37d05a8546caa0ef03183e0ed66441bf5ba889eeb3e42b SHA512 576cc7ada0b0f02f8ae72149741be5e9cd83fce2ae6aaf1da05a5493fa0f391b6ca3a3f1ee7ae71e51d3480c381931a0b3a99ebeba460a33e6416f8d43cc21b5
 EBUILD selinux-cdrecord-2.20210203-r1.ebuild 281 BLAKE2B 1e2522d77ff313dae03ce34eeea4d20ddad6b092350a3e44802de6ab8c641ada7619bc04d229076bcb37d05a8546caa0ef03183e0ed66441bf5ba889eeb3e42b SHA512 576cc7ada0b0f02f8ae72149741be5e9cd83fce2ae6aaf1da05a5493fa0f391b6ca3a3f1ee7ae71e51d3480c381931a0b3a99ebeba460a33e6416f8d43cc21b5
 EBUILD selinux-cdrecord-2.20210908-r1.ebuild 281 BLAKE2B 1e2522d77ff313dae03ce34eeea4d20ddad6b092350a3e44802de6ab8c641ada7619bc04d229076bcb37d05a8546caa0ef03183e0ed66441bf5ba889eeb3e42b SHA512 576cc7ada0b0f02f8ae72149741be5e9cd83fce2ae6aaf1da05a5493fa0f391b6ca3a3f1ee7ae71e51d3480c381931a0b3a99ebeba460a33e6416f8d43cc21b5
-EBUILD selinux-cdrecord-2.20220106-r1.ebuild 285 BLAKE2B 25ebe14a58bf0d04707756dab66ec2544666588dba8e71741428a45eb694da3d7bb941d2417e986feaef1a44e43be2dd09264e5e48d8995a3cd0bd4eeae3927a SHA512 e21fa8387330e3be7e34d8abe7b338333ffe8e7d4583db97808b990a222b99eb205a9ae4289a75b451bc527714a4cdab508b1ead85ea6bb939e36acc6d7bb83e
+EBUILD selinux-cdrecord-2.20220106-r1.ebuild 283 BLAKE2B 937d94478b442362a8c75f3bb35590231712a0fc28436b364374ccbf16aa12a9094a455067f540452cfcd292a91ad7746e33b033dbbdad2db4f0803fce2e1870 SHA512 1d8ebb60204018f201a237f571b7c96b8207f8fbe883c37468f60c8445f10044f76d1409fbca8591f4f3098279fed019abbbfe351f0f1edb15d6d4723c632fe4
+EBUILD selinux-cdrecord-2.20220106-r2.ebuild 285 BLAKE2B 25ebe14a58bf0d04707756dab66ec2544666588dba8e71741428a45eb694da3d7bb941d2417e986feaef1a44e43be2dd09264e5e48d8995a3cd0bd4eeae3927a SHA512 e21fa8387330e3be7e34d8abe7b338333ffe8e7d4583db97808b990a222b99eb205a9ae4289a75b451bc527714a4cdab508b1ead85ea6bb939e36acc6d7bb83e
 EBUILD selinux-cdrecord-9999.ebuild 285 BLAKE2B 523c162c492a5a3808a14c455ce5260948ea236d6e78e60150eed12a0028df8a2f435835251b4cf25a28ee24a8df956f120c2779bf3398f854a9dfd420e5f58d SHA512 e33d9251f4e85bea6f2836ad2acbbd6fb9567adb3e5bc6ec46f5c433f1180971e4e15eb918970c92b9ba2f4d851660be732736f51162d1f919b0e2b8c8e7bd3b
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20220106-r1.ebuild b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20220106-r1.ebuild
index 50eda9b6fcb0..3fa3d8046ce3 100644
--- a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cdrecord"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20220106-r2.ebuild b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..50eda9b6fcb0
--- /dev/null
+++ b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="cdrecord"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cdrecord"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ceph/Manifest b/sec-policy/selinux-ceph/Manifest
index 141aed643c63..945bb6920767 100644
--- a/sec-policy/selinux-ceph/Manifest
+++ b/sec-policy/selinux-ceph/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-ceph-2.20200818-r2.ebuild 273 BLAKE2B 2067fe996ffe8a7009800e2483bdfbc3bff53797ef03b7f0b0d9168c605b498d9007036f28a05116b218476e02a6a874f630f64d0e028f6e44661b9226532556 SHA512 558c911b766af977b027566b783b41e031cdd41cd0c8eea166d4e4331ecf71dc6a68f4d1478b44f1af98e995bbec3735105adfe0ab80545eead9365438f6a627
 EBUILD selinux-ceph-2.20210203-r1.ebuild 273 BLAKE2B 2067fe996ffe8a7009800e2483bdfbc3bff53797ef03b7f0b0d9168c605b498d9007036f28a05116b218476e02a6a874f630f64d0e028f6e44661b9226532556 SHA512 558c911b766af977b027566b783b41e031cdd41cd0c8eea166d4e4331ecf71dc6a68f4d1478b44f1af98e995bbec3735105adfe0ab80545eead9365438f6a627
 EBUILD selinux-ceph-2.20210908-r1.ebuild 273 BLAKE2B 2067fe996ffe8a7009800e2483bdfbc3bff53797ef03b7f0b0d9168c605b498d9007036f28a05116b218476e02a6a874f630f64d0e028f6e44661b9226532556 SHA512 558c911b766af977b027566b783b41e031cdd41cd0c8eea166d4e4331ecf71dc6a68f4d1478b44f1af98e995bbec3735105adfe0ab80545eead9365438f6a627
-EBUILD selinux-ceph-2.20220106-r1.ebuild 277 BLAKE2B 2f8a90563c0dba1af20171d5488bb422f30cba6be21efdb1db3537ccc1f40a997ecf5aee53a5c4ba7413a591acaeeef41537e34566247004104857466353a820 SHA512 2924e9be3edaf84bdf0db2d75eeb5c38d60c193de2d2302093087708de52adf57a347648ec319aedb04f06c7a180ac9592c57f90ba44feed5c3db32ee83f8fe4
+EBUILD selinux-ceph-2.20220106-r1.ebuild 275 BLAKE2B c3942b9a2ecabd6a6caff2e122b9d42197d15183799071b115bd829dd6a3d06009c351b7fa591c0c9eaa464d0dc373d0b9132d24b39a60ee5d40e7fe07ddc6ca SHA512 9c8c2f79c96f4e2bedebab2169999b0283138a898f5b3b051f00a006f2750d158cb6885eba9f8f9e1e381bfdbf35038c2f64d5d80a855434720e53867ea9b6f6
+EBUILD selinux-ceph-2.20220106-r2.ebuild 277 BLAKE2B 2f8a90563c0dba1af20171d5488bb422f30cba6be21efdb1db3537ccc1f40a997ecf5aee53a5c4ba7413a591acaeeef41537e34566247004104857466353a820 SHA512 2924e9be3edaf84bdf0db2d75eeb5c38d60c193de2d2302093087708de52adf57a347648ec319aedb04f06c7a180ac9592c57f90ba44feed5c3db32ee83f8fe4
 EBUILD selinux-ceph-9999.ebuild 277 BLAKE2B 27dc793da326d450a443d83b3d445645fb10945d1ed7b7f0a29b415e91821ed7c339959ea41ae90fb1bce32b4042c4b92c9c21ebf7574bdd0a300d7dba700a37 SHA512 39aa0a06a98b8f782e4ea5d1e216a5c29098804517fc59acaae9cfe663da4c29a7c7924abe162f94c306b3f2f023f9e7839eb9f591636de344843e5bee9f3092
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-ceph/selinux-ceph-2.20220106-r1.ebuild b/sec-policy/selinux-ceph/selinux-ceph-2.20220106-r1.ebuild
index 6de61d142b51..6354382f1f94 100644
--- a/sec-policy/selinux-ceph/selinux-ceph-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-ceph/selinux-ceph-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ceph"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ceph/selinux-ceph-2.20220106-r2.ebuild b/sec-policy/selinux-ceph/selinux-ceph-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..6de61d142b51
--- /dev/null
+++ b/sec-policy/selinux-ceph/selinux-ceph-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="ceph"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ceph"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-certbot/Manifest b/sec-policy/selinux-certbot/Manifest
index 60c29ca13051..14e5f9544cde 100644
--- a/sec-policy/selinux-certbot/Manifest
+++ b/sec-policy/selinux-certbot/Manifest
@@ -1,8 +1,10 @@
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
 DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176d3c8e508b2ff97d4f8a876d7c0a65534a62d86c9816ac59f6eed583f4b5c51cf432643edd2dad24dd51eb3cf22e2b75ac SHA512 794327d2dd07196b5f36771f9a961cdf294cf68f690735418d6bdd859499b7007c518cc022ccca9c245a5266b85bdb7cacdcaeefee14e4800937c9101476b373
 EBUILD selinux-certbot-2.20210908-r1.ebuild 279 BLAKE2B 9a6a82661fce0415b0db28c0a3ac4c6a53cd667f317fda2e3f6385eca994b7da2a54ae46d86e52b96bd617b9080ef18139c68cfa61c137e5556a873f14127679 SHA512 2a3c633643e74f848bd7e20010bd9093af0d8eb5496a5ad9de7fa41aa0f4ac735d09109bcf59fd83d1ceb9fe60460b0861ef6f39fc20024bf5b04ba0bdedd31f
-EBUILD selinux-certbot-2.20220106-r1.ebuild 283 BLAKE2B 07376066cf1b231ae15125173ed1d82b5ff6d7e7cabb2256822254aa3c4283c16eaca48fc5d33d68e651fd76d96da1e63cf12d012f9600551e8859d86a6eed15 SHA512 11146643e8756c196e88152205b2dc1108e2e422f855a3d90ea297a0fb8b33ab707a36c578cf8473f2cf4450bcf6353a3c6dbaaa6be7489efeaa521cac007cf2
+EBUILD selinux-certbot-2.20220106-r1.ebuild 281 BLAKE2B cf8dea66c990eb8a174c4d7f18f31400e4707d664ada156791683c64b599dd797b90214b2f317b5e69dcd2f8a12aa29452aa52116b1a1550055cd472cb51c9e0 SHA512 ba78fe951cb9e3dcc613e102e6b35ec5efeed6055eb2c9e2b395e44fbbe342572f523992c445f3b5e1ce5b70526a0471c0d0b4ff75469cdfca7511ce154b9e86
+EBUILD selinux-certbot-2.20220106-r2.ebuild 283 BLAKE2B 07376066cf1b231ae15125173ed1d82b5ff6d7e7cabb2256822254aa3c4283c16eaca48fc5d33d68e651fd76d96da1e63cf12d012f9600551e8859d86a6eed15 SHA512 11146643e8756c196e88152205b2dc1108e2e422f855a3d90ea297a0fb8b33ab707a36c578cf8473f2cf4450bcf6353a3c6dbaaa6be7489efeaa521cac007cf2
 EBUILD selinux-certbot-9999.ebuild 283 BLAKE2B 3ae37683b95681a44e29d8de6a71358696206551eb552e33cb6b60b76f4924252dc07fe5105713a443adb469701241d4cdd066cb68bda363aee45f7995e0a2e6 SHA512 e3e5abb2b20430b20817e51d5617b9cfd4d2284f1745965879c280d61aa551ec11ec48a10bae50fde3b4d781bd3eed6f7630082e06d45cbd18429ba198ebdb5e
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-certbot/selinux-certbot-2.20220106-r1.ebuild b/sec-policy/selinux-certbot/selinux-certbot-2.20220106-r1.ebuild
index d5dbc4fbc7e6..8d04f17626b2 100644
--- a/sec-policy/selinux-certbot/selinux-certbot-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-certbot/selinux-certbot-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for certbot"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-certbot/selinux-certbot-2.20220106-r2.ebuild b/sec-policy/selinux-certbot/selinux-certbot-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..d5dbc4fbc7e6
--- /dev/null
+++ b/sec-policy/selinux-certbot/selinux-certbot-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="certbot"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for certbot"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-cgmanager/Manifest b/sec-policy/selinux-cgmanager/Manifest
index b044eb87af03..c9e4365ab475 100644
--- a/sec-policy/selinux-cgmanager/Manifest
+++ b/sec-policy/selinux-cgmanager/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-cgmanager-2.20200818-r2.ebuild 283 BLAKE2B d065b9bce605c205116db9c34b321e54445b12162b792315f2ea0362f9e2e5c13b557c5fcd8cf829347cac0b4a0eb0b32b82bc73d68732d35606dce20390f2ac SHA512 7a4ee9c200d18fc1b0c6f267c654092c29581120cd84ba30c6fa23f1954b8951e71c6c6597270b0fcf2b47d8e8a74dd4d8d1639bad02a51ec80bc34ad2b5cbb1
 EBUILD selinux-cgmanager-2.20210203-r1.ebuild 283 BLAKE2B d065b9bce605c205116db9c34b321e54445b12162b792315f2ea0362f9e2e5c13b557c5fcd8cf829347cac0b4a0eb0b32b82bc73d68732d35606dce20390f2ac SHA512 7a4ee9c200d18fc1b0c6f267c654092c29581120cd84ba30c6fa23f1954b8951e71c6c6597270b0fcf2b47d8e8a74dd4d8d1639bad02a51ec80bc34ad2b5cbb1
 EBUILD selinux-cgmanager-2.20210908-r1.ebuild 283 BLAKE2B d065b9bce605c205116db9c34b321e54445b12162b792315f2ea0362f9e2e5c13b557c5fcd8cf829347cac0b4a0eb0b32b82bc73d68732d35606dce20390f2ac SHA512 7a4ee9c200d18fc1b0c6f267c654092c29581120cd84ba30c6fa23f1954b8951e71c6c6597270b0fcf2b47d8e8a74dd4d8d1639bad02a51ec80bc34ad2b5cbb1
-EBUILD selinux-cgmanager-2.20220106-r1.ebuild 287 BLAKE2B 065198a85a3e14fce720f59cb7f52f5b09b680c215a2a38d06ca1a69ce41f7c9cd55f0b1bbb0ce31c4b403afa4cb4212f78b4b069e34974cf41953ffc786e282 SHA512 20645d6fd40f5c4712272a4fd5b7117f3a6c60e028b9f089a3194ca566b188e9790e369ea3043ed2322cca39b5155e8cfc9025a5fba1e307fcc8db555dea712e
+EBUILD selinux-cgmanager-2.20220106-r1.ebuild 285 BLAKE2B 29d4707ee6a22f8416d6a2e09080b853087be3d2b33b0f0687a1699ec61a68845c1d3b31bef3e93e94ae43bccfaee4e7f252b7111e31445393e367df51c01eae SHA512 942a5ec496aadec18a42ef173a751de740eb98a80ec148afd1a87094acd81c3b07d4ac94c56e68aa80b34cf3dedd811f057ace0a37ea0a6fc216f61cd86ee118
+EBUILD selinux-cgmanager-2.20220106-r2.ebuild 287 BLAKE2B 065198a85a3e14fce720f59cb7f52f5b09b680c215a2a38d06ca1a69ce41f7c9cd55f0b1bbb0ce31c4b403afa4cb4212f78b4b069e34974cf41953ffc786e282 SHA512 20645d6fd40f5c4712272a4fd5b7117f3a6c60e028b9f089a3194ca566b188e9790e369ea3043ed2322cca39b5155e8cfc9025a5fba1e307fcc8db555dea712e
 EBUILD selinux-cgmanager-9999.ebuild 287 BLAKE2B bd3171af068fe8cf52d407eae96cf920f63a0511fc42f8ecbce1070e5de6854229e26f040784bf4f321be0c44aed06b06f1e2f7742f415b70c3b7f6cd4ca921d SHA512 8c9f3ed15fd7e72ac9c438f3f9eb043ffc22690189bfb4f018a79c61b93f7f59ae0975fe84766b0556649b54f03e3e0c68629f2a48507adf8f7f96e098311221
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20220106-r1.ebuild b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20220106-r1.ebuild
index 0f25b459ec96..c6298032d7a7 100644
--- a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cgmanager"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20220106-r2.ebuild b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..0f25b459ec96
--- /dev/null
+++ b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="cgmanager"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cgmanager"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-cgroup/Manifest b/sec-policy/selinux-cgroup/Manifest
index c6814f2cadaf..ec00150fa3ab 100644
--- a/sec-policy/selinux-cgroup/Manifest
+++ b/sec-policy/selinux-cgroup/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-cgroup-2.20200818-r2.ebuild 277 BLAKE2B 57988830412aea3d547b6c893dffb5e43ae43f1a266242470129b5d2449ac929c3c9d85d7d87726f8d9e9b70ff22224f2acf11153cc2f27680b0cfe085a63ce1 SHA512 ff122949308055fbf9e5ef3f23817b67584262f7b730be323047084e0c03f491363fd729bdaf560ae9c7458af22c282295ed33f51246b59501a8e83619c8ddfc
 EBUILD selinux-cgroup-2.20210203-r1.ebuild 277 BLAKE2B 57988830412aea3d547b6c893dffb5e43ae43f1a266242470129b5d2449ac929c3c9d85d7d87726f8d9e9b70ff22224f2acf11153cc2f27680b0cfe085a63ce1 SHA512 ff122949308055fbf9e5ef3f23817b67584262f7b730be323047084e0c03f491363fd729bdaf560ae9c7458af22c282295ed33f51246b59501a8e83619c8ddfc
 EBUILD selinux-cgroup-2.20210908-r1.ebuild 277 BLAKE2B 57988830412aea3d547b6c893dffb5e43ae43f1a266242470129b5d2449ac929c3c9d85d7d87726f8d9e9b70ff22224f2acf11153cc2f27680b0cfe085a63ce1 SHA512 ff122949308055fbf9e5ef3f23817b67584262f7b730be323047084e0c03f491363fd729bdaf560ae9c7458af22c282295ed33f51246b59501a8e83619c8ddfc
-EBUILD selinux-cgroup-2.20220106-r1.ebuild 281 BLAKE2B 728d80cb15a385672c48bf7a1a7cd8755ea6ed1eba0770ea1993926d66a12c34a436e6e89409247085f95bb7f5717a90457810250d9638ee5ecb035f390d38aa SHA512 0e48b39c4e5737f339f35d50b3555084ac73b46bdca1177172efd63a0934686600ad9f8aad2d10a12f6e9ea36a6d291f16a8e82528be28a3e85135edf71269fc
+EBUILD selinux-cgroup-2.20220106-r1.ebuild 279 BLAKE2B c773725eaa07d9f6f72aa99eb402bfe91f8e7c26503ff7f9d2ed0032a0f6a4b683778b03586616ec095c720be9ae12809bfbf9a43f48c9416c4878bc63625cfe SHA512 a334ef1c7b2d8a16f728047056b39cce7faee55a49fc89220818629824617a745d5a9ed7f3c1818b3c2097fea4e442290f7cb3e9eca9110bee993c3f1dc9a595
+EBUILD selinux-cgroup-2.20220106-r2.ebuild 281 BLAKE2B 728d80cb15a385672c48bf7a1a7cd8755ea6ed1eba0770ea1993926d66a12c34a436e6e89409247085f95bb7f5717a90457810250d9638ee5ecb035f390d38aa SHA512 0e48b39c4e5737f339f35d50b3555084ac73b46bdca1177172efd63a0934686600ad9f8aad2d10a12f6e9ea36a6d291f16a8e82528be28a3e85135edf71269fc
 EBUILD selinux-cgroup-9999.ebuild 281 BLAKE2B 038298c4e81c373ac1aa8400a69fb2f147a6844f60514404644afeba401323860ce5006d226a3b742160f4cecd53abc7c9ccfc7102c4dc3775e051d6f095ca14 SHA512 dff1b391702c751569cbe9d74c2cb61a58fd19abd08c63b0a68630c87c535e4a616211db860309d3419671c7262abfd59ca89e58d2d97c735f7973b268563037
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-cgroup/selinux-cgroup-2.20220106-r1.ebuild b/sec-policy/selinux-cgroup/selinux-cgroup-2.20220106-r1.ebuild
index 7deba6a588e9..ba8920238c1e 100644
--- a/sec-policy/selinux-cgroup/selinux-cgroup-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-cgroup/selinux-cgroup-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cgroup"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-cgroup/selinux-cgroup-2.20220106-r2.ebuild b/sec-policy/selinux-cgroup/selinux-cgroup-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..7deba6a588e9
--- /dev/null
+++ b/sec-policy/selinux-cgroup/selinux-cgroup-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="cgroup"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cgroup"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-chromium/Manifest b/sec-policy/selinux-chromium/Manifest
index 607aa97e6da6..0dac156d1a39 100644
--- a/sec-policy/selinux-chromium/Manifest
+++ b/sec-policy/selinux-chromium/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-chromium-2.20200818-r2.ebuild 384 BLAKE2B 1acbe766bb1298d9315c4295caae0214f33ee8e20f49362a2afb160915b1419f8c509419b0696ecd65da0885edd3eafcb7bbe066b1c4af36b3f1f94b7bc4ee0e SHA512 d5fa8bd3f5b74605bb674d29afba84b0dcd281fd523fa2893a659a718f22c369cc0e8cffc203601d64d5862d1580ab420d12e8db9b35e926f6ec7d649ca2a688
 EBUILD selinux-chromium-2.20210203-r1.ebuild 384 BLAKE2B 1acbe766bb1298d9315c4295caae0214f33ee8e20f49362a2afb160915b1419f8c509419b0696ecd65da0885edd3eafcb7bbe066b1c4af36b3f1f94b7bc4ee0e SHA512 d5fa8bd3f5b74605bb674d29afba84b0dcd281fd523fa2893a659a718f22c369cc0e8cffc203601d64d5862d1580ab420d12e8db9b35e926f6ec7d649ca2a688
 EBUILD selinux-chromium-2.20210908-r1.ebuild 384 BLAKE2B 1acbe766bb1298d9315c4295caae0214f33ee8e20f49362a2afb160915b1419f8c509419b0696ecd65da0885edd3eafcb7bbe066b1c4af36b3f1f94b7bc4ee0e SHA512 d5fa8bd3f5b74605bb674d29afba84b0dcd281fd523fa2893a659a718f22c369cc0e8cffc203601d64d5862d1580ab420d12e8db9b35e926f6ec7d649ca2a688
-EBUILD selinux-chromium-2.20220106-r1.ebuild 388 BLAKE2B c61643ed774112c184cc488f6a9c98d020b03792ec8abfe9cae19be4c0ccdec5d09c9f30e46c3a2e66bc1801727604685be1eac3e93ab734075b343a1279b078 SHA512 2880f86b0321b459ceac00d57365c3a9ddb1e9691d2920c34a5311d27447d510b37eb7d332b5117bd3d65cb7e7f271185198da1afc726a2159aef7a0d079fe92
+EBUILD selinux-chromium-2.20220106-r1.ebuild 386 BLAKE2B 62e0a684290c1f869055e3919cda6e49322b7eabda106be81cec4026baef88ef88cbd0b5deb6ae78a752b93d128e2177410a7b37869d5ed96e8cea80726441e5 SHA512 95ffbb12e008f74678147343b4a6cd215399dc3e75a43e0e5b5bc6d496e26b35ea807690b4720cf3f3adc749c886f69b0caf850c7e4b4f6e8aedd7c66bf4373b
+EBUILD selinux-chromium-2.20220106-r2.ebuild 388 BLAKE2B c61643ed774112c184cc488f6a9c98d020b03792ec8abfe9cae19be4c0ccdec5d09c9f30e46c3a2e66bc1801727604685be1eac3e93ab734075b343a1279b078 SHA512 2880f86b0321b459ceac00d57365c3a9ddb1e9691d2920c34a5311d27447d510b37eb7d332b5117bd3d65cb7e7f271185198da1afc726a2159aef7a0d079fe92
 EBUILD selinux-chromium-9999.ebuild 388 BLAKE2B 802680e245188f28e922ec049f11a47d16786c13dc5b5fb2daae99cd90a2b2bbf4d6630a2bfa87efff5e2fad8836a64bc0d94e380853127f95a9b9279d8b84cc SHA512 a269aee091bbbaaeef3740b425cddc7d12f1c1035abf7d10809539de3d7f9d6b821279d2661c07984a629897cdddbd5ccf087837b9ac991fdf1007611b09d324
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-chromium/selinux-chromium-2.20220106-r1.ebuild b/sec-policy/selinux-chromium/selinux-chromium-2.20220106-r1.ebuild
index cb075f198a34..5c5a327fcd08 100644
--- a/sec-policy/selinux-chromium/selinux-chromium-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-chromium/selinux-chromium-2.20220106-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for chromium"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-chromium/selinux-chromium-2.20220106-r2.ebuild b/sec-policy/selinux-chromium/selinux-chromium-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..cb075f198a34
--- /dev/null
+++ b/sec-policy/selinux-chromium/selinux-chromium-2.20220106-r2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE="alsa"
+MODS="chromium"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for chromium"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-xserver
+"
diff --git a/sec-policy/selinux-chronyd/Manifest b/sec-policy/selinux-chronyd/Manifest
index da285e64983b..82b89a0f5736 100644
--- a/sec-policy/selinux-chronyd/Manifest
+++ b/sec-policy/selinux-chronyd/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-chronyd-2.20200818-r2.ebuild 279 BLAKE2B f8ae69af30c260e11cce2cadd3879b8bfbdaac2a02abc39793fdb0a5820c11541dc60ad408031cec59b8cd9d6b003c5e853361069b832bd0be87d7c5f802553f SHA512 e5d0a5dd4c36bcb2ac91ae1f34d5cf9a19b0183b9564825eb475561095687e814f444b2d0521160344bdc210e8e4b631ef2f0536f88a9231625c281395a4e589
 EBUILD selinux-chronyd-2.20210203-r1.ebuild 279 BLAKE2B f8ae69af30c260e11cce2cadd3879b8bfbdaac2a02abc39793fdb0a5820c11541dc60ad408031cec59b8cd9d6b003c5e853361069b832bd0be87d7c5f802553f SHA512 e5d0a5dd4c36bcb2ac91ae1f34d5cf9a19b0183b9564825eb475561095687e814f444b2d0521160344bdc210e8e4b631ef2f0536f88a9231625c281395a4e589
 EBUILD selinux-chronyd-2.20210908-r1.ebuild 279 BLAKE2B f8ae69af30c260e11cce2cadd3879b8bfbdaac2a02abc39793fdb0a5820c11541dc60ad408031cec59b8cd9d6b003c5e853361069b832bd0be87d7c5f802553f SHA512 e5d0a5dd4c36bcb2ac91ae1f34d5cf9a19b0183b9564825eb475561095687e814f444b2d0521160344bdc210e8e4b631ef2f0536f88a9231625c281395a4e589
-EBUILD selinux-chronyd-2.20220106-r1.ebuild 283 BLAKE2B e1a4eb64ffa809e3e2cd4eab5ab76065a25bc3d217919f7753226e46f8b1babb55fc658dcca263c6c83fa20cb7ebe69b45eaf5257320d4a33148d7fa8db03b14 SHA512 c47ba4cd6686346a734ec7936c813b5dc33ef8fc18f16dee9f2bdbc4f78abd318b47296db6f77066cd9835c3c433964f2d29f1fe47495f604604102843ec195b
+EBUILD selinux-chronyd-2.20220106-r1.ebuild 281 BLAKE2B 0835dee3ed22b8efe945856c325ae18cc07dcb47b978ef0fbe4b1b1103715d73a499086849f4233db544d4c195f52f8c43926fb9f0d93d3a5cbcdf55a89e9e97 SHA512 b152a4526a2759399c04fa3932f7dbc20dcb8a3a56520adc5162a4503e997f6b96a0905da8e5808a46c440d4229924d2fc3bb6dfc708f3edacfc2b973434c98d
+EBUILD selinux-chronyd-2.20220106-r2.ebuild 283 BLAKE2B e1a4eb64ffa809e3e2cd4eab5ab76065a25bc3d217919f7753226e46f8b1babb55fc658dcca263c6c83fa20cb7ebe69b45eaf5257320d4a33148d7fa8db03b14 SHA512 c47ba4cd6686346a734ec7936c813b5dc33ef8fc18f16dee9f2bdbc4f78abd318b47296db6f77066cd9835c3c433964f2d29f1fe47495f604604102843ec195b
 EBUILD selinux-chronyd-9999.ebuild 283 BLAKE2B 72c6c1abd89c1a6917a3f0421c4afbb01aeb01d33f92192b220ad63b45b8b54231660083b1ee6e74236f14a2d92defd67274a45b771553a476926c3f31f85545 SHA512 dd85ab74fae624e94eb6300003004065dacd3bc2f730a27a7a1db1d995eff66f1ff83aea06144848c481fc49868932246b809c7f8ceef6422eae2d14692eb006
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-chronyd/selinux-chronyd-2.20220106-r1.ebuild b/sec-policy/selinux-chronyd/selinux-chronyd-2.20220106-r1.ebuild
index fe35d8b52774..eb90f1f22b97 100644
--- a/sec-policy/selinux-chronyd/selinux-chronyd-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-chronyd/selinux-chronyd-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for chronyd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-chronyd/selinux-chronyd-2.20220106-r2.ebuild b/sec-policy/selinux-chronyd/selinux-chronyd-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..fe35d8b52774
--- /dev/null
+++ b/sec-policy/selinux-chronyd/selinux-chronyd-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="chronyd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for chronyd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-clamav/Manifest b/sec-policy/selinux-clamav/Manifest
index 52ded2a7563d..480385d38345 100644
--- a/sec-policy/selinux-clamav/Manifest
+++ b/sec-policy/selinux-clamav/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-clamav-2.20200818-r2.ebuild 277 BLAKE2B 63160ee98189601474d58d4c4567df9802b7ae5b944de1302854e0904aec335e4869e6ac5c4047205256235cca36e68c152b1967616b651371fb316bb750b3c6 SHA512 c808c85430966185fc233293f1e3c05834fb78468703061dbb8f86e5fd6482f4089efeaf0f3e4ddd68653728befe3a6f157c4acfd2e64c72a2e60323dfe2de1d
 EBUILD selinux-clamav-2.20210203-r1.ebuild 277 BLAKE2B 63160ee98189601474d58d4c4567df9802b7ae5b944de1302854e0904aec335e4869e6ac5c4047205256235cca36e68c152b1967616b651371fb316bb750b3c6 SHA512 c808c85430966185fc233293f1e3c05834fb78468703061dbb8f86e5fd6482f4089efeaf0f3e4ddd68653728befe3a6f157c4acfd2e64c72a2e60323dfe2de1d
 EBUILD selinux-clamav-2.20210908-r1.ebuild 277 BLAKE2B 63160ee98189601474d58d4c4567df9802b7ae5b944de1302854e0904aec335e4869e6ac5c4047205256235cca36e68c152b1967616b651371fb316bb750b3c6 SHA512 c808c85430966185fc233293f1e3c05834fb78468703061dbb8f86e5fd6482f4089efeaf0f3e4ddd68653728befe3a6f157c4acfd2e64c72a2e60323dfe2de1d
-EBUILD selinux-clamav-2.20220106-r1.ebuild 281 BLAKE2B c3a9f653585b55bb56c6d0dc5922f4bbaacf8820f07a4d707107211fe9e3684aebf15cce404b27b4656d599d9ed69c16ab89c3ac14436a27f0f3edfdcbea6347 SHA512 e95d4935817ca97116129fe35adf7869add6adc52176f004171be0319ee69d028b43d0b7ba17c6cdbcc2138b5a874b5420c86c0bccbfbdc0a2f97e6401124306
+EBUILD selinux-clamav-2.20220106-r1.ebuild 279 BLAKE2B 305d6620da6a0042403877ff34ea681c7007d77080c9832ab7606289e5e1d0952d05d064a0e57e6457909d593dbdd446e3439a4b84494be22da6a244f6a06852 SHA512 67799138324e0a9bb52cab2ab67b69cb6b742210d46c6f29ba5e21aade0da816531fb22f7a708f1d39a6bee449cb2bf2683fe9bed417c7dfee4e2148e4b2c8ed
+EBUILD selinux-clamav-2.20220106-r2.ebuild 281 BLAKE2B c3a9f653585b55bb56c6d0dc5922f4bbaacf8820f07a4d707107211fe9e3684aebf15cce404b27b4656d599d9ed69c16ab89c3ac14436a27f0f3edfdcbea6347 SHA512 e95d4935817ca97116129fe35adf7869add6adc52176f004171be0319ee69d028b43d0b7ba17c6cdbcc2138b5a874b5420c86c0bccbfbdc0a2f97e6401124306
 EBUILD selinux-clamav-9999.ebuild 281 BLAKE2B ca597ba154f3f6e032f5eded9da457799a58ff07b6dba78c428fc9cf8060d549ad913a00f806b6071f5c0bca12e6f1845f2d386cc2c5d8c325509e1309e6d92b SHA512 3a67e1a921692ddb19d0f1e4c1eabf25cf7282343efdf6468661e20f53e9670838bbc03e1f6075fe716e7207ed07fa9a6093376a2ea70adcbbe6b2298aad2c39
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-clamav/selinux-clamav-2.20220106-r1.ebuild b/sec-policy/selinux-clamav/selinux-clamav-2.20220106-r1.ebuild
index ed45f5f9c45e..526b0196a2dc 100644
--- a/sec-policy/selinux-clamav/selinux-clamav-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-clamav/selinux-clamav-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for clamav"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-clamav/selinux-clamav-2.20220106-r2.ebuild b/sec-policy/selinux-clamav/selinux-clamav-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..ed45f5f9c45e
--- /dev/null
+++ b/sec-policy/selinux-clamav/selinux-clamav-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="clamav"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for clamav"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-collectd/Manifest b/sec-policy/selinux-collectd/Manifest
index a30831e15b43..cf79ce9a3c64 100644
--- a/sec-policy/selinux-collectd/Manifest
+++ b/sec-policy/selinux-collectd/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-collectd-2.20200818-r2.ebuild 379 BLAKE2B 05748686e3d04cdd5a97302ad6c31e17782a510706d7b00215889795687d2e95226b65f35017f1a239e8cae6445a4a1de0d095eab1431113fda9f220053936f2 SHA512 8b1e0f7bc44e59bc07ae75d09f3e3f27b4c0cf7bd63941e3fcf68003e3d2b9ae470d83fe3f49ab88c22d1dab87f07c6b35c5b7c771ab8ce8b30d04c3f70d56b0
 EBUILD selinux-collectd-2.20210203-r1.ebuild 379 BLAKE2B 05748686e3d04cdd5a97302ad6c31e17782a510706d7b00215889795687d2e95226b65f35017f1a239e8cae6445a4a1de0d095eab1431113fda9f220053936f2 SHA512 8b1e0f7bc44e59bc07ae75d09f3e3f27b4c0cf7bd63941e3fcf68003e3d2b9ae470d83fe3f49ab88c22d1dab87f07c6b35c5b7c771ab8ce8b30d04c3f70d56b0
 EBUILD selinux-collectd-2.20210908-r1.ebuild 379 BLAKE2B 05748686e3d04cdd5a97302ad6c31e17782a510706d7b00215889795687d2e95226b65f35017f1a239e8cae6445a4a1de0d095eab1431113fda9f220053936f2 SHA512 8b1e0f7bc44e59bc07ae75d09f3e3f27b4c0cf7bd63941e3fcf68003e3d2b9ae470d83fe3f49ab88c22d1dab87f07c6b35c5b7c771ab8ce8b30d04c3f70d56b0
-EBUILD selinux-collectd-2.20220106-r1.ebuild 383 BLAKE2B 9b02e479b334a89195cc310acd2a985117bfe82982b1358c389be807c5507d4597655826131418d9e460de2147b249ec78496c54dc8e42441bcbdc5a21d90b52 SHA512 6ca8d6a7c1142a11b68c24d6012a5fd794289f70ed401be8265b269146985f700743a9edf8ebaac48d8f41a1a54d0b7e25d852735ab8ca45051f2f2beff91047
+EBUILD selinux-collectd-2.20220106-r1.ebuild 381 BLAKE2B 632b2e749ca5128ffc6241946d27783ad8fd4e3cd520de2f5eec880d1fb330bc40fc6e63fc4b72b5df03a6fea25ec0c930516c84cfe8744e6f0079aa4a96ab83 SHA512 bacf7ab6a5ff5e2d5ae5d22cb7a3f2acd46ecbb1767b0c5b93bf0f8c1b24aadb8854cff90f542c38aec1ff9bc30fb4f29b02e6494864a782567a6c96ba5eb145
+EBUILD selinux-collectd-2.20220106-r2.ebuild 383 BLAKE2B 9b02e479b334a89195cc310acd2a985117bfe82982b1358c389be807c5507d4597655826131418d9e460de2147b249ec78496c54dc8e42441bcbdc5a21d90b52 SHA512 6ca8d6a7c1142a11b68c24d6012a5fd794289f70ed401be8265b269146985f700743a9edf8ebaac48d8f41a1a54d0b7e25d852735ab8ca45051f2f2beff91047
 EBUILD selinux-collectd-9999.ebuild 383 BLAKE2B 66786790e0d91f339e02fd3efe1c0dac26dc0a6b99233fc18f8cf877cd0979b65e2781288331e0187e964b19dc993363a4235abc47c41a7f9b1f4356e055a146 SHA512 bdadd28919a20dba6e5f3cf89f4ac723028b02ec65c3262def52fc79a6cb7997685c8a291173ca743121e84cdb87c0bc2cf019987664b14cbb2585d199e13763
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-collectd/selinux-collectd-2.20220106-r1.ebuild b/sec-policy/selinux-collectd/selinux-collectd-2.20220106-r1.ebuild
index 7e5966d4c17c..1e2fce11c14d 100644
--- a/sec-policy/selinux-collectd/selinux-collectd-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-collectd/selinux-collectd-2.20220106-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for collectd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-collectd/selinux-collectd-2.20220106-r2.ebuild b/sec-policy/selinux-collectd/selinux-collectd-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..7e5966d4c17c
--- /dev/null
+++ b/sec-policy/selinux-collectd/selinux-collectd-2.20220106-r2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="collectd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for collectd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-colord/Manifest b/sec-policy/selinux-colord/Manifest
index 27749fbda64b..890c92787b87 100644
--- a/sec-policy/selinux-colord/Manifest
+++ b/sec-policy/selinux-colord/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-colord-2.20200818-r2.ebuild 277 BLAKE2B 0478d2795be7d9763cfff39ca832e6e74946471ba60346a59d1aa1ab3ab2c945ca594308c6ba3029c0e3a33cbaa969c9719fb284e9f42caa9f30192af26b9e6f SHA512 ad1b3216b434ec1079b5c4305c5ba899ca54a178b1cf23c823bd47b4dda2858a8dc2afd1f7b45483bf7f055340a6e9aaf491029f1e3c51afc0a06c52e1b33514
 EBUILD selinux-colord-2.20210203-r1.ebuild 277 BLAKE2B 0478d2795be7d9763cfff39ca832e6e74946471ba60346a59d1aa1ab3ab2c945ca594308c6ba3029c0e3a33cbaa969c9719fb284e9f42caa9f30192af26b9e6f SHA512 ad1b3216b434ec1079b5c4305c5ba899ca54a178b1cf23c823bd47b4dda2858a8dc2afd1f7b45483bf7f055340a6e9aaf491029f1e3c51afc0a06c52e1b33514
 EBUILD selinux-colord-2.20210908-r1.ebuild 277 BLAKE2B 0478d2795be7d9763cfff39ca832e6e74946471ba60346a59d1aa1ab3ab2c945ca594308c6ba3029c0e3a33cbaa969c9719fb284e9f42caa9f30192af26b9e6f SHA512 ad1b3216b434ec1079b5c4305c5ba899ca54a178b1cf23c823bd47b4dda2858a8dc2afd1f7b45483bf7f055340a6e9aaf491029f1e3c51afc0a06c52e1b33514
-EBUILD selinux-colord-2.20220106-r1.ebuild 281 BLAKE2B bc5c9bc7ceefe9b24490fc161ff638bf54bdf478f8c5c00d77896a84d136cf22c148716626f8bcff28a5b2e1e1cb1b74ba54853e6ce22abb3c59a50207152f5c SHA512 7522b2e0bd9fa44040d8f61fa25d95be8451383d3c8eb820979f7ca87a6d84f03e93eb2a8012b2a186cb0d4497ca0ff8bf4f74099507611e2cae75f755a2b1c6
+EBUILD selinux-colord-2.20220106-r1.ebuild 279 BLAKE2B 618b08dbaa422fc30981f469a99e7186d0ff8b3060ddf14b8153e1b4669ebd29f5b4a21ddc3e801c54085f00b205c9dabec9303b586999ff843765c957529359 SHA512 a27a8c4c6f1fa898fc34fb191653e08469e491816e33793c8d939c2c6e5c03a897930824d9a33f1dc39f9a1bf6f37a0f8c0d8ea401cd41cb05ae4ae396fe979d
+EBUILD selinux-colord-2.20220106-r2.ebuild 281 BLAKE2B bc5c9bc7ceefe9b24490fc161ff638bf54bdf478f8c5c00d77896a84d136cf22c148716626f8bcff28a5b2e1e1cb1b74ba54853e6ce22abb3c59a50207152f5c SHA512 7522b2e0bd9fa44040d8f61fa25d95be8451383d3c8eb820979f7ca87a6d84f03e93eb2a8012b2a186cb0d4497ca0ff8bf4f74099507611e2cae75f755a2b1c6
 EBUILD selinux-colord-9999.ebuild 281 BLAKE2B 414e9b26830e03e64d291425890fee3652040e08848839e3e4715a1bd8a8503d15dec100145a429d13bc80881a3b9028b3cb633374b5b8e56431e9ab32e3a201 SHA512 fab0a40aea0721bf3bf28895f13ddc22eb6664d87ceac659dfdc0d027761a8b65e2ce7ab0f35de079a9b5c06a797edd1da5eac23bb1e60f1521d29aa3ce89cbe
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-colord/selinux-colord-2.20220106-r1.ebuild b/sec-policy/selinux-colord/selinux-colord-2.20220106-r1.ebuild
index 4b5bd3877dd8..feaa6b85aa2b 100644
--- a/sec-policy/selinux-colord/selinux-colord-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-colord/selinux-colord-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for colord"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-colord/selinux-colord-2.20220106-r2.ebuild b/sec-policy/selinux-colord/selinux-colord-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..4b5bd3877dd8
--- /dev/null
+++ b/sec-policy/selinux-colord/selinux-colord-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="colord"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for colord"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-container/Manifest b/sec-policy/selinux-container/Manifest
index aed69780b32b..d656307582ea 100644
--- a/sec-policy/selinux-container/Manifest
+++ b/sec-policy/selinux-container/Manifest
@@ -1,5 +1,7 @@
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176d3c8e508b2ff97d4f8a876d7c0a65534a62d86c9816ac59f6eed583f4b5c51cf432643edd2dad24dd51eb3cf22e2b75ac SHA512 794327d2dd07196b5f36771f9a961cdf294cf68f690735418d6bdd859499b7007c518cc022ccca9c245a5266b85bdb7cacdcaeefee14e4800937c9101476b373
-EBUILD selinux-container-2.20220106-r1.ebuild 287 BLAKE2B 9d8dd85ebb81a22deb75175ec47327b323dad9bc0daa1d5bd3ccde87ab00c493c1202e74343245ba86ff7f54a361506ddc30b7d3eab93925485da928574e6191 SHA512 eb2a3c5c4517ccf3b369974111e98165c7882d9e4cbd3105d145fec4ce8a213f1a92b2641b31025708badbfb8f70ff531cf9121442d2553b8e473cbf5f95bdf6
+EBUILD selinux-container-2.20220106-r1.ebuild 285 BLAKE2B 1d4d8bd8fbc8aa8f3a5afb4a763c3200c48908c4a24a644ff225f929794f647fb8a76a4a81be3846b9a7ddb4ea7212ced029e614cb4608a17e24242d8b400999 SHA512 422e0a0481c989e3295de9122ce2bf19cb51d87d607c5e2653a47fdc4b9c6e4d42652784ccc47d53e82413b66fd73ed2906436f06c7f861737e168b881dff17a
+EBUILD selinux-container-2.20220106-r2.ebuild 287 BLAKE2B 9d8dd85ebb81a22deb75175ec47327b323dad9bc0daa1d5bd3ccde87ab00c493c1202e74343245ba86ff7f54a361506ddc30b7d3eab93925485da928574e6191 SHA512 eb2a3c5c4517ccf3b369974111e98165c7882d9e4cbd3105d145fec4ce8a213f1a92b2641b31025708badbfb8f70ff531cf9121442d2553b8e473cbf5f95bdf6
 EBUILD selinux-container-9999.ebuild 287 BLAKE2B 9d8dd85ebb81a22deb75175ec47327b323dad9bc0daa1d5bd3ccde87ab00c493c1202e74343245ba86ff7f54a361506ddc30b7d3eab93925485da928574e6191 SHA512 eb2a3c5c4517ccf3b369974111e98165c7882d9e4cbd3105d145fec4ce8a213f1a92b2641b31025708badbfb8f70ff531cf9121442d2553b8e473cbf5f95bdf6
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-container/selinux-container-2.20220106-r1.ebuild b/sec-policy/selinux-container/selinux-container-2.20220106-r1.ebuild
index e664a42c56f3..2a4479d5404e 100644
--- a/sec-policy/selinux-container/selinux-container-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-container/selinux-container-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for container"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-container/selinux-container-2.20220106-r2.ebuild b/sec-policy/selinux-container/selinux-container-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..e664a42c56f3
--- /dev/null
+++ b/sec-policy/selinux-container/selinux-container-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="container"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for container"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-corosync/Manifest b/sec-policy/selinux-corosync/Manifest
index 2b0e4cb34dff..1b15e78cb221 100644
--- a/sec-policy/selinux-corosync/Manifest
+++ b/sec-policy/selinux-corosync/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-corosync-2.20200818-r2.ebuild 281 BLAKE2B d2812c48a92a816cf9e6e11e398413db15182ee60a8a379c8bd93aa183ca4c987a555acc27dc833fdb95ea5ccf309fca9d818ccaf9f7d3aa5107dee98c82635e SHA512 95aa56bd6137f62fc0caa8019676384dcfdc40fad3ae582840ae9bc03e0b844f5048cef8adedb3d21873d03c93ad101c89ae9629d0e013247730b633d41e1c70
 EBUILD selinux-corosync-2.20210203-r1.ebuild 281 BLAKE2B d2812c48a92a816cf9e6e11e398413db15182ee60a8a379c8bd93aa183ca4c987a555acc27dc833fdb95ea5ccf309fca9d818ccaf9f7d3aa5107dee98c82635e SHA512 95aa56bd6137f62fc0caa8019676384dcfdc40fad3ae582840ae9bc03e0b844f5048cef8adedb3d21873d03c93ad101c89ae9629d0e013247730b633d41e1c70
 EBUILD selinux-corosync-2.20210908-r1.ebuild 281 BLAKE2B d2812c48a92a816cf9e6e11e398413db15182ee60a8a379c8bd93aa183ca4c987a555acc27dc833fdb95ea5ccf309fca9d818ccaf9f7d3aa5107dee98c82635e SHA512 95aa56bd6137f62fc0caa8019676384dcfdc40fad3ae582840ae9bc03e0b844f5048cef8adedb3d21873d03c93ad101c89ae9629d0e013247730b633d41e1c70
-EBUILD selinux-corosync-2.20220106-r1.ebuild 285 BLAKE2B 96984a081241fe62598bac60a292ed4e73045a875a4a64f6ba55f48f28c33e23680d93c2da3c620724baee874e2a3871d871b53928e9278b2008624b715cc9d0 SHA512 7986f4f1ff2a167e4bff9c6dce96ba538626bdb84fb75f65e2599166cdcd52f6507d6dcdc28d60e580f57e16d3ed8c5d63d56404aaf9e8a2052fcf0f6daeeed9
+EBUILD selinux-corosync-2.20220106-r1.ebuild 283 BLAKE2B ef9679f425aaead102d9d73073c9b4f26469bce5cdfbb0ce363567fc5ebbf020035fa3a4d4a2f905ca351d1a23c1ee90e05bf03bd422423d48b7e313a9e13f62 SHA512 1c6c6e00e8e9dd56546b8ba5ee13aae8e3befb92078ceae3d30bf8530f9febe25706dff5a791ac8c2c5bc8ff8dbe43d3ce29875e702dcbb03b3ce629c60aa21f
+EBUILD selinux-corosync-2.20220106-r2.ebuild 285 BLAKE2B 96984a081241fe62598bac60a292ed4e73045a875a4a64f6ba55f48f28c33e23680d93c2da3c620724baee874e2a3871d871b53928e9278b2008624b715cc9d0 SHA512 7986f4f1ff2a167e4bff9c6dce96ba538626bdb84fb75f65e2599166cdcd52f6507d6dcdc28d60e580f57e16d3ed8c5d63d56404aaf9e8a2052fcf0f6daeeed9
 EBUILD selinux-corosync-9999.ebuild 285 BLAKE2B cde93bad36bbb5e593a61161928c8a9c0d129fdd015dba9266d8bb3e8e6e802a390703872b438dc682f1c215044967dce4136480461d81ae6fd6f06446d5d66b SHA512 815d80b434b272923a9e2f87f34e6b8d1cf668f6d37a2fa47a88146c13fc1017a0c2e0d1a8d8682e384358913c1d3e354622098377340ed2b82b6a47afd38d4e
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-corosync/selinux-corosync-2.20220106-r1.ebuild b/sec-policy/selinux-corosync/selinux-corosync-2.20220106-r1.ebuild
index c625057992dd..b1b85c828ead 100644
--- a/sec-policy/selinux-corosync/selinux-corosync-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-corosync/selinux-corosync-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for corosync"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-corosync/selinux-corosync-2.20220106-r2.ebuild b/sec-policy/selinux-corosync/selinux-corosync-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..c625057992dd
--- /dev/null
+++ b/sec-policy/selinux-corosync/selinux-corosync-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="corosync"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for corosync"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-couchdb/Manifest b/sec-policy/selinux-couchdb/Manifest
index 7ba2c0019b3b..8072b197d698 100644
--- a/sec-policy/selinux-couchdb/Manifest
+++ b/sec-policy/selinux-couchdb/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-couchdb-2.20200818-r2.ebuild 279 BLAKE2B 11532cd2168d6c87d8f3425093e9e54cda90f5542bb840aeb70c6c451700604edad44b277a20c79f0d8381433e8e832832761c9d4b8334ac27ffc0f6114ecf20 SHA512 5269f79c8d4e229b99de35a4392b1739de2917c211159320fac3b09b612f9cb3e58729c63af9fdc6c641ac41ed7cf81830ebdb818d5fb7d41339fd3f992c82cb
 EBUILD selinux-couchdb-2.20210203-r1.ebuild 279 BLAKE2B 11532cd2168d6c87d8f3425093e9e54cda90f5542bb840aeb70c6c451700604edad44b277a20c79f0d8381433e8e832832761c9d4b8334ac27ffc0f6114ecf20 SHA512 5269f79c8d4e229b99de35a4392b1739de2917c211159320fac3b09b612f9cb3e58729c63af9fdc6c641ac41ed7cf81830ebdb818d5fb7d41339fd3f992c82cb
 EBUILD selinux-couchdb-2.20210908-r1.ebuild 279 BLAKE2B 11532cd2168d6c87d8f3425093e9e54cda90f5542bb840aeb70c6c451700604edad44b277a20c79f0d8381433e8e832832761c9d4b8334ac27ffc0f6114ecf20 SHA512 5269f79c8d4e229b99de35a4392b1739de2917c211159320fac3b09b612f9cb3e58729c63af9fdc6c641ac41ed7cf81830ebdb818d5fb7d41339fd3f992c82cb
-EBUILD selinux-couchdb-2.20220106-r1.ebuild 283 BLAKE2B bcc574ef1de59bbd996ee69f60ed232210bc8139596db2f9af519f7c784bfd573bdbeab8795f5f2cbdff4e1db378b86485aa600059af240e94201bb2c9cb5ba6 SHA512 d7696a9c001fa26c0d2d52c2f9efd5b02d0e71331ba50deb863a6c91e197327830d39d7347ddce8a85db14e0ca0bdbd5a59b81df2a8c5a7413dda9fc3a779867
+EBUILD selinux-couchdb-2.20220106-r1.ebuild 281 BLAKE2B f45a6b3a69333ca5e8ed84b58f2fa6fa3295c996476f202f1450648886880a9f05e173c85970c420f8d2c88e4aab1dd54a9d05ff10e73cc06813f4f318438dd8 SHA512 224dedad5aaa07b53dfbc985cb46ed8a06268c3011c5aea6cb4dd30fc97a6c2ede765ef3c1f78d977e0f09c7865d977ac5f98162fd9ee546177d03705221c4a5
+EBUILD selinux-couchdb-2.20220106-r2.ebuild 283 BLAKE2B bcc574ef1de59bbd996ee69f60ed232210bc8139596db2f9af519f7c784bfd573bdbeab8795f5f2cbdff4e1db378b86485aa600059af240e94201bb2c9cb5ba6 SHA512 d7696a9c001fa26c0d2d52c2f9efd5b02d0e71331ba50deb863a6c91e197327830d39d7347ddce8a85db14e0ca0bdbd5a59b81df2a8c5a7413dda9fc3a779867
 EBUILD selinux-couchdb-9999.ebuild 283 BLAKE2B b288dec08ec5815403adcf532ea0593939448f626fc026316dd96865df5f618339c2803763010c897bf3f4afcce94b5ce247b34f73ad091c298759c57dc0f7d3 SHA512 a2c3050a5a47d895efcb4137668f585e8b1687c38a3c524264d451cd6b21fd062bc01f69520ebd37783925be8e56c8eda2dee28ed35a7b62d8ae9f85fc4cdc1a
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-couchdb/selinux-couchdb-2.20220106-r1.ebuild b/sec-policy/selinux-couchdb/selinux-couchdb-2.20220106-r1.ebuild
index 4f62bbadba81..0983f337b7f2 100644
--- a/sec-policy/selinux-couchdb/selinux-couchdb-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-couchdb/selinux-couchdb-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for couchdb"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-couchdb/selinux-couchdb-2.20220106-r2.ebuild b/sec-policy/selinux-couchdb/selinux-couchdb-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..4f62bbadba81
--- /dev/null
+++ b/sec-policy/selinux-couchdb/selinux-couchdb-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="couchdb"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for couchdb"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-courier/Manifest b/sec-policy/selinux-courier/Manifest
index 74d55a3c0620..b3b233a415b9 100644
--- a/sec-policy/selinux-courier/Manifest
+++ b/sec-policy/selinux-courier/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-courier-2.20200818-r2.ebuild 279 BLAKE2B 3d376e308c366c292c25ebdba3c2353b02801bea869073898a5897550506da2f95e20020250beb40719535e3a9ce6d773b3208788e45468c0faf1b00f3c82eca SHA512 9074da6e771f30b4afbcf8acec8d12c8ebb4bfc1f5805f7602011fbdee6ec97fda9715abf1224fe12cddc92548ccc26a9a1ec397b19afd82ace3aae8df770470
 EBUILD selinux-courier-2.20210203-r1.ebuild 279 BLAKE2B 3d376e308c366c292c25ebdba3c2353b02801bea869073898a5897550506da2f95e20020250beb40719535e3a9ce6d773b3208788e45468c0faf1b00f3c82eca SHA512 9074da6e771f30b4afbcf8acec8d12c8ebb4bfc1f5805f7602011fbdee6ec97fda9715abf1224fe12cddc92548ccc26a9a1ec397b19afd82ace3aae8df770470
 EBUILD selinux-courier-2.20210908-r1.ebuild 279 BLAKE2B 3d376e308c366c292c25ebdba3c2353b02801bea869073898a5897550506da2f95e20020250beb40719535e3a9ce6d773b3208788e45468c0faf1b00f3c82eca SHA512 9074da6e771f30b4afbcf8acec8d12c8ebb4bfc1f5805f7602011fbdee6ec97fda9715abf1224fe12cddc92548ccc26a9a1ec397b19afd82ace3aae8df770470
-EBUILD selinux-courier-2.20220106-r1.ebuild 283 BLAKE2B c253bf1b971b38052766866609589338c0d9ac7409bb8b9a30a6e237da072bb11aa3f7f0e49d0e51cda8680c62609d51501001aa30a87cb6fc8a698190bd4cbf SHA512 a7eb0de197587ff037ead0dd8eed09bf09ba9722ed58992ac4039aef8c80907077a7edb176c4d615957743de3e9deca391488f2de874ea7e97a318f672865c09
+EBUILD selinux-courier-2.20220106-r1.ebuild 281 BLAKE2B e2fb902b9a621642b9af2529de6813a181c359695e91b1259b8613115a94f1fb67d7b0d002f76352aa36d6b142a158d73db0b72133e3c9aac9365cf699989d4e SHA512 5990285d5115715216d3f5e30076aa6719bba874d2f5b94ff8e489de4dd1fb464bf8828846603e2a2d77c03753bf7e4bc21b9933e3aea023bd1049da6a8586e3
+EBUILD selinux-courier-2.20220106-r2.ebuild 283 BLAKE2B c253bf1b971b38052766866609589338c0d9ac7409bb8b9a30a6e237da072bb11aa3f7f0e49d0e51cda8680c62609d51501001aa30a87cb6fc8a698190bd4cbf SHA512 a7eb0de197587ff037ead0dd8eed09bf09ba9722ed58992ac4039aef8c80907077a7edb176c4d615957743de3e9deca391488f2de874ea7e97a318f672865c09
 EBUILD selinux-courier-9999.ebuild 283 BLAKE2B fe66e7169b78fb72d7c332cf04ba109b4dd8c9ccdc15876d194fffa92fad65f97c03cb469a6c3ef053e455444cc1e2c3132d56c8d757bd82b0d726bf26d59ddc SHA512 eb870f06f949f140fe1d9831f691eb400efeed60e316bf4b0bf97b1d9fd5022219c5d74980b235122f40674f24e1305e61d9ef142053b710d10fd5bcc83d4ad2
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-courier/selinux-courier-2.20220106-r1.ebuild b/sec-policy/selinux-courier/selinux-courier-2.20220106-r1.ebuild
index 28f7db8d089e..44beeaf6e497 100644
--- a/sec-policy/selinux-courier/selinux-courier-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-courier/selinux-courier-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for courier"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-courier/selinux-courier-2.20220106-r2.ebuild b/sec-policy/selinux-courier/selinux-courier-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..28f7db8d089e
--- /dev/null
+++ b/sec-policy/selinux-courier/selinux-courier-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="courier"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for courier"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-cpucontrol/Manifest b/sec-policy/selinux-cpucontrol/Manifest
index da17bc978ade..bd2b0ccb15ca 100644
--- a/sec-policy/selinux-cpucontrol/Manifest
+++ b/sec-policy/selinux-cpucontrol/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-cpucontrol-2.20200818-r2.ebuild 285 BLAKE2B 3721155b986628b8d22906bbe7ac479c9b803b9971c7a565559e336edba6499f0291f1246b12b1c560b8f9e9acf7a652d7ef0afe0c3471a296a8a4c4012dc672 SHA512 54d94ede7bd590753307eca8e572b1ebd865a1d8465f2268acc95888cea4f9a34a0c317ce161beb1a344f98b0c84bcbd3b1464441f9aef0ebafd8802bf8f40f4
 EBUILD selinux-cpucontrol-2.20210203-r1.ebuild 285 BLAKE2B 3721155b986628b8d22906bbe7ac479c9b803b9971c7a565559e336edba6499f0291f1246b12b1c560b8f9e9acf7a652d7ef0afe0c3471a296a8a4c4012dc672 SHA512 54d94ede7bd590753307eca8e572b1ebd865a1d8465f2268acc95888cea4f9a34a0c317ce161beb1a344f98b0c84bcbd3b1464441f9aef0ebafd8802bf8f40f4
 EBUILD selinux-cpucontrol-2.20210908-r1.ebuild 285 BLAKE2B 3721155b986628b8d22906bbe7ac479c9b803b9971c7a565559e336edba6499f0291f1246b12b1c560b8f9e9acf7a652d7ef0afe0c3471a296a8a4c4012dc672 SHA512 54d94ede7bd590753307eca8e572b1ebd865a1d8465f2268acc95888cea4f9a34a0c317ce161beb1a344f98b0c84bcbd3b1464441f9aef0ebafd8802bf8f40f4
-EBUILD selinux-cpucontrol-2.20220106-r1.ebuild 289 BLAKE2B b61eb94725cf03d519041be10ada1f9cae39cf83dd21899ae8280f3448b42a7059acf2534b34f18023f8fd6a212a1fbe727bc0d87660635c56c14ccace323651 SHA512 cdcec50478de06bb39bd2327bcb46e56dd436dbe5f796d22f9f6b569a0856e2b142fb63f32335f86167e74aac3d6ce9ff6ec8a6141885fe80b76feefa6439caf
+EBUILD selinux-cpucontrol-2.20220106-r1.ebuild 287 BLAKE2B 51a91c759f5cfb0cffe0eb083f7db58849344be97f2040a211e45f091b198180ed6ce97d07c0962f4578dc117520353fd3ce61663f208679a6e67657c7be3c33 SHA512 d74a8822ae6e59fbc7ed0f7b84aab76e9595a286d52767f93c9ed2c1b349cf202c1958945c8e564239853a12b66a614242f6499c3180cdaeb07b781f99e19a9e
+EBUILD selinux-cpucontrol-2.20220106-r2.ebuild 289 BLAKE2B b61eb94725cf03d519041be10ada1f9cae39cf83dd21899ae8280f3448b42a7059acf2534b34f18023f8fd6a212a1fbe727bc0d87660635c56c14ccace323651 SHA512 cdcec50478de06bb39bd2327bcb46e56dd436dbe5f796d22f9f6b569a0856e2b142fb63f32335f86167e74aac3d6ce9ff6ec8a6141885fe80b76feefa6439caf
 EBUILD selinux-cpucontrol-9999.ebuild 289 BLAKE2B 0a0d7793904fa300ab4be022787c80534f9a3540aca20000ccd9442781da368890e83964bdc698db386d5a7f26844cc14a2285a0f2f86d6f26f145431c89af0a SHA512 77edf30f610ebe45b76de6ef8df4d6cf8a031f41e3cc17b41d38884cfe17de3e74d92a9ec3e1e54a333566eeb3e190f78a9d1874b781097f33a77f22b2a414d7
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20220106-r1.ebuild b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20220106-r1.ebuild
index 7e25e4d09506..c533d88d1362 100644
--- a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cpucontrol"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20220106-r2.ebuild b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..7e25e4d09506
--- /dev/null
+++ b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="cpucontrol"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cpucontrol"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-cpufreqselector/Manifest b/sec-policy/selinux-cpufreqselector/Manifest
index c91faebdbd8e..58c520cac22e 100644
--- a/sec-policy/selinux-cpufreqselector/Manifest
+++ b/sec-policy/selinux-cpufreqselector/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-cpufreqselector-2.20200818-r2.ebuild 295 BLAKE2B b76ff389492c13a0d0a5079c27e4e6733ba560fa635ed2907d13c5933485bb92c7caf9ec0d32d25da4030f32115db4f54852794bc2a27221230dc43cc931ed13 SHA512 761b3c3fd150ebe5da39a76d685ce74fdd2d370d4e2ea9e00c8d74f09ca3d6354e2307fb64ea7f4c6536d4d8eae361ddc403cff6a684fa54466dbf02ad00866a
 EBUILD selinux-cpufreqselector-2.20210203-r1.ebuild 295 BLAKE2B b76ff389492c13a0d0a5079c27e4e6733ba560fa635ed2907d13c5933485bb92c7caf9ec0d32d25da4030f32115db4f54852794bc2a27221230dc43cc931ed13 SHA512 761b3c3fd150ebe5da39a76d685ce74fdd2d370d4e2ea9e00c8d74f09ca3d6354e2307fb64ea7f4c6536d4d8eae361ddc403cff6a684fa54466dbf02ad00866a
 EBUILD selinux-cpufreqselector-2.20210908-r1.ebuild 295 BLAKE2B b76ff389492c13a0d0a5079c27e4e6733ba560fa635ed2907d13c5933485bb92c7caf9ec0d32d25da4030f32115db4f54852794bc2a27221230dc43cc931ed13 SHA512 761b3c3fd150ebe5da39a76d685ce74fdd2d370d4e2ea9e00c8d74f09ca3d6354e2307fb64ea7f4c6536d4d8eae361ddc403cff6a684fa54466dbf02ad00866a
-EBUILD selinux-cpufreqselector-2.20220106-r1.ebuild 299 BLAKE2B 40dacadda25ac94c510aa2a31a92f41603aab6feabd8382da4c1d43679389721d572efdfb27161cb05d832ea6c79339411a7c9d3dbdaa6da84c97c225a79c6ea SHA512 f0d44b87946c6d0a9d7961f9fa229fb4fce7b0a4a3636e843a52c5e69902d4c63a8becfccc1f753b6361fb284bee8b707b2d149f79aa515588a213dc365029c2
+EBUILD selinux-cpufreqselector-2.20220106-r1.ebuild 297 BLAKE2B d50496b9c211457b7c0962ecb1b70ef6dd74828e557ff2f1692d84a66ac7db3df5c322230a64c7b73bf8fa38130f62e1de22b38ecf89a1317c49971832dc823f SHA512 11c76df35ac38aaa77a17c8e860010429a1baefac6300f41e3d7fcda4607e65aba0cb24f6c3dcd71068029ad96dee6c6e13eb8c916144b7d4b3b18d67d6f60ff
+EBUILD selinux-cpufreqselector-2.20220106-r2.ebuild 299 BLAKE2B 40dacadda25ac94c510aa2a31a92f41603aab6feabd8382da4c1d43679389721d572efdfb27161cb05d832ea6c79339411a7c9d3dbdaa6da84c97c225a79c6ea SHA512 f0d44b87946c6d0a9d7961f9fa229fb4fce7b0a4a3636e843a52c5e69902d4c63a8becfccc1f753b6361fb284bee8b707b2d149f79aa515588a213dc365029c2
 EBUILD selinux-cpufreqselector-9999.ebuild 299 BLAKE2B f20e99056d1c2fa8db3b0c10f9a07dce4cb6b3e808b53bc0eff3def821a0a887971979c2c29697a75d617609a60df0e115bd0511773fa1ba65e8c5a81eb1dcc0 SHA512 63b7915898abf2f60cb1637cd03e85004402dae6c08f0505fa7abc731ba04bf6a9af46cea5d987b6a0495c29d60c947eb53c365e95e1b6930ab38eb08b643b19
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20220106-r1.ebuild b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20220106-r1.ebuild
index 5597c1e46849..e5a1851c0992 100644
--- a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cpufreqselector"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20220106-r2.ebuild b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..5597c1e46849
--- /dev/null
+++ b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="cpufreqselector"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cpufreqselector"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-cups/Manifest b/sec-policy/selinux-cups/Manifest
index 03f17a0fd714..b31001ab5b8d 100644
--- a/sec-policy/selinux-cups/Manifest
+++ b/sec-policy/selinux-cups/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-cups-2.20200818-r2.ebuild 363 BLAKE2B 64fa4e65b6b46d7601e96e8642c5494f00eaea0f0902ee8b4b2bbbe476eecd81327ab0b3e7735366dfca5783257348726f902b1491f97a316c3012c0e91596b9 SHA512 4949d83e1b1ceb3cde3851e0aa3b23bb0b73f074ace62503d7a3355009dc706df7b9cc89bab497fd5a7dde40ef6f841bada79c18a5c1fcc61a4a5dd7ede198e8
 EBUILD selinux-cups-2.20210203-r1.ebuild 363 BLAKE2B 64fa4e65b6b46d7601e96e8642c5494f00eaea0f0902ee8b4b2bbbe476eecd81327ab0b3e7735366dfca5783257348726f902b1491f97a316c3012c0e91596b9 SHA512 4949d83e1b1ceb3cde3851e0aa3b23bb0b73f074ace62503d7a3355009dc706df7b9cc89bab497fd5a7dde40ef6f841bada79c18a5c1fcc61a4a5dd7ede198e8
 EBUILD selinux-cups-2.20210908-r1.ebuild 363 BLAKE2B 64fa4e65b6b46d7601e96e8642c5494f00eaea0f0902ee8b4b2bbbe476eecd81327ab0b3e7735366dfca5783257348726f902b1491f97a316c3012c0e91596b9 SHA512 4949d83e1b1ceb3cde3851e0aa3b23bb0b73f074ace62503d7a3355009dc706df7b9cc89bab497fd5a7dde40ef6f841bada79c18a5c1fcc61a4a5dd7ede198e8
-EBUILD selinux-cups-2.20220106-r1.ebuild 367 BLAKE2B 2392251d868f1c6c78e4c8e2719d79e098a55816a5476621bc403502236a14e4d6191db8029d737f866ed1833af39c2f98ae3444679039b9382b4c42e629f239 SHA512 e1d3babb9696d45bc80cdf6e76503edd34582241dcf3c37dbedbb18ba6f0f78a68c6d9575f970247c2457f92e6a52f4a78676aa24946c9d598bd3be94f14a8e3
+EBUILD selinux-cups-2.20220106-r1.ebuild 365 BLAKE2B 4d1869982ecbba93cc6fa9e920f2b76c7efda6942a999b779be8cf802f3ae63984f8fc9d88c08d716ea34953fc80c916a4c74a73e1e5a790e8a33d5f36d66898 SHA512 31c89f3a37fdc316b7f21af4b004b1b20288ab75a35037e87441896f3e7d37e255c053920e3bcd8d6abc49409b8f8622b2ed5e66f82ce1295e1502bf9ba8b977
+EBUILD selinux-cups-2.20220106-r2.ebuild 367 BLAKE2B 2392251d868f1c6c78e4c8e2719d79e098a55816a5476621bc403502236a14e4d6191db8029d737f866ed1833af39c2f98ae3444679039b9382b4c42e629f239 SHA512 e1d3babb9696d45bc80cdf6e76503edd34582241dcf3c37dbedbb18ba6f0f78a68c6d9575f970247c2457f92e6a52f4a78676aa24946c9d598bd3be94f14a8e3
 EBUILD selinux-cups-9999.ebuild 367 BLAKE2B 134e56a005cdd25487dd322baf0352c1facce66b5664cadfabd3017b20790e2921f129268c5b00e5a400fafe2a660dec1e98c547a8809ca6e50e60dc3acc6783 SHA512 019541ee46509c57963c97b6cbed157b4df952e0d4e948db61ce32e849267c30102e7f7875e62f91c5beddf1ad7ebe83df48ef86cc74fc5e6bd8498ed2cc1bbc
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-cups/selinux-cups-2.20220106-r1.ebuild b/sec-policy/selinux-cups/selinux-cups-2.20220106-r1.ebuild
index d549fa052e99..619b66693084 100644
--- a/sec-policy/selinux-cups/selinux-cups-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-cups/selinux-cups-2.20220106-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cups"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-lpd
diff --git a/sec-policy/selinux-cups/selinux-cups-2.20220106-r2.ebuild b/sec-policy/selinux-cups/selinux-cups-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..d549fa052e99
--- /dev/null
+++ b/sec-policy/selinux-cups/selinux-cups-2.20220106-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="cups"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cups"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-lpd
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-lpd
+"
diff --git a/sec-policy/selinux-cvs/Manifest b/sec-policy/selinux-cvs/Manifest
index 715a85bb521c..91749d43612f 100644
--- a/sec-policy/selinux-cvs/Manifest
+++ b/sec-policy/selinux-cvs/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-cvs-2.20200818-r2.ebuild 419 BLAKE2B 2cabc7652857ca746181c9079076fb5938291c1c89b99fa500cbf6bcc96087759449da673327dc4ae73038506eba9692e58894c43c0a9caecdf32efeb1882b4d SHA512 3264a080619001dce93a095c188f5c289202948a49dfa4f80767fef9cb4a935d08cd51f0cdc633a76fac53b8c3ec0b3512e651a0e6128998697419f295787bac
 EBUILD selinux-cvs-2.20210203-r1.ebuild 419 BLAKE2B 2cabc7652857ca746181c9079076fb5938291c1c89b99fa500cbf6bcc96087759449da673327dc4ae73038506eba9692e58894c43c0a9caecdf32efeb1882b4d SHA512 3264a080619001dce93a095c188f5c289202948a49dfa4f80767fef9cb4a935d08cd51f0cdc633a76fac53b8c3ec0b3512e651a0e6128998697419f295787bac
 EBUILD selinux-cvs-2.20210908-r1.ebuild 419 BLAKE2B 2cabc7652857ca746181c9079076fb5938291c1c89b99fa500cbf6bcc96087759449da673327dc4ae73038506eba9692e58894c43c0a9caecdf32efeb1882b4d SHA512 3264a080619001dce93a095c188f5c289202948a49dfa4f80767fef9cb4a935d08cd51f0cdc633a76fac53b8c3ec0b3512e651a0e6128998697419f295787bac
-EBUILD selinux-cvs-2.20220106-r1.ebuild 423 BLAKE2B 6c42338d1d4540221d47c30e716a91d039356da5b40ec4c29af4f20c92866210acaa2cf2157c8bba2acab0923379a868dba5cec16969922573047fd19a52191c SHA512 92a025a81327fcd0400265d4a6d2c33780ac31f50edc618c04875dedc8d9930618a9c7bf9c42ba9f87077fd82900ef63cec18dbab77d003900f826adf25b780a
+EBUILD selinux-cvs-2.20220106-r1.ebuild 421 BLAKE2B 66ac20e839385e3cb7dccc72609fe7f8aa0c576c3ee4a84dc304dde54ef3bbbb17bbc037acc8c114807d656c683cb05521bce2981dc035aba3eb294e9bbadb37 SHA512 018b09a68c878f6946cd5ef0ef87cd1aad431b10d328e5591439f85489d272524d9b7e483606350f159ca91eb0eec7086082cd89f720f1e9dcffac56b3fc3439
+EBUILD selinux-cvs-2.20220106-r2.ebuild 423 BLAKE2B 6c42338d1d4540221d47c30e716a91d039356da5b40ec4c29af4f20c92866210acaa2cf2157c8bba2acab0923379a868dba5cec16969922573047fd19a52191c SHA512 92a025a81327fcd0400265d4a6d2c33780ac31f50edc618c04875dedc8d9930618a9c7bf9c42ba9f87077fd82900ef63cec18dbab77d003900f826adf25b780a
 EBUILD selinux-cvs-9999.ebuild 423 BLAKE2B b88ab893b83222fb6acdeca8c31322fb2813276210fabb8317e6dd9dd91f8bc485677de101494b60c0f9bd17f72c8da848b8a521a48e1d879cf2bf7ea157f883 SHA512 09e51d5b7b7e6ad690991ec50a61ca8231fba179f4547f4b60178e3a657cd29647f7b81b9c523df07e95b542970520333f88ccd32776fb689f08ee7e4186e1e6
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-cvs/selinux-cvs-2.20220106-r1.ebuild b/sec-policy/selinux-cvs/selinux-cvs-2.20220106-r1.ebuild
index c5ceaa85e235..e054670ce5ed 100644
--- a/sec-policy/selinux-cvs/selinux-cvs-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-cvs/selinux-cvs-2.20220106-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cvs"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-cvs/selinux-cvs-2.20220106-r2.ebuild b/sec-policy/selinux-cvs/selinux-cvs-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..c5ceaa85e235
--- /dev/null
+++ b/sec-policy/selinux-cvs/selinux-cvs-2.20220106-r2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="cvs"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cvs"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+	sec-policy/selinux-inetd
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-apache
+	sec-policy/selinux-inetd
+"
diff --git a/sec-policy/selinux-cyphesis/Manifest b/sec-policy/selinux-cyphesis/Manifest
index 34f6a6ddff02..08e9be863c2c 100644
--- a/sec-policy/selinux-cyphesis/Manifest
+++ b/sec-policy/selinux-cyphesis/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-cyphesis-2.20200818-r2.ebuild 281 BLAKE2B c5fed7d2bab52077e4a56ac62b1a097c74bef1e3b157ff25d0c9b405e587b9d9a02b0d01c83af8281ddc8e9d26655bfc2cb480074bebd1fcdc6f9b626070dda0 SHA512 dd07fa4cf7df65c976843c6b4c8fe2444a3ecf60b2870f712a9db953f15b6adad5b013a988717d99bc7ab16d067402b97b6bf21c6f892c2597ffad570bc9f9fe
 EBUILD selinux-cyphesis-2.20210203-r1.ebuild 281 BLAKE2B c5fed7d2bab52077e4a56ac62b1a097c74bef1e3b157ff25d0c9b405e587b9d9a02b0d01c83af8281ddc8e9d26655bfc2cb480074bebd1fcdc6f9b626070dda0 SHA512 dd07fa4cf7df65c976843c6b4c8fe2444a3ecf60b2870f712a9db953f15b6adad5b013a988717d99bc7ab16d067402b97b6bf21c6f892c2597ffad570bc9f9fe
 EBUILD selinux-cyphesis-2.20210908-r1.ebuild 281 BLAKE2B c5fed7d2bab52077e4a56ac62b1a097c74bef1e3b157ff25d0c9b405e587b9d9a02b0d01c83af8281ddc8e9d26655bfc2cb480074bebd1fcdc6f9b626070dda0 SHA512 dd07fa4cf7df65c976843c6b4c8fe2444a3ecf60b2870f712a9db953f15b6adad5b013a988717d99bc7ab16d067402b97b6bf21c6f892c2597ffad570bc9f9fe
-EBUILD selinux-cyphesis-2.20220106-r1.ebuild 285 BLAKE2B 3bea0bdcadf34eed0e98f95cc797d198dc7e212ab910b193c3a54a08ec185bc1aed23bc3c5be48273c553310eb047eb8273db19471b2882c4185c87c2583d444 SHA512 281a6b7079e167d13e905b6474506412b25c48553884d4b31ddb17e041690e33de6a1404960336f9bae66584ba150033d3a9eec2a166ed74543b019939826226
+EBUILD selinux-cyphesis-2.20220106-r1.ebuild 283 BLAKE2B b794d87e07579323a485722dfaa94ab38e4fa8d3774ab452e6f760845e559379e383fcaeb8b9b63854230c177efa4ebb0d15b9c868a165266eb8ec5290ffba34 SHA512 e7daf548eff9abe691c824386c30f18b586da391d2ffe34477343cc1f336e4bd2b97d40376f4c811d8f7dcad657d3fc61225f84a9cd552af4f9a3dcfdb4fad89
+EBUILD selinux-cyphesis-2.20220106-r2.ebuild 285 BLAKE2B 3bea0bdcadf34eed0e98f95cc797d198dc7e212ab910b193c3a54a08ec185bc1aed23bc3c5be48273c553310eb047eb8273db19471b2882c4185c87c2583d444 SHA512 281a6b7079e167d13e905b6474506412b25c48553884d4b31ddb17e041690e33de6a1404960336f9bae66584ba150033d3a9eec2a166ed74543b019939826226
 EBUILD selinux-cyphesis-9999.ebuild 285 BLAKE2B 91011061c0e80ea3cd65cbae1febd9e0f0e96532a92a3d400c5a1274d76a776ca6e3908dd407a3c2feb9c7f9c79252e936cc72dbeaae23eb1d386f5e54108cc1 SHA512 abc9603e27169ee057cd52b4372f581e03091dfca5722da04d09438540942db69bc30d5fa7aec9f2b6198013b5bb038ceb48dd32505d25505d6125d1a6271454
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20220106-r1.ebuild b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20220106-r1.ebuild
index 1bef549e1011..c2a65ee55bac 100644
--- a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cyphesis"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20220106-r2.ebuild b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..1bef549e1011
--- /dev/null
+++ b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="cyphesis"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cyphesis"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-daemontools/Manifest b/sec-policy/selinux-daemontools/Manifest
index a1dbcc66ecca..a2ec9a7d8f88 100644
--- a/sec-policy/selinux-daemontools/Manifest
+++ b/sec-policy/selinux-daemontools/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-daemontools-2.20200818-r2.ebuild 287 BLAKE2B 3baf46fcedf830be732721a0a45754f912d70bf4abfbe13e7e4de579de6d1ff2b020db2adfd3efe8fbafea170065308dd9b51a3341a8f8757accd0207226f5f4 SHA512 eab57daae518b011b6ca561985892763d244ffbe87023bbcd4f7f0e7e74d90968f4d7631e0cc0ca3b9f803644ef27cecdca80ab647a14f740d80b01b35589243
 EBUILD selinux-daemontools-2.20210203-r1.ebuild 287 BLAKE2B 3baf46fcedf830be732721a0a45754f912d70bf4abfbe13e7e4de579de6d1ff2b020db2adfd3efe8fbafea170065308dd9b51a3341a8f8757accd0207226f5f4 SHA512 eab57daae518b011b6ca561985892763d244ffbe87023bbcd4f7f0e7e74d90968f4d7631e0cc0ca3b9f803644ef27cecdca80ab647a14f740d80b01b35589243
 EBUILD selinux-daemontools-2.20210908-r1.ebuild 287 BLAKE2B 3baf46fcedf830be732721a0a45754f912d70bf4abfbe13e7e4de579de6d1ff2b020db2adfd3efe8fbafea170065308dd9b51a3341a8f8757accd0207226f5f4 SHA512 eab57daae518b011b6ca561985892763d244ffbe87023bbcd4f7f0e7e74d90968f4d7631e0cc0ca3b9f803644ef27cecdca80ab647a14f740d80b01b35589243
-EBUILD selinux-daemontools-2.20220106-r1.ebuild 291 BLAKE2B 884d30a840ed3c925322242bb60bfe0617ddd7ddec619176150e27a409b0c595ae1d67167b7c9aff2cca02034a9e6b5077350d2016a34d9cf625b37eaecf1555 SHA512 09524d223e56f6567e3e8e3cd8a5e404eb0a41fac1d868de8e42a820d548b01a2771370441a9fea6cdf865927cfe6e9d54da4b0bd840ff297318a6f839327ed6
+EBUILD selinux-daemontools-2.20220106-r1.ebuild 289 BLAKE2B 1612d5845dde79830728594d836c4ac262102c10adebe2f84dc1e07c6126271d9319fb76f09fe8a386897b7a7aa9210100fc0a96856a4f66b9ff109c54d40bed SHA512 d25192adac61ad9f8a7aed78e52a257757a48bc3554014b86c5e255c7b79dfd5966e57becf3a56ee802e15143c0624528fe0e6a1836157d3a3673f22285ea449
+EBUILD selinux-daemontools-2.20220106-r2.ebuild 291 BLAKE2B 884d30a840ed3c925322242bb60bfe0617ddd7ddec619176150e27a409b0c595ae1d67167b7c9aff2cca02034a9e6b5077350d2016a34d9cf625b37eaecf1555 SHA512 09524d223e56f6567e3e8e3cd8a5e404eb0a41fac1d868de8e42a820d548b01a2771370441a9fea6cdf865927cfe6e9d54da4b0bd840ff297318a6f839327ed6
 EBUILD selinux-daemontools-9999.ebuild 291 BLAKE2B 032a8df21734566660695f99ab34f1205c64fba0453fa12019390167e9b248269145e00c0dad7f3192fcbaad0e84f481abb4ebcdf4500dbb39bae0da14772a24 SHA512 b226e1095ab0c7126b9e52dda6b5cb26521f653224e021c489a235a92170356287c6abdb59690b88192307b23f3e4a659f5ad86a18182182789253b872ae9189
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-daemontools/selinux-daemontools-2.20220106-r1.ebuild b/sec-policy/selinux-daemontools/selinux-daemontools-2.20220106-r1.ebuild
index 79e38eba5f25..a9bd6094dce3 100644
--- a/sec-policy/selinux-daemontools/selinux-daemontools-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-daemontools/selinux-daemontools-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for daemontools"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-daemontools/selinux-daemontools-2.20220106-r2.ebuild b/sec-policy/selinux-daemontools/selinux-daemontools-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..79e38eba5f25
--- /dev/null
+++ b/sec-policy/selinux-daemontools/selinux-daemontools-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="daemontools"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for daemontools"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-dante/Manifest b/sec-policy/selinux-dante/Manifest
index eaf1f0ef34d2..618253885627 100644
--- a/sec-policy/selinux-dante/Manifest
+++ b/sec-policy/selinux-dante/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-dante-2.20200818-r2.ebuild 275 BLAKE2B e5200982aa6ce2ad99cc682fb95e985b2ca9e29d1e82acfc127a7750f7aa1aadbf202ebfb02a2f6fcb117ab39c46ed30b1ea946ebdd0e40b02b6e8ca5da04c2a SHA512 ed40a4de3c09a83d2ba3b60d05a65e3ab8a33c25f9ab10d108b36e8ca959f066c30dadfa7f7381a6a8ea7c176a4402b0725155dc379b68993f0607c75135d72f
 EBUILD selinux-dante-2.20210203-r1.ebuild 275 BLAKE2B e5200982aa6ce2ad99cc682fb95e985b2ca9e29d1e82acfc127a7750f7aa1aadbf202ebfb02a2f6fcb117ab39c46ed30b1ea946ebdd0e40b02b6e8ca5da04c2a SHA512 ed40a4de3c09a83d2ba3b60d05a65e3ab8a33c25f9ab10d108b36e8ca959f066c30dadfa7f7381a6a8ea7c176a4402b0725155dc379b68993f0607c75135d72f
 EBUILD selinux-dante-2.20210908-r1.ebuild 275 BLAKE2B e5200982aa6ce2ad99cc682fb95e985b2ca9e29d1e82acfc127a7750f7aa1aadbf202ebfb02a2f6fcb117ab39c46ed30b1ea946ebdd0e40b02b6e8ca5da04c2a SHA512 ed40a4de3c09a83d2ba3b60d05a65e3ab8a33c25f9ab10d108b36e8ca959f066c30dadfa7f7381a6a8ea7c176a4402b0725155dc379b68993f0607c75135d72f
-EBUILD selinux-dante-2.20220106-r1.ebuild 279 BLAKE2B 36f372718ae96ff83644938d14c9317f9f90277d128ba193aa69cf9ca0498e5385f33550726c849148ba6f0a5622887874859f92d00593431099409f2540f31c SHA512 4e9ff3a549173ff6d8dc612724332a56d6f62afbea85c06e4f4678649c11dc6b5168965eebd46e192154a3e16e55dce6484c6fd44e9e02ef8fb67cb038e05bbd
+EBUILD selinux-dante-2.20220106-r1.ebuild 277 BLAKE2B 9d84bf47f68a1d53ad6ce7d7142446863b491be943e78a3da65005a8727e140d5118976bb6853262e1cf0f24ebf171d80606eb0c41d7622253a8bef839224aa1 SHA512 5f8763a1eb1085707ba5f30cf10ee39a99eb5ecd0f9da877e308fdf22cad20480f8ba1f430dbecb3611dff4b8e505784336cd8fc9c5b7be82fcdd7763819e65d
+EBUILD selinux-dante-2.20220106-r2.ebuild 279 BLAKE2B 36f372718ae96ff83644938d14c9317f9f90277d128ba193aa69cf9ca0498e5385f33550726c849148ba6f0a5622887874859f92d00593431099409f2540f31c SHA512 4e9ff3a549173ff6d8dc612724332a56d6f62afbea85c06e4f4678649c11dc6b5168965eebd46e192154a3e16e55dce6484c6fd44e9e02ef8fb67cb038e05bbd
 EBUILD selinux-dante-9999.ebuild 279 BLAKE2B 37987ab756d37f97bffe10695d31ed9d5f562252d76c60474c8115997ded3e540843bddab1bd3c9b5ca3d9d0d73301225f91281f6a8d6fd89f51bac59d432fd1 SHA512 7079612fa072feb18153fbcd1ab16fa1173aa4ff23467dfa0d07d05df64a7a32bf0a77585134542acced05dd056ff1f5faed9f96263b75301a9fc9db22d1c94d
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-dante/selinux-dante-2.20220106-r1.ebuild b/sec-policy/selinux-dante/selinux-dante-2.20220106-r1.ebuild
index d5483707430c..b6756ea642ec 100644
--- a/sec-policy/selinux-dante/selinux-dante-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-dante/selinux-dante-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dante"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dante/selinux-dante-2.20220106-r2.ebuild b/sec-policy/selinux-dante/selinux-dante-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..d5483707430c
--- /dev/null
+++ b/sec-policy/selinux-dante/selinux-dante-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="dante"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dante"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-dbadm/Manifest b/sec-policy/selinux-dbadm/Manifest
index 13b279079b4f..9cd6a5ce40e7 100644
--- a/sec-policy/selinux-dbadm/Manifest
+++ b/sec-policy/selinux-dbadm/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-dbadm-2.20200818-r2.ebuild 275 BLAKE2B bec08e45de2d503d6fea44cf5f1831cd127c7f09f25a1a7473be51e138346ee70c52eef7b4db79b4d143df5edbbe1103f8af11bfdb4a857ef25db759bfa2f6f4 SHA512 99814dc204b4836b83475e93679723273e9c37f89e616ef7a2ca113b6cc3b04c9c461d20e1727d5791f8ee837074e42caf0cdf66fb0ca984ca7e1eb4c4116eb3
 EBUILD selinux-dbadm-2.20210203-r1.ebuild 275 BLAKE2B bec08e45de2d503d6fea44cf5f1831cd127c7f09f25a1a7473be51e138346ee70c52eef7b4db79b4d143df5edbbe1103f8af11bfdb4a857ef25db759bfa2f6f4 SHA512 99814dc204b4836b83475e93679723273e9c37f89e616ef7a2ca113b6cc3b04c9c461d20e1727d5791f8ee837074e42caf0cdf66fb0ca984ca7e1eb4c4116eb3
 EBUILD selinux-dbadm-2.20210908-r1.ebuild 275 BLAKE2B bec08e45de2d503d6fea44cf5f1831cd127c7f09f25a1a7473be51e138346ee70c52eef7b4db79b4d143df5edbbe1103f8af11bfdb4a857ef25db759bfa2f6f4 SHA512 99814dc204b4836b83475e93679723273e9c37f89e616ef7a2ca113b6cc3b04c9c461d20e1727d5791f8ee837074e42caf0cdf66fb0ca984ca7e1eb4c4116eb3
-EBUILD selinux-dbadm-2.20220106-r1.ebuild 279 BLAKE2B 341322d584e20fe17b42a2a2fb323e905ccbd3826d5b35fef372cf4075165cd2aaba4e97eb72057be83189ff26c1217d39872c8a3174a55583590c486cf30c0f SHA512 31dab0c5a24d3178dbee8b53c7115c8744ae73279652124e686f561063563ff4c417ed56fa812f844ee0c569a5e0ba2eed09a4a5dd8d4d534b92d9d71e1358aa
+EBUILD selinux-dbadm-2.20220106-r1.ebuild 277 BLAKE2B 226f1c52777dde9da95696e6ca0b45ca3269768a0d308ce9c4b092a1fb95a1a6413cdbbf59cabf3e842da8345c9d8db0c08ea5621ce319aeaa3905048769bd16 SHA512 c1e12d7fef92b90cdda3e4b1d56956308f6e6c14c5f5a2aac0e7884c2fb223e8b3cdfcc4ae6a161cb2c88913cd20915beed7b06debc483a157baaf89f9fabe3a
+EBUILD selinux-dbadm-2.20220106-r2.ebuild 279 BLAKE2B 341322d584e20fe17b42a2a2fb323e905ccbd3826d5b35fef372cf4075165cd2aaba4e97eb72057be83189ff26c1217d39872c8a3174a55583590c486cf30c0f SHA512 31dab0c5a24d3178dbee8b53c7115c8744ae73279652124e686f561063563ff4c417ed56fa812f844ee0c569a5e0ba2eed09a4a5dd8d4d534b92d9d71e1358aa
 EBUILD selinux-dbadm-9999.ebuild 279 BLAKE2B 921e05318d6dbbff93e4c5a1de3136a14a25fda0636c187e2aca94ee72433f7079b9f72480a1c15dfa63915526cac718c2c977f36874768a7333f04a7313b124 SHA512 214554a388826a564244b22fb786611ab95e48a49b70bdedb79979e3126556b5504ab5caa59545da9a8811ada2c360d533f43d4a7fb2acc96bd87658de9ce867
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-dbadm/selinux-dbadm-2.20220106-r1.ebuild b/sec-policy/selinux-dbadm/selinux-dbadm-2.20220106-r1.ebuild
index 96b36b252bd2..ffb10192961c 100644
--- a/sec-policy/selinux-dbadm/selinux-dbadm-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-dbadm/selinux-dbadm-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dbadm"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dbadm/selinux-dbadm-2.20220106-r2.ebuild b/sec-policy/selinux-dbadm/selinux-dbadm-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..96b36b252bd2
--- /dev/null
+++ b/sec-policy/selinux-dbadm/selinux-dbadm-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="dbadm"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dbadm"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-dbskk/Manifest b/sec-policy/selinux-dbskk/Manifest
index dcc576441550..2ec106a0c5c7 100644
--- a/sec-policy/selinux-dbskk/Manifest
+++ b/sec-policy/selinux-dbskk/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-dbskk-2.20200818-r2.ebuild 369 BLAKE2B f9f5e72a3ccdafe7dc6ccb766244bb649620e1c8a157fcf200874d3425738edb5e8fad97204d5b6df53c274058efe2daafe86bf7ff6746078f4e94644f0dc299 SHA512 88fbe80d598c645c8be0b6479f091b13482e8ba15229faf9e69ce930b7cadba3ab85471ba5b6059ca3e0d1c99e4d9c24803fc9a960eb2bea471f52216759e0fb
 EBUILD selinux-dbskk-2.20210203-r1.ebuild 369 BLAKE2B f9f5e72a3ccdafe7dc6ccb766244bb649620e1c8a157fcf200874d3425738edb5e8fad97204d5b6df53c274058efe2daafe86bf7ff6746078f4e94644f0dc299 SHA512 88fbe80d598c645c8be0b6479f091b13482e8ba15229faf9e69ce930b7cadba3ab85471ba5b6059ca3e0d1c99e4d9c24803fc9a960eb2bea471f52216759e0fb
 EBUILD selinux-dbskk-2.20210908-r1.ebuild 369 BLAKE2B f9f5e72a3ccdafe7dc6ccb766244bb649620e1c8a157fcf200874d3425738edb5e8fad97204d5b6df53c274058efe2daafe86bf7ff6746078f4e94644f0dc299 SHA512 88fbe80d598c645c8be0b6479f091b13482e8ba15229faf9e69ce930b7cadba3ab85471ba5b6059ca3e0d1c99e4d9c24803fc9a960eb2bea471f52216759e0fb
-EBUILD selinux-dbskk-2.20220106-r1.ebuild 373 BLAKE2B dd9e8e043ce107d6c9434902e268337241e0db1b5880a605e75c4b16d221075a5fb69e04cc784fd8a193e0fbe72ef87b3c5b7703bce053b7bf9155e8005df253 SHA512 cd0bbfd49f34f4dfae01ac357c5bc24eeeaeeadaa8f935543a5c7da4bfc03e1b04b4f41ea216544e2233b2377ddd9c2394ef85565829a002a9cf4b71454b1875
+EBUILD selinux-dbskk-2.20220106-r1.ebuild 371 BLAKE2B 2737d06a8c5b4d55897407401070470f0b9f9f3b953c8d77411823d2e730cbfc1d990feaabb6c95cc96de10226232c92e2db965150e2f6cbcd35f78a71a2ef22 SHA512 bad2afc13030a87c6ed820b3b0e9392a4904aa8217bad073267bf0f595e83d4e2c27abdb9f02b6dcd4feb68b33178a4855868ffa019c1ed684a523360de7af60
+EBUILD selinux-dbskk-2.20220106-r2.ebuild 373 BLAKE2B dd9e8e043ce107d6c9434902e268337241e0db1b5880a605e75c4b16d221075a5fb69e04cc784fd8a193e0fbe72ef87b3c5b7703bce053b7bf9155e8005df253 SHA512 cd0bbfd49f34f4dfae01ac357c5bc24eeeaeeadaa8f935543a5c7da4bfc03e1b04b4f41ea216544e2233b2377ddd9c2394ef85565829a002a9cf4b71454b1875
 EBUILD selinux-dbskk-9999.ebuild 373 BLAKE2B c640190b1b346847ad18eed0c948f6d7c7cc287a26274e30f3c9fee650afaa2cc896d6d14d20dbea4ea40eeee4b955d69d738bb42d207f515649b14f08b5f698 SHA512 f44afa3b7e6db6d0948335edd92eddf7f4362aa7cbb76f895a10af754c474c1ccf4f48cfeb299e16d350f5aacc352ba97f4da377f831650f06100e5e2708f9e4
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-dbskk/selinux-dbskk-2.20220106-r1.ebuild b/sec-policy/selinux-dbskk/selinux-dbskk-2.20220106-r1.ebuild
index fb3fafc1aa64..9f9f775eb0b4 100644
--- a/sec-policy/selinux-dbskk/selinux-dbskk-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-dbskk/selinux-dbskk-2.20220106-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dbskk"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-inetd
diff --git a/sec-policy/selinux-dbskk/selinux-dbskk-2.20220106-r2.ebuild b/sec-policy/selinux-dbskk/selinux-dbskk-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..fb3fafc1aa64
--- /dev/null
+++ b/sec-policy/selinux-dbskk/selinux-dbskk-2.20220106-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="dbskk"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dbskk"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-inetd
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-inetd
+"
diff --git a/sec-policy/selinux-dbus/Manifest b/sec-policy/selinux-dbus/Manifest
index 7e4fa0d3485a..1d0f425402ea 100644
--- a/sec-policy/selinux-dbus/Manifest
+++ b/sec-policy/selinux-dbus/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-dbus-2.20200818-r2.ebuild 273 BLAKE2B 48601875d47cef3d396e0ad41d231a1fbcdbd6f448e6a49b0980ebf3ba5b4aa51487e4d2fc653415da466c27244e11b7d53f9d3782022cc4193b1b4699a79a0f SHA512 b7c2a59bc0cd3b558c43cfc2a24e3680bf45fedde4f2ce384e9363edbb0c6b403298dde11db97db67db57f7d0ced22b6438103688fe63f3ff36481cdbb12d04f
 EBUILD selinux-dbus-2.20210203-r1.ebuild 273 BLAKE2B 48601875d47cef3d396e0ad41d231a1fbcdbd6f448e6a49b0980ebf3ba5b4aa51487e4d2fc653415da466c27244e11b7d53f9d3782022cc4193b1b4699a79a0f SHA512 b7c2a59bc0cd3b558c43cfc2a24e3680bf45fedde4f2ce384e9363edbb0c6b403298dde11db97db67db57f7d0ced22b6438103688fe63f3ff36481cdbb12d04f
 EBUILD selinux-dbus-2.20210908-r1.ebuild 273 BLAKE2B 48601875d47cef3d396e0ad41d231a1fbcdbd6f448e6a49b0980ebf3ba5b4aa51487e4d2fc653415da466c27244e11b7d53f9d3782022cc4193b1b4699a79a0f SHA512 b7c2a59bc0cd3b558c43cfc2a24e3680bf45fedde4f2ce384e9363edbb0c6b403298dde11db97db67db57f7d0ced22b6438103688fe63f3ff36481cdbb12d04f
-EBUILD selinux-dbus-2.20220106-r1.ebuild 277 BLAKE2B 25ad045181f1fe59c9c0f50b859a6d6a53183b619f0cc00444e9b2ebdeabe1c243f710cfd54e86f0fd90859f95059a5b6ce4aa80fa686c922e709ae047c037f6 SHA512 b321643d60af633ce1f6176b6823929247eea4fd9f9a0b1617d5b8b6ee9ca6a6d97bf98f8c403299ab2519c833dc87632c76f61ac4dfea8037a960ed1ae6fd9d
+EBUILD selinux-dbus-2.20220106-r1.ebuild 275 BLAKE2B ed70e6594ae60a6220bfffdc01faa6bf9bf67cddae22797e31bbdfe4b0be88026a5025b3d6806f7152ec860266648ac5c633cc0af29a06cf70f3edd9557e3945 SHA512 9a24d2bbe11ec3d1fdafca47bdf216f09159a58cd03d26afe753d8616c0374b8657a938930e18a3e60b43dae111d8a17db72f16174bb9f811ef1ae88adad8e7e
+EBUILD selinux-dbus-2.20220106-r2.ebuild 277 BLAKE2B 25ad045181f1fe59c9c0f50b859a6d6a53183b619f0cc00444e9b2ebdeabe1c243f710cfd54e86f0fd90859f95059a5b6ce4aa80fa686c922e709ae047c037f6 SHA512 b321643d60af633ce1f6176b6823929247eea4fd9f9a0b1617d5b8b6ee9ca6a6d97bf98f8c403299ab2519c833dc87632c76f61ac4dfea8037a960ed1ae6fd9d
 EBUILD selinux-dbus-9999.ebuild 277 BLAKE2B d57ae1cb0fe8cf2a7fd541d5496cd77f317cf363083fd7b7feec029d32cd1af47764d157c1e90a4285c438be109e90a75a156dc88be5abd017cd309dd10587b1 SHA512 fd10bbe656566f643b33454f027b7d9f7baefae59ae0c9d2b14dfe9df7f4aae97ae753c5d64eb253f67d9728a685c619860c8ef787e02c0b89fd91dc626da42a
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-dbus/selinux-dbus-2.20220106-r1.ebuild b/sec-policy/selinux-dbus/selinux-dbus-2.20220106-r1.ebuild
index 85f13c61c0be..fcd2ad0f4f29 100644
--- a/sec-policy/selinux-dbus/selinux-dbus-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-dbus/selinux-dbus-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dbus"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dbus/selinux-dbus-2.20220106-r2.ebuild b/sec-policy/selinux-dbus/selinux-dbus-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..85f13c61c0be
--- /dev/null
+++ b/sec-policy/selinux-dbus/selinux-dbus-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="dbus"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dbus"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ddclient/Manifest b/sec-policy/selinux-ddclient/Manifest
index 768a0ae9c976..805d43bc724a 100644
--- a/sec-policy/selinux-ddclient/Manifest
+++ b/sec-policy/selinux-ddclient/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-ddclient-2.20200818-r2.ebuild 281 BLAKE2B 372ff6a0d9d5acd51fddca0760a950ed218ef0ea64ded8e3efc64ed9188fdacd26bed44c37544714172e708fb3a013bebd4041c512efa585bc2d9187ea2e302b SHA512 a4ace0850081ebdb89346bd94048fd810348e1b77de9978d13277c329b2e7111a84a7c0d1b7731459f6d340dd20ae3f88c54449d4629529587986a9cf835ffe9
 EBUILD selinux-ddclient-2.20210203-r1.ebuild 281 BLAKE2B 372ff6a0d9d5acd51fddca0760a950ed218ef0ea64ded8e3efc64ed9188fdacd26bed44c37544714172e708fb3a013bebd4041c512efa585bc2d9187ea2e302b SHA512 a4ace0850081ebdb89346bd94048fd810348e1b77de9978d13277c329b2e7111a84a7c0d1b7731459f6d340dd20ae3f88c54449d4629529587986a9cf835ffe9
 EBUILD selinux-ddclient-2.20210908-r1.ebuild 281 BLAKE2B 372ff6a0d9d5acd51fddca0760a950ed218ef0ea64ded8e3efc64ed9188fdacd26bed44c37544714172e708fb3a013bebd4041c512efa585bc2d9187ea2e302b SHA512 a4ace0850081ebdb89346bd94048fd810348e1b77de9978d13277c329b2e7111a84a7c0d1b7731459f6d340dd20ae3f88c54449d4629529587986a9cf835ffe9
-EBUILD selinux-ddclient-2.20220106-r1.ebuild 285 BLAKE2B ad00ab7b7f1ca2a6d735c38a75974abfd4ddf7d9b2a2eb612a127dc8cf55f313a0d5ed2dc4a0b4929977d00eedcf95a2401489b9f664ba4911a58e0623c4cc92 SHA512 0d145e253c50af3e3ade3605af94f2c1c4330cdf0ef81ef16658bd55a5d11c244f24bdd7bec0a9c2ff1928693e0465182e78bf7f429c183f5e64e706d7ac74ae
+EBUILD selinux-ddclient-2.20220106-r1.ebuild 283 BLAKE2B 9f97c83e846e8da1bd19180c19b39bbcf1a19fdbe275f47c88660bb0ad4117e5dec3a7c0f84efe5a7eb53658712168ae9b97e9fdb857b60378b3170bae460af8 SHA512 6eb3e2e90240924cf16ee3e400e9b93daa5c581b98d75fcd38715e5730d185569612ff17db20f476b21e94a3063588bd13ff05e77f28c7a4c40933d2f7c50f90
+EBUILD selinux-ddclient-2.20220106-r2.ebuild 285 BLAKE2B ad00ab7b7f1ca2a6d735c38a75974abfd4ddf7d9b2a2eb612a127dc8cf55f313a0d5ed2dc4a0b4929977d00eedcf95a2401489b9f664ba4911a58e0623c4cc92 SHA512 0d145e253c50af3e3ade3605af94f2c1c4330cdf0ef81ef16658bd55a5d11c244f24bdd7bec0a9c2ff1928693e0465182e78bf7f429c183f5e64e706d7ac74ae
 EBUILD selinux-ddclient-9999.ebuild 285 BLAKE2B e2280b05389ed0a5b6dddd332e6f098ca6de6d9b424a866630936fc7c0ed68a4b49febec84ceef92e0038722aa67d2a4f2d3f02b1405d6c9af06f8e0cac4502b SHA512 cfff4eef25b9b9525ea18d989820694d652b8bb10acef71bc6acd8ddcf1c4af483ad920ea027eb4f51e466777fce5ba4d17e263f33da3b23139fddde61923288
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-ddclient/selinux-ddclient-2.20220106-r1.ebuild b/sec-policy/selinux-ddclient/selinux-ddclient-2.20220106-r1.ebuild
index 5e4ddedf7823..bd4c6492ca20 100644
--- a/sec-policy/selinux-ddclient/selinux-ddclient-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-ddclient/selinux-ddclient-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ddclient"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ddclient/selinux-ddclient-2.20220106-r2.ebuild b/sec-policy/selinux-ddclient/selinux-ddclient-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..5e4ddedf7823
--- /dev/null
+++ b/sec-policy/selinux-ddclient/selinux-ddclient-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="ddclient"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ddclient"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-devicekit/Manifest b/sec-policy/selinux-devicekit/Manifest
index dba91d3f36e5..cb61579be128 100644
--- a/sec-policy/selinux-devicekit/Manifest
+++ b/sec-policy/selinux-devicekit/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-devicekit-2.20200818-r2.ebuild 376 BLAKE2B e5b2aeff318e8b85c04d6ca551e57fc94758240ecdd5524d8989e5e01851b5fc95b00c9a1ba626e435087a47b39892108f1d72aeda560e8f206b7f8457303746 SHA512 fe20640a026c0f7f81809b8d68877afc8377a89bc8ab7f4fcfe18093dcd6096162d6654cb3459296de13a29ca5ddcda7861a8fad6dc17fb44d39a8e6df26d4c2
 EBUILD selinux-devicekit-2.20210203-r1.ebuild 376 BLAKE2B e5b2aeff318e8b85c04d6ca551e57fc94758240ecdd5524d8989e5e01851b5fc95b00c9a1ba626e435087a47b39892108f1d72aeda560e8f206b7f8457303746 SHA512 fe20640a026c0f7f81809b8d68877afc8377a89bc8ab7f4fcfe18093dcd6096162d6654cb3459296de13a29ca5ddcda7861a8fad6dc17fb44d39a8e6df26d4c2
 EBUILD selinux-devicekit-2.20210908-r1.ebuild 376 BLAKE2B e5b2aeff318e8b85c04d6ca551e57fc94758240ecdd5524d8989e5e01851b5fc95b00c9a1ba626e435087a47b39892108f1d72aeda560e8f206b7f8457303746 SHA512 fe20640a026c0f7f81809b8d68877afc8377a89bc8ab7f4fcfe18093dcd6096162d6654cb3459296de13a29ca5ddcda7861a8fad6dc17fb44d39a8e6df26d4c2
-EBUILD selinux-devicekit-2.20220106-r1.ebuild 380 BLAKE2B 06ac9ae79fff251527408268df964346b28f3e73d776c26b732a0ac073864b9eecbe45e2c61c81ec145456823083357a253ab2cf06b29c620ad5f5cdcb49d6ea SHA512 b2c942034c79f3c8cea69c51e4f4885289172f84f19e5c2737de3c4c347d95169e1d8fce44257401ccb58a8d321b744e26a74ffadea344a5cd1634064ae5ceeb
+EBUILD selinux-devicekit-2.20220106-r1.ebuild 378 BLAKE2B ac2c773364e654b9daa76a3e320339d18807ab6bc6e71fcff2c591f64739ef9a337212c20f4b7720c011de2ce62a140e570ad8b502c0022dc7e6325f3e4f08ec SHA512 ccf4f23c827233d250985dfb67afd0823df8ab8ebcfda3ef18f4ef23484439c906dc0f0ddadcdd1e7c6027dad917fe47be3da3c549c4160984808d3af24aa7e2
+EBUILD selinux-devicekit-2.20220106-r2.ebuild 380 BLAKE2B 06ac9ae79fff251527408268df964346b28f3e73d776c26b732a0ac073864b9eecbe45e2c61c81ec145456823083357a253ab2cf06b29c620ad5f5cdcb49d6ea SHA512 b2c942034c79f3c8cea69c51e4f4885289172f84f19e5c2737de3c4c347d95169e1d8fce44257401ccb58a8d321b744e26a74ffadea344a5cd1634064ae5ceeb
 EBUILD selinux-devicekit-9999.ebuild 380 BLAKE2B fe63d1fcd8aa7796c67e445d76acfbae4c87d590734664921a0b82c7bc82f22f2451faecb9b261aafc29342d804da8cf5d3e9ee20e1a83db5d1280e37022c08a SHA512 128ff46913426eb518f204cbeec75938458c90780df6a4d6c258f3de077b3abd35508a90a0b4180b50f4c6614e4ce974de4454d621545d6e7cb385f791a19b8e
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-devicekit/selinux-devicekit-2.20220106-r1.ebuild b/sec-policy/selinux-devicekit/selinux-devicekit-2.20220106-r1.ebuild
index a14985d1a7ff..2ae9b8480f0a 100644
--- a/sec-policy/selinux-devicekit/selinux-devicekit-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-devicekit/selinux-devicekit-2.20220106-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for devicekit"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-devicekit/selinux-devicekit-2.20220106-r2.ebuild b/sec-policy/selinux-devicekit/selinux-devicekit-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..a14985d1a7ff
--- /dev/null
+++ b/sec-policy/selinux-devicekit/selinux-devicekit-2.20220106-r2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="devicekit"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for devicekit"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+
+DEPEND="${DEPEND}
+	sec-policy/selinux-dbus
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-dbus
+"
diff --git a/sec-policy/selinux-dhcp/Manifest b/sec-policy/selinux-dhcp/Manifest
index 6a48c7dc587e..b1355dac058b 100644
--- a/sec-policy/selinux-dhcp/Manifest
+++ b/sec-policy/selinux-dhcp/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-dhcp-2.20200818-r2.ebuild 273 BLAKE2B 2341b53f5debf035a680ed9b5c8b4b7bb71dff4eafddc79a05b4906108089d828cb9cd78210936676a3248b090719c2f1bcef65c184d569c723ac6afd12c0e9a SHA512 af9da9ec14896751de3af9c5b837600b467cdc6d7dde426a658dc0cc8b19bc8c7c9ebe7c6f74e9d3f21d7f59fc78dc948a5b72c4dd55e527e0ec0e2fb8e719a2
 EBUILD selinux-dhcp-2.20210203-r1.ebuild 273 BLAKE2B 2341b53f5debf035a680ed9b5c8b4b7bb71dff4eafddc79a05b4906108089d828cb9cd78210936676a3248b090719c2f1bcef65c184d569c723ac6afd12c0e9a SHA512 af9da9ec14896751de3af9c5b837600b467cdc6d7dde426a658dc0cc8b19bc8c7c9ebe7c6f74e9d3f21d7f59fc78dc948a5b72c4dd55e527e0ec0e2fb8e719a2
 EBUILD selinux-dhcp-2.20210908-r1.ebuild 273 BLAKE2B 2341b53f5debf035a680ed9b5c8b4b7bb71dff4eafddc79a05b4906108089d828cb9cd78210936676a3248b090719c2f1bcef65c184d569c723ac6afd12c0e9a SHA512 af9da9ec14896751de3af9c5b837600b467cdc6d7dde426a658dc0cc8b19bc8c7c9ebe7c6f74e9d3f21d7f59fc78dc948a5b72c4dd55e527e0ec0e2fb8e719a2
-EBUILD selinux-dhcp-2.20220106-r1.ebuild 277 BLAKE2B 183ed4466a69ef4645d73e3f848d55ee1c8aad9de94bf152c17c8e5f3671f62287633fb7f893607c30a12787060415c28bbcba4a43a63a7b5a1b31059fc7ced4 SHA512 332f0eaa48715e60b19ad6152f934701d0c5849a8334a6e0137b8b12d746c4ac6f6fad47ee46e83fab706032c10e96197495955c808ba02eac53c6d1841ad457
+EBUILD selinux-dhcp-2.20220106-r1.ebuild 275 BLAKE2B 79db8e236e6934d42b6344c02dfad52316e479f46cfa24be7469d8dcce87891815064e1658361db12a2260190e55d776f354327ccdd57d7fd5f0255d510698d4 SHA512 253c3a5aabe8ba6ba454a5e3b17cacc1e83427701b89d50a11c01b2f2c75e6484754d4d05cd880917e95ba8b38bd89dc1437f19e9b441491a967765257a5361f
+EBUILD selinux-dhcp-2.20220106-r2.ebuild 277 BLAKE2B 183ed4466a69ef4645d73e3f848d55ee1c8aad9de94bf152c17c8e5f3671f62287633fb7f893607c30a12787060415c28bbcba4a43a63a7b5a1b31059fc7ced4 SHA512 332f0eaa48715e60b19ad6152f934701d0c5849a8334a6e0137b8b12d746c4ac6f6fad47ee46e83fab706032c10e96197495955c808ba02eac53c6d1841ad457
 EBUILD selinux-dhcp-9999.ebuild 277 BLAKE2B c9e90048c1bc75e5ee5c680bf63cc1b40a1cbeff4a1826b62328bb2e06f15fe007556c2cf3516390d557d3f26063fea3f6a3602dbf8ac92fd72405c7ab8e6809 SHA512 b150888e36050916ed24424e9414c8be398871862a27a806785413141426238bcdbca69aaf8befd54ed804b6c8438e65bb9080508951cb0c684fca191c2e068c
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-dhcp/selinux-dhcp-2.20220106-r1.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-2.20220106-r1.ebuild
index 4a72ef801230..493fff099a15 100644
--- a/sec-policy/selinux-dhcp/selinux-dhcp-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-dhcp/selinux-dhcp-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dhcp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dhcp/selinux-dhcp-2.20220106-r2.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..4a72ef801230
--- /dev/null
+++ b/sec-policy/selinux-dhcp/selinux-dhcp-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="dhcp"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dhcp"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-dictd/Manifest b/sec-policy/selinux-dictd/Manifest
index b71eb95fff99..3744c28e2f60 100644
--- a/sec-policy/selinux-dictd/Manifest
+++ b/sec-policy/selinux-dictd/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-dictd-2.20200818-r2.ebuild 275 BLAKE2B c141b227692208a90e4eb193a9a4ab9883fe79f1952c686548f05e5ee71bc22d4ddacfee80e5073fe867ad210e754be24b766b0c961007c9b3d7c92aa6bec438 SHA512 538957b3da56ab6541a4a5a3fb27532e7b3b1a85ddb62e402668d3b15c0075df8bcc527ef636c809df68cd39126b4ef4173a518274047b3decaf99bb548b6041
 EBUILD selinux-dictd-2.20210203-r1.ebuild 275 BLAKE2B c141b227692208a90e4eb193a9a4ab9883fe79f1952c686548f05e5ee71bc22d4ddacfee80e5073fe867ad210e754be24b766b0c961007c9b3d7c92aa6bec438 SHA512 538957b3da56ab6541a4a5a3fb27532e7b3b1a85ddb62e402668d3b15c0075df8bcc527ef636c809df68cd39126b4ef4173a518274047b3decaf99bb548b6041
 EBUILD selinux-dictd-2.20210908-r1.ebuild 275 BLAKE2B c141b227692208a90e4eb193a9a4ab9883fe79f1952c686548f05e5ee71bc22d4ddacfee80e5073fe867ad210e754be24b766b0c961007c9b3d7c92aa6bec438 SHA512 538957b3da56ab6541a4a5a3fb27532e7b3b1a85ddb62e402668d3b15c0075df8bcc527ef636c809df68cd39126b4ef4173a518274047b3decaf99bb548b6041
-EBUILD selinux-dictd-2.20220106-r1.ebuild 279 BLAKE2B 665ce04b547da96498052cabfe0cde90e3dc2b828c3c3bb7c3ab7042026034bac6863ea9de3011ba16e55023daeec75f7d4d2b51439bd5cd374489d6168c71c4 SHA512 ca27c1a4a1047bdb8b34dded844a0456ca95389c047ad480ef2ef4badb2923b3ef0cf6464e46e56be15b1e955f167e2d48f3bd57a2c759ca5e928f8b9dcbad9b
+EBUILD selinux-dictd-2.20220106-r1.ebuild 277 BLAKE2B 8e545f752f4278487a042307584d8ae180f1972611d8feda9f6399f0d4bf8db6c5dcae5bfc8ca2d3077674def3170d08dd0802df0209cf6aa66df83f431317f2 SHA512 2e5d8c5f619d85d3ceac8c6e63158ab7617ec6f827b636f427131549cfa9505b94a82e37e5098bb16dd4c3165bde9ed5b1f5318520c71ba808b1e0406c5a1bad
+EBUILD selinux-dictd-2.20220106-r2.ebuild 279 BLAKE2B 665ce04b547da96498052cabfe0cde90e3dc2b828c3c3bb7c3ab7042026034bac6863ea9de3011ba16e55023daeec75f7d4d2b51439bd5cd374489d6168c71c4 SHA512 ca27c1a4a1047bdb8b34dded844a0456ca95389c047ad480ef2ef4badb2923b3ef0cf6464e46e56be15b1e955f167e2d48f3bd57a2c759ca5e928f8b9dcbad9b
 EBUILD selinux-dictd-9999.ebuild 279 BLAKE2B 86d3fd80f6e8d883f2124b61a10ba98cffcbe0f60d32e35b37bdbd0ec8209a194266e1e85bd078af59e37ca7bedc0399868bbbae093a78ced5097db2d558eaf1 SHA512 57549e6805265f1cc5f2506931c35a30409d1ca1531b19cba99bc2620862b590690ba8a48f620908313bdf13c5bf6d442c1a64edf50b3275f5da0f7787f32e4d
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-dictd/selinux-dictd-2.20220106-r1.ebuild b/sec-policy/selinux-dictd/selinux-dictd-2.20220106-r1.ebuild
index 4923003066d6..a7bb29685b49 100644
--- a/sec-policy/selinux-dictd/selinux-dictd-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-dictd/selinux-dictd-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dictd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dictd/selinux-dictd-2.20220106-r2.ebuild b/sec-policy/selinux-dictd/selinux-dictd-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..4923003066d6
--- /dev/null
+++ b/sec-policy/selinux-dictd/selinux-dictd-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="dictd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dictd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-dirmngr/Manifest b/sec-policy/selinux-dirmngr/Manifest
index bd8d2be61116..4d4f9d7b6ed8 100644
--- a/sec-policy/selinux-dirmngr/Manifest
+++ b/sec-policy/selinux-dirmngr/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-dirmngr-2.20200818-r2.ebuild 279 BLAKE2B 7ebea8c6380bb48f61eddbe5226af38a91c0d26e1d9b8047e4066ebc8095b61243a8eca4b00fd3bcab5a8a52738548abb25f5c20dcd62e63024c31991015e55b SHA512 5690492a341f81d09a4969b04d09e522b7a6d17b90057bea0afef8fea22d7fd7b90191f6334f98a1f2a61d750776f02e125f6782123eb9245d7f3d7de675f2b8
 EBUILD selinux-dirmngr-2.20210203-r1.ebuild 279 BLAKE2B 7ebea8c6380bb48f61eddbe5226af38a91c0d26e1d9b8047e4066ebc8095b61243a8eca4b00fd3bcab5a8a52738548abb25f5c20dcd62e63024c31991015e55b SHA512 5690492a341f81d09a4969b04d09e522b7a6d17b90057bea0afef8fea22d7fd7b90191f6334f98a1f2a61d750776f02e125f6782123eb9245d7f3d7de675f2b8
 EBUILD selinux-dirmngr-2.20210908-r1.ebuild 279 BLAKE2B 7ebea8c6380bb48f61eddbe5226af38a91c0d26e1d9b8047e4066ebc8095b61243a8eca4b00fd3bcab5a8a52738548abb25f5c20dcd62e63024c31991015e55b SHA512 5690492a341f81d09a4969b04d09e522b7a6d17b90057bea0afef8fea22d7fd7b90191f6334f98a1f2a61d750776f02e125f6782123eb9245d7f3d7de675f2b8
-EBUILD selinux-dirmngr-2.20220106-r1.ebuild 283 BLAKE2B 2f860bf41b42262fec1325158ad21ea46aaf37eaae08a1f1c693e746b3da47e3d190713e1b3ae5d39a68bcbbb36d3133c1a587cc1bd5da0533da23cd03a20d4c SHA512 dc2823ecd17c6de71ee84e0eb71ed824139eb39073ee38ec428ea2b0b249657095500b1f0cb667d464a0a53303cfd45e218b4097eab4c1833fcefa7bc2d9c918
+EBUILD selinux-dirmngr-2.20220106-r1.ebuild 281 BLAKE2B 09ab7d0265318d6063bc20ffcd3b1317963b68e224cda46f24e946010af2f1f0c152947edffb656414497dc05e3640daff7f4f4fedc3a7225dd3ccb72e195d70 SHA512 cda17218a14b1ceb4923ee7a359782385ff364481491dc602ae2c24838cdead3573c3085014d9dcb056184fce913199e95a384b7f240c25cf378adc92985f11a
+EBUILD selinux-dirmngr-2.20220106-r2.ebuild 283 BLAKE2B 2f860bf41b42262fec1325158ad21ea46aaf37eaae08a1f1c693e746b3da47e3d190713e1b3ae5d39a68bcbbb36d3133c1a587cc1bd5da0533da23cd03a20d4c SHA512 dc2823ecd17c6de71ee84e0eb71ed824139eb39073ee38ec428ea2b0b249657095500b1f0cb667d464a0a53303cfd45e218b4097eab4c1833fcefa7bc2d9c918
 EBUILD selinux-dirmngr-9999.ebuild 283 BLAKE2B 553706533ab8f2b120b6fbca08d559ba9d47a55e584b83399096d805e03a01ad5601cc1daa178d9b05f51b53d64607555f98c01297a21c4cfd825bbb6fe4b303 SHA512 ae32095b381a7c3394dbca3738c8a01e718fab6218a57a85a57170518f967697267396e36c768f3c29b9a7d401f84ad54f46ef2612143edb3ac73dfc664a2688
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20220106-r1.ebuild b/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20220106-r1.ebuild
index 1adf4d19112f..5256dbf4bb8a 100644
--- a/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dirmngr"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20220106-r2.ebuild b/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..1adf4d19112f
--- /dev/null
+++ b/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="dirmngr"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dirmngr"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-dirsrv/Manifest b/sec-policy/selinux-dirsrv/Manifest
index 3aa6d992d559..638525a20f1d 100644
--- a/sec-policy/selinux-dirsrv/Manifest
+++ b/sec-policy/selinux-dirsrv/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-dirsrv-2.20200818-r2.ebuild 277 BLAKE2B 31f9b9290c10b723c0340aa9f00ecd9b9d0382b40458ac05e34134c76aa9e867bd7a0f6d1e3680d19d501494f673a7f3ee51cfd12056631cdb521e623cc7dd93 SHA512 40465bd41cbdbb1536d15f40a6b2c722454cf865c26439886a1ea08f6c90b5bab897316e7c749716011898a223f967f19800d0dde5b56c23ac0d58d8c1d40f7f
 EBUILD selinux-dirsrv-2.20210203-r1.ebuild 277 BLAKE2B 31f9b9290c10b723c0340aa9f00ecd9b9d0382b40458ac05e34134c76aa9e867bd7a0f6d1e3680d19d501494f673a7f3ee51cfd12056631cdb521e623cc7dd93 SHA512 40465bd41cbdbb1536d15f40a6b2c722454cf865c26439886a1ea08f6c90b5bab897316e7c749716011898a223f967f19800d0dde5b56c23ac0d58d8c1d40f7f
 EBUILD selinux-dirsrv-2.20210908-r1.ebuild 277 BLAKE2B 31f9b9290c10b723c0340aa9f00ecd9b9d0382b40458ac05e34134c76aa9e867bd7a0f6d1e3680d19d501494f673a7f3ee51cfd12056631cdb521e623cc7dd93 SHA512 40465bd41cbdbb1536d15f40a6b2c722454cf865c26439886a1ea08f6c90b5bab897316e7c749716011898a223f967f19800d0dde5b56c23ac0d58d8c1d40f7f
-EBUILD selinux-dirsrv-2.20220106-r1.ebuild 281 BLAKE2B a53bee04ce0379a29320947b91d874446a3332de8fc504a24e7aca55ebd58ae5bcd0af801754d66ad272fa6aaf8f3d6054cf85f3a75863ab6d1fe58a1bf9cdeb SHA512 634c0e603502274d4ca4c06e412084884b607647526efd806b11ea30b569410fbd57587661b7f4238482ff9aa185672c6b7b5dcfdb5e2edceebd40a883287081
+EBUILD selinux-dirsrv-2.20220106-r1.ebuild 279 BLAKE2B 9cee7912998e30b9a38454c5018ce39a8d3c885bbfeca413fa4043acc068124201a82755ddf0723bb90ec64dff492d323cfe5c8cfd37ca43d49cfcc38ea5ed87 SHA512 59158265ff83c9c4aa01737be8505ad711f5c6af7ded896006d545bd18cc58a4492ce495c44ac7a54f84e90821bb9b9597e5a9aff82361cc08397c8df73e0e5a
+EBUILD selinux-dirsrv-2.20220106-r2.ebuild 281 BLAKE2B a53bee04ce0379a29320947b91d874446a3332de8fc504a24e7aca55ebd58ae5bcd0af801754d66ad272fa6aaf8f3d6054cf85f3a75863ab6d1fe58a1bf9cdeb SHA512 634c0e603502274d4ca4c06e412084884b607647526efd806b11ea30b569410fbd57587661b7f4238482ff9aa185672c6b7b5dcfdb5e2edceebd40a883287081
 EBUILD selinux-dirsrv-9999.ebuild 281 BLAKE2B d3e0c290f16262c08de8b10bfe634c0eef68ae2a9bb330d76a5dbe13bc5484358bbb91ce6b6792d973305738701675cbfd4f63ed9619a455f7d2ba973394d48c SHA512 514a0bb51a90d545e5c5d2bb2b71443ac49ae37a0db5522c54b2e5281277fd5c838a776ae412dba6d7067f1864089f16f6388b06f4f78283a9ca952410ab3d59
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20220106-r1.ebuild b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20220106-r1.ebuild
index 58816b4d9e42..9dd56c4db80a 100644
--- a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dirsrv"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20220106-r2.ebuild b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..58816b4d9e42
--- /dev/null
+++ b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="dirsrv"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dirsrv"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-distcc/Manifest b/sec-policy/selinux-distcc/Manifest
index d4c521824736..a23d335e125b 100644
--- a/sec-policy/selinux-distcc/Manifest
+++ b/sec-policy/selinux-distcc/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-distcc-2.20200818-r2.ebuild 277 BLAKE2B d3890a9df7042a13aaf4a0323a3b7a1985d5b529d499bd7db3541c1c4523f495a5457268022c1e7380817ac4f21a0610d62bdf6128771c2d763e1d1902c12be8 SHA512 4fd56a897576a7b8c8be036e510b7c19d0712bcdeb8195412bce37bd926f5c2f677c636247abb3c42fcf6424cc4fad0a0c761b10ba2cc9a196bc399c9a91d479
 EBUILD selinux-distcc-2.20210203-r1.ebuild 277 BLAKE2B d3890a9df7042a13aaf4a0323a3b7a1985d5b529d499bd7db3541c1c4523f495a5457268022c1e7380817ac4f21a0610d62bdf6128771c2d763e1d1902c12be8 SHA512 4fd56a897576a7b8c8be036e510b7c19d0712bcdeb8195412bce37bd926f5c2f677c636247abb3c42fcf6424cc4fad0a0c761b10ba2cc9a196bc399c9a91d479
 EBUILD selinux-distcc-2.20210908-r1.ebuild 277 BLAKE2B d3890a9df7042a13aaf4a0323a3b7a1985d5b529d499bd7db3541c1c4523f495a5457268022c1e7380817ac4f21a0610d62bdf6128771c2d763e1d1902c12be8 SHA512 4fd56a897576a7b8c8be036e510b7c19d0712bcdeb8195412bce37bd926f5c2f677c636247abb3c42fcf6424cc4fad0a0c761b10ba2cc9a196bc399c9a91d479
-EBUILD selinux-distcc-2.20220106-r1.ebuild 281 BLAKE2B f9bb3da8c89ff6f4d58c18bdc6186cb8670da606f25b7add12e97a6284dd22f59fa5f0428bb04abcf7f4b00a9204c8a79118e1f0ce5c0c6f6dab4678af034a8b SHA512 6321f1003202494ca6051b7cdc35ed8cf4fc756d91d09be4ab26ee3de0299383945ca93c66479208a9ccd610514ea4ac88cd397d29d58293df98c133685c8bcf
+EBUILD selinux-distcc-2.20220106-r1.ebuild 279 BLAKE2B ba42420d3e8be71a048ba6a42e326635d7683f48add1a72038ce9d69aee66006ddaff5b553ad86432c31a1955c09a32f1c307829416439c39087120b0cdebb81 SHA512 b5d0b4a1087bb57f32dd365220e5e75e4a5a902a143ff540b10dd2e125fa4301050f3e2d0b345d13d3ea6d853f13971b14c93e256d66be7aab2dfab492058a1b
+EBUILD selinux-distcc-2.20220106-r2.ebuild 281 BLAKE2B f9bb3da8c89ff6f4d58c18bdc6186cb8670da606f25b7add12e97a6284dd22f59fa5f0428bb04abcf7f4b00a9204c8a79118e1f0ce5c0c6f6dab4678af034a8b SHA512 6321f1003202494ca6051b7cdc35ed8cf4fc756d91d09be4ab26ee3de0299383945ca93c66479208a9ccd610514ea4ac88cd397d29d58293df98c133685c8bcf
 EBUILD selinux-distcc-9999.ebuild 281 BLAKE2B 74ff0024e868d0d19cf7d8bcf4a00ffbd8fc4370b75ade737d1560c71d8491509a5fd0ac82c835e42c0602a85e9f406fdf14d48a80d2e2654fa8a88b75ecf61c SHA512 3f21cab87047090fe82b843fe39e3850724b2541eb7064f5635b86111052556f28d2e6222dccfcf5dedaa73596f8f79f5d37c250ca7ae3c69e635d90e8e9e3a7
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-distcc/selinux-distcc-2.20220106-r1.ebuild b/sec-policy/selinux-distcc/selinux-distcc-2.20220106-r1.ebuild
index 2d538da698dc..45595e14e833 100644
--- a/sec-policy/selinux-distcc/selinux-distcc-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-distcc/selinux-distcc-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for distcc"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-distcc/selinux-distcc-2.20220106-r2.ebuild b/sec-policy/selinux-distcc/selinux-distcc-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..2d538da698dc
--- /dev/null
+++ b/sec-policy/selinux-distcc/selinux-distcc-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="distcc"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for distcc"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-djbdns/Manifest b/sec-policy/selinux-djbdns/Manifest
index e0d1837d51ba..3f122651c6f8 100644
--- a/sec-policy/selinux-djbdns/Manifest
+++ b/sec-policy/selinux-djbdns/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-djbdns-2.20200818-r2.ebuild 441 BLAKE2B 23bcdc6f3b87565de08aa26329aac1223a54e1e5feb371dcc9b9b0a1503ab6c23d094355b4a48c1b90c706b603c6e39a355e027bece1c803ece6e8fa131b9843 SHA512 c44fcb1fb2f798c941b34196df21029a36fc2371bcd56d06ced686b0e789d95afc69dcc92b7eb0b02ed9bd0e988438b6d8ef0e349ccd2c1a312b4d9de5c2218b
 EBUILD selinux-djbdns-2.20210203-r1.ebuild 441 BLAKE2B 23bcdc6f3b87565de08aa26329aac1223a54e1e5feb371dcc9b9b0a1503ab6c23d094355b4a48c1b90c706b603c6e39a355e027bece1c803ece6e8fa131b9843 SHA512 c44fcb1fb2f798c941b34196df21029a36fc2371bcd56d06ced686b0e789d95afc69dcc92b7eb0b02ed9bd0e988438b6d8ef0e349ccd2c1a312b4d9de5c2218b
 EBUILD selinux-djbdns-2.20210908-r1.ebuild 441 BLAKE2B 23bcdc6f3b87565de08aa26329aac1223a54e1e5feb371dcc9b9b0a1503ab6c23d094355b4a48c1b90c706b603c6e39a355e027bece1c803ece6e8fa131b9843 SHA512 c44fcb1fb2f798c941b34196df21029a36fc2371bcd56d06ced686b0e789d95afc69dcc92b7eb0b02ed9bd0e988438b6d8ef0e349ccd2c1a312b4d9de5c2218b
-EBUILD selinux-djbdns-2.20220106-r1.ebuild 445 BLAKE2B 1711f0126d1e01405952d949f3c246e47a5f3bd86a4828448b67fe5380921520f7ce6d28028c23bb28631b40dc09a2d090857cf6cb87e604ba3aed27d747936b SHA512 744b65973ca0d2e1fff496ec48764710fd16668101c4be45e42d999e0b2080ab60b31cb489d6a2368e8af3452162a749252a86ef56d2ae28e168847b1a13093d
+EBUILD selinux-djbdns-2.20220106-r1.ebuild 443 BLAKE2B a093b958c90a2265961628966273bc088f3053e03d1582af5edc26ae332529a69194de8b710658aeb12436e712c3e9c6555a6e33afda813ce075dc977d7ef6a6 SHA512 6cbe5c01b02c5a2e3a810dbb297ce8618c954a74ba97fd8c1dcd689668b49031bdf0453bde4943fd48a3b5fc84360e894e6e5d290b06ba93645275c34e9f0126
+EBUILD selinux-djbdns-2.20220106-r2.ebuild 445 BLAKE2B 1711f0126d1e01405952d949f3c246e47a5f3bd86a4828448b67fe5380921520f7ce6d28028c23bb28631b40dc09a2d090857cf6cb87e604ba3aed27d747936b SHA512 744b65973ca0d2e1fff496ec48764710fd16668101c4be45e42d999e0b2080ab60b31cb489d6a2368e8af3452162a749252a86ef56d2ae28e168847b1a13093d
 EBUILD selinux-djbdns-9999.ebuild 445 BLAKE2B a1638fd2a047283288cb8aad02af1691992582ee57ea696b0ecc4527ed994671b2668dc10721d6920973a37fb5673e3f9b7385979032ea0030cf17c505f6e5fe SHA512 6f728d12ca6481366ed9934f1c053fd58714b1febbbdb6fce45802e93f9aa7e4f78a1ecd384e0e8bdf178d71e32800898daf66db9da2654afa3c3ab6c239ac93
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-djbdns/selinux-djbdns-2.20220106-r1.ebuild b/sec-policy/selinux-djbdns/selinux-djbdns-2.20220106-r1.ebuild
index 8823bfa6007f..33bf5f6c195c 100644
--- a/sec-policy/selinux-djbdns/selinux-djbdns-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-djbdns/selinux-djbdns-2.20220106-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for djbdns"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-daemontools
diff --git a/sec-policy/selinux-djbdns/selinux-djbdns-2.20220106-r2.ebuild b/sec-policy/selinux-djbdns/selinux-djbdns-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..8823bfa6007f
--- /dev/null
+++ b/sec-policy/selinux-djbdns/selinux-djbdns-2.20220106-r2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="djbdns"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for djbdns"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-daemontools
+	sec-policy/selinux-ucspitcp
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-daemontools
+	sec-policy/selinux-ucspitcp
+"
diff --git a/sec-policy/selinux-dkim/Manifest b/sec-policy/selinux-dkim/Manifest
index d85420860fe6..edd8635b51a0 100644
--- a/sec-policy/selinux-dkim/Manifest
+++ b/sec-policy/selinux-dkim/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-dkim-2.20200818-r2.ebuild 370 BLAKE2B 342208b23b5871d91fcef6206ac5b917864431692975133cb8a5f238d787ca3a530f3e5ca7f0fba26fbfa3f76f4df6b2446878b80fe11c090d5fad12ba241c4b SHA512 6d895a3faf32c4f7465f2a03655ae61aef9b58292fe68e0923e744226c5b3d306389cf01a8f48776f316eefc1bd3f84c51eeacfadad6ad96d67cceca1d81d9ab
 EBUILD selinux-dkim-2.20210203-r1.ebuild 370 BLAKE2B 342208b23b5871d91fcef6206ac5b917864431692975133cb8a5f238d787ca3a530f3e5ca7f0fba26fbfa3f76f4df6b2446878b80fe11c090d5fad12ba241c4b SHA512 6d895a3faf32c4f7465f2a03655ae61aef9b58292fe68e0923e744226c5b3d306389cf01a8f48776f316eefc1bd3f84c51eeacfadad6ad96d67cceca1d81d9ab
 EBUILD selinux-dkim-2.20210908-r1.ebuild 370 BLAKE2B 342208b23b5871d91fcef6206ac5b917864431692975133cb8a5f238d787ca3a530f3e5ca7f0fba26fbfa3f76f4df6b2446878b80fe11c090d5fad12ba241c4b SHA512 6d895a3faf32c4f7465f2a03655ae61aef9b58292fe68e0923e744226c5b3d306389cf01a8f48776f316eefc1bd3f84c51eeacfadad6ad96d67cceca1d81d9ab
-EBUILD selinux-dkim-2.20220106-r1.ebuild 374 BLAKE2B 21cf5fd0626565dd83ee32e7fc5274329a205b8a999d4c71878e92b51dc336714fb66f28c842ccb85061c8f0b5da405e8ed019e4c71082df5156079169ad0045 SHA512 0e0cd8d466d5655ca193c5563dd393f265bc94d2cb32ccfbac369a7fd2b127c6e4bacc8c5a01c002bfbf67e81dbf5ce0c108bed447be64135a527a245eca0373
+EBUILD selinux-dkim-2.20220106-r1.ebuild 372 BLAKE2B 5ec97aa9d4035a7c401fa8b55c577485ed58cce0bb283d26fc0b34872c8be34f94637bfc63134bd2b55ab3bdbb597ce7ce6b67aeeb1d0b9aa14f503ce1426f7b SHA512 617438dd63e6fd0cb95d1666e0352ad647df82e17a1be20075ea261aa0e581fe9721b2b165437df9281f91ea7826fe806ccf7686631578b42d92f1b54760499e
+EBUILD selinux-dkim-2.20220106-r2.ebuild 374 BLAKE2B 21cf5fd0626565dd83ee32e7fc5274329a205b8a999d4c71878e92b51dc336714fb66f28c842ccb85061c8f0b5da405e8ed019e4c71082df5156079169ad0045 SHA512 0e0cd8d466d5655ca193c5563dd393f265bc94d2cb32ccfbac369a7fd2b127c6e4bacc8c5a01c002bfbf67e81dbf5ce0c108bed447be64135a527a245eca0373
 EBUILD selinux-dkim-9999.ebuild 374 BLAKE2B 27d5d1e7aa6c67aab46ba6d9b78a931799442c32a5839d91d83ab0048091d4819f911d298ee788eb9a11cbd0e95bd7c71c7372c078138b3aa8074880a43d1537 SHA512 3078f9e24f962333e06558563c3ef477e4a47a9a3798b4e3ab64786ed5179c1aa1ce5a126ff5120cd049b302b9dd6de16606e960a5f04dbbbc5a4d36a89c1dfa
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-dkim/selinux-dkim-2.20220106-r1.ebuild b/sec-policy/selinux-dkim/selinux-dkim-2.20220106-r1.ebuild
index b7a918b0afd2..9d8f227356a8 100644
--- a/sec-policy/selinux-dkim/selinux-dkim-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-dkim/selinux-dkim-2.20220106-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dkim"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-dkim/selinux-dkim-2.20220106-r2.ebuild b/sec-policy/selinux-dkim/selinux-dkim-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..b7a918b0afd2
--- /dev/null
+++ b/sec-policy/selinux-dkim/selinux-dkim-2.20220106-r2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="dkim"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dkim"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+
+DEPEND="${DEPEND}
+	sec-policy/selinux-milter
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-milter
+"
diff --git a/sec-policy/selinux-dmidecode/Manifest b/sec-policy/selinux-dmidecode/Manifest
index ff8a0d772680..b0da6ca4ebe2 100644
--- a/sec-policy/selinux-dmidecode/Manifest
+++ b/sec-policy/selinux-dmidecode/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-dmidecode-2.20200818-r2.ebuild 283 BLAKE2B 20a7a25e91b267ad7f0c43d1c66586e0ec76b6cd62a8517d3028025a55d3cc42f7154d8feb1fc20f21f946487e81400e4da56372e98294232290ad8982b5ff57 SHA512 87b871955157787cfb4522f84a5a51c555e0e43940c0a8a81ac4431096073baf888b0e6f185aba19183ff0a3dba024a38eeb8135d96086a4c797aecfe7444c7b
 EBUILD selinux-dmidecode-2.20210203-r1.ebuild 283 BLAKE2B 20a7a25e91b267ad7f0c43d1c66586e0ec76b6cd62a8517d3028025a55d3cc42f7154d8feb1fc20f21f946487e81400e4da56372e98294232290ad8982b5ff57 SHA512 87b871955157787cfb4522f84a5a51c555e0e43940c0a8a81ac4431096073baf888b0e6f185aba19183ff0a3dba024a38eeb8135d96086a4c797aecfe7444c7b
 EBUILD selinux-dmidecode-2.20210908-r1.ebuild 283 BLAKE2B 20a7a25e91b267ad7f0c43d1c66586e0ec76b6cd62a8517d3028025a55d3cc42f7154d8feb1fc20f21f946487e81400e4da56372e98294232290ad8982b5ff57 SHA512 87b871955157787cfb4522f84a5a51c555e0e43940c0a8a81ac4431096073baf888b0e6f185aba19183ff0a3dba024a38eeb8135d96086a4c797aecfe7444c7b
-EBUILD selinux-dmidecode-2.20220106-r1.ebuild 287 BLAKE2B 98f7b001ae13c89d0c91305e99cb4de43cc55b0e7966d1444b1fb11c1ac0eb6a56a14e3554a4e864c599216009bac8e2393ab3d8e5edbd80b264fd4f53d16d89 SHA512 7c9f2442577ef1a96213d9104522235948418841d7acca94fc25ede09d735de67b1033bf15777b177429eba4acc0f9a4d948c8886229bd143b63abdc85fa3d3a
+EBUILD selinux-dmidecode-2.20220106-r1.ebuild 285 BLAKE2B 34cd4c306cd977012194698116bec21899b2bf2267537b0364c4792d9694b01a4000b9a942b377475b1fa449336d7ad6ce4eea4b7a915dd73f08c3a905951402 SHA512 4348b6b1830a4cd9f1e4d1b7adf01d4b4074bb4a6321cdfb19b424e02e6f2764d28d4a6ca49f0104e97c0b228c016395d66836656f6ecf97d0898c6b20810dee
+EBUILD selinux-dmidecode-2.20220106-r2.ebuild 287 BLAKE2B 98f7b001ae13c89d0c91305e99cb4de43cc55b0e7966d1444b1fb11c1ac0eb6a56a14e3554a4e864c599216009bac8e2393ab3d8e5edbd80b264fd4f53d16d89 SHA512 7c9f2442577ef1a96213d9104522235948418841d7acca94fc25ede09d735de67b1033bf15777b177429eba4acc0f9a4d948c8886229bd143b63abdc85fa3d3a
 EBUILD selinux-dmidecode-9999.ebuild 287 BLAKE2B cb9b2199991d381e9d759e5b784728e5a28c51daa22ed72e222ecbca1611056c07a550d5ac650ded1410aef90a24f2d792a951ba69055188dfefcc7b34e1125f SHA512 19baef00d2067a48d6411f1740976ee0164d559e54f2da4c109b681ae107fb9627f6a36d3e0c403042f01e5dae95f98c6137ec78d571798cd3e33e9b38c0f38c
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20220106-r1.ebuild b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20220106-r1.ebuild
index 8b198fbc7c16..b9697a78db8a 100644
--- a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dmidecode"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20220106-r2.ebuild b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..8b198fbc7c16
--- /dev/null
+++ b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="dmidecode"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dmidecode"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-dnsmasq/Manifest b/sec-policy/selinux-dnsmasq/Manifest
index 99af18eb6ab7..a3e4c6bf7ded 100644
--- a/sec-policy/selinux-dnsmasq/Manifest
+++ b/sec-policy/selinux-dnsmasq/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-dnsmasq-2.20200818-r2.ebuild 279 BLAKE2B c5d9c22ff74dbe595c28ca5c033b8c435659ddf01961b98dfa39f72252f62a002f8cf328dd0ee96c772dc7257eca313b91d025b140fdaeb66e3be29180cb4957 SHA512 bfcdca5fac356ab87d82f5638c0746c2e2a2f91810f01ff82f7cd4c4b1392db1214078eecfd2e9680b0fcb76fba974a7e1226fa8f2fc4cae6fe55839c31af7fc
 EBUILD selinux-dnsmasq-2.20210203-r1.ebuild 279 BLAKE2B c5d9c22ff74dbe595c28ca5c033b8c435659ddf01961b98dfa39f72252f62a002f8cf328dd0ee96c772dc7257eca313b91d025b140fdaeb66e3be29180cb4957 SHA512 bfcdca5fac356ab87d82f5638c0746c2e2a2f91810f01ff82f7cd4c4b1392db1214078eecfd2e9680b0fcb76fba974a7e1226fa8f2fc4cae6fe55839c31af7fc
 EBUILD selinux-dnsmasq-2.20210908-r1.ebuild 279 BLAKE2B c5d9c22ff74dbe595c28ca5c033b8c435659ddf01961b98dfa39f72252f62a002f8cf328dd0ee96c772dc7257eca313b91d025b140fdaeb66e3be29180cb4957 SHA512 bfcdca5fac356ab87d82f5638c0746c2e2a2f91810f01ff82f7cd4c4b1392db1214078eecfd2e9680b0fcb76fba974a7e1226fa8f2fc4cae6fe55839c31af7fc
-EBUILD selinux-dnsmasq-2.20220106-r1.ebuild 283 BLAKE2B d8bfb435048e6d8baae5bf66b5a74de000174900fec2ef6ab0b3086f611a13877932b5037be25860debfb61bbcabf99181268b70f039aef7190453ff607f15e7 SHA512 500e1c100b4da15a09facbdd1180122c65089d5ca937e16bd077786854897feb7f3d1db6ef2c4e311885fcde437c17f9115c711684cfb7bfd77c75df64a88273
+EBUILD selinux-dnsmasq-2.20220106-r1.ebuild 281 BLAKE2B c09d5fc76e990c1ef6d51e01ebbd0a3dacf880016cede7b58b7d36707a723601a8885bae8ec5505adeece9a0213963a4ae778fa6ef65a1e1be3a24a620f0d7f0 SHA512 dc03d8ea2ab93159e53f567f10f1579cc81ae3af9bca97f7328b3a5dbf0d3fa34db1b392642fc5d75715a718e5ab8a32d94c23132312474027d4719e2a4114f8
+EBUILD selinux-dnsmasq-2.20220106-r2.ebuild 283 BLAKE2B d8bfb435048e6d8baae5bf66b5a74de000174900fec2ef6ab0b3086f611a13877932b5037be25860debfb61bbcabf99181268b70f039aef7190453ff607f15e7 SHA512 500e1c100b4da15a09facbdd1180122c65089d5ca937e16bd077786854897feb7f3d1db6ef2c4e311885fcde437c17f9115c711684cfb7bfd77c75df64a88273
 EBUILD selinux-dnsmasq-9999.ebuild 283 BLAKE2B 7922225b390977c7ce4fcb19ffffd6d4e5f135fd8cded38fca83e29f88f34bfac5e6c98ed3422418643ef5103f3569793e04e404837a6b235d25b3dbc423a310 SHA512 edadad012f5f5f0adf1b498c8699eceac3b37be899f7e4b679cd03d8fe2ec66b5a7af8a61f9d4e9070a2f985a6106f3d666885927eb61cc8cbff55ac5ac834f8
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20220106-r1.ebuild b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20220106-r1.ebuild
index b518418cd74b..68994863a068 100644
--- a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dnsmasq"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20220106-r2.ebuild b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..b518418cd74b
--- /dev/null
+++ b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="dnsmasq"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dnsmasq"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-docker/Manifest b/sec-policy/selinux-docker/Manifest
index 3ba48511688d..06781921bfe4 100644
--- a/sec-policy/selinux-docker/Manifest
+++ b/sec-policy/selinux-docker/Manifest
@@ -1,5 +1,7 @@
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176d3c8e508b2ff97d4f8a876d7c0a65534a62d86c9816ac59f6eed583f4b5c51cf432643edd2dad24dd51eb3cf22e2b75ac SHA512 794327d2dd07196b5f36771f9a961cdf294cf68f690735418d6bdd859499b7007c518cc022ccca9c245a5266b85bdb7cacdcaeefee14e4800937c9101476b373
-EBUILD selinux-docker-2.20220106-r1.ebuild 384 BLAKE2B 45fe8e057ff0bc68c7b6c4e865f1e854fb9a1056ed13af5f818d17ed85840cd4688bdde3686f54f2476ed1b2a23c45ac17eb484877068cdddb2ca7cb379ecc1f SHA512 95accf576155a27444f86eeb249ed572d0fbef13b759c0d18bdeef08b2a2ad444517bad58c91b76b644ec18eb887b7f23fec692993e94588f882db16cb6ec969
+EBUILD selinux-docker-2.20220106-r1.ebuild 382 BLAKE2B b10077fb8fdccb50f147b67031c46a5a031576c1a3d8af764ea11b1ec3625c94376c73eb7f8bb45770d8e0ec89608abb176d27d4c0447a7e9d1e4b48ef403ebc SHA512 ea9213ffa03ca790a64427346f582f045bbc74943f5e7af4e40c75e384611727443e94c81b47fd482334d2186eb49f2274873999437ea52b6a6d173f3977b444
+EBUILD selinux-docker-2.20220106-r2.ebuild 384 BLAKE2B 45fe8e057ff0bc68c7b6c4e865f1e854fb9a1056ed13af5f818d17ed85840cd4688bdde3686f54f2476ed1b2a23c45ac17eb484877068cdddb2ca7cb379ecc1f SHA512 95accf576155a27444f86eeb249ed572d0fbef13b759c0d18bdeef08b2a2ad444517bad58c91b76b644ec18eb887b7f23fec692993e94588f882db16cb6ec969
 EBUILD selinux-docker-9999.ebuild 384 BLAKE2B 45fe8e057ff0bc68c7b6c4e865f1e854fb9a1056ed13af5f818d17ed85840cd4688bdde3686f54f2476ed1b2a23c45ac17eb484877068cdddb2ca7cb379ecc1f SHA512 95accf576155a27444f86eeb249ed572d0fbef13b759c0d18bdeef08b2a2ad444517bad58c91b76b644ec18eb887b7f23fec692993e94588f882db16cb6ec969
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-docker/selinux-docker-2.20220106-r1.ebuild b/sec-policy/selinux-docker/selinux-docker-2.20220106-r1.ebuild
index 86cb6e1fc893..b3100eb8d13a 100644
--- a/sec-policy/selinux-docker/selinux-docker-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-docker/selinux-docker-2.20220106-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for docker"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-docker/selinux-docker-2.20220106-r2.ebuild b/sec-policy/selinux-docker/selinux-docker-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..86cb6e1fc893
--- /dev/null
+++ b/sec-policy/selinux-docker/selinux-docker-2.20220106-r2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="docker"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for docker"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+
+DEPEND="${DEPEND}
+	sec-policy/selinux-container
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-container
+"
diff --git a/sec-policy/selinux-dovecot/Manifest b/sec-policy/selinux-dovecot/Manifest
index b53e9aa36489..7b5aef29db3b 100644
--- a/sec-policy/selinux-dovecot/Manifest
+++ b/sec-policy/selinux-dovecot/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-dovecot-2.20200818-r2.ebuild 279 BLAKE2B e5d0dd9cda4a6f3a7300df2f4bbfcb633ff979559368491ddd64a52d1b87d131f36e5c1f5e2acc6b828f9e87dd243e7c6d75ca0d34042b02969fc81114d12e79 SHA512 ef63d6f580c6401e527fb6a4aa3e12c1582f79ce77d1cbadd9500ccf40a732dbbc3db4476a1ec89dc7c1b1b180fc33942a9f7c63fa0f851e896ac52d9c7e236a
 EBUILD selinux-dovecot-2.20210203-r1.ebuild 279 BLAKE2B e5d0dd9cda4a6f3a7300df2f4bbfcb633ff979559368491ddd64a52d1b87d131f36e5c1f5e2acc6b828f9e87dd243e7c6d75ca0d34042b02969fc81114d12e79 SHA512 ef63d6f580c6401e527fb6a4aa3e12c1582f79ce77d1cbadd9500ccf40a732dbbc3db4476a1ec89dc7c1b1b180fc33942a9f7c63fa0f851e896ac52d9c7e236a
 EBUILD selinux-dovecot-2.20210908-r1.ebuild 279 BLAKE2B e5d0dd9cda4a6f3a7300df2f4bbfcb633ff979559368491ddd64a52d1b87d131f36e5c1f5e2acc6b828f9e87dd243e7c6d75ca0d34042b02969fc81114d12e79 SHA512 ef63d6f580c6401e527fb6a4aa3e12c1582f79ce77d1cbadd9500ccf40a732dbbc3db4476a1ec89dc7c1b1b180fc33942a9f7c63fa0f851e896ac52d9c7e236a
-EBUILD selinux-dovecot-2.20220106-r1.ebuild 283 BLAKE2B f5307077ce0003fd086c3d3eba9a35de198ead688cff812338db2cfaac1fa815179167aac51a30685bbed44b2f4335382843efd3e157d87b4e8856f7d51619ba SHA512 94f22e11f2f81d50708e0f57e3f3440524d5c67099c05ac3779a3b7debe9bcc9e295e6b095cc73091c3d649497d409def8ea48f2619f86eb2329948af59fc856
+EBUILD selinux-dovecot-2.20220106-r1.ebuild 281 BLAKE2B 85279f1e3c051beb7c64b219503860b9085bb6a1dda98d105498c7f092783075f2c6810c8282a20b144a1f06e16ee147f488961bcb63af6f35c862d6fc032033 SHA512 62312e94d9ecd68513b2beb69fd3bf0f189667749dc9fa2f7e599ca66edcff4051c503759e3fad9061633e1c5164b37c059112fd7534c93b072592fe8c987d1d
+EBUILD selinux-dovecot-2.20220106-r2.ebuild 283 BLAKE2B f5307077ce0003fd086c3d3eba9a35de198ead688cff812338db2cfaac1fa815179167aac51a30685bbed44b2f4335382843efd3e157d87b4e8856f7d51619ba SHA512 94f22e11f2f81d50708e0f57e3f3440524d5c67099c05ac3779a3b7debe9bcc9e295e6b095cc73091c3d649497d409def8ea48f2619f86eb2329948af59fc856
 EBUILD selinux-dovecot-9999.ebuild 283 BLAKE2B 7ddc83c63ef96cb6af3a75dc02b683ea260d7ec26741bc69630bfece0c6647b985b039ba1fefca963556062bd773825b3ab237e78f6ec3c129738a3011061ccd SHA512 cec6aa1feae72a4d87326a0c53774d2a1a6eaf7b81e9aa4d7b44751193e5ee02e57aade2b3ebb5062f82dc020b1442087ff84834d5dd00d77c33336e499184c0
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-dovecot/selinux-dovecot-2.20220106-r1.ebuild b/sec-policy/selinux-dovecot/selinux-dovecot-2.20220106-r1.ebuild
index dde0b5e08390..5cb1f6b0fee9 100644
--- a/sec-policy/selinux-dovecot/selinux-dovecot-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-dovecot/selinux-dovecot-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dovecot"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dovecot/selinux-dovecot-2.20220106-r2.ebuild b/sec-policy/selinux-dovecot/selinux-dovecot-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..dde0b5e08390
--- /dev/null
+++ b/sec-policy/selinux-dovecot/selinux-dovecot-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="dovecot"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dovecot"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-dpkg/Manifest b/sec-policy/selinux-dpkg/Manifest
index 74f2ac7fc59f..d845a2409b7c 100644
--- a/sec-policy/selinux-dpkg/Manifest
+++ b/sec-policy/selinux-dpkg/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-dpkg-2.20200818-r2.ebuild 273 BLAKE2B 07c5c7eeb5201ce325c45791da2a961d7c00087e6e385bc33444bd55ec654cae807c8885dfe5dddc0df929c809b5e3c414ad2ca44fcaff48a5b7f26d4fdd19b5 SHA512 c5974201cebd55ee44102490659870ff20085b6a4966959b92b7b803c5331b652543d7f9851891a9d826d18ad4e45c4e64e55da13e0610613093e3cca38c5d1e
 EBUILD selinux-dpkg-2.20210203-r1.ebuild 273 BLAKE2B 07c5c7eeb5201ce325c45791da2a961d7c00087e6e385bc33444bd55ec654cae807c8885dfe5dddc0df929c809b5e3c414ad2ca44fcaff48a5b7f26d4fdd19b5 SHA512 c5974201cebd55ee44102490659870ff20085b6a4966959b92b7b803c5331b652543d7f9851891a9d826d18ad4e45c4e64e55da13e0610613093e3cca38c5d1e
 EBUILD selinux-dpkg-2.20210908-r1.ebuild 273 BLAKE2B 07c5c7eeb5201ce325c45791da2a961d7c00087e6e385bc33444bd55ec654cae807c8885dfe5dddc0df929c809b5e3c414ad2ca44fcaff48a5b7f26d4fdd19b5 SHA512 c5974201cebd55ee44102490659870ff20085b6a4966959b92b7b803c5331b652543d7f9851891a9d826d18ad4e45c4e64e55da13e0610613093e3cca38c5d1e
-EBUILD selinux-dpkg-2.20220106-r1.ebuild 277 BLAKE2B c2de1b3acd8583ec1eb7ba9768cff0a88e6dd46934a5e860ba8236c798fda2dc5c247e88acce7fa82af6b8ced2694edaaa979c89ee1eebfc08aac60968fec7bf SHA512 6cce51c68dabad58843c7ffcf41c5a811df7f50385c1bf6049ed34207d6cd157a67b043321e555499e2127b889576ce96ac6c0e9328e0de6014729f7cdef8977
+EBUILD selinux-dpkg-2.20220106-r1.ebuild 275 BLAKE2B 3fa3b7119806671c9c7fe547d19ec09f7c6ec9390008da895fb40d9916359218008294cec1d7e273d58a9d1d1e20170be7f538d26dc1b18a80043d52bc48f59c SHA512 4961c7ddbc46cc3e7e7ebd3daeddbfc68ef6fabccd8494fc3ac58996120325fd7d0557c44a06577444d9b3a78488e56e3ea1045bbeab095c86d10f85a00962cf
+EBUILD selinux-dpkg-2.20220106-r2.ebuild 277 BLAKE2B c2de1b3acd8583ec1eb7ba9768cff0a88e6dd46934a5e860ba8236c798fda2dc5c247e88acce7fa82af6b8ced2694edaaa979c89ee1eebfc08aac60968fec7bf SHA512 6cce51c68dabad58843c7ffcf41c5a811df7f50385c1bf6049ed34207d6cd157a67b043321e555499e2127b889576ce96ac6c0e9328e0de6014729f7cdef8977
 EBUILD selinux-dpkg-9999.ebuild 277 BLAKE2B 5ec81da73feda2f2f619df6f5479b5100e9b66fd0f23826c93cf9e247e4dee36f909080b96f8aa625f86f489bf74554c16b03d30abfb83c0c7d645bad9256452 SHA512 6c7624fb81f4700a5ba7f1bb89491b6bbbda65bd038673bd83ef1753e80185a1f3c59b34eaa5982869c508c2cc388b6f90d068671dd4742196c0b6b6df331383
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-dpkg/selinux-dpkg-2.20220106-r1.ebuild b/sec-policy/selinux-dpkg/selinux-dpkg-2.20220106-r1.ebuild
index f12be426e792..17a62366e39c 100644
--- a/sec-policy/selinux-dpkg/selinux-dpkg-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-dpkg/selinux-dpkg-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dpkg"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dpkg/selinux-dpkg-2.20220106-r2.ebuild b/sec-policy/selinux-dpkg/selinux-dpkg-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..f12be426e792
--- /dev/null
+++ b/sec-policy/selinux-dpkg/selinux-dpkg-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="dpkg"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dpkg"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-dracut/Manifest b/sec-policy/selinux-dracut/Manifest
index 81ab7f33a860..5ea6165ecfe1 100644
--- a/sec-policy/selinux-dracut/Manifest
+++ b/sec-policy/selinux-dracut/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-dracut-2.20200818-r2.ebuild 277 BLAKE2B ee790bed4ca67cfdb1c050eb1e513d32166a477c1694265ed817b2fe575b5a7f52ea812e2325db3d73fca298034872bbfebbdcea7bc28d8be2b934fcbec14f46 SHA512 d176081dfd0e28bebda13457dcbc00460b501c44c4e7a861d29ed5e6597d8d2ef106b4775556212d62e9bde00ac5d957166eaaed7c91e39c2096d483b9b36a7f
 EBUILD selinux-dracut-2.20210203-r1.ebuild 277 BLAKE2B ee790bed4ca67cfdb1c050eb1e513d32166a477c1694265ed817b2fe575b5a7f52ea812e2325db3d73fca298034872bbfebbdcea7bc28d8be2b934fcbec14f46 SHA512 d176081dfd0e28bebda13457dcbc00460b501c44c4e7a861d29ed5e6597d8d2ef106b4775556212d62e9bde00ac5d957166eaaed7c91e39c2096d483b9b36a7f
 EBUILD selinux-dracut-2.20210908-r1.ebuild 277 BLAKE2B ee790bed4ca67cfdb1c050eb1e513d32166a477c1694265ed817b2fe575b5a7f52ea812e2325db3d73fca298034872bbfebbdcea7bc28d8be2b934fcbec14f46 SHA512 d176081dfd0e28bebda13457dcbc00460b501c44c4e7a861d29ed5e6597d8d2ef106b4775556212d62e9bde00ac5d957166eaaed7c91e39c2096d483b9b36a7f
-EBUILD selinux-dracut-2.20220106-r1.ebuild 281 BLAKE2B c50b921e09a99dfeb706ba9d03afff51a5f41862f1ca98f2b50ddf1642aa93d886c768c010d933ca4fd80b4a7a77b7b4ff4437673893ae49a42b2805889ebd57 SHA512 67aa6bc70662623f02559738525b4acd67f2125331056dc1e310462bfbd8f06aa44b4fabf83b81d9ae3290ea0d2a1cb02405ee6d22fae42f78afe456e79d3553
+EBUILD selinux-dracut-2.20220106-r1.ebuild 279 BLAKE2B 2140ad0980eba5b2e7f407794f2b59a2394600f98c8eac8bbbd0c99474284033f1a74505b05ed0ab11827fba2ac610713878e54283526e44ac8e1f24efbc7f49 SHA512 604ef7c4c34024b85abd0a17654a3b1c1fce936d729d7fb0e39bc55522b403afabcea9ae00d4b418f3f23b70d03633ece0a649fee957db568988336c59d9bc63
+EBUILD selinux-dracut-2.20220106-r2.ebuild 281 BLAKE2B c50b921e09a99dfeb706ba9d03afff51a5f41862f1ca98f2b50ddf1642aa93d886c768c010d933ca4fd80b4a7a77b7b4ff4437673893ae49a42b2805889ebd57 SHA512 67aa6bc70662623f02559738525b4acd67f2125331056dc1e310462bfbd8f06aa44b4fabf83b81d9ae3290ea0d2a1cb02405ee6d22fae42f78afe456e79d3553
 EBUILD selinux-dracut-9999.ebuild 281 BLAKE2B 010046dfbfad9c491859a32ea6696fa326a58cef10650db405f70cc4e02fe4685a502f2ed42a994318ae6f1d4b3ac652bdef6be1d545928737a3090dbcfd1c3f SHA512 3e8ad23d2dbf9907c336b6b65e604c7baffc02e7ba8845fff578abc32044fb1cf6db48baf78b1b1943cff06ca9e078e189d9ac5b740994262cca0563675d8969
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-dracut/selinux-dracut-2.20220106-r1.ebuild b/sec-policy/selinux-dracut/selinux-dracut-2.20220106-r1.ebuild
index 7a97a74717f1..f8ace43cbbd8 100644
--- a/sec-policy/selinux-dracut/selinux-dracut-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-dracut/selinux-dracut-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dracut"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dracut/selinux-dracut-2.20220106-r2.ebuild b/sec-policy/selinux-dracut/selinux-dracut-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..7a97a74717f1
--- /dev/null
+++ b/sec-policy/selinux-dracut/selinux-dracut-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="dracut"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dracut"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-dropbox/Manifest b/sec-policy/selinux-dropbox/Manifest
index 51a2d7272c6d..d205e93634f3 100644
--- a/sec-policy/selinux-dropbox/Manifest
+++ b/sec-policy/selinux-dropbox/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-dropbox-2.20200818-r2.ebuild 427 BLAKE2B 2c25ec91a4c7cf7d0809f7ea47fb042ae472b3182837386d2ae4b8b0d6ec7f6bad3e3e04c21345bdc96f254a262190429a1014671e7fe184fc80eb5dfbb8d8c5 SHA512 7cefe024dbf249a39ac6b42f7786b8ad9ec1e5b19f840ea3f986e6b9ddf01ae0deb18d9a823164f5cf0ab1d2c9bc16fcb935512005f5c453486e1463b6c77cd3
 EBUILD selinux-dropbox-2.20210203-r1.ebuild 427 BLAKE2B 2c25ec91a4c7cf7d0809f7ea47fb042ae472b3182837386d2ae4b8b0d6ec7f6bad3e3e04c21345bdc96f254a262190429a1014671e7fe184fc80eb5dfbb8d8c5 SHA512 7cefe024dbf249a39ac6b42f7786b8ad9ec1e5b19f840ea3f986e6b9ddf01ae0deb18d9a823164f5cf0ab1d2c9bc16fcb935512005f5c453486e1463b6c77cd3
 EBUILD selinux-dropbox-2.20210908-r1.ebuild 427 BLAKE2B 2c25ec91a4c7cf7d0809f7ea47fb042ae472b3182837386d2ae4b8b0d6ec7f6bad3e3e04c21345bdc96f254a262190429a1014671e7fe184fc80eb5dfbb8d8c5 SHA512 7cefe024dbf249a39ac6b42f7786b8ad9ec1e5b19f840ea3f986e6b9ddf01ae0deb18d9a823164f5cf0ab1d2c9bc16fcb935512005f5c453486e1463b6c77cd3
-EBUILD selinux-dropbox-2.20220106-r1.ebuild 431 BLAKE2B 3e2bde3a808096957bb5e0416b625d111b1b50fd9599caa494d40889843b14e0ca80bff58aba87b4ae7076473f757984b5bbf5d5d5f9e3a95914496094474082 SHA512 8d48bc3e4d1b93df898b96cc03fa5032d13d4e0133328db43686e31d9e98c6a07b918132aecd8376419452a2bb2268bd826b680906b7916f2babd941dd22158f
+EBUILD selinux-dropbox-2.20220106-r1.ebuild 429 BLAKE2B 5e2ca2dea69379f013a084152a4ef1b44106eccc56466686bce715c483ff599b8588e5a8ab2d0f9a0259b9cc294dd3926c550db92d7478dda30f5724306a7ee9 SHA512 c12c1b22e06592ba6478460517c7356de34ffcb9f422bccf46984fceedb3fbc332b93ab3baa4aad9389c2102632d7814886426d0704878e183114d219c05b5fc
+EBUILD selinux-dropbox-2.20220106-r2.ebuild 431 BLAKE2B 3e2bde3a808096957bb5e0416b625d111b1b50fd9599caa494d40889843b14e0ca80bff58aba87b4ae7076473f757984b5bbf5d5d5f9e3a95914496094474082 SHA512 8d48bc3e4d1b93df898b96cc03fa5032d13d4e0133328db43686e31d9e98c6a07b918132aecd8376419452a2bb2268bd826b680906b7916f2babd941dd22158f
 EBUILD selinux-dropbox-9999.ebuild 431 BLAKE2B d56e0d129b7c8607393d39d94f3407d95fb09e5e7a79e2eedb450169afe577b39f562d399d7e1d81def3dd6ca17b2372ce80780b44bf294b30776b98d2a7ce8a SHA512 613b08938c1cb4dc601563a6ed531bfe712f9cc8af304e87fdb16b1ed03505be23149c783d6ebca11656af7a99edc0626731e1f9bbad9b274faf4545bd5e763c
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-dropbox/selinux-dropbox-2.20220106-r1.ebuild b/sec-policy/selinux-dropbox/selinux-dropbox-2.20220106-r1.ebuild
index a738257c36eb..bd652f82ce1a 100644
--- a/sec-policy/selinux-dropbox/selinux-dropbox-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-dropbox/selinux-dropbox-2.20220106-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dropbox"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-dropbox/selinux-dropbox-2.20220106-r2.ebuild b/sec-policy/selinux-dropbox/selinux-dropbox-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..a738257c36eb
--- /dev/null
+++ b/sec-policy/selinux-dropbox/selinux-dropbox-2.20220106-r2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="dropbox"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dropbox"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+	sec-policy/selinux-dbus
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-xserver
+	sec-policy/selinux-dbus
+"
diff --git a/sec-policy/selinux-entropyd/Manifest b/sec-policy/selinux-entropyd/Manifest
index d10026d54a58..9311e1583517 100644
--- a/sec-policy/selinux-entropyd/Manifest
+++ b/sec-policy/selinux-entropyd/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-entropyd-2.20200818-r2.ebuild 281 BLAKE2B 3f2a571b9749d45348b10d33f05f9e5da72654d746507ffa7f7d8cd2e9ea51f26f23db3e6e141acb1e3226f0be874afedc4caf58982e6238d317894405261b56 SHA512 34dfb5fb4c6c434621b5de3ccb37740445026a0928d779e2492e2e2aa4c1ac98edbc3688a51f9985da43bbbdba2f4d8772eded010c53ef2937ec0df27268f741
 EBUILD selinux-entropyd-2.20210203-r1.ebuild 281 BLAKE2B 3f2a571b9749d45348b10d33f05f9e5da72654d746507ffa7f7d8cd2e9ea51f26f23db3e6e141acb1e3226f0be874afedc4caf58982e6238d317894405261b56 SHA512 34dfb5fb4c6c434621b5de3ccb37740445026a0928d779e2492e2e2aa4c1ac98edbc3688a51f9985da43bbbdba2f4d8772eded010c53ef2937ec0df27268f741
 EBUILD selinux-entropyd-2.20210908-r1.ebuild 281 BLAKE2B 3f2a571b9749d45348b10d33f05f9e5da72654d746507ffa7f7d8cd2e9ea51f26f23db3e6e141acb1e3226f0be874afedc4caf58982e6238d317894405261b56 SHA512 34dfb5fb4c6c434621b5de3ccb37740445026a0928d779e2492e2e2aa4c1ac98edbc3688a51f9985da43bbbdba2f4d8772eded010c53ef2937ec0df27268f741
-EBUILD selinux-entropyd-2.20220106-r1.ebuild 285 BLAKE2B 280cfccea8213817bed430441ce9850f5cc298b258bca9feef8543276171d7173f4da56ed462fa91337905a94f8ad9d76733adba5ddc7158758dcc1d34ffaba3 SHA512 a9c81bc28568ead3ab01b37bf603e6a64d9fbf794bb02cbe80b329b3b8b12db8da544255e124e94f28d656f26cc7132ecd64ca1b9e0450b42dab43c340fb9323
+EBUILD selinux-entropyd-2.20220106-r1.ebuild 283 BLAKE2B abab713ea635c320db958683ee94895472a8dc6a452d99230a872a72babc368990e331bd84e09ec5ddb16fe9fcd2f9d5d9a8f4576948603848e30bc4c3c23fde SHA512 1e518338048ba46eba48e1fe5632354b9cd6cb438b5c04af5421c8b5f3410e4da2e0ff587f49d974c3818efbd53981436327a251c722cc10af34c0db95e34e2d
+EBUILD selinux-entropyd-2.20220106-r2.ebuild 285 BLAKE2B 280cfccea8213817bed430441ce9850f5cc298b258bca9feef8543276171d7173f4da56ed462fa91337905a94f8ad9d76733adba5ddc7158758dcc1d34ffaba3 SHA512 a9c81bc28568ead3ab01b37bf603e6a64d9fbf794bb02cbe80b329b3b8b12db8da544255e124e94f28d656f26cc7132ecd64ca1b9e0450b42dab43c340fb9323
 EBUILD selinux-entropyd-9999.ebuild 285 BLAKE2B 0d71055e853097de7f67edc5e9d125f831826359606160765af6b76e8b5a0abcdb200a5bd10ed0ca8c16a94893c62e859f85ed7243dbaa89ab935ed90ad96d61 SHA512 90b4717ed3f52dec7ff6864e6670b2630fd5ae14a0bc853de035983aea62e933d07c9d3ed969f73cde53f6f3370ffc61fc54c7268d697fd1937e14f57191fbec
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-entropyd/selinux-entropyd-2.20220106-r1.ebuild b/sec-policy/selinux-entropyd/selinux-entropyd-2.20220106-r1.ebuild
index d2fe8dd6f687..ecbf2cfb9ad1 100644
--- a/sec-policy/selinux-entropyd/selinux-entropyd-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-entropyd/selinux-entropyd-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for entropyd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-entropyd/selinux-entropyd-2.20220106-r2.ebuild b/sec-policy/selinux-entropyd/selinux-entropyd-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..d2fe8dd6f687
--- /dev/null
+++ b/sec-policy/selinux-entropyd/selinux-entropyd-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="entropyd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for entropyd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-evolution/Manifest b/sec-policy/selinux-evolution/Manifest
index 70d9f8557228..3e821a00f08b 100644
--- a/sec-policy/selinux-evolution/Manifest
+++ b/sec-policy/selinux-evolution/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-evolution-2.20200818-r2.ebuild 381 BLAKE2B 05f4e2834233acc1beedf2c5a6a23e6d08b5e670e544f021a17a8432f175ae2c5efc67c7ab8b69dada65d94934f99ae8dc1b227a129c3119464081dd21cb57c9 SHA512 967201b7e5ec8aa68999d252e9cd26fd667032bc5c3547cc423eae95093deb3c449af98d0acce8a5b98ed65dc021e81387ba1375f032eacb794be32ec87332ef
 EBUILD selinux-evolution-2.20210203-r1.ebuild 381 BLAKE2B 05f4e2834233acc1beedf2c5a6a23e6d08b5e670e544f021a17a8432f175ae2c5efc67c7ab8b69dada65d94934f99ae8dc1b227a129c3119464081dd21cb57c9 SHA512 967201b7e5ec8aa68999d252e9cd26fd667032bc5c3547cc423eae95093deb3c449af98d0acce8a5b98ed65dc021e81387ba1375f032eacb794be32ec87332ef
 EBUILD selinux-evolution-2.20210908-r1.ebuild 381 BLAKE2B 05f4e2834233acc1beedf2c5a6a23e6d08b5e670e544f021a17a8432f175ae2c5efc67c7ab8b69dada65d94934f99ae8dc1b227a129c3119464081dd21cb57c9 SHA512 967201b7e5ec8aa68999d252e9cd26fd667032bc5c3547cc423eae95093deb3c449af98d0acce8a5b98ed65dc021e81387ba1375f032eacb794be32ec87332ef
-EBUILD selinux-evolution-2.20220106-r1.ebuild 385 BLAKE2B c8b0266d7066aa69a1a9cde48290e41ae539e5b4d506d9cc57339335a5b6f6751ae9f45d974ed97c7094d77101b97fd7ae2fe59ae57e08d2a98a0cbec14367bf SHA512 75ecc3975a109fd75e4852d4797dc6ee45ab6ce7d4a9baa3fea4e6e4398fefe69dc15bc049549e808403defa8f93f324d680f648531976927a181b8f79b198a5
+EBUILD selinux-evolution-2.20220106-r1.ebuild 383 BLAKE2B 885ff8e456168b1f271a3d25a497fd008216876e5ae77ced3e8d9023ae099e183ba8259eb6f277ef5b1cbc50065e917c3d9d59a3da16727260fa35ca3b780b83 SHA512 48055358c3f19a79af703c834f634da835e1a6041c1de5fc668a42b1f9ecf4e107d69cd985cfe3748155d67540102828dec9c821577e2e8c54f134d41763a0b8
+EBUILD selinux-evolution-2.20220106-r2.ebuild 385 BLAKE2B c8b0266d7066aa69a1a9cde48290e41ae539e5b4d506d9cc57339335a5b6f6751ae9f45d974ed97c7094d77101b97fd7ae2fe59ae57e08d2a98a0cbec14367bf SHA512 75ecc3975a109fd75e4852d4797dc6ee45ab6ce7d4a9baa3fea4e6e4398fefe69dc15bc049549e808403defa8f93f324d680f648531976927a181b8f79b198a5
 EBUILD selinux-evolution-9999.ebuild 385 BLAKE2B 940aa5f59b72ea1d30f22272f11f89303e9fd8cf9832667feef6903a70f2bd3ddb21d3e1769cee31b1de6d86eb4cbfd60a5357816b59d3acb6b3a984cfe357f9 SHA512 7cd7abffecb9952b85d84750e76f68ee36f0ad3dc29ead498e22c67542b036efb85361e8b1eb8577d5703f16be0095f4faa8906ca4b34d7b5a9259324d62d879
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-evolution/selinux-evolution-2.20220106-r1.ebuild b/sec-policy/selinux-evolution/selinux-evolution-2.20220106-r1.ebuild
index 19208e0840ce..ebede1bbb2d8 100644
--- a/sec-policy/selinux-evolution/selinux-evolution-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-evolution/selinux-evolution-2.20220106-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for evolution"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-evolution/selinux-evolution-2.20220106-r2.ebuild b/sec-policy/selinux-evolution/selinux-evolution-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..19208e0840ce
--- /dev/null
+++ b/sec-policy/selinux-evolution/selinux-evolution-2.20220106-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="evolution"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for evolution"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-xserver
+"
diff --git a/sec-policy/selinux-exim/Manifest b/sec-policy/selinux-exim/Manifest
index ef85fdf92dba..bc1ca4a48293 100644
--- a/sec-policy/selinux-exim/Manifest
+++ b/sec-policy/selinux-exim/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-exim-2.20200818-r2.ebuild 273 BLAKE2B beae40a3e0462c379b75d959a4710be6475588987b14ad285cb1d8195fc07589dc1e13b4defdb977babff3db39b58863a21944f70c8ba105bf0435ffd40997ee SHA512 3416ccfe918a1f25da0c5b39e23a9562dd77adef7b1fd8c0b2b4f3548adedc50026e7940fbe335ec9b58d19e65fb87b9a465c5c2db2b09df5cb84df056c9dce8
 EBUILD selinux-exim-2.20210203-r1.ebuild 273 BLAKE2B beae40a3e0462c379b75d959a4710be6475588987b14ad285cb1d8195fc07589dc1e13b4defdb977babff3db39b58863a21944f70c8ba105bf0435ffd40997ee SHA512 3416ccfe918a1f25da0c5b39e23a9562dd77adef7b1fd8c0b2b4f3548adedc50026e7940fbe335ec9b58d19e65fb87b9a465c5c2db2b09df5cb84df056c9dce8
 EBUILD selinux-exim-2.20210908-r1.ebuild 273 BLAKE2B beae40a3e0462c379b75d959a4710be6475588987b14ad285cb1d8195fc07589dc1e13b4defdb977babff3db39b58863a21944f70c8ba105bf0435ffd40997ee SHA512 3416ccfe918a1f25da0c5b39e23a9562dd77adef7b1fd8c0b2b4f3548adedc50026e7940fbe335ec9b58d19e65fb87b9a465c5c2db2b09df5cb84df056c9dce8
-EBUILD selinux-exim-2.20220106-r1.ebuild 277 BLAKE2B e42ce0bbaa96727cc02890b45fc39bacd4895c38b0a084928f2d369b0335a9274b00810d468183b1e0ed089351f5b1cf239eb183e915e32abb0364514e79c819 SHA512 58385f7676fa3b398e67c7e7dcfd0513820ef42fd5cd59a279e9157265a8e11b7a5b96a54c8f97ebbebb1f2c4c9d0a7207ff535d82d58fe5ccdb4952b7012fd8
+EBUILD selinux-exim-2.20220106-r1.ebuild 275 BLAKE2B dced62a7e0eb4a667d28990bfae6903b165e1fde5cff45b26521bd37846bd0b1b403fefa7bace22c549ac39132ac099412c91a3d2a6e840b55dd8e88be13e126 SHA512 084ee9830166bd3dd512b3b00f20a7213867a816f741212af7f34eb6b8131ed4f25250d698c2c39554984cac98907b60b81013ca75ae2203ae33b13309377a32
+EBUILD selinux-exim-2.20220106-r2.ebuild 277 BLAKE2B e42ce0bbaa96727cc02890b45fc39bacd4895c38b0a084928f2d369b0335a9274b00810d468183b1e0ed089351f5b1cf239eb183e915e32abb0364514e79c819 SHA512 58385f7676fa3b398e67c7e7dcfd0513820ef42fd5cd59a279e9157265a8e11b7a5b96a54c8f97ebbebb1f2c4c9d0a7207ff535d82d58fe5ccdb4952b7012fd8
 EBUILD selinux-exim-9999.ebuild 277 BLAKE2B b3ab21165464c046d0fd18146d4613df068e0ee19964c47f03e4afe6ca090da9b5942faa56d999b026f7f4d6ba9904a7afe2f5b3277dd2a2c52ca05810fc8a52 SHA512 b79e7616c3feb5c91964ed71bc2a0e2cc4355e3c34aff9939fa6478546c258fcd64395594ed52c12f20e7a3e7aa860d16f5be68acf207d591d6e85ff4492a0c9
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-exim/selinux-exim-2.20220106-r1.ebuild b/sec-policy/selinux-exim/selinux-exim-2.20220106-r1.ebuild
index 95be5e49cddb..a97bec6d33ff 100644
--- a/sec-policy/selinux-exim/selinux-exim-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-exim/selinux-exim-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for exim"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-exim/selinux-exim-2.20220106-r2.ebuild b/sec-policy/selinux-exim/selinux-exim-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..95be5e49cddb
--- /dev/null
+++ b/sec-policy/selinux-exim/selinux-exim-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="exim"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for exim"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-fail2ban/Manifest b/sec-policy/selinux-fail2ban/Manifest
index b1248cdd93f6..ec3c46e89642 100644
--- a/sec-policy/selinux-fail2ban/Manifest
+++ b/sec-policy/selinux-fail2ban/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-fail2ban-2.20200818-r2.ebuild 281 BLAKE2B 4e62232904fa49c755f3c378bb5980372bb601e7e2126109434fc679fc052243ec8820651b05408973594c941646563fa3aa86b8e7d70dfad5d667a2e0636fca SHA512 48ac7feff5f6b460125f2137eb3e716a107f299d8d0cd19817141d76ca60421a0377d6b53748fbaf00f2313357d90e1c1622712f926817c1261c4f71b35dee95
 EBUILD selinux-fail2ban-2.20210203-r1.ebuild 281 BLAKE2B 4e62232904fa49c755f3c378bb5980372bb601e7e2126109434fc679fc052243ec8820651b05408973594c941646563fa3aa86b8e7d70dfad5d667a2e0636fca SHA512 48ac7feff5f6b460125f2137eb3e716a107f299d8d0cd19817141d76ca60421a0377d6b53748fbaf00f2313357d90e1c1622712f926817c1261c4f71b35dee95
 EBUILD selinux-fail2ban-2.20210908-r1.ebuild 281 BLAKE2B 4e62232904fa49c755f3c378bb5980372bb601e7e2126109434fc679fc052243ec8820651b05408973594c941646563fa3aa86b8e7d70dfad5d667a2e0636fca SHA512 48ac7feff5f6b460125f2137eb3e716a107f299d8d0cd19817141d76ca60421a0377d6b53748fbaf00f2313357d90e1c1622712f926817c1261c4f71b35dee95
-EBUILD selinux-fail2ban-2.20220106-r1.ebuild 285 BLAKE2B 643fbcb6513011ded372224858896248185f10311299f52fac091d18ee633c8c7ab5724584f6478e22d7be1b0507a5fb373767621660240a5666c46cb97ae591 SHA512 0e3601f5f9bea6b49c703a93a6df2ebd29170a0614f89f316d63b9e9e348e0af8247ba31ad7ee4021986b844ce287e1f9ed7a7162cc190abc30b2661e3d749b3
+EBUILD selinux-fail2ban-2.20220106-r1.ebuild 283 BLAKE2B eefd346801571bad4c7ec747652049cf769bba19937cd703500b24305bc700dfce2a1c9d8f8f6676ffc4bdfe09a582d8e88a2b997ac5b22301622b313ac4117f SHA512 0e749f002d71e67528b60a50521b2a7a396b102d80a63f07b0be0f22bf1cb458406499838ce055d8475d969e008d1079ca40ca65d73489d004f7b3fc1e705324
+EBUILD selinux-fail2ban-2.20220106-r2.ebuild 285 BLAKE2B 643fbcb6513011ded372224858896248185f10311299f52fac091d18ee633c8c7ab5724584f6478e22d7be1b0507a5fb373767621660240a5666c46cb97ae591 SHA512 0e3601f5f9bea6b49c703a93a6df2ebd29170a0614f89f316d63b9e9e348e0af8247ba31ad7ee4021986b844ce287e1f9ed7a7162cc190abc30b2661e3d749b3
 EBUILD selinux-fail2ban-9999.ebuild 285 BLAKE2B d602a7c1b010257a64fa599bc1fdaa84dbbe8d7fe17dacbf4b3fa478d9039d458e13a77b4a5e3e963ed6f489a3c2483a9838f70a95607d2d96de4d432ba86e3f SHA512 8be1bc014807c054bcf556f15ac897082125d7acc57d29125a8c6d0c3c541790c578c2ce05a970351c98001d04d2fbb0b60c6558b6cbb74b54f41485b85c2567
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20220106-r1.ebuild b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20220106-r1.ebuild
index 5138b9e7d428..3bfb8648632e 100644
--- a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for fail2ban"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20220106-r2.ebuild b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..5138b9e7d428
--- /dev/null
+++ b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="fail2ban"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for fail2ban"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-fetchmail/Manifest b/sec-policy/selinux-fetchmail/Manifest
index a65b92711550..e3eba38c71b3 100644
--- a/sec-policy/selinux-fetchmail/Manifest
+++ b/sec-policy/selinux-fetchmail/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-fetchmail-2.20200818-r2.ebuild 283 BLAKE2B 8594d9d2906377873d3fa737a146f08f20b779bf980a5af391b4320805d54f206bf9caec9c192d78e3ff44e21a739a6b8016225059b602b4bda09b8be9c4b825 SHA512 ecbe995ee7797b1351641e4e3e16f79f7c23e191e9bc1033244473805387c7eace3c9420645870900918f5b819686f6dd913b76bcc69af8708f3231c3895763c
 EBUILD selinux-fetchmail-2.20210203-r1.ebuild 283 BLAKE2B 8594d9d2906377873d3fa737a146f08f20b779bf980a5af391b4320805d54f206bf9caec9c192d78e3ff44e21a739a6b8016225059b602b4bda09b8be9c4b825 SHA512 ecbe995ee7797b1351641e4e3e16f79f7c23e191e9bc1033244473805387c7eace3c9420645870900918f5b819686f6dd913b76bcc69af8708f3231c3895763c
 EBUILD selinux-fetchmail-2.20210908-r1.ebuild 283 BLAKE2B 8594d9d2906377873d3fa737a146f08f20b779bf980a5af391b4320805d54f206bf9caec9c192d78e3ff44e21a739a6b8016225059b602b4bda09b8be9c4b825 SHA512 ecbe995ee7797b1351641e4e3e16f79f7c23e191e9bc1033244473805387c7eace3c9420645870900918f5b819686f6dd913b76bcc69af8708f3231c3895763c
-EBUILD selinux-fetchmail-2.20220106-r1.ebuild 287 BLAKE2B 0654ab6eef9781e884ddf97ed9e2b83c0601f431b27ab9cab50640ee39050fe31424bcb48f855ac6b987c729ebc3057f6addf924f9daae32c25152b3607d21a9 SHA512 f913c28f4703a808c747681215cd6a0e4617f811e6a0f49f04b7740688c989448d789ee55b663cda72fef97f7f0706ce7317331f6bf5ad78b8edcd8866165385
+EBUILD selinux-fetchmail-2.20220106-r1.ebuild 285 BLAKE2B 9aae3f6f5ed18f14a6b833de7b6ddcd97ea719e67c0b3aed3d61768de39123613c977e13faeac6a8bc9cf6d9ae757133bc8d530aeb1cfb3694af8281bd3e1dab SHA512 9c54759de6b75eb5caabf1d793f4b90277ba411c3a7909f485812906e37b92876f18ecd7ba364675c4588cf1611e63327832001b421a85e4ced33a1fd885e451
+EBUILD selinux-fetchmail-2.20220106-r2.ebuild 287 BLAKE2B 0654ab6eef9781e884ddf97ed9e2b83c0601f431b27ab9cab50640ee39050fe31424bcb48f855ac6b987c729ebc3057f6addf924f9daae32c25152b3607d21a9 SHA512 f913c28f4703a808c747681215cd6a0e4617f811e6a0f49f04b7740688c989448d789ee55b663cda72fef97f7f0706ce7317331f6bf5ad78b8edcd8866165385
 EBUILD selinux-fetchmail-9999.ebuild 287 BLAKE2B 82d41ab0ff12440dcf0d23952eaedca29ea2a0757b60dd4aa19576c2f1546ab3a40a52c5d5d09b7b1753c8d91301c43cc0c180f25c641be0db6f0c85f70c2e7a SHA512 c144d6b7e546f02eb51439e07984c01a0f8b8a469a416e77eb90253603ebca2371bfa5eacfa6154a6b4d2e48130c1aedff55e0f051b513f3ba1a8a996f641ee3
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20220106-r1.ebuild b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20220106-r1.ebuild
index 3e5aa783d27f..2c7ea0eb499c 100644
--- a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for fetchmail"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20220106-r2.ebuild b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..3e5aa783d27f
--- /dev/null
+++ b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="fetchmail"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for fetchmail"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-finger/Manifest b/sec-policy/selinux-finger/Manifest
index eea42534dda2..3398ca6bf2de 100644
--- a/sec-policy/selinux-finger/Manifest
+++ b/sec-policy/selinux-finger/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-finger-2.20200818-r2.ebuild 372 BLAKE2B a7f0e2e92c9a321dafc9ea86de951bf77ec55f4ae1ad71406bd7d01ba3007bce31b64b543ad8a9b03d43efb97300d6dcccba637bd89b558939ff1ac1b61d4153 SHA512 9637db2f00b8eb50647d8e826eb18e8cabf55dad444c372a3a72276c3f9f0c73a464a77d077813ee2da304c5ffce409bbd1ea3a691e134bf782f130d69ae6587
 EBUILD selinux-finger-2.20210203-r1.ebuild 372 BLAKE2B a7f0e2e92c9a321dafc9ea86de951bf77ec55f4ae1ad71406bd7d01ba3007bce31b64b543ad8a9b03d43efb97300d6dcccba637bd89b558939ff1ac1b61d4153 SHA512 9637db2f00b8eb50647d8e826eb18e8cabf55dad444c372a3a72276c3f9f0c73a464a77d077813ee2da304c5ffce409bbd1ea3a691e134bf782f130d69ae6587
 EBUILD selinux-finger-2.20210908-r1.ebuild 372 BLAKE2B a7f0e2e92c9a321dafc9ea86de951bf77ec55f4ae1ad71406bd7d01ba3007bce31b64b543ad8a9b03d43efb97300d6dcccba637bd89b558939ff1ac1b61d4153 SHA512 9637db2f00b8eb50647d8e826eb18e8cabf55dad444c372a3a72276c3f9f0c73a464a77d077813ee2da304c5ffce409bbd1ea3a691e134bf782f130d69ae6587
-EBUILD selinux-finger-2.20220106-r1.ebuild 376 BLAKE2B a0b76585aea5b0aa112497ec93b99478129c9fa7cf157304fab36f6166f8586a168bb866bebf96b98721a259d5c553a97684a423f72ff9f013a3f01f91f3b89c SHA512 aad90fc579f0e744254cefcb94d2beb14d7d567637312851c84ec6b5bed083ea6996e77983d84e2220c1437862f88a6dfa562029dd7d3e6bf13d39634c00a446
+EBUILD selinux-finger-2.20220106-r1.ebuild 374 BLAKE2B 4e4ce78b0da36c5f9de0206695d48219bd5cd56ca5129800fd6af7dd1b05b52210524d78529f45f259ff200a54d664b70eadd90acbd3a4b92cbcc379967f0f94 SHA512 e98e6d4d203cb3860dc2292f342fab02566a7b1b33d59a44a35b522e6eb4edc3d15c84bbe6c5d0b111f56535ff439ef15cbe8a8abd5e3ec5912fbb8e9487c2df
+EBUILD selinux-finger-2.20220106-r2.ebuild 376 BLAKE2B a0b76585aea5b0aa112497ec93b99478129c9fa7cf157304fab36f6166f8586a168bb866bebf96b98721a259d5c553a97684a423f72ff9f013a3f01f91f3b89c SHA512 aad90fc579f0e744254cefcb94d2beb14d7d567637312851c84ec6b5bed083ea6996e77983d84e2220c1437862f88a6dfa562029dd7d3e6bf13d39634c00a446
 EBUILD selinux-finger-9999.ebuild 376 BLAKE2B 65aca9199ba3dd34403786efe493d31c6e4c5675a7a6ca3686b2faa9da75e80f33afef24f8be3800ff9a9985171b594fdd70270c8dc964e91421c54cc1562106 SHA512 d3b955176c1ac2d75d521fcf6d4f6d5097b3679fad012190ad7f68f2f7e2e4008b839d4d3e4eaa09221b884f77602c5a6104e107be5f8d7655e7bcd14b4e7154
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-finger/selinux-finger-2.20220106-r1.ebuild b/sec-policy/selinux-finger/selinux-finger-2.20220106-r1.ebuild
index 3020b65de3a5..00f36f129736 100644
--- a/sec-policy/selinux-finger/selinux-finger-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-finger/selinux-finger-2.20220106-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for finger"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-finger/selinux-finger-2.20220106-r2.ebuild b/sec-policy/selinux-finger/selinux-finger-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..3020b65de3a5
--- /dev/null
+++ b/sec-policy/selinux-finger/selinux-finger-2.20220106-r2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="finger"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for finger"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+
+DEPEND="${DEPEND}
+	sec-policy/selinux-inetd
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-inetd
+"
diff --git a/sec-policy/selinux-flash/Manifest b/sec-policy/selinux-flash/Manifest
index fb956a59c0ec..67d079b0b182 100644
--- a/sec-policy/selinux-flash/Manifest
+++ b/sec-policy/selinux-flash/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-flash-2.20200818-r2.ebuild 275 BLAKE2B 3805ec6f44dffdb8d75d9441e9bbef0463da1e2ad1608b5e5514e496b6919384a358836c4227faf6c8e6868c4ff63d67e80ee3d51639fc5034ae38e339c9f667 SHA512 bca3a06802318636988d2052f9eae3b4f5b7dcfde2999d27c15ac3d4a7cc1a8258de5fbc5eaf913aa38cd261b999cee6adc54d7e21e02a1bf70b2db8162d887b
 EBUILD selinux-flash-2.20210203-r1.ebuild 275 BLAKE2B 3805ec6f44dffdb8d75d9441e9bbef0463da1e2ad1608b5e5514e496b6919384a358836c4227faf6c8e6868c4ff63d67e80ee3d51639fc5034ae38e339c9f667 SHA512 bca3a06802318636988d2052f9eae3b4f5b7dcfde2999d27c15ac3d4a7cc1a8258de5fbc5eaf913aa38cd261b999cee6adc54d7e21e02a1bf70b2db8162d887b
 EBUILD selinux-flash-2.20210908-r1.ebuild 275 BLAKE2B 3805ec6f44dffdb8d75d9441e9bbef0463da1e2ad1608b5e5514e496b6919384a358836c4227faf6c8e6868c4ff63d67e80ee3d51639fc5034ae38e339c9f667 SHA512 bca3a06802318636988d2052f9eae3b4f5b7dcfde2999d27c15ac3d4a7cc1a8258de5fbc5eaf913aa38cd261b999cee6adc54d7e21e02a1bf70b2db8162d887b
-EBUILD selinux-flash-2.20220106-r1.ebuild 279 BLAKE2B c5d0589b74d189327b4cefa66d2d589ecb83d9d55006406f8490b7f64aa491d5fc3ec399514606c7adee32ad26777913404daa0f43b30f375b8f7a637d97cb55 SHA512 5350a3d5a61f26e9aec18c6046b47b458cad17402b7d84a9c4e8abeda65b402c5388ccf811121edb385d553432b3133a102c571827441ba8c4a3318a712feead
+EBUILD selinux-flash-2.20220106-r1.ebuild 277 BLAKE2B 081697c62988cc1e9a8046a99a2aabc726c202fd0cddb6ce81b470ee4ba22da2fd6ffd691e75a3db10f547893c673a5a90e8172bd2330477b8b40760502aa469 SHA512 9a59625cc93b3efc1a1f2b9b00bee3bfd19a54feb192e3450560f8539fd08df7183e6a9b5d75a1725aa291daf2154b4b9dc1cd1a20a7f5067976f80e50d2d128
+EBUILD selinux-flash-2.20220106-r2.ebuild 279 BLAKE2B c5d0589b74d189327b4cefa66d2d589ecb83d9d55006406f8490b7f64aa491d5fc3ec399514606c7adee32ad26777913404daa0f43b30f375b8f7a637d97cb55 SHA512 5350a3d5a61f26e9aec18c6046b47b458cad17402b7d84a9c4e8abeda65b402c5388ccf811121edb385d553432b3133a102c571827441ba8c4a3318a712feead
 EBUILD selinux-flash-9999.ebuild 279 BLAKE2B 7b85b5979c007f316e89ce8c623e3f16b29703851c93f863563202bdd459609a8a2180204d506b39a79cdd61bfa5d117cc7822ae653975f7e62e0f740ed8d5bc SHA512 413416f879c8d3360feaec41efffaf3503290bd586a25db635ca3d484454187fc4c980b7db23e74c6db1dbeeb42f0edbbca2ceab42bd7a6e04dddb859ba509c7
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-flash/selinux-flash-2.20220106-r1.ebuild b/sec-policy/selinux-flash/selinux-flash-2.20220106-r1.ebuild
index 1909c9fbdfd5..3305bb313490 100644
--- a/sec-policy/selinux-flash/selinux-flash-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-flash/selinux-flash-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for flash"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-flash/selinux-flash-2.20220106-r2.ebuild b/sec-policy/selinux-flash/selinux-flash-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..1909c9fbdfd5
--- /dev/null
+++ b/sec-policy/selinux-flash/selinux-flash-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="flash"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for flash"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-fprintd/Manifest b/sec-policy/selinux-fprintd/Manifest
index 6e18fc194474..bcd77d49eacd 100644
--- a/sec-policy/selinux-fprintd/Manifest
+++ b/sec-policy/selinux-fprintd/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-fprintd-2.20200818-r2.ebuild 371 BLAKE2B 41b448d997079fd275135095fa94c9f34ff040ccea5251b71f89acb8a450f7a585eb28cb34a0f68fd4ada7c35c8367c612e62d5d7e347660b8ff86e95be9ec60 SHA512 e86f82db84fd34bb2858005ff3c83ac7d63bbcde1170f04a4abed7c1cb280e550ab0cb16b11cf588f4eba79972a3ab1e631c6a7358981c92f06f9461960dceaa
 EBUILD selinux-fprintd-2.20210203-r1.ebuild 371 BLAKE2B 41b448d997079fd275135095fa94c9f34ff040ccea5251b71f89acb8a450f7a585eb28cb34a0f68fd4ada7c35c8367c612e62d5d7e347660b8ff86e95be9ec60 SHA512 e86f82db84fd34bb2858005ff3c83ac7d63bbcde1170f04a4abed7c1cb280e550ab0cb16b11cf588f4eba79972a3ab1e631c6a7358981c92f06f9461960dceaa
 EBUILD selinux-fprintd-2.20210908-r1.ebuild 371 BLAKE2B 41b448d997079fd275135095fa94c9f34ff040ccea5251b71f89acb8a450f7a585eb28cb34a0f68fd4ada7c35c8367c612e62d5d7e347660b8ff86e95be9ec60 SHA512 e86f82db84fd34bb2858005ff3c83ac7d63bbcde1170f04a4abed7c1cb280e550ab0cb16b11cf588f4eba79972a3ab1e631c6a7358981c92f06f9461960dceaa
-EBUILD selinux-fprintd-2.20220106-r1.ebuild 375 BLAKE2B 6a073140d006f035aba5c16085e416d9d8875c96423686420e0f11c7f8ff463f99d2d997790d8418f62b7a6b7f71c18de6693dabda983270d5a69cb017162a91 SHA512 fbb82de2d3d9dfc4c2ff77398398bb73b9cb52aab3cdb82ef3321b0ecbcb76d330b3d3f80622de642010f800f353069d41422a7bcbd384b551e5346998ba1b97
+EBUILD selinux-fprintd-2.20220106-r1.ebuild 373 BLAKE2B 3ff4d49a52b33cf5b0cfbea10cbad125efeb148d567323eace15ad57c9ea3cfe44d9af8eb465a828445d0abd5543d7b5ad7270af2935f2d5c48c66202f283e5c SHA512 316714f184672d038c932d8c1a0e849ebec0d2a128ae9c8d36060c379698cf6006b331eef9d38f2110e58fbaeaa482afde3e95a681a653a51770dc6e68a25347
+EBUILD selinux-fprintd-2.20220106-r2.ebuild 375 BLAKE2B 6a073140d006f035aba5c16085e416d9d8875c96423686420e0f11c7f8ff463f99d2d997790d8418f62b7a6b7f71c18de6693dabda983270d5a69cb017162a91 SHA512 fbb82de2d3d9dfc4c2ff77398398bb73b9cb52aab3cdb82ef3321b0ecbcb76d330b3d3f80622de642010f800f353069d41422a7bcbd384b551e5346998ba1b97
 EBUILD selinux-fprintd-9999.ebuild 375 BLAKE2B f8e7bd897516f6b8125718897b5e1eeb1633047af154c78829895a8f624501591737138957d5783e4de1441e6cf5fb28e03ded50b5d93ec298faeb4af46b619a SHA512 0a0e1d6f860f73f73dca9bd3cfa7c32cf1d70916bc624bb2bd859f8037f0415daf1a931d51394ea62bd27701571b3ccc3120a3a89c1312d531dcbce3dec3a517
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-fprintd/selinux-fprintd-2.20220106-r1.ebuild b/sec-policy/selinux-fprintd/selinux-fprintd-2.20220106-r1.ebuild
index b208484e34c0..ba37d5ae8d36 100644
--- a/sec-policy/selinux-fprintd/selinux-fprintd-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-fprintd/selinux-fprintd-2.20220106-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for fprintd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-dbus
diff --git a/sec-policy/selinux-fprintd/selinux-fprintd-2.20220106-r2.ebuild b/sec-policy/selinux-fprintd/selinux-fprintd-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..b208484e34c0
--- /dev/null
+++ b/sec-policy/selinux-fprintd/selinux-fprintd-2.20220106-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="fprintd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for fprintd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-dbus
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-dbus
+"
diff --git a/sec-policy/selinux-ftp/Manifest b/sec-policy/selinux-ftp/Manifest
index c4f810f88cac..0d2c0086b075 100644
--- a/sec-policy/selinux-ftp/Manifest
+++ b/sec-policy/selinux-ftp/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-ftp-2.20200818-r2.ebuild 271 BLAKE2B 8adb4055677d4ad3679faa709e13e9729d0e6df4694eb088da969bc1370f4d92474b552ad4a2ca05434d1ab84829b7d3c8a62723f87a7e9124b7af06ae723807 SHA512 ef74c3e76d2c2695ea1e4804a95c03112a1833c6c1b448e3730e18d6a541b0cfe8c7b2e011aad4513e3d493ccfedfa615098c13aa505ac15d6cb5158fed0abce
 EBUILD selinux-ftp-2.20210203-r1.ebuild 271 BLAKE2B 8adb4055677d4ad3679faa709e13e9729d0e6df4694eb088da969bc1370f4d92474b552ad4a2ca05434d1ab84829b7d3c8a62723f87a7e9124b7af06ae723807 SHA512 ef74c3e76d2c2695ea1e4804a95c03112a1833c6c1b448e3730e18d6a541b0cfe8c7b2e011aad4513e3d493ccfedfa615098c13aa505ac15d6cb5158fed0abce
 EBUILD selinux-ftp-2.20210908-r1.ebuild 271 BLAKE2B 8adb4055677d4ad3679faa709e13e9729d0e6df4694eb088da969bc1370f4d92474b552ad4a2ca05434d1ab84829b7d3c8a62723f87a7e9124b7af06ae723807 SHA512 ef74c3e76d2c2695ea1e4804a95c03112a1833c6c1b448e3730e18d6a541b0cfe8c7b2e011aad4513e3d493ccfedfa615098c13aa505ac15d6cb5158fed0abce
-EBUILD selinux-ftp-2.20220106-r1.ebuild 275 BLAKE2B 9815adbbc32de9928734ba904296082c93d341b715c7c50cf601fa6453526e002a324defa9aa87e9f08ec8be7fae8bc22aae548a690cb72ab67563cb97642432 SHA512 090328a9d7f37f2ceb40a881ef2d5b4dc53fa9c0b6cea229aca85fed0303ab5122395a4d9af83d88c9d839f8d22f510c21e487d54754b8887d588fca4c9608a5
+EBUILD selinux-ftp-2.20220106-r1.ebuild 273 BLAKE2B 8f1873ffb20979529e6feb513cf624896a4dd62bc525b0511016d24ee82760497cbd0161059d8d86074f35f30403ed534b239e59dbae1b8cafff97dff4e18fa6 SHA512 e8c18e18427ad9b2008744e2a4427cec62f8d6877bee5da8e6782e54ed79f2f833534300774f3c322f6a47cbe1802c0e2a7cca88ec335121b1ff47c4814e4558
+EBUILD selinux-ftp-2.20220106-r2.ebuild 275 BLAKE2B 9815adbbc32de9928734ba904296082c93d341b715c7c50cf601fa6453526e002a324defa9aa87e9f08ec8be7fae8bc22aae548a690cb72ab67563cb97642432 SHA512 090328a9d7f37f2ceb40a881ef2d5b4dc53fa9c0b6cea229aca85fed0303ab5122395a4d9af83d88c9d839f8d22f510c21e487d54754b8887d588fca4c9608a5
 EBUILD selinux-ftp-9999.ebuild 275 BLAKE2B 5c237b104a77de81aa89b1666551e8fecd3bd35749b540622d4f9e1859d1c59dee402aeb5ea550308903b71b466d1bb4dfb17d289eb5795e6d9b058cc39028cb SHA512 ef082abe3a637e408f94f564a62c3b137fd4e6a934f7c95092175276afaeb65cf775b8b0688185eae9be2514a1c43c9f2fa86b5b32a2d5010ad73f14c31c3375
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-ftp/selinux-ftp-2.20220106-r1.ebuild b/sec-policy/selinux-ftp/selinux-ftp-2.20220106-r1.ebuild
index f2062624d95a..4deb8146ef25 100644
--- a/sec-policy/selinux-ftp/selinux-ftp-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-ftp/selinux-ftp-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ftp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ftp/selinux-ftp-2.20220106-r2.ebuild b/sec-policy/selinux-ftp/selinux-ftp-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..f2062624d95a
--- /dev/null
+++ b/sec-policy/selinux-ftp/selinux-ftp-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="ftp"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ftp"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-games/Manifest b/sec-policy/selinux-games/Manifest
index 717290e849f6..23bde907fe81 100644
--- a/sec-policy/selinux-games/Manifest
+++ b/sec-policy/selinux-games/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-games-2.20200818-r2.ebuild 275 BLAKE2B 6d6ae80a903f46400d240acae57855790306a854e469422052034a618184d82a603d113aa17d7630d51f07f7101a407212e4acc7ad279062451a93005b4e72dc SHA512 8a6da060f1ef11241410bca116b28a0d6c16156fb537f4920e58309c248099035259e4b8f06677d000d564bf1b1b5c9b46a22e046adb013b0d7ea90f3d69662b
 EBUILD selinux-games-2.20210203-r1.ebuild 275 BLAKE2B 6d6ae80a903f46400d240acae57855790306a854e469422052034a618184d82a603d113aa17d7630d51f07f7101a407212e4acc7ad279062451a93005b4e72dc SHA512 8a6da060f1ef11241410bca116b28a0d6c16156fb537f4920e58309c248099035259e4b8f06677d000d564bf1b1b5c9b46a22e046adb013b0d7ea90f3d69662b
 EBUILD selinux-games-2.20210908-r1.ebuild 275 BLAKE2B 6d6ae80a903f46400d240acae57855790306a854e469422052034a618184d82a603d113aa17d7630d51f07f7101a407212e4acc7ad279062451a93005b4e72dc SHA512 8a6da060f1ef11241410bca116b28a0d6c16156fb537f4920e58309c248099035259e4b8f06677d000d564bf1b1b5c9b46a22e046adb013b0d7ea90f3d69662b
-EBUILD selinux-games-2.20220106-r1.ebuild 279 BLAKE2B 35c5edcd750ae1a39a5c8e345f1e71448c81fc32f3192f52d5522f4d44d2a2540d66492583a56958caf9ace5c1f7a95af07c671191ef4847cb567fec0a726553 SHA512 4db7c958131a3ed4160dbf69da73899d644c669dddb7a2539c8d6641535ce0a3266f67ff3554a9323435dc13927ce802bce4ee472925251e13d47e0596a2e75f
+EBUILD selinux-games-2.20220106-r1.ebuild 277 BLAKE2B 61a123ef73e6bb0f8c13e6e01a4045ca9962ea7d312bfb1f7f0cbe86a5029e807862c62be5cc27109ea1b2bc230a92a649bc185ff15e4b62e11bd88302282260 SHA512 196878453c99b69c63e0e0e3e6258ec392675ef8674ec2ed81af34a8a3c692065575bb97e6084b231015c92362a56eb2daa9e9105af9c25b09ad3779ca0cd926
+EBUILD selinux-games-2.20220106-r2.ebuild 279 BLAKE2B 35c5edcd750ae1a39a5c8e345f1e71448c81fc32f3192f52d5522f4d44d2a2540d66492583a56958caf9ace5c1f7a95af07c671191ef4847cb567fec0a726553 SHA512 4db7c958131a3ed4160dbf69da73899d644c669dddb7a2539c8d6641535ce0a3266f67ff3554a9323435dc13927ce802bce4ee472925251e13d47e0596a2e75f
 EBUILD selinux-games-9999.ebuild 279 BLAKE2B e251df82ab36eaaf226a492e02d137b675b602c60185f013b4de495ebfb4c1186c03ab606ce01d10cbda883dcf016c70aff52e6ca67b77a59eb8a3a363071fd2 SHA512 3f59b1057ce990f3420347bdfd0c44d9ed0f06c0ca69d3fe8700d57bd3cee51ddb8536659c07208d06bf978828b224a1b2feead17d445b898818509377c7eb9d
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-games/selinux-games-2.20220106-r1.ebuild b/sec-policy/selinux-games/selinux-games-2.20220106-r1.ebuild
index 660fce2c206c..a4f51ec4c7a1 100644
--- a/sec-policy/selinux-games/selinux-games-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-games/selinux-games-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for games"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-games/selinux-games-2.20220106-r2.ebuild b/sec-policy/selinux-games/selinux-games-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..660fce2c206c
--- /dev/null
+++ b/sec-policy/selinux-games/selinux-games-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="games"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for games"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-gatekeeper/Manifest b/sec-policy/selinux-gatekeeper/Manifest
index 8c1c9a5ab114..2c8a7dee9de9 100644
--- a/sec-policy/selinux-gatekeeper/Manifest
+++ b/sec-policy/selinux-gatekeeper/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-gatekeeper-2.20200818-r2.ebuild 285 BLAKE2B 8253d9efd95be524322a6e097c65b2a39c75a94e665532d1c957c6fbb2458093881ea0b5507f1d8b6836e047d5d2dd59cf782f16f659e7c452a2b62a13b2945f SHA512 b1ffc993a0d808a99b8a7f6d45b10deeb8a46e6c1f75505a09a46a110587a5455e01090ab823b9472082d05410b5ced22d4692b6dae45ef8fcc0a5c459cab296
 EBUILD selinux-gatekeeper-2.20210203-r1.ebuild 285 BLAKE2B 8253d9efd95be524322a6e097c65b2a39c75a94e665532d1c957c6fbb2458093881ea0b5507f1d8b6836e047d5d2dd59cf782f16f659e7c452a2b62a13b2945f SHA512 b1ffc993a0d808a99b8a7f6d45b10deeb8a46e6c1f75505a09a46a110587a5455e01090ab823b9472082d05410b5ced22d4692b6dae45ef8fcc0a5c459cab296
 EBUILD selinux-gatekeeper-2.20210908-r1.ebuild 285 BLAKE2B 8253d9efd95be524322a6e097c65b2a39c75a94e665532d1c957c6fbb2458093881ea0b5507f1d8b6836e047d5d2dd59cf782f16f659e7c452a2b62a13b2945f SHA512 b1ffc993a0d808a99b8a7f6d45b10deeb8a46e6c1f75505a09a46a110587a5455e01090ab823b9472082d05410b5ced22d4692b6dae45ef8fcc0a5c459cab296
-EBUILD selinux-gatekeeper-2.20220106-r1.ebuild 289 BLAKE2B 2b98949f0ff86f7da9cf9faf8243cebe830a8c4b7b0e0019fa2b111d87671f4d0d0e952fe04d2472e4859da98b6b45606c1041599a86f76d4b67b07a8dc9dd2f SHA512 d39f2e1c4cd8bbb8c5411a48d972c831059e9988939a641a97ac4cd5a06f48f865d860b42ad0c370f2dd9a115d28b5036f35d75907905d63ca33cedce966c386
+EBUILD selinux-gatekeeper-2.20220106-r1.ebuild 287 BLAKE2B cb66dde8773781827b6615d26f0a90cd044ca60d714ca1027c1280dff79fa61fda80052786d59397e2c144cd826696e18f0781ad36fc1759842ca1a4971483b1 SHA512 3d038efc6586c59f12483770fce99f501249f752d72c98a8633f39f09eef23aa5d0f9b10adea7f9364cc5f81455fad00578e5d6053ca96815eaa23a749f55561
+EBUILD selinux-gatekeeper-2.20220106-r2.ebuild 289 BLAKE2B 2b98949f0ff86f7da9cf9faf8243cebe830a8c4b7b0e0019fa2b111d87671f4d0d0e952fe04d2472e4859da98b6b45606c1041599a86f76d4b67b07a8dc9dd2f SHA512 d39f2e1c4cd8bbb8c5411a48d972c831059e9988939a641a97ac4cd5a06f48f865d860b42ad0c370f2dd9a115d28b5036f35d75907905d63ca33cedce966c386
 EBUILD selinux-gatekeeper-9999.ebuild 289 BLAKE2B b2c006dcd3438e98e4f3ae077fb17ce72ea1d1b5f1297e93fee3083f6c8a4efce37d6aed9e518cec2a177419fbacf2ed25a3e8ab3004e2190a3884c3c175da9f SHA512 16f070ccbe1f916acde8d8161683d0cdf3129b5366d5d6fe9d10fa9b25e0a1440268e7ad4fa1ae27f1c5495a85507b8ec30241e734751b57088dc79e30c3973b
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20220106-r1.ebuild b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20220106-r1.ebuild
index 6d6e9da8a3b3..5fcb49333997 100644
--- a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gatekeeper"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20220106-r2.ebuild b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..6d6e9da8a3b3
--- /dev/null
+++ b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="gatekeeper"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gatekeeper"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-git/Manifest b/sec-policy/selinux-git/Manifest
index 284926cfdd50..1588c779ddb2 100644
--- a/sec-policy/selinux-git/Manifest
+++ b/sec-policy/selinux-git/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-git-2.20200818-r2.ebuild 367 BLAKE2B a239580795153bb40972ad944bd1b9616d1ac6f8c2b0beeb9d71bba744cbb38aafdfade24f2526fe2b830aa5a07c7a850198a6b91d88b6d80e4af12379067398 SHA512 cdbb9508c735c34b8dc734ab4f26c2ac06f15e01f59f1318ace8e9555ae268813bd6661db7666192f121bad95684e09208bf3620849d2313eb2242105adc3723
 EBUILD selinux-git-2.20210203-r1.ebuild 367 BLAKE2B a239580795153bb40972ad944bd1b9616d1ac6f8c2b0beeb9d71bba744cbb38aafdfade24f2526fe2b830aa5a07c7a850198a6b91d88b6d80e4af12379067398 SHA512 cdbb9508c735c34b8dc734ab4f26c2ac06f15e01f59f1318ace8e9555ae268813bd6661db7666192f121bad95684e09208bf3620849d2313eb2242105adc3723
 EBUILD selinux-git-2.20210908-r1.ebuild 367 BLAKE2B a239580795153bb40972ad944bd1b9616d1ac6f8c2b0beeb9d71bba744cbb38aafdfade24f2526fe2b830aa5a07c7a850198a6b91d88b6d80e4af12379067398 SHA512 cdbb9508c735c34b8dc734ab4f26c2ac06f15e01f59f1318ace8e9555ae268813bd6661db7666192f121bad95684e09208bf3620849d2313eb2242105adc3723
-EBUILD selinux-git-2.20220106-r1.ebuild 371 BLAKE2B 59fc1d7956bd81ddab42983de5a9c94b473ffb06ada12928652ef7167e8116547b248dbbcd5e062815ef146cebf890c8eb7a17ae8d4950606e649202a0961ce5 SHA512 207809c4729f4bbc932d7a4e0c581bf55be3afa3260943b99642ccf7bb3cca2037b01874e40e35a0e73a454f212f5832c02c51c9b7a06c1c6c8b08483ab1c68f
+EBUILD selinux-git-2.20220106-r1.ebuild 369 BLAKE2B daa85bcbab9e4a7920a1b0503248199f8687d342e218248ca6e217269777e9349deae2ba51af1a52f6a5e43b073284dfef1252760c38804218036c1bece0031d SHA512 16db0ce0a85c35d207e180331fb5ba4c8e32efe22e171b413646f9776177c1a42b5c21ae9b37241c69d6e7cac218eb4f8a97e8f3d3879545772d845fc1ce03ad
+EBUILD selinux-git-2.20220106-r2.ebuild 371 BLAKE2B 59fc1d7956bd81ddab42983de5a9c94b473ffb06ada12928652ef7167e8116547b248dbbcd5e062815ef146cebf890c8eb7a17ae8d4950606e649202a0961ce5 SHA512 207809c4729f4bbc932d7a4e0c581bf55be3afa3260943b99642ccf7bb3cca2037b01874e40e35a0e73a454f212f5832c02c51c9b7a06c1c6c8b08483ab1c68f
 EBUILD selinux-git-9999.ebuild 371 BLAKE2B 351c9587105c1c137db1025dc4123ba11415f54584dcb5e665187244ca5ef27b31785028d1d7624195b72230c4aeb01addaf5e97262370d21b498f4a3139f6b4 SHA512 48b98b527021ac1a50ebadedf4150a6be6d41cbe1b97a633ed9d733a3d6d741e37fdbfd3b1b84e3388cafaaaed071d6c6137e24ab2f4adb51f7eecc33bd94729
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-git/selinux-git-2.20220106-r1.ebuild b/sec-policy/selinux-git/selinux-git-2.20220106-r1.ebuild
index 34684274be7a..f660b4590faa 100644
--- a/sec-policy/selinux-git/selinux-git-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-git/selinux-git-2.20220106-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for git"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-git/selinux-git-2.20220106-r2.ebuild b/sec-policy/selinux-git/selinux-git-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..34684274be7a
--- /dev/null
+++ b/sec-policy/selinux-git/selinux-git-2.20220106-r2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="git"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for git"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-gitosis/Manifest b/sec-policy/selinux-gitosis/Manifest
index 672473e5a679..632a6a7d86aa 100644
--- a/sec-policy/selinux-gitosis/Manifest
+++ b/sec-policy/selinux-gitosis/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-gitosis-2.20200818-r2.ebuild 279 BLAKE2B 1f07bc56e2e7c26a7a61f36816470440af61b23ac5a53a1920cbdf6d09ba6c844e149bfa7cc08a724ec0cf9ae6d747f871c6d4d83e9bc7ab83103ae6de941d53 SHA512 0f519d1b47e09bbbc389212627f2ed8d2bad5faa5856debde116d468567287d83ce2ba0f8e72ae02696af6c598add3dc47276f657fe1c33c82d162558e51212e
 EBUILD selinux-gitosis-2.20210203-r1.ebuild 279 BLAKE2B 1f07bc56e2e7c26a7a61f36816470440af61b23ac5a53a1920cbdf6d09ba6c844e149bfa7cc08a724ec0cf9ae6d747f871c6d4d83e9bc7ab83103ae6de941d53 SHA512 0f519d1b47e09bbbc389212627f2ed8d2bad5faa5856debde116d468567287d83ce2ba0f8e72ae02696af6c598add3dc47276f657fe1c33c82d162558e51212e
 EBUILD selinux-gitosis-2.20210908-r1.ebuild 279 BLAKE2B 1f07bc56e2e7c26a7a61f36816470440af61b23ac5a53a1920cbdf6d09ba6c844e149bfa7cc08a724ec0cf9ae6d747f871c6d4d83e9bc7ab83103ae6de941d53 SHA512 0f519d1b47e09bbbc389212627f2ed8d2bad5faa5856debde116d468567287d83ce2ba0f8e72ae02696af6c598add3dc47276f657fe1c33c82d162558e51212e
-EBUILD selinux-gitosis-2.20220106-r1.ebuild 283 BLAKE2B 6d668d0fef72a8e624328fadd268402c4282a436a087187fb207e00c57ae460fb47c84f8c0d608da50cf773806840fac6c20929f33033e5cace317d1b8474038 SHA512 dc725b77684379443cbaf8b6bdfa433717be772a47e3d5615e2465a7137ca7450548fe488fe7b7d72e7ae4b9d3854936cdb6a5b3fed8cc307b2e91c78a2aef22
+EBUILD selinux-gitosis-2.20220106-r1.ebuild 281 BLAKE2B 6239fdaa40b99d9760811a5af55a538c3ef4648cdba2fcb6f831b88b6f6ee3e067bbcb420ec3d1cca79b3175c17e12158715566d08d0d6fe375800093b209fcb SHA512 0c3ef4215b86ae93a9ed7c45173321a8f64aec8e81f76f5edf0d2fc3d8bb07188a06329ef3483c45adeec20233fc09731535e204f11808a6fdbba70f8c1ae0c2
+EBUILD selinux-gitosis-2.20220106-r2.ebuild 283 BLAKE2B 6d668d0fef72a8e624328fadd268402c4282a436a087187fb207e00c57ae460fb47c84f8c0d608da50cf773806840fac6c20929f33033e5cace317d1b8474038 SHA512 dc725b77684379443cbaf8b6bdfa433717be772a47e3d5615e2465a7137ca7450548fe488fe7b7d72e7ae4b9d3854936cdb6a5b3fed8cc307b2e91c78a2aef22
 EBUILD selinux-gitosis-9999.ebuild 283 BLAKE2B 9246044c844dc056ebb4cfe5617369154ead958a9abf017cb1e96c2a8b6737de9e5f71670973d55a6c8109a6fcabc2db67186450a70c71f81cf6674e98228ac2 SHA512 601ea22a5e86aff0deeee3ad5bb45affef12844107229d06d4da0ea34e3c6d6ca6da759a16cb2733b2fe2f4de9858805909843ea5ebd072df728cf4d085c5e10
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-gitosis/selinux-gitosis-2.20220106-r1.ebuild b/sec-policy/selinux-gitosis/selinux-gitosis-2.20220106-r1.ebuild
index e51a6ef3731c..123c8e64b9fb 100644
--- a/sec-policy/selinux-gitosis/selinux-gitosis-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-gitosis/selinux-gitosis-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gitosis"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-gitosis/selinux-gitosis-2.20220106-r2.ebuild b/sec-policy/selinux-gitosis/selinux-gitosis-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..e51a6ef3731c
--- /dev/null
+++ b/sec-policy/selinux-gitosis/selinux-gitosis-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="gitosis"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gitosis"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-gnome/Manifest b/sec-policy/selinux-gnome/Manifest
index cc1c99361501..a220666271e8 100644
--- a/sec-policy/selinux-gnome/Manifest
+++ b/sec-policy/selinux-gnome/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-gnome-2.20200818-r2.ebuild 275 BLAKE2B 02d748d373cb01914f6c3da0ad53667e5b260f5f4e1ef42d60d6406f612363279b420671a909467152e248ee2519e43585b80b0de31da64bee7e900f49a6ae39 SHA512 3b8c357d1209fccfc14ea7a4ffa69177a15a0f3845fbf497ab3771c11ada65b5ae9e87b5973915be5a1d850705f0dc58a97087c6fc929ff3892f10afeff2766c
 EBUILD selinux-gnome-2.20210203-r1.ebuild 275 BLAKE2B 02d748d373cb01914f6c3da0ad53667e5b260f5f4e1ef42d60d6406f612363279b420671a909467152e248ee2519e43585b80b0de31da64bee7e900f49a6ae39 SHA512 3b8c357d1209fccfc14ea7a4ffa69177a15a0f3845fbf497ab3771c11ada65b5ae9e87b5973915be5a1d850705f0dc58a97087c6fc929ff3892f10afeff2766c
 EBUILD selinux-gnome-2.20210908-r1.ebuild 275 BLAKE2B 02d748d373cb01914f6c3da0ad53667e5b260f5f4e1ef42d60d6406f612363279b420671a909467152e248ee2519e43585b80b0de31da64bee7e900f49a6ae39 SHA512 3b8c357d1209fccfc14ea7a4ffa69177a15a0f3845fbf497ab3771c11ada65b5ae9e87b5973915be5a1d850705f0dc58a97087c6fc929ff3892f10afeff2766c
-EBUILD selinux-gnome-2.20220106-r1.ebuild 279 BLAKE2B 1042e7a68302436e7cdb5a123bb29a72a37ab58567313e7cd106b72ffd03826e42a4ddd1c2404d17f4dd916980e51aff4c46df6b44a42bb77ae85cda27066c8c SHA512 b8d18d7064f979e21fff5a753fc24f201a70df322b2a03b674b9aff505ff406f4b5bdcff4538d3ee447eeaadf7b0ac3c525ef89ca57ca5f61c05cfdb07c86c3a
+EBUILD selinux-gnome-2.20220106-r1.ebuild 277 BLAKE2B 27b864a04a26f20ce840111ab7a3ac2958d863d2034b26a54698eabb5d67bfc102dc62113aa650d4651502c8d3adb34ca150e74a1c1e0876a523e03e47aa2e2c SHA512 27872de82e8b2789603474da825b865f8663f850d45fa45e8756ecb49224134480d0e4ab05374ff9e8c6514d39f7bcd9217b60aeb9a030ebfe0126370d9f31eb
+EBUILD selinux-gnome-2.20220106-r2.ebuild 279 BLAKE2B 1042e7a68302436e7cdb5a123bb29a72a37ab58567313e7cd106b72ffd03826e42a4ddd1c2404d17f4dd916980e51aff4c46df6b44a42bb77ae85cda27066c8c SHA512 b8d18d7064f979e21fff5a753fc24f201a70df322b2a03b674b9aff505ff406f4b5bdcff4538d3ee447eeaadf7b0ac3c525ef89ca57ca5f61c05cfdb07c86c3a
 EBUILD selinux-gnome-9999.ebuild 279 BLAKE2B 488af7a6ffee59b769ba17d3dc7ee90e07e187f605268b8cf2921e0fb57610482e1b1d86204709fd48d2dd23d5883f0e25d16e48039c61f9dcfd8b5cf27c969b SHA512 aadd8279a4abd5c9eff38fb86b1a5f8d393c00a8cd3936cad3f0d2d83921a67366cde1c2ad474de48c7330717a405a9cc158045d6eec43b8d62682b88f93977b
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-gnome/selinux-gnome-2.20220106-r1.ebuild b/sec-policy/selinux-gnome/selinux-gnome-2.20220106-r1.ebuild
index aae38b4527c2..cbe932bfb461 100644
--- a/sec-policy/selinux-gnome/selinux-gnome-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-gnome/selinux-gnome-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gnome"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-gnome/selinux-gnome-2.20220106-r2.ebuild b/sec-policy/selinux-gnome/selinux-gnome-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..aae38b4527c2
--- /dev/null
+++ b/sec-policy/selinux-gnome/selinux-gnome-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="gnome"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gnome"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-googletalk/Manifest b/sec-policy/selinux-googletalk/Manifest
index 6476c436fec3..cda92951ab93 100644
--- a/sec-policy/selinux-googletalk/Manifest
+++ b/sec-policy/selinux-googletalk/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-googletalk-2.20200818-r2.ebuild 289 BLAKE2B eb87d195f97e368e0bc4e795b10610292ce57b003a02483acc1bc6b5279a854874acaf35f5c5bb9c4621833f12d828bf3cd5b56c3599f3b7804ff3f15a8f2d81 SHA512 5606b329ddcc627059db31bda9dcc7039ac91ac2077154873668c34b52c9c3811c3d3b101c3059d81f66c880693ac19b2106b5947dbdd9bc4d48be6015b4c489
 EBUILD selinux-googletalk-2.20210203-r1.ebuild 289 BLAKE2B eb87d195f97e368e0bc4e795b10610292ce57b003a02483acc1bc6b5279a854874acaf35f5c5bb9c4621833f12d828bf3cd5b56c3599f3b7804ff3f15a8f2d81 SHA512 5606b329ddcc627059db31bda9dcc7039ac91ac2077154873668c34b52c9c3811c3d3b101c3059d81f66c880693ac19b2106b5947dbdd9bc4d48be6015b4c489
 EBUILD selinux-googletalk-2.20210908-r1.ebuild 289 BLAKE2B eb87d195f97e368e0bc4e795b10610292ce57b003a02483acc1bc6b5279a854874acaf35f5c5bb9c4621833f12d828bf3cd5b56c3599f3b7804ff3f15a8f2d81 SHA512 5606b329ddcc627059db31bda9dcc7039ac91ac2077154873668c34b52c9c3811c3d3b101c3059d81f66c880693ac19b2106b5947dbdd9bc4d48be6015b4c489
-EBUILD selinux-googletalk-2.20220106-r1.ebuild 293 BLAKE2B e72918802d7409c22f7f379c4495291a892041cd4e8556fde75dfb935a570f6974b61c45411e8290e3ec74243ac599a699b5210d1ba1f43c907eecb7670b4487 SHA512 f62359e33697c7529a633e84f11e2fdd2f57655388dce17d7948867060e7c4e3432e0a6f94fd13ed9d3087e866f459c1c78fb778f7018c686ef402dd77ad73ba
+EBUILD selinux-googletalk-2.20220106-r1.ebuild 291 BLAKE2B dd22fe853bdd44eba5fa5681213529e327700f337b75d813638188c255a310fcfefa586b2fac08c0c8ab20de007488823a1d898678f7717442a5f121dbd6465a SHA512 99510159622ade13fe3b1277082c24f250227d18db6056f15a4d9c37cedf14112db4bb67a7848cb5bea2b20742d65f04aebf678f383f9e2b833a52d016d7efc3
+EBUILD selinux-googletalk-2.20220106-r2.ebuild 293 BLAKE2B e72918802d7409c22f7f379c4495291a892041cd4e8556fde75dfb935a570f6974b61c45411e8290e3ec74243ac599a699b5210d1ba1f43c907eecb7670b4487 SHA512 f62359e33697c7529a633e84f11e2fdd2f57655388dce17d7948867060e7c4e3432e0a6f94fd13ed9d3087e866f459c1c78fb778f7018c686ef402dd77ad73ba
 EBUILD selinux-googletalk-9999.ebuild 293 BLAKE2B b8dbb2697562dc281ace7e27f85e2de4487fe290618fc6dd4636d86e5118f2ecc47cffa1d65212a34f4852c078638e301db68a0df0ee03249f4c4f152bee9fad SHA512 0640010efa70b8c3e4d3becdd953b785048d597323c360b7f626da80f24a64e1b246372138e5a99106db440ee49d90dbab72ac471fa37c67e1183cabd364f409
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-googletalk/selinux-googletalk-2.20220106-r1.ebuild b/sec-policy/selinux-googletalk/selinux-googletalk-2.20220106-r1.ebuild
index 9679ee142a08..93c21ac975f0 100644
--- a/sec-policy/selinux-googletalk/selinux-googletalk-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-googletalk/selinux-googletalk-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for googletalk"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-googletalk/selinux-googletalk-2.20220106-r2.ebuild b/sec-policy/selinux-googletalk/selinux-googletalk-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..9679ee142a08
--- /dev/null
+++ b/sec-policy/selinux-googletalk/selinux-googletalk-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE="alsa"
+MODS="googletalk"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for googletalk"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-gorg/Manifest b/sec-policy/selinux-gorg/Manifest
index bb42f5e2965a..5fcde358c060 100644
--- a/sec-policy/selinux-gorg/Manifest
+++ b/sec-policy/selinux-gorg/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-gorg-2.20200818-r2.ebuild 273 BLAKE2B 7b93e4b99ce006f9a6babcdb02d21225e002d98ed9a993f49e3cbd485939a0a8b7ff78341b978a5b9104ed1e6b7273894ef453ea95030998627f4091c5bc61ee SHA512 66dda5d9eb11cb7e5dc3c36cbd9eceeb280363b1daeeaf71a79dfa8422f906db1a429d6f3df1f57b0512365c2cde673f5a7ec8fee0c60de465cffafe3e14e271
 EBUILD selinux-gorg-2.20210203-r1.ebuild 273 BLAKE2B 7b93e4b99ce006f9a6babcdb02d21225e002d98ed9a993f49e3cbd485939a0a8b7ff78341b978a5b9104ed1e6b7273894ef453ea95030998627f4091c5bc61ee SHA512 66dda5d9eb11cb7e5dc3c36cbd9eceeb280363b1daeeaf71a79dfa8422f906db1a429d6f3df1f57b0512365c2cde673f5a7ec8fee0c60de465cffafe3e14e271
 EBUILD selinux-gorg-2.20210908-r1.ebuild 273 BLAKE2B 7b93e4b99ce006f9a6babcdb02d21225e002d98ed9a993f49e3cbd485939a0a8b7ff78341b978a5b9104ed1e6b7273894ef453ea95030998627f4091c5bc61ee SHA512 66dda5d9eb11cb7e5dc3c36cbd9eceeb280363b1daeeaf71a79dfa8422f906db1a429d6f3df1f57b0512365c2cde673f5a7ec8fee0c60de465cffafe3e14e271
-EBUILD selinux-gorg-2.20220106-r1.ebuild 277 BLAKE2B 24fb75642aee37e00d56c09fcf57f932af75f48a011700e6c762d03ad7088b70c17e36d45b7a13dda6d96b3412911714b1a318c1726cfee974db8bfc858500d6 SHA512 fc0ecb4c1cbac87b5260f839a9fe4fcc2c2dd139a8f1d2870a2f3a299ea452183da2e909fa7b51d60fb8940d3508ff1204666e60dc07dbc8b4a60c06417549fb
+EBUILD selinux-gorg-2.20220106-r1.ebuild 275 BLAKE2B d1a435799dc08239bea00f57cb07179be210fd7854768bcc6a66405417c7acef3123b8668f649b28e1c989635ddbebf7efc20350f34a2cad1674539e2a58dc83 SHA512 1d9c182adfd6a1064880598a2a27ee0a4d108d296d11a67b2bfa421a7093b43c6180a316c301e7e52e61582425a78a0a4fb1ce2f0be752d4e19c1b8f863c14f9
+EBUILD selinux-gorg-2.20220106-r2.ebuild 277 BLAKE2B 24fb75642aee37e00d56c09fcf57f932af75f48a011700e6c762d03ad7088b70c17e36d45b7a13dda6d96b3412911714b1a318c1726cfee974db8bfc858500d6 SHA512 fc0ecb4c1cbac87b5260f839a9fe4fcc2c2dd139a8f1d2870a2f3a299ea452183da2e909fa7b51d60fb8940d3508ff1204666e60dc07dbc8b4a60c06417549fb
 EBUILD selinux-gorg-9999.ebuild 277 BLAKE2B 80bdf92af082abccd3a8a22a662c576b8ebd0e20dc3ddb4ea4a28dd2dc62a6a586fadf5ed7e880978143cfa2f685e288d015db77748dbe2cc63c044281460237 SHA512 6e3812dbb6ac1c1f1996845df03aa214a21126e61a3076e6a6f721073a067fb04c0dd5e67400b4d592f6aaa93b73257f9d792d702a23b8d4af3cb64d5acfca10
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-gorg/selinux-gorg-2.20220106-r1.ebuild b/sec-policy/selinux-gorg/selinux-gorg-2.20220106-r1.ebuild
index 93acde702bb9..9d677192e892 100644
--- a/sec-policy/selinux-gorg/selinux-gorg-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-gorg/selinux-gorg-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gorg"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-gorg/selinux-gorg-2.20220106-r2.ebuild b/sec-policy/selinux-gorg/selinux-gorg-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..93acde702bb9
--- /dev/null
+++ b/sec-policy/selinux-gorg/selinux-gorg-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="gorg"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gorg"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-gpg/Manifest b/sec-policy/selinux-gpg/Manifest
index 6f8347d74ab9..2beb8690f4a0 100644
--- a/sec-policy/selinux-gpg/Manifest
+++ b/sec-policy/selinux-gpg/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-gpg-2.20200818-r2.ebuild 370 BLAKE2B d5ebcb3aa5f3716ad12456ba6a5c5b7b6854acf32bd189f488ed9af4e0a60f27fa7af1071b1a45b33c23e9738e5ea2fad2112991508cfc6c511778db4c6c7048 SHA512 2caaae51679628e4a04f19dda0f2efb435ecc185f9c62d33285bd87877788bece693fd82937e30634f2296ef88e66d6de70a9444148b6cd217a598c8af9542d8
 EBUILD selinux-gpg-2.20210203-r1.ebuild 370 BLAKE2B d5ebcb3aa5f3716ad12456ba6a5c5b7b6854acf32bd189f488ed9af4e0a60f27fa7af1071b1a45b33c23e9738e5ea2fad2112991508cfc6c511778db4c6c7048 SHA512 2caaae51679628e4a04f19dda0f2efb435ecc185f9c62d33285bd87877788bece693fd82937e30634f2296ef88e66d6de70a9444148b6cd217a598c8af9542d8
 EBUILD selinux-gpg-2.20210908-r1.ebuild 370 BLAKE2B d5ebcb3aa5f3716ad12456ba6a5c5b7b6854acf32bd189f488ed9af4e0a60f27fa7af1071b1a45b33c23e9738e5ea2fad2112991508cfc6c511778db4c6c7048 SHA512 2caaae51679628e4a04f19dda0f2efb435ecc185f9c62d33285bd87877788bece693fd82937e30634f2296ef88e66d6de70a9444148b6cd217a598c8af9542d8
-EBUILD selinux-gpg-2.20220106-r1.ebuild 374 BLAKE2B 6671b4ee82a2fc0bbed9886688d2bbe5578ac0987df494d9702350bc7e213ee6a026753f708a1b2ade215093fce828242a1ec639c47016a2099a1835d77d9926 SHA512 c339ed8e2dd0c417f0ad657a5447759e43639ed5e4a17ba85070269b500fe7434520679ff43e068971220e89656b1b7d91d00d53e1e495818d210ce0f6f2e89e
+EBUILD selinux-gpg-2.20220106-r1.ebuild 372 BLAKE2B 55dabe8ea8a561ff3eae1ee24c98957e4e4bc4c7e21da6dc79da61105c37fbbd3451105e8f53d2a629445404dab7399d3a337da11da7fcf124f7fee037eccaf7 SHA512 66eceb3529922a9961609e12626552200f94fc5ecc87af80fcf360231a0f680e4bccdcbb93ee9aa6ee763892edd9f12d0a8732a8328a7a1e5d3098092e267a3e
+EBUILD selinux-gpg-2.20220106-r2.ebuild 374 BLAKE2B 6671b4ee82a2fc0bbed9886688d2bbe5578ac0987df494d9702350bc7e213ee6a026753f708a1b2ade215093fce828242a1ec639c47016a2099a1835d77d9926 SHA512 c339ed8e2dd0c417f0ad657a5447759e43639ed5e4a17ba85070269b500fe7434520679ff43e068971220e89656b1b7d91d00d53e1e495818d210ce0f6f2e89e
 EBUILD selinux-gpg-9999.ebuild 374 BLAKE2B 994a7ca2b5b3a195e55bc49e6e35760a6feda3566f7649a5c79c8461e5a9c001257091c865c013091965ff6537fdff552c9d56c777ca579e414e5127d1416bd1 SHA512 7981d6b86925401fbf88a3e79d8168cc7eaeb2f9123e469014c47bf59fee598656cc7b7f10bd74ef462ca7ab5f889adfab9b27f6edcf5b7b632e9376c1202403
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-gpg/selinux-gpg-2.20220106-r1.ebuild b/sec-policy/selinux-gpg/selinux-gpg-2.20220106-r1.ebuild
index d4ea1a4f0432..f5ba2ec1ec4b 100644
--- a/sec-policy/selinux-gpg/selinux-gpg-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-gpg/selinux-gpg-2.20220106-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gpg"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-gpg/selinux-gpg-2.20220106-r2.ebuild b/sec-policy/selinux-gpg/selinux-gpg-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..d4ea1a4f0432
--- /dev/null
+++ b/sec-policy/selinux-gpg/selinux-gpg-2.20220106-r2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="gpg"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gpg"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+
+DEPEND="${DEPEND}
+	sec-policy/selinux-dirmngr
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-dirmngr
+"
diff --git a/sec-policy/selinux-gpm/Manifest b/sec-policy/selinux-gpm/Manifest
index 63163585a773..e288fc2b3376 100644
--- a/sec-policy/selinux-gpm/Manifest
+++ b/sec-policy/selinux-gpm/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-gpm-2.20200818-r2.ebuild 271 BLAKE2B 1c2fb048f3df822789dd4fa4872759ad455b653fe88eeea196fbb11d5dacb7b94d4c81d78537b13fcbfc0f8c9002199cc2ac4765c133323b97b36f97bf8b5983 SHA512 f944e8be050ba09bf37fcab8646960c827ed09caf3755c27e5147d4da83cb8f6d8a6502f9fee8a3d804a1e428d84255f6eeb6f0d6699b5c6010a783affc08944
 EBUILD selinux-gpm-2.20210203-r1.ebuild 271 BLAKE2B 1c2fb048f3df822789dd4fa4872759ad455b653fe88eeea196fbb11d5dacb7b94d4c81d78537b13fcbfc0f8c9002199cc2ac4765c133323b97b36f97bf8b5983 SHA512 f944e8be050ba09bf37fcab8646960c827ed09caf3755c27e5147d4da83cb8f6d8a6502f9fee8a3d804a1e428d84255f6eeb6f0d6699b5c6010a783affc08944
 EBUILD selinux-gpm-2.20210908-r1.ebuild 271 BLAKE2B 1c2fb048f3df822789dd4fa4872759ad455b653fe88eeea196fbb11d5dacb7b94d4c81d78537b13fcbfc0f8c9002199cc2ac4765c133323b97b36f97bf8b5983 SHA512 f944e8be050ba09bf37fcab8646960c827ed09caf3755c27e5147d4da83cb8f6d8a6502f9fee8a3d804a1e428d84255f6eeb6f0d6699b5c6010a783affc08944
-EBUILD selinux-gpm-2.20220106-r1.ebuild 275 BLAKE2B 5c46e85750febf278878da29babf849a075cee9dee43cd548955dbd4ce0ed4cda0896e2665a5458edf7fac12ec3240ced8f5b4305dad6ba93b0255bdf0266ed7 SHA512 e63669f06f9275f78825a2a9bcda6350bc14862c41fd04f8c48e03f08627a9e85429c3c392abb0e354c3276747d0610d5df356fef4b41016b7a325fcabe43b83
+EBUILD selinux-gpm-2.20220106-r1.ebuild 273 BLAKE2B db690231bf5a0e3a17157d49b14045a23ac9780d9253057c619cc10d8ebdf1a708993dce7290384bc65c7d1373983af1af4af5b48758e921d6322248b00e5c1a SHA512 62e24c806ac861c74d343b76f4e395acd3efa93e456d3c132294c3922d143ff6234376c3f6d924dd6efed3e0ddc50dd5f187eacf02b651cad70d9b97eee7a7d2
+EBUILD selinux-gpm-2.20220106-r2.ebuild 275 BLAKE2B 5c46e85750febf278878da29babf849a075cee9dee43cd548955dbd4ce0ed4cda0896e2665a5458edf7fac12ec3240ced8f5b4305dad6ba93b0255bdf0266ed7 SHA512 e63669f06f9275f78825a2a9bcda6350bc14862c41fd04f8c48e03f08627a9e85429c3c392abb0e354c3276747d0610d5df356fef4b41016b7a325fcabe43b83
 EBUILD selinux-gpm-9999.ebuild 275 BLAKE2B cd8f66d6fb3388441f48ba2ff3f4d94619881c265df4f991b591bf0ceda624fd621d2d3cb065598bc84ee4f78cdb55fe9938a83d538cbc7411fd19a11d3481d9 SHA512 9f37016395cd64b8696b9626386b4a656a53877dec6e4be18d4bebceed8b2862150bd3b7a16c53ddbcc5360b899ffbe7edeb62ebadba70aecfb40565b7c36bc2
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-gpm/selinux-gpm-2.20220106-r1.ebuild b/sec-policy/selinux-gpm/selinux-gpm-2.20220106-r1.ebuild
index cf7997b4ceb4..a7bb18001fa1 100644
--- a/sec-policy/selinux-gpm/selinux-gpm-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-gpm/selinux-gpm-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gpm"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-gpm/selinux-gpm-2.20220106-r2.ebuild b/sec-policy/selinux-gpm/selinux-gpm-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..cf7997b4ceb4
--- /dev/null
+++ b/sec-policy/selinux-gpm/selinux-gpm-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="gpm"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gpm"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-gpsd/Manifest b/sec-policy/selinux-gpsd/Manifest
index 54cb4d4cfe25..a28d4a935c50 100644
--- a/sec-policy/selinux-gpsd/Manifest
+++ b/sec-policy/selinux-gpsd/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-gpsd-2.20200818-r2.ebuild 273 BLAKE2B 7465da054b1c820ec986d8bce2393fed694755086f10d74832ef57cd3ff6091eba054327f21897e012d8a9db4b04e9b1e8d08d0e32eef42e0d792015c7d86425 SHA512 32bf5f4e5d79586ed73c7bb510ed0a25c9e5746da08b00aeedd719d474705f110e1b4e4f5d9c888d91386d9a62ba780aae440a5679d8ccdbf6e3123c6f9a0222
 EBUILD selinux-gpsd-2.20210203-r1.ebuild 273 BLAKE2B 7465da054b1c820ec986d8bce2393fed694755086f10d74832ef57cd3ff6091eba054327f21897e012d8a9db4b04e9b1e8d08d0e32eef42e0d792015c7d86425 SHA512 32bf5f4e5d79586ed73c7bb510ed0a25c9e5746da08b00aeedd719d474705f110e1b4e4f5d9c888d91386d9a62ba780aae440a5679d8ccdbf6e3123c6f9a0222
 EBUILD selinux-gpsd-2.20210908-r1.ebuild 273 BLAKE2B 7465da054b1c820ec986d8bce2393fed694755086f10d74832ef57cd3ff6091eba054327f21897e012d8a9db4b04e9b1e8d08d0e32eef42e0d792015c7d86425 SHA512 32bf5f4e5d79586ed73c7bb510ed0a25c9e5746da08b00aeedd719d474705f110e1b4e4f5d9c888d91386d9a62ba780aae440a5679d8ccdbf6e3123c6f9a0222
-EBUILD selinux-gpsd-2.20220106-r1.ebuild 277 BLAKE2B 1b826cc4a51e788f1e2f9e5e99930ed1ad46224e10ec31caf066042f15215408a1e4fc5ed0eabb471fb199b154233da846a4c3fce757408510ff3d221af43caa SHA512 c56c9f6dc22ead8f243ddadc4e2ad7813dd4b6e0e15fd92e3bbb68e631e0ae85e5706c97035e3a1c1f1acd842f220a56ad7c6925569119e285f5ae46567b70dd
+EBUILD selinux-gpsd-2.20220106-r1.ebuild 275 BLAKE2B c3f60892d4a37488d02f1d34e6263aa7810a2edd7c28a6f51ff61e2e9c25709dd85e58b381c3d423f7c74c777aa30f6e20a82f735eee3ef702739504ef9c3b3c SHA512 3472a7de340abeb17979df768a011bf083f686a4ab2919fb1dd5db04dd7fcb5c7ae16561903f7e2fdbd7e5d6e769954d04980d00a2ece5fedd2c2f8dba81a08a
+EBUILD selinux-gpsd-2.20220106-r2.ebuild 277 BLAKE2B 1b826cc4a51e788f1e2f9e5e99930ed1ad46224e10ec31caf066042f15215408a1e4fc5ed0eabb471fb199b154233da846a4c3fce757408510ff3d221af43caa SHA512 c56c9f6dc22ead8f243ddadc4e2ad7813dd4b6e0e15fd92e3bbb68e631e0ae85e5706c97035e3a1c1f1acd842f220a56ad7c6925569119e285f5ae46567b70dd
 EBUILD selinux-gpsd-9999.ebuild 277 BLAKE2B 64ab29f8f1e185a60606fc0b1f46f7f0bd9853f8519c3a579a204b3d418fa474a524d8cac9569a81b87af3b2c8be90db64904ef8f21156b0c88f4c13c63c030a SHA512 160f506a288ff5b4182b2fa001a7d83dc27e5f4d35cda4b313e38ae06770aabc661ca1cf90df5856941d12beb5a9d4b67dabfb6b2ef479c47780f473f8a8c21b
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-gpsd/selinux-gpsd-2.20220106-r1.ebuild b/sec-policy/selinux-gpsd/selinux-gpsd-2.20220106-r1.ebuild
index b5e61caf8d74..1fec5ad887b6 100644
--- a/sec-policy/selinux-gpsd/selinux-gpsd-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-gpsd/selinux-gpsd-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gpsd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-gpsd/selinux-gpsd-2.20220106-r2.ebuild b/sec-policy/selinux-gpsd/selinux-gpsd-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..b5e61caf8d74
--- /dev/null
+++ b/sec-policy/selinux-gpsd/selinux-gpsd-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="gpsd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gpsd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-gssproxy/Manifest b/sec-policy/selinux-gssproxy/Manifest
index c77ef71525fd..76f3c9408038 100644
--- a/sec-policy/selinux-gssproxy/Manifest
+++ b/sec-policy/selinux-gssproxy/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-gssproxy-2.20200818-r2.ebuild 281 BLAKE2B 6686c3e47230f05c7aef97aefca08e614b97be1a79d6822286947818ab72c5fd9ebf33b090f0e65b58f36f01bba4e2efe18fb4a5b2b170d0dd4907ece54bc8ac SHA512 ee624030ecd3493e64ca36294e0ecced3623a06e35a2662efcce3cc76d718b3dfab9c943b8fd840321372131e9e49b15028d9193acc2b198ea7c894d839d8021
 EBUILD selinux-gssproxy-2.20210203-r1.ebuild 281 BLAKE2B 6686c3e47230f05c7aef97aefca08e614b97be1a79d6822286947818ab72c5fd9ebf33b090f0e65b58f36f01bba4e2efe18fb4a5b2b170d0dd4907ece54bc8ac SHA512 ee624030ecd3493e64ca36294e0ecced3623a06e35a2662efcce3cc76d718b3dfab9c943b8fd840321372131e9e49b15028d9193acc2b198ea7c894d839d8021
 EBUILD selinux-gssproxy-2.20210908-r1.ebuild 281 BLAKE2B 6686c3e47230f05c7aef97aefca08e614b97be1a79d6822286947818ab72c5fd9ebf33b090f0e65b58f36f01bba4e2efe18fb4a5b2b170d0dd4907ece54bc8ac SHA512 ee624030ecd3493e64ca36294e0ecced3623a06e35a2662efcce3cc76d718b3dfab9c943b8fd840321372131e9e49b15028d9193acc2b198ea7c894d839d8021
-EBUILD selinux-gssproxy-2.20220106-r1.ebuild 285 BLAKE2B 47d2ce88daf901a66f11b8393530695ce77428822edeb7c321edf20c4649c15e240f5ed56a0d0a7c549f5d3c551cf388b6a1dc887fb386b609a133ef692b4b7d SHA512 666e007663c746df2991313147792152c72023008f23fe081a30bf935069c939909bd557441d7dbd4fc1ea62ea60a903d7838d5c42e1eda91b863742a5ccc646
+EBUILD selinux-gssproxy-2.20220106-r1.ebuild 283 BLAKE2B caea2c86c02af84254157483eceb1cd1074236b0a9080154edc9cba7dfb80a942734feab7d9b8d161e237f01dda3cf6a04bbd8f79e0f7f805722f9be7ceda997 SHA512 a533a1d4232a38dd66528a5f3aa6a37a4ac28068ad38c56407d87cff124a36a642567de23bd0bc30e90c55ab8b43f6beff3980933a47dc0cf5ec7af79d4c466f
+EBUILD selinux-gssproxy-2.20220106-r2.ebuild 285 BLAKE2B 47d2ce88daf901a66f11b8393530695ce77428822edeb7c321edf20c4649c15e240f5ed56a0d0a7c549f5d3c551cf388b6a1dc887fb386b609a133ef692b4b7d SHA512 666e007663c746df2991313147792152c72023008f23fe081a30bf935069c939909bd557441d7dbd4fc1ea62ea60a903d7838d5c42e1eda91b863742a5ccc646
 EBUILD selinux-gssproxy-9999.ebuild 285 BLAKE2B 1e379f8a91f4b52d7c44809f7e6a6a4c9042be1dc7f1e28f7b0c4b3ede444bc54941f2f68160b82950b63349fd967b856b0a1a85f0227e3e365d7808ea2c75cd SHA512 d20d0440ad3175ce101289212dc1c32824c4623d0eb680f47b86c231bc6732da240315d0feae043343dee4efa40370c2d4275374f60372b9372e3c6b993001ff
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20220106-r1.ebuild b/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20220106-r1.ebuild
index d28e252641c1..0b354f76527f 100644
--- a/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gssproxy"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20220106-r2.ebuild b/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..d28e252641c1
--- /dev/null
+++ b/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="gssproxy"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gssproxy"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-hddtemp/Manifest b/sec-policy/selinux-hddtemp/Manifest
index 3846eb0ac112..0db6f1fa4c06 100644
--- a/sec-policy/selinux-hddtemp/Manifest
+++ b/sec-policy/selinux-hddtemp/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-hddtemp-2.20200818-r2.ebuild 279 BLAKE2B 205051f9c37220defff18c03636d57e5724815c2646dd35abc4f8f7707e93678f09f57cea6b300eb76f4a3195276639991cd926f25431eefafb02a1e6be10233 SHA512 961e49c90ef86a914c6f00bd4600337fa932d82b80767eff57d54a418aabebe8e5b95e41818c0ad028d2b801883aed9a1a17781f5f1c19f9749c7c9ee6d6448e
 EBUILD selinux-hddtemp-2.20210203-r1.ebuild 279 BLAKE2B 205051f9c37220defff18c03636d57e5724815c2646dd35abc4f8f7707e93678f09f57cea6b300eb76f4a3195276639991cd926f25431eefafb02a1e6be10233 SHA512 961e49c90ef86a914c6f00bd4600337fa932d82b80767eff57d54a418aabebe8e5b95e41818c0ad028d2b801883aed9a1a17781f5f1c19f9749c7c9ee6d6448e
 EBUILD selinux-hddtemp-2.20210908-r1.ebuild 279 BLAKE2B 205051f9c37220defff18c03636d57e5724815c2646dd35abc4f8f7707e93678f09f57cea6b300eb76f4a3195276639991cd926f25431eefafb02a1e6be10233 SHA512 961e49c90ef86a914c6f00bd4600337fa932d82b80767eff57d54a418aabebe8e5b95e41818c0ad028d2b801883aed9a1a17781f5f1c19f9749c7c9ee6d6448e
-EBUILD selinux-hddtemp-2.20220106-r1.ebuild 283 BLAKE2B 00bce0e0bf399c7e2e28ffef974392bd6d133d52aa3130eada61aa9d0dc73b064c48c544fbb9753664bb889286673d97c81f4cd4300c7cf9429cde5577dae8e5 SHA512 be375547687855b2d0dda77234c69c19ef8f4d8fdf4c7aaa41d3a9a71ed6e21d9630fa91331a391a0dc7bc757918b85c6a361ca7f9adefca1add59d5c91c71fa
+EBUILD selinux-hddtemp-2.20220106-r1.ebuild 281 BLAKE2B 53dc0f64f779fb7d378f210a2dba3d97088ba003f7372f89d36f5098cafe0b6291dc846faca397c36130f01c3ab0ba144e4782fc11c7d21c58b96a446ac6a807 SHA512 38ef87d87f61e44635ddb2cd71d434bd12f755eca0fe4cae98424f5d882726d8a4f41fe57ac60a319c09919c077ba4c65e2787df18984b49811e10e06aca4ebe
+EBUILD selinux-hddtemp-2.20220106-r2.ebuild 283 BLAKE2B 00bce0e0bf399c7e2e28ffef974392bd6d133d52aa3130eada61aa9d0dc73b064c48c544fbb9753664bb889286673d97c81f4cd4300c7cf9429cde5577dae8e5 SHA512 be375547687855b2d0dda77234c69c19ef8f4d8fdf4c7aaa41d3a9a71ed6e21d9630fa91331a391a0dc7bc757918b85c6a361ca7f9adefca1add59d5c91c71fa
 EBUILD selinux-hddtemp-9999.ebuild 283 BLAKE2B 974fd9e6bf521ee676c5150cbdbebf26a26afa21d581497fd574949ba3991f479700e36473a4d5e788922496d404baa52e769313d99122707eebd37972e419ef SHA512 ba7aecc6c5d8a70ddc46000c6cd2c9a3e1b7800279dbe18444ee54be68f4291e00bfc92951ea0d4a2e34ff90c73dcc33d82b6f7f3e6cd0d2ee8118c51687aa1d
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20220106-r1.ebuild b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20220106-r1.ebuild
index beed88513d11..fa3660c6f5cd 100644
--- a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for hddtemp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20220106-r2.ebuild b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..beed88513d11
--- /dev/null
+++ b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="hddtemp"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for hddtemp"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-icecast/Manifest b/sec-policy/selinux-icecast/Manifest
index 4877ce12eca4..537a8a6f0703 100644
--- a/sec-policy/selinux-icecast/Manifest
+++ b/sec-policy/selinux-icecast/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-icecast-2.20200818-r2.ebuild 279 BLAKE2B ca672079aec0decea093244a619e730e1313822d32134f164df75de1c05a954bdd780c0f9834c249096490c1377ac1e693a80b785d8007adfd854858f872f10b SHA512 6382d930eb430fc66e3f0ae79ce8ed1703499ad4c61568fa8077aa192b0838ff8a4725eb48af0c3635cd9459f9a5a9c4b422a0caf0450d81fabc5b9792ff5f60
 EBUILD selinux-icecast-2.20210203-r1.ebuild 279 BLAKE2B ca672079aec0decea093244a619e730e1313822d32134f164df75de1c05a954bdd780c0f9834c249096490c1377ac1e693a80b785d8007adfd854858f872f10b SHA512 6382d930eb430fc66e3f0ae79ce8ed1703499ad4c61568fa8077aa192b0838ff8a4725eb48af0c3635cd9459f9a5a9c4b422a0caf0450d81fabc5b9792ff5f60
 EBUILD selinux-icecast-2.20210908-r1.ebuild 279 BLAKE2B ca672079aec0decea093244a619e730e1313822d32134f164df75de1c05a954bdd780c0f9834c249096490c1377ac1e693a80b785d8007adfd854858f872f10b SHA512 6382d930eb430fc66e3f0ae79ce8ed1703499ad4c61568fa8077aa192b0838ff8a4725eb48af0c3635cd9459f9a5a9c4b422a0caf0450d81fabc5b9792ff5f60
-EBUILD selinux-icecast-2.20220106-r1.ebuild 283 BLAKE2B 9a5d27664e5b9ba509a17c5b62cc64382a7c8b35435b0aefb48232db48097ef19cc817cad29c4ce420ef26dd874545a15092aafe81fce805c011997f0af2f6cd SHA512 31db97476e9ccab0454dbd8b94970ab207f6d7cbabd4a01243eb2d360c76f4ddbb890f6f2d24ef1830c503dc335db833259c92170677e86403c8aed981b77385
+EBUILD selinux-icecast-2.20220106-r1.ebuild 281 BLAKE2B e7e10139e8a17583aca16b2c4248a5f52db7f07d3500171e5ff742ca0c4174f0dd3bf0953abcc19a23d7cbdb896aa14e492912aeaf7cd60ffb5b026397932edd SHA512 34a965e4bae2879875394a1ad5409e2d66e7637f663bd8511791a464e8bdc6f3187150e09b31024443ded1e524b82fb294b4cc34711637b13aa8e119739c3e65
+EBUILD selinux-icecast-2.20220106-r2.ebuild 283 BLAKE2B 9a5d27664e5b9ba509a17c5b62cc64382a7c8b35435b0aefb48232db48097ef19cc817cad29c4ce420ef26dd874545a15092aafe81fce805c011997f0af2f6cd SHA512 31db97476e9ccab0454dbd8b94970ab207f6d7cbabd4a01243eb2d360c76f4ddbb890f6f2d24ef1830c503dc335db833259c92170677e86403c8aed981b77385
 EBUILD selinux-icecast-9999.ebuild 283 BLAKE2B af3c1255de6d55b0ca7cca9c9cb36eb5849e724c27c6d41090745c5c4863423d91bf1cc6d37e0a8fea81a648fc43f75d86cb912e7932c993d3903f781ef49b1f SHA512 9f5f3ca20536a997d0cdaf2a23c2bcffe7e24edc9367f154a2bd61fa6e1361a09fc2c80d56a7f2f639a2d617ef90d9d8a7423bc6045f24329bdc9450122bc6f4
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-icecast/selinux-icecast-2.20220106-r1.ebuild b/sec-policy/selinux-icecast/selinux-icecast-2.20220106-r1.ebuild
index 038d819f20fa..8a0752567924 100644
--- a/sec-policy/selinux-icecast/selinux-icecast-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-icecast/selinux-icecast-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for icecast"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-icecast/selinux-icecast-2.20220106-r2.ebuild b/sec-policy/selinux-icecast/selinux-icecast-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..038d819f20fa
--- /dev/null
+++ b/sec-policy/selinux-icecast/selinux-icecast-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="icecast"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for icecast"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ifplugd/Manifest b/sec-policy/selinux-ifplugd/Manifest
index 4e4d18bf9513..e1d4f3f51734 100644
--- a/sec-policy/selinux-ifplugd/Manifest
+++ b/sec-policy/selinux-ifplugd/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-ifplugd-2.20200818-r2.ebuild 279 BLAKE2B ebb61cceb4c1ac0e4913e47a98181edec85c40f18e78e329dee2d55d5f1e59ae87e4e8a6fe58ff287e2ba8173e5b2788df22aa2f22b513ca828b0e6d8cfbab5d SHA512 83e022c3cfd37bc444b65ba4eb2be4c82c2dcd26113091956d10450bcb815e85967c040cdf330823af1978cc7fe9588706389e3ad07408010952df354777a9fe
 EBUILD selinux-ifplugd-2.20210203-r1.ebuild 279 BLAKE2B ebb61cceb4c1ac0e4913e47a98181edec85c40f18e78e329dee2d55d5f1e59ae87e4e8a6fe58ff287e2ba8173e5b2788df22aa2f22b513ca828b0e6d8cfbab5d SHA512 83e022c3cfd37bc444b65ba4eb2be4c82c2dcd26113091956d10450bcb815e85967c040cdf330823af1978cc7fe9588706389e3ad07408010952df354777a9fe
 EBUILD selinux-ifplugd-2.20210908-r1.ebuild 279 BLAKE2B ebb61cceb4c1ac0e4913e47a98181edec85c40f18e78e329dee2d55d5f1e59ae87e4e8a6fe58ff287e2ba8173e5b2788df22aa2f22b513ca828b0e6d8cfbab5d SHA512 83e022c3cfd37bc444b65ba4eb2be4c82c2dcd26113091956d10450bcb815e85967c040cdf330823af1978cc7fe9588706389e3ad07408010952df354777a9fe
-EBUILD selinux-ifplugd-2.20220106-r1.ebuild 283 BLAKE2B 631ef012af0a39d25f422932fe86a8c4d6e663bf575f8ba3e73fe1005f8adfece53848f704c03a01a7620bb15d097a26dd63b4291492732ced49fa2b4b77ec71 SHA512 a108cff68d1987c6adb22e3eeebe5911d9de466d624451b192ba122c4d1e7f395b9e61bb2bd2bc3abb9ec258cf930dcf121bfe37c44be67daec5de5b1c847b77
+EBUILD selinux-ifplugd-2.20220106-r1.ebuild 281 BLAKE2B 5a947df63bee1ebd8acbf72508cdff607a1ab747e8854dcdb3718a4d565ad070ebfa5ca6a31a67bf38bca028e22df966cbaefb28244e8f7925b9c4be2d9a864e SHA512 780b8a3bf2a8e2ccde53097abb2a10e24edad1c034ac9ff63fdaf710d890a0141a05dd38597fa6e5b6111030afb17d1954c7522af04643cf3ae63707d6f6ccd6
+EBUILD selinux-ifplugd-2.20220106-r2.ebuild 283 BLAKE2B 631ef012af0a39d25f422932fe86a8c4d6e663bf575f8ba3e73fe1005f8adfece53848f704c03a01a7620bb15d097a26dd63b4291492732ced49fa2b4b77ec71 SHA512 a108cff68d1987c6adb22e3eeebe5911d9de466d624451b192ba122c4d1e7f395b9e61bb2bd2bc3abb9ec258cf930dcf121bfe37c44be67daec5de5b1c847b77
 EBUILD selinux-ifplugd-9999.ebuild 283 BLAKE2B 24596d7d0e5e11e6cfb29359f72a60533573610c2cb06dad365b1a5a265c3afa2d29d2ad9d218d9f27c1ecc5632c3ee674ffe95c605c99429c41b268f1831177 SHA512 e9c47755b44c49efb792e0c0154441b5895a82dbc436dbf1c5d5975de8c2555fdc64055ae5774277a7d570adabf58458e38d4c5c723b5481d8c882ba36a1f051
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20220106-r1.ebuild b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20220106-r1.ebuild
index 39e21ea8d460..c8a6644afcab 100644
--- a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ifplugd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20220106-r2.ebuild b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..39e21ea8d460
--- /dev/null
+++ b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="ifplugd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ifplugd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-inetd/Manifest b/sec-policy/selinux-inetd/Manifest
index 240de1e89c05..bc0c41ddfafa 100644
--- a/sec-policy/selinux-inetd/Manifest
+++ b/sec-policy/selinux-inetd/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-inetd-2.20200818-r2.ebuild 275 BLAKE2B e6dc1ca377bf1c9f8021f456595d9185b30a7735d959959ab6c79c1940838e9cb5f974ea2135b36ac4bd6a24462f4c8ab4bcb66a3cfeb764682e9561b2d66932 SHA512 d3fd43da591f529e9a8e0ada894aa737117635850d253f1d1ddb87b54b751476191c827269ae656d36bbb89fb314b3bfce17ebe54cfc64d802d57832ffd48a41
 EBUILD selinux-inetd-2.20210203-r1.ebuild 275 BLAKE2B e6dc1ca377bf1c9f8021f456595d9185b30a7735d959959ab6c79c1940838e9cb5f974ea2135b36ac4bd6a24462f4c8ab4bcb66a3cfeb764682e9561b2d66932 SHA512 d3fd43da591f529e9a8e0ada894aa737117635850d253f1d1ddb87b54b751476191c827269ae656d36bbb89fb314b3bfce17ebe54cfc64d802d57832ffd48a41
 EBUILD selinux-inetd-2.20210908-r1.ebuild 275 BLAKE2B e6dc1ca377bf1c9f8021f456595d9185b30a7735d959959ab6c79c1940838e9cb5f974ea2135b36ac4bd6a24462f4c8ab4bcb66a3cfeb764682e9561b2d66932 SHA512 d3fd43da591f529e9a8e0ada894aa737117635850d253f1d1ddb87b54b751476191c827269ae656d36bbb89fb314b3bfce17ebe54cfc64d802d57832ffd48a41
-EBUILD selinux-inetd-2.20220106-r1.ebuild 279 BLAKE2B 2f48dbfb68f323043b3e956c59169955171cb655910d4df05928577fb584c55cc36deaca2da0b8709a36e84afba4a05482e74a36f23ee6b017b5fd1e4e07f9d3 SHA512 d62324d6a3e156198402a60e6f2d17f0ca6d99466fe4cf3b9d370d7bf13ebc57219cf87585e5e69e83896ee29e37c300f2aa974f39ba3de037dcdac82721f6a5
+EBUILD selinux-inetd-2.20220106-r1.ebuild 277 BLAKE2B 045c5b526bbbe0ec2f756a75ba0086228fb311f25cb6a6d1c0bbba196272033a52dc1dcb7ceabbc0f695ded790f559aa9ae2cea8f323fbd7d928e4c05ac7a153 SHA512 368b1a6baf0a0a5b1d312d95b6d3261fb91b767536acf75a77ff487bce4df97215020713c071783aa0aed8f6af312bcdc7acb2960c8da72a40d9bfa35626ea46
+EBUILD selinux-inetd-2.20220106-r2.ebuild 279 BLAKE2B 2f48dbfb68f323043b3e956c59169955171cb655910d4df05928577fb584c55cc36deaca2da0b8709a36e84afba4a05482e74a36f23ee6b017b5fd1e4e07f9d3 SHA512 d62324d6a3e156198402a60e6f2d17f0ca6d99466fe4cf3b9d370d7bf13ebc57219cf87585e5e69e83896ee29e37c300f2aa974f39ba3de037dcdac82721f6a5
 EBUILD selinux-inetd-9999.ebuild 279 BLAKE2B ecf77775f198b8afa5fa44e040ee970ac06ccea53552ece6e0b3346871e00a32a33e83ad9cc5da2542c59582603da8bd4a4c8e488535289da4a4c5b8488a0231 SHA512 064e2485426ccc283a52e2e786a7b21d70917235ccc8b7352d7c102e2f6a5054e9c5b2939aa7819586863d05b5292513feea64b27bf2c7fbbf3e62b140ca28c6
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-inetd/selinux-inetd-2.20220106-r1.ebuild b/sec-policy/selinux-inetd/selinux-inetd-2.20220106-r1.ebuild
index d6b25e33f263..a55bf641a6d5 100644
--- a/sec-policy/selinux-inetd/selinux-inetd-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-inetd/selinux-inetd-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for inetd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-inetd/selinux-inetd-2.20220106-r2.ebuild b/sec-policy/selinux-inetd/selinux-inetd-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..d6b25e33f263
--- /dev/null
+++ b/sec-policy/selinux-inetd/selinux-inetd-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="inetd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for inetd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-inn/Manifest b/sec-policy/selinux-inn/Manifest
index b0c12070a690..b51702e649ad 100644
--- a/sec-policy/selinux-inn/Manifest
+++ b/sec-policy/selinux-inn/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-inn-2.20200818-r2.ebuild 271 BLAKE2B bced2c9bb40b50805b899626d13c81d3615aa040c2fabe6073763df15857124ea74501cde9962c813c3748de59eddb77c7708549dc2a91b0f0259385bb674c9d SHA512 8ef53a3812f8c2fddd493cd0a7ea2a2e9234f15da2741333653e51dd9e1bf556549c5cbae06299e86622562e9127c00cdb90c7929fb1b584db22118c504d9550
 EBUILD selinux-inn-2.20210203-r1.ebuild 271 BLAKE2B bced2c9bb40b50805b899626d13c81d3615aa040c2fabe6073763df15857124ea74501cde9962c813c3748de59eddb77c7708549dc2a91b0f0259385bb674c9d SHA512 8ef53a3812f8c2fddd493cd0a7ea2a2e9234f15da2741333653e51dd9e1bf556549c5cbae06299e86622562e9127c00cdb90c7929fb1b584db22118c504d9550
 EBUILD selinux-inn-2.20210908-r1.ebuild 271 BLAKE2B bced2c9bb40b50805b899626d13c81d3615aa040c2fabe6073763df15857124ea74501cde9962c813c3748de59eddb77c7708549dc2a91b0f0259385bb674c9d SHA512 8ef53a3812f8c2fddd493cd0a7ea2a2e9234f15da2741333653e51dd9e1bf556549c5cbae06299e86622562e9127c00cdb90c7929fb1b584db22118c504d9550
-EBUILD selinux-inn-2.20220106-r1.ebuild 275 BLAKE2B 2f3e5289dc4fb6aba941799104d4078852234e1a28892e735f47ee70d56c010637d606368e170bad4dcb60efa17fa01ac0edf6c4f66d156f1d264ad5d59b4bfb SHA512 5528f5b73ee79da2c087812e6c10c23110b027401d224337a5d4973ccb3f293ea60eb69e9e3e84c774bfc601e953725f589c76f69c889d9445838550c9e26e0a
+EBUILD selinux-inn-2.20220106-r1.ebuild 273 BLAKE2B de2f0996c50d417b16ff93e9d709eaa617969856b3b73f3fc5f4387b5e3f2f6286806b4d4026debbab358f2b244354d54bce0d32a6f319550dd48cbcd2b4778c SHA512 4d23d872844618c5d20a39d64b450fe705ffed13a7e01d9acebf353a484f4a04bbc00824ae3dd5edef7c8830324f10262600b7389ca9c891ad69756e1bd072c6
+EBUILD selinux-inn-2.20220106-r2.ebuild 275 BLAKE2B 2f3e5289dc4fb6aba941799104d4078852234e1a28892e735f47ee70d56c010637d606368e170bad4dcb60efa17fa01ac0edf6c4f66d156f1d264ad5d59b4bfb SHA512 5528f5b73ee79da2c087812e6c10c23110b027401d224337a5d4973ccb3f293ea60eb69e9e3e84c774bfc601e953725f589c76f69c889d9445838550c9e26e0a
 EBUILD selinux-inn-9999.ebuild 275 BLAKE2B 983a29f6838b72bc74057279789b5f8b59064a4a9690d32d0de01a23ab8bacd0e005d25d9ea68f8ce91b17689fef5f8de8267d5547f5f237589d64bf4aa66c5a SHA512 12146e07dc5cf943690fe97f595b0d629612d8f0104e4bf7810c263362791b6f683378552e38e9bbba8dce79f1f94c7d8691f3146b1fca87461daf144bf556ec
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-inn/selinux-inn-2.20220106-r1.ebuild b/sec-policy/selinux-inn/selinux-inn-2.20220106-r1.ebuild
index 3febf0dddaa5..3c8e2ea9a121 100644
--- a/sec-policy/selinux-inn/selinux-inn-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-inn/selinux-inn-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for inn"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-inn/selinux-inn-2.20220106-r2.ebuild b/sec-policy/selinux-inn/selinux-inn-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..3febf0dddaa5
--- /dev/null
+++ b/sec-policy/selinux-inn/selinux-inn-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="inn"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for inn"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ipsec/Manifest b/sec-policy/selinux-ipsec/Manifest
index 9e828f810f41..231399fbf3ec 100644
--- a/sec-policy/selinux-ipsec/Manifest
+++ b/sec-policy/selinux-ipsec/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-ipsec-2.20200818-r2.ebuild 275 BLAKE2B db4d4f1d770e5c2d5b684def941421125797157022bd8b9fd0207be71f8def5b2fb0e867db4bac0693abfa78e6522b2ae0fed464d260d76ed138599952886049 SHA512 5e2ad11884501f1cbe09bce4fc7ca6f5d6cfbc8564e0c1dca433253e815994980f3acce9440546c358536c628fe04ecdf5084a277ca23af1e60cc955bb4b1a35
 EBUILD selinux-ipsec-2.20210203-r1.ebuild 275 BLAKE2B db4d4f1d770e5c2d5b684def941421125797157022bd8b9fd0207be71f8def5b2fb0e867db4bac0693abfa78e6522b2ae0fed464d260d76ed138599952886049 SHA512 5e2ad11884501f1cbe09bce4fc7ca6f5d6cfbc8564e0c1dca433253e815994980f3acce9440546c358536c628fe04ecdf5084a277ca23af1e60cc955bb4b1a35
 EBUILD selinux-ipsec-2.20210908-r1.ebuild 275 BLAKE2B db4d4f1d770e5c2d5b684def941421125797157022bd8b9fd0207be71f8def5b2fb0e867db4bac0693abfa78e6522b2ae0fed464d260d76ed138599952886049 SHA512 5e2ad11884501f1cbe09bce4fc7ca6f5d6cfbc8564e0c1dca433253e815994980f3acce9440546c358536c628fe04ecdf5084a277ca23af1e60cc955bb4b1a35
-EBUILD selinux-ipsec-2.20220106-r1.ebuild 279 BLAKE2B 8727d07e79d91bf81ad8f42d78fd6268e6aec12d4683fac1425470523fa8b92f03fc2a39f245a2ed92f979be363b09f4209cd1435efb68fe5dcc484735271703 SHA512 7253285f4a33d9eb74fd28e09486096abaa58c482dbd2146af5a67f44c5f226579231ffb5318dc8610e5936943b2363d35805761bef871573333ca79bb5a3059
+EBUILD selinux-ipsec-2.20220106-r1.ebuild 277 BLAKE2B ef4d3ec1952ca91eabdaa7c363a15107731520fa1b94cb3cd4c1c5d5b618fe3fcc7a42cc267d9f16fb44e1f154ac32d13f894c035ebd1e91051ecd2936e2c1bf SHA512 edb8c30cf145daa33bb8e5e13b45da97bcc3bbcafb8ff61c3e7f4080b3502e55455b7f90edefbb4f1ac62a96d2eb1b035b1bdcddb46cfceb27af7cd1563387fe
+EBUILD selinux-ipsec-2.20220106-r2.ebuild 279 BLAKE2B 8727d07e79d91bf81ad8f42d78fd6268e6aec12d4683fac1425470523fa8b92f03fc2a39f245a2ed92f979be363b09f4209cd1435efb68fe5dcc484735271703 SHA512 7253285f4a33d9eb74fd28e09486096abaa58c482dbd2146af5a67f44c5f226579231ffb5318dc8610e5936943b2363d35805761bef871573333ca79bb5a3059
 EBUILD selinux-ipsec-9999.ebuild 279 BLAKE2B 7795910f4436dcc659fcbc3c1e05186dc7970ae9412911ffcc20a9357c19b42436367e864dde46ebe0a68e08c799cdf0ef038123b4a920471ae8217076d8c432 SHA512 792b92270ee71edfec841bc5ec53317de8166c60a7c49affb539d2ba8006adf4d8cc0c5f54960f9580ee60d1c588cea1f99d99bc658c00a592982538160e0e3d
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-ipsec/selinux-ipsec-2.20220106-r1.ebuild b/sec-policy/selinux-ipsec/selinux-ipsec-2.20220106-r1.ebuild
index f2d840cc9713..165eeff356f4 100644
--- a/sec-policy/selinux-ipsec/selinux-ipsec-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-ipsec/selinux-ipsec-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ipsec"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ipsec/selinux-ipsec-2.20220106-r2.ebuild b/sec-policy/selinux-ipsec/selinux-ipsec-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..f2d840cc9713
--- /dev/null
+++ b/sec-policy/selinux-ipsec/selinux-ipsec-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="ipsec"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ipsec"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-irc/Manifest b/sec-policy/selinux-irc/Manifest
index 1197e3fac352..bc9fca835643 100644
--- a/sec-policy/selinux-irc/Manifest
+++ b/sec-policy/selinux-irc/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-irc-2.20200818-r2.ebuild 271 BLAKE2B 123e8e9b076a6a83f0ef3e6250491b062aeb8144dd0cfa33aba0ffd4cf9bab1c78e0a509ae4184fdad82c2afc8cfdca24710f32cc8380f23e8c51bc58ee2cbf3 SHA512 1ddc7f4cc5fbffcfee99e2d73b0bb14be1cc2859829a8ad9902e213eb922cfcf83d75aded0294d40102dcb078e51ac465fcbbe31d6703806d872263961dce846
 EBUILD selinux-irc-2.20210203-r1.ebuild 271 BLAKE2B 123e8e9b076a6a83f0ef3e6250491b062aeb8144dd0cfa33aba0ffd4cf9bab1c78e0a509ae4184fdad82c2afc8cfdca24710f32cc8380f23e8c51bc58ee2cbf3 SHA512 1ddc7f4cc5fbffcfee99e2d73b0bb14be1cc2859829a8ad9902e213eb922cfcf83d75aded0294d40102dcb078e51ac465fcbbe31d6703806d872263961dce846
 EBUILD selinux-irc-2.20210908-r1.ebuild 271 BLAKE2B 123e8e9b076a6a83f0ef3e6250491b062aeb8144dd0cfa33aba0ffd4cf9bab1c78e0a509ae4184fdad82c2afc8cfdca24710f32cc8380f23e8c51bc58ee2cbf3 SHA512 1ddc7f4cc5fbffcfee99e2d73b0bb14be1cc2859829a8ad9902e213eb922cfcf83d75aded0294d40102dcb078e51ac465fcbbe31d6703806d872263961dce846
-EBUILD selinux-irc-2.20220106-r1.ebuild 275 BLAKE2B 5330f52ad0ed7ff94a3b9b71802b9411d5c3192bb9290c6783a1011167a7aba0fab0475819e388232cb30c53efaa9c8026d5f988eeed978428a189ff4c6c47b4 SHA512 3457b134ac0050115fbdff93c525a7cbf55f377718832331922e2cc5d9111fbdd46c37793456a98af5fd8345d33bf84efeb1b14b014b42565646e6dee0cc80f1
+EBUILD selinux-irc-2.20220106-r1.ebuild 273 BLAKE2B 06375a2930f595d4bd6c83c54e18657e970a0bccc43a1c0169ed48f7960ef57e6df1180af37b52aea875a877ee166c01071886d87f7c706b968032d98f29f0da SHA512 4855be25b3127cd4d288a028c994909fce04179cd25b1afd480df79930e74d2411db8aa2846fc9b2b0cf2be43844e52fe6637e015cb27cd4dea35519a297f99b
+EBUILD selinux-irc-2.20220106-r2.ebuild 275 BLAKE2B 5330f52ad0ed7ff94a3b9b71802b9411d5c3192bb9290c6783a1011167a7aba0fab0475819e388232cb30c53efaa9c8026d5f988eeed978428a189ff4c6c47b4 SHA512 3457b134ac0050115fbdff93c525a7cbf55f377718832331922e2cc5d9111fbdd46c37793456a98af5fd8345d33bf84efeb1b14b014b42565646e6dee0cc80f1
 EBUILD selinux-irc-9999.ebuild 275 BLAKE2B 6c0defd2ab9e2aadf22463021df11ffcc609019d1b9d1fac559ca3a29b01ccfee821ab5b16ae9f9591c187a245ae838b6c689fc2e32f72fbe1b7e8823b1cd501 SHA512 22e9e6d7840ef38dd1799b2bb742a9700e947fee876d30f614f9afca81759736cf6b184aa490e436163511761e76df430b60bddb86715b8afe6e4d57ac1ab230
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-irc/selinux-irc-2.20220106-r1.ebuild b/sec-policy/selinux-irc/selinux-irc-2.20220106-r1.ebuild
index ee7e0484b3df..8df24c9a6836 100644
--- a/sec-policy/selinux-irc/selinux-irc-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-irc/selinux-irc-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for irc"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-irc/selinux-irc-2.20220106-r2.ebuild b/sec-policy/selinux-irc/selinux-irc-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..ee7e0484b3df
--- /dev/null
+++ b/sec-policy/selinux-irc/selinux-irc-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="irc"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for irc"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ircd/Manifest b/sec-policy/selinux-ircd/Manifest
index 4115fdbe53bc..06d819d1ea83 100644
--- a/sec-policy/selinux-ircd/Manifest
+++ b/sec-policy/selinux-ircd/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-ircd-2.20200818-r2.ebuild 273 BLAKE2B 2188b13713ef0e7cd74473ae91af1e48effc9011502142e0814d2a1c8ef64673eb92844f70aaea101e75585628809fb0ad40a3fe93fab90e5f50c3599791fa7a SHA512 d13573af031131c3559b904fc8241e5ed3b48ff275fef8b8917fc1f4087956a78a0cdd55796bed672328d8deecaaae4e1d1e55b56f327e13afd933754e66c678
 EBUILD selinux-ircd-2.20210203-r1.ebuild 273 BLAKE2B 2188b13713ef0e7cd74473ae91af1e48effc9011502142e0814d2a1c8ef64673eb92844f70aaea101e75585628809fb0ad40a3fe93fab90e5f50c3599791fa7a SHA512 d13573af031131c3559b904fc8241e5ed3b48ff275fef8b8917fc1f4087956a78a0cdd55796bed672328d8deecaaae4e1d1e55b56f327e13afd933754e66c678
 EBUILD selinux-ircd-2.20210908-r1.ebuild 273 BLAKE2B 2188b13713ef0e7cd74473ae91af1e48effc9011502142e0814d2a1c8ef64673eb92844f70aaea101e75585628809fb0ad40a3fe93fab90e5f50c3599791fa7a SHA512 d13573af031131c3559b904fc8241e5ed3b48ff275fef8b8917fc1f4087956a78a0cdd55796bed672328d8deecaaae4e1d1e55b56f327e13afd933754e66c678
-EBUILD selinux-ircd-2.20220106-r1.ebuild 277 BLAKE2B 2e7a580853ef8db68e7d857bd85d734fe89c56349d979f3e569c6284700bc0612f34f857c0147c86136f8aadea7fb62915e37591e1b5d26bdbdc633e47f97090 SHA512 f5f8da365167d817bc5bf50c497c6dfecfacd781f1f630770d47c25100a8d811709d6e71ebfb60c3220a91a18737d451a0a4c6f355e9a3f4b39b9db76258d95a
+EBUILD selinux-ircd-2.20220106-r1.ebuild 275 BLAKE2B 163a9db03abfd996b572251eabcc68ce7aa268c55fd4456298362edc71f4f845ea38af303192d9a248ea580dcf120740ca2884dba767ab970811b1fe192cf95a SHA512 01150a7110ffcfe927b581d5d4812d7fb82df28df6abc26b03d412573c5252ba8df10fa1446e13d9acf77c2d3d09d9e779b0e292b516383c2449b2ed8d6d359c
+EBUILD selinux-ircd-2.20220106-r2.ebuild 277 BLAKE2B 2e7a580853ef8db68e7d857bd85d734fe89c56349d979f3e569c6284700bc0612f34f857c0147c86136f8aadea7fb62915e37591e1b5d26bdbdc633e47f97090 SHA512 f5f8da365167d817bc5bf50c497c6dfecfacd781f1f630770d47c25100a8d811709d6e71ebfb60c3220a91a18737d451a0a4c6f355e9a3f4b39b9db76258d95a
 EBUILD selinux-ircd-9999.ebuild 277 BLAKE2B 2eb4c999c9d8974045f41cb7f3aa3f4b24416c05295f5dc48c90e1e10da94ffd3a072a5a348174651cdd4dbf028a21b69cb02d9a113a4e4e0cc92c68218dc2b3 SHA512 cf0792f13e7f673d86cf426305a89d0f381287e38931677572a91857281216663f103c3a6d4ff9462ca362f8bea7e0a45b31c5168c9c95961b257df5aac51381
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-ircd/selinux-ircd-2.20220106-r1.ebuild b/sec-policy/selinux-ircd/selinux-ircd-2.20220106-r1.ebuild
index 30cb6e34ddb8..dce8e1527c9b 100644
--- a/sec-policy/selinux-ircd/selinux-ircd-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-ircd/selinux-ircd-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ircd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ircd/selinux-ircd-2.20220106-r2.ebuild b/sec-policy/selinux-ircd/selinux-ircd-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..30cb6e34ddb8
--- /dev/null
+++ b/sec-policy/selinux-ircd/selinux-ircd-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="ircd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ircd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-irqbalance/Manifest b/sec-policy/selinux-irqbalance/Manifest
index ec6046256375..ec24d0f98376 100644
--- a/sec-policy/selinux-irqbalance/Manifest
+++ b/sec-policy/selinux-irqbalance/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-irqbalance-2.20200818-r2.ebuild 285 BLAKE2B e8d476f201aa36d4b439ae9457e71c2154d48c21aa934846d7ffb154045a06fe90e03b95a088901abc20e97c104d2329423d1a7dc354aab011815b3cf43ad3fe SHA512 4d65cdbcb4d4bda6c078336af7003f273ef643ceac078f8a5ea6ec9bbdae69cc0850ff7fff3977535c3d2b4f26d2489f5bff572b992cb99ed091e2c39b97c2ed
 EBUILD selinux-irqbalance-2.20210203-r1.ebuild 285 BLAKE2B e8d476f201aa36d4b439ae9457e71c2154d48c21aa934846d7ffb154045a06fe90e03b95a088901abc20e97c104d2329423d1a7dc354aab011815b3cf43ad3fe SHA512 4d65cdbcb4d4bda6c078336af7003f273ef643ceac078f8a5ea6ec9bbdae69cc0850ff7fff3977535c3d2b4f26d2489f5bff572b992cb99ed091e2c39b97c2ed
 EBUILD selinux-irqbalance-2.20210908-r1.ebuild 285 BLAKE2B e8d476f201aa36d4b439ae9457e71c2154d48c21aa934846d7ffb154045a06fe90e03b95a088901abc20e97c104d2329423d1a7dc354aab011815b3cf43ad3fe SHA512 4d65cdbcb4d4bda6c078336af7003f273ef643ceac078f8a5ea6ec9bbdae69cc0850ff7fff3977535c3d2b4f26d2489f5bff572b992cb99ed091e2c39b97c2ed
-EBUILD selinux-irqbalance-2.20220106-r1.ebuild 289 BLAKE2B 0546a377023c918865012791e3362ef3bf47011cca6ae171e648e919fcfd2e6b50c169157be708da5fc37ff9445b5a00bdb569b14ae8bf29f3976644e0d7aed6 SHA512 392bf1e47156792188ee981e8c90ee3011ff0a9659d783f1fa39a48fdf78fb54a5eeb4f5b27e8eedd7ef5fc2188c9b790889d29a63960bb58dc5013996cfed40
+EBUILD selinux-irqbalance-2.20220106-r1.ebuild 287 BLAKE2B 3846d9c35bd350a2e72d8c17dbdb098c20f246f2e7dcc277c25545316a740d7f6ff233e0217a62fa76b2c8191d110851634b58ba5bb29f10acdc4d74a8258315 SHA512 7f879a93125ad92d4e94508a0678d15f57b2a641c87f85c6a083d0fe1e5bdaea13f828dc713c4f9df46215fc14e3da6942c46f30a82d7fde05f01bdecd806ef2
+EBUILD selinux-irqbalance-2.20220106-r2.ebuild 289 BLAKE2B 0546a377023c918865012791e3362ef3bf47011cca6ae171e648e919fcfd2e6b50c169157be708da5fc37ff9445b5a00bdb569b14ae8bf29f3976644e0d7aed6 SHA512 392bf1e47156792188ee981e8c90ee3011ff0a9659d783f1fa39a48fdf78fb54a5eeb4f5b27e8eedd7ef5fc2188c9b790889d29a63960bb58dc5013996cfed40
 EBUILD selinux-irqbalance-9999.ebuild 289 BLAKE2B 40f3836b08174b9cc65fdd3baaec38215ebf0e5b33d122a5a159d498809438aa5ae74221127657f37789a6201f022b1f058ef7ddb6b0bf8fd775eb1898c490ae SHA512 2e37281b4ee4a19e372a1bbdd493e0524d930024adb6e5bd4f612b28818bf80ba15dc9ecb38acdbaa7c479746db668cd11c85277050557c12f6818d2d56a113b
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20220106-r1.ebuild b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20220106-r1.ebuild
index 7da8ffd5c16e..a9424ddb7b02 100644
--- a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for irqbalance"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20220106-r2.ebuild b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..7da8ffd5c16e
--- /dev/null
+++ b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="irqbalance"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for irqbalance"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-jabber/Manifest b/sec-policy/selinux-jabber/Manifest
index ac272aab399d..f72d02e169e4 100644
--- a/sec-policy/selinux-jabber/Manifest
+++ b/sec-policy/selinux-jabber/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-jabber-2.20200818-r2.ebuild 277 BLAKE2B 8d7dad95179be088a55829cc3d0ad7ffec5bb5c2e66007e16853674f1efba1a6d284459872daa63aad9551264ceb9af14d8952885028c75d3cbf4bde95b7bbfc SHA512 83394e2f59fa55fb22dcd2224a7fcab30b7421719af6fff08e7364aef0ae94e4125355af00b90003db9476a9111b73611e41da132eb8b55a09a7883886e6b6bc
 EBUILD selinux-jabber-2.20210203-r1.ebuild 277 BLAKE2B 8d7dad95179be088a55829cc3d0ad7ffec5bb5c2e66007e16853674f1efba1a6d284459872daa63aad9551264ceb9af14d8952885028c75d3cbf4bde95b7bbfc SHA512 83394e2f59fa55fb22dcd2224a7fcab30b7421719af6fff08e7364aef0ae94e4125355af00b90003db9476a9111b73611e41da132eb8b55a09a7883886e6b6bc
 EBUILD selinux-jabber-2.20210908-r1.ebuild 277 BLAKE2B 8d7dad95179be088a55829cc3d0ad7ffec5bb5c2e66007e16853674f1efba1a6d284459872daa63aad9551264ceb9af14d8952885028c75d3cbf4bde95b7bbfc SHA512 83394e2f59fa55fb22dcd2224a7fcab30b7421719af6fff08e7364aef0ae94e4125355af00b90003db9476a9111b73611e41da132eb8b55a09a7883886e6b6bc
-EBUILD selinux-jabber-2.20220106-r1.ebuild 281 BLAKE2B 73e567dea0eee4a3080723f89b46916ab239e31cec1e5b6e725cad7f588910a79ac29481d455f8f52f2377959cb87a35691704bb8014e507621146e04dba7b14 SHA512 53e3195ec16c0ddc6925c0c1fff2a236ec575dfb913da476d55163cd5d3481f46c67a25d727a5a3b188779ab0134991feb72dc714e4d5be3b8aef11ddbf24eb7
+EBUILD selinux-jabber-2.20220106-r1.ebuild 279 BLAKE2B b37776496a1a9840640ec926a315cf39d61b64185f8d8cce9addb85599caeed1434c4dc5dbaecc6f7fa960677dc7d5dae3353387192d40c34daa3dd4094369f6 SHA512 03821b0552b35dcc828683fbee3ddb709bed53f3b24304561fc892fb9c139281b9d4f3865170be75d9722bba4bc9a01f163f1778867f60d1f39c32f095bb5d62
+EBUILD selinux-jabber-2.20220106-r2.ebuild 281 BLAKE2B 73e567dea0eee4a3080723f89b46916ab239e31cec1e5b6e725cad7f588910a79ac29481d455f8f52f2377959cb87a35691704bb8014e507621146e04dba7b14 SHA512 53e3195ec16c0ddc6925c0c1fff2a236ec575dfb913da476d55163cd5d3481f46c67a25d727a5a3b188779ab0134991feb72dc714e4d5be3b8aef11ddbf24eb7
 EBUILD selinux-jabber-9999.ebuild 281 BLAKE2B 07e2ecb70fe5431cddacbd6554f4675ebcd06ae4aab79d540e6452d70a2228ebf7ff83a73612eaa32d2e633207755b7e2cb7035fbacc48a90776d397bc994dee SHA512 d1783b61035a6ec6fe657edeb33b2fae5720bddd593b4ba3aa618a9c7a7a3b21e2868b774ef3df9f61ecf96a5e8bc22c2770f957fd3c597b4139156fca677b80
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-jabber/selinux-jabber-2.20220106-r1.ebuild b/sec-policy/selinux-jabber/selinux-jabber-2.20220106-r1.ebuild
index 6dd4b32d4cdc..554c1ea8915d 100644
--- a/sec-policy/selinux-jabber/selinux-jabber-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-jabber/selinux-jabber-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for jabber"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-jabber/selinux-jabber-2.20220106-r2.ebuild b/sec-policy/selinux-jabber/selinux-jabber-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..6dd4b32d4cdc
--- /dev/null
+++ b/sec-policy/selinux-jabber/selinux-jabber-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="jabber"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for jabber"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-java/Manifest b/sec-policy/selinux-java/Manifest
index 61bb7dc67ff3..51905c0b1b10 100644
--- a/sec-policy/selinux-java/Manifest
+++ b/sec-policy/selinux-java/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-java-2.20200818-r2.ebuild 277 BLAKE2B 449706b777496f1e4d98ec4bcb5dbd792bf5c2ca9f1bd70298f6cc6af1c26ff6a6e19863202d4fd469b78283ee3ea3b3e4ffedd0cec8664816b4c307c6790f20 SHA512 34c7d25ca0ef1e1b8a566feabe0ae3d15bc962f194806cd8792657fd7caecffa6e986fef72d9c4bbe00749c522489d46392ea7d01f19421a41bcd4ba8ebe02be
 EBUILD selinux-java-2.20210203-r1.ebuild 277 BLAKE2B 449706b777496f1e4d98ec4bcb5dbd792bf5c2ca9f1bd70298f6cc6af1c26ff6a6e19863202d4fd469b78283ee3ea3b3e4ffedd0cec8664816b4c307c6790f20 SHA512 34c7d25ca0ef1e1b8a566feabe0ae3d15bc962f194806cd8792657fd7caecffa6e986fef72d9c4bbe00749c522489d46392ea7d01f19421a41bcd4ba8ebe02be
 EBUILD selinux-java-2.20210908-r1.ebuild 277 BLAKE2B 449706b777496f1e4d98ec4bcb5dbd792bf5c2ca9f1bd70298f6cc6af1c26ff6a6e19863202d4fd469b78283ee3ea3b3e4ffedd0cec8664816b4c307c6790f20 SHA512 34c7d25ca0ef1e1b8a566feabe0ae3d15bc962f194806cd8792657fd7caecffa6e986fef72d9c4bbe00749c522489d46392ea7d01f19421a41bcd4ba8ebe02be
-EBUILD selinux-java-2.20220106-r1.ebuild 281 BLAKE2B 6db21e1cea93e437aeb12cb947b4873e05e7d43844f23c4845e4318f16444b1fc460b3dbba4b68f1f0f78688d8bad88418afe6a4cf82126240e659359507c03c SHA512 3cf3c629b233ab006b6aabe278d346e91d8ea4109e574afa2146602e0c14c2e684b7f60acc0f2c8639f039f87551396d10d01567dbf17f479272a9c74c9947fe
+EBUILD selinux-java-2.20220106-r1.ebuild 279 BLAKE2B 2b8e15c13a6fa9f167ec12ab5d9aeafc7b00e9e656c2d074063b7d4e1514a7ac13b38dd84ca55267ffa39793a531ac35fa3f17a6d26722efdfbfb96d04962f87 SHA512 078b1088af9ac3285e4ebd3b63e751778090521823bdb57baddf7fbf997f877b6470e88807956e48d4527926a4fc2dcee59e92686265b2070ab3019fe033145e
+EBUILD selinux-java-2.20220106-r2.ebuild 281 BLAKE2B 6db21e1cea93e437aeb12cb947b4873e05e7d43844f23c4845e4318f16444b1fc460b3dbba4b68f1f0f78688d8bad88418afe6a4cf82126240e659359507c03c SHA512 3cf3c629b233ab006b6aabe278d346e91d8ea4109e574afa2146602e0c14c2e684b7f60acc0f2c8639f039f87551396d10d01567dbf17f479272a9c74c9947fe
 EBUILD selinux-java-9999.ebuild 281 BLAKE2B 263b9af6da0c547ebf5f09ee342b85315c80919c9f8ca3214f35a815d595f977956c6ef378eff01ad67aa94d7c33d5a8f2d9e6430309751e494f9ad6fdc88f27 SHA512 e81666732d2887f85c30b97db8b5a70a8c6924c3b84ae01e7d327f279a85745ad821200a3b9d37ed363c45770c711135b2b20d804d398902a2041881385c742c
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-java/selinux-java-2.20220106-r1.ebuild b/sec-policy/selinux-java/selinux-java-2.20220106-r1.ebuild
index 67e17f351108..d7a04e48a83d 100644
--- a/sec-policy/selinux-java/selinux-java-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-java/selinux-java-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for java"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-java/selinux-java-2.20220106-r2.ebuild b/sec-policy/selinux-java/selinux-java-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..67e17f351108
--- /dev/null
+++ b/sec-policy/selinux-java/selinux-java-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE="alsa"
+MODS="java"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for java"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-kdeconnect/Manifest b/sec-policy/selinux-kdeconnect/Manifest
index 519f1fdd3933..b3afa0082b96 100644
--- a/sec-policy/selinux-kdeconnect/Manifest
+++ b/sec-policy/selinux-kdeconnect/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-kdeconnect-2.20200818-r2.ebuild 285 BLAKE2B e585c0cd108e837836c5aa9f229820c067f64973fab7a8a5401b5079b041eea67f1211b9bc4b037f81f690d7cc4f458cd405d03446041d8b6db9eeff0234e9d2 SHA512 8a895c7cb0de474bf46be7ca3fb7d13d93820e5bc349489973b3dd9f603a359a240b670e6f7faa24697c7fd062fe840f416c7ca873591118661dcaaba4b996b7
 EBUILD selinux-kdeconnect-2.20210203-r1.ebuild 285 BLAKE2B e585c0cd108e837836c5aa9f229820c067f64973fab7a8a5401b5079b041eea67f1211b9bc4b037f81f690d7cc4f458cd405d03446041d8b6db9eeff0234e9d2 SHA512 8a895c7cb0de474bf46be7ca3fb7d13d93820e5bc349489973b3dd9f603a359a240b670e6f7faa24697c7fd062fe840f416c7ca873591118661dcaaba4b996b7
 EBUILD selinux-kdeconnect-2.20210908-r1.ebuild 285 BLAKE2B e585c0cd108e837836c5aa9f229820c067f64973fab7a8a5401b5079b041eea67f1211b9bc4b037f81f690d7cc4f458cd405d03446041d8b6db9eeff0234e9d2 SHA512 8a895c7cb0de474bf46be7ca3fb7d13d93820e5bc349489973b3dd9f603a359a240b670e6f7faa24697c7fd062fe840f416c7ca873591118661dcaaba4b996b7
-EBUILD selinux-kdeconnect-2.20220106-r1.ebuild 289 BLAKE2B 690ecb132822731551165aab200e4496e39ce9014ed32a6be83eabf1ebd59f366c6cb7dde44124f938096e6acf783957e0418d1df18887dfd98f06c2db520c1f SHA512 83f336c592de55224c2ce3d71fcb6c04632e1899a905d41ed43cc0d50fc2f494a901b7ec73aa6ab4d1ad32f4f446a855b6349b0fe0015836b9f2f0e2ba54d268
+EBUILD selinux-kdeconnect-2.20220106-r1.ebuild 287 BLAKE2B cf05acf7fff64f9d305f11950f94abde575bc3b0c18849512c28c64d28b4167b1f4c3041b2b3363e16f5b518f1b8fc55f588a8f3b06279b6d06e72beb94960c5 SHA512 8925a5be210afc2831013fcd6d0ea1a7d09414ff3bd2e8b294a9b8dabfc10746ec95d4fbe7ffc8bfd6e513140a9c89d17627cd286cb42b950f9621bddbc64e75
+EBUILD selinux-kdeconnect-2.20220106-r2.ebuild 289 BLAKE2B 690ecb132822731551165aab200e4496e39ce9014ed32a6be83eabf1ebd59f366c6cb7dde44124f938096e6acf783957e0418d1df18887dfd98f06c2db520c1f SHA512 83f336c592de55224c2ce3d71fcb6c04632e1899a905d41ed43cc0d50fc2f494a901b7ec73aa6ab4d1ad32f4f446a855b6349b0fe0015836b9f2f0e2ba54d268
 EBUILD selinux-kdeconnect-9999.ebuild 289 BLAKE2B 4975bf7031973bef3c7445c4bd93bd06c15d9ee2a5c2a541a864362a5fc1adbeb978c0b1aaee6b1452daef2700becad757c39e09acf8f3d26a01bc597320a86c SHA512 6b9ef0fea4564b061b63878725ca35bfc17c757f319be61286b31aefa118ba6b2107639d4c123fd8b46a02ddccce476db80107a5e15fa40e96c222b18a154b37
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20220106-r1.ebuild b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20220106-r1.ebuild
index 8e098fe5b59b..a4e0a40d9c67 100644
--- a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for kdeconnect"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20220106-r2.ebuild b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..8e098fe5b59b
--- /dev/null
+++ b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="kdeconnect"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for kdeconnect"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-kdump/Manifest b/sec-policy/selinux-kdump/Manifest
index ef1ec39df777..e9df2ebf5ac8 100644
--- a/sec-policy/selinux-kdump/Manifest
+++ b/sec-policy/selinux-kdump/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-kdump-2.20200818-r2.ebuild 275 BLAKE2B d04503579c47b93d8f7217638ee63d14515147eb9cee4465d41cb2f9a58b5bb86f789b1885aa846018876936414534dcc3b81b10a473e8227f6ff020cd05a77c SHA512 683d32f1e3dfd8bd0d17f9b93870e4509d202d8c3f099fefbe847606daa71f89d99e5e87b402a57d8f58612f29acb2fdfae81e5801dea246b37292d017c41e06
 EBUILD selinux-kdump-2.20210203-r1.ebuild 275 BLAKE2B d04503579c47b93d8f7217638ee63d14515147eb9cee4465d41cb2f9a58b5bb86f789b1885aa846018876936414534dcc3b81b10a473e8227f6ff020cd05a77c SHA512 683d32f1e3dfd8bd0d17f9b93870e4509d202d8c3f099fefbe847606daa71f89d99e5e87b402a57d8f58612f29acb2fdfae81e5801dea246b37292d017c41e06
 EBUILD selinux-kdump-2.20210908-r1.ebuild 275 BLAKE2B d04503579c47b93d8f7217638ee63d14515147eb9cee4465d41cb2f9a58b5bb86f789b1885aa846018876936414534dcc3b81b10a473e8227f6ff020cd05a77c SHA512 683d32f1e3dfd8bd0d17f9b93870e4509d202d8c3f099fefbe847606daa71f89d99e5e87b402a57d8f58612f29acb2fdfae81e5801dea246b37292d017c41e06
-EBUILD selinux-kdump-2.20220106-r1.ebuild 279 BLAKE2B d2809bfe4926bb09b9052bb0c1699f0efa9749d49b9938197d11935c0e82c90e9eda47446c17c85847acbf854fc5d0a37ff251b6eceb1a9134baabd1e50d53d9 SHA512 22a0a0d3b6d34c09098a4633db3bd1abc5861c9b6f473dce859e0ad391650c2138ed686817e1ef5026c15820da5c042c290f33d2bc7b56365e32a13bf1f23cbc
+EBUILD selinux-kdump-2.20220106-r1.ebuild 277 BLAKE2B 39eaff54313bd9d149862c15cacdd1eeedead313698b304f47fdce52d7ab39b023f1b1f0fbddd284a0048a26d9843d860c9e3bc21aa59504182d07fb8c33939c SHA512 4711020e87d01e86c78ee56457d3076b4fa74db17ed46054f98f3d8dbb017085853a4cf77f97c8c31b91795d5851f9708bbf5266103e208f8f52232a3861011f
+EBUILD selinux-kdump-2.20220106-r2.ebuild 279 BLAKE2B d2809bfe4926bb09b9052bb0c1699f0efa9749d49b9938197d11935c0e82c90e9eda47446c17c85847acbf854fc5d0a37ff251b6eceb1a9134baabd1e50d53d9 SHA512 22a0a0d3b6d34c09098a4633db3bd1abc5861c9b6f473dce859e0ad391650c2138ed686817e1ef5026c15820da5c042c290f33d2bc7b56365e32a13bf1f23cbc
 EBUILD selinux-kdump-9999.ebuild 279 BLAKE2B 8b091fe1bfdabdd20b09b95e7a73899f7b96fc934b0ba9710e279dfb352f8d3c44f17fd967e72690abc02302008a9b5e556be73f6daa65385cca03af69333766 SHA512 6fbe18dd517461c3d2bc9fbddb957e0bbba017b6e434b8ad963e573997549ac74d81874c4b33d163250ee96f510b92258a78808a383d5313db0138cb7353e7ea
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-kdump/selinux-kdump-2.20220106-r1.ebuild b/sec-policy/selinux-kdump/selinux-kdump-2.20220106-r1.ebuild
index 91c80d2ceba3..70f6be196d8a 100644
--- a/sec-policy/selinux-kdump/selinux-kdump-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-kdump/selinux-kdump-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for kdump"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-kdump/selinux-kdump-2.20220106-r2.ebuild b/sec-policy/selinux-kdump/selinux-kdump-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..91c80d2ceba3
--- /dev/null
+++ b/sec-policy/selinux-kdump/selinux-kdump-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="kdump"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for kdump"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-kerberos/Manifest b/sec-policy/selinux-kerberos/Manifest
index fbdcfecad600..6597e9db26b8 100644
--- a/sec-policy/selinux-kerberos/Manifest
+++ b/sec-policy/selinux-kerberos/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-kerberos-2.20200818-r2.ebuild 281 BLAKE2B 11d783ad3151688c53b2f16f181c7ec1bf9bc88c3d53091e026b1769d47bdff16c49462ea800f4a72a70858d3ba278d748e52735adeca018bfa66b99f5ae2739 SHA512 6be503cf0caa7225b3106f9f8b903f29f2b656d92aabd2369ba56a2ecb0ee162b3cf5e579f09b13aa7864276c50cc519e106b411529a18a283e2e7613c1bfa71
 EBUILD selinux-kerberos-2.20210203-r1.ebuild 281 BLAKE2B 11d783ad3151688c53b2f16f181c7ec1bf9bc88c3d53091e026b1769d47bdff16c49462ea800f4a72a70858d3ba278d748e52735adeca018bfa66b99f5ae2739 SHA512 6be503cf0caa7225b3106f9f8b903f29f2b656d92aabd2369ba56a2ecb0ee162b3cf5e579f09b13aa7864276c50cc519e106b411529a18a283e2e7613c1bfa71
 EBUILD selinux-kerberos-2.20210908-r1.ebuild 281 BLAKE2B 11d783ad3151688c53b2f16f181c7ec1bf9bc88c3d53091e026b1769d47bdff16c49462ea800f4a72a70858d3ba278d748e52735adeca018bfa66b99f5ae2739 SHA512 6be503cf0caa7225b3106f9f8b903f29f2b656d92aabd2369ba56a2ecb0ee162b3cf5e579f09b13aa7864276c50cc519e106b411529a18a283e2e7613c1bfa71
-EBUILD selinux-kerberos-2.20220106-r1.ebuild 285 BLAKE2B b2575eba9bc05ca8b577fcca40fb80566dba31e8097f0eed4098b302fcab71d22bce318539c5d8ca9930a366df1bd4c9e37843ea52a2f11bce820ba2ee8c96ea SHA512 e3dc5af19f0ba7c813e9e6cd356681587ce40eaba7ca6536106b3837ef27ff4d09bd65b571902128a0e8e38099335290a9b62f6d7af612638a6c9e90a9511a89
+EBUILD selinux-kerberos-2.20220106-r1.ebuild 283 BLAKE2B 5241a73563c0a889c3e2baf0917d4c536339be830bd76eb48b6c9c6906c5eefc3d3bf390359d35d8e848311a7dfd89d310e31eda684422dd2d87cafc38f0e148 SHA512 9768584146accedaf7c7202b649c25ea6a4d78fc368c1fbed970765f9d5ba4705e3be7f7ff1261b57dc3a7ce8e00956be1741844b3340a29cc7b2241e0cae32c
+EBUILD selinux-kerberos-2.20220106-r2.ebuild 285 BLAKE2B b2575eba9bc05ca8b577fcca40fb80566dba31e8097f0eed4098b302fcab71d22bce318539c5d8ca9930a366df1bd4c9e37843ea52a2f11bce820ba2ee8c96ea SHA512 e3dc5af19f0ba7c813e9e6cd356681587ce40eaba7ca6536106b3837ef27ff4d09bd65b571902128a0e8e38099335290a9b62f6d7af612638a6c9e90a9511a89
 EBUILD selinux-kerberos-9999.ebuild 285 BLAKE2B b602fbcdb4668de36bf0c8c4780adc2acc6227ab911658ef9f1e9bbb77a8af27c029666caff278043c95f8598df10dc41ebf5d7166374d428637f54ca66a8c3d SHA512 fa439ad23e02d2398a8e6ba9fe7a5efb8ee03e45504b0276adfdcb6809e48f82c39893b7928f0399a90134c57b3fce8d88d41d7bff28b500f5c736f0a413b2f1
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-kerberos/selinux-kerberos-2.20220106-r1.ebuild b/sec-policy/selinux-kerberos/selinux-kerberos-2.20220106-r1.ebuild
index 0af5c7d4dc61..a9fb87c73c6e 100644
--- a/sec-policy/selinux-kerberos/selinux-kerberos-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-kerberos/selinux-kerberos-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for kerberos"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-kerberos/selinux-kerberos-2.20220106-r2.ebuild b/sec-policy/selinux-kerberos/selinux-kerberos-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..0af5c7d4dc61
--- /dev/null
+++ b/sec-policy/selinux-kerberos/selinux-kerberos-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="kerberos"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for kerberos"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-kerneloops/Manifest b/sec-policy/selinux-kerneloops/Manifest
index f00ee6733923..511b5a262561 100644
--- a/sec-policy/selinux-kerneloops/Manifest
+++ b/sec-policy/selinux-kerneloops/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-kerneloops-2.20200818-r2.ebuild 285 BLAKE2B 7dd60aa66eb5d0e57e73d3a05eec8a28c0b71332a8b6ee5f51625d6498d94065bd03e2274e2c2a7967c095b70b2bbfbeaf169b497abc9625775143e787f3b6dc SHA512 fb3c473485230e31950a072d93912aa955844e7a703eb33e0e97b61a5564d077eb162a265c52b2712d836713797813bcdde6c57dea9c6982047d8c1001434e1c
 EBUILD selinux-kerneloops-2.20210203-r1.ebuild 285 BLAKE2B 7dd60aa66eb5d0e57e73d3a05eec8a28c0b71332a8b6ee5f51625d6498d94065bd03e2274e2c2a7967c095b70b2bbfbeaf169b497abc9625775143e787f3b6dc SHA512 fb3c473485230e31950a072d93912aa955844e7a703eb33e0e97b61a5564d077eb162a265c52b2712d836713797813bcdde6c57dea9c6982047d8c1001434e1c
 EBUILD selinux-kerneloops-2.20210908-r1.ebuild 285 BLAKE2B 7dd60aa66eb5d0e57e73d3a05eec8a28c0b71332a8b6ee5f51625d6498d94065bd03e2274e2c2a7967c095b70b2bbfbeaf169b497abc9625775143e787f3b6dc SHA512 fb3c473485230e31950a072d93912aa955844e7a703eb33e0e97b61a5564d077eb162a265c52b2712d836713797813bcdde6c57dea9c6982047d8c1001434e1c
-EBUILD selinux-kerneloops-2.20220106-r1.ebuild 289 BLAKE2B 7ec51389e9a794759b95d1c372a7b77959e90b9b8ab15e7c6e00fdb6d44db9c8871876600cb709464e45fc3621cf0b531a364654d6dd9f2ffaeeb661c3213ae8 SHA512 6070bdfc8759813308effaba371217020f16d0524b4d918e58aae964dc6adaa6da03ed57f8fbfb4f7f311555f6a68a495124d0aab4479f7fb285ebe27376d2ee
+EBUILD selinux-kerneloops-2.20220106-r1.ebuild 287 BLAKE2B 76feeb6179a5fe6301366da6bbe766722b9241dce5dc03936651c57af1cd7a92f740209506e767ff3b82b13b6b4b18c4cc9a668110bb452d0c992db737733c52 SHA512 e0e0a1e3394b22c5bd636ebfc1a9c131bf396f27546b1449a6588682d25a23dce3bb6a68ea25f17b8bc116fb5f72b3e02246e43c1c561785243e1134ff117461
+EBUILD selinux-kerneloops-2.20220106-r2.ebuild 289 BLAKE2B 7ec51389e9a794759b95d1c372a7b77959e90b9b8ab15e7c6e00fdb6d44db9c8871876600cb709464e45fc3621cf0b531a364654d6dd9f2ffaeeb661c3213ae8 SHA512 6070bdfc8759813308effaba371217020f16d0524b4d918e58aae964dc6adaa6da03ed57f8fbfb4f7f311555f6a68a495124d0aab4479f7fb285ebe27376d2ee
 EBUILD selinux-kerneloops-9999.ebuild 289 BLAKE2B d20868a80db1527350ae485c047688c4a04ade9a0f6a6abe8feb6045948e90aa56edba4bc9ffeb4259c736152e7a9daa8ac5234fb37d15314f89cbd4c6acd456 SHA512 802c2c5239102d398fec4e3727bc3029f884762c35a1312e934124ade2d78866f61a4c1ac70e1487ed6c47c222c7c277446e26e8fe109ce362494d3f8f1ce185
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20220106-r1.ebuild b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20220106-r1.ebuild
index e297d53ad7de..6f08c09e13e9 100644
--- a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for kerneloops"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20220106-r2.ebuild b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..e297d53ad7de
--- /dev/null
+++ b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="kerneloops"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for kerneloops"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-kismet/Manifest b/sec-policy/selinux-kismet/Manifest
index 0323f2dcc178..566909fd4917 100644
--- a/sec-policy/selinux-kismet/Manifest
+++ b/sec-policy/selinux-kismet/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-kismet-2.20200818-r2.ebuild 277 BLAKE2B a65aa546f64fb27da49113baa65ea2b5f4ddd9ac228c2c7c5b370bee47218ed5d69142e024e8580ac517a8994a2cd6aeaac8e6499157143d43468b78e3604120 SHA512 850a882a8c24c4bbe88f6894a4d19546e989e62d5e18a8e37176f5642e302fdbe047764faa03b6e9d5a4713316de4a97c6a62437b4204c7e13ae65c2ba9cfa64
 EBUILD selinux-kismet-2.20210203-r1.ebuild 277 BLAKE2B a65aa546f64fb27da49113baa65ea2b5f4ddd9ac228c2c7c5b370bee47218ed5d69142e024e8580ac517a8994a2cd6aeaac8e6499157143d43468b78e3604120 SHA512 850a882a8c24c4bbe88f6894a4d19546e989e62d5e18a8e37176f5642e302fdbe047764faa03b6e9d5a4713316de4a97c6a62437b4204c7e13ae65c2ba9cfa64
 EBUILD selinux-kismet-2.20210908-r1.ebuild 277 BLAKE2B a65aa546f64fb27da49113baa65ea2b5f4ddd9ac228c2c7c5b370bee47218ed5d69142e024e8580ac517a8994a2cd6aeaac8e6499157143d43468b78e3604120 SHA512 850a882a8c24c4bbe88f6894a4d19546e989e62d5e18a8e37176f5642e302fdbe047764faa03b6e9d5a4713316de4a97c6a62437b4204c7e13ae65c2ba9cfa64
-EBUILD selinux-kismet-2.20220106-r1.ebuild 281 BLAKE2B 44958aafb87b937f064f58d5c41c329c52efabcf55d9d82b7ded3b3db990a9f02dfa7a7a92cb851583405f6b9dbd3fd99438c48ca69d7d00c5053111b14c9978 SHA512 2054dfd8db6cd2211dca0ba271602eb25a0299eb1d46bce0c41052b5ee37f11cc0791b90e3f5391816011be1bdcf346e4b1faa147e9e88bdeafea6055c2d8064
+EBUILD selinux-kismet-2.20220106-r1.ebuild 279 BLAKE2B a4fdb2e48ae5148465caa122c582d278942539e16b7d5faf8670c74c9cda8ac7a9e0e70bff6d3e6ec59cc895e1b92a2a1ed4da43addded004187e7a869416798 SHA512 e9aa445c340ad37600e033299ad63e11b111a4ad4e0b1192b37bff8184be3e8a8e21f03f87835e304502d9647ad5327fd80d843256494d9fd6bce5993dddff36
+EBUILD selinux-kismet-2.20220106-r2.ebuild 281 BLAKE2B 44958aafb87b937f064f58d5c41c329c52efabcf55d9d82b7ded3b3db990a9f02dfa7a7a92cb851583405f6b9dbd3fd99438c48ca69d7d00c5053111b14c9978 SHA512 2054dfd8db6cd2211dca0ba271602eb25a0299eb1d46bce0c41052b5ee37f11cc0791b90e3f5391816011be1bdcf346e4b1faa147e9e88bdeafea6055c2d8064
 EBUILD selinux-kismet-9999.ebuild 281 BLAKE2B 9adbdad236da9bbd13c8977efe7e5bede830465ab4d7c744708568d137e07554ddf872d87f53f76c5be5f88d794a8573c563becdef7be767ac6717bddd5225c4 SHA512 00366eba50014540f206d87350caf8d09437425d6c5d075aa2fda9fb552e4c0c4ce48acf4af18e01e2031871db05235a4903269b0aafe6b356ae798c5341005a
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-kismet/selinux-kismet-2.20220106-r1.ebuild b/sec-policy/selinux-kismet/selinux-kismet-2.20220106-r1.ebuild
index f6ccb3d633aa..fdf75aecfc50 100644
--- a/sec-policy/selinux-kismet/selinux-kismet-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-kismet/selinux-kismet-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for kismet"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-kismet/selinux-kismet-2.20220106-r2.ebuild b/sec-policy/selinux-kismet/selinux-kismet-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..f6ccb3d633aa
--- /dev/null
+++ b/sec-policy/selinux-kismet/selinux-kismet-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="kismet"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for kismet"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ksmtuned/Manifest b/sec-policy/selinux-ksmtuned/Manifest
index 66d7614f4c23..89c178de6339 100644
--- a/sec-policy/selinux-ksmtuned/Manifest
+++ b/sec-policy/selinux-ksmtuned/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-ksmtuned-2.20200818-r2.ebuild 281 BLAKE2B c593fd777651509146a44694fc6daffa15385691f885de4b2c64c9decb5b0ea3011c1372a884db5eb06c3d515e9300568ef9c6d10cf106ad9edd2613c7142d27 SHA512 54f63b7cf2b9ae846d06d7fc90872a0483d90fb157b016722090487c6d444689b3669bc289b1d404da2e52a6a87464090c6cfee00d8c4dadd3d6d6a46104e11c
 EBUILD selinux-ksmtuned-2.20210203-r1.ebuild 281 BLAKE2B c593fd777651509146a44694fc6daffa15385691f885de4b2c64c9decb5b0ea3011c1372a884db5eb06c3d515e9300568ef9c6d10cf106ad9edd2613c7142d27 SHA512 54f63b7cf2b9ae846d06d7fc90872a0483d90fb157b016722090487c6d444689b3669bc289b1d404da2e52a6a87464090c6cfee00d8c4dadd3d6d6a46104e11c
 EBUILD selinux-ksmtuned-2.20210908-r1.ebuild 281 BLAKE2B c593fd777651509146a44694fc6daffa15385691f885de4b2c64c9decb5b0ea3011c1372a884db5eb06c3d515e9300568ef9c6d10cf106ad9edd2613c7142d27 SHA512 54f63b7cf2b9ae846d06d7fc90872a0483d90fb157b016722090487c6d444689b3669bc289b1d404da2e52a6a87464090c6cfee00d8c4dadd3d6d6a46104e11c
-EBUILD selinux-ksmtuned-2.20220106-r1.ebuild 285 BLAKE2B 5785f24d455eb4655d4e0a28f567ca16417cb222290c8b0a58390e84e8334ab23c01aa6f06ad6a3299b99f864017affaa4275a557a6ab67546dc5384fad588c8 SHA512 bc048172197dc8c811e7f0271899c108b364edaaef43f14cd64d294b6676b0838adb7d10f1e2e89cc46ffaa8085abe0bb7c35419fb833331de48c497a8e8e7ba
+EBUILD selinux-ksmtuned-2.20220106-r1.ebuild 283 BLAKE2B 79b6fd5dcc620507e5bea957303bdac76a2f6a71657be02f300e5c735eebf5ab90265343d3f095991a5825e641ba1a5293c24831a11f64b790bc37e5a06552c2 SHA512 c269c25f7fe2c2659fc9c591b3eca7ac89dcb9788dfcd446822f2f284aa8e7175c31f4afcffbe202954c6faae1e631bf4413ff2b890a108dfd276af6e6de9c8f
+EBUILD selinux-ksmtuned-2.20220106-r2.ebuild 285 BLAKE2B 5785f24d455eb4655d4e0a28f567ca16417cb222290c8b0a58390e84e8334ab23c01aa6f06ad6a3299b99f864017affaa4275a557a6ab67546dc5384fad588c8 SHA512 bc048172197dc8c811e7f0271899c108b364edaaef43f14cd64d294b6676b0838adb7d10f1e2e89cc46ffaa8085abe0bb7c35419fb833331de48c497a8e8e7ba
 EBUILD selinux-ksmtuned-9999.ebuild 285 BLAKE2B 8746b9e0f87474b2ef6ab66e9adad2fc2f78846513625b90778f38d69ba6fae388382ab0323d9742a3ac766d07ae8e6b88ecf5a16d69a23c8f4482815c2913f8 SHA512 705a7c17fc6e6d7bcae68e90b9ccf267d2d0436c2f751abd62442cf80603ecd36d0ae881179709b07d1b2d40bdfeb876a19c204839f6b30b23ab00caf6af05fb
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20220106-r1.ebuild b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20220106-r1.ebuild
index 34d1717dcad3..e86fdd9648a8 100644
--- a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ksmtuned"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20220106-r2.ebuild b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..34d1717dcad3
--- /dev/null
+++ b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="ksmtuned"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ksmtuned"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ldap/Manifest b/sec-policy/selinux-ldap/Manifest
index 9f3ccd2af6e6..165cc0e0c698 100644
--- a/sec-policy/selinux-ldap/Manifest
+++ b/sec-policy/selinux-ldap/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-ldap-2.20200818-r2.ebuild 273 BLAKE2B c298f1a0d12a4581ba2c854bde988c2aab036e7c212a2a7cbfcd048df9c0b154c76414fba479ee5acc82b62cf1f1f54a2cfbbd221b5dd872e74ee300436d1935 SHA512 be58cd83de31a8f43f2aab631dc876ef045acb8799d13367a2d829987e1d9d9bd7ea7623455548bbf6a8fdd2feac61a6676439813dde2cd3f914dd4693511255
 EBUILD selinux-ldap-2.20210203-r1.ebuild 273 BLAKE2B c298f1a0d12a4581ba2c854bde988c2aab036e7c212a2a7cbfcd048df9c0b154c76414fba479ee5acc82b62cf1f1f54a2cfbbd221b5dd872e74ee300436d1935 SHA512 be58cd83de31a8f43f2aab631dc876ef045acb8799d13367a2d829987e1d9d9bd7ea7623455548bbf6a8fdd2feac61a6676439813dde2cd3f914dd4693511255
 EBUILD selinux-ldap-2.20210908-r1.ebuild 273 BLAKE2B c298f1a0d12a4581ba2c854bde988c2aab036e7c212a2a7cbfcd048df9c0b154c76414fba479ee5acc82b62cf1f1f54a2cfbbd221b5dd872e74ee300436d1935 SHA512 be58cd83de31a8f43f2aab631dc876ef045acb8799d13367a2d829987e1d9d9bd7ea7623455548bbf6a8fdd2feac61a6676439813dde2cd3f914dd4693511255
-EBUILD selinux-ldap-2.20220106-r1.ebuild 277 BLAKE2B c6b166c611750d3afbbf5c886dd8990a49f9b0783c22afdf978f3ae2fd2140a88848df77180ece9ae7ea644ff201f202069d99598e01372638e4ce98e4e8e055 SHA512 3dd2dfe6ee4f6a8fc07b029f6b32354d52b5324419978ed47b745336035c992a372830a3b74009589476594ef0986c679277c00504544c65f55ac1db41f3bf16
+EBUILD selinux-ldap-2.20220106-r1.ebuild 275 BLAKE2B f87e1dc25322421c5dbb9dd3192b97cb59edcb44f99bcf78af3be1fd8fa59c8b31953db211ecbc40c03e21e88a5627ecdb7f23c41e29f5a3913909caab7de045 SHA512 ea3d6a4d3735fad39c61e0f2a5e38d52dcc8ef810ac7b2c111cf707bb98457003a54db2535ab43a716c54b0cc9bd4b95743a3740aeafc301e731c1a176c04a06
+EBUILD selinux-ldap-2.20220106-r2.ebuild 277 BLAKE2B c6b166c611750d3afbbf5c886dd8990a49f9b0783c22afdf978f3ae2fd2140a88848df77180ece9ae7ea644ff201f202069d99598e01372638e4ce98e4e8e055 SHA512 3dd2dfe6ee4f6a8fc07b029f6b32354d52b5324419978ed47b745336035c992a372830a3b74009589476594ef0986c679277c00504544c65f55ac1db41f3bf16
 EBUILD selinux-ldap-9999.ebuild 277 BLAKE2B bd303e5d45e6998f17e0960ce7ab9f57ac5a5d8b956c785a45d3376de075910db747d8ec929224073241811900327d44cbfd92468bbd676cd974d4a33b6dd649 SHA512 960891a57fd8c60bafad9233dba49dde28febd8693bff9f276e1c0b3fc212b49313a27f7fb7f2afcd92c0a3240d13e804337c89fdd3ffddc006bbb467a7bda7c
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-ldap/selinux-ldap-2.20220106-r1.ebuild b/sec-policy/selinux-ldap/selinux-ldap-2.20220106-r1.ebuild
index efd57f133c7d..c49a394a31d4 100644
--- a/sec-policy/selinux-ldap/selinux-ldap-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-ldap/selinux-ldap-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ldap"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ldap/selinux-ldap-2.20220106-r2.ebuild b/sec-policy/selinux-ldap/selinux-ldap-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..efd57f133c7d
--- /dev/null
+++ b/sec-policy/selinux-ldap/selinux-ldap-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="ldap"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ldap"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-links/Manifest b/sec-policy/selinux-links/Manifest
index caaebcc353e1..d49f8d589b12 100644
--- a/sec-policy/selinux-links/Manifest
+++ b/sec-policy/selinux-links/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-links-2.20200818-r2.ebuild 275 BLAKE2B 4d8733e8bfcea11e223e00f2fddf2c672a5617fd22416829b153f0f9c7ee8634ae93b0f55dce01fd5d7be759bba383ce6a0220a46d10fb6ca7ef9fc9a41f98a8 SHA512 320c58ad02adf646985924cdbd72e2c7aa2aa9864f44fe2eeb9e581695f5cd3b8b37e3d6fe8d1b7d337bc2e3ac7fc405a57f16a6fce06fbe29b6c7e69ad8f613
 EBUILD selinux-links-2.20210203-r1.ebuild 275 BLAKE2B 4d8733e8bfcea11e223e00f2fddf2c672a5617fd22416829b153f0f9c7ee8634ae93b0f55dce01fd5d7be759bba383ce6a0220a46d10fb6ca7ef9fc9a41f98a8 SHA512 320c58ad02adf646985924cdbd72e2c7aa2aa9864f44fe2eeb9e581695f5cd3b8b37e3d6fe8d1b7d337bc2e3ac7fc405a57f16a6fce06fbe29b6c7e69ad8f613
 EBUILD selinux-links-2.20210908-r1.ebuild 275 BLAKE2B 4d8733e8bfcea11e223e00f2fddf2c672a5617fd22416829b153f0f9c7ee8634ae93b0f55dce01fd5d7be759bba383ce6a0220a46d10fb6ca7ef9fc9a41f98a8 SHA512 320c58ad02adf646985924cdbd72e2c7aa2aa9864f44fe2eeb9e581695f5cd3b8b37e3d6fe8d1b7d337bc2e3ac7fc405a57f16a6fce06fbe29b6c7e69ad8f613
-EBUILD selinux-links-2.20220106-r1.ebuild 279 BLAKE2B 03ac48bafe61f111693c10da4d9cda4413a0f70c5675a14d7613c6983236ca29fa16174ee7845596603f11f5d1a17b783a3e0cad9c6e516cc4962ed7450d9390 SHA512 9019fec8964918a49cd044fa6c4dcc49bf50b8fa926514174329c0dc92eed01d8ce75243cbc656f1984133a81eee6ae436625aaf3e750444d193838e8f94d2d0
+EBUILD selinux-links-2.20220106-r1.ebuild 277 BLAKE2B 0064105e3e07aabecaa8524b3b2ca9b095975932cfc6b819bff98ea2b149b747949e763070e0f2702ad9c0549628f9cc8310fa9d4f770b32db46c822fc0a690e SHA512 5dd824d531b2075f45531fd844a66098e891ff02ab3c3bb80749b9752191759336efb9ccae99117dcce3bad38a27414befafed425195443321683b27ee5f511d
+EBUILD selinux-links-2.20220106-r2.ebuild 279 BLAKE2B 03ac48bafe61f111693c10da4d9cda4413a0f70c5675a14d7613c6983236ca29fa16174ee7845596603f11f5d1a17b783a3e0cad9c6e516cc4962ed7450d9390 SHA512 9019fec8964918a49cd044fa6c4dcc49bf50b8fa926514174329c0dc92eed01d8ce75243cbc656f1984133a81eee6ae436625aaf3e750444d193838e8f94d2d0
 EBUILD selinux-links-9999.ebuild 279 BLAKE2B 1f7659f0dbd5ec5ccb0fe912ef90038d1bc942120115209f0247ea2e72b4dd7020b50f3892da0e188c9a62e476760191e2a6ff184ed8d52a332be0b3f4421a0b SHA512 4f886b5cee6c680ad711c7d8bc08d66565cf97fbb2e2dbb49f770230942c3ace58161b979f3426c66e774e65a75ebcdeadb39a003c6295275b36b44985afb689
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-links/selinux-links-2.20220106-r1.ebuild b/sec-policy/selinux-links/selinux-links-2.20220106-r1.ebuild
index f4d947d96b10..79ef00f7699a 100644
--- a/sec-policy/selinux-links/selinux-links-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-links/selinux-links-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for links"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-links/selinux-links-2.20220106-r2.ebuild b/sec-policy/selinux-links/selinux-links-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..f4d947d96b10
--- /dev/null
+++ b/sec-policy/selinux-links/selinux-links-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="links"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for links"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-lircd/Manifest b/sec-policy/selinux-lircd/Manifest
index 0b637b4479a2..255f29571d34 100644
--- a/sec-policy/selinux-lircd/Manifest
+++ b/sec-policy/selinux-lircd/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-lircd-2.20200818-r2.ebuild 275 BLAKE2B d60656dee2926bd75e1773a18c7deb5c4f6547c804de79861dbaa7ee666b231863b42a23a845a8cfc03ac969052767587c112271fba1462965c5ecaed07211ad SHA512 a7b0e1da9eab50e8d3f8f3186b25b202abb7cf89e1166498e00149382447e98e6b56d10a6e5dbf93e7c3dbd790d42f9787a187155523275b01b93ad8797299e6
 EBUILD selinux-lircd-2.20210203-r1.ebuild 275 BLAKE2B d60656dee2926bd75e1773a18c7deb5c4f6547c804de79861dbaa7ee666b231863b42a23a845a8cfc03ac969052767587c112271fba1462965c5ecaed07211ad SHA512 a7b0e1da9eab50e8d3f8f3186b25b202abb7cf89e1166498e00149382447e98e6b56d10a6e5dbf93e7c3dbd790d42f9787a187155523275b01b93ad8797299e6
 EBUILD selinux-lircd-2.20210908-r1.ebuild 275 BLAKE2B d60656dee2926bd75e1773a18c7deb5c4f6547c804de79861dbaa7ee666b231863b42a23a845a8cfc03ac969052767587c112271fba1462965c5ecaed07211ad SHA512 a7b0e1da9eab50e8d3f8f3186b25b202abb7cf89e1166498e00149382447e98e6b56d10a6e5dbf93e7c3dbd790d42f9787a187155523275b01b93ad8797299e6
-EBUILD selinux-lircd-2.20220106-r1.ebuild 279 BLAKE2B 67d22f8601707942bbb6f16110c1b028c493425aa9d5f3e3fd1b269ed2968cc3aa71dc9bc3d62f5de20d2203a1ca898938cd183a3a3de95315f0aec6a55d37d2 SHA512 26142c9f2e98e36db22a5258751160688b499e2e3cb551c5b5928343554046ebd66cee5ec542118411b6eb3f99665d7323d80371836ac10543ae074f24ee5375
+EBUILD selinux-lircd-2.20220106-r1.ebuild 277 BLAKE2B 833b2f1545447ef56a97218259c4c3ec75a6ed3c9722f3ae0c761b4f550dc0a9bea86565f27f982ab9de665dfa9888de9ae869b2fe1c409536fdba2d731e13b8 SHA512 139ae9990fdef4cab12d641095fb801d31bfc573365a905176bc80956de6aedfd7df07f5eb30db509d583a562aa8ecd77c56109e80858a76906a16bbbcd67c32
+EBUILD selinux-lircd-2.20220106-r2.ebuild 279 BLAKE2B 67d22f8601707942bbb6f16110c1b028c493425aa9d5f3e3fd1b269ed2968cc3aa71dc9bc3d62f5de20d2203a1ca898938cd183a3a3de95315f0aec6a55d37d2 SHA512 26142c9f2e98e36db22a5258751160688b499e2e3cb551c5b5928343554046ebd66cee5ec542118411b6eb3f99665d7323d80371836ac10543ae074f24ee5375
 EBUILD selinux-lircd-9999.ebuild 279 BLAKE2B 63ada194b6d372b07d95e0ebc32b8f26e7452b8a22d24ea6746cf468221cf91d7f988697b8ee432a7e5ed3c6ca5d9486775f719d15d8fdbfa7d0293c5a640ac5 SHA512 0975666cdd016c6c707bf1b14983151b7510dcef7ebe3c42c87361bfb4a6b9cc369511174e476926063ed75746a554ad0011b237f4856d83c841f8aadf4498ae
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-lircd/selinux-lircd-2.20220106-r1.ebuild b/sec-policy/selinux-lircd/selinux-lircd-2.20220106-r1.ebuild
index 926dbc93984c..6d14ff6f1b9e 100644
--- a/sec-policy/selinux-lircd/selinux-lircd-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-lircd/selinux-lircd-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for lircd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-lircd/selinux-lircd-2.20220106-r2.ebuild b/sec-policy/selinux-lircd/selinux-lircd-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..926dbc93984c
--- /dev/null
+++ b/sec-policy/selinux-lircd/selinux-lircd-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="lircd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for lircd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-loadkeys/Manifest b/sec-policy/selinux-loadkeys/Manifest
index 729005ca1c90..0e0fa708fe4d 100644
--- a/sec-policy/selinux-loadkeys/Manifest
+++ b/sec-policy/selinux-loadkeys/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-loadkeys-2.20200818-r2.ebuild 281 BLAKE2B dd879fa19e4827b572ed5fd476440cb1a55c2dd41dcf18a2b4757327ecdd4503c953fd0e3e99a8b32588864bb38ff5a79c86233a3a6c8849f29d0400eb0b970e SHA512 186fc382c3e2a9bd94e580f5518f166723c1cb2cdd56d410240dd2eab280c954e3b9f8efef0e0a484040b62e3ea8ddb6136bd787bac1871df83365400ea4873a
 EBUILD selinux-loadkeys-2.20210203-r1.ebuild 281 BLAKE2B dd879fa19e4827b572ed5fd476440cb1a55c2dd41dcf18a2b4757327ecdd4503c953fd0e3e99a8b32588864bb38ff5a79c86233a3a6c8849f29d0400eb0b970e SHA512 186fc382c3e2a9bd94e580f5518f166723c1cb2cdd56d410240dd2eab280c954e3b9f8efef0e0a484040b62e3ea8ddb6136bd787bac1871df83365400ea4873a
 EBUILD selinux-loadkeys-2.20210908-r1.ebuild 281 BLAKE2B dd879fa19e4827b572ed5fd476440cb1a55c2dd41dcf18a2b4757327ecdd4503c953fd0e3e99a8b32588864bb38ff5a79c86233a3a6c8849f29d0400eb0b970e SHA512 186fc382c3e2a9bd94e580f5518f166723c1cb2cdd56d410240dd2eab280c954e3b9f8efef0e0a484040b62e3ea8ddb6136bd787bac1871df83365400ea4873a
-EBUILD selinux-loadkeys-2.20220106-r1.ebuild 285 BLAKE2B ade1e6e3c4d042d0eff9917d8c5e77fdcb7abc467b0600e0ce3d983aced3009117f999c8521d902dbb5ad7ca9aeaa5dcd5736bc0ddd82844862a94b22f8454ca SHA512 b8b72e1904edeabbf639660a81a95160114a86a51921e3f4914e53d368eb46b749898be903f3f5dff03eaecdc06ecb67cf8eef7724e8456fd78f4814181cd87d
+EBUILD selinux-loadkeys-2.20220106-r1.ebuild 283 BLAKE2B 5ce2ae60b6ffac2c567980e65eb0da4bbd9da3c2b62e4ea75fe3449b0beaa318943b09f289096aaab3dd41353da68214ef9a71c4c12c6ab0b02371b539f0e555 SHA512 f77ac0423cf0f4aceff8a610e8043872f3e269d4dd6263a6c576eb101612ff52b909fd5c0c94e58ef24fd61cecee74816029ea630d5a7944c049579cc402b9f4
+EBUILD selinux-loadkeys-2.20220106-r2.ebuild 285 BLAKE2B ade1e6e3c4d042d0eff9917d8c5e77fdcb7abc467b0600e0ce3d983aced3009117f999c8521d902dbb5ad7ca9aeaa5dcd5736bc0ddd82844862a94b22f8454ca SHA512 b8b72e1904edeabbf639660a81a95160114a86a51921e3f4914e53d368eb46b749898be903f3f5dff03eaecdc06ecb67cf8eef7724e8456fd78f4814181cd87d
 EBUILD selinux-loadkeys-9999.ebuild 285 BLAKE2B 81b404b3a29a1ef9fa2cb5e9f06541fcba5d24c6a9a84c2d10e652e4d9da0aa41a69d9cc98bf1551f415c32933274f14dd64b82f5c8e8d066cb696ecabefcfaa SHA512 08200f6a732fae00529b930c770495794c455a470d315c246235b4c27d9b3301cd58dbe564c35b03f1c98f19f8f7309cbf6157e1497cfb55a3e9eec02ba496ab
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20220106-r1.ebuild b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20220106-r1.ebuild
index 0c32514abc29..90da5e93aa4a 100644
--- a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for loadkeys"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20220106-r2.ebuild b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..0c32514abc29
--- /dev/null
+++ b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="loadkeys"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for loadkeys"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-logrotate/Manifest b/sec-policy/selinux-logrotate/Manifest
index 6d4897783c0e..2c9b7844c2f5 100644
--- a/sec-policy/selinux-logrotate/Manifest
+++ b/sec-policy/selinux-logrotate/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-logrotate-2.20200818-r2.ebuild 283 BLAKE2B 6ac7b27819380102d8b61bdd3b3360b54e15541c7daa36534ddd239880371038e6e18a3eb9d35467b2c4a08162659cc473957f423cbe81a24c1410555eb59359 SHA512 e4f10bae50be48e76ae9e212e907ebfcc98e1ebb98e64d0db3daea0e1765284b254c10ce906f08eb18c87adc656b71df9298e65fd394aecd905b82c01eb62868
 EBUILD selinux-logrotate-2.20210203-r1.ebuild 283 BLAKE2B 6ac7b27819380102d8b61bdd3b3360b54e15541c7daa36534ddd239880371038e6e18a3eb9d35467b2c4a08162659cc473957f423cbe81a24c1410555eb59359 SHA512 e4f10bae50be48e76ae9e212e907ebfcc98e1ebb98e64d0db3daea0e1765284b254c10ce906f08eb18c87adc656b71df9298e65fd394aecd905b82c01eb62868
 EBUILD selinux-logrotate-2.20210908-r1.ebuild 283 BLAKE2B 6ac7b27819380102d8b61bdd3b3360b54e15541c7daa36534ddd239880371038e6e18a3eb9d35467b2c4a08162659cc473957f423cbe81a24c1410555eb59359 SHA512 e4f10bae50be48e76ae9e212e907ebfcc98e1ebb98e64d0db3daea0e1765284b254c10ce906f08eb18c87adc656b71df9298e65fd394aecd905b82c01eb62868
-EBUILD selinux-logrotate-2.20220106-r1.ebuild 287 BLAKE2B 7abc606c5745e955fe4afe8b32043ac5d6a160d56bb632498625a43c2790ceb02b39013ec5b94e51592037cce632c838f2a09ff1890ff142eb350fb91b92903e SHA512 5a0eca7b52616adcf23949f092fde43afa20b11b47be98a057ae66c9f4165762b8a4469cc825d1db8ee8816c788e05be271b40d0df6eb72297ef076777042294
+EBUILD selinux-logrotate-2.20220106-r1.ebuild 285 BLAKE2B f5e66e6d05122aa7610f1989090e2686134fe3d2baad7342a789410f6da8fc7e24a82ed4f3f14ee1d341f7b119d7e6a76d193aea7c6be7f807e1033d46cbd66c SHA512 daf05c737750739864056de377c903f874af6f112991bbe040e3464830b27e2d2330bd9f3e62bf29c6221632234a6ac1a941d6e38a8f07a67cf6a6367899b965
+EBUILD selinux-logrotate-2.20220106-r2.ebuild 287 BLAKE2B 7abc606c5745e955fe4afe8b32043ac5d6a160d56bb632498625a43c2790ceb02b39013ec5b94e51592037cce632c838f2a09ff1890ff142eb350fb91b92903e SHA512 5a0eca7b52616adcf23949f092fde43afa20b11b47be98a057ae66c9f4165762b8a4469cc825d1db8ee8816c788e05be271b40d0df6eb72297ef076777042294
 EBUILD selinux-logrotate-9999.ebuild 287 BLAKE2B 00976d3b9822fa52b7e1bb3da627b8ccf9ca38eb3c228e05aca21bfcc81168070f52ad61a7a12b9fbac83ed999d3f3a28ab834b59daa51cd51d46d1e71078de8 SHA512 84a0537e9b38f532704e27eda566fa621f2a5440ba687373fafb864903035583c3ba116450941a00a54adc4934bd3b95260c5acd7addda1d62ef811f21d926f6
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-logrotate/selinux-logrotate-2.20220106-r1.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-2.20220106-r1.ebuild
index 16282086d14f..11471825113f 100644
--- a/sec-policy/selinux-logrotate/selinux-logrotate-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-logrotate/selinux-logrotate-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for logrotate"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-logrotate/selinux-logrotate-2.20220106-r2.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..16282086d14f
--- /dev/null
+++ b/sec-policy/selinux-logrotate/selinux-logrotate-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="logrotate"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for logrotate"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-logsentry/Manifest b/sec-policy/selinux-logsentry/Manifest
index 246580e6571f..561037ec3390 100644
--- a/sec-policy/selinux-logsentry/Manifest
+++ b/sec-policy/selinux-logsentry/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-logsentry-2.20200818-r2.ebuild 283 BLAKE2B 92fb7bfedaa13a49ad9a02c3b3ab4d228297aba72d5fb84ac17c6f169742f99b9bf5ee53a131ce1520910bed8e1c86db7c9ae36c3d10ebe97f97805251a00abe SHA512 6c2f1cb0bad62dbbaf4297c051d629f28d842ffa3b6600a446eacc909fa19295281c7abbb2bb8e46368bfd4b1d47d6bd8c9d4dde750a9d36a4d6ba670fff431d
 EBUILD selinux-logsentry-2.20210203-r1.ebuild 283 BLAKE2B 92fb7bfedaa13a49ad9a02c3b3ab4d228297aba72d5fb84ac17c6f169742f99b9bf5ee53a131ce1520910bed8e1c86db7c9ae36c3d10ebe97f97805251a00abe SHA512 6c2f1cb0bad62dbbaf4297c051d629f28d842ffa3b6600a446eacc909fa19295281c7abbb2bb8e46368bfd4b1d47d6bd8c9d4dde750a9d36a4d6ba670fff431d
 EBUILD selinux-logsentry-2.20210908-r1.ebuild 283 BLAKE2B 92fb7bfedaa13a49ad9a02c3b3ab4d228297aba72d5fb84ac17c6f169742f99b9bf5ee53a131ce1520910bed8e1c86db7c9ae36c3d10ebe97f97805251a00abe SHA512 6c2f1cb0bad62dbbaf4297c051d629f28d842ffa3b6600a446eacc909fa19295281c7abbb2bb8e46368bfd4b1d47d6bd8c9d4dde750a9d36a4d6ba670fff431d
-EBUILD selinux-logsentry-2.20220106-r1.ebuild 287 BLAKE2B 1cafc2441eefdaf2942505696fa5689656859202b9472ac6ca2b3630f11a679f0102d700807a76847892edb2f0916e5314a8cccf30745a4e1dea3b0bd4790809 SHA512 3366eb4fdc486b58ea5b57d0b2c42b3c32eb1566981195e7bfa3eef6ee3b91ccc4052d60d7da4554b056d2ea00e678a24dee7f49023bf0ab240976c1f915ccd9
+EBUILD selinux-logsentry-2.20220106-r1.ebuild 285 BLAKE2B e84bffe82847e8dab3e891a542e926690dd0ca0b1fedb15ae521116453cd8ba17b9523e7af2230e46ea4e9d1947ccdf36e5a1f0d6155c265fefb39bfe6884f50 SHA512 d4107893274ec722e2e8146cd1b93a5456a89904b3800529e0870ca6fc2635d0afe9e62d9f0f7c815d1695d475de595727f9e7fc30c9a4f700a54c2402419117
+EBUILD selinux-logsentry-2.20220106-r2.ebuild 287 BLAKE2B 1cafc2441eefdaf2942505696fa5689656859202b9472ac6ca2b3630f11a679f0102d700807a76847892edb2f0916e5314a8cccf30745a4e1dea3b0bd4790809 SHA512 3366eb4fdc486b58ea5b57d0b2c42b3c32eb1566981195e7bfa3eef6ee3b91ccc4052d60d7da4554b056d2ea00e678a24dee7f49023bf0ab240976c1f915ccd9
 EBUILD selinux-logsentry-9999.ebuild 287 BLAKE2B 75d39f4d37485560ea3c59bc6a07ca212b47662d5474722e1efb55cd9fe7610b3de8589b60b7341d38f1513eedbfdfca9e12b60272adee4f06d8ca5ae9cfedd6 SHA512 52fc41b8394ba4eba9b59835ac3e454f016c0748dcb6e6068c54295ab69b9cd4a424bcafd1dffc885facc3dec2575cf7ba1c1d71ac395436181a8da5c22b88f8
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-logsentry/selinux-logsentry-2.20220106-r1.ebuild b/sec-policy/selinux-logsentry/selinux-logsentry-2.20220106-r1.ebuild
index f6ed486c889f..fd366605e44a 100644
--- a/sec-policy/selinux-logsentry/selinux-logsentry-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-logsentry/selinux-logsentry-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for logsentry"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-logsentry/selinux-logsentry-2.20220106-r2.ebuild b/sec-policy/selinux-logsentry/selinux-logsentry-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..f6ed486c889f
--- /dev/null
+++ b/sec-policy/selinux-logsentry/selinux-logsentry-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="logsentry"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for logsentry"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-logwatch/Manifest b/sec-policy/selinux-logwatch/Manifest
index 7d96f0289e68..b2019bfe9a22 100644
--- a/sec-policy/selinux-logwatch/Manifest
+++ b/sec-policy/selinux-logwatch/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-logwatch-2.20200818-r2.ebuild 281 BLAKE2B fafc940b49775b89c557296dc2037947f369fefd3034ac8858139005bfd8b805262320a8ed005e775fec3f4a8bf1676fae46d86140697f5bff67d38a1d0ff8a3 SHA512 908f4183295dcd7f0bc37ab5ebace5c7002f2d1f40de6eefdc94ee4d65dc03261a0eeca59681958997d6be4d0188829696ea0643923f7f9749effd0f46c9c164
 EBUILD selinux-logwatch-2.20210203-r1.ebuild 281 BLAKE2B fafc940b49775b89c557296dc2037947f369fefd3034ac8858139005bfd8b805262320a8ed005e775fec3f4a8bf1676fae46d86140697f5bff67d38a1d0ff8a3 SHA512 908f4183295dcd7f0bc37ab5ebace5c7002f2d1f40de6eefdc94ee4d65dc03261a0eeca59681958997d6be4d0188829696ea0643923f7f9749effd0f46c9c164
 EBUILD selinux-logwatch-2.20210908-r1.ebuild 281 BLAKE2B fafc940b49775b89c557296dc2037947f369fefd3034ac8858139005bfd8b805262320a8ed005e775fec3f4a8bf1676fae46d86140697f5bff67d38a1d0ff8a3 SHA512 908f4183295dcd7f0bc37ab5ebace5c7002f2d1f40de6eefdc94ee4d65dc03261a0eeca59681958997d6be4d0188829696ea0643923f7f9749effd0f46c9c164
-EBUILD selinux-logwatch-2.20220106-r1.ebuild 285 BLAKE2B 9db104012a6df60315ee276054f9b5b9a7c68cecaa9f5d527b7441c2e7943bb7688b98ffd3ba8afc75f48470c9908b4719a453f7956763216f009323cb0fdaba SHA512 7c860af058ce05bd4b510489c0f5c8600c617adef88e6f9582d141237e8e426b19b39ee20d187f7771c58b51afa388f5c750ffcbb01a9f05fe10884b83464f07
+EBUILD selinux-logwatch-2.20220106-r1.ebuild 283 BLAKE2B e83a0ae624d5f3284ea0a16f296c7d08fc4d551b5f3d4937ae13e1beece4fdfdfca6bb08125f942956d787c20b029732c6b343443233b37f797ad9bb7972ede5 SHA512 b312b5802bcd89bb6a667ed0df65e25c8d7e7c525435d0a2bbde571892fa7f328c1c4a6212ebacd5d656188d0236b06b62591dca3a15736e182427dcab5b6bd3
+EBUILD selinux-logwatch-2.20220106-r2.ebuild 285 BLAKE2B 9db104012a6df60315ee276054f9b5b9a7c68cecaa9f5d527b7441c2e7943bb7688b98ffd3ba8afc75f48470c9908b4719a453f7956763216f009323cb0fdaba SHA512 7c860af058ce05bd4b510489c0f5c8600c617adef88e6f9582d141237e8e426b19b39ee20d187f7771c58b51afa388f5c750ffcbb01a9f05fe10884b83464f07
 EBUILD selinux-logwatch-9999.ebuild 285 BLAKE2B bb253bea03525e9c7bafa9b247e93526de907f74aa5bf35737a6adf7c153d448a40c786f74642ba8cdbc42e98cd232ad1fc05d72d42b36374ff284f3488d8be3 SHA512 f6129c0cc6c207a6f6ed656473892a1f2b8cc7dfd00d37f2f06c963092ea52e7b393a0ed5125ed906b514858b107b050e3e6fbdbbc1067c6a8d20ab5c153ffbe
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-logwatch/selinux-logwatch-2.20220106-r1.ebuild b/sec-policy/selinux-logwatch/selinux-logwatch-2.20220106-r1.ebuild
index 7947c3aa7755..293fdec55548 100644
--- a/sec-policy/selinux-logwatch/selinux-logwatch-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-logwatch/selinux-logwatch-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for logwatch"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-logwatch/selinux-logwatch-2.20220106-r2.ebuild b/sec-policy/selinux-logwatch/selinux-logwatch-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..7947c3aa7755
--- /dev/null
+++ b/sec-policy/selinux-logwatch/selinux-logwatch-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="logwatch"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for logwatch"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-lpd/Manifest b/sec-policy/selinux-lpd/Manifest
index f142103724d1..f0b2b442c9f7 100644
--- a/sec-policy/selinux-lpd/Manifest
+++ b/sec-policy/selinux-lpd/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-lpd-2.20200818-r2.ebuild 271 BLAKE2B 77e075b1be28e1f3ed2e7c9721d16189642a73ba0043af51335950a69483df4c5a60c91822439506e60ca2abac03fceaccd9cfd17b61eb33e3d564205206fc4f SHA512 fbd1905dd1f3a23507be12f5125de9a707b37fcc9c68f36b20a192457062fc5122fe30d08e14b0c87ac513d878dd5b5ee2836da0aacf2d21860f8cb241caed1c
 EBUILD selinux-lpd-2.20210203-r1.ebuild 271 BLAKE2B 77e075b1be28e1f3ed2e7c9721d16189642a73ba0043af51335950a69483df4c5a60c91822439506e60ca2abac03fceaccd9cfd17b61eb33e3d564205206fc4f SHA512 fbd1905dd1f3a23507be12f5125de9a707b37fcc9c68f36b20a192457062fc5122fe30d08e14b0c87ac513d878dd5b5ee2836da0aacf2d21860f8cb241caed1c
 EBUILD selinux-lpd-2.20210908-r1.ebuild 271 BLAKE2B 77e075b1be28e1f3ed2e7c9721d16189642a73ba0043af51335950a69483df4c5a60c91822439506e60ca2abac03fceaccd9cfd17b61eb33e3d564205206fc4f SHA512 fbd1905dd1f3a23507be12f5125de9a707b37fcc9c68f36b20a192457062fc5122fe30d08e14b0c87ac513d878dd5b5ee2836da0aacf2d21860f8cb241caed1c
-EBUILD selinux-lpd-2.20220106-r1.ebuild 275 BLAKE2B 96dccb14c7d5e5500dc82dae628faf3a2d9fc4ca98f32bfbcd06583cd687d59c6309550e0cdde589151b1b28b6e0d7a0e52a90311c2f642445384dd337add8bb SHA512 133877dd628568b236d763d31095528da2f567cee296a1fc1b646e7e93feff1922ed02700f6f8910d07b564739ae06dc5d2b5b32a209f472ffcb3dab2397fc41
+EBUILD selinux-lpd-2.20220106-r1.ebuild 273 BLAKE2B e71d7abf7421759301e301bb11ca4f104c87f14238182ee1e7a45a8687cdacb32b5ef1d4ba6fa01887beb4d9f546d216bf282e630687bf6198200ec0b806ad8e SHA512 03d787f06ac127ef483f2173fb07d08f9ccd1b3d1d61e8e9e960c76bcceb1b9dbf24a10ca6e243fc789c113b16cfe155457954fea61091743474af3a6968bb40
+EBUILD selinux-lpd-2.20220106-r2.ebuild 275 BLAKE2B 96dccb14c7d5e5500dc82dae628faf3a2d9fc4ca98f32bfbcd06583cd687d59c6309550e0cdde589151b1b28b6e0d7a0e52a90311c2f642445384dd337add8bb SHA512 133877dd628568b236d763d31095528da2f567cee296a1fc1b646e7e93feff1922ed02700f6f8910d07b564739ae06dc5d2b5b32a209f472ffcb3dab2397fc41
 EBUILD selinux-lpd-9999.ebuild 275 BLAKE2B f1c0d5d9d6078126db55789c440c35b78bcac55f709e4f67551ffc44cb911c640e5941b574e1c5959d68c7683a8296f5f6530a95ea37112bc96bed0a2f8f5a13 SHA512 eaadaad71d0bb5a6a98222d9a5eb108f52730c77efb2d551034f9a4399a60ef1439b141809971786c5aab77ce9125559df44aa851d490b236febecb7b663400b
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-lpd/selinux-lpd-2.20220106-r1.ebuild b/sec-policy/selinux-lpd/selinux-lpd-2.20220106-r1.ebuild
index 0a7fbfceb062..51d39035eb38 100644
--- a/sec-policy/selinux-lpd/selinux-lpd-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-lpd/selinux-lpd-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for lpd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-lpd/selinux-lpd-2.20220106-r2.ebuild b/sec-policy/selinux-lpd/selinux-lpd-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..0a7fbfceb062
--- /dev/null
+++ b/sec-policy/selinux-lpd/selinux-lpd-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="lpd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for lpd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-mailman/Manifest b/sec-policy/selinux-mailman/Manifest
index 9cc2483363a7..5483356558a6 100644
--- a/sec-policy/selinux-mailman/Manifest
+++ b/sec-policy/selinux-mailman/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-mailman-2.20200818-r2.ebuild 279 BLAKE2B be147e26b5044ff2c493eba2f852651045c0bcb54c6aa9ac009bf47d8f4100220b963123001087fe3d40cc05a547654febcf4e56f2d5b77e2a816aac42425292 SHA512 f55747f4a9e6788d14073d381cf8c9f226635609aeaba9fefc657270be4874be822687e2f4e9eb7c30e76bb3325ad6c7401fbdcfa56c642839b18ea8346e3af7
 EBUILD selinux-mailman-2.20210203-r1.ebuild 279 BLAKE2B be147e26b5044ff2c493eba2f852651045c0bcb54c6aa9ac009bf47d8f4100220b963123001087fe3d40cc05a547654febcf4e56f2d5b77e2a816aac42425292 SHA512 f55747f4a9e6788d14073d381cf8c9f226635609aeaba9fefc657270be4874be822687e2f4e9eb7c30e76bb3325ad6c7401fbdcfa56c642839b18ea8346e3af7
 EBUILD selinux-mailman-2.20210908-r1.ebuild 279 BLAKE2B be147e26b5044ff2c493eba2f852651045c0bcb54c6aa9ac009bf47d8f4100220b963123001087fe3d40cc05a547654febcf4e56f2d5b77e2a816aac42425292 SHA512 f55747f4a9e6788d14073d381cf8c9f226635609aeaba9fefc657270be4874be822687e2f4e9eb7c30e76bb3325ad6c7401fbdcfa56c642839b18ea8346e3af7
-EBUILD selinux-mailman-2.20220106-r1.ebuild 283 BLAKE2B 2b257a12d3b7e742836404841401569dee6614c5532aae6f6b0b541a1f2976de6e58ba79ba2bd81797a2efcbc78bbdb9c7ad94a5b5b72ce7e5c770a89d3690c0 SHA512 95f99812c1bfd49b75bd1d8b150dffdba0a110ddc064c8f5605908058130e9c94970740df8430c00d465b397d9fa255957c7a71011c69910889a01483acb3862
+EBUILD selinux-mailman-2.20220106-r1.ebuild 281 BLAKE2B c416f3e90dea14d9f43821a00ede868a1d5c1474970b9db38de7af10cc6b7fc8c56bf04c68585611e4a190233c8dda75d7ee2a5d5fd90c9f2eb613812f24a4b1 SHA512 81c525665c16dc435f6c26fda10e9ad61b688d389cea6979eee59613560b1a13be1d4a37699e17a441ae6645994ba51da5f12795eaf165bb65d49d7f34b553f7
+EBUILD selinux-mailman-2.20220106-r2.ebuild 283 BLAKE2B 2b257a12d3b7e742836404841401569dee6614c5532aae6f6b0b541a1f2976de6e58ba79ba2bd81797a2efcbc78bbdb9c7ad94a5b5b72ce7e5c770a89d3690c0 SHA512 95f99812c1bfd49b75bd1d8b150dffdba0a110ddc064c8f5605908058130e9c94970740df8430c00d465b397d9fa255957c7a71011c69910889a01483acb3862
 EBUILD selinux-mailman-9999.ebuild 283 BLAKE2B 3dc1f6e49db6365f1514153ad86c6a74349327539d3c8dea9f9190b617e4229d76f6f78ffadfba52741646f167fc0c5005b5dcf970b1bb912483799745dc49c7 SHA512 4426496fbadadb53ffd21643c2ebfa8254c426bcac4697bc4c4713a1eb94a901da29f0f4d63f2e476fa4e844dcb97a9be1b338816fe23059d61f828407b5075f
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-mailman/selinux-mailman-2.20220106-r1.ebuild b/sec-policy/selinux-mailman/selinux-mailman-2.20220106-r1.ebuild
index 69ac92966605..2a9473ccc2b3 100644
--- a/sec-policy/selinux-mailman/selinux-mailman-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-mailman/selinux-mailman-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mailman"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-mailman/selinux-mailman-2.20220106-r2.ebuild b/sec-policy/selinux-mailman/selinux-mailman-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..69ac92966605
--- /dev/null
+++ b/sec-policy/selinux-mailman/selinux-mailman-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="mailman"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mailman"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-makewhatis/Manifest b/sec-policy/selinux-makewhatis/Manifest
index 59f2846d0165..6b755f81892c 100644
--- a/sec-policy/selinux-makewhatis/Manifest
+++ b/sec-policy/selinux-makewhatis/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-makewhatis-2.20200818-r2.ebuild 285 BLAKE2B 62808faa8f7989817196a6654b4f0b0e915146631d4988508c35c83725fe545f425b5e48f74575b4c7f0a953c6cc18012e14fead04da23d7e3cad3efeaf48eb7 SHA512 9e1f27a5ecb206a287ed983823c0d4a349a18c5247f5ddbd5c26f8dda1dd20568f4715d4cd4360c115d813c39fc09f9db5f4569a10b973cfe315065149545996
 EBUILD selinux-makewhatis-2.20210203-r1.ebuild 285 BLAKE2B 62808faa8f7989817196a6654b4f0b0e915146631d4988508c35c83725fe545f425b5e48f74575b4c7f0a953c6cc18012e14fead04da23d7e3cad3efeaf48eb7 SHA512 9e1f27a5ecb206a287ed983823c0d4a349a18c5247f5ddbd5c26f8dda1dd20568f4715d4cd4360c115d813c39fc09f9db5f4569a10b973cfe315065149545996
 EBUILD selinux-makewhatis-2.20210908-r1.ebuild 285 BLAKE2B 62808faa8f7989817196a6654b4f0b0e915146631d4988508c35c83725fe545f425b5e48f74575b4c7f0a953c6cc18012e14fead04da23d7e3cad3efeaf48eb7 SHA512 9e1f27a5ecb206a287ed983823c0d4a349a18c5247f5ddbd5c26f8dda1dd20568f4715d4cd4360c115d813c39fc09f9db5f4569a10b973cfe315065149545996
-EBUILD selinux-makewhatis-2.20220106-r1.ebuild 289 BLAKE2B 1688a7588384d3fec8578ebc162c50fe7b737447ff841580bcc9af9519a186bec7829bfad5c1f1d5289552db6bd095f7bf3d0d373f103fade059855cb12935ce SHA512 6777e0c19f75728b1c557898a59fc60fd3cafdacd40d22234c9898e6e957907d172fbb49525b4336101e025880c4875606fa424c0acee017c44f01364313399d
+EBUILD selinux-makewhatis-2.20220106-r1.ebuild 287 BLAKE2B bc4dc41075f1fea241a727fdbc29b403d3f6fa85debecbbc21071d0195463eafe9b5290e9432745830688ee48888c9c9dd68501e0225253e70dfc0b561ca04d3 SHA512 9b72538e894957c1d207dded363554f6a5ec9d1e828148c6771cf117fe10faadd48c1f11836512f8f44b07c883432e97ec6f700ae29b748c54f69b8a844f2ff6
+EBUILD selinux-makewhatis-2.20220106-r2.ebuild 289 BLAKE2B 1688a7588384d3fec8578ebc162c50fe7b737447ff841580bcc9af9519a186bec7829bfad5c1f1d5289552db6bd095f7bf3d0d373f103fade059855cb12935ce SHA512 6777e0c19f75728b1c557898a59fc60fd3cafdacd40d22234c9898e6e957907d172fbb49525b4336101e025880c4875606fa424c0acee017c44f01364313399d
 EBUILD selinux-makewhatis-9999.ebuild 289 BLAKE2B a4b6e3cae9d9ad8e7e8dd2c933a237fe09c6a455f703baa1d7afb56261cd0e49bc1fe2971e9148edb7850e67baddc5353a22d876bdd0dc579da477e3b194670a SHA512 5ba053b39364f7a2a955d53aff1e19e3dba27b3c8348d7473fa326d57c2b2680fe8620d67e2f58d44987c5036ce3279498d657751e2d087330bdf660acc6c294
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20220106-r1.ebuild b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20220106-r1.ebuild
index 0253b805eb35..e7eb9be81613 100644
--- a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for makewhatis"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20220106-r2.ebuild b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..0253b805eb35
--- /dev/null
+++ b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="makewhatis"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for makewhatis"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-mandb/Manifest b/sec-policy/selinux-mandb/Manifest
index 44157dd81956..41b4c08a1a27 100644
--- a/sec-policy/selinux-mandb/Manifest
+++ b/sec-policy/selinux-mandb/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-mandb-2.20200818-r2.ebuild 275 BLAKE2B 8b3f26b251f1bb59c71fe070f462c30f62d3301ac4205f57a91ec9ee9e74e3169d41670c2e7985dab94fc889f23913de1aa83401eddfce17e9aad9669e22a7dc SHA512 858a835d19eee73c4a7212b9b675512e1c0774ce1d9c857cab321e3db7544d79a66228e64d003cb12eeb6c08e3f34c4680b391a1a5808f768fe3cff0556089ca
 EBUILD selinux-mandb-2.20210203-r1.ebuild 275 BLAKE2B 8b3f26b251f1bb59c71fe070f462c30f62d3301ac4205f57a91ec9ee9e74e3169d41670c2e7985dab94fc889f23913de1aa83401eddfce17e9aad9669e22a7dc SHA512 858a835d19eee73c4a7212b9b675512e1c0774ce1d9c857cab321e3db7544d79a66228e64d003cb12eeb6c08e3f34c4680b391a1a5808f768fe3cff0556089ca
 EBUILD selinux-mandb-2.20210908-r1.ebuild 275 BLAKE2B 8b3f26b251f1bb59c71fe070f462c30f62d3301ac4205f57a91ec9ee9e74e3169d41670c2e7985dab94fc889f23913de1aa83401eddfce17e9aad9669e22a7dc SHA512 858a835d19eee73c4a7212b9b675512e1c0774ce1d9c857cab321e3db7544d79a66228e64d003cb12eeb6c08e3f34c4680b391a1a5808f768fe3cff0556089ca
-EBUILD selinux-mandb-2.20220106-r1.ebuild 279 BLAKE2B 21ad8cf7c29ffb09fbcb662083078bf119a25b326c4799363e622a392e94e0b4871b50db67dad70c02ef0736a38b4059dc1c3c3addfcaaa4e8190b3e19825b62 SHA512 2453f6c9b3d84d98cbc7bb4592b9998c30846fb71a80422ee3a46cc3f3c77d612e5db7668dae323d66e1549e1df16fb139cc72e004905399fc18045a0a7a6682
+EBUILD selinux-mandb-2.20220106-r1.ebuild 277 BLAKE2B 535f70cdd181a097c1c1deda538c5be6c20283116eec75d97899956ea68a61eb40ccf94d5c79afa058c7f66c68e4d652015eff1a1d77f5508d15bdb8685744c8 SHA512 153d4e6593f1b627cee3546b6bbbbd60ede25c895c1df43a11440be25ad82f6fcbd37b820c0796eba168ed90d07a80286cc386fc6a1fcb09cd400e6037002c79
+EBUILD selinux-mandb-2.20220106-r2.ebuild 279 BLAKE2B 21ad8cf7c29ffb09fbcb662083078bf119a25b326c4799363e622a392e94e0b4871b50db67dad70c02ef0736a38b4059dc1c3c3addfcaaa4e8190b3e19825b62 SHA512 2453f6c9b3d84d98cbc7bb4592b9998c30846fb71a80422ee3a46cc3f3c77d612e5db7668dae323d66e1549e1df16fb139cc72e004905399fc18045a0a7a6682
 EBUILD selinux-mandb-9999.ebuild 279 BLAKE2B e8ffc7ec7d630cde0cb370b42b075120b513576005a9c86aff3fa833e2f08efb06ef7ac6a1dc3eb9e2821a82568ffc32eae80ba355adb4ad888f092ef4334c85 SHA512 6a56ac4bc5b5d8760d66839c926ade4fd81ffd1c202728f6e7985084411e5e78c17caba29bd7cbdd30965cd2dc979cf7dbd6e18e6204f88abb836e22977116a5
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-mandb/selinux-mandb-2.20220106-r1.ebuild b/sec-policy/selinux-mandb/selinux-mandb-2.20220106-r1.ebuild
index 0cfeb7363481..35192587d9ab 100644
--- a/sec-policy/selinux-mandb/selinux-mandb-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-mandb/selinux-mandb-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mandb"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-mandb/selinux-mandb-2.20220106-r2.ebuild b/sec-policy/selinux-mandb/selinux-mandb-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..0cfeb7363481
--- /dev/null
+++ b/sec-policy/selinux-mandb/selinux-mandb-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="mandb"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mandb"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-mcelog/Manifest b/sec-policy/selinux-mcelog/Manifest
index 9884d69757c9..14d5dd044728 100644
--- a/sec-policy/selinux-mcelog/Manifest
+++ b/sec-policy/selinux-mcelog/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-mcelog-2.20200818-r2.ebuild 277 BLAKE2B 04976998b17af77b3655c3631050f7970888408922d1faec7b9acee96d1ad797c57bbdf8db6e6e9bd48adad56c3e3a3330bfb9124182a16446d0b94c3e9c1c85 SHA512 1817b64af3abaaef075d56cb6a9d3a25158ef93d3b03660a333b2ab11531df4e2fdbec67934b38ac4b26a5e464f10d1db3889d71de502b333c28384b5b58aba5
 EBUILD selinux-mcelog-2.20210203-r1.ebuild 277 BLAKE2B 04976998b17af77b3655c3631050f7970888408922d1faec7b9acee96d1ad797c57bbdf8db6e6e9bd48adad56c3e3a3330bfb9124182a16446d0b94c3e9c1c85 SHA512 1817b64af3abaaef075d56cb6a9d3a25158ef93d3b03660a333b2ab11531df4e2fdbec67934b38ac4b26a5e464f10d1db3889d71de502b333c28384b5b58aba5
 EBUILD selinux-mcelog-2.20210908-r1.ebuild 277 BLAKE2B 04976998b17af77b3655c3631050f7970888408922d1faec7b9acee96d1ad797c57bbdf8db6e6e9bd48adad56c3e3a3330bfb9124182a16446d0b94c3e9c1c85 SHA512 1817b64af3abaaef075d56cb6a9d3a25158ef93d3b03660a333b2ab11531df4e2fdbec67934b38ac4b26a5e464f10d1db3889d71de502b333c28384b5b58aba5
-EBUILD selinux-mcelog-2.20220106-r1.ebuild 281 BLAKE2B 0175163bb62511b14219562d2b9471460ccd80d266790829f3666c4b905ff92139b14ff1d2982ed0b363214635483dc47c0a82f2b60127bccb2a4a75e3277980 SHA512 722581e8477139388b5e2baee0b4e0c99528c4eb5da5dc1322e4cda5d36113448b242c58c8b5e8efb9e14a197a169a6f4452caf48ca2af4623dff3a40ca65331
+EBUILD selinux-mcelog-2.20220106-r1.ebuild 279 BLAKE2B dfb86b9bc598043ccb7549c8dcb90be984de7325a89fa6d4e5289c253895669094e179d5a8487bafa1a3df1c96e44e60d6d67267a1d27b6a40633af7f288f38e SHA512 8cdc86ce4880ba3e31f26992f3bde96f04accb65373ee5aeaaa2ce64febbb54e9934d44bb2c185faaba6d337c4b2ccd5d3dbe72cd25957e4ad5523db97765863
+EBUILD selinux-mcelog-2.20220106-r2.ebuild 281 BLAKE2B 0175163bb62511b14219562d2b9471460ccd80d266790829f3666c4b905ff92139b14ff1d2982ed0b363214635483dc47c0a82f2b60127bccb2a4a75e3277980 SHA512 722581e8477139388b5e2baee0b4e0c99528c4eb5da5dc1322e4cda5d36113448b242c58c8b5e8efb9e14a197a169a6f4452caf48ca2af4623dff3a40ca65331
 EBUILD selinux-mcelog-9999.ebuild 281 BLAKE2B de0e63757b4cfb0f6289c9b33cc0a50b1460407168ee380be1134a4b41b644a19fb26ea3e237e13247130b781b167ed9eab684a437cf2e66a79827523833e237 SHA512 1635e46f79fa7b021a474170fb0eb7014811adfbd1d49cb2a0224bc43daf7d2c2b704e551c4c89cda4d34d85aeeb13da4653747a65f41d0b8e8fd5dec3367b7c
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-mcelog/selinux-mcelog-2.20220106-r1.ebuild b/sec-policy/selinux-mcelog/selinux-mcelog-2.20220106-r1.ebuild
index 2303f953c7f0..76995b8beec4 100644
--- a/sec-policy/selinux-mcelog/selinux-mcelog-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-mcelog/selinux-mcelog-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mcelog"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-mcelog/selinux-mcelog-2.20220106-r2.ebuild b/sec-policy/selinux-mcelog/selinux-mcelog-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..2303f953c7f0
--- /dev/null
+++ b/sec-policy/selinux-mcelog/selinux-mcelog-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="mcelog"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mcelog"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-memcached/Manifest b/sec-policy/selinux-memcached/Manifest
index f94f51e4df7e..001c33323947 100644
--- a/sec-policy/selinux-memcached/Manifest
+++ b/sec-policy/selinux-memcached/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-memcached-2.20200818-r2.ebuild 283 BLAKE2B 9fd41f968dd191f8f3b6661b5350b5aa2161d71c897e771ce3c072ce1be94d011816c3b83da18f62bbf0cbaf22bd92272d389b96bee1b24307d25feb7b801761 SHA512 f2197ea21ecb4cf07cd92d00e29502edafae5487c7f361642472d2376c47536dd9288e6390e90d903d8779f731344659969f7aa0215ff2a8942f09a9a99c8925
 EBUILD selinux-memcached-2.20210203-r1.ebuild 283 BLAKE2B 9fd41f968dd191f8f3b6661b5350b5aa2161d71c897e771ce3c072ce1be94d011816c3b83da18f62bbf0cbaf22bd92272d389b96bee1b24307d25feb7b801761 SHA512 f2197ea21ecb4cf07cd92d00e29502edafae5487c7f361642472d2376c47536dd9288e6390e90d903d8779f731344659969f7aa0215ff2a8942f09a9a99c8925
 EBUILD selinux-memcached-2.20210908-r1.ebuild 283 BLAKE2B 9fd41f968dd191f8f3b6661b5350b5aa2161d71c897e771ce3c072ce1be94d011816c3b83da18f62bbf0cbaf22bd92272d389b96bee1b24307d25feb7b801761 SHA512 f2197ea21ecb4cf07cd92d00e29502edafae5487c7f361642472d2376c47536dd9288e6390e90d903d8779f731344659969f7aa0215ff2a8942f09a9a99c8925
-EBUILD selinux-memcached-2.20220106-r1.ebuild 287 BLAKE2B 9223bf7b11652fcdac57f2dd984751583271e6d3ca356a2abf12f6ac7c67b11b9c701fada91c3ea60e06c376503d233d844e41b5b6f346abc0359dc90f1dc86d SHA512 c5d4bc0940c02ee993390911ed81d7677ea1f6dffa186e8f82a53b807d15cd863439ed67df91b0868d48d2c879936b6c136d2067890c6e6d58279dff8f66336b
+EBUILD selinux-memcached-2.20220106-r1.ebuild 285 BLAKE2B 06215396e0f8aae2590098dbf38e4f9008f6e53f13f9b64841586a9ff97e1000f8ee8fee798de226fa1451b68b3e3b7fd1a32dda31ccf018fb20f2faac8af5d5 SHA512 d16e997fbd11d0bb5b1bd1d9045f28a88af1ca0a6d60eaa5a30299add554a3d31a79e9b391cba0e02ff6801694cb5644bec60d83372f741542a6d1d18f2f503d
+EBUILD selinux-memcached-2.20220106-r2.ebuild 287 BLAKE2B 9223bf7b11652fcdac57f2dd984751583271e6d3ca356a2abf12f6ac7c67b11b9c701fada91c3ea60e06c376503d233d844e41b5b6f346abc0359dc90f1dc86d SHA512 c5d4bc0940c02ee993390911ed81d7677ea1f6dffa186e8f82a53b807d15cd863439ed67df91b0868d48d2c879936b6c136d2067890c6e6d58279dff8f66336b
 EBUILD selinux-memcached-9999.ebuild 287 BLAKE2B 639c2118689ff1b7134be0cfd1526f3593b5bc9c43abed5e9b6bd68289424391a72623b6e807427b3d25dd83192450267008bc9b13c60a5c6befdc08289e86e8 SHA512 25aacdad6c63c955cfdca0f22a04178640d1b5e62867d6181847049c823a76707a35d82719c7ce033c5616d69389747a234403db799ce7e1f5e0e0fe5f963bd6
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-memcached/selinux-memcached-2.20220106-r1.ebuild b/sec-policy/selinux-memcached/selinux-memcached-2.20220106-r1.ebuild
index 352e1599b0aa..5612d75398f2 100644
--- a/sec-policy/selinux-memcached/selinux-memcached-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-memcached/selinux-memcached-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for memcached"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-memcached/selinux-memcached-2.20220106-r2.ebuild b/sec-policy/selinux-memcached/selinux-memcached-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..352e1599b0aa
--- /dev/null
+++ b/sec-policy/selinux-memcached/selinux-memcached-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="memcached"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for memcached"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-milter/Manifest b/sec-policy/selinux-milter/Manifest
index 6314222e43f0..7bfd5e052921 100644
--- a/sec-policy/selinux-milter/Manifest
+++ b/sec-policy/selinux-milter/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-milter-2.20200818-r2.ebuild 277 BLAKE2B bdd51b8baf0525a133d4fbb399ca8e6f5f8a26ceddf39cdb13283ba18346c63ad30bb1fc6f514c0797c0e4e6ca193e4c1ea96cb7288faa8ff34dd9175c026113 SHA512 cf9a57b25e30bb9eb193ae07aef8f4aa1007efb5d3da5519912ace282441a9e9dd4307f4768ef5eeeee3b1aa3ef3062c7ed89a10ebab2e4646f1592857e42306
 EBUILD selinux-milter-2.20210203-r1.ebuild 277 BLAKE2B bdd51b8baf0525a133d4fbb399ca8e6f5f8a26ceddf39cdb13283ba18346c63ad30bb1fc6f514c0797c0e4e6ca193e4c1ea96cb7288faa8ff34dd9175c026113 SHA512 cf9a57b25e30bb9eb193ae07aef8f4aa1007efb5d3da5519912ace282441a9e9dd4307f4768ef5eeeee3b1aa3ef3062c7ed89a10ebab2e4646f1592857e42306
 EBUILD selinux-milter-2.20210908-r1.ebuild 277 BLAKE2B bdd51b8baf0525a133d4fbb399ca8e6f5f8a26ceddf39cdb13283ba18346c63ad30bb1fc6f514c0797c0e4e6ca193e4c1ea96cb7288faa8ff34dd9175c026113 SHA512 cf9a57b25e30bb9eb193ae07aef8f4aa1007efb5d3da5519912ace282441a9e9dd4307f4768ef5eeeee3b1aa3ef3062c7ed89a10ebab2e4646f1592857e42306
-EBUILD selinux-milter-2.20220106-r1.ebuild 281 BLAKE2B 3679aab2a29bff7782bf9854011670ea9b642cc00d9ef3f38d127098982f15b66ab9054802b46e1b7fb150f88a74a5345abfc0ecb2ae16303e6e9a3f29ab4e9d SHA512 819735e78f323cbcd2a422ee2360faea5e5f641ee49c86c1cdab3d814283edd72ab99145edd81b45a578396d7696326e6dd193ef7a4ab0181375719573f47e60
+EBUILD selinux-milter-2.20220106-r1.ebuild 279 BLAKE2B bcbe3c690b6ae7170f96f076aa48566a17c1d16058958f0b9a9b7fc1838ac63702c46c140338207e22a76ea72cadddac41b4909604cad4f38afa8e73016007e0 SHA512 b56634c5fa2ab11ae2ad94edc8496ef943f4914b749c6f129ce29828a3e3e0a6162d048f32481425c6ed4ae347d01279a81e13c39e331678bb94a13ffc8de7a6
+EBUILD selinux-milter-2.20220106-r2.ebuild 281 BLAKE2B 3679aab2a29bff7782bf9854011670ea9b642cc00d9ef3f38d127098982f15b66ab9054802b46e1b7fb150f88a74a5345abfc0ecb2ae16303e6e9a3f29ab4e9d SHA512 819735e78f323cbcd2a422ee2360faea5e5f641ee49c86c1cdab3d814283edd72ab99145edd81b45a578396d7696326e6dd193ef7a4ab0181375719573f47e60
 EBUILD selinux-milter-9999.ebuild 281 BLAKE2B 3f669b3a50ead6449bf63877597c3493d6212ae2674ef8c593e51b45126ade564c0c436f49fcf8f0b2566b8d7d329750960d98c4e5ac7a2b99cf62a4755537a7 SHA512 088cce8437b19b358476a29f51be8ccda6fbe79f70b47743f8e7d68059097d983d0895634450b78cbb93b73d1c8a4ee6d2abeffe1962358f9ce2ee9c7bbff53c
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-milter/selinux-milter-2.20220106-r1.ebuild b/sec-policy/selinux-milter/selinux-milter-2.20220106-r1.ebuild
index 18327180c1f6..191b87619122 100644
--- a/sec-policy/selinux-milter/selinux-milter-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-milter/selinux-milter-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for milter"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-milter/selinux-milter-2.20220106-r2.ebuild b/sec-policy/selinux-milter/selinux-milter-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..18327180c1f6
--- /dev/null
+++ b/sec-policy/selinux-milter/selinux-milter-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="milter"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for milter"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-modemmanager/Manifest b/sec-policy/selinux-modemmanager/Manifest
index 4427cfc06d30..b0f2b937f378 100644
--- a/sec-policy/selinux-modemmanager/Manifest
+++ b/sec-policy/selinux-modemmanager/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-modemmanager-2.20200818-r2.ebuild 381 BLAKE2B 825ca0df4e802bdeed5161cc52f91d2563ff736456020695f34b0fb2a5e1f525af45a0a1c46ca6630402d496518ccb0144e2ef70129bcf2f4017db00766c57e3 SHA512 9a13d17fb64e3f616f38110f78ed0f059daaf318e46cad081a0ed29628b79955b8a99cf4f1cbc4653f972889bd3865d03b72d141214ab1baacae1572623ca0c2
 EBUILD selinux-modemmanager-2.20210203-r1.ebuild 381 BLAKE2B 825ca0df4e802bdeed5161cc52f91d2563ff736456020695f34b0fb2a5e1f525af45a0a1c46ca6630402d496518ccb0144e2ef70129bcf2f4017db00766c57e3 SHA512 9a13d17fb64e3f616f38110f78ed0f059daaf318e46cad081a0ed29628b79955b8a99cf4f1cbc4653f972889bd3865d03b72d141214ab1baacae1572623ca0c2
 EBUILD selinux-modemmanager-2.20210908-r1.ebuild 381 BLAKE2B 825ca0df4e802bdeed5161cc52f91d2563ff736456020695f34b0fb2a5e1f525af45a0a1c46ca6630402d496518ccb0144e2ef70129bcf2f4017db00766c57e3 SHA512 9a13d17fb64e3f616f38110f78ed0f059daaf318e46cad081a0ed29628b79955b8a99cf4f1cbc4653f972889bd3865d03b72d141214ab1baacae1572623ca0c2
-EBUILD selinux-modemmanager-2.20220106-r1.ebuild 385 BLAKE2B 82fe5a49a8ce33c4828e66aee83b59cb8b7a2b7673206b0f31bc151788f2d89188633f87de130e3caf23dcc0383912e378ab4feb002f1c074de23dbf64c7bd86 SHA512 9822512794d0981879c894587ffda2f01700c272e982f5b45fb44bcfdbcddc2563e54bee82e6dab8c5f00482929000d01c3f69d64210a31bf628003571090f15
+EBUILD selinux-modemmanager-2.20220106-r1.ebuild 383 BLAKE2B 80655d92eab7242ea0274f6e333335c3196fd9e6041c85377f355124950ccfed38912afb231f71ae9ca25c6b10278f210c6088c1c76fca2416a654f683e58626 SHA512 8885d5541a5c5cc8bcefafb84d83e3132e820fe6a931f251b185550e507e294ab373bcfc0834ac1cdfee7de007c132fc5dd41c334c1b6637e4257a30c6e96476
+EBUILD selinux-modemmanager-2.20220106-r2.ebuild 385 BLAKE2B 82fe5a49a8ce33c4828e66aee83b59cb8b7a2b7673206b0f31bc151788f2d89188633f87de130e3caf23dcc0383912e378ab4feb002f1c074de23dbf64c7bd86 SHA512 9822512794d0981879c894587ffda2f01700c272e982f5b45fb44bcfdbcddc2563e54bee82e6dab8c5f00482929000d01c3f69d64210a31bf628003571090f15
 EBUILD selinux-modemmanager-9999.ebuild 385 BLAKE2B fdf0cc75b1af14a9209217c57c433fe12bf94270e5e79b1878b9862f8a643d5cfc7127c82a1ac3d77de0e85e138c49f9ec7546f501a2e35e5548fb086a951736 SHA512 963043ba158f9cd04a49e4225026bb281c02d3ff0601a56633f2bf1a7358ca962cf1f6ca3ec67e6d2fd3af781bbf543aca91f55441f502c3f6c4cf94fa38f37a
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20220106-r1.ebuild b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20220106-r1.ebuild
index 4cf74711e90d..6e6750845aa9 100644
--- a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20220106-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for modemmanager"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-dbus
diff --git a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20220106-r2.ebuild b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..4cf74711e90d
--- /dev/null
+++ b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20220106-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="modemmanager"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for modemmanager"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-dbus
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-dbus
+"
diff --git a/sec-policy/selinux-mono/Manifest b/sec-policy/selinux-mono/Manifest
index 097382ac856e..ffdafec26113 100644
--- a/sec-policy/selinux-mono/Manifest
+++ b/sec-policy/selinux-mono/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-mono-2.20200818-r2.ebuild 273 BLAKE2B 9718886afdc838784fb1b432e2541bdda01831ddfd3c4e276620557d3ac6f67e0502f9b910fec6e55de5e22ab644eaed20b44a36cf2cb2a9ef69b297a8ac92d6 SHA512 b5aacc23182315ecc7974ee94a8fa6b692d5f50614c6879912e475ba13f636a5b28730105815b795654b123f84b091ac20f9b3ca7c1eae65ea0703691c5467a1
 EBUILD selinux-mono-2.20210203-r1.ebuild 273 BLAKE2B 9718886afdc838784fb1b432e2541bdda01831ddfd3c4e276620557d3ac6f67e0502f9b910fec6e55de5e22ab644eaed20b44a36cf2cb2a9ef69b297a8ac92d6 SHA512 b5aacc23182315ecc7974ee94a8fa6b692d5f50614c6879912e475ba13f636a5b28730105815b795654b123f84b091ac20f9b3ca7c1eae65ea0703691c5467a1
 EBUILD selinux-mono-2.20210908-r1.ebuild 273 BLAKE2B 9718886afdc838784fb1b432e2541bdda01831ddfd3c4e276620557d3ac6f67e0502f9b910fec6e55de5e22ab644eaed20b44a36cf2cb2a9ef69b297a8ac92d6 SHA512 b5aacc23182315ecc7974ee94a8fa6b692d5f50614c6879912e475ba13f636a5b28730105815b795654b123f84b091ac20f9b3ca7c1eae65ea0703691c5467a1
-EBUILD selinux-mono-2.20220106-r1.ebuild 277 BLAKE2B 929d6f192b711933ca9786b4b840220563d47019ee187dff5ff9aae431152b1cabd8c75919f4226bfe9b5c620038812fbe1d1ce30e62c06d8b198f438d331180 SHA512 f1b6d3ada79be2316776ac92f7fa1358fd51947a53102b3ec7565f4923484a94c69158ff1f4d34e48f8a5473568d3ee4ce32d6cd48d81a086e9153872fec5d16
+EBUILD selinux-mono-2.20220106-r1.ebuild 275 BLAKE2B 99bc3e596b85df8547eef000f20066bb626e3950a7b83916644739e2f4e3869206177503d76d5f8a42b911553d3c84225e1816e677b0ffeb0023aa741c49ac4e SHA512 bce0d8442aa8fd8b021b0acb74c5f883275030d13e2f45fa951b88b6296c5aa02ae351d768a6b13c9c4ac737da9377f22831c2399cdbe1e91ab394326902361d
+EBUILD selinux-mono-2.20220106-r2.ebuild 277 BLAKE2B 929d6f192b711933ca9786b4b840220563d47019ee187dff5ff9aae431152b1cabd8c75919f4226bfe9b5c620038812fbe1d1ce30e62c06d8b198f438d331180 SHA512 f1b6d3ada79be2316776ac92f7fa1358fd51947a53102b3ec7565f4923484a94c69158ff1f4d34e48f8a5473568d3ee4ce32d6cd48d81a086e9153872fec5d16
 EBUILD selinux-mono-9999.ebuild 277 BLAKE2B 08bed118962c8f406a782a44efa94640b4c7b15dc964c6c7356782f8f82a316d5ea1d6be100f77e76a89cec9c7023e47418e0a9471c4b622d6297cbe79cc9047 SHA512 cbf86d08c66225105ae173ab8d8937bf3e8c5a1921ef27f3e830c0773eaf3f829a477c566f5d0adebcafe4d0c377dde591dd05a8f09e2be210e59dd0377e8b42
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-mono/selinux-mono-2.20220106-r1.ebuild b/sec-policy/selinux-mono/selinux-mono-2.20220106-r1.ebuild
index 24a9ae6d6acb..a4f4fb506ba8 100644
--- a/sec-policy/selinux-mono/selinux-mono-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-mono/selinux-mono-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mono"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-mono/selinux-mono-2.20220106-r2.ebuild b/sec-policy/selinux-mono/selinux-mono-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..24a9ae6d6acb
--- /dev/null
+++ b/sec-policy/selinux-mono/selinux-mono-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="mono"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mono"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-mozilla/Manifest b/sec-policy/selinux-mozilla/Manifest
index ea831a7db50b..478928bd4f70 100644
--- a/sec-policy/selinux-mozilla/Manifest
+++ b/sec-policy/selinux-mozilla/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-mozilla-2.20200818-r2.ebuild 381 BLAKE2B 5f715ce58720510454c5a6cac8bfabc65945e20a92b6e2403aab482e04f387f2dbea9027f182d908e5c39ce00d2dc61b5f154d586313857007edfd85ec1fdbed SHA512 b618fce8fa068699ea582c9495ec81cf1deb4db86dd2e9037f84d743d7cdc3834d517865f67e0c2ae271b64d1093387fe82c92707c1d1df48d8c2e82a024a475
 EBUILD selinux-mozilla-2.20210203-r1.ebuild 381 BLAKE2B 5f715ce58720510454c5a6cac8bfabc65945e20a92b6e2403aab482e04f387f2dbea9027f182d908e5c39ce00d2dc61b5f154d586313857007edfd85ec1fdbed SHA512 b618fce8fa068699ea582c9495ec81cf1deb4db86dd2e9037f84d743d7cdc3834d517865f67e0c2ae271b64d1093387fe82c92707c1d1df48d8c2e82a024a475
 EBUILD selinux-mozilla-2.20210908-r1.ebuild 381 BLAKE2B 5f715ce58720510454c5a6cac8bfabc65945e20a92b6e2403aab482e04f387f2dbea9027f182d908e5c39ce00d2dc61b5f154d586313857007edfd85ec1fdbed SHA512 b618fce8fa068699ea582c9495ec81cf1deb4db86dd2e9037f84d743d7cdc3834d517865f67e0c2ae271b64d1093387fe82c92707c1d1df48d8c2e82a024a475
-EBUILD selinux-mozilla-2.20220106-r1.ebuild 385 BLAKE2B 29df4fb58b95cd34c61f054df794e33833d97250f646bfab27c7aac45d31045a413bb88d883d332a6e1a1ff8d92e53c4d933cc4d632f8704409ed48bcada89e9 SHA512 bf7d481a589025ae18418dcadf34b3cf87b05ba066c6df8049cbc586777c67ab835ed6b39c3ff0bec58cebc4813b2a9781fcf06d33232e9ad10c8362fa8c417a
+EBUILD selinux-mozilla-2.20220106-r1.ebuild 383 BLAKE2B 2ccc60ecf16d93ebc277622620ddef7f34ffd3f4ccd9810982f5dbb219a017026c78feb59dcd90ab528df0c8efdde1e1fe6a6e1adfb3ecf8a60a1bd3937ff33e SHA512 111a0e1b086e9725e88a97ca8633b690c7c589230b086b4a033f8b51cb982cce3308bf430f3dce1a1c9ca9ff3f93b3f30e7d79afe5c39687a1fcc5a089a184e7
+EBUILD selinux-mozilla-2.20220106-r2.ebuild 385 BLAKE2B 29df4fb58b95cd34c61f054df794e33833d97250f646bfab27c7aac45d31045a413bb88d883d332a6e1a1ff8d92e53c4d933cc4d632f8704409ed48bcada89e9 SHA512 bf7d481a589025ae18418dcadf34b3cf87b05ba066c6df8049cbc586777c67ab835ed6b39c3ff0bec58cebc4813b2a9781fcf06d33232e9ad10c8362fa8c417a
 EBUILD selinux-mozilla-9999.ebuild 385 BLAKE2B 6ad1412a4bccf2320ca99fed80b43e51f06d51221fb177491049c539b084d4daabfb4d05d13cc311f9d47f273ad9b67d4b39e91a2ac1dbcf1ad714b40d8518f2 SHA512 d89192bd33c94e48b2f0e18c87e1ea9adf95ca80a26cedf33a599fb2d58a8d2392918580e4a7ad76663676d96bffac7a861a3e665119ec7bb89996bb9ff7df4b
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-mozilla/selinux-mozilla-2.20220106-r1.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-2.20220106-r1.ebuild
index 6898cce05e2b..ddb21528a126 100644
--- a/sec-policy/selinux-mozilla/selinux-mozilla-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-mozilla/selinux-mozilla-2.20220106-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mozilla"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-mozilla/selinux-mozilla-2.20220106-r2.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..6898cce05e2b
--- /dev/null
+++ b/sec-policy/selinux-mozilla/selinux-mozilla-2.20220106-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE="alsa"
+MODS="mozilla"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mozilla"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-xserver
+"
diff --git a/sec-policy/selinux-mpd/Manifest b/sec-policy/selinux-mpd/Manifest
index 9b22489ff0f8..0e79612fa152 100644
--- a/sec-policy/selinux-mpd/Manifest
+++ b/sec-policy/selinux-mpd/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-mpd-2.20200818-r2.ebuild 271 BLAKE2B 6612bd0f72928c7306deb8b730b645ffdeb7ef60332add9d36cad497521f0b394a19a54fc18e7997eadd3e568d47f8fca80645125482b44f6ddcaa3b8c2f86db SHA512 5e4b594d01d302ad2cdaa6864d27dbefa1540ad9c87d73030e1d44d41b2e6728d4f84f64dc9959dcfcb30a9813d70b21c546e7ca334cb5f2998f7d6952b5ecf5
 EBUILD selinux-mpd-2.20210203-r1.ebuild 271 BLAKE2B 6612bd0f72928c7306deb8b730b645ffdeb7ef60332add9d36cad497521f0b394a19a54fc18e7997eadd3e568d47f8fca80645125482b44f6ddcaa3b8c2f86db SHA512 5e4b594d01d302ad2cdaa6864d27dbefa1540ad9c87d73030e1d44d41b2e6728d4f84f64dc9959dcfcb30a9813d70b21c546e7ca334cb5f2998f7d6952b5ecf5
 EBUILD selinux-mpd-2.20210908-r1.ebuild 271 BLAKE2B 6612bd0f72928c7306deb8b730b645ffdeb7ef60332add9d36cad497521f0b394a19a54fc18e7997eadd3e568d47f8fca80645125482b44f6ddcaa3b8c2f86db SHA512 5e4b594d01d302ad2cdaa6864d27dbefa1540ad9c87d73030e1d44d41b2e6728d4f84f64dc9959dcfcb30a9813d70b21c546e7ca334cb5f2998f7d6952b5ecf5
-EBUILD selinux-mpd-2.20220106-r1.ebuild 275 BLAKE2B d27a3dad39f17bf2957f5e501969a9f275e666305050108a83287cd9de66882c248c7cb451831c44c80145809dc336bf651f940d965aa4fe92aa55b626a4fb25 SHA512 49853984349b30e9db6c39c83928b1c06caac49b84ee5bd32886e440aa4e5f9abb2578cbc4bac81545d3a30ca4c70d41110aa7495167e573e76a589955a281bb
+EBUILD selinux-mpd-2.20220106-r1.ebuild 273 BLAKE2B 6bf696ec833e6d5726321b28883584f6dbc253ba2387c63ed44d1afbc08c036a5ec0193cc3b5d7f13acbc8a9931b90cd79694cdc4dae769ee938f7cf1747ca83 SHA512 2412e4ab16922637b58112dc36e5df64d9876ed92314b45a6329c62c17d5c2d7dcd142b03c234438bc56be429ee73401525b9c88271139ddd8ac10dd86e07804
+EBUILD selinux-mpd-2.20220106-r2.ebuild 275 BLAKE2B d27a3dad39f17bf2957f5e501969a9f275e666305050108a83287cd9de66882c248c7cb451831c44c80145809dc336bf651f940d965aa4fe92aa55b626a4fb25 SHA512 49853984349b30e9db6c39c83928b1c06caac49b84ee5bd32886e440aa4e5f9abb2578cbc4bac81545d3a30ca4c70d41110aa7495167e573e76a589955a281bb
 EBUILD selinux-mpd-9999.ebuild 275 BLAKE2B 5991284d72fba7153f3818a7b685790756f273d92254621031c9b0b2d77ae2489f2c4c6aa701cd675e30af34af3b49b5c323a25d4628fdd353482257b941550b SHA512 116306471f223a38a8bd79d7b03e7c44728a51e40ea02d48ff690a4921825b894e6bb9ad0ef5910b46a775fcd7f50553ecdbe8ebd5ddd50307d43dae65ff20ed
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-mpd/selinux-mpd-2.20220106-r1.ebuild b/sec-policy/selinux-mpd/selinux-mpd-2.20220106-r1.ebuild
index d2bd42397e74..e4eda7a49200 100644
--- a/sec-policy/selinux-mpd/selinux-mpd-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-mpd/selinux-mpd-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mpd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-mpd/selinux-mpd-2.20220106-r2.ebuild b/sec-policy/selinux-mpd/selinux-mpd-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..d2bd42397e74
--- /dev/null
+++ b/sec-policy/selinux-mpd/selinux-mpd-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="mpd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mpd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-mplayer/Manifest b/sec-policy/selinux-mplayer/Manifest
index a6e5ec5032b8..560fca1f2760 100644
--- a/sec-policy/selinux-mplayer/Manifest
+++ b/sec-policy/selinux-mplayer/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-mplayer-2.20200818-r2.ebuild 283 BLAKE2B d8f39fb25af32ec7d8bc688efa2b2a87050d47ea315815316d9a6f1a5dda3f70e7d835b0edfcc25c3a122879a17112c559abceec3aea100ca071784f80358511 SHA512 6ea4973592d5017778c27b71dd5b49dc1d67fb9a09d42d4637a530756c9f443597602eb0aeac9467cd3de06d70f012cee96f6840ccd93fedfb4684043c54cab8
 EBUILD selinux-mplayer-2.20210203-r1.ebuild 283 BLAKE2B d8f39fb25af32ec7d8bc688efa2b2a87050d47ea315815316d9a6f1a5dda3f70e7d835b0edfcc25c3a122879a17112c559abceec3aea100ca071784f80358511 SHA512 6ea4973592d5017778c27b71dd5b49dc1d67fb9a09d42d4637a530756c9f443597602eb0aeac9467cd3de06d70f012cee96f6840ccd93fedfb4684043c54cab8
 EBUILD selinux-mplayer-2.20210908-r1.ebuild 283 BLAKE2B d8f39fb25af32ec7d8bc688efa2b2a87050d47ea315815316d9a6f1a5dda3f70e7d835b0edfcc25c3a122879a17112c559abceec3aea100ca071784f80358511 SHA512 6ea4973592d5017778c27b71dd5b49dc1d67fb9a09d42d4637a530756c9f443597602eb0aeac9467cd3de06d70f012cee96f6840ccd93fedfb4684043c54cab8
-EBUILD selinux-mplayer-2.20220106-r1.ebuild 287 BLAKE2B d57b178e12dd8b3fd0cfef04d4a57fa142c7d7a4e1d63f970c5f4f3ac65d4e50a9d63b67d7b58cd3342d72df6e04ba37a234955415ea3e2c4c1a5b1442be9b10 SHA512 c3f45303c5242a5d2432bd0dea43a3168c95bcb473187c07dd5e5e2b6cf1d8836ebf408e3e572ec77b8659f29f5cd79586742cb4fdcb3b8dd93fe8eebfed9be2
+EBUILD selinux-mplayer-2.20220106-r1.ebuild 285 BLAKE2B f7c3d5d81392cf00755a820073e59df286716cdc331ea47a1bbbd79cb49df4c6763207ac77691dbd815a531674ab47a876b1493f6e545020d338f42b37120567 SHA512 a5158f85050ab5bfb068e146c5f79ba15932d13a99b4d06c55fbeecc67a07f756397a430419404e343d9f29cb6769d4402c0c88e111a1222057ab7ed95874846
+EBUILD selinux-mplayer-2.20220106-r2.ebuild 287 BLAKE2B d57b178e12dd8b3fd0cfef04d4a57fa142c7d7a4e1d63f970c5f4f3ac65d4e50a9d63b67d7b58cd3342d72df6e04ba37a234955415ea3e2c4c1a5b1442be9b10 SHA512 c3f45303c5242a5d2432bd0dea43a3168c95bcb473187c07dd5e5e2b6cf1d8836ebf408e3e572ec77b8659f29f5cd79586742cb4fdcb3b8dd93fe8eebfed9be2
 EBUILD selinux-mplayer-9999.ebuild 287 BLAKE2B c2ad1fb7bab79932508d26cfdea4f4cbed45bd1dbe4adfbc33e7c8bda51797433a01002580c4bc36bbffe42b84a4926f907d2fd28c2c303dc66d1fc0730c1ee5 SHA512 83c3d596bf8e1390f08816dab1db88d644dc06f50cf095931701c4b52f8c9be18bca72279d3aef172999d727d608b46a56203246cd4c394749bbb272853c8e79
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-mplayer/selinux-mplayer-2.20220106-r1.ebuild b/sec-policy/selinux-mplayer/selinux-mplayer-2.20220106-r1.ebuild
index e340f9c0f11b..4682e2085419 100644
--- a/sec-policy/selinux-mplayer/selinux-mplayer-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-mplayer/selinux-mplayer-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mplayer"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-mplayer/selinux-mplayer-2.20220106-r2.ebuild b/sec-policy/selinux-mplayer/selinux-mplayer-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..e340f9c0f11b
--- /dev/null
+++ b/sec-policy/selinux-mplayer/selinux-mplayer-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE="alsa"
+MODS="mplayer"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mplayer"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-mrtg/Manifest b/sec-policy/selinux-mrtg/Manifest
index cebe2bd05a8d..9bd5c82ab45f 100644
--- a/sec-policy/selinux-mrtg/Manifest
+++ b/sec-policy/selinux-mrtg/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-mrtg-2.20200818-r2.ebuild 273 BLAKE2B 6162750108e17b17467b4d95b47ac291976b264c54694171491facefd92a6739eb73fa4bcf0ad8b871a895736aa92ec3f8b291967fe7caf88c0d2023e669d671 SHA512 db75d22fb75ecf908a167627b9e2d1db8a7bfc1362168675783b9a2cf36ab5b8f6fd2f9213b6585cbc5fbaebb6dc450efb26d87970f3482a26ee4736cd853d0b
 EBUILD selinux-mrtg-2.20210203-r1.ebuild 273 BLAKE2B 6162750108e17b17467b4d95b47ac291976b264c54694171491facefd92a6739eb73fa4bcf0ad8b871a895736aa92ec3f8b291967fe7caf88c0d2023e669d671 SHA512 db75d22fb75ecf908a167627b9e2d1db8a7bfc1362168675783b9a2cf36ab5b8f6fd2f9213b6585cbc5fbaebb6dc450efb26d87970f3482a26ee4736cd853d0b
 EBUILD selinux-mrtg-2.20210908-r1.ebuild 273 BLAKE2B 6162750108e17b17467b4d95b47ac291976b264c54694171491facefd92a6739eb73fa4bcf0ad8b871a895736aa92ec3f8b291967fe7caf88c0d2023e669d671 SHA512 db75d22fb75ecf908a167627b9e2d1db8a7bfc1362168675783b9a2cf36ab5b8f6fd2f9213b6585cbc5fbaebb6dc450efb26d87970f3482a26ee4736cd853d0b
-EBUILD selinux-mrtg-2.20220106-r1.ebuild 277 BLAKE2B d12b66db46eeb0cd1fc79821058f773a0abba03f4846133550321298484d13c4a1d587b73737008d12a00622b79d06bcba4b083fd55b21939a9c53acd99cd40e SHA512 82d64b3f45c7b5fbc9db3afefb0a6a8b55cbe3d448c0414b0f7997208f457eddd4e52a75484c7d21970990f83ac281126323f56aa2751201e4c7f3a05ef595d3
+EBUILD selinux-mrtg-2.20220106-r1.ebuild 275 BLAKE2B 186594e72d53aeab459a2dc90b1887842dfbda776ba495c4a3fbabbcbcbe1a771dbdda519d715a6b3e4219edb63a5bcf688ff863ab0f4ce57ab854893dd7d1f6 SHA512 0bd0e76d0c1c4a6e1b3e450ed6d0cb825a6961c7c5c424569355cdfd522e2a8591c7c20d9263a5f0d5b671de90e2a106907a094902468ebac8dfb862a14b93ea
+EBUILD selinux-mrtg-2.20220106-r2.ebuild 277 BLAKE2B d12b66db46eeb0cd1fc79821058f773a0abba03f4846133550321298484d13c4a1d587b73737008d12a00622b79d06bcba4b083fd55b21939a9c53acd99cd40e SHA512 82d64b3f45c7b5fbc9db3afefb0a6a8b55cbe3d448c0414b0f7997208f457eddd4e52a75484c7d21970990f83ac281126323f56aa2751201e4c7f3a05ef595d3
 EBUILD selinux-mrtg-9999.ebuild 277 BLAKE2B ca644f4e4473dd23d7e57599b943fed3184c1c4ecfaa4fadcdcaf11cb682762663dc0f75620541c97b96bb708545c3e1e75ec5a2f230ff345f2de32a4ababc35 SHA512 f339478e9c08247f5ecc0e70e937522dfd4f718959f86a8f69d9c0139715f6f4af475d4da8b581aedd2a624146bfd9941f63bcfac70bd4a307c5290990be420e
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-mrtg/selinux-mrtg-2.20220106-r1.ebuild b/sec-policy/selinux-mrtg/selinux-mrtg-2.20220106-r1.ebuild
index af5b48d0b831..04aaee7f0434 100644
--- a/sec-policy/selinux-mrtg/selinux-mrtg-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-mrtg/selinux-mrtg-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mrtg"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-mrtg/selinux-mrtg-2.20220106-r2.ebuild b/sec-policy/selinux-mrtg/selinux-mrtg-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..af5b48d0b831
--- /dev/null
+++ b/sec-policy/selinux-mrtg/selinux-mrtg-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="mrtg"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mrtg"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-munin/Manifest b/sec-policy/selinux-munin/Manifest
index 0f4355388aed..53264c7e862e 100644
--- a/sec-policy/selinux-munin/Manifest
+++ b/sec-policy/selinux-munin/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-munin-2.20200818-r2.ebuild 371 BLAKE2B 85651e351b7681dd25fafa53bf20921fc362f5be123775085140ca15e79848c34f10dfa24836da0d6a3a443c3a7bd5ed3078f59fcde94b80aa291a23615540bd SHA512 e761fbd1fde464c5a0cdcfe8057eb30db471e0a1df8136db6bddfcf698e09600be228d98c967fff89acf9cb453bac2123f30351142c2ef6858b5c10dfc1272bb
 EBUILD selinux-munin-2.20210203-r1.ebuild 371 BLAKE2B 85651e351b7681dd25fafa53bf20921fc362f5be123775085140ca15e79848c34f10dfa24836da0d6a3a443c3a7bd5ed3078f59fcde94b80aa291a23615540bd SHA512 e761fbd1fde464c5a0cdcfe8057eb30db471e0a1df8136db6bddfcf698e09600be228d98c967fff89acf9cb453bac2123f30351142c2ef6858b5c10dfc1272bb
 EBUILD selinux-munin-2.20210908-r1.ebuild 371 BLAKE2B 85651e351b7681dd25fafa53bf20921fc362f5be123775085140ca15e79848c34f10dfa24836da0d6a3a443c3a7bd5ed3078f59fcde94b80aa291a23615540bd SHA512 e761fbd1fde464c5a0cdcfe8057eb30db471e0a1df8136db6bddfcf698e09600be228d98c967fff89acf9cb453bac2123f30351142c2ef6858b5c10dfc1272bb
-EBUILD selinux-munin-2.20220106-r1.ebuild 375 BLAKE2B 541fae2440293ed60240be5e0082e77d840623ca0e20e03bcf8c6b89683dae247139477d34a4fef5549e0783ac5688be775fed419e7a55ba49656e2c7f88ed67 SHA512 74d773fd70d34f5365e8a88cd1fe99aa6e82de55caaafc17b97607379807828d72fa469fb1a83dea89b0f2680d8da0cdb47b3d5814751a9295c3547371f8b14a
+EBUILD selinux-munin-2.20220106-r1.ebuild 373 BLAKE2B c2871bd46a42c9bfdfbd2026c7bd48a897590f1bfec67e4962c5d39f794058e19a4d7fd4327e5bd0b2cc7ad31c1a54bdaa76c96d07c90f782680f09d9eeb13a6 SHA512 28e0e1a78c1c3726dc28ad5bd59c86074feb3addff63acb5730dd2560a6ec3c6b5fc073cfca4dc5ec11ae78a11fcdba6665e9e73a13e71df6e2c0d8eb776d941
+EBUILD selinux-munin-2.20220106-r2.ebuild 375 BLAKE2B 541fae2440293ed60240be5e0082e77d840623ca0e20e03bcf8c6b89683dae247139477d34a4fef5549e0783ac5688be775fed419e7a55ba49656e2c7f88ed67 SHA512 74d773fd70d34f5365e8a88cd1fe99aa6e82de55caaafc17b97607379807828d72fa469fb1a83dea89b0f2680d8da0cdb47b3d5814751a9295c3547371f8b14a
 EBUILD selinux-munin-9999.ebuild 375 BLAKE2B db46074c1ef92f5cf4f5722fd5e206a2f0eba9e4c553df799feaa80a20132f79a74bcc846cc901fa9933eb111ebfe1b24ca412c480777c1666e0c03f3d65b130 SHA512 4a8c22a23d79c44154731b0c9697597283224d0f51f7fa2fac35708053e179b527f4a36764c1e428a66327ec51f4ce9f358b79d4cd733fd9db42b8663ca23f1a
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-munin/selinux-munin-2.20220106-r1.ebuild b/sec-policy/selinux-munin/selinux-munin-2.20220106-r1.ebuild
index e7ec7e73717d..581b880aefe0 100644
--- a/sec-policy/selinux-munin/selinux-munin-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-munin/selinux-munin-2.20220106-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for munin"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-munin/selinux-munin-2.20220106-r2.ebuild b/sec-policy/selinux-munin/selinux-munin-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..e7ec7e73717d
--- /dev/null
+++ b/sec-policy/selinux-munin/selinux-munin-2.20220106-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="munin"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for munin"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-mutt/Manifest b/sec-policy/selinux-mutt/Manifest
index f592f0155639..13528cceabc2 100644
--- a/sec-policy/selinux-mutt/Manifest
+++ b/sec-policy/selinux-mutt/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-mutt-2.20200818-r2.ebuild 273 BLAKE2B 3f3c1c308584c4bf8edf6be32544bb43e64fd287915a0190235ca8d28529ad36c7010f0d224a4c14819202a861cfedf3dc2e7980c2946de515be192d7d1731b3 SHA512 e6845bd459cdee68784a4aed774f0b75c0119b1bc9dd12757b49fb203d27311a0de58c7a34bc91206ff11102888ad71ec1c8d15119033efe93498238f99906ae
 EBUILD selinux-mutt-2.20210203-r1.ebuild 273 BLAKE2B 3f3c1c308584c4bf8edf6be32544bb43e64fd287915a0190235ca8d28529ad36c7010f0d224a4c14819202a861cfedf3dc2e7980c2946de515be192d7d1731b3 SHA512 e6845bd459cdee68784a4aed774f0b75c0119b1bc9dd12757b49fb203d27311a0de58c7a34bc91206ff11102888ad71ec1c8d15119033efe93498238f99906ae
 EBUILD selinux-mutt-2.20210908-r1.ebuild 273 BLAKE2B 3f3c1c308584c4bf8edf6be32544bb43e64fd287915a0190235ca8d28529ad36c7010f0d224a4c14819202a861cfedf3dc2e7980c2946de515be192d7d1731b3 SHA512 e6845bd459cdee68784a4aed774f0b75c0119b1bc9dd12757b49fb203d27311a0de58c7a34bc91206ff11102888ad71ec1c8d15119033efe93498238f99906ae
-EBUILD selinux-mutt-2.20220106-r1.ebuild 277 BLAKE2B 73924a6eb37e01768a36a2b1228f440b58a8342b8d6b4d0480d1fac011671bfe0fbcb3ff38337b18b947ccfc2db021f521ab9b252e7f3101c42c7c68839de079 SHA512 bda1c6b3fb3f7070e720b3067b61a90eba68e5ded63d1accf77fe25e1138de3ac22321f3b1c19281aa4104dd20b523150b13ba1a12273f471fcbede773458318
+EBUILD selinux-mutt-2.20220106-r1.ebuild 275 BLAKE2B e2f7603303b78e08a12e3949c3687c271050b46a879e93b5fd995e3fe0720d1b7124cccf338816f2c319779549608797fcafeea4feca4d7003b56f52bc338ba0 SHA512 68d2aa02bb94d95c4ca981ff5e4c2a5e87ce442abf2f94f1e86f360efcd6c43d5485a139309421b7b5391677514214e05fbc27cc7486337a17d44fd57b5b493a
+EBUILD selinux-mutt-2.20220106-r2.ebuild 277 BLAKE2B 73924a6eb37e01768a36a2b1228f440b58a8342b8d6b4d0480d1fac011671bfe0fbcb3ff38337b18b947ccfc2db021f521ab9b252e7f3101c42c7c68839de079 SHA512 bda1c6b3fb3f7070e720b3067b61a90eba68e5ded63d1accf77fe25e1138de3ac22321f3b1c19281aa4104dd20b523150b13ba1a12273f471fcbede773458318
 EBUILD selinux-mutt-9999.ebuild 277 BLAKE2B 3fc26b3540d54e91f3951379efad6cd182d65f9a590098aad0ff56492e4755ec2f38e15c8f8fee33e1d21e1b348409e797a4233100bdaa7ba0449e63c69f2972 SHA512 0714e6353dee504dd2b07544380f51944f40a0782297b95cf5ab91677a2b6bd1efbd7a533b93ef9fc03e1d95d323e8b36b8e44b336ba7ff3d4bc854b32850904
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-mutt/selinux-mutt-2.20220106-r1.ebuild b/sec-policy/selinux-mutt/selinux-mutt-2.20220106-r1.ebuild
index 9bf3af54861b..0a5fef125574 100644
--- a/sec-policy/selinux-mutt/selinux-mutt-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-mutt/selinux-mutt-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mutt"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-mutt/selinux-mutt-2.20220106-r2.ebuild b/sec-policy/selinux-mutt/selinux-mutt-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..9bf3af54861b
--- /dev/null
+++ b/sec-policy/selinux-mutt/selinux-mutt-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="mutt"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mutt"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-mysql/Manifest b/sec-policy/selinux-mysql/Manifest
index c185ff9a3fa2..e96f8e7344cc 100644
--- a/sec-policy/selinux-mysql/Manifest
+++ b/sec-policy/selinux-mysql/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-mysql-2.20200818-r2.ebuild 275 BLAKE2B 32151328bac2ddf5c895dded03cac32199e32a30dcb65a84f0eac96dfa103125657b7d46fb40f6637e849e68567275687ef14eef85253694982435b2dcb1f263 SHA512 6db2944a5285e4b0d50708338d3a7837fdbad7c46a3be2d322968a8df387e80c5a279a94ce0faa399c694e1bd9a7de828a05d4582e6084b0c6af8ed0385eec86
 EBUILD selinux-mysql-2.20210203-r1.ebuild 275 BLAKE2B 32151328bac2ddf5c895dded03cac32199e32a30dcb65a84f0eac96dfa103125657b7d46fb40f6637e849e68567275687ef14eef85253694982435b2dcb1f263 SHA512 6db2944a5285e4b0d50708338d3a7837fdbad7c46a3be2d322968a8df387e80c5a279a94ce0faa399c694e1bd9a7de828a05d4582e6084b0c6af8ed0385eec86
 EBUILD selinux-mysql-2.20210908-r1.ebuild 275 BLAKE2B 32151328bac2ddf5c895dded03cac32199e32a30dcb65a84f0eac96dfa103125657b7d46fb40f6637e849e68567275687ef14eef85253694982435b2dcb1f263 SHA512 6db2944a5285e4b0d50708338d3a7837fdbad7c46a3be2d322968a8df387e80c5a279a94ce0faa399c694e1bd9a7de828a05d4582e6084b0c6af8ed0385eec86
-EBUILD selinux-mysql-2.20220106-r1.ebuild 279 BLAKE2B ea31e0a90598be90ca1e0e42f9219ec43641f38082f20017142e370f07c4030076a176d6e5826dd460a7840e9191e28294b60be964acdf2ef40bbda398a4bd45 SHA512 65941ac86ca345c9bad45c102e34e3daeee86de66752ff9879be9d663a3319973e1ef07da7126457ef39fbeab42a9dba8b45645fb73449c2acb2648db1fa36d8
+EBUILD selinux-mysql-2.20220106-r1.ebuild 277 BLAKE2B ad7398592acb5d3ec069f6db2a13e6e99607b2dd9f69cfb184fb76e22cb7c54a4e12fc3f99d381b65b38a156a1efef95a059a28eee5baa1fa65346025f950441 SHA512 086ed577f0a41cb3b6a520ec1cdebce9404ca4495a565cbf52ccd57dfdd34cba9ee31b206c54ef3b01608c5a03c5c2e2f182c23f07dc2d34f4b114eb53be9b36
+EBUILD selinux-mysql-2.20220106-r2.ebuild 279 BLAKE2B ea31e0a90598be90ca1e0e42f9219ec43641f38082f20017142e370f07c4030076a176d6e5826dd460a7840e9191e28294b60be964acdf2ef40bbda398a4bd45 SHA512 65941ac86ca345c9bad45c102e34e3daeee86de66752ff9879be9d663a3319973e1ef07da7126457ef39fbeab42a9dba8b45645fb73449c2acb2648db1fa36d8
 EBUILD selinux-mysql-9999.ebuild 279 BLAKE2B 39fc0d4d15e72f1b81fecd428a4c6a4cf5795ab121aa125a26369a933c56ec8d796a9d3d9eae7577f1b82db559e49deb1ba08e39deec9546cf28134b80b8183a SHA512 2ad9ff202bf84fb7989357804bf4feaee687ba44bda8c25ee4f7521639840402a983421f5d1ac743fedb9ec9f474b4c127b1fbae8342cae8eabf6974d707bd67
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-mysql/selinux-mysql-2.20220106-r1.ebuild b/sec-policy/selinux-mysql/selinux-mysql-2.20220106-r1.ebuild
index dd654488ebb9..e984095376cd 100644
--- a/sec-policy/selinux-mysql/selinux-mysql-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-mysql/selinux-mysql-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mysql"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-mysql/selinux-mysql-2.20220106-r2.ebuild b/sec-policy/selinux-mysql/selinux-mysql-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..dd654488ebb9
--- /dev/null
+++ b/sec-policy/selinux-mysql/selinux-mysql-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="mysql"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mysql"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-nagios/Manifest b/sec-policy/selinux-nagios/Manifest
index c7d3e853afef..d7c9e63a7d9e 100644
--- a/sec-policy/selinux-nagios/Manifest
+++ b/sec-policy/selinux-nagios/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-nagios-2.20200818-r2.ebuild 373 BLAKE2B 394c05885fcb331c5c1b0a73268ad1051110a081b28bdee2756fd1b24f7c693685e08e1a90e90e080c6395884e2dd62550c00b322a0de86ff0e433c306601ad3 SHA512 a3ec776f81519b958fb8a09da38f649fb68dd76d3270a2940ef69b40ce495e7570474f0d752331b12235bd394b7a59ada634abac91f87db62b2d1efb40284343
 EBUILD selinux-nagios-2.20210203-r1.ebuild 373 BLAKE2B 394c05885fcb331c5c1b0a73268ad1051110a081b28bdee2756fd1b24f7c693685e08e1a90e90e080c6395884e2dd62550c00b322a0de86ff0e433c306601ad3 SHA512 a3ec776f81519b958fb8a09da38f649fb68dd76d3270a2940ef69b40ce495e7570474f0d752331b12235bd394b7a59ada634abac91f87db62b2d1efb40284343
 EBUILD selinux-nagios-2.20210908-r1.ebuild 373 BLAKE2B 394c05885fcb331c5c1b0a73268ad1051110a081b28bdee2756fd1b24f7c693685e08e1a90e90e080c6395884e2dd62550c00b322a0de86ff0e433c306601ad3 SHA512 a3ec776f81519b958fb8a09da38f649fb68dd76d3270a2940ef69b40ce495e7570474f0d752331b12235bd394b7a59ada634abac91f87db62b2d1efb40284343
-EBUILD selinux-nagios-2.20220106-r1.ebuild 377 BLAKE2B d08e1a63e0aea9d2c84231b9794627eef3512ea3246a93ceab607032a77eb9d32444d3acc41bb79517f39bffe53a6e6babfcdd22acb1661be1f65995529ffe81 SHA512 9fa8668345f10de324b7344ca9c36fc18c0a5ba09782dffb97aac1b1b2e3baa50f9019b71955f42b0470c2e4be21a8b7e216925d602926e0645da2ba640e1775
+EBUILD selinux-nagios-2.20220106-r1.ebuild 375 BLAKE2B 8abd67caab92fc0aa864ef2945d9e2053704ca1cd4481f730140a8806bed8a3a6ac83c140e02bdb99eaebb3665ec9bd318ac40fe901eb810a461965b552f744c SHA512 8439d27443a395bfb40ed5b4cdbd58438296733998620a4cceefae39d7168c4921d3f6d7568d3721c21982af24a1192b516504c1bc462420eb7393d7212cb93c
+EBUILD selinux-nagios-2.20220106-r2.ebuild 377 BLAKE2B d08e1a63e0aea9d2c84231b9794627eef3512ea3246a93ceab607032a77eb9d32444d3acc41bb79517f39bffe53a6e6babfcdd22acb1661be1f65995529ffe81 SHA512 9fa8668345f10de324b7344ca9c36fc18c0a5ba09782dffb97aac1b1b2e3baa50f9019b71955f42b0470c2e4be21a8b7e216925d602926e0645da2ba640e1775
 EBUILD selinux-nagios-9999.ebuild 377 BLAKE2B 9ef11cb6c58c1149ae78124015e3a3cc6ee6f6aada57dcf8a84b5c9691372ea4235d476b381a47cb7567bc97a77db620fe9f9633762787425bf670b1bdb9a2a3 SHA512 bb8841bc885e1a798fec0c5326766fd15f5b33da4b12794ab53087f3f6da1dae4d121c492215914d1b21f15f71493949f274c52515bde6d6ef0af1c640ce2b56
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20220106-r1.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20220106-r1.ebuild
index 617e5be80a54..159c0ef51b69 100644
--- a/sec-policy/selinux-nagios/selinux-nagios-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-nagios/selinux-nagios-2.20220106-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for nagios"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20220106-r2.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..617e5be80a54
--- /dev/null
+++ b/sec-policy/selinux-nagios/selinux-nagios-2.20220106-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="nagios"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for nagios"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-ncftool/Manifest b/sec-policy/selinux-ncftool/Manifest
index 000d326542d5..563f9317db7d 100644
--- a/sec-policy/selinux-ncftool/Manifest
+++ b/sec-policy/selinux-ncftool/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-ncftool-2.20200818-r2.ebuild 279 BLAKE2B cff4d4f8e9ac817a6977fe77dba40ebf8d25992275445607276b2427f15da3112be450910586df1641fd1c287e9dd79d1988e42de300e19469fdf0090e02b5a4 SHA512 d3e3e7104eab6d64d12fb6f0656fff3adcf6a2dc833016ee46152469a4c18f9d18f9c631f85a85782fb0c658c40a85d0672d0651335bef78e82061c352b36387
 EBUILD selinux-ncftool-2.20210203-r1.ebuild 279 BLAKE2B cff4d4f8e9ac817a6977fe77dba40ebf8d25992275445607276b2427f15da3112be450910586df1641fd1c287e9dd79d1988e42de300e19469fdf0090e02b5a4 SHA512 d3e3e7104eab6d64d12fb6f0656fff3adcf6a2dc833016ee46152469a4c18f9d18f9c631f85a85782fb0c658c40a85d0672d0651335bef78e82061c352b36387
 EBUILD selinux-ncftool-2.20210908-r1.ebuild 279 BLAKE2B cff4d4f8e9ac817a6977fe77dba40ebf8d25992275445607276b2427f15da3112be450910586df1641fd1c287e9dd79d1988e42de300e19469fdf0090e02b5a4 SHA512 d3e3e7104eab6d64d12fb6f0656fff3adcf6a2dc833016ee46152469a4c18f9d18f9c631f85a85782fb0c658c40a85d0672d0651335bef78e82061c352b36387
-EBUILD selinux-ncftool-2.20220106-r1.ebuild 283 BLAKE2B 1a8ed4ef71fdc0d09587f892c0fd064b6d0217f1158237e09919f76fc8ea6642222182eae0da503842f05db7ecdea4c5b9e628fa5c1db9cd57266d8208c72996 SHA512 84ad4bacfe696296ed1df20d53be470d8f3fa97f498e20e3ae0746b032632364b2e262367e9f12e8469a831f12a9114828ea745376b5169df3cc025b8cab9dfe
+EBUILD selinux-ncftool-2.20220106-r1.ebuild 281 BLAKE2B 87fd50c6a15b3cf3b0f40ff7843e2925209b13824bbf27a3f814ae4c0019a9395199fc3b93b031018d42545947f8370a68ed040912dd594188bf803a29bf093f SHA512 54a18d29f000000d3da9eec1b98f85cf185467977679d19e853ac0a9e768c836e7265ff649f75bfdd88a0e21882c48b0f57d7f3893746fc9c61bd7d8f38b085e
+EBUILD selinux-ncftool-2.20220106-r2.ebuild 283 BLAKE2B 1a8ed4ef71fdc0d09587f892c0fd064b6d0217f1158237e09919f76fc8ea6642222182eae0da503842f05db7ecdea4c5b9e628fa5c1db9cd57266d8208c72996 SHA512 84ad4bacfe696296ed1df20d53be470d8f3fa97f498e20e3ae0746b032632364b2e262367e9f12e8469a831f12a9114828ea745376b5169df3cc025b8cab9dfe
 EBUILD selinux-ncftool-9999.ebuild 283 BLAKE2B 51837da05c18ad81607fd07bc02d82c6372e431f811f4e5c6d82e363a8e17d4ce6d629dc18a95b25abb818645f81c2d7e67a3faa064821c10dfb880b3afa21bc SHA512 02b3b7d28a7641d2510be3b7c5b5cea38c8f1a158d3b25b8903657eafa92534137983972e4017339edc52029c4fa755e09c56f34238808daeb25e06e62df3863
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-ncftool/selinux-ncftool-2.20220106-r1.ebuild b/sec-policy/selinux-ncftool/selinux-ncftool-2.20220106-r1.ebuild
index 9e7731ccff09..6e83ec18e3dd 100644
--- a/sec-policy/selinux-ncftool/selinux-ncftool-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-ncftool/selinux-ncftool-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ncftool"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ncftool/selinux-ncftool-2.20220106-r2.ebuild b/sec-policy/selinux-ncftool/selinux-ncftool-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..9e7731ccff09
--- /dev/null
+++ b/sec-policy/selinux-ncftool/selinux-ncftool-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="ncftool"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ncftool"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-networkmanager/Manifest b/sec-policy/selinux-networkmanager/Manifest
index 6c06b795a321..9dc5d91dae96 100644
--- a/sec-policy/selinux-networkmanager/Manifest
+++ b/sec-policy/selinux-networkmanager/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-networkmanager-2.20200818-r2.ebuild 293 BLAKE2B c1fc7b426386d5cf3346157ffd8fe64730d1a40a5a3b3cb920f3b160e3684f8c473f8536b1561ba2f5dbe20aa35ca818f726d141047422b43fa14d77ba1786a4 SHA512 22871e4365362ced945213b08bd43266f09fb49c97c22352ae3eb172871800b8f769cd146285cc559d44e8d512aeb5a7d8c8080f8401a77c13f2c9d5bb806ee6
 EBUILD selinux-networkmanager-2.20210203-r1.ebuild 293 BLAKE2B c1fc7b426386d5cf3346157ffd8fe64730d1a40a5a3b3cb920f3b160e3684f8c473f8536b1561ba2f5dbe20aa35ca818f726d141047422b43fa14d77ba1786a4 SHA512 22871e4365362ced945213b08bd43266f09fb49c97c22352ae3eb172871800b8f769cd146285cc559d44e8d512aeb5a7d8c8080f8401a77c13f2c9d5bb806ee6
 EBUILD selinux-networkmanager-2.20210908-r1.ebuild 293 BLAKE2B c1fc7b426386d5cf3346157ffd8fe64730d1a40a5a3b3cb920f3b160e3684f8c473f8536b1561ba2f5dbe20aa35ca818f726d141047422b43fa14d77ba1786a4 SHA512 22871e4365362ced945213b08bd43266f09fb49c97c22352ae3eb172871800b8f769cd146285cc559d44e8d512aeb5a7d8c8080f8401a77c13f2c9d5bb806ee6
-EBUILD selinux-networkmanager-2.20220106-r1.ebuild 297 BLAKE2B 3fcee86e76958e78da6a01846753761865448a9dee0e312f30d9529e1a115d933c7aed07197ff1abae75c8dc54a285163e169611840df9dff7181614d5290fdb SHA512 011ad562098a58d3514de706edfd5746aa3d4c7782aefb403a8ca995418a9f8f8cf01fb91c54f1c5572962329188bf324aec5e65a56e54df83c5ddbd97ae687d
+EBUILD selinux-networkmanager-2.20220106-r1.ebuild 295 BLAKE2B 9e2fd12c7a74d957d1b83b8a4189c76426cbb718db1d991739ffbb8dda4383528ec2e18501fb2ce9196240d1344256fbacb379910e0bc2222afb5f9fa5ef7ffe SHA512 062bb5aa09da5ff7b589a119b3858479cdf5ff07bf035eaad050976fc2103cf5bd0c49b15a6d14aac5d9a55393a1d3fabb17efd5f9b537879b7357e9dfb3a70b
+EBUILD selinux-networkmanager-2.20220106-r2.ebuild 297 BLAKE2B 3fcee86e76958e78da6a01846753761865448a9dee0e312f30d9529e1a115d933c7aed07197ff1abae75c8dc54a285163e169611840df9dff7181614d5290fdb SHA512 011ad562098a58d3514de706edfd5746aa3d4c7782aefb403a8ca995418a9f8f8cf01fb91c54f1c5572962329188bf324aec5e65a56e54df83c5ddbd97ae687d
 EBUILD selinux-networkmanager-9999.ebuild 297 BLAKE2B c7f87f578658a866206ed08377e60b266d966aa61d04702cd5bd91f33d8f822416d2553b464db37618606f5e248593db25d2a20e5d8a9c3526494f0a3bf68b36 SHA512 00285bf79158a5fcd44239cc9882cf9ddac367c8937baa7f307ac27f2cb0030e932987b41165ee393d219a2adef2a1f278ed0fefbfb288ee0ce17f56d0fb280f
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20220106-r1.ebuild b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20220106-r1.ebuild
index 8680234d0fda..ca1f418fb85e 100644
--- a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for networkmanager"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20220106-r2.ebuild b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..8680234d0fda
--- /dev/null
+++ b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="networkmanager"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for networkmanager"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-nginx/Manifest b/sec-policy/selinux-nginx/Manifest
index 1aa6c23dd970..324fd4b5c6a2 100644
--- a/sec-policy/selinux-nginx/Manifest
+++ b/sec-policy/selinux-nginx/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-nginx-2.20200818-r2.ebuild 370 BLAKE2B 33c311d1c659348abafdc00f1a14e630475440b6582ef23433ae31b970f8d89b269cbe10d96d2b3e5bf9b8f3932ed4519e227c299de908f300218456bb7d0bdf SHA512 38ca05db322c6f346bc772b1a8f538d3b155bf19a880b68fa3d16840280613684c6cc329474a0f98f18039a8034f3a493b76611b1a4abf2ad6c86d895fb8fd92
 EBUILD selinux-nginx-2.20210203-r1.ebuild 370 BLAKE2B 33c311d1c659348abafdc00f1a14e630475440b6582ef23433ae31b970f8d89b269cbe10d96d2b3e5bf9b8f3932ed4519e227c299de908f300218456bb7d0bdf SHA512 38ca05db322c6f346bc772b1a8f538d3b155bf19a880b68fa3d16840280613684c6cc329474a0f98f18039a8034f3a493b76611b1a4abf2ad6c86d895fb8fd92
 EBUILD selinux-nginx-2.20210908-r1.ebuild 370 BLAKE2B 33c311d1c659348abafdc00f1a14e630475440b6582ef23433ae31b970f8d89b269cbe10d96d2b3e5bf9b8f3932ed4519e227c299de908f300218456bb7d0bdf SHA512 38ca05db322c6f346bc772b1a8f538d3b155bf19a880b68fa3d16840280613684c6cc329474a0f98f18039a8034f3a493b76611b1a4abf2ad6c86d895fb8fd92
-EBUILD selinux-nginx-2.20220106-r1.ebuild 374 BLAKE2B 42522467273fb14e4f1ad2c2cca2360dd9405dab9410a0d47df6ca74aa274c4f19de44fa10bf10c8e8c360f9b031733574176e7f1a6140a9a15855d7c1f8a606 SHA512 f135ee1acf563c19dfbda6d99d0a4d6dbf4f95cbd9b40a1a9cb251a973ea45dfaee7087f12f5e30f12965cd8504034ef8246c4df31bbce8d31d7375925515915
+EBUILD selinux-nginx-2.20220106-r1.ebuild 372 BLAKE2B b93283bd9d1ba307f31065e778a43a26d874de84fb343a3a5ab35f45187439f29dc3562bd7fc7bbafce3a4c203782882576789d8a6e727687cd8647cfbcb969f SHA512 28096f8b9232da8ad9e56125b399845a07362bccad9a90210634bf1d114dc2c64ca89c051c0f4cb9608d05e57f83e6850f0c01e59da3c84d58c0d03d28a6eea0
+EBUILD selinux-nginx-2.20220106-r2.ebuild 374 BLAKE2B 42522467273fb14e4f1ad2c2cca2360dd9405dab9410a0d47df6ca74aa274c4f19de44fa10bf10c8e8c360f9b031733574176e7f1a6140a9a15855d7c1f8a606 SHA512 f135ee1acf563c19dfbda6d99d0a4d6dbf4f95cbd9b40a1a9cb251a973ea45dfaee7087f12f5e30f12965cd8504034ef8246c4df31bbce8d31d7375925515915
 EBUILD selinux-nginx-9999.ebuild 374 BLAKE2B f7b8e6d314f060f8ded3f5700a5633af2f84c09456dcd1a7e07972da8631afaf1f2dee11a420b8507192c8858e65649236f881d19a47e461cfd6f8b36dd159d6 SHA512 01a611fd0a4e10b6f2f88d775c9f6133832f869115679eaca3665c04516a5ed6a7ab332c493d2697dd82d2429c5b202fc216c5a3158c21eb6e73db555f1ade02
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-nginx/selinux-nginx-2.20220106-r1.ebuild b/sec-policy/selinux-nginx/selinux-nginx-2.20220106-r1.ebuild
index fe043acf0f22..9182c6c75518 100644
--- a/sec-policy/selinux-nginx/selinux-nginx-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-nginx/selinux-nginx-2.20220106-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for nginx"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-nginx/selinux-nginx-2.20220106-r2.ebuild b/sec-policy/selinux-nginx/selinux-nginx-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..fe043acf0f22
--- /dev/null
+++ b/sec-policy/selinux-nginx/selinux-nginx-2.20220106-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="nginx"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for nginx"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-node_exporter/Manifest b/sec-policy/selinux-node_exporter/Manifest
new file mode 100644
index 000000000000..e7af7c3e39b1
--- /dev/null
+++ b/sec-policy/selinux-node_exporter/Manifest
@@ -0,0 +1,5 @@
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
+DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176d3c8e508b2ff97d4f8a876d7c0a65534a62d86c9816ac59f6eed583f4b5c51cf432643edd2dad24dd51eb3cf22e2b75ac SHA512 794327d2dd07196b5f36771f9a961cdf294cf68f690735418d6bdd859499b7007c518cc022ccca9c245a5266b85bdb7cacdcaeefee14e4800937c9101476b373
+EBUILD selinux-node_exporter-2.20220106-r2.ebuild 295 BLAKE2B 21f5202e98632c0f277f58fa34d16f55f7ad1e45deab73ae8dfc732e893bd1f237173b63b7a9fbac616be3e8d6652e06825453f5bd0beb0e365a1bafda40cb8e SHA512 d3a530c0ebb656b607b8b7fdeb2f269cf6a90797efb15690c33e42d7c3e39cd7f3ed36bcb4fa49ccf57812c34ea7557d68c438921800c3b5f10b55b91a99873d
+EBUILD selinux-node_exporter-9999.ebuild 295 BLAKE2B 21f5202e98632c0f277f58fa34d16f55f7ad1e45deab73ae8dfc732e893bd1f237173b63b7a9fbac616be3e8d6652e06825453f5bd0beb0e365a1bafda40cb8e SHA512 d3a530c0ebb656b607b8b7fdeb2f269cf6a90797efb15690c33e42d7c3e39cd7f3ed36bcb4fa49ccf57812c34ea7557d68c438921800c3b5f10b55b91a99873d
+MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-prelink/metadata.xml b/sec-policy/selinux-node_exporter/metadata.xml
index 781bc07e6d59..781bc07e6d59 100644
--- a/sec-policy/selinux-prelink/metadata.xml
+++ b/sec-policy/selinux-node_exporter/metadata.xml
diff --git a/sec-policy/selinux-node_exporter/selinux-node_exporter-2.20220106-r2.ebuild b/sec-policy/selinux-node_exporter/selinux-node_exporter-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..5c81b8da8185
--- /dev/null
+++ b/sec-policy/selinux-node_exporter/selinux-node_exporter-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="node_exporter"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for node_exporter"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-node_exporter/selinux-node_exporter-9999.ebuild b/sec-policy/selinux-node_exporter/selinux-node_exporter-9999.ebuild
new file mode 100644
index 000000000000..5c81b8da8185
--- /dev/null
+++ b/sec-policy/selinux-node_exporter/selinux-node_exporter-9999.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="node_exporter"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for node_exporter"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-nslcd/Manifest b/sec-policy/selinux-nslcd/Manifest
index 5164f734dc00..a47e8f269d09 100644
--- a/sec-policy/selinux-nslcd/Manifest
+++ b/sec-policy/selinux-nslcd/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-nslcd-2.20200818-r2.ebuild 275 BLAKE2B 7747eb66496e8540e8a2f59d761689128f72252380c12366bfbaa0dfa984f5fa7113550500345ac4c6f3c3121eda08e755fe8a17b1598a10b18b8ae34aefd903 SHA512 5b1cd1b2908a985d197d24c47edeffa1816bf07916ec63dfe1c9fb9975c4c62d4f1599c8243d6aceed361fbc6654e62519e478b73abd3ccaecbd8d5c0209b190
 EBUILD selinux-nslcd-2.20210203-r1.ebuild 275 BLAKE2B 7747eb66496e8540e8a2f59d761689128f72252380c12366bfbaa0dfa984f5fa7113550500345ac4c6f3c3121eda08e755fe8a17b1598a10b18b8ae34aefd903 SHA512 5b1cd1b2908a985d197d24c47edeffa1816bf07916ec63dfe1c9fb9975c4c62d4f1599c8243d6aceed361fbc6654e62519e478b73abd3ccaecbd8d5c0209b190
 EBUILD selinux-nslcd-2.20210908-r1.ebuild 275 BLAKE2B 7747eb66496e8540e8a2f59d761689128f72252380c12366bfbaa0dfa984f5fa7113550500345ac4c6f3c3121eda08e755fe8a17b1598a10b18b8ae34aefd903 SHA512 5b1cd1b2908a985d197d24c47edeffa1816bf07916ec63dfe1c9fb9975c4c62d4f1599c8243d6aceed361fbc6654e62519e478b73abd3ccaecbd8d5c0209b190
-EBUILD selinux-nslcd-2.20220106-r1.ebuild 279 BLAKE2B 0af7bb156119c8f85f26c4a89819d6906f478f13ee8a521e493130ee4fb17b363cc4c409f30d03aa4a825046c9565fbbbffdf4978d32ce1e46b51ef3056091b1 SHA512 f166b02dbda3ff55d484da9856648392f1a2f8a4f61ef509fdebcc73b044f19c50b1493bbe6142a58707c423a4897a49c311e2464b4bd11df5f70fa1fc9ece6a
+EBUILD selinux-nslcd-2.20220106-r1.ebuild 277 BLAKE2B 969db56561423f63aa690bfc4decdfe5b2f508bb05b21dc90d7e68e17219ff4d71ac00e45a093d0e935faa65968d9529abe93ce3bca44f152d563fcd79cf4247 SHA512 92a52c290ad8d422a846a4aa3b98a1de9b1cb0eb049cea3666f666dfa4e2a41ebc7d3084cde87427c82fb614c7ade331af832fa912f3ee58d3d0a41cf0fa1f3c
+EBUILD selinux-nslcd-2.20220106-r2.ebuild 279 BLAKE2B 0af7bb156119c8f85f26c4a89819d6906f478f13ee8a521e493130ee4fb17b363cc4c409f30d03aa4a825046c9565fbbbffdf4978d32ce1e46b51ef3056091b1 SHA512 f166b02dbda3ff55d484da9856648392f1a2f8a4f61ef509fdebcc73b044f19c50b1493bbe6142a58707c423a4897a49c311e2464b4bd11df5f70fa1fc9ece6a
 EBUILD selinux-nslcd-9999.ebuild 279 BLAKE2B 2261332ddb9c906ef017d671e9193496ea4f7be9c34f5603b8960c75344030e5da9ac23068df228b3b4158a70d6548130c954c48b23f6127bb28840697e08d29 SHA512 9149b5ee960234068887c20b8184fbdad099aced939657df14a04bd49bd2863043487eb7e63ba77c9e459ffb7a2480d18439542ef4706cd170fefea5efa1b4f0
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-nslcd/selinux-nslcd-2.20220106-r1.ebuild b/sec-policy/selinux-nslcd/selinux-nslcd-2.20220106-r1.ebuild
index 8ab2509be03f..3668247a7ed6 100644
--- a/sec-policy/selinux-nslcd/selinux-nslcd-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-nslcd/selinux-nslcd-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for nslcd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-nslcd/selinux-nslcd-2.20220106-r2.ebuild b/sec-policy/selinux-nslcd/selinux-nslcd-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..8ab2509be03f
--- /dev/null
+++ b/sec-policy/selinux-nslcd/selinux-nslcd-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="nslcd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for nslcd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ntop/Manifest b/sec-policy/selinux-ntop/Manifest
index 516e257c453a..e70d784de4c2 100644
--- a/sec-policy/selinux-ntop/Manifest
+++ b/sec-policy/selinux-ntop/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-ntop-2.20200818-r2.ebuild 273 BLAKE2B 45ac9422dbd58192b7cf1ebcb9d835e58b4a018f7ed09671647acf6f6723677ea9024d79876a24eb7a9b4be323d4b3dc898749fe4af8bb2ccdd74bbd65d1c338 SHA512 aa0510821fccc044e396459de86bd7199720f139ee481df4623e42932c1104b7e208afba0a56338246c521493e8fa428c4a809a3cdb4a862e4f7bc2a551912f5
 EBUILD selinux-ntop-2.20210203-r1.ebuild 273 BLAKE2B 45ac9422dbd58192b7cf1ebcb9d835e58b4a018f7ed09671647acf6f6723677ea9024d79876a24eb7a9b4be323d4b3dc898749fe4af8bb2ccdd74bbd65d1c338 SHA512 aa0510821fccc044e396459de86bd7199720f139ee481df4623e42932c1104b7e208afba0a56338246c521493e8fa428c4a809a3cdb4a862e4f7bc2a551912f5
 EBUILD selinux-ntop-2.20210908-r1.ebuild 273 BLAKE2B 45ac9422dbd58192b7cf1ebcb9d835e58b4a018f7ed09671647acf6f6723677ea9024d79876a24eb7a9b4be323d4b3dc898749fe4af8bb2ccdd74bbd65d1c338 SHA512 aa0510821fccc044e396459de86bd7199720f139ee481df4623e42932c1104b7e208afba0a56338246c521493e8fa428c4a809a3cdb4a862e4f7bc2a551912f5
-EBUILD selinux-ntop-2.20220106-r1.ebuild 277 BLAKE2B ce03a2f7deda9f58a9bd84b15e018bf39026178dea840af7d5724fde9daa40c78080cc31915f0596ad332bb7143b9befad8b09ba737b5dcf5e764c1f212ea0a9 SHA512 cdab90ee900b333df754332594ccbcec07d001bcc675053930be67df98f114df71e6a5e2ae10513f4908314ab2e09075f33eea14b30cbce91bffc3b70fbb972c
+EBUILD selinux-ntop-2.20220106-r1.ebuild 275 BLAKE2B 836dfc1bf973fffea51b5a5dadf493d8062e6bd2e9ff14cecbda1435c34755ee2f9303c549a10f1552c675c846f193562cbb8ca410eab1c0b9802fda547e2b30 SHA512 bf6160759c9b2e7e23d565562a10f75c282c769cb99a860425bb157dfb828c6bb09362487a521e86113a3d166ea885be2ef83679ee88a6f4935a72ce6fba8bc0
+EBUILD selinux-ntop-2.20220106-r2.ebuild 277 BLAKE2B ce03a2f7deda9f58a9bd84b15e018bf39026178dea840af7d5724fde9daa40c78080cc31915f0596ad332bb7143b9befad8b09ba737b5dcf5e764c1f212ea0a9 SHA512 cdab90ee900b333df754332594ccbcec07d001bcc675053930be67df98f114df71e6a5e2ae10513f4908314ab2e09075f33eea14b30cbce91bffc3b70fbb972c
 EBUILD selinux-ntop-9999.ebuild 277 BLAKE2B e36d5a2def6a08d8626b44938e1f18191f765e58244975677d58c524e85c533d791198028c1b9faddf85088ae4d514201339b671977a278cebf3a5510eedc769 SHA512 f48a592d15803ce7fa5390b0cc80f7ab92d5ca8c55e7f6493c432acff728ebdbb06dc93fe56e8d8642629269bb10fa2d1dbb8dfc4b56239fec45d1c80e152109
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-ntop/selinux-ntop-2.20220106-r1.ebuild b/sec-policy/selinux-ntop/selinux-ntop-2.20220106-r1.ebuild
index bdc357404c14..48d14fb1d26a 100644
--- a/sec-policy/selinux-ntop/selinux-ntop-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-ntop/selinux-ntop-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ntop"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ntop/selinux-ntop-2.20220106-r2.ebuild b/sec-policy/selinux-ntop/selinux-ntop-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..bdc357404c14
--- /dev/null
+++ b/sec-policy/selinux-ntop/selinux-ntop-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="ntop"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ntop"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ntp/Manifest b/sec-policy/selinux-ntp/Manifest
index 6d0e6f76bd47..1cf320ac098a 100644
--- a/sec-policy/selinux-ntp/Manifest
+++ b/sec-policy/selinux-ntp/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-ntp-2.20200818-r2.ebuild 271 BLAKE2B c9b92e8c8e6d4c9d238d4401a046b145cdaf12d78f8ff08af59f33345d5877eb704051005ac1c3e21c886a1f5ce42ff692646b90f82aa9c60ceb60feb1000e7f SHA512 894eaced27542c177bb3e89be9727f0f0a2629046bf02f07b9b55a9bc54294545270a6e1afb060ed715af00771d6da0707ddf84082a8ce0fe174911410b2b57f
 EBUILD selinux-ntp-2.20210203-r1.ebuild 271 BLAKE2B c9b92e8c8e6d4c9d238d4401a046b145cdaf12d78f8ff08af59f33345d5877eb704051005ac1c3e21c886a1f5ce42ff692646b90f82aa9c60ceb60feb1000e7f SHA512 894eaced27542c177bb3e89be9727f0f0a2629046bf02f07b9b55a9bc54294545270a6e1afb060ed715af00771d6da0707ddf84082a8ce0fe174911410b2b57f
 EBUILD selinux-ntp-2.20210908-r1.ebuild 271 BLAKE2B c9b92e8c8e6d4c9d238d4401a046b145cdaf12d78f8ff08af59f33345d5877eb704051005ac1c3e21c886a1f5ce42ff692646b90f82aa9c60ceb60feb1000e7f SHA512 894eaced27542c177bb3e89be9727f0f0a2629046bf02f07b9b55a9bc54294545270a6e1afb060ed715af00771d6da0707ddf84082a8ce0fe174911410b2b57f
-EBUILD selinux-ntp-2.20220106-r1.ebuild 275 BLAKE2B f2419ccab39225080cb3ca3977e4f07b48a6274eb828da47e2aca26c5726494d9fa815b875e4c78e18d30865755059f04b7ec1a50be13186392ae05cd3f19b49 SHA512 6f26f127b1ac0605a2555a6fd972f279401b81c38ddc7d49e26c06eeeedde0da77fe8a898b23f175298c124559e652be0636ad0197cbc492c256c47f8599ffbd
+EBUILD selinux-ntp-2.20220106-r1.ebuild 273 BLAKE2B 71345d4be0aecff31245614c3eb48deb9ba725e494babaccc0d6f654fb05d70bcee43d55ad4437cd0ce9bc77a78de7f6406910b8a44caf559f109d28cf7ff532 SHA512 eba6dd94c6a897c7e7b32d4575d189647439567c41adcc0492123e2bc9fac456a0dc7acd4d74a1571ff6d05494b091d3bf526d097cfb206672d749a04545c658
+EBUILD selinux-ntp-2.20220106-r2.ebuild 275 BLAKE2B f2419ccab39225080cb3ca3977e4f07b48a6274eb828da47e2aca26c5726494d9fa815b875e4c78e18d30865755059f04b7ec1a50be13186392ae05cd3f19b49 SHA512 6f26f127b1ac0605a2555a6fd972f279401b81c38ddc7d49e26c06eeeedde0da77fe8a898b23f175298c124559e652be0636ad0197cbc492c256c47f8599ffbd
 EBUILD selinux-ntp-9999.ebuild 275 BLAKE2B f7183ce5983003b15fe46c3effdb3e4537aeb36463aafb26df490479594696763d56f7808ff4c3da812a06edaa1e002386d701745f4f029cabcd8d1138d09481 SHA512 a30841c9f28675971061ce4a7ea9f0f9a1cdf065164080d132807130f35958aa43daa2c4c79e255fde72f9d78ea774018145cb7b38e1522f716c42ec77e28c99
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-ntp/selinux-ntp-2.20220106-r1.ebuild b/sec-policy/selinux-ntp/selinux-ntp-2.20220106-r1.ebuild
index 28a6614cc3eb..c3239093740d 100644
--- a/sec-policy/selinux-ntp/selinux-ntp-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-ntp/selinux-ntp-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ntp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ntp/selinux-ntp-2.20220106-r2.ebuild b/sec-policy/selinux-ntp/selinux-ntp-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..28a6614cc3eb
--- /dev/null
+++ b/sec-policy/selinux-ntp/selinux-ntp-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="ntp"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ntp"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-nut/Manifest b/sec-policy/selinux-nut/Manifest
index ac85879808d4..936b3b211482 100644
--- a/sec-policy/selinux-nut/Manifest
+++ b/sec-policy/selinux-nut/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-nut-2.20200818-r2.ebuild 367 BLAKE2B 469d595bbbc9f21bdd07a6ff3f2c4e9e80330c418dae51086fc6d357bed891892b4cf1a8cc85ca6ae056a34e1d32d83d44e74540882e46f36835012a971d39db SHA512 e361c7e3dafcd0cb303c4083a4d5d976437f5c1357754ee03ff2ea3dca70253f9ad9f712b53bfd5e3aec58898e3b720bd07093cdc1e327087ecd96ccc40c55a1
 EBUILD selinux-nut-2.20210203-r1.ebuild 367 BLAKE2B 469d595bbbc9f21bdd07a6ff3f2c4e9e80330c418dae51086fc6d357bed891892b4cf1a8cc85ca6ae056a34e1d32d83d44e74540882e46f36835012a971d39db SHA512 e361c7e3dafcd0cb303c4083a4d5d976437f5c1357754ee03ff2ea3dca70253f9ad9f712b53bfd5e3aec58898e3b720bd07093cdc1e327087ecd96ccc40c55a1
 EBUILD selinux-nut-2.20210908-r1.ebuild 367 BLAKE2B 469d595bbbc9f21bdd07a6ff3f2c4e9e80330c418dae51086fc6d357bed891892b4cf1a8cc85ca6ae056a34e1d32d83d44e74540882e46f36835012a971d39db SHA512 e361c7e3dafcd0cb303c4083a4d5d976437f5c1357754ee03ff2ea3dca70253f9ad9f712b53bfd5e3aec58898e3b720bd07093cdc1e327087ecd96ccc40c55a1
-EBUILD selinux-nut-2.20220106-r1.ebuild 371 BLAKE2B 0de45b2d3dea0d3e8d3ea6800aefec49bfd42959bc49df4d0d22d7263b284dc0122d5a91a2c4e225f8cc21f84c80ca0deff9d907e14203996200a8260be1623a SHA512 0fe50b91b5d3afa65c6be803e641e506004d389896499a9bcf992868bcac8095167c1a3e90af50e74b7f31e0966f72309231120dae8cf9cd3173f1716187e1ed
+EBUILD selinux-nut-2.20220106-r1.ebuild 369 BLAKE2B b884e09ae7e8e74fdb9ea3f852cbbe8a1149f8a9e1530c549b12651e7555c76d0388182cb18fd25dcd0a841b5dfb701729bf8d274b40b4ff901c8ff86d5faf74 SHA512 fe22fdb4c18ad12068a9e02a95532fc709d1497e0588f9db473a7256f5f49066ec06a87442fae005be2b8170c7a6ce4129353ed25a528cfdf2bdc88a72094383
+EBUILD selinux-nut-2.20220106-r2.ebuild 371 BLAKE2B 0de45b2d3dea0d3e8d3ea6800aefec49bfd42959bc49df4d0d22d7263b284dc0122d5a91a2c4e225f8cc21f84c80ca0deff9d907e14203996200a8260be1623a SHA512 0fe50b91b5d3afa65c6be803e641e506004d389896499a9bcf992868bcac8095167c1a3e90af50e74b7f31e0966f72309231120dae8cf9cd3173f1716187e1ed
 EBUILD selinux-nut-9999.ebuild 371 BLAKE2B 14426e4206f2be6d3a0a7960800bf41e7b33c13e17ac236b4ca3b749a077ba4b69dfcad6b98ee3ed18f3a284735ff64204ca13133cf0334c274cb8f93126bf78 SHA512 e59fb2eb59d0bc6b29bccc5a659f3f004297921e52c396d0b17858848ef9155d4bfb96d86a9aed63e3dbe4fcaa642dcafe88647a97cd02a575bb116e5892f4bd
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-nut/selinux-nut-2.20220106-r1.ebuild b/sec-policy/selinux-nut/selinux-nut-2.20220106-r1.ebuild
index 7e2f5f4f2053..0355942b5e7a 100644
--- a/sec-policy/selinux-nut/selinux-nut-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-nut/selinux-nut-2.20220106-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for nut"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-nut/selinux-nut-2.20220106-r2.ebuild b/sec-policy/selinux-nut/selinux-nut-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..7e2f5f4f2053
--- /dev/null
+++ b/sec-policy/selinux-nut/selinux-nut-2.20220106-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="nut"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for nut"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-nx/Manifest b/sec-policy/selinux-nx/Manifest
index c00dc8691e8c..60696d416ce3 100644
--- a/sec-policy/selinux-nx/Manifest
+++ b/sec-policy/selinux-nx/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-nx-2.20200818-r2.ebuild 269 BLAKE2B 2117f3c6f29d67d36898823ce523fe1e408ad98fccb683893d540c93a0ff3c07086a72b87d70be97b917b25a25bbfab7b2f7520945997432520735be074cade2 SHA512 cd6dca01f15ed175445fd565142085062e71631a373ec231c431fba8c682d1d343ce437f358c03aa787c68b54abac7542e6a6c02598d7898b1120038ddb4e233
 EBUILD selinux-nx-2.20210203-r1.ebuild 269 BLAKE2B 2117f3c6f29d67d36898823ce523fe1e408ad98fccb683893d540c93a0ff3c07086a72b87d70be97b917b25a25bbfab7b2f7520945997432520735be074cade2 SHA512 cd6dca01f15ed175445fd565142085062e71631a373ec231c431fba8c682d1d343ce437f358c03aa787c68b54abac7542e6a6c02598d7898b1120038ddb4e233
 EBUILD selinux-nx-2.20210908-r1.ebuild 269 BLAKE2B 2117f3c6f29d67d36898823ce523fe1e408ad98fccb683893d540c93a0ff3c07086a72b87d70be97b917b25a25bbfab7b2f7520945997432520735be074cade2 SHA512 cd6dca01f15ed175445fd565142085062e71631a373ec231c431fba8c682d1d343ce437f358c03aa787c68b54abac7542e6a6c02598d7898b1120038ddb4e233
-EBUILD selinux-nx-2.20220106-r1.ebuild 273 BLAKE2B c1f12f5d31a13b5343c8a9ec525d42ba202fa2cd869bc52d21b1849b2da1690db39ddd7cea775ae2e2a5fffec08e972f1286160338c644a15f23d6c6645f63c5 SHA512 5e5b49ab4bc8a1424192513a7a244914b10f77f47c3581f1da97e5349c093f9235af51849ed7c57eba9a21ae82b7fb3f472b39d597c3e1b7bb15b33bd8dc2ecc
+EBUILD selinux-nx-2.20220106-r1.ebuild 271 BLAKE2B b12ed7c60a19c9736eb6cfcf74ecea01e59eee3581d29ca480ee7b5e3e7188eddfa163688de08d03b9cd556c31cea42e4a63b6cbc80b9639b92f8c375c7186a7 SHA512 202f6031de774693b54c7e086dc1364c0cb14372ba65b7ffb0c68ccd498de586cc5ea4597bbf331abd5e0864c7c27cf972e8d89bff5e81f16229e1421764fa8c
+EBUILD selinux-nx-2.20220106-r2.ebuild 273 BLAKE2B c1f12f5d31a13b5343c8a9ec525d42ba202fa2cd869bc52d21b1849b2da1690db39ddd7cea775ae2e2a5fffec08e972f1286160338c644a15f23d6c6645f63c5 SHA512 5e5b49ab4bc8a1424192513a7a244914b10f77f47c3581f1da97e5349c093f9235af51849ed7c57eba9a21ae82b7fb3f472b39d597c3e1b7bb15b33bd8dc2ecc
 EBUILD selinux-nx-9999.ebuild 273 BLAKE2B 313556d929aff418f7dad171639258326fb989b8faa00d92745b0fd435bcda50d3a6637e68003af77fe79d433776b7abc62617486162d4d7dcd8eec718bcd095 SHA512 1ed25140ffe1bc529e3b55a78aef2545f59ed065a4c545ee8adec5043c7aa0b5751928e4573cda1cb56577976cdb79a98ece62968c3ce78fcc30a60d3da83bca
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-nx/selinux-nx-2.20220106-r1.ebuild b/sec-policy/selinux-nx/selinux-nx-2.20220106-r1.ebuild
index 541ac532c579..af3a080879fd 100644
--- a/sec-policy/selinux-nx/selinux-nx-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-nx/selinux-nx-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for nx"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-nx/selinux-nx-2.20220106-r2.ebuild b/sec-policy/selinux-nx/selinux-nx-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..541ac532c579
--- /dev/null
+++ b/sec-policy/selinux-nx/selinux-nx-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="nx"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for nx"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-obfs4proxy/Manifest b/sec-policy/selinux-obfs4proxy/Manifest
new file mode 100644
index 000000000000..55a2f1c6c83d
--- /dev/null
+++ b/sec-policy/selinux-obfs4proxy/Manifest
@@ -0,0 +1,7 @@
+DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
+DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176d3c8e508b2ff97d4f8a876d7c0a65534a62d86c9816ac59f6eed583f4b5c51cf432643edd2dad24dd51eb3cf22e2b75ac SHA512 794327d2dd07196b5f36771f9a961cdf294cf68f690735418d6bdd859499b7007c518cc022ccca9c245a5266b85bdb7cacdcaeefee14e4800937c9101476b373
+EBUILD selinux-obfs4proxy-2.20220106-r1.ebuild 287 BLAKE2B 1497e5064edbc10e021f2a211420b30a8d141ea2f91493456a3c82e0e27061247041f1b75ecb1e495a12fb6ac6be7676089589cfa67468e7626ff5a6c7ae0746 SHA512 a9fa62f712039bbcea479da0d6cf9375a5df7132d39832a302dcd6b31a2f1b6ba49d6d6d12079c09fe141e8a4db2541be932f6cb20c3c8b9d6b47b5c4c135b21
+EBUILD selinux-obfs4proxy-2.20220106-r2.ebuild 289 BLAKE2B b643d0c3a185717cc92fe5d7e1003ccb99a40367ab047e4d0315d3c60298e7f2d360e93257ebb13ef365ea6c1d38aa7ad82c261f56958a425ed61aa9c2a4045f SHA512 ec75f2f87c3b6b3eb60d133966aa0a1341b7b7b40961f2b84515b062d4ce9a47d60859bf45b2443c30ae64d4bdf76d69bdaeacb0d2ffbf92e1dbf635f1daf4dd
+EBUILD selinux-obfs4proxy-9999.ebuild 289 BLAKE2B b643d0c3a185717cc92fe5d7e1003ccb99a40367ab047e4d0315d3c60298e7f2d360e93257ebb13ef365ea6c1d38aa7ad82c261f56958a425ed61aa9c2a4045f SHA512 ec75f2f87c3b6b3eb60d133966aa0a1341b7b7b40961f2b84515b062d4ce9a47d60859bf45b2443c30ae64d4bdf76d69bdaeacb0d2ffbf92e1dbf635f1daf4dd
+MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-obfs4proxy/metadata.xml b/sec-policy/selinux-obfs4proxy/metadata.xml
new file mode 100644
index 000000000000..781bc07e6d59
--- /dev/null
+++ b/sec-policy/selinux-obfs4proxy/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/sec-policy/selinux-prelink/selinux-prelink-2.20210908-r1.ebuild b/sec-policy/selinux-obfs4proxy/selinux-obfs4proxy-2.20220106-r1.ebuild
index fdb199ea6b62..749f50ae6242 100644
--- a/sec-policy/selinux-prelink/selinux-prelink-2.20210908-r1.ebuild
+++ b/sec-policy/selinux-obfs4proxy/selinux-obfs4proxy-2.20220106-r1.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
 IUSE=""
-MODS="prelink"
+MODS="obfs4proxy"
 
 inherit selinux-policy-2
 
-DESCRIPTION="SELinux policy for prelink"
+DESCRIPTION="SELinux policy for obfs4proxy"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-obfs4proxy/selinux-obfs4proxy-2.20220106-r2.ebuild b/sec-policy/selinux-obfs4proxy/selinux-obfs4proxy-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..392e40f46bd6
--- /dev/null
+++ b/sec-policy/selinux-obfs4proxy/selinux-obfs4proxy-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="obfs4proxy"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for obfs4proxy"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-obfs4proxy/selinux-obfs4proxy-9999.ebuild b/sec-policy/selinux-obfs4proxy/selinux-obfs4proxy-9999.ebuild
new file mode 100644
index 000000000000..392e40f46bd6
--- /dev/null
+++ b/sec-policy/selinux-obfs4proxy/selinux-obfs4proxy-9999.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="obfs4proxy"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for obfs4proxy"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-oddjob/Manifest b/sec-policy/selinux-oddjob/Manifest
index a1a79c5b8c51..f3c66e649119 100644
--- a/sec-policy/selinux-oddjob/Manifest
+++ b/sec-policy/selinux-oddjob/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-oddjob-2.20200818-r2.ebuild 277 BLAKE2B 5ea0cb93ef035f04ec005c645f776c09bf47ae12052119a57473cdb583ba2526c3e83aa43073e2ef3ff464ca22ef200e3bf61616358f6fbc46b1e6a31d26224c SHA512 e54ed18bfee9ebcbc76049ab988f1a9c13252e9ae28b43c106f0d64b979025fdd0eee1379f9464a42cf8bed4486a9f9cef630ee63f0e08ef093a55c49fbbf7b4
 EBUILD selinux-oddjob-2.20210203-r1.ebuild 277 BLAKE2B 5ea0cb93ef035f04ec005c645f776c09bf47ae12052119a57473cdb583ba2526c3e83aa43073e2ef3ff464ca22ef200e3bf61616358f6fbc46b1e6a31d26224c SHA512 e54ed18bfee9ebcbc76049ab988f1a9c13252e9ae28b43c106f0d64b979025fdd0eee1379f9464a42cf8bed4486a9f9cef630ee63f0e08ef093a55c49fbbf7b4
 EBUILD selinux-oddjob-2.20210908-r1.ebuild 277 BLAKE2B 5ea0cb93ef035f04ec005c645f776c09bf47ae12052119a57473cdb583ba2526c3e83aa43073e2ef3ff464ca22ef200e3bf61616358f6fbc46b1e6a31d26224c SHA512 e54ed18bfee9ebcbc76049ab988f1a9c13252e9ae28b43c106f0d64b979025fdd0eee1379f9464a42cf8bed4486a9f9cef630ee63f0e08ef093a55c49fbbf7b4
-EBUILD selinux-oddjob-2.20220106-r1.ebuild 281 BLAKE2B 94b9da0713cee69d06f4b773e195ae6118bce3bb418505f80a095a3fc08b680dcd1cb0b20fbf0f03c5045f7130bd650e42c0578b85e4431b14dd191460077f36 SHA512 f76dc3b96941c0072626f2075954aaea67162897a06c620ac07cf271970240e832ab1faebe758f2372be6852a2055454b8266630ae2b2e71990dd5e296a19ab0
+EBUILD selinux-oddjob-2.20220106-r1.ebuild 279 BLAKE2B 04a7fa2baf115d821293572e2a31d6a1a74b36fe204a1a4648c4b725a09a1018d50469e2ec19883d30fc069be9b3eabb301e01dc240d6cce55f52145cfba201d SHA512 77e9dc09d72fc6bb079fd65c8320ca1748d86159860e11f4f44c88f7440f7dea3c120b8fd130521f41f6bb83bb02fe33e5b24052c2d97d78d76ee699ab0cd1b7
+EBUILD selinux-oddjob-2.20220106-r2.ebuild 281 BLAKE2B 94b9da0713cee69d06f4b773e195ae6118bce3bb418505f80a095a3fc08b680dcd1cb0b20fbf0f03c5045f7130bd650e42c0578b85e4431b14dd191460077f36 SHA512 f76dc3b96941c0072626f2075954aaea67162897a06c620ac07cf271970240e832ab1faebe758f2372be6852a2055454b8266630ae2b2e71990dd5e296a19ab0
 EBUILD selinux-oddjob-9999.ebuild 281 BLAKE2B 9a61b68f9ad816be8995689f376c6b3a091217e48f93ff5ac8f88e937f69b7b828d570e41fbf9774c235152464c09814dca17cc85d263bc9055680ba1f1dc089 SHA512 ff0b100d9f7ce100bc4a8a353811db14290ebbd701db4825d08c3d8c5e5b0a1e7fe206595ece0ad888920090e65bce2f0089c480abf0c418e412ecfd76959927
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-oddjob/selinux-oddjob-2.20220106-r1.ebuild b/sec-policy/selinux-oddjob/selinux-oddjob-2.20220106-r1.ebuild
index 8fa1a432d1fa..81840e6a2ec6 100644
--- a/sec-policy/selinux-oddjob/selinux-oddjob-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-oddjob/selinux-oddjob-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for oddjob"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-oddjob/selinux-oddjob-2.20220106-r2.ebuild b/sec-policy/selinux-oddjob/selinux-oddjob-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..8fa1a432d1fa
--- /dev/null
+++ b/sec-policy/selinux-oddjob/selinux-oddjob-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="oddjob"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for oddjob"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-oident/Manifest b/sec-policy/selinux-oident/Manifest
index 50074dcdf460..cb969759b695 100644
--- a/sec-policy/selinux-oident/Manifest
+++ b/sec-policy/selinux-oident/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-oident-2.20200818-r2.ebuild 277 BLAKE2B b205a1227a8ec6aca7abd2cb45cf6353941b17537c2543e290c262c618429d19264dbfd1d47abcc50d35a6c27b2da18b7106e012825cd6d057c14135aa7f6feb SHA512 cf6a367e0485b073ebcf7a3ab65291f6f35880aecdb20164ea701fbfd80e0689a191b6bf0b12ed222df7eff9a0a27d9c144d781b26f90a110da083fd0c04cbbc
 EBUILD selinux-oident-2.20210203-r1.ebuild 277 BLAKE2B b205a1227a8ec6aca7abd2cb45cf6353941b17537c2543e290c262c618429d19264dbfd1d47abcc50d35a6c27b2da18b7106e012825cd6d057c14135aa7f6feb SHA512 cf6a367e0485b073ebcf7a3ab65291f6f35880aecdb20164ea701fbfd80e0689a191b6bf0b12ed222df7eff9a0a27d9c144d781b26f90a110da083fd0c04cbbc
 EBUILD selinux-oident-2.20210908-r1.ebuild 277 BLAKE2B b205a1227a8ec6aca7abd2cb45cf6353941b17537c2543e290c262c618429d19264dbfd1d47abcc50d35a6c27b2da18b7106e012825cd6d057c14135aa7f6feb SHA512 cf6a367e0485b073ebcf7a3ab65291f6f35880aecdb20164ea701fbfd80e0689a191b6bf0b12ed222df7eff9a0a27d9c144d781b26f90a110da083fd0c04cbbc
-EBUILD selinux-oident-2.20220106-r1.ebuild 281 BLAKE2B 92bfdb4009cd6d7a49c05fa232effeb770120cac44d1907145a35a736c555411617bc5a35ef4b5c9eb383f0595a4bb110ad7a8c971d0b8cb19cccc8f0ee66a13 SHA512 621cb18e8f8e49cbcfbd75b30f3fa2758820086a74af5e51beb1454a9417810b0b1b57451b9cb4d990e6093b3631cf31bbfcd060f6f1e37ceeb44b48816d7e09
+EBUILD selinux-oident-2.20220106-r1.ebuild 279 BLAKE2B 63010ea3190c8eeb197c521c1056095ff8447e9ccf1bd82ce12a096db6d705b0dc29f3f6bcf9637017d19f64b9924c299260113f1028c81905661f270d60afa2 SHA512 8193c013c8d399c7016922ab141b793158a82632eff4e3747e1f40a0b22dfd9edc2eccccbb19638ecb281abf5f0a26840c0b5b04b9bec1576c0bfbd2c82aeb48
+EBUILD selinux-oident-2.20220106-r2.ebuild 281 BLAKE2B 92bfdb4009cd6d7a49c05fa232effeb770120cac44d1907145a35a736c555411617bc5a35ef4b5c9eb383f0595a4bb110ad7a8c971d0b8cb19cccc8f0ee66a13 SHA512 621cb18e8f8e49cbcfbd75b30f3fa2758820086a74af5e51beb1454a9417810b0b1b57451b9cb4d990e6093b3631cf31bbfcd060f6f1e37ceeb44b48816d7e09
 EBUILD selinux-oident-9999.ebuild 281 BLAKE2B 1e37658dc3e618012a2bd4b05573614fd6df484ebceba156de610d837efe56accb9c7cf0251384e0c8fb006c64dc6db89ef997c65f2ac529015b3b5ecb1c55bb SHA512 e1409a085e0a391cbd849a744324af84de71692552c469754c5ab4bc4bf5586cb2c5a87c90267f4145f07e19364e2d8545c22a7ba8ca34ee961b3e899de685a7
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-oident/selinux-oident-2.20220106-r1.ebuild b/sec-policy/selinux-oident/selinux-oident-2.20220106-r1.ebuild
index 1de3317b2feb..0d61be6dddb8 100644
--- a/sec-policy/selinux-oident/selinux-oident-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-oident/selinux-oident-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for oident"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-oident/selinux-oident-2.20220106-r2.ebuild b/sec-policy/selinux-oident/selinux-oident-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..1de3317b2feb
--- /dev/null
+++ b/sec-policy/selinux-oident/selinux-oident-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="oident"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for oident"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-openct/Manifest b/sec-policy/selinux-openct/Manifest
index 2df9370ce578..72a02120ceb0 100644
--- a/sec-policy/selinux-openct/Manifest
+++ b/sec-policy/selinux-openct/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-openct-2.20200818-r2.ebuild 277 BLAKE2B c695347df35f97ea8640d2c94ab95e096e08f1cc3228fc7ad5c02766bd9f1bacfcd0f350a80acc9360c645bfb874de69a54718274af6ffbe4f0adaa13188df10 SHA512 d1da901d6d09b8878997fcf6d37432c909ef83b359259166cd4710f97de667c17e18e44afa5bb9bfddf0b6eec7388daebba79de774327ba524a77e4721c8c0f9
 EBUILD selinux-openct-2.20210203-r1.ebuild 277 BLAKE2B c695347df35f97ea8640d2c94ab95e096e08f1cc3228fc7ad5c02766bd9f1bacfcd0f350a80acc9360c645bfb874de69a54718274af6ffbe4f0adaa13188df10 SHA512 d1da901d6d09b8878997fcf6d37432c909ef83b359259166cd4710f97de667c17e18e44afa5bb9bfddf0b6eec7388daebba79de774327ba524a77e4721c8c0f9
 EBUILD selinux-openct-2.20210908-r1.ebuild 277 BLAKE2B c695347df35f97ea8640d2c94ab95e096e08f1cc3228fc7ad5c02766bd9f1bacfcd0f350a80acc9360c645bfb874de69a54718274af6ffbe4f0adaa13188df10 SHA512 d1da901d6d09b8878997fcf6d37432c909ef83b359259166cd4710f97de667c17e18e44afa5bb9bfddf0b6eec7388daebba79de774327ba524a77e4721c8c0f9
-EBUILD selinux-openct-2.20220106-r1.ebuild 281 BLAKE2B 9fbca684dc04068a83cf338aaf45d77439eb9eb6bf18cef8e1bcb5377c2e98b69f51427d68e596ade34db223f3d5438a667fc4d230c42146a312e2599b24fb94 SHA512 9d33a4816fa7a540ae01c6acb886212ff5bf855f41ddfabe6ea03a0707eb7b4bfcbffff3b34766389102e9b9a2f42ca04474138467eeab574c4a56a0892432f5
+EBUILD selinux-openct-2.20220106-r1.ebuild 279 BLAKE2B 924430146a7b04bbbce7f62ffe196b019d9c96c137b1a7cde30d5342f3970bf9c3ace1997bc263a199ac1a46f39577e8730cd35275c55b33dcc821294f9fac16 SHA512 11733ea697199235103b2d67e93bcab871e7582439b334bc7dcfd3463e75020d08b20a6a7361661e5eaacd61100d98b8548b6b0458e549d1b8c15b851c8663e3
+EBUILD selinux-openct-2.20220106-r2.ebuild 281 BLAKE2B 9fbca684dc04068a83cf338aaf45d77439eb9eb6bf18cef8e1bcb5377c2e98b69f51427d68e596ade34db223f3d5438a667fc4d230c42146a312e2599b24fb94 SHA512 9d33a4816fa7a540ae01c6acb886212ff5bf855f41ddfabe6ea03a0707eb7b4bfcbffff3b34766389102e9b9a2f42ca04474138467eeab574c4a56a0892432f5
 EBUILD selinux-openct-9999.ebuild 281 BLAKE2B 359320b60a4304b61338b0e2168a93a92a73ce25b059dd41f3032068378d133f28fba0e4f0cee9acbb7cd316bde602c9887ddbe86f3f30b6ceac01ee59ad53ca SHA512 20d7d4391b1fa54fb3ffb0c30dfbbde7720ad3cae43956a9b231a7299fc1dd88abf3f550724f7acd46de9d700b4ce94b2cd8c57c59e3fa51041589a0fac5f1fb
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-openct/selinux-openct-2.20220106-r1.ebuild b/sec-policy/selinux-openct/selinux-openct-2.20220106-r1.ebuild
index 61e844a2107d..f1ab6626cf51 100644
--- a/sec-policy/selinux-openct/selinux-openct-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-openct/selinux-openct-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for openct"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-openct/selinux-openct-2.20220106-r2.ebuild b/sec-policy/selinux-openct/selinux-openct-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..61e844a2107d
--- /dev/null
+++ b/sec-policy/selinux-openct/selinux-openct-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="openct"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for openct"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-openrc/Manifest b/sec-policy/selinux-openrc/Manifest
index 46a10b967739..d3d426f0b138 100644
--- a/sec-policy/selinux-openrc/Manifest
+++ b/sec-policy/selinux-openrc/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-openrc-2.20200818-r2.ebuild 277 BLAKE2B 944fd70904fb8a51ef732be0da1a26b89731a2e4efc26321d5c344af74457d18b745168035e22d16154a677513aab14da7f4077f17739247e9e117421dbd14fd SHA512 545646fa9fe57d90b8c66cbd66b14559938f87c8c6cdee025cac1faf745be86eed2b96f642f452186f59f92bf53fe34c5e72e423631bddee5ac2efc4107756a7
 EBUILD selinux-openrc-2.20210203-r1.ebuild 277 BLAKE2B 944fd70904fb8a51ef732be0da1a26b89731a2e4efc26321d5c344af74457d18b745168035e22d16154a677513aab14da7f4077f17739247e9e117421dbd14fd SHA512 545646fa9fe57d90b8c66cbd66b14559938f87c8c6cdee025cac1faf745be86eed2b96f642f452186f59f92bf53fe34c5e72e423631bddee5ac2efc4107756a7
 EBUILD selinux-openrc-2.20210908-r1.ebuild 277 BLAKE2B 944fd70904fb8a51ef732be0da1a26b89731a2e4efc26321d5c344af74457d18b745168035e22d16154a677513aab14da7f4077f17739247e9e117421dbd14fd SHA512 545646fa9fe57d90b8c66cbd66b14559938f87c8c6cdee025cac1faf745be86eed2b96f642f452186f59f92bf53fe34c5e72e423631bddee5ac2efc4107756a7
-EBUILD selinux-openrc-2.20220106-r1.ebuild 281 BLAKE2B 9f6d13271410b0a345ebdd97815970d9125b03894772e913be4a3002abc3a561a609753b07ecbf08b7546146646d502d2bc4d9d9be06afdd56decdd715cdbfb8 SHA512 70e537fdce1356d4bd2b916d27fdd3251e247298f5062ec2e681b53576780a8ecb2a3019624154f5f50ea6c16488c9b070543810a658f039f5fb51619faa93df
+EBUILD selinux-openrc-2.20220106-r1.ebuild 279 BLAKE2B fdd9c7945825cc9e9c507927b8aab1e859e35fe6d384ddb5db5cfdcd51e8735add5c1ae15e70f3c1e5f77c97443d02b563d2b30854a17659997b0e9dd1e7132d SHA512 54211116e37e9eea654809ad795ddff63fba54c4742fe832a98cd9f4d9a23ac8ff0da6b4fcbe59a0cd761f8d35ff03cf7ccd003cb02adabdeb497984c2dfe54b
+EBUILD selinux-openrc-2.20220106-r2.ebuild 281 BLAKE2B 9f6d13271410b0a345ebdd97815970d9125b03894772e913be4a3002abc3a561a609753b07ecbf08b7546146646d502d2bc4d9d9be06afdd56decdd715cdbfb8 SHA512 70e537fdce1356d4bd2b916d27fdd3251e247298f5062ec2e681b53576780a8ecb2a3019624154f5f50ea6c16488c9b070543810a658f039f5fb51619faa93df
 EBUILD selinux-openrc-9999.ebuild 281 BLAKE2B 14a06a388752002a74254ea3e493ec18ea309d4a0d76069d3fcf4e57234a52f751a6b4344524d9061a97ba314d499a1565b804f600436f54e4d251f752223221 SHA512 7df68ffb9671b3b798c1f0dd01e9849bc31f379a8f10fcc9b7c5c5e96c54e0926656f99cf23f4380301c2fb56dcc37211cb6ee953fb851bf1f9da08d6dd08bbd
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-openrc/selinux-openrc-2.20220106-r1.ebuild b/sec-policy/selinux-openrc/selinux-openrc-2.20220106-r1.ebuild
index 6f28e775c1f5..3823c9dc0d46 100644
--- a/sec-policy/selinux-openrc/selinux-openrc-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-openrc/selinux-openrc-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for openrc"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-openrc/selinux-openrc-2.20220106-r2.ebuild b/sec-policy/selinux-openrc/selinux-openrc-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..6f28e775c1f5
--- /dev/null
+++ b/sec-policy/selinux-openrc/selinux-openrc-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="openrc"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for openrc"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-openvpn/Manifest b/sec-policy/selinux-openvpn/Manifest
index 9b848d625ce8..b74446649c1f 100644
--- a/sec-policy/selinux-openvpn/Manifest
+++ b/sec-policy/selinux-openvpn/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-openvpn-2.20200818-r2.ebuild 279 BLAKE2B c29c4445ea301f43968f30869dcf6848d732c68e4a091d3c2b400676b779179767709990d2bc6ec8c1bc957eed3e84e9f7fc257be10ffddfbb69c3d5960a01aa SHA512 ec4d2414ed2ed924998cb947b5cc39ac30c8bc39beb0fc08ee3b25313a11ae5dafe325c7d9d2299c33d9cd785aa6ae2001d7a2a5c3f6f033bf6fbd4020ec93ff
 EBUILD selinux-openvpn-2.20210203-r1.ebuild 279 BLAKE2B c29c4445ea301f43968f30869dcf6848d732c68e4a091d3c2b400676b779179767709990d2bc6ec8c1bc957eed3e84e9f7fc257be10ffddfbb69c3d5960a01aa SHA512 ec4d2414ed2ed924998cb947b5cc39ac30c8bc39beb0fc08ee3b25313a11ae5dafe325c7d9d2299c33d9cd785aa6ae2001d7a2a5c3f6f033bf6fbd4020ec93ff
 EBUILD selinux-openvpn-2.20210908-r1.ebuild 279 BLAKE2B c29c4445ea301f43968f30869dcf6848d732c68e4a091d3c2b400676b779179767709990d2bc6ec8c1bc957eed3e84e9f7fc257be10ffddfbb69c3d5960a01aa SHA512 ec4d2414ed2ed924998cb947b5cc39ac30c8bc39beb0fc08ee3b25313a11ae5dafe325c7d9d2299c33d9cd785aa6ae2001d7a2a5c3f6f033bf6fbd4020ec93ff
-EBUILD selinux-openvpn-2.20220106-r1.ebuild 283 BLAKE2B 325900889885aa7952d2f0092be8074952cd2540b2c3159792d7b31b5db4c379a0a951ff2e51fa3f4377feb86936cce9fb0fcb65074557b4a71fa33176a1d4a9 SHA512 1e068b98b88680d138e8403de9f00094d1b18674a292e33795d075955ca3174a5bfccbaec26e27cc7e9236e1039191ca9dd80c9d0088bd282d7f235cdfa847a1
+EBUILD selinux-openvpn-2.20220106-r1.ebuild 281 BLAKE2B 9846ff03639431a8250d365751e0a0ddc80e44f739554d12b844b70e2881a479df200018761603faba94ea85343fe40eb0b51fb4539415e2175ed1cda075a479 SHA512 e2ccd5cfb3b323167eb76fc2a822c00de3ec1f2751e86d7d3d439375f9fda17daacd938e7e171c185861f0b3e6e0530e413713dca4e1322e583f0f1708ced815
+EBUILD selinux-openvpn-2.20220106-r2.ebuild 283 BLAKE2B 325900889885aa7952d2f0092be8074952cd2540b2c3159792d7b31b5db4c379a0a951ff2e51fa3f4377feb86936cce9fb0fcb65074557b4a71fa33176a1d4a9 SHA512 1e068b98b88680d138e8403de9f00094d1b18674a292e33795d075955ca3174a5bfccbaec26e27cc7e9236e1039191ca9dd80c9d0088bd282d7f235cdfa847a1
 EBUILD selinux-openvpn-9999.ebuild 283 BLAKE2B 1da4ede792c220bf8ba7ca7ea2f85313684121d1642f857d9021d82cb2633332b2f1d01a3043b118a89955e59a9f6107898a1a1cc6405c00681c8d6b8daab35a SHA512 b3a2ad1c7fd432194f48992d0f0366792301cb556d501df8eeb1a49dc8970401502a3112826713b3e5c4416d173739759cd484ea6cc55abd09b2025b1e5503f5
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-openvpn/selinux-openvpn-2.20220106-r1.ebuild b/sec-policy/selinux-openvpn/selinux-openvpn-2.20220106-r1.ebuild
index fac5d0756e0e..852a16e64589 100644
--- a/sec-policy/selinux-openvpn/selinux-openvpn-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-openvpn/selinux-openvpn-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for openvpn"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-openvpn/selinux-openvpn-2.20220106-r2.ebuild b/sec-policy/selinux-openvpn/selinux-openvpn-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..fac5d0756e0e
--- /dev/null
+++ b/sec-policy/selinux-openvpn/selinux-openvpn-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="openvpn"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for openvpn"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-pan/Manifest b/sec-policy/selinux-pan/Manifest
index 5416f17b1752..e35f52a6984a 100644
--- a/sec-policy/selinux-pan/Manifest
+++ b/sec-policy/selinux-pan/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-pan-2.20200818-r2.ebuild 369 BLAKE2B 5a895b4ca3ff1207de17d806db4fb80d05279d4c4c54760d236f8dbf2bfae610bc055484b1b635c9b01564f6d74352c8a52494bdc1f2db2ac26394895b95b69b SHA512 2c0cf6668601736e7ea2eccc31b1153106e22145f16a225e60f79bfc5c019ebd14a1cfde1ec419580613a5751ee8f53fb0c34a68396bf561a036d2ac3dc692e7
 EBUILD selinux-pan-2.20210203-r1.ebuild 369 BLAKE2B 5a895b4ca3ff1207de17d806db4fb80d05279d4c4c54760d236f8dbf2bfae610bc055484b1b635c9b01564f6d74352c8a52494bdc1f2db2ac26394895b95b69b SHA512 2c0cf6668601736e7ea2eccc31b1153106e22145f16a225e60f79bfc5c019ebd14a1cfde1ec419580613a5751ee8f53fb0c34a68396bf561a036d2ac3dc692e7
 EBUILD selinux-pan-2.20210908-r1.ebuild 369 BLAKE2B 5a895b4ca3ff1207de17d806db4fb80d05279d4c4c54760d236f8dbf2bfae610bc055484b1b635c9b01564f6d74352c8a52494bdc1f2db2ac26394895b95b69b SHA512 2c0cf6668601736e7ea2eccc31b1153106e22145f16a225e60f79bfc5c019ebd14a1cfde1ec419580613a5751ee8f53fb0c34a68396bf561a036d2ac3dc692e7
-EBUILD selinux-pan-2.20220106-r1.ebuild 373 BLAKE2B 9e3f74b3f69c5bdd2aea6463bfe2a5040ea5713024586ca81f27ca8c6a55f093c8ef31104ce447677e0f27111198d60a3d8c105afb96487ee45ab274fd094a13 SHA512 e0d6526d545a0ebcfa993ff2d61296ac6fadcb64c1afc5022e23fb87609c7ea8da89622f4007646926f3e4c41cc44f181d698d75efc3e87eaf05fd6913a033b9
+EBUILD selinux-pan-2.20220106-r1.ebuild 371 BLAKE2B b8232ba8047949e2743b79e7925524082264ff318ef59a44f846715a660881e65d45504d1743dc834690060ffc5ce4432e907cee354f30607d949eba29b8dd89 SHA512 33c4fa7b82f50cdb79e3982b53630d943738b880fbcb24e12926efe9bb6ebf80c18ee679576fd55dbb6e1bc316e74712e53ce5b362d3703bd0fd1ded4463efef
+EBUILD selinux-pan-2.20220106-r2.ebuild 373 BLAKE2B 9e3f74b3f69c5bdd2aea6463bfe2a5040ea5713024586ca81f27ca8c6a55f093c8ef31104ce447677e0f27111198d60a3d8c105afb96487ee45ab274fd094a13 SHA512 e0d6526d545a0ebcfa993ff2d61296ac6fadcb64c1afc5022e23fb87609c7ea8da89622f4007646926f3e4c41cc44f181d698d75efc3e87eaf05fd6913a033b9
 EBUILD selinux-pan-9999.ebuild 373 BLAKE2B 2de2becf37edc2944bcbab3d64d41917a7f87bf1e5e13e9b2a1f5d7a1e64ff98cadc2c0a10f3d3a5e65152b832be71425337e56b323ab36d7d9b4b8194a179e5 SHA512 524870a5521b82eff0e0909ae8b2029795b72e8d7deddcefbdd70c45605bf99f439a5ff6f651838025d79dcdb41de86166c28bac31d10b7893dab1865d233d27
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-pan/selinux-pan-2.20220106-r1.ebuild b/sec-policy/selinux-pan/selinux-pan-2.20220106-r1.ebuild
index 9b766ca526ee..e3f94810da53 100644
--- a/sec-policy/selinux-pan/selinux-pan-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-pan/selinux-pan-2.20220106-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for pan"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-pan/selinux-pan-2.20220106-r2.ebuild b/sec-policy/selinux-pan/selinux-pan-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..9b766ca526ee
--- /dev/null
+++ b/sec-policy/selinux-pan/selinux-pan-2.20220106-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="pan"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for pan"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-xserver
+"
diff --git a/sec-policy/selinux-pcscd/Manifest b/sec-policy/selinux-pcscd/Manifest
index b4683f3d2015..711438996549 100644
--- a/sec-policy/selinux-pcscd/Manifest
+++ b/sec-policy/selinux-pcscd/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-pcscd-2.20200818-r2.ebuild 275 BLAKE2B 0f232395bd16d2b80d769e9d5384e89061d56b3ebb561ec761615c23c7c18d660926d75ab37ed0593da79c0175933ed404e02ef5edf71dfa38edd45f98babd5f SHA512 c4c79aa4c95d4ad47ede84c9c755ff1c96b6f0601f06d200dbd6952f61d1fa3b07534794912ea1264072665357d332dbbc8d806fa743dc5e5f143279f0756ffe
 EBUILD selinux-pcscd-2.20210203-r1.ebuild 275 BLAKE2B 0f232395bd16d2b80d769e9d5384e89061d56b3ebb561ec761615c23c7c18d660926d75ab37ed0593da79c0175933ed404e02ef5edf71dfa38edd45f98babd5f SHA512 c4c79aa4c95d4ad47ede84c9c755ff1c96b6f0601f06d200dbd6952f61d1fa3b07534794912ea1264072665357d332dbbc8d806fa743dc5e5f143279f0756ffe
 EBUILD selinux-pcscd-2.20210908-r1.ebuild 275 BLAKE2B 0f232395bd16d2b80d769e9d5384e89061d56b3ebb561ec761615c23c7c18d660926d75ab37ed0593da79c0175933ed404e02ef5edf71dfa38edd45f98babd5f SHA512 c4c79aa4c95d4ad47ede84c9c755ff1c96b6f0601f06d200dbd6952f61d1fa3b07534794912ea1264072665357d332dbbc8d806fa743dc5e5f143279f0756ffe
-EBUILD selinux-pcscd-2.20220106-r1.ebuild 279 BLAKE2B deed6914b5741bbe4e0e2b446540f9e190f4e495a5453094b8251fb468ad8faa27e85fce4084fe3a16894ba6374d6d3970a89a80755ff64cead3e24a1726e130 SHA512 9e3b49086b4d6d45cdc93331ae9d58ec39f68b8f7e087274722fdb81d63dee5bd519be23389ccdc65d5700ad282274096f5fcd77e3d0f0a9271019841771e277
+EBUILD selinux-pcscd-2.20220106-r1.ebuild 277 BLAKE2B 327b59157637a9c31f8ef4622a50bf3340199023424cda54032328c31873c7794696a930d078bc3db7d1e339bf2a9e844e64dcc0fef5bf9c9f16b31a32eef46e SHA512 70832d8e9f735bf08b914264cb96a21e7894e4420c44f2b9e55565d85397df38b8c7f91ada077d11f7d105b83ed21760e78d8845b8852eb649e75c2c44b8dd33
+EBUILD selinux-pcscd-2.20220106-r2.ebuild 279 BLAKE2B deed6914b5741bbe4e0e2b446540f9e190f4e495a5453094b8251fb468ad8faa27e85fce4084fe3a16894ba6374d6d3970a89a80755ff64cead3e24a1726e130 SHA512 9e3b49086b4d6d45cdc93331ae9d58ec39f68b8f7e087274722fdb81d63dee5bd519be23389ccdc65d5700ad282274096f5fcd77e3d0f0a9271019841771e277
 EBUILD selinux-pcscd-9999.ebuild 279 BLAKE2B 17d2b7f51a3ad8e179826ddd30c2f1fdfd2cf4b8c11eb292a05f1b693cf24f902caddcfda8a747e4846e1070110862279d4dea3636468272b54baf9face37862 SHA512 77ccc67162c75d2b21f5d245fa2a2b395065f8083f5dff959a9c31cdcccaae7cd42c3117f9b7de2d5fed4133daa01bc58202c71d1daa5bd83d779a6208677c23
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-pcscd/selinux-pcscd-2.20220106-r1.ebuild b/sec-policy/selinux-pcscd/selinux-pcscd-2.20220106-r1.ebuild
index 924d8ac78f53..48cfd03aeee4 100644
--- a/sec-policy/selinux-pcscd/selinux-pcscd-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-pcscd/selinux-pcscd-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for pcscd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-pcscd/selinux-pcscd-2.20220106-r2.ebuild b/sec-policy/selinux-pcscd/selinux-pcscd-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..924d8ac78f53
--- /dev/null
+++ b/sec-policy/selinux-pcscd/selinux-pcscd-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="pcscd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for pcscd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-phpfpm/Manifest b/sec-policy/selinux-phpfpm/Manifest
index 021ea49f4c9e..f0a4786dea12 100644
--- a/sec-policy/selinux-phpfpm/Manifest
+++ b/sec-policy/selinux-phpfpm/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-phpfpm-2.20200818-r2.ebuild 373 BLAKE2B 45cea6956a7dde5e656cf092e2682ad7a33f8a5739bd3a1c582cb03732806b3ce13563876911c759d598dda653cf2d8cdbee7fc725e90edc6fb02aa1ad8cb1bf SHA512 f26f223eead967ca30160f1928eaa692a8538f1510928bd1af28c5235662772a46c1ce91fe2177081af94800f75b8200b7c0b04679fe0d8b672c9569f782307d
 EBUILD selinux-phpfpm-2.20210203-r1.ebuild 373 BLAKE2B 45cea6956a7dde5e656cf092e2682ad7a33f8a5739bd3a1c582cb03732806b3ce13563876911c759d598dda653cf2d8cdbee7fc725e90edc6fb02aa1ad8cb1bf SHA512 f26f223eead967ca30160f1928eaa692a8538f1510928bd1af28c5235662772a46c1ce91fe2177081af94800f75b8200b7c0b04679fe0d8b672c9569f782307d
 EBUILD selinux-phpfpm-2.20210908-r1.ebuild 373 BLAKE2B 45cea6956a7dde5e656cf092e2682ad7a33f8a5739bd3a1c582cb03732806b3ce13563876911c759d598dda653cf2d8cdbee7fc725e90edc6fb02aa1ad8cb1bf SHA512 f26f223eead967ca30160f1928eaa692a8538f1510928bd1af28c5235662772a46c1ce91fe2177081af94800f75b8200b7c0b04679fe0d8b672c9569f782307d
-EBUILD selinux-phpfpm-2.20220106-r1.ebuild 377 BLAKE2B c0f9fcc0b5eacba1179228d7bbcbd0a6bc78576a4c2ffccd12fda451d6ae3f9c1088ab629ba8e1315bf767d0f8a71a086794a42e411e95185e0f04cb910aee60 SHA512 d4ebf42dfcc9b05873e0c4e38f7f6ff1a9e382544f9dde3dd299e700a25737b28d268196d25e09edf28513bc79a56889fd98d1af61d3489fe349bc4db6c1f33b
+EBUILD selinux-phpfpm-2.20220106-r1.ebuild 375 BLAKE2B b81e417d51364d60e794fab2c4706e22aa59ac46e23dea6f554958ddf57cdfd481e6c214ac343af2b87101d61b21512a71fd3a9168e1d71d43767e0c73a775ae SHA512 deb5f0fc85adc2edf9f1a37fe88068f16b094c1be5b61d59e052a9ce8e1cfed06bf241196e48256bd740c3606912e21fcd1e437cf0adb6e952493ee9ffd095e4
+EBUILD selinux-phpfpm-2.20220106-r2.ebuild 377 BLAKE2B c0f9fcc0b5eacba1179228d7bbcbd0a6bc78576a4c2ffccd12fda451d6ae3f9c1088ab629ba8e1315bf767d0f8a71a086794a42e411e95185e0f04cb910aee60 SHA512 d4ebf42dfcc9b05873e0c4e38f7f6ff1a9e382544f9dde3dd299e700a25737b28d268196d25e09edf28513bc79a56889fd98d1af61d3489fe349bc4db6c1f33b
 EBUILD selinux-phpfpm-9999.ebuild 377 BLAKE2B 1a1598675f083bb73b0af8be263c7f6d9b4cbc5a36670e2b460347ee62679cf08c472c6962c52718b81ea13880045c8bb74b14860d7511c85b04566181611652 SHA512 9853804873bdcc4b184ad6a79b52b2e7bf07526d079f3e568a78fff5759602c26adb9753ff3f55273f7eb2caaf01e18418c4376b7cf73ff8038f44546cf27dc9
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20220106-r1.ebuild b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20220106-r1.ebuild
index a78aff8bb937..15e46b177683 100644
--- a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20220106-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for phpfpm"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20220106-r2.ebuild b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..a78aff8bb937
--- /dev/null
+++ b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20220106-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="phpfpm"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for phpfpm"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-plymouthd/Manifest b/sec-policy/selinux-plymouthd/Manifest
index ceb8bd8c9442..6b84024a6af7 100644
--- a/sec-policy/selinux-plymouthd/Manifest
+++ b/sec-policy/selinux-plymouthd/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-plymouthd-2.20200818-r2.ebuild 283 BLAKE2B 366e9c0b98f6cd14953852793520fc33d08979070857644eabcfec88da6f97693446a8f61fc37cc61ed06f73fccbe95a279ff911a393a14dc212f9fa9a3891bf SHA512 37c0bfe29b3610860bc521ebd0f668ec43a152559010222853ce60bb23c6f885591bc4231fe238266b1eb2898c07ee937f786ba952acb80db0d92d1f63c7d233
 EBUILD selinux-plymouthd-2.20210203-r1.ebuild 283 BLAKE2B 366e9c0b98f6cd14953852793520fc33d08979070857644eabcfec88da6f97693446a8f61fc37cc61ed06f73fccbe95a279ff911a393a14dc212f9fa9a3891bf SHA512 37c0bfe29b3610860bc521ebd0f668ec43a152559010222853ce60bb23c6f885591bc4231fe238266b1eb2898c07ee937f786ba952acb80db0d92d1f63c7d233
 EBUILD selinux-plymouthd-2.20210908-r1.ebuild 283 BLAKE2B 366e9c0b98f6cd14953852793520fc33d08979070857644eabcfec88da6f97693446a8f61fc37cc61ed06f73fccbe95a279ff911a393a14dc212f9fa9a3891bf SHA512 37c0bfe29b3610860bc521ebd0f668ec43a152559010222853ce60bb23c6f885591bc4231fe238266b1eb2898c07ee937f786ba952acb80db0d92d1f63c7d233
-EBUILD selinux-plymouthd-2.20220106-r1.ebuild 287 BLAKE2B a0b3b3cd4a9269dbd54925bf544eab4f612da1645d5f303bbb20e2349f1fad599d76bf3a1bc07313a90e87bb5c683b42bb37d71610267081891367069470e099 SHA512 4287676d952b9884434408775eee25138528b747d9d38fa28d5dc5813bf408dea292c36b1504cad08a6e7843334905fa2930abfbfe0dffd86f462d2d54d86831
+EBUILD selinux-plymouthd-2.20220106-r1.ebuild 285 BLAKE2B b7ce23662a4c31eea10e9ec3d5dad91372db712265da72d97642edd233aad12fa4c61db78a08e2efa61a88330935cddbb7972140760c41ee07f26cbf02dbe141 SHA512 c1341dc58e24e0b5c31432aa8fa3b6e7fd60aae988243fdfdd5f4bac4a2bee76bd726cd7897e52163e465d820c764cc1b275f47b413b4e60679a1d3653c88a0b
+EBUILD selinux-plymouthd-2.20220106-r2.ebuild 287 BLAKE2B a0b3b3cd4a9269dbd54925bf544eab4f612da1645d5f303bbb20e2349f1fad599d76bf3a1bc07313a90e87bb5c683b42bb37d71610267081891367069470e099 SHA512 4287676d952b9884434408775eee25138528b747d9d38fa28d5dc5813bf408dea292c36b1504cad08a6e7843334905fa2930abfbfe0dffd86f462d2d54d86831
 EBUILD selinux-plymouthd-9999.ebuild 287 BLAKE2B 30a58b4cc20aff7d5ac697c4588f9dd19ba3296cd099ccd713b0e0f453e603d4de2e90bb54ae270838ca26762489472f18e8f2a025ab0e26f34a526705175df7 SHA512 3f9bfb500d1c4545535e2864b8ef1336d8a8d0d6fc5a4813ed9e6776056f43e9d4466dc204cf4730c630a39fa2c581b02df2da2001f28e7bcb9d467dffbc1380
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20220106-r1.ebuild b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20220106-r1.ebuild
index eee932601de6..670c5be69a43 100644
--- a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for plymouthd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20220106-r2.ebuild b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..eee932601de6
--- /dev/null
+++ b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="plymouthd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for plymouthd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-podman/Manifest b/sec-policy/selinux-podman/Manifest
index 78422bc0f6c8..155a3e353276 100644
--- a/sec-policy/selinux-podman/Manifest
+++ b/sec-policy/selinux-podman/Manifest
@@ -1,5 +1,7 @@
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176d3c8e508b2ff97d4f8a876d7c0a65534a62d86c9816ac59f6eed583f4b5c51cf432643edd2dad24dd51eb3cf22e2b75ac SHA512 794327d2dd07196b5f36771f9a961cdf294cf68f690735418d6bdd859499b7007c518cc022ccca9c245a5266b85bdb7cacdcaeefee14e4800937c9101476b373
-EBUILD selinux-podman-2.20220106-r1.ebuild 384 BLAKE2B a8d2d935b325820e31c1feb6af7280315d3ac6aa304c08eac30df420411cc1ad9e164992f97b31767d92fc3cc5bb72c0a2f074a07e2b5d89d8dfccbe9f53ce47 SHA512 c7e616241f801d38ceba7d8cff3cd01d04254cb01036d5c2b97e3ab11b0064b7d8717578e71f71b0f911f8a5019537c9bce7b6b67de5b70eb002d7fdbc206823
+EBUILD selinux-podman-2.20220106-r1.ebuild 382 BLAKE2B d9bff70427e3359ff517a1d26aaf008018a5c63ee135dfdfa430cf8e777bd29267c3ae1cc30b0a261d79f2fe3cfacc2beb85a7ec944092f1daa64a4bb157e305 SHA512 58c60abc47f1890f21cfe273d7f32344445e4bf7febac33eb702b350371553f271dd2e20a3269054266143ca40e914c0092f231b21cfcfeeacce7bbe1d2755eb
+EBUILD selinux-podman-2.20220106-r2.ebuild 384 BLAKE2B a8d2d935b325820e31c1feb6af7280315d3ac6aa304c08eac30df420411cc1ad9e164992f97b31767d92fc3cc5bb72c0a2f074a07e2b5d89d8dfccbe9f53ce47 SHA512 c7e616241f801d38ceba7d8cff3cd01d04254cb01036d5c2b97e3ab11b0064b7d8717578e71f71b0f911f8a5019537c9bce7b6b67de5b70eb002d7fdbc206823
 EBUILD selinux-podman-9999.ebuild 384 BLAKE2B a8d2d935b325820e31c1feb6af7280315d3ac6aa304c08eac30df420411cc1ad9e164992f97b31767d92fc3cc5bb72c0a2f074a07e2b5d89d8dfccbe9f53ce47 SHA512 c7e616241f801d38ceba7d8cff3cd01d04254cb01036d5c2b97e3ab11b0064b7d8717578e71f71b0f911f8a5019537c9bce7b6b67de5b70eb002d7fdbc206823
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-podman/selinux-podman-2.20220106-r1.ebuild b/sec-policy/selinux-podman/selinux-podman-2.20220106-r1.ebuild
index 86c074ff20d0..56470f656da3 100644
--- a/sec-policy/selinux-podman/selinux-podman-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-podman/selinux-podman-2.20220106-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for podman"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-podman/selinux-podman-2.20220106-r2.ebuild b/sec-policy/selinux-podman/selinux-podman-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..86c074ff20d0
--- /dev/null
+++ b/sec-policy/selinux-podman/selinux-podman-2.20220106-r2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="podman"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for podman"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+
+DEPEND="${DEPEND}
+	sec-policy/selinux-container
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-container
+"
diff --git a/sec-policy/selinux-policykit/Manifest b/sec-policy/selinux-policykit/Manifest
index b8631a4555f7..fd75294caee0 100644
--- a/sec-policy/selinux-policykit/Manifest
+++ b/sec-policy/selinux-policykit/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-policykit-2.20200818-r2.ebuild 283 BLAKE2B d33f35d0d0b3f827372d5af7b1e30ba31e3f34cb592304e5593a6e7ba0c48e5639e036ceebc9066a62671533122444588097aa7b4ea91bab1517b58c18a7f3a0 SHA512 560a724c57da2a21adaaecc04fd640d3a690d301c6c74f0a5e4bf8123f70d48d395dc6440844357a1d9a3c04ca42c624cfb9881308c659a05a9d750f5df21ba8
 EBUILD selinux-policykit-2.20210203-r1.ebuild 283 BLAKE2B d33f35d0d0b3f827372d5af7b1e30ba31e3f34cb592304e5593a6e7ba0c48e5639e036ceebc9066a62671533122444588097aa7b4ea91bab1517b58c18a7f3a0 SHA512 560a724c57da2a21adaaecc04fd640d3a690d301c6c74f0a5e4bf8123f70d48d395dc6440844357a1d9a3c04ca42c624cfb9881308c659a05a9d750f5df21ba8
 EBUILD selinux-policykit-2.20210908-r1.ebuild 283 BLAKE2B d33f35d0d0b3f827372d5af7b1e30ba31e3f34cb592304e5593a6e7ba0c48e5639e036ceebc9066a62671533122444588097aa7b4ea91bab1517b58c18a7f3a0 SHA512 560a724c57da2a21adaaecc04fd640d3a690d301c6c74f0a5e4bf8123f70d48d395dc6440844357a1d9a3c04ca42c624cfb9881308c659a05a9d750f5df21ba8
-EBUILD selinux-policykit-2.20220106-r1.ebuild 287 BLAKE2B f67abd2c9962cba97f670ca2db6203b5e877234b70291ea151071e7aaefcea678a766648ed52cb5502828c9cb67ed2caf68bcdc604c0739154cfc4ccefa9192d SHA512 f6ec1e683c91cac39bda69da65fa7931f4842faed2c0615c0d6c98aa80b70561d7478f17480c0deaadbe60078790ecb8e5f838caa00f3a52ec4b3f837e70d84a
+EBUILD selinux-policykit-2.20220106-r1.ebuild 285 BLAKE2B 060c1c17cc12d007cac3205d2e1a639ec8fce3ec77fdba6030fec7e39a42d5eae294fc10d6463f55d80eedf3d7af1a4e486d2b8801af65b9a14e3aeabe82b0b8 SHA512 2137eaa7c5fa36c54bbee67c1b9f099530453a522eb292fce3517c125c99ab0c019e3a2f3348ea14bc3906c684d4e3993fdfc93626d2dc93e6aca753fd129d28
+EBUILD selinux-policykit-2.20220106-r2.ebuild 287 BLAKE2B f67abd2c9962cba97f670ca2db6203b5e877234b70291ea151071e7aaefcea678a766648ed52cb5502828c9cb67ed2caf68bcdc604c0739154cfc4ccefa9192d SHA512 f6ec1e683c91cac39bda69da65fa7931f4842faed2c0615c0d6c98aa80b70561d7478f17480c0deaadbe60078790ecb8e5f838caa00f3a52ec4b3f837e70d84a
 EBUILD selinux-policykit-9999.ebuild 287 BLAKE2B 79339a640755e95c0e55990f2478a2c015534c61fb310c5f8e7a04c07fb8eb513bab4057ef82479c0eeff51424ade0a0a6f2f51b4bb62f7dd1b33addd1731124 SHA512 424709b795ace79a950c3beb6012fd2f6c13f04859c679851ca9b0a559a3a5e3b723af14e956a3ca1601f1ae497f95995c4dbeab16fe12f7bf02220c21a2b8de
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-policykit/selinux-policykit-2.20220106-r1.ebuild b/sec-policy/selinux-policykit/selinux-policykit-2.20220106-r1.ebuild
index 1ede5819cb90..99b2bcf0f009 100644
--- a/sec-policy/selinux-policykit/selinux-policykit-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-policykit/selinux-policykit-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for policykit"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-policykit/selinux-policykit-2.20220106-r2.ebuild b/sec-policy/selinux-policykit/selinux-policykit-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..1ede5819cb90
--- /dev/null
+++ b/sec-policy/selinux-policykit/selinux-policykit-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="policykit"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for policykit"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-portmap/Manifest b/sec-policy/selinux-portmap/Manifest
index 6aaec00baaf7..80914fee90c8 100644
--- a/sec-policy/selinux-portmap/Manifest
+++ b/sec-policy/selinux-portmap/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-portmap-2.20200818-r2.ebuild 279 BLAKE2B 482847e4051aa910d02604319af791fdf78eb1794c1a96e0af9f3f82d75e2e5f4e804a547ce7553b99ebae4a1574fa7e94fe9cd03505a2a48c90397eba67b967 SHA512 623499a9bd984ad4f79f332a3781b6bd02f7479ac62a9cf1886c6a06f5ff4edca9769880deddc9f131720569ddbad28748f9158d498e4acd2fe9187da834153c
 EBUILD selinux-portmap-2.20210203-r1.ebuild 279 BLAKE2B 482847e4051aa910d02604319af791fdf78eb1794c1a96e0af9f3f82d75e2e5f4e804a547ce7553b99ebae4a1574fa7e94fe9cd03505a2a48c90397eba67b967 SHA512 623499a9bd984ad4f79f332a3781b6bd02f7479ac62a9cf1886c6a06f5ff4edca9769880deddc9f131720569ddbad28748f9158d498e4acd2fe9187da834153c
 EBUILD selinux-portmap-2.20210908-r1.ebuild 279 BLAKE2B 482847e4051aa910d02604319af791fdf78eb1794c1a96e0af9f3f82d75e2e5f4e804a547ce7553b99ebae4a1574fa7e94fe9cd03505a2a48c90397eba67b967 SHA512 623499a9bd984ad4f79f332a3781b6bd02f7479ac62a9cf1886c6a06f5ff4edca9769880deddc9f131720569ddbad28748f9158d498e4acd2fe9187da834153c
-EBUILD selinux-portmap-2.20220106-r1.ebuild 283 BLAKE2B f5f4845cb0e080d7d7e1244d8144e83f8a0988e677c6b3714a932776f5a1ab2eecbe0c2dd81f1a58e6f8d5fe206e579df0a9abf0b86fe53c4745a88144c7b849 SHA512 c6f48a75bd7a4d3b24d19434240101cf96b1b0bb99f2cd9ef6ff3a2572d10522baa98da38fffd5804e0538f7a0bc7c876fd05b5f3e3af1b8d79f346e8abbe0b0
+EBUILD selinux-portmap-2.20220106-r1.ebuild 281 BLAKE2B 69ebce503bf4c5037f1c25715888ce12d70881b2056e9717f5e9f3edcef86b757b70c3854a4e85a4699509c87536be7fc960cb50dfccb53b657686ac6ecce0e9 SHA512 e9917955e0b9bac0662a62653082e9f036b22625bfa4f9a0bca3519e04975981d6aeb8f06af6f9564fbab26b4b85217257f554795ea6c5785b5fc1458ed0b7f7
+EBUILD selinux-portmap-2.20220106-r2.ebuild 283 BLAKE2B f5f4845cb0e080d7d7e1244d8144e83f8a0988e677c6b3714a932776f5a1ab2eecbe0c2dd81f1a58e6f8d5fe206e579df0a9abf0b86fe53c4745a88144c7b849 SHA512 c6f48a75bd7a4d3b24d19434240101cf96b1b0bb99f2cd9ef6ff3a2572d10522baa98da38fffd5804e0538f7a0bc7c876fd05b5f3e3af1b8d79f346e8abbe0b0
 EBUILD selinux-portmap-9999.ebuild 283 BLAKE2B e07c714d1febf80ba8bc4e74fae56e508d8713fe20f2aaaccb24d6c2d9bfb45803dd93409cad817dbbcc6d37613679852a151ce2d323100ed245ad30cde1e34b SHA512 65588b838117888fd4b5762d6716e127010e4e5c3d01c23327e99b7946e3a03957a4aa0a13ab297e9cd34c49507823238ad0840501eed7712bf900fa06ffa38d
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-portmap/selinux-portmap-2.20220106-r1.ebuild b/sec-policy/selinux-portmap/selinux-portmap-2.20220106-r1.ebuild
index e2e02f769a14..33fec89ad9de 100644
--- a/sec-policy/selinux-portmap/selinux-portmap-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-portmap/selinux-portmap-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for portmap"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-portmap/selinux-portmap-2.20220106-r2.ebuild b/sec-policy/selinux-portmap/selinux-portmap-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..e2e02f769a14
--- /dev/null
+++ b/sec-policy/selinux-portmap/selinux-portmap-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="portmap"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for portmap"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-postfix/Manifest b/sec-policy/selinux-postfix/Manifest
index 0b3bfb984558..34d341fa6cba 100644
--- a/sec-policy/selinux-postfix/Manifest
+++ b/sec-policy/selinux-postfix/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-postfix-2.20200818-r2.ebuild 279 BLAKE2B 58db1047e8b14be39653861d311787d37be3d7757126f6a5556b3b6834af7a99626dfd88ec17966d831684362dd4044cf614891093e519a22222206ff2517c7c SHA512 fd4aede9fdeca9c0fa2e88d67dbcb97326bb25d5acc594be7d168474ee2c066ae4d3e8cb0e890468f75201e3ea43715cd9e4bf2fe30491b5b6a17ea87a8aa680
 EBUILD selinux-postfix-2.20210203-r1.ebuild 279 BLAKE2B 58db1047e8b14be39653861d311787d37be3d7757126f6a5556b3b6834af7a99626dfd88ec17966d831684362dd4044cf614891093e519a22222206ff2517c7c SHA512 fd4aede9fdeca9c0fa2e88d67dbcb97326bb25d5acc594be7d168474ee2c066ae4d3e8cb0e890468f75201e3ea43715cd9e4bf2fe30491b5b6a17ea87a8aa680
 EBUILD selinux-postfix-2.20210908-r1.ebuild 279 BLAKE2B 58db1047e8b14be39653861d311787d37be3d7757126f6a5556b3b6834af7a99626dfd88ec17966d831684362dd4044cf614891093e519a22222206ff2517c7c SHA512 fd4aede9fdeca9c0fa2e88d67dbcb97326bb25d5acc594be7d168474ee2c066ae4d3e8cb0e890468f75201e3ea43715cd9e4bf2fe30491b5b6a17ea87a8aa680
-EBUILD selinux-postfix-2.20220106-r1.ebuild 283 BLAKE2B 7b38dac687eecbbddcb9e4e662dd9ffbb916fc8b68b43bf4e670b3bc7ae5c643c32d3d21a3627c21c917c148f0fa32f01aebae4c4126d51a924ab21ff6f96b87 SHA512 1c9be47d9e461685243184f512d9347b7cc9c914c6915142666943f13fd852ce51c441622300d36eaa78a7f32a51a02fd25c954dc5b6f5b0131988d4b4eb3aa1
+EBUILD selinux-postfix-2.20220106-r1.ebuild 281 BLAKE2B 4ba7eb8145a7e241c54723d98712b1ca5e4e24432b27ea1272409cb9f89729ae2c1d55b19860a59325f3224a72eb2fdc7366daf333ca2714b0efb8b2f5e017ff SHA512 fd7079ddfacdf223dfec35ed52ac6432e133f6f8fab5cf4600ba90765b5958e8486fc1ba989606c8d794f9d8bd47e6d499a258aac0994496f34424b5f99001ea
+EBUILD selinux-postfix-2.20220106-r2.ebuild 283 BLAKE2B 7b38dac687eecbbddcb9e4e662dd9ffbb916fc8b68b43bf4e670b3bc7ae5c643c32d3d21a3627c21c917c148f0fa32f01aebae4c4126d51a924ab21ff6f96b87 SHA512 1c9be47d9e461685243184f512d9347b7cc9c914c6915142666943f13fd852ce51c441622300d36eaa78a7f32a51a02fd25c954dc5b6f5b0131988d4b4eb3aa1
 EBUILD selinux-postfix-9999.ebuild 283 BLAKE2B 53fb7ae78428c6634808e46dea8570857042c8ba4d92f0abe0c60e31fbc013faba5dc254c14f2fc764d573ecfcd434b214ac6ea27592e0a89de037006b7f3e6e SHA512 8992967abf6e8564c9b463859fce69c1a0ad9ceaad42052435d8106b393e5b298eadb797f428ccdd57c9d7f9c564d363dc110ac7c7da8f8a038033722f09189d
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-postfix/selinux-postfix-2.20220106-r1.ebuild b/sec-policy/selinux-postfix/selinux-postfix-2.20220106-r1.ebuild
index daf81213125e..f5f704814497 100644
--- a/sec-policy/selinux-postfix/selinux-postfix-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-postfix/selinux-postfix-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for postfix"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-postfix/selinux-postfix-2.20220106-r2.ebuild b/sec-policy/selinux-postfix/selinux-postfix-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..daf81213125e
--- /dev/null
+++ b/sec-policy/selinux-postfix/selinux-postfix-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="postfix"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for postfix"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-postgresql/Manifest b/sec-policy/selinux-postgresql/Manifest
index ada6e5a27ff9..201ed3ba0b1e 100644
--- a/sec-policy/selinux-postgresql/Manifest
+++ b/sec-policy/selinux-postgresql/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-postgresql-2.20200818-r2.ebuild 285 BLAKE2B 497f813c562f76137303c6100d10231a9e5cda9de8858b1010b84a0a1dce9599011cf1e6fd44e0eb111658e12919db406e67863697e17a50ed379939862be132 SHA512 676472e68d88bff99ed4302ee5c63ab84f6acab5150dceefd950c518ef1efa0986e34b0cdbe2eddfc5f9094932b9e2ae14f20bd55ebb920f02b97f2097475335
 EBUILD selinux-postgresql-2.20210203-r1.ebuild 285 BLAKE2B 497f813c562f76137303c6100d10231a9e5cda9de8858b1010b84a0a1dce9599011cf1e6fd44e0eb111658e12919db406e67863697e17a50ed379939862be132 SHA512 676472e68d88bff99ed4302ee5c63ab84f6acab5150dceefd950c518ef1efa0986e34b0cdbe2eddfc5f9094932b9e2ae14f20bd55ebb920f02b97f2097475335
 EBUILD selinux-postgresql-2.20210908-r1.ebuild 285 BLAKE2B 497f813c562f76137303c6100d10231a9e5cda9de8858b1010b84a0a1dce9599011cf1e6fd44e0eb111658e12919db406e67863697e17a50ed379939862be132 SHA512 676472e68d88bff99ed4302ee5c63ab84f6acab5150dceefd950c518ef1efa0986e34b0cdbe2eddfc5f9094932b9e2ae14f20bd55ebb920f02b97f2097475335
-EBUILD selinux-postgresql-2.20220106-r1.ebuild 289 BLAKE2B 3241d4884b2e6054cc9ff47e792adb3b11f3fe5daca1abbbd4849ead5e4c8a14883be0627c785fc845e2d84d5a8500d8b4918b0678cf2671ed9cc022a65fdb10 SHA512 2ffc81e39ca57e3c717dbb8054369a336f832e3946584144b3a060966754664cd9d0ca7c0a08113a2a24d46ad724a9f8680c916a8c97d03b15895509250ac1d8
+EBUILD selinux-postgresql-2.20220106-r1.ebuild 287 BLAKE2B 64e3f466bd49ec25eec0aa2537733ec14a5c759df5a7eef22b13ffdf0d39fb667682bb8fcc157009d3c61c8b7a2c2e7c626f35441535cf71f9da9bc721d78861 SHA512 2f394b6bc942f088523bda01530bf8cafe3f383a89c6d190e080e19fcc37398616e8f824ff67343ac2089bb019c90378fc9a519eab67861f35212ab622ee5f37
+EBUILD selinux-postgresql-2.20220106-r2.ebuild 289 BLAKE2B 3241d4884b2e6054cc9ff47e792adb3b11f3fe5daca1abbbd4849ead5e4c8a14883be0627c785fc845e2d84d5a8500d8b4918b0678cf2671ed9cc022a65fdb10 SHA512 2ffc81e39ca57e3c717dbb8054369a336f832e3946584144b3a060966754664cd9d0ca7c0a08113a2a24d46ad724a9f8680c916a8c97d03b15895509250ac1d8
 EBUILD selinux-postgresql-9999.ebuild 289 BLAKE2B f638a1e2891fdfee0418e5fd687a1b88481098f1a693193fac36c167b26482dec4eef5671549f50a98a68b0cabb0b8ff1a9b924315bdf5f12baa63e3108bc579 SHA512 cbb3b2215f58aa602a1771e2437113bf6b33a0dcbc75689618bd6d72c433d0f2501fd05fcdc11e0e50b4ea87e02af4a02f7991725a6685e35cbfcfac71ba054c
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-postgresql/selinux-postgresql-2.20220106-r1.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-2.20220106-r1.ebuild
index 9214d5a64b55..64e6d6d549b2 100644
--- a/sec-policy/selinux-postgresql/selinux-postgresql-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-postgresql/selinux-postgresql-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for postgresql"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-postgresql/selinux-postgresql-2.20220106-r2.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..9214d5a64b55
--- /dev/null
+++ b/sec-policy/selinux-postgresql/selinux-postgresql-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="postgresql"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for postgresql"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-postgrey/Manifest b/sec-policy/selinux-postgrey/Manifest
index f9b8ef166512..558c9865bb67 100644
--- a/sec-policy/selinux-postgrey/Manifest
+++ b/sec-policy/selinux-postgrey/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-postgrey-2.20200818-r2.ebuild 281 BLAKE2B d7e67a297b9fa3991f0304773ded9040c904648cbe4e8c110fd89beecf520c6eea296ab131b5e9e97d7f1ef362817d12d34d26727d114ca858c31616dbef2231 SHA512 4b09a218bcdc85a23decb62cec2514be21a0fd9611846839eebed77ebafff9ce84ed8e40ff1beb2172867e1f7a47f91138b987c8ac8619f2167591824937f27b
 EBUILD selinux-postgrey-2.20210203-r1.ebuild 281 BLAKE2B d7e67a297b9fa3991f0304773ded9040c904648cbe4e8c110fd89beecf520c6eea296ab131b5e9e97d7f1ef362817d12d34d26727d114ca858c31616dbef2231 SHA512 4b09a218bcdc85a23decb62cec2514be21a0fd9611846839eebed77ebafff9ce84ed8e40ff1beb2172867e1f7a47f91138b987c8ac8619f2167591824937f27b
 EBUILD selinux-postgrey-2.20210908-r1.ebuild 281 BLAKE2B d7e67a297b9fa3991f0304773ded9040c904648cbe4e8c110fd89beecf520c6eea296ab131b5e9e97d7f1ef362817d12d34d26727d114ca858c31616dbef2231 SHA512 4b09a218bcdc85a23decb62cec2514be21a0fd9611846839eebed77ebafff9ce84ed8e40ff1beb2172867e1f7a47f91138b987c8ac8619f2167591824937f27b
-EBUILD selinux-postgrey-2.20220106-r1.ebuild 285 BLAKE2B eb20572b9ef7e19384b22810904c169fd7d1f53600894e35b22d268c855ef8822326f79a147fda3d5f32eb6ad144b92d4a2f5df17a9f5b9bbb042cbd79bca9f2 SHA512 2c06f7347c7db2b251e9860a9c216d5c123e9e511122e0595518965dc4a46295e21ce18a51b455d418bb583566f49bba1bb3e69c9b25a96bcb46b5dbdcf5b161
+EBUILD selinux-postgrey-2.20220106-r1.ebuild 283 BLAKE2B 59a2bf90f34664d9b8c306dc7be9e168a5db67882fa7eda8411000202b9949c993877fe383d7aa6840f2600e0f120ee37c1c9a535fb4712e426dd73655631e7a SHA512 e9dceebd84f3550c63029d61594482a45c29343bc206fff089c44027d10023cef73b25779fabbb5ef5b8bbac034a2128cb1925e294205a344d37ae8f0ed5a91d
+EBUILD selinux-postgrey-2.20220106-r2.ebuild 285 BLAKE2B eb20572b9ef7e19384b22810904c169fd7d1f53600894e35b22d268c855ef8822326f79a147fda3d5f32eb6ad144b92d4a2f5df17a9f5b9bbb042cbd79bca9f2 SHA512 2c06f7347c7db2b251e9860a9c216d5c123e9e511122e0595518965dc4a46295e21ce18a51b455d418bb583566f49bba1bb3e69c9b25a96bcb46b5dbdcf5b161
 EBUILD selinux-postgrey-9999.ebuild 285 BLAKE2B ccbb3952f90c577c19f4367e54a9f522ec7cbd5e489c9a4f12f53d4895b172e52850ed1a71e7f972e25247de3dae49faeb01a12d31c41591ef23c5df8adbeae8 SHA512 116f999e70ac818d99d2622e7aca4b67712d98b641bb097c916a8b1e14f9014021d3ad95a0c11f2be34d3db0cc31bca526e48ff7dde0b75c22a188181081dd2d
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-postgrey/selinux-postgrey-2.20220106-r1.ebuild b/sec-policy/selinux-postgrey/selinux-postgrey-2.20220106-r1.ebuild
index 7aab3b4d7c67..db2bc73df3f2 100644
--- a/sec-policy/selinux-postgrey/selinux-postgrey-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-postgrey/selinux-postgrey-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for postgrey"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-postgrey/selinux-postgrey-2.20220106-r2.ebuild b/sec-policy/selinux-postgrey/selinux-postgrey-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..7aab3b4d7c67
--- /dev/null
+++ b/sec-policy/selinux-postgrey/selinux-postgrey-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="postgrey"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for postgrey"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ppp/Manifest b/sec-policy/selinux-ppp/Manifest
index d38c03bf4cab..f018b1b0528d 100644
--- a/sec-policy/selinux-ppp/Manifest
+++ b/sec-policy/selinux-ppp/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-ppp-2.20200818-r2.ebuild 271 BLAKE2B 200c64b6aa3b7fdd3fc91485d11addec81c6964b7b573e80dbbfe0ed86001de10b4eec8189a32a2299002da86aa9926965f09f7d18edf699b377829980d220fe SHA512 45cd4854128e2b0970475b4978e0de900edee6392a921c64889c2bc5634f0980be1dfa9c8530de2b92d2842d8e56a30a2ad77527bc86a3718ef58b010882c1e4
 EBUILD selinux-ppp-2.20210203-r1.ebuild 271 BLAKE2B 200c64b6aa3b7fdd3fc91485d11addec81c6964b7b573e80dbbfe0ed86001de10b4eec8189a32a2299002da86aa9926965f09f7d18edf699b377829980d220fe SHA512 45cd4854128e2b0970475b4978e0de900edee6392a921c64889c2bc5634f0980be1dfa9c8530de2b92d2842d8e56a30a2ad77527bc86a3718ef58b010882c1e4
 EBUILD selinux-ppp-2.20210908-r1.ebuild 271 BLAKE2B 200c64b6aa3b7fdd3fc91485d11addec81c6964b7b573e80dbbfe0ed86001de10b4eec8189a32a2299002da86aa9926965f09f7d18edf699b377829980d220fe SHA512 45cd4854128e2b0970475b4978e0de900edee6392a921c64889c2bc5634f0980be1dfa9c8530de2b92d2842d8e56a30a2ad77527bc86a3718ef58b010882c1e4
-EBUILD selinux-ppp-2.20220106-r1.ebuild 275 BLAKE2B dc878f10e5e199e267375c042ed0ca3015039f160fc3f2a3fd04486a75ab6da0f73d581af214fe5e980f45c6893f48e4b1ed3497a13c0881d4364d190d02400c SHA512 c30da99c9aa187ea2e8db46cb39180ce23c66b3504ab83aecbdeae32d6e9127f6b9cbbe0105e749e2abbde5fa5382022a1018f45b42bfe4033d4d39b1e8f8729
+EBUILD selinux-ppp-2.20220106-r1.ebuild 273 BLAKE2B 3269a45ef48c5c3eb9debce94e3cd8aac425a3bee709bc9f19513880334e7f6a2b7d40170ff656f57cba764ab19e370171b5dacef771a99541f3f416fb1bf3d7 SHA512 fa1de7d3e292e4af2900222487c6c0b03d021186728cbb898b1d1dfc88978ce0d13a12e9060bfe0d40398789b2975a9b94bb3c873c36bd4e564760feb3d9a825
+EBUILD selinux-ppp-2.20220106-r2.ebuild 275 BLAKE2B dc878f10e5e199e267375c042ed0ca3015039f160fc3f2a3fd04486a75ab6da0f73d581af214fe5e980f45c6893f48e4b1ed3497a13c0881d4364d190d02400c SHA512 c30da99c9aa187ea2e8db46cb39180ce23c66b3504ab83aecbdeae32d6e9127f6b9cbbe0105e749e2abbde5fa5382022a1018f45b42bfe4033d4d39b1e8f8729
 EBUILD selinux-ppp-9999.ebuild 275 BLAKE2B 67d27449bc3ca5725754244f8a7790470a7e5215194da209e53496dc079b362f6ed61726ff3cab8f36863e0cfb703da706a0cbc266eb370682f4d6c8c96b9bff SHA512 95e85a46b1030a78b73cb8666043f67db94e20ef94b2f42bfac5fcbf419031a3c6cef8de605395255357229b54ee09d93f93fb49791e9ac94313bcc526140620
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-ppp/selinux-ppp-2.20220106-r1.ebuild b/sec-policy/selinux-ppp/selinux-ppp-2.20220106-r1.ebuild
index 27bf40dc4df1..6c23725e6b41 100644
--- a/sec-policy/selinux-ppp/selinux-ppp-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-ppp/selinux-ppp-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ppp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ppp/selinux-ppp-2.20220106-r2.ebuild b/sec-policy/selinux-ppp/selinux-ppp-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..27bf40dc4df1
--- /dev/null
+++ b/sec-policy/selinux-ppp/selinux-ppp-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="ppp"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ppp"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-prelink/Manifest b/sec-policy/selinux-prelink/Manifest
deleted file mode 100644
index f409dab12ce8..000000000000
--- a/sec-policy/selinux-prelink/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
-DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
-DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
-DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
-DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
-DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
-DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176d3c8e508b2ff97d4f8a876d7c0a65534a62d86c9816ac59f6eed583f4b5c51cf432643edd2dad24dd51eb3cf22e2b75ac SHA512 794327d2dd07196b5f36771f9a961cdf294cf68f690735418d6bdd859499b7007c518cc022ccca9c245a5266b85bdb7cacdcaeefee14e4800937c9101476b373
-EBUILD selinux-prelink-2.20200818-r2.ebuild 279 BLAKE2B cd30f307d8a12b73cc5ba8f0110d6b5297a27c0b779194638b03c529aa8b57524b609da471211c08e6af933b2d523e3da6f323b43d811440e00b47f09df87c13 SHA512 c830f15d9236a657a4baf4ede2369e77b137d1471951a1ee40cf8aee504a1968cf6e22f9a97c16352ee8b0c78d0fc70f0cf9d4c070eea8ea31f330083ab6759b
-EBUILD selinux-prelink-2.20210203-r1.ebuild 279 BLAKE2B cd30f307d8a12b73cc5ba8f0110d6b5297a27c0b779194638b03c529aa8b57524b609da471211c08e6af933b2d523e3da6f323b43d811440e00b47f09df87c13 SHA512 c830f15d9236a657a4baf4ede2369e77b137d1471951a1ee40cf8aee504a1968cf6e22f9a97c16352ee8b0c78d0fc70f0cf9d4c070eea8ea31f330083ab6759b
-EBUILD selinux-prelink-2.20210908-r1.ebuild 279 BLAKE2B cd30f307d8a12b73cc5ba8f0110d6b5297a27c0b779194638b03c529aa8b57524b609da471211c08e6af933b2d523e3da6f323b43d811440e00b47f09df87c13 SHA512 c830f15d9236a657a4baf4ede2369e77b137d1471951a1ee40cf8aee504a1968cf6e22f9a97c16352ee8b0c78d0fc70f0cf9d4c070eea8ea31f330083ab6759b
-EBUILD selinux-prelink-2.20220106-r1.ebuild 283 BLAKE2B 6f5a527043ffc79ac2d95fdbf30767a651df4943e1e67e970bddbecb89e3021754e86daf3724ff74e1627cd003ee34f2b77fc57c19e7dc626ac257dff630e6da SHA512 4ab13dc167dbd5fffa48307d213f53c086544ec9ac9b8d3206b73e123a88cbc30f2293209243f60975770cba0d77592b5e619c756dbc0b71595a761c6c6b2123
-EBUILD selinux-prelink-9999.ebuild 283 BLAKE2B 603430e5ba085183627f6e20340e51152ed99ec2a301dabf9dcb4f4e973a301e9bcf2f7c6eabda5c8acd1b4b22ccc83099c9bcde92a1300d4cba6398de03560d SHA512 f0c46ee34af002c10968781b497cab32f30fff4a85662779a4637215068769fdd4b0563cf8cc794e21ab729bb131dd87d7b57dd80df97149bcc3abd3d6504459
-MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-prelude/Manifest b/sec-policy/selinux-prelude/Manifest
index 05fef4b52e0d..cebfbf5827bd 100644
--- a/sec-policy/selinux-prelude/Manifest
+++ b/sec-policy/selinux-prelude/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-prelude-2.20200818-r2.ebuild 375 BLAKE2B c797884d22b6c718ae43a127115700ea6fcf1ca6db9da979b91dfc1c9e5dfe452a43711f27dbcf80e6d17bfa229d58539d5330959874bca132dc842b5585d7af SHA512 eb070c4c8837817d121ec1606c853c8184070721dbd417e25fd696638c8ddd4cc17be806b37cb6bf97da7617a9b19e796cb698ee495c2df30bafc5f55814e6c6
 EBUILD selinux-prelude-2.20210203-r1.ebuild 375 BLAKE2B c797884d22b6c718ae43a127115700ea6fcf1ca6db9da979b91dfc1c9e5dfe452a43711f27dbcf80e6d17bfa229d58539d5330959874bca132dc842b5585d7af SHA512 eb070c4c8837817d121ec1606c853c8184070721dbd417e25fd696638c8ddd4cc17be806b37cb6bf97da7617a9b19e796cb698ee495c2df30bafc5f55814e6c6
 EBUILD selinux-prelude-2.20210908-r1.ebuild 375 BLAKE2B c797884d22b6c718ae43a127115700ea6fcf1ca6db9da979b91dfc1c9e5dfe452a43711f27dbcf80e6d17bfa229d58539d5330959874bca132dc842b5585d7af SHA512 eb070c4c8837817d121ec1606c853c8184070721dbd417e25fd696638c8ddd4cc17be806b37cb6bf97da7617a9b19e796cb698ee495c2df30bafc5f55814e6c6
-EBUILD selinux-prelude-2.20220106-r1.ebuild 379 BLAKE2B 0e2fbc4ac3d6d81f79bd3275076aa3e46f4ddd4534aed86a66de8caeb80fafb5c4e3cb4080d2ad94baa48bd85b7586de3b2c13e44b6a8f35d96adc404cd79e55 SHA512 fdbcbeb5428d155ecffa3a30527c4f0f25225a262b5441726ba0bb935ae392931850d2ff3f7c06ba74b228b706b3bf94d596d52d430e2e1a02ed2fc7fcf973f7
+EBUILD selinux-prelude-2.20220106-r1.ebuild 377 BLAKE2B 723825214c5ee3e9506eab38e52a188231af7b469baa1e012ad29e40efaa5faea2523a5e3cb208d97190c4fec837b33485be823d283585c7e57e6092d4d69c30 SHA512 8e8e993e75e49cdfb809378af1a6e304e5d9afda702f7431dce075045b5980181fb90c945e350e4239456c008e5046b2beb318959b8bbf04be8a396de2b6a32b
+EBUILD selinux-prelude-2.20220106-r2.ebuild 379 BLAKE2B 0e2fbc4ac3d6d81f79bd3275076aa3e46f4ddd4534aed86a66de8caeb80fafb5c4e3cb4080d2ad94baa48bd85b7586de3b2c13e44b6a8f35d96adc404cd79e55 SHA512 fdbcbeb5428d155ecffa3a30527c4f0f25225a262b5441726ba0bb935ae392931850d2ff3f7c06ba74b228b706b3bf94d596d52d430e2e1a02ed2fc7fcf973f7
 EBUILD selinux-prelude-9999.ebuild 379 BLAKE2B 9abf97bfaf98a2017884e9543638e8ee79bf7605bf57ef507a4dedb834b33b34cf54ebc2f1331280866426c5947f7e449cc4fd067d5a76b3d38e9c7f64a955f2 SHA512 83e909d343ea6271010554cdc2e9f7ec7057b86dc0b572892d34f634ccae3d9696a26043dc7cf52e8806d55ee8b01bbd7f1bc189d2a7102f831c447a11812382
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-prelude/selinux-prelude-2.20220106-r1.ebuild b/sec-policy/selinux-prelude/selinux-prelude-2.20220106-r1.ebuild
index 284d47186b16..9d7b5ca0491e 100644
--- a/sec-policy/selinux-prelude/selinux-prelude-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-prelude/selinux-prelude-2.20220106-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for prelude"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-prelude/selinux-prelude-2.20220106-r2.ebuild b/sec-policy/selinux-prelude/selinux-prelude-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..284d47186b16
--- /dev/null
+++ b/sec-policy/selinux-prelude/selinux-prelude-2.20220106-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="prelude"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for prelude"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-privoxy/Manifest b/sec-policy/selinux-privoxy/Manifest
index b780a749ed0f..19b5ef9ca23c 100644
--- a/sec-policy/selinux-privoxy/Manifest
+++ b/sec-policy/selinux-privoxy/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-privoxy-2.20200818-r2.ebuild 279 BLAKE2B d835dae913e6240f5f5f097e816ac5ae0cbc41c409a96199c965cfc45949f711f9c72bdf7f4c59a9943139c7300bcafa1b28ffd863afe94a98ee37da4627019f SHA512 b417b1f6d54f8302557d3ded09c3a1823e2ce31bfe17b180579e92dbc17abb49f1e068b785555d291ff174b4fc4e928e3812c2517214f62776c9a10d3c1cd53c
 EBUILD selinux-privoxy-2.20210203-r1.ebuild 279 BLAKE2B d835dae913e6240f5f5f097e816ac5ae0cbc41c409a96199c965cfc45949f711f9c72bdf7f4c59a9943139c7300bcafa1b28ffd863afe94a98ee37da4627019f SHA512 b417b1f6d54f8302557d3ded09c3a1823e2ce31bfe17b180579e92dbc17abb49f1e068b785555d291ff174b4fc4e928e3812c2517214f62776c9a10d3c1cd53c
 EBUILD selinux-privoxy-2.20210908-r1.ebuild 279 BLAKE2B d835dae913e6240f5f5f097e816ac5ae0cbc41c409a96199c965cfc45949f711f9c72bdf7f4c59a9943139c7300bcafa1b28ffd863afe94a98ee37da4627019f SHA512 b417b1f6d54f8302557d3ded09c3a1823e2ce31bfe17b180579e92dbc17abb49f1e068b785555d291ff174b4fc4e928e3812c2517214f62776c9a10d3c1cd53c
-EBUILD selinux-privoxy-2.20220106-r1.ebuild 283 BLAKE2B a97b607ad839a0a6b77d5051018db7e7d2914216fcb4afdb8649b2436dadcaa2a0f6a6c659ace885e873b71ccb9f9d59e421eb1fd2a31153e8bb81e33095a20d SHA512 590253fcefbe5b00416395649e5ea39bc197745484bedf38f7d8cda26d0902310cf1ad8c8323ae072f0002e3a53990907cc4a04e02ef9ae34b4a640b54b02fa3
+EBUILD selinux-privoxy-2.20220106-r1.ebuild 281 BLAKE2B 87bd0dc1ed9f2187906fc8a55ee14b20fe44c60a6c9bf69ed8bff00efc34e0cd7ca31f0ff05e9958b1f62fbc6869fbde2d716f719cbfe27cb87df8a68cc9bdc6 SHA512 58745dec555f4decb7d2d7861a3c4d72187ef3421a08ef8e9c6169e28b575ed93bb490cbcebeabad3ecc357f312c50892a51d9b130586da0d71c6c26840bb7af
+EBUILD selinux-privoxy-2.20220106-r2.ebuild 283 BLAKE2B a97b607ad839a0a6b77d5051018db7e7d2914216fcb4afdb8649b2436dadcaa2a0f6a6c659ace885e873b71ccb9f9d59e421eb1fd2a31153e8bb81e33095a20d SHA512 590253fcefbe5b00416395649e5ea39bc197745484bedf38f7d8cda26d0902310cf1ad8c8323ae072f0002e3a53990907cc4a04e02ef9ae34b4a640b54b02fa3
 EBUILD selinux-privoxy-9999.ebuild 283 BLAKE2B c09f0cadfb6343bdbe9751f349a9dbf5ff652c63416755cff2d4840c902b19cebdc1823baac5415631069124327c18abc52f3149b78848cfbfef7785ffda6c0b SHA512 f0b97e1dd0c48e1f042c8caf6e383c22e89b189a82088af6c795ae3801e6c52931079c4bd346c8f478bfb4ae257e2891603a451b4103fd4381b7cb0a44617b0e
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-privoxy/selinux-privoxy-2.20220106-r1.ebuild b/sec-policy/selinux-privoxy/selinux-privoxy-2.20220106-r1.ebuild
index 0e5d40071c08..49e68a24b5f5 100644
--- a/sec-policy/selinux-privoxy/selinux-privoxy-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-privoxy/selinux-privoxy-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for privoxy"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-privoxy/selinux-privoxy-2.20220106-r2.ebuild b/sec-policy/selinux-privoxy/selinux-privoxy-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..0e5d40071c08
--- /dev/null
+++ b/sec-policy/selinux-privoxy/selinux-privoxy-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="privoxy"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for privoxy"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-procmail/Manifest b/sec-policy/selinux-procmail/Manifest
index 9fa519ee9520..d9f794ec8713 100644
--- a/sec-policy/selinux-procmail/Manifest
+++ b/sec-policy/selinux-procmail/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-procmail-2.20200818-r2.ebuild 281 BLAKE2B 9a18c5fa07b6c3bd800944409aebee0fe41fc884b224023eb357a3b6c2044f32fdfedb889bc20823a38ed7aab5cbf2dbe8540744c9f3f0f62aa65a141efd2d11 SHA512 1619f03ecbaefd1a8ac72640f42dc6cf5194f4870ec15696125d158a7271c819fd4dc36b8eb8f3b038f9538e867c19e60da0097f3b35fd237f37a90b0124648e
 EBUILD selinux-procmail-2.20210203-r1.ebuild 281 BLAKE2B 9a18c5fa07b6c3bd800944409aebee0fe41fc884b224023eb357a3b6c2044f32fdfedb889bc20823a38ed7aab5cbf2dbe8540744c9f3f0f62aa65a141efd2d11 SHA512 1619f03ecbaefd1a8ac72640f42dc6cf5194f4870ec15696125d158a7271c819fd4dc36b8eb8f3b038f9538e867c19e60da0097f3b35fd237f37a90b0124648e
 EBUILD selinux-procmail-2.20210908-r1.ebuild 281 BLAKE2B 9a18c5fa07b6c3bd800944409aebee0fe41fc884b224023eb357a3b6c2044f32fdfedb889bc20823a38ed7aab5cbf2dbe8540744c9f3f0f62aa65a141efd2d11 SHA512 1619f03ecbaefd1a8ac72640f42dc6cf5194f4870ec15696125d158a7271c819fd4dc36b8eb8f3b038f9538e867c19e60da0097f3b35fd237f37a90b0124648e
-EBUILD selinux-procmail-2.20220106-r1.ebuild 285 BLAKE2B 13661b5c7a63cfe6399ec3c24cdce9653c4c4e35ce70d739bcc32a8f0996852c0666fed2f3ad07cdc5cf4625442ae30bd883644287822a61e0643293039dff8d SHA512 353b5d2a3dafd1e40ad28aead9df4e822cccddf276907282e31fa1128ab25f72cb81c6dd796f6f26ca0afc32943ac695e0f472b7082ff83cb86a7e2280ba1cb6
+EBUILD selinux-procmail-2.20220106-r1.ebuild 283 BLAKE2B 2f47126b63e07f24ec72954fae0ee260341f22048627b404daeec877c9d002235cd2e9a21f35a6a2557f848370251dc281c3b183cbc9630d56ddfbf1a650fa03 SHA512 a690e0a6c2d5ad37f1c80d61743e34086fcf527e9f838cb48c4059a71692f1524371e115721a90c415aa35893d518193931172dece70d1b1237b9eef0968cc9e
+EBUILD selinux-procmail-2.20220106-r2.ebuild 285 BLAKE2B 13661b5c7a63cfe6399ec3c24cdce9653c4c4e35ce70d739bcc32a8f0996852c0666fed2f3ad07cdc5cf4625442ae30bd883644287822a61e0643293039dff8d SHA512 353b5d2a3dafd1e40ad28aead9df4e822cccddf276907282e31fa1128ab25f72cb81c6dd796f6f26ca0afc32943ac695e0f472b7082ff83cb86a7e2280ba1cb6
 EBUILD selinux-procmail-9999.ebuild 285 BLAKE2B b2f220db5f938faa7a9faff1423303acafd13821e6e0c119bc21e551b9bdf88aa0b4346c02b470e350527f51bfc8ef7df2d03c58337167a86f879267a164a396 SHA512 345d7d24c42238fa6beb2615380a179b1846afeeec919dded6e0fd7886a475f867b1475c47d1433578de92b7ca4f30e956037109cda1e4359b78e07966d19b48
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-procmail/selinux-procmail-2.20220106-r1.ebuild b/sec-policy/selinux-procmail/selinux-procmail-2.20220106-r1.ebuild
index a02352c2d42b..33a6c9b005c9 100644
--- a/sec-policy/selinux-procmail/selinux-procmail-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-procmail/selinux-procmail-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for procmail"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-procmail/selinux-procmail-2.20220106-r2.ebuild b/sec-policy/selinux-procmail/selinux-procmail-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..a02352c2d42b
--- /dev/null
+++ b/sec-policy/selinux-procmail/selinux-procmail-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="procmail"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for procmail"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-psad/Manifest b/sec-policy/selinux-psad/Manifest
index 15748fb97dd7..460d96817fa5 100644
--- a/sec-policy/selinux-psad/Manifest
+++ b/sec-policy/selinux-psad/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-psad-2.20200818-r2.ebuild 273 BLAKE2B 72755635a2016c0f7877e7b2b6344138c2143557bbec55152f4173057f6048ef6906dc07b45a00a84a3cea9bce8be862e4f4313f11b4b581d10bc206ba1d0819 SHA512 1dec73481b86bc90f55c40825b690b87b987f4fc4ff72043dbd7db1b7852b0197828826e648b5e8f83433668380994fca036fbb3b5cd7f774cc209e018e559d4
 EBUILD selinux-psad-2.20210203-r1.ebuild 273 BLAKE2B 72755635a2016c0f7877e7b2b6344138c2143557bbec55152f4173057f6048ef6906dc07b45a00a84a3cea9bce8be862e4f4313f11b4b581d10bc206ba1d0819 SHA512 1dec73481b86bc90f55c40825b690b87b987f4fc4ff72043dbd7db1b7852b0197828826e648b5e8f83433668380994fca036fbb3b5cd7f774cc209e018e559d4
 EBUILD selinux-psad-2.20210908-r1.ebuild 273 BLAKE2B 72755635a2016c0f7877e7b2b6344138c2143557bbec55152f4173057f6048ef6906dc07b45a00a84a3cea9bce8be862e4f4313f11b4b581d10bc206ba1d0819 SHA512 1dec73481b86bc90f55c40825b690b87b987f4fc4ff72043dbd7db1b7852b0197828826e648b5e8f83433668380994fca036fbb3b5cd7f774cc209e018e559d4
-EBUILD selinux-psad-2.20220106-r1.ebuild 277 BLAKE2B 7dafc19ff6f5d2b93f91e1923ef886eece30abe983cd11ded131bc00afc2480f800be86683859688672572b623cf2c57d5414dae178048b56cabdc2b5ab3e966 SHA512 71ecfffbee56f6f38827d033b7ac61c9ffed37b2357a3af80ad570c9dafc12027d2138201499fff5aa1d8a180ed9aab825d4d6f6c81f7ec60b3295792faa2734
+EBUILD selinux-psad-2.20220106-r1.ebuild 275 BLAKE2B 81059312ee33d82f40a2225c3165161c96fd63d2581b2e6e76e0eb382e26b81cce07413f3892a1fc2ecdd8a2f658cf9ea5de8526a4bd5538c80ac3477adcd39a SHA512 2c392753bad89c1bc656c5867e0b52aae4d2dc8282da09ba1134b7346d7868c85fe1386fce6fea5238db452148d8cc4f457243592a9f3930a30a8b137c48f543
+EBUILD selinux-psad-2.20220106-r2.ebuild 277 BLAKE2B 7dafc19ff6f5d2b93f91e1923ef886eece30abe983cd11ded131bc00afc2480f800be86683859688672572b623cf2c57d5414dae178048b56cabdc2b5ab3e966 SHA512 71ecfffbee56f6f38827d033b7ac61c9ffed37b2357a3af80ad570c9dafc12027d2138201499fff5aa1d8a180ed9aab825d4d6f6c81f7ec60b3295792faa2734
 EBUILD selinux-psad-9999.ebuild 277 BLAKE2B d704b3a1356d3e60ba840e0280a01a377ede335f2a38444fe9f924a4e139dc60c761e11de94ca5d72be6d9c7b0a318e879a7fc4b110713451881487616d97164 SHA512 5d64282be18d4c48feb85890f591e172467c41cadd5d72b0ab055bed8a9bce30db904c74847424be5caf86ed25187f1e6b405120209d3db35da5aa16cf154dcd
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-psad/selinux-psad-2.20220106-r1.ebuild b/sec-policy/selinux-psad/selinux-psad-2.20220106-r1.ebuild
index ee1007d7bb4d..8f066451f75d 100644
--- a/sec-policy/selinux-psad/selinux-psad-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-psad/selinux-psad-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for psad"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-psad/selinux-psad-2.20220106-r2.ebuild b/sec-policy/selinux-psad/selinux-psad-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..ee1007d7bb4d
--- /dev/null
+++ b/sec-policy/selinux-psad/selinux-psad-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="psad"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for psad"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-publicfile/Manifest b/sec-policy/selinux-publicfile/Manifest
index ea37e6af1b80..c497efc6387e 100644
--- a/sec-policy/selinux-publicfile/Manifest
+++ b/sec-policy/selinux-publicfile/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-publicfile-2.20200818-r2.ebuild 285 BLAKE2B 2a10dc2013a2e08e4210e87553a50253fbe2ebd3d40fc8bc519d88b0976686d3585b6572bceef48ec11e01794725da58c69dba533f62bd4cd4f7da1aedaa1861 SHA512 7cc03d6b78545b4b6d47f54c75ef7757b4477adfdba7d31c8fe1b2c61a5386cdfbbc89c97e4b9189aed3a19653a08c1f43a37f306b3f6d0823c716fc414b3131
 EBUILD selinux-publicfile-2.20210203-r1.ebuild 285 BLAKE2B 2a10dc2013a2e08e4210e87553a50253fbe2ebd3d40fc8bc519d88b0976686d3585b6572bceef48ec11e01794725da58c69dba533f62bd4cd4f7da1aedaa1861 SHA512 7cc03d6b78545b4b6d47f54c75ef7757b4477adfdba7d31c8fe1b2c61a5386cdfbbc89c97e4b9189aed3a19653a08c1f43a37f306b3f6d0823c716fc414b3131
 EBUILD selinux-publicfile-2.20210908-r1.ebuild 285 BLAKE2B 2a10dc2013a2e08e4210e87553a50253fbe2ebd3d40fc8bc519d88b0976686d3585b6572bceef48ec11e01794725da58c69dba533f62bd4cd4f7da1aedaa1861 SHA512 7cc03d6b78545b4b6d47f54c75ef7757b4477adfdba7d31c8fe1b2c61a5386cdfbbc89c97e4b9189aed3a19653a08c1f43a37f306b3f6d0823c716fc414b3131
-EBUILD selinux-publicfile-2.20220106-r1.ebuild 289 BLAKE2B 6720625c310571366e1359e163d25d8655e7f6ecab718874c1ce10e01434926c40b0639cae9c60b53c3dfba11d36a616eb1103f973ebadca58a4d33c5d917de8 SHA512 4bc833376f565aa81e50bfa904beb0c364312e4f7cc8c088bec1d589acd7591c9ab0a0a63ea32dd9f614acf9b1a36bc6f1136cbbe8af28aa07b22861dfb0d652
+EBUILD selinux-publicfile-2.20220106-r1.ebuild 287 BLAKE2B 4d2625cae693772b556e749b026e87a56a81d836cff6deecfc87ed20400bc7a5f15b3b864d61c8b39fa5cc19930c03a5429cd825201bb3254acf6be4bc532832 SHA512 29231f0867821e6236a8fd41d9b92be09bfa14ea241a72daec73c48a00cddacb1cd1e5b8de1b447703a5e494887ea4b015cebd9164279cee60997b51a1a35b90
+EBUILD selinux-publicfile-2.20220106-r2.ebuild 289 BLAKE2B 6720625c310571366e1359e163d25d8655e7f6ecab718874c1ce10e01434926c40b0639cae9c60b53c3dfba11d36a616eb1103f973ebadca58a4d33c5d917de8 SHA512 4bc833376f565aa81e50bfa904beb0c364312e4f7cc8c088bec1d589acd7591c9ab0a0a63ea32dd9f614acf9b1a36bc6f1136cbbe8af28aa07b22861dfb0d652
 EBUILD selinux-publicfile-9999.ebuild 289 BLAKE2B 666647d4d47357ecf766c02360fb42d0411f3de2aca61dfb315514702f44d5415b78283d1b16316a95fe166cbc1798b8732b548657db4bb7f29e3383feaa9ec9 SHA512 119d7167c9470aa07d55460f06c2265e58e44175f12233e15b6ec0a002324f8a5765973522fb400f6a455a4dd029df1f900a62d2548d519adf80b03e53f9c5c3
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-publicfile/selinux-publicfile-2.20220106-r1.ebuild b/sec-policy/selinux-publicfile/selinux-publicfile-2.20220106-r1.ebuild
index 4b31d0d186b7..db22bcaa3e89 100644
--- a/sec-policy/selinux-publicfile/selinux-publicfile-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-publicfile/selinux-publicfile-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for publicfile"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-publicfile/selinux-publicfile-2.20220106-r2.ebuild b/sec-policy/selinux-publicfile/selinux-publicfile-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..4b31d0d186b7
--- /dev/null
+++ b/sec-policy/selinux-publicfile/selinux-publicfile-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="publicfile"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for publicfile"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-pulseaudio/Manifest b/sec-policy/selinux-pulseaudio/Manifest
index 68fa29f0cd04..5129357e9a32 100644
--- a/sec-policy/selinux-pulseaudio/Manifest
+++ b/sec-policy/selinux-pulseaudio/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-pulseaudio-2.20200818-r2.ebuild 285 BLAKE2B 2a9db424f46658994c2dbc662d5eb6e8aec3ff85ecc094c77b4efe00540da2082a81861a2544da3fb401ac43c05fae25bcbff318dc11740d4bf1be160306962f SHA512 64182fd82057325e3e5a1537649369d753ed927456e373c1121d8ecda6e5eb005932b658ffb3fb282a1c3a3d3fe20f6fd08dce2642519b9836759deda8c98207
 EBUILD selinux-pulseaudio-2.20210203-r1.ebuild 285 BLAKE2B 2a9db424f46658994c2dbc662d5eb6e8aec3ff85ecc094c77b4efe00540da2082a81861a2544da3fb401ac43c05fae25bcbff318dc11740d4bf1be160306962f SHA512 64182fd82057325e3e5a1537649369d753ed927456e373c1121d8ecda6e5eb005932b658ffb3fb282a1c3a3d3fe20f6fd08dce2642519b9836759deda8c98207
 EBUILD selinux-pulseaudio-2.20210908-r1.ebuild 285 BLAKE2B 2a9db424f46658994c2dbc662d5eb6e8aec3ff85ecc094c77b4efe00540da2082a81861a2544da3fb401ac43c05fae25bcbff318dc11740d4bf1be160306962f SHA512 64182fd82057325e3e5a1537649369d753ed927456e373c1121d8ecda6e5eb005932b658ffb3fb282a1c3a3d3fe20f6fd08dce2642519b9836759deda8c98207
-EBUILD selinux-pulseaudio-2.20220106-r1.ebuild 289 BLAKE2B 0695eae009ebe5381cbe40fadbc3aa263c80aaffbafb76f9f425444a580f7d7d05d9c7721793c676fd4db3397ff5343a4ef6d10de7d66bcf87241793eef1425e SHA512 ccc9fb53286dafff07273fa834d894b7312b8976e300228f71386217d246a800e9078c20d6c7bdec5bb8821de636ae054297dbf3f8699b55dc297c6118142965
+EBUILD selinux-pulseaudio-2.20220106-r1.ebuild 287 BLAKE2B fd1828e5c9a0fdd853f2ac2ff917b5a63ac67ec250565180563dc30d478fb0935da25c7052a9d13ad99406b49b75105ce0901cb4e3feb9cdcb6019396885f8e6 SHA512 c62caaa78a0790c134ffd58745f624cefef993e47c1da39a28f7cf8033ae6cc25c57a79ce37a5248899046cf3ea9d241bc8670875cdc0aebca1cef5253d00b50
+EBUILD selinux-pulseaudio-2.20220106-r2.ebuild 289 BLAKE2B 0695eae009ebe5381cbe40fadbc3aa263c80aaffbafb76f9f425444a580f7d7d05d9c7721793c676fd4db3397ff5343a4ef6d10de7d66bcf87241793eef1425e SHA512 ccc9fb53286dafff07273fa834d894b7312b8976e300228f71386217d246a800e9078c20d6c7bdec5bb8821de636ae054297dbf3f8699b55dc297c6118142965
 EBUILD selinux-pulseaudio-9999.ebuild 289 BLAKE2B 1b9c97fe6f1a9560b312d934a965f24afc87fc9b5d9c61bf46b4652653542eca42c3ea9283b9e8dd068879235da2ce6eaa2fc592e0cc5379fa2e8da4069844dc SHA512 cfd0805bc89dff7a5cf4b3fa54df6f0bbaa239903b09ca69e7e2f83ff1e5bcd21f714d80f5fa2c8414bc41fd54a486f7f97cfd68699598395605336339a68df3
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20220106-r1.ebuild b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20220106-r1.ebuild
index 7fe2164cc88b..4cd538273a09 100644
--- a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for pulseaudio"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20220106-r2.ebuild b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..7fe2164cc88b
--- /dev/null
+++ b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="pulseaudio"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for pulseaudio"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-puppet/Manifest b/sec-policy/selinux-puppet/Manifest
index 59f0dfba93a4..4199330ff360 100644
--- a/sec-policy/selinux-puppet/Manifest
+++ b/sec-policy/selinux-puppet/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-puppet-2.20200818-r2.ebuild 277 BLAKE2B a1e76313dbeaf9f7d4b366650b890c40cfe1f7cf965c9b8eebc35f6214a1f247eea2641e1867e2e587db849b2136c6f3d8cb75c1d803f7eb8d17f771b022054b SHA512 ade0d6b642c143a8ff452e7095bccc06fc3e09632f457e173902d4303ce80a0980d8cecd8d1f752c0650e95e3d61aef9ed58990222c725e9692af52869decb1c
 EBUILD selinux-puppet-2.20210203-r1.ebuild 277 BLAKE2B a1e76313dbeaf9f7d4b366650b890c40cfe1f7cf965c9b8eebc35f6214a1f247eea2641e1867e2e587db849b2136c6f3d8cb75c1d803f7eb8d17f771b022054b SHA512 ade0d6b642c143a8ff452e7095bccc06fc3e09632f457e173902d4303ce80a0980d8cecd8d1f752c0650e95e3d61aef9ed58990222c725e9692af52869decb1c
 EBUILD selinux-puppet-2.20210908-r1.ebuild 277 BLAKE2B a1e76313dbeaf9f7d4b366650b890c40cfe1f7cf965c9b8eebc35f6214a1f247eea2641e1867e2e587db849b2136c6f3d8cb75c1d803f7eb8d17f771b022054b SHA512 ade0d6b642c143a8ff452e7095bccc06fc3e09632f457e173902d4303ce80a0980d8cecd8d1f752c0650e95e3d61aef9ed58990222c725e9692af52869decb1c
-EBUILD selinux-puppet-2.20220106-r1.ebuild 281 BLAKE2B b4484c8d6eb4305bc6290c1c9684ad52fa305ef34215f7c2f6635bbe8369a7b36107cdc2657faf1e9260c9082f7c16aea9546829b57ffb0f559ea267489e4295 SHA512 dc0912efef032bc098f3676e90e819ed3bec575f8a1fa44abd4a1dd8762f9e270106f60c070342bcda14f165615dd40506685ece0146a9ffb29f384ae887ebf2
+EBUILD selinux-puppet-2.20220106-r1.ebuild 279 BLAKE2B afc3e269f49e4515476bf334b61f7a285c9b8be35d8eefb5f12dae39d757721b683366c12852521905363b79d90e546599a78a980ded70729d8c619de05186f7 SHA512 db55b426f0cd47a70b27a2862e620ac6fe4f5924f8c2f54a3d61ef7218fda46cb8839696159448ab4e586deb6abafaf26762bdcc539645b95dc28072e3d4f268
+EBUILD selinux-puppet-2.20220106-r2.ebuild 281 BLAKE2B b4484c8d6eb4305bc6290c1c9684ad52fa305ef34215f7c2f6635bbe8369a7b36107cdc2657faf1e9260c9082f7c16aea9546829b57ffb0f559ea267489e4295 SHA512 dc0912efef032bc098f3676e90e819ed3bec575f8a1fa44abd4a1dd8762f9e270106f60c070342bcda14f165615dd40506685ece0146a9ffb29f384ae887ebf2
 EBUILD selinux-puppet-9999.ebuild 281 BLAKE2B 5e077eda4bedc225da9a39e00dcaaea17c1938cec71953406ea55c9b43fef0e06434e5a3cbd9defb3b601e3ecdf9d5bb545c71db530e3c6c3c73f0dfd33c62ef SHA512 4175c45f68c734b86ae6687cc84f158aeb0f6fa428789e9db0aa597cf6a455c4cf918881fd1784f6dedf80f7fa1856ad9b4ea6366367e6e2a010c5ed8a8b0bf0
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-puppet/selinux-puppet-2.20220106-r1.ebuild b/sec-policy/selinux-puppet/selinux-puppet-2.20220106-r1.ebuild
index efc25df6ffcf..036d071196f8 100644
--- a/sec-policy/selinux-puppet/selinux-puppet-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-puppet/selinux-puppet-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for puppet"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-puppet/selinux-puppet-2.20220106-r2.ebuild b/sec-policy/selinux-puppet/selinux-puppet-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..efc25df6ffcf
--- /dev/null
+++ b/sec-policy/selinux-puppet/selinux-puppet-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="puppet"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for puppet"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-pyzor/Manifest b/sec-policy/selinux-pyzor/Manifest
index 46e6b704b78a..e1cc2621b225 100644
--- a/sec-policy/selinux-pyzor/Manifest
+++ b/sec-policy/selinux-pyzor/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-pyzor-2.20200818-r2.ebuild 275 BLAKE2B 5ce21700e720e17b54021ba446ecece249d0ff9c2618855cb05a90fcb9e7a9095db30a849e5ba69387e7fc341d383d955b6c4ff9a93fdb39e20f2afb6d341cf2 SHA512 9672c4a3f73ff4e254e559e6587d754ac3c1a09bb04ae78432dbe73f45b7c27f0e3694b63463548e03d5ee6d812ff49a57a8f8aa82f12e95ca3fa25f036b758d
 EBUILD selinux-pyzor-2.20210203-r1.ebuild 275 BLAKE2B 5ce21700e720e17b54021ba446ecece249d0ff9c2618855cb05a90fcb9e7a9095db30a849e5ba69387e7fc341d383d955b6c4ff9a93fdb39e20f2afb6d341cf2 SHA512 9672c4a3f73ff4e254e559e6587d754ac3c1a09bb04ae78432dbe73f45b7c27f0e3694b63463548e03d5ee6d812ff49a57a8f8aa82f12e95ca3fa25f036b758d
 EBUILD selinux-pyzor-2.20210908-r1.ebuild 275 BLAKE2B 5ce21700e720e17b54021ba446ecece249d0ff9c2618855cb05a90fcb9e7a9095db30a849e5ba69387e7fc341d383d955b6c4ff9a93fdb39e20f2afb6d341cf2 SHA512 9672c4a3f73ff4e254e559e6587d754ac3c1a09bb04ae78432dbe73f45b7c27f0e3694b63463548e03d5ee6d812ff49a57a8f8aa82f12e95ca3fa25f036b758d
-EBUILD selinux-pyzor-2.20220106-r1.ebuild 279 BLAKE2B 4773563af2cf13760502ec3eeb0f11b7d57a7d2b481ae1a5c38414ee6fec16533353c4f89c4b9a67833c4d4bd1aa5eef25968ecaca7ff9f6a903ec00b11f95bc SHA512 0c27c27d5d87f8f1e92109b5decb3d3ead8850de483cd9c51720d55b48d8e12c5d66b9af970f9561bdd6ee030f053eef5d765848978519bab6fe0f11e6aa73f6
+EBUILD selinux-pyzor-2.20220106-r1.ebuild 277 BLAKE2B 990859978d5e310eeebf7bfd54aa572d65669396bd0d4371e157b67a7403ddcf318e51f394fb430ffda295e02e4903c0270d9b5ba0058067d7f05f438264eb57 SHA512 eedd84a7e30c393230169b8b4ccddd6852cfa1b3e4968b52a9ca6dee79ff7eaf3ee9cabc6c763490bed76777ef9d71a743439240819c2e5bdaf32fc02949ace8
+EBUILD selinux-pyzor-2.20220106-r2.ebuild 279 BLAKE2B 4773563af2cf13760502ec3eeb0f11b7d57a7d2b481ae1a5c38414ee6fec16533353c4f89c4b9a67833c4d4bd1aa5eef25968ecaca7ff9f6a903ec00b11f95bc SHA512 0c27c27d5d87f8f1e92109b5decb3d3ead8850de483cd9c51720d55b48d8e12c5d66b9af970f9561bdd6ee030f053eef5d765848978519bab6fe0f11e6aa73f6
 EBUILD selinux-pyzor-9999.ebuild 279 BLAKE2B e42e08537d6e0c53c2c123b9069f78e1eb1ea05056370b3f78fea619c4ea1d118fb8cfcf900623d215455e012370fb8bfed0d54c53287f98ab7639f9bf676956 SHA512 47cbc926357667083c233dea617f9a80083ef724ef39210d57d6a78b4222d40e383580df3b8788c24d34c5dd15c6ce4d9d8d9592e766a3713ca0f9f9e5c50a5e
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-pyzor/selinux-pyzor-2.20220106-r1.ebuild b/sec-policy/selinux-pyzor/selinux-pyzor-2.20220106-r1.ebuild
index 7ed3ea7e10c7..1e6cbbf9a379 100644
--- a/sec-policy/selinux-pyzor/selinux-pyzor-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-pyzor/selinux-pyzor-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for pyzor"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-pyzor/selinux-pyzor-2.20220106-r2.ebuild b/sec-policy/selinux-pyzor/selinux-pyzor-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..7ed3ea7e10c7
--- /dev/null
+++ b/sec-policy/selinux-pyzor/selinux-pyzor-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="pyzor"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for pyzor"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-qemu/Manifest b/sec-policy/selinux-qemu/Manifest
index 87a571571101..64a543606187 100644
--- a/sec-policy/selinux-qemu/Manifest
+++ b/sec-policy/selinux-qemu/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-qemu-2.20200818-r2.ebuild 365 BLAKE2B 2457f1993c4406907d150cd80f338314d68ce4f1ea6bc44a358ea9ab49760e50c6de0f401ebafa84e0ba575d2a6ac407855c5557d7bcc35a23f32981ce36da48 SHA512 932193555f6b0c218514e1cedd05cd1df65794eb17feb0962aa1e5214c083426f1d7d8b3b967ab3cd8d5c667d002ec0ad400451b7565eedd52c754a21ccd9512
 EBUILD selinux-qemu-2.20210203-r1.ebuild 365 BLAKE2B 2457f1993c4406907d150cd80f338314d68ce4f1ea6bc44a358ea9ab49760e50c6de0f401ebafa84e0ba575d2a6ac407855c5557d7bcc35a23f32981ce36da48 SHA512 932193555f6b0c218514e1cedd05cd1df65794eb17feb0962aa1e5214c083426f1d7d8b3b967ab3cd8d5c667d002ec0ad400451b7565eedd52c754a21ccd9512
 EBUILD selinux-qemu-2.20210908-r1.ebuild 365 BLAKE2B 2457f1993c4406907d150cd80f338314d68ce4f1ea6bc44a358ea9ab49760e50c6de0f401ebafa84e0ba575d2a6ac407855c5557d7bcc35a23f32981ce36da48 SHA512 932193555f6b0c218514e1cedd05cd1df65794eb17feb0962aa1e5214c083426f1d7d8b3b967ab3cd8d5c667d002ec0ad400451b7565eedd52c754a21ccd9512
-EBUILD selinux-qemu-2.20220106-r1.ebuild 369 BLAKE2B ec74351150597bf47e1c798c86299cd9db72a7cf1ae635ed901ab8b927f716923db669b2f120ec4dfdc3eaad9f0a3743254294e1b143bb45758d591826675722 SHA512 09f2b6b8f804abc1f26ec246ccac0936549ab551d229331a3efd261113c1255bf6324099f7d408a0edd0ceccf4f630bc5efbbcf98eb160a937a9ccff8fef2a09
+EBUILD selinux-qemu-2.20220106-r1.ebuild 367 BLAKE2B ebed660d1d4363f500a0f2f6de58c082bed32f5db65198bfd46e32bbbff59c3ac2131a0f7e2bc9317cdacb3f48e05c1780b2fc13512c8a04c7e661a2ac847c86 SHA512 48c638f5554d90c4582767bc44edfd6ef7deb025ad59d571922e442e5de95b4223cf9cb27a2e804dd031b2d62348a7d568d9be61f7c4adf136d61020c99942ae
+EBUILD selinux-qemu-2.20220106-r2.ebuild 369 BLAKE2B ec74351150597bf47e1c798c86299cd9db72a7cf1ae635ed901ab8b927f716923db669b2f120ec4dfdc3eaad9f0a3743254294e1b143bb45758d591826675722 SHA512 09f2b6b8f804abc1f26ec246ccac0936549ab551d229331a3efd261113c1255bf6324099f7d408a0edd0ceccf4f630bc5efbbcf98eb160a937a9ccff8fef2a09
 EBUILD selinux-qemu-9999.ebuild 369 BLAKE2B e1288d6796ef307e1c23b579f6760c5c9213dc781b6bc43d769858a606e71daeb8be63528e91e848942449a873e3b41d86f0cb28caaab128485d5aac95176934 SHA512 1d3b3eef26b15ee4b0b000d8b03bab9046bd441f666d1c9ae7a81218ff2e90bf178857d805bb59a137552ac46cc1817c58e80b1dd7d1899a7052be7f1e63c83c
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-qemu/selinux-qemu-2.20220106-r1.ebuild b/sec-policy/selinux-qemu/selinux-qemu-2.20220106-r1.ebuild
index 5f5594656c5b..cd7ad05614bc 100644
--- a/sec-policy/selinux-qemu/selinux-qemu-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-qemu/selinux-qemu-2.20220106-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for qemu"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-virt
diff --git a/sec-policy/selinux-qemu/selinux-qemu-2.20220106-r2.ebuild b/sec-policy/selinux-qemu/selinux-qemu-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..5f5594656c5b
--- /dev/null
+++ b/sec-policy/selinux-qemu/selinux-qemu-2.20220106-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="qemu"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for qemu"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-virt
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-virt
+"
diff --git a/sec-policy/selinux-qmail/Manifest b/sec-policy/selinux-qmail/Manifest
index fa2078b40eca..57fcee18b73a 100644
--- a/sec-policy/selinux-qmail/Manifest
+++ b/sec-policy/selinux-qmail/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-qmail-2.20200818-r2.ebuild 275 BLAKE2B 477fb65bd132a2d9d8978d21a8a4f2878c180147c525b1f7c8dcf65b9fcf184924234b783770708867c8b44031dee48b25d8867e5e254864d970d6c528dd5b15 SHA512 928acadd3b5bb8997c0b2a6c25c1520494f87258d5518d323541990b42dcc886c8a8b7ecbeecbd40dc506bd9dbb74fe693ffd0fb52b57e7e21358cbb552cb198
 EBUILD selinux-qmail-2.20210203-r1.ebuild 275 BLAKE2B 477fb65bd132a2d9d8978d21a8a4f2878c180147c525b1f7c8dcf65b9fcf184924234b783770708867c8b44031dee48b25d8867e5e254864d970d6c528dd5b15 SHA512 928acadd3b5bb8997c0b2a6c25c1520494f87258d5518d323541990b42dcc886c8a8b7ecbeecbd40dc506bd9dbb74fe693ffd0fb52b57e7e21358cbb552cb198
 EBUILD selinux-qmail-2.20210908-r1.ebuild 275 BLAKE2B 477fb65bd132a2d9d8978d21a8a4f2878c180147c525b1f7c8dcf65b9fcf184924234b783770708867c8b44031dee48b25d8867e5e254864d970d6c528dd5b15 SHA512 928acadd3b5bb8997c0b2a6c25c1520494f87258d5518d323541990b42dcc886c8a8b7ecbeecbd40dc506bd9dbb74fe693ffd0fb52b57e7e21358cbb552cb198
-EBUILD selinux-qmail-2.20220106-r1.ebuild 279 BLAKE2B 18b91c83d00a6cb834e3661fbc624bdb913e97378d6b334b00809eecada22fb9122d75e0171132d186adf2308d3c49b77ef9b186b7b434495d5c0ee95b3f5659 SHA512 f76c33f65a9bbc4920687eb2d996ccacdd93ff6da6c47039fa33f309a19db96f9806b347610e114f05f655e358d2bb323540c48e76dde023686c9681fa5d96b5
+EBUILD selinux-qmail-2.20220106-r1.ebuild 277 BLAKE2B 20ba34a60a66fc355d6e92260abaa99db28ad48b5767d7f92ac92e70c6bc0c20e2fce0956767f9f35133e62afcbd05f9f136a13087a9e28ba9e2fba93bfe8413 SHA512 660a304a1a0d260546f06f628430b3bbde7bd8b9f2f3deb22043408a66d4412640e08a0bd3b37aa8ae14e20807be8e29e37fca52789a3e1ea27bfa1761f98c88
+EBUILD selinux-qmail-2.20220106-r2.ebuild 279 BLAKE2B 18b91c83d00a6cb834e3661fbc624bdb913e97378d6b334b00809eecada22fb9122d75e0171132d186adf2308d3c49b77ef9b186b7b434495d5c0ee95b3f5659 SHA512 f76c33f65a9bbc4920687eb2d996ccacdd93ff6da6c47039fa33f309a19db96f9806b347610e114f05f655e358d2bb323540c48e76dde023686c9681fa5d96b5
 EBUILD selinux-qmail-9999.ebuild 279 BLAKE2B dffe77ac4606004882b13f6b55b21a84508b2d25b9a78742ceae064bbf0bdf1f488fae4c67255139e5d74db5050b431e0c7c40243182c560dc46662b74adbea1 SHA512 764773541f902b6d99888fc6e588df05fd4c4d8c0ec444540cdc3d95cc53ee8ef50ee585d0c54b489553f1c3ed9c3dba684a3bd9f28c6654854f5506a63fb415
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-qmail/selinux-qmail-2.20220106-r1.ebuild b/sec-policy/selinux-qmail/selinux-qmail-2.20220106-r1.ebuild
index 4ac214b844b7..9adc0d3f766e 100644
--- a/sec-policy/selinux-qmail/selinux-qmail-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-qmail/selinux-qmail-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for qmail"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-qmail/selinux-qmail-2.20220106-r2.ebuild b/sec-policy/selinux-qmail/selinux-qmail-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..4ac214b844b7
--- /dev/null
+++ b/sec-policy/selinux-qmail/selinux-qmail-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="qmail"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for qmail"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-quota/Manifest b/sec-policy/selinux-quota/Manifest
index bcee88da1b12..b29e63ed925d 100644
--- a/sec-policy/selinux-quota/Manifest
+++ b/sec-policy/selinux-quota/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-quota-2.20200818-r2.ebuild 275 BLAKE2B dde74686871df9053880ecd0a49bcc70bc8ad5080491841b9b94b2be782a5a722010837aa96795da389c124d2c9ccda8969a1e2bd0f00101cbfe9d6d3216b356 SHA512 61fdc1a4eb22085a6ed30870da70eca8622f2967140907b34fdd4c31d97b807712cac3172fb966b20c8a6096969ae9f621c8bf68e696d3ae350ac146b74e80a2
 EBUILD selinux-quota-2.20210203-r1.ebuild 275 BLAKE2B dde74686871df9053880ecd0a49bcc70bc8ad5080491841b9b94b2be782a5a722010837aa96795da389c124d2c9ccda8969a1e2bd0f00101cbfe9d6d3216b356 SHA512 61fdc1a4eb22085a6ed30870da70eca8622f2967140907b34fdd4c31d97b807712cac3172fb966b20c8a6096969ae9f621c8bf68e696d3ae350ac146b74e80a2
 EBUILD selinux-quota-2.20210908-r1.ebuild 275 BLAKE2B dde74686871df9053880ecd0a49bcc70bc8ad5080491841b9b94b2be782a5a722010837aa96795da389c124d2c9ccda8969a1e2bd0f00101cbfe9d6d3216b356 SHA512 61fdc1a4eb22085a6ed30870da70eca8622f2967140907b34fdd4c31d97b807712cac3172fb966b20c8a6096969ae9f621c8bf68e696d3ae350ac146b74e80a2
-EBUILD selinux-quota-2.20220106-r1.ebuild 279 BLAKE2B 16befc3e1eb2d9fa3debad47b911147090760f7a4f3c14b188ac3b52ff2888dd5db3fbd448ea23c8ca3b9d2be0f592209a80250a843c54d54f464684db392022 SHA512 7167b74df54e2b18b7bfa4e5620a358213642df794b49fca324019d2b935e806af56248c0ac9f691b759ab4d52d71706dbf9b9a596ff7a7882722ce0240620b2
+EBUILD selinux-quota-2.20220106-r1.ebuild 277 BLAKE2B f3922738e8d88d65c51bff1f7b2b2ed90c29a2629dfde294d83ee778351d77596fa8b24b9fdd7b9361f2a7bad9f16184c86445f05d70bfcb82c3424c598d573b SHA512 3eb38a9ab9d5dad1e8ece8461d4bbbee99b26984d53ed0b35152f4b8f7efa9f0994d0aa37add246ac3d1f10f47494961d76d996e0bb2af52cea28f2cec9d7daa
+EBUILD selinux-quota-2.20220106-r2.ebuild 279 BLAKE2B 16befc3e1eb2d9fa3debad47b911147090760f7a4f3c14b188ac3b52ff2888dd5db3fbd448ea23c8ca3b9d2be0f592209a80250a843c54d54f464684db392022 SHA512 7167b74df54e2b18b7bfa4e5620a358213642df794b49fca324019d2b935e806af56248c0ac9f691b759ab4d52d71706dbf9b9a596ff7a7882722ce0240620b2
 EBUILD selinux-quota-9999.ebuild 279 BLAKE2B f0a9157b3eeb0bd2060594426c32949c680b962d5b0336263b99d932b3e512929e15afdcecf19a9b97e2730a548c4fb5953bbd19bd255b099db636f614e75cea SHA512 2b90a8b86844e02ae93d2a9489adfa2809691c157994555352772fbd9b31ff3d14a6f1904555fb89111d2986ce118decc26d33aebbf059ae84b3f9b354c8c10b
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-quota/selinux-quota-2.20220106-r1.ebuild b/sec-policy/selinux-quota/selinux-quota-2.20220106-r1.ebuild
index b0beca82bd27..70c9ecf742d2 100644
--- a/sec-policy/selinux-quota/selinux-quota-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-quota/selinux-quota-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for quota"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-quota/selinux-quota-2.20220106-r2.ebuild b/sec-policy/selinux-quota/selinux-quota-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..b0beca82bd27
--- /dev/null
+++ b/sec-policy/selinux-quota/selinux-quota-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="quota"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for quota"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-radius/Manifest b/sec-policy/selinux-radius/Manifest
index 3c0b4dbdd67f..193b8b1bdcb1 100644
--- a/sec-policy/selinux-radius/Manifest
+++ b/sec-policy/selinux-radius/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-radius-2.20200818-r2.ebuild 277 BLAKE2B dac4736593e39a9341342709ff949e29e4696bd5a24e6ea30e35b4053282282c59e0b3425e3df6bf8a50321e20db92f4655cc9feaf7881b127ebb94977d52302 SHA512 658418ffc99285423176f2e1b597f302d81288291ff7d6f9f1a9f569dc48c13241cc22e28d82677b879161afb501e602b97a1a3b73dee19c7967d35b30f105a9
 EBUILD selinux-radius-2.20210203-r1.ebuild 277 BLAKE2B dac4736593e39a9341342709ff949e29e4696bd5a24e6ea30e35b4053282282c59e0b3425e3df6bf8a50321e20db92f4655cc9feaf7881b127ebb94977d52302 SHA512 658418ffc99285423176f2e1b597f302d81288291ff7d6f9f1a9f569dc48c13241cc22e28d82677b879161afb501e602b97a1a3b73dee19c7967d35b30f105a9
 EBUILD selinux-radius-2.20210908-r1.ebuild 277 BLAKE2B dac4736593e39a9341342709ff949e29e4696bd5a24e6ea30e35b4053282282c59e0b3425e3df6bf8a50321e20db92f4655cc9feaf7881b127ebb94977d52302 SHA512 658418ffc99285423176f2e1b597f302d81288291ff7d6f9f1a9f569dc48c13241cc22e28d82677b879161afb501e602b97a1a3b73dee19c7967d35b30f105a9
-EBUILD selinux-radius-2.20220106-r1.ebuild 281 BLAKE2B bbee9a0da237a53ed92a8a98c1c240564b5a528170cc5b7adeb3c0895f3db11af26faf24ea54d2ae6e4cbfff1dc2f4a81965d2dec68e2ae2ac0f85351ed39904 SHA512 dba784ba69a880f5b41e6ba5970f38478fc77e50c38356e29a22e325c11247a74ccc1b3f85271c61bce5419ad45099ae0f9a215b42b9049a8c32592f41942a03
+EBUILD selinux-radius-2.20220106-r1.ebuild 279 BLAKE2B 337c1f76d89d1e7508f50bf3705b695a40651ab5b0c42fe4a408c05d04cd30db264f418b13c3b7d38d6a3231ce780073996f16e529b3319fc1cf52b48a84a57c SHA512 5a7504742e250f3fb7b29b437cd2a36a188b8c1ec284c2279f5a46f3e5a1999fae2e8038e30d0be404cf1ab043e0880c4ebafed28707e3dd199310a8c3c9d100
+EBUILD selinux-radius-2.20220106-r2.ebuild 281 BLAKE2B bbee9a0da237a53ed92a8a98c1c240564b5a528170cc5b7adeb3c0895f3db11af26faf24ea54d2ae6e4cbfff1dc2f4a81965d2dec68e2ae2ac0f85351ed39904 SHA512 dba784ba69a880f5b41e6ba5970f38478fc77e50c38356e29a22e325c11247a74ccc1b3f85271c61bce5419ad45099ae0f9a215b42b9049a8c32592f41942a03
 EBUILD selinux-radius-9999.ebuild 281 BLAKE2B c0004b15626b484c0591bd2ff2e6c57fefa07828976c45e5947b702258f76b02cb4cd8dfc6d666983ed05f673cd71397fbfe1716ca7b77f4da7de9d194dbf548 SHA512 db9eac01765e2ce7c6b33313e41c3599350bf26aca0bdbe25016f3f2c0c96eb19bdc1c257d9d613960953d9635ae84bc26388d8518ab7b40b9643098966e68c4
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-radius/selinux-radius-2.20220106-r1.ebuild b/sec-policy/selinux-radius/selinux-radius-2.20220106-r1.ebuild
index 883b5f1cb9cb..5978db4657d8 100644
--- a/sec-policy/selinux-radius/selinux-radius-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-radius/selinux-radius-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for radius"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-radius/selinux-radius-2.20220106-r2.ebuild b/sec-policy/selinux-radius/selinux-radius-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..883b5f1cb9cb
--- /dev/null
+++ b/sec-policy/selinux-radius/selinux-radius-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="radius"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for radius"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-radvd/Manifest b/sec-policy/selinux-radvd/Manifest
index 73c2f9298944..d7ad554ba0b9 100644
--- a/sec-policy/selinux-radvd/Manifest
+++ b/sec-policy/selinux-radvd/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-radvd-2.20200818-r2.ebuild 275 BLAKE2B f85bb6e00e360288bf9c7a60837d0dca728eaa238e92e89a44e47b126a28094c3a84d6d7b227c1c727a790560e0ba42abb9783ed797757b73cb12267d6d8fb1e SHA512 38dd0779eac93d62c6a1c8c6d04b0d4146fd106f10b67c9d4afdd279b273df2cc0836069903f1c65616bf83a56a216bc56fc9e5f06fddff6eacf2b57f9e793f5
 EBUILD selinux-radvd-2.20210203-r1.ebuild 275 BLAKE2B f85bb6e00e360288bf9c7a60837d0dca728eaa238e92e89a44e47b126a28094c3a84d6d7b227c1c727a790560e0ba42abb9783ed797757b73cb12267d6d8fb1e SHA512 38dd0779eac93d62c6a1c8c6d04b0d4146fd106f10b67c9d4afdd279b273df2cc0836069903f1c65616bf83a56a216bc56fc9e5f06fddff6eacf2b57f9e793f5
 EBUILD selinux-radvd-2.20210908-r1.ebuild 275 BLAKE2B f85bb6e00e360288bf9c7a60837d0dca728eaa238e92e89a44e47b126a28094c3a84d6d7b227c1c727a790560e0ba42abb9783ed797757b73cb12267d6d8fb1e SHA512 38dd0779eac93d62c6a1c8c6d04b0d4146fd106f10b67c9d4afdd279b273df2cc0836069903f1c65616bf83a56a216bc56fc9e5f06fddff6eacf2b57f9e793f5
-EBUILD selinux-radvd-2.20220106-r1.ebuild 279 BLAKE2B 8d9497d3515bd1ba1920f29e290f6abf07bfd58051a5fd0ab01936104523ed6f7d4d360812b23783017cb9f2faa76389155632b598d832867268919d96497dc2 SHA512 58c61891f2b98f1c8ae659ceafcce60134cd5aebdeda33074cb352edd5b5e29bbf25d730172f79183d09c7031b9289e4a813d28d6af50b4b4f0475d8d04573f0
+EBUILD selinux-radvd-2.20220106-r1.ebuild 277 BLAKE2B ca4c2497cdab41109560e04d594c7b665485c0f9f2ce845c88990ff9a3835ef76dbf98e353aa0b8d120e0fbd629712311a01ac28da48649a4e4162974c53de40 SHA512 5b4ccbab02214fc41ccfbda5a9a94f44bf035bef18ab994e01199fcb25253fd384859600ba667fbdd008a77173d7de86cf7ddc963ab08272c8f4e05d484886e5
+EBUILD selinux-radvd-2.20220106-r2.ebuild 279 BLAKE2B 8d9497d3515bd1ba1920f29e290f6abf07bfd58051a5fd0ab01936104523ed6f7d4d360812b23783017cb9f2faa76389155632b598d832867268919d96497dc2 SHA512 58c61891f2b98f1c8ae659ceafcce60134cd5aebdeda33074cb352edd5b5e29bbf25d730172f79183d09c7031b9289e4a813d28d6af50b4b4f0475d8d04573f0
 EBUILD selinux-radvd-9999.ebuild 279 BLAKE2B b5353d8fd2461438a4ad5c524fba181179c35b6762697c2bdea84b61dd5a96956127f534d9cbfc84495a7572000c59234e7d2cfe74d1140ddac9859b7aac8e73 SHA512 e5fc007b697d89e5487bb5b95aaa4148652ec43140fbb8bc0cc497af19acffcd51eb10582679441427d3a62e5cc118d85660a56d4972ba028325afe6db060a52
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-radvd/selinux-radvd-2.20220106-r1.ebuild b/sec-policy/selinux-radvd/selinux-radvd-2.20220106-r1.ebuild
index 594eb76d08ff..17874bfec2f6 100644
--- a/sec-policy/selinux-radvd/selinux-radvd-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-radvd/selinux-radvd-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for radvd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-radvd/selinux-radvd-2.20220106-r2.ebuild b/sec-policy/selinux-radvd/selinux-radvd-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..594eb76d08ff
--- /dev/null
+++ b/sec-policy/selinux-radvd/selinux-radvd-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="radvd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for radvd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-razor/Manifest b/sec-policy/selinux-razor/Manifest
index 620f558631bc..e69e82283860 100644
--- a/sec-policy/selinux-razor/Manifest
+++ b/sec-policy/selinux-razor/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-razor-2.20200818-r2.ebuild 275 BLAKE2B ce02694bd4473024134f1cf6effea6ba7169963539ebacd37e3029a6713a9677375dde7c263944bb578aa682363f21a4b8974eb9c75e36df031c7f0cfc0a9fc2 SHA512 15269f065c5090608cfa7545eaebcc4d80e9877db6a8164e877520cf931fea773dff6c07adc03923b5a42934ca66728d5fefd9c49898bc4a22527aa0d3f7b5af
 EBUILD selinux-razor-2.20210203-r1.ebuild 275 BLAKE2B ce02694bd4473024134f1cf6effea6ba7169963539ebacd37e3029a6713a9677375dde7c263944bb578aa682363f21a4b8974eb9c75e36df031c7f0cfc0a9fc2 SHA512 15269f065c5090608cfa7545eaebcc4d80e9877db6a8164e877520cf931fea773dff6c07adc03923b5a42934ca66728d5fefd9c49898bc4a22527aa0d3f7b5af
 EBUILD selinux-razor-2.20210908-r1.ebuild 275 BLAKE2B ce02694bd4473024134f1cf6effea6ba7169963539ebacd37e3029a6713a9677375dde7c263944bb578aa682363f21a4b8974eb9c75e36df031c7f0cfc0a9fc2 SHA512 15269f065c5090608cfa7545eaebcc4d80e9877db6a8164e877520cf931fea773dff6c07adc03923b5a42934ca66728d5fefd9c49898bc4a22527aa0d3f7b5af
-EBUILD selinux-razor-2.20220106-r1.ebuild 279 BLAKE2B db5cec23b9f8f2fe4892926dba4009f8e6574082d7e24958380b0e37e0457fd3ec7ff4238944652f081d05eb46062bc434399565f4bad5dc9614b2f63a6ad4b6 SHA512 6c2302becf41f53aaef7391cbe3ef11b05f90b76d6653e51485618539c119e47a036c343bf0c268ad6c491d780c2d6b7a98e2ec020bbe9001b66abfe0c97fd3a
+EBUILD selinux-razor-2.20220106-r1.ebuild 277 BLAKE2B 067332df209bc66bdd5c63faea082204cbf5daf5bb1e317a12dda8e729dbff5a3204d7461fd1e03b7185352e6fa5efd881bc04b71d9c2af5c1e2f6729647686a SHA512 9df15c4df54a85c5c5dedfeca18279a6d2f209f0a781ce9878fe0e6f590cf5fa742511b3ce9134d09f8ce02a09f2779430b8f83826ebd86c17e1c0b08f669f12
+EBUILD selinux-razor-2.20220106-r2.ebuild 279 BLAKE2B db5cec23b9f8f2fe4892926dba4009f8e6574082d7e24958380b0e37e0457fd3ec7ff4238944652f081d05eb46062bc434399565f4bad5dc9614b2f63a6ad4b6 SHA512 6c2302becf41f53aaef7391cbe3ef11b05f90b76d6653e51485618539c119e47a036c343bf0c268ad6c491d780c2d6b7a98e2ec020bbe9001b66abfe0c97fd3a
 EBUILD selinux-razor-9999.ebuild 279 BLAKE2B 43a2a3d6aa7cffd23584e28570e889c93d506c03a398cf2c83f1749f13039276b03c98706e4afb916408bb99af48b988577a7917a7b69907b0f70c959596daa7 SHA512 c5bc4a89e845bd1e32dab1b4632c00b0250ef6a3c9ba56f4074d731eb893df01074a1b058c2070ae2d184c62270a566c1aa5e76b20e576a75b76be29bba20b35
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-razor/selinux-razor-2.20220106-r1.ebuild b/sec-policy/selinux-razor/selinux-razor-2.20220106-r1.ebuild
index e3cbc7c7550e..0e8d6d675622 100644
--- a/sec-policy/selinux-razor/selinux-razor-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-razor/selinux-razor-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for razor"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-razor/selinux-razor-2.20220106-r2.ebuild b/sec-policy/selinux-razor/selinux-razor-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..e3cbc7c7550e
--- /dev/null
+++ b/sec-policy/selinux-razor/selinux-razor-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="razor"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for razor"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-redis/Manifest b/sec-policy/selinux-redis/Manifest
index 3ac13bc36221..41a380421c5c 100644
--- a/sec-policy/selinux-redis/Manifest
+++ b/sec-policy/selinux-redis/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-redis-2.20200818-r2.ebuild 275 BLAKE2B 84bb3bed1eecab48d17a7bdf29752d737c6f5ac0e574108014e182174a74fa1a1d9ba4caab2ea87e9b8551875034edd367fbf79e9c36ca7b387f93e506e63ddf SHA512 587463fe1ca26eaf65f33cf8a0ece9dfb6c55600bd1978c037c97b1f19c0992bc8ae0d3bb552c7b4180fb9b8a83ca5b414b90f9094e53397f533d4517c750c8d
 EBUILD selinux-redis-2.20210203-r1.ebuild 275 BLAKE2B 84bb3bed1eecab48d17a7bdf29752d737c6f5ac0e574108014e182174a74fa1a1d9ba4caab2ea87e9b8551875034edd367fbf79e9c36ca7b387f93e506e63ddf SHA512 587463fe1ca26eaf65f33cf8a0ece9dfb6c55600bd1978c037c97b1f19c0992bc8ae0d3bb552c7b4180fb9b8a83ca5b414b90f9094e53397f533d4517c750c8d
 EBUILD selinux-redis-2.20210908-r1.ebuild 275 BLAKE2B 84bb3bed1eecab48d17a7bdf29752d737c6f5ac0e574108014e182174a74fa1a1d9ba4caab2ea87e9b8551875034edd367fbf79e9c36ca7b387f93e506e63ddf SHA512 587463fe1ca26eaf65f33cf8a0ece9dfb6c55600bd1978c037c97b1f19c0992bc8ae0d3bb552c7b4180fb9b8a83ca5b414b90f9094e53397f533d4517c750c8d
-EBUILD selinux-redis-2.20220106-r1.ebuild 279 BLAKE2B 4984eaf852c18d1fba878068bd0d69472f323c68e3048d3b9a9f28fda0c5bb8d852684a4f9dea4e56c8e40e1ff55f4229aa84785096e49b5027a1d8337493f02 SHA512 55842e70a0051b3ff89b3305b49fcc980680f92116511f9948d0ec59b991eb18765b8b32f04f5dbe2d6fcfbbca2172a41b5be03c3f5a3c36e9a73541921c3dec
+EBUILD selinux-redis-2.20220106-r1.ebuild 277 BLAKE2B 77bd906a37f43bd3bbcd9de2ba237f6f024918aa8c46fdeda02a3bde788a91dcb8bf40ebaa8a4434c5febbc8bd103ea70ac054300bcaca00aadde7cf4e5aaf0a SHA512 ee9b3c80cec031f84d93b44edcf47fae5e59a2586e3e0b72c7d8cb0c26f01ce91a9fc761f9fb2bf656bcb54b1517b8f88892aff7e1730e96f72a0042188c3e49
+EBUILD selinux-redis-2.20220106-r2.ebuild 279 BLAKE2B 4984eaf852c18d1fba878068bd0d69472f323c68e3048d3b9a9f28fda0c5bb8d852684a4f9dea4e56c8e40e1ff55f4229aa84785096e49b5027a1d8337493f02 SHA512 55842e70a0051b3ff89b3305b49fcc980680f92116511f9948d0ec59b991eb18765b8b32f04f5dbe2d6fcfbbca2172a41b5be03c3f5a3c36e9a73541921c3dec
 EBUILD selinux-redis-9999.ebuild 279 BLAKE2B 5b8341ec9432a4c9955497dfb1a8d8ee798c4aa8c82160b752193b7d36ec66c5a40195c1ce3f4db8c0d69f26d086196d0575a6a8ae1c9497f951dc5e9b40b570 SHA512 c744f68047a117553e2b08c79e1a15a7f0e2aa13fde912ecf3bb026646dc9517298c5ac68391358de97f897e57903d010a394f0d881c3ef783cc22e2b5eeb00d
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-redis/selinux-redis-2.20220106-r1.ebuild b/sec-policy/selinux-redis/selinux-redis-2.20220106-r1.ebuild
index 170cd464171c..34a0896ee35f 100644
--- a/sec-policy/selinux-redis/selinux-redis-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-redis/selinux-redis-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for redis"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-redis/selinux-redis-2.20220106-r2.ebuild b/sec-policy/selinux-redis/selinux-redis-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..170cd464171c
--- /dev/null
+++ b/sec-policy/selinux-redis/selinux-redis-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="redis"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for redis"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-remotelogin/Manifest b/sec-policy/selinux-remotelogin/Manifest
index 4cde6e5f85c1..7fdb90309fd9 100644
--- a/sec-policy/selinux-remotelogin/Manifest
+++ b/sec-policy/selinux-remotelogin/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-remotelogin-2.20200818-r2.ebuild 287 BLAKE2B e1044c42ad2d67b99e793a20af21631615ac92e04553c600a2929be88b730b9191d299c84e862b40ddfd64f7aeb02ad9762711a906ba6ed35218c7e5d861f62c SHA512 d848c31b8bb96edb87155b074e6410046556a925a16a97dd4c1d3f8ec33af43d9ed95171f56e911c1a5107624743c628a8b86e227686ccff046b3a1820a982c0
 EBUILD selinux-remotelogin-2.20210203-r1.ebuild 287 BLAKE2B e1044c42ad2d67b99e793a20af21631615ac92e04553c600a2929be88b730b9191d299c84e862b40ddfd64f7aeb02ad9762711a906ba6ed35218c7e5d861f62c SHA512 d848c31b8bb96edb87155b074e6410046556a925a16a97dd4c1d3f8ec33af43d9ed95171f56e911c1a5107624743c628a8b86e227686ccff046b3a1820a982c0
 EBUILD selinux-remotelogin-2.20210908-r1.ebuild 287 BLAKE2B e1044c42ad2d67b99e793a20af21631615ac92e04553c600a2929be88b730b9191d299c84e862b40ddfd64f7aeb02ad9762711a906ba6ed35218c7e5d861f62c SHA512 d848c31b8bb96edb87155b074e6410046556a925a16a97dd4c1d3f8ec33af43d9ed95171f56e911c1a5107624743c628a8b86e227686ccff046b3a1820a982c0
-EBUILD selinux-remotelogin-2.20220106-r1.ebuild 291 BLAKE2B c2c8ddf09cece0ecdb87da588b6a0c2ca3dbb7d10f5a5be0bd043ad402305acbd46795a8510ae2c1707d825060a60b094c069a3b9d23b7bffdda32c9ea003d39 SHA512 88f232fbf8c32bd5f25d58c1e8e2d0cfccb6a2157a5c3b92e14ee93ab899a1259ee01a63b3edd00f2f8b3caf8c177fb59891851932fb12cf537245209e92c7d0
+EBUILD selinux-remotelogin-2.20220106-r1.ebuild 289 BLAKE2B f1f3c6d446c0573a1e1c223f642a597e67a2e6f25b007941dc85f4808045a419d4e26d9d5fc1a44253e685eeda341deab8ccc0b2aa26a7a142138f8b43a5780d SHA512 3f109105b8f1dd68f89a932a181dc235513c60fd6d554a3afaf38234688583533f4c4760a9d7856423fd6713eb3a4e8ba978c06a892bf9136532303e8b185292
+EBUILD selinux-remotelogin-2.20220106-r2.ebuild 291 BLAKE2B c2c8ddf09cece0ecdb87da588b6a0c2ca3dbb7d10f5a5be0bd043ad402305acbd46795a8510ae2c1707d825060a60b094c069a3b9d23b7bffdda32c9ea003d39 SHA512 88f232fbf8c32bd5f25d58c1e8e2d0cfccb6a2157a5c3b92e14ee93ab899a1259ee01a63b3edd00f2f8b3caf8c177fb59891851932fb12cf537245209e92c7d0
 EBUILD selinux-remotelogin-9999.ebuild 291 BLAKE2B a3bb105f7979378673d47876a5aa444632c294d61cbca86e1dbe9328a37fc1f8151140d01372c74b1065a676d4ffaee7a8b74ebd00d843375c6c4dd871ccdab4 SHA512 6b63d830d86008bfee239e2e1a68f878c5facb73e6de6064fab007ce3340529037583e0ff1207848d9ff3159c8849f61235737063f9c054cc140c1d4916e834e
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20220106-r1.ebuild b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20220106-r1.ebuild
index 72901de8c94b..7b0bf4aa7bf0 100644
--- a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for remotelogin"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20220106-r2.ebuild b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..72901de8c94b
--- /dev/null
+++ b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="remotelogin"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for remotelogin"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-resolvconf/Manifest b/sec-policy/selinux-resolvconf/Manifest
index 6821283b23b5..36368baa7d75 100644
--- a/sec-policy/selinux-resolvconf/Manifest
+++ b/sec-policy/selinux-resolvconf/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-resolvconf-2.20200818-r2.ebuild 285 BLAKE2B f2f1630e94bbb298e5fa1b990d55adc709dd580c3081025858acc3f83e2f15680816afb20b1405d378d45b28748b93db445647c79a18cb121296a3dc83166255 SHA512 02d76a4bb15dfe089c935ae90c0e8dee1b6eefed125281e9b23a8f37187c3ac16a9548b4f1c9a83ba383345616240626544221d0f7a483f3726d221be616d490
 EBUILD selinux-resolvconf-2.20210203-r1.ebuild 285 BLAKE2B f2f1630e94bbb298e5fa1b990d55adc709dd580c3081025858acc3f83e2f15680816afb20b1405d378d45b28748b93db445647c79a18cb121296a3dc83166255 SHA512 02d76a4bb15dfe089c935ae90c0e8dee1b6eefed125281e9b23a8f37187c3ac16a9548b4f1c9a83ba383345616240626544221d0f7a483f3726d221be616d490
 EBUILD selinux-resolvconf-2.20210908-r1.ebuild 285 BLAKE2B f2f1630e94bbb298e5fa1b990d55adc709dd580c3081025858acc3f83e2f15680816afb20b1405d378d45b28748b93db445647c79a18cb121296a3dc83166255 SHA512 02d76a4bb15dfe089c935ae90c0e8dee1b6eefed125281e9b23a8f37187c3ac16a9548b4f1c9a83ba383345616240626544221d0f7a483f3726d221be616d490
-EBUILD selinux-resolvconf-2.20220106-r1.ebuild 289 BLAKE2B b7eb5cf4af4fd30dd6ce4a83da0b7402242b1e727365abe65f2c4cd8dd2d40c39c9ce27fc25bb8a842470b83742cb4456a90300b4f9aa395e57cdf0a3b4160d4 SHA512 83f831e4deb8f2d255be081453bd3ac437bbf923616a61d24147b7e84bd2ce152806c0b1588ecd7025dacdb1c160398ab0d7d50c232da63daa7968b0664ffddc
+EBUILD selinux-resolvconf-2.20220106-r1.ebuild 287 BLAKE2B b27c0ad8abff2987f04cebff48a9218471fdc8c3eb5b5a3606422b18e04777556c6cf6295d8a1a9cf23b3dc673c9c1e0218ccbf47a945e13340f5599a58da621 SHA512 45d3a0782c1d8e5d07366adaa38b96bb5e7a5cdcf521114ce8bfee021de2968999a73af5bb9650d1d6e018e453d3737e46f80d60086b4c8f8af6ebe4884c7ca0
+EBUILD selinux-resolvconf-2.20220106-r2.ebuild 289 BLAKE2B b7eb5cf4af4fd30dd6ce4a83da0b7402242b1e727365abe65f2c4cd8dd2d40c39c9ce27fc25bb8a842470b83742cb4456a90300b4f9aa395e57cdf0a3b4160d4 SHA512 83f831e4deb8f2d255be081453bd3ac437bbf923616a61d24147b7e84bd2ce152806c0b1588ecd7025dacdb1c160398ab0d7d50c232da63daa7968b0664ffddc
 EBUILD selinux-resolvconf-9999.ebuild 289 BLAKE2B 39b0cc0a64f82a81b6fea4403da0db928af39bd8642e3e7ec07ae450478ad7f1546a5e745b40a1c73ef92bd02cafa04ef2e7284b19b48095c19546d621a4e48c SHA512 6b8cebbf6c4b721bedff637892f744103ecac2fbfc6e77e96d54f39a23325e88a23b72f8829d671f06a8ea0a66c9a02327ab011579046efe4b84eb59d014890a
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20220106-r1.ebuild b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20220106-r1.ebuild
index 510b2a5e0b30..439cf8afa258 100644
--- a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for resolvconf"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20220106-r2.ebuild b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..510b2a5e0b30
--- /dev/null
+++ b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="resolvconf"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for resolvconf"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-rngd/Manifest b/sec-policy/selinux-rngd/Manifest
index a4afcb947b22..9d4c984de8ae 100644
--- a/sec-policy/selinux-rngd/Manifest
+++ b/sec-policy/selinux-rngd/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-rngd-2.20200818-r2.ebuild 273 BLAKE2B d5805ee252cf9a63654ee655f6749f352b45180972432aa66f1474c17cc9134da739d107250feafd64b351c2b1d9ffdb909a3be36d4a069063b9971cd4da8ca2 SHA512 b27a65e7d1fe0a2aaa8a3281eaede217eddc82d805cd2d194a05c8ee2637b0429ad60afcbcab682a11fc5f9209ebab822518e9a828345d062a45b5acd7649dba
 EBUILD selinux-rngd-2.20210203-r1.ebuild 273 BLAKE2B d5805ee252cf9a63654ee655f6749f352b45180972432aa66f1474c17cc9134da739d107250feafd64b351c2b1d9ffdb909a3be36d4a069063b9971cd4da8ca2 SHA512 b27a65e7d1fe0a2aaa8a3281eaede217eddc82d805cd2d194a05c8ee2637b0429ad60afcbcab682a11fc5f9209ebab822518e9a828345d062a45b5acd7649dba
 EBUILD selinux-rngd-2.20210908-r1.ebuild 273 BLAKE2B d5805ee252cf9a63654ee655f6749f352b45180972432aa66f1474c17cc9134da739d107250feafd64b351c2b1d9ffdb909a3be36d4a069063b9971cd4da8ca2 SHA512 b27a65e7d1fe0a2aaa8a3281eaede217eddc82d805cd2d194a05c8ee2637b0429ad60afcbcab682a11fc5f9209ebab822518e9a828345d062a45b5acd7649dba
-EBUILD selinux-rngd-2.20220106-r1.ebuild 277 BLAKE2B 73926d21d9a532a4651556113007dfea90967fd9fb676240cebc6705ef351425d35bab99c210cd933623983cd84f8943fb7252d93053f57dbd536496681ba58c SHA512 b4b279fd4f8de601b07c8ee4ff00b76d3ccfd8077d0f022dd6080f3e2c79bcf8b5d1eed5db822c416dedb1c2c77e1fa1c7cfb22abfc1d759a1d5a0e25b691c25
+EBUILD selinux-rngd-2.20220106-r1.ebuild 275 BLAKE2B 5c19a52a1c5a025a599c508f77ba2ba6cca63392d3899f073e7d457fc65a198d8f9e535fa25aebaa90e90c313492b17f044bbdc6ee1bf76c0cd987b3a39ca2c0 SHA512 bb3115198043693b2ea3e73e1db2f4e8cb620fac046ed3d338bbab3c903de04a0daeb1fd6867620af167a73fd82d1b6132546c2f1b000ad904ff6ee649b18396
+EBUILD selinux-rngd-2.20220106-r2.ebuild 277 BLAKE2B 73926d21d9a532a4651556113007dfea90967fd9fb676240cebc6705ef351425d35bab99c210cd933623983cd84f8943fb7252d93053f57dbd536496681ba58c SHA512 b4b279fd4f8de601b07c8ee4ff00b76d3ccfd8077d0f022dd6080f3e2c79bcf8b5d1eed5db822c416dedb1c2c77e1fa1c7cfb22abfc1d759a1d5a0e25b691c25
 EBUILD selinux-rngd-9999.ebuild 277 BLAKE2B 8e345d20e9d665b21960cda07c740a60ba3fc4d9f6c8d736faf7148d5299fcf0522d8e80fcfb3190fb9a60009218775e1717706d2c3d04e8b300651a4973a3e5 SHA512 c5c1854ee61aeb8b05e07d50650da80e2c3931b8e423a9af63e0c77ead66c4853ee3d5e22584ea200b32157c5d1500a2b7f2b7597ea51a8b269ed2cd819b8e33
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-rngd/selinux-rngd-2.20220106-r1.ebuild b/sec-policy/selinux-rngd/selinux-rngd-2.20220106-r1.ebuild
index 3e32b697831b..d37c8e67b8e2 100644
--- a/sec-policy/selinux-rngd/selinux-rngd-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-rngd/selinux-rngd-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rngd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-rngd/selinux-rngd-2.20220106-r2.ebuild b/sec-policy/selinux-rngd/selinux-rngd-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..3e32b697831b
--- /dev/null
+++ b/sec-policy/selinux-rngd/selinux-rngd-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="rngd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rngd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-rpc/Manifest b/sec-policy/selinux-rpc/Manifest
index 42d25ee6355b..3659bce8172a 100644
--- a/sec-policy/selinux-rpc/Manifest
+++ b/sec-policy/selinux-rpc/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-rpc-2.20200818-r2.ebuild 271 BLAKE2B b7b3c2175587738778218c09b39342f40a649da5b22220b143845a19f1e0b2ad099dd6de6a85dfeb59eab529427ff0efdff831df1e614824c9f40b86923ccd2d SHA512 2eb12d9c038634e7afe43e6de3253d2a0529dfd457fc691a14767dc8ae7870e4a310f2ee117af5626b2af9d3d12fb879069233d45704f22253c5ceefa6ec9df8
 EBUILD selinux-rpc-2.20210203-r1.ebuild 271 BLAKE2B b7b3c2175587738778218c09b39342f40a649da5b22220b143845a19f1e0b2ad099dd6de6a85dfeb59eab529427ff0efdff831df1e614824c9f40b86923ccd2d SHA512 2eb12d9c038634e7afe43e6de3253d2a0529dfd457fc691a14767dc8ae7870e4a310f2ee117af5626b2af9d3d12fb879069233d45704f22253c5ceefa6ec9df8
 EBUILD selinux-rpc-2.20210908-r1.ebuild 271 BLAKE2B b7b3c2175587738778218c09b39342f40a649da5b22220b143845a19f1e0b2ad099dd6de6a85dfeb59eab529427ff0efdff831df1e614824c9f40b86923ccd2d SHA512 2eb12d9c038634e7afe43e6de3253d2a0529dfd457fc691a14767dc8ae7870e4a310f2ee117af5626b2af9d3d12fb879069233d45704f22253c5ceefa6ec9df8
-EBUILD selinux-rpc-2.20220106-r1.ebuild 275 BLAKE2B 73afc74c48d0a649b5f60abc915c5a1eca166addee6d84a907b4080f77c24cdd7a58ccf6d269e2125ed8b38ba2259b594eee76881dfbabc124717cc498533d50 SHA512 53fb9b28ae84e548f3a8b38a2e7ff4bcd8a4bb6c5f51190f303aed1b135f701e3516423b13c5b4478bb05ad35e7655f7d2b4a8d3f017f813b17dc29f1be2fbd8
+EBUILD selinux-rpc-2.20220106-r1.ebuild 273 BLAKE2B 9fa3a46a88c24622f0034b1f72a5c5a2be0e65ae585a356856cd6d2d863d906527683bc52a13d73d3ecded24c26f0dabc0b9516f46e2d2fee620080a422602f7 SHA512 118cc0ea946e2cbcdabbba1cc13599bbc1d9fc340f271aa6eb508b3354a5337d51f05bf1b733797ce83a89580d62abf84f96aae78a7f1baacc3784e4b93d6c93
+EBUILD selinux-rpc-2.20220106-r2.ebuild 275 BLAKE2B 73afc74c48d0a649b5f60abc915c5a1eca166addee6d84a907b4080f77c24cdd7a58ccf6d269e2125ed8b38ba2259b594eee76881dfbabc124717cc498533d50 SHA512 53fb9b28ae84e548f3a8b38a2e7ff4bcd8a4bb6c5f51190f303aed1b135f701e3516423b13c5b4478bb05ad35e7655f7d2b4a8d3f017f813b17dc29f1be2fbd8
 EBUILD selinux-rpc-9999.ebuild 275 BLAKE2B 1b0ca2d53fdc00dc64af5ca2727ec944621f655f5659d76e2245d81989cf0db4e8f44f83f52b1c4f62f7ffd417fa73e2f2e17fa774d9cd3f1f8c7be69af0bfa5 SHA512 9b85fb05b2e622f1243bf97f9fd6aa7336f25d3c2da0d9ab1823b1cdef7f697337a77def38437f863861b770a641640ecc83347760877a17301b5dce4b3ee499
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-rpc/selinux-rpc-2.20220106-r1.ebuild b/sec-policy/selinux-rpc/selinux-rpc-2.20220106-r1.ebuild
index f266d02915b2..c17a65487ffc 100644
--- a/sec-policy/selinux-rpc/selinux-rpc-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-rpc/selinux-rpc-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rpc"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-rpc/selinux-rpc-2.20220106-r2.ebuild b/sec-policy/selinux-rpc/selinux-rpc-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..f266d02915b2
--- /dev/null
+++ b/sec-policy/selinux-rpc/selinux-rpc-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="rpc"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rpc"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-rpcbind/Manifest b/sec-policy/selinux-rpcbind/Manifest
index ae882118fed9..d97b16615774 100644
--- a/sec-policy/selinux-rpcbind/Manifest
+++ b/sec-policy/selinux-rpcbind/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-rpcbind-2.20200818-r2.ebuild 279 BLAKE2B fe0d36ef31cbf5a5944359706ba30c92ee42d181bf60ce57c84b359db750852eb737750fa76988b5ef82c4c1e647bf281f4304cef6fe5e1a3d4a3a88b8031159 SHA512 0f8660649e96dfdd7abac36a7b1a2be6b9184dafa62a8670e6f56431fa73eec1461507e1111c81e28bf162adf36ebaf3f7b5bdb0c0256392e1cf9b90f240b9fc
 EBUILD selinux-rpcbind-2.20210203-r1.ebuild 279 BLAKE2B fe0d36ef31cbf5a5944359706ba30c92ee42d181bf60ce57c84b359db750852eb737750fa76988b5ef82c4c1e647bf281f4304cef6fe5e1a3d4a3a88b8031159 SHA512 0f8660649e96dfdd7abac36a7b1a2be6b9184dafa62a8670e6f56431fa73eec1461507e1111c81e28bf162adf36ebaf3f7b5bdb0c0256392e1cf9b90f240b9fc
 EBUILD selinux-rpcbind-2.20210908-r1.ebuild 279 BLAKE2B fe0d36ef31cbf5a5944359706ba30c92ee42d181bf60ce57c84b359db750852eb737750fa76988b5ef82c4c1e647bf281f4304cef6fe5e1a3d4a3a88b8031159 SHA512 0f8660649e96dfdd7abac36a7b1a2be6b9184dafa62a8670e6f56431fa73eec1461507e1111c81e28bf162adf36ebaf3f7b5bdb0c0256392e1cf9b90f240b9fc
-EBUILD selinux-rpcbind-2.20220106-r1.ebuild 283 BLAKE2B 833dcd293d76ac146a487706f7b6a5362191218979c1e654a79f79dfab58103243755285edab34a5f59f8f6178ec8a42348f96b846f49c7356db8c74a88329e7 SHA512 be29f483da17ba5e8f8fe941f7583245c954bc49be80d07e3a032ed5f6cabe17e10b78c4f22f4c8f36fad7a6f9033f03d461a79c30b0447b944dabf754f2bee4
+EBUILD selinux-rpcbind-2.20220106-r1.ebuild 281 BLAKE2B 45f3d54d5be5a1a3984bf1cad682d302cf46767d208fedd697f6d72fd022c0cefced65e72e9a5fdbceb6ac38bbe6a238254fb7a8b825a6877ed95839da50cf23 SHA512 960d2dd6201be675eb69adc12a22f78d232cec25454c0c6798f88eca2c32ec485844df0aab8de5f9babddd08a22a718bcd91fe85233296caae4ed83b8668d573
+EBUILD selinux-rpcbind-2.20220106-r2.ebuild 283 BLAKE2B 833dcd293d76ac146a487706f7b6a5362191218979c1e654a79f79dfab58103243755285edab34a5f59f8f6178ec8a42348f96b846f49c7356db8c74a88329e7 SHA512 be29f483da17ba5e8f8fe941f7583245c954bc49be80d07e3a032ed5f6cabe17e10b78c4f22f4c8f36fad7a6f9033f03d461a79c30b0447b944dabf754f2bee4
 EBUILD selinux-rpcbind-9999.ebuild 283 BLAKE2B 3036732b154178c25b2b19e7c50f0e419b7eda9b8f87ff699c23e8a1d26ad40c3e768204bdd98700faa6dff146a3c494e6ac7ba94c4a217e3ca55cf56aa1e94c SHA512 20a05fd05901d01e9f12603f386ca39778bbeec67ce1764a3664ae3636da52393f3e1bd75e7893771a5622c01e7428afbbb5924bdd2d7d4b28a0630dfdd21a13
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20220106-r1.ebuild b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20220106-r1.ebuild
index 52d78be166e3..6a97c6bff38a 100644
--- a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rpcbind"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20220106-r2.ebuild b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..52d78be166e3
--- /dev/null
+++ b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="rpcbind"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rpcbind"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-rpm/Manifest b/sec-policy/selinux-rpm/Manifest
index bde566232698..726b4353a0e3 100644
--- a/sec-policy/selinux-rpm/Manifest
+++ b/sec-policy/selinux-rpm/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-rpm-2.20200818-r2.ebuild 271 BLAKE2B 1252fb4bb5da6ca46ec4bca12d2872c482f687d312f6b2789d511295d93b00f17af2fda1ecf4e0ed7ec619d398f0b3048b60c25bbf2e99e0126c8627fe28c0d8 SHA512 5ca84c845c758f231b547bab81825c99a82a52a5a902a2f9e13abfbe0f1ee4aa8da49c6d0ed4385bc73b51c00d2e68a95cc025cbcffaff21b78f8c62b75cceb6
 EBUILD selinux-rpm-2.20210203-r1.ebuild 271 BLAKE2B 1252fb4bb5da6ca46ec4bca12d2872c482f687d312f6b2789d511295d93b00f17af2fda1ecf4e0ed7ec619d398f0b3048b60c25bbf2e99e0126c8627fe28c0d8 SHA512 5ca84c845c758f231b547bab81825c99a82a52a5a902a2f9e13abfbe0f1ee4aa8da49c6d0ed4385bc73b51c00d2e68a95cc025cbcffaff21b78f8c62b75cceb6
 EBUILD selinux-rpm-2.20210908-r1.ebuild 271 BLAKE2B 1252fb4bb5da6ca46ec4bca12d2872c482f687d312f6b2789d511295d93b00f17af2fda1ecf4e0ed7ec619d398f0b3048b60c25bbf2e99e0126c8627fe28c0d8 SHA512 5ca84c845c758f231b547bab81825c99a82a52a5a902a2f9e13abfbe0f1ee4aa8da49c6d0ed4385bc73b51c00d2e68a95cc025cbcffaff21b78f8c62b75cceb6
-EBUILD selinux-rpm-2.20220106-r1.ebuild 275 BLAKE2B 34b20470da47ea051adfcdae68d5853684b66b11b5c0ce39289b52cb8bdf81ce7203ee9c3fd1346af3836a9f46b40dc89690e3f555c04027b20edba9e744b767 SHA512 de373e50792c1b2f3c305c19846f5480f0d4f7095f94a0dd734b4adc9c64623891804ad1d085350fa3cb65a2ca4d34b970c7dca897fd432c27231c02560a60ec
+EBUILD selinux-rpm-2.20220106-r1.ebuild 273 BLAKE2B a0f1cc63158635c3038e66e2dcede61faa4860263432de97563227c256e2c21eec8bf32e6c8a118f2923b4fa335fcc0572fffda6ddf1d19832a74c7e240ddae5 SHA512 dabe8f97b27307c76045adc024cb1580181076aea1e40d72e1969956d06847669d244dc233a33b4bfbeef8fd9099846a0134f8b8658b3f759ac5ab417ca65c04
+EBUILD selinux-rpm-2.20220106-r2.ebuild 275 BLAKE2B 34b20470da47ea051adfcdae68d5853684b66b11b5c0ce39289b52cb8bdf81ce7203ee9c3fd1346af3836a9f46b40dc89690e3f555c04027b20edba9e744b767 SHA512 de373e50792c1b2f3c305c19846f5480f0d4f7095f94a0dd734b4adc9c64623891804ad1d085350fa3cb65a2ca4d34b970c7dca897fd432c27231c02560a60ec
 EBUILD selinux-rpm-9999.ebuild 275 BLAKE2B b479d79311d1ab63511c2f0e0b19835393dbb3baeeb0b268f7bd903e624c7c06d12d900e2b8ffe6399c37fc1e2b3d21ce02ce04f633226f00dc9d6ecd31e3f25 SHA512 851a1a77bd90d95bd628e19cd82316f39733d71225d6e0dff251639d8b3d5f40aa3e65d6bf802e7244d3c2b5016cd5b60acfadb01490df61709b2da9a71764ef
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-rpm/selinux-rpm-2.20220106-r1.ebuild b/sec-policy/selinux-rpm/selinux-rpm-2.20220106-r1.ebuild
index 309c381acd0a..377c465a1c2d 100644
--- a/sec-policy/selinux-rpm/selinux-rpm-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-rpm/selinux-rpm-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rpm"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-rpm/selinux-rpm-2.20220106-r2.ebuild b/sec-policy/selinux-rpm/selinux-rpm-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..309c381acd0a
--- /dev/null
+++ b/sec-policy/selinux-rpm/selinux-rpm-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="rpm"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rpm"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-rssh/Manifest b/sec-policy/selinux-rssh/Manifest
index 144f7aef83a2..da9d7061c22e 100644
--- a/sec-policy/selinux-rssh/Manifest
+++ b/sec-policy/selinux-rssh/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-rssh-2.20200818-r2.ebuild 273 BLAKE2B 19267d088dee4d1e403aaaf8fa0a9faf0b453872575d86e562f9812572620f71a5ca5e69cfa5be5b38e851186d9d69fae357e979e66abe33d3ed3777517b3557 SHA512 4975ac38524f9dd98afc0a8820fda56135ed872e0b6ab561c36aa9b93c0c860b5d6aade46b5d2d7b2e449dae3fdae0658d29350c68c7742cb7834ddd7668045a
 EBUILD selinux-rssh-2.20210203-r1.ebuild 273 BLAKE2B 19267d088dee4d1e403aaaf8fa0a9faf0b453872575d86e562f9812572620f71a5ca5e69cfa5be5b38e851186d9d69fae357e979e66abe33d3ed3777517b3557 SHA512 4975ac38524f9dd98afc0a8820fda56135ed872e0b6ab561c36aa9b93c0c860b5d6aade46b5d2d7b2e449dae3fdae0658d29350c68c7742cb7834ddd7668045a
 EBUILD selinux-rssh-2.20210908-r1.ebuild 273 BLAKE2B 19267d088dee4d1e403aaaf8fa0a9faf0b453872575d86e562f9812572620f71a5ca5e69cfa5be5b38e851186d9d69fae357e979e66abe33d3ed3777517b3557 SHA512 4975ac38524f9dd98afc0a8820fda56135ed872e0b6ab561c36aa9b93c0c860b5d6aade46b5d2d7b2e449dae3fdae0658d29350c68c7742cb7834ddd7668045a
-EBUILD selinux-rssh-2.20220106-r1.ebuild 277 BLAKE2B ec7d62541681e87870c56f6b940e906d6617b0c175020ccb2902a3fcb0371c85b759c38607964c2443131b2bae63835902075187ca4b92e8d07e17c8793e56a3 SHA512 caa1bb1d0aeb7d05c54aad1b61257d762ffc949d3db095893e5090c85b0d750f097564171dac898f5d928f9fbb6bd911426fd269a2916bbe8d236a7e73d55107
+EBUILD selinux-rssh-2.20220106-r1.ebuild 275 BLAKE2B f9fe59ffa6b94e4a9f3e7a105b00b8ba6a875ee497d300ac29aee7146fbcd2abcf7aa47c5ba89fe8d9c1a497cfbd714271954f5f99212769bc15c0ed8dbc3326 SHA512 afa3f9a1fabe83778c47a2c70ebabbc70451e0e2936389ccc49b33678606e5189126b13dda53c33ec0d8dabe9e5b795d9a073b02cf645f03d806fd92a14e63b4
+EBUILD selinux-rssh-2.20220106-r2.ebuild 277 BLAKE2B ec7d62541681e87870c56f6b940e906d6617b0c175020ccb2902a3fcb0371c85b759c38607964c2443131b2bae63835902075187ca4b92e8d07e17c8793e56a3 SHA512 caa1bb1d0aeb7d05c54aad1b61257d762ffc949d3db095893e5090c85b0d750f097564171dac898f5d928f9fbb6bd911426fd269a2916bbe8d236a7e73d55107
 EBUILD selinux-rssh-9999.ebuild 277 BLAKE2B eae870d2b258eb8b0508663c5cadf2c8ddabed8250e3d2910c68857a72e87a285d030d610cfcfe1d17e43713ab4973f5eb5253649c1e705c37c7fcaebf5a01ea SHA512 47d791e15ed7174b9d7150905c9c2e3c35977076414993cfe86e24ae91efc7727a6cfa9b52129b399fcd5f8eaae3f17065733b1c3c8e4f43cb9e67900b5340a4
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-rssh/selinux-rssh-2.20220106-r1.ebuild b/sec-policy/selinux-rssh/selinux-rssh-2.20220106-r1.ebuild
index 9c4ab20636c8..6613322f1153 100644
--- a/sec-policy/selinux-rssh/selinux-rssh-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-rssh/selinux-rssh-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rssh"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-rssh/selinux-rssh-2.20220106-r2.ebuild b/sec-policy/selinux-rssh/selinux-rssh-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..9c4ab20636c8
--- /dev/null
+++ b/sec-policy/selinux-rssh/selinux-rssh-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="rssh"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rssh"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-rtkit/Manifest b/sec-policy/selinux-rtkit/Manifest
index 85d1d65ccf3a..07bef5fd042b 100644
--- a/sec-policy/selinux-rtkit/Manifest
+++ b/sec-policy/selinux-rtkit/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-rtkit-2.20200818-r2.ebuild 367 BLAKE2B 01a239bc314f0c9dbfe2ed71cb428ea55a110b35f31f14d186b8e3bd917702f275552b3a993fe50634a2f5c5b9a7f8b0a6c3fdd596bbdcb7af4a90dc268d89bc SHA512 91d6d01a1da944bacd72f0a38f0b2547d6d251e64d2630d5b3d829179d2570e90d916573f31caa104e2d76f811a550ed6c7cb12ebe4f963851b14405202ac2ed
 EBUILD selinux-rtkit-2.20210203-r1.ebuild 367 BLAKE2B 01a239bc314f0c9dbfe2ed71cb428ea55a110b35f31f14d186b8e3bd917702f275552b3a993fe50634a2f5c5b9a7f8b0a6c3fdd596bbdcb7af4a90dc268d89bc SHA512 91d6d01a1da944bacd72f0a38f0b2547d6d251e64d2630d5b3d829179d2570e90d916573f31caa104e2d76f811a550ed6c7cb12ebe4f963851b14405202ac2ed
 EBUILD selinux-rtkit-2.20210908-r1.ebuild 367 BLAKE2B 01a239bc314f0c9dbfe2ed71cb428ea55a110b35f31f14d186b8e3bd917702f275552b3a993fe50634a2f5c5b9a7f8b0a6c3fdd596bbdcb7af4a90dc268d89bc SHA512 91d6d01a1da944bacd72f0a38f0b2547d6d251e64d2630d5b3d829179d2570e90d916573f31caa104e2d76f811a550ed6c7cb12ebe4f963851b14405202ac2ed
-EBUILD selinux-rtkit-2.20220106-r1.ebuild 371 BLAKE2B 2fdcecbf49bba16b82ed174d003b5bd7eb3c854363736aedf90b2c6dedc13d2f9bbbc8bef6cfcd7b4dc3982d05fa567a000cc2ed59221723a1082aa5286e8e18 SHA512 c9ba9d7d118ef41cc64952af853b4b1dabc6973e39181f2854a17d8021b08a9dd6dd92b9b4863901cdb7d0dcdc1ce21142fff65595c3156c8d8e27513ab6d84a
+EBUILD selinux-rtkit-2.20220106-r1.ebuild 369 BLAKE2B c27d7ca74531e537308e4e76df5ba3143864f242d3fc8bcce040b8ad0f07a3d20ff5219b57b6635704f9f491d2015b1ba5d1fb0feff43a4fe76d563c56791c8a SHA512 ce29a0dd8f6c323e949b62aaa75160e6f7aaa4ec4f8cc784727c47b7bb934cfa0fcf1bd9e369bf77656331be304efa4b41905f5fe9be8b2494dc012f89913788
+EBUILD selinux-rtkit-2.20220106-r2.ebuild 371 BLAKE2B 2fdcecbf49bba16b82ed174d003b5bd7eb3c854363736aedf90b2c6dedc13d2f9bbbc8bef6cfcd7b4dc3982d05fa567a000cc2ed59221723a1082aa5286e8e18 SHA512 c9ba9d7d118ef41cc64952af853b4b1dabc6973e39181f2854a17d8021b08a9dd6dd92b9b4863901cdb7d0dcdc1ce21142fff65595c3156c8d8e27513ab6d84a
 EBUILD selinux-rtkit-9999.ebuild 371 BLAKE2B be97ae91cd408388c9ac05954c523d82456d4cc7af5a7857a59d4d5f0d3d37fe5a7c24ce4aea69249c42d53d81f7ca34f6c010702dc96bd49127ae1b6c3c7bf4 SHA512 c99521e2e681106d68cbed54e31e4eb315ea5ef6e54069d09b371b03cfe9284b8d4904258e5d0a410c2321ef198113cc4a181df07b58e1e5d1ffb07e6435610e
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-rtkit/selinux-rtkit-2.20220106-r1.ebuild b/sec-policy/selinux-rtkit/selinux-rtkit-2.20220106-r1.ebuild
index 5a2a4d3bd8fc..b56f85335ffc 100644
--- a/sec-policy/selinux-rtkit/selinux-rtkit-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-rtkit/selinux-rtkit-2.20220106-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rtkit"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-dbus
diff --git a/sec-policy/selinux-rtkit/selinux-rtkit-2.20220106-r2.ebuild b/sec-policy/selinux-rtkit/selinux-rtkit-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..5a2a4d3bd8fc
--- /dev/null
+++ b/sec-policy/selinux-rtkit/selinux-rtkit-2.20220106-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="rtkit"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rtkit"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-dbus
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-dbus
+"
diff --git a/sec-policy/selinux-rtorrent/Manifest b/sec-policy/selinux-rtorrent/Manifest
index 6e416f9d4465..89919a9b78c3 100644
--- a/sec-policy/selinux-rtorrent/Manifest
+++ b/sec-policy/selinux-rtorrent/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-rtorrent-2.20200818-r2.ebuild 281 BLAKE2B 6501f910a23fb7719c6a21c936a60b6084b5adeacb41b570cb284152733de0c9f4b0220092fcb6ee70429d4cf15a889664159faa1ba96553da345f2de4597bf3 SHA512 8fbf971b371802fd5d9e20abfccb631e9675a87150b4ec5e396be112a0cf8a2b9dca296d4517d904485bcdc3f9b9d67b1507fe7663b9924e48742e36ef2f59e2
 EBUILD selinux-rtorrent-2.20210203-r1.ebuild 281 BLAKE2B 6501f910a23fb7719c6a21c936a60b6084b5adeacb41b570cb284152733de0c9f4b0220092fcb6ee70429d4cf15a889664159faa1ba96553da345f2de4597bf3 SHA512 8fbf971b371802fd5d9e20abfccb631e9675a87150b4ec5e396be112a0cf8a2b9dca296d4517d904485bcdc3f9b9d67b1507fe7663b9924e48742e36ef2f59e2
 EBUILD selinux-rtorrent-2.20210908-r1.ebuild 281 BLAKE2B 6501f910a23fb7719c6a21c936a60b6084b5adeacb41b570cb284152733de0c9f4b0220092fcb6ee70429d4cf15a889664159faa1ba96553da345f2de4597bf3 SHA512 8fbf971b371802fd5d9e20abfccb631e9675a87150b4ec5e396be112a0cf8a2b9dca296d4517d904485bcdc3f9b9d67b1507fe7663b9924e48742e36ef2f59e2
-EBUILD selinux-rtorrent-2.20220106-r1.ebuild 285 BLAKE2B e462e1199c92f14d36d4d7cdeb00b5472880ebaa75623979cc24cc321a84707276f94174948c115d945513405d5ea7bbd8a47178225d777896b49a71df0b2f93 SHA512 63a7ea6e01e6fd4f39408c1af1a39bddb9cd9f7b30c2f81b445bb761bcb557746b444608e6aba7e3ddafd7904f851a5c3b7198729fa03275e164be6e9980638a
+EBUILD selinux-rtorrent-2.20220106-r1.ebuild 283 BLAKE2B ffafa746fc1927d6b583b313336f277db350dcb31083bf99f0cb3b779026b86adc4af3de625072a12e0351c8902eced0bc6bfb96ecf0e7be5aae2c90f6f1223c SHA512 f3e486c4be0210cb7c6e78d3aab459a8fae6f83d2f3346852de561795fe45d8808491a39436f9f045f7f43819bb3a51e7e607b3fc0159b549069232543e665e5
+EBUILD selinux-rtorrent-2.20220106-r2.ebuild 285 BLAKE2B e462e1199c92f14d36d4d7cdeb00b5472880ebaa75623979cc24cc321a84707276f94174948c115d945513405d5ea7bbd8a47178225d777896b49a71df0b2f93 SHA512 63a7ea6e01e6fd4f39408c1af1a39bddb9cd9f7b30c2f81b445bb761bcb557746b444608e6aba7e3ddafd7904f851a5c3b7198729fa03275e164be6e9980638a
 EBUILD selinux-rtorrent-9999.ebuild 285 BLAKE2B f4cfa08eb8c1913108ec43df35031c45f0e1e046a08bbc188e9e2db3048a86c78b4e66ea2f186a3b0c7e4d69a6a523b51bfe670657a236dfab0888b994273e40 SHA512 5aff6e4b275b0f76ae35cf41ae3b421f1521c0d92df424af9913633e82a2c65390b4c0097c86c420c30f3eb3cab98677b41b072a59ea139c69b4f35b8673a76e
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20220106-r1.ebuild b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20220106-r1.ebuild
index f1220d8759d0..231e2304d2bb 100644
--- a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rtorrent"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20220106-r2.ebuild b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..f1220d8759d0
--- /dev/null
+++ b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="rtorrent"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rtorrent"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-salt/Manifest b/sec-policy/selinux-salt/Manifest
index 680cf0c77e04..86a89a9c7b8e 100644
--- a/sec-policy/selinux-salt/Manifest
+++ b/sec-policy/selinux-salt/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-salt-2.20200818-r2.ebuild 273 BLAKE2B bba5aaf7c556c2996306d8cebdea370c51f17e3251d80d0de3c91e4f867843b4a9af51344bc664839e33123c4ce02ba4d740fb59444aec294d5b50a9c47eb335 SHA512 9dde088b91422f667f76a168d7df146f0a642298e3d3891e3309e63251887d7593909d958f5c2fcbaa19b514670d744bba2676ac705ecdc6289a24a37d157006
 EBUILD selinux-salt-2.20210203-r1.ebuild 273 BLAKE2B bba5aaf7c556c2996306d8cebdea370c51f17e3251d80d0de3c91e4f867843b4a9af51344bc664839e33123c4ce02ba4d740fb59444aec294d5b50a9c47eb335 SHA512 9dde088b91422f667f76a168d7df146f0a642298e3d3891e3309e63251887d7593909d958f5c2fcbaa19b514670d744bba2676ac705ecdc6289a24a37d157006
 EBUILD selinux-salt-2.20210908-r1.ebuild 273 BLAKE2B bba5aaf7c556c2996306d8cebdea370c51f17e3251d80d0de3c91e4f867843b4a9af51344bc664839e33123c4ce02ba4d740fb59444aec294d5b50a9c47eb335 SHA512 9dde088b91422f667f76a168d7df146f0a642298e3d3891e3309e63251887d7593909d958f5c2fcbaa19b514670d744bba2676ac705ecdc6289a24a37d157006
-EBUILD selinux-salt-2.20220106-r1.ebuild 277 BLAKE2B 4718c160e6e77f4323c98a47e39f9bbfc49325efd196b920cd977a82be3e89c5cc6d45e1fdb7ab9d6775ffd409735c9da6e9026876c11ab23848803fe5c407b7 SHA512 a73e727792fac71fd25d456049f047487ade29f3e64642fc96a23c38d0ea764806410f14d4a1ee9dbc6fbb515cdf3d3307347e93aec13498adf88a5a58405756
+EBUILD selinux-salt-2.20220106-r1.ebuild 275 BLAKE2B eab58c7c86aabcc7685e84025ea9a2903d17d98a785f134ec4ee84cdf1331ad5b39ae472e6e4794279ff06797639411abf993ab6e31435f2494bb555a8d368c5 SHA512 f7bc819e8e69cd37555142fdc0753d6da0d876e8c264a269265e4f2a6ba11fc8e10381cf57ea620359af9b5ce1048768a4ed75e25eb3139fb44cd185adfcb317
+EBUILD selinux-salt-2.20220106-r2.ebuild 277 BLAKE2B 4718c160e6e77f4323c98a47e39f9bbfc49325efd196b920cd977a82be3e89c5cc6d45e1fdb7ab9d6775ffd409735c9da6e9026876c11ab23848803fe5c407b7 SHA512 a73e727792fac71fd25d456049f047487ade29f3e64642fc96a23c38d0ea764806410f14d4a1ee9dbc6fbb515cdf3d3307347e93aec13498adf88a5a58405756
 EBUILD selinux-salt-9999.ebuild 277 BLAKE2B 4c9dfbfba3b18424ccc731eaf326d6ba64385ecb5d87030f5e68963870d8e71a1c3b804379ecbf4abb8bc2b7f0c445ce25e241e1f528e8c1c8ba838dd65d7540 SHA512 d3ef860db169dba5a7880f12b05744e83dcffd993e8c9a31c4c4f3b1b840ae7b6c24e512f93965bd4b91d520ae27cea6a602ad4346ae3570912c6e21bfbd511b
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-salt/selinux-salt-2.20220106-r1.ebuild b/sec-policy/selinux-salt/selinux-salt-2.20220106-r1.ebuild
index 12cfc945b156..6a32851449b8 100644
--- a/sec-policy/selinux-salt/selinux-salt-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-salt/selinux-salt-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for salt"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-salt/selinux-salt-2.20220106-r2.ebuild b/sec-policy/selinux-salt/selinux-salt-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..12cfc945b156
--- /dev/null
+++ b/sec-policy/selinux-salt/selinux-salt-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="salt"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for salt"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-samba/Manifest b/sec-policy/selinux-samba/Manifest
index dd4bc7edd57b..a4e0d214194f 100644
--- a/sec-policy/selinux-samba/Manifest
+++ b/sec-policy/selinux-samba/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-samba-2.20200818-r2.ebuild 275 BLAKE2B 80d22af606b8a3f048a52cb7cc4741b0ee7d7adf64299e0e9c2b8f148f5fbc4b25a4017a2b939c36230f45c5bf66c914abd1e3e66fa29d55a419fb942fe25f15 SHA512 77b418878e67d60b9a177b69b47897e79644111ea0dfbc33c18196b5169df043366e16507f63e9f7e1bdd884c0e6005ad0772ae4467df056db01ba0066da4e7e
 EBUILD selinux-samba-2.20210203-r1.ebuild 275 BLAKE2B 80d22af606b8a3f048a52cb7cc4741b0ee7d7adf64299e0e9c2b8f148f5fbc4b25a4017a2b939c36230f45c5bf66c914abd1e3e66fa29d55a419fb942fe25f15 SHA512 77b418878e67d60b9a177b69b47897e79644111ea0dfbc33c18196b5169df043366e16507f63e9f7e1bdd884c0e6005ad0772ae4467df056db01ba0066da4e7e
 EBUILD selinux-samba-2.20210908-r1.ebuild 275 BLAKE2B 80d22af606b8a3f048a52cb7cc4741b0ee7d7adf64299e0e9c2b8f148f5fbc4b25a4017a2b939c36230f45c5bf66c914abd1e3e66fa29d55a419fb942fe25f15 SHA512 77b418878e67d60b9a177b69b47897e79644111ea0dfbc33c18196b5169df043366e16507f63e9f7e1bdd884c0e6005ad0772ae4467df056db01ba0066da4e7e
-EBUILD selinux-samba-2.20220106-r1.ebuild 279 BLAKE2B 0a75573c612e3e11aa755508afa5e9df93c29ca29fd77bde1c9c49fbdfccff504524efef97aab617487374719f433ecf4d3bea94a2aa5989d88b712fdc68fd7f SHA512 a4bb579aea03ad4703100aa521b8bee693c57deb383d23c5859cba9dbdb8326c438817d5c07648558c5a9978a31541b067c13cfa61ebc7bba17185b9fc8dbefb
+EBUILD selinux-samba-2.20220106-r1.ebuild 277 BLAKE2B e87922790593fc45456c19d9c5fb7a4124f036619ce2b8304595955622800dcf18f616831b9dcfbc701e906ad0906fbff8fd55efa1388399d712119d62cb2f81 SHA512 ca98944d8836c66d9cf79722370b48191e267bef3bc9e98729336c376ebd3dcc38611b36774743fe823de73eb719cf28706f40163b41008d742d95888eb7b60a
+EBUILD selinux-samba-2.20220106-r2.ebuild 279 BLAKE2B 0a75573c612e3e11aa755508afa5e9df93c29ca29fd77bde1c9c49fbdfccff504524efef97aab617487374719f433ecf4d3bea94a2aa5989d88b712fdc68fd7f SHA512 a4bb579aea03ad4703100aa521b8bee693c57deb383d23c5859cba9dbdb8326c438817d5c07648558c5a9978a31541b067c13cfa61ebc7bba17185b9fc8dbefb
 EBUILD selinux-samba-9999.ebuild 279 BLAKE2B f2d136cdc059e20eb8667b33ca8eb038b59327e1a4b79ba8c3463e436d25db7148c7fe6880db5a685916c3d8ebe14bd578114573eb128d5cd924af9ed5b17077 SHA512 e98aaf61b3bf082bbd2d0b4c259debc9b4e9ccef5b4750198c8899754d968c84d4a82dd318df18ef95882dddb5768ec538ebaf49dd0038aaf7b099716a1397d2
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-samba/selinux-samba-2.20220106-r1.ebuild b/sec-policy/selinux-samba/selinux-samba-2.20220106-r1.ebuild
index 62fa59b893dc..ad08013d0d0f 100644
--- a/sec-policy/selinux-samba/selinux-samba-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-samba/selinux-samba-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for samba"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-samba/selinux-samba-2.20220106-r2.ebuild b/sec-policy/selinux-samba/selinux-samba-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..62fa59b893dc
--- /dev/null
+++ b/sec-policy/selinux-samba/selinux-samba-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="samba"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for samba"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-sasl/Manifest b/sec-policy/selinux-sasl/Manifest
index f59507f6c3d3..4fcd4583715c 100644
--- a/sec-policy/selinux-sasl/Manifest
+++ b/sec-policy/selinux-sasl/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-sasl-2.20200818-r2.ebuild 273 BLAKE2B 0b1aaa1e43d9638a1897e6112bacc172ea2dd6377514edbf977c9a31759e4f63fe9ba7cad22f50cd09869016dd0c9c69094e703f51d86909e1b36c164e8f38ce SHA512 6047267de86312bcc5d449949280af9adb13e5e5dae98f49b7192501e3905e3c5c182d3c0aea7db4373e217a152525622858f2e60bc5597728b9cc0e37178f36
 EBUILD selinux-sasl-2.20210203-r1.ebuild 273 BLAKE2B 0b1aaa1e43d9638a1897e6112bacc172ea2dd6377514edbf977c9a31759e4f63fe9ba7cad22f50cd09869016dd0c9c69094e703f51d86909e1b36c164e8f38ce SHA512 6047267de86312bcc5d449949280af9adb13e5e5dae98f49b7192501e3905e3c5c182d3c0aea7db4373e217a152525622858f2e60bc5597728b9cc0e37178f36
 EBUILD selinux-sasl-2.20210908-r1.ebuild 273 BLAKE2B 0b1aaa1e43d9638a1897e6112bacc172ea2dd6377514edbf977c9a31759e4f63fe9ba7cad22f50cd09869016dd0c9c69094e703f51d86909e1b36c164e8f38ce SHA512 6047267de86312bcc5d449949280af9adb13e5e5dae98f49b7192501e3905e3c5c182d3c0aea7db4373e217a152525622858f2e60bc5597728b9cc0e37178f36
-EBUILD selinux-sasl-2.20220106-r1.ebuild 277 BLAKE2B 251c23e2b7dc1ba16fb2c810e4f997e278b95cd224ab90a0d5e6fb87897a10453aa448707e8ce4ae5ac7810e53a7e01032437f93c4e303625852699d30e47071 SHA512 ca58e7f95410d3f2f5cc950f2496496b7c5cefdd70173c6f7e91786a72ff56acc017fcb91967d0bd9d616fb5178e30ed44162007971217e1e978866844d7172e
+EBUILD selinux-sasl-2.20220106-r1.ebuild 275 BLAKE2B d3e49b309d9685e987ab0f55f8546e58c411af9cb8602fe15717bfb20e1f91847d2606fef3674f1e4ca18aee103d87d01cbda63b68b1c72a4b6804eca90cc38a SHA512 27f0aa0695b4a3dd127e1180598f5730db9a6093cbb6013a2bf5b708096172638e7946569559b6334f9856ca5204db17cb342d8d499622810d89a76a4a9c903d
+EBUILD selinux-sasl-2.20220106-r2.ebuild 277 BLAKE2B 251c23e2b7dc1ba16fb2c810e4f997e278b95cd224ab90a0d5e6fb87897a10453aa448707e8ce4ae5ac7810e53a7e01032437f93c4e303625852699d30e47071 SHA512 ca58e7f95410d3f2f5cc950f2496496b7c5cefdd70173c6f7e91786a72ff56acc017fcb91967d0bd9d616fb5178e30ed44162007971217e1e978866844d7172e
 EBUILD selinux-sasl-9999.ebuild 277 BLAKE2B a253eea3ab1b21d1b19e0228c412a8132aecb7c9cf890bd02b6d04ba6cfce88945996dba4e3e2ed2ea3086424709eed04caa724bf3bb43a0db9a2b43f86b17db SHA512 f26b85241900fa7c1bf563abf0cf22fcde0af6e9d6ec2b1eb31c7bbe11052d25c254b9fc7815762740baa222cf491945e028c43a719595461406a111beddd1fa
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-sasl/selinux-sasl-2.20220106-r1.ebuild b/sec-policy/selinux-sasl/selinux-sasl-2.20220106-r1.ebuild
index 7a66efb88522..751498e19824 100644
--- a/sec-policy/selinux-sasl/selinux-sasl-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-sasl/selinux-sasl-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sasl"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-sasl/selinux-sasl-2.20220106-r2.ebuild b/sec-policy/selinux-sasl/selinux-sasl-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..7a66efb88522
--- /dev/null
+++ b/sec-policy/selinux-sasl/selinux-sasl-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="sasl"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for sasl"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-screen/Manifest b/sec-policy/selinux-screen/Manifest
index 7ae0dea775d2..754501912481 100644
--- a/sec-policy/selinux-screen/Manifest
+++ b/sec-policy/selinux-screen/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-screen-2.20200818-r2.ebuild 277 BLAKE2B 82cd50628ea5b519c645b8a1bb4659b3d9f651473f78542b64f12b3582ae6fc6bb8e817e0737aceb98f615dfa10c86d6ddfc57d315c8a2b6e81afda79dfc422d SHA512 79ba5e2d4d8c4b3382e129bb2a222d786c94bee448cb164b11f9813ec06359520bd7d338ce84c7991a1891fb26fed3aed63f86c753f352bf934036d33b7936b6
 EBUILD selinux-screen-2.20210203-r1.ebuild 277 BLAKE2B 82cd50628ea5b519c645b8a1bb4659b3d9f651473f78542b64f12b3582ae6fc6bb8e817e0737aceb98f615dfa10c86d6ddfc57d315c8a2b6e81afda79dfc422d SHA512 79ba5e2d4d8c4b3382e129bb2a222d786c94bee448cb164b11f9813ec06359520bd7d338ce84c7991a1891fb26fed3aed63f86c753f352bf934036d33b7936b6
 EBUILD selinux-screen-2.20210908-r1.ebuild 277 BLAKE2B 82cd50628ea5b519c645b8a1bb4659b3d9f651473f78542b64f12b3582ae6fc6bb8e817e0737aceb98f615dfa10c86d6ddfc57d315c8a2b6e81afda79dfc422d SHA512 79ba5e2d4d8c4b3382e129bb2a222d786c94bee448cb164b11f9813ec06359520bd7d338ce84c7991a1891fb26fed3aed63f86c753f352bf934036d33b7936b6
-EBUILD selinux-screen-2.20220106-r1.ebuild 281 BLAKE2B b0861569aff369d48e4870cf5ae65030f0d445feac1136c8acd58677ad85dce3752e5be8cb5e80dee834eae53debb12057df6eb475b326e6356c31ed6816e9e9 SHA512 8480b3dbb7adcf3472b141cddaee4c8e6145fa9742457ab43ef1cddf1aa776c439336cd0e6cc1664176c32440b123ad506941d807dba6bac1a4cb35e20d0973e
+EBUILD selinux-screen-2.20220106-r1.ebuild 279 BLAKE2B ab3b96e9483af5a558d174c62869870439736a1e013c7504353036d846b5064604847a1ac164b46690bcb7db2da7695857955deff0ebec3476f2186f4e786f07 SHA512 28403d8f5cff7ef207af51a1b81714c962f7a513403816d2739f9d134672cad5384c9ec68e4ec833417e681aa679d1d796fbbdd9847e2b1b8bd070f0e99d6637
+EBUILD selinux-screen-2.20220106-r2.ebuild 281 BLAKE2B b0861569aff369d48e4870cf5ae65030f0d445feac1136c8acd58677ad85dce3752e5be8cb5e80dee834eae53debb12057df6eb475b326e6356c31ed6816e9e9 SHA512 8480b3dbb7adcf3472b141cddaee4c8e6145fa9742457ab43ef1cddf1aa776c439336cd0e6cc1664176c32440b123ad506941d807dba6bac1a4cb35e20d0973e
 EBUILD selinux-screen-9999.ebuild 281 BLAKE2B 6b376b95c463bf097b900115306bda5caadf77847b28bba6385edcc56d9717ce617205138903753ffca0cfd8b77d21a179e68759abf5c9b8af31e6cacc50fe5d SHA512 95786ede8240504e4feca191fabc305b9ab0e48418500ad16a6e2c31d2c98a2b04aa9f28aaa7e62681a3f93390af5616dfe39f94187f9e670a44368ec83d2dbb
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-screen/selinux-screen-2.20220106-r1.ebuild b/sec-policy/selinux-screen/selinux-screen-2.20220106-r1.ebuild
index 98109f1cfb37..a59c8cc141fb 100644
--- a/sec-policy/selinux-screen/selinux-screen-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-screen/selinux-screen-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for screen"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-screen/selinux-screen-2.20220106-r2.ebuild b/sec-policy/selinux-screen/selinux-screen-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..98109f1cfb37
--- /dev/null
+++ b/sec-policy/selinux-screen/selinux-screen-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="screen"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for screen"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-sendmail/Manifest b/sec-policy/selinux-sendmail/Manifest
index 88ebbef306df..2e0ba14d12b2 100644
--- a/sec-policy/selinux-sendmail/Manifest
+++ b/sec-policy/selinux-sendmail/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-sendmail-2.20200818-r2.ebuild 281 BLAKE2B 660559ed2fb027b304179c38f83cb55b3a94cdf79974a0739f50aa7f595cfc8eaf0ce2945f8c20cbd105b57ccfc78960912e457843b32080391a8bc808631f4e SHA512 f2a02fffd13d1c2d394c39d16760f39aed1a48cdccf752ff1b0106ebbe8b26534a8eedcafbcbf928faf7c4fd1df5434783abdaa5c8c8ba18b31c874cd73d9f8f
 EBUILD selinux-sendmail-2.20210203-r1.ebuild 281 BLAKE2B 660559ed2fb027b304179c38f83cb55b3a94cdf79974a0739f50aa7f595cfc8eaf0ce2945f8c20cbd105b57ccfc78960912e457843b32080391a8bc808631f4e SHA512 f2a02fffd13d1c2d394c39d16760f39aed1a48cdccf752ff1b0106ebbe8b26534a8eedcafbcbf928faf7c4fd1df5434783abdaa5c8c8ba18b31c874cd73d9f8f
 EBUILD selinux-sendmail-2.20210908-r1.ebuild 281 BLAKE2B 660559ed2fb027b304179c38f83cb55b3a94cdf79974a0739f50aa7f595cfc8eaf0ce2945f8c20cbd105b57ccfc78960912e457843b32080391a8bc808631f4e SHA512 f2a02fffd13d1c2d394c39d16760f39aed1a48cdccf752ff1b0106ebbe8b26534a8eedcafbcbf928faf7c4fd1df5434783abdaa5c8c8ba18b31c874cd73d9f8f
-EBUILD selinux-sendmail-2.20220106-r1.ebuild 285 BLAKE2B b76594356ac1fac176582147992503b46faabaf3593e1a4e6ddd7bad88b99a2e0bd929f04cdb02a357de369445fd060429297ea2e1d89af91b7f5c9ae9dd5a5e SHA512 ffbec00af67bd9c1455f10cc84f623e2be9248f78436f22d530bc61b872daee626a74f314d95cf17671aeb5f08d26ba1dbc06da40bf0d47f61821a6e1ae9ad4b
+EBUILD selinux-sendmail-2.20220106-r1.ebuild 283 BLAKE2B 03e82edaebe517dca56293eafeba6820eca8e013997d596660ec0f61a8108ba999ac0405e49f47931bdce312f2827737c4fbbd722ad911c5477c2a75f1328cb3 SHA512 b82a47d4e025c6e4ce550455c94efcd8ab0ab97fa36066a9b11368097175cc7744c7d3706fcfed5ee176604dbcd051430a9c8ad424853e7c45e49e2acb652b23
+EBUILD selinux-sendmail-2.20220106-r2.ebuild 285 BLAKE2B b76594356ac1fac176582147992503b46faabaf3593e1a4e6ddd7bad88b99a2e0bd929f04cdb02a357de369445fd060429297ea2e1d89af91b7f5c9ae9dd5a5e SHA512 ffbec00af67bd9c1455f10cc84f623e2be9248f78436f22d530bc61b872daee626a74f314d95cf17671aeb5f08d26ba1dbc06da40bf0d47f61821a6e1ae9ad4b
 EBUILD selinux-sendmail-9999.ebuild 285 BLAKE2B 781ee8439a94af9a24e4508de9d9d7c2e16af6e27c4a2b263a9086988f27cdb78e0901a67ad9c927c59addd9eae7ad3be7957fe90c8f29c6f05f7017f5569468 SHA512 0d231eaca4fae30efe38ee99fc97b968e2e7fe5fb31b9b45ddaaf42238c5f337575dd851e24cf54eebcd418676910e40c28447d173150883395027323c48eada
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-sendmail/selinux-sendmail-2.20220106-r1.ebuild b/sec-policy/selinux-sendmail/selinux-sendmail-2.20220106-r1.ebuild
index 1fdebf13c22f..e3a7612d593c 100644
--- a/sec-policy/selinux-sendmail/selinux-sendmail-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-sendmail/selinux-sendmail-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sendmail"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-sendmail/selinux-sendmail-2.20220106-r2.ebuild b/sec-policy/selinux-sendmail/selinux-sendmail-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..1fdebf13c22f
--- /dev/null
+++ b/sec-policy/selinux-sendmail/selinux-sendmail-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="sendmail"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for sendmail"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-sensord/Manifest b/sec-policy/selinux-sensord/Manifest
index 23d996865291..982fe2fbb7ff 100644
--- a/sec-policy/selinux-sensord/Manifest
+++ b/sec-policy/selinux-sensord/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-sensord-2.20200818-r2.ebuild 279 BLAKE2B df1ecfab0ecab775c0268f4cf89af6835f3068dc36940b96888e181f4d68ffab47efc62be391459bf53c8eca33e3b1ae74f06686622257cf0dde3f406e43e0d4 SHA512 fb3fb639d8723011ad48aa118530da32a078a8355e8da459f792f141f13a86f7e541ce28bce897e6bd4a6a13b44d3d5c298dfbe8d2e1e138e83d8d88c690ec18
 EBUILD selinux-sensord-2.20210203-r1.ebuild 279 BLAKE2B df1ecfab0ecab775c0268f4cf89af6835f3068dc36940b96888e181f4d68ffab47efc62be391459bf53c8eca33e3b1ae74f06686622257cf0dde3f406e43e0d4 SHA512 fb3fb639d8723011ad48aa118530da32a078a8355e8da459f792f141f13a86f7e541ce28bce897e6bd4a6a13b44d3d5c298dfbe8d2e1e138e83d8d88c690ec18
 EBUILD selinux-sensord-2.20210908-r1.ebuild 279 BLAKE2B df1ecfab0ecab775c0268f4cf89af6835f3068dc36940b96888e181f4d68ffab47efc62be391459bf53c8eca33e3b1ae74f06686622257cf0dde3f406e43e0d4 SHA512 fb3fb639d8723011ad48aa118530da32a078a8355e8da459f792f141f13a86f7e541ce28bce897e6bd4a6a13b44d3d5c298dfbe8d2e1e138e83d8d88c690ec18
-EBUILD selinux-sensord-2.20220106-r1.ebuild 283 BLAKE2B 8e10dff645bb64f56ad32999a4e6226ff2d662f2e5168736a6889b0c308579a877aeca0e032828d4198b02181301d810e8c426789d26791d5c1b2b3e28511cb9 SHA512 f622440877cb297f8a6e9ca200307446519909fd7af3d3692520608ad18d730e3878913ebefed3106701fa1675cf2780485ab1818282d4ba86f0d4ea0faca655
+EBUILD selinux-sensord-2.20220106-r1.ebuild 281 BLAKE2B 1141e9922e51d072eb39e001e81c6e93a9005c5304d6adc5a008f3a3ae7a5e3332159bdb0ddf875da16e7d2a967cf0f8dab9ecfd4e3738520725f32d862d17ee SHA512 9b1b841b4b011a22b137604331d341542a181fb53695650f662f24485c5a35debe631235609e1537037e5cc9d0bb0c5a809868601a1a06f22abaaba9b844b0ca
+EBUILD selinux-sensord-2.20220106-r2.ebuild 283 BLAKE2B 8e10dff645bb64f56ad32999a4e6226ff2d662f2e5168736a6889b0c308579a877aeca0e032828d4198b02181301d810e8c426789d26791d5c1b2b3e28511cb9 SHA512 f622440877cb297f8a6e9ca200307446519909fd7af3d3692520608ad18d730e3878913ebefed3106701fa1675cf2780485ab1818282d4ba86f0d4ea0faca655
 EBUILD selinux-sensord-9999.ebuild 283 BLAKE2B 920790f576c1dcff52204a0cdcdcbba6d09f6219051d2f9d30df3b4ee414885a0476098a7bf88a5236acd1b2ac6e1cf6db1968b5e341661d8dd556949ba5f7bd SHA512 592f26baebf5b30d8bf011f5e10634abc44a89728477aa3560fdc657e774a7bdf2ef5afea5558866ec9a68a48ef8319f664ecb2806bffff4adcb6100687cfa7a
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-sensord/selinux-sensord-2.20220106-r1.ebuild b/sec-policy/selinux-sensord/selinux-sensord-2.20220106-r1.ebuild
index e2b70a975e0f..d92dc71b8a83 100644
--- a/sec-policy/selinux-sensord/selinux-sensord-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-sensord/selinux-sensord-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sensord"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-sensord/selinux-sensord-2.20220106-r2.ebuild b/sec-policy/selinux-sensord/selinux-sensord-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..e2b70a975e0f
--- /dev/null
+++ b/sec-policy/selinux-sensord/selinux-sensord-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="sensord"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for sensord"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-shorewall/Manifest b/sec-policy/selinux-shorewall/Manifest
index 13c0cea62ecd..c52c405acf2a 100644
--- a/sec-policy/selinux-shorewall/Manifest
+++ b/sec-policy/selinux-shorewall/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-shorewall-2.20200818-r2.ebuild 283 BLAKE2B 813b7f64a107bb3cf35d012e7797ce61cb76b35e3cd5bab31270c12f360f6850b5636417a3126a01b47784022e9d51c943dcc89eed83cda8250a85c9c2743b96 SHA512 868df6b04dc50c239c50ef9e7a8b2d3502adbf851a34c3783f7b3a2a44a4532504f607823df570cac2ee0afebfdc65bc0cf985609cd47df594da7f1524df5ebd
 EBUILD selinux-shorewall-2.20210203-r1.ebuild 283 BLAKE2B 813b7f64a107bb3cf35d012e7797ce61cb76b35e3cd5bab31270c12f360f6850b5636417a3126a01b47784022e9d51c943dcc89eed83cda8250a85c9c2743b96 SHA512 868df6b04dc50c239c50ef9e7a8b2d3502adbf851a34c3783f7b3a2a44a4532504f607823df570cac2ee0afebfdc65bc0cf985609cd47df594da7f1524df5ebd
 EBUILD selinux-shorewall-2.20210908-r1.ebuild 283 BLAKE2B 813b7f64a107bb3cf35d012e7797ce61cb76b35e3cd5bab31270c12f360f6850b5636417a3126a01b47784022e9d51c943dcc89eed83cda8250a85c9c2743b96 SHA512 868df6b04dc50c239c50ef9e7a8b2d3502adbf851a34c3783f7b3a2a44a4532504f607823df570cac2ee0afebfdc65bc0cf985609cd47df594da7f1524df5ebd
-EBUILD selinux-shorewall-2.20220106-r1.ebuild 287 BLAKE2B dbc54b917990450a564180e1df1d3d4501a5fb7a5a7a02d3c8bbc57780c8ecb536e389e76dbed704131d457f8a909cda367c0cca4cf4fbd427e2cd8e55d10ce7 SHA512 5007a132bc7256a94b41f55855c80a6dda26e852add6b713bb353f939a7dec7999cfac8c9903cee43618eb266dd93bde35cf7bf67e7cd9fa5d387287e0c6a8c1
+EBUILD selinux-shorewall-2.20220106-r1.ebuild 285 BLAKE2B 93d44c32e3dc37d3bccf04406c393fb84ca033c7fea0e377713e358c31815bc8c9f4efab17d92e9ed4441bfb1e7d4c29748c52b73d5dd0d6b21213c59f783032 SHA512 50e8d62951ba15d5183c13a0e5eb686b6bbf709a61d3b217e1c8ab1c3ca8f546ffb7e76ab8e74a853d849297281dbd5d618c3736608c09a7b44d0d4a84ab05ae
+EBUILD selinux-shorewall-2.20220106-r2.ebuild 287 BLAKE2B dbc54b917990450a564180e1df1d3d4501a5fb7a5a7a02d3c8bbc57780c8ecb536e389e76dbed704131d457f8a909cda367c0cca4cf4fbd427e2cd8e55d10ce7 SHA512 5007a132bc7256a94b41f55855c80a6dda26e852add6b713bb353f939a7dec7999cfac8c9903cee43618eb266dd93bde35cf7bf67e7cd9fa5d387287e0c6a8c1
 EBUILD selinux-shorewall-9999.ebuild 287 BLAKE2B 32fe09b87238b55ab7f5a6156331853f9bf400c6d11283c9e59e6bbf9ea66b289fabee607b9681c156dfa018b0963a20d66003d4f76827ef60b70d2c4ef8cbe0 SHA512 136ee0e25b9685fa1539fde3138336e104866222f692f5428c3f3d55348471b215126cd6236bc82fbc11063276c14ed53460d9ffeb1a9fd3e84ea554d16dba42
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-shorewall/selinux-shorewall-2.20220106-r1.ebuild b/sec-policy/selinux-shorewall/selinux-shorewall-2.20220106-r1.ebuild
index 2028165030ca..da981d9452bd 100644
--- a/sec-policy/selinux-shorewall/selinux-shorewall-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-shorewall/selinux-shorewall-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for shorewall"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-shorewall/selinux-shorewall-2.20220106-r2.ebuild b/sec-policy/selinux-shorewall/selinux-shorewall-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..2028165030ca
--- /dev/null
+++ b/sec-policy/selinux-shorewall/selinux-shorewall-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="shorewall"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for shorewall"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-shutdown/Manifest b/sec-policy/selinux-shutdown/Manifest
index 466644ec4adf..019d534917c8 100644
--- a/sec-policy/selinux-shutdown/Manifest
+++ b/sec-policy/selinux-shutdown/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-shutdown-2.20200818-r2.ebuild 281 BLAKE2B e5b8bc1343bca2bedb0db32d7e9d94615fef623e49e3f52fc00f4a31e6749f4fdf1f715bdea284fa51f2f75a2cb5c1ae06996b42199a1170119ec30100fedda1 SHA512 39db8f1e7b521a24db509869fe176e8c0be1e3091a22adbde0b931c07fc74360751a03911c6f92dced1e82ab616167faba6f6ba52926e5811e8360373cc8d0b3
 EBUILD selinux-shutdown-2.20210203-r1.ebuild 281 BLAKE2B e5b8bc1343bca2bedb0db32d7e9d94615fef623e49e3f52fc00f4a31e6749f4fdf1f715bdea284fa51f2f75a2cb5c1ae06996b42199a1170119ec30100fedda1 SHA512 39db8f1e7b521a24db509869fe176e8c0be1e3091a22adbde0b931c07fc74360751a03911c6f92dced1e82ab616167faba6f6ba52926e5811e8360373cc8d0b3
 EBUILD selinux-shutdown-2.20210908-r1.ebuild 281 BLAKE2B e5b8bc1343bca2bedb0db32d7e9d94615fef623e49e3f52fc00f4a31e6749f4fdf1f715bdea284fa51f2f75a2cb5c1ae06996b42199a1170119ec30100fedda1 SHA512 39db8f1e7b521a24db509869fe176e8c0be1e3091a22adbde0b931c07fc74360751a03911c6f92dced1e82ab616167faba6f6ba52926e5811e8360373cc8d0b3
-EBUILD selinux-shutdown-2.20220106-r1.ebuild 285 BLAKE2B 5024641ab95d32dea4504708496b14e1d319873855d0f45f366fc18be3dbb25d19014516f92ea582b64627062daf5d5cff5f0e5e7b09622fc8f9335f514c780b SHA512 f6164febb4ef0d9d1d398e96c153804efb68eceb85c5b02350de313b6876b62593d9edaf22e4ee823e957dba2fa49129cced22788399c0799d720af29ede26fe
+EBUILD selinux-shutdown-2.20220106-r1.ebuild 283 BLAKE2B 92a25c24de7cb2528d3a117beacfe755e401f3397f9240dbe998dbb71cfa0968b77d03f4725b1b372793204e9c7104ad10c88c81d9c4b48593fb51bc8f37acfd SHA512 4e9888983e871fa80d980bb9d2890e57c5088eeccda101b5217514b4d6d22ca6e06eec1ef4cf5f93a96596e55aba238b51ec38fea695829d116844ca9febc6b7
+EBUILD selinux-shutdown-2.20220106-r2.ebuild 285 BLAKE2B 5024641ab95d32dea4504708496b14e1d319873855d0f45f366fc18be3dbb25d19014516f92ea582b64627062daf5d5cff5f0e5e7b09622fc8f9335f514c780b SHA512 f6164febb4ef0d9d1d398e96c153804efb68eceb85c5b02350de313b6876b62593d9edaf22e4ee823e957dba2fa49129cced22788399c0799d720af29ede26fe
 EBUILD selinux-shutdown-9999.ebuild 285 BLAKE2B 1d4ee69256c4da81cc04571fb1c177426b4c059d5f03d9174231d4405c0643c85c6aefee989415a65b21abae629ccfeb9a4d38b4a622185b96fde2b8fd690c0d SHA512 7f08fe92724e13d1c0e1dc64c34d316de6eb98ed7f6e1d776940b48fa2586c5c9f8e38fe2c4a6f5d4d4e123206aa780ab7f96e5e13fd612f098503800b5df71c
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-shutdown/selinux-shutdown-2.20220106-r1.ebuild b/sec-policy/selinux-shutdown/selinux-shutdown-2.20220106-r1.ebuild
index 3c9b8980c4f7..cf2fdec7b9d4 100644
--- a/sec-policy/selinux-shutdown/selinux-shutdown-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-shutdown/selinux-shutdown-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for shutdown"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-shutdown/selinux-shutdown-2.20220106-r2.ebuild b/sec-policy/selinux-shutdown/selinux-shutdown-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..3c9b8980c4f7
--- /dev/null
+++ b/sec-policy/selinux-shutdown/selinux-shutdown-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="shutdown"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for shutdown"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-skype/Manifest b/sec-policy/selinux-skype/Manifest
index d8b7fa6d2262..70d8a03b9470 100644
--- a/sec-policy/selinux-skype/Manifest
+++ b/sec-policy/selinux-skype/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-skype-2.20200818-r2.ebuild 377 BLAKE2B 0d5f5041a2afbcb7ff3b86da92af3d2b191fbdf72e3bc5a1c26571b9f23c5d929f35e16a0b28c39836a00134bda8f4dcfd447135fc2a80493385a30c33a99aee SHA512 3b277b939aa41c9c460856ecedfd429093ad8749fc045b378997baf76c2043804711e2a341c63b18d6bd8e128761ffc4116bd325c71497efc59c4378bcbb5753
 EBUILD selinux-skype-2.20210203-r1.ebuild 377 BLAKE2B 0d5f5041a2afbcb7ff3b86da92af3d2b191fbdf72e3bc5a1c26571b9f23c5d929f35e16a0b28c39836a00134bda8f4dcfd447135fc2a80493385a30c33a99aee SHA512 3b277b939aa41c9c460856ecedfd429093ad8749fc045b378997baf76c2043804711e2a341c63b18d6bd8e128761ffc4116bd325c71497efc59c4378bcbb5753
 EBUILD selinux-skype-2.20210908-r1.ebuild 377 BLAKE2B 0d5f5041a2afbcb7ff3b86da92af3d2b191fbdf72e3bc5a1c26571b9f23c5d929f35e16a0b28c39836a00134bda8f4dcfd447135fc2a80493385a30c33a99aee SHA512 3b277b939aa41c9c460856ecedfd429093ad8749fc045b378997baf76c2043804711e2a341c63b18d6bd8e128761ffc4116bd325c71497efc59c4378bcbb5753
-EBUILD selinux-skype-2.20220106-r1.ebuild 381 BLAKE2B dc9f987f3ff8163675eca9468dc91784ad3d4d35ad893813cdb983f6e29251193ff32cab2aac21279521c26ce98b837c719c558de771185697e861ede87e7cde SHA512 bf04d90f805b970a36209a9204dab058deffd8e2575d48b8b5638b1fed86d2f417466f9a1c7151fb515bd7bd337d2c8c4554c32da1abea5be9685d857e0bc122
+EBUILD selinux-skype-2.20220106-r1.ebuild 379 BLAKE2B 355a315b65e00a6681f80d837ef2b4f08e7cab5b1302ad0aa34d6e48fe4c2774a40593c5b12abd9cee379065464d6d2461b6839f17643561d4c68ba1b795e0cd SHA512 361ea172df5f80e99c22408f08a86f4ae5396b9d1c159843c0e78183b3b282c9d5acf51c1ccfe986212d17eeec3a72c448378952009873a449df8fd0b88c6ecd
+EBUILD selinux-skype-2.20220106-r2.ebuild 381 BLAKE2B dc9f987f3ff8163675eca9468dc91784ad3d4d35ad893813cdb983f6e29251193ff32cab2aac21279521c26ce98b837c719c558de771185697e861ede87e7cde SHA512 bf04d90f805b970a36209a9204dab058deffd8e2575d48b8b5638b1fed86d2f417466f9a1c7151fb515bd7bd337d2c8c4554c32da1abea5be9685d857e0bc122
 EBUILD selinux-skype-9999.ebuild 381 BLAKE2B 4e169edfe2664db83107dd259abdd15e53e0b239ea64c6dc34d5c84c59b6e5ed327c3f6ca1a716d28fa0712719b846d91e0bdea11419fa4e01fcc01c1dfbc143 SHA512 43b0ce63303da2bda796d0aba670c153f022961fdb05b85cfb17334f70e5b07808f5283ab50d09a76c46d771cf6f403ff4087cf78194999e975d6435e201a2b4
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-skype/selinux-skype-2.20220106-r1.ebuild b/sec-policy/selinux-skype/selinux-skype-2.20220106-r1.ebuild
index d17609b17e81..83ad1e776529 100644
--- a/sec-policy/selinux-skype/selinux-skype-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-skype/selinux-skype-2.20220106-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for skype"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-skype/selinux-skype-2.20220106-r2.ebuild b/sec-policy/selinux-skype/selinux-skype-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..d17609b17e81
--- /dev/null
+++ b/sec-policy/selinux-skype/selinux-skype-2.20220106-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE="alsa"
+MODS="skype"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for skype"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-xserver
+"
diff --git a/sec-policy/selinux-slocate/Manifest b/sec-policy/selinux-slocate/Manifest
index fd0764f28444..ee0619dec83f 100644
--- a/sec-policy/selinux-slocate/Manifest
+++ b/sec-policy/selinux-slocate/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-slocate-2.20200818-r2.ebuild 279 BLAKE2B 34554f5d60a8a33cf2bdf57116901a89cc26e0a05a3245baaa61354de908f160b8c34e30a78a8e0b50badaf643647695eda51b70a29fdab7f79a63bc274f57f1 SHA512 ca388d6902b387731fef235c223d8027441f61612d7498eeab248da90b636dc21be0350f6389b4e111085abc8b359dd511ddb2253cf462983a24740b515208c9
 EBUILD selinux-slocate-2.20210203-r1.ebuild 279 BLAKE2B 34554f5d60a8a33cf2bdf57116901a89cc26e0a05a3245baaa61354de908f160b8c34e30a78a8e0b50badaf643647695eda51b70a29fdab7f79a63bc274f57f1 SHA512 ca388d6902b387731fef235c223d8027441f61612d7498eeab248da90b636dc21be0350f6389b4e111085abc8b359dd511ddb2253cf462983a24740b515208c9
 EBUILD selinux-slocate-2.20210908-r1.ebuild 279 BLAKE2B 34554f5d60a8a33cf2bdf57116901a89cc26e0a05a3245baaa61354de908f160b8c34e30a78a8e0b50badaf643647695eda51b70a29fdab7f79a63bc274f57f1 SHA512 ca388d6902b387731fef235c223d8027441f61612d7498eeab248da90b636dc21be0350f6389b4e111085abc8b359dd511ddb2253cf462983a24740b515208c9
-EBUILD selinux-slocate-2.20220106-r1.ebuild 283 BLAKE2B a9a45fb65519388ae9bae37e99093b70eb990cbf0830666bc8a79000230bb6a2f339da9f4ec3740b98aa1eb3ee85dee1e1787037f5dab2cf07fd16ce3692668f SHA512 945b8e44dfb01fca4be93d83a78a8e58348b5c8aca7aea501d0f83360bafa89cf24bce355480c7810c2f5469091e80b25330b9da12aa99a74433bdbb1619273b
+EBUILD selinux-slocate-2.20220106-r1.ebuild 281 BLAKE2B 8df171c92c933d2475d4e52e671b9ca3da44934af9c67d2b52589316b209dcfc15a4176b8029b0822c977fdf0e97999aad4f2ed19f4c153d72506993f4a88a41 SHA512 9553d86c382dce6d1677172185d78c497050012ea162cef30080b121011d444c458bb6d85fdacf33721b4138d6ddc7b0a6975318ef3270a86926ffd550b3954b
+EBUILD selinux-slocate-2.20220106-r2.ebuild 283 BLAKE2B a9a45fb65519388ae9bae37e99093b70eb990cbf0830666bc8a79000230bb6a2f339da9f4ec3740b98aa1eb3ee85dee1e1787037f5dab2cf07fd16ce3692668f SHA512 945b8e44dfb01fca4be93d83a78a8e58348b5c8aca7aea501d0f83360bafa89cf24bce355480c7810c2f5469091e80b25330b9da12aa99a74433bdbb1619273b
 EBUILD selinux-slocate-9999.ebuild 283 BLAKE2B 2d2d8b7cf4dd8d0e240b660c824969b29ba028e405fde6648696aaee2e9d483ab4f47dfcff2bb1087ca72263491f2d63472321901c2ef0876f13c570182778c9 SHA512 735b7de0f7d4f31571a1fa251bccd9eace44674d6034d79a401c0f4865a3f7ee7eb6849fcc421f459a58494ec78908698223ebdeb1aa86a3c714a8e3d905fde5
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-slocate/selinux-slocate-2.20220106-r1.ebuild b/sec-policy/selinux-slocate/selinux-slocate-2.20220106-r1.ebuild
index 20be97262f32..7d9d61eb2e05 100644
--- a/sec-policy/selinux-slocate/selinux-slocate-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-slocate/selinux-slocate-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for slocate"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-slocate/selinux-slocate-2.20220106-r2.ebuild b/sec-policy/selinux-slocate/selinux-slocate-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..20be97262f32
--- /dev/null
+++ b/sec-policy/selinux-slocate/selinux-slocate-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="slocate"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for slocate"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-slrnpull/Manifest b/sec-policy/selinux-slrnpull/Manifest
index afed1acef617..ad8772aa103b 100644
--- a/sec-policy/selinux-slrnpull/Manifest
+++ b/sec-policy/selinux-slrnpull/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-slrnpull-2.20200818-r2.ebuild 281 BLAKE2B 6ee4b0af83352de21560e55b904b2d5ce36f007c7152cf9cde312eea54283285f6b616ffc31c8fbb2ea5a28fd18d3e0189a6f1f0e5decd26db018436fb73a80e SHA512 31dd5c55b60ef01de459b0714fd4a87e68479ce5719a5a731f5756e9438dfc3029d67cdd47d4938ffaf2b54b7b597cf74798f9a9fc6e66eb14d676ce6919c69f
 EBUILD selinux-slrnpull-2.20210203-r1.ebuild 281 BLAKE2B 6ee4b0af83352de21560e55b904b2d5ce36f007c7152cf9cde312eea54283285f6b616ffc31c8fbb2ea5a28fd18d3e0189a6f1f0e5decd26db018436fb73a80e SHA512 31dd5c55b60ef01de459b0714fd4a87e68479ce5719a5a731f5756e9438dfc3029d67cdd47d4938ffaf2b54b7b597cf74798f9a9fc6e66eb14d676ce6919c69f
 EBUILD selinux-slrnpull-2.20210908-r1.ebuild 281 BLAKE2B 6ee4b0af83352de21560e55b904b2d5ce36f007c7152cf9cde312eea54283285f6b616ffc31c8fbb2ea5a28fd18d3e0189a6f1f0e5decd26db018436fb73a80e SHA512 31dd5c55b60ef01de459b0714fd4a87e68479ce5719a5a731f5756e9438dfc3029d67cdd47d4938ffaf2b54b7b597cf74798f9a9fc6e66eb14d676ce6919c69f
-EBUILD selinux-slrnpull-2.20220106-r1.ebuild 285 BLAKE2B c8518a8eac60c5b7806185ca659a4e0d85df30483d2356969e4bc51dc38fa587fae17aceb01f96b5a1ff66b8e84307a8e9bc7135705942e3f14143c3796784b6 SHA512 b927b1af236c26c9d9dff1d91cca57f8ceb014b0c7e1ce72b39ba7975cface2adfa4ef4ceb7a9f5ad2c36417b621ae91afe1ee070f1e651910dcbe2645cfb373
+EBUILD selinux-slrnpull-2.20220106-r1.ebuild 283 BLAKE2B b2c0341103a6b4255c951ccf73e14110dff9743d2a2609df6efc49dfcdc4bec6f3e4799daca3fc82f4a7a673d29902ca2501d6858baabc246e1f0cdd8b42eace SHA512 1808eb02ac0bc76f68b07de02fc0274d45953607cc0134a95bb9d9c0cbce56d4e005f497fcd940ab24ca2ac7ff93192e731659d5261449e444b131b2722a4674
+EBUILD selinux-slrnpull-2.20220106-r2.ebuild 285 BLAKE2B c8518a8eac60c5b7806185ca659a4e0d85df30483d2356969e4bc51dc38fa587fae17aceb01f96b5a1ff66b8e84307a8e9bc7135705942e3f14143c3796784b6 SHA512 b927b1af236c26c9d9dff1d91cca57f8ceb014b0c7e1ce72b39ba7975cface2adfa4ef4ceb7a9f5ad2c36417b621ae91afe1ee070f1e651910dcbe2645cfb373
 EBUILD selinux-slrnpull-9999.ebuild 285 BLAKE2B de7729e3c2d2810a0f6698bd13efb550712df8c4ef4b71180ae142cefacc67272374d9d4f2ea891d66c69be5e97fc9f538e191323b1273f6624a7173c8c4300c SHA512 b03ed58926b7877e6118820ea734bafca852edb1f072257dc64876b7865c01c43c3e0eb1922bbb3f347ae47032a0ef8265e30017a182078a8ad751626fecd680
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20220106-r1.ebuild b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20220106-r1.ebuild
index 1c31aa66741b..9661aa4f0d3e 100644
--- a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for slrnpull"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20220106-r2.ebuild b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..1c31aa66741b
--- /dev/null
+++ b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="slrnpull"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for slrnpull"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-smartmon/Manifest b/sec-policy/selinux-smartmon/Manifest
index e2cca3a5173f..7ad140973db4 100644
--- a/sec-policy/selinux-smartmon/Manifest
+++ b/sec-policy/selinux-smartmon/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-smartmon-2.20200818-r2.ebuild 281 BLAKE2B 587ccc2bb17677a35150f6167c34ae1df901650f16b01743a3b9a2c9293446d70dac8b8903411c618705e538a347af6429b8cc581d51c7579beae9b49de405cf SHA512 c9b19084dcfd7a7e8579b4c42cc3e82662b3418e99f1a5f6a664025a569d60ff42b2d73714b7a5dadff5debe2db1b4c964e01202536299c6295b3a266098718e
 EBUILD selinux-smartmon-2.20210203-r1.ebuild 281 BLAKE2B 587ccc2bb17677a35150f6167c34ae1df901650f16b01743a3b9a2c9293446d70dac8b8903411c618705e538a347af6429b8cc581d51c7579beae9b49de405cf SHA512 c9b19084dcfd7a7e8579b4c42cc3e82662b3418e99f1a5f6a664025a569d60ff42b2d73714b7a5dadff5debe2db1b4c964e01202536299c6295b3a266098718e
 EBUILD selinux-smartmon-2.20210908-r1.ebuild 281 BLAKE2B 587ccc2bb17677a35150f6167c34ae1df901650f16b01743a3b9a2c9293446d70dac8b8903411c618705e538a347af6429b8cc581d51c7579beae9b49de405cf SHA512 c9b19084dcfd7a7e8579b4c42cc3e82662b3418e99f1a5f6a664025a569d60ff42b2d73714b7a5dadff5debe2db1b4c964e01202536299c6295b3a266098718e
-EBUILD selinux-smartmon-2.20220106-r1.ebuild 285 BLAKE2B 972ae59b0fbccea46005e0ecddb710067cbda6301b46c38452b44a8976373a818457e0ceafdf9c71c403c9d148936513b3ab54377fbd1347f15cc3b1a8227dc6 SHA512 d49a757dd2c1456be47e33d33fc945e5ba9282a9f75725adf8a491c445886ee9d1b823bf8e766e16086670e04fddc9fcb6df90e68404f5bc2529fc2c0cf3dbd6
+EBUILD selinux-smartmon-2.20220106-r1.ebuild 283 BLAKE2B 46b600eb22b64f442c2093aaf65f1bf2225f48632a27caae005478eb9addb698eb8c91f8535ce55f53cd2ac899c57141e9370679d1d41eefe3bc23a0f8db640c SHA512 fec0886a107a9705557368b6bf3fc81a7acbd72dd615da3a38b36a91773bf0e943e7b2579946a1bce68bef68f3669571176a03df7b5119bab1b3a8c839caac22
+EBUILD selinux-smartmon-2.20220106-r2.ebuild 285 BLAKE2B 972ae59b0fbccea46005e0ecddb710067cbda6301b46c38452b44a8976373a818457e0ceafdf9c71c403c9d148936513b3ab54377fbd1347f15cc3b1a8227dc6 SHA512 d49a757dd2c1456be47e33d33fc945e5ba9282a9f75725adf8a491c445886ee9d1b823bf8e766e16086670e04fddc9fcb6df90e68404f5bc2529fc2c0cf3dbd6
 EBUILD selinux-smartmon-9999.ebuild 285 BLAKE2B 695732951df284a01d7d6ebd136a069368a035c7ff779d49ceb82bf7a115bcd942b708af2f87ce80ea54e7c33fefcf0a633df01d3d461094b6e34cb2a6570de6 SHA512 a0fcdd954586c336d1245cc5c469d1392e6911dd14873e80c7593d30aba940463973129d83685ffa9dcca73aec54f7fd4700618c012292301db6c967851cc215
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-smartmon/selinux-smartmon-2.20220106-r1.ebuild b/sec-policy/selinux-smartmon/selinux-smartmon-2.20220106-r1.ebuild
index 5fd7a52e79c0..0a95652f04bf 100644
--- a/sec-policy/selinux-smartmon/selinux-smartmon-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-smartmon/selinux-smartmon-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for smartmon"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-smartmon/selinux-smartmon-2.20220106-r2.ebuild b/sec-policy/selinux-smartmon/selinux-smartmon-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..5fd7a52e79c0
--- /dev/null
+++ b/sec-policy/selinux-smartmon/selinux-smartmon-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="smartmon"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for smartmon"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-smokeping/Manifest b/sec-policy/selinux-smokeping/Manifest
index 45d4a9b435af..ee30491e6d2a 100644
--- a/sec-policy/selinux-smokeping/Manifest
+++ b/sec-policy/selinux-smokeping/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-smokeping-2.20200818-r2.ebuild 379 BLAKE2B ad640892a82b55d70fc522d1d2c5d41329277a89ac29baf43aa80807f94d4415a66f5645210f7e8c2c23786d3066025959390a2617163b8094f47d824b3c7422 SHA512 c294ad5548a196aba77da7dee74a862dbb921873563618b8083db24476acc85bb3bdc4358d84cb52bb4e221a628e365ec15edda2bcef013d38ba8de8f3c42d31
 EBUILD selinux-smokeping-2.20210203-r1.ebuild 379 BLAKE2B ad640892a82b55d70fc522d1d2c5d41329277a89ac29baf43aa80807f94d4415a66f5645210f7e8c2c23786d3066025959390a2617163b8094f47d824b3c7422 SHA512 c294ad5548a196aba77da7dee74a862dbb921873563618b8083db24476acc85bb3bdc4358d84cb52bb4e221a628e365ec15edda2bcef013d38ba8de8f3c42d31
 EBUILD selinux-smokeping-2.20210908-r1.ebuild 379 BLAKE2B ad640892a82b55d70fc522d1d2c5d41329277a89ac29baf43aa80807f94d4415a66f5645210f7e8c2c23786d3066025959390a2617163b8094f47d824b3c7422 SHA512 c294ad5548a196aba77da7dee74a862dbb921873563618b8083db24476acc85bb3bdc4358d84cb52bb4e221a628e365ec15edda2bcef013d38ba8de8f3c42d31
-EBUILD selinux-smokeping-2.20220106-r1.ebuild 383 BLAKE2B 046b6a8668aa82e645e1a5b775d4fa695f9c257ebc7a9670e929dfa50f3c3c30ff435551a616700a3be6d5bed1e8c049993b6179d90c9fa10ac2b15eaa2fe96b SHA512 245300f83cefd554906a5e3e65ff53b2b98406dd7dcf27dbaf04628c2902415d6ded5a4a88c9c5d44a43bf9c54596cc88b330888bd108814556970fb02ab1dab
+EBUILD selinux-smokeping-2.20220106-r1.ebuild 381 BLAKE2B abb6dc6341c4524eb6020fefedb34e764d519142a946561164e8368e0ff7c5f3278bef8b79d7f34080687bf3858c07784538db061ef7478aec31b4e915b4e2f7 SHA512 806c0f467b113270bba9e2cd62bcc969c8c62aa209ebb13ba28737fb921a43c174753368cafeaf222047bddeb5fceec2e03e7fb3f55f6bff6e7f0be906aeba38
+EBUILD selinux-smokeping-2.20220106-r2.ebuild 383 BLAKE2B 046b6a8668aa82e645e1a5b775d4fa695f9c257ebc7a9670e929dfa50f3c3c30ff435551a616700a3be6d5bed1e8c049993b6179d90c9fa10ac2b15eaa2fe96b SHA512 245300f83cefd554906a5e3e65ff53b2b98406dd7dcf27dbaf04628c2902415d6ded5a4a88c9c5d44a43bf9c54596cc88b330888bd108814556970fb02ab1dab
 EBUILD selinux-smokeping-9999.ebuild 383 BLAKE2B a948265539be13a4047dee2c16e65da8b139ca2843b3e58d6340ece8dbaa5441a489853a72838e62fca9fa162347068e3e52d219cfe55670be9544761882f9b8 SHA512 5c479da79fb0ea7429bb4715c788fc84f856b7d5b9edd441e0ff94a064d7846bf49a326ac0af3772dffb0ef4cbf27b612a8d9181f3245065d284706d080df914
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-smokeping/selinux-smokeping-2.20220106-r1.ebuild b/sec-policy/selinux-smokeping/selinux-smokeping-2.20220106-r1.ebuild
index 4dc1c5f0547f..bceed53a0a4f 100644
--- a/sec-policy/selinux-smokeping/selinux-smokeping-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-smokeping/selinux-smokeping-2.20220106-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for smokeping"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-smokeping/selinux-smokeping-2.20220106-r2.ebuild b/sec-policy/selinux-smokeping/selinux-smokeping-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..4dc1c5f0547f
--- /dev/null
+++ b/sec-policy/selinux-smokeping/selinux-smokeping-2.20220106-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="smokeping"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for smokeping"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-snmp/Manifest b/sec-policy/selinux-snmp/Manifest
index 4ef9d9daebe4..483ce2ce289a 100644
--- a/sec-policy/selinux-snmp/Manifest
+++ b/sec-policy/selinux-snmp/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-snmp-2.20200818-r2.ebuild 273 BLAKE2B 12b4ff073ff434bdd4bff19d35a90926b9e56374bdb5cb724e66530030c4f9d123f167da82b5801cb946bd30f74e88f87ddb5b7345cb442ff3aa428d32d17c95 SHA512 b67266415766d2c5e0473a8994dca18e17034f1f033f4c60c383dbb09e2ade9da2bfc719f0ae92481af51122569de022774b4a893be0c0c73778fc7424f95a72
 EBUILD selinux-snmp-2.20210203-r1.ebuild 273 BLAKE2B 12b4ff073ff434bdd4bff19d35a90926b9e56374bdb5cb724e66530030c4f9d123f167da82b5801cb946bd30f74e88f87ddb5b7345cb442ff3aa428d32d17c95 SHA512 b67266415766d2c5e0473a8994dca18e17034f1f033f4c60c383dbb09e2ade9da2bfc719f0ae92481af51122569de022774b4a893be0c0c73778fc7424f95a72
 EBUILD selinux-snmp-2.20210908-r1.ebuild 273 BLAKE2B 12b4ff073ff434bdd4bff19d35a90926b9e56374bdb5cb724e66530030c4f9d123f167da82b5801cb946bd30f74e88f87ddb5b7345cb442ff3aa428d32d17c95 SHA512 b67266415766d2c5e0473a8994dca18e17034f1f033f4c60c383dbb09e2ade9da2bfc719f0ae92481af51122569de022774b4a893be0c0c73778fc7424f95a72
-EBUILD selinux-snmp-2.20220106-r1.ebuild 277 BLAKE2B 45a3ab6ab7a864a5440652d97ba5e100f3099ed90beed2a812ec8e0b7d3953ec8232e39a5206867acb2ab2496b409541e85fcdd22e3e7a3480c28294c67efc87 SHA512 bdbab1135a2113e1999bd9bc7ff4cbc7dea5403df6b9e13a37defc6743e957d7011dfe5a49d8aaa75ca753e5844b83466a8d29b5e16bd38ba441df114371095d
+EBUILD selinux-snmp-2.20220106-r1.ebuild 275 BLAKE2B 9376c03ffeab141708fd46f89f2af38111e3da5765eff18b9436dfc084b39f441e9a39e5fc6c1e38ead10c36d306572ce09e37a1e459e8027c709f6a1f412dab SHA512 365cbbb76f1b0d7a99fcde8391f9179230719a8e95fa97d9804f09efba44ee5ffb2861e810a57bab102e6bb13ddc092c44d8c79ca8b7c810d302eaf025b40fa2
+EBUILD selinux-snmp-2.20220106-r2.ebuild 277 BLAKE2B 45a3ab6ab7a864a5440652d97ba5e100f3099ed90beed2a812ec8e0b7d3953ec8232e39a5206867acb2ab2496b409541e85fcdd22e3e7a3480c28294c67efc87 SHA512 bdbab1135a2113e1999bd9bc7ff4cbc7dea5403df6b9e13a37defc6743e957d7011dfe5a49d8aaa75ca753e5844b83466a8d29b5e16bd38ba441df114371095d
 EBUILD selinux-snmp-9999.ebuild 277 BLAKE2B 35acf31baf12af096cc871222fd2c7f36ce9ca79cf9f58e2d92718d58f2dde990052cbe8a2aeaa3018b79be6d44bd79ca07a55c45984c7c7d340da006402b1e3 SHA512 06b90bb333b3174854eda1c83a66065145f0b9be1abf10d70ef2774e209f0fe6fa07a966301630a0c946246744c9491a2c925ae6b3c66e95347c65baa770ab08
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-snmp/selinux-snmp-2.20220106-r1.ebuild b/sec-policy/selinux-snmp/selinux-snmp-2.20220106-r1.ebuild
index 371bb7ff5aa7..2476a8fe0b31 100644
--- a/sec-policy/selinux-snmp/selinux-snmp-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-snmp/selinux-snmp-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for snmp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-snmp/selinux-snmp-2.20220106-r2.ebuild b/sec-policy/selinux-snmp/selinux-snmp-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..371bb7ff5aa7
--- /dev/null
+++ b/sec-policy/selinux-snmp/selinux-snmp-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="snmp"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for snmp"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-snort/Manifest b/sec-policy/selinux-snort/Manifest
index 4d1de36262bd..70c7c193d626 100644
--- a/sec-policy/selinux-snort/Manifest
+++ b/sec-policy/selinux-snort/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-snort-2.20200818-r2.ebuild 275 BLAKE2B 94e88821e4f97079a5d49d556647456987b707d3248d24e3d5de6319490b542ba1bccdbfd4da619f87c63bf2882006fd15626ed182133ce3cc788c8761517124 SHA512 8eff7809ab4858e159e00c8491c2cfd639ffb94f145f33d513c05fcae1799e6efe2e865325b032a393d9f2243aa67b1d13c6e28bc288d43edbcbda209d6c2ea2
 EBUILD selinux-snort-2.20210203-r1.ebuild 275 BLAKE2B 94e88821e4f97079a5d49d556647456987b707d3248d24e3d5de6319490b542ba1bccdbfd4da619f87c63bf2882006fd15626ed182133ce3cc788c8761517124 SHA512 8eff7809ab4858e159e00c8491c2cfd639ffb94f145f33d513c05fcae1799e6efe2e865325b032a393d9f2243aa67b1d13c6e28bc288d43edbcbda209d6c2ea2
 EBUILD selinux-snort-2.20210908-r1.ebuild 275 BLAKE2B 94e88821e4f97079a5d49d556647456987b707d3248d24e3d5de6319490b542ba1bccdbfd4da619f87c63bf2882006fd15626ed182133ce3cc788c8761517124 SHA512 8eff7809ab4858e159e00c8491c2cfd639ffb94f145f33d513c05fcae1799e6efe2e865325b032a393d9f2243aa67b1d13c6e28bc288d43edbcbda209d6c2ea2
-EBUILD selinux-snort-2.20220106-r1.ebuild 279 BLAKE2B 8a95152c1a4ccd30795394d5bf6b9b784aa06ef64b1ecc091fc7e65e630a46539d73dc9529636757e55e7cbc4d12237aae0bef337fc988c8422a6780e320fd6b SHA512 a34f3781d6279ee88cacca87546ee92b66198f45a9d9af01bdcbc2c21a21b7628574b5336afb99fef2e65803fb8e85f9fc662566df7ee7148d752fdc573953b1
+EBUILD selinux-snort-2.20220106-r1.ebuild 277 BLAKE2B 978c65b90bf5bbdd7fbd59462acffda3dc9b3eb6fd739912cef8763d4bf8dfbb9582a8b5c1f2de34ac157345179c26fd425c11375d763ebbfd79609355ab62e6 SHA512 5ceecf29764750c8e33f0d786b1b7c061a8d21d1a0dd1521d6ce2653ff9bbb70503c4ae0247271170e990f244ef5b0431bbd8c4cb68c4f41497fb423c4f7f82c
+EBUILD selinux-snort-2.20220106-r2.ebuild 279 BLAKE2B 8a95152c1a4ccd30795394d5bf6b9b784aa06ef64b1ecc091fc7e65e630a46539d73dc9529636757e55e7cbc4d12237aae0bef337fc988c8422a6780e320fd6b SHA512 a34f3781d6279ee88cacca87546ee92b66198f45a9d9af01bdcbc2c21a21b7628574b5336afb99fef2e65803fb8e85f9fc662566df7ee7148d752fdc573953b1
 EBUILD selinux-snort-9999.ebuild 279 BLAKE2B 39e90fb04973d1df64120c4ee77d93ab4b48f8a566fb9817572f932099821982ff793f4b5068c728ad57b758b08e4929ef236979a0f8b9ed9224a007e95fd667 SHA512 f339b7456597526dad461eb179a1c45b820039d7f3b4395393947b0ed0d0155720f24680e346009a4193e981914eacd5e5a540cb3aa3948c7a8344c1457fe000
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-snort/selinux-snort-2.20220106-r1.ebuild b/sec-policy/selinux-snort/selinux-snort-2.20220106-r1.ebuild
index acb2f0f8050d..c70876ce6a4d 100644
--- a/sec-policy/selinux-snort/selinux-snort-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-snort/selinux-snort-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for snort"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-snort/selinux-snort-2.20220106-r2.ebuild b/sec-policy/selinux-snort/selinux-snort-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..acb2f0f8050d
--- /dev/null
+++ b/sec-policy/selinux-snort/selinux-snort-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="snort"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for snort"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-soundserver/Manifest b/sec-policy/selinux-soundserver/Manifest
index dc3b5dce9657..1de715298a44 100644
--- a/sec-policy/selinux-soundserver/Manifest
+++ b/sec-policy/selinux-soundserver/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-soundserver-2.20200818-r2.ebuild 287 BLAKE2B 697cb0fba964cf29bb78b6d811aea6d70c0d3e68fab32d6c8555eb8c33d3076054ed97bb9e92b84c83d2f78295cf9dcf84ad51a5bb50996cd83bda4814455a14 SHA512 3498f105a44e600d0c59c077f77a59ca9b7d857eb12720f4165256e24da738b0c6be67eb47ae5826c84e8b06f41248f454cc3d6cc714ce5d46d8936c835901b1
 EBUILD selinux-soundserver-2.20210203-r1.ebuild 287 BLAKE2B 697cb0fba964cf29bb78b6d811aea6d70c0d3e68fab32d6c8555eb8c33d3076054ed97bb9e92b84c83d2f78295cf9dcf84ad51a5bb50996cd83bda4814455a14 SHA512 3498f105a44e600d0c59c077f77a59ca9b7d857eb12720f4165256e24da738b0c6be67eb47ae5826c84e8b06f41248f454cc3d6cc714ce5d46d8936c835901b1
 EBUILD selinux-soundserver-2.20210908-r1.ebuild 287 BLAKE2B 697cb0fba964cf29bb78b6d811aea6d70c0d3e68fab32d6c8555eb8c33d3076054ed97bb9e92b84c83d2f78295cf9dcf84ad51a5bb50996cd83bda4814455a14 SHA512 3498f105a44e600d0c59c077f77a59ca9b7d857eb12720f4165256e24da738b0c6be67eb47ae5826c84e8b06f41248f454cc3d6cc714ce5d46d8936c835901b1
-EBUILD selinux-soundserver-2.20220106-r1.ebuild 291 BLAKE2B c96da577032345712e83537be7c270c7150ffedb509fc36a39ef01c0449846f7c2561113c9ece2df33ebce70d7667b6f12dc06af1df67b7b1ac685683b6acadb SHA512 f9dc6f961220703857e0c8ab2ebfe4b46e5e6f2218aeb530c7016468f79de907d21401c8316acae2b720bacd74e1fb536312023b393a8743fdf4f1ac6c8c8254
+EBUILD selinux-soundserver-2.20220106-r1.ebuild 289 BLAKE2B 660e4bd88c5a35cf4adfa9c91fa82770d1acfd312ef2929ad98b7ffb48d8f69acbdf364bf73aacabc7b79929e3868ab95093b39813ef281bf933886e28ee2979 SHA512 bb46a9a6ea705988940fef5871ec93e698d17070a18bea3aca8340784e01a3556962c657ccdaa191ab280eec8eca937de7d0456f5f1bbedd2444e1acb4942efe
+EBUILD selinux-soundserver-2.20220106-r2.ebuild 291 BLAKE2B c96da577032345712e83537be7c270c7150ffedb509fc36a39ef01c0449846f7c2561113c9ece2df33ebce70d7667b6f12dc06af1df67b7b1ac685683b6acadb SHA512 f9dc6f961220703857e0c8ab2ebfe4b46e5e6f2218aeb530c7016468f79de907d21401c8316acae2b720bacd74e1fb536312023b393a8743fdf4f1ac6c8c8254
 EBUILD selinux-soundserver-9999.ebuild 291 BLAKE2B abf5341987885f67a06021e3a63d84ea94ad1f3edf933abb42fc405b573410056b051fda46a4651430acb6f15d5e6597828199fff14d5b147b4e936146e28c37 SHA512 7328e86627fdd2e3458c372807df679839d6faf95096a3ab592b071644360be5a9a02c6dfecce9d981f033fb34968c0288df1122409e931d1ecb2add23e93fd7
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-soundserver/selinux-soundserver-2.20220106-r1.ebuild b/sec-policy/selinux-soundserver/selinux-soundserver-2.20220106-r1.ebuild
index 5821db8265fb..c2ded355dec1 100644
--- a/sec-policy/selinux-soundserver/selinux-soundserver-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-soundserver/selinux-soundserver-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for soundserver"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-soundserver/selinux-soundserver-2.20220106-r2.ebuild b/sec-policy/selinux-soundserver/selinux-soundserver-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..5821db8265fb
--- /dev/null
+++ b/sec-policy/selinux-soundserver/selinux-soundserver-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="soundserver"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for soundserver"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-spamassassin/Manifest b/sec-policy/selinux-spamassassin/Manifest
index 858c80a88c8a..9347cb1b8c3a 100644
--- a/sec-policy/selinux-spamassassin/Manifest
+++ b/sec-policy/selinux-spamassassin/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-spamassassin-2.20200818-r2.ebuild 289 BLAKE2B ba4c2ff974d1c9a24f08fe7d36217ca92fbefc9ac8d065f9f80959740f2d81efbfece29727aef5595c4210e4c6d4f57ccd0f09329dd9e59642ef38b9f77d67b1 SHA512 ec037eb64cd77f3399ec5ab526763ae359106c5eeb5ebd7a5722dd0575f27b7b23cb7e71e030374cd28d58414ed830a2254344741fcb64307d80ecdc322c3b5d
 EBUILD selinux-spamassassin-2.20210203-r1.ebuild 289 BLAKE2B ba4c2ff974d1c9a24f08fe7d36217ca92fbefc9ac8d065f9f80959740f2d81efbfece29727aef5595c4210e4c6d4f57ccd0f09329dd9e59642ef38b9f77d67b1 SHA512 ec037eb64cd77f3399ec5ab526763ae359106c5eeb5ebd7a5722dd0575f27b7b23cb7e71e030374cd28d58414ed830a2254344741fcb64307d80ecdc322c3b5d
 EBUILD selinux-spamassassin-2.20210908-r1.ebuild 289 BLAKE2B ba4c2ff974d1c9a24f08fe7d36217ca92fbefc9ac8d065f9f80959740f2d81efbfece29727aef5595c4210e4c6d4f57ccd0f09329dd9e59642ef38b9f77d67b1 SHA512 ec037eb64cd77f3399ec5ab526763ae359106c5eeb5ebd7a5722dd0575f27b7b23cb7e71e030374cd28d58414ed830a2254344741fcb64307d80ecdc322c3b5d
-EBUILD selinux-spamassassin-2.20220106-r1.ebuild 293 BLAKE2B ad240931b1f404a86de35e6217d95513bce39a315b033c66605cb34349107fc7b1bd30e13a18d51b7c6f8481ee0a8d486080c9194d1b81b0552031a37a208e40 SHA512 f390662d11e07dfccc4db095552bc8ed4eb07b5cc47e84cd96afc84bb257b3b91d887e9218fbac0292ee101433cf5c97938848ce5b8f856cfea13c374e4f3df2
+EBUILD selinux-spamassassin-2.20220106-r1.ebuild 291 BLAKE2B eeb400014a3e0f174335ba69df7765450d738a24203b4fd9cf62e05a1139f9b642aa445f46f505fe0306c91d5e41f1c748f7f2843e2bb01fd3f555274c2b6ed4 SHA512 a9f24fb0c9ad7fd07bc5aae0260b238b83a6889e2d791945a3293a9f9823697cc382663caa3cd005095f1976ce3bb7534fd4b23bb0406be30b5c90e4cc8909ee
+EBUILD selinux-spamassassin-2.20220106-r2.ebuild 293 BLAKE2B ad240931b1f404a86de35e6217d95513bce39a315b033c66605cb34349107fc7b1bd30e13a18d51b7c6f8481ee0a8d486080c9194d1b81b0552031a37a208e40 SHA512 f390662d11e07dfccc4db095552bc8ed4eb07b5cc47e84cd96afc84bb257b3b91d887e9218fbac0292ee101433cf5c97938848ce5b8f856cfea13c374e4f3df2
 EBUILD selinux-spamassassin-9999.ebuild 293 BLAKE2B 38afce80048ecb576a1ee4194ab8f4bec0f62fe3805ffe3a18a975f89a42a2d87966d5c95f1271aa924638403fa42304281e89312ff6cdb7143dfdd7b925086e SHA512 a701f652ff1f536361760a5cedf97f9beae0873343f77afb672174b30df4a491acf04cc4032100e7f25d7dd46ff46e2170f259a33d3acec550e5de5f05f6a201
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20220106-r1.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20220106-r1.ebuild
index 3abe0e7d7048..7f0ee56b25af 100644
--- a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for spamassassin"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20220106-r2.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..3abe0e7d7048
--- /dev/null
+++ b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="spamassassin"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for spamassassin"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-squid/Manifest b/sec-policy/selinux-squid/Manifest
index 474ebd6966ec..2626c6ef5cd0 100644
--- a/sec-policy/selinux-squid/Manifest
+++ b/sec-policy/selinux-squid/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-squid-2.20200818-r2.ebuild 371 BLAKE2B 3fc3760abda82166b112104128ded50d6be288a265f573884b362949be77dbd6aac5cbcf79bffdbeb87ad6ee38d79a96a72aa414b0846747e59b450ee7b9e45d SHA512 9ad86cb59ced1cfb53d589f6e04457d3285316d7acbd26875c4a8889b25cee68876ee15f1d0dfffc56573973e3352bf870d9241bcb3bb7a75f5d1829a30890fe
 EBUILD selinux-squid-2.20210203-r1.ebuild 371 BLAKE2B 3fc3760abda82166b112104128ded50d6be288a265f573884b362949be77dbd6aac5cbcf79bffdbeb87ad6ee38d79a96a72aa414b0846747e59b450ee7b9e45d SHA512 9ad86cb59ced1cfb53d589f6e04457d3285316d7acbd26875c4a8889b25cee68876ee15f1d0dfffc56573973e3352bf870d9241bcb3bb7a75f5d1829a30890fe
 EBUILD selinux-squid-2.20210908-r1.ebuild 371 BLAKE2B 3fc3760abda82166b112104128ded50d6be288a265f573884b362949be77dbd6aac5cbcf79bffdbeb87ad6ee38d79a96a72aa414b0846747e59b450ee7b9e45d SHA512 9ad86cb59ced1cfb53d589f6e04457d3285316d7acbd26875c4a8889b25cee68876ee15f1d0dfffc56573973e3352bf870d9241bcb3bb7a75f5d1829a30890fe
-EBUILD selinux-squid-2.20220106-r1.ebuild 375 BLAKE2B 5adf0b4ee4d72aa0ecce63ed503f72c41beba175d224fe0bfdaecc7476364fc27e197778f7a2a7ed2f755f4887fb0803716604f1b2787c06993da483b6a59feb SHA512 491568122ca983e1a221b4023ae3c383b520213a1503f91b61ed7efbc520bb6f0cc64c60347b8965603e1e43f38a2e7897947e074ad818694ecd8bbcad2dcaaa
+EBUILD selinux-squid-2.20220106-r1.ebuild 373 BLAKE2B 5f1f3ad233a196be77f35e04246a2b1c2ad639f8d07743949332f1c457325db8fb8981b738afdcf6a39b0e1162313b54092a2b16df0eff6aefc125d34f28bf6f SHA512 3f02835fa080eb5c6f9a682c830b8e1290893dbeee63f2948bf4cc7b095eff9d039c5485595e40f81884e3f1e526082580e85c574b0238f6461b81743dbfe809
+EBUILD selinux-squid-2.20220106-r2.ebuild 375 BLAKE2B 5adf0b4ee4d72aa0ecce63ed503f72c41beba175d224fe0bfdaecc7476364fc27e197778f7a2a7ed2f755f4887fb0803716604f1b2787c06993da483b6a59feb SHA512 491568122ca983e1a221b4023ae3c383b520213a1503f91b61ed7efbc520bb6f0cc64c60347b8965603e1e43f38a2e7897947e074ad818694ecd8bbcad2dcaaa
 EBUILD selinux-squid-9999.ebuild 375 BLAKE2B 29f8585261fd6ef6f7329c915f74c86ca425a27b3511a41369095f62248fd83cea28ca8fab6e1a8e9cef6282a29b9616319da831edef51f74a750088869a6a0f SHA512 ebabe89c276e03ee8c412e1baa977cf166f8d4274cf2eec04b0a86064274f85fe3ae6251bfb99301532b198f9bf6ff7ac81772a75be67dcf79254e0283c770b5
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-squid/selinux-squid-2.20220106-r1.ebuild b/sec-policy/selinux-squid/selinux-squid-2.20220106-r1.ebuild
index dc8fc9c50556..cf24d0c555b6 100644
--- a/sec-policy/selinux-squid/selinux-squid-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-squid/selinux-squid-2.20220106-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for squid"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-squid/selinux-squid-2.20220106-r2.ebuild b/sec-policy/selinux-squid/selinux-squid-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..dc8fc9c50556
--- /dev/null
+++ b/sec-policy/selinux-squid/selinux-squid-2.20220106-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="squid"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for squid"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-sssd/Manifest b/sec-policy/selinux-sssd/Manifest
index 0bd6aea89840..67f195af23b4 100644
--- a/sec-policy/selinux-sssd/Manifest
+++ b/sec-policy/selinux-sssd/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-sssd-2.20200818-r2.ebuild 273 BLAKE2B 23013c06f878f4b3968a7b1c7303e92637e73c829918c813440c04af275e4a817f37d6b1dd234f2380511b57c355a18c9f110ad93771f6dbd5585cce87777510 SHA512 d950c0cf7e7ea29ccc487c0d92d44975990b80ff494530af7bf94ae39f096189fe30cb604be15297dc8b400c1bb860b7307ede77387bb270f540702e50573e7b
 EBUILD selinux-sssd-2.20210203-r1.ebuild 273 BLAKE2B 23013c06f878f4b3968a7b1c7303e92637e73c829918c813440c04af275e4a817f37d6b1dd234f2380511b57c355a18c9f110ad93771f6dbd5585cce87777510 SHA512 d950c0cf7e7ea29ccc487c0d92d44975990b80ff494530af7bf94ae39f096189fe30cb604be15297dc8b400c1bb860b7307ede77387bb270f540702e50573e7b
 EBUILD selinux-sssd-2.20210908-r1.ebuild 273 BLAKE2B 23013c06f878f4b3968a7b1c7303e92637e73c829918c813440c04af275e4a817f37d6b1dd234f2380511b57c355a18c9f110ad93771f6dbd5585cce87777510 SHA512 d950c0cf7e7ea29ccc487c0d92d44975990b80ff494530af7bf94ae39f096189fe30cb604be15297dc8b400c1bb860b7307ede77387bb270f540702e50573e7b
-EBUILD selinux-sssd-2.20220106-r1.ebuild 277 BLAKE2B 30d281874d2ce9d01e53b3c7efe592893faa239fba7a835003b249f68733e6c4579fe53951850d67b04d646bda4c90d8562bace163f7f7bef84fc65ade6b7cca SHA512 4e2a64e7934b6e5f004d5328992bb08e367dfdbb76380198e6e7abf0209a626c0e388881794f9f046d6d3f1a3b108835ab37fa4b2a54a136fbb083f3a307eb74
+EBUILD selinux-sssd-2.20220106-r1.ebuild 275 BLAKE2B b877e9e6bf7344caed12d4cc054594f101bc8a7014115b0d03ca36b2b4b63f79432ba4218c7f485d4dfdb490e80b311255404f95fad81b61f207f0fc0afa9dc9 SHA512 94a52791d6a637d027f5a1cfe6614345d90a926702214b681244f656899f4a7e7f35105c87d328c9223cd260531facb89560a9757efa3da80fbca53785e6a2bd
+EBUILD selinux-sssd-2.20220106-r2.ebuild 277 BLAKE2B 30d281874d2ce9d01e53b3c7efe592893faa239fba7a835003b249f68733e6c4579fe53951850d67b04d646bda4c90d8562bace163f7f7bef84fc65ade6b7cca SHA512 4e2a64e7934b6e5f004d5328992bb08e367dfdbb76380198e6e7abf0209a626c0e388881794f9f046d6d3f1a3b108835ab37fa4b2a54a136fbb083f3a307eb74
 EBUILD selinux-sssd-9999.ebuild 277 BLAKE2B 07739aaa6e53cfd55014bf2230eae1371584428981a92b71ad7d3420d81a6e490686429339bbff525c682da9583b4b0a2adf8e17e8049dd7fa587853622a4d75 SHA512 dd38a5e7743ca2d97a973d4fa916ab09958af6aa98fe0534e1ef40e497abc6e2130c6d60251efc3d2aff5cba1d22dc15b15f01330c2caf6b7f36d51e36bca45b
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-sssd/selinux-sssd-2.20220106-r1.ebuild b/sec-policy/selinux-sssd/selinux-sssd-2.20220106-r1.ebuild
index 6bb2ebbfe0b4..6019cee644aa 100644
--- a/sec-policy/selinux-sssd/selinux-sssd-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-sssd/selinux-sssd-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sssd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-sssd/selinux-sssd-2.20220106-r2.ebuild b/sec-policy/selinux-sssd/selinux-sssd-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..6bb2ebbfe0b4
--- /dev/null
+++ b/sec-policy/selinux-sssd/selinux-sssd-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="sssd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for sssd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-stunnel/Manifest b/sec-policy/selinux-stunnel/Manifest
index f00b2a9a7875..3905d950b3f4 100644
--- a/sec-policy/selinux-stunnel/Manifest
+++ b/sec-policy/selinux-stunnel/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-stunnel-2.20200818-r2.ebuild 279 BLAKE2B a2ae464c6e5f80629f5936a61d7d42b2e7dc67bec171b744a6b0e0cff30f7d9b86823c6f14e6bb0681d6ba46c16e3c1e0b25633904e3d35090c5d30fa674e820 SHA512 db5955dba2d67852f6b21368772adb0a02ec07dc4fd0e3c5d490c49d6e66bdb015dedee8e4aa1f6e88f2f7a71cc852b97594d8a1988ec2b78e7cb49e8d42fd9d
 EBUILD selinux-stunnel-2.20210203-r1.ebuild 279 BLAKE2B a2ae464c6e5f80629f5936a61d7d42b2e7dc67bec171b744a6b0e0cff30f7d9b86823c6f14e6bb0681d6ba46c16e3c1e0b25633904e3d35090c5d30fa674e820 SHA512 db5955dba2d67852f6b21368772adb0a02ec07dc4fd0e3c5d490c49d6e66bdb015dedee8e4aa1f6e88f2f7a71cc852b97594d8a1988ec2b78e7cb49e8d42fd9d
 EBUILD selinux-stunnel-2.20210908-r1.ebuild 279 BLAKE2B a2ae464c6e5f80629f5936a61d7d42b2e7dc67bec171b744a6b0e0cff30f7d9b86823c6f14e6bb0681d6ba46c16e3c1e0b25633904e3d35090c5d30fa674e820 SHA512 db5955dba2d67852f6b21368772adb0a02ec07dc4fd0e3c5d490c49d6e66bdb015dedee8e4aa1f6e88f2f7a71cc852b97594d8a1988ec2b78e7cb49e8d42fd9d
-EBUILD selinux-stunnel-2.20220106-r1.ebuild 283 BLAKE2B 67563fae66e4caa788ce5bfef114c667f49f2158d32424139e62250cecaad72d114c490aa32f84fd0a70319303f0f2f2e26a0bb0cb001c425d102a57b79ae402 SHA512 b100f0c85758df319f0e15ccb1c9252c169ed07852eac7b48c04cfa842794abaadd2a043537ef5461c946d21c93b5047ef5f9bb64fced1954d9f16da1eb51b2e
+EBUILD selinux-stunnel-2.20220106-r1.ebuild 281 BLAKE2B 4a9632c59afefa700b427aebcb054dc82dbffc0e462f8f5e7b5bbf36a76b48ac576b2270189b69b105c4e4356e9be03c2cea6cf9c855c107f66b920a01295f41 SHA512 6a38a731273d34b29db3e858915c70424e57a5327b481ede7a08c40a69ac2d56deed8e61ad4ec8bd9101c7f00fe51d8a5576feea644d0e13fac99eca2d1d23b6
+EBUILD selinux-stunnel-2.20220106-r2.ebuild 283 BLAKE2B 67563fae66e4caa788ce5bfef114c667f49f2158d32424139e62250cecaad72d114c490aa32f84fd0a70319303f0f2f2e26a0bb0cb001c425d102a57b79ae402 SHA512 b100f0c85758df319f0e15ccb1c9252c169ed07852eac7b48c04cfa842794abaadd2a043537ef5461c946d21c93b5047ef5f9bb64fced1954d9f16da1eb51b2e
 EBUILD selinux-stunnel-9999.ebuild 283 BLAKE2B 22c5a77e4314267389fadffa831513ae60d4e0bb2dd6262104395d03e7c10262674f572a0d2bcbad4504b03ca7557bf875ad51c83b525b22072646d5c9a5ad1b SHA512 9497d7f95bb95a777f4393ce99301dc807403fa179c3284f3f1dcd9ac93ea64293265654aaee38f8394a58fad1e035e415bc5b27df6dd0d42dd584e6cae3d478
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-stunnel/selinux-stunnel-2.20220106-r1.ebuild b/sec-policy/selinux-stunnel/selinux-stunnel-2.20220106-r1.ebuild
index d7dacfdd2607..48e8567bb387 100644
--- a/sec-policy/selinux-stunnel/selinux-stunnel-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-stunnel/selinux-stunnel-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for stunnel"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-stunnel/selinux-stunnel-2.20220106-r2.ebuild b/sec-policy/selinux-stunnel/selinux-stunnel-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..d7dacfdd2607
--- /dev/null
+++ b/sec-policy/selinux-stunnel/selinux-stunnel-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="stunnel"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for stunnel"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-subsonic/Manifest b/sec-policy/selinux-subsonic/Manifest
index 6b37b9e122ba..9d36f23ae8ee 100644
--- a/sec-policy/selinux-subsonic/Manifest
+++ b/sec-policy/selinux-subsonic/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-subsonic-2.20200818-r2.ebuild 281 BLAKE2B 0bd02329c4232b22e929a7175af560d6c1e5716c1e718ce822ae9e4dfb98c42cefb5e34bee496dfd17438d33f48ca4394c88d94c6045b24a8c511d7bc52130b1 SHA512 2772052fee012a25e217d5f7b8132be4f784eae1bc9921f2f868bf2f197524ec66b23ec32c3444ffeb37fc7f59db61fb1caaa65310f099b9f85684c5766df4da
 EBUILD selinux-subsonic-2.20210203-r1.ebuild 281 BLAKE2B 0bd02329c4232b22e929a7175af560d6c1e5716c1e718ce822ae9e4dfb98c42cefb5e34bee496dfd17438d33f48ca4394c88d94c6045b24a8c511d7bc52130b1 SHA512 2772052fee012a25e217d5f7b8132be4f784eae1bc9921f2f868bf2f197524ec66b23ec32c3444ffeb37fc7f59db61fb1caaa65310f099b9f85684c5766df4da
 EBUILD selinux-subsonic-2.20210908-r1.ebuild 281 BLAKE2B 0bd02329c4232b22e929a7175af560d6c1e5716c1e718ce822ae9e4dfb98c42cefb5e34bee496dfd17438d33f48ca4394c88d94c6045b24a8c511d7bc52130b1 SHA512 2772052fee012a25e217d5f7b8132be4f784eae1bc9921f2f868bf2f197524ec66b23ec32c3444ffeb37fc7f59db61fb1caaa65310f099b9f85684c5766df4da
-EBUILD selinux-subsonic-2.20220106-r1.ebuild 285 BLAKE2B 7c408dde7d3bf20d75e5f621ab6d1f56e66de203313da01b37e51c3841fcb052af9a40a7aaf788e15ffd92f9e3fd734f7856eac27c2d6af64b2f2b20aa1c12e7 SHA512 ee97e254a03ae4936493845d89a5061f2f7f6f453fd06d89866aa4fa3f93cd909bcceec5f03801cb82bf9fa012b65671d48857f6ef2feb32760b9117e774d300
+EBUILD selinux-subsonic-2.20220106-r1.ebuild 283 BLAKE2B dc3eeea786de122aad912d616312a0b69beaa47f01529a215e8058cecaeb0e9d0177539ed4293aa27b36437ac758ffac6a40d15549f5cd3d6e34999048e4c931 SHA512 ec6fff1babc60867d825ab6e4dfc719680699a3016d7b2eccbc3723883487eaaf58fddb66a2b09a3de97d361035ad8a9ff0797a5b9c4ba68e765cbac122ce944
+EBUILD selinux-subsonic-2.20220106-r2.ebuild 285 BLAKE2B 7c408dde7d3bf20d75e5f621ab6d1f56e66de203313da01b37e51c3841fcb052af9a40a7aaf788e15ffd92f9e3fd734f7856eac27c2d6af64b2f2b20aa1c12e7 SHA512 ee97e254a03ae4936493845d89a5061f2f7f6f453fd06d89866aa4fa3f93cd909bcceec5f03801cb82bf9fa012b65671d48857f6ef2feb32760b9117e774d300
 EBUILD selinux-subsonic-9999.ebuild 285 BLAKE2B c002dab89c203ca6da43e8c1b752c08840a4fe4fbc0caafee2243e67c07fcc6d2f20bc05c49813b29e6e635094efe737b2c1956c34cbcd95de890d1fb3a60e40 SHA512 3b19efd3ed600d65559f77d22cb729e729c74210d640fb60e77cba2191caa23bf2d73697cd969784a78e7105cdc8e21159c55605e7c03a3c9f2f62ca2ad70833
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-subsonic/selinux-subsonic-2.20220106-r1.ebuild b/sec-policy/selinux-subsonic/selinux-subsonic-2.20220106-r1.ebuild
index e82c7f8b670e..feb6041d5293 100644
--- a/sec-policy/selinux-subsonic/selinux-subsonic-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-subsonic/selinux-subsonic-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for subsonic"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-subsonic/selinux-subsonic-2.20220106-r2.ebuild b/sec-policy/selinux-subsonic/selinux-subsonic-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..e82c7f8b670e
--- /dev/null
+++ b/sec-policy/selinux-subsonic/selinux-subsonic-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="subsonic"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for subsonic"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-sudo/Manifest b/sec-policy/selinux-sudo/Manifest
index 99f7fd6c2b4c..7cc19a63e898 100644
--- a/sec-policy/selinux-sudo/Manifest
+++ b/sec-policy/selinux-sudo/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-sudo-2.20200818-r2.ebuild 273 BLAKE2B c0146708586d66999065c3bc642b964488d4d7318a85c7d48ca8df1593a8dbf6b9b2145943b8551daa08b5563422e43d873e760665d2c0799e53aaddc9517ae7 SHA512 9eba20091d9deb96337ae97ba9f5bffd609f757b387126bcb0bd4761abf673eb00daa4103525adf9acded3254405df1c01f5edaa66fce63b425b5e5ab7aef8c3
 EBUILD selinux-sudo-2.20210203-r1.ebuild 273 BLAKE2B c0146708586d66999065c3bc642b964488d4d7318a85c7d48ca8df1593a8dbf6b9b2145943b8551daa08b5563422e43d873e760665d2c0799e53aaddc9517ae7 SHA512 9eba20091d9deb96337ae97ba9f5bffd609f757b387126bcb0bd4761abf673eb00daa4103525adf9acded3254405df1c01f5edaa66fce63b425b5e5ab7aef8c3
 EBUILD selinux-sudo-2.20210908-r1.ebuild 273 BLAKE2B c0146708586d66999065c3bc642b964488d4d7318a85c7d48ca8df1593a8dbf6b9b2145943b8551daa08b5563422e43d873e760665d2c0799e53aaddc9517ae7 SHA512 9eba20091d9deb96337ae97ba9f5bffd609f757b387126bcb0bd4761abf673eb00daa4103525adf9acded3254405df1c01f5edaa66fce63b425b5e5ab7aef8c3
-EBUILD selinux-sudo-2.20220106-r1.ebuild 277 BLAKE2B 528e48f5d07bddd15a9c2333cdf7c1241e9d0a71e96e3fe82c67860bb1240a97b5dd08707ef01a770187711591c9fb416092654b237fdea8f6d10867b6a4b37d SHA512 6adf09923fd97db495292da13c9b95e3919f7d07449a4c8da128923bae5666e604b065652cdb45829e87129cd815d79ad3c3ecbb4a5f53573d8c4f436112dfee
+EBUILD selinux-sudo-2.20220106-r1.ebuild 275 BLAKE2B 4029530fb2128fb563af920b167428202e35ec7eea5156f457c1f6114931a67d133b52244b9d91009e893efb3f6e3f039eb2e7cf5d775f495f39fe5f04cc9caa SHA512 24f439437c1eee3955dde572e68b506313755d4443c43da13b35ebe6a0b2345e62f5b5b3fb765474aa885832c468dcdd5586c51a426bd73d8ac43060cc06919f
+EBUILD selinux-sudo-2.20220106-r2.ebuild 277 BLAKE2B 528e48f5d07bddd15a9c2333cdf7c1241e9d0a71e96e3fe82c67860bb1240a97b5dd08707ef01a770187711591c9fb416092654b237fdea8f6d10867b6a4b37d SHA512 6adf09923fd97db495292da13c9b95e3919f7d07449a4c8da128923bae5666e604b065652cdb45829e87129cd815d79ad3c3ecbb4a5f53573d8c4f436112dfee
 EBUILD selinux-sudo-9999.ebuild 277 BLAKE2B c495a5fbfa900ee49188a485abc5dfae030c8c50c88ce6602106162ffcc80be6652839d158731b83fb0c9ba399c535e60c5bff024905d64e36aefd49a05a962a SHA512 a1ae8bcf35e24bd08cebae9e60dafccd56221b283331a1c398b2c343ae475d2a9f67b3045a36aec4826fa8a5ddc1b7b4f95958fcaa7640d4335f9310537ddf33
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-sudo/selinux-sudo-2.20220106-r1.ebuild b/sec-policy/selinux-sudo/selinux-sudo-2.20220106-r1.ebuild
index d307bad670b1..76dd4cfd342a 100644
--- a/sec-policy/selinux-sudo/selinux-sudo-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-sudo/selinux-sudo-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sudo"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-sudo/selinux-sudo-2.20220106-r2.ebuild b/sec-policy/selinux-sudo/selinux-sudo-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..d307bad670b1
--- /dev/null
+++ b/sec-policy/selinux-sudo/selinux-sudo-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="sudo"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for sudo"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-sxid/Manifest b/sec-policy/selinux-sxid/Manifest
index ba1b6a43efbf..fa1add2c35d7 100644
--- a/sec-policy/selinux-sxid/Manifest
+++ b/sec-policy/selinux-sxid/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-sxid-2.20200818-r2.ebuild 273 BLAKE2B 063df74d6dca176bd4c28f7368bd8ca3686a6074aa98a6e6ed7af05bffc06a8cbb188dcfe891ab46602db41a6cf510125b8da8a31fcbcff862358be37cac41ce SHA512 d70f16d9fdc027850b9c5df12e2eb9764f7707449763467553dfaf1ab6f29fa07b23942e5c39663762a04b5893c2edbf297ba38bfb1a04759aab4934db5a8c1f
 EBUILD selinux-sxid-2.20210203-r1.ebuild 273 BLAKE2B 063df74d6dca176bd4c28f7368bd8ca3686a6074aa98a6e6ed7af05bffc06a8cbb188dcfe891ab46602db41a6cf510125b8da8a31fcbcff862358be37cac41ce SHA512 d70f16d9fdc027850b9c5df12e2eb9764f7707449763467553dfaf1ab6f29fa07b23942e5c39663762a04b5893c2edbf297ba38bfb1a04759aab4934db5a8c1f
 EBUILD selinux-sxid-2.20210908-r1.ebuild 273 BLAKE2B 063df74d6dca176bd4c28f7368bd8ca3686a6074aa98a6e6ed7af05bffc06a8cbb188dcfe891ab46602db41a6cf510125b8da8a31fcbcff862358be37cac41ce SHA512 d70f16d9fdc027850b9c5df12e2eb9764f7707449763467553dfaf1ab6f29fa07b23942e5c39663762a04b5893c2edbf297ba38bfb1a04759aab4934db5a8c1f
-EBUILD selinux-sxid-2.20220106-r1.ebuild 277 BLAKE2B 37440649312cac5c66aff62407f36daf313fce9be5a52681d9f6890c1c3ae4e2eebacc4cf20bdbc7b600c4fb2c3c52e8382b34ee12b74e855a2987e1a86e4b39 SHA512 8d52ea6ba255dc9e4d151b4e5d4fd4780f8fbb8583f1baffbdc963b020adb4d4dc434a59b57e0badaa8eb38fb9e94c4df5611183735b56782669ace8d8fde345
+EBUILD selinux-sxid-2.20220106-r1.ebuild 275 BLAKE2B 92441f210747a20e0b6682379548c99cc1ab0be3ac274375cb66fb47b92179cc03a7c9bd697eeaa096e266250aa0116ce09dccc34a009adddf4f42e8b5d1f9e7 SHA512 06a7c90ef2b79bae04da631b9b70080ae511ceccd2ecd3c144149193e88843c9ce366dc6532c2c8706cf00ea2f62ee5b20682dc2f481ab16e5597827c8d02421
+EBUILD selinux-sxid-2.20220106-r2.ebuild 277 BLAKE2B 37440649312cac5c66aff62407f36daf313fce9be5a52681d9f6890c1c3ae4e2eebacc4cf20bdbc7b600c4fb2c3c52e8382b34ee12b74e855a2987e1a86e4b39 SHA512 8d52ea6ba255dc9e4d151b4e5d4fd4780f8fbb8583f1baffbdc963b020adb4d4dc434a59b57e0badaa8eb38fb9e94c4df5611183735b56782669ace8d8fde345
 EBUILD selinux-sxid-9999.ebuild 277 BLAKE2B c4e4441a6df0c1ecf2bc93512fa951fbf52b7f86a21947d79c4f06d84f3fb8a08dc2ec1fa4cd89d89982ecf3896b3b98bb7cb96cbc4a0a4a0b885efddb1a8836 SHA512 5d219584acfab1c7c8884f9d6f0b4075156088519cc6dd63ce7cb9a88f5d360af762eb73acba81aec203fbeabe48f5ec79c15f2b2847c5b0f2f9f43df5c5389e
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-sxid/selinux-sxid-2.20220106-r1.ebuild b/sec-policy/selinux-sxid/selinux-sxid-2.20220106-r1.ebuild
index 3e3263270ecf..b88365840fe3 100644
--- a/sec-policy/selinux-sxid/selinux-sxid-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-sxid/selinux-sxid-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sxid"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-sxid/selinux-sxid-2.20220106-r2.ebuild b/sec-policy/selinux-sxid/selinux-sxid-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..3e3263270ecf
--- /dev/null
+++ b/sec-policy/selinux-sxid/selinux-sxid-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="sxid"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for sxid"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-syncthing/Manifest b/sec-policy/selinux-syncthing/Manifest
index a359f1cffafd..329f52947573 100644
--- a/sec-policy/selinux-syncthing/Manifest
+++ b/sec-policy/selinux-syncthing/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-syncthing-2.20200818-r2.ebuild 283 BLAKE2B 7d07f18992a444004b3ab7ed438c80c1e63564db9f0a1b9b2872b7be96822f0cabe58215cc6a1a9fd88858b2cc54651d265dcb81a2390bd64a3e9d3569f9fdfe SHA512 616096a906ded216ca792e9dec48d009fd54c46ef6197cd6fa99dec8eb8eee6d26dbbc988cc62ce01488ed5266b7b3ae3a845cd31605cd6f874c95094b752024
 EBUILD selinux-syncthing-2.20210203-r1.ebuild 283 BLAKE2B 7d07f18992a444004b3ab7ed438c80c1e63564db9f0a1b9b2872b7be96822f0cabe58215cc6a1a9fd88858b2cc54651d265dcb81a2390bd64a3e9d3569f9fdfe SHA512 616096a906ded216ca792e9dec48d009fd54c46ef6197cd6fa99dec8eb8eee6d26dbbc988cc62ce01488ed5266b7b3ae3a845cd31605cd6f874c95094b752024
 EBUILD selinux-syncthing-2.20210908-r1.ebuild 283 BLAKE2B 7d07f18992a444004b3ab7ed438c80c1e63564db9f0a1b9b2872b7be96822f0cabe58215cc6a1a9fd88858b2cc54651d265dcb81a2390bd64a3e9d3569f9fdfe SHA512 616096a906ded216ca792e9dec48d009fd54c46ef6197cd6fa99dec8eb8eee6d26dbbc988cc62ce01488ed5266b7b3ae3a845cd31605cd6f874c95094b752024
-EBUILD selinux-syncthing-2.20220106-r1.ebuild 287 BLAKE2B cf80e9e6bece8c54699988ca13cf8ddae4f83204a73e60da92f89bb7c0c0d346ca2a173538c0b0f56b9a9aaf2fc6b816d5e882d8cd8d0be013426061c2a61176 SHA512 66d2222a114726ae11f17c7d3e020074d537271496ffeb0eda5626f28015dddafba8c0b53935a7883812c94ec86d6f4ac4eeb1455532c013e96944c33bf1177b
+EBUILD selinux-syncthing-2.20220106-r1.ebuild 285 BLAKE2B f5d184437b2510ac7fd59a7b0cc296b2f1104467a460be3a205881ecae521afb85f38c15a0616fcd3069c110eb180fbb003cec13529675252b11a3d13ccb4b0b SHA512 c3aa8f0f2ddec638888451f6b564b4eafd8c5d2809575c9ba2c9388e06a537ce3c3c06066cd71d4f1e4170c2d460dc4d033bd1e8830c14f3e58b1261d3524cf6
+EBUILD selinux-syncthing-2.20220106-r2.ebuild 287 BLAKE2B cf80e9e6bece8c54699988ca13cf8ddae4f83204a73e60da92f89bb7c0c0d346ca2a173538c0b0f56b9a9aaf2fc6b816d5e882d8cd8d0be013426061c2a61176 SHA512 66d2222a114726ae11f17c7d3e020074d537271496ffeb0eda5626f28015dddafba8c0b53935a7883812c94ec86d6f4ac4eeb1455532c013e96944c33bf1177b
 EBUILD selinux-syncthing-9999.ebuild 287 BLAKE2B b1e49d4910e4e8ef7e911e441774d2e3e18a54ebed668e6dd58cc33641db8878b996ffc79dffb2ca4f33e261df95b56dfadb589be3589ddd404319d567457210 SHA512 5eb7293332f3465fcb8b94ab3975b5731b8a45b18897baa5346acbda95a2255f99b39b95d92840dac92073fef91bc0dc162041fb0d6dd4857b581be131a51ea7
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-syncthing/selinux-syncthing-2.20220106-r1.ebuild b/sec-policy/selinux-syncthing/selinux-syncthing-2.20220106-r1.ebuild
index 8ca09de2e5ff..4c9e8facbe1c 100644
--- a/sec-policy/selinux-syncthing/selinux-syncthing-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-syncthing/selinux-syncthing-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for syncthing"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-syncthing/selinux-syncthing-2.20220106-r2.ebuild b/sec-policy/selinux-syncthing/selinux-syncthing-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..8ca09de2e5ff
--- /dev/null
+++ b/sec-policy/selinux-syncthing/selinux-syncthing-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="syncthing"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for syncthing"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-sysstat/Manifest b/sec-policy/selinux-sysstat/Manifest
index 5969d54c7832..6d7c5d2302a3 100644
--- a/sec-policy/selinux-sysstat/Manifest
+++ b/sec-policy/selinux-sysstat/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-sysstat-2.20200818-r2.ebuild 279 BLAKE2B 7d250911a7073783dc133face5f000bc69925d7244597faf245f6e508664ca814d04100e50692832940046bc85823753a3bb79d8ce24dc3a432b68c876331f8e SHA512 93461eb4a5a9eefb52ec9b4bd87f16a76971b8faf701862c5dc56344a22b444b53179391e8901ae3440564b2bd1838d5f1563ea4b9d9bb2e10fb14ab90779409
 EBUILD selinux-sysstat-2.20210203-r1.ebuild 279 BLAKE2B 7d250911a7073783dc133face5f000bc69925d7244597faf245f6e508664ca814d04100e50692832940046bc85823753a3bb79d8ce24dc3a432b68c876331f8e SHA512 93461eb4a5a9eefb52ec9b4bd87f16a76971b8faf701862c5dc56344a22b444b53179391e8901ae3440564b2bd1838d5f1563ea4b9d9bb2e10fb14ab90779409
 EBUILD selinux-sysstat-2.20210908-r1.ebuild 279 BLAKE2B 7d250911a7073783dc133face5f000bc69925d7244597faf245f6e508664ca814d04100e50692832940046bc85823753a3bb79d8ce24dc3a432b68c876331f8e SHA512 93461eb4a5a9eefb52ec9b4bd87f16a76971b8faf701862c5dc56344a22b444b53179391e8901ae3440564b2bd1838d5f1563ea4b9d9bb2e10fb14ab90779409
-EBUILD selinux-sysstat-2.20220106-r1.ebuild 283 BLAKE2B 6aa8e9a7650158690d9dab7c2bc79334cf6f772fc83b615603000855a8dd07d48109cf189bff31e510e0ba05386e4c7221e3cbb96a4037edae0627fd2b920b44 SHA512 99ab92887fe7f612cc1bc4823f958281e6f2b91a81a37a29f3cef6cb30cd20b6f81b2d8b5a637f779636e82b3f20c7981dd2be110f6a31ce367f13d6b35d8639
+EBUILD selinux-sysstat-2.20220106-r1.ebuild 281 BLAKE2B b9566090a0e3168b9d4958298282083c533e8d43cf59ed6c7003f44e50d5dda93a50bbe954d40ad5ed5f0a5ad07d471613c1bbb2581d5b3e95cc52539abfce28 SHA512 a346d6c42f50dd8623588d5cf7eeb9587d9ddbd49972f3101d0ed749496ea521be79a534fe0656af4686526f306fa6f8c1068fe327efcbf1efddc31e7ea7cbd6
+EBUILD selinux-sysstat-2.20220106-r2.ebuild 283 BLAKE2B 6aa8e9a7650158690d9dab7c2bc79334cf6f772fc83b615603000855a8dd07d48109cf189bff31e510e0ba05386e4c7221e3cbb96a4037edae0627fd2b920b44 SHA512 99ab92887fe7f612cc1bc4823f958281e6f2b91a81a37a29f3cef6cb30cd20b6f81b2d8b5a637f779636e82b3f20c7981dd2be110f6a31ce367f13d6b35d8639
 EBUILD selinux-sysstat-9999.ebuild 283 BLAKE2B a3efde5687f21a398514c01e3936a54da9753c5747077681330b72b3dbf18e2f13b55cda21161afafe6fc355ac3907f13eb3537192975f399771c145909c6ade SHA512 9f36a3a540b2dd362e4a6ced3e0eda317d03cdeee9eda400f36f3a051e9535c61ca467cb6aa95509e0951d6017324e7394449aa9adbd0b55fd3a25c8b147f8ba
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-sysstat/selinux-sysstat-2.20220106-r1.ebuild b/sec-policy/selinux-sysstat/selinux-sysstat-2.20220106-r1.ebuild
index fc6c05f8012f..d4237f8d4bef 100644
--- a/sec-policy/selinux-sysstat/selinux-sysstat-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-sysstat/selinux-sysstat-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sysstat"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-sysstat/selinux-sysstat-2.20220106-r2.ebuild b/sec-policy/selinux-sysstat/selinux-sysstat-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..fc6c05f8012f
--- /dev/null
+++ b/sec-policy/selinux-sysstat/selinux-sysstat-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="sysstat"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for sysstat"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-tboot/Manifest b/sec-policy/selinux-tboot/Manifest
index 0bc584be6537..e7d4c7987935 100644
--- a/sec-policy/selinux-tboot/Manifest
+++ b/sec-policy/selinux-tboot/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-tboot-2.20200818-r2.ebuild 275 BLAKE2B 9a5435a6a5d88a4fb619718a2a121e0d851920a2d5db2277519b578093d9b97fe2d00f5dac86f83c5e329fd86e3f3853f39bd871f7da3137ae652570700fc13f SHA512 3e873e0517c868b19984b703c29f34eb41f4fefe2dc904dcea2712abf8bf3749b7783b349ddf9dcc1140901583bc16345816d774199f74a18e13a964739e3e75
 EBUILD selinux-tboot-2.20210203-r1.ebuild 275 BLAKE2B 9a5435a6a5d88a4fb619718a2a121e0d851920a2d5db2277519b578093d9b97fe2d00f5dac86f83c5e329fd86e3f3853f39bd871f7da3137ae652570700fc13f SHA512 3e873e0517c868b19984b703c29f34eb41f4fefe2dc904dcea2712abf8bf3749b7783b349ddf9dcc1140901583bc16345816d774199f74a18e13a964739e3e75
 EBUILD selinux-tboot-2.20210908-r1.ebuild 275 BLAKE2B 9a5435a6a5d88a4fb619718a2a121e0d851920a2d5db2277519b578093d9b97fe2d00f5dac86f83c5e329fd86e3f3853f39bd871f7da3137ae652570700fc13f SHA512 3e873e0517c868b19984b703c29f34eb41f4fefe2dc904dcea2712abf8bf3749b7783b349ddf9dcc1140901583bc16345816d774199f74a18e13a964739e3e75
-EBUILD selinux-tboot-2.20220106-r1.ebuild 279 BLAKE2B 133cc37a8034c9ea5eca5516c5693723a50403cb235010c23dc6214ded1fdd48c3732e7aaa202031165ce4c8bc812ee6e31544c8f54e48d7c33e8182530ee9d0 SHA512 57773ca7085c50227345381d6dd4b3aaa05dd70d180a5cfd55c5b7826fe68b8d5da09b0ea3b6d61b23eeb87b6210b806e6097c7582b7c38d6bdefd8bb7c84e1b
+EBUILD selinux-tboot-2.20220106-r1.ebuild 277 BLAKE2B 35cb4b9288de1b77a29fdea574c7fa688ab10a64f0b6513dc7b5fa087535689ef88301e4f412fa45872458679d0a4ff958876d96ff92135faf71e34bb9312a60 SHA512 a88e015b466fbfba165f6a73993019b963d7c56656d96b8e9c01c977609b22f7ad386ccd82a7182b1cb9633f672bf1f7ef9ad2a1a738c9c7df5d7d83aea92d3e
+EBUILD selinux-tboot-2.20220106-r2.ebuild 279 BLAKE2B 133cc37a8034c9ea5eca5516c5693723a50403cb235010c23dc6214ded1fdd48c3732e7aaa202031165ce4c8bc812ee6e31544c8f54e48d7c33e8182530ee9d0 SHA512 57773ca7085c50227345381d6dd4b3aaa05dd70d180a5cfd55c5b7826fe68b8d5da09b0ea3b6d61b23eeb87b6210b806e6097c7582b7c38d6bdefd8bb7c84e1b
 EBUILD selinux-tboot-9999.ebuild 279 BLAKE2B 7a3cadfcbabe447a3b7438fe66bcc93d21c85f7439ba6a9a21a5e7384d05ac10aef3cd4193ebf784a6204502209cb69c13df2f396344f5837960914104ee241c SHA512 d1a6814eca795ab2e891a2f46cc7ce919366d021d340891200aa1259f7f4f6d5c9032acf934585f4a10c242b565fb6523249af5797f295321fcba0563d7b8a47
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-tboot/selinux-tboot-2.20220106-r1.ebuild b/sec-policy/selinux-tboot/selinux-tboot-2.20220106-r1.ebuild
index 95fc5e1a909a..a29bf35e4512 100644
--- a/sec-policy/selinux-tboot/selinux-tboot-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-tboot/selinux-tboot-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tboot"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-tboot/selinux-tboot-2.20220106-r2.ebuild b/sec-policy/selinux-tboot/selinux-tboot-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..95fc5e1a909a
--- /dev/null
+++ b/sec-policy/selinux-tboot/selinux-tboot-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="tboot"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tboot"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-tcpd/Manifest b/sec-policy/selinux-tcpd/Manifest
index e4c4a2b034c4..0947507e653e 100644
--- a/sec-policy/selinux-tcpd/Manifest
+++ b/sec-policy/selinux-tcpd/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-tcpd-2.20200818-r2.ebuild 367 BLAKE2B de7902fcdb0b810f44462a587fdb3d9d32552cce1ccaea63c09738c7b4306a0d375d507018b0577f9fc55e5057276989242386dad75eeb3ec0c1bf6d3356eef1 SHA512 d6ec784db3665944ccfc2b4cb294c7a085fe7f32ccc5051730145d911691d6dfb8129b654d6ccff51b0449ba5f59a41aa1782e33d1e12a717bb041d2dfaa5492
 EBUILD selinux-tcpd-2.20210203-r1.ebuild 367 BLAKE2B de7902fcdb0b810f44462a587fdb3d9d32552cce1ccaea63c09738c7b4306a0d375d507018b0577f9fc55e5057276989242386dad75eeb3ec0c1bf6d3356eef1 SHA512 d6ec784db3665944ccfc2b4cb294c7a085fe7f32ccc5051730145d911691d6dfb8129b654d6ccff51b0449ba5f59a41aa1782e33d1e12a717bb041d2dfaa5492
 EBUILD selinux-tcpd-2.20210908-r1.ebuild 367 BLAKE2B de7902fcdb0b810f44462a587fdb3d9d32552cce1ccaea63c09738c7b4306a0d375d507018b0577f9fc55e5057276989242386dad75eeb3ec0c1bf6d3356eef1 SHA512 d6ec784db3665944ccfc2b4cb294c7a085fe7f32ccc5051730145d911691d6dfb8129b654d6ccff51b0449ba5f59a41aa1782e33d1e12a717bb041d2dfaa5492
-EBUILD selinux-tcpd-2.20220106-r1.ebuild 371 BLAKE2B 904f73e5dd31601b2464bbb89ca921522ac321cdcceca18f5ac2e1428f6c2a2fb754ac357f23c7e5a4ebb1894b0d380b9f3848a6beee4a8d8aba372027c4c924 SHA512 c9722aac04a499b82ca2aa0c1bce6e8c58d45fdc103241cf7b1e1db5cda7540432f581566ff662331120189c6322ef00196140d28f37ed91d86c79b62cae23bf
+EBUILD selinux-tcpd-2.20220106-r1.ebuild 369 BLAKE2B 15a4f36bb0ff0926ad6965e3462aea98b08cf63d69c3d4ff95a915044ac7cbc1610e0cb094d5f3e8203ed7c208d43da01bb702a3a8365b68568804f048ee4a34 SHA512 e7ea23f47feecaa263f645e047cb5fa17defc33e653162245cfe9244c4643f357914c9664f089b1d5af4d7166b9f881a74180063284b2b84496ac0d1095b499b
+EBUILD selinux-tcpd-2.20220106-r2.ebuild 371 BLAKE2B 904f73e5dd31601b2464bbb89ca921522ac321cdcceca18f5ac2e1428f6c2a2fb754ac357f23c7e5a4ebb1894b0d380b9f3848a6beee4a8d8aba372027c4c924 SHA512 c9722aac04a499b82ca2aa0c1bce6e8c58d45fdc103241cf7b1e1db5cda7540432f581566ff662331120189c6322ef00196140d28f37ed91d86c79b62cae23bf
 EBUILD selinux-tcpd-9999.ebuild 371 BLAKE2B 1858825823c99d4e2885fc161f10cacbfdd521d7ef9d2347be3188adf820f61eb1d9c62ec44bac10ba87ae86a26b9cdb1956b419676fb1e2396d167905ee6621 SHA512 d91ac19209a7f178a20abee559b1dfc162d21dfc79e96ede7ec5b303c02595a8475bc98feeed149580c1083d9f3623383f5c777be226acb4fc4cfb81bf6c0981
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-tcpd/selinux-tcpd-2.20220106-r1.ebuild b/sec-policy/selinux-tcpd/selinux-tcpd-2.20220106-r1.ebuild
index f0720f34fb1e..4582adacda4f 100644
--- a/sec-policy/selinux-tcpd/selinux-tcpd-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-tcpd/selinux-tcpd-2.20220106-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tcpd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-inetd
diff --git a/sec-policy/selinux-tcpd/selinux-tcpd-2.20220106-r2.ebuild b/sec-policy/selinux-tcpd/selinux-tcpd-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..f0720f34fb1e
--- /dev/null
+++ b/sec-policy/selinux-tcpd/selinux-tcpd-2.20220106-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="tcpd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tcpd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-inetd
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-inetd
+"
diff --git a/sec-policy/selinux-tcsd/Manifest b/sec-policy/selinux-tcsd/Manifest
index 2c21d5245b13..dcc3ee2c1ab5 100644
--- a/sec-policy/selinux-tcsd/Manifest
+++ b/sec-policy/selinux-tcsd/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-tcsd-2.20200818-r2.ebuild 273 BLAKE2B 70a8e08bd4cc8189c5dea31fbe12026a4b24ff75fb9e39ebb336fdc87cc4d45ec20c443cc76f8d35d7d824846f75653cc61fcb6a3be614a7be66c84601f27ce7 SHA512 d88c00f74ad6428ae498465ea1f931dc9d331ea1f26f8490243365be73267e208b605a68b45bac3dc263f877d88f46e9ab182fd041b2a9e6d18b1f099d652277
 EBUILD selinux-tcsd-2.20210203-r1.ebuild 273 BLAKE2B 70a8e08bd4cc8189c5dea31fbe12026a4b24ff75fb9e39ebb336fdc87cc4d45ec20c443cc76f8d35d7d824846f75653cc61fcb6a3be614a7be66c84601f27ce7 SHA512 d88c00f74ad6428ae498465ea1f931dc9d331ea1f26f8490243365be73267e208b605a68b45bac3dc263f877d88f46e9ab182fd041b2a9e6d18b1f099d652277
 EBUILD selinux-tcsd-2.20210908-r1.ebuild 273 BLAKE2B 70a8e08bd4cc8189c5dea31fbe12026a4b24ff75fb9e39ebb336fdc87cc4d45ec20c443cc76f8d35d7d824846f75653cc61fcb6a3be614a7be66c84601f27ce7 SHA512 d88c00f74ad6428ae498465ea1f931dc9d331ea1f26f8490243365be73267e208b605a68b45bac3dc263f877d88f46e9ab182fd041b2a9e6d18b1f099d652277
-EBUILD selinux-tcsd-2.20220106-r1.ebuild 277 BLAKE2B 7105b358c9bbd8cafe60fb25ac0923af0d5aec0e16e8ed71b4ca645b0d2abf9ab90795d189ac068987583022e304551b8e5167a2e762d9cf16168111e933c81c SHA512 2bbe12223cec5cfadd5b67d60ae1b95021b33502f6ffb0a60d4c0fb7e39dc945689ff4d6f77781de260386da4998b9279465660eac217dcff4215ca6cd1df8e1
+EBUILD selinux-tcsd-2.20220106-r1.ebuild 275 BLAKE2B 750a05704f0d031388f32cf5da5a5cdc8c52e8127cf14c15a5fbad056fcc3ddae28d18849cd09dba3e8f1e35b50de3cb789ff8eaff7f241ac666512585a98d1c SHA512 c83c93c15541c7609950353745883908232724c29944c8c7cc77d0b09f1dc908ababf6fed3c3b1ef08772030bfaa13ce59f87166f45ddaf26d7292f7998d6ed8
+EBUILD selinux-tcsd-2.20220106-r2.ebuild 277 BLAKE2B 7105b358c9bbd8cafe60fb25ac0923af0d5aec0e16e8ed71b4ca645b0d2abf9ab90795d189ac068987583022e304551b8e5167a2e762d9cf16168111e933c81c SHA512 2bbe12223cec5cfadd5b67d60ae1b95021b33502f6ffb0a60d4c0fb7e39dc945689ff4d6f77781de260386da4998b9279465660eac217dcff4215ca6cd1df8e1
 EBUILD selinux-tcsd-9999.ebuild 277 BLAKE2B 0f4fd1daadab9ae8cc137a43b70e1738d9bec816ac8d8b710d63923f6d0dc8579ac85ab1ce0768a85e027ea9dd4452b60241a40819efb89853c205f9986ced1b SHA512 24a2db1030e59491d4cde456caef844c36a4e8a865faa67c03faf8ba959a3a01f4ea693c916dcd6cee444894c606e901f3578bfda2ece0aaa2d5dd2714a01719
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-tcsd/selinux-tcsd-2.20220106-r1.ebuild b/sec-policy/selinux-tcsd/selinux-tcsd-2.20220106-r1.ebuild
index 73db7f8ed8ff..0f37d0bde9e9 100644
--- a/sec-policy/selinux-tcsd/selinux-tcsd-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-tcsd/selinux-tcsd-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tcsd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-tcsd/selinux-tcsd-2.20220106-r2.ebuild b/sec-policy/selinux-tcsd/selinux-tcsd-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..73db7f8ed8ff
--- /dev/null
+++ b/sec-policy/selinux-tcsd/selinux-tcsd-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="tcsd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tcsd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-telnet/Manifest b/sec-policy/selinux-telnet/Manifest
index 5e2c1df08923..9c0466124307 100644
--- a/sec-policy/selinux-telnet/Manifest
+++ b/sec-policy/selinux-telnet/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-telnet-2.20200818-r2.ebuild 383 BLAKE2B bb4084603b7e664dbd427e501046868b50a2ed7f46113503b3f65af67c242b0f7f99e78bc062506714b6c0f730c56ee5cd5005aed93dde3962481b2e5d31f534 SHA512 8962ae8fba31e25fc57a530dcd3ddbde1c9fc890d2806d8e06aade33ea1691a371f460d36efe563ca182caa225b56c0ac2963165dd272dca2ed3a44f30e1255b
 EBUILD selinux-telnet-2.20210203-r1.ebuild 383 BLAKE2B bb4084603b7e664dbd427e501046868b50a2ed7f46113503b3f65af67c242b0f7f99e78bc062506714b6c0f730c56ee5cd5005aed93dde3962481b2e5d31f534 SHA512 8962ae8fba31e25fc57a530dcd3ddbde1c9fc890d2806d8e06aade33ea1691a371f460d36efe563ca182caa225b56c0ac2963165dd272dca2ed3a44f30e1255b
 EBUILD selinux-telnet-2.20210908-r1.ebuild 383 BLAKE2B bb4084603b7e664dbd427e501046868b50a2ed7f46113503b3f65af67c242b0f7f99e78bc062506714b6c0f730c56ee5cd5005aed93dde3962481b2e5d31f534 SHA512 8962ae8fba31e25fc57a530dcd3ddbde1c9fc890d2806d8e06aade33ea1691a371f460d36efe563ca182caa225b56c0ac2963165dd272dca2ed3a44f30e1255b
-EBUILD selinux-telnet-2.20220106-r1.ebuild 387 BLAKE2B 1eeebb0cefd9240d7e1873e98b6f90adb8c78d9a5b881dd5c628dd7ff1db3c5efa7f4b0689b2b3560ab1cce4b1c6840fda78266dceda72f73b16724b46e9cb3a SHA512 fe31a944fa5a1529f8dae734af6517f3d4301e6a2319220cd899cda6ee62420fed7a216ebdbd3f30777fa1fe7478f7a608e1ae345189928115017154439f79bd
+EBUILD selinux-telnet-2.20220106-r1.ebuild 385 BLAKE2B f35d3d8d8eda4698c9221488925d3eae844044463c15a61c62e5d64b1ce226e8f57e80ebe400a6814b61bd63956d4c9eca264f49201416ba921adb7b43af93d1 SHA512 e7de6be74901c97c16585549eb0c8db69a6356894780456581005fd7477a6a3ad049f94c0a66b14eebbb6848eaf0bb7479f2930dcb3d90a49833782473d12bf3
+EBUILD selinux-telnet-2.20220106-r2.ebuild 387 BLAKE2B 1eeebb0cefd9240d7e1873e98b6f90adb8c78d9a5b881dd5c628dd7ff1db3c5efa7f4b0689b2b3560ab1cce4b1c6840fda78266dceda72f73b16724b46e9cb3a SHA512 fe31a944fa5a1529f8dae734af6517f3d4301e6a2319220cd899cda6ee62420fed7a216ebdbd3f30777fa1fe7478f7a608e1ae345189928115017154439f79bd
 EBUILD selinux-telnet-9999.ebuild 387 BLAKE2B 91e9b06521fa229bc9df19c7228cf705a3011338d837ddd1af9052ce376c1c700d9861e5ef93d48db7fea91eeb27bdec9d814324151b6e372f4fd2d648aca938 SHA512 1310ed1a542faed3b62c9ee21eb15cef16154ac5e3f06d23589330ffa9044082ae559b21c6bc361ce9a18abd324e17f52dace456ffdc2e8ddda62d86ded81c36
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-telnet/selinux-telnet-2.20220106-r1.ebuild b/sec-policy/selinux-telnet/selinux-telnet-2.20220106-r1.ebuild
index d2c25a7c6731..85090cf94fbe 100644
--- a/sec-policy/selinux-telnet/selinux-telnet-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-telnet/selinux-telnet-2.20220106-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for telnet"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-remotelogin
diff --git a/sec-policy/selinux-telnet/selinux-telnet-2.20220106-r2.ebuild b/sec-policy/selinux-telnet/selinux-telnet-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..d2c25a7c6731
--- /dev/null
+++ b/sec-policy/selinux-telnet/selinux-telnet-2.20220106-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="telnet"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for telnet"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-remotelogin
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-remotelogin
+"
diff --git a/sec-policy/selinux-tftp/Manifest b/sec-policy/selinux-tftp/Manifest
index a2990a4b8fcf..7183fe984781 100644
--- a/sec-policy/selinux-tftp/Manifest
+++ b/sec-policy/selinux-tftp/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-tftp-2.20200818-r2.ebuild 273 BLAKE2B 986c932a508a585b5000cca9c93bad0eae6867d9efbfe8ea116c9fb1969f4ed3608b7859b26af4788868fd72382f3827d63667975e1d3b836cab4314886027e7 SHA512 b27d77db55a97d661151f7beba0866e927bd75765d2464780b4283207f2503a0314a3000b05ad29f50c8a2d0b5432712042f8964e6291491e68a86fc431871de
 EBUILD selinux-tftp-2.20210203-r1.ebuild 273 BLAKE2B 986c932a508a585b5000cca9c93bad0eae6867d9efbfe8ea116c9fb1969f4ed3608b7859b26af4788868fd72382f3827d63667975e1d3b836cab4314886027e7 SHA512 b27d77db55a97d661151f7beba0866e927bd75765d2464780b4283207f2503a0314a3000b05ad29f50c8a2d0b5432712042f8964e6291491e68a86fc431871de
 EBUILD selinux-tftp-2.20210908-r1.ebuild 273 BLAKE2B 986c932a508a585b5000cca9c93bad0eae6867d9efbfe8ea116c9fb1969f4ed3608b7859b26af4788868fd72382f3827d63667975e1d3b836cab4314886027e7 SHA512 b27d77db55a97d661151f7beba0866e927bd75765d2464780b4283207f2503a0314a3000b05ad29f50c8a2d0b5432712042f8964e6291491e68a86fc431871de
-EBUILD selinux-tftp-2.20220106-r1.ebuild 277 BLAKE2B 5041a235c5ef105ad2fc05f1113daafb1a32d036cca41e29612c437f668dd9825a53cb0829441b8e53df27861e4bc2a15443a359067fd485f504bdb508515bd9 SHA512 312162db54c17b8ef6c84adf4fb0b5cb281f4765a1e3835e0bfb01611512ba1fab9394ae9ad0cd762b6c2cdb63e3edd8ddebe13bb233ae8c91e9c063e9ab7b41
+EBUILD selinux-tftp-2.20220106-r1.ebuild 275 BLAKE2B f11a9a2a0c69b772425065af37963ebe4c5b16ef6f78ec9c417e120e629e61728408528d528ebd8a4c5539dfc26ab670023e5253a494509746cefaff62c298a5 SHA512 e94207885d01cfcdf2c66d4542734d4aa732c635eceae239cafed4dd35a7e5104bd80b1f5e2f154718b877a4c49355a01cdea6e73cff183cffa1e70651134989
+EBUILD selinux-tftp-2.20220106-r2.ebuild 277 BLAKE2B 5041a235c5ef105ad2fc05f1113daafb1a32d036cca41e29612c437f668dd9825a53cb0829441b8e53df27861e4bc2a15443a359067fd485f504bdb508515bd9 SHA512 312162db54c17b8ef6c84adf4fb0b5cb281f4765a1e3835e0bfb01611512ba1fab9394ae9ad0cd762b6c2cdb63e3edd8ddebe13bb233ae8c91e9c063e9ab7b41
 EBUILD selinux-tftp-9999.ebuild 277 BLAKE2B 7017ea6647966a254f10134e3138a6db7f1b46121ae292cf54e8d5765c00b151b55d518924e6226ad3cbc68b7a03350da8f69ff9fbb3e6b2784afe3c3a10d741 SHA512 4888ea45aa11d67a4d18dc97621a4bc748e1e9c9e571420bd1fa5a5165508faa2553a0972221c81baca14c5af496a95f8c2cb32c8719aa1c29ac8b21f844540d
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-tftp/selinux-tftp-2.20220106-r1.ebuild b/sec-policy/selinux-tftp/selinux-tftp-2.20220106-r1.ebuild
index aa6695919368..296a4368a8f7 100644
--- a/sec-policy/selinux-tftp/selinux-tftp-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-tftp/selinux-tftp-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tftp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-tftp/selinux-tftp-2.20220106-r2.ebuild b/sec-policy/selinux-tftp/selinux-tftp-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..aa6695919368
--- /dev/null
+++ b/sec-policy/selinux-tftp/selinux-tftp-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="tftp"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tftp"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-tgtd/Manifest b/sec-policy/selinux-tgtd/Manifest
index 6f47e5ff886a..25857c9172ce 100644
--- a/sec-policy/selinux-tgtd/Manifest
+++ b/sec-policy/selinux-tgtd/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-tgtd-2.20200818-r2.ebuild 273 BLAKE2B bbbb02ff58a362b6de8c0478ad06a1f9dd3970459d8394bf1930b6a371112d7a11f68fb3c6fe9188545c723dea9b9139dd7d7452b47d292f01a340b56762f9c1 SHA512 580c3445ec5fe5cc1cd773663372c34e22fe1e09c253cba0f1ee92ad07562659b66d5a658ce6fe974aa3b4e65b7cc96f0ca0def581f470b531f06948c6d3e693
 EBUILD selinux-tgtd-2.20210203-r1.ebuild 273 BLAKE2B bbbb02ff58a362b6de8c0478ad06a1f9dd3970459d8394bf1930b6a371112d7a11f68fb3c6fe9188545c723dea9b9139dd7d7452b47d292f01a340b56762f9c1 SHA512 580c3445ec5fe5cc1cd773663372c34e22fe1e09c253cba0f1ee92ad07562659b66d5a658ce6fe974aa3b4e65b7cc96f0ca0def581f470b531f06948c6d3e693
 EBUILD selinux-tgtd-2.20210908-r1.ebuild 273 BLAKE2B bbbb02ff58a362b6de8c0478ad06a1f9dd3970459d8394bf1930b6a371112d7a11f68fb3c6fe9188545c723dea9b9139dd7d7452b47d292f01a340b56762f9c1 SHA512 580c3445ec5fe5cc1cd773663372c34e22fe1e09c253cba0f1ee92ad07562659b66d5a658ce6fe974aa3b4e65b7cc96f0ca0def581f470b531f06948c6d3e693
-EBUILD selinux-tgtd-2.20220106-r1.ebuild 277 BLAKE2B 01442dc8e035ff19b87f71b2f0043d4a9f89075ee4674e4df6e4aabd24f4743619826f04af57e80f2dcef63ca97bf326cfd6b849de096cb32cf39f37020bd69a SHA512 f83ca129b7e0df48fe6976d0f5335192225efa5ca3a67092a005f10ad34c47a0befdaa1a996b0f6255a001a4fe673b5536dcace1099dd1f62e6c11f5f8d98c7d
+EBUILD selinux-tgtd-2.20220106-r1.ebuild 275 BLAKE2B 4840e09e3d759411004600f3da65eae0a7ca7575851c4df6ac491019ad280ba400a32292d309b90256aab6b5e9f24cfc19902eb1e98c7d33b6b54a2456de6772 SHA512 d856bb5e55789681bbd61d9cc4829ab75b57a6c162c57da001c4aca2dc8b974336da53e5a1cf66b44bb6a2bf237751ff290e678585ad73aa2a0b5f42acafa8bb
+EBUILD selinux-tgtd-2.20220106-r2.ebuild 277 BLAKE2B 01442dc8e035ff19b87f71b2f0043d4a9f89075ee4674e4df6e4aabd24f4743619826f04af57e80f2dcef63ca97bf326cfd6b849de096cb32cf39f37020bd69a SHA512 f83ca129b7e0df48fe6976d0f5335192225efa5ca3a67092a005f10ad34c47a0befdaa1a996b0f6255a001a4fe673b5536dcace1099dd1f62e6c11f5f8d98c7d
 EBUILD selinux-tgtd-9999.ebuild 277 BLAKE2B 6badc3156a5659e6a21bdb9a570e1b9dc084ee7d4e46d0fefd9493e44ec338e37785ea9b3564037e6097b5ed90d5131edfd1888ad4b9d4d03614d9fb81f7e9f4 SHA512 816720051d98c03f33ccf4a7e7049afcdc6f1f191cd15d02dfa3048bbd9da429fce6a36f2a9bb62e2b814d44423079a807b208307d7df618448a0813107d9ce3
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-tgtd/selinux-tgtd-2.20220106-r1.ebuild b/sec-policy/selinux-tgtd/selinux-tgtd-2.20220106-r1.ebuild
index 0a3e75b7e89a..28b2eb95aaac 100644
--- a/sec-policy/selinux-tgtd/selinux-tgtd-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-tgtd/selinux-tgtd-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tgtd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-tgtd/selinux-tgtd-2.20220106-r2.ebuild b/sec-policy/selinux-tgtd/selinux-tgtd-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..0a3e75b7e89a
--- /dev/null
+++ b/sec-policy/selinux-tgtd/selinux-tgtd-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="tgtd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tgtd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-thunderbird/Manifest b/sec-policy/selinux-thunderbird/Manifest
index f93d575b21de..424b3e3d7700 100644
--- a/sec-policy/selinux-thunderbird/Manifest
+++ b/sec-policy/selinux-thunderbird/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-thunderbird-2.20200818-r2.ebuild 385 BLAKE2B 0248d2b0e728bce9d1e1ee5dba001acc039d09e59abdad4c3f193719ee6bb009a578b8588f02864f14edb4ece57ae48947d3f5126e7438b6530bdf826e8600ad SHA512 8c7d9a69d3f8a07f4f56e8e421da276422ab207b4edd865908c4b18f845166b02ec19202b5e2fe44d91b4ab8a9c1b8b9436ee267ca24ceb8f25b3bf0b805c1e3
 EBUILD selinux-thunderbird-2.20210203-r1.ebuild 385 BLAKE2B 0248d2b0e728bce9d1e1ee5dba001acc039d09e59abdad4c3f193719ee6bb009a578b8588f02864f14edb4ece57ae48947d3f5126e7438b6530bdf826e8600ad SHA512 8c7d9a69d3f8a07f4f56e8e421da276422ab207b4edd865908c4b18f845166b02ec19202b5e2fe44d91b4ab8a9c1b8b9436ee267ca24ceb8f25b3bf0b805c1e3
 EBUILD selinux-thunderbird-2.20210908-r1.ebuild 385 BLAKE2B 0248d2b0e728bce9d1e1ee5dba001acc039d09e59abdad4c3f193719ee6bb009a578b8588f02864f14edb4ece57ae48947d3f5126e7438b6530bdf826e8600ad SHA512 8c7d9a69d3f8a07f4f56e8e421da276422ab207b4edd865908c4b18f845166b02ec19202b5e2fe44d91b4ab8a9c1b8b9436ee267ca24ceb8f25b3bf0b805c1e3
-EBUILD selinux-thunderbird-2.20220106-r1.ebuild 389 BLAKE2B e48ec4ffe9ad39c1726b8416ff8b42bdfdd006b1707024dd2a1b9ab8c79567beb1edadd8b614329af44dd7599b1373a18914963fa4dae9dcdc20a8e1eccc27eb SHA512 3c896c9fe29baaae938574cdda4c383f0891090ee3b33db42ce0049b6322d2e2a3a4350f2b7f8081d800c4c8443e546fc3f59666584d04887f9e39456766d9fd
+EBUILD selinux-thunderbird-2.20220106-r1.ebuild 387 BLAKE2B d0a4cf1ce2bee9290df6e7702eac8fc8b9dbb86b6c8c3c1dc0f4be3f21018f0c971fc38988be96822b5bdd62cacbcf4b0ebfb291a5fe8401c6806c29b5b5cd2f SHA512 487de229fd09972bb491b96edca59e359a2979d6c2193d98da47ff92b80b7aba5249d8c7a09abaedc789f506a6f041f9c6f077e4582dc598b0b0cc961033855e
+EBUILD selinux-thunderbird-2.20220106-r2.ebuild 389 BLAKE2B e48ec4ffe9ad39c1726b8416ff8b42bdfdd006b1707024dd2a1b9ab8c79567beb1edadd8b614329af44dd7599b1373a18914963fa4dae9dcdc20a8e1eccc27eb SHA512 3c896c9fe29baaae938574cdda4c383f0891090ee3b33db42ce0049b6322d2e2a3a4350f2b7f8081d800c4c8443e546fc3f59666584d04887f9e39456766d9fd
 EBUILD selinux-thunderbird-9999.ebuild 389 BLAKE2B cbe23efe13265a1dfeefc571f4fb310c2cc206352a6b3597d5c9c6f4556e92fcf2f1c604ec9ef5f3c5ba191fc3e18f45d89601f5ac872feab0698e0481434d40 SHA512 6d20f623c18bf70fe866d4698f4c56133c351cdfd72f141e9ddf5e140c3a448be1739a3f3b9b7301f68426d1deffe6f2e2fde4d35d30135feabd8143e47d9b8d
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20220106-r1.ebuild b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20220106-r1.ebuild
index 12150c30dd4c..335655bad368 100644
--- a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20220106-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for thunderbird"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20220106-r2.ebuild b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..12150c30dd4c
--- /dev/null
+++ b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20220106-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="thunderbird"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for thunderbird"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-xserver
+"
diff --git a/sec-policy/selinux-timidity/Manifest b/sec-policy/selinux-timidity/Manifest
index 3c4ed95d35f7..3afb912708dc 100644
--- a/sec-policy/selinux-timidity/Manifest
+++ b/sec-policy/selinux-timidity/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-timidity-2.20200818-r2.ebuild 281 BLAKE2B 518e15fee6fa20356507488ea9ef3692edc90d27c13cc212b4e8a9ee8903dc455d8bf50d77470d4b26d842b7691de0570cc1c084b68b355cee3a3695dede8c57 SHA512 06067874602bc364f8d9f4264fbc04c7a78912336cccfd74e6d0e89a7f21c07dc01fcc1aa484c5d4dd093c9c6a15f687c38e4eb7cff60dad1198a7fca4356dcc
 EBUILD selinux-timidity-2.20210203-r1.ebuild 281 BLAKE2B 518e15fee6fa20356507488ea9ef3692edc90d27c13cc212b4e8a9ee8903dc455d8bf50d77470d4b26d842b7691de0570cc1c084b68b355cee3a3695dede8c57 SHA512 06067874602bc364f8d9f4264fbc04c7a78912336cccfd74e6d0e89a7f21c07dc01fcc1aa484c5d4dd093c9c6a15f687c38e4eb7cff60dad1198a7fca4356dcc
 EBUILD selinux-timidity-2.20210908-r1.ebuild 281 BLAKE2B 518e15fee6fa20356507488ea9ef3692edc90d27c13cc212b4e8a9ee8903dc455d8bf50d77470d4b26d842b7691de0570cc1c084b68b355cee3a3695dede8c57 SHA512 06067874602bc364f8d9f4264fbc04c7a78912336cccfd74e6d0e89a7f21c07dc01fcc1aa484c5d4dd093c9c6a15f687c38e4eb7cff60dad1198a7fca4356dcc
-EBUILD selinux-timidity-2.20220106-r1.ebuild 285 BLAKE2B 4a0e44cc931fc75f199576320ba19065f71d75aa2838125bb259936872bd1e2f2ab6a79e0b1ed3d92330680766b25fa67c8d3fccad8758722de0d6d07151774d SHA512 acd2cb2552f1814ed939f154b5c571b1f85c2ca7041a33642aadb09df4c3e35f1304ff4c5a86942b83144a7e4dd1b5fa4cb7f071366df5c6c0fb2e13b0d26e24
+EBUILD selinux-timidity-2.20220106-r1.ebuild 283 BLAKE2B 3474c996af9fee1f680c9e4bf0a30d83878badce8eb771e9689f04cee0a57b064fa6ab8c114509116a06ba00e476c47119f54f7a866bfa4a560c7f6462f38ebf SHA512 980e115f8117c26e7b99410f8c5445da2b164b8e840d881113e391e3c8e22ea677d51472b1159a281be845a3b0b6894fe291a96b7bc5d6b02270789a413d7ec4
+EBUILD selinux-timidity-2.20220106-r2.ebuild 285 BLAKE2B 4a0e44cc931fc75f199576320ba19065f71d75aa2838125bb259936872bd1e2f2ab6a79e0b1ed3d92330680766b25fa67c8d3fccad8758722de0d6d07151774d SHA512 acd2cb2552f1814ed939f154b5c571b1f85c2ca7041a33642aadb09df4c3e35f1304ff4c5a86942b83144a7e4dd1b5fa4cb7f071366df5c6c0fb2e13b0d26e24
 EBUILD selinux-timidity-9999.ebuild 285 BLAKE2B d665c00ae1ce02a7fa2e878d162ae8fc4fadd84e7dccd48a368a078330ac67fdf07b9f172b78b12b2f73479b09523a749651d5ec629876bc106a40d602aa23dc SHA512 f0164ae2ff20bc8b9689e9a59a5417fa75d8be4d1b0de9dfab1b05eeba1a538254b9f3f49c88fc8e41f841e5fc9dfa8c6655429c63bf6a45f4beeb628c91e875
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-timidity/selinux-timidity-2.20220106-r1.ebuild b/sec-policy/selinux-timidity/selinux-timidity-2.20220106-r1.ebuild
index 6f15dd196ad7..5f5a39831228 100644
--- a/sec-policy/selinux-timidity/selinux-timidity-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-timidity/selinux-timidity-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for timidity"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-timidity/selinux-timidity-2.20220106-r2.ebuild b/sec-policy/selinux-timidity/selinux-timidity-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..6f15dd196ad7
--- /dev/null
+++ b/sec-policy/selinux-timidity/selinux-timidity-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="timidity"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for timidity"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-tmpreaper/Manifest b/sec-policy/selinux-tmpreaper/Manifest
index de4e64004c2c..53f6759a50e1 100644
--- a/sec-policy/selinux-tmpreaper/Manifest
+++ b/sec-policy/selinux-tmpreaper/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-tmpreaper-2.20200818-r2.ebuild 283 BLAKE2B 8de0d0440bd7195a1a23a00b7d521e6323246de62e728353899d8c95361dbb8e59e64f79502fa10cfaf7cc06b921aabd90a057a6838fb1c704b2ca93f8c6dbcd SHA512 863909cf75d747b1a073fa2e989d58d0d27644fc27371844dcc7cc58a17d5a44ed00495a26c5e04ec4301c06f3ad198952bf838a201147fdbbd98cc8e8fee0d3
 EBUILD selinux-tmpreaper-2.20210203-r1.ebuild 283 BLAKE2B 8de0d0440bd7195a1a23a00b7d521e6323246de62e728353899d8c95361dbb8e59e64f79502fa10cfaf7cc06b921aabd90a057a6838fb1c704b2ca93f8c6dbcd SHA512 863909cf75d747b1a073fa2e989d58d0d27644fc27371844dcc7cc58a17d5a44ed00495a26c5e04ec4301c06f3ad198952bf838a201147fdbbd98cc8e8fee0d3
 EBUILD selinux-tmpreaper-2.20210908-r1.ebuild 283 BLAKE2B 8de0d0440bd7195a1a23a00b7d521e6323246de62e728353899d8c95361dbb8e59e64f79502fa10cfaf7cc06b921aabd90a057a6838fb1c704b2ca93f8c6dbcd SHA512 863909cf75d747b1a073fa2e989d58d0d27644fc27371844dcc7cc58a17d5a44ed00495a26c5e04ec4301c06f3ad198952bf838a201147fdbbd98cc8e8fee0d3
-EBUILD selinux-tmpreaper-2.20220106-r1.ebuild 287 BLAKE2B 484f5e56e72e35907e91613c8ecdb686e6d4a1e96348d9989a68e9bba7a508c0627ef36cf674959d26d1b813ce057f58a3d3492b6add0e7173649c8f298d80d4 SHA512 4221e72b43e520128c2cca580c6eb93e777b8ca66d03982cdd407c46ae0fa9860c3c2bb6cabe2927b21cca484432c0c3d4aa1591e2547a4883a040c101f2b58c
+EBUILD selinux-tmpreaper-2.20220106-r1.ebuild 285 BLAKE2B 5db641dd0e1e04bf91f84b903c54cafdbdb1fdd798015feb8c0f9c87639e5a482e0211040da6b56392d21ce6775dfa4245078d089d567ac73c79a4c176d30d15 SHA512 e5894ecf71c586bc932d3dc323c1765938f358dcbcb3338b112ed8d451cf43cf109f2a2589236dfbfae7ac9affec9fe32383b42fa95dd00c3b4c0569d826d20b
+EBUILD selinux-tmpreaper-2.20220106-r2.ebuild 287 BLAKE2B 484f5e56e72e35907e91613c8ecdb686e6d4a1e96348d9989a68e9bba7a508c0627ef36cf674959d26d1b813ce057f58a3d3492b6add0e7173649c8f298d80d4 SHA512 4221e72b43e520128c2cca580c6eb93e777b8ca66d03982cdd407c46ae0fa9860c3c2bb6cabe2927b21cca484432c0c3d4aa1591e2547a4883a040c101f2b58c
 EBUILD selinux-tmpreaper-9999.ebuild 287 BLAKE2B 927776ca035d0e7e5887e024c8a7888ef59e28fdbba6d6f23f7d9dbbf8f56052028cbf17b0dc7ca07f0f0ccdbd4e37338b7fafca9c546e4cce5194cd58a5afe0 SHA512 95b9c103c6795d97967ea99407423037f2a2c42f1d2147e59974fb89caf4aa635eeaec603d46831edc0d30aff3666e4cec488807e2086b2ca42b6e134e7db0a3
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20220106-r1.ebuild b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20220106-r1.ebuild
index f4719c0384e6..d81551cada07 100644
--- a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tmpreaper"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20220106-r2.ebuild b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..f4719c0384e6
--- /dev/null
+++ b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="tmpreaper"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tmpreaper"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-tor/Manifest b/sec-policy/selinux-tor/Manifest
index f2e8c43bed6a..07e50994686a 100644
--- a/sec-policy/selinux-tor/Manifest
+++ b/sec-policy/selinux-tor/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-tor-2.20200818-r2.ebuild 271 BLAKE2B 89476c886e528a3130d60d3b495615831f26d8f638dd447aafdaa2ac331e5ddbf8fb65efee52e1b583172baa2ccbb6d6cf98db0b33953aa740e4dee2eea84d1e SHA512 7783eb2026a1e2b91651f141881ecccb833bf7c527eaf76ec047997405bb8d394d3cc429bfa1687c2ebb4efd097c7ed82b9914b9740ed9ff97af55990b5051ae
 EBUILD selinux-tor-2.20210203-r1.ebuild 271 BLAKE2B 89476c886e528a3130d60d3b495615831f26d8f638dd447aafdaa2ac331e5ddbf8fb65efee52e1b583172baa2ccbb6d6cf98db0b33953aa740e4dee2eea84d1e SHA512 7783eb2026a1e2b91651f141881ecccb833bf7c527eaf76ec047997405bb8d394d3cc429bfa1687c2ebb4efd097c7ed82b9914b9740ed9ff97af55990b5051ae
 EBUILD selinux-tor-2.20210908-r1.ebuild 271 BLAKE2B 89476c886e528a3130d60d3b495615831f26d8f638dd447aafdaa2ac331e5ddbf8fb65efee52e1b583172baa2ccbb6d6cf98db0b33953aa740e4dee2eea84d1e SHA512 7783eb2026a1e2b91651f141881ecccb833bf7c527eaf76ec047997405bb8d394d3cc429bfa1687c2ebb4efd097c7ed82b9914b9740ed9ff97af55990b5051ae
-EBUILD selinux-tor-2.20220106-r1.ebuild 275 BLAKE2B c76ac82635debb18a4a8b79a2575470046a7cd36fbb21fd6ad996c4b0fe33cbadc395ca11ae2f0938510e32a77aa9c159683c8282f509e43dc02cc12fd6ee9ca SHA512 d287c8a25ab1a69d72cf2c866b2ee9fddfab614e5a46d3a957f104810ad9e647442f29d73b51311ee881b27989d4803f1cde7dae374e64686e44079eb0913cfc
+EBUILD selinux-tor-2.20220106-r1.ebuild 273 BLAKE2B e6c7b1f67bd2bca1305d23f0deccf755b2cf5abb288cb704a1397474c42812d4b7efb24f9c048e8b68a22e5c928a2298ccaf96748727e03306a8b5c78f9af6b2 SHA512 4a305a1e2acc13f7d7979cc4e8aa2133388f2c751102c5dc4fad94cc899a6c2ff88f71e53e75a9ae463b955cadf75b2e1d5f83fad65d88e907f25b7b3b8cb52c
+EBUILD selinux-tor-2.20220106-r2.ebuild 275 BLAKE2B c76ac82635debb18a4a8b79a2575470046a7cd36fbb21fd6ad996c4b0fe33cbadc395ca11ae2f0938510e32a77aa9c159683c8282f509e43dc02cc12fd6ee9ca SHA512 d287c8a25ab1a69d72cf2c866b2ee9fddfab614e5a46d3a957f104810ad9e647442f29d73b51311ee881b27989d4803f1cde7dae374e64686e44079eb0913cfc
 EBUILD selinux-tor-9999.ebuild 275 BLAKE2B 8892294547fd4f17aeff99013ee4a6845ed8f8a5c5e8fd665a4813a38fc98819b1369095f7762c57653b62d43ab0703f5ed6cfec9ce7a62492efc716c1f1cb48 SHA512 a4b30dcb2f9a42239e2f738c84e98d2f837c2997a8516b50241353969523ab905daf304e91ae821a86433bb98e65c04578d2d3822f568e7d5e324e1465c3d10f
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-tor/selinux-tor-2.20220106-r1.ebuild b/sec-policy/selinux-tor/selinux-tor-2.20220106-r1.ebuild
index af327ce9b87d..f86cbe9e5289 100644
--- a/sec-policy/selinux-tor/selinux-tor-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-tor/selinux-tor-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tor"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-tor/selinux-tor-2.20220106-r2.ebuild b/sec-policy/selinux-tor/selinux-tor-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..af327ce9b87d
--- /dev/null
+++ b/sec-policy/selinux-tor/selinux-tor-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="tor"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tor"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-tripwire/Manifest b/sec-policy/selinux-tripwire/Manifest
index 4e3f88ec73e4..5e6f3db5c444 100644
--- a/sec-policy/selinux-tripwire/Manifest
+++ b/sec-policy/selinux-tripwire/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-tripwire-2.20200818-r2.ebuild 281 BLAKE2B e622951ddb58d1538efa391927f18ac6dc789e7d67d9eab6df5b32f2c84578ccb81c158a6898eeae3edf8540da0477a14ffe1bb31dc8ffbc6191a1d6272184bc SHA512 083313d8384dd8e38de9bfcd633feea21d13d10b9c69bb379a7d066fd1aaa9bc6a3c956db5b0e58c5a940180399e421e5d1ecd4cba92de73766d64925044bc0b
 EBUILD selinux-tripwire-2.20210203-r1.ebuild 281 BLAKE2B e622951ddb58d1538efa391927f18ac6dc789e7d67d9eab6df5b32f2c84578ccb81c158a6898eeae3edf8540da0477a14ffe1bb31dc8ffbc6191a1d6272184bc SHA512 083313d8384dd8e38de9bfcd633feea21d13d10b9c69bb379a7d066fd1aaa9bc6a3c956db5b0e58c5a940180399e421e5d1ecd4cba92de73766d64925044bc0b
 EBUILD selinux-tripwire-2.20210908-r1.ebuild 281 BLAKE2B e622951ddb58d1538efa391927f18ac6dc789e7d67d9eab6df5b32f2c84578ccb81c158a6898eeae3edf8540da0477a14ffe1bb31dc8ffbc6191a1d6272184bc SHA512 083313d8384dd8e38de9bfcd633feea21d13d10b9c69bb379a7d066fd1aaa9bc6a3c956db5b0e58c5a940180399e421e5d1ecd4cba92de73766d64925044bc0b
-EBUILD selinux-tripwire-2.20220106-r1.ebuild 285 BLAKE2B f237dafd62cb0e4d68cba959b0c84e169b0b8e5b1d0ca1925236a85f226df8d7d50046fc86b7e4bd5be24e89594ba86f160c753116b49a20d46ad4d94bea291a SHA512 b868fb383c1954e4f4d36f46599fc12f29e7e5bfff4c4a19cdcc2e94e8065ddcdcc0629dc104e1aa982d43ccd0e88986ea824f76759bbfec694d871d1851a874
+EBUILD selinux-tripwire-2.20220106-r1.ebuild 283 BLAKE2B d6cefe731e626d386d56af9a473810c970028516de4818017bddc963ed267a23713f6d36c22acafe2456b045d073dab75dc2ac70ad670ea15f887108707970f1 SHA512 81bac656c93419ad4e351d66aa60b08affbc74be76a953b9ec9710301c167f5bc51a84dc2d167781b552abbda576ae6b152bf434088f84ef27b0968f466de66f
+EBUILD selinux-tripwire-2.20220106-r2.ebuild 285 BLAKE2B f237dafd62cb0e4d68cba959b0c84e169b0b8e5b1d0ca1925236a85f226df8d7d50046fc86b7e4bd5be24e89594ba86f160c753116b49a20d46ad4d94bea291a SHA512 b868fb383c1954e4f4d36f46599fc12f29e7e5bfff4c4a19cdcc2e94e8065ddcdcc0629dc104e1aa982d43ccd0e88986ea824f76759bbfec694d871d1851a874
 EBUILD selinux-tripwire-9999.ebuild 285 BLAKE2B 8ee5b950bf74102466fe23eb6cde6399a53a854ccada5ec088a70f026483b506f9ae916bc92fec72b1a96bbc4c8c97d9e77987327b5eeecfec744db9711ece5c SHA512 5c6e49c9c8e360ef23e752abac2ca17f47eaaee4c5c9086d17252f21838d408add0a47290e117cf3095181500988ac07859e585a85872d1b333de867aea4e201
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-tripwire/selinux-tripwire-2.20220106-r1.ebuild b/sec-policy/selinux-tripwire/selinux-tripwire-2.20220106-r1.ebuild
index a48a76d34daf..61f608548818 100644
--- a/sec-policy/selinux-tripwire/selinux-tripwire-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-tripwire/selinux-tripwire-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tripwire"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-tripwire/selinux-tripwire-2.20220106-r2.ebuild b/sec-policy/selinux-tripwire/selinux-tripwire-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..a48a76d34daf
--- /dev/null
+++ b/sec-policy/selinux-tripwire/selinux-tripwire-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="tripwire"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tripwire"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ucspitcp/Manifest b/sec-policy/selinux-ucspitcp/Manifest
index e99ee08b8f59..c6f129e7c800 100644
--- a/sec-policy/selinux-ucspitcp/Manifest
+++ b/sec-policy/selinux-ucspitcp/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-ucspitcp-2.20200818-r2.ebuild 281 BLAKE2B ab05a2568393f5a042fcd944fffc635c96e7539d8d9eb81b6ffe9e4e833d89cacf3201e332d77aff4757b56526d432a87386484c77a84c88f038998818120981 SHA512 be72409ce2edfd9329a2991ac30c1281f811d142b2c543bfd024c7cc55496cb46112c51cebd03b381cd2f456a864dc83449e88b7f534e49ec32611607573e71d
 EBUILD selinux-ucspitcp-2.20210203-r1.ebuild 281 BLAKE2B ab05a2568393f5a042fcd944fffc635c96e7539d8d9eb81b6ffe9e4e833d89cacf3201e332d77aff4757b56526d432a87386484c77a84c88f038998818120981 SHA512 be72409ce2edfd9329a2991ac30c1281f811d142b2c543bfd024c7cc55496cb46112c51cebd03b381cd2f456a864dc83449e88b7f534e49ec32611607573e71d
 EBUILD selinux-ucspitcp-2.20210908-r1.ebuild 281 BLAKE2B ab05a2568393f5a042fcd944fffc635c96e7539d8d9eb81b6ffe9e4e833d89cacf3201e332d77aff4757b56526d432a87386484c77a84c88f038998818120981 SHA512 be72409ce2edfd9329a2991ac30c1281f811d142b2c543bfd024c7cc55496cb46112c51cebd03b381cd2f456a864dc83449e88b7f534e49ec32611607573e71d
-EBUILD selinux-ucspitcp-2.20220106-r1.ebuild 285 BLAKE2B f605a5a9c63638c559470ee33bc21d2d87cefe98b08e7e6e9ced2414215de37a3024a32263ab36d6b556a555a907fa16563ec6552b9d18fb16fef71384c5c4c5 SHA512 29ae40e3811f0bad5d29c875e1b0f5012a18f36d11bcc73654c19ceeb84046c57637d354ab7107e15f28003b9ca81d98bdc57b68e5d4af11d502872d246ddeaf
+EBUILD selinux-ucspitcp-2.20220106-r1.ebuild 283 BLAKE2B 8388943b9915f0967a0816796e93c4d95ac9d260ddaa36036c87959c59dcd02df00465b5b1c0fe0b7d39ce16218f25423e0cf0772475178ba59f2d915962ab1f SHA512 c938a4f0f060b9018a74dbc742d11145bbac8df73a2527ed20edc23982384e357b89739842dac2d68fb31fd4f2cd0c9b1ed584b7b21cf8cb8f0bd457dd1e321e
+EBUILD selinux-ucspitcp-2.20220106-r2.ebuild 285 BLAKE2B f605a5a9c63638c559470ee33bc21d2d87cefe98b08e7e6e9ced2414215de37a3024a32263ab36d6b556a555a907fa16563ec6552b9d18fb16fef71384c5c4c5 SHA512 29ae40e3811f0bad5d29c875e1b0f5012a18f36d11bcc73654c19ceeb84046c57637d354ab7107e15f28003b9ca81d98bdc57b68e5d4af11d502872d246ddeaf
 EBUILD selinux-ucspitcp-9999.ebuild 285 BLAKE2B ab79a6f01b6d0dccc2f4f012c644cdf9d0d199cb1b585b27dd0efa735baf619110bb883cca093b892b3eb2956c14efc777d62c56c7083d99ef965a03f2439be1 SHA512 3b15af219e390e9bd783327fc98c9f49c6d7a51aa9d306458bb02f81a089fe69cf37e43807ec968a7e5555beaad14cb5a1aacbf7fbb1709d6f579ead84d4d1c3
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20220106-r1.ebuild b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20220106-r1.ebuild
index 06a2ece306e1..fd4f29a43bd8 100644
--- a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ucspitcp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20220106-r2.ebuild b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..06a2ece306e1
--- /dev/null
+++ b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="ucspitcp"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ucspitcp"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ulogd/Manifest b/sec-policy/selinux-ulogd/Manifest
index 7884404ac28a..09a0030752da 100644
--- a/sec-policy/selinux-ulogd/Manifest
+++ b/sec-policy/selinux-ulogd/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-ulogd-2.20200818-r2.ebuild 275 BLAKE2B d137997b195bf7ccbbc2d1d50e39f5f1e86160aee313032698aaf0ca8896a9969061e07e7a13379f090595d1026f6b485f59da1fc5cf1d971155dfe17cf1124a SHA512 ec1485e60cf4665d5a50e7e93e636078998519929c14473c8da493f421ba4b22449f4e584d0b32314b040cdc779c71b4bfce19f5aead24ede935c5815cc8b52c
 EBUILD selinux-ulogd-2.20210203-r1.ebuild 275 BLAKE2B d137997b195bf7ccbbc2d1d50e39f5f1e86160aee313032698aaf0ca8896a9969061e07e7a13379f090595d1026f6b485f59da1fc5cf1d971155dfe17cf1124a SHA512 ec1485e60cf4665d5a50e7e93e636078998519929c14473c8da493f421ba4b22449f4e584d0b32314b040cdc779c71b4bfce19f5aead24ede935c5815cc8b52c
 EBUILD selinux-ulogd-2.20210908-r1.ebuild 275 BLAKE2B d137997b195bf7ccbbc2d1d50e39f5f1e86160aee313032698aaf0ca8896a9969061e07e7a13379f090595d1026f6b485f59da1fc5cf1d971155dfe17cf1124a SHA512 ec1485e60cf4665d5a50e7e93e636078998519929c14473c8da493f421ba4b22449f4e584d0b32314b040cdc779c71b4bfce19f5aead24ede935c5815cc8b52c
-EBUILD selinux-ulogd-2.20220106-r1.ebuild 279 BLAKE2B e767ac3a4fa1449c14a634d39078c11665b3f4d665b06d8c5f316460bfda1ce37883c15e49ce7e8dfd23b5b73afaa815cd82d2dc2b0a0b40691f06d48f0773e8 SHA512 62777da3d64a15e89c6a1d3800262a4be578ecdaf01d058b4ec22b7f135ffa94901aa2ebe2c3b6641548bff8e746646e98a782ed33b0190b8512abd7d5dfd83a
+EBUILD selinux-ulogd-2.20220106-r1.ebuild 277 BLAKE2B b6ea6fb55076209b38ab0d9658660625b7952d4268dd08428f730cfe371605736abc58eee1272e02368dd496729f484f752ce3d9400ffdbc73253bf11575d592 SHA512 9e95ad49fcf263874b55aebbd44a8c885c88d360daa142e86c23de3803e81320a7a3ba78ed8d0c2510cd355002ad0531dd422124162a30febf95bfc549a714dc
+EBUILD selinux-ulogd-2.20220106-r2.ebuild 279 BLAKE2B e767ac3a4fa1449c14a634d39078c11665b3f4d665b06d8c5f316460bfda1ce37883c15e49ce7e8dfd23b5b73afaa815cd82d2dc2b0a0b40691f06d48f0773e8 SHA512 62777da3d64a15e89c6a1d3800262a4be578ecdaf01d058b4ec22b7f135ffa94901aa2ebe2c3b6641548bff8e746646e98a782ed33b0190b8512abd7d5dfd83a
 EBUILD selinux-ulogd-9999.ebuild 279 BLAKE2B 4970552f0838ed4a87c06042681b6db3696d8405f7d9609143ddba43047dd963be562adc892fbfbbc2f9f27d5ea895926eaa9d9ac043106eca2c0c7cfdc57164 SHA512 ef97c9b2f6949b54fc74715d4e61ee1ea58c56af32538fbb5de64db191af683e06c953677c796aefb99888fff745bf73d189b27db214edd816d37e114d4dff4e
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-ulogd/selinux-ulogd-2.20220106-r1.ebuild b/sec-policy/selinux-ulogd/selinux-ulogd-2.20220106-r1.ebuild
index e85d27a3779a..9d6f8255d661 100644
--- a/sec-policy/selinux-ulogd/selinux-ulogd-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-ulogd/selinux-ulogd-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ulogd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ulogd/selinux-ulogd-2.20220106-r2.ebuild b/sec-policy/selinux-ulogd/selinux-ulogd-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..e85d27a3779a
--- /dev/null
+++ b/sec-policy/selinux-ulogd/selinux-ulogd-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="ulogd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ulogd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-uml/Manifest b/sec-policy/selinux-uml/Manifest
index 291fd49c7b88..e762c130831b 100644
--- a/sec-policy/selinux-uml/Manifest
+++ b/sec-policy/selinux-uml/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-uml-2.20200818-r2.ebuild 271 BLAKE2B 31248ee1e32dbdfc37a6c8f9751f191da4b817ba7fcf4dca0b9ffed5b06c7d0777d9c2e78cb72acf89cbd7ef04278b75169942accfff484d0599e0e3573da21a SHA512 ed20d59bd557f1cf18c14c1f70281a15603b0cac01d1bab15d0b4809cff4669cfcd3f2d1c3e7907c36225a7685560cf8976ec700ce6d4fee0d2ca6ef47787a49
 EBUILD selinux-uml-2.20210203-r1.ebuild 271 BLAKE2B 31248ee1e32dbdfc37a6c8f9751f191da4b817ba7fcf4dca0b9ffed5b06c7d0777d9c2e78cb72acf89cbd7ef04278b75169942accfff484d0599e0e3573da21a SHA512 ed20d59bd557f1cf18c14c1f70281a15603b0cac01d1bab15d0b4809cff4669cfcd3f2d1c3e7907c36225a7685560cf8976ec700ce6d4fee0d2ca6ef47787a49
 EBUILD selinux-uml-2.20210908-r1.ebuild 271 BLAKE2B 31248ee1e32dbdfc37a6c8f9751f191da4b817ba7fcf4dca0b9ffed5b06c7d0777d9c2e78cb72acf89cbd7ef04278b75169942accfff484d0599e0e3573da21a SHA512 ed20d59bd557f1cf18c14c1f70281a15603b0cac01d1bab15d0b4809cff4669cfcd3f2d1c3e7907c36225a7685560cf8976ec700ce6d4fee0d2ca6ef47787a49
-EBUILD selinux-uml-2.20220106-r1.ebuild 275 BLAKE2B 5c640cd0573a7bb85b683bc4347f1b87600010c9cfb56d1468f218ff8df669f8a7e0fb4461c8e18daedbbc1152f780b35f8c334050c8b246eaa49efbfddf6961 SHA512 f8e5840e83e9fed2f84ab0feca4b650d4d8d40f08f95906bc3de647127425a13cef214d0de2fbc7b6e0a24ce10734330ea4444907d27ff3fa54c83521692e671
+EBUILD selinux-uml-2.20220106-r1.ebuild 273 BLAKE2B 4e7754fb32cee6a9933c44fcba4ea1628bd97d72b0b40652d055744ad24bd16bf48ae0b2089b18f2680624613183385c349a7c6c03c4db239efbc0e42724cdd1 SHA512 b9bdde0b7536320b5cb0eaf6207fa2c44b223eaab32bde8cd57f2b81aa818222c9915547b7fd28badaa86be87cf619a502fe349ba8805e67029c8537b65deabe
+EBUILD selinux-uml-2.20220106-r2.ebuild 275 BLAKE2B 5c640cd0573a7bb85b683bc4347f1b87600010c9cfb56d1468f218ff8df669f8a7e0fb4461c8e18daedbbc1152f780b35f8c334050c8b246eaa49efbfddf6961 SHA512 f8e5840e83e9fed2f84ab0feca4b650d4d8d40f08f95906bc3de647127425a13cef214d0de2fbc7b6e0a24ce10734330ea4444907d27ff3fa54c83521692e671
 EBUILD selinux-uml-9999.ebuild 275 BLAKE2B 4a5a3a6f762e2f1d02a47dcc6c92063e6ce3f479dee46cb17f157a099918af08d1bd14e78edfca7af52f07eaa18466a72df2f6a23896a9d21d8347574f2f8c45 SHA512 c9718a50b3b7afaa839589b9494bb592dbe34aafbb88250bdc80f8c6f80f2bac9cf675414f52b7da6ee915db87b830ee6c28630d8c54091e6a74b3587af20cb4
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-uml/selinux-uml-2.20220106-r1.ebuild b/sec-policy/selinux-uml/selinux-uml-2.20220106-r1.ebuild
index 414286a79c06..6325ecdb3fa8 100644
--- a/sec-policy/selinux-uml/selinux-uml-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-uml/selinux-uml-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for uml"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-uml/selinux-uml-2.20220106-r2.ebuild b/sec-policy/selinux-uml/selinux-uml-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..414286a79c06
--- /dev/null
+++ b/sec-policy/selinux-uml/selinux-uml-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="uml"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for uml"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-unconfined/Manifest b/sec-policy/selinux-unconfined/Manifest
index 8895015b7165..b1975d0c5b50 100644
--- a/sec-policy/selinux-unconfined/Manifest
+++ b/sec-policy/selinux-unconfined/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-unconfined-2.20200818-r2.ebuild 285 BLAKE2B 2a7555a6d96e2f3b100614a2c7a35883d8df363142201aad52ee2792aa234df8ffa2ac777670cf64a6dbea1dd923cff5ce5efc57ffb04f500aed2a6cee177914 SHA512 67cfe8dbd76bce275fd23489b43bc4f6566a55a05437997cf358ede640825b4c858f71aefd8bf39a3a83d53a5444896d9571da93fc090e442f006e0254261cc8
 EBUILD selinux-unconfined-2.20210203-r1.ebuild 285 BLAKE2B 2a7555a6d96e2f3b100614a2c7a35883d8df363142201aad52ee2792aa234df8ffa2ac777670cf64a6dbea1dd923cff5ce5efc57ffb04f500aed2a6cee177914 SHA512 67cfe8dbd76bce275fd23489b43bc4f6566a55a05437997cf358ede640825b4c858f71aefd8bf39a3a83d53a5444896d9571da93fc090e442f006e0254261cc8
 EBUILD selinux-unconfined-2.20210908-r1.ebuild 285 BLAKE2B 2a7555a6d96e2f3b100614a2c7a35883d8df363142201aad52ee2792aa234df8ffa2ac777670cf64a6dbea1dd923cff5ce5efc57ffb04f500aed2a6cee177914 SHA512 67cfe8dbd76bce275fd23489b43bc4f6566a55a05437997cf358ede640825b4c858f71aefd8bf39a3a83d53a5444896d9571da93fc090e442f006e0254261cc8
-EBUILD selinux-unconfined-2.20220106-r1.ebuild 289 BLAKE2B a3a5ba1846cc793bc831a5b07bf08b47e118088059e93379b89c3ea1d7d87f7c2382cde224f8292b1fdb875f53461bd3d3cd3f35c5e64e88849421845e73b475 SHA512 0137297ba36c8d7bba7c2d51fbfe98e15f92dd69637f517e753596ae206677e9996ad1ace53dd69b1606afff33ac81c1ead4b5b29ac1f8ede2ebba2bf41cfaf7
+EBUILD selinux-unconfined-2.20220106-r1.ebuild 287 BLAKE2B 91fc737f342a34bc15b5c1e77466e02eb1904df87a4959af7fb1629357a0e416fd46ff4bb63776cc6c898f5606f9b90e34bcf81815fe3d0f89f5a98894441778 SHA512 6718c49fda0d5b0315709f444b3f8bac2e69f40785dba7a7db525981b33c0fa91e885a376d21531b2b5570b2ec2ab5efe3704018e484a13c662b779577c3a073
+EBUILD selinux-unconfined-2.20220106-r2.ebuild 289 BLAKE2B a3a5ba1846cc793bc831a5b07bf08b47e118088059e93379b89c3ea1d7d87f7c2382cde224f8292b1fdb875f53461bd3d3cd3f35c5e64e88849421845e73b475 SHA512 0137297ba36c8d7bba7c2d51fbfe98e15f92dd69637f517e753596ae206677e9996ad1ace53dd69b1606afff33ac81c1ead4b5b29ac1f8ede2ebba2bf41cfaf7
 EBUILD selinux-unconfined-9999.ebuild 289 BLAKE2B f2af8e6f7ffc4f227edace014da2fe28cdceecc8274a3e863e34916f2246a7dd08d0e110620210d368d2c6e8fc08a6d241963d3da6929c6d71c16f42f0244de6 SHA512 5cdc6074a5c1e4114bc1b92afbc2c494fdda3596ce934fd1ec9e45687e440e486370ba7db8c66caed864698f3f800c659492bb4c89f3ff974b92da1c5460c4d7
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-unconfined/selinux-unconfined-2.20220106-r1.ebuild b/sec-policy/selinux-unconfined/selinux-unconfined-2.20220106-r1.ebuild
index 36e90163a529..335bfce94ed0 100644
--- a/sec-policy/selinux-unconfined/selinux-unconfined-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-unconfined/selinux-unconfined-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for unconfined"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-unconfined/selinux-unconfined-2.20220106-r2.ebuild b/sec-policy/selinux-unconfined/selinux-unconfined-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..36e90163a529
--- /dev/null
+++ b/sec-policy/selinux-unconfined/selinux-unconfined-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="unconfined"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for unconfined"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-uptime/Manifest b/sec-policy/selinux-uptime/Manifest
index 7ed1308c7793..3c303b8bbc3b 100644
--- a/sec-policy/selinux-uptime/Manifest
+++ b/sec-policy/selinux-uptime/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-uptime-2.20200818-r2.ebuild 277 BLAKE2B 1dbd90e926c593f930d8e400a2acefb5885031a2cc18a1744810410be3d4ee2fcf8467d76af7b930d80c5b454d9a72216bf17e961ab990e474c0280e32ea4a9c SHA512 2337424d55f2b12ebd67105aa1cdf0fc3139112da2660e29b3f2ba622b6e857cdbd70d154dd1e425248b8f6625188ea784fd7c8af4144d798324286d9269d62a
 EBUILD selinux-uptime-2.20210203-r1.ebuild 277 BLAKE2B 1dbd90e926c593f930d8e400a2acefb5885031a2cc18a1744810410be3d4ee2fcf8467d76af7b930d80c5b454d9a72216bf17e961ab990e474c0280e32ea4a9c SHA512 2337424d55f2b12ebd67105aa1cdf0fc3139112da2660e29b3f2ba622b6e857cdbd70d154dd1e425248b8f6625188ea784fd7c8af4144d798324286d9269d62a
 EBUILD selinux-uptime-2.20210908-r1.ebuild 277 BLAKE2B 1dbd90e926c593f930d8e400a2acefb5885031a2cc18a1744810410be3d4ee2fcf8467d76af7b930d80c5b454d9a72216bf17e961ab990e474c0280e32ea4a9c SHA512 2337424d55f2b12ebd67105aa1cdf0fc3139112da2660e29b3f2ba622b6e857cdbd70d154dd1e425248b8f6625188ea784fd7c8af4144d798324286d9269d62a
-EBUILD selinux-uptime-2.20220106-r1.ebuild 281 BLAKE2B c233a31d46c4574ca3c27af1ec8ebe64f0b11608e69f31782a68813f2804ae9e68423b03acea67cc4f2bd096539e9eca407131cf776e36727eac2cbc9631d6aa SHA512 d33aa1224aaca94198f1cefd5d10bf85d174ef0692e6ea8ce62995425c03b8b6558eead9d4a85895c6849f8b05f71fd03aa2d678d3570c97eee30474c3c26c62
+EBUILD selinux-uptime-2.20220106-r1.ebuild 279 BLAKE2B bfddce4a70a84f633acd5b28581b4fffd24b86c89852e38e83d489bdf44f99e0119bce279d0d993b986cb9dbb9dfdd1236bd91c6449afa2a99e51d4ca6a49fff SHA512 303e25be7cba053f1e3ed8a6ffe385dde3dee2bfa854254283df9a214a4e314c6242b8e19a9751de5ce78055804e82e4ef28cc00d7ca97e59fbe5102c11dd585
+EBUILD selinux-uptime-2.20220106-r2.ebuild 281 BLAKE2B c233a31d46c4574ca3c27af1ec8ebe64f0b11608e69f31782a68813f2804ae9e68423b03acea67cc4f2bd096539e9eca407131cf776e36727eac2cbc9631d6aa SHA512 d33aa1224aaca94198f1cefd5d10bf85d174ef0692e6ea8ce62995425c03b8b6558eead9d4a85895c6849f8b05f71fd03aa2d678d3570c97eee30474c3c26c62
 EBUILD selinux-uptime-9999.ebuild 281 BLAKE2B ea8393fc49d8a1c356861585ca2a104273a246946cbe5fd5c568c9884d9857360a35ef177865f2d4bfd82f61dafd138a04b0fb6f80bdb222323df528101ad96d SHA512 7d88d942f79496e6b138f831fba27c2fc16906618197af6234e96cae14b08a64ba1a71a1140d5b737640d3006932c41a7e94899a8fe96359a848663f11bb53fa
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-uptime/selinux-uptime-2.20220106-r1.ebuild b/sec-policy/selinux-uptime/selinux-uptime-2.20220106-r1.ebuild
index 5a5cf1c05dd2..86bbbe1a3cc7 100644
--- a/sec-policy/selinux-uptime/selinux-uptime-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-uptime/selinux-uptime-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for uptime"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-uptime/selinux-uptime-2.20220106-r2.ebuild b/sec-policy/selinux-uptime/selinux-uptime-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..5a5cf1c05dd2
--- /dev/null
+++ b/sec-policy/selinux-uptime/selinux-uptime-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="uptime"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for uptime"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-usbguard/Manifest b/sec-policy/selinux-usbguard/Manifest
index 702aa432091d..d568b5fbe601 100644
--- a/sec-policy/selinux-usbguard/Manifest
+++ b/sec-policy/selinux-usbguard/Manifest
@@ -1,8 +1,10 @@
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
 DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176d3c8e508b2ff97d4f8a876d7c0a65534a62d86c9816ac59f6eed583f4b5c51cf432643edd2dad24dd51eb3cf22e2b75ac SHA512 794327d2dd07196b5f36771f9a961cdf294cf68f690735418d6bdd859499b7007c518cc022ccca9c245a5266b85bdb7cacdcaeefee14e4800937c9101476b373
 EBUILD selinux-usbguard-2.20210908-r1.ebuild 281 BLAKE2B b88f01f8382b0f0c786da504c834c3f92364525f902d0926ef4987b429e1909cdf00dcfc90ac49338bffad4f3dbf9565499280287c2317583ae8f6379e5e516d SHA512 b76c82b9a9a13d92830ceb17018b548cfd1a8dac99136c75c8a810a571c1746cb35c3dc2777c2a3c27d344a5b70a48480148bf8680e8cfbba35acfacf8282421
-EBUILD selinux-usbguard-2.20220106-r1.ebuild 285 BLAKE2B 4844cf95e5319f1080e6b4ffaa7a552420a6de33fda5c7dacf03a03f9a5f0643457af5d25dde09700d7932d711d658b90be62d828b808ab2d2561d52620e9c76 SHA512 d6b5412e16b787b726c6f0713fd490b1411167f1c521d8d0633a3a6255be9004a184aa08f1141c2d3923e27e6733118a468d714255f3577dfffc952901631416
+EBUILD selinux-usbguard-2.20220106-r1.ebuild 283 BLAKE2B 7b4fd85fc667bf6023b42c21ada7a273aceaf2dcefcba1cbe7b6da00eef424a9c248d6396d9abbf28b3e267ebeb748969107ab261022051c6fc64fe8624f3415 SHA512 fd1a2a59e2f0fbdbec1a7102707a3b7cf3efb0f020253668e1c037dcb81dcdf4ed91cb6c3b4763dbad1b55ec15e360affb5f4233de6e35b1882642a411f6f34f
+EBUILD selinux-usbguard-2.20220106-r2.ebuild 285 BLAKE2B 4844cf95e5319f1080e6b4ffaa7a552420a6de33fda5c7dacf03a03f9a5f0643457af5d25dde09700d7932d711d658b90be62d828b808ab2d2561d52620e9c76 SHA512 d6b5412e16b787b726c6f0713fd490b1411167f1c521d8d0633a3a6255be9004a184aa08f1141c2d3923e27e6733118a468d714255f3577dfffc952901631416
 EBUILD selinux-usbguard-9999.ebuild 285 BLAKE2B 556bb272d8908df840adf8ea2bf7ae3af6ce4634576ed7ae9bfe4ed3cb3f9e448f39b669230d01b3a95a853bf9ae99fc62b5f4d3571e1a4ca85113542a40f0f6 SHA512 68a3cde5f37c63e8e9a8c69061f8345ad639cf1beeaa59e94ec535151c5614f768a4b32fa5390d72763b4d16c196529b5b8298633093467d586077cbc146a688
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-usbguard/selinux-usbguard-2.20220106-r1.ebuild b/sec-policy/selinux-usbguard/selinux-usbguard-2.20220106-r1.ebuild
index 2306a3c6f0dc..746e1e5366c2 100644
--- a/sec-policy/selinux-usbguard/selinux-usbguard-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-usbguard/selinux-usbguard-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for usbguard"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-usbguard/selinux-usbguard-2.20220106-r2.ebuild b/sec-policy/selinux-usbguard/selinux-usbguard-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..2306a3c6f0dc
--- /dev/null
+++ b/sec-policy/selinux-usbguard/selinux-usbguard-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="usbguard"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for usbguard"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-usbmuxd/Manifest b/sec-policy/selinux-usbmuxd/Manifest
index a65f98a5bfc7..aac8a5990f0e 100644
--- a/sec-policy/selinux-usbmuxd/Manifest
+++ b/sec-policy/selinux-usbmuxd/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-usbmuxd-2.20200818-r2.ebuild 279 BLAKE2B 432ae5287ec3f6ea635fef8ebd06ab4748adfa80b159f1652a88bc713192cddcd2c005c382b272b437585446aab5cb69f85b7fd599878c035328a575cf3f4429 SHA512 6cb65b16be2b947f19eb828df4212a7c61c620e2b77771a62f887877ed58082401621c80b5e9affb784e154ed7c9b28cc149797c10f13255ab5271d0ec53e8e6
 EBUILD selinux-usbmuxd-2.20210203-r1.ebuild 279 BLAKE2B 432ae5287ec3f6ea635fef8ebd06ab4748adfa80b159f1652a88bc713192cddcd2c005c382b272b437585446aab5cb69f85b7fd599878c035328a575cf3f4429 SHA512 6cb65b16be2b947f19eb828df4212a7c61c620e2b77771a62f887877ed58082401621c80b5e9affb784e154ed7c9b28cc149797c10f13255ab5271d0ec53e8e6
 EBUILD selinux-usbmuxd-2.20210908-r1.ebuild 279 BLAKE2B 432ae5287ec3f6ea635fef8ebd06ab4748adfa80b159f1652a88bc713192cddcd2c005c382b272b437585446aab5cb69f85b7fd599878c035328a575cf3f4429 SHA512 6cb65b16be2b947f19eb828df4212a7c61c620e2b77771a62f887877ed58082401621c80b5e9affb784e154ed7c9b28cc149797c10f13255ab5271d0ec53e8e6
-EBUILD selinux-usbmuxd-2.20220106-r1.ebuild 283 BLAKE2B 8329c5ce7ddbd773a32ca04af72d6ab597ec96d61bd69164adfbcce0aba843661df420aeb268bdd1a66528bfb1d5635a74b94acdb857d94dd313e84d99cdb122 SHA512 97f8d7e15cea7dfd4df45151bbfee3605ead01ed742e0c9ef6c19165bfda832047261fa0e633892433a611f2582222dfc6a94220edc429fd4182a968197d1923
+EBUILD selinux-usbmuxd-2.20220106-r1.ebuild 281 BLAKE2B 9655cf52d17c87aeeaa4a0c4bb10217ddc39ed99f7f8e79f4e4be8c5eff3e7c449ef4eaebfe06394472b9829b5c92ed2b4841b363276eb559ba0d24a7cfe9a90 SHA512 fbe83adbbb9a360c968b15399ec9aca5f1a925bb60f4d7c09673e3e698a59af99d481d36b75424b0fc864283531d9a9e192d62920be9671c108f7c4cfc6948b1
+EBUILD selinux-usbmuxd-2.20220106-r2.ebuild 283 BLAKE2B 8329c5ce7ddbd773a32ca04af72d6ab597ec96d61bd69164adfbcce0aba843661df420aeb268bdd1a66528bfb1d5635a74b94acdb857d94dd313e84d99cdb122 SHA512 97f8d7e15cea7dfd4df45151bbfee3605ead01ed742e0c9ef6c19165bfda832047261fa0e633892433a611f2582222dfc6a94220edc429fd4182a968197d1923
 EBUILD selinux-usbmuxd-9999.ebuild 283 BLAKE2B b030ab51f9b3ce3ed8f6f8a7c95b474088e8206219921d8de2f1a5f138b0b39f19296847dc95bf50d609a73445a5e0a7634dc191bc70111c9b06f76f3c5cd98f SHA512 136ad9103035d6fe4fada40b6b720cbc3cfc71bcafe83dd0e85a2fa21db80e71282b71c4425bdc4efaeb2a5cb065510b33cba0057f548d5a889ffd9eb66e4bbe
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20220106-r1.ebuild b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20220106-r1.ebuild
index fd42366f839a..1c11e435d758 100644
--- a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for usbmuxd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20220106-r2.ebuild b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..fd42366f839a
--- /dev/null
+++ b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="usbmuxd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for usbmuxd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-uucp/Manifest b/sec-policy/selinux-uucp/Manifest
index af7b26cb6a21..81dbd4f108e6 100644
--- a/sec-policy/selinux-uucp/Manifest
+++ b/sec-policy/selinux-uucp/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-uucp-2.20200818-r2.ebuild 367 BLAKE2B b539d320635461a557de81c3426c71d646bf395938f2cd12807d97aa79eeebbcb6349e5b7d6a5c42b2c4cbc82dbecbfeffd3400f01efffa14a81044d62be5a83 SHA512 89a747535a9c1c0d08797cdad25d8d8af6799ff6bf898b2b0b34c0991398611e785d776d8de9c6e34ba1e391934d3ab83a66d861c4b277322f5691b20f2acc41
 EBUILD selinux-uucp-2.20210203-r1.ebuild 367 BLAKE2B b539d320635461a557de81c3426c71d646bf395938f2cd12807d97aa79eeebbcb6349e5b7d6a5c42b2c4cbc82dbecbfeffd3400f01efffa14a81044d62be5a83 SHA512 89a747535a9c1c0d08797cdad25d8d8af6799ff6bf898b2b0b34c0991398611e785d776d8de9c6e34ba1e391934d3ab83a66d861c4b277322f5691b20f2acc41
 EBUILD selinux-uucp-2.20210908-r1.ebuild 367 BLAKE2B b539d320635461a557de81c3426c71d646bf395938f2cd12807d97aa79eeebbcb6349e5b7d6a5c42b2c4cbc82dbecbfeffd3400f01efffa14a81044d62be5a83 SHA512 89a747535a9c1c0d08797cdad25d8d8af6799ff6bf898b2b0b34c0991398611e785d776d8de9c6e34ba1e391934d3ab83a66d861c4b277322f5691b20f2acc41
-EBUILD selinux-uucp-2.20220106-r1.ebuild 371 BLAKE2B b079948777ffbd8cc336cb13e3c9b8c452c5fd3cf43e6f1805cea1560de22de13a800c1a1a8597b3d4274bc18e44b3116b4262ef004446ffcd2ed0ee8e0b242e SHA512 2e787ca887f5dc788f204d9caee72993685ffa08521bdd54cf535e73d2bab1133f2f5c28205226f402774ee38be36db607b32944dd335a5bb419ce3c91a4d7d9
+EBUILD selinux-uucp-2.20220106-r1.ebuild 369 BLAKE2B 074a7f61df5422833abb5c6cb251095c017a7606da12164764247ce8789438bd5ff5b03b6cc49b6cc6c7299470c2e94a867e1d64262d14d786518b006863953a SHA512 22a8484d864910005ba56bb283ff085c7f9166986aff5288db8111feef92ffb37f6e33750e51fdde23f9ab6f50b9ec591d352d95efc95f322bb703be997f9e11
+EBUILD selinux-uucp-2.20220106-r2.ebuild 371 BLAKE2B b079948777ffbd8cc336cb13e3c9b8c452c5fd3cf43e6f1805cea1560de22de13a800c1a1a8597b3d4274bc18e44b3116b4262ef004446ffcd2ed0ee8e0b242e SHA512 2e787ca887f5dc788f204d9caee72993685ffa08521bdd54cf535e73d2bab1133f2f5c28205226f402774ee38be36db607b32944dd335a5bb419ce3c91a4d7d9
 EBUILD selinux-uucp-9999.ebuild 371 BLAKE2B ebe1e8a163d0e0f00b0b45e219dd045d0227da5173d6a375dda2d979aa2918651c8aa2d23f3fd1f09d60e8aa736ed2beceb443b225b55287f2a6d4039bc58dcf SHA512 734a0854510ff39b0c34a2d203820fc84741ad58db57d30caa5206cb5aaeed3559cca77809ada6e8c33d6a0c765375a53f33021946af887005b3645ede14e18f
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-uucp/selinux-uucp-2.20220106-r1.ebuild b/sec-policy/selinux-uucp/selinux-uucp-2.20220106-r1.ebuild
index ac7d19d4eea7..5d571d92b02e 100644
--- a/sec-policy/selinux-uucp/selinux-uucp-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-uucp/selinux-uucp-2.20220106-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for uucp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-inetd
diff --git a/sec-policy/selinux-uucp/selinux-uucp-2.20220106-r2.ebuild b/sec-policy/selinux-uucp/selinux-uucp-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..ac7d19d4eea7
--- /dev/null
+++ b/sec-policy/selinux-uucp/selinux-uucp-2.20220106-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="uucp"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for uucp"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-inetd
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-inetd
+"
diff --git a/sec-policy/selinux-uwimap/Manifest b/sec-policy/selinux-uwimap/Manifest
index e148d8ef4ed2..a00bcb359afa 100644
--- a/sec-policy/selinux-uwimap/Manifest
+++ b/sec-policy/selinux-uwimap/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-uwimap-2.20200818-r2.ebuild 277 BLAKE2B 443669815ca53dfc1fc263ae54212fdd62eefbfd6c807ab2f490163e7c662013b00aa7c1e7275b394f017a77ce8b8ba4d0e1f5de0056b82b3f84a5600fb43637 SHA512 1fae41b8d292afed73379fead54d1edfee91bc0584158c698d40450f4835afb3d5340a40731e8c469c93478502605e58cebd896f5cbac2b8400797ee0e9e888b
 EBUILD selinux-uwimap-2.20210203-r1.ebuild 277 BLAKE2B 443669815ca53dfc1fc263ae54212fdd62eefbfd6c807ab2f490163e7c662013b00aa7c1e7275b394f017a77ce8b8ba4d0e1f5de0056b82b3f84a5600fb43637 SHA512 1fae41b8d292afed73379fead54d1edfee91bc0584158c698d40450f4835afb3d5340a40731e8c469c93478502605e58cebd896f5cbac2b8400797ee0e9e888b
 EBUILD selinux-uwimap-2.20210908-r1.ebuild 277 BLAKE2B 443669815ca53dfc1fc263ae54212fdd62eefbfd6c807ab2f490163e7c662013b00aa7c1e7275b394f017a77ce8b8ba4d0e1f5de0056b82b3f84a5600fb43637 SHA512 1fae41b8d292afed73379fead54d1edfee91bc0584158c698d40450f4835afb3d5340a40731e8c469c93478502605e58cebd896f5cbac2b8400797ee0e9e888b
-EBUILD selinux-uwimap-2.20220106-r1.ebuild 281 BLAKE2B 47c786b9ffe1f91ad1db9608e0058c287a029185d78ed1e3dae0e804b18251f5d36578aef60a009a9558d5fd04637f734c2d300015fd83d342ef09aa70291aa5 SHA512 d546bae3fa6bdabccbef18e655d39ddefdd76424b7ee51f780f1fdf5cf117e35bf7276155f89d3503d609abb4cc801a9b6af0226c03067cbcb7ed59745f68265
+EBUILD selinux-uwimap-2.20220106-r1.ebuild 279 BLAKE2B 772ddc115515059ff7eb13b6843cadadcc9b159e7f79b40d22cb8c44552d8a48da3a628b87f8f5ed693d2a989659c96b9eff85cfd8d5aafcc3ea0472e5b0225d SHA512 2a2c6c6dba431b4275a8171d4a7bd0575e29b21fc5deb57f65753b5bfe40acce34aebd49ccffd7843585c5b7af3acead03cf386a165f580215d0b54a5b9dbfa2
+EBUILD selinux-uwimap-2.20220106-r2.ebuild 281 BLAKE2B 47c786b9ffe1f91ad1db9608e0058c287a029185d78ed1e3dae0e804b18251f5d36578aef60a009a9558d5fd04637f734c2d300015fd83d342ef09aa70291aa5 SHA512 d546bae3fa6bdabccbef18e655d39ddefdd76424b7ee51f780f1fdf5cf117e35bf7276155f89d3503d609abb4cc801a9b6af0226c03067cbcb7ed59745f68265
 EBUILD selinux-uwimap-9999.ebuild 281 BLAKE2B fecfe0323679ef67c8db88d07aec8601bafad85f99a111643a67e16c68fae08107327f12f549e3462129d899eddc24494fd58f23301025cfd58752a4ddf2e597 SHA512 b0e598fd2c04280a31a2204f0ac1c90625da6e63c6a8d8f15982f52cfd6b82d17b8f7131c2462c122108d70b6592a1f325786ba90c834dd59ced36fb70725875
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-uwimap/selinux-uwimap-2.20220106-r1.ebuild b/sec-policy/selinux-uwimap/selinux-uwimap-2.20220106-r1.ebuild
index 3a5b2f9b8996..8dbd00227cdd 100644
--- a/sec-policy/selinux-uwimap/selinux-uwimap-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-uwimap/selinux-uwimap-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for uwimap"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-uwimap/selinux-uwimap-2.20220106-r2.ebuild b/sec-policy/selinux-uwimap/selinux-uwimap-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..3a5b2f9b8996
--- /dev/null
+++ b/sec-policy/selinux-uwimap/selinux-uwimap-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="uwimap"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for uwimap"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-uwsgi/Manifest b/sec-policy/selinux-uwsgi/Manifest
index 3171044a5d92..348d978ca2af 100644
--- a/sec-policy/selinux-uwsgi/Manifest
+++ b/sec-policy/selinux-uwsgi/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-uwsgi-2.20200818-r2.ebuild 275 BLAKE2B 1e10aa4b39f95359ba48c36d78c65eafca9cfbfe29abc598992d17988ee271f88a5e1be76ae4840b5ef218b14f4501dc53003b112876c5f18ddbf71dd4db287e SHA512 70e4a3f7db81bf67a54beae860f6462dc0dec484f50050b054b08f7b1739a66ccd73c8e4d03c0abd21f4adbb9e946439eaba0fb07f9a7fa68a8fc4e8da7478d9
 EBUILD selinux-uwsgi-2.20210203-r1.ebuild 275 BLAKE2B 1e10aa4b39f95359ba48c36d78c65eafca9cfbfe29abc598992d17988ee271f88a5e1be76ae4840b5ef218b14f4501dc53003b112876c5f18ddbf71dd4db287e SHA512 70e4a3f7db81bf67a54beae860f6462dc0dec484f50050b054b08f7b1739a66ccd73c8e4d03c0abd21f4adbb9e946439eaba0fb07f9a7fa68a8fc4e8da7478d9
 EBUILD selinux-uwsgi-2.20210908-r1.ebuild 275 BLAKE2B 1e10aa4b39f95359ba48c36d78c65eafca9cfbfe29abc598992d17988ee271f88a5e1be76ae4840b5ef218b14f4501dc53003b112876c5f18ddbf71dd4db287e SHA512 70e4a3f7db81bf67a54beae860f6462dc0dec484f50050b054b08f7b1739a66ccd73c8e4d03c0abd21f4adbb9e946439eaba0fb07f9a7fa68a8fc4e8da7478d9
-EBUILD selinux-uwsgi-2.20220106-r1.ebuild 279 BLAKE2B 5a3f7e0fd1b900899e23dbc05226f09a2b71f290c50283e7e30b880a61d3673b5a935526347ced83e7c8a09172d37acf057c8af7a5c19c84991bd8a9654d2bbc SHA512 91122efceab16819e77fffa64e44c952ee5a20b6e3ce745b2ed5b2f71e46642d49911b8b2332044dfcccf699b3a303e2c24d094065cea6ccc214ae514fd82246
+EBUILD selinux-uwsgi-2.20220106-r1.ebuild 277 BLAKE2B 2c523b3566b385d70796e67a280aa53cdffd98a933ed7e734dc1512027b356137aa3cc9cf1e7903bf2369752f7ad0e2e79686b1a62228babdc1f6044aa95d247 SHA512 16575b818b4bc3f35a0f51734c196e164ad1fdac51bbc9a539c35984be89b402f07c7db56602c679d7a084dacc6f3eb10a1ec96456dcccd2ba37889bb998d514
+EBUILD selinux-uwsgi-2.20220106-r2.ebuild 279 BLAKE2B 5a3f7e0fd1b900899e23dbc05226f09a2b71f290c50283e7e30b880a61d3673b5a935526347ced83e7c8a09172d37acf057c8af7a5c19c84991bd8a9654d2bbc SHA512 91122efceab16819e77fffa64e44c952ee5a20b6e3ce745b2ed5b2f71e46642d49911b8b2332044dfcccf699b3a303e2c24d094065cea6ccc214ae514fd82246
 EBUILD selinux-uwsgi-9999.ebuild 279 BLAKE2B 35f343cce2174bd24222370affbffc706d30eafe5937b5c8b4908e52c50b30cf7e3d960edbc1bee221b7c5d82246d478a63eb6ceb1bfc2b147c4e72e75de4f7f SHA512 c4ac69d4965b14349d61b7ac2f752fa7ae1cb4585a713a0df4082643f09e190af7e751432d33953746e7a906fcb6279afbc2b792307fda30afac2e4efeb63ec3
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20220106-r1.ebuild b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20220106-r1.ebuild
index d7388134df95..3f37fb297b92 100644
--- a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for uWSGI"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20220106-r2.ebuild b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..d7388134df95
--- /dev/null
+++ b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="uwsgi"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for uWSGI"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-varnishd/Manifest b/sec-policy/selinux-varnishd/Manifest
index 54e704559d8c..b87677d91d31 100644
--- a/sec-policy/selinux-varnishd/Manifest
+++ b/sec-policy/selinux-varnishd/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-varnishd-2.20200818-r2.ebuild 281 BLAKE2B 712f4f6412b0ed0e2d7063a3d23d3cd2fe815f7a488073e380fb846947d57eef5e2120ec57820c5305cd47467ef68a96e9a8a6c4a0fe5151582982f5bc34f3dc SHA512 dd937f2b14a4fc85445f4dc61745edbab6aeeefd772135009d7a6029091d095b4d42fc5d515d78b5a3f44784ac61b985be28d3609535fc2dd7568650c01db1e2
 EBUILD selinux-varnishd-2.20210203-r1.ebuild 281 BLAKE2B 712f4f6412b0ed0e2d7063a3d23d3cd2fe815f7a488073e380fb846947d57eef5e2120ec57820c5305cd47467ef68a96e9a8a6c4a0fe5151582982f5bc34f3dc SHA512 dd937f2b14a4fc85445f4dc61745edbab6aeeefd772135009d7a6029091d095b4d42fc5d515d78b5a3f44784ac61b985be28d3609535fc2dd7568650c01db1e2
 EBUILD selinux-varnishd-2.20210908-r1.ebuild 281 BLAKE2B 712f4f6412b0ed0e2d7063a3d23d3cd2fe815f7a488073e380fb846947d57eef5e2120ec57820c5305cd47467ef68a96e9a8a6c4a0fe5151582982f5bc34f3dc SHA512 dd937f2b14a4fc85445f4dc61745edbab6aeeefd772135009d7a6029091d095b4d42fc5d515d78b5a3f44784ac61b985be28d3609535fc2dd7568650c01db1e2
-EBUILD selinux-varnishd-2.20220106-r1.ebuild 285 BLAKE2B 3db136ea78bb646ea03fda67fa22cbb428e75bc4dfae212033a802b69c1bff06c61dd9419c9da09f387056a73af4af5ab2168d0afe7e484126e6f85413cbdacf SHA512 47bdf3d67753010721a441e67e68f75b7d86f327321e4d4b200a272590348f4db3f500e3d8123c8105dac9a68545e1e9d148cb35e3548d5cec3b74df704c8fdd
+EBUILD selinux-varnishd-2.20220106-r1.ebuild 283 BLAKE2B 3f44241c31f12be3e7ad1116615294ed39916fab178874659e8a59630c456c3775b6ecee3e954b1ed008de6cfde13c7e9f2e76fade218211782cfd484c943423 SHA512 a1ce1a3851e3095c85706031f8c7a84fa7068607c98b11f3a54c541864adf06af741ca70344a7b9413187e686db4e6405c9dc861078dc2584bd9d474675902b0
+EBUILD selinux-varnishd-2.20220106-r2.ebuild 285 BLAKE2B 3db136ea78bb646ea03fda67fa22cbb428e75bc4dfae212033a802b69c1bff06c61dd9419c9da09f387056a73af4af5ab2168d0afe7e484126e6f85413cbdacf SHA512 47bdf3d67753010721a441e67e68f75b7d86f327321e4d4b200a272590348f4db3f500e3d8123c8105dac9a68545e1e9d148cb35e3548d5cec3b74df704c8fdd
 EBUILD selinux-varnishd-9999.ebuild 285 BLAKE2B 06297eb553a379586fb9a4fe3ded3306bf627e9e3c50cb49344eb9597d39505b8fda46551dd7a3ccd5c9b71ab3cf8a6df994a15e827a29201e6eb220e759c2e9 SHA512 5865c84962d1af21bc11bbc3290a2bf919c3188e523b6e76a5ffca5356ba443f6bc57290001185e20ccc03bd66c46d9ffd1bdf14adcda92fe3c52086078bbd74
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-varnishd/selinux-varnishd-2.20220106-r1.ebuild b/sec-policy/selinux-varnishd/selinux-varnishd-2.20220106-r1.ebuild
index 5b50b8526f0f..a4ed901d9bda 100644
--- a/sec-policy/selinux-varnishd/selinux-varnishd-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-varnishd/selinux-varnishd-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for varnishd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-varnishd/selinux-varnishd-2.20220106-r2.ebuild b/sec-policy/selinux-varnishd/selinux-varnishd-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..5b50b8526f0f
--- /dev/null
+++ b/sec-policy/selinux-varnishd/selinux-varnishd-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="varnishd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for varnishd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-vbetool/Manifest b/sec-policy/selinux-vbetool/Manifest
index 8bb5970109ff..a20cd83a2fc9 100644
--- a/sec-policy/selinux-vbetool/Manifest
+++ b/sec-policy/selinux-vbetool/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-vbetool-2.20200818-r2.ebuild 279 BLAKE2B 0d633ff449dc5af6719259965434e1937fbc36bea3a7c394228ab2c69d3d1c6aacfb6223f9fdc401e6d2b5be98717ce48249d4704745068808e097e873389eba SHA512 abc98259c1ae030fd510d90382845b8a69d5b65797e07f16ef8c8c3e9a584b1b3902d684b55b5043ddfed28b3069a78486ed28b0d7f14c33eccb622ae675a7b5
 EBUILD selinux-vbetool-2.20210203-r1.ebuild 279 BLAKE2B 0d633ff449dc5af6719259965434e1937fbc36bea3a7c394228ab2c69d3d1c6aacfb6223f9fdc401e6d2b5be98717ce48249d4704745068808e097e873389eba SHA512 abc98259c1ae030fd510d90382845b8a69d5b65797e07f16ef8c8c3e9a584b1b3902d684b55b5043ddfed28b3069a78486ed28b0d7f14c33eccb622ae675a7b5
 EBUILD selinux-vbetool-2.20210908-r1.ebuild 279 BLAKE2B 0d633ff449dc5af6719259965434e1937fbc36bea3a7c394228ab2c69d3d1c6aacfb6223f9fdc401e6d2b5be98717ce48249d4704745068808e097e873389eba SHA512 abc98259c1ae030fd510d90382845b8a69d5b65797e07f16ef8c8c3e9a584b1b3902d684b55b5043ddfed28b3069a78486ed28b0d7f14c33eccb622ae675a7b5
-EBUILD selinux-vbetool-2.20220106-r1.ebuild 283 BLAKE2B 1f27740e606fedc3cecaa17718af2c7bd4272d3ad36577a2975eb19e02987a4d1df26cfc751144b826949a29d695ac955b9e5678ad3740ebdcadbd71a20a21b7 SHA512 7f2cd160e7d29a0ffef061b86d5ef7fe0281508ad0390e5fd8b8c90c0f38dbeafd3e46724b9830a6c11ce91fd059a87674113adcadd34dec8cf1cd79270d78ba
+EBUILD selinux-vbetool-2.20220106-r1.ebuild 281 BLAKE2B e78f9d773a840fe93d690e2f8288ab246081ce76b94f2decd30fcd5bb29f07aabefde5c57320a63ae66457f21d2a3925fc613941c61ad758b0c34fae1efe47e3 SHA512 cbc141ebba4267507276fdb5a72490f4f3ac2d1990969f0d34b329d4874403eb5ea3276577a9634d5ed189e91edb35dcc42884ffa5a416e578283aff39b282af
+EBUILD selinux-vbetool-2.20220106-r2.ebuild 283 BLAKE2B 1f27740e606fedc3cecaa17718af2c7bd4272d3ad36577a2975eb19e02987a4d1df26cfc751144b826949a29d695ac955b9e5678ad3740ebdcadbd71a20a21b7 SHA512 7f2cd160e7d29a0ffef061b86d5ef7fe0281508ad0390e5fd8b8c90c0f38dbeafd3e46724b9830a6c11ce91fd059a87674113adcadd34dec8cf1cd79270d78ba
 EBUILD selinux-vbetool-9999.ebuild 283 BLAKE2B 78a267746ab82739dbadb6a3ad491df78c394851882284fae7f7732f478a5f53f0981cd490965e14bbbbb47c7ee7c7afcfd45fd96048459aea839f838f56edf3 SHA512 c6e0cbeabf6d0fccd9341487f691363a701b83dbbbfe78d2a496d7ce0d0e3245f3ec781c7d4c5343064fa7d0fa56dba65399ef551beacd213b0616cbbf1b06f4
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-vbetool/selinux-vbetool-2.20220106-r1.ebuild b/sec-policy/selinux-vbetool/selinux-vbetool-2.20220106-r1.ebuild
index 9f076bc25f8e..c278495ce3b2 100644
--- a/sec-policy/selinux-vbetool/selinux-vbetool-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-vbetool/selinux-vbetool-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vbetool"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-vbetool/selinux-vbetool-2.20220106-r2.ebuild b/sec-policy/selinux-vbetool/selinux-vbetool-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..9f076bc25f8e
--- /dev/null
+++ b/sec-policy/selinux-vbetool/selinux-vbetool-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="vbetool"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vbetool"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-vdagent/Manifest b/sec-policy/selinux-vdagent/Manifest
index 0121bc7c039c..59d158b37829 100644
--- a/sec-policy/selinux-vdagent/Manifest
+++ b/sec-policy/selinux-vdagent/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-vdagent-2.20200818-r2.ebuild 279 BLAKE2B 6b158b06f5dfb07a6e8928714a49e03292d798d855a830026a652478f14a5c80ef5dd7a7014d2fa23e8a22c3eb9bdbd33bfbfce01db0793db48bceb09ddf5cb6 SHA512 e4ebf281c192d2d2acc1510a222ee54e4b82e8dd453a983fad6ef46c763bde5ff476e5fc4101db8e32fd926a6ee699f773dff00671e8e1ae661ed565ecc2b4d4
 EBUILD selinux-vdagent-2.20210203-r1.ebuild 279 BLAKE2B 6b158b06f5dfb07a6e8928714a49e03292d798d855a830026a652478f14a5c80ef5dd7a7014d2fa23e8a22c3eb9bdbd33bfbfce01db0793db48bceb09ddf5cb6 SHA512 e4ebf281c192d2d2acc1510a222ee54e4b82e8dd453a983fad6ef46c763bde5ff476e5fc4101db8e32fd926a6ee699f773dff00671e8e1ae661ed565ecc2b4d4
 EBUILD selinux-vdagent-2.20210908-r1.ebuild 279 BLAKE2B 6b158b06f5dfb07a6e8928714a49e03292d798d855a830026a652478f14a5c80ef5dd7a7014d2fa23e8a22c3eb9bdbd33bfbfce01db0793db48bceb09ddf5cb6 SHA512 e4ebf281c192d2d2acc1510a222ee54e4b82e8dd453a983fad6ef46c763bde5ff476e5fc4101db8e32fd926a6ee699f773dff00671e8e1ae661ed565ecc2b4d4
-EBUILD selinux-vdagent-2.20220106-r1.ebuild 283 BLAKE2B f8b179c8f4ccb06bd7118d4cd11b805ee5422e42a070facc7e6ba5167ef8ca2f327730fb616140ea7d731ec105684a3083e4cbfabed1ad5735613a791e6750b5 SHA512 27c835c8a681838ddaba6a322bb60e3a7028a270acf8549d7e79496f88f0cc00a95be26df874b48037c0f3d0b681612d7f7b52f625dd9be74b9758495eb6dfd2
+EBUILD selinux-vdagent-2.20220106-r1.ebuild 281 BLAKE2B 5815c86c5bbb99c876ad29c9918d1ccf6820a8551a0c78fa3786d59f5251b30108619ad9fc9d2fb42995044d3a7064c2936681b105bb4f03ac2f1c48f4a7e912 SHA512 6652d99a9961cf4b90542232e9ee4037d729f07c81d7348819c35cb8da6f0ec9f07f552db3ef1de40a2deb74206914b556dd3f84e8e211f80b7dbedda06d760e
+EBUILD selinux-vdagent-2.20220106-r2.ebuild 283 BLAKE2B f8b179c8f4ccb06bd7118d4cd11b805ee5422e42a070facc7e6ba5167ef8ca2f327730fb616140ea7d731ec105684a3083e4cbfabed1ad5735613a791e6750b5 SHA512 27c835c8a681838ddaba6a322bb60e3a7028a270acf8549d7e79496f88f0cc00a95be26df874b48037c0f3d0b681612d7f7b52f625dd9be74b9758495eb6dfd2
 EBUILD selinux-vdagent-9999.ebuild 283 BLAKE2B 2da6aa54592bfe2f9723cbf79580e451aff3414137a5808286e7bd8d930d7c31c196b08e30bb19b37b67050c7b017cccad4ab0ed800f06e0dd06c0a1204e42f9 SHA512 a3851195aca1ef396ff3d5d33f14838b43808cfff0cd0540c5ca90f0fd972574cc4f470e6830042c0c67082869a54fbfb899399d4e5a9c0f5ae23f144e0da540
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-vdagent/selinux-vdagent-2.20220106-r1.ebuild b/sec-policy/selinux-vdagent/selinux-vdagent-2.20220106-r1.ebuild
index f54bfe98bbf1..95ffc42c8d7c 100644
--- a/sec-policy/selinux-vdagent/selinux-vdagent-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-vdagent/selinux-vdagent-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vdagent"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-vdagent/selinux-vdagent-2.20220106-r2.ebuild b/sec-policy/selinux-vdagent/selinux-vdagent-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..f54bfe98bbf1
--- /dev/null
+++ b/sec-policy/selinux-vdagent/selinux-vdagent-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="vdagent"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vdagent"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-vde/Manifest b/sec-policy/selinux-vde/Manifest
index ffdb0d90bb27..dbd85604836e 100644
--- a/sec-policy/selinux-vde/Manifest
+++ b/sec-policy/selinux-vde/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-vde-2.20200818-r2.ebuild 271 BLAKE2B 535e431b8d7a29ab76c5b3f5603dc99758d07996d29fc90865b4dea2ece120a4fef0c620db00143fad77fb94799788c5039d4235bf4584cce435cbbd9a1f4ce8 SHA512 80ca45c06eaf86f1274873e7d604cf47090dc088e0fe1149bae82a37eb34f29a43fcd0fb7430326374b898867158ca1cdc9eaf40219a8918eb517a8072977290
 EBUILD selinux-vde-2.20210203-r1.ebuild 271 BLAKE2B 535e431b8d7a29ab76c5b3f5603dc99758d07996d29fc90865b4dea2ece120a4fef0c620db00143fad77fb94799788c5039d4235bf4584cce435cbbd9a1f4ce8 SHA512 80ca45c06eaf86f1274873e7d604cf47090dc088e0fe1149bae82a37eb34f29a43fcd0fb7430326374b898867158ca1cdc9eaf40219a8918eb517a8072977290
 EBUILD selinux-vde-2.20210908-r1.ebuild 271 BLAKE2B 535e431b8d7a29ab76c5b3f5603dc99758d07996d29fc90865b4dea2ece120a4fef0c620db00143fad77fb94799788c5039d4235bf4584cce435cbbd9a1f4ce8 SHA512 80ca45c06eaf86f1274873e7d604cf47090dc088e0fe1149bae82a37eb34f29a43fcd0fb7430326374b898867158ca1cdc9eaf40219a8918eb517a8072977290
-EBUILD selinux-vde-2.20220106-r1.ebuild 275 BLAKE2B c42028d367c942b998956acd6db2a5ba96fa241eed3db789d1ebcb942873df0966f8a4e2539302a7f2cc65f06466890902777d14fe42f84a841153edd817a9e2 SHA512 2096ae2ff0ceb3f05e1d294054bb5d4e01f07ecf0b353fe177c7137fce7de26838056caef2f92c6637aa7280fec3f40a274e305b70f339a59cca995c1950bdd0
+EBUILD selinux-vde-2.20220106-r1.ebuild 273 BLAKE2B dc7f11406656c19986c6fd342050095fe26c1e9ac9d9c4acac944a0ed820f2885ce71f5c4a13aaf10fefc1acc856337e75531e70ef3b42eff93259080b976236 SHA512 024a3bdca210a127bd76221f84911dcdbf6dc1dd369bfdf011f19516d4fe255c4d8a8f53623b989d1cc6b8302e3555e181c80ee13800392f370a079baeaf25fc
+EBUILD selinux-vde-2.20220106-r2.ebuild 275 BLAKE2B c42028d367c942b998956acd6db2a5ba96fa241eed3db789d1ebcb942873df0966f8a4e2539302a7f2cc65f06466890902777d14fe42f84a841153edd817a9e2 SHA512 2096ae2ff0ceb3f05e1d294054bb5d4e01f07ecf0b353fe177c7137fce7de26838056caef2f92c6637aa7280fec3f40a274e305b70f339a59cca995c1950bdd0
 EBUILD selinux-vde-9999.ebuild 275 BLAKE2B 887ffd5bd5e14c9fb059dbb374d85c14da6228b117d9665efaf94a8116a8c042907552851795ee4f5392c13fa634acbbf535869303450281523aca6412de9980 SHA512 0ca53c7967278040a14fdd29da898c13799dd111afa6b8d0b767cd2b8963012306eb3ab830b917a7f3ae85d537c994e6488f9ce895e97e04524b2f96401377ef
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-vde/selinux-vde-2.20220106-r1.ebuild b/sec-policy/selinux-vde/selinux-vde-2.20220106-r1.ebuild
index 666735436bc2..7b85db35e056 100644
--- a/sec-policy/selinux-vde/selinux-vde-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-vde/selinux-vde-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vde"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-vde/selinux-vde-2.20220106-r2.ebuild b/sec-policy/selinux-vde/selinux-vde-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..666735436bc2
--- /dev/null
+++ b/sec-policy/selinux-vde/selinux-vde-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="vde"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vde"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-virt/Manifest b/sec-policy/selinux-virt/Manifest
index bb0e7c110c2e..6e5e4f4e341c 100644
--- a/sec-policy/selinux-virt/Manifest
+++ b/sec-policy/selinux-virt/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-virt-2.20200818-r2.ebuild 273 BLAKE2B 6c4c95c1b30610b2f9f243405a36d8c4304f6f99ab4c2f577d58981cd08cbc2474ec234271fa7ad5f16340a13f88ad6cbe327bd6624e80c4a7d544c7a42a6d71 SHA512 5d43f3a51ff13549c6e8a58ccc198874d7af9ebe37ffcd68f5df3a5a3c02f3ab7148dfe18b65d036987b933e1a4197fd565d170115845db94eb08499ccff88ee
 EBUILD selinux-virt-2.20210203-r1.ebuild 273 BLAKE2B 6c4c95c1b30610b2f9f243405a36d8c4304f6f99ab4c2f577d58981cd08cbc2474ec234271fa7ad5f16340a13f88ad6cbe327bd6624e80c4a7d544c7a42a6d71 SHA512 5d43f3a51ff13549c6e8a58ccc198874d7af9ebe37ffcd68f5df3a5a3c02f3ab7148dfe18b65d036987b933e1a4197fd565d170115845db94eb08499ccff88ee
 EBUILD selinux-virt-2.20210908-r1.ebuild 273 BLAKE2B 6c4c95c1b30610b2f9f243405a36d8c4304f6f99ab4c2f577d58981cd08cbc2474ec234271fa7ad5f16340a13f88ad6cbe327bd6624e80c4a7d544c7a42a6d71 SHA512 5d43f3a51ff13549c6e8a58ccc198874d7af9ebe37ffcd68f5df3a5a3c02f3ab7148dfe18b65d036987b933e1a4197fd565d170115845db94eb08499ccff88ee
-EBUILD selinux-virt-2.20220106-r1.ebuild 277 BLAKE2B e2bfce94c80fe1b4037e58d15200ed879a1573ea2be3cd0d565be980b388c3da62e084363d7226c4c6074db37e0fff3c84e548b655052ea30d41f93338a776b1 SHA512 a560bf85a0ca27fd6eab73d5701614410db465476e18763ae208688ba733a8676aa668005d6bd9b62a60a5bd57d6f4e6f25f3f3f5185135315afa85d28d0251b
+EBUILD selinux-virt-2.20220106-r1.ebuild 275 BLAKE2B a4cdcbd76c3d6173a7e1573484224ad81a5e60d2228fb542e3013becb46233f281d02ee31883035a86796a996dc76a577735efca3586bda01da627a9a24afb53 SHA512 3281dd5d7f5f3f6f25eeb6b7136c1d8b33d5a7d3148ec136e7397e645e3477928f2f1bb579390435d117a3e5113eed82fa1edec85897d94a3c015dc625ed04eb
+EBUILD selinux-virt-2.20220106-r2.ebuild 277 BLAKE2B e2bfce94c80fe1b4037e58d15200ed879a1573ea2be3cd0d565be980b388c3da62e084363d7226c4c6074db37e0fff3c84e548b655052ea30d41f93338a776b1 SHA512 a560bf85a0ca27fd6eab73d5701614410db465476e18763ae208688ba733a8676aa668005d6bd9b62a60a5bd57d6f4e6f25f3f3f5185135315afa85d28d0251b
 EBUILD selinux-virt-9999.ebuild 277 BLAKE2B 3161fd131fb524b35b2a353c9266fe2cda88146a6d2681db111cc80dadf2af5692de8d5cf3b918af73842ea8929d3586e59c070f9d4344477de3aa34eab6eecf SHA512 daa7aa826edbadcff773e64df6b480fc1abf4e8f81d2644c7a526977a675bd2067ff6bb7a9660a56c0a2875a5d6ec89670b91115463aa07be4f6ec13cbf49702
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-virt/selinux-virt-2.20220106-r1.ebuild b/sec-policy/selinux-virt/selinux-virt-2.20220106-r1.ebuild
index 8d064c4f1d45..106d09b1e637 100644
--- a/sec-policy/selinux-virt/selinux-virt-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-virt/selinux-virt-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for virt"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-virt/selinux-virt-2.20220106-r2.ebuild b/sec-policy/selinux-virt/selinux-virt-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..8d064c4f1d45
--- /dev/null
+++ b/sec-policy/selinux-virt/selinux-virt-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="virt"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for virt"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-vlock/Manifest b/sec-policy/selinux-vlock/Manifest
index a5fa91ec677c..e3cbc1aed44e 100644
--- a/sec-policy/selinux-vlock/Manifest
+++ b/sec-policy/selinux-vlock/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-vlock-2.20200818-r2.ebuild 275 BLAKE2B 301a83afa85188ef6aea1a4e43a5eceead5dce7131701eac907a1c23bf29ebcbb4cad23175a6f84f213d6ab82571ac111356f80039fdf1adb766da01167c1ab6 SHA512 54fd37f60ed7e59fea3d0643e159b0a687962e99a43fc628b7c0e44a4476346e2407fea4abe77578e814bc5e1754b7607b5c8226107bb64252dd0cd9134bd635
 EBUILD selinux-vlock-2.20210203-r1.ebuild 275 BLAKE2B 301a83afa85188ef6aea1a4e43a5eceead5dce7131701eac907a1c23bf29ebcbb4cad23175a6f84f213d6ab82571ac111356f80039fdf1adb766da01167c1ab6 SHA512 54fd37f60ed7e59fea3d0643e159b0a687962e99a43fc628b7c0e44a4476346e2407fea4abe77578e814bc5e1754b7607b5c8226107bb64252dd0cd9134bd635
 EBUILD selinux-vlock-2.20210908-r1.ebuild 275 BLAKE2B 301a83afa85188ef6aea1a4e43a5eceead5dce7131701eac907a1c23bf29ebcbb4cad23175a6f84f213d6ab82571ac111356f80039fdf1adb766da01167c1ab6 SHA512 54fd37f60ed7e59fea3d0643e159b0a687962e99a43fc628b7c0e44a4476346e2407fea4abe77578e814bc5e1754b7607b5c8226107bb64252dd0cd9134bd635
-EBUILD selinux-vlock-2.20220106-r1.ebuild 279 BLAKE2B 55d5e4f886e2d5476406629aab9ac638fe504670c2222ff32091bcb2a8b7c8162e7d435b95115292cda9fcd0ac9f0101772af228d1870b43b28c816b9f8685e3 SHA512 95997e414afa2e108f5335380109f3d82e8a0854aed383074b29ee096ff7ac6a71e888564d525f6597d8070f8823d8db107e7f3ed4da9df0d1a94490427b7779
+EBUILD selinux-vlock-2.20220106-r1.ebuild 277 BLAKE2B d07801c4ae39f112e70f6392c3e00cf3610c3cec3eafeca07517e37691907989a9cc56fe825c0e04faf83b1486a5c9658f92241487524dac698fac413b5ca617 SHA512 edcd95ebaeaa5b5f4c55eef7acd3659474016e7625078b92bf6d044b74c3229355be4bed9b7beeac3274f10e8ed7c7786a612ae7cc9e9e610326ffd6ef92fdf2
+EBUILD selinux-vlock-2.20220106-r2.ebuild 279 BLAKE2B 55d5e4f886e2d5476406629aab9ac638fe504670c2222ff32091bcb2a8b7c8162e7d435b95115292cda9fcd0ac9f0101772af228d1870b43b28c816b9f8685e3 SHA512 95997e414afa2e108f5335380109f3d82e8a0854aed383074b29ee096ff7ac6a71e888564d525f6597d8070f8823d8db107e7f3ed4da9df0d1a94490427b7779
 EBUILD selinux-vlock-9999.ebuild 279 BLAKE2B 9aaae275459f54b14f809d3efdbe00181e1d8fa2d1756beeda4379d6f3a4bc0d4797dd1664d518d34e374b5d0d849e2a388d3cd96cda6cd83e332c4679dce8bc SHA512 01d925da8bfcf793ecc8c40e6e8124ef28943508d1813895384ea99c13cd5872217fe746d2963ba3feec2504765a61ffa4ffa8cc6e19af703b307cd4b3da41e1
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-vlock/selinux-vlock-2.20220106-r1.ebuild b/sec-policy/selinux-vlock/selinux-vlock-2.20220106-r1.ebuild
index 197ed006e049..d43a7746fba8 100644
--- a/sec-policy/selinux-vlock/selinux-vlock-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-vlock/selinux-vlock-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vlock"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-vlock/selinux-vlock-2.20220106-r2.ebuild b/sec-policy/selinux-vlock/selinux-vlock-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..197ed006e049
--- /dev/null
+++ b/sec-policy/selinux-vlock/selinux-vlock-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="vlock"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vlock"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-vmware/Manifest b/sec-policy/selinux-vmware/Manifest
index 68d3cd33c089..13205f94f22a 100644
--- a/sec-policy/selinux-vmware/Manifest
+++ b/sec-policy/selinux-vmware/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-vmware-2.20200818-r2.ebuild 375 BLAKE2B ffca8bb31b1714c2aa1677881045ee0f81e07947393d06a35f013b572a7e717ea201cd5c93ab875c0facecc135501f46edf3fac6932bddeb24fc5362203bd9eb SHA512 b8bce130867952a1b58c215e22c9cf3ad2998543da8d48ae594ebfa8fde29b1fc4b86ac71494528c08c72fa332902b37ca978d720616c73efcce6d9f2a4c0726
 EBUILD selinux-vmware-2.20210203-r1.ebuild 375 BLAKE2B ffca8bb31b1714c2aa1677881045ee0f81e07947393d06a35f013b572a7e717ea201cd5c93ab875c0facecc135501f46edf3fac6932bddeb24fc5362203bd9eb SHA512 b8bce130867952a1b58c215e22c9cf3ad2998543da8d48ae594ebfa8fde29b1fc4b86ac71494528c08c72fa332902b37ca978d720616c73efcce6d9f2a4c0726
 EBUILD selinux-vmware-2.20210908-r1.ebuild 375 BLAKE2B ffca8bb31b1714c2aa1677881045ee0f81e07947393d06a35f013b572a7e717ea201cd5c93ab875c0facecc135501f46edf3fac6932bddeb24fc5362203bd9eb SHA512 b8bce130867952a1b58c215e22c9cf3ad2998543da8d48ae594ebfa8fde29b1fc4b86ac71494528c08c72fa332902b37ca978d720616c73efcce6d9f2a4c0726
-EBUILD selinux-vmware-2.20220106-r1.ebuild 379 BLAKE2B 31e92f1f30fc05949b3d3c4979a8290739a7ad13f46924cd26738b3bc35021197a3f91e89f0e6258d1cd065526624f40e7bd6d910c33effba4c7ee4469e80760 SHA512 bec2ea9b46051640a0832a8f585358ca265dd099c7ad2cf7076d580783fbdcbf5f794e70ce21e58f5585a82ab2a79315130f5b521e22f11d31015b43b1e27b88
+EBUILD selinux-vmware-2.20220106-r1.ebuild 377 BLAKE2B b2b998efe0c6146301a8a7a2c2f276d73f19ea0cd4cb79527fcf77a82f5ede58f4aff23b1c2eb861980d2e6c372454ccb933634a7b2e87e11f22ea9273866c9e SHA512 a3ae5bf8a51c6cc78abb1a46355ae1065d3e6aac6fce102bb70329bdae818b279b059f62468f1dd87e1ce459dbbf9c0a3d42f9a50436b58090a8e5246cca8615
+EBUILD selinux-vmware-2.20220106-r2.ebuild 379 BLAKE2B 31e92f1f30fc05949b3d3c4979a8290739a7ad13f46924cd26738b3bc35021197a3f91e89f0e6258d1cd065526624f40e7bd6d910c33effba4c7ee4469e80760 SHA512 bec2ea9b46051640a0832a8f585358ca265dd099c7ad2cf7076d580783fbdcbf5f794e70ce21e58f5585a82ab2a79315130f5b521e22f11d31015b43b1e27b88
 EBUILD selinux-vmware-9999.ebuild 379 BLAKE2B aa5327f894f5d4637c33bb9a2ba239c8449815e1bfe4a2735f73407692424f3cca6e17ba6ad4345436e98cf39196da16c0d0861e6524a3ad5b1fcf16d0fb26e9 SHA512 938d6e5b0fa104bbd7b8a6a9ebaaefd7cb779298f2371ab3dfcafaa2f3190e6105ca38bd29047815bcb8c2d629244d3cbb1eb8b19611804cb27b0b2da94cab3e
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-vmware/selinux-vmware-2.20220106-r1.ebuild b/sec-policy/selinux-vmware/selinux-vmware-2.20220106-r1.ebuild
index 3c5984ed4514..0cf2cb184128 100644
--- a/sec-policy/selinux-vmware/selinux-vmware-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-vmware/selinux-vmware-2.20220106-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vmware"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-vmware/selinux-vmware-2.20220106-r2.ebuild b/sec-policy/selinux-vmware/selinux-vmware-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..3c5984ed4514
--- /dev/null
+++ b/sec-policy/selinux-vmware/selinux-vmware-2.20220106-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="vmware"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vmware"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-xserver
+"
diff --git a/sec-policy/selinux-vnstatd/Manifest b/sec-policy/selinux-vnstatd/Manifest
index 437cdc75d53f..152713466e01 100644
--- a/sec-policy/selinux-vnstatd/Manifest
+++ b/sec-policy/selinux-vnstatd/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-vnstatd-2.20200818-r2.ebuild 279 BLAKE2B adbf58663a9c64f0fdff47a685660a66a259a48a967f7d28dc2bfb67766953fe4e9005f07e2420acc677adcb40a13c92b9d41e94ee16ca7bd6ed7e75b2572cde SHA512 3d303296aa372127fa6110ab1677c01842da36ceeaca9c0aa534911b812adcedc0032ff8e97a41c05551dd429f5ff1e5999a97cd21d3be6d943c576ad346c518
 EBUILD selinux-vnstatd-2.20210203-r1.ebuild 279 BLAKE2B adbf58663a9c64f0fdff47a685660a66a259a48a967f7d28dc2bfb67766953fe4e9005f07e2420acc677adcb40a13c92b9d41e94ee16ca7bd6ed7e75b2572cde SHA512 3d303296aa372127fa6110ab1677c01842da36ceeaca9c0aa534911b812adcedc0032ff8e97a41c05551dd429f5ff1e5999a97cd21d3be6d943c576ad346c518
 EBUILD selinux-vnstatd-2.20210908-r1.ebuild 279 BLAKE2B adbf58663a9c64f0fdff47a685660a66a259a48a967f7d28dc2bfb67766953fe4e9005f07e2420acc677adcb40a13c92b9d41e94ee16ca7bd6ed7e75b2572cde SHA512 3d303296aa372127fa6110ab1677c01842da36ceeaca9c0aa534911b812adcedc0032ff8e97a41c05551dd429f5ff1e5999a97cd21d3be6d943c576ad346c518
-EBUILD selinux-vnstatd-2.20220106-r1.ebuild 283 BLAKE2B c5a12a19d2736a086caf22b8a5ea319116fe5fd67c0a5089715af3293cb94e7166875ddb28b44fb580f2cbaf2fa882f28ba0a0f6e80de064a5347b26b13784a3 SHA512 365db2caefc585bb9bad9a8e1060552175bdbcc2663ce152942c4961ca0249b17bbc56ea0d511b0975486758d6f741487a2ae3a72ac125d0b65a84252c6bfadf
+EBUILD selinux-vnstatd-2.20220106-r1.ebuild 281 BLAKE2B 27b47801a51559da3ea7450690aa69192e3f341b7154529c433b6193fae0ba99bc253cdde4458d5d5ce107ff9fae0d57387043d389749aa390fe681b91c3c502 SHA512 1dec08ce5efe9dcc2dd251c98b3fac69601f05cbb67bbe5d2d23d74fef95dea4763a76452ceebbe5a8b3677594b8fa30da15509e54f8d2b0de08b847de5169f6
+EBUILD selinux-vnstatd-2.20220106-r2.ebuild 283 BLAKE2B c5a12a19d2736a086caf22b8a5ea319116fe5fd67c0a5089715af3293cb94e7166875ddb28b44fb580f2cbaf2fa882f28ba0a0f6e80de064a5347b26b13784a3 SHA512 365db2caefc585bb9bad9a8e1060552175bdbcc2663ce152942c4961ca0249b17bbc56ea0d511b0975486758d6f741487a2ae3a72ac125d0b65a84252c6bfadf
 EBUILD selinux-vnstatd-9999.ebuild 283 BLAKE2B f1b2f1ec309a443718c05fe7e980ff4397fbf9bc11f94e2c85267e092ee6a5232c9f71a7652a84d210270502f46c5092c6b3cee0e38e91892e2e07dabbf54440 SHA512 c8151658e8cccd23d0763d9dab8d8e6ffe8091f952c1d20f42bef08ed4992e9ade43b5ed99de67c5d395cdfa2d66be26c62fc1f4c6e1e7f4682e9a2c0904223e
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20220106-r1.ebuild b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20220106-r1.ebuild
index 3fca4dbdcaac..f32e48616564 100644
--- a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vnstatd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20220106-r2.ebuild b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..3fca4dbdcaac
--- /dev/null
+++ b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="vnstatd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vnstatd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-vpn/Manifest b/sec-policy/selinux-vpn/Manifest
index ab5317b2e196..71e80de412ec 100644
--- a/sec-policy/selinux-vpn/Manifest
+++ b/sec-policy/selinux-vpn/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-vpn-2.20200818-r2.ebuild 271 BLAKE2B deff4b25c64b7f929365127b1151d879fcc62ca7ee95b065006539411f394e8b8f483bc53e1c09124a00825a004815a11831f8313aab47903e99705381cbf028 SHA512 4e7a31ee751ae7ff8f625db95ef05f35efef26d41b95f338b3236d5a026cbc71d93ea76ea9259a85300275db1fce3ed9a7bdbe88454123e35c35b81f606834a9
 EBUILD selinux-vpn-2.20210203-r1.ebuild 271 BLAKE2B deff4b25c64b7f929365127b1151d879fcc62ca7ee95b065006539411f394e8b8f483bc53e1c09124a00825a004815a11831f8313aab47903e99705381cbf028 SHA512 4e7a31ee751ae7ff8f625db95ef05f35efef26d41b95f338b3236d5a026cbc71d93ea76ea9259a85300275db1fce3ed9a7bdbe88454123e35c35b81f606834a9
 EBUILD selinux-vpn-2.20210908-r1.ebuild 271 BLAKE2B deff4b25c64b7f929365127b1151d879fcc62ca7ee95b065006539411f394e8b8f483bc53e1c09124a00825a004815a11831f8313aab47903e99705381cbf028 SHA512 4e7a31ee751ae7ff8f625db95ef05f35efef26d41b95f338b3236d5a026cbc71d93ea76ea9259a85300275db1fce3ed9a7bdbe88454123e35c35b81f606834a9
-EBUILD selinux-vpn-2.20220106-r1.ebuild 275 BLAKE2B e6535b23b35aacf01cc319f97add9b4b734a661621fe954ae82a838ef07c7abbc80f70ee212f0ec5d1a1817f48b49f7f5f44a082b4c77c9aefb852d10284dd0c SHA512 5d0c35c954a70741f290823e9259a1d638c21c2900fbe82499c6c638b7acee21b22d176e7ad59c919669851a55cac058f2df83798eaed44a3ea6bca0c0f0a34a
+EBUILD selinux-vpn-2.20220106-r1.ebuild 273 BLAKE2B d62c00b7b5088cd6b8e87292c6dd8323dbda469fafc5034ac18aad918f1d526f3416bab4d10b1c747580d9af6a1adc3c99f9d827a568938e2cb9e0438abb8b26 SHA512 f5ca4961e0c47eaf4b14501e5e4b44ee1077b66d2facf2e36b2843670fc71487aa469d2ffe232d56e669f87aea1c9a8710f20c856db4f2318213a9d4c57eac26
+EBUILD selinux-vpn-2.20220106-r2.ebuild 275 BLAKE2B e6535b23b35aacf01cc319f97add9b4b734a661621fe954ae82a838ef07c7abbc80f70ee212f0ec5d1a1817f48b49f7f5f44a082b4c77c9aefb852d10284dd0c SHA512 5d0c35c954a70741f290823e9259a1d638c21c2900fbe82499c6c638b7acee21b22d176e7ad59c919669851a55cac058f2df83798eaed44a3ea6bca0c0f0a34a
 EBUILD selinux-vpn-9999.ebuild 275 BLAKE2B 6f14ed95253f76212bdd9fc74bf399471f11df50b56822d9ee4417ce10308bbe250f37beba60e7b2b1487452ece4a5689392696604380ec0c1faa35280bf6664 SHA512 d3aa1bf8beeec2107d3e5c0199ec04567b4518e93773d5f4326679aa3e7767630b298889a95fe597829e3cfe0f259677691568fcfe0beaba1587824e6f8b7ba1
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-vpn/selinux-vpn-2.20220106-r1.ebuild b/sec-policy/selinux-vpn/selinux-vpn-2.20220106-r1.ebuild
index 200dbc6e9ab0..b616dfe50bc6 100644
--- a/sec-policy/selinux-vpn/selinux-vpn-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-vpn/selinux-vpn-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vpn"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-vpn/selinux-vpn-2.20220106-r2.ebuild b/sec-policy/selinux-vpn/selinux-vpn-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..200dbc6e9ab0
--- /dev/null
+++ b/sec-policy/selinux-vpn/selinux-vpn-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="vpn"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vpn"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-watchdog/Manifest b/sec-policy/selinux-watchdog/Manifest
index d641bd8b9ff3..1e4c60413adc 100644
--- a/sec-policy/selinux-watchdog/Manifest
+++ b/sec-policy/selinux-watchdog/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-watchdog-2.20200818-r2.ebuild 281 BLAKE2B 283a1d6e34330086a3a57a15d2d8845e42644708d039e50e80c73cfb740644f962985a75590ca98f9f55746d32b3595823c3be450f535cf80d0b1f4adbb27fde SHA512 1dd1c15ca914a09d9dbec8b04c614acd648ffa7f8f4da560013c3556855b705f1d88bb148085e7e175d92e67fe5e04c2012adea05fb49239532010dab80cf774
 EBUILD selinux-watchdog-2.20210203-r1.ebuild 281 BLAKE2B 283a1d6e34330086a3a57a15d2d8845e42644708d039e50e80c73cfb740644f962985a75590ca98f9f55746d32b3595823c3be450f535cf80d0b1f4adbb27fde SHA512 1dd1c15ca914a09d9dbec8b04c614acd648ffa7f8f4da560013c3556855b705f1d88bb148085e7e175d92e67fe5e04c2012adea05fb49239532010dab80cf774
 EBUILD selinux-watchdog-2.20210908-r1.ebuild 281 BLAKE2B 283a1d6e34330086a3a57a15d2d8845e42644708d039e50e80c73cfb740644f962985a75590ca98f9f55746d32b3595823c3be450f535cf80d0b1f4adbb27fde SHA512 1dd1c15ca914a09d9dbec8b04c614acd648ffa7f8f4da560013c3556855b705f1d88bb148085e7e175d92e67fe5e04c2012adea05fb49239532010dab80cf774
-EBUILD selinux-watchdog-2.20220106-r1.ebuild 285 BLAKE2B 6c729d1cc8d47e783913fca5eb41651e6eddbfa8500e90a0e647788b487dfde85a96b1586ee057bb62149d4f55fe82e7305daeb90f3cb40d9ac083ac9633613a SHA512 15901bc1420a6654d39bcb93208c971e288f2f0feb45da8138fd2e5a7fed8d75e754c333a6fde106173155ee97acbfcd7e5df6f99b83141e554a4ee992aae128
+EBUILD selinux-watchdog-2.20220106-r1.ebuild 283 BLAKE2B 3098609a084cf5c310edb4b55c42637525b60e4a99fd42c121d6b840ecfcea2aca261ff3e3ce164070cce3caf7f7afe8da8da77ffdefca90f757428fb53ce8fb SHA512 727770c6534e60a97c99b04f51bcb71908516d1807d5c95af0ee6034cb8507220cbf33d10e16afbe9d3ba07feb1278251efe463f92d40e66ff117babfe4a370f
+EBUILD selinux-watchdog-2.20220106-r2.ebuild 285 BLAKE2B 6c729d1cc8d47e783913fca5eb41651e6eddbfa8500e90a0e647788b487dfde85a96b1586ee057bb62149d4f55fe82e7305daeb90f3cb40d9ac083ac9633613a SHA512 15901bc1420a6654d39bcb93208c971e288f2f0feb45da8138fd2e5a7fed8d75e754c333a6fde106173155ee97acbfcd7e5df6f99b83141e554a4ee992aae128
 EBUILD selinux-watchdog-9999.ebuild 285 BLAKE2B 0149bdded3924390b236f59a275bbb650fcf3c57aa4267ad8392a2522dc12f916824b9a7b3a9385f257c0c68d62cb94572a56272e2a884941779da95892425d4 SHA512 053397832ce37ee91669b63e8561954d7cbcfdd3d7c943ae37ab90c96684b9a4ff90338728fb4a478a6962f67990a25f7a41cb160a1ad70c7a80e7b7f9e0b7be
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-watchdog/selinux-watchdog-2.20220106-r1.ebuild b/sec-policy/selinux-watchdog/selinux-watchdog-2.20220106-r1.ebuild
index 8043807eaa56..404884ef4ba1 100644
--- a/sec-policy/selinux-watchdog/selinux-watchdog-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-watchdog/selinux-watchdog-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for watchdog"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-watchdog/selinux-watchdog-2.20220106-r2.ebuild b/sec-policy/selinux-watchdog/selinux-watchdog-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..8043807eaa56
--- /dev/null
+++ b/sec-policy/selinux-watchdog/selinux-watchdog-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="watchdog"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for watchdog"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-webalizer/Manifest b/sec-policy/selinux-webalizer/Manifest
index 1ebf7471a928..2ad30f5b746c 100644
--- a/sec-policy/selinux-webalizer/Manifest
+++ b/sec-policy/selinux-webalizer/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-webalizer-2.20200818-r2.ebuild 380 BLAKE2B 9e5c384acdc643f5339726240c9935aeddd055350845067407d1d95824bcfa69362acc1e7dc20a7fc406999801fad8be8d46dd8b3a71108c322ea164332b1951 SHA512 04fac97a3d3e0bebcab793527d9ae40e36632d204347e1a16fe11772c6f6d110558bdffd5181ad31614f9a3f11aa5952b664bd995a3a943d73f4d63dfad77543
 EBUILD selinux-webalizer-2.20210203-r1.ebuild 380 BLAKE2B 9e5c384acdc643f5339726240c9935aeddd055350845067407d1d95824bcfa69362acc1e7dc20a7fc406999801fad8be8d46dd8b3a71108c322ea164332b1951 SHA512 04fac97a3d3e0bebcab793527d9ae40e36632d204347e1a16fe11772c6f6d110558bdffd5181ad31614f9a3f11aa5952b664bd995a3a943d73f4d63dfad77543
 EBUILD selinux-webalizer-2.20210908-r1.ebuild 380 BLAKE2B 9e5c384acdc643f5339726240c9935aeddd055350845067407d1d95824bcfa69362acc1e7dc20a7fc406999801fad8be8d46dd8b3a71108c322ea164332b1951 SHA512 04fac97a3d3e0bebcab793527d9ae40e36632d204347e1a16fe11772c6f6d110558bdffd5181ad31614f9a3f11aa5952b664bd995a3a943d73f4d63dfad77543
-EBUILD selinux-webalizer-2.20220106-r1.ebuild 384 BLAKE2B 50094cced0ace4f94b5bd6c2f3acccfc808678f122136cd45c89db04bcecf9ffb72d58bc8a9de6922f88715bff67954541c0035e6e666f241e7fa361c4791a65 SHA512 68f335af7d378029a9a0f986a62544d2974490999104979f34cbf169fa790c0cf87f68fe63d9a7ecb7e3f8aa38a6d828e79b0bdbdad05981a113c20dff2ae74c
+EBUILD selinux-webalizer-2.20220106-r1.ebuild 382 BLAKE2B b4a782732e9f352e877ad30716cc62334e24a857dca9a734dcdb380a61b76f2af880ad36aa8b41a864e2dccbd6ddb6e1b9052a9ecdb3df5ae2a5988b62ace08e SHA512 7eb1ab1ef4a300d929fa2bdbfa6666faa297b82036507ddc64baad1c0589749296b998be0bdecbf59665b1df6651cdf6b3a1bd8a18ce54de836f164024ba3776
+EBUILD selinux-webalizer-2.20220106-r2.ebuild 384 BLAKE2B 50094cced0ace4f94b5bd6c2f3acccfc808678f122136cd45c89db04bcecf9ffb72d58bc8a9de6922f88715bff67954541c0035e6e666f241e7fa361c4791a65 SHA512 68f335af7d378029a9a0f986a62544d2974490999104979f34cbf169fa790c0cf87f68fe63d9a7ecb7e3f8aa38a6d828e79b0bdbdad05981a113c20dff2ae74c
 EBUILD selinux-webalizer-9999.ebuild 384 BLAKE2B d718a8e1cd0620e3b9ba252ca69fbc85a93bd8cb9a01cacf69909183b41844410673dbb065a3c1f4ec9079174f431e5e47a5fe5895fe1e924b5df562a5f87289 SHA512 94d3ec573ca7c613762007435a618acbb88500fa58f4f87a1dd8569e5ecf7901c3426cf25008b4a0a843068fe002d081393504e01f72328e800f29178dfffe11
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-webalizer/selinux-webalizer-2.20220106-r1.ebuild b/sec-policy/selinux-webalizer/selinux-webalizer-2.20220106-r1.ebuild
index c5ec15c952f0..9444a5584eb3 100644
--- a/sec-policy/selinux-webalizer/selinux-webalizer-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-webalizer/selinux-webalizer-2.20220106-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for webalizer"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-webalizer/selinux-webalizer-2.20220106-r2.ebuild b/sec-policy/selinux-webalizer/selinux-webalizer-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..c5ec15c952f0
--- /dev/null
+++ b/sec-policy/selinux-webalizer/selinux-webalizer-2.20220106-r2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="webalizer"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for webalizer"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-wine/Manifest b/sec-policy/selinux-wine/Manifest
index 0ba4135bce7d..55324c7387f1 100644
--- a/sec-policy/selinux-wine/Manifest
+++ b/sec-policy/selinux-wine/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-wine-2.20200818-r2.ebuild 273 BLAKE2B a028c11efe76f5db2f28a657dcdfcf8fdc77fd0d024ac4be6bc550490917a494028554fe9aac4f6bb22f47394c12188b7353a92f67d9143c500b5b62bd899098 SHA512 e78370802e8a5a230d2a85c27198419a8aa55c8b779d025d55f16fe1af8c564a42f2e0f863289a4302884bc756952241e6ccdd91276c05c5e44d6fd1ec096b81
 EBUILD selinux-wine-2.20210203-r1.ebuild 273 BLAKE2B a028c11efe76f5db2f28a657dcdfcf8fdc77fd0d024ac4be6bc550490917a494028554fe9aac4f6bb22f47394c12188b7353a92f67d9143c500b5b62bd899098 SHA512 e78370802e8a5a230d2a85c27198419a8aa55c8b779d025d55f16fe1af8c564a42f2e0f863289a4302884bc756952241e6ccdd91276c05c5e44d6fd1ec096b81
 EBUILD selinux-wine-2.20210908-r1.ebuild 273 BLAKE2B a028c11efe76f5db2f28a657dcdfcf8fdc77fd0d024ac4be6bc550490917a494028554fe9aac4f6bb22f47394c12188b7353a92f67d9143c500b5b62bd899098 SHA512 e78370802e8a5a230d2a85c27198419a8aa55c8b779d025d55f16fe1af8c564a42f2e0f863289a4302884bc756952241e6ccdd91276c05c5e44d6fd1ec096b81
-EBUILD selinux-wine-2.20220106-r1.ebuild 277 BLAKE2B ee104d7aeb9dc02217d82959e0af093b1fc61d27b188568243fba7c17a1a2c749367d88b2949061d68cf2b0aba994cbbf2c6d27913b041d2078a9580b8fbebc3 SHA512 3e48325c1ef6fb99632a7f45f1ebcdd8001c14f9b2ae911d6d74b9f8102bfd883d8466b2cbe226818734c7199a501c3a318642df7e02e3d777bf4a02c44da169
+EBUILD selinux-wine-2.20220106-r1.ebuild 275 BLAKE2B 1d21ab2f8d1fd22281f8bba0faaa54ea6cffb3da02710d420972be68bf875dc0caba7bb434ffd83420ac4b2d6d0fddbd4f1a235475fd80593559b7a76385d16e SHA512 d90e232798424786695060d9ec5617d89be2cf006224fe462aa4cded726f86ff458a945cff3676a8e209dc60891166744f7d53cf7ddc50aefcee406e9df15bc9
+EBUILD selinux-wine-2.20220106-r2.ebuild 277 BLAKE2B ee104d7aeb9dc02217d82959e0af093b1fc61d27b188568243fba7c17a1a2c749367d88b2949061d68cf2b0aba994cbbf2c6d27913b041d2078a9580b8fbebc3 SHA512 3e48325c1ef6fb99632a7f45f1ebcdd8001c14f9b2ae911d6d74b9f8102bfd883d8466b2cbe226818734c7199a501c3a318642df7e02e3d777bf4a02c44da169
 EBUILD selinux-wine-9999.ebuild 277 BLAKE2B adb645c10dfb8c318e3c35b13673eb6b9f17126b6dd242ebe2122d0abc6d88c11842fe5eec451927cb25a016fa5c7aaf76cf36d9061cbfce6a42f0746d2da90f SHA512 1b928621d60f23e193bedff2bc31d8a2c02b29f02b0dd68f86e002b33acdd4b92ab02dee811b6f3cef16f916241c744c96518abedbb225c186b82e4501f81d03
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-wine/selinux-wine-2.20220106-r1.ebuild b/sec-policy/selinux-wine/selinux-wine-2.20220106-r1.ebuild
index cd0d9efbe51d..7290a55e8283 100644
--- a/sec-policy/selinux-wine/selinux-wine-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-wine/selinux-wine-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for wine"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-wine/selinux-wine-2.20220106-r2.ebuild b/sec-policy/selinux-wine/selinux-wine-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..cd0d9efbe51d
--- /dev/null
+++ b/sec-policy/selinux-wine/selinux-wine-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="wine"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for wine"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-wireguard/Manifest b/sec-policy/selinux-wireguard/Manifest
index d45aebcad306..bca066acb0e9 100644
--- a/sec-policy/selinux-wireguard/Manifest
+++ b/sec-policy/selinux-wireguard/Manifest
@@ -1,11 +1,13 @@
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
 DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176d3c8e508b2ff97d4f8a876d7c0a65534a62d86c9816ac59f6eed583f4b5c51cf432643edd2dad24dd51eb3cf22e2b75ac SHA512 794327d2dd07196b5f36771f9a961cdf294cf68f690735418d6bdd859499b7007c518cc022ccca9c245a5266b85bdb7cacdcaeefee14e4800937c9101476b373
 EBUILD selinux-wireguard-2.20210203-r1.ebuild 283 BLAKE2B 58effcab5ed83ac016d82d0d5f486a6602251966cfc4b2ce308a197884f326fac6680ca6e5c3fabdbd2b059938b2b6fb48fd0f660b84eecfa8f8b25563788636 SHA512 55c6f7127a178febced735a26793905a52dc371bee2c5ef8113d6dbaf06345d4c803e9fb88168fb0b0ac0da7a657e5089eb18fec0cf213feecd9d357ba737e2e
 EBUILD selinux-wireguard-2.20210908-r1.ebuild 283 BLAKE2B 58effcab5ed83ac016d82d0d5f486a6602251966cfc4b2ce308a197884f326fac6680ca6e5c3fabdbd2b059938b2b6fb48fd0f660b84eecfa8f8b25563788636 SHA512 55c6f7127a178febced735a26793905a52dc371bee2c5ef8113d6dbaf06345d4c803e9fb88168fb0b0ac0da7a657e5089eb18fec0cf213feecd9d357ba737e2e
-EBUILD selinux-wireguard-2.20220106-r1.ebuild 287 BLAKE2B ce534a973db447d54b9f53bdde505b544ee3f051fe5fd5a8326486b69af024653f1fed1a570a56c3f4c351ef947a0d838a9b143f47981495d3a29c397c63da7f SHA512 05405559acea2b93b03bca8fb226ca0e41b4c1b1fe086cca301ed9fff53d7b2a4a290f3fe757a69bcfce05ff90e68b695def4babbc64fad9fadd8408ffc4df32
+EBUILD selinux-wireguard-2.20220106-r1.ebuild 285 BLAKE2B 6e6370305595bb28ef42242b002311c711795a7dfb507a21690723270e5a49e016bf9f5aa571eb3125a147026b8a970ed9e9c103ebc6036fe9ae1c08b5ec1838 SHA512 38029969f8f43f6f0aca579fdbee56e595103ca33172c09836d2f1dc9bdc71f85fef0bc56366f05c5899ebc11f84d97aac9f8297af486fbdb16299b2da71a1ef
+EBUILD selinux-wireguard-2.20220106-r2.ebuild 287 BLAKE2B ce534a973db447d54b9f53bdde505b544ee3f051fe5fd5a8326486b69af024653f1fed1a570a56c3f4c351ef947a0d838a9b143f47981495d3a29c397c63da7f SHA512 05405559acea2b93b03bca8fb226ca0e41b4c1b1fe086cca301ed9fff53d7b2a4a290f3fe757a69bcfce05ff90e68b695def4babbc64fad9fadd8408ffc4df32
 EBUILD selinux-wireguard-9999.ebuild 287 BLAKE2B 52d029ba32d455d9f85f3b9a5ab45fee32325320c4cb91d42b54c25bacf7c9c566351c1534307e3b6bb794fb06600a6b8beab37dd5aa8520fd49499dae1a98d1 SHA512 c4c53917901034bd828ad81c6a362cefa61f63824afea6c7972dc6fcacd094ba7245a209bf412ede02b1b69b422c7ff4692a26566d3bb2c4a7d390404b286726
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-wireguard/selinux-wireguard-2.20220106-r1.ebuild b/sec-policy/selinux-wireguard/selinux-wireguard-2.20220106-r1.ebuild
index e19a6174649f..3c392676c600 100644
--- a/sec-policy/selinux-wireguard/selinux-wireguard-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-wireguard/selinux-wireguard-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for wireguard"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-wireguard/selinux-wireguard-2.20220106-r2.ebuild b/sec-policy/selinux-wireguard/selinux-wireguard-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..e19a6174649f
--- /dev/null
+++ b/sec-policy/selinux-wireguard/selinux-wireguard-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="wireguard"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for wireguard"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-wireshark/Manifest b/sec-policy/selinux-wireshark/Manifest
index 33d4ff7dc2f1..0b52c1129c54 100644
--- a/sec-policy/selinux-wireshark/Manifest
+++ b/sec-policy/selinux-wireshark/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-wireshark-2.20200818-r2.ebuild 283 BLAKE2B f3382b0af4dd3792a90df02e6a4d61ca8e0049c502bc5ce1aeb7db1e43d740c2ffd93ec5850f88e685673bba01cf0d46c2ebe57492ef98da9bfc275a1983e38b SHA512 6be605b4d831cd55dbdbdc15da9623a3e6d60b1d8318e0d282affbdfa2862211d99cca56ac7f43ebeeff91270aaeb34325229ed437e9c46b319ec5dd0d335541
 EBUILD selinux-wireshark-2.20210203-r1.ebuild 283 BLAKE2B f3382b0af4dd3792a90df02e6a4d61ca8e0049c502bc5ce1aeb7db1e43d740c2ffd93ec5850f88e685673bba01cf0d46c2ebe57492ef98da9bfc275a1983e38b SHA512 6be605b4d831cd55dbdbdc15da9623a3e6d60b1d8318e0d282affbdfa2862211d99cca56ac7f43ebeeff91270aaeb34325229ed437e9c46b319ec5dd0d335541
 EBUILD selinux-wireshark-2.20210908-r1.ebuild 283 BLAKE2B f3382b0af4dd3792a90df02e6a4d61ca8e0049c502bc5ce1aeb7db1e43d740c2ffd93ec5850f88e685673bba01cf0d46c2ebe57492ef98da9bfc275a1983e38b SHA512 6be605b4d831cd55dbdbdc15da9623a3e6d60b1d8318e0d282affbdfa2862211d99cca56ac7f43ebeeff91270aaeb34325229ed437e9c46b319ec5dd0d335541
-EBUILD selinux-wireshark-2.20220106-r1.ebuild 287 BLAKE2B 90902ac6c2fbfb18b9daa336d63c5598c721da17eab6dc1eff74a0661f85bd514d3dedb26a377d5250c317a657ac4b318cebbcee971cf39d746c58cc0cb4e6f6 SHA512 c9bd6f8af980ab439fa9cfce46a815deaf888effcc015c06fd0deb4a26fa824eca419fc79d6b8493eddd8038c19e1a241dfd0a1248bf2969888a9b5c45f505cc
+EBUILD selinux-wireshark-2.20220106-r1.ebuild 285 BLAKE2B 4bd948fa16d4b48d9267bf23c39acaa27a53da111cc4cc6120c48cf906b5885438daab329e0e15136a1a07cf5b4fe9f05610c089e850ad55bfc2983abe7e895a SHA512 2ea0b107b4d4e7990b44dce268d9edf2e479e9a6d2bd858984f5ededa13851fac0b01b7439c3af952c2a00d10d04c74328dfe0713bddcd2499c9fe28da13b54f
+EBUILD selinux-wireshark-2.20220106-r2.ebuild 287 BLAKE2B 90902ac6c2fbfb18b9daa336d63c5598c721da17eab6dc1eff74a0661f85bd514d3dedb26a377d5250c317a657ac4b318cebbcee971cf39d746c58cc0cb4e6f6 SHA512 c9bd6f8af980ab439fa9cfce46a815deaf888effcc015c06fd0deb4a26fa824eca419fc79d6b8493eddd8038c19e1a241dfd0a1248bf2969888a9b5c45f505cc
 EBUILD selinux-wireshark-9999.ebuild 287 BLAKE2B 2d23c5dc556815973e9b8f9c8ffc402aa05a370d2eac58e80639152118c35e15a116b07daa0e4b31f89ac35c17514d2c61afc2b3c38bc9f933c765317379d257 SHA512 4266bf1748ac32dad12f055b0be3e786b2d43b90a9fdb88ec83bbcae0f0e048bb950e830596d756b1df144f6810093aa049fe664dbc8dde51fa901c2351f8a76
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-wireshark/selinux-wireshark-2.20220106-r1.ebuild b/sec-policy/selinux-wireshark/selinux-wireshark-2.20220106-r1.ebuild
index 615c477833f6..75c92a771a4d 100644
--- a/sec-policy/selinux-wireshark/selinux-wireshark-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-wireshark/selinux-wireshark-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for wireshark"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-wireshark/selinux-wireshark-2.20220106-r2.ebuild b/sec-policy/selinux-wireshark/selinux-wireshark-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..615c477833f6
--- /dev/null
+++ b/sec-policy/selinux-wireshark/selinux-wireshark-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="wireshark"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for wireshark"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-wm/Manifest b/sec-policy/selinux-wm/Manifest
index 40967d3091d1..674767385d44 100644
--- a/sec-policy/selinux-wm/Manifest
+++ b/sec-policy/selinux-wm/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-wm-2.20200818-r2.ebuild 269 BLAKE2B cde0c84782de6f745d4fa8620f8011120219a8cb8dc78a84b46e0de7217d3cba11115d4124d96f04d107f384e2e31851dcdacca4f267b9795b56df9c051108f6 SHA512 9d85a1592dc15d9e05cb79894e34f4b981d6f6724e6dc1339a4d2c20b413375e92aa2a7e318b407b8d1347aca14c23ae72a9b9480299990b12b9e71ce6478f87
 EBUILD selinux-wm-2.20210203-r1.ebuild 269 BLAKE2B cde0c84782de6f745d4fa8620f8011120219a8cb8dc78a84b46e0de7217d3cba11115d4124d96f04d107f384e2e31851dcdacca4f267b9795b56df9c051108f6 SHA512 9d85a1592dc15d9e05cb79894e34f4b981d6f6724e6dc1339a4d2c20b413375e92aa2a7e318b407b8d1347aca14c23ae72a9b9480299990b12b9e71ce6478f87
 EBUILD selinux-wm-2.20210908-r1.ebuild 269 BLAKE2B cde0c84782de6f745d4fa8620f8011120219a8cb8dc78a84b46e0de7217d3cba11115d4124d96f04d107f384e2e31851dcdacca4f267b9795b56df9c051108f6 SHA512 9d85a1592dc15d9e05cb79894e34f4b981d6f6724e6dc1339a4d2c20b413375e92aa2a7e318b407b8d1347aca14c23ae72a9b9480299990b12b9e71ce6478f87
-EBUILD selinux-wm-2.20220106-r1.ebuild 273 BLAKE2B ba250f12f080036af51e863c1662a9882824107e923de34ddc7b1326648e865de3e54915e683b1988117db50a707bf950a6ff8f09db0f45c0192dae2491e5f8a SHA512 100ad82f9fc796febf227156a70e3d2953d8527520436855244c82d5c05574549260628889c375cb3e52158ebf954a91217f2bb01c49afe790e2ecea941a0117
+EBUILD selinux-wm-2.20220106-r1.ebuild 271 BLAKE2B 321a356eca9166f58c636f7cc4fe29814cd8293546cdce45d1ee8a96760381c6b915d79b854c28ca49accdbef6d3c3b73de7b449f4859edcac90488e2285e9ad SHA512 3a6305fa2416efa34977213bd370312b3632642b6d3b521e2b1406721f0accf33b41cfacad857bc600c0edb1667ff717834e65d51b2bd3dd27b85bdd564cbbe6
+EBUILD selinux-wm-2.20220106-r2.ebuild 273 BLAKE2B ba250f12f080036af51e863c1662a9882824107e923de34ddc7b1326648e865de3e54915e683b1988117db50a707bf950a6ff8f09db0f45c0192dae2491e5f8a SHA512 100ad82f9fc796febf227156a70e3d2953d8527520436855244c82d5c05574549260628889c375cb3e52158ebf954a91217f2bb01c49afe790e2ecea941a0117
 EBUILD selinux-wm-9999.ebuild 273 BLAKE2B 05c5d9d5a5a683f13be9c19785bbfde2722354f345b2648bb7f0a5929279aeb300c37247fda9a80cb162b189d772d0c77d3eecb377b5edc12d67089175e0217c SHA512 ba905ed8c84ea6bfa83370ba0ffbb8541649239ff408fe7e322fd5e361dce195329d9cf91d0bf19ea97d6b09c680b51fdc92ac1df97c5973ebad7e91d1995c8b
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-wm/selinux-wm-2.20220106-r1.ebuild b/sec-policy/selinux-wm/selinux-wm-2.20220106-r1.ebuild
index 10fabd1b2356..b4c89b57814f 100644
--- a/sec-policy/selinux-wm/selinux-wm-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-wm/selinux-wm-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for wm"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-wm/selinux-wm-2.20220106-r2.ebuild b/sec-policy/selinux-wm/selinux-wm-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..10fabd1b2356
--- /dev/null
+++ b/sec-policy/selinux-wm/selinux-wm-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="wm"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for wm"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-xen/Manifest b/sec-policy/selinux-xen/Manifest
index 67f238326411..072206ea4575 100644
--- a/sec-policy/selinux-xen/Manifest
+++ b/sec-policy/selinux-xen/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-xen-2.20200818-r2.ebuild 271 BLAKE2B 40bc81878cd657614016ecd0c459d784203a1759f8d129c17e0e7b31b296fc054a2fe9533f99acfb5ff9bd89107728b404bfe216f56b1a7e252c68c29b87fc87 SHA512 5f474b10ee801b8d3418ffbc746f2243af075eb2958fbf4cd5cac08e84bf4f9a9bc18c9d178ea8151d89a04a7cd90f8c6d07a2b576f54b0902a26c7242c5a2eb
 EBUILD selinux-xen-2.20210203-r1.ebuild 271 BLAKE2B 40bc81878cd657614016ecd0c459d784203a1759f8d129c17e0e7b31b296fc054a2fe9533f99acfb5ff9bd89107728b404bfe216f56b1a7e252c68c29b87fc87 SHA512 5f474b10ee801b8d3418ffbc746f2243af075eb2958fbf4cd5cac08e84bf4f9a9bc18c9d178ea8151d89a04a7cd90f8c6d07a2b576f54b0902a26c7242c5a2eb
 EBUILD selinux-xen-2.20210908-r1.ebuild 271 BLAKE2B 40bc81878cd657614016ecd0c459d784203a1759f8d129c17e0e7b31b296fc054a2fe9533f99acfb5ff9bd89107728b404bfe216f56b1a7e252c68c29b87fc87 SHA512 5f474b10ee801b8d3418ffbc746f2243af075eb2958fbf4cd5cac08e84bf4f9a9bc18c9d178ea8151d89a04a7cd90f8c6d07a2b576f54b0902a26c7242c5a2eb
-EBUILD selinux-xen-2.20220106-r1.ebuild 275 BLAKE2B 5b50513ac5982133542a8d2a4106fdbf20a7011ff037572310440b9ea4bbbbbbc3886a201da59efb6d4049e693b9470be7474d3901d37d679f0203b65fb81596 SHA512 c32056f8c1066c568869716ed887d7620b13baeddce9af3bd7e600a27e2af9bf67dc5d6c51a3fa9284e72dfb1fbc02279bb896d62d2d669596b3ab6e74feda9d
+EBUILD selinux-xen-2.20220106-r1.ebuild 273 BLAKE2B c7a2cb61e58e6402a0bb9463394749e4aa71524826e3bf8ea9a5ade76e8a19e5619a7c1554340d900d2aa3432e2d31902091dbb76ed567d443ada32b50930e6e SHA512 f56027d3bbb49578b07ee0b658807d380e374443651358dcd35c5f375f30b7c9214cf32886051b23b5dd2174e506f1fa221300d06bef63f322fd835528a2f3c9
+EBUILD selinux-xen-2.20220106-r2.ebuild 275 BLAKE2B 5b50513ac5982133542a8d2a4106fdbf20a7011ff037572310440b9ea4bbbbbbc3886a201da59efb6d4049e693b9470be7474d3901d37d679f0203b65fb81596 SHA512 c32056f8c1066c568869716ed887d7620b13baeddce9af3bd7e600a27e2af9bf67dc5d6c51a3fa9284e72dfb1fbc02279bb896d62d2d669596b3ab6e74feda9d
 EBUILD selinux-xen-9999.ebuild 275 BLAKE2B a0f020bc05895654dfa194a770bddbc8dd974a8813cf57a981588f2a61edfa136412e0b1813098d63c98a8bb3658f60ce88f8b5bce2f2b5ded18d58fd0057b79 SHA512 3e7445fb3a18482fda31052793889a6b87de11d5a6fc5596505996e1dbf4d7ff9d7cec97faa7abafcfe7188af566b6489b9b71c5139bd306d028f30b22814ee1
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-xen/selinux-xen-2.20220106-r1.ebuild b/sec-policy/selinux-xen/selinux-xen-2.20220106-r1.ebuild
index d2653712e836..2781a68987e5 100644
--- a/sec-policy/selinux-xen/selinux-xen-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-xen/selinux-xen-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for xen"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-xen/selinux-xen-2.20220106-r2.ebuild b/sec-policy/selinux-xen/selinux-xen-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..d2653712e836
--- /dev/null
+++ b/sec-policy/selinux-xen/selinux-xen-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="xen"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for xen"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-xfs/Manifest b/sec-policy/selinux-xfs/Manifest
index a74554f50cd5..d0947a0030fe 100644
--- a/sec-policy/selinux-xfs/Manifest
+++ b/sec-policy/selinux-xfs/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-xfs-2.20200818-r2.ebuild 271 BLAKE2B 4e28528b1a40763e54410a732a00e7ae862983e8022609010313b116621927352fc916c502e358748f2b636253652ad5586f0c2c00f8b851561b7ae410f9bde3 SHA512 ff5e1929059eedfb1183bb9b101ccd1d0a3c08ec450eb1a715e6f5cc45cabf2d7ee390ca8e1ad59d577c236781dbd337171c77c1a45a942f6e7e8680f46b8f60
 EBUILD selinux-xfs-2.20210203-r1.ebuild 271 BLAKE2B 4e28528b1a40763e54410a732a00e7ae862983e8022609010313b116621927352fc916c502e358748f2b636253652ad5586f0c2c00f8b851561b7ae410f9bde3 SHA512 ff5e1929059eedfb1183bb9b101ccd1d0a3c08ec450eb1a715e6f5cc45cabf2d7ee390ca8e1ad59d577c236781dbd337171c77c1a45a942f6e7e8680f46b8f60
 EBUILD selinux-xfs-2.20210908-r1.ebuild 271 BLAKE2B 4e28528b1a40763e54410a732a00e7ae862983e8022609010313b116621927352fc916c502e358748f2b636253652ad5586f0c2c00f8b851561b7ae410f9bde3 SHA512 ff5e1929059eedfb1183bb9b101ccd1d0a3c08ec450eb1a715e6f5cc45cabf2d7ee390ca8e1ad59d577c236781dbd337171c77c1a45a942f6e7e8680f46b8f60
-EBUILD selinux-xfs-2.20220106-r1.ebuild 275 BLAKE2B b39f8c81d985eb503e7570c4824410270bae2be4d9fe98232f1a40b364637e6c9a80698dcd3045c28ffaa0ad29b0690d89a215bf6a0706464bf4a520f375fced SHA512 6b44bf65b28a56b632fce0edb664dd9e8281053af7c9f3fcb1731696299c77e7f98b366b94747021016421fd50ecdac8bd247bbad9b6a4577db3653bbbe1fd9b
+EBUILD selinux-xfs-2.20220106-r1.ebuild 273 BLAKE2B 588fe46e7f49167c9198d5b8ba76764f3128a5a76a462765b781980c674816ed2e3f7e513792656140ee81f378ab5741abb85ccb14d9fe4343e0a67e9d71d794 SHA512 952eabaa7ff91483791abd8f725dd603c419a562c1d302b3913f51e50662726568d768c8369217a7a58b32912f398edd2eff201a79066f7ff082b5e59990b1c5
+EBUILD selinux-xfs-2.20220106-r2.ebuild 275 BLAKE2B b39f8c81d985eb503e7570c4824410270bae2be4d9fe98232f1a40b364637e6c9a80698dcd3045c28ffaa0ad29b0690d89a215bf6a0706464bf4a520f375fced SHA512 6b44bf65b28a56b632fce0edb664dd9e8281053af7c9f3fcb1731696299c77e7f98b366b94747021016421fd50ecdac8bd247bbad9b6a4577db3653bbbe1fd9b
 EBUILD selinux-xfs-9999.ebuild 275 BLAKE2B 7b9413eb823528490b0c8507e018c2bce2c3af6ef607575f446abb7ccdac26193a2682f718fe9efb3afc19eba084d79ab4f4800fa3ce023a62f29583501380be SHA512 d83f44dabcc768c92e8ab45204bc8fe98e3cdd0aad542b1c8b76ff49b2525b67a9870d5fbaf09d871e5ac7cbf5480cfff1a6bc89888f605291d7c29ba37e28ed
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-xfs/selinux-xfs-2.20220106-r1.ebuild b/sec-policy/selinux-xfs/selinux-xfs-2.20220106-r1.ebuild
index 6c30073820a8..2da8723c30f5 100644
--- a/sec-policy/selinux-xfs/selinux-xfs-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-xfs/selinux-xfs-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for xfs"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-xfs/selinux-xfs-2.20220106-r2.ebuild b/sec-policy/selinux-xfs/selinux-xfs-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..6c30073820a8
--- /dev/null
+++ b/sec-policy/selinux-xfs/selinux-xfs-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="xfs"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for xfs"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-xscreensaver/Manifest b/sec-policy/selinux-xscreensaver/Manifest
index 26267460e611..227fa4592643 100644
--- a/sec-policy/selinux-xscreensaver/Manifest
+++ b/sec-policy/selinux-xscreensaver/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-xscreensaver-2.20200818-r2.ebuild 387 BLAKE2B 0140be13a2170f2fb3f2e92a4534317b836b4bc77af1cf4efec8ad45e6fef7277f348749b0a15d1f06e1012508fb95270a1c6a98e766d830255cbf6451b3675d SHA512 1a9dd9beb5226ce57b40e1bdb2f430712218f22bcce160efc6a85a4603d4479e7df33e9b84db9824d461ad841f96e065c331b8123cea81bfc154a3d81437ec7f
 EBUILD selinux-xscreensaver-2.20210203-r1.ebuild 387 BLAKE2B 0140be13a2170f2fb3f2e92a4534317b836b4bc77af1cf4efec8ad45e6fef7277f348749b0a15d1f06e1012508fb95270a1c6a98e766d830255cbf6451b3675d SHA512 1a9dd9beb5226ce57b40e1bdb2f430712218f22bcce160efc6a85a4603d4479e7df33e9b84db9824d461ad841f96e065c331b8123cea81bfc154a3d81437ec7f
 EBUILD selinux-xscreensaver-2.20210908-r1.ebuild 387 BLAKE2B 0140be13a2170f2fb3f2e92a4534317b836b4bc77af1cf4efec8ad45e6fef7277f348749b0a15d1f06e1012508fb95270a1c6a98e766d830255cbf6451b3675d SHA512 1a9dd9beb5226ce57b40e1bdb2f430712218f22bcce160efc6a85a4603d4479e7df33e9b84db9824d461ad841f96e065c331b8123cea81bfc154a3d81437ec7f
-EBUILD selinux-xscreensaver-2.20220106-r1.ebuild 391 BLAKE2B 3549047bd868209b37052d18c6373496d96c428b3363ad8b6c82df77232ba32cc60f9808b557268b6bf9babf68db62cbbd5efc378bd3af9429cce41cf8458014 SHA512 2b452c87f541b68fd04da5cdefa63d08158d1ebbd662b10cdb4a2388d8b3ae6e09201bdc89945bc996e0821063be5a737e83ab8e6c394b15b01179d211997e14
+EBUILD selinux-xscreensaver-2.20220106-r1.ebuild 389 BLAKE2B 12c36d6f3915f99ef1a14e38f69f7608c2d218fafd4ec9e8995995cbad5b22eb22cd576b0ce19ff1a970cd3ed92035d2fee19301ac87409e0f3827ee7759104c SHA512 d6ce40f8423604df69ce247acd4ca0e2ac790877a2f463cf49aa949d4dd1fdb89279e84d443cbf1ea1fbd42cb459983aad1aa9c5c1483799f99c2a602a2749da
+EBUILD selinux-xscreensaver-2.20220106-r2.ebuild 391 BLAKE2B 3549047bd868209b37052d18c6373496d96c428b3363ad8b6c82df77232ba32cc60f9808b557268b6bf9babf68db62cbbd5efc378bd3af9429cce41cf8458014 SHA512 2b452c87f541b68fd04da5cdefa63d08158d1ebbd662b10cdb4a2388d8b3ae6e09201bdc89945bc996e0821063be5a737e83ab8e6c394b15b01179d211997e14
 EBUILD selinux-xscreensaver-9999.ebuild 391 BLAKE2B f62bbccac255edc4a100f018ec5e6141e06f088bcdce63190c63891507b37e1d6e5ff9e23c455904f388c1e3766f06b0ddccda994bae32dd89fef838d4809101 SHA512 8e4f3d61eea34377a39e6ebf2dca715185aa2a386d82fa479505899841d991bb089b5f3f65b45cf3ffd77edce4295ebe5401894cb5812b34e3ec53e716af7d91
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20220106-r1.ebuild b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20220106-r1.ebuild
index 93b8afa1de83..78f4347877d0 100644
--- a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20220106-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for xscreensaver"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20220106-r2.ebuild b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..93b8afa1de83
--- /dev/null
+++ b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20220106-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="xscreensaver"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for xscreensaver"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-xserver
+"
diff --git a/sec-policy/selinux-xserver/Manifest b/sec-policy/selinux-xserver/Manifest
index 62c96a0294e3..85b5d02f66ec 100644
--- a/sec-policy/selinux-xserver/Manifest
+++ b/sec-policy/selinux-xserver/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-xserver-2.20200818-r2.ebuild 279 BLAKE2B e4609cfa40d93c3ce5441ca3bbec092ab5babb733d32a2810951322a6749b26e8fd4c15d6eb74d34777b0553e1e2a5d796cb5a495ddcf3dda7ce0198afb3ce29 SHA512 01c64f642586dbff97fa048dfacd40736552a62079898c9dccc423cd385690e45932c3caf166dcee755faa3ac660fafce524b51c595ec6aa656256a784651901
 EBUILD selinux-xserver-2.20210203-r1.ebuild 279 BLAKE2B e4609cfa40d93c3ce5441ca3bbec092ab5babb733d32a2810951322a6749b26e8fd4c15d6eb74d34777b0553e1e2a5d796cb5a495ddcf3dda7ce0198afb3ce29 SHA512 01c64f642586dbff97fa048dfacd40736552a62079898c9dccc423cd385690e45932c3caf166dcee755faa3ac660fafce524b51c595ec6aa656256a784651901
 EBUILD selinux-xserver-2.20210908-r1.ebuild 279 BLAKE2B e4609cfa40d93c3ce5441ca3bbec092ab5babb733d32a2810951322a6749b26e8fd4c15d6eb74d34777b0553e1e2a5d796cb5a495ddcf3dda7ce0198afb3ce29 SHA512 01c64f642586dbff97fa048dfacd40736552a62079898c9dccc423cd385690e45932c3caf166dcee755faa3ac660fafce524b51c595ec6aa656256a784651901
-EBUILD selinux-xserver-2.20220106-r1.ebuild 283 BLAKE2B 76afdafa52074b7e9498cfc809175509a314202093a5eda753cde2d89635e0e95213eb1025745702b4750e33f5ef8f35d07beb238807a58db36dfca4e42e6103 SHA512 5e71b3a06b797764766045a77e7ac587c2846e11462ccdc6b4b8799c337acc2f02001d55743fe9e973b9bba1fb5081be997755a87ea53b89f1e7b0265600eba0
+EBUILD selinux-xserver-2.20220106-r1.ebuild 281 BLAKE2B f879d34fa409ab886ef428d1e59107c63a24d55360bd0af917d6ed38943e6cdcf9466e152c41ebf8527b7fba36dec5da58146e2dca63c409bce20b86241cab4f SHA512 63505e13ad6e53e1641c1b35c53dd0ca29315f262d6a4a86572f7a42c3dca83944b6cf9531632b3bac3c47e60c33eb59d8cb034f23fb7f07665f2766baa1909b
+EBUILD selinux-xserver-2.20220106-r2.ebuild 283 BLAKE2B 76afdafa52074b7e9498cfc809175509a314202093a5eda753cde2d89635e0e95213eb1025745702b4750e33f5ef8f35d07beb238807a58db36dfca4e42e6103 SHA512 5e71b3a06b797764766045a77e7ac587c2846e11462ccdc6b4b8799c337acc2f02001d55743fe9e973b9bba1fb5081be997755a87ea53b89f1e7b0265600eba0
 EBUILD selinux-xserver-9999.ebuild 283 BLAKE2B 00e6059be9055d67c1349214aa2dc5894e8111c1c241532e3db1d73a3b1ba5ab4c7a47b165ccb7dad0e585d047ac8ad87385b0145d98f47c2f5f0c87694886ce SHA512 f4a8fb7f11ed42cdf523c1a8f8a55194cc68c1c810a061a95fb445da86eb51543e2a91577465457580a22892663c2e875bad99ec500bafa7446c2e6c686c7b9e
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-xserver/selinux-xserver-2.20220106-r1.ebuild b/sec-policy/selinux-xserver/selinux-xserver-2.20220106-r1.ebuild
index 7d681b3bf01f..05debfc6bcbd 100644
--- a/sec-policy/selinux-xserver/selinux-xserver-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-xserver/selinux-xserver-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for xserver"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-xserver/selinux-xserver-2.20220106-r2.ebuild b/sec-policy/selinux-xserver/selinux-xserver-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..7d681b3bf01f
--- /dev/null
+++ b/sec-policy/selinux-xserver/selinux-xserver-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="xserver"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for xserver"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-zabbix/Manifest b/sec-policy/selinux-zabbix/Manifest
index 68e41ba8af53..ab16817db64a 100644
--- a/sec-policy/selinux-zabbix/Manifest
+++ b/sec-policy/selinux-zabbix/Manifest
@@ -2,6 +2,7 @@ DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c
 DIST patchbundle-selinux-base-policy-2.20210203-r1.tar.bz2 298116 BLAKE2B 50c5523a8b758652af6aa59d548e9499b899898b58f52f74f1667a0c552f2b2d0ed5a44352e59245c7f0ebd199e2391400168d6ab27b4160d726fccded0c56f2 SHA512 ddb877ec3e2883f57e54e7380dd449d4d89a0769a1fb87141786e5de741ac21b2ead60362fd17c25888eb1334c68f71da561f4f29f406f0d4b5d13d378f6baff
 DIST patchbundle-selinux-base-policy-2.20210908-r1.tar.bz2 295091 BLAKE2B 649d9a1d9190aac4a42d460b0609175bb7e1a32624d7504ebfa294741ed5fc2eec286471af1b9128f4cdb9845240b37353a8e641e111b9e53250607c34257baf SHA512 5c9cbd97ece391a2ba0f3586bf19811a2425b9c94c9beafa781dd7b175d7572a46e31a46e8f8671a4b7e122186574f5098a247fee62e1be8afc89233d71effb9
 DIST patchbundle-selinux-base-policy-2.20220106-r1.tar.bz2 299683 BLAKE2B 9e48733878e2f809b8634a1e96a4b1bb2fc3e866e562a6ac9449da8d4af591cbe7de380384fabec50c7a7c67733253f82024ce62dee51fc73e35e0653626ff6c SHA512 314c639e08b15a94656e467e81857241b242020884c0e40272cfb422cccc35f2d4a5f067dc6ebdf8926335a65d737c233d1df75f69b356509e07fd60b46b07bf
+DIST patchbundle-selinux-base-policy-2.20220106-r2.tar.bz2 436316 BLAKE2B 07d6ba7a5fa8e8213e922bfd4c698b73c1cdf598ceaa5efe98be095b51aafa446af8ea7217dcc2bc001bfadaa250bfcc8b8dea3d9aa630384f8cdf139512170d SHA512 68a71d098ae09b034cb57f8e38c06b23a6584f5538b94a44fb1e48e48c718f2b37eb5e38931e55e8769481ebf0ed8c8642cfa85a45ac23a71be31cc35380fbad
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 DIST refpolicy-2.20210203.tar.bz2 564099 BLAKE2B a94a11ebb78890ba2c98714be2fe9054fdb8ccaf5154f47b881a9575a4a6865e8df475805550d7bba8039b4230c6a0c9f5c6130bf8c35a26bc7c473d550fb40d SHA512 a6ffe718626dd6121023b4cbc424c933d44ca8b662bd708baad307cf6284be0d80fef40cdc8b37f6f17ecb3636fd8d6c1d5d4072c17d835b7f500e17a3acd9fc
 DIST refpolicy-2.20210908.tar.bz2 556375 BLAKE2B 12791eeed54204ef075b2d95a738c7d5007d48630d2a60d7e698bcb909dda0abcc15233811a91f4646415ab3daabe2cac46fbfbd04e61f71782e729c0209f99d SHA512 7b84330ca5dd631629302f342a11bf6211cf0711ff3f3273d63ddb072e84c8fe8bef48d511b264affc82090ee51036a09421f81878e10b0c047f572d7720de96
@@ -9,6 +10,7 @@ DIST refpolicy-2.20220106.tar.bz2 560342 BLAKE2B bc0e65466333e02acb48adbb28b8176
 EBUILD selinux-zabbix-2.20200818-r2.ebuild 277 BLAKE2B 1fcec97055ebf85108c64243414aff489ee0264b0dae2c4235ef34f61e46927fc4753a7490aa56501480ed5264bd73ca7e94790f4bc8a4d06d7a034a8eeec1bc SHA512 65038845e576f558cfeecd23b8e79090bc247705891fe272cc9ebf9a65e439014fe35a17ba0a43227ee07e97f0111e772d6ece2a444c52c785db0a7e5d9640dc
 EBUILD selinux-zabbix-2.20210203-r1.ebuild 277 BLAKE2B 1fcec97055ebf85108c64243414aff489ee0264b0dae2c4235ef34f61e46927fc4753a7490aa56501480ed5264bd73ca7e94790f4bc8a4d06d7a034a8eeec1bc SHA512 65038845e576f558cfeecd23b8e79090bc247705891fe272cc9ebf9a65e439014fe35a17ba0a43227ee07e97f0111e772d6ece2a444c52c785db0a7e5d9640dc
 EBUILD selinux-zabbix-2.20210908-r1.ebuild 277 BLAKE2B 1fcec97055ebf85108c64243414aff489ee0264b0dae2c4235ef34f61e46927fc4753a7490aa56501480ed5264bd73ca7e94790f4bc8a4d06d7a034a8eeec1bc SHA512 65038845e576f558cfeecd23b8e79090bc247705891fe272cc9ebf9a65e439014fe35a17ba0a43227ee07e97f0111e772d6ece2a444c52c785db0a7e5d9640dc
-EBUILD selinux-zabbix-2.20220106-r1.ebuild 281 BLAKE2B 23cee7e8fbd4cb67c0b1ce1b67ec35636f5d3b6387a478ab87867d5f05f8a8dabf6fc7514be31641902d17bde4845c53749a798ccf06820ee11c207bc9735dca SHA512 e4dd8f515511b2d0be1b3061f1602d4f1f460508fa4b759b2414dcc7b54989f28ec413e385862d0321b80379335d7b1ebaf7e2d3c8de63cb0c407c0f4fc7c7d9
+EBUILD selinux-zabbix-2.20220106-r1.ebuild 279 BLAKE2B 466dd15635c4ccae84d873c4fe60b798f0896c78cbdfd81a21d90e6395f8671166dcab22ba788285dc3aa26666b425f79bb620f813e4fce18543ce23b1d5c056 SHA512 7944ba284f1d120dda10f48d5bcade0d105d49fe1d0071f2e074306e79b893154f4da4d39a6f835995724af415f61c83dc725b4f88b9df1f4ba178dca0050bd0
+EBUILD selinux-zabbix-2.20220106-r2.ebuild 281 BLAKE2B 23cee7e8fbd4cb67c0b1ce1b67ec35636f5d3b6387a478ab87867d5f05f8a8dabf6fc7514be31641902d17bde4845c53749a798ccf06820ee11c207bc9735dca SHA512 e4dd8f515511b2d0be1b3061f1602d4f1f460508fa4b759b2414dcc7b54989f28ec413e385862d0321b80379335d7b1ebaf7e2d3c8de63cb0c407c0f4fc7c7d9
 EBUILD selinux-zabbix-9999.ebuild 281 BLAKE2B 0f6644e9cef870f56f9647ca07e8b143470206abd567a255ff8a62a65cff698d6a43040e385ca2fe150d76f1e94ed4aab9caf22a98f6483166530deb17e9aa8e SHA512 d24c708bdaf35325b8b5b1881336577abf11bfec3a63a35ee3432e734bac5e8a1ee08165ac372549e8b0f8dd29f2ec3b658c13384ab846d310ca161d58de3610
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-zabbix/selinux-zabbix-2.20220106-r1.ebuild b/sec-policy/selinux-zabbix/selinux-zabbix-2.20220106-r1.ebuild
index 235932cd3e71..84d9d8b88e51 100644
--- a/sec-policy/selinux-zabbix/selinux-zabbix-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-zabbix/selinux-zabbix-2.20220106-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for zabbix"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-zabbix/selinux-zabbix-2.20220106-r2.ebuild b/sec-policy/selinux-zabbix/selinux-zabbix-2.20220106-r2.ebuild
new file mode 100644
index 000000000000..235932cd3e71
--- /dev/null
+++ b/sec-policy/selinux-zabbix/selinux-zabbix-2.20220106-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+IUSE=""
+MODS="zabbix"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for zabbix"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
author	V3n3RiX <venerix@koprulu.sector>	2022-04-06 22:33:41 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-04-06 22:33:41 +0100
commit	e68d405c5d712af4387159df07e226217bdda049 (patch)
tree	009ab0f3d427f0813e62930d71802cb054c07e30 /sec-policy
parent	401101f9c8077911929d3f2b60a37098460a5d89 (diff)