gentoo resync : 25.11.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
commit: d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree: 0625f358789b5e015e49db139cc1dbc9be00428f /sec-policy
parent: 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)
780 files changed, 5714 insertions, 550 deletions
diff --git a/sec-policy/Manifest.gz b/sec-policy/Manifest.gz
index a840422f41a8..d9fddebab713 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 ffac90cf4413..3f33eacb463c 100644
--- a/sec-policy/apparmor-profiles/Manifest
+++ b/sec-policy/apparmor-profiles/Manifest
@@ -1,4 +1,7 @@
 DIST apparmor-2.13.4.tar.gz 7390179 BLAKE2B 49818a010d5e5757dd43710f2af925fbb62a9f8f9be74556ff31a9a8834bebac010762fc6bef3da8d295e487b65d0e0135f4be25bcb01a834846c5e5d65d92a4 SHA512 d42748bf36ae66849f79653a62d499e9d17a97c4d680fb653eb1c379d0593aaa09f7ddfc6f2fa0d2fb468bce05fb25444976f60a5ec24778fdd7ec20d1c13651
+DIST apparmor-3.0.0.tar.gz 7780686 BLAKE2B a9d9edb4fd2cb32b3db322a3f145aac7cea40fac3401b82947b2c5183598cc326d70859466823e3ac0a2227483c7ed7ba0b2f727e9fb7fbf532468716ef8d18f SHA512 2465a8bc400e24e548b0589b7b022fb8325c53858429b9c54204f989d5589d7bd99c9507bde88a48f9965a55edcbac98efeeb6b93aeefe6a27afa0b7e851aea6
 EBUILD apparmor-profiles-2.13.4.ebuild 616 BLAKE2B 4edd168013f3e74682680cd9f6545ae831b075a18a4d316cc2e98ae10890977bbaac357bdb1b517ba7420708fbff5be4de184857e56587f669d3ddc7307f315e SHA512 badd1879d23544758ec5ba2085b676a37210fa59d7c1ae6e6d7ee36fdd7357fb94e9e0bac00caab3439cf09370b24d0dec4c0134d7f0ece267c5be505f2df039
-EBUILD apparmor-profiles-9999.ebuild 727 BLAKE2B 4e77ef1fb847d6c6d7e9545c0e9ee823f0e308260d3ba75bc3d888702b0f60e620fe897fc81b8e65161092be4bd7965c79aa8afd6401ea987db15d41f7cae9c6 SHA512 8586498145e7b8acf27a4842a8ced8b8a7c804dfdd84cccab81ca1029c4a7ef224580bd2f87758b5b6f4923140e80244bac1fbc238ae854d34a910d392130191
+EBUILD apparmor-profiles-3.0.0-r1.ebuild 623 BLAKE2B bb06ee53c7a4ca1ea061f7449ad8d1dd924efe0be0fa331a11a6d02f9d6e39b184ebfec334dfeb9bbac7850a850fc47d00c200f99c0d41673bd2f065abe2a3a5 SHA512 bea3769e6f17b609131d5d0aa54f381288385ce7804fdf5331db541e8d1fb7adda11f3112fa1c8e6c756808346a8f2d009fe11b0aa3f146072a19dcf143b8a36
+EBUILD apparmor-profiles-3.0.0.ebuild 619 BLAKE2B 4b0d2efaba135e0ab90a6321f1bc4ca1e0d14772f6c4c882be90a99019b6d689dc26b088f99ed0e546120e84a9f3f627669c5f1adff8cf70090300e102abbce6 SHA512 66383f42f0dfc541b21dc6951bc9b238f8bff7dad1353b0b75fdd1fd8afb70f3979cc2f0b9aafbd1c88c649cf532689ebb1ce1b23badf58eba2fb85b49f93048
+EBUILD apparmor-profiles-9999.ebuild 731 BLAKE2B a79150eaeea4626e1126dd612c7b1f58548fa9bb9a1fd786adbb03eeab2f05707b4a40d96691c754ec233a65a5eafbb5b7b25208f65356bcfaf2d819efc69277 SHA512 81d444b4577b3f23957d69cb14d1b0474047807567965a74b1fca7a86d48a1c2c370b163da3c780293170a86a7931e248a1e88430fb7bde736f19f7ad4431880
 MISC metadata.xml 409 BLAKE2B 63cb1726a015cf118e8ffcc8cf9d49795a75d367e36b0332fbf23faad8b3eed41e2ae090cc92757e12248d831e0ea1782b6f275ef02b7d2d2022bf2b79f69042 SHA512 a66647c5e40f2593017942c12786dc30995e7980fdb58c1de0b9ae34069434cb5a4c70b2bd268a239df82edfcc1e7288e8033bf57609f757a321639afd5e78b8
diff --git a/sec-policy/apparmor-profiles/apparmor-profiles-3.0.0-r1.ebuild b/sec-policy/apparmor-profiles/apparmor-profiles-3.0.0-r1.ebuild
new file mode 100644
index 000000000000..e03119a08670
--- /dev/null
+++ b/sec-policy/apparmor-profiles/apparmor-profiles-3.0.0-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV="$(ver_cut 1-2)"
+
+DESCRIPTION="A collection of profiles for the AppArmor application security system"
+HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"
+SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${MY_PV}/+download/apparmor-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="minimal"
+
+RESTRICT="test"
+
+S=${WORKDIR}/apparmor-${PV}/profiles
+
+src_install() {
+	if use minimal ; then
+		insinto /etc/apparmor.d
+		doins -r apparmor.d/{abi,abstractions,tunables}
+	else
+		default
+	fi
+}
diff --git a/sec-policy/apparmor-profiles/apparmor-profiles-3.0.0.ebuild b/sec-policy/apparmor-profiles/apparmor-profiles-3.0.0.ebuild
new file mode 100644
index 000000000000..46576ffed516
--- /dev/null
+++ b/sec-policy/apparmor-profiles/apparmor-profiles-3.0.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV="$(ver_cut 1-2)"
+
+DESCRIPTION="A collection of profiles for the AppArmor application security system"
+HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"
+SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${MY_PV}/+download/apparmor-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="minimal"
+
+RESTRICT="test"
+
+S=${WORKDIR}/apparmor-${PV}/profiles
+
+src_install() {
+	if use minimal ; then
+		insinto /etc/apparmor.d
+		doins -r apparmor.d/{abstractions,tunables}
+	else
+		default
+	fi
+}
diff --git a/sec-policy/apparmor-profiles/apparmor-profiles-9999.ebuild b/sec-policy/apparmor-profiles/apparmor-profiles-9999.ebuild
index 7c3930d38474..730d6bdf71f6 100644
--- a/sec-policy/apparmor-profiles/apparmor-profiles-9999.ebuild
+++ b/sec-policy/apparmor-profiles/apparmor-profiles-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,7 +30,7 @@ pkg_setup() {
 src_install() {
 	if use minimal ; then
 		insinto /etc/apparmor.d
-		doins -r apparmor.d/{abstractions,tunables}
+		doins -r apparmor.d/{abi,abstractions,tunables}
 	else
 		default
 	fi
diff --git a/sec-policy/selinux-abrt/Manifest b/sec-policy/selinux-abrt/Manifest
index cf85b87fb803..9a6d3e23927f 100644
--- a/sec-policy/selinux-abrt/Manifest
+++ b/sec-policy/selinux-abrt/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-abrt-2.20190201-r1.ebuild 275 BLAKE2B 279a8b2a8cdf4f39d019365d3d2035a85412cc0e600018e8bb5ccd3995c9800425f553b1adcbadb21a274c36a7491fd66df12c4cb0ceaf82df538b5b97339408 SHA512 7a4531e7ccb024afcd44222003a6c19631189861fc97668e73f9bd19b2e24ee85f19b2e24b20844014431f51abfe1d822252fed36a799fcbc8c47a11a7cc8b35
-EBUILD selinux-abrt-2.20190609-r1.ebuild 277 BLAKE2B 1a2d4ada5533118943b068668e044246952da92e87fa7a7bafb6453f457ced24da7134264673eaefb69075afb75ffce92b819c97c4bacec5848a55fecf12d7ac SHA512 7c54ea55f4b52becbb536c47e4a9fadc9c969d3b9838cf158e8dfb5acd7f6c0d5231b68691a8b6796593082749f630ac969776236e64b3cf7a5751894270856a
+EBUILD selinux-abrt-2.20190609-r1.ebuild 275 BLAKE2B 279a8b2a8cdf4f39d019365d3d2035a85412cc0e600018e8bb5ccd3995c9800425f553b1adcbadb21a274c36a7491fd66df12c4cb0ceaf82df538b5b97339408 SHA512 7a4531e7ccb024afcd44222003a6c19631189861fc97668e73f9bd19b2e24ee85f19b2e24b20844014431f51abfe1d822252fed36a799fcbc8c47a11a7cc8b35
+EBUILD selinux-abrt-2.20200818-r1.ebuild 277 BLAKE2B 1a2d4ada5533118943b068668e044246952da92e87fa7a7bafb6453f457ced24da7134264673eaefb69075afb75ffce92b819c97c4bacec5848a55fecf12d7ac SHA512 7c54ea55f4b52becbb536c47e4a9fadc9c969d3b9838cf158e8dfb5acd7f6c0d5231b68691a8b6796593082749f630ac969776236e64b3cf7a5751894270856a
 EBUILD selinux-abrt-9999.ebuild 280 BLAKE2B 88f99a4483c8ed1235892d4aa9d17df4c7a4448e10463d13e6e651ed1c82d4425cff02c4d5d99012680ddbca6586fb5cbfd630a557be12ba26131bbccea534fc SHA512 8464df9d5dddf0f462271499e0fe4ded5db27c90ad3125911dd16c0aed004fc2cdc6a4aa757c0cb7ee83bfe8845b530baecf857944794c7afa71ae58e1211b96
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-abrt/selinux-abrt-2.20190609-r1.ebuild b/sec-policy/selinux-abrt/selinux-abrt-2.20190609-r1.ebuild
index 7ce29272597c..b873a89a358e 100644
--- a/sec-policy/selinux-abrt/selinux-abrt-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-abrt/selinux-abrt-2.20190609-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-consolekit/selinux-consolekit-2.20190609-r1.ebuild b/sec-policy/selinux-abrt/selinux-abrt-2.20200818-r1.ebuild
index 598ba29b0d55..7ce29272597c 100644
--- a/sec-policy/selinux-consolekit/selinux-consolekit-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-abrt/selinux-abrt-2.20200818-r1.ebuild
@@ -4,11 +4,11 @@
 EAPI="6"
 
 IUSE=""
-MODS="consolekit"
+MODS="abrt"
 
 inherit selinux-policy-2
 
-DESCRIPTION="SELinux policy for consolekit"
+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 832c79756245..14fa6d90c1c6 100644
--- a/sec-policy/selinux-accountsd/Manifest
+++ b/sec-policy/selinux-accountsd/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-accountsd-2.20190201-r1.ebuild 378 BLAKE2B 9c2c18d19f10542d4b621f7b1e7ae5f1472136bc239c85c3d785ce6d39ac1b2cf29355e752fa6b9cf7463bbe709742c966e646038879b3263de722684c90a4f7 SHA512 35d15bd8bd44c087f2354ca4bb7afeec6b4faa6fd883eca82217298f1210a3fc77de56f536f5f4b30f531d40b44d2f7f9f2ed9f8e6c81fd50467e28982733ba8
-EBUILD selinux-accountsd-2.20190609-r1.ebuild 380 BLAKE2B 92bff1dfbad7ff1d3232103703f0714d22b3883f7a2c87e615707186b5b0ac0f79ba28bdf0380bcce8d3bab7be625de05fe2781c7f46be4242aaa58779a8bd3b SHA512 4f69c987c6a936cdcb2037e14fe2895bf6b4c2d147583d0f2861b11f9d050d88402891a61aa9fea739a9f8c0e32f2268e3c57736182ad2e16c176d1c72e8641a
+EBUILD selinux-accountsd-2.20190609-r1.ebuild 378 BLAKE2B 9c2c18d19f10542d4b621f7b1e7ae5f1472136bc239c85c3d785ce6d39ac1b2cf29355e752fa6b9cf7463bbe709742c966e646038879b3263de722684c90a4f7 SHA512 35d15bd8bd44c087f2354ca4bb7afeec6b4faa6fd883eca82217298f1210a3fc77de56f536f5f4b30f531d40b44d2f7f9f2ed9f8e6c81fd50467e28982733ba8
+EBUILD selinux-accountsd-2.20200818-r1.ebuild 380 BLAKE2B 92bff1dfbad7ff1d3232103703f0714d22b3883f7a2c87e615707186b5b0ac0f79ba28bdf0380bcce8d3bab7be625de05fe2781c7f46be4242aaa58779a8bd3b SHA512 4f69c987c6a936cdcb2037e14fe2895bf6b4c2d147583d0f2861b11f9d050d88402891a61aa9fea739a9f8c0e32f2268e3c57736182ad2e16c176d1c72e8641a
 EBUILD selinux-accountsd-9999.ebuild 383 BLAKE2B dffe4673eb88161222b8bc3cef1c82b4b7d28fe29a611e3041253fc720ab186cb0734b7eb79b421577093cd8ef72203ed52824d29f2a861e768a31e2230d3f75 SHA512 c991c2aacfe1d4c4430d5f1eeec3194d68bc713394e8553a2eeb3b4da0228f015fecc7fd079ef999a8bc0c3d42f80bba1d7dc663dceee53c213f7cd284863434
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-accountsd/selinux-accountsd-2.20190609-r1.ebuild b/sec-policy/selinux-accountsd/selinux-accountsd-2.20190609-r1.ebuild
index 7f3f8a5d333b..2de7f0239bce 100644
--- a/sec-policy/selinux-accountsd/selinux-accountsd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-accountsd/selinux-accountsd-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-accountsd/selinux-accountsd-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..7f3f8a5d333b
--- /dev/null
+++ b/sec-policy/selinux-accountsd/selinux-accountsd-2.20200818-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 1d62268952a9..fc1b924a4e0f 100644
--- a/sec-policy/selinux-acct/Manifest
+++ b/sec-policy/selinux-acct/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-acct-2.20190201-r1.ebuild 275 BLAKE2B 1667ff8303ec2d730db653ca8eef4a961d3fbb1643e4f22965ededcfe342271adad7f6b20aec854c1d44f3894bb1752c901972f58f701647277712ab812946ae SHA512 311af8eb1bb9082d8f593c0ba170ba0e1f9c0561bd9e4341b43ce0caa9f5f651c56e3f6c97a13dfc95d5fec7fbfd1eb1f952b6c2cbeac4bf349e1dd233fbbfa3
-EBUILD selinux-acct-2.20190609-r1.ebuild 277 BLAKE2B b6b1a7d7ed8d4eb273d474f1aef64c6b38c3ceba5a9de02083565de290d50125e7c438f0703548d6fabcbfb706883cad75de303ed065ced5ddd4ef4ec4d6fc05 SHA512 f08d9232d3187b816335058e1638c8e87f3ca9026f4adbe5374c17f4afd1436287123f50e70201242465f1343a2c98cea752f580143edbeb79b95c94aa997c21
+EBUILD selinux-acct-2.20190609-r1.ebuild 275 BLAKE2B 1667ff8303ec2d730db653ca8eef4a961d3fbb1643e4f22965ededcfe342271adad7f6b20aec854c1d44f3894bb1752c901972f58f701647277712ab812946ae SHA512 311af8eb1bb9082d8f593c0ba170ba0e1f9c0561bd9e4341b43ce0caa9f5f651c56e3f6c97a13dfc95d5fec7fbfd1eb1f952b6c2cbeac4bf349e1dd233fbbfa3
+EBUILD selinux-acct-2.20200818-r1.ebuild 277 BLAKE2B b6b1a7d7ed8d4eb273d474f1aef64c6b38c3ceba5a9de02083565de290d50125e7c438f0703548d6fabcbfb706883cad75de303ed065ced5ddd4ef4ec4d6fc05 SHA512 f08d9232d3187b816335058e1638c8e87f3ca9026f4adbe5374c17f4afd1436287123f50e70201242465f1343a2c98cea752f580143edbeb79b95c94aa997c21
 EBUILD selinux-acct-9999.ebuild 280 BLAKE2B bf2adfc61fe0c27535a3b59243e984d7ec35f720638dbec46caf9b2f6cc2260d50f3e8a884c31dd949df29585b91407cd34169faaf0a95f6f40029e179979eff SHA512 2e72f5c740aceedb0dd0833abc1e88601c1b8ff1aec1bc45325415e8db53c4b028f5630faf13e5dbcf194636082e4f170e7ce975369516494a753a6574391f80
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-acct/selinux-acct-2.20190609-r1.ebuild b/sec-policy/selinux-acct/selinux-acct-2.20190609-r1.ebuild
index a012c94e8f75..afc94895c459 100644
--- a/sec-policy/selinux-acct/selinux-acct-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-acct/selinux-acct-2.20190609-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-consolekit/selinux-consolekit-9999.ebuild b/sec-policy/selinux-acct/selinux-acct-2.20200818-r1.ebuild
index 084d9430ec27..a012c94e8f75 100644
--- a/sec-policy/selinux-consolekit/selinux-consolekit-9999.ebuild
+++ b/sec-policy/selinux-acct/selinux-acct-2.20200818-r1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
 IUSE=""
-MODS="consolekit"
+MODS="acct"
 
 inherit selinux-policy-2
 
-DESCRIPTION="SELinux policy for consolekit"
+DESCRIPTION="SELinux policy for acct"
 
 if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
diff --git a/sec-policy/selinux-ada/Manifest b/sec-policy/selinux-ada/Manifest
index f0a1e895e2d0..eb62a2ad27cb 100644
--- a/sec-policy/selinux-ada/Manifest
+++ b/sec-policy/selinux-ada/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-ada-2.20190201-r1.ebuild 273 BLAKE2B bbc93de888c74a63d210ab9fe84dc0fe230fea0bf9c0894a1cb01ed55f69cb5140ac0c98249daa2d7662a2c4ffd28a8e34ad88d57a84a838b9e866edecc54a47 SHA512 ecab6f318d15919a9208df2a152e64b1123022ccf5d8f9a09758a9855ad4b1c985062a9898168910fad612183ef1696b5dc1326a80fc11f28cfd9503f0940a36
-EBUILD selinux-ada-2.20190609-r1.ebuild 275 BLAKE2B 6407b3e8e5d33700f174530f43dd36c7427432914b768934e8678fc242e6686b7641a57aa55bc9616e37d6594fb3c764512231d4186386d845f609a58f195779 SHA512 14ddffe454e224ae0102b12e24623e5f1160834cb6a1d5b27add33052c434fdcd1d8bf4f512b4c8e194ee7712cf5aa27ee7f1cf0287ea03eb0a07294e3d559be
+EBUILD selinux-ada-2.20190609-r1.ebuild 273 BLAKE2B bbc93de888c74a63d210ab9fe84dc0fe230fea0bf9c0894a1cb01ed55f69cb5140ac0c98249daa2d7662a2c4ffd28a8e34ad88d57a84a838b9e866edecc54a47 SHA512 ecab6f318d15919a9208df2a152e64b1123022ccf5d8f9a09758a9855ad4b1c985062a9898168910fad612183ef1696b5dc1326a80fc11f28cfd9503f0940a36
+EBUILD selinux-ada-2.20200818-r1.ebuild 275 BLAKE2B 6407b3e8e5d33700f174530f43dd36c7427432914b768934e8678fc242e6686b7641a57aa55bc9616e37d6594fb3c764512231d4186386d845f609a58f195779 SHA512 14ddffe454e224ae0102b12e24623e5f1160834cb6a1d5b27add33052c434fdcd1d8bf4f512b4c8e194ee7712cf5aa27ee7f1cf0287ea03eb0a07294e3d559be
 EBUILD selinux-ada-9999.ebuild 278 BLAKE2B 452d5e763ea273aa35915a92b0badfa3623089d5a288e5c3e727725d52b944e1a37ef7adfe72758ebaa3edb6392185085d9e9865854d2e01fb779273d3172224 SHA512 3908f5a4f157ba5ee88fda2c684f2c680167869a20fb9e35d04bd737285c37fb958e98125639298a83f45b314e2d4b47827b1b94739c8f2067dd0e34282f45a4
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ada/selinux-ada-2.20190609-r1.ebuild b/sec-policy/selinux-ada/selinux-ada-2.20190609-r1.ebuild
index 9008a2bf117f..06eec0838701 100644
--- a/sec-policy/selinux-ada/selinux-ada-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-ada/selinux-ada-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ada"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-consolekit/selinux-consolekit-2.20190201-r1.ebuild b/sec-policy/selinux-ada/selinux-ada-2.20200818-r1.ebuild
index 1ebffc011086..9008a2bf117f 100644
--- a/sec-policy/selinux-consolekit/selinux-consolekit-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-ada/selinux-ada-2.20200818-r1.ebuild
@@ -4,12 +4,12 @@
 EAPI="6"
 
 IUSE=""
-MODS="consolekit"
+MODS="ada"
 
 inherit selinux-policy-2
 
-DESCRIPTION="SELinux policy for consolekit"
+DESCRIPTION="SELinux policy for ada"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
 fi
diff --git a/sec-policy/selinux-afs/Manifest b/sec-policy/selinux-afs/Manifest
index 9ffec450b7c0..45099a6bf453 100644
--- a/sec-policy/selinux-afs/Manifest
+++ b/sec-policy/selinux-afs/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-afs-2.20190201-r1.ebuild 273 BLAKE2B b2976f6d44994e4e966c2ae217c38cdcb04896c9fa722459e8aee81998b89944b4cce8ca4dc1780aa515a72b8a864f3b8f962b0b11d3a9e7fcdee6a1e440c42a SHA512 31e95ddd20ee766f3cb387a3aabc65f2849295ebbedaea917f48ea63292d84f9ba74c5b0549f958f92cd46b8b0cd76d207b0876bba4e4ede19c4c5d3a6011afa
-EBUILD selinux-afs-2.20190609-r1.ebuild 275 BLAKE2B 5b9b945530583af71323e24dfaf70c997c750f45c4906d048f82b8eb68a264bf0579727d260f4749288be1502e183b9a92fada1b3550211333fdcf4e8e8c51d7 SHA512 4b76a1c601cc79bdc017d99c90f0c875dcae461de60ee862d3c2188c1c20cd9b1c3b86be5f3a30eda4c609642d73b8cfefd138aaf496f5f4490c915e66b4f48f
+EBUILD selinux-afs-2.20190609-r1.ebuild 273 BLAKE2B b2976f6d44994e4e966c2ae217c38cdcb04896c9fa722459e8aee81998b89944b4cce8ca4dc1780aa515a72b8a864f3b8f962b0b11d3a9e7fcdee6a1e440c42a SHA512 31e95ddd20ee766f3cb387a3aabc65f2849295ebbedaea917f48ea63292d84f9ba74c5b0549f958f92cd46b8b0cd76d207b0876bba4e4ede19c4c5d3a6011afa
+EBUILD selinux-afs-2.20200818-r1.ebuild 275 BLAKE2B 5b9b945530583af71323e24dfaf70c997c750f45c4906d048f82b8eb68a264bf0579727d260f4749288be1502e183b9a92fada1b3550211333fdcf4e8e8c51d7 SHA512 4b76a1c601cc79bdc017d99c90f0c875dcae461de60ee862d3c2188c1c20cd9b1c3b86be5f3a30eda4c609642d73b8cfefd138aaf496f5f4490c915e66b4f48f
 EBUILD selinux-afs-9999.ebuild 278 BLAKE2B 6bd6e036a2128c93bba88b35b03d4cd4516a93c3222af43c388358541aad15ac0c780b0d48e5b67cba4187aefacc80e49db83f013970795d2e95521eca65aac2 SHA512 e19dc975e9f9e0a63b8257876106e50f3ce0613ea2964438dc5adc74204563b4fa9e8f646babe91896afc226bf85d1940e6a2f7cb0a2e557a44d9a679d221f37
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-afs/selinux-afs-2.20190609-r1.ebuild b/sec-policy/selinux-afs/selinux-afs-2.20190609-r1.ebuild
index 483eb036cbea..1d6c1c4bc440 100644
--- a/sec-policy/selinux-afs/selinux-afs-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-afs/selinux-afs-2.20190609-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-afs/selinux-afs-2.20200818-r1.ebuild b/sec-policy/selinux-afs/selinux-afs-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..483eb036cbea
--- /dev/null
+++ b/sec-policy/selinux-afs/selinux-afs-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="afs"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for afs"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-aide/Manifest b/sec-policy/selinux-aide/Manifest
index 95b1c3723589..4137a88a5823 100644
--- a/sec-policy/selinux-aide/Manifest
+++ b/sec-policy/selinux-aide/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-aide-2.20190201-r1.ebuild 275 BLAKE2B a431b8374584ac5b5c737db254514e1bd0471f5f292785a5a14b3d9dafd32e1f0a83c3f46e5bee81e36ad3c553f99c4952d943e5f5e136167f35285a124d65ef SHA512 61fe18029a8e0f2c9897b83b4fa512bd47d7d03d85847a38aa25d7995d1df518c4d47957fe97b0a51a4c0d9574bd4898eb14ab3a41564abc5075f80330de12bb
-EBUILD selinux-aide-2.20190609-r1.ebuild 277 BLAKE2B ccc168bb2427749bd419cf7ea29add0f72f13ac28c3fd4050d8583aa2c859d8316667804e3c395a09e70393fd2373071d4e23137ecc2836815b0f91349b22500 SHA512 84a3d894d69afd49f551e8c75bc84236a0285e6a3d08c88bfd63c8ea60ddf4385866b0724e878eb75f10c82ba8533c69a2339eae816352438a74637dba30408d
+EBUILD selinux-aide-2.20190609-r1.ebuild 275 BLAKE2B a431b8374584ac5b5c737db254514e1bd0471f5f292785a5a14b3d9dafd32e1f0a83c3f46e5bee81e36ad3c553f99c4952d943e5f5e136167f35285a124d65ef SHA512 61fe18029a8e0f2c9897b83b4fa512bd47d7d03d85847a38aa25d7995d1df518c4d47957fe97b0a51a4c0d9574bd4898eb14ab3a41564abc5075f80330de12bb
+EBUILD selinux-aide-2.20200818-r1.ebuild 277 BLAKE2B ccc168bb2427749bd419cf7ea29add0f72f13ac28c3fd4050d8583aa2c859d8316667804e3c395a09e70393fd2373071d4e23137ecc2836815b0f91349b22500 SHA512 84a3d894d69afd49f551e8c75bc84236a0285e6a3d08c88bfd63c8ea60ddf4385866b0724e878eb75f10c82ba8533c69a2339eae816352438a74637dba30408d
 EBUILD selinux-aide-9999.ebuild 280 BLAKE2B 0619ecbb757875177cc1d01218b4644e31b41820e0af4a69381ac2f9a43d4d7950ce72719d4c27a05211ac3544d764b7c5b1e1b6cb7a5ebd3331135a5b476906 SHA512 df9e4f9a6e9b6fadd48d3fe550355369933c4d9cbaac5f0d2de9d75758de97e1ce3dd01e6ee4cb27253eabce1121695c55f5839ce4b17a8c02a316f92524bae3
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-aide/selinux-aide-2.20190609-r1.ebuild b/sec-policy/selinux-aide/selinux-aide-2.20190609-r1.ebuild
index 8f4334a0f8b1..fdbe2ad8fe19 100644
--- a/sec-policy/selinux-aide/selinux-aide-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-aide/selinux-aide-2.20190609-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-aide/selinux-aide-2.20200818-r1.ebuild b/sec-policy/selinux-aide/selinux-aide-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..8f4334a0f8b1
--- /dev/null
+++ b/sec-policy/selinux-aide/selinux-aide-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="aide"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for aide"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-alsa/Manifest b/sec-policy/selinux-alsa/Manifest
index 45f21e6b1f27..5759fcfb4bc6 100644
--- a/sec-policy/selinux-alsa/Manifest
+++ b/sec-policy/selinux-alsa/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-alsa-2.20190201-r1.ebuild 275 BLAKE2B 18c33ac526bde40d7da8ed8789c612b249f15a35b1853659f1a0e4049c6b2a22cae42fad68ae28cdc9f8fed7dc8fdd6bf778e25941992b3cd921c5348114bbd5 SHA512 d5f4a317053176310c435486b3365cc8a0aee56c5c62180d7583f0e4d6b14a6c8cbc15dcd2db6ac6d7163aaa11e8d7dabc5ba74f8a5657a9544ade61678b8fdf
-EBUILD selinux-alsa-2.20190609-r1.ebuild 277 BLAKE2B 4f1309baa35fdfa53160b37238da3560f8a748f0fd8baa9c2b72ee54fb36ec49b2774388ff2b450d29724a88b05ef79f83b3f24031a911a439d764979e9a3230 SHA512 d7a878e241163b6d478b6a50430479662382730814c8b51898809ddacd84b7761214403d106eab9fb6c1f16c43c0849dbd532ef66ca1a378434739d84e9a98a1
+EBUILD selinux-alsa-2.20190609-r1.ebuild 275 BLAKE2B 18c33ac526bde40d7da8ed8789c612b249f15a35b1853659f1a0e4049c6b2a22cae42fad68ae28cdc9f8fed7dc8fdd6bf778e25941992b3cd921c5348114bbd5 SHA512 d5f4a317053176310c435486b3365cc8a0aee56c5c62180d7583f0e4d6b14a6c8cbc15dcd2db6ac6d7163aaa11e8d7dabc5ba74f8a5657a9544ade61678b8fdf
+EBUILD selinux-alsa-2.20200818-r1.ebuild 277 BLAKE2B 4f1309baa35fdfa53160b37238da3560f8a748f0fd8baa9c2b72ee54fb36ec49b2774388ff2b450d29724a88b05ef79f83b3f24031a911a439d764979e9a3230 SHA512 d7a878e241163b6d478b6a50430479662382730814c8b51898809ddacd84b7761214403d106eab9fb6c1f16c43c0849dbd532ef66ca1a378434739d84e9a98a1
 EBUILD selinux-alsa-9999.ebuild 280 BLAKE2B 66498f44a74ad33219d282e1f3b9a74f29a08ac5ef7ebdbc5a6f6eb6b6727a8e2817dddcb4da7a5902df2db9b72e7b8479e2dd384da3d03ff0d537ebb6bcf107 SHA512 14a2d18227bbe77b5d904e624d76a4736626e163ef5e3966621e0372ddff162862010259a0a0781751f85012a07fe0e63a4389b7fa2a9a322b7842f51baefeda
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-alsa/selinux-alsa-2.20190609-r1.ebuild b/sec-policy/selinux-alsa/selinux-alsa-2.20190609-r1.ebuild
index 9cf83ba211ab..b81a533192d4 100644
--- a/sec-policy/selinux-alsa/selinux-alsa-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-alsa/selinux-alsa-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-alsa/selinux-alsa-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..9cf83ba211ab
--- /dev/null
+++ b/sec-policy/selinux-alsa/selinux-alsa-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 c9eabef60e83..be206d459286 100644
--- a/sec-policy/selinux-amanda/Manifest
+++ b/sec-policy/selinux-amanda/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-amanda-2.20190201-r1.ebuild 373 BLAKE2B 8c4925318ab8e00a4130eca1a18024e94f79f830dfbb387f9733e0b51b6a155cd7c8b888dc580d61457128a1846d177684acfcc09b46595295e46227d18c5f1d SHA512 f99979c7a58c93d45951b9eb669c87256e0ba471377b2d7f2dc225084e4718368a84e2fbf0805482252342591c2933ad6daa1198cc64e676468a097fe737e743
-EBUILD selinux-amanda-2.20190609-r1.ebuild 375 BLAKE2B 5e8d232c92be185dcf5c6626dedb52ba087bf5befcf98fd523cce2d6edab4e8c80b4c7e64448c58ade50bf1c803281f9e75dcbae22a4d8aae81efe228b0a76fb SHA512 70b53c5de35c693fd7ea28e57239676d7b5b9f6f7d9b8ec4806df6fcf865010f89ea3fcf0cef1eb4f78b0ee4d8f36397d6a0b8d0727dfd30b76a0dfcb59e7e68
+EBUILD selinux-amanda-2.20190609-r1.ebuild 373 BLAKE2B 8c4925318ab8e00a4130eca1a18024e94f79f830dfbb387f9733e0b51b6a155cd7c8b888dc580d61457128a1846d177684acfcc09b46595295e46227d18c5f1d SHA512 f99979c7a58c93d45951b9eb669c87256e0ba471377b2d7f2dc225084e4718368a84e2fbf0805482252342591c2933ad6daa1198cc64e676468a097fe737e743
+EBUILD selinux-amanda-2.20200818-r1.ebuild 375 BLAKE2B 5e8d232c92be185dcf5c6626dedb52ba087bf5befcf98fd523cce2d6edab4e8c80b4c7e64448c58ade50bf1c803281f9e75dcbae22a4d8aae81efe228b0a76fb SHA512 70b53c5de35c693fd7ea28e57239676d7b5b9f6f7d9b8ec4806df6fcf865010f89ea3fcf0cef1eb4f78b0ee4d8f36397d6a0b8d0727dfd30b76a0dfcb59e7e68
 EBUILD selinux-amanda-9999.ebuild 378 BLAKE2B f05d3e24e87efa85390431108c5ea318c5aeee59777eb08337052c6e5cc076acbca28d3aadbc28770b87a704bb8d8017bfa460da675eda36f79ae40a139f00ca SHA512 bdc94e45001a2fd5f9ba987704584f51445282589fa682aac6938cad1aef9c43032714043fc9c2c1206417353660bfc277fada5842124b3de15a4875498d098d
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-amanda/selinux-amanda-2.20190609-r1.ebuild b/sec-policy/selinux-amanda/selinux-amanda-2.20190609-r1.ebuild
index f31158bebca3..4e0a659ca088 100644
--- a/sec-policy/selinux-amanda/selinux-amanda-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-amanda/selinux-amanda-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-amanda/selinux-amanda-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..f31158bebca3
--- /dev/null
+++ b/sec-policy/selinux-amanda/selinux-amanda-2.20200818-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 a6ed6c34fb0d..d4a3823f69dc 100644
--- a/sec-policy/selinux-amavis/Manifest
+++ b/sec-policy/selinux-amavis/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-amavis-2.20190201-r1.ebuild 279 BLAKE2B 500e6bddef3eebba2fbe8687c0350aaca692a52c957a2d89e9dbc15cfed620fcb23be402bcb9221c071f02217af069e3b2c3c3138372fe0e7be39d035d1d7b72 SHA512 e1377d9002f4f497dd2c56abd36001e422ed94d9909e4d7983a2604dbd4687eab055bc9b4a503061c1b867ba7bb7288114a8565b8d85bef9554685e99daba27d
-EBUILD selinux-amavis-2.20190609-r1.ebuild 281 BLAKE2B ac8d1b34e968c0fbbee8739f5ce248cc6cac74ffcb73ab696f1be971fe0524009d83edf7d6eb33825b700de02fe9c93b0f6a7c7d9874b2fa19f1f2400d43126b SHA512 d54e2ccfa9c89a60716e5cc983c133de734db74a7dc786f8b63f4aeca6c7f42589c5eeaacda2e12e19382b36ad88a049f9daa0877de1bddcf9c613d3b12149b5
+EBUILD selinux-amavis-2.20190609-r1.ebuild 279 BLAKE2B 500e6bddef3eebba2fbe8687c0350aaca692a52c957a2d89e9dbc15cfed620fcb23be402bcb9221c071f02217af069e3b2c3c3138372fe0e7be39d035d1d7b72 SHA512 e1377d9002f4f497dd2c56abd36001e422ed94d9909e4d7983a2604dbd4687eab055bc9b4a503061c1b867ba7bb7288114a8565b8d85bef9554685e99daba27d
+EBUILD selinux-amavis-2.20200818-r1.ebuild 281 BLAKE2B ac8d1b34e968c0fbbee8739f5ce248cc6cac74ffcb73ab696f1be971fe0524009d83edf7d6eb33825b700de02fe9c93b0f6a7c7d9874b2fa19f1f2400d43126b SHA512 d54e2ccfa9c89a60716e5cc983c133de734db74a7dc786f8b63f4aeca6c7f42589c5eeaacda2e12e19382b36ad88a049f9daa0877de1bddcf9c613d3b12149b5
 EBUILD selinux-amavis-9999.ebuild 284 BLAKE2B 4f49a7a3b93d788bdc3ea9ca51d7e60beda6d12c4ca3237449955dae0a3581b93febc4cc4df44cf8702bd28c59420de54585430ef747989dac29f244cb88d31b SHA512 b9a4e96d5fe2f07de2fb27a20d4f2ca36078f0a71c91139041de26be1f83d0918125ecaa7f0b32370a9b744847049807c746b95652d67d6ac4d2e45918842547
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-amavis/selinux-amavis-2.20190609-r1.ebuild b/sec-policy/selinux-amavis/selinux-amavis-2.20190609-r1.ebuild
index 1bb9ac36180a..6630bc37efb3 100644
--- a/sec-policy/selinux-amavis/selinux-amavis-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-amavis/selinux-amavis-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-amavis/selinux-amavis-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..1bb9ac36180a
--- /dev/null
+++ b/sec-policy/selinux-amavis/selinux-amavis-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 b076b2ff845f..19cbba88992f 100644
--- a/sec-policy/selinux-android/Manifest
+++ b/sec-policy/selinux-android/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-android-2.20190201-r1.ebuild 430 BLAKE2B 39a1aab1387201c32d9892ab93ff2d887e3afaf85420e66014879e824fc05d53b2f37257c31137a3d358a4de560b35db616d22c991d574dce4abed48579ada74 SHA512 3106f5a1a336e2dc1e455e5f6c0456678bb3ac398072f0f118684db3a87958bd56736309866b2d3e7ebd8f752dc9923990249b1568d816477a6932632cbddbe5
-EBUILD selinux-android-2.20190609-r1.ebuild 432 BLAKE2B efdc02a739dd8dc2a7ae232709e4b816a1858ce74ad00630049f6eec6c94e2d64939f1f1f83f51b338e44defdaa766e0dadd6b9ec01c0b4a013a815299905789 SHA512 7518408c5591ced1e373795062897d27e1dbc514216cf8ef342b6d29e91418966b9f9ddbc6afe08aad4f2369d588f0e7df62fca27c5a85be7faf75a8e587b458
+EBUILD selinux-android-2.20190609-r1.ebuild 430 BLAKE2B 39a1aab1387201c32d9892ab93ff2d887e3afaf85420e66014879e824fc05d53b2f37257c31137a3d358a4de560b35db616d22c991d574dce4abed48579ada74 SHA512 3106f5a1a336e2dc1e455e5f6c0456678bb3ac398072f0f118684db3a87958bd56736309866b2d3e7ebd8f752dc9923990249b1568d816477a6932632cbddbe5
+EBUILD selinux-android-2.20200818-r1.ebuild 432 BLAKE2B efdc02a739dd8dc2a7ae232709e4b816a1858ce74ad00630049f6eec6c94e2d64939f1f1f83f51b338e44defdaa766e0dadd6b9ec01c0b4a013a815299905789 SHA512 7518408c5591ced1e373795062897d27e1dbc514216cf8ef342b6d29e91418966b9f9ddbc6afe08aad4f2369d588f0e7df62fca27c5a85be7faf75a8e587b458
 EBUILD selinux-android-9999.ebuild 435 BLAKE2B 25d20cfddb37edb18b743c7a8365e2190edb996a87f9e5b2c49b7082cfc0456a0bf651d181f1c36cb1cfd457ecb449732d4612f19eaa51d179a007cd2171db62 SHA512 dd9773515c7f8566f403f9e28817e634a4b9a560da71e3f1af8e498160b858bdccc948737a124a2598f1664f4eda4124f3f5969c16340aa01e0c65f370b97ee2
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-android/selinux-android-2.20190609-r1.ebuild b/sec-policy/selinux-android/selinux-android-2.20190609-r1.ebuild
index 8096d1741803..031c3d821d9c 100644
--- a/sec-policy/selinux-android/selinux-android-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-android/selinux-android-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-android/selinux-android-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..8096d1741803
--- /dev/null
+++ b/sec-policy/selinux-android/selinux-android-2.20200818-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 3079299ba8ef..6aeef6386062 100644
--- a/sec-policy/selinux-apache/Manifest
+++ b/sec-policy/selinux-apache/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-apache-2.20190201-r1.ebuild 379 BLAKE2B 36558ca470930505a64bcfa6c6235bf17d6cf438f359ca5ddd4a08722348dcb27850f124d25192a6038c06c4944b1de14994a744119bc07ed30318f0b7ab0cca SHA512 eb33fac406e22f4c5849b6c87562d8f6e30ad45c3a33c7f878f5df229510912d388dfa79342182764660fb4b7b3acf911c04887330a6cad4f0c97431db16d97f
-EBUILD selinux-apache-2.20190609-r1.ebuild 381 BLAKE2B f183cfb7d7edc44c9e8f08acea7a03b40c2bb838bf9013893f98cc86daba955fae6b0feb460c7aecdf011cec2e7bab852538d20b42bf8c241edfe383eccd1f76 SHA512 134f153c2d30c23e4a03c2e74cf314f10d8041e9cb8a2dbf43d3a9cffcda7671a866a944a092a464617f4f22f5b9f80c7b34269a3798ab9799f68a66ab04f927
+EBUILD selinux-apache-2.20190609-r1.ebuild 379 BLAKE2B 36558ca470930505a64bcfa6c6235bf17d6cf438f359ca5ddd4a08722348dcb27850f124d25192a6038c06c4944b1de14994a744119bc07ed30318f0b7ab0cca SHA512 eb33fac406e22f4c5849b6c87562d8f6e30ad45c3a33c7f878f5df229510912d388dfa79342182764660fb4b7b3acf911c04887330a6cad4f0c97431db16d97f
+EBUILD selinux-apache-2.20200818-r1.ebuild 381 BLAKE2B f183cfb7d7edc44c9e8f08acea7a03b40c2bb838bf9013893f98cc86daba955fae6b0feb460c7aecdf011cec2e7bab852538d20b42bf8c241edfe383eccd1f76 SHA512 134f153c2d30c23e4a03c2e74cf314f10d8041e9cb8a2dbf43d3a9cffcda7671a866a944a092a464617f4f22f5b9f80c7b34269a3798ab9799f68a66ab04f927
 EBUILD selinux-apache-9999.ebuild 384 BLAKE2B 3816bd97bbe6c21a2b931bd2434be9ff9e0e2e18a0f86460a9565018126cb174529496efedf793a21471462f51d875e0dff669c688516aa1547dbe87265f49df SHA512 7edaadb7c90f786051749b6f7823f692dbe4f2e29a763c49b10f80caf840a0af8a8d277fb5041a0510257332ff977850c736de1427ceb3717b1132f45ff53ef8
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-apache/selinux-apache-2.20190609-r1.ebuild b/sec-policy/selinux-apache/selinux-apache-2.20190609-r1.ebuild
index 757a65498659..a181b10df320 100644
--- a/sec-policy/selinux-apache/selinux-apache-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-apache/selinux-apache-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-apache/selinux-apache-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..757a65498659
--- /dev/null
+++ b/sec-policy/selinux-apache/selinux-apache-2.20200818-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 5f229220d52e..bc64116edea5 100644
--- a/sec-policy/selinux-apcupsd/Manifest
+++ b/sec-policy/selinux-apcupsd/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-apcupsd-2.20190201-r1.ebuild 377 BLAKE2B bb5075b0fc2e5aded13dcb5b9dd1c514acf49e6213fd66ef184290daad54bc1100c9dfba4674c55b09338bed71a4e4d3c515ee5916fc09e224812fa5ff5fdb0e SHA512 2d7ce7bef91f9fe9db6a623127ac003e84de5c530dede9df7b70805fcde2e20f25be0d11be0fbf1ce180e6f0443d56b6dbda38f322099cdfcaf090916d751194
-EBUILD selinux-apcupsd-2.20190609-r1.ebuild 379 BLAKE2B a65f3a50738e296932dda5faf14cc4d4d5ab08f1a1d5dbf3df479a9a0d711c8d6def04a8de59fbfd859f901bb3cab9277fef9d76c1879270b8f0075f816c3584 SHA512 129b0d912e2db5050b138fe60c60b8d1331ba8ea6c06717f6ee0aa365a2332d5dc2ac6fb87372098c4dcfa975aad38ffa47397841df6141c019116b171be0d6c
+EBUILD selinux-apcupsd-2.20190609-r1.ebuild 377 BLAKE2B bb5075b0fc2e5aded13dcb5b9dd1c514acf49e6213fd66ef184290daad54bc1100c9dfba4674c55b09338bed71a4e4d3c515ee5916fc09e224812fa5ff5fdb0e SHA512 2d7ce7bef91f9fe9db6a623127ac003e84de5c530dede9df7b70805fcde2e20f25be0d11be0fbf1ce180e6f0443d56b6dbda38f322099cdfcaf090916d751194
+EBUILD selinux-apcupsd-2.20200818-r1.ebuild 379 BLAKE2B a65f3a50738e296932dda5faf14cc4d4d5ab08f1a1d5dbf3df479a9a0d711c8d6def04a8de59fbfd859f901bb3cab9277fef9d76c1879270b8f0075f816c3584 SHA512 129b0d912e2db5050b138fe60c60b8d1331ba8ea6c06717f6ee0aa365a2332d5dc2ac6fb87372098c4dcfa975aad38ffa47397841df6141c019116b171be0d6c
 EBUILD selinux-apcupsd-9999.ebuild 382 BLAKE2B 78f29e8ae0186f95473521050a56c136b89a22ba462c8bff7d0d592484174588723ca6af4169662d27134a18205f23f6429037dd9ba7528d7a3450587f3f58f0 SHA512 a9090c93fa49e64393691c2599963d150e60566007836a68063cdc5b43ecc5d975935b971adda83f3afa4b29a2cd4628f83d4d2504aa4a04affb85d5834b674e
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20190609-r1.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20190609-r1.ebuild
index d8703e580df6..70059826e9b7 100644
--- a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..d8703e580df6
--- /dev/null
+++ b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20200818-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 047d66df2e31..543a641c4637 100644
--- a/sec-policy/selinux-apm/Manifest
+++ b/sec-policy/selinux-apm/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-apm-2.20190201-r1.ebuild 808 BLAKE2B c4f9ba1fc2f34b80cb11dc45f21239016573322eac5df244686a4e5ea6d015bdeab1946e31ff99ee16dd615fbf3db8ca6ac387b8d3e2f8c73e7c10cccff2e4ed SHA512 01209694444ee9adea602122901a37e90b93ada6c40e254a8e68de45ab12c410baca2eacbcbf84c8effa3329897aff765624b2df59807882042d96625168756a
-EBUILD selinux-apm-2.20190609-r1.ebuild 810 BLAKE2B 513b44fba06a110537e6637be7d8f629978c5b582690fb3dd558c78e42035ca52bb6ed7a81eecff4953695277c35ca68250e50363311f92087ec63d0033b9f0f SHA512 7c3fc20ad544e4eb4429c1bc8617499d6c641added7b5855fcc747bdb89172d54ecafe54669f9db8baf4f1ae3fcc2f35fd4a53442bf20eadcef82d9f25516cb4
+EBUILD selinux-apm-2.20190609-r1.ebuild 808 BLAKE2B c4f9ba1fc2f34b80cb11dc45f21239016573322eac5df244686a4e5ea6d015bdeab1946e31ff99ee16dd615fbf3db8ca6ac387b8d3e2f8c73e7c10cccff2e4ed SHA512 01209694444ee9adea602122901a37e90b93ada6c40e254a8e68de45ab12c410baca2eacbcbf84c8effa3329897aff765624b2df59807882042d96625168756a
+EBUILD selinux-apm-2.20200818-r1.ebuild 810 BLAKE2B 513b44fba06a110537e6637be7d8f629978c5b582690fb3dd558c78e42035ca52bb6ed7a81eecff4953695277c35ca68250e50363311f92087ec63d0033b9f0f SHA512 7c3fc20ad544e4eb4429c1bc8617499d6c641added7b5855fcc747bdb89172d54ecafe54669f9db8baf4f1ae3fcc2f35fd4a53442bf20eadcef82d9f25516cb4
 EBUILD selinux-apm-9999.ebuild 813 BLAKE2B 02d4357122907b444873e6702f258db294a21f625aa35f2473d128cb7c026fe59058c5adbb76f03a2e89f5001e417669ab46ebc43ccad7647d282714026c8caf SHA512 5f16b6ff30e52a22050cf332487315598ec0830390a696bdc90e234d762c3686178aaeef3ed69768d5a4ac6e40346feccda31cc5b544970408ebb795502237ae
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-apm/selinux-apm-2.20190609-r1.ebuild b/sec-policy/selinux-apm/selinux-apm-2.20190609-r1.ebuild
index aa9a5b46b1c6..ae55fff8b58d 100644
--- a/sec-policy/selinux-apm/selinux-apm-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-apm/selinux-apm-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-apm/selinux-apm-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..aa9a5b46b1c6
--- /dev/null
+++ b/sec-policy/selinux-apm/selinux-apm-2.20200818-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 f66fbea9741d..fd057befbed7 100644
--- a/sec-policy/selinux-arpwatch/Manifest
+++ b/sec-policy/selinux-arpwatch/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-arpwatch-2.20190201-r1.ebuild 283 BLAKE2B 9d19ad02c822a4d6e5d85cb2023731f782765325731d0afa634878b807aa57b5dfeefe2181502c30b5ae71e79a1cf5214acfb8f444a2024ac240c54630a9f93b SHA512 6b2af7001ee854372e4cdd4896067141568584b7649caca6094e79a65967465c6cb231c80b5c3dfe415f900613a18aeeac4d82cceea9490451f2c7878c7822ec
-EBUILD selinux-arpwatch-2.20190609-r1.ebuild 285 BLAKE2B 5a436d2367e816acac8f1f9759354e6f8714b35d6684b17bc78568a89a7076c33aea14aaf7282d90da85e2f8ff89ff903f717a65e9890b8dd597a564fdd5d61c SHA512 8ef8a511399f9613471768f7c9143954e012f949dd977a1e2a0863ac02e94e98b007c7ad97fc0e90b334d5596fad8dd7ed024328a72f074ede4706da10640d31
+EBUILD selinux-arpwatch-2.20190609-r1.ebuild 283 BLAKE2B 9d19ad02c822a4d6e5d85cb2023731f782765325731d0afa634878b807aa57b5dfeefe2181502c30b5ae71e79a1cf5214acfb8f444a2024ac240c54630a9f93b SHA512 6b2af7001ee854372e4cdd4896067141568584b7649caca6094e79a65967465c6cb231c80b5c3dfe415f900613a18aeeac4d82cceea9490451f2c7878c7822ec
+EBUILD selinux-arpwatch-2.20200818-r1.ebuild 285 BLAKE2B 5a436d2367e816acac8f1f9759354e6f8714b35d6684b17bc78568a89a7076c33aea14aaf7282d90da85e2f8ff89ff903f717a65e9890b8dd597a564fdd5d61c SHA512 8ef8a511399f9613471768f7c9143954e012f949dd977a1e2a0863ac02e94e98b007c7ad97fc0e90b334d5596fad8dd7ed024328a72f074ede4706da10640d31
 EBUILD selinux-arpwatch-9999.ebuild 288 BLAKE2B ecbddc7bd83d09508c97ba4f69b2aaa3b034ab89acb5259f1418a472fdf8358cb4931d3708b07d063e3379fb444db0b758ccd4d344e39ad11f9c8ad4207b0e20 SHA512 1cff0f6c2c75d957b774a3235fce6a5ace7a34273f808d394d6b01b2c37b72287ef5224d44e71c64d19a05594e428c230bb3e9c577a2e9a8825b524088188a3a
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20190609-r1.ebuild b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20190609-r1.ebuild
index f1f7ea5c32cc..9bb3a3a5c47d 100644
--- a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..f1f7ea5c32cc
--- /dev/null
+++ b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 e5da7f5ea14c..f6eabe61eb96 100644
--- a/sec-policy/selinux-asterisk/Manifest
+++ b/sec-policy/selinux-asterisk/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-asterisk-2.20190201-r1.ebuild 283 BLAKE2B 93b625c04e045d6b0e5abb4936ec00dcc712ecfa744cf08c98b4212a0d0076a1af05525d7aea7c98da6f51372e5f8475f92b91b45a6e9e9ff6da8b9b5acac819 SHA512 b4b7915b3b0061b73c0a7873502a9ba7157473073a4efe98e74314f17fe28d5a623a31ecafa2bac7affdf0ea178518e5583f93bb62a743c2ce065e42f810fd16
-EBUILD selinux-asterisk-2.20190609-r1.ebuild 285 BLAKE2B 11e4887af431c55b4d50378eba5fb3e1655483c317b5bb83839b985f7040cfc8d729db5b06db223518327e47dd3cea745b1dc52866ed57c8def03813db41f1e5 SHA512 1a8913b206060f0e01d128d9d697f93ee27aed8756a026c58c61784702d3e59c8e0b8edde82d5ba3e16a145a05e44308c9924aac23f4c770ff4cef63d11ae693
+EBUILD selinux-asterisk-2.20190609-r1.ebuild 283 BLAKE2B 93b625c04e045d6b0e5abb4936ec00dcc712ecfa744cf08c98b4212a0d0076a1af05525d7aea7c98da6f51372e5f8475f92b91b45a6e9e9ff6da8b9b5acac819 SHA512 b4b7915b3b0061b73c0a7873502a9ba7157473073a4efe98e74314f17fe28d5a623a31ecafa2bac7affdf0ea178518e5583f93bb62a743c2ce065e42f810fd16
+EBUILD selinux-asterisk-2.20200818-r1.ebuild 285 BLAKE2B 11e4887af431c55b4d50378eba5fb3e1655483c317b5bb83839b985f7040cfc8d729db5b06db223518327e47dd3cea745b1dc52866ed57c8def03813db41f1e5 SHA512 1a8913b206060f0e01d128d9d697f93ee27aed8756a026c58c61784702d3e59c8e0b8edde82d5ba3e16a145a05e44308c9924aac23f4c770ff4cef63d11ae693
 EBUILD selinux-asterisk-9999.ebuild 288 BLAKE2B 9ed889d209f1abc2d1881758fbae06b1f57b01e16437fa485f0ea4f0c0d4e56a15820b4f17bccd7fd39457ccf14a37ad6257ec59f8eabeb1d8c9a7d6bd8ef23c SHA512 f4390b053bd01a1473fc37d1d191140ccc798bac910994b45f8b35c51a6b99510b6014b21706f2cf65fe8c5dcd1c32e5f39f96bbe05b724cdc4c4c560a0c8a57
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-asterisk/selinux-asterisk-2.20190609-r1.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-2.20190609-r1.ebuild
index 21768ddff004..cf9c32649ff8 100644
--- a/sec-policy/selinux-asterisk/selinux-asterisk-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-asterisk/selinux-asterisk-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..21768ddff004
--- /dev/null
+++ b/sec-policy/selinux-asterisk/selinux-asterisk-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 03733abc6ff8..3b87e6d92beb 100644
--- a/sec-policy/selinux-at/Manifest
+++ b/sec-policy/selinux-at/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-at-2.20190201-r1.ebuild 271 BLAKE2B f3661f959b87fa726519c25fdc8c65e34d731256d31f73d7b623dacdee32a8ff5a17f781d63ed185d8ae9a152ec7edad2cd4ac00dc6d53e19af08f34e711a5b5 SHA512 1cf3770b458decb3117d041cc3515cc247d904523e6800c39bd978226129e2de43505e467c310338c5c053d2d781ef7a06ae843887d1d4d3c23b0fb6d5253fbf
-EBUILD selinux-at-2.20190609-r1.ebuild 273 BLAKE2B 199981d2d3e468c06c9a29c00871ce22bc8208842688966640bdec7d4f1fde113cbdbaf4d4300b23182bdf8f78ef38ed3cff6afb46941c0ce0640addc96d8f00 SHA512 3005ab546f0ed220323274302ee1d13be79f38e0d926bf4265e40517279669a96bc104345653c17ebb83927fd85d5a190a4d3357116f2281025be4a0eb98338c
+EBUILD selinux-at-2.20190609-r1.ebuild 271 BLAKE2B f3661f959b87fa726519c25fdc8c65e34d731256d31f73d7b623dacdee32a8ff5a17f781d63ed185d8ae9a152ec7edad2cd4ac00dc6d53e19af08f34e711a5b5 SHA512 1cf3770b458decb3117d041cc3515cc247d904523e6800c39bd978226129e2de43505e467c310338c5c053d2d781ef7a06ae843887d1d4d3c23b0fb6d5253fbf
+EBUILD selinux-at-2.20200818-r1.ebuild 273 BLAKE2B 199981d2d3e468c06c9a29c00871ce22bc8208842688966640bdec7d4f1fde113cbdbaf4d4300b23182bdf8f78ef38ed3cff6afb46941c0ce0640addc96d8f00 SHA512 3005ab546f0ed220323274302ee1d13be79f38e0d926bf4265e40517279669a96bc104345653c17ebb83927fd85d5a190a4d3357116f2281025be4a0eb98338c
 EBUILD selinux-at-9999.ebuild 276 BLAKE2B 7d059ddf4fb6f79709b46e844c46d5a3e305c1516ec170553800cbe1ca5469f65bdb3b3992a08ee5834f0e5ccff0a9b6e554e119570d85565351d4ba1039461e SHA512 50810d8f6729a4bda774a412ac65dc783070804c02d8556a07b491a0c70f0d4b18cae7d1bf4ebd381d29b3ee96cef25125f63bddfee2caa7e998ba1487e9bf7e
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-at/selinux-at-2.20190609-r1.ebuild b/sec-policy/selinux-at/selinux-at-2.20190609-r1.ebuild
index 596fa923eeca..c049f8c29d02 100644
--- a/sec-policy/selinux-at/selinux-at-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-at/selinux-at-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-at/selinux-at-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..596fa923eeca
--- /dev/null
+++ b/sec-policy/selinux-at/selinux-at-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 68aeeb5a7019..d332b846e29f 100644
--- a/sec-policy/selinux-automount/Manifest
+++ b/sec-policy/selinux-automount/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-automount-2.20190201-r1.ebuild 285 BLAKE2B 3d1c9921d4bedd2489f52b85588ed5d8767eec537c194c1cff37e4b2ae6e601024108d6871f6f844a2920cc15626f76532c67ac4a8122f876cc3db4ea3efc1cf SHA512 2c3e5576601740933d185f51c4fb12e06666412ef86c1f9b453b4e9d62bce18e193b1b851214b2cdf949d558bfdc60b89c098268140758b4ad68456c3d447021
-EBUILD selinux-automount-2.20190609-r1.ebuild 287 BLAKE2B 55c1a4bfcff3009adc170b000b38dcf32bc0c300b419495134bf7ebc0ebf2f7388d59eaa18f208a1cd4117fa9844be78cec1e7f53d12f60852c66851d9a2f811 SHA512 19a3c301506685196794930314ce7cd5bb3fd148079fe938f3797105e87adf1328d69464ec3a332536a4c112503c8ec38cd8e6c1cdc264479b7ccd31082263d5
+EBUILD selinux-automount-2.20190609-r1.ebuild 285 BLAKE2B 3d1c9921d4bedd2489f52b85588ed5d8767eec537c194c1cff37e4b2ae6e601024108d6871f6f844a2920cc15626f76532c67ac4a8122f876cc3db4ea3efc1cf SHA512 2c3e5576601740933d185f51c4fb12e06666412ef86c1f9b453b4e9d62bce18e193b1b851214b2cdf949d558bfdc60b89c098268140758b4ad68456c3d447021
+EBUILD selinux-automount-2.20200818-r1.ebuild 287 BLAKE2B 55c1a4bfcff3009adc170b000b38dcf32bc0c300b419495134bf7ebc0ebf2f7388d59eaa18f208a1cd4117fa9844be78cec1e7f53d12f60852c66851d9a2f811 SHA512 19a3c301506685196794930314ce7cd5bb3fd148079fe938f3797105e87adf1328d69464ec3a332536a4c112503c8ec38cd8e6c1cdc264479b7ccd31082263d5
 EBUILD selinux-automount-9999.ebuild 290 BLAKE2B 8e0ca09e38d11531a12ec539f63f3c7f97d2a78cb2b34a9ca9e9274ba6cb4ea30e8fa374a3b92ef7cc68e4eda88db37f7447dbb8ab5f75325a2c38625e11a122 SHA512 e6698bdd64c90c4417a036aad361611231bcbcdb556a3f3b09e14a8ba5568fd03fb7972e47e9057ba1d9e2fd701696bb22d5042ec836b68e6853cf176ffa1a36
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-automount/selinux-automount-2.20190609-r1.ebuild b/sec-policy/selinux-automount/selinux-automount-2.20190609-r1.ebuild
index 567a4b107d17..d7aaf7012db4 100644
--- a/sec-policy/selinux-automount/selinux-automount-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-automount/selinux-automount-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-automount/selinux-automount-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..567a4b107d17
--- /dev/null
+++ b/sec-policy/selinux-automount/selinux-automount-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 41be952bd381..06360cf4aec1 100644
--- a/sec-policy/selinux-avahi/Manifest
+++ b/sec-policy/selinux-avahi/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-avahi-2.20190201-r1.ebuild 277 BLAKE2B d48491fb1fd3ada5a956c422de2f2ee96356c771da92dc7ff1b2c3b26b5761a6bea25b558c5dc6714a265f17fd5551429421480cd7bb38ecb19a08d931ef5380 SHA512 2c36ce70351544e3ec3b411d165240004425a1d1415607208091558fbb5ec0a9ab3e9292f5c6d173c7c33059a29b14433f3d1f6ffcddab7a2ff178068f1a5fa8
-EBUILD selinux-avahi-2.20190609-r1.ebuild 279 BLAKE2B e9bfbb8642a5d051af7cf64d66fc027e9e1cfbb84212f2fb1cf2d4e65ee47285c5b4b983c81bd1fb1273cde2f4df3af62c47c8d1c5609d06a6a0b83c0f1438a5 SHA512 986b5846239b1ed30f35e1c30a01ff8be2b0a5fa35d837be2f6275aa931e5edc98d76f3f0e390ba8a156f79c59f82eeebd7241eff5754d01df1e199dd88f529d
+EBUILD selinux-avahi-2.20190609-r1.ebuild 277 BLAKE2B d48491fb1fd3ada5a956c422de2f2ee96356c771da92dc7ff1b2c3b26b5761a6bea25b558c5dc6714a265f17fd5551429421480cd7bb38ecb19a08d931ef5380 SHA512 2c36ce70351544e3ec3b411d165240004425a1d1415607208091558fbb5ec0a9ab3e9292f5c6d173c7c33059a29b14433f3d1f6ffcddab7a2ff178068f1a5fa8
+EBUILD selinux-avahi-2.20200818-r1.ebuild 279 BLAKE2B e9bfbb8642a5d051af7cf64d66fc027e9e1cfbb84212f2fb1cf2d4e65ee47285c5b4b983c81bd1fb1273cde2f4df3af62c47c8d1c5609d06a6a0b83c0f1438a5 SHA512 986b5846239b1ed30f35e1c30a01ff8be2b0a5fa35d837be2f6275aa931e5edc98d76f3f0e390ba8a156f79c59f82eeebd7241eff5754d01df1e199dd88f529d
 EBUILD selinux-avahi-9999.ebuild 282 BLAKE2B 15fde30d17dae5d6ed03fa84410888197fca1fa8f5a9f7671b3d8ef9164b0153b70c0e87158536c27385def6817b822db73b5433ec5f2165f20d263a2b400b7e SHA512 fc4760a095c7c5b46854b73c8f188d195683baa75f6d479392cb4f954e73bd20a53999d88ed0a0142b26ad28fd7fef4990b8569bb8b9840c1916f708cba616a5
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-avahi/selinux-avahi-2.20190609-r1.ebuild b/sec-policy/selinux-avahi/selinux-avahi-2.20190609-r1.ebuild
index e4ef6f2e6953..603ed81d8360 100644
--- a/sec-policy/selinux-avahi/selinux-avahi-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-avahi/selinux-avahi-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-avahi/selinux-avahi-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..e4ef6f2e6953
--- /dev/null
+++ b/sec-policy/selinux-avahi/selinux-avahi-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 43c1852ee6dc..d647c85716a3 100644
--- a/sec-policy/selinux-awstats/Manifest
+++ b/sec-policy/selinux-awstats/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-awstats-2.20190201-r1.ebuild 377 BLAKE2B 3d4a5f5d6e48db884a4d596405b1abfd01faea79004468d33999d896a63d89ef375b10abd7f5e0620f87120e5c158667c1f0e819cc53fb90b6b95dc2f19aad7b SHA512 126be7bf7977438ad5f73bba0863eb20eff1196efe80ced56c0ecd80c6da9bfd65fcc23425d17a6dba2d87b126b15853440cd0a608c099557bb90a5b6a8f5a36
-EBUILD selinux-awstats-2.20190609-r1.ebuild 379 BLAKE2B 3caef8ead01db411c45171f0c864ae53805dd0380d4485b3b9467e54e4453b840726182873248663f2a27d944e2c55b73a863e9606231a459d3c54e18714fbd6 SHA512 1d33c442e16cdd30a03d1ca7622725b316c95f59e5000415385197e7932c481b6db9f176456870682bb7f162d3d5d6dc523889a06bcaa64f0f8f6187cb0bb14b
+EBUILD selinux-awstats-2.20190609-r1.ebuild 377 BLAKE2B 3d4a5f5d6e48db884a4d596405b1abfd01faea79004468d33999d896a63d89ef375b10abd7f5e0620f87120e5c158667c1f0e819cc53fb90b6b95dc2f19aad7b SHA512 126be7bf7977438ad5f73bba0863eb20eff1196efe80ced56c0ecd80c6da9bfd65fcc23425d17a6dba2d87b126b15853440cd0a608c099557bb90a5b6a8f5a36
+EBUILD selinux-awstats-2.20200818-r1.ebuild 379 BLAKE2B 3caef8ead01db411c45171f0c864ae53805dd0380d4485b3b9467e54e4453b840726182873248663f2a27d944e2c55b73a863e9606231a459d3c54e18714fbd6 SHA512 1d33c442e16cdd30a03d1ca7622725b316c95f59e5000415385197e7932c481b6db9f176456870682bb7f162d3d5d6dc523889a06bcaa64f0f8f6187cb0bb14b
 EBUILD selinux-awstats-9999.ebuild 382 BLAKE2B f2e6e3ed4a1ede3492b756aa511a0aec8c0d84d544c1d0a5350b6d354d05222ab9aaf6572cd024945c43ed91a574f342a39ff65cbd294958193457c2e2161f42 SHA512 57e72771158f81e0cf3f32dbe1b5bfee9c11ac7b0e44fff23cae384972816128e745978c7492e8f5e5557497fcb27aa3f5f0b66df8c5c28729da92fb5b23b03c
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-awstats/selinux-awstats-2.20190609-r1.ebuild b/sec-policy/selinux-awstats/selinux-awstats-2.20190609-r1.ebuild
index e0d395e69c01..04f221885692 100644
--- a/sec-policy/selinux-awstats/selinux-awstats-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-awstats/selinux-awstats-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-awstats/selinux-awstats-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..e0d395e69c01
--- /dev/null
+++ b/sec-policy/selinux-awstats/selinux-awstats-2.20200818-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 62a0573ad466..c0dc0d778196 100644
--- a/sec-policy/selinux-backup/Manifest
+++ b/sec-policy/selinux-backup/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-backup-2.20190201-r1.ebuild 292 BLAKE2B 42e280b68026e2adc49ca0a8636a001c5255cdd7be6528ae03985a58a1ae5263ded8949ac004170b12ea4ba427bbc3f67aca8b8e246227ba604337e4de355c33 SHA512 a11da8d59f5b21bb7aa276dae15aaf8c36788ab08a2829755ed81b861f789f42098390ab8314829f8ef6ce6ab64ba82734d3c310a6396ed672f2fec6bbda4552
-EBUILD selinux-backup-2.20190609-r1.ebuild 294 BLAKE2B 4e02c0c82bfc9062eb486c9c61e2374911734d8d4b796dd49e98e46f0f53bdcfed5d03468ec2ef3aec4090f27b6582eeaf85c3578ea7311976daa2abfce541ac SHA512 a70ee8947bddf4296fc88f2b71b0239b1fbd67c1a1c4b32dec613ea3e6140712f7f4b1c877cd17efd18f685554da7ef5c05df234ae0dbf093ed1608974b5c041
+EBUILD selinux-backup-2.20190609-r1.ebuild 292 BLAKE2B 42e280b68026e2adc49ca0a8636a001c5255cdd7be6528ae03985a58a1ae5263ded8949ac004170b12ea4ba427bbc3f67aca8b8e246227ba604337e4de355c33 SHA512 a11da8d59f5b21bb7aa276dae15aaf8c36788ab08a2829755ed81b861f789f42098390ab8314829f8ef6ce6ab64ba82734d3c310a6396ed672f2fec6bbda4552
+EBUILD selinux-backup-2.20200818-r1.ebuild 294 BLAKE2B 4e02c0c82bfc9062eb486c9c61e2374911734d8d4b796dd49e98e46f0f53bdcfed5d03468ec2ef3aec4090f27b6582eeaf85c3578ea7311976daa2abfce541ac SHA512 a70ee8947bddf4296fc88f2b71b0239b1fbd67c1a1c4b32dec613ea3e6140712f7f4b1c877cd17efd18f685554da7ef5c05df234ae0dbf093ed1608974b5c041
 EBUILD selinux-backup-9999.ebuild 297 BLAKE2B abdf74e2c6f99d4e6bc8baaf68858997e0be0316be41d65ad857561c3900ad9bee6f3f3be21a8997470a3d7d74d71c868bc700033118f98189410becedf7bb81 SHA512 be818d490f55c88df363fa3bee02f71fcf88815284998f91f08cc5d81d80f3982ed60c74dc856f76cfde51837a13962bf28fcd6f2d310d48fe6ec122d088265c
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-backup/selinux-backup-2.20190609-r1.ebuild b/sec-policy/selinux-backup/selinux-backup-2.20190609-r1.ebuild
index a6a25303d7fe..296374891d75 100644
--- a/sec-policy/selinux-backup/selinux-backup-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-backup/selinux-backup-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-backup/selinux-backup-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..a6a25303d7fe
--- /dev/null
+++ b/sec-policy/selinux-backup/selinux-backup-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 b2e98503728c..3fa7ceac924d 100644
--- a/sec-policy/selinux-bacula/Manifest
+++ b/sec-policy/selinux-bacula/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-bacula-2.20190201-r1.ebuild 279 BLAKE2B ccf7096c37cd959aed23da04f857a165f4aac8ce0c7c680ce026fac8c099d74f6572c586caebcdb7453d62f7ea036e0ce136596133f85f287650a6c15fb33d55 SHA512 fcdb5421f3500eb3bdd46ceef56b0745e104e09e7c5306d12828f3cbb2a218fcbb315c7acab6a7703326f37c3b2b43018bbd8902fb488bac360ea4c79f7ed0b2
-EBUILD selinux-bacula-2.20190609-r1.ebuild 281 BLAKE2B d68f56a2e3865c99f2c2f4eda0efc0ae9161efa33a50305a56a9bfae0cbbbeb02356a227b38c0b204b6f09d46984701dfaa99be11cd8de36828dabb0ea41d695 SHA512 13f56ef4725b7bb5b3548e4866e70e47578457badb388c4f373cb30baa804211256ff104559ebe5a3272a715831d8ac7e0f5765f9249de43e79be6e805e170a2
+EBUILD selinux-bacula-2.20190609-r1.ebuild 279 BLAKE2B ccf7096c37cd959aed23da04f857a165f4aac8ce0c7c680ce026fac8c099d74f6572c586caebcdb7453d62f7ea036e0ce136596133f85f287650a6c15fb33d55 SHA512 fcdb5421f3500eb3bdd46ceef56b0745e104e09e7c5306d12828f3cbb2a218fcbb315c7acab6a7703326f37c3b2b43018bbd8902fb488bac360ea4c79f7ed0b2
+EBUILD selinux-bacula-2.20200818-r1.ebuild 281 BLAKE2B d68f56a2e3865c99f2c2f4eda0efc0ae9161efa33a50305a56a9bfae0cbbbeb02356a227b38c0b204b6f09d46984701dfaa99be11cd8de36828dabb0ea41d695 SHA512 13f56ef4725b7bb5b3548e4866e70e47578457badb388c4f373cb30baa804211256ff104559ebe5a3272a715831d8ac7e0f5765f9249de43e79be6e805e170a2
 EBUILD selinux-bacula-9999.ebuild 284 BLAKE2B 78a6c7976a1617be11792aa0fa09eda7c65168be046b60c93418a6272ab4fbedacc715315b3235446c0c104fef99385a827d9ace6fc4bf38a999ea7dabdf3761 SHA512 dab0a32bac3b2bb677edff56e78c70b6726f733e458b981293097bafead8d763ec1009774f7aa6024e55bf372bae5eaaa96bb7dab2c9247dfb2e63dbce4182fb
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-bacula/selinux-bacula-2.20190609-r1.ebuild b/sec-policy/selinux-bacula/selinux-bacula-2.20190609-r1.ebuild
index b841a4f7fea6..a5a4b9617c7a 100644
--- a/sec-policy/selinux-bacula/selinux-bacula-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-bacula/selinux-bacula-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-bacula/selinux-bacula-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..b841a4f7fea6
--- /dev/null
+++ b/sec-policy/selinux-bacula/selinux-bacula-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 bb934ada255f..0d1b10d66e92 100644
--- a/sec-policy/selinux-base-policy/Manifest
+++ b/sec-policy/selinux-base-policy/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-base-policy-2.20190201-r1.ebuild 3876 BLAKE2B 3fdf86914afa4ea4851b7a61011589e4f1fb2c20775ee260bdce26c3197ab9b1ad97c871a58c1ff7704f9ca23609def48f802167f1238773f9a2c4daab0e2b07 SHA512 03f531f3ce9d7646b9101a159cb96a091011a5a9215491ecc7fcadf7412814e30abb285de3939c7f0584232b540f61b9a1e3ebefbf228f5713da5de9ed9a553f
-EBUILD selinux-base-policy-2.20190609-r1.ebuild 3818 BLAKE2B 78071157fd3f922bbd200d84027dfaefa39b66a0b294753027694183fec9adb45fa5faab31784432255cf12d767a01e2217a2e04950105e7a60d0a01d200f75f SHA512 a76925a23a78c805f3b21263dd80d3569deb10b82d8d86a67a617d83090984300447249bbf313999657bea180c58d833474b20b3e57c650abb4fd8365d9fde5a
+EBUILD selinux-base-policy-2.20190609-r1.ebuild 3816 BLAKE2B a52fb08dc3d36042f251afe98c7894b955c3160890eb4eb84f0b69428a90b05d764b7b1ef12315cea44d5b00617b5747303872e906f67e68c28945cf48197d48 SHA512 cf062f6526826c9b7225ef3c8fe0a3b74da3905b35ba0a174328de422cfc383fbb6831dcbded65f876a956d66523bab39c89f5e23c7a5f80eebc5067ce72a550
+EBUILD selinux-base-policy-2.20200818-r1.ebuild 3818 BLAKE2B 78071157fd3f922bbd200d84027dfaefa39b66a0b294753027694183fec9adb45fa5faab31784432255cf12d767a01e2217a2e04950105e7a60d0a01d200f75f SHA512 a76925a23a78c805f3b21263dd80d3569deb10b82d8d86a67a617d83090984300447249bbf313999657bea180c58d833474b20b3e57c650abb4fd8365d9fde5a
 EBUILD selinux-base-policy-9999.ebuild 3818 BLAKE2B e5c0dbf7326cfb52fb95951c7ec7ad29a09c0604f2106198c63d182923157933590c97f70b993b77810e83d67dc667d8cf12d46450f3548629abfd3fe0a88d6b SHA512 ed99b8042b5b16247d4cd2bc02d8f3a6ee13a3fd1ca16d5500b6ba3df56d9d20d1cbd82add3e280c4cd4c27216ec794690af645e14ed6e0af0cf9a70aa983a95
 MISC metadata.xml 534 BLAKE2B 1bb289204431150ae974c9fd677926faf72e75def3294b9df405a048e398ac3b6147de8483512487edaeea378e1dbd32df0675acb7fa50326c48382603c5dbfe SHA512 d8340bec9d0ec0feb396b17b53a6d53e3caa7ddd1efdc5e5de07baf86592ad0526d08fc08908295cf18a915eef1c7429c72970d56967162b2390eed6f28c822a
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20190609-r1.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20190609-r1.ebuild
index 2cf75e0c5f40..3bfca9781cb9 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..2cf75e0c5f40
--- /dev/null
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20200818-r1.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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"
+
+MODS="application authlogin bootloader clock consoletype cron dmesg fstools getty hostname hotplug 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"
+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 ${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="${ROOT%/}"/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}
+	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 ebf25d4753a8..0507485dbf21 100644
--- a/sec-policy/selinux-base/Manifest
+++ b/sec-policy/selinux-base/Manifest
@@ -2,9 +2,12 @@ AUX config 631 BLAKE2B 7c7c5ad7e2349cf8dd6877bba7947f256b6bdee492ef76a44ac378eaf
 AUX selinux.conf 119 BLAKE2B c877aec601cfc066b42493a3b45e179834d30b7f0eb34b625f3758795c2fd2e58744cf539fdb5b06c002365fb264bdf6e953c1f6e30c7b2d310e22206ea5a37f SHA512 a057f84388b2b494b5e7623b076450c1856687c50a4ccb5aa22215748461786a0c71fdd9f76e9ed8639bcd3040006fb010aa5497192d6c0cab432a1b9c028b3b
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
-EBUILD selinux-base-2.20190201-r1.ebuild 4129 BLAKE2B 6a757ed06800b462aac3fdd0343732ee2fd88e45b6c0557187686bb18fb9f296e4159de52e77d440c1f2278e8945de456800918315a492e8d0679189c24877ad SHA512 eb9b30d65d98828c751c16c42f756a7f946a8b2b73e7cfdc0272409d59121a135678a593ad181756747b58db67a5096ac72c79bbe212a2a6c2ee587ae00998ac
-EBUILD selinux-base-2.20190609-r1.ebuild 4164 BLAKE2B 18880e11e2deb3ac150ffc09aa273ac2cc51da775c45f25ec8820a5439dbdd0e2b0c2e3acbed5c21c6d3b6246ebeaf56d78f0e1b8390e9e6f86b63afccc7a844 SHA512 1d3b09ab0b7ae019772d781ec632bb54fb67b691256a8d15eaa95eab21afe55f427b5897d2bdd6951bb84c1826f8d71a08d3567783fd800e15794f72eea782c3
-EBUILD selinux-base-9999.ebuild 4164 BLAKE2B e778e6f3924e97996d0dbfd1ff3ce4ce1ad006e6e82ca52562092f83349f1d8dee29b477c10e5256fcb1233ddebe10b19e4eca2e583f47d904caf63585e77e6e SHA512 28d2d7f5baf51c833ec008e92626a65fb3fa5e9b27f43875423497090859ee9e5afe45ac0ec9df6debbcc347aaf45097c1d368eff0f2e2325a8d6345d69345f7
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
+EBUILD selinux-base-2.20190201-r1.ebuild 4115 BLAKE2B e8aae442032d9bf13d7b731429a7509787ce473a624877e70cc533522e0f4e2f296a546280f0d3f1fd882186e57e990be5c74ae6fc2548b20f533f5cf39aacef SHA512 583881aeedce6e61f83678f64eb99e5779291436651bd4d8b74f16e7a4741915da48bf5e71eee34fab0aca3124864ff3dc763b9938acb64b4022c0ca0807301b
+EBUILD selinux-base-2.20190609-r1.ebuild 4148 BLAKE2B 4612b1f194d7635b8bf29c60f177ae4bec921b6ba5648d4d7ec0bdd322f3179cd4037d56d4f75857f80bfc9ae2f2362ab5b15ea300d015cc73c30834eb505bf9 SHA512 7c23345cb1dfb2b4206f05e5ce443fcd3ffba033ce14f9c176262b9f2a771cfab6a2c5bbb22a88809b650017f21fb6b858bd9709220320df0d2adf25c0a1a673
+EBUILD selinux-base-2.20200818-r1.ebuild 4150 BLAKE2B c557086ca49ab14a940f5b5e13b18cbbb827b3a914efe9959084d813acf8a3724f7f70a04f88b363f4a803e2886a8274b1cb0f380124565b34dff523d5a0a56a SHA512 ee0235f92adcf10fd5451d13df6be53174dbc7e84140e566e1ab9df2fec5c6f4bd1c712505e4fa4e7c374443aeb3a28f2fc3c55cd4b49ecc20626e4635ce25d3
+EBUILD selinux-base-9999.ebuild 4150 BLAKE2B c557086ca49ab14a940f5b5e13b18cbbb827b3a914efe9959084d813acf8a3724f7f70a04f88b363f4a803e2886a8274b1cb0f380124565b34dff523d5a0a56a SHA512 ee0235f92adcf10fd5451d13df6be53174dbc7e84140e566e1ab9df2fec5c6f4bd1c712505e4fa4e7c374443aeb3a28f2fc3c55cd4b49ecc20626e4635ce25d3
 MISC metadata.xml 967 BLAKE2B 1d3313048964e8b84c6386c24682735ba255897021b5d9df9739a4852864e092c6c8a42c86b91962274c22764661ff5f4f8c0c34edfbf52abe6ae8583f15fcdd SHA512 fc513a530a30b8114a5b9c02862939a4cdd2e123f370292bdc0399b161afdf4843f53c2a15b4bd505d2111496fc6354a54c408c9022137086a33385e5fa99541
diff --git a/sec-policy/selinux-base/selinux-base-2.20190201-r1.ebuild b/sec-policy/selinux-base/selinux-base-2.20190201-r1.ebuild
index c172a8fdb9bd..818af8e1c44d 100644
--- a/sec-policy/selinux-base/selinux-base-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-base/selinux-base-2.20190201-r1.ebuild
@@ -23,8 +23,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux"
 LICENSE="GPL-2"
 SLOT="0"
 
-RDEPEND=">=sys-apps/policycoreutils-2.8
-	virtual/udev"
+RDEPEND=">=sys-apps/policycoreutils-2.8"
 DEPEND="${RDEPEND}
 	sys-devel/m4
 	>=sys-apps/checkpolicy-2.8"
diff --git a/sec-policy/selinux-base/selinux-base-2.20190609-r1.ebuild b/sec-policy/selinux-base/selinux-base-2.20190609-r1.ebuild
index bb95a29ae659..c11baced5560 100644
--- a/sec-policy/selinux-base/selinux-base-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-base/selinux-base-2.20190609-r1.ebuild
@@ -13,7 +13,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"
@@ -23,8 +23,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux"
 LICENSE="GPL-2"
 SLOT="0"
 
-RDEPEND=">=sys-apps/policycoreutils-2.8
-	virtual/udev"
+RDEPEND=">=sys-apps/policycoreutils-2.8"
 DEPEND="${RDEPEND}
 	sys-devel/m4
 	>=sys-apps/checkpolicy-2.8"
diff --git a/sec-policy/selinux-base/selinux-base-2.20200818-r1.ebuild b/sec-policy/selinux-base/selinux-base-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..a16000f98026
--- /dev/null
+++ b/sec-policy/selinux-base/selinux-base-2.20200818-r1.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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}
+	sys-devel/m4
+	>=sys-apps/checkpolicy-2.8"
+
+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
+
+		#cp "${FILESDIR}/modules-2.20120215.conf" "${S}/${i}/policy/modules.conf"
+		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-base/selinux-base-9999.ebuild b/sec-policy/selinux-base/selinux-base-9999.ebuild
index 5342853efec5..a16000f98026 100644
--- a/sec-policy/selinux-base/selinux-base-9999.ebuild
+++ b/sec-policy/selinux-base/selinux-base-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -23,8 +23,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux"
 LICENSE="GPL-2"
 SLOT="0"
 
-RDEPEND=">=sys-apps/policycoreutils-2.8
-	virtual/udev"
+RDEPEND=">=sys-apps/policycoreutils-2.8"
 DEPEND="${RDEPEND}
 	sys-devel/m4
 	>=sys-apps/checkpolicy-2.8"
diff --git a/sec-policy/selinux-bind/Manifest b/sec-policy/selinux-bind/Manifest
index 66b25110f514..d3f6b01b6092 100644
--- a/sec-policy/selinux-bind/Manifest
+++ b/sec-policy/selinux-bind/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-bind-2.20190201-r1.ebuild 275 BLAKE2B a1d2e9d70e3118b2967086bd85035977cc4435fd172721313f104a4bc62b02512deb68bc3d746b78203264a733299904afb69be08f0a0f90cd1496eece7e7310 SHA512 21d9acda1af4769eaea00bc7c7947a20218b6f4183777cff937176ad607a1179519b0f23fad2b14572fc75dcdcebba07020ef1d5b1578216b05d9e016d9875da
-EBUILD selinux-bind-2.20190609-r1.ebuild 277 BLAKE2B af7405592f7afb739e095c5c5e3b184e7b70f367b0c56a08181724b4e44cc555b34d8abb5e5d180690f8f2170acf3d36637fccb0f878bae099eeb7c2a0e72bae SHA512 0c59d837e18f87ad3fbe406322116826f32e10c5bacf78b218431ca96091189701241a5090b645d51e28ad9c05b3ca052be7f548bdd8a95626a44b1bc01db91a
+EBUILD selinux-bind-2.20190609-r1.ebuild 275 BLAKE2B a1d2e9d70e3118b2967086bd85035977cc4435fd172721313f104a4bc62b02512deb68bc3d746b78203264a733299904afb69be08f0a0f90cd1496eece7e7310 SHA512 21d9acda1af4769eaea00bc7c7947a20218b6f4183777cff937176ad607a1179519b0f23fad2b14572fc75dcdcebba07020ef1d5b1578216b05d9e016d9875da
+EBUILD selinux-bind-2.20200818-r1.ebuild 277 BLAKE2B af7405592f7afb739e095c5c5e3b184e7b70f367b0c56a08181724b4e44cc555b34d8abb5e5d180690f8f2170acf3d36637fccb0f878bae099eeb7c2a0e72bae SHA512 0c59d837e18f87ad3fbe406322116826f32e10c5bacf78b218431ca96091189701241a5090b645d51e28ad9c05b3ca052be7f548bdd8a95626a44b1bc01db91a
 EBUILD selinux-bind-9999.ebuild 280 BLAKE2B 9681c852bc197af8b3a24fadcd4c0e3c7770e6943d0bbab68ea3bbbb382edec4a5e7d0ee8f9d98b1816ee6c95449bb8d736bf6a5bd3513b12a373466ad96dfbd SHA512 2900801fd0122b357ecb2e7d37113d48b553c07bcb08923f9e182d9475f3c8f86bca52608b19a1c2fa493104492eef8562b90e384ddb42a4818c15204dd14c19
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-bind/selinux-bind-2.20190609-r1.ebuild b/sec-policy/selinux-bind/selinux-bind-2.20190609-r1.ebuild
index 1be1516f89c6..316b5a0c1ce2 100644
--- a/sec-policy/selinux-bind/selinux-bind-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-bind/selinux-bind-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-bind/selinux-bind-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..1be1516f89c6
--- /dev/null
+++ b/sec-policy/selinux-bind/selinux-bind-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 e872ff00a27a..12aa4adf80cc 100644
--- a/sec-policy/selinux-bitcoin/Manifest
+++ b/sec-policy/selinux-bitcoin/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-bitcoin-2.20190201-r1.ebuild 281 BLAKE2B 1610f1382644bda0a76c7f8fe8f2e3acdfdcc55c127b63a25acad490af2ab85a066445d57b0c249e001e5564fedbea8123ade422a3073018e4f41bad33739acf SHA512 96bdf2cfa511de8be12854e567dd9fd0380b1b259630f0c73ed6f43e5944e6cae645ccf3a2a62910415d185b7e4eb8e968583e563d0713284a2ace954c1a8675
-EBUILD selinux-bitcoin-2.20190609-r1.ebuild 283 BLAKE2B 2a06bffa3ac5df4715d60dba0c061c2d77d0cbc6f415099c328c22ed30bac26695357b0d1245e25735171ae7823f18f12ed0d64ffcd8e2f18c38bb42cabd663a SHA512 c950ec7cb91e070797600734a6234ae4342cea43dc80191945bdb30e1736078885d4faa0bfa5851609cf05b68691f838bd215a0160e329958f0d3b61d5879705
+EBUILD selinux-bitcoin-2.20190609-r1.ebuild 281 BLAKE2B 1610f1382644bda0a76c7f8fe8f2e3acdfdcc55c127b63a25acad490af2ab85a066445d57b0c249e001e5564fedbea8123ade422a3073018e4f41bad33739acf SHA512 96bdf2cfa511de8be12854e567dd9fd0380b1b259630f0c73ed6f43e5944e6cae645ccf3a2a62910415d185b7e4eb8e968583e563d0713284a2ace954c1a8675
+EBUILD selinux-bitcoin-2.20200818-r1.ebuild 283 BLAKE2B 2a06bffa3ac5df4715d60dba0c061c2d77d0cbc6f415099c328c22ed30bac26695357b0d1245e25735171ae7823f18f12ed0d64ffcd8e2f18c38bb42cabd663a SHA512 c950ec7cb91e070797600734a6234ae4342cea43dc80191945bdb30e1736078885d4faa0bfa5851609cf05b68691f838bd215a0160e329958f0d3b61d5879705
 EBUILD selinux-bitcoin-9999.ebuild 286 BLAKE2B aada5b48af24d5ece4203a01c2f9aa3cd829159faa6cb881f0425751144bbf45e2354673e542a41dbc15bf69ad508477a2c0a37858ce155d2b51ca289faf2ac4 SHA512 7960e81e9ba39fb85e8085abbfc5b3fe119f5cef0a500875ae4a4c2d041433017cc41bf4e36d2312a437ece09f7cfb02924e12f285bf59c8328308e9cff491ff
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20190609-r1.ebuild b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20190609-r1.ebuild
index 0fed7c9ab0e3..975370171f42 100644
--- a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..0fed7c9ab0e3
--- /dev/null
+++ b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 deca06ff49c0..fe951f0e4804 100644
--- a/sec-policy/selinux-bitlbee/Manifest
+++ b/sec-policy/selinux-bitlbee/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-bitlbee-2.20190201-r1.ebuild 376 BLAKE2B 8c59951e90900de40c14efecc42ddd49702e5034b82d90f2f88cc8f7af331c93c688062d169910f90bcd2dc9d9a04efc3508ebdcb02e7efcd0079a1bfd3f1d41 SHA512 2600abbdbd16bdfa016cea289c51f6ae856cc9290d74543555fbff9b970fe0d205d24c7b81774f24cedc308827e7d7f6351906295b3c441bee1f6ac6f7e1d5de
-EBUILD selinux-bitlbee-2.20190609-r1.ebuild 378 BLAKE2B 4093a2fd18be05891d96f624bc072958e4d1de87c26e0a7ed9e9fa423559631c0deae70f7a942f8c9e0e43aa509ed5a4c0ef5ca86a97e7586e881cbf765f6b34 SHA512 605fa89d0b2691277f33d8612042e2eee9a150f73d5c914782d44393e1444f304fd606e4c1e69044e017ff8636c198f654bb7cc02a7129cbb56b17519b311427
+EBUILD selinux-bitlbee-2.20190609-r1.ebuild 376 BLAKE2B 8c59951e90900de40c14efecc42ddd49702e5034b82d90f2f88cc8f7af331c93c688062d169910f90bcd2dc9d9a04efc3508ebdcb02e7efcd0079a1bfd3f1d41 SHA512 2600abbdbd16bdfa016cea289c51f6ae856cc9290d74543555fbff9b970fe0d205d24c7b81774f24cedc308827e7d7f6351906295b3c441bee1f6ac6f7e1d5de
+EBUILD selinux-bitlbee-2.20200818-r1.ebuild 378 BLAKE2B 4093a2fd18be05891d96f624bc072958e4d1de87c26e0a7ed9e9fa423559631c0deae70f7a942f8c9e0e43aa509ed5a4c0ef5ca86a97e7586e881cbf765f6b34 SHA512 605fa89d0b2691277f33d8612042e2eee9a150f73d5c914782d44393e1444f304fd606e4c1e69044e017ff8636c198f654bb7cc02a7129cbb56b17519b311427
 EBUILD selinux-bitlbee-9999.ebuild 381 BLAKE2B bf1166593f798de1fcc106beaafbb4d6824a8a8f20f51ada6cf332d441209ac282d1fe042ec1e27e48e1fe68c68c1825c88d8d323c0b32749f10a0da30e24fdd SHA512 137b5156670aa3a0ee7d98299c6dc7a3e8d521ddd6572aafce81ae1fe0151d170c78425efb7bfacd7ff87fa7b87c0fa9d20bbb95eaa850d4a36adc68041179ce
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20190609-r1.ebuild b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20190609-r1.ebuild
index 902995934dc0..0216388f2893 100644
--- a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..902995934dc0
--- /dev/null
+++ b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20200818-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 c0d3af6c6555..2cc17cdfd3a8 100644
--- a/sec-policy/selinux-bluetooth/Manifest
+++ b/sec-policy/selinux-bluetooth/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-bluetooth-2.20190201-r1.ebuild 285 BLAKE2B d12bab4cebff0abd177ceb9bb9221f6f53bee86fa1c98ef51457b8531c56d9cd0328557eddca61d9209e7e4749c827ee9aab6a03e257a5ce4d2cec0336bb1bec SHA512 7c3ada0b09c470fe52c0f295b7cf91c3ab23d4a02936c70bfa45d60119abbe6167ce467866bbc5ce291c7980acb8e80f47049c8d3e9585ed00d8ebc88633efd9
-EBUILD selinux-bluetooth-2.20190609-r1.ebuild 287 BLAKE2B 4c187950d7d8f4aa55c092d34a90d078dff3de66d24b4f1a8b45589dda71f3a409780e5c470fe7078b8a0fb063467ad6623df1b2cdf907c1aca6fcfeb22eb0ef SHA512 423a75eaaf5a74f0878f76464110b433cdd3cb1e3d312d0b02f919588f090fdf25b6659f3ecc131de83f1be917b21a71b830df81015f51920ddcd29695e8fbd1
+EBUILD selinux-bluetooth-2.20190609-r1.ebuild 285 BLAKE2B d12bab4cebff0abd177ceb9bb9221f6f53bee86fa1c98ef51457b8531c56d9cd0328557eddca61d9209e7e4749c827ee9aab6a03e257a5ce4d2cec0336bb1bec SHA512 7c3ada0b09c470fe52c0f295b7cf91c3ab23d4a02936c70bfa45d60119abbe6167ce467866bbc5ce291c7980acb8e80f47049c8d3e9585ed00d8ebc88633efd9
+EBUILD selinux-bluetooth-2.20200818-r1.ebuild 287 BLAKE2B 4c187950d7d8f4aa55c092d34a90d078dff3de66d24b4f1a8b45589dda71f3a409780e5c470fe7078b8a0fb063467ad6623df1b2cdf907c1aca6fcfeb22eb0ef SHA512 423a75eaaf5a74f0878f76464110b433cdd3cb1e3d312d0b02f919588f090fdf25b6659f3ecc131de83f1be917b21a71b830df81015f51920ddcd29695e8fbd1
 EBUILD selinux-bluetooth-9999.ebuild 290 BLAKE2B 600d1648f2c206f995a5a73eb67faf83fca451be451187b683ab1bd3ea2bc1993f22946302b854071a99281c38e345c9328f369d0d8b4f7e66284e7a61993faf SHA512 288555daa61647ab553ded399658f5e9183b851c6ae6e9109774991e8cdf919a35865e92d87d9501be4575b40ae845f64e5a3655d9c1e19ec8acba467d5af7fd
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20190609-r1.ebuild b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20190609-r1.ebuild
index 3421eba43ffe..29c4304ad9f4 100644
--- a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..3421eba43ffe
--- /dev/null
+++ b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 7584ed16cfc2..8890581ffc24 100644
--- a/sec-policy/selinux-brctl/Manifest
+++ b/sec-policy/selinux-brctl/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-brctl-2.20190201-r1.ebuild 277 BLAKE2B 9f5e14caade3681e3b0ffb8984d05f3dd59cff90ab1af66ae9f4a73ccf63833cbcccddc671864d22ea9e14f003ec300ad1654b3199aecb14760453e477d79b09 SHA512 94b230780355b21d7842fd486709011e6ce9e19b552f6d462e23c09aac51fe44db0609bee4046d46bb2bf2c5c8b0c7583dbb0dc47bdcb96bdbfb2515babb3e52
-EBUILD selinux-brctl-2.20190609-r1.ebuild 279 BLAKE2B 18f0cdb4122ce10ae1bd676dfedf7395d9e8b7ab7fc239f2386e6d4b6a5555ccf2fa71a84d82945ce8aafde845e65095a9977d2304dd231bdd593376287a08f9 SHA512 36c3385c5455fd9677bdc0a7e839d49ad86240c563a646feaeb53bd7eebce4a729ef0281cc31c04bb8b7954a48818e2b044310a44a12b7ea093ad61dd47a7f25
+EBUILD selinux-brctl-2.20190609-r1.ebuild 277 BLAKE2B 9f5e14caade3681e3b0ffb8984d05f3dd59cff90ab1af66ae9f4a73ccf63833cbcccddc671864d22ea9e14f003ec300ad1654b3199aecb14760453e477d79b09 SHA512 94b230780355b21d7842fd486709011e6ce9e19b552f6d462e23c09aac51fe44db0609bee4046d46bb2bf2c5c8b0c7583dbb0dc47bdcb96bdbfb2515babb3e52
+EBUILD selinux-brctl-2.20200818-r1.ebuild 279 BLAKE2B 18f0cdb4122ce10ae1bd676dfedf7395d9e8b7ab7fc239f2386e6d4b6a5555ccf2fa71a84d82945ce8aafde845e65095a9977d2304dd231bdd593376287a08f9 SHA512 36c3385c5455fd9677bdc0a7e839d49ad86240c563a646feaeb53bd7eebce4a729ef0281cc31c04bb8b7954a48818e2b044310a44a12b7ea093ad61dd47a7f25
 EBUILD selinux-brctl-9999.ebuild 282 BLAKE2B b900d7645a31a0d819c3a1b5c31796becaa634b60095b4a862b4d1911ff9313637bb992767a11c3a07bf682412a1f4861de1dedff0ff6e11eed095bc70e49746 SHA512 882a0fde367fa21bccbe7729f131aa2982b1c61d91da25e2a1ccd1212a1979d3e81cb882913e548b882b1486ec83dc5d1358e83443136856f9cacd17d4beb07c
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-brctl/selinux-brctl-2.20190609-r1.ebuild b/sec-policy/selinux-brctl/selinux-brctl-2.20190609-r1.ebuild
index dfcfa6c208f5..9e7406bdc317 100644
--- a/sec-policy/selinux-brctl/selinux-brctl-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-brctl/selinux-brctl-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-brctl/selinux-brctl-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..dfcfa6c208f5
--- /dev/null
+++ b/sec-policy/selinux-brctl/selinux-brctl-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 207a6951fd04..58cd55388658 100644
--- a/sec-policy/selinux-cachefilesd/Manifest
+++ b/sec-policy/selinux-cachefilesd/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-cachefilesd-2.20190201-r1.ebuild 289 BLAKE2B 62621fd6a3ee25a2aacb47976964a1e2f23daf17c5419293b90591cf163c8b0bd5f55ca3b9c60b84dd2163ecddf1c9dd804d8b67e03a489d1ffd0cd6cf2d4961 SHA512 800d39ea338e8bff886be89b14ab48e2dd664295ef4c71779d67b04b512845fa851ff7c1e321abac6f002b8e371476b63c3e89cac8618a173623a61f945e2cc0
-EBUILD selinux-cachefilesd-2.20190609-r1.ebuild 291 BLAKE2B 66141d1187d4e917de6a4ff0b90640325f7034cb5ee1917c5ddfade77af5c056f6535fbd955d19a3720208055b3e0cd94d563df1712820fd95a6f8eeae30a03d SHA512 f2799708f332be2fcf380523c8b3e9a5f13428a64160311bb370f8d92e6cb82409358f75430cc6331f1ff4067b43f7917879473d8877b3c496896f2b38b36e5a
+EBUILD selinux-cachefilesd-2.20190609-r1.ebuild 289 BLAKE2B 62621fd6a3ee25a2aacb47976964a1e2f23daf17c5419293b90591cf163c8b0bd5f55ca3b9c60b84dd2163ecddf1c9dd804d8b67e03a489d1ffd0cd6cf2d4961 SHA512 800d39ea338e8bff886be89b14ab48e2dd664295ef4c71779d67b04b512845fa851ff7c1e321abac6f002b8e371476b63c3e89cac8618a173623a61f945e2cc0
+EBUILD selinux-cachefilesd-2.20200818-r1.ebuild 291 BLAKE2B 66141d1187d4e917de6a4ff0b90640325f7034cb5ee1917c5ddfade77af5c056f6535fbd955d19a3720208055b3e0cd94d563df1712820fd95a6f8eeae30a03d SHA512 f2799708f332be2fcf380523c8b3e9a5f13428a64160311bb370f8d92e6cb82409358f75430cc6331f1ff4067b43f7917879473d8877b3c496896f2b38b36e5a
 EBUILD selinux-cachefilesd-9999.ebuild 294 BLAKE2B 48b9fac86252443eccd3ea326f4471b86fa3fa2246e8f287c5ce5886614640e42f36ed9ac01311f90ed285e67ce646e1fb6da3263e7b2cc9a1794ea0b3c78c0d SHA512 d6af12307ebde115c68a0ee758ba4bf5ebdcc250ea74c62d8aa279cb0bc52c3320242781775bc0f25c380045278f58c8c7b84ae0294785923a1ce241b2d66683
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20190609-r1.ebuild b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20190609-r1.ebuild
index a8cbd4b1bfff..8de1241a8c0f 100644
--- a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..a8cbd4b1bfff
--- /dev/null
+++ b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 8e5668e5f156..8560d4a99d24 100644
--- a/sec-policy/selinux-calamaris/Manifest
+++ b/sec-policy/selinux-calamaris/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-calamaris-2.20190201-r1.ebuild 285 BLAKE2B 5e6c54b0d6145ec011631a4ffda705b9c474bd0a366e76a0b3d5e27edffab213520dab273d8b4f2470c68fa8fba6f08202ed1f8751058fafc6ed8a50b76cdab0 SHA512 97270bc3bba2dcb4601f79480a91933b633ee0b66cec0f710a3c50f8468c7a464e7413b9718c43b8673f26363f524a4b9c74131972182ab8d7b25e0343c63070
-EBUILD selinux-calamaris-2.20190609-r1.ebuild 287 BLAKE2B 66748c9e73924f7c60c4047d341d351ec098aa5b33cfb4bf8a96174115c57726ca6156abe954caa2bbd5d0823b592f7cab8449c02ef9d5fe6b4f60f060b2822c SHA512 b5e44527b6ebfc65f63187a4653f7f6735a75f3571280f12826b08c3a489d8a9d5a993059bd4f4cfc8e9326f7a830ef3316ba4a9fa1780b9faf70d2ea8b57b6d
+EBUILD selinux-calamaris-2.20190609-r1.ebuild 285 BLAKE2B 5e6c54b0d6145ec011631a4ffda705b9c474bd0a366e76a0b3d5e27edffab213520dab273d8b4f2470c68fa8fba6f08202ed1f8751058fafc6ed8a50b76cdab0 SHA512 97270bc3bba2dcb4601f79480a91933b633ee0b66cec0f710a3c50f8468c7a464e7413b9718c43b8673f26363f524a4b9c74131972182ab8d7b25e0343c63070
+EBUILD selinux-calamaris-2.20200818-r1.ebuild 287 BLAKE2B 66748c9e73924f7c60c4047d341d351ec098aa5b33cfb4bf8a96174115c57726ca6156abe954caa2bbd5d0823b592f7cab8449c02ef9d5fe6b4f60f060b2822c SHA512 b5e44527b6ebfc65f63187a4653f7f6735a75f3571280f12826b08c3a489d8a9d5a993059bd4f4cfc8e9326f7a830ef3316ba4a9fa1780b9faf70d2ea8b57b6d
 EBUILD selinux-calamaris-9999.ebuild 290 BLAKE2B 833684e911209f8e1bdc465bb43bc8342ce92d5d18a634069cdf2fe83269f76596b0ec78906fe4143074f246157b355ca9fb2d85f60c5c2cd25250e8ca5a4372 SHA512 a2da855c4791ad9af2a6b83a2c1d55778a575e5c8345ce8b7ca8a769afe20678d99c92e247e9e913a8ea6b9f9bc3df2bca4d0ee9954ea34d55793b948a336f3a
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-calamaris/selinux-calamaris-2.20190609-r1.ebuild b/sec-policy/selinux-calamaris/selinux-calamaris-2.20190609-r1.ebuild
index be1eb5e5e59f..b32bc6a90c1a 100644
--- a/sec-policy/selinux-calamaris/selinux-calamaris-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-calamaris/selinux-calamaris-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-calamaris/selinux-calamaris-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..be1eb5e5e59f
--- /dev/null
+++ b/sec-policy/selinux-calamaris/selinux-calamaris-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 8b947a11bd28..375cc6197d04 100644
--- a/sec-policy/selinux-canna/Manifest
+++ b/sec-policy/selinux-canna/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-canna-2.20190201-r1.ebuild 277 BLAKE2B ba4a0f5feca81ff65396644d0768a2a1570f82d4b5efe266b730ac55b3638576cfe82578795a523731f624f844d99a8e474e1760aee8a63854fda6a240d88db7 SHA512 f6d5540280fae2b93df3ca211b4e540adadaea14e9ba100c6e35cd67bc8e1d85cfbc0e18ec60c84bf1f550740a2db514c8a0183185f26133ce3b51e53c09704b
-EBUILD selinux-canna-2.20190609-r1.ebuild 279 BLAKE2B ab9709d1b40b37490866e5944cb4c2cea7854d2176268ef6f2376546a8c98159f33492879badf5cc1f6e3630ba6ac0c4791f7041f78011bad6c439ab0d5f2224 SHA512 de3e4dcb62ea8f81862e2333a9f9c7af8e2a43051e813d459969818c9390a5e2c87e133d881ee2f139a265f927166893988994f725b2a30d253dadcc0bfb5928
+EBUILD selinux-canna-2.20190609-r1.ebuild 277 BLAKE2B ba4a0f5feca81ff65396644d0768a2a1570f82d4b5efe266b730ac55b3638576cfe82578795a523731f624f844d99a8e474e1760aee8a63854fda6a240d88db7 SHA512 f6d5540280fae2b93df3ca211b4e540adadaea14e9ba100c6e35cd67bc8e1d85cfbc0e18ec60c84bf1f550740a2db514c8a0183185f26133ce3b51e53c09704b
+EBUILD selinux-canna-2.20200818-r1.ebuild 279 BLAKE2B ab9709d1b40b37490866e5944cb4c2cea7854d2176268ef6f2376546a8c98159f33492879badf5cc1f6e3630ba6ac0c4791f7041f78011bad6c439ab0d5f2224 SHA512 de3e4dcb62ea8f81862e2333a9f9c7af8e2a43051e813d459969818c9390a5e2c87e133d881ee2f139a265f927166893988994f725b2a30d253dadcc0bfb5928
 EBUILD selinux-canna-9999.ebuild 282 BLAKE2B cd6c33c5d85f105506462f16f427bff4f23a36bb6c7a42f4450c6e6dd93cb4fdf0e8e10e1b4ff9afe3556575c94af075b390dd12a4a4651b541a36d83a825a61 SHA512 3611c6a33c1bbbcfea8aeaa63e43e0dff5c39409fcbac66b33cff84ffd95a75078416de12c2c383b0b57a7c927dc4d77c5481105b8c9c35e5b3613e86aaa5df8
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-canna/selinux-canna-2.20190609-r1.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20190609-r1.ebuild
index ccadae58f655..52fa0b1fa258 100644
--- a/sec-policy/selinux-canna/selinux-canna-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-canna/selinux-canna-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..ccadae58f655
--- /dev/null
+++ b/sec-policy/selinux-canna/selinux-canna-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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-ccs/Manifest b/sec-policy/selinux-ccs/Manifest
index 660e60ee15e2..23a333e49ca5 100644
--- a/sec-policy/selinux-ccs/Manifest
+++ b/sec-policy/selinux-ccs/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-ccs-2.20190201-r1.ebuild 273 BLAKE2B a55c9ad8324741067e4b2574fd61d13cbb19aa9ba61e4fff3791ffb4270d681c71db8e752a309249569d8d19db60d733c2574202f1b6d42eafce628c86c3182c SHA512 4d39feb8672c23987c3c4d1a0f3c27a08b3f20d2b4832d7ff6abd4fc54acbd6cfd9b9e105bb4d87b62037db6ab418d5a3cb0c29502988f7efdaba1bc340f1185
-EBUILD selinux-ccs-2.20190609-r1.ebuild 275 BLAKE2B d7d7d7ff57bd3ed82e5590459a2c344d03ccea24b94588975a1ef859b70ad750c6aa22132a9b7ec64a871f6867e39f3827a17de04fc27e87ca1a121344339438 SHA512 8c90e170580bc97f9a1a4076f545596051937babeb129e149c757cd53f36ee1312010e6234f5438949d014da5ac78b5699ce11d00903033c471e2c9ee5cd88fa
+EBUILD selinux-ccs-2.20190609-r1.ebuild 273 BLAKE2B a55c9ad8324741067e4b2574fd61d13cbb19aa9ba61e4fff3791ffb4270d681c71db8e752a309249569d8d19db60d733c2574202f1b6d42eafce628c86c3182c SHA512 4d39feb8672c23987c3c4d1a0f3c27a08b3f20d2b4832d7ff6abd4fc54acbd6cfd9b9e105bb4d87b62037db6ab418d5a3cb0c29502988f7efdaba1bc340f1185
+EBUILD selinux-ccs-2.20200818-r1.ebuild 275 BLAKE2B d7d7d7ff57bd3ed82e5590459a2c344d03ccea24b94588975a1ef859b70ad750c6aa22132a9b7ec64a871f6867e39f3827a17de04fc27e87ca1a121344339438 SHA512 8c90e170580bc97f9a1a4076f545596051937babeb129e149c757cd53f36ee1312010e6234f5438949d014da5ac78b5699ce11d00903033c471e2c9ee5cd88fa
 EBUILD selinux-ccs-9999.ebuild 278 BLAKE2B a57b60f43d4fb5bb2b0998ddf1c9dc3e8e1b4cb8b4b1f74258a1d1df53081d398586469909bea6d32300ebbdb0d98ef29219df46cf6c01fadab609e968c07112 SHA512 be1029eddc622842c8ba7bd6fbc66385d546025ceb6dd6de5538fe0c7f8623fe58c1f9aaf38a699d4a545cfbfa219eb49e824711f49af757c9669c45b49222be
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ccs/selinux-ccs-2.20190609-r1.ebuild b/sec-policy/selinux-ccs/selinux-ccs-2.20190609-r1.ebuild
index 33dcd9512037..bbfa217c0599 100644
--- a/sec-policy/selinux-ccs/selinux-ccs-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-ccs/selinux-ccs-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ccs"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ccs/selinux-ccs-2.20200818-r1.ebuild b/sec-policy/selinux-ccs/selinux-ccs-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..33dcd9512037
--- /dev/null
+++ b/sec-policy/selinux-ccs/selinux-ccs-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="ccs"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ccs"
+
+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 9c7ecc13700f..050ebdd077f9 100644
--- a/sec-policy/selinux-cdrecord/Manifest
+++ b/sec-policy/selinux-cdrecord/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-cdrecord-2.20190201-r1.ebuild 283 BLAKE2B f9d7718a8b590cf95afe074e784779306c5c7e0852179cefee1bc62e541cba8a6f1bf5402b94fbd80af949008bee1f8a61aa33978d43b61399255945e3a76acf SHA512 a285156aa3cabf03e7fa33b37cc0ac2b6bfe41c5b08fae0be9d9e0dc1b7cb1866539ade936fd2123743a32f9f8c1178ed53da842a5f40594ece7ec91fd40bdbc
-EBUILD selinux-cdrecord-2.20190609-r1.ebuild 285 BLAKE2B b260002a0f858eb8c33b2e650015c1eacb7aba7a40a83501d36b151ae1837ba288d456cdb7b60d212406d611fb36c79b08305df57babf05c8e4f87145237c1a5 SHA512 b6c517242a4a3ea65af5c3e004ec855f094aaacf5a41fa391ee750da89418043983814f771a02beb33e074de8677db67fcbf2560a7db385a86aed015b6eb04ae
+EBUILD selinux-cdrecord-2.20190609-r1.ebuild 283 BLAKE2B f9d7718a8b590cf95afe074e784779306c5c7e0852179cefee1bc62e541cba8a6f1bf5402b94fbd80af949008bee1f8a61aa33978d43b61399255945e3a76acf SHA512 a285156aa3cabf03e7fa33b37cc0ac2b6bfe41c5b08fae0be9d9e0dc1b7cb1866539ade936fd2123743a32f9f8c1178ed53da842a5f40594ece7ec91fd40bdbc
+EBUILD selinux-cdrecord-2.20200818-r1.ebuild 285 BLAKE2B b260002a0f858eb8c33b2e650015c1eacb7aba7a40a83501d36b151ae1837ba288d456cdb7b60d212406d611fb36c79b08305df57babf05c8e4f87145237c1a5 SHA512 b6c517242a4a3ea65af5c3e004ec855f094aaacf5a41fa391ee750da89418043983814f771a02beb33e074de8677db67fcbf2560a7db385a86aed015b6eb04ae
 EBUILD selinux-cdrecord-9999.ebuild 288 BLAKE2B a0f82c8611e6ec46cea0c033cce7987b5521b229f7e3eebda8445d0a0c4ed1d0387ef6488ddec3c4f66abab5a52aabd94f4cebd4e49a14a6a7cf9fa737a293ca SHA512 b7809930e9331ed04991ed644f2d35a62499ece03cc4abee1658b54aeb5a1343c7107f0591dd2fb5aa9239f67c7b9d4a47b40ac3462c378e22f16ec8d282a760
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20190609-r1.ebuild b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20190609-r1.ebuild
index 08a483e4c1de..9b1d26dd820d 100644
--- a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..08a483e4c1de
--- /dev/null
+++ b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 9f28ba62380f..8545a6cc390c 100644
--- a/sec-policy/selinux-ceph/Manifest
+++ b/sec-policy/selinux-ceph/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-ceph-2.20190201-r1.ebuild 275 BLAKE2B 3f1cf2e8ecf307e7d7b34c75e685b7c780b1f2f6d71a399bd5d916576c10865709606de0c1320d462be1a32297b0257aab2b89532c3dc405d5770001721cf489 SHA512 991350d9f335fec7f97ea971bac7355686be9ecb46a3a3342faf4195f994cc3d700f20f2a45dd2bbde7ba5fa3d17c96d6e8ee10f40e145b9d435e4fcbe71d961
-EBUILD selinux-ceph-2.20190609-r1.ebuild 277 BLAKE2B 85f6e9181852648879f05f80ecd28c8e4496ed9f4babf77714dbeee5d5c446656fe3e46dffe8ee65333340d2f929e42c5e9b4d147fd9c9214f0f62915e884d54 SHA512 6fe45acfbf22cf06a5648831b1bc30e73905f20fb3e5c177ab5c96169e569b88e39bd3ff9871597fa3924b95796b49a883e3fbf3f9667606639c30a00ca21dbf
+EBUILD selinux-ceph-2.20190609-r1.ebuild 275 BLAKE2B 3f1cf2e8ecf307e7d7b34c75e685b7c780b1f2f6d71a399bd5d916576c10865709606de0c1320d462be1a32297b0257aab2b89532c3dc405d5770001721cf489 SHA512 991350d9f335fec7f97ea971bac7355686be9ecb46a3a3342faf4195f994cc3d700f20f2a45dd2bbde7ba5fa3d17c96d6e8ee10f40e145b9d435e4fcbe71d961
+EBUILD selinux-ceph-2.20200818-r1.ebuild 277 BLAKE2B 85f6e9181852648879f05f80ecd28c8e4496ed9f4babf77714dbeee5d5c446656fe3e46dffe8ee65333340d2f929e42c5e9b4d147fd9c9214f0f62915e884d54 SHA512 6fe45acfbf22cf06a5648831b1bc30e73905f20fb3e5c177ab5c96169e569b88e39bd3ff9871597fa3924b95796b49a883e3fbf3f9667606639c30a00ca21dbf
 EBUILD selinux-ceph-9999.ebuild 280 BLAKE2B 515062d2dfd2e00ea39c18322945321f5d6f9ce90a307881835610268c7393d943be1109364adbc06f272b932f9c1b004d54aeeb7dd328a374e2d17d64738c2c SHA512 cc81cc3538ed2f410c749042dc176741402d3df9fbae1c39d9d1511790f42250419d499e080fe6bb75a8666386b1ec7dae55a47bff04d008f4ee82b42c56a6db
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ceph/selinux-ceph-2.20190609-r1.ebuild b/sec-policy/selinux-ceph/selinux-ceph-2.20190609-r1.ebuild
index e087d4efabec..5661fc772eff 100644
--- a/sec-policy/selinux-ceph/selinux-ceph-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-ceph/selinux-ceph-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-ceph/selinux-ceph-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..e087d4efabec
--- /dev/null
+++ b/sec-policy/selinux-ceph/selinux-ceph-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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-cgmanager/Manifest b/sec-policy/selinux-cgmanager/Manifest
index babc11a3976f..00396b491b42 100644
--- a/sec-policy/selinux-cgmanager/Manifest
+++ b/sec-policy/selinux-cgmanager/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-cgmanager-2.20190201-r1.ebuild 285 BLAKE2B a691290b4e6548fc1fee3d57d82e15b6295e1e9e14217f4d4828e4dec9d5b71ea883391d4323ea0a315e46baede6334046aab997efa1b896adfe74e4ca281db3 SHA512 b76a762d06b121ba557cfabb5eba4de052705e145671e64abc231918a33e9f054709e0e1912e6c4967f905f48858580877356d0ccc4136ba3a8b8c290722dc18
-EBUILD selinux-cgmanager-2.20190609-r1.ebuild 287 BLAKE2B 1d848aa9b6032dae9e84d8e17368b7c5a6015bff355b115c705f59f937b8414a0225a7c2a02fe6b790aca9b7ec6a759fa98542fa15201cb7d4b16aa20f83dd9d SHA512 48d9fb60ead5266af1ffd8f2568eac81f756adc0657a8361cc018045bc90fda7855f55344302fe26acc00fd9e1781a7b3ac8f3c59da8c4d7198c6f02c6af0389
+EBUILD selinux-cgmanager-2.20190609-r1.ebuild 285 BLAKE2B a691290b4e6548fc1fee3d57d82e15b6295e1e9e14217f4d4828e4dec9d5b71ea883391d4323ea0a315e46baede6334046aab997efa1b896adfe74e4ca281db3 SHA512 b76a762d06b121ba557cfabb5eba4de052705e145671e64abc231918a33e9f054709e0e1912e6c4967f905f48858580877356d0ccc4136ba3a8b8c290722dc18
+EBUILD selinux-cgmanager-2.20200818-r1.ebuild 287 BLAKE2B 1d848aa9b6032dae9e84d8e17368b7c5a6015bff355b115c705f59f937b8414a0225a7c2a02fe6b790aca9b7ec6a759fa98542fa15201cb7d4b16aa20f83dd9d SHA512 48d9fb60ead5266af1ffd8f2568eac81f756adc0657a8361cc018045bc90fda7855f55344302fe26acc00fd9e1781a7b3ac8f3c59da8c4d7198c6f02c6af0389
 EBUILD selinux-cgmanager-9999.ebuild 290 BLAKE2B 04d2aadb6503b435bde2dce583c5231db9a2eb4b3bce50275510b38e125e9bc22fd78b3832ed9f128f769cf11867e72a6d6877e952b55adae2c24a181fdaa9b7 SHA512 f1e7b90885b666767e70cc49cee1e7eb5d9b2010b34e43a805509796d009f236f3a013463f61616136df39a5469316beb62785f41cc678db7a325110a7eeb058
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20190609-r1.ebuild b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20190609-r1.ebuild
index 0579da862034..256856515232 100644
--- a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..0579da862034
--- /dev/null
+++ b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 7bb6f7c77378..22dc10edb0e6 100644
--- a/sec-policy/selinux-cgroup/Manifest
+++ b/sec-policy/selinux-cgroup/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-cgroup-2.20190201-r1.ebuild 279 BLAKE2B 847883a8a9d4b4ba7ca3430fe1c38783e530bc93e8dcb1f14ad7825023455636b517658713855e402e631b8f7714e591b6b37ceab845a06cd5bb41e1947b32f4 SHA512 778b0ac980766fca9b34436636ed0089a9219bbeb075ea36829d769e816e30c84922c0896ab8e39ee756d10ed2a371b7fa405106ea8fc7d763a892d873b8b9c9
-EBUILD selinux-cgroup-2.20190609-r1.ebuild 281 BLAKE2B 3280567cd4d2e616489f66c588ed7e1847dd163701359e5642cb16126e40738b1b70aca5630f69103356358c0306b9223af34437476f6bf51adea760078fdc7e SHA512 095f07271dde77ecd0c06c194fe431f1db37256d3802104d9c96fa9698cafb58521c85496699e756749540a7c6f97c9713c7a579e51bdab9dd7d5424227c1b15
+EBUILD selinux-cgroup-2.20190609-r1.ebuild 279 BLAKE2B 847883a8a9d4b4ba7ca3430fe1c38783e530bc93e8dcb1f14ad7825023455636b517658713855e402e631b8f7714e591b6b37ceab845a06cd5bb41e1947b32f4 SHA512 778b0ac980766fca9b34436636ed0089a9219bbeb075ea36829d769e816e30c84922c0896ab8e39ee756d10ed2a371b7fa405106ea8fc7d763a892d873b8b9c9
+EBUILD selinux-cgroup-2.20200818-r1.ebuild 281 BLAKE2B 3280567cd4d2e616489f66c588ed7e1847dd163701359e5642cb16126e40738b1b70aca5630f69103356358c0306b9223af34437476f6bf51adea760078fdc7e SHA512 095f07271dde77ecd0c06c194fe431f1db37256d3802104d9c96fa9698cafb58521c85496699e756749540a7c6f97c9713c7a579e51bdab9dd7d5424227c1b15
 EBUILD selinux-cgroup-9999.ebuild 284 BLAKE2B cc4285d28ed38140b4d7667e419cd7a96c51dca187cac3a110385667844ea8ad5ed6e1cb64932dc1f6d997a583339fff2e1922785aec4013646a3f4fee306f06 SHA512 1812648d5d437d71d02f80147dcae8aec7b305b63a2395451d16c77a5d71622045b14ea2e375b7729c5870f6089f3c75443219d736b41e813a481063701bb664
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-cgroup/selinux-cgroup-2.20190609-r1.ebuild b/sec-policy/selinux-cgroup/selinux-cgroup-2.20190609-r1.ebuild
index ae3cc604d872..8f2a15a1e49d 100644
--- a/sec-policy/selinux-cgroup/selinux-cgroup-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-cgroup/selinux-cgroup-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-cgroup/selinux-cgroup-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..ae3cc604d872
--- /dev/null
+++ b/sec-policy/selinux-cgroup/selinux-cgroup-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 39fd1b88ab8d..61fc2e4d09b5 100644
--- a/sec-policy/selinux-chromium/Manifest
+++ b/sec-policy/selinux-chromium/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-chromium-2.20190201-r1.ebuild 386 BLAKE2B b3957f297ac5d60e3e083db26ece2855399cfdb8cc6fad5dd5f31657cd586c847ff94638b64dc7c517ed70005611ceab6a3995c12f0ab4c2c34c5f6a588a09e4 SHA512 95b9cda33b49a59ee3c6239ace9d7780452297aa4d2a23f8f64f9de91866b17f0f4dd146ab7531521625e39be4d079138812e64fa038087d0cf3b4da682289fd
-EBUILD selinux-chromium-2.20190609-r1.ebuild 388 BLAKE2B cd1912e64231ccb223b76daa02e91d9d0ddd62554f25d0129536d1efdf3a4236820eb98ab325f34fa003bdae976a9a82ffb1c8e3a4e432c099b7c8352222a193 SHA512 7fd15a1ba1709cdf93a709ca2f1018042f270cdee39f82005fa03933f965a78471509a406c3a6b1094ca231c236955f7671b213aeb39d28817bebac9cb0e37c0
+EBUILD selinux-chromium-2.20190609-r1.ebuild 386 BLAKE2B b3957f297ac5d60e3e083db26ece2855399cfdb8cc6fad5dd5f31657cd586c847ff94638b64dc7c517ed70005611ceab6a3995c12f0ab4c2c34c5f6a588a09e4 SHA512 95b9cda33b49a59ee3c6239ace9d7780452297aa4d2a23f8f64f9de91866b17f0f4dd146ab7531521625e39be4d079138812e64fa038087d0cf3b4da682289fd
+EBUILD selinux-chromium-2.20200818-r1.ebuild 388 BLAKE2B cd1912e64231ccb223b76daa02e91d9d0ddd62554f25d0129536d1efdf3a4236820eb98ab325f34fa003bdae976a9a82ffb1c8e3a4e432c099b7c8352222a193 SHA512 7fd15a1ba1709cdf93a709ca2f1018042f270cdee39f82005fa03933f965a78471509a406c3a6b1094ca231c236955f7671b213aeb39d28817bebac9cb0e37c0
 EBUILD selinux-chromium-9999.ebuild 391 BLAKE2B 0811eaa7be1569e0ea4bd5240785dabfefe32d8d88b1b73c666a474d5d871385af220f276146c3e30aa427de0e535534b1d229242ca5c8179ae6aadfcdb30771 SHA512 5e2efd8292ecb3d2adf21b7d86c85b2211e6e0e7768e6e2ece55ded6ec44ef40c8d4c63732de21554cfd1ed63f8fd60cdbfed437f62d8d2876af8ebb69473656
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-chromium/selinux-chromium-2.20190609-r1.ebuild b/sec-policy/selinux-chromium/selinux-chromium-2.20190609-r1.ebuild
index 49a72a62bbdd..d6caff85c30c 100644
--- a/sec-policy/selinux-chromium/selinux-chromium-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-chromium/selinux-chromium-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-chromium/selinux-chromium-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..49a72a62bbdd
--- /dev/null
+++ b/sec-policy/selinux-chromium/selinux-chromium-2.20200818-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 2728c1f0ba1f..24c275739cc3 100644
--- a/sec-policy/selinux-chronyd/Manifest
+++ b/sec-policy/selinux-chronyd/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-chronyd-2.20190201-r1.ebuild 281 BLAKE2B 8ef09c64df1676cac54fc381ce8624e777dc80f247a174c0b6937a015a0e80ae47b5107bf5046490536a334e890fbf72a4ac302066db9dd5c018ff44afd8c1f8 SHA512 506f03977777021a02c46d62132ab52e7b8b8ff145f335600b7300f4c87b851b1e267023bbb0af3d4862405561116a48131caa3d856eca4c85862a6ddd16ef25
-EBUILD selinux-chronyd-2.20190609-r1.ebuild 283 BLAKE2B f6ad4c84163b4b409aa7b7cba776be42f95389a2f81933b79512439c8eb578927391876c04f32af685c7d488280f9e468d29c0f2c104029bd7a608915091871d SHA512 50c79774064ed8cce63a47b96d45c60d65672444b93cbed58e9fa9ecd686dbc46e29fa155889392f39062764b284a126e03d035141f2cb2c1078b9b6e3c3fef6
+EBUILD selinux-chronyd-2.20190609-r1.ebuild 281 BLAKE2B 8ef09c64df1676cac54fc381ce8624e777dc80f247a174c0b6937a015a0e80ae47b5107bf5046490536a334e890fbf72a4ac302066db9dd5c018ff44afd8c1f8 SHA512 506f03977777021a02c46d62132ab52e7b8b8ff145f335600b7300f4c87b851b1e267023bbb0af3d4862405561116a48131caa3d856eca4c85862a6ddd16ef25
+EBUILD selinux-chronyd-2.20200818-r1.ebuild 283 BLAKE2B f6ad4c84163b4b409aa7b7cba776be42f95389a2f81933b79512439c8eb578927391876c04f32af685c7d488280f9e468d29c0f2c104029bd7a608915091871d SHA512 50c79774064ed8cce63a47b96d45c60d65672444b93cbed58e9fa9ecd686dbc46e29fa155889392f39062764b284a126e03d035141f2cb2c1078b9b6e3c3fef6
 EBUILD selinux-chronyd-9999.ebuild 286 BLAKE2B 7cb3bd180866d62e0a850b9029657b585a0d16365f091e3130c832719218df3efcd518a9640e019d891ce34424ec8d1f471138c1c8ec73d063da22677922763b SHA512 9da5b0fdbf270940c3e9eb511ed393f36a28bf3c29eef4d8f6b0e462feed5d75d670b9739cfef15c09ffa170eb3abe387e75fc44e16c0cf01f4042873cf6d7b1
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-chronyd/selinux-chronyd-2.20190609-r1.ebuild b/sec-policy/selinux-chronyd/selinux-chronyd-2.20190609-r1.ebuild
index f84c68043472..fdea543bc6a6 100644
--- a/sec-policy/selinux-chronyd/selinux-chronyd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-chronyd/selinux-chronyd-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-chronyd/selinux-chronyd-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..f84c68043472
--- /dev/null
+++ b/sec-policy/selinux-chronyd/selinux-chronyd-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 7160b503463b..ceb74384d254 100644
--- a/sec-policy/selinux-clamav/Manifest
+++ b/sec-policy/selinux-clamav/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-clamav-2.20190201-r1.ebuild 279 BLAKE2B 8d64ee8ebabdc8f9c0550c5690bf7682b767f333d4fe31afdf0dce72c5731913edd93cc58d9afecbf1cac4f0cd2c6fb80b11adba49d342f9ee3d17d92fd44902 SHA512 0496b2c936ead928811be52e336ae54310b55e0f695f02294da9fe1c0a9f3ba66f474ad14275ed35794fb43c67aadaee6a214e1df2e9a22f16286b1d81cb1c6f
-EBUILD selinux-clamav-2.20190609-r1.ebuild 281 BLAKE2B 5bdd3dd93efaf626935b279937ae417e67070ac6dbf9a6ecd2a608754448a72001a900156b32878408f65dcb499150d8d3d9719c27f075bc212d4108bd7dc105 SHA512 661764612b196192143ce54820e819e5eab3636d5ea8901aa743f258c0d753cb06ac98b077560b85e6213fdbd6d9e3653e2b10d917628d1350af601180eb5e20
+EBUILD selinux-clamav-2.20190609-r1.ebuild 279 BLAKE2B 8d64ee8ebabdc8f9c0550c5690bf7682b767f333d4fe31afdf0dce72c5731913edd93cc58d9afecbf1cac4f0cd2c6fb80b11adba49d342f9ee3d17d92fd44902 SHA512 0496b2c936ead928811be52e336ae54310b55e0f695f02294da9fe1c0a9f3ba66f474ad14275ed35794fb43c67aadaee6a214e1df2e9a22f16286b1d81cb1c6f
+EBUILD selinux-clamav-2.20200818-r1.ebuild 281 BLAKE2B 5bdd3dd93efaf626935b279937ae417e67070ac6dbf9a6ecd2a608754448a72001a900156b32878408f65dcb499150d8d3d9719c27f075bc212d4108bd7dc105 SHA512 661764612b196192143ce54820e819e5eab3636d5ea8901aa743f258c0d753cb06ac98b077560b85e6213fdbd6d9e3653e2b10d917628d1350af601180eb5e20
 EBUILD selinux-clamav-9999.ebuild 284 BLAKE2B 75c9ccea4ffd8630ec4995dc438fb6095aa14f638eeb66a4540e0c17b983e16f307e9cd37f5baa83da8140283b882bc48d9c94ba46d23ec509e4d04a32d8d3e6 SHA512 ea510ad0d8b2de946442a7b710f08f4fe89bf40988a533b233538b1bae06a5bed951d4670716c0ce87cfce45a1976c913c4735fc5d2df4694a491167188eb986
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-clamav/selinux-clamav-2.20190609-r1.ebuild b/sec-policy/selinux-clamav/selinux-clamav-2.20190609-r1.ebuild
index df5ef0290e76..ca2993f85ce7 100644
--- a/sec-policy/selinux-clamav/selinux-clamav-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-clamav/selinux-clamav-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-clamav/selinux-clamav-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..df5ef0290e76
--- /dev/null
+++ b/sec-policy/selinux-clamav/selinux-clamav-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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-clockspeed/Manifest b/sec-policy/selinux-clockspeed/Manifest
index be254e1cd8c6..b69b245e5213 100644
--- a/sec-policy/selinux-clockspeed/Manifest
+++ b/sec-policy/selinux-clockspeed/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-clockspeed-2.20190201-r1.ebuild 287 BLAKE2B eabcb38709b528c5100be262fcdaab88e27d9f9e6a65564fdf47bb10c286cb7d25b462d5e2c6684483e64fe39a1a58acf13198374678f501bf92c2c83626d202 SHA512 7bae6f665b0fccba1b7a9ca4498634c33373b07e2dd919f34372d4b5ff2fbf75e81f069d8c2ade91732f5b4a559e6c094716a8f9621d8d2b86e44a0a9f9f2a7d
-EBUILD selinux-clockspeed-2.20190609-r1.ebuild 289 BLAKE2B 2de40f79c1e5877c222d6ab922512fb8532aaaab5db3c229ec1b196b5c81ae16f82e40b1d351eeea05bde17a5bd49283d1a5884a3c275cf69ed9260c799fd035 SHA512 d8ad69ef8f90ea693e9587790dfbc07e2fd5c97bb466b42b896acce1ac99206a75d7d10709b0f037d98278f868c6a4f10c4f2d59d7edd7809839aed7a9b55d0a
+EBUILD selinux-clockspeed-2.20190609-r1.ebuild 287 BLAKE2B eabcb38709b528c5100be262fcdaab88e27d9f9e6a65564fdf47bb10c286cb7d25b462d5e2c6684483e64fe39a1a58acf13198374678f501bf92c2c83626d202 SHA512 7bae6f665b0fccba1b7a9ca4498634c33373b07e2dd919f34372d4b5ff2fbf75e81f069d8c2ade91732f5b4a559e6c094716a8f9621d8d2b86e44a0a9f9f2a7d
+EBUILD selinux-clockspeed-2.20200818-r1.ebuild 289 BLAKE2B 2de40f79c1e5877c222d6ab922512fb8532aaaab5db3c229ec1b196b5c81ae16f82e40b1d351eeea05bde17a5bd49283d1a5884a3c275cf69ed9260c799fd035 SHA512 d8ad69ef8f90ea693e9587790dfbc07e2fd5c97bb466b42b896acce1ac99206a75d7d10709b0f037d98278f868c6a4f10c4f2d59d7edd7809839aed7a9b55d0a
 EBUILD selinux-clockspeed-9999.ebuild 292 BLAKE2B 5901402fd478d1c5efc4473889cc33e70e8b1d1081e9d63f14e6bea873c2323eec5b504d4560ca94075790bce46f7fc0d8fa88624610a04cb48e0bca2a3d8502 SHA512 546ae11276f1d838de3b1c85b0130ce9b169b8ebd06aee573a5c59fb99cacaada5b0cd765f61920f7f423f4de87cd7e1a1672c54472df4d77d8e0d0b822a12dc
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20190609-r1.ebuild b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20190609-r1.ebuild
index 991ea6ad6313..3ecd87cd4b1d 100644
--- a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for clockspeed"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20200818-r1.ebuild b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..991ea6ad6313
--- /dev/null
+++ b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="clockspeed"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for clockspeed"
+
+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 4232223a66ce..fc4baa768da9 100644
--- a/sec-policy/selinux-collectd/Manifest
+++ b/sec-policy/selinux-collectd/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-collectd-2.20190201-r1.ebuild 381 BLAKE2B 17a959cd1db858ee52adaf8020211354cd5c91145a07ff7c4bba7c333c7428a08b098ce1eaa98a5bbc66b33ab740dd76f9dbaed419b54199c696f4f31bd44c2b SHA512 32002c22388a3b6e79a2a39380f1270d73b3e91e47872b72bcb69cfc7ca8a9f2ce0e408b35c2b8446f2afb3c69dbc4821f22148ce778e2c708ebe4f742853cde
-EBUILD selinux-collectd-2.20190609-r1.ebuild 383 BLAKE2B cd94dc9ec044608768fb740cff2583d0232a6ca167719aab9caa374b9b503d9f86e33a72292f94509bcfaa3ef56fac0b453a9b8073336197685fed0e3b8a523e SHA512 6a79b8ccca6badafb7ea278f82fe5985d2290ae28e42b1aea4ae6ebdcb6d6fb0d19ec649794349ec0fc794320e311af5a7f2f2b4fefbff7e53aef9d9382b7fb6
+EBUILD selinux-collectd-2.20190609-r1.ebuild 381 BLAKE2B 17a959cd1db858ee52adaf8020211354cd5c91145a07ff7c4bba7c333c7428a08b098ce1eaa98a5bbc66b33ab740dd76f9dbaed419b54199c696f4f31bd44c2b SHA512 32002c22388a3b6e79a2a39380f1270d73b3e91e47872b72bcb69cfc7ca8a9f2ce0e408b35c2b8446f2afb3c69dbc4821f22148ce778e2c708ebe4f742853cde
+EBUILD selinux-collectd-2.20200818-r1.ebuild 383 BLAKE2B cd94dc9ec044608768fb740cff2583d0232a6ca167719aab9caa374b9b503d9f86e33a72292f94509bcfaa3ef56fac0b453a9b8073336197685fed0e3b8a523e SHA512 6a79b8ccca6badafb7ea278f82fe5985d2290ae28e42b1aea4ae6ebdcb6d6fb0d19ec649794349ec0fc794320e311af5a7f2f2b4fefbff7e53aef9d9382b7fb6
 EBUILD selinux-collectd-9999.ebuild 386 BLAKE2B a0ada1b380690f03e6630fcf9c77dd783ab14135bcae03cce604b112a917f795dae5bc017ef91b798408dcb5a6fc3fc6344e878e76306498ef68aec63e46e653 SHA512 31f4d90d4ab0b1c7c8a0ae8ad4dc7867d7d947c6d3f7ffd4cbddc1db15b92b5467f041ffef463ee74bd0347d6d5d7ce88c21356ea76b679bdfa4a5979a988e92
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-collectd/selinux-collectd-2.20190609-r1.ebuild b/sec-policy/selinux-collectd/selinux-collectd-2.20190609-r1.ebuild
index 82578a806621..2eb2d32bcbb6 100644
--- a/sec-policy/selinux-collectd/selinux-collectd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-collectd/selinux-collectd-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-collectd/selinux-collectd-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..82578a806621
--- /dev/null
+++ b/sec-policy/selinux-collectd/selinux-collectd-2.20200818-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 daafb6336cca..069f978f420f 100644
--- a/sec-policy/selinux-colord/Manifest
+++ b/sec-policy/selinux-colord/Manifest
@@ -1,5 +1,8 @@
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
-EBUILD selinux-colord-2.20190609-r1.ebuild 281 BLAKE2B 2c79abc44e75d49233d2084ee6a0af4d942bfddf0c510c5acb397148e89e4a82fd70a5d1a6dff743c58268ceb2c7c1a36a4ccd7cd117102e3da50cb22455cab0 SHA512 e8a0b181fb4bc3884379ed93b4bcd49c5f2c523eb75b12b05956ba715056a08b725417e905188e8d1905545a3a35edfef7d45c5f00e122b4b3402248b01b1ffd
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
+EBUILD selinux-colord-2.20190609-r1.ebuild 279 BLAKE2B 7533377ec675c3836471a1082a6cb8aa30612eba93f36bea096333d3f1f278f3709334a8e20ec3230a930adaa0484b843f4d18fe169d781acaf2608b6604f181 SHA512 337bb2a2c3cbf549c948bab5335046b550821614dd637cd3f7edb99b6efde16d4a1b4fdaa67e709108233695efc6fcea725b30095799ea9903ce3422a6bf23a6
+EBUILD selinux-colord-2.20200818-r1.ebuild 281 BLAKE2B 2c79abc44e75d49233d2084ee6a0af4d942bfddf0c510c5acb397148e89e4a82fd70a5d1a6dff743c58268ceb2c7c1a36a4ccd7cd117102e3da50cb22455cab0 SHA512 e8a0b181fb4bc3884379ed93b4bcd49c5f2c523eb75b12b05956ba715056a08b725417e905188e8d1905545a3a35edfef7d45c5f00e122b4b3402248b01b1ffd
 EBUILD selinux-colord-9999.ebuild 281 BLAKE2B 2c79abc44e75d49233d2084ee6a0af4d942bfddf0c510c5acb397148e89e4a82fd70a5d1a6dff743c58268ceb2c7c1a36a4ccd7cd117102e3da50cb22455cab0 SHA512 e8a0b181fb4bc3884379ed93b4bcd49c5f2c523eb75b12b05956ba715056a08b725417e905188e8d1905545a3a35edfef7d45c5f00e122b4b3402248b01b1ffd
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-colord/selinux-colord-2.20190609-r1.ebuild b/sec-policy/selinux-colord/selinux-colord-2.20190609-r1.ebuild
index ab98b57ae44e..5227c7770b88 100644
--- a/sec-policy/selinux-colord/selinux-colord-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-colord/selinux-colord-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-colord/selinux-colord-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..ab98b57ae44e
--- /dev/null
+++ b/sec-policy/selinux-colord/selinux-colord-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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-consolekit/Manifest b/sec-policy/selinux-consolekit/Manifest
deleted file mode 100644
index 1d82b366f201..000000000000
--- a/sec-policy/selinux-consolekit/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
-DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
-DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
-DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
-EBUILD selinux-consolekit-2.20190201-r1.ebuild 287 BLAKE2B 8ff9107e70eb65cb63ef037942d957a91bf88efa5fc357a97fde1db270e3c0a250288b8d6b1576a724126737bed77b6846502b92cae0fdf9d48c10cec102113e SHA512 c47e346abb21a066d399d85b3881836806a787af3704b046fb50b469727ab579cff674b72aa22163ed6fd438898b1e285e17e8093653e4362658fb9337b4f7ac
-EBUILD selinux-consolekit-2.20190609-r1.ebuild 289 BLAKE2B a8fdbc8009f91a13d70f8b23081af31a72a6ab272edb80a0552f8918048ccaf8620cbc9b70ceab8deb9a8c19aabe18586fcf99b0ed705ea56d94d5a461306aaa SHA512 63ecd794323ef9152991e342c111d45ce9e4d7c9fb32d5e1dd450e8e31c44706dd306c87f54e3777e754cf2eb1eb9321dc37c7c5d2cf4ec3ef013338a45aa26a
-EBUILD selinux-consolekit-9999.ebuild 292 BLAKE2B b959b47a3f2d5f290a613af7ea0d186e0df376f4720025b8724763f07c178566f8ff281d1071bec43eb8aaa3dec8a874239a190f090df73da83662671d20b11b SHA512 c3445e03e84edb69950237deb03a5f8f404393a5661b19cf2a3ec728911280f25fa70b423614123f2a07c9b9b27753503439339d0af021a23ca34719bd415e16
-MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-consolekit/metadata.xml b/sec-policy/selinux-consolekit/metadata.xml
deleted file mode 100644
index 9173800ffc42..000000000000
--- a/sec-policy/selinux-consolekit/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://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-corosync/Manifest b/sec-policy/selinux-corosync/Manifest
index f7ca77cc906f..cb16935b714e 100644
--- a/sec-policy/selinux-corosync/Manifest
+++ b/sec-policy/selinux-corosync/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-corosync-2.20190201-r1.ebuild 283 BLAKE2B 2198e3f80286408935d77bf920acb978cbec53833d094019bb1a7bc9b798730211ee1b877bed9d0a303d80ddafdc8969a892981ea1640367ef595408c7c28891 SHA512 52d07533b627a57f879c20b400190c3c7640b690050fa67f7e0522a03deb79453fcfc2d0146a741cd6bc48aadb981ce2353e3cf593e41fe2a235d40941f7fd49
-EBUILD selinux-corosync-2.20190609-r1.ebuild 285 BLAKE2B d9d892f294b0326a63ed38599e4d497063ff0a89038911c6b0621acf44051c464798536333b11277785ecd2bc8d98f52a628707f10635020c0a4af1287c96629 SHA512 c469ec40bc04d4ea0e4bc542821bad0744e84134088aa65ea23b5c5eca7bc44e3cf04c6e3a9cb9106cb049197074cbe429493d1b91aa156998c7994ee310189c
+EBUILD selinux-corosync-2.20190609-r1.ebuild 283 BLAKE2B 2198e3f80286408935d77bf920acb978cbec53833d094019bb1a7bc9b798730211ee1b877bed9d0a303d80ddafdc8969a892981ea1640367ef595408c7c28891 SHA512 52d07533b627a57f879c20b400190c3c7640b690050fa67f7e0522a03deb79453fcfc2d0146a741cd6bc48aadb981ce2353e3cf593e41fe2a235d40941f7fd49
+EBUILD selinux-corosync-2.20200818-r1.ebuild 285 BLAKE2B d9d892f294b0326a63ed38599e4d497063ff0a89038911c6b0621acf44051c464798536333b11277785ecd2bc8d98f52a628707f10635020c0a4af1287c96629 SHA512 c469ec40bc04d4ea0e4bc542821bad0744e84134088aa65ea23b5c5eca7bc44e3cf04c6e3a9cb9106cb049197074cbe429493d1b91aa156998c7994ee310189c
 EBUILD selinux-corosync-9999.ebuild 288 BLAKE2B bbb15d438b4dc3f34779c413bd81483cd5af0e8ca6a8352a5edf8edeb141761cecce475182b99da6a2480219a39f58f1b561ee974e479c7da36b9e71d4f28375 SHA512 1e39b5920b7eb32bd331f43dd2f44c46bec2325996e151e79cd7deba260379721c8c8d5111e9d5d1426cd550998bae35074391ebede14f25a5f66f2f671e53cd
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-corosync/selinux-corosync-2.20190609-r1.ebuild b/sec-policy/selinux-corosync/selinux-corosync-2.20190609-r1.ebuild
index 492a3aff0e78..bddc292c3cc9 100644
--- a/sec-policy/selinux-corosync/selinux-corosync-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-corosync/selinux-corosync-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-corosync/selinux-corosync-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..492a3aff0e78
--- /dev/null
+++ b/sec-policy/selinux-corosync/selinux-corosync-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 f781e88a58ce..e55fd4941b53 100644
--- a/sec-policy/selinux-couchdb/Manifest
+++ b/sec-policy/selinux-couchdb/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-couchdb-2.20190201-r1.ebuild 281 BLAKE2B d513c992867bc074159e5527a9283d624c33515c95e2a45941ae2141f6c0cedd24499dd656bbf5d8fd7af5c09d683d092ab8abc7a9834583200ba3ca28670c4a SHA512 3dcb4fe88cd1dc914e3825353dc86deefbfdcbd2910e539587c7facfc665f54395d98ac6a2432ad24bab092bff1044533da6608b78e85d59b708e9e5260037e8
-EBUILD selinux-couchdb-2.20190609-r1.ebuild 283 BLAKE2B f37dfb9039e9ca48ce9c02429ffd26e5ce4af6256363b8d12d6caa3fcb20bdbf8e006586bb8fc69e50d6f9f8d5e50ecc0dff46ad7efebc015f3633cc5d42d68d SHA512 df1942c430e90e5d523d2c273e5439080bbf1cc9f5d8b5e42155bb7717f54f966384d766ad7d0bdb7c9a8c77679d4116903970dd9a3dd1afe9aced15add75f68
+EBUILD selinux-couchdb-2.20190609-r1.ebuild 281 BLAKE2B d513c992867bc074159e5527a9283d624c33515c95e2a45941ae2141f6c0cedd24499dd656bbf5d8fd7af5c09d683d092ab8abc7a9834583200ba3ca28670c4a SHA512 3dcb4fe88cd1dc914e3825353dc86deefbfdcbd2910e539587c7facfc665f54395d98ac6a2432ad24bab092bff1044533da6608b78e85d59b708e9e5260037e8
+EBUILD selinux-couchdb-2.20200818-r1.ebuild 283 BLAKE2B f37dfb9039e9ca48ce9c02429ffd26e5ce4af6256363b8d12d6caa3fcb20bdbf8e006586bb8fc69e50d6f9f8d5e50ecc0dff46ad7efebc015f3633cc5d42d68d SHA512 df1942c430e90e5d523d2c273e5439080bbf1cc9f5d8b5e42155bb7717f54f966384d766ad7d0bdb7c9a8c77679d4116903970dd9a3dd1afe9aced15add75f68
 EBUILD selinux-couchdb-9999.ebuild 286 BLAKE2B 054274d8a44593f280c9c49236c5190fd6e321f088f8bfe00210904cc624cc64fea0c18a8f3db4a656f41c9e27453eab984db6e5b0d90f0dc63893a1b6758134 SHA512 faa851337eac4c43f3f449ae03b545ea6669ed1e7cb974855876ab8f54adf845fb7146d5b8ebe86f2efd1d9c71197edc27c058b1de6e710b9624d07df32f8a68
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-couchdb/selinux-couchdb-2.20190609-r1.ebuild b/sec-policy/selinux-couchdb/selinux-couchdb-2.20190609-r1.ebuild
index 1eea9a03560d..a0c751186b13 100644
--- a/sec-policy/selinux-couchdb/selinux-couchdb-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-couchdb/selinux-couchdb-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-couchdb/selinux-couchdb-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..1eea9a03560d
--- /dev/null
+++ b/sec-policy/selinux-couchdb/selinux-couchdb-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 70255d102dbc..8940afc99713 100644
--- a/sec-policy/selinux-courier/Manifest
+++ b/sec-policy/selinux-courier/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-courier-2.20190201-r1.ebuild 281 BLAKE2B e6e04cb26645e913102a74a20379a539c635ea04a589112a9bad7558b1cb31fe1fdca03874e06803357ef49757ec0ee430649313f5c18073e84c21d87d586788 SHA512 ddaf17f887197b7fc9ec29327bce47692ed76509f948cc139fa909025236f8623473bcb788fbfe1f49441917d4187354ba938580796ab55318c5109b7dd8d8ab
-EBUILD selinux-courier-2.20190609-r1.ebuild 283 BLAKE2B 578e5cac584f4519bba456aa412db2be023c1c11fb81a8aec72f9a70af2bbf46e0b0363b6bdd8a739fbf143482e3a1f07892664948298c799d923a3d2725ff9d SHA512 795133130f9a9eb0b01d2394e2e59871cd2839588b71d848bc17787f957b57f29fa79b6baa96ef6a807dd3a1b635b44773b33ba954946a542d43e4124adf6192
+EBUILD selinux-courier-2.20190609-r1.ebuild 281 BLAKE2B e6e04cb26645e913102a74a20379a539c635ea04a589112a9bad7558b1cb31fe1fdca03874e06803357ef49757ec0ee430649313f5c18073e84c21d87d586788 SHA512 ddaf17f887197b7fc9ec29327bce47692ed76509f948cc139fa909025236f8623473bcb788fbfe1f49441917d4187354ba938580796ab55318c5109b7dd8d8ab
+EBUILD selinux-courier-2.20200818-r1.ebuild 283 BLAKE2B 578e5cac584f4519bba456aa412db2be023c1c11fb81a8aec72f9a70af2bbf46e0b0363b6bdd8a739fbf143482e3a1f07892664948298c799d923a3d2725ff9d SHA512 795133130f9a9eb0b01d2394e2e59871cd2839588b71d848bc17787f957b57f29fa79b6baa96ef6a807dd3a1b635b44773b33ba954946a542d43e4124adf6192
 EBUILD selinux-courier-9999.ebuild 286 BLAKE2B 035e6fca082d6ea66ae74b3c642f4cb70f3904f0337bd1079b9e3304c0168b4f602449c1e4409f27de00f3302addaee519d40b1b25e2858c077a3167e5ba8366 SHA512 db8018fbce4284508712b4ccf8b41c581e93dc47d28c5c1ec6238f4732995a654294e644f72680ecb6e8f47fa194f2fff77bddc7924ef4ef04fd3b00e24763f1
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-courier/selinux-courier-2.20190609-r1.ebuild b/sec-policy/selinux-courier/selinux-courier-2.20190609-r1.ebuild
index 6997e079b95a..e386d720af7c 100644
--- a/sec-policy/selinux-courier/selinux-courier-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-courier/selinux-courier-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-courier/selinux-courier-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..6997e079b95a
--- /dev/null
+++ b/sec-policy/selinux-courier/selinux-courier-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 b0dca30f0f77..d1299a22f2e8 100644
--- a/sec-policy/selinux-cpucontrol/Manifest
+++ b/sec-policy/selinux-cpucontrol/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-cpucontrol-2.20190201-r1.ebuild 287 BLAKE2B 0a8439d581fd71bfadcb0796bf8b9f5cf77e8c0bd90cd2ac43d03d4c82916f27229d57c31b4acc6febd9873a8c2770515e3356441f7e485e5ad5873709f8d2f9 SHA512 c6be951c5208174d18a425e9fecd53e2cb0fccdf69cc88a395933e16e8fcb5bf0d80af7d55807856e140ac38641689e8ed7c47dae4f9779238df7ed29d635c9a
-EBUILD selinux-cpucontrol-2.20190609-r1.ebuild 289 BLAKE2B fbd731b00268b790bc980e24fda334ce4fe147ecc235af9ed105d3ae4bbcc26171bb957c97f98c3d045637c8e28bf7945c6e968b06bcdbf5896176d5fe611d40 SHA512 0307bcec416da26b2e82e069405cdfb76ccad9eca9e5cc29c191d1637e019629c80d90565816201ca607a82e91ece8e00689fa1a31c7562c4389e2b404e34501
+EBUILD selinux-cpucontrol-2.20190609-r1.ebuild 287 BLAKE2B 0a8439d581fd71bfadcb0796bf8b9f5cf77e8c0bd90cd2ac43d03d4c82916f27229d57c31b4acc6febd9873a8c2770515e3356441f7e485e5ad5873709f8d2f9 SHA512 c6be951c5208174d18a425e9fecd53e2cb0fccdf69cc88a395933e16e8fcb5bf0d80af7d55807856e140ac38641689e8ed7c47dae4f9779238df7ed29d635c9a
+EBUILD selinux-cpucontrol-2.20200818-r1.ebuild 289 BLAKE2B fbd731b00268b790bc980e24fda334ce4fe147ecc235af9ed105d3ae4bbcc26171bb957c97f98c3d045637c8e28bf7945c6e968b06bcdbf5896176d5fe611d40 SHA512 0307bcec416da26b2e82e069405cdfb76ccad9eca9e5cc29c191d1637e019629c80d90565816201ca607a82e91ece8e00689fa1a31c7562c4389e2b404e34501
 EBUILD selinux-cpucontrol-9999.ebuild 292 BLAKE2B 90f101dc18eb2221d278302d4317645747206e0a44142bcc09b292771e076a2c627d750458852476628768021618ba146105dd3b43cc14b7a47f6895b9999cc2 SHA512 f65c7a525b4e1e9e65e40ef971747924dbff6f69a9f163dfbdeab57706f906c33fd9db1f5ca431d5f01fd4c9e67a6012b4390458f276e2ff5fbe8c99fbf3853b
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20190609-r1.ebuild b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20190609-r1.ebuild
index 87539bb0578d..e052c5e46053 100644
--- a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..87539bb0578d
--- /dev/null
+++ b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 7d32fa07d5e1..59f33da0da0f 100644
--- a/sec-policy/selinux-cpufreqselector/Manifest
+++ b/sec-policy/selinux-cpufreqselector/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-cpufreqselector-2.20190201-r1.ebuild 297 BLAKE2B be345972d93d700482d355cdee230c9ed9d1c1a41b14dcad74009a741d38cd036600889feb68701f87485aa2e8ef751efad82e8b0eb183f1046cde5efb2f2c8f SHA512 50ab8d4b3c8f2ee4eb2de411f1d514e7aaaef0497957da1b9e928d9925f29400d8ad2f79092efc6064a0b1b45ea5a1b7cf15e6fbd1dc8c901191178bbc7721d8
-EBUILD selinux-cpufreqselector-2.20190609-r1.ebuild 299 BLAKE2B e3ab8851a8d0ab7e24d81328e6821936ff6e1ca9ec71c8f58d5182d3c5387e22b3904f58d24a3591ac8ff687c42d5049cecdcb2b4332b86e6a8dc850399d1bbc SHA512 9228ffc15c708ee3eb34b4ade9c2deac281cf0c9c5ab5ca5de6c553cc121829f136101902427676ca0a524d5558ca90571815f08e3363a6ac3dc32679a2c30d8
+EBUILD selinux-cpufreqselector-2.20190609-r1.ebuild 297 BLAKE2B be345972d93d700482d355cdee230c9ed9d1c1a41b14dcad74009a741d38cd036600889feb68701f87485aa2e8ef751efad82e8b0eb183f1046cde5efb2f2c8f SHA512 50ab8d4b3c8f2ee4eb2de411f1d514e7aaaef0497957da1b9e928d9925f29400d8ad2f79092efc6064a0b1b45ea5a1b7cf15e6fbd1dc8c901191178bbc7721d8
+EBUILD selinux-cpufreqselector-2.20200818-r1.ebuild 299 BLAKE2B e3ab8851a8d0ab7e24d81328e6821936ff6e1ca9ec71c8f58d5182d3c5387e22b3904f58d24a3591ac8ff687c42d5049cecdcb2b4332b86e6a8dc850399d1bbc SHA512 9228ffc15c708ee3eb34b4ade9c2deac281cf0c9c5ab5ca5de6c553cc121829f136101902427676ca0a524d5558ca90571815f08e3363a6ac3dc32679a2c30d8
 EBUILD selinux-cpufreqselector-9999.ebuild 302 BLAKE2B 304cbb5e443532c0081439410070203d0b1da972bbdab59d409d6e2d83ee1dd0a747319ad6041bb5fbd03d6626c5b4c134e950e54eec05c23430558bdb606ef7 SHA512 38544db23220e3f9dd281b3f250adf5cb83754df1109c1de1a4aa87be5a9d4d51519006f38ea7f6143bc18971e2857dae215c8a6944b160f38b4097a2906b046
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20190609-r1.ebuild b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20190609-r1.ebuild
index 40d818f6fdff..4406aa586813 100644
--- a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..40d818f6fdff
--- /dev/null
+++ b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 7e52e8a4b2e8..a8aa448647eb 100644
--- a/sec-policy/selinux-cups/Manifest
+++ b/sec-policy/selinux-cups/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-cups-2.20190201-r1.ebuild 365 BLAKE2B 4f29ef848b343bd3c6e68c8ecd4193ff17cd3614820431aedf25f48997a1604e2635ba94dc5bc58bf8c567ae4e478b294932ac20f314a0285ffcb7a102b87f0b SHA512 201adc81cb9346b8642da2fa3e5df8504d68fb4a42514ccd0f1537c43c4f8543cb9ac891aabd687e6e2e3bea47b8ad37feddb763228581397fa0e0aff6757471
-EBUILD selinux-cups-2.20190609-r1.ebuild 367 BLAKE2B 1a809a243e9af7132a53388d58480299fbc3e4b7484726867e74aa3d9470f25b823c944e61538f2f7851e49d755b2f0fbb47df06a2a24c0d6e0b987408eada4d SHA512 9abbe9c488f09c657a3fe9b28c9c678992e77ea829fe621a44f2fc9b18aee44f49f54b4d5915eab6e71bdfa496fcb529e3d06e3a79829e45aeacbfc9e69de801
+EBUILD selinux-cups-2.20190609-r1.ebuild 365 BLAKE2B 4f29ef848b343bd3c6e68c8ecd4193ff17cd3614820431aedf25f48997a1604e2635ba94dc5bc58bf8c567ae4e478b294932ac20f314a0285ffcb7a102b87f0b SHA512 201adc81cb9346b8642da2fa3e5df8504d68fb4a42514ccd0f1537c43c4f8543cb9ac891aabd687e6e2e3bea47b8ad37feddb763228581397fa0e0aff6757471
+EBUILD selinux-cups-2.20200818-r1.ebuild 367 BLAKE2B 1a809a243e9af7132a53388d58480299fbc3e4b7484726867e74aa3d9470f25b823c944e61538f2f7851e49d755b2f0fbb47df06a2a24c0d6e0b987408eada4d SHA512 9abbe9c488f09c657a3fe9b28c9c678992e77ea829fe621a44f2fc9b18aee44f49f54b4d5915eab6e71bdfa496fcb529e3d06e3a79829e45aeacbfc9e69de801
 EBUILD selinux-cups-9999.ebuild 370 BLAKE2B 1a6a21abea290681f8ff0c44c4478241a3d055a1eb40a6e357d94fd942edfcf006baac29aa5952b43f687bf0c1f1a0611bddb613297727d8019da7efac23328f SHA512 16dbe034c5e538f40b4f67bc68e96e5d0169fe82d9016e97f1e88fd32c57fae743e79cfab051cf4802d118eae11c3917d581f4ac98f42efc7a8806ba7e2bc27f
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-cups/selinux-cups-2.20190609-r1.ebuild b/sec-policy/selinux-cups/selinux-cups-2.20190609-r1.ebuild
index ef76549f7e20..7df0fe175dde 100644
--- a/sec-policy/selinux-cups/selinux-cups-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-cups/selinux-cups-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-cups/selinux-cups-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..ef76549f7e20
--- /dev/null
+++ b/sec-policy/selinux-cups/selinux-cups-2.20200818-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 42ebbce1745d..a56a046a3d20 100644
--- a/sec-policy/selinux-cvs/Manifest
+++ b/sec-policy/selinux-cvs/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-cvs-2.20190201-r1.ebuild 421 BLAKE2B 7b1d4e66a76a2f87b2215685199026603b2a4e78cba080e73684fb9cc5dc864ba90ea35510d97c316c9a8d2477ef58c748f4ada85dd5d7d323580185fd722226 SHA512 c8e1c4975eed2c29214bcc2a915b37d1acd06b258210d99784a0418d49770d9546453d978122ee55b03c783965dc15f4a75b861bcfc4f280c18c040998219b3a
-EBUILD selinux-cvs-2.20190609-r1.ebuild 423 BLAKE2B cb8d7d9e35dab2656a932fc98eda248d0ee09623053a8813d7fc25d8414085f77256baa76d63974d0d089ecad11bbdc7e8bed600bcdb590134e9027d0eb19b3c SHA512 b0a8cebfa2209b098b68b81588468ea237bf5fb40dcfa004ee32dc1ad913b2b1982cbd854e6f97da481ab494408a46b6a271cd8f6da8e4b116afa1a3e1c46d4e
+EBUILD selinux-cvs-2.20190609-r1.ebuild 421 BLAKE2B 7b1d4e66a76a2f87b2215685199026603b2a4e78cba080e73684fb9cc5dc864ba90ea35510d97c316c9a8d2477ef58c748f4ada85dd5d7d323580185fd722226 SHA512 c8e1c4975eed2c29214bcc2a915b37d1acd06b258210d99784a0418d49770d9546453d978122ee55b03c783965dc15f4a75b861bcfc4f280c18c040998219b3a
+EBUILD selinux-cvs-2.20200818-r1.ebuild 423 BLAKE2B cb8d7d9e35dab2656a932fc98eda248d0ee09623053a8813d7fc25d8414085f77256baa76d63974d0d089ecad11bbdc7e8bed600bcdb590134e9027d0eb19b3c SHA512 b0a8cebfa2209b098b68b81588468ea237bf5fb40dcfa004ee32dc1ad913b2b1982cbd854e6f97da481ab494408a46b6a271cd8f6da8e4b116afa1a3e1c46d4e
 EBUILD selinux-cvs-9999.ebuild 426 BLAKE2B 0a24c1e69546c1166d50b7ae7647693a39ab5383d00b49ce6d95a94f1c69aebc3d208c6d2ee4f1b98c6333bd84d6d0f4e8cb0acc464ae2ffc6f59178f47c4f15 SHA512 f86a9e445e48adfd63e04e8dee78f334cccf8cec8b0bdce84bdf9d55aafaa1db0caeed02a53c43017f23bb52e342f50ae19880d2c60d78103f5381cd0800d95a
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-cvs/selinux-cvs-2.20190609-r1.ebuild b/sec-policy/selinux-cvs/selinux-cvs-2.20190609-r1.ebuild
index b44fe8dcab44..4eb8346ea7b6 100644
--- a/sec-policy/selinux-cvs/selinux-cvs-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-cvs/selinux-cvs-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-cvs/selinux-cvs-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..b44fe8dcab44
--- /dev/null
+++ b/sec-policy/selinux-cvs/selinux-cvs-2.20200818-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 951a1327b72a..6a93964fd000 100644
--- a/sec-policy/selinux-cyphesis/Manifest
+++ b/sec-policy/selinux-cyphesis/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-cyphesis-2.20190201-r1.ebuild 283 BLAKE2B 14ba4a4d0ece648f0a550a0941472fd4d2d9a29d1293b6b510f264a4113881242353920f5aa95555487650043e52cdc32ff31f42e4f41dc583c7fa1bcf927782 SHA512 92a586f376ab93f8f8ab0c6893eeafedcf6ccb5ef3609ca4bd5a63dadd143dd8315453cc19371c4e69edeb9e1daab2955231dc93ba353d1f9552426b5e5065c2
-EBUILD selinux-cyphesis-2.20190609-r1.ebuild 285 BLAKE2B 2baba8f35087be47a337145d10d4159b5d448fac503f732952bd6ff9221c296db92a10f0835e979a2e17a1c3359b427fe9b02a2448c0440b4b77b3c69d71fc2d SHA512 22caaa32cc1579b9e63dcb2808511a8022b841827d47ad754899799503218e52da1b0939fabdfc4d130690970d66ab59db02f298efaa8f5901180a27bb63ee80
+EBUILD selinux-cyphesis-2.20190609-r1.ebuild 283 BLAKE2B 14ba4a4d0ece648f0a550a0941472fd4d2d9a29d1293b6b510f264a4113881242353920f5aa95555487650043e52cdc32ff31f42e4f41dc583c7fa1bcf927782 SHA512 92a586f376ab93f8f8ab0c6893eeafedcf6ccb5ef3609ca4bd5a63dadd143dd8315453cc19371c4e69edeb9e1daab2955231dc93ba353d1f9552426b5e5065c2
+EBUILD selinux-cyphesis-2.20200818-r1.ebuild 285 BLAKE2B 2baba8f35087be47a337145d10d4159b5d448fac503f732952bd6ff9221c296db92a10f0835e979a2e17a1c3359b427fe9b02a2448c0440b4b77b3c69d71fc2d SHA512 22caaa32cc1579b9e63dcb2808511a8022b841827d47ad754899799503218e52da1b0939fabdfc4d130690970d66ab59db02f298efaa8f5901180a27bb63ee80
 EBUILD selinux-cyphesis-9999.ebuild 288 BLAKE2B 91c08b7a60d429256421706584cbe90aa9ebe0d71f23dafbb377a15281a4134b714a4a0a23274f48b09fa51135e490e89ee8e4cecd240f9646c14275847fe52f SHA512 78c064946a2f2c4f5a5235b0ddc78060163dae164a8205ba5adfec1e1c5c742ec9bbbbd81d27be86c963c0f1c5942049e14d3d6707f578959a906d00183825da
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20190609-r1.ebuild b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20190609-r1.ebuild
index e14b4aacd141..aace0ba91fa1 100644
--- a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..e14b4aacd141
--- /dev/null
+++ b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 2ab425a89e82..6d0daa6f6b9d 100644
--- a/sec-policy/selinux-daemontools/Manifest
+++ b/sec-policy/selinux-daemontools/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-daemontools-2.20190201-r1.ebuild 289 BLAKE2B 78cce0f411f28593b77ab3ae118d9d2c36f831b872999addc9538e9bf0cec07905b23a8efd0eb5106d23cbb22db6173f8c2e67783d1e2d628e8c4892e2c664ce SHA512 09034e7453c7238104df33817bb83db38c7feed14a245ee01f28a11eac6ba746c3fe8ee48c862761e78d951c13ebd407b84d0f8dd4383263d1cd38f01dcf2b90
-EBUILD selinux-daemontools-2.20190609-r1.ebuild 291 BLAKE2B 5e9313a463fa23b8214ddbc98b43fbda39f674438c199902668a981bc4ce6f0ae7b92e2b7bf0ef2e5b7d6dd0c7e1b44a18303e1077fe4a7c76f578bd63b7a89d SHA512 0f5d66788ae64a780244a060ba63d68b22c7ff3cc572889153d942243ae45b3741ac806eb3014fdd79f8592cae88f0b639a5ca4a43fd2e7a9b52d5b19ca1d785
+EBUILD selinux-daemontools-2.20190609-r1.ebuild 289 BLAKE2B 78cce0f411f28593b77ab3ae118d9d2c36f831b872999addc9538e9bf0cec07905b23a8efd0eb5106d23cbb22db6173f8c2e67783d1e2d628e8c4892e2c664ce SHA512 09034e7453c7238104df33817bb83db38c7feed14a245ee01f28a11eac6ba746c3fe8ee48c862761e78d951c13ebd407b84d0f8dd4383263d1cd38f01dcf2b90
+EBUILD selinux-daemontools-2.20200818-r1.ebuild 291 BLAKE2B 5e9313a463fa23b8214ddbc98b43fbda39f674438c199902668a981bc4ce6f0ae7b92e2b7bf0ef2e5b7d6dd0c7e1b44a18303e1077fe4a7c76f578bd63b7a89d SHA512 0f5d66788ae64a780244a060ba63d68b22c7ff3cc572889153d942243ae45b3741ac806eb3014fdd79f8592cae88f0b639a5ca4a43fd2e7a9b52d5b19ca1d785
 EBUILD selinux-daemontools-9999.ebuild 294 BLAKE2B fa34a3ec8d0ddabcfc1ffcf8f71482cf401c7e5f1321cd2b037437825dca7ab891967b89525df1ff0e256877a097e7b5cafc3eeb0a4cc50017d85e95c8c4a998 SHA512 b33cda9b6228d6f2fb2c81a2da98920ce3aecbebb41287a8e2a4977ea6fd9a16b4c67b0d7fc6ac0c5f143a40fcec0c84638124ba6b2a1c96d86a062f85c16924
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-daemontools/selinux-daemontools-2.20190609-r1.ebuild b/sec-policy/selinux-daemontools/selinux-daemontools-2.20190609-r1.ebuild
index 1b4ee6d4ecd1..bb6c6bd46e73 100644
--- a/sec-policy/selinux-daemontools/selinux-daemontools-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-daemontools/selinux-daemontools-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-daemontools/selinux-daemontools-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..1b4ee6d4ecd1
--- /dev/null
+++ b/sec-policy/selinux-daemontools/selinux-daemontools-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 69e80345d872..8dc593c78e68 100644
--- a/sec-policy/selinux-dante/Manifest
+++ b/sec-policy/selinux-dante/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-dante-2.20190201-r1.ebuild 277 BLAKE2B 71889654b43a1be75dc76719fdf465862e176d1c9a65c713cfa7f77fc30b15f59b278555ad4434cb108ee7dce58549a78f79da17d948ec176078a836f8294584 SHA512 b1a63f75afd135c8cffca782335e4bafa2f10260cc128370d6c6b5038cccc19f038ce4c3022bed3c5595a359f8915c378cfe4604378004f43f4251cf4b9a11ee
-EBUILD selinux-dante-2.20190609-r1.ebuild 279 BLAKE2B e800aeca3aa5708886d53df2532f6f866637d03777a9df287be3a9dfbb6314b9a9f04e4edfef9249fecb83f76d7e809c6ec4e54f303f654720f04d3a2b7e93e2 SHA512 adef5115da5434286905ee759d05e20819237f8f0b9adf6683b7a661b4e36f664a7d5abbac8d00be5aad6b78653307b71c4a2c86358951fb788257a94abce9be
+EBUILD selinux-dante-2.20190609-r1.ebuild 277 BLAKE2B 71889654b43a1be75dc76719fdf465862e176d1c9a65c713cfa7f77fc30b15f59b278555ad4434cb108ee7dce58549a78f79da17d948ec176078a836f8294584 SHA512 b1a63f75afd135c8cffca782335e4bafa2f10260cc128370d6c6b5038cccc19f038ce4c3022bed3c5595a359f8915c378cfe4604378004f43f4251cf4b9a11ee
+EBUILD selinux-dante-2.20200818-r1.ebuild 279 BLAKE2B e800aeca3aa5708886d53df2532f6f866637d03777a9df287be3a9dfbb6314b9a9f04e4edfef9249fecb83f76d7e809c6ec4e54f303f654720f04d3a2b7e93e2 SHA512 adef5115da5434286905ee759d05e20819237f8f0b9adf6683b7a661b4e36f664a7d5abbac8d00be5aad6b78653307b71c4a2c86358951fb788257a94abce9be
 EBUILD selinux-dante-9999.ebuild 282 BLAKE2B ac6f53953f4682447995ca906183434e68a8d252a2be2477043aeda478a9ac0fee0fe6d68f7dad266dca22004e2d7b6bdb2ddcb96263afee60cab4713047446d SHA512 14fcf5e36de28c5147cfa26c4772ed4ebfeacfa2c239aeba1a897a05cfe8b1493cf22f81cf527878841f46330779b12c4c67ecfc28bf794dcdc848bc99214b57
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dante/selinux-dante-2.20190609-r1.ebuild b/sec-policy/selinux-dante/selinux-dante-2.20190609-r1.ebuild
index 197352fe2e3a..7f5e5c8dacfd 100644
--- a/sec-policy/selinux-dante/selinux-dante-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-dante/selinux-dante-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-dante/selinux-dante-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..197352fe2e3a
--- /dev/null
+++ b/sec-policy/selinux-dante/selinux-dante-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 80ab5613514b..06aaebac97eb 100644
--- a/sec-policy/selinux-dbadm/Manifest
+++ b/sec-policy/selinux-dbadm/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-dbadm-2.20190201-r1.ebuild 277 BLAKE2B 28efaf20a5fe99779bfc16a567341d45397e38af17c83b8082ecdb61de147174654eab7bf697e247b8d619a49e6c8686e7435f2e1bf63c635c08fbd64c19f1bd SHA512 c9ae2b7254898735eddff20c3ac01e50c5f7949ac9d994e693750d85826a7c33068ed0923c860262e31d79e323a21cf0175dd9b92de990629c4fbd486187c14a
-EBUILD selinux-dbadm-2.20190609-r1.ebuild 279 BLAKE2B 4f3dc879bad0836bbb5e8322722c19969b987109b68da4d611b51004f4c21cb6df913218808a5209e30b6bd44fd40782dcb7c8ef7675f00ad15f6f65d73e290f SHA512 3a81e4d391d4e44ae80d27963719fb194966c8e164b3c2edc7c2fc41c7a667bba3c31082aa0c44b1e2536bfa7117e2ec76abd2e19b6c32c882b781bafde277c6
+EBUILD selinux-dbadm-2.20190609-r1.ebuild 277 BLAKE2B 28efaf20a5fe99779bfc16a567341d45397e38af17c83b8082ecdb61de147174654eab7bf697e247b8d619a49e6c8686e7435f2e1bf63c635c08fbd64c19f1bd SHA512 c9ae2b7254898735eddff20c3ac01e50c5f7949ac9d994e693750d85826a7c33068ed0923c860262e31d79e323a21cf0175dd9b92de990629c4fbd486187c14a
+EBUILD selinux-dbadm-2.20200818-r1.ebuild 279 BLAKE2B 4f3dc879bad0836bbb5e8322722c19969b987109b68da4d611b51004f4c21cb6df913218808a5209e30b6bd44fd40782dcb7c8ef7675f00ad15f6f65d73e290f SHA512 3a81e4d391d4e44ae80d27963719fb194966c8e164b3c2edc7c2fc41c7a667bba3c31082aa0c44b1e2536bfa7117e2ec76abd2e19b6c32c882b781bafde277c6
 EBUILD selinux-dbadm-9999.ebuild 282 BLAKE2B 2234965836cfea53911610a4863709da8d94d97d9573e8b9aaa2b83377158d2c9d74ddc27a11b17cfda8f817fe6a23dc24d70957295e585b09027544d64a93de SHA512 b42b594acdef838300ec488d01d7e190b60f424480ce702f1a41e665900bbe6606610174568472bd882ed2985f9dbf4e5ba715b6795825ad93ce775d1704d67e
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dbadm/selinux-dbadm-2.20190609-r1.ebuild b/sec-policy/selinux-dbadm/selinux-dbadm-2.20190609-r1.ebuild
index eb7bdd38545f..1debebca55dc 100644
--- a/sec-policy/selinux-dbadm/selinux-dbadm-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-dbadm/selinux-dbadm-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-dbadm/selinux-dbadm-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..eb7bdd38545f
--- /dev/null
+++ b/sec-policy/selinux-dbadm/selinux-dbadm-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 50ead16d651e..373eba713346 100644
--- a/sec-policy/selinux-dbskk/Manifest
+++ b/sec-policy/selinux-dbskk/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-dbskk-2.20190201-r1.ebuild 371 BLAKE2B 05414c7737864d5243bfd3a947a295a616dc8fb9a8b0f48c8aff39820bcd017f00bdb59c0d9354dd3a03aff953211bfd7f82030f51e72469940a03ad0089ded6 SHA512 9103eeb2c44996e914631b4492c7d2f1bd289f701609ca2571b48c8ecea59f5de848f851e90803156e16ff7d8c8faa55db6e5cbc778157b30d58a9b3c41c3b64
-EBUILD selinux-dbskk-2.20190609-r1.ebuild 373 BLAKE2B 899eae84aec5c514484159e7995b11b87c9bdd73b08f95a439950b9012190746eec508faa2189c0bfe5a6c64478ab28d87003e6b734b87d7ee12db9809034561 SHA512 c83a8ea4c6f06f91148f803966b4c47404c8e6dc79c46e814ac16a6ef1da375390ed05132da84832bfd22383afaf7e3392ee179219d1e7fb347005bf0008d167
+EBUILD selinux-dbskk-2.20190609-r1.ebuild 371 BLAKE2B 05414c7737864d5243bfd3a947a295a616dc8fb9a8b0f48c8aff39820bcd017f00bdb59c0d9354dd3a03aff953211bfd7f82030f51e72469940a03ad0089ded6 SHA512 9103eeb2c44996e914631b4492c7d2f1bd289f701609ca2571b48c8ecea59f5de848f851e90803156e16ff7d8c8faa55db6e5cbc778157b30d58a9b3c41c3b64
+EBUILD selinux-dbskk-2.20200818-r1.ebuild 373 BLAKE2B 899eae84aec5c514484159e7995b11b87c9bdd73b08f95a439950b9012190746eec508faa2189c0bfe5a6c64478ab28d87003e6b734b87d7ee12db9809034561 SHA512 c83a8ea4c6f06f91148f803966b4c47404c8e6dc79c46e814ac16a6ef1da375390ed05132da84832bfd22383afaf7e3392ee179219d1e7fb347005bf0008d167
 EBUILD selinux-dbskk-9999.ebuild 376 BLAKE2B 4276d8b588244310a6afa03709637dea9beef8ca68d0aad55add6927d226434630e31d436460c9760ef1e2d01a6e8c47757ffe18d07d0fdde8fd2033ebd4d8ef SHA512 44c423de8c8a30a942374c31aa8d313dbe52bc3eb34f1c798e4e405bf32d6c115e59a16e73c79e26a0419e5c9131220aa0ad7734896a840255311e00e5c5152d
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dbskk/selinux-dbskk-2.20190609-r1.ebuild b/sec-policy/selinux-dbskk/selinux-dbskk-2.20190609-r1.ebuild
index cdb06e002202..08be811020b4 100644
--- a/sec-policy/selinux-dbskk/selinux-dbskk-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-dbskk/selinux-dbskk-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-dbskk/selinux-dbskk-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..cdb06e002202
--- /dev/null
+++ b/sec-policy/selinux-dbskk/selinux-dbskk-2.20200818-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 bed33d76919a..bed5420470aa 100644
--- a/sec-policy/selinux-dbus/Manifest
+++ b/sec-policy/selinux-dbus/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-dbus-2.20190201-r1.ebuild 275 BLAKE2B a9491738dc9183b7e38952a32181baf2f227501a12ed5fe652c2db9aa914b92fbe6676275cfcd74371e77ea79bbef76f1e5b10aa045b9433b4955d20cdf0e719 SHA512 f0e6630aa8f2e260b4e947be9dcb1c3af816566971f9e3ef1f509e451eb93eb02a88249f8198e4a74aa9a448b12f86bb9f912b917bffd345e35565d69484ab0b
-EBUILD selinux-dbus-2.20190609-r1.ebuild 277 BLAKE2B 0702f90738fbcd435da37793a22e09211089a236be27c24bc36361caf5f5756a41b528c22c4dc325065fed3ff835f34577c6ebbbcb4fc518fb2225757825bec1 SHA512 7225fe881ad5a2b8443be6a06cf81b4006d3d37a84bf465d9497d9ad1372afe27960fb9f4c8e0a40355f0335d0173f2fbda54f512821294fa355628721d58f6a
+EBUILD selinux-dbus-2.20190609-r1.ebuild 275 BLAKE2B a9491738dc9183b7e38952a32181baf2f227501a12ed5fe652c2db9aa914b92fbe6676275cfcd74371e77ea79bbef76f1e5b10aa045b9433b4955d20cdf0e719 SHA512 f0e6630aa8f2e260b4e947be9dcb1c3af816566971f9e3ef1f509e451eb93eb02a88249f8198e4a74aa9a448b12f86bb9f912b917bffd345e35565d69484ab0b
+EBUILD selinux-dbus-2.20200818-r1.ebuild 277 BLAKE2B 0702f90738fbcd435da37793a22e09211089a236be27c24bc36361caf5f5756a41b528c22c4dc325065fed3ff835f34577c6ebbbcb4fc518fb2225757825bec1 SHA512 7225fe881ad5a2b8443be6a06cf81b4006d3d37a84bf465d9497d9ad1372afe27960fb9f4c8e0a40355f0335d0173f2fbda54f512821294fa355628721d58f6a
 EBUILD selinux-dbus-9999.ebuild 280 BLAKE2B 3e28b3d4d8318ced51fbde7ac34fcaec622f4d8ffda68fbe270ad3fd6bb812209d6243d7bbb390003a632bb40219a2c80f689b26557372b9980ea46b1f0c99a3 SHA512 c12c940dc60938ee6d70174ccd9e06ed0926754980bc879685c8577a75e4c7b495da446cb312ec9020bbffd4992948e39a206d6d0d435dcf7929317694fefab6
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dbus/selinux-dbus-2.20190609-r1.ebuild b/sec-policy/selinux-dbus/selinux-dbus-2.20190609-r1.ebuild
index 08368fca8786..30e4ce38da9e 100644
--- a/sec-policy/selinux-dbus/selinux-dbus-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-dbus/selinux-dbus-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-dbus/selinux-dbus-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..08368fca8786
--- /dev/null
+++ b/sec-policy/selinux-dbus/selinux-dbus-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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-dcc/Manifest b/sec-policy/selinux-dcc/Manifest
index d9a9a59bb13b..2482192743f9 100644
--- a/sec-policy/selinux-dcc/Manifest
+++ b/sec-policy/selinux-dcc/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-dcc-2.20190201-r1.ebuild 273 BLAKE2B c094d9a9b14f1cdf111fea9c86cf30b2c127a65895f8703b2c3bd1af026ecdd1380d9ab590fbd44611490f13741708fc4a3515fa5870669042b23893eb965578 SHA512 87a8edce662ed6b3a78d629cf0c6cc95af85c75d53d1ce9b369e758b24ff113094db2678872b52eec4aff6fdad486de95666c2aea8b8b2e3b582d51fe9968e03
-EBUILD selinux-dcc-2.20190609-r1.ebuild 275 BLAKE2B a475d80371d0fce04fe6ec143a224c330e1aa6a93da1e8ce5bbfbb21aa81dfc3761f0f1fc94b5de83190805c55718acf9c9306a1c151287de8c455fb297cd8f7 SHA512 ac60072844dde0d2020864a0d752702d3fc6b0b489302d2b0c2db0a3ca24f303513964944616511582d8af5bab6a55042bf818e79287c1f3188bf53bceb080f6
+EBUILD selinux-dcc-2.20190609-r1.ebuild 273 BLAKE2B c094d9a9b14f1cdf111fea9c86cf30b2c127a65895f8703b2c3bd1af026ecdd1380d9ab590fbd44611490f13741708fc4a3515fa5870669042b23893eb965578 SHA512 87a8edce662ed6b3a78d629cf0c6cc95af85c75d53d1ce9b369e758b24ff113094db2678872b52eec4aff6fdad486de95666c2aea8b8b2e3b582d51fe9968e03
+EBUILD selinux-dcc-2.20200818-r1.ebuild 275 BLAKE2B a475d80371d0fce04fe6ec143a224c330e1aa6a93da1e8ce5bbfbb21aa81dfc3761f0f1fc94b5de83190805c55718acf9c9306a1c151287de8c455fb297cd8f7 SHA512 ac60072844dde0d2020864a0d752702d3fc6b0b489302d2b0c2db0a3ca24f303513964944616511582d8af5bab6a55042bf818e79287c1f3188bf53bceb080f6
 EBUILD selinux-dcc-9999.ebuild 278 BLAKE2B 995c331706d56ff647d47e6bdebb12843b7e6a29e5c6ffcbcab24f993e633a4c027a66f8bfa1c778ab8d1358d0f98b13043d8a6c8919feb3e98bdd61eff38c03 SHA512 9b6af4bc0375e40dc9904e77811ed9a3a74c4314ec32378b93f787c31f5a24cfa8c703d98d354186759fc8ef9fd56f3e465b9b80803b80baa44f936d5b99ddb7
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dcc/selinux-dcc-2.20190609-r1.ebuild b/sec-policy/selinux-dcc/selinux-dcc-2.20190609-r1.ebuild
index 87ba80ff8144..3daeb35f2884 100644
--- a/sec-policy/selinux-dcc/selinux-dcc-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-dcc/selinux-dcc-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dcc"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dcc/selinux-dcc-2.20200818-r1.ebuild b/sec-policy/selinux-dcc/selinux-dcc-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..87ba80ff8144
--- /dev/null
+++ b/sec-policy/selinux-dcc/selinux-dcc-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="dcc"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dcc"
+
+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 a8d2c564ff6b..62b974f41950 100644
--- a/sec-policy/selinux-ddclient/Manifest
+++ b/sec-policy/selinux-ddclient/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-ddclient-2.20190201-r1.ebuild 283 BLAKE2B 35ad75e94be50514e92b4daece3d1932d6f196f6dadc4b908e06979bff0608d6ad8bdcb00a5659b4227e2f0c97d9c4cf7217c54c9f316cdc43dfdee99bb67cd3 SHA512 b99e4ceda0d97c068bf300798b6d935e15219d03e3d928bf1910aecd5c233e2636ba893fe26072920bb509662fe090af5eb5e373ab6e73122031da150deebd10
-EBUILD selinux-ddclient-2.20190609-r1.ebuild 285 BLAKE2B 4c55d7e4d536804e9b9aa37fb03429ee08f02953297551677ae5df04585db00d566d033eca4b476658704c3ac9c1e49ac3cc32085c6af90bb62deb79e7f77754 SHA512 3d808c0805f35da19365b54aeb810778002e19f5427700858b668fdb6883e99f4ba25302081221cc285293f1e8e92e53ada2340184dd25d50619bf8197265b5a
+EBUILD selinux-ddclient-2.20190609-r1.ebuild 283 BLAKE2B 35ad75e94be50514e92b4daece3d1932d6f196f6dadc4b908e06979bff0608d6ad8bdcb00a5659b4227e2f0c97d9c4cf7217c54c9f316cdc43dfdee99bb67cd3 SHA512 b99e4ceda0d97c068bf300798b6d935e15219d03e3d928bf1910aecd5c233e2636ba893fe26072920bb509662fe090af5eb5e373ab6e73122031da150deebd10
+EBUILD selinux-ddclient-2.20200818-r1.ebuild 285 BLAKE2B 4c55d7e4d536804e9b9aa37fb03429ee08f02953297551677ae5df04585db00d566d033eca4b476658704c3ac9c1e49ac3cc32085c6af90bb62deb79e7f77754 SHA512 3d808c0805f35da19365b54aeb810778002e19f5427700858b668fdb6883e99f4ba25302081221cc285293f1e8e92e53ada2340184dd25d50619bf8197265b5a
 EBUILD selinux-ddclient-9999.ebuild 288 BLAKE2B c137f635c72af1aa7a12c98cd91726e67ec23c2328973fa2b040e464ebec7c0ad3ca80c91b70fe4b99db3429f607e4d1ef07b65f99cee5bf4ea5fdd2d55fb830 SHA512 d7b959dad37b060cd2761883dba91e2a9aa8dc4c47325dd6617104771da03d428a08568fcb7ac9ef35e9d74ade08b742bd50c0d8a27e6da51d9d6d5da5d1906b
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ddclient/selinux-ddclient-2.20190609-r1.ebuild b/sec-policy/selinux-ddclient/selinux-ddclient-2.20190609-r1.ebuild
index da014bed7169..1048608aedc2 100644
--- a/sec-policy/selinux-ddclient/selinux-ddclient-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-ddclient/selinux-ddclient-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-ddclient/selinux-ddclient-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..da014bed7169
--- /dev/null
+++ b/sec-policy/selinux-ddclient/selinux-ddclient-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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-ddcprobe/Manifest b/sec-policy/selinux-ddcprobe/Manifest
index 625cf762c7e5..6bc1ef370cc3 100644
--- a/sec-policy/selinux-ddcprobe/Manifest
+++ b/sec-policy/selinux-ddcprobe/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-ddcprobe-2.20190201-r1.ebuild 283 BLAKE2B ed08627d0f9f1a380f615d95231e3f2c390549ac23c93aaa3215bdd177175301823ec5dba780b428f6bae3eeecb51d6fbc8112ae08e4df63bdf0362351c78e6c SHA512 aff334bef287179e655a4a65b874f2a83f90a44bd3e5868136f712ae6984bdccfde6db7b00e07afc4a8c2f6df30163046abc3f53b5856bab309250809dc295a5
-EBUILD selinux-ddcprobe-2.20190609-r1.ebuild 285 BLAKE2B 715f996133f6669c63f804ed64111f6972415023d5946e5a659f12267b68711142b61c8fe886199e12a8326173f73d15fbfd5b131c2362e2057246781682dcfe SHA512 dfa85085b10cbca3726971810eb94bd306a9cbc7ac3a16a6b41d4a18beb9b893a6ab512bfb512f8c75ce1146beda4e604c7c3151fc3640a516e7695bc6777e5e
+EBUILD selinux-ddcprobe-2.20190609-r1.ebuild 283 BLAKE2B ed08627d0f9f1a380f615d95231e3f2c390549ac23c93aaa3215bdd177175301823ec5dba780b428f6bae3eeecb51d6fbc8112ae08e4df63bdf0362351c78e6c SHA512 aff334bef287179e655a4a65b874f2a83f90a44bd3e5868136f712ae6984bdccfde6db7b00e07afc4a8c2f6df30163046abc3f53b5856bab309250809dc295a5
+EBUILD selinux-ddcprobe-2.20200818-r1.ebuild 285 BLAKE2B 715f996133f6669c63f804ed64111f6972415023d5946e5a659f12267b68711142b61c8fe886199e12a8326173f73d15fbfd5b131c2362e2057246781682dcfe SHA512 dfa85085b10cbca3726971810eb94bd306a9cbc7ac3a16a6b41d4a18beb9b893a6ab512bfb512f8c75ce1146beda4e604c7c3151fc3640a516e7695bc6777e5e
 EBUILD selinux-ddcprobe-9999.ebuild 288 BLAKE2B b735650b27f7d7736887098b4cb69a475b148ecf09061df30fa747308b698e2464a3dbdc8de62a2075b0372f906630b7008e211bcf6cc1b191f0d088543dd5ab SHA512 ce1a8ec4404f27ebb6088a602aa86ff9a9c533f1cde08dbb8edf03b80a600fca976884a9cf974e0cb0283f6c56e932056445c6c621cf5df46dc71833d1de15ae
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20190609-r1.ebuild b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20190609-r1.ebuild
index 2c62fb102269..5373462a1fad 100644
--- a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ddcprobe"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20200818-r1.ebuild b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..2c62fb102269
--- /dev/null
+++ b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="ddcprobe"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ddcprobe"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-denyhosts/Manifest b/sec-policy/selinux-denyhosts/Manifest
index 14d09c6792ad..bd0f27b64e62 100644
--- a/sec-policy/selinux-denyhosts/Manifest
+++ b/sec-policy/selinux-denyhosts/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-denyhosts-2.20190201-r1.ebuild 285 BLAKE2B 6b4f1595a8327dc73c9d4222da545d68848cd7ebeb51962babafc86135a5b4b6070d1d73a5e1d383cb26acdecf3c0a3254bd2768691abe783d26c9d940d24eae SHA512 5653388a0fd7e8527b3b6ce127c784fa353601228db1a1528970249fc65c0a816d77aa72a0b3ab74f453fe5f10818e2159af20ccf0075485be9aa45ca5858578
-EBUILD selinux-denyhosts-2.20190609-r1.ebuild 287 BLAKE2B 123bcc73e0f2618d348175665874932b607cd75e4bd9a8ec52fcb4a4cefa15c22f8e3e4aede1aa522ecdb2e84add2e9c9af497703464a1b6c44d52e3a01cb1f9 SHA512 3453cbf14fc80ae36e56f40bbc65b97c56bcd6c0fbace909378910b8ea1587d3a3fe33be6471752a2776d7237f15fd9076d79616a0a32f919204cde0e34a70bb
+EBUILD selinux-denyhosts-2.20190609-r1.ebuild 285 BLAKE2B 6b4f1595a8327dc73c9d4222da545d68848cd7ebeb51962babafc86135a5b4b6070d1d73a5e1d383cb26acdecf3c0a3254bd2768691abe783d26c9d940d24eae SHA512 5653388a0fd7e8527b3b6ce127c784fa353601228db1a1528970249fc65c0a816d77aa72a0b3ab74f453fe5f10818e2159af20ccf0075485be9aa45ca5858578
+EBUILD selinux-denyhosts-2.20200818-r1.ebuild 287 BLAKE2B 123bcc73e0f2618d348175665874932b607cd75e4bd9a8ec52fcb4a4cefa15c22f8e3e4aede1aa522ecdb2e84add2e9c9af497703464a1b6c44d52e3a01cb1f9 SHA512 3453cbf14fc80ae36e56f40bbc65b97c56bcd6c0fbace909378910b8ea1587d3a3fe33be6471752a2776d7237f15fd9076d79616a0a32f919204cde0e34a70bb
 EBUILD selinux-denyhosts-9999.ebuild 290 BLAKE2B 5f5c8a011471dbdb5e7128e07cf5c7150d123a020ad4c4a1b2df38392e60406392092df2a9471d76f300e74c37092527c23320e3230ce7afbcda576c37857e9f SHA512 c31002c0ebf564498c5138ce2fca6ebf7036970ad0e02d073d34e8fcf6173e5ff53be9058ace87c27115f05a286239389be53061da6598a22b32926d20daa5a2
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20190609-r1.ebuild b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20190609-r1.ebuild
index 607f0dc94550..c5821f7c1996 100644
--- a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for denyhosts"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20200818-r1.ebuild b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..607f0dc94550
--- /dev/null
+++ b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="denyhosts"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for denyhosts"
+
+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 ee5823d14767..bfbbce39da32 100644
--- a/sec-policy/selinux-devicekit/Manifest
+++ b/sec-policy/selinux-devicekit/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-devicekit-2.20190201-r1.ebuild 378 BLAKE2B 392c872538fc605ad613f424e9cd9577a89511764b7c29f6c1b5369d72c98320ecc274abb7b9dfacd6756b5554753e0e3bb2bc7a18597e49cde457dc8b5126dc SHA512 6c5b0cca97b084d82f4f17a43a9598d70da5bd92f9545348ad13cdbca136243c04652e233f5e50d5a1f9f838640e345a80efcf556ae2733c6fb3ea69f193324d
-EBUILD selinux-devicekit-2.20190609-r1.ebuild 380 BLAKE2B fafa0f31b7638e0d05b5151bf26c4802eaf430a4a299d473e4f89c8dbfd4f0c9b02039616a315a295039535cfa2f137842a5bc2add545e7af9b3c4ac3ef38d3b SHA512 5dcbaaf4bc24894cd3514ed4ef7fd9a14a854de656572d468650f57578888c6db038fb1e3514718d8bb25b45d00e68cf0ef2fe9be5fbcdb0efddba257c4ee010
+EBUILD selinux-devicekit-2.20190609-r1.ebuild 378 BLAKE2B 392c872538fc605ad613f424e9cd9577a89511764b7c29f6c1b5369d72c98320ecc274abb7b9dfacd6756b5554753e0e3bb2bc7a18597e49cde457dc8b5126dc SHA512 6c5b0cca97b084d82f4f17a43a9598d70da5bd92f9545348ad13cdbca136243c04652e233f5e50d5a1f9f838640e345a80efcf556ae2733c6fb3ea69f193324d
+EBUILD selinux-devicekit-2.20200818-r1.ebuild 380 BLAKE2B fafa0f31b7638e0d05b5151bf26c4802eaf430a4a299d473e4f89c8dbfd4f0c9b02039616a315a295039535cfa2f137842a5bc2add545e7af9b3c4ac3ef38d3b SHA512 5dcbaaf4bc24894cd3514ed4ef7fd9a14a854de656572d468650f57578888c6db038fb1e3514718d8bb25b45d00e68cf0ef2fe9be5fbcdb0efddba257c4ee010
 EBUILD selinux-devicekit-9999.ebuild 383 BLAKE2B 33eb2481cef9fa92b2e9e8dfdb4765b83f3e3e8ac849224427c0fa13f14d27a1b6f96090a5ab4ee0fc6fe76fe8d373b5428b1c96b010d1df8c6172be25bb955f SHA512 bf74814b616c938a0d8379a33425e7ba81586d8f9226119a8d6f8fc93537aeec72d3539530221f886ddf16215f0d95a4f5b44ef7cecbb0a39a6938c3df79b7c6
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-devicekit/selinux-devicekit-2.20190609-r1.ebuild b/sec-policy/selinux-devicekit/selinux-devicekit-2.20190609-r1.ebuild
index abbb06ff13da..ac130b34a23d 100644
--- a/sec-policy/selinux-devicekit/selinux-devicekit-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-devicekit/selinux-devicekit-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-devicekit/selinux-devicekit-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..abbb06ff13da
--- /dev/null
+++ b/sec-policy/selinux-devicekit/selinux-devicekit-2.20200818-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 5384acc191bd..a8cce126ca7b 100644
--- a/sec-policy/selinux-dhcp/Manifest
+++ b/sec-policy/selinux-dhcp/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-dhcp-2.20190201-r1.ebuild 275 BLAKE2B ee6de3772a5a3c3562616c5832f893f523ed8cf331a71c7aba0fc3958464dfe622f5be865f6bb01dbc75accad5081c2308393622e785c4806059b261129dd72a SHA512 6631b5fb35066e379f28431493dfd8e863090c73a39ab1aff118190ffca7481b4660d5b2de1c3f6bc3f97676529accb286ddde7dcc6748e5921604725d1bbbb1
-EBUILD selinux-dhcp-2.20190609-r1.ebuild 277 BLAKE2B e1efa6ce25d0bd4d85389b265b28202b6f4232aad484573be5cbc2c47b55dbbe3f313ac5c310f2db36bf91240bb903fcbeca245da4e6120b7b767ae00ceb38ce SHA512 068de50017ab132aef5968407a5fe23a2850374e4c0bee8a18b32e1288b6f64994686eadf1b3ee35366ffd97712ffdeb7b1921e0f7364a5cd219cb1c284451ed
+EBUILD selinux-dhcp-2.20190609-r1.ebuild 275 BLAKE2B ee6de3772a5a3c3562616c5832f893f523ed8cf331a71c7aba0fc3958464dfe622f5be865f6bb01dbc75accad5081c2308393622e785c4806059b261129dd72a SHA512 6631b5fb35066e379f28431493dfd8e863090c73a39ab1aff118190ffca7481b4660d5b2de1c3f6bc3f97676529accb286ddde7dcc6748e5921604725d1bbbb1
+EBUILD selinux-dhcp-2.20200818-r1.ebuild 277 BLAKE2B e1efa6ce25d0bd4d85389b265b28202b6f4232aad484573be5cbc2c47b55dbbe3f313ac5c310f2db36bf91240bb903fcbeca245da4e6120b7b767ae00ceb38ce SHA512 068de50017ab132aef5968407a5fe23a2850374e4c0bee8a18b32e1288b6f64994686eadf1b3ee35366ffd97712ffdeb7b1921e0f7364a5cd219cb1c284451ed
 EBUILD selinux-dhcp-9999.ebuild 280 BLAKE2B 3058fd05c8d75e97ff981125bb72361029878c8811d25ce8c944d471fd2a6637faa0f3bc3ab4ebee784b6040a59d5ed62d337e207dd8169d035b24ec5b3bbc70 SHA512 3ce114cec139382112a643755141a9fa7fe760817b90ce14627745cbcfd2361464dcc8badcfb6299237bca594f1574c54d68223f86d4f228fc688e39ac78d30e
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dhcp/selinux-dhcp-2.20190609-r1.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-2.20190609-r1.ebuild
index 3016ba58eb36..d735edb05ccb 100644
--- a/sec-policy/selinux-dhcp/selinux-dhcp-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-dhcp/selinux-dhcp-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..3016ba58eb36
--- /dev/null
+++ b/sec-policy/selinux-dhcp/selinux-dhcp-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 0b0e8e1f89a2..15ccc84d92b0 100644
--- a/sec-policy/selinux-dictd/Manifest
+++ b/sec-policy/selinux-dictd/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-dictd-2.20190201-r1.ebuild 277 BLAKE2B 6d05f59324304a0fe2680248e96bb65dac409e32b7cb947f4b96cd6aebf17ade49af3dad168c640785dcfd3b935dde765075f4e37fe6995410b6626869db9431 SHA512 4d434d0b8183ca31d196af84004456982239b7cbcc83e063cd795063df16c8f12ccc00d294b4819ded45dc41a084568b0a534ad09e61ca5c7b9f71db98483508
-EBUILD selinux-dictd-2.20190609-r1.ebuild 279 BLAKE2B 543629e668bbb2bb7456b45a0de28c6c79cf4a299e7df36084974be385e475afbc29fb6f8d5f71c10635c7ac51c4bffb23c30f648ede1f5a90b0919454d9226b SHA512 cf9464b64fb80d0da64f109793f0dda08cd0f13872d68a27dc7bd8910cf1fc596ead753771af0d579797f79e3aca0c9de574012e05289f930e4dfb51f0ae5d85
+EBUILD selinux-dictd-2.20190609-r1.ebuild 277 BLAKE2B 6d05f59324304a0fe2680248e96bb65dac409e32b7cb947f4b96cd6aebf17ade49af3dad168c640785dcfd3b935dde765075f4e37fe6995410b6626869db9431 SHA512 4d434d0b8183ca31d196af84004456982239b7cbcc83e063cd795063df16c8f12ccc00d294b4819ded45dc41a084568b0a534ad09e61ca5c7b9f71db98483508
+EBUILD selinux-dictd-2.20200818-r1.ebuild 279 BLAKE2B 543629e668bbb2bb7456b45a0de28c6c79cf4a299e7df36084974be385e475afbc29fb6f8d5f71c10635c7ac51c4bffb23c30f648ede1f5a90b0919454d9226b SHA512 cf9464b64fb80d0da64f109793f0dda08cd0f13872d68a27dc7bd8910cf1fc596ead753771af0d579797f79e3aca0c9de574012e05289f930e4dfb51f0ae5d85
 EBUILD selinux-dictd-9999.ebuild 282 BLAKE2B ef297e319462589561b3c028b133c674c16e543af852e328fb22a2a1f7c18a8f824ed1ed4e4bc7979ffeb0237638dc1667c9dff366f8db12c355ff48b2172b33 SHA512 64603ce15f5e0956645fe7262a68aaf908aaea559a9ce2063dcf06945f3511046b63b58116a251517eeee08bd5cc6e7daae0ef2f2447c96d2b35d8a4ee0a52c9
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dictd/selinux-dictd-2.20190609-r1.ebuild b/sec-policy/selinux-dictd/selinux-dictd-2.20190609-r1.ebuild
index db2c604276f2..10ba9a6a2e99 100644
--- a/sec-policy/selinux-dictd/selinux-dictd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-dictd/selinux-dictd-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-dictd/selinux-dictd-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..db2c604276f2
--- /dev/null
+++ b/sec-policy/selinux-dictd/selinux-dictd-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 2fad4b549e20..bb6d94113a27 100644
--- a/sec-policy/selinux-dirmngr/Manifest
+++ b/sec-policy/selinux-dirmngr/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-dirmngr-2.20190201-r1.ebuild 281 BLAKE2B 77cd7f47e0d077c7bfa1888b1e2783c6d6e413894bcc2ea87e780077b169967760370b18f0a2fb1c6810dba68d2b4aca159027a5b49aac68be982ca3fe6005f7 SHA512 13e6fddc9ac34e53d82458523b181db4e25d50be9772dddb7f26c283ea3ccbdb028d214e376bcca3a6c28065d2a633439b804540d04b73431e18b29bf74ef46c
-EBUILD selinux-dirmngr-2.20190609-r1.ebuild 283 BLAKE2B e5db1ada7f7798252c1fd1268cb1eb46ee6257d8a2094b91f6fef99e1326c48f43f599a8c905e515e526042e3f2c4ec4f6033d918369572ba77be8ebd85dece1 SHA512 b45d40e8df694e910448f3a8ae3cf6bb2ef94498b8a2dd6858f6a2727c051236406ad03ff2fbc16e9696e265c0f96c60cdd7628ef05bdca99dd91ba1e453d76b
+EBUILD selinux-dirmngr-2.20190609-r1.ebuild 281 BLAKE2B 77cd7f47e0d077c7bfa1888b1e2783c6d6e413894bcc2ea87e780077b169967760370b18f0a2fb1c6810dba68d2b4aca159027a5b49aac68be982ca3fe6005f7 SHA512 13e6fddc9ac34e53d82458523b181db4e25d50be9772dddb7f26c283ea3ccbdb028d214e376bcca3a6c28065d2a633439b804540d04b73431e18b29bf74ef46c
+EBUILD selinux-dirmngr-2.20200818-r1.ebuild 283 BLAKE2B e5db1ada7f7798252c1fd1268cb1eb46ee6257d8a2094b91f6fef99e1326c48f43f599a8c905e515e526042e3f2c4ec4f6033d918369572ba77be8ebd85dece1 SHA512 b45d40e8df694e910448f3a8ae3cf6bb2ef94498b8a2dd6858f6a2727c051236406ad03ff2fbc16e9696e265c0f96c60cdd7628ef05bdca99dd91ba1e453d76b
 EBUILD selinux-dirmngr-9999.ebuild 286 BLAKE2B 15ac5a4fbd7ed62ad6129fd6e04d6510532301c49ae76ddddc836956565abd03de09c67ccf89733b4f989e02f283054e6cd4dbc47e9c205b74c7884476728ff0 SHA512 aa51a91e468ac42b476ec82c5a31e2474c2cc94428d7cf5244e94b31e73debdfbb12698788ba45dc1de5ea7f24475b4d75d5f6d14e99eaeba02facc5e966ad17
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20190609-r1.ebuild b/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20190609-r1.ebuild
index 5f08d1cb4057..08cd2e747812 100644
--- a/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..5f08d1cb4057
--- /dev/null
+++ b/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 0690b1cb39a9..d9d320e8abf0 100644
--- a/sec-policy/selinux-dirsrv/Manifest
+++ b/sec-policy/selinux-dirsrv/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-dirsrv-2.20190201-r1.ebuild 279 BLAKE2B 501751b7a507e21f4145bee3233227a1c877ae6b513e17a75eddbddf771ee3cd95547acc7070fa98e92032060de2fb56c7c603130ad5bef55e6a621ccfe0526b SHA512 8d9c9d2e079e937ff02860e903c35144a8cbd513197bcec928ccd2b9cb937c4c2764e863d247823abbac21be6193a6170b38fd434bf9206544d13e41c585139f
-EBUILD selinux-dirsrv-2.20190609-r1.ebuild 281 BLAKE2B 134c83e69b87b07ad967227f5e167f5b822aabc0789c9879bee69c566fcabce99223ee94131b81c22bd06193358b5cd21606eb7aa7580314860089ca49318a2a SHA512 17756e428274177749d19e21558349c4d8b4b4f523b01e807445946262cf23a93cffa8b16cb7e9a44a62baa753514692275bf24ddda6d257fb4e4084f217a914
+EBUILD selinux-dirsrv-2.20190609-r1.ebuild 279 BLAKE2B 501751b7a507e21f4145bee3233227a1c877ae6b513e17a75eddbddf771ee3cd95547acc7070fa98e92032060de2fb56c7c603130ad5bef55e6a621ccfe0526b SHA512 8d9c9d2e079e937ff02860e903c35144a8cbd513197bcec928ccd2b9cb937c4c2764e863d247823abbac21be6193a6170b38fd434bf9206544d13e41c585139f
+EBUILD selinux-dirsrv-2.20200818-r1.ebuild 281 BLAKE2B 134c83e69b87b07ad967227f5e167f5b822aabc0789c9879bee69c566fcabce99223ee94131b81c22bd06193358b5cd21606eb7aa7580314860089ca49318a2a SHA512 17756e428274177749d19e21558349c4d8b4b4f523b01e807445946262cf23a93cffa8b16cb7e9a44a62baa753514692275bf24ddda6d257fb4e4084f217a914
 EBUILD selinux-dirsrv-9999.ebuild 284 BLAKE2B 2cca4f21340ef6c962f96f15f5d108fc5888afc26ebc282199b0ff8707c116ecb6302c3a41393ce44c2cc30871bed87eb780506e111b560af13e00cf6053af8e SHA512 831ffac89dd9b11ba8c916f612ae26f6d6ce375825157375df1176cb6d5bf6bd4a34b96061b7e9f740275a4442e69585f8f3fefb9819ba515b1613ccfd838117
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20190609-r1.ebuild b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20190609-r1.ebuild
index be7bcd71917d..6b25630e88f8 100644
--- a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..be7bcd71917d
--- /dev/null
+++ b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 e369e1118d81..dcfef7ca1148 100644
--- a/sec-policy/selinux-distcc/Manifest
+++ b/sec-policy/selinux-distcc/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-distcc-2.20190201-r1.ebuild 279 BLAKE2B 3244bda2af3fcb1e29779cecd0f1fea9afc018741eec4f05ab95bde12a585c3dd2ca0902455b931da1a6d82d73bdea96755430032de4304232b12158481ab421 SHA512 469b08e9846b838887f856b5a07bbe8244f6902c6d673d08e0258e5d7d46ce861ee0f21dba7645efcc37a75859b37119197496dbabad8a2ddb85773c57ef2ec7
-EBUILD selinux-distcc-2.20190609-r1.ebuild 281 BLAKE2B 2e440408363ef7e6dbf7911eee497baebb3d8594633b157eaa7cee504992131eea86253cbea844e59ed03ae513c201de130c229b341e570c5e49bf72c24614e0 SHA512 b8107d5d448bf08509747810c1358a85d31d19b1cd1d1c9c5395fbbcb56a948ed2ba5dfb55c721e8a436a2ef7eb28f40c08423818260212fc36bfab54f0e2620
+EBUILD selinux-distcc-2.20190609-r1.ebuild 279 BLAKE2B 3244bda2af3fcb1e29779cecd0f1fea9afc018741eec4f05ab95bde12a585c3dd2ca0902455b931da1a6d82d73bdea96755430032de4304232b12158481ab421 SHA512 469b08e9846b838887f856b5a07bbe8244f6902c6d673d08e0258e5d7d46ce861ee0f21dba7645efcc37a75859b37119197496dbabad8a2ddb85773c57ef2ec7
+EBUILD selinux-distcc-2.20200818-r1.ebuild 281 BLAKE2B 2e440408363ef7e6dbf7911eee497baebb3d8594633b157eaa7cee504992131eea86253cbea844e59ed03ae513c201de130c229b341e570c5e49bf72c24614e0 SHA512 b8107d5d448bf08509747810c1358a85d31d19b1cd1d1c9c5395fbbcb56a948ed2ba5dfb55c721e8a436a2ef7eb28f40c08423818260212fc36bfab54f0e2620
 EBUILD selinux-distcc-9999.ebuild 284 BLAKE2B a849739206390224313fd788c68164e22a729ea6b781db6491f5186dafa40dbc6c8afcf71500a72d15ea05efbe56a8cdb69ac9114e6d15873df79cba5b38af97 SHA512 32b82946a439e730f86d45652bf73f3b6a6d3f1414cf6be29f2da63319be171df81102ce4832f6f5ea0635153e152bd824d60ef687a3b60bd50eeace4c9bd690
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-distcc/selinux-distcc-2.20190609-r1.ebuild b/sec-policy/selinux-distcc/selinux-distcc-2.20190609-r1.ebuild
index 07fc45e1faf3..1fb57712c541 100644
--- a/sec-policy/selinux-distcc/selinux-distcc-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-distcc/selinux-distcc-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-distcc/selinux-distcc-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..07fc45e1faf3
--- /dev/null
+++ b/sec-policy/selinux-distcc/selinux-distcc-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 0e3c96215ac9..075d0040c39b 100644
--- a/sec-policy/selinux-djbdns/Manifest
+++ b/sec-policy/selinux-djbdns/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-djbdns-2.20190201-r1.ebuild 443 BLAKE2B d518ce7c5f327ad18b9e9b6a2b9b8ae4d2aabefc1c2fc85fd1568dd64ddfdfc9cda3cc37b0f3bf443ddab275fd11adcbf3a5bb2720450ca6e21ab3e3617555cd SHA512 96c710ba8fff53d7052b61d4419c59b89892edca136604590eb3ecd1cf50dfc1ff71fbd11df5b92a89b5beec097bc78f282c7b6bc1509d0370edf889178b5b2d
-EBUILD selinux-djbdns-2.20190609-r1.ebuild 445 BLAKE2B 4cb1611aaede38b7634dbb1e8f87df264eb570dc30db3b7ce230b0326ee9116ec20703788748bcc59d18a548aab0fd21ffdc6cb6214e719ebabe57c123ea3d36 SHA512 ad73f4171327e794aed1887fc41deabf89cdbd53eda5dcd65e518f243ba957ab59bdb8b9b19a12d5353e8a2e6d544506c39ddb8fcac7498dd5a33612548875db
+EBUILD selinux-djbdns-2.20190609-r1.ebuild 443 BLAKE2B d518ce7c5f327ad18b9e9b6a2b9b8ae4d2aabefc1c2fc85fd1568dd64ddfdfc9cda3cc37b0f3bf443ddab275fd11adcbf3a5bb2720450ca6e21ab3e3617555cd SHA512 96c710ba8fff53d7052b61d4419c59b89892edca136604590eb3ecd1cf50dfc1ff71fbd11df5b92a89b5beec097bc78f282c7b6bc1509d0370edf889178b5b2d
+EBUILD selinux-djbdns-2.20200818-r1.ebuild 445 BLAKE2B 4cb1611aaede38b7634dbb1e8f87df264eb570dc30db3b7ce230b0326ee9116ec20703788748bcc59d18a548aab0fd21ffdc6cb6214e719ebabe57c123ea3d36 SHA512 ad73f4171327e794aed1887fc41deabf89cdbd53eda5dcd65e518f243ba957ab59bdb8b9b19a12d5353e8a2e6d544506c39ddb8fcac7498dd5a33612548875db
 EBUILD selinux-djbdns-9999.ebuild 448 BLAKE2B eb06001eb69da903bb9b5978da4aca9e29b30b0df5a1dff6a09f81e3ccaab73067c2f3fdb0de6b7c4696f45d54f1cf4132fc69e7fbde69af70428707dbe3cf32 SHA512 4f69a6e5a84a55cace93beb6c0ade83a58ce2007893546701d7132d610ac767e5f2f099c72709d160e98f2d748fed13bbf922ae30aeaefb74ab6dc36878da42c
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-djbdns/selinux-djbdns-2.20190609-r1.ebuild b/sec-policy/selinux-djbdns/selinux-djbdns-2.20190609-r1.ebuild
index 4fd14768c9de..99eb073c70e1 100644
--- a/sec-policy/selinux-djbdns/selinux-djbdns-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-djbdns/selinux-djbdns-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-djbdns/selinux-djbdns-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..4fd14768c9de
--- /dev/null
+++ b/sec-policy/selinux-djbdns/selinux-djbdns-2.20200818-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 502d384b2b7e..e613bdfb54c7 100644
--- a/sec-policy/selinux-dkim/Manifest
+++ b/sec-policy/selinux-dkim/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-dkim-2.20190201-r1.ebuild 372 BLAKE2B 881502b798ffc5bdc49ea1f43e8cca320c00fc9930f1f3f612bfc7dcf25356a926b43e87c79777a2f0ddaf8b073596afbc37d461eaa49ca1936ccc7371c95d5e SHA512 9ceccdaef3cbdb02c998b4ff0d8a7839bd1e07dbcbefc51fbad98d04ef4af57dd61df6b00d52bde819f517264058d5943d8d03d35141324d7dc9389541579133
-EBUILD selinux-dkim-2.20190609-r1.ebuild 374 BLAKE2B 26512997ca8763a050f262801d79f59a0f9f99b21e22eb048850e785fab4cf4c52b661b525e96558683e855109a60b3f8f579794c735e3bf96b07a66467739c5 SHA512 1d0920dc3a3718288b8ebc5b035faa82a78e7420e1d31f9d4d043d33e8fbfc7a999976f1d6e216efc4e0397a62d7a37c9c38d26256cbc8772d9ca3aecab9547a
+EBUILD selinux-dkim-2.20190609-r1.ebuild 372 BLAKE2B 881502b798ffc5bdc49ea1f43e8cca320c00fc9930f1f3f612bfc7dcf25356a926b43e87c79777a2f0ddaf8b073596afbc37d461eaa49ca1936ccc7371c95d5e SHA512 9ceccdaef3cbdb02c998b4ff0d8a7839bd1e07dbcbefc51fbad98d04ef4af57dd61df6b00d52bde819f517264058d5943d8d03d35141324d7dc9389541579133
+EBUILD selinux-dkim-2.20200818-r1.ebuild 374 BLAKE2B 26512997ca8763a050f262801d79f59a0f9f99b21e22eb048850e785fab4cf4c52b661b525e96558683e855109a60b3f8f579794c735e3bf96b07a66467739c5 SHA512 1d0920dc3a3718288b8ebc5b035faa82a78e7420e1d31f9d4d043d33e8fbfc7a999976f1d6e216efc4e0397a62d7a37c9c38d26256cbc8772d9ca3aecab9547a
 EBUILD selinux-dkim-9999.ebuild 377 BLAKE2B ea78b57eb862fdc139ad26db4fd7159d0fd8245247d23621a43312d2961ea0aa1238527ba5883f5d086dddb80b453bfcad459c2d9fae85bdc33fcc0acc160b9d SHA512 5b27db16dfa580aea99735a794b10c44f3546d01ae9f1934837d97c188f79d417d9b9d9f566ab4d6c6186b427ccc5d2fc9c6265eac98f92d32c258c7f4c98623
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dkim/selinux-dkim-2.20190609-r1.ebuild b/sec-policy/selinux-dkim/selinux-dkim-2.20190609-r1.ebuild
index a6ab770ee838..7becae43bfe7 100644
--- a/sec-policy/selinux-dkim/selinux-dkim-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-dkim/selinux-dkim-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-dkim/selinux-dkim-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..a6ab770ee838
--- /dev/null
+++ b/sec-policy/selinux-dkim/selinux-dkim-2.20200818-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 e48ebffc65cc..bc5fbdbe6f79 100644
--- a/sec-policy/selinux-dmidecode/Manifest
+++ b/sec-policy/selinux-dmidecode/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-dmidecode-2.20190201-r1.ebuild 285 BLAKE2B 0183609eca2dc0e65f761e7bea2a1e5f398b4177fbc3aeb588ac71d1170c0a5fd49a4d9e222bf35626278e3e5564852492e1f4b0ce73970c67a120d26eeae0c3 SHA512 a587e1552c2d3adb1cabc31bf9759bf43a6ba5c67e8cc69fc6840afe32d3f807825a49490e59fcda7f08b705990e151900b8312a8549f079cdd1d082c24d2026
-EBUILD selinux-dmidecode-2.20190609-r1.ebuild 287 BLAKE2B ae8bbd78975d43697124182829c374faefd2426df022bd8519c5916c32b0c87e2d992414be46366804bd6caf124b34c03ca8be410dae4d2b7fb4603f4380ee50 SHA512 d7f4f1600c67c4a99a6ce34355d38148729fb4fc7cc15e86ec56370c7dd7fe4c99b2d2208c48c0a9ca34622713a289a639f79b4d988e22d45882b8a60f789452
+EBUILD selinux-dmidecode-2.20190609-r1.ebuild 285 BLAKE2B 0183609eca2dc0e65f761e7bea2a1e5f398b4177fbc3aeb588ac71d1170c0a5fd49a4d9e222bf35626278e3e5564852492e1f4b0ce73970c67a120d26eeae0c3 SHA512 a587e1552c2d3adb1cabc31bf9759bf43a6ba5c67e8cc69fc6840afe32d3f807825a49490e59fcda7f08b705990e151900b8312a8549f079cdd1d082c24d2026
+EBUILD selinux-dmidecode-2.20200818-r1.ebuild 287 BLAKE2B ae8bbd78975d43697124182829c374faefd2426df022bd8519c5916c32b0c87e2d992414be46366804bd6caf124b34c03ca8be410dae4d2b7fb4603f4380ee50 SHA512 d7f4f1600c67c4a99a6ce34355d38148729fb4fc7cc15e86ec56370c7dd7fe4c99b2d2208c48c0a9ca34622713a289a639f79b4d988e22d45882b8a60f789452
 EBUILD selinux-dmidecode-9999.ebuild 290 BLAKE2B 40fb04c58685f79ca71d56b35e4556649b9863954c3b72738522a014d9401115b4b78804965a2da3ac1b115754b99b8e8aa452d32b8a722a215c4cf18475f794 SHA512 232652b41d6c5818f55b2dcccfc94c758106c9be4c76e514c33eb8012d6fc39a6789f33645f032471f4b749f933367b0e469b7073fbaf81afaeedb6376bdddbe
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20190609-r1.ebuild b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20190609-r1.ebuild
index 6737d466d6d8..50fd2aa6b619 100644
--- a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..6737d466d6d8
--- /dev/null
+++ b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 2a3e83c13a69..86721b1d4225 100644
--- a/sec-policy/selinux-dnsmasq/Manifest
+++ b/sec-policy/selinux-dnsmasq/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-dnsmasq-2.20190201-r1.ebuild 281 BLAKE2B b541cc440e79c453ea154c11c5ec5797714391a114a86c2c1080d852c1bf3d16819dc51d4d72369fcfea222dff2745b448915bda85f7028cf9faea58ea37e00f SHA512 280606f4918965e8c0402b3bdcae1e5862ac6a01d0f683ab6c7bc86d2b4015ffaa4c5105f831975a75e70b5c71b2dd7c06f465a50074d10883d6214d3b5c537f
-EBUILD selinux-dnsmasq-2.20190609-r1.ebuild 283 BLAKE2B fd19da6cb147d0d8157b70eeb3f437fd95c8beaa5bd66323eb705ba93f60a3e3ea3ffbb911c4c61be653924016761dabb27a96a28fce884f4cc36c373306106e SHA512 aea442bb958ac44322e471d2af1097ddec8e3616d15fa393e83f219c37c25fa9a957e44c92b796a030faf84bbdb7aabbc4410cefbe7e655f6a43bf45e28f59d3
+EBUILD selinux-dnsmasq-2.20190609-r1.ebuild 281 BLAKE2B b541cc440e79c453ea154c11c5ec5797714391a114a86c2c1080d852c1bf3d16819dc51d4d72369fcfea222dff2745b448915bda85f7028cf9faea58ea37e00f SHA512 280606f4918965e8c0402b3bdcae1e5862ac6a01d0f683ab6c7bc86d2b4015ffaa4c5105f831975a75e70b5c71b2dd7c06f465a50074d10883d6214d3b5c537f
+EBUILD selinux-dnsmasq-2.20200818-r1.ebuild 283 BLAKE2B fd19da6cb147d0d8157b70eeb3f437fd95c8beaa5bd66323eb705ba93f60a3e3ea3ffbb911c4c61be653924016761dabb27a96a28fce884f4cc36c373306106e SHA512 aea442bb958ac44322e471d2af1097ddec8e3616d15fa393e83f219c37c25fa9a957e44c92b796a030faf84bbdb7aabbc4410cefbe7e655f6a43bf45e28f59d3
 EBUILD selinux-dnsmasq-9999.ebuild 286 BLAKE2B 84793b4c937a436e07195616ddaae01337ef89a7f484cce426d79995d0ef966f57f6fe903ab52f9b2ba3dee27540b8d0209ab090646d30a3838ef58da0d9f617 SHA512 6c7110caecadb6596dcb8e8b811e174395c01fb548eae76c755eec5abf6c2e46b46a055bd72bac6864aa2a977990713d812ed2a5d39165af988162c20202490a
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20190609-r1.ebuild b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20190609-r1.ebuild
index 92ddc660b994..6bfbbf392abe 100644
--- a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..92ddc660b994
--- /dev/null
+++ b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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-dovecot/Manifest b/sec-policy/selinux-dovecot/Manifest
index ee10318590cf..a5bfcf01143d 100644
--- a/sec-policy/selinux-dovecot/Manifest
+++ b/sec-policy/selinux-dovecot/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-dovecot-2.20190201-r1.ebuild 281 BLAKE2B 5539d2b762b8e6f24beee1e50511116e7e3abf0b0f1921f6f56aa1eefbc188f081e4a2c18dfae391163aca9b8349785e0d1d50afedf37fe91d984a59d629caac SHA512 aee040f922df93eb224e3109bd0d80ab7c839660750fa805e539050f2808cbbfb32f14a938010f59249413a79d60883ef5cfb8b48ea5b7ba18c7ef14132f227e
-EBUILD selinux-dovecot-2.20190609-r1.ebuild 283 BLAKE2B 3cb429c403f9d0e66e9753547de834fe092f7c241d9174fcdcfbef430f9f7b9132419cb7f7b6637799892e28211a407d60e20fca164a994ad31c3ddeda4463fc SHA512 37a8e20feda7427bd98c42d901e520f5b610398ac664916d3597b05c14e068ed8ebf9e40937059c20cc7d5784031fb546f0f9466ad57eb0345bb7f5b79e7a25c
+EBUILD selinux-dovecot-2.20190609-r1.ebuild 281 BLAKE2B 5539d2b762b8e6f24beee1e50511116e7e3abf0b0f1921f6f56aa1eefbc188f081e4a2c18dfae391163aca9b8349785e0d1d50afedf37fe91d984a59d629caac SHA512 aee040f922df93eb224e3109bd0d80ab7c839660750fa805e539050f2808cbbfb32f14a938010f59249413a79d60883ef5cfb8b48ea5b7ba18c7ef14132f227e
+EBUILD selinux-dovecot-2.20200818-r1.ebuild 283 BLAKE2B 3cb429c403f9d0e66e9753547de834fe092f7c241d9174fcdcfbef430f9f7b9132419cb7f7b6637799892e28211a407d60e20fca164a994ad31c3ddeda4463fc SHA512 37a8e20feda7427bd98c42d901e520f5b610398ac664916d3597b05c14e068ed8ebf9e40937059c20cc7d5784031fb546f0f9466ad57eb0345bb7f5b79e7a25c
 EBUILD selinux-dovecot-9999.ebuild 286 BLAKE2B fc54984eb4b1eb4fec0507628ec2b9bf35d72aa47ee0a5319f545465bc38d4f4daa97a6cbda1f055a1743d98bf9d1ab22e67ac00a97e05909fed998bf2129dc5 SHA512 c58475100aa32828664c8fdf5cfa5af35bbe8051527b3e58e43757c804015f35fd686d8c802967ab3c17c68070cd77bba11d69712cd5b556f276dc2efe0a829b
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dovecot/selinux-dovecot-2.20190609-r1.ebuild b/sec-policy/selinux-dovecot/selinux-dovecot-2.20190609-r1.ebuild
index a0565000cb9c..1e1f33ba3fbe 100644
--- a/sec-policy/selinux-dovecot/selinux-dovecot-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-dovecot/selinux-dovecot-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-dovecot/selinux-dovecot-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..a0565000cb9c
--- /dev/null
+++ b/sec-policy/selinux-dovecot/selinux-dovecot-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 e0e4a7152b3c..cc3dd5455bdf 100644
--- a/sec-policy/selinux-dpkg/Manifest
+++ b/sec-policy/selinux-dpkg/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-dpkg-2.20190201-r1.ebuild 275 BLAKE2B c496001b4e478aa7a500d8269b7d2567a0742ffdeb38d24c7bb13fc18a70563a79cfeaaab9d251e4f2fda59bf66ef2a9a7e3b5d597bcec92f10d9f1296213a72 SHA512 7a8a1f242aa525cf8e79c66124172638a3a174d2fbd0d7c9703986f636eeef1313804c6ac82f2b9dbb20b71db4cc7753860039e146390df2e8408b324a3e02ec
-EBUILD selinux-dpkg-2.20190609-r1.ebuild 277 BLAKE2B 263b606cbd53cfc2fcfa3fbe1bcb2b37bbaa71496c1af475905ae4471a64b997b07e522c60457b301b1b56d5a10aec438c83dfbc6dc4e80c724bb6869e499c41 SHA512 9020799f26851ec094dd33daaab15ca77c05f6ffcc4c4e7462cd2cd08839c5da82b11c2fc148fb46ef4e0ac2660a42a050fcb8655cfe31dbf438e85b75d17a99
+EBUILD selinux-dpkg-2.20190609-r1.ebuild 275 BLAKE2B c496001b4e478aa7a500d8269b7d2567a0742ffdeb38d24c7bb13fc18a70563a79cfeaaab9d251e4f2fda59bf66ef2a9a7e3b5d597bcec92f10d9f1296213a72 SHA512 7a8a1f242aa525cf8e79c66124172638a3a174d2fbd0d7c9703986f636eeef1313804c6ac82f2b9dbb20b71db4cc7753860039e146390df2e8408b324a3e02ec
+EBUILD selinux-dpkg-2.20200818-r1.ebuild 277 BLAKE2B 263b606cbd53cfc2fcfa3fbe1bcb2b37bbaa71496c1af475905ae4471a64b997b07e522c60457b301b1b56d5a10aec438c83dfbc6dc4e80c724bb6869e499c41 SHA512 9020799f26851ec094dd33daaab15ca77c05f6ffcc4c4e7462cd2cd08839c5da82b11c2fc148fb46ef4e0ac2660a42a050fcb8655cfe31dbf438e85b75d17a99
 EBUILD selinux-dpkg-9999.ebuild 280 BLAKE2B 3a8d566662c26dc656447089df6a28bf8e8ea4860ef76b1f2c01f7bebc73173f27856b2b61f90607cd3ab19748521f34d92ccb8ef05d6c69d7141f1c9710027c SHA512 0876cb2cd469995bc88989eb40166eccfb61b3478e9b80d5de82919081efa4df72b3d042f0aa29f741ecb81f63d886caa1051d9ee033d9bb5f71d090ff72747b
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dpkg/selinux-dpkg-2.20190609-r1.ebuild b/sec-policy/selinux-dpkg/selinux-dpkg-2.20190609-r1.ebuild
index e6383a01db5d..89cab8ca4b66 100644
--- a/sec-policy/selinux-dpkg/selinux-dpkg-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-dpkg/selinux-dpkg-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-dpkg/selinux-dpkg-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..e6383a01db5d
--- /dev/null
+++ b/sec-policy/selinux-dpkg/selinux-dpkg-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 94526c7b701b..a99eec1369f9 100644
--- a/sec-policy/selinux-dracut/Manifest
+++ b/sec-policy/selinux-dracut/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-dracut-2.20190201-r1.ebuild 279 BLAKE2B 46bf21cc75f942e0acec2f72b5d60baccdabedc0173ef374e9f47b42eb250f8b62a149caad2b76b3f6281899ce70bb113f5a2003d52759abacc4e77ef2f66897 SHA512 bbf24738d0df351060ca6d50d4ae1ffd6f645b9275ce3e71965c113d2bc699ad3b0963f2b1699641fb40862c8034d47039a686989be253e18d7621b18b75ca98
-EBUILD selinux-dracut-2.20190609-r1.ebuild 281 BLAKE2B 00caf5e7b61265d8633e3298c5e90ab02a1629915dc1dcd88db0f9039ab6c1a462afdb0b2acbbf13318bacb98d1db449241e59c3c3594e61edec1c0218d57216 SHA512 e3d448804819238ac29c3b7b4f81c3d141d8bd6d4f0a483f91877bda69915808d7c246ddfe852c3b8605b2f79b29271e85c52f089c764052e61ad60a4c860f02
+EBUILD selinux-dracut-2.20190609-r1.ebuild 279 BLAKE2B 46bf21cc75f942e0acec2f72b5d60baccdabedc0173ef374e9f47b42eb250f8b62a149caad2b76b3f6281899ce70bb113f5a2003d52759abacc4e77ef2f66897 SHA512 bbf24738d0df351060ca6d50d4ae1ffd6f645b9275ce3e71965c113d2bc699ad3b0963f2b1699641fb40862c8034d47039a686989be253e18d7621b18b75ca98
+EBUILD selinux-dracut-2.20200818-r1.ebuild 281 BLAKE2B 00caf5e7b61265d8633e3298c5e90ab02a1629915dc1dcd88db0f9039ab6c1a462afdb0b2acbbf13318bacb98d1db449241e59c3c3594e61edec1c0218d57216 SHA512 e3d448804819238ac29c3b7b4f81c3d141d8bd6d4f0a483f91877bda69915808d7c246ddfe852c3b8605b2f79b29271e85c52f089c764052e61ad60a4c860f02
 EBUILD selinux-dracut-9999.ebuild 284 BLAKE2B 29174e47b5227accb466a85ebc2de16b75d310074e51e2a485ae4c036a3e5160be6bff6c939e6ac7e82adadef5ab2355e8d9c72dd48089975b6c085014cc9d27 SHA512 31938f2405c8153ab69f15c2a82e76430dcbeeef44e5bf97c926069b392b74e9154794ceee09aef54ed1fdbf01f994e19052339081b7cb376a8dbce8d1aea73d
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dracut/selinux-dracut-2.20190609-r1.ebuild b/sec-policy/selinux-dracut/selinux-dracut-2.20190609-r1.ebuild
index 2054bae3ef3f..4666893b2dfb 100644
--- a/sec-policy/selinux-dracut/selinux-dracut-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-dracut/selinux-dracut-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-dracut/selinux-dracut-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..2054bae3ef3f
--- /dev/null
+++ b/sec-policy/selinux-dracut/selinux-dracut-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 daa7625df074..1ef64453c4cc 100644
--- a/sec-policy/selinux-dropbox/Manifest
+++ b/sec-policy/selinux-dropbox/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-dropbox-2.20190201-r1.ebuild 429 BLAKE2B 59e515efb38914a1c85766d381ec4e5d99edf3a98cd74117562504b509a558e38abd79d023f871bc066bef72cb0bb2e9a0dddc557469634b15d5c6375b7bbfae SHA512 b5eba1054c0c2036988c002f3dc959dda7ffb9a95f38ca5ee774858e1e7034761c84ab5075b2653802d4868ddc977e58fa8fb0e41aa92f484cc0d3eda9e0515b
-EBUILD selinux-dropbox-2.20190609-r1.ebuild 431 BLAKE2B 858c0e3d771c589dd056e287759dd58170751e9af8d2df4b8abf2d1198ba8fbc41bd5b5af678101e77d32fae28cb0ca857f17c502769bb53ae32c82e079f4581 SHA512 aba919083e2524ce70bdafd139e3a24c2e86ebc4190ef942b3a173dc2faaf9eb1633caf1dc41cd88eb4fba063b90aff20baa50e6a2871588d8f7ba9c8d6ef29f
+EBUILD selinux-dropbox-2.20190609-r1.ebuild 429 BLAKE2B 59e515efb38914a1c85766d381ec4e5d99edf3a98cd74117562504b509a558e38abd79d023f871bc066bef72cb0bb2e9a0dddc557469634b15d5c6375b7bbfae SHA512 b5eba1054c0c2036988c002f3dc959dda7ffb9a95f38ca5ee774858e1e7034761c84ab5075b2653802d4868ddc977e58fa8fb0e41aa92f484cc0d3eda9e0515b
+EBUILD selinux-dropbox-2.20200818-r1.ebuild 431 BLAKE2B 858c0e3d771c589dd056e287759dd58170751e9af8d2df4b8abf2d1198ba8fbc41bd5b5af678101e77d32fae28cb0ca857f17c502769bb53ae32c82e079f4581 SHA512 aba919083e2524ce70bdafd139e3a24c2e86ebc4190ef942b3a173dc2faaf9eb1633caf1dc41cd88eb4fba063b90aff20baa50e6a2871588d8f7ba9c8d6ef29f
 EBUILD selinux-dropbox-9999.ebuild 434 BLAKE2B baf516b36d9fe954e5918e47d30425c491f093d8d08fa28208b46adc78a2dc2c12959e22dc5bbed2634c87acd8dd92ae03d2379d1dacb404230f21b28a200319 SHA512 b0036ba75bb8b360199b7e83abf1cc60a9c47505dda8fcf10b4a181cc14107c285e5dd7e67ee76a223b4c94dfe42af05f8b1dd9580dd2494bc51f51794207a3e
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dropbox/selinux-dropbox-2.20190609-r1.ebuild b/sec-policy/selinux-dropbox/selinux-dropbox-2.20190609-r1.ebuild
index a1ff5fb57a42..62d5dc077a97 100644
--- a/sec-policy/selinux-dropbox/selinux-dropbox-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-dropbox/selinux-dropbox-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-dropbox/selinux-dropbox-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..a1ff5fb57a42
--- /dev/null
+++ b/sec-policy/selinux-dropbox/selinux-dropbox-2.20200818-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 d2c0573d7303..06f640ddfce0 100644
--- a/sec-policy/selinux-entropyd/Manifest
+++ b/sec-policy/selinux-entropyd/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-entropyd-2.20190201-r1.ebuild 283 BLAKE2B ddfaa596e04a2d4ec80e33a85f0be70f6b9fb52ff815769b80c67a09d18a85fbab4be9968d0e35194c05dc7cda86d217141c60552e9f31f52c60cf7c13db79f5 SHA512 9efe15f325bdec93833e2c532bb4fade3026c62e4121c46ee1a13014c565614fd8c459c56493734bcc05e456cb4fa81c5e1b9955c9be1f9eeb9b8d9ca0e3540f
-EBUILD selinux-entropyd-2.20190609-r1.ebuild 285 BLAKE2B e580a645c4b19a136da6021f8fddc6b9b58957ed3fb9753f85897fa3b3bad6989434baa02ce6dd0a6cdffaf45cb8fab8f4c9c03f606052a8d584b2af2001e1dd SHA512 91c136cbd6bf39a1b4b8f580df811349d38a1a1124b30a759e8c455ccf3f630ba17f3cd5ddd4882878d291d99b04633384b6eeabe080ea2ab4f9cb9b69d75706
+EBUILD selinux-entropyd-2.20190609-r1.ebuild 283 BLAKE2B ddfaa596e04a2d4ec80e33a85f0be70f6b9fb52ff815769b80c67a09d18a85fbab4be9968d0e35194c05dc7cda86d217141c60552e9f31f52c60cf7c13db79f5 SHA512 9efe15f325bdec93833e2c532bb4fade3026c62e4121c46ee1a13014c565614fd8c459c56493734bcc05e456cb4fa81c5e1b9955c9be1f9eeb9b8d9ca0e3540f
+EBUILD selinux-entropyd-2.20200818-r1.ebuild 285 BLAKE2B e580a645c4b19a136da6021f8fddc6b9b58957ed3fb9753f85897fa3b3bad6989434baa02ce6dd0a6cdffaf45cb8fab8f4c9c03f606052a8d584b2af2001e1dd SHA512 91c136cbd6bf39a1b4b8f580df811349d38a1a1124b30a759e8c455ccf3f630ba17f3cd5ddd4882878d291d99b04633384b6eeabe080ea2ab4f9cb9b69d75706
 EBUILD selinux-entropyd-9999.ebuild 288 BLAKE2B 9aa5ee3cc94ee1adfa1cc457627f6a5a367f4bb5558d4355a1e8d474d584f1c3243d238243e24f6bedc3f142ffea7d655215309696df1260c5cfc0f26143900c SHA512 e3430f2ac62898d882db2cd83bb143ba2bc942a6d0a3c4413301b01e3b2069556af7fa2bbd5808295b5cc23f68190481e3bae94b7e3f7ad29e9873b159c25564
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-entropyd/selinux-entropyd-2.20190609-r1.ebuild b/sec-policy/selinux-entropyd/selinux-entropyd-2.20190609-r1.ebuild
index 12207da05f25..bd0339fd2955 100644
--- a/sec-policy/selinux-entropyd/selinux-entropyd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-entropyd/selinux-entropyd-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-entropyd/selinux-entropyd-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..12207da05f25
--- /dev/null
+++ b/sec-policy/selinux-entropyd/selinux-entropyd-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 b34db5992816..d579f5976fda 100644
--- a/sec-policy/selinux-evolution/Manifest
+++ b/sec-policy/selinux-evolution/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-evolution-2.20190201-r1.ebuild 383 BLAKE2B 829b083dada4a82761531fc0cea1fe0934c66e6020d601628ec5f68a29825deadd878afc30b5deb3f4d019b08797d115f6e1fe766afc144c888364f7570bb597 SHA512 d6873e858632652adc46c7fd50a88be093eb39c021d30972b1c9847932bdf58fa057a6861d9c5b87a41fab0b6c836006178db5db879fb8d47268efefdda1922c
-EBUILD selinux-evolution-2.20190609-r1.ebuild 385 BLAKE2B 8d137075737b95a34fbf31a0a387d31f252ae64a1540677dcf475a319e0b0bf2fb405d908efccc25bb6ca2ec41cb9389a645b422fd2ca992f8d8030651393848 SHA512 c36400d09f530b0aad8786ac41a6c126a37b02c5aec44e5d806c7606e16ab5ac9ccfad0744a82a0dd37f9de24f1ea30bf3c55f4cf5661cc9f1ae487af21ac1ae
+EBUILD selinux-evolution-2.20190609-r1.ebuild 383 BLAKE2B 829b083dada4a82761531fc0cea1fe0934c66e6020d601628ec5f68a29825deadd878afc30b5deb3f4d019b08797d115f6e1fe766afc144c888364f7570bb597 SHA512 d6873e858632652adc46c7fd50a88be093eb39c021d30972b1c9847932bdf58fa057a6861d9c5b87a41fab0b6c836006178db5db879fb8d47268efefdda1922c
+EBUILD selinux-evolution-2.20200818-r1.ebuild 385 BLAKE2B 8d137075737b95a34fbf31a0a387d31f252ae64a1540677dcf475a319e0b0bf2fb405d908efccc25bb6ca2ec41cb9389a645b422fd2ca992f8d8030651393848 SHA512 c36400d09f530b0aad8786ac41a6c126a37b02c5aec44e5d806c7606e16ab5ac9ccfad0744a82a0dd37f9de24f1ea30bf3c55f4cf5661cc9f1ae487af21ac1ae
 EBUILD selinux-evolution-9999.ebuild 388 BLAKE2B bd7d2a8ebceba62476b33cca24cdbc3f1c5a2656371c235c2f2269fec782993e529b26a1044b319ce8a4750a5e59947fb07d5b42cbc70eb9629ee42d565a729d SHA512 403695e28f11d5b58eb1f3c7d8ad8dc8abb310d1fef609cc9efaff6568b35fa8431a37dd997696c03174b721ed4f862d83978aac12b4e713293a17161603987f
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-evolution/selinux-evolution-2.20190609-r1.ebuild b/sec-policy/selinux-evolution/selinux-evolution-2.20190609-r1.ebuild
index d175f463b9ea..091f6ae1dd82 100644
--- a/sec-policy/selinux-evolution/selinux-evolution-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-evolution/selinux-evolution-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-evolution/selinux-evolution-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..d175f463b9ea
--- /dev/null
+++ b/sec-policy/selinux-evolution/selinux-evolution-2.20200818-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 9f4d7cd7bade..7bd20482a3d6 100644
--- a/sec-policy/selinux-exim/Manifest
+++ b/sec-policy/selinux-exim/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-exim-2.20190201-r1.ebuild 275 BLAKE2B e271f3fece459bb5f79e6e9ca7b36f834c252fc54edc0a60540e58b7c58fcb11a9521295a023be23ca21bb2d3f141531a752c649b9da5f1ee26a4fb8602b45c2 SHA512 748ead7aa541ef6fbe1a337d9b98a1bbb9d1f3698d4624c2b210376d7dbae6ff6cb44c51ce2782353ae9eefc11f09d8b64ec56d355a0972918557115c07bcc75
-EBUILD selinux-exim-2.20190609-r1.ebuild 277 BLAKE2B d3e00ee4abfe2b082b7038aa4099209979a6133cb19d832ddcf3051b9f6accb7922cfb94a5c5cd94d14e5626b2f0b5c50b424b8d15c5d1e14f99d92c360facbc SHA512 27cbc12b0e0dd8451c0d6635db490a68852a65b9d2a76fd1cf2c4e70ca1190e99c510c7b88efde3925165d4732fd72bcb4da79fc0b4abeb84404a6b464bd225b
+EBUILD selinux-exim-2.20190609-r1.ebuild 275 BLAKE2B e271f3fece459bb5f79e6e9ca7b36f834c252fc54edc0a60540e58b7c58fcb11a9521295a023be23ca21bb2d3f141531a752c649b9da5f1ee26a4fb8602b45c2 SHA512 748ead7aa541ef6fbe1a337d9b98a1bbb9d1f3698d4624c2b210376d7dbae6ff6cb44c51ce2782353ae9eefc11f09d8b64ec56d355a0972918557115c07bcc75
+EBUILD selinux-exim-2.20200818-r1.ebuild 277 BLAKE2B d3e00ee4abfe2b082b7038aa4099209979a6133cb19d832ddcf3051b9f6accb7922cfb94a5c5cd94d14e5626b2f0b5c50b424b8d15c5d1e14f99d92c360facbc SHA512 27cbc12b0e0dd8451c0d6635db490a68852a65b9d2a76fd1cf2c4e70ca1190e99c510c7b88efde3925165d4732fd72bcb4da79fc0b4abeb84404a6b464bd225b
 EBUILD selinux-exim-9999.ebuild 280 BLAKE2B 27c56aa9de7e12fddcf22d07a3889a5e4bf567643e42e9805443ea43491b5fcd4ab60fa4ec8b4b2a4aac39d1cfcb8c7106ed45620570c4da4e44663890422802 SHA512 5a4ef393f6365d4f74669d08e3802b220c077138d46cdd68d635aa65f17c9e580a5abc619aaffcd329482bb59b28a040071be35d737f1d8d925f943f69fe9aa2
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-exim/selinux-exim-2.20190609-r1.ebuild b/sec-policy/selinux-exim/selinux-exim-2.20190609-r1.ebuild
index 0ff65864f52f..724df83e9453 100644
--- a/sec-policy/selinux-exim/selinux-exim-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-exim/selinux-exim-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-exim/selinux-exim-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..0ff65864f52f
--- /dev/null
+++ b/sec-policy/selinux-exim/selinux-exim-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 216f75b00d48..d72c96124cb6 100644
--- a/sec-policy/selinux-fail2ban/Manifest
+++ b/sec-policy/selinux-fail2ban/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-fail2ban-2.20190201-r1.ebuild 283 BLAKE2B b3f146efbb8ec4cd7188ff049ae7140a63f18b864e54fb3850828a8db24170265fd7334a898d68e1bf9f2030b8fb12f55b9d4ee2d33effd01dbd092220d3b69e SHA512 fb679bc7b119482300060cc87ed69875bca8c3c27f0236818a4dbbb373860337a52fdf1399758bfd068bb0b30a27f281288e6fcbb743d351b287a484e8e93900
-EBUILD selinux-fail2ban-2.20190609-r1.ebuild 285 BLAKE2B 3601e0a1139039e9cc89e49033c8cde93106649412f7b585e5a60378608b62d99913ccaa9821ffdb67e7a9299a43ef7c89fed6026da6019ca089b06a0c3e44ea SHA512 c113d4fd157b94926a1640b48b9812a07768ef328eca5e1ccb9f2fe63d8e9873ba18486a81cdc3c4e5b82bb92aa5c10b77bc3a15446a1523fa27c9fc89b0bd66
+EBUILD selinux-fail2ban-2.20190609-r1.ebuild 283 BLAKE2B b3f146efbb8ec4cd7188ff049ae7140a63f18b864e54fb3850828a8db24170265fd7334a898d68e1bf9f2030b8fb12f55b9d4ee2d33effd01dbd092220d3b69e SHA512 fb679bc7b119482300060cc87ed69875bca8c3c27f0236818a4dbbb373860337a52fdf1399758bfd068bb0b30a27f281288e6fcbb743d351b287a484e8e93900
+EBUILD selinux-fail2ban-2.20200818-r1.ebuild 285 BLAKE2B 3601e0a1139039e9cc89e49033c8cde93106649412f7b585e5a60378608b62d99913ccaa9821ffdb67e7a9299a43ef7c89fed6026da6019ca089b06a0c3e44ea SHA512 c113d4fd157b94926a1640b48b9812a07768ef328eca5e1ccb9f2fe63d8e9873ba18486a81cdc3c4e5b82bb92aa5c10b77bc3a15446a1523fa27c9fc89b0bd66
 EBUILD selinux-fail2ban-9999.ebuild 288 BLAKE2B d3ba286ea343b95ca6e0c114cc20acd32576890f7394e6136448122c1323292c022d1e4e5a1c313ce4676c4c7676522998b58ef7d8396cab1aa88e0ebe58a65e SHA512 9ad46e3b624c74649c134655994f13bff97e6b11228b7520124d56a15ea637799bdab79fa9b106a7bd8185c443d04ad573ce20f95f90b5427f5b4ad21a711871
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20190609-r1.ebuild b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20190609-r1.ebuild
index a1cded44bfc2..b2b0b8ee1ac9 100644
--- a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..a1cded44bfc2
--- /dev/null
+++ b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 46746357f4bf..9b6ef517ad7c 100644
--- a/sec-policy/selinux-fetchmail/Manifest
+++ b/sec-policy/selinux-fetchmail/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-fetchmail-2.20190201-r1.ebuild 285 BLAKE2B 355d28801287926acb880fc96af9ce43f38acdfd5ef0c9a3ca2e24b6c7fdea476a7aef0a503098367743d4338f5ac16f367556871fd3fbf8eb40f02d77819004 SHA512 baab271254c6be609ddb755b626cb6e6840dcb10ef3281442fb1b3dc5e2400d6bb66831cadfbd5a6a6aba27c0b910c3b2aa05dbd14e167c17932baa5c62b4d59
-EBUILD selinux-fetchmail-2.20190609-r1.ebuild 287 BLAKE2B e2fb3b93b8a2fa0b0334f77d2df63a5c6cde00fcdb2850619bc171f66146942b8694746c90acfaa59d3b18d8e305df473a8696869487a15d510ab8d42696fd81 SHA512 ea869094b99945cfa9b32bf46f45a676a7dc5125dd8dc64bb84ae3043b462d86313da767d32c19aaac0ca9a9636c026459291031271b0273a4090cb5c0332fe7
+EBUILD selinux-fetchmail-2.20190609-r1.ebuild 285 BLAKE2B 355d28801287926acb880fc96af9ce43f38acdfd5ef0c9a3ca2e24b6c7fdea476a7aef0a503098367743d4338f5ac16f367556871fd3fbf8eb40f02d77819004 SHA512 baab271254c6be609ddb755b626cb6e6840dcb10ef3281442fb1b3dc5e2400d6bb66831cadfbd5a6a6aba27c0b910c3b2aa05dbd14e167c17932baa5c62b4d59
+EBUILD selinux-fetchmail-2.20200818-r1.ebuild 287 BLAKE2B e2fb3b93b8a2fa0b0334f77d2df63a5c6cde00fcdb2850619bc171f66146942b8694746c90acfaa59d3b18d8e305df473a8696869487a15d510ab8d42696fd81 SHA512 ea869094b99945cfa9b32bf46f45a676a7dc5125dd8dc64bb84ae3043b462d86313da767d32c19aaac0ca9a9636c026459291031271b0273a4090cb5c0332fe7
 EBUILD selinux-fetchmail-9999.ebuild 290 BLAKE2B e84e446c107a25f807382e19b23959936f9ece26fe71815bd34fc5c861847041e26ad1561a31cc8eca99b7cfb6c4b0ce0510bfa5713be762529dc4cfe2437476 SHA512 cc184e4349ea7beb4a528805ffd429b394010bc24a7eeb37f6faa2c7e5be9700b2e89605013a0ff37c020b502cea29ee0893aef841ed31fae201053745183557
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20190609-r1.ebuild b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20190609-r1.ebuild
index e4b9f4758613..ebec93eb3d47 100644
--- a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..e4b9f4758613
--- /dev/null
+++ b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 8a0550f3b601..4539cf45e28f 100644
--- a/sec-policy/selinux-finger/Manifest
+++ b/sec-policy/selinux-finger/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-finger-2.20190201-r1.ebuild 374 BLAKE2B b8f8ffc14fbb19d2a259ff1f7bc634b35b31a9dc70b618a3732c19a8c8aaf5287f377021bcc8cc7f1d04faf52210fa3c74f87704706b4836e53aa8f139f8cf79 SHA512 ebb3f837bb8ee1cbaf0ccd8083866bed9ee70af5b881178b93eb679f206f6d36a0e4bc0e5bf015e530ca0d1bd55c2fdfcf7e03d3b3e0501083c3ee8ec7f4288f
-EBUILD selinux-finger-2.20190609-r1.ebuild 376 BLAKE2B 1556c8bb077f0b483d9d0c53a02eb073a1f3d4760d6c2e585995f730d73c8345e4906d13e69174113a4c90b3c350d82a79c58e20c15c0c5024e81e28d57ed199 SHA512 3974481f38f7b9aeb7c6ecc3d196579cfe7f2445e773917439a445dc20e96bb7580add8395a3702ea969b2654c44f7e9162fa6fe85135a97cd4b836a0fc193fe
+EBUILD selinux-finger-2.20190609-r1.ebuild 374 BLAKE2B b8f8ffc14fbb19d2a259ff1f7bc634b35b31a9dc70b618a3732c19a8c8aaf5287f377021bcc8cc7f1d04faf52210fa3c74f87704706b4836e53aa8f139f8cf79 SHA512 ebb3f837bb8ee1cbaf0ccd8083866bed9ee70af5b881178b93eb679f206f6d36a0e4bc0e5bf015e530ca0d1bd55c2fdfcf7e03d3b3e0501083c3ee8ec7f4288f
+EBUILD selinux-finger-2.20200818-r1.ebuild 376 BLAKE2B 1556c8bb077f0b483d9d0c53a02eb073a1f3d4760d6c2e585995f730d73c8345e4906d13e69174113a4c90b3c350d82a79c58e20c15c0c5024e81e28d57ed199 SHA512 3974481f38f7b9aeb7c6ecc3d196579cfe7f2445e773917439a445dc20e96bb7580add8395a3702ea969b2654c44f7e9162fa6fe85135a97cd4b836a0fc193fe
 EBUILD selinux-finger-9999.ebuild 379 BLAKE2B ae42f00c0b1ae7b927bb35b8cf05f6e3fa7befff3c195a613673ad8b3104819c2604e6680a4095df6c33a23b649e4375811045b789d2652173105781e0990cc4 SHA512 100020ba8690a677e51bc22043f5697b076b490f16b92067fb4ffd9fcb2a6150ffdb017ee8e5c4fe3f72ce0a8346a11aa4e13e63d0b204beead795a594a887b5
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-finger/selinux-finger-2.20190609-r1.ebuild b/sec-policy/selinux-finger/selinux-finger-2.20190609-r1.ebuild
index a4821f707c58..79c29efb8b8f 100644
--- a/sec-policy/selinux-finger/selinux-finger-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-finger/selinux-finger-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-finger/selinux-finger-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..a4821f707c58
--- /dev/null
+++ b/sec-policy/selinux-finger/selinux-finger-2.20200818-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 b49646c04e1a..68f6ef63ce9d 100644
--- a/sec-policy/selinux-flash/Manifest
+++ b/sec-policy/selinux-flash/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-flash-2.20190201-r1.ebuild 277 BLAKE2B 398723a3a2564761a10a3cc7b9d967563794da966d3c2ed6bef8bc45af8af80a95e954b65c9034fcd502cba22192a153e510035b69ec2168193839519c538fe0 SHA512 a3ede68add9f474d9c544f5b00848595a382a6b3e2369730402e601d2494400ebf623b856f1c66222128c3afb141dfa867cf4c98aba4911d175df51be23d948c
-EBUILD selinux-flash-2.20190609-r1.ebuild 279 BLAKE2B 21924c513eaabe4206bed0bfec29afeb36a2192f52db1b8d9c7487bee958fc3933b96a7f452045d27ec98550ca184aebe9f7a4ee9db4d7fa1f59f0366ea1f547 SHA512 213379f976e9e4a1d865ec0fd8f21d9e42b975960d653e3aad405e31a27c9461e861d4aa7d5cff32be7ea74a03f0ce921d4b6fa9e05f1414b9ad3cb3fc875256
+EBUILD selinux-flash-2.20190609-r1.ebuild 277 BLAKE2B 398723a3a2564761a10a3cc7b9d967563794da966d3c2ed6bef8bc45af8af80a95e954b65c9034fcd502cba22192a153e510035b69ec2168193839519c538fe0 SHA512 a3ede68add9f474d9c544f5b00848595a382a6b3e2369730402e601d2494400ebf623b856f1c66222128c3afb141dfa867cf4c98aba4911d175df51be23d948c
+EBUILD selinux-flash-2.20200818-r1.ebuild 279 BLAKE2B 21924c513eaabe4206bed0bfec29afeb36a2192f52db1b8d9c7487bee958fc3933b96a7f452045d27ec98550ca184aebe9f7a4ee9db4d7fa1f59f0366ea1f547 SHA512 213379f976e9e4a1d865ec0fd8f21d9e42b975960d653e3aad405e31a27c9461e861d4aa7d5cff32be7ea74a03f0ce921d4b6fa9e05f1414b9ad3cb3fc875256
 EBUILD selinux-flash-9999.ebuild 282 BLAKE2B 43f2ebf65c5f79b67426e9b8e3b736892283f82ed7abdd801800f7560cb8cf3a0ecacb6a78fbd176be8b355dfeedf8da77826a47d1213412f60785c71852c57c SHA512 d39d2fc8e0ebd4499573661e15dca2afb3737293131cf0a1d8626a3b78b3967497837d0344704fdbe17801c49b24f5f6cb4aad14d261c27c67acbad915bb51b1
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-flash/selinux-flash-2.20190609-r1.ebuild b/sec-policy/selinux-flash/selinux-flash-2.20190609-r1.ebuild
index c78504df8f10..ff8ae6d5c295 100644
--- a/sec-policy/selinux-flash/selinux-flash-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-flash/selinux-flash-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-flash/selinux-flash-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..c78504df8f10
--- /dev/null
+++ b/sec-policy/selinux-flash/selinux-flash-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 a77b8766e7b7..c93e39ad5304 100644
--- a/sec-policy/selinux-fprintd/Manifest
+++ b/sec-policy/selinux-fprintd/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-fprintd-2.20190201-r1.ebuild 373 BLAKE2B f2a3cc566ea3ec93c5ea8a7f1432715c02dd66e04082a77a85bac709541e92463b7d82e59d545a9c632f6d28c50e1c220badf38f283d7a3b41b97fd49d4b7869 SHA512 40a8ed7717d128ebde3a0f8324c5bcd0b96fa7030c3853bc89ca4ab6f392bdf683acfb1cade3ac458caf9cc58454e0244ad3bec2eed994bd8eb9a3f208477234
-EBUILD selinux-fprintd-2.20190609-r1.ebuild 375 BLAKE2B 945698bc3936da3ee9ce067dbb8e3eaf04dcefd62ba9df72d20e59e27dbeb23a168ed6c748b058838f4f14b85c2b5528ac8800c063e01c6b06a9f689d287fe1b SHA512 d7c8bb1794ebe14c0424d2806ddb81e4c3d257345fd720768d982ad07b96c553a0fc0a833fbda9d11c9ccf04e0bfd5971ec86bb95f68d1bfbd79b065890d0eca
+EBUILD selinux-fprintd-2.20190609-r1.ebuild 373 BLAKE2B f2a3cc566ea3ec93c5ea8a7f1432715c02dd66e04082a77a85bac709541e92463b7d82e59d545a9c632f6d28c50e1c220badf38f283d7a3b41b97fd49d4b7869 SHA512 40a8ed7717d128ebde3a0f8324c5bcd0b96fa7030c3853bc89ca4ab6f392bdf683acfb1cade3ac458caf9cc58454e0244ad3bec2eed994bd8eb9a3f208477234
+EBUILD selinux-fprintd-2.20200818-r1.ebuild 375 BLAKE2B 945698bc3936da3ee9ce067dbb8e3eaf04dcefd62ba9df72d20e59e27dbeb23a168ed6c748b058838f4f14b85c2b5528ac8800c063e01c6b06a9f689d287fe1b SHA512 d7c8bb1794ebe14c0424d2806ddb81e4c3d257345fd720768d982ad07b96c553a0fc0a833fbda9d11c9ccf04e0bfd5971ec86bb95f68d1bfbd79b065890d0eca
 EBUILD selinux-fprintd-9999.ebuild 378 BLAKE2B 20be727aae31ede351d819a5cc3cff1669391f63ac90e9209f49570cd2eab95a5a6e946c4edcd38bd89f325b22ed1eef2a3908d7c2cb84216456809d3e40399f SHA512 13bb722fbf653d86f5fefb86def05ad837b2e3747478bae91242dd59c5b2c7d855a454a7e7fdbf495224e1d451557fc2f11b0e371cd50510d1705e670fc594f9
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-fprintd/selinux-fprintd-2.20190609-r1.ebuild b/sec-policy/selinux-fprintd/selinux-fprintd-2.20190609-r1.ebuild
index 439886384f89..546d0e1ba794 100644
--- a/sec-policy/selinux-fprintd/selinux-fprintd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-fprintd/selinux-fprintd-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-fprintd/selinux-fprintd-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..439886384f89
--- /dev/null
+++ b/sec-policy/selinux-fprintd/selinux-fprintd-2.20200818-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 56bee91e02f2..f3a4dff6a675 100644
--- a/sec-policy/selinux-ftp/Manifest
+++ b/sec-policy/selinux-ftp/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-ftp-2.20190201-r1.ebuild 273 BLAKE2B 826b23798472f2efcfbe99266a38d7bb3edf45bc30a1a5c4bd5959c9e799e81b36bee4a7e69f4a2faf0dbc1c68a78212a9d9c28834d9a85f5b7371ddc5bc864f SHA512 910f4a77bfaa486ebf1fed76899c1f03e32f201f9ec661fe20db379aaca33095db198e8001bb1e0d82750c6de764ef3918d2203ac921249653631d728155cd50
-EBUILD selinux-ftp-2.20190609-r1.ebuild 275 BLAKE2B 5e4b3e37d98aa40ecbbd50eab8e1754350a95bda0da1ec30af2cd21e5b91954ebebdae2c482bfc03ff0e1cea04bc66cebfe91ae522a2030a55a78d88db7746f5 SHA512 907a169884ea875123666ef65e9e00417dd5e44b5256c734653045312b1b8b5622062633f09fb2cfc9b1fdc7390cd1ef0a73b2fa3b81f6e2e3f15b973a03a237
+EBUILD selinux-ftp-2.20190609-r1.ebuild 273 BLAKE2B 826b23798472f2efcfbe99266a38d7bb3edf45bc30a1a5c4bd5959c9e799e81b36bee4a7e69f4a2faf0dbc1c68a78212a9d9c28834d9a85f5b7371ddc5bc864f SHA512 910f4a77bfaa486ebf1fed76899c1f03e32f201f9ec661fe20db379aaca33095db198e8001bb1e0d82750c6de764ef3918d2203ac921249653631d728155cd50
+EBUILD selinux-ftp-2.20200818-r1.ebuild 275 BLAKE2B 5e4b3e37d98aa40ecbbd50eab8e1754350a95bda0da1ec30af2cd21e5b91954ebebdae2c482bfc03ff0e1cea04bc66cebfe91ae522a2030a55a78d88db7746f5 SHA512 907a169884ea875123666ef65e9e00417dd5e44b5256c734653045312b1b8b5622062633f09fb2cfc9b1fdc7390cd1ef0a73b2fa3b81f6e2e3f15b973a03a237
 EBUILD selinux-ftp-9999.ebuild 278 BLAKE2B 951d287c1ae115ef1e7460e764dd814b4d5f0d4184c1def363037c6209c74be8e31d57e245955cb460f00c8d31f2acf8fa58834127fc5f88c6df095160cdad06 SHA512 dfadcebb73fef617b79e0e2dba40d18650fa35e19baaaacf63430bfa9e273bd0f9ddb7f085c86e30745b15bb9dba283202af6cfe761887c430008a6e32d85183
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ftp/selinux-ftp-2.20190609-r1.ebuild b/sec-policy/selinux-ftp/selinux-ftp-2.20190609-r1.ebuild
index 5a96505f57f1..60b89d957ce5 100644
--- a/sec-policy/selinux-ftp/selinux-ftp-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-ftp/selinux-ftp-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-ftp/selinux-ftp-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..5a96505f57f1
--- /dev/null
+++ b/sec-policy/selinux-ftp/selinux-ftp-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 2950d1406fe5..48bb0c3ec6be 100644
--- a/sec-policy/selinux-games/Manifest
+++ b/sec-policy/selinux-games/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-games-2.20190201-r1.ebuild 277 BLAKE2B 7906999affc93ad5fe27b79c10c47a0cfe52d59462129e2a43431e4ca136cdcc1a86f8ee89d796be022103de37e7322dbb11861aff18d7c7dbc2120fb96806cc SHA512 71eb1299bdcd58d596b8b1f502b3f97c8c1727793480664b6cddbc35551953ed4651e716595bd392ad4353bcfa6734131e1ad34c290a177a008f9ee35be84821
-EBUILD selinux-games-2.20190609-r1.ebuild 279 BLAKE2B 68d38a2f649d463915c31d2e30a9804d7c62c4ab7a81c5071cabdac2fccd41d063a171529e877511933b0530efa695f05d3296e5333c04166260aa4207dd2234 SHA512 fa4bc673dd291063da4de9c028c5e7a1367e3e9f39b1d64939cabe01198f5326e5c38d01fdd9aeb0d383b417d62ba204aa1277e7718bd5f8d513d7a5c2d2295d
+EBUILD selinux-games-2.20190609-r1.ebuild 277 BLAKE2B 7906999affc93ad5fe27b79c10c47a0cfe52d59462129e2a43431e4ca136cdcc1a86f8ee89d796be022103de37e7322dbb11861aff18d7c7dbc2120fb96806cc SHA512 71eb1299bdcd58d596b8b1f502b3f97c8c1727793480664b6cddbc35551953ed4651e716595bd392ad4353bcfa6734131e1ad34c290a177a008f9ee35be84821
+EBUILD selinux-games-2.20200818-r1.ebuild 279 BLAKE2B 68d38a2f649d463915c31d2e30a9804d7c62c4ab7a81c5071cabdac2fccd41d063a171529e877511933b0530efa695f05d3296e5333c04166260aa4207dd2234 SHA512 fa4bc673dd291063da4de9c028c5e7a1367e3e9f39b1d64939cabe01198f5326e5c38d01fdd9aeb0d383b417d62ba204aa1277e7718bd5f8d513d7a5c2d2295d
 EBUILD selinux-games-9999.ebuild 282 BLAKE2B 8d7837cae56dbc97fb2d48d34083db6fadae9a408219cfb01bdd8c47cadd66e64b124f639607752d7d352eef22f21d940c7f5c4a618706ebbe517718d8485eb3 SHA512 7e3110d42f869688e9adcd0513402d2fec5785bcd74e018a0e6e2576bec3bb27a31ef3e134b8b9ad9b15b0ca6a55aae6d04ba83a42e28ec750bfa904fa3fd134
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-games/selinux-games-2.20190609-r1.ebuild b/sec-policy/selinux-games/selinux-games-2.20190609-r1.ebuild
index 892674828bae..5b88b7d06130 100644
--- a/sec-policy/selinux-games/selinux-games-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-games/selinux-games-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-games/selinux-games-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..892674828bae
--- /dev/null
+++ b/sec-policy/selinux-games/selinux-games-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 6d3781cf044a..6a899d4ef14c 100644
--- a/sec-policy/selinux-gatekeeper/Manifest
+++ b/sec-policy/selinux-gatekeeper/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-gatekeeper-2.20190201-r1.ebuild 287 BLAKE2B c70f817144df2e3e90948829f373a0921a20ff9154d495c1cdec4eebdd44391a654e4223098d66abb92d600d5e7498f6d5e33f9b58f443e91004904c24c92560 SHA512 db6b5481d8c4777a77c5e76d4d9e928211c8f2c236aa636d2b58020ed1ead5f00561b0140849f28ffb254d9dfaf3f54710e1c8ca4a7eae50906e3c803276ef79
-EBUILD selinux-gatekeeper-2.20190609-r1.ebuild 289 BLAKE2B 43c4baed0f5c4a1e25c0351010634c7e01c438d55c727ff58778392f5e818e265c55aefbd405afb20694c4518b8645e6019eba8ccd44882e6841825a43d014c3 SHA512 0454cb030222291bf701a7edf4d0eefa4fa79c0c1a5b21d2259042a7b366c2db1b3acff51189de7d16778fae26abc9bfc0a698abc738a1a35b90b928c29820c6
+EBUILD selinux-gatekeeper-2.20190609-r1.ebuild 287 BLAKE2B c70f817144df2e3e90948829f373a0921a20ff9154d495c1cdec4eebdd44391a654e4223098d66abb92d600d5e7498f6d5e33f9b58f443e91004904c24c92560 SHA512 db6b5481d8c4777a77c5e76d4d9e928211c8f2c236aa636d2b58020ed1ead5f00561b0140849f28ffb254d9dfaf3f54710e1c8ca4a7eae50906e3c803276ef79
+EBUILD selinux-gatekeeper-2.20200818-r1.ebuild 289 BLAKE2B 43c4baed0f5c4a1e25c0351010634c7e01c438d55c727ff58778392f5e818e265c55aefbd405afb20694c4518b8645e6019eba8ccd44882e6841825a43d014c3 SHA512 0454cb030222291bf701a7edf4d0eefa4fa79c0c1a5b21d2259042a7b366c2db1b3acff51189de7d16778fae26abc9bfc0a698abc738a1a35b90b928c29820c6
 EBUILD selinux-gatekeeper-9999.ebuild 292 BLAKE2B 23ed75ae334fb75924eb269fb16163e77a2ad1f2c0a9fc1c7318562d84308cab3db8234c60741ef3d0d9622d37e25143c8a3aabe5a4744930e88f4d10b0c8c5e SHA512 4f0a4243811c1daaf8c44e759a1ce3b7c2d38961f05031dd88a201dd6ce5e2b06838bcfa3183d7792470cf46991c387f13a7a55115d4e86d7342f8849afeaf85
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20190609-r1.ebuild b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20190609-r1.ebuild
index bce180d3afd2..8b5d1f279ad7 100644
--- a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..bce180d3afd2
--- /dev/null
+++ b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 52fd25a254f9..c64f748bad85 100644
--- a/sec-policy/selinux-git/Manifest
+++ b/sec-policy/selinux-git/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-git-2.20190201-r1.ebuild 369 BLAKE2B 524434e90ff83c64449ccf81ea4dc883ece5dea437a634cc85157558e289a3a797508591031b1d191acf3ec2380fd2eb457eff2420e0aa6ce13514778d0acc6f SHA512 1989357dc9416f20954653f1ab9ceb214711cb540c6f8001a6acb07fbbf473a566f410df9c826546014df7d13c66a7f839b1370d5483eeba20f699b742531668
-EBUILD selinux-git-2.20190609-r1.ebuild 371 BLAKE2B 8c6822d747fbf85b4333c3992d17f9ce8474b8d36186c68721931ec69b6d4425ed3885b60bf3be4aebef5b621764c0a02b0c384fc9e7059c0a9aae2e3dbfacb4 SHA512 406da45f6753926e6397dba4e5a7a71d8efc3b78695aabf464db833be687be821d100a5d8292880439d69e7f6351a0358a8bc3ffc428680e5df4d93ea1ba8e94
+EBUILD selinux-git-2.20190609-r1.ebuild 369 BLAKE2B 524434e90ff83c64449ccf81ea4dc883ece5dea437a634cc85157558e289a3a797508591031b1d191acf3ec2380fd2eb457eff2420e0aa6ce13514778d0acc6f SHA512 1989357dc9416f20954653f1ab9ceb214711cb540c6f8001a6acb07fbbf473a566f410df9c826546014df7d13c66a7f839b1370d5483eeba20f699b742531668
+EBUILD selinux-git-2.20200818-r1.ebuild 371 BLAKE2B 8c6822d747fbf85b4333c3992d17f9ce8474b8d36186c68721931ec69b6d4425ed3885b60bf3be4aebef5b621764c0a02b0c384fc9e7059c0a9aae2e3dbfacb4 SHA512 406da45f6753926e6397dba4e5a7a71d8efc3b78695aabf464db833be687be821d100a5d8292880439d69e7f6351a0358a8bc3ffc428680e5df4d93ea1ba8e94
 EBUILD selinux-git-9999.ebuild 374 BLAKE2B 2d994f2b95b65f8275af1679d8a03d12a98ede2b5552c6f5b761232684af8f77aa737593ce199bf281c5a71a75e5fa68416cb530a7d9d501c9b2f0d316e29690 SHA512 4f02acaf0a49ee83a5075de0379842608f4d55ff3803c48e3a7b487cf2324d3f0b91245a8cecb41c03cf906ce6572ffa5db8e8272994743bda6c196f3d6cd7f3
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-git/selinux-git-2.20190609-r1.ebuild b/sec-policy/selinux-git/selinux-git-2.20190609-r1.ebuild
index 0dcb24ed68a1..49a24f6621c0 100644
--- a/sec-policy/selinux-git/selinux-git-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-git/selinux-git-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-git/selinux-git-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..0dcb24ed68a1
--- /dev/null
+++ b/sec-policy/selinux-git/selinux-git-2.20200818-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 35d5ceaddda2..d94459dca526 100644
--- a/sec-policy/selinux-gitosis/Manifest
+++ b/sec-policy/selinux-gitosis/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-gitosis-2.20190201-r1.ebuild 281 BLAKE2B 057decd4c858bbb378d875d8eab5448457e48b7c7d3118ced6e40038301c85e1440cbbbf38211e2f3a22a9d0a6e65de991f5bdc5e4a00cced56d8fc0aaa4f949 SHA512 6bd6d0a498b3505c1cc5ee22bf2fe0d86aa9e2f44287fc689ecb5658e88ac1b66026599379bfb7431af058d206e2daec9e7d14a84725091fe7829110be301dc4
-EBUILD selinux-gitosis-2.20190609-r1.ebuild 283 BLAKE2B 2ebffb45292df78772d900333a7d8c0f8447878e58ae2f7917ee16715c1f80d397c9ef8a40f96df3d52f91e55a989e9b09f06ed4f9f15ad81e3e93b11fac624d SHA512 83c12fcbceefa831c96c59fa5260e4b63018314488f877acc6938b818435b23d01cc95fe1663d76b506a2c09e8f49fe366322d242f0861e4b86caa95781866ab
+EBUILD selinux-gitosis-2.20190609-r1.ebuild 281 BLAKE2B 057decd4c858bbb378d875d8eab5448457e48b7c7d3118ced6e40038301c85e1440cbbbf38211e2f3a22a9d0a6e65de991f5bdc5e4a00cced56d8fc0aaa4f949 SHA512 6bd6d0a498b3505c1cc5ee22bf2fe0d86aa9e2f44287fc689ecb5658e88ac1b66026599379bfb7431af058d206e2daec9e7d14a84725091fe7829110be301dc4
+EBUILD selinux-gitosis-2.20200818-r1.ebuild 283 BLAKE2B 2ebffb45292df78772d900333a7d8c0f8447878e58ae2f7917ee16715c1f80d397c9ef8a40f96df3d52f91e55a989e9b09f06ed4f9f15ad81e3e93b11fac624d SHA512 83c12fcbceefa831c96c59fa5260e4b63018314488f877acc6938b818435b23d01cc95fe1663d76b506a2c09e8f49fe366322d242f0861e4b86caa95781866ab
 EBUILD selinux-gitosis-9999.ebuild 286 BLAKE2B e10d8157035d778398d843ad45efec06e2555db024498c0e78522b66ad0877231a569d3ed3eb4e469db967227a1d31d30b82ec7c09f03e226d99e3a2a32a8018 SHA512 53654112606cd53dbf1c1feb67279e7d39558aff834d74c852e20da7ee0d762db7449b835e1b7776ce27dfaa09702594e842c41242d7b076f3d003a9b18d8094
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-gitosis/selinux-gitosis-2.20190609-r1.ebuild b/sec-policy/selinux-gitosis/selinux-gitosis-2.20190609-r1.ebuild
index 55bdf28d1f45..d4f730fe9c1e 100644
--- a/sec-policy/selinux-gitosis/selinux-gitosis-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-gitosis/selinux-gitosis-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-gitosis/selinux-gitosis-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..55bdf28d1f45
--- /dev/null
+++ b/sec-policy/selinux-gitosis/selinux-gitosis-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 ef7c152d5879..2f0483f702dc 100644
--- a/sec-policy/selinux-gnome/Manifest
+++ b/sec-policy/selinux-gnome/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-gnome-2.20190201-r1.ebuild 277 BLAKE2B 7886bed92648c63171c5e6d2fa7a75934ec7ed7a1de235b347b8f9edc89850b7a6efa7440a6a466ee8c7cf33e69971067ccfa9cd7116e5d8d124545f215bb273 SHA512 ae60415fade2035f6b74690d51bc59dc72b8fcfe0b07a2271d6f07f21fb8da637776db5bece03a7c845065561bf1538e33eea208ecb9eddd38e0d668f7f5aba6
-EBUILD selinux-gnome-2.20190609-r1.ebuild 279 BLAKE2B 0a6948dc46db1727182f7eb88467e136447da3be1980660817bd0bc0732d9ba19918d18d18b258d6ca2ea6c945701c77ad23b182bda8cb5e69a0c54563eb88bd SHA512 6dbdae9cef60b628d58afae6645d51dc1b40f803f2561919266ca6194aaee3bf51b7a14327705af843e7ed62a5d124a32cf324f8db6f9672565bf8ec333ffd00
+EBUILD selinux-gnome-2.20190609-r1.ebuild 277 BLAKE2B 7886bed92648c63171c5e6d2fa7a75934ec7ed7a1de235b347b8f9edc89850b7a6efa7440a6a466ee8c7cf33e69971067ccfa9cd7116e5d8d124545f215bb273 SHA512 ae60415fade2035f6b74690d51bc59dc72b8fcfe0b07a2271d6f07f21fb8da637776db5bece03a7c845065561bf1538e33eea208ecb9eddd38e0d668f7f5aba6
+EBUILD selinux-gnome-2.20200818-r1.ebuild 279 BLAKE2B 0a6948dc46db1727182f7eb88467e136447da3be1980660817bd0bc0732d9ba19918d18d18b258d6ca2ea6c945701c77ad23b182bda8cb5e69a0c54563eb88bd SHA512 6dbdae9cef60b628d58afae6645d51dc1b40f803f2561919266ca6194aaee3bf51b7a14327705af843e7ed62a5d124a32cf324f8db6f9672565bf8ec333ffd00
 EBUILD selinux-gnome-9999.ebuild 282 BLAKE2B 01b4b8d382fb97acff433527e8e37fb9c6ac0ad8e1b443d51c9aa9bd9d90a605255ab4c39b14a1d5ea6d2646aeb9d513772b93fc2af116a87c5372b223294574 SHA512 580cc8d5b3f35a3f814b40ecf04220bcaba632d479207a94f8819a9bed8baed4fed0b3885227843855b4428b727a60a6da517265fe66ecb5a2d7cd6ef790441f
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-gnome/selinux-gnome-2.20190609-r1.ebuild b/sec-policy/selinux-gnome/selinux-gnome-2.20190609-r1.ebuild
index ffb8a5bb7380..d454a15f284b 100644
--- a/sec-policy/selinux-gnome/selinux-gnome-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-gnome/selinux-gnome-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-gnome/selinux-gnome-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..ffb8a5bb7380
--- /dev/null
+++ b/sec-policy/selinux-gnome/selinux-gnome-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 6f9540ff6196..596b3022a00e 100644
--- a/sec-policy/selinux-googletalk/Manifest
+++ b/sec-policy/selinux-googletalk/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-googletalk-2.20190201-r1.ebuild 291 BLAKE2B 04be59ecdb1be83e5c365d0099dbfb719fc06054aa9bdc609ed4c34b24ff2e5bf4228000f43e8da166765135ab76f3511fd4d685eb7e161bcbb520bdd67e933b SHA512 e92a0f797bed9b05768d6598aacdd73bc023a2d729947a5790e27f61a879ea3735dafcd06ea07e9808b8cf65e7188c86f4841207ec8f727af467262980a69269
-EBUILD selinux-googletalk-2.20190609-r1.ebuild 293 BLAKE2B c8a3910b677e6121ed02b7788cccd3ab4038e01b08aaf8d9d95273e691ad081016cfd4633122985d0ab91ef7b19233c92e2a260c2e99316d6f8588678b574119 SHA512 a5342a9510964647f3858cd58261f25c9b48c06e6b1f7421f3c67ba53a9d47a3b15fcf110c7bef825fc6f2fd56c2deddadf18df8bda6d1a2ff030d5a1ad0c776
+EBUILD selinux-googletalk-2.20190609-r1.ebuild 291 BLAKE2B 04be59ecdb1be83e5c365d0099dbfb719fc06054aa9bdc609ed4c34b24ff2e5bf4228000f43e8da166765135ab76f3511fd4d685eb7e161bcbb520bdd67e933b SHA512 e92a0f797bed9b05768d6598aacdd73bc023a2d729947a5790e27f61a879ea3735dafcd06ea07e9808b8cf65e7188c86f4841207ec8f727af467262980a69269
+EBUILD selinux-googletalk-2.20200818-r1.ebuild 293 BLAKE2B c8a3910b677e6121ed02b7788cccd3ab4038e01b08aaf8d9d95273e691ad081016cfd4633122985d0ab91ef7b19233c92e2a260c2e99316d6f8588678b574119 SHA512 a5342a9510964647f3858cd58261f25c9b48c06e6b1f7421f3c67ba53a9d47a3b15fcf110c7bef825fc6f2fd56c2deddadf18df8bda6d1a2ff030d5a1ad0c776
 EBUILD selinux-googletalk-9999.ebuild 296 BLAKE2B 5b6e3c089fe50ba2019321e8617968fa94f2fabd1bf3d9ccf5dd5c35c82ab94c54a6eb5083b3cf5178b52f106984607bb763e7e84164bd90acae1b5c52c57007 SHA512 b576f1a91b85712d257a651be4298f56dffed4345ed8b764f9c062595f866e7e80f45c40b1f595bf84575f7794c4b9ae41bffb185480444c5dcbb95f664a2ba3
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-googletalk/selinux-googletalk-2.20190609-r1.ebuild b/sec-policy/selinux-googletalk/selinux-googletalk-2.20190609-r1.ebuild
index 9528cb6d240f..c8ed29c56195 100644
--- a/sec-policy/selinux-googletalk/selinux-googletalk-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-googletalk/selinux-googletalk-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-googletalk/selinux-googletalk-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..9528cb6d240f
--- /dev/null
+++ b/sec-policy/selinux-googletalk/selinux-googletalk-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 f77d340be014..715a1f2396c1 100644
--- a/sec-policy/selinux-gorg/Manifest
+++ b/sec-policy/selinux-gorg/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-gorg-2.20190201-r1.ebuild 275 BLAKE2B 1a47374168c8a45998cbc32b163b7e1c9b0b8ba110c22cdbb5779413feaa6f69a9b32a3ed229ef183f3d1405899b9b0d522c97421df9b23256ddf5c71ad76ee4 SHA512 ca026bb6bc4e9bcb9ab927550fed30f0c05915a097fa0e1a35c9755770f0588db984be507e0d8ce4f4bb053cb0fa8f8c7f37cdfb7726ac28b6246f4ad3bbeeb7
-EBUILD selinux-gorg-2.20190609-r1.ebuild 277 BLAKE2B 06863a8f96ad85534166a0b006ed5dd355bec08db6760ad55c3eb6ea8da8def49135e292f4b98a714b6f9f76a6b4fdaafa328931c021b34e1fd1654578a4bfa8 SHA512 ba57dcdf6d0511757740df8d5df8f99b5689ecb1463ea6dc562a4092e45b3e713444e6979420b0e9766b46ce67e1ca72cfbfa165dc7c8cad187f3c6760bd2ef8
+EBUILD selinux-gorg-2.20190609-r1.ebuild 275 BLAKE2B 1a47374168c8a45998cbc32b163b7e1c9b0b8ba110c22cdbb5779413feaa6f69a9b32a3ed229ef183f3d1405899b9b0d522c97421df9b23256ddf5c71ad76ee4 SHA512 ca026bb6bc4e9bcb9ab927550fed30f0c05915a097fa0e1a35c9755770f0588db984be507e0d8ce4f4bb053cb0fa8f8c7f37cdfb7726ac28b6246f4ad3bbeeb7
+EBUILD selinux-gorg-2.20200818-r1.ebuild 277 BLAKE2B 06863a8f96ad85534166a0b006ed5dd355bec08db6760ad55c3eb6ea8da8def49135e292f4b98a714b6f9f76a6b4fdaafa328931c021b34e1fd1654578a4bfa8 SHA512 ba57dcdf6d0511757740df8d5df8f99b5689ecb1463ea6dc562a4092e45b3e713444e6979420b0e9766b46ce67e1ca72cfbfa165dc7c8cad187f3c6760bd2ef8
 EBUILD selinux-gorg-9999.ebuild 280 BLAKE2B f15386379354a20cdc159d5dffc80ba7abdd6de882a389b4c00b83a80350e7efa6b1bd724fcaacf033ef9d304d0cad330ce8be814f4d0482fe43ad2825446e44 SHA512 96e96d2ff2a3e5d2e24760082703d34ff8422db371314a7f78fd5f247d4d6efcdea1cd9a1e89931370508a36cb15b60280a62dc8743c82e7cbb5adf6ffdbb900
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-gorg/selinux-gorg-2.20190609-r1.ebuild b/sec-policy/selinux-gorg/selinux-gorg-2.20190609-r1.ebuild
index a0db7bf363d4..981390bfef56 100644
--- a/sec-policy/selinux-gorg/selinux-gorg-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-gorg/selinux-gorg-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-gorg/selinux-gorg-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..a0db7bf363d4
--- /dev/null
+++ b/sec-policy/selinux-gorg/selinux-gorg-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 2c246e49d017..db1fe2ad40c8 100644
--- a/sec-policy/selinux-gpg/Manifest
+++ b/sec-policy/selinux-gpg/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-gpg-2.20190201-r1.ebuild 372 BLAKE2B d0312cb72123770bb0d864418d00048b8d2e5cd3b900912872d39f35052c320dca941949c1b8b4d1d61d044e65499ac4ca4d286a83762ef151cc0a197b9d4391 SHA512 5195867c53a06a1f8077047b1bcb587c85efed7103fc12ea8cb724ada7c812182dc0cf1456cb847989d3c62834a48d0d5d5a113a1fc482336e98a6dae1b259b9
-EBUILD selinux-gpg-2.20190609-r1.ebuild 374 BLAKE2B cd6319f3a4fab473fe1a34443e16d7d6b39dafe11f518ceb71985ac2f12f138c1fc144358ef0ad2d25d8a5dadbb514c1dbb2c35ccf79d3ed4f603dd8c20f31f3 SHA512 512a4431a59699884e91ec9fb2f6fdd453770d1009c50f29a2bce7a66e8f370be93c85e6f115dc686248aefbce5f36367a15d2d7aeca5193326b85cbf11f19b3
+EBUILD selinux-gpg-2.20190609-r1.ebuild 372 BLAKE2B d0312cb72123770bb0d864418d00048b8d2e5cd3b900912872d39f35052c320dca941949c1b8b4d1d61d044e65499ac4ca4d286a83762ef151cc0a197b9d4391 SHA512 5195867c53a06a1f8077047b1bcb587c85efed7103fc12ea8cb724ada7c812182dc0cf1456cb847989d3c62834a48d0d5d5a113a1fc482336e98a6dae1b259b9
+EBUILD selinux-gpg-2.20200818-r1.ebuild 374 BLAKE2B cd6319f3a4fab473fe1a34443e16d7d6b39dafe11f518ceb71985ac2f12f138c1fc144358ef0ad2d25d8a5dadbb514c1dbb2c35ccf79d3ed4f603dd8c20f31f3 SHA512 512a4431a59699884e91ec9fb2f6fdd453770d1009c50f29a2bce7a66e8f370be93c85e6f115dc686248aefbce5f36367a15d2d7aeca5193326b85cbf11f19b3
 EBUILD selinux-gpg-9999.ebuild 377 BLAKE2B 77d92a948b3f1efbdfea3e400ef57cbe0c26b0ce728964cf8dd1e25225e3f4a74356edaeaf7ad4c3284462f48c005570239bdd01c0d3716c853077db2dabed4c SHA512 6b07e76281819406a5d6bfc8d668ca9816bf25383891a0119c01e67d54398cc447cec135b6dc1a97427f6dfe39a7af0e5039434bec31805399e26c17a3b88da7
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-gpg/selinux-gpg-2.20190609-r1.ebuild b/sec-policy/selinux-gpg/selinux-gpg-2.20190609-r1.ebuild
index 60cf29e2355f..5cf174af34fd 100644
--- a/sec-policy/selinux-gpg/selinux-gpg-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-gpg/selinux-gpg-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-gpg/selinux-gpg-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..60cf29e2355f
--- /dev/null
+++ b/sec-policy/selinux-gpg/selinux-gpg-2.20200818-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 f863f86c5d52..4384c6ef9f93 100644
--- a/sec-policy/selinux-gpm/Manifest
+++ b/sec-policy/selinux-gpm/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-gpm-2.20190201-r1.ebuild 273 BLAKE2B 338f9cfc3837d08458325f9ff421b27f8a4a42a6c858307931ce9a80353cb82c3d014ec2ce70e02c5faf52f26fbdc1a28b9637fb735f4bd421a33411c5135042 SHA512 a1e689564dc7b660e9a371f22d28207bbc29b4d9c6e60d74dd0564cc2a6ff982e2e77e53265b50ec87c0f8b6ba53e60b6d3cb15a22b524e808c664cfcfd08a8f
-EBUILD selinux-gpm-2.20190609-r1.ebuild 275 BLAKE2B 80b53a1cd1a80e5358be33d2239b345b215517002fbf53ade3c6795c1a1a4988d73bb48a9fe7167d0b39be132c388499b30dc436e5408cab8ae30748097b2394 SHA512 9c30bc070e456cc7e08677fc4a51488bc56cd87e79815089112f5cabb5b23897c71a890df6752a35355dba3871390fad25289d7f5351a6be8a91dc7d0f912074
+EBUILD selinux-gpm-2.20190609-r1.ebuild 273 BLAKE2B 338f9cfc3837d08458325f9ff421b27f8a4a42a6c858307931ce9a80353cb82c3d014ec2ce70e02c5faf52f26fbdc1a28b9637fb735f4bd421a33411c5135042 SHA512 a1e689564dc7b660e9a371f22d28207bbc29b4d9c6e60d74dd0564cc2a6ff982e2e77e53265b50ec87c0f8b6ba53e60b6d3cb15a22b524e808c664cfcfd08a8f
+EBUILD selinux-gpm-2.20200818-r1.ebuild 275 BLAKE2B 80b53a1cd1a80e5358be33d2239b345b215517002fbf53ade3c6795c1a1a4988d73bb48a9fe7167d0b39be132c388499b30dc436e5408cab8ae30748097b2394 SHA512 9c30bc070e456cc7e08677fc4a51488bc56cd87e79815089112f5cabb5b23897c71a890df6752a35355dba3871390fad25289d7f5351a6be8a91dc7d0f912074
 EBUILD selinux-gpm-9999.ebuild 278 BLAKE2B 462472303125c0016635256d3997ca31cd610248441d1b17d816107933e1447d5a14537af847276a5c90211d100a9dd1c485ad9d35467f434cb902cc222fb7bb SHA512 79cbf6574e9963fc3b4b7119dba9a16c188d5b164a99b21435ab1d064099e02614e481d10bc06c515c6a47cc25e4927cd1a57e43cac673006ed1da1b76c0df67
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-gpm/selinux-gpm-2.20190609-r1.ebuild b/sec-policy/selinux-gpm/selinux-gpm-2.20190609-r1.ebuild
index d6917ef04317..c31facbd46fc 100644
--- a/sec-policy/selinux-gpm/selinux-gpm-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-gpm/selinux-gpm-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-gpm/selinux-gpm-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..d6917ef04317
--- /dev/null
+++ b/sec-policy/selinux-gpm/selinux-gpm-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 88468d541f7d..a3520082a079 100644
--- a/sec-policy/selinux-gpsd/Manifest
+++ b/sec-policy/selinux-gpsd/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-gpsd-2.20190201-r1.ebuild 275 BLAKE2B 7a5c57b700ae04c4bb85103a976b2e5c3b240e3315bb91e9be6d34ae9cf134664b371fd66b5553f554b840915409b14237ad1e722e9b70c3f972d45a03c39856 SHA512 0fc92187b92f58e05575d766f0da2a35ce37b0b165611fe80a338b52a716714aa5213704f7cd2ce8f3742209165d8dc5b6954af5f0d819568171242cdd8033fb
-EBUILD selinux-gpsd-2.20190609-r1.ebuild 277 BLAKE2B 33d1922c06d9016414ecc73ceeebeaef4d5a80d897c68d74186ea379bce3b5fd390e2b7e2f11d61c22af135b0d4074fc771462403fff249a67643c2a72dc26b1 SHA512 acd8e795f9851e93945d49ba9b62eec229ffe3c5d9cd68224ddc013a5e862006b4f4d8771e8837fb92fb079d70ebe8fb9c2efc3fd691c288f01422bf6e3236d0
+EBUILD selinux-gpsd-2.20190609-r1.ebuild 275 BLAKE2B 7a5c57b700ae04c4bb85103a976b2e5c3b240e3315bb91e9be6d34ae9cf134664b371fd66b5553f554b840915409b14237ad1e722e9b70c3f972d45a03c39856 SHA512 0fc92187b92f58e05575d766f0da2a35ce37b0b165611fe80a338b52a716714aa5213704f7cd2ce8f3742209165d8dc5b6954af5f0d819568171242cdd8033fb
+EBUILD selinux-gpsd-2.20200818-r1.ebuild 277 BLAKE2B 33d1922c06d9016414ecc73ceeebeaef4d5a80d897c68d74186ea379bce3b5fd390e2b7e2f11d61c22af135b0d4074fc771462403fff249a67643c2a72dc26b1 SHA512 acd8e795f9851e93945d49ba9b62eec229ffe3c5d9cd68224ddc013a5e862006b4f4d8771e8837fb92fb079d70ebe8fb9c2efc3fd691c288f01422bf6e3236d0
 EBUILD selinux-gpsd-9999.ebuild 280 BLAKE2B f3d2743affce65d62c28e460d541f9c3ac1379d8800876eb7d006396dfcc3ddb5ca8bd367366a64a79c80481ad82b3e7478952b4b1be0f2b3d2d31fdaf0b5c88 SHA512 c0838c5c06866dfa1ceeae27e9ff82b18e38ecbd82bf5d1b71e66fc0c62e1c937ecff2fefb0e2e7508b9d13f0a88f47735561f207c041b0598d860ce59cd46b0
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-gpsd/selinux-gpsd-2.20190609-r1.ebuild b/sec-policy/selinux-gpsd/selinux-gpsd-2.20190609-r1.ebuild
index 3fa180185a28..c35a34440ef7 100644
--- a/sec-policy/selinux-gpsd/selinux-gpsd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-gpsd/selinux-gpsd-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-gpsd/selinux-gpsd-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..3fa180185a28
--- /dev/null
+++ b/sec-policy/selinux-gpsd/selinux-gpsd-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 4b80e467c3c5..fb364de20459 100644
--- a/sec-policy/selinux-gssproxy/Manifest
+++ b/sec-policy/selinux-gssproxy/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-gssproxy-2.20190201-r1.ebuild 283 BLAKE2B e6ddb0546236ada8a9ed49710bc5260895741953b0715d473f0671921c33f1e533af31aa65603efa090ca5008408cbb01b51465ebb3d8a5c4991c21d348e916c SHA512 3c5dc03935df9d277ead996185ca780a6297f9c940881ea678cb017f4ba67ee2b2b129b0a68dcf6a4309e26e9ab1e3ef1a9fee40388a1656ee2301151ec6bae8
-EBUILD selinux-gssproxy-2.20190609-r1.ebuild 285 BLAKE2B b90a82a601d042c2794d8a3bcc7b8d06c6d38564458fdd17ba71acfb0c04bbc30374be4bb0fea6778f1797b23a9636853ecc9b97b1fa6e602d9ae19f218f64c1 SHA512 08d91fa344d892d3064f4399613ba0c1dd2a88df9f3ffd92639b6b06f6986ece8970acb13b945ccdc93d5d6aee719c86dd3ae8bc58aa856aba3e447ec2075608
+EBUILD selinux-gssproxy-2.20190609-r1.ebuild 283 BLAKE2B e6ddb0546236ada8a9ed49710bc5260895741953b0715d473f0671921c33f1e533af31aa65603efa090ca5008408cbb01b51465ebb3d8a5c4991c21d348e916c SHA512 3c5dc03935df9d277ead996185ca780a6297f9c940881ea678cb017f4ba67ee2b2b129b0a68dcf6a4309e26e9ab1e3ef1a9fee40388a1656ee2301151ec6bae8
+EBUILD selinux-gssproxy-2.20200818-r1.ebuild 285 BLAKE2B b90a82a601d042c2794d8a3bcc7b8d06c6d38564458fdd17ba71acfb0c04bbc30374be4bb0fea6778f1797b23a9636853ecc9b97b1fa6e602d9ae19f218f64c1 SHA512 08d91fa344d892d3064f4399613ba0c1dd2a88df9f3ffd92639b6b06f6986ece8970acb13b945ccdc93d5d6aee719c86dd3ae8bc58aa856aba3e447ec2075608
 EBUILD selinux-gssproxy-9999.ebuild 288 BLAKE2B 645f656d5211e51f01a616e28cb9b4ec12e0734fd422c9c26b97e160114e65786c0f62beb36342d1492d387a24f9a316d796826a36e2d003ed8d1193dcfba506 SHA512 10575c93ea61f07caa2e14adc466ceb0683363d7a045ea9cfafdf3de1faebc0089600ad07cf7eddf68f405db18bb2d80f74986e6b4e290e6ba0ac201fcc79e38
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20190609-r1.ebuild b/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20190609-r1.ebuild
index a0b74e25a2eb..5e04a763492d 100644
--- a/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..a0b74e25a2eb
--- /dev/null
+++ b/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 5821ce2a5712..0fc9586cfa85 100644
--- a/sec-policy/selinux-hddtemp/Manifest
+++ b/sec-policy/selinux-hddtemp/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-hddtemp-2.20190201-r1.ebuild 281 BLAKE2B a8d481dd3dfbc365f485b2019b62574184b914f1672e2c76a7a085a75074ee62a45bb1bc0d134ae41c2fd955fb095df558525fe93b8528d8d19ff429ae416271 SHA512 5dc9b72547cf47c8d5c2b7f1ecdfcafd3097a07954d103fc2f7a79901b93979c0d65786b44b387ef9607c2cd91413b8018a647e85e9d1b5e21f95d013d3736eb
-EBUILD selinux-hddtemp-2.20190609-r1.ebuild 283 BLAKE2B 8e432f21cf62aec8989cbd32128e51ab54651915e994a807e6b5b7f4fc045ad875807ebe3166473d313a9dc4d8c457172a1f33a19f962a05ce27b1b0895f7f7b SHA512 dcc44f2090f01b38188e54e34f519bafb961499efb2771255113cdde931f202c1a9c651b8d628af7490be159a65331110927ef4ef5fdc70d0c0e4f6f2a02d93f
+EBUILD selinux-hddtemp-2.20190609-r1.ebuild 281 BLAKE2B a8d481dd3dfbc365f485b2019b62574184b914f1672e2c76a7a085a75074ee62a45bb1bc0d134ae41c2fd955fb095df558525fe93b8528d8d19ff429ae416271 SHA512 5dc9b72547cf47c8d5c2b7f1ecdfcafd3097a07954d103fc2f7a79901b93979c0d65786b44b387ef9607c2cd91413b8018a647e85e9d1b5e21f95d013d3736eb
+EBUILD selinux-hddtemp-2.20200818-r1.ebuild 283 BLAKE2B 8e432f21cf62aec8989cbd32128e51ab54651915e994a807e6b5b7f4fc045ad875807ebe3166473d313a9dc4d8c457172a1f33a19f962a05ce27b1b0895f7f7b SHA512 dcc44f2090f01b38188e54e34f519bafb961499efb2771255113cdde931f202c1a9c651b8d628af7490be159a65331110927ef4ef5fdc70d0c0e4f6f2a02d93f
 EBUILD selinux-hddtemp-9999.ebuild 286 BLAKE2B 47728d56bd4fb51cde0c2dce236d5cc62d75d585260a7f7ecb312946730cad012797bbc9312409e062e3e25cfe901862925a1d11378afb16e2b06514b5eb40f7 SHA512 215a747fb3f0787acf0ef0757f26210052631cafc7d7ebbad631e090f897e605906aaf5d428c6adc345259dec79ac50773ed50df7cb128b44a8ac0b29d9094fb
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20190609-r1.ebuild b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20190609-r1.ebuild
index 5be1701c8c9d..b677c4b786b0 100644
--- a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..5be1701c8c9d
--- /dev/null
+++ b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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-howl/Manifest b/sec-policy/selinux-howl/Manifest
index d1e94a0ac030..4eb95b64cdd3 100644
--- a/sec-policy/selinux-howl/Manifest
+++ b/sec-policy/selinux-howl/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-howl-2.20190201-r1.ebuild 275 BLAKE2B b51b0e281eed5865c99cca3147b187986715cb11c5c3aeaf6d2a33301476e0d852949b753892eb1a5a01b57907cdd439c20b1ab24d8e9daf1272146b30bb846b SHA512 3a426bcb86ba48bceda2d1c9a52fbd13fff946ada7a4e4b7aed0db67a9f9cbef0a9cc2efccce40b6c301e68bc154acd04d6626313176b20e9b0b408bac7ef04d
-EBUILD selinux-howl-2.20190609-r1.ebuild 277 BLAKE2B 46526b35b8527f2235a2336af40e7a747afb15b9688011423995dff614db1071a7e1a7e4bacc7c81e4bf518c3a8385ddd69d39b5795626465f13631cae66c6c6 SHA512 585281918188bc6b475ce7d3a1b5fcd6bfe57ff8f95a60dc3f0c46a4eb9470952c64abc2dcb0d4ce271c46b65177b50229b71fed5d86f9d30288917441edfc62
+EBUILD selinux-howl-2.20190609-r1.ebuild 275 BLAKE2B b51b0e281eed5865c99cca3147b187986715cb11c5c3aeaf6d2a33301476e0d852949b753892eb1a5a01b57907cdd439c20b1ab24d8e9daf1272146b30bb846b SHA512 3a426bcb86ba48bceda2d1c9a52fbd13fff946ada7a4e4b7aed0db67a9f9cbef0a9cc2efccce40b6c301e68bc154acd04d6626313176b20e9b0b408bac7ef04d
+EBUILD selinux-howl-2.20200818-r1.ebuild 277 BLAKE2B 46526b35b8527f2235a2336af40e7a747afb15b9688011423995dff614db1071a7e1a7e4bacc7c81e4bf518c3a8385ddd69d39b5795626465f13631cae66c6c6 SHA512 585281918188bc6b475ce7d3a1b5fcd6bfe57ff8f95a60dc3f0c46a4eb9470952c64abc2dcb0d4ce271c46b65177b50229b71fed5d86f9d30288917441edfc62
 EBUILD selinux-howl-9999.ebuild 280 BLAKE2B cd3625eec20f4ff83471312e37c424f6037c4d6e6280fe6b896294bc6d5fae1a7650ece207dc72801618e3abb072171b21038fab937f46e7d8a3fda81886df8e SHA512 e806d420905815473f1e997986cfa7ea11dff25028618d6403ca55afad1583023f0914b53ea54f89defa1d2b5c9f052a780134dbfa28f77d724319492e423d8c
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-howl/selinux-howl-2.20190609-r1.ebuild b/sec-policy/selinux-howl/selinux-howl-2.20190609-r1.ebuild
index c85d764c5afe..ac0fe42b2cca 100644
--- a/sec-policy/selinux-howl/selinux-howl-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-howl/selinux-howl-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for howl"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-howl/selinux-howl-2.20200818-r1.ebuild b/sec-policy/selinux-howl/selinux-howl-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..c85d764c5afe
--- /dev/null
+++ b/sec-policy/selinux-howl/selinux-howl-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="howl"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for howl"
+
+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 dcdd61854fbe..8dc642d4b359 100644
--- a/sec-policy/selinux-icecast/Manifest
+++ b/sec-policy/selinux-icecast/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-icecast-2.20190201-r1.ebuild 281 BLAKE2B e9d6d793cde170b088756472e7ed2c756fbb6fe5746c07912dab5713df22ab36627801c386eba994b50a166706c1959ebd71c610b5cad590483037e980b2ff57 SHA512 c62cd484aefa2259a32f7442d7aaf4b62415086cfd60e25f901ae44f17791d0d7aca9d9e95918d2d496342ef0c68a13a938939e2daf32554cc5505365cc48874
-EBUILD selinux-icecast-2.20190609-r1.ebuild 283 BLAKE2B 9dc6a232516c0d8d028fe8ffceed56c5f62c2d463450add7cfeebed5189fd1afa09aaadc35d652a1188c6f7df55c8dc2b580bc854f64ced92372259c5188d109 SHA512 ab379577efc81439303a6defe5659728212142695d7c559bf07dfbb46b81a819c6054c96b9a74a4fe2f74934a1c31bb1aff282db8e91df6c234a3170b632b2eb
+EBUILD selinux-icecast-2.20190609-r1.ebuild 281 BLAKE2B e9d6d793cde170b088756472e7ed2c756fbb6fe5746c07912dab5713df22ab36627801c386eba994b50a166706c1959ebd71c610b5cad590483037e980b2ff57 SHA512 c62cd484aefa2259a32f7442d7aaf4b62415086cfd60e25f901ae44f17791d0d7aca9d9e95918d2d496342ef0c68a13a938939e2daf32554cc5505365cc48874
+EBUILD selinux-icecast-2.20200818-r1.ebuild 283 BLAKE2B 9dc6a232516c0d8d028fe8ffceed56c5f62c2d463450add7cfeebed5189fd1afa09aaadc35d652a1188c6f7df55c8dc2b580bc854f64ced92372259c5188d109 SHA512 ab379577efc81439303a6defe5659728212142695d7c559bf07dfbb46b81a819c6054c96b9a74a4fe2f74934a1c31bb1aff282db8e91df6c234a3170b632b2eb
 EBUILD selinux-icecast-9999.ebuild 286 BLAKE2B d0c5ee1103b886e9c6845651d36464c4ebfb491255c600097b50c43e1eb35e969f4a8b1628b16182f7e5f6454ca8e4c307aefd0972f680ae15616e1453a9edae SHA512 ba82efda116302c2df5f5a128ed1327d30b5702984f76b252fdc9b5d99bbcb69e0af42c181d27ef086a5f88fdac3967a9b5b26098b682784c3e088523bc44d58
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-icecast/selinux-icecast-2.20190609-r1.ebuild b/sec-policy/selinux-icecast/selinux-icecast-2.20190609-r1.ebuild
index 95a5fefebd98..e1c6d82781bc 100644
--- a/sec-policy/selinux-icecast/selinux-icecast-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-icecast/selinux-icecast-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-icecast/selinux-icecast-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..95a5fefebd98
--- /dev/null
+++ b/sec-policy/selinux-icecast/selinux-icecast-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 e7f33b87a36e..bbbcc485f8b5 100644
--- a/sec-policy/selinux-ifplugd/Manifest
+++ b/sec-policy/selinux-ifplugd/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-ifplugd-2.20190201-r1.ebuild 281 BLAKE2B 28cf75e3ccea660a3c4f9886408705cd12863b09d858ca29f1eb5590ce77fcd5d900d9ec02bfd5614d61ad142ca55df57a2a592cf65bc03650e411465ec74ed3 SHA512 55c43b2a8e17d04619857fdf76085b6e05063fe93c9a7c826e123bef02899bfe2ad2a3165068648d89df93b779c3b2b4791c8211a39ab7c37eefa96fb5acbc9c
-EBUILD selinux-ifplugd-2.20190609-r1.ebuild 283 BLAKE2B e4f9f5e3a350ce6d7306371c2e94eba89527675042b7c9808fb884f1de524eadacf3efffa6966dca6dbe613cdd72ee80b77e492129fcaee01ca020cf82c631b1 SHA512 4df03d07705995d4fb5a0ac7df007bde7879b8cf4f0f71ace253c838f4734f2f80393b6cfb3c8d707fbc08ca0a4d536bf5b7d79993af4c845bd65739adacd411
+EBUILD selinux-ifplugd-2.20190609-r1.ebuild 281 BLAKE2B 28cf75e3ccea660a3c4f9886408705cd12863b09d858ca29f1eb5590ce77fcd5d900d9ec02bfd5614d61ad142ca55df57a2a592cf65bc03650e411465ec74ed3 SHA512 55c43b2a8e17d04619857fdf76085b6e05063fe93c9a7c826e123bef02899bfe2ad2a3165068648d89df93b779c3b2b4791c8211a39ab7c37eefa96fb5acbc9c
+EBUILD selinux-ifplugd-2.20200818-r1.ebuild 283 BLAKE2B e4f9f5e3a350ce6d7306371c2e94eba89527675042b7c9808fb884f1de524eadacf3efffa6966dca6dbe613cdd72ee80b77e492129fcaee01ca020cf82c631b1 SHA512 4df03d07705995d4fb5a0ac7df007bde7879b8cf4f0f71ace253c838f4734f2f80393b6cfb3c8d707fbc08ca0a4d536bf5b7d79993af4c845bd65739adacd411
 EBUILD selinux-ifplugd-9999.ebuild 286 BLAKE2B c56774666c3af8176bc730c1a7618152b97e2c012edc2e170e19a54769e75fec83e02d545aa131a90dcc948372a10402aa4af693190f7e61cf9405c01f2dbf91 SHA512 1a29c4110e36b414b72b2ff70a40e6da5e892242ed0d3739d7143e82bda8b34f8ba790d76a9c18fd5a54b2a3a331210d7ecd6d4cb7c01f33f2bd4f478623c1a8
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20190609-r1.ebuild b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20190609-r1.ebuild
index db5375b26ab1..3190e65561e0 100644
--- a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..db5375b26ab1
--- /dev/null
+++ b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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-imaze/Manifest b/sec-policy/selinux-imaze/Manifest
index 2e64f241cca4..ca2fe16f4d84 100644
--- a/sec-policy/selinux-imaze/Manifest
+++ b/sec-policy/selinux-imaze/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-imaze-2.20190201-r1.ebuild 277 BLAKE2B 7dc82ed9d231fb6f5afb19dfa77c051719729809121f752176c814634b9f138d56081c1043222b34ab6034e6a43bb94fb293435821de2faf33d4c87eb93a273d SHA512 f0fa13de0b73d546b8facb83cffac195eef84e9de9b2544b86dfec3afdb44b869a64e16d9fc2ca8ce7f97de15218f4e1de8955a88d4a88942d6a35a7c4cdefb5
-EBUILD selinux-imaze-2.20190609-r1.ebuild 279 BLAKE2B e1f868acc088670d6893d39eb3b1a4f1e93ab83acb59ec1ba7face0059e60b798e3b407f42c8bb59341296063224d35ffc34d0302325850125a0206bfb8b2fdc SHA512 2c1a9570034daf4c4e287984d3299ac5b744057cfd1fde21b7a9cd4db3e3a799a51a2d154e49244433b3438ca2531d7e699a87219c836fd701245bc7b61d4c6a
+EBUILD selinux-imaze-2.20190609-r1.ebuild 277 BLAKE2B 7dc82ed9d231fb6f5afb19dfa77c051719729809121f752176c814634b9f138d56081c1043222b34ab6034e6a43bb94fb293435821de2faf33d4c87eb93a273d SHA512 f0fa13de0b73d546b8facb83cffac195eef84e9de9b2544b86dfec3afdb44b869a64e16d9fc2ca8ce7f97de15218f4e1de8955a88d4a88942d6a35a7c4cdefb5
+EBUILD selinux-imaze-2.20200818-r1.ebuild 279 BLAKE2B e1f868acc088670d6893d39eb3b1a4f1e93ab83acb59ec1ba7face0059e60b798e3b407f42c8bb59341296063224d35ffc34d0302325850125a0206bfb8b2fdc SHA512 2c1a9570034daf4c4e287984d3299ac5b744057cfd1fde21b7a9cd4db3e3a799a51a2d154e49244433b3438ca2531d7e699a87219c836fd701245bc7b61d4c6a
 EBUILD selinux-imaze-9999.ebuild 282 BLAKE2B e769ffc3484d2fb8db26b107535570a377b29458bf13eb69fcf6fa6203164b9a174c44741f0d61522fc74f0713bd23d689d2bdc7640f431415b341cab59a53bf SHA512 522efc3487450d59b5e71bb4da7d471ac9621a54609a9c11aa55942db0c3a42d718021b3f2d15dcad8583028c4130706ab2867c2d539bfb878f59cce96b8cdd1
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-imaze/selinux-imaze-2.20190609-r1.ebuild b/sec-policy/selinux-imaze/selinux-imaze-2.20190609-r1.ebuild
index 8433c4916828..489648ba6142 100644
--- a/sec-policy/selinux-imaze/selinux-imaze-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-imaze/selinux-imaze-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for imaze"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-imaze/selinux-imaze-2.20200818-r1.ebuild b/sec-policy/selinux-imaze/selinux-imaze-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..8433c4916828
--- /dev/null
+++ b/sec-policy/selinux-imaze/selinux-imaze-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="imaze"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for imaze"
+
+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 607f2985e420..bcf310fdca82 100644
--- a/sec-policy/selinux-inetd/Manifest
+++ b/sec-policy/selinux-inetd/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-inetd-2.20190201-r1.ebuild 277 BLAKE2B c3a2adc0b3a054b2a248d8c7156ad615c033d1f4b7264cec586e98bd0a720e2038b036e006e34d6e622bf1368281a329c47246b8dd9c877387dfbdb1f734b7b1 SHA512 f4bb5849085748d632257dc52ca1d5d760c8d4b5c6d271cd363f50ce7fd54394fd18bcb90e668218ab952f5a601979fa802ae18cb72dd0c9c601df900385a64c
-EBUILD selinux-inetd-2.20190609-r1.ebuild 279 BLAKE2B da49bfcee3136f48f2cd58f80d9f3f23fa9b47e2a9b57207ec5fe1b82cdf623711e1d0d5806c18922e4d5550bbba73b0a232ca97cca1fd61981a5fb5b454561e SHA512 65e170bdaf9f9f9fe68f4455bf96cd8e0508bbc165b9848e0a77b44c58978fc3be4465582cfdab013481604b26d16c54afcfe42e67d98c10dcf556a10781db49
+EBUILD selinux-inetd-2.20190609-r1.ebuild 277 BLAKE2B c3a2adc0b3a054b2a248d8c7156ad615c033d1f4b7264cec586e98bd0a720e2038b036e006e34d6e622bf1368281a329c47246b8dd9c877387dfbdb1f734b7b1 SHA512 f4bb5849085748d632257dc52ca1d5d760c8d4b5c6d271cd363f50ce7fd54394fd18bcb90e668218ab952f5a601979fa802ae18cb72dd0c9c601df900385a64c
+EBUILD selinux-inetd-2.20200818-r1.ebuild 279 BLAKE2B da49bfcee3136f48f2cd58f80d9f3f23fa9b47e2a9b57207ec5fe1b82cdf623711e1d0d5806c18922e4d5550bbba73b0a232ca97cca1fd61981a5fb5b454561e SHA512 65e170bdaf9f9f9fe68f4455bf96cd8e0508bbc165b9848e0a77b44c58978fc3be4465582cfdab013481604b26d16c54afcfe42e67d98c10dcf556a10781db49
 EBUILD selinux-inetd-9999.ebuild 282 BLAKE2B 82cb6096721da5d856d55449aad6fab0a4f7b2b6440effdff732562ad6e389b2d327abf5152b8ce645dc12396135e5b427f174f04e95b08824c731e4166a592b SHA512 1a6e0f73edf567dc316f7342e45b294d8103e5e3a64df8d17ba3bbe87948963f3521e5d70b5693f6da328dc097d46f578fa7fbe7cb093fd9e1a338e9f7fa84dc
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-inetd/selinux-inetd-2.20190609-r1.ebuild b/sec-policy/selinux-inetd/selinux-inetd-2.20190609-r1.ebuild
index ec96842d35b6..fede958e81a4 100644
--- a/sec-policy/selinux-inetd/selinux-inetd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-inetd/selinux-inetd-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-inetd/selinux-inetd-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..ec96842d35b6
--- /dev/null
+++ b/sec-policy/selinux-inetd/selinux-inetd-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 cd978a900c86..468054b680a8 100644
--- a/sec-policy/selinux-inn/Manifest
+++ b/sec-policy/selinux-inn/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-inn-2.20190201-r1.ebuild 273 BLAKE2B 672797b7bee8c32b506e039641430ab6a8cd82453528ce848ebe198a28b4179c468b7fd313e973c2fe7f677ccc9f483228c21d284335945e96769af260a7fd5d SHA512 bcc21b2416e6e5a8856253eca82b7b64ac79b1f9af4ad66c1c015d0d4aab59d67efb314842b5ecf6b7cf4c4440944959e7c36dafa593b4d59fb639bbec08ff4c
-EBUILD selinux-inn-2.20190609-r1.ebuild 275 BLAKE2B 6c4227a3d65291576f85ebe38d88fc7e4f64aadf22e3158bd96ce41832a35361deee80bb266d7a904f104099103b2ab03a73e15f17ae77c1ad12d2acb0c3022b SHA512 4171fb3242f09e4fe964d0181f81b75f4c935fe3d3d6716c847f5d27e8a29f078e5c13068d85fdda8e089306efd3448c0320d93a396c6047db3be53bd79a8ed6
+EBUILD selinux-inn-2.20190609-r1.ebuild 273 BLAKE2B 672797b7bee8c32b506e039641430ab6a8cd82453528ce848ebe198a28b4179c468b7fd313e973c2fe7f677ccc9f483228c21d284335945e96769af260a7fd5d SHA512 bcc21b2416e6e5a8856253eca82b7b64ac79b1f9af4ad66c1c015d0d4aab59d67efb314842b5ecf6b7cf4c4440944959e7c36dafa593b4d59fb639bbec08ff4c
+EBUILD selinux-inn-2.20200818-r1.ebuild 275 BLAKE2B 6c4227a3d65291576f85ebe38d88fc7e4f64aadf22e3158bd96ce41832a35361deee80bb266d7a904f104099103b2ab03a73e15f17ae77c1ad12d2acb0c3022b SHA512 4171fb3242f09e4fe964d0181f81b75f4c935fe3d3d6716c847f5d27e8a29f078e5c13068d85fdda8e089306efd3448c0320d93a396c6047db3be53bd79a8ed6
 EBUILD selinux-inn-9999.ebuild 278 BLAKE2B f54e71778325116c0f9a4907f75a7aa9c7e8a0358f4e065b025627a97160aebfd8263be98da97259dd7c0aaa11971a0b44044dba44c87e7761ddb314ab988948 SHA512 12de60c38dd3cc53915447d109be08f93674a457a1ab9d1fcdaebdc454966afed3a11a58264529dbf5fd4502760114c6034249b47e7b160f44fe14ed78be70c5
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-inn/selinux-inn-2.20190609-r1.ebuild b/sec-policy/selinux-inn/selinux-inn-2.20190609-r1.ebuild
index b03b8bfebb50..c6c4d8b76174 100644
--- a/sec-policy/selinux-inn/selinux-inn-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-inn/selinux-inn-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-inn/selinux-inn-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..b03b8bfebb50
--- /dev/null
+++ b/sec-policy/selinux-inn/selinux-inn-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 35aac1e5e330..5492ac15a4d3 100644
--- a/sec-policy/selinux-ipsec/Manifest
+++ b/sec-policy/selinux-ipsec/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-ipsec-2.20190201-r1.ebuild 277 BLAKE2B d948c18dc4e3f96307c79918ca3cff77317087120a703a2440b5c457506880e76a51bfb33b25b08c4d86c7edeee9116fb8b58f8017669ac3e1f282bea034ac3e SHA512 36fe0a15e27ab22b1ea410e8eae5e46137b4a145a70e500cd798706dbdd08cf88f80522754866267c778b352f861258a6518e2f6a0c38f9076e5f1fbcd9aa5e1
-EBUILD selinux-ipsec-2.20190609-r1.ebuild 279 BLAKE2B 69f69d5321e5db91a1745ef5ca51a26a6be44a206fd5031455c98514174339376a8caaca0db96144bb971f3324387f983b10a53f7d9d04f738308dc0ae846d34 SHA512 1dbd8f4f0df77b9eb0e585fcfa613976de32bdc8329e00339107b188acad9f6678b6b11ff0bf608b3757539ddc656b8dc542ed16ce98e3f5baf0b74478c04524
+EBUILD selinux-ipsec-2.20190609-r1.ebuild 277 BLAKE2B d948c18dc4e3f96307c79918ca3cff77317087120a703a2440b5c457506880e76a51bfb33b25b08c4d86c7edeee9116fb8b58f8017669ac3e1f282bea034ac3e SHA512 36fe0a15e27ab22b1ea410e8eae5e46137b4a145a70e500cd798706dbdd08cf88f80522754866267c778b352f861258a6518e2f6a0c38f9076e5f1fbcd9aa5e1
+EBUILD selinux-ipsec-2.20200818-r1.ebuild 279 BLAKE2B 69f69d5321e5db91a1745ef5ca51a26a6be44a206fd5031455c98514174339376a8caaca0db96144bb971f3324387f983b10a53f7d9d04f738308dc0ae846d34 SHA512 1dbd8f4f0df77b9eb0e585fcfa613976de32bdc8329e00339107b188acad9f6678b6b11ff0bf608b3757539ddc656b8dc542ed16ce98e3f5baf0b74478c04524
 EBUILD selinux-ipsec-9999.ebuild 282 BLAKE2B 404bf2524a77692ef78785a5a75fe734a806b2e52513156149d25e2c8add33f63523f53ed5a0143ff9795d3601a94bb9d4cffe712c77c36a27b600b77907621f SHA512 a9f67a25f8dfb841c95bc89df4131a62e4c85a85c6dad63f85255c26f54d792e71c28a4e1f5dce46a276209e8b0329356b662803f3c7e0a39eed70e8de9ef2fc
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ipsec/selinux-ipsec-2.20190609-r1.ebuild b/sec-policy/selinux-ipsec/selinux-ipsec-2.20190609-r1.ebuild
index 16183a95d5ab..5c90d6ed4a0c 100644
--- a/sec-policy/selinux-ipsec/selinux-ipsec-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-ipsec/selinux-ipsec-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-ipsec/selinux-ipsec-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..16183a95d5ab
--- /dev/null
+++ b/sec-policy/selinux-ipsec/selinux-ipsec-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 27a39cdfb842..db583a138128 100644
--- a/sec-policy/selinux-irc/Manifest
+++ b/sec-policy/selinux-irc/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-irc-2.20190201-r1.ebuild 273 BLAKE2B d823b81194dde4bf21666381d9b978bb666489eb07b197d364d28186b0533cb29f1fefe3a3fbebb542d2f7c685efaee580d8d4f2765227dce9033d3b023126c3 SHA512 4e1642e2fbf414dbd6a387ad3d8e0fac73a2b7da91c2e53e15f4e9f14ed6ff5cc7f290e40995dcba110cfc0c1d114a50aee1bf44c38df9aec1eb14da6f15e9de
-EBUILD selinux-irc-2.20190609-r1.ebuild 275 BLAKE2B fb0c2011ee0cdb56ccadb076d616576d60d0eb6c426905116e313660c6429b6db6286eb9f1de66e90d2da5ca06813bd27c42abf07939d13de331af10de848efc SHA512 4d4564ef95e9eea344e64f91bea4c63a4355739591f0219b343aa1207c9cbf00c480e8a03f7477d2c559b94bec62e5746feae61a2ed0b4a57cbf993beba932d9
+EBUILD selinux-irc-2.20190609-r1.ebuild 273 BLAKE2B d823b81194dde4bf21666381d9b978bb666489eb07b197d364d28186b0533cb29f1fefe3a3fbebb542d2f7c685efaee580d8d4f2765227dce9033d3b023126c3 SHA512 4e1642e2fbf414dbd6a387ad3d8e0fac73a2b7da91c2e53e15f4e9f14ed6ff5cc7f290e40995dcba110cfc0c1d114a50aee1bf44c38df9aec1eb14da6f15e9de
+EBUILD selinux-irc-2.20200818-r1.ebuild 275 BLAKE2B fb0c2011ee0cdb56ccadb076d616576d60d0eb6c426905116e313660c6429b6db6286eb9f1de66e90d2da5ca06813bd27c42abf07939d13de331af10de848efc SHA512 4d4564ef95e9eea344e64f91bea4c63a4355739591f0219b343aa1207c9cbf00c480e8a03f7477d2c559b94bec62e5746feae61a2ed0b4a57cbf993beba932d9
 EBUILD selinux-irc-9999.ebuild 278 BLAKE2B 22bd4c8542b1830336c737f2a525bf044d8af2d38852e9ae0789bc9a43b4baf2c708b677ab3547ae86704d2b706fc397a6af053f603cbb3f3f5fcc40722d6e01 SHA512 47673607390fb0c897f438a5ba458fa4a6bb4ba87b403468fd80cede151853bb0343f79eef67e65095dd6206697eeacee5e25339af990be65064cbd51fe3b15d
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-irc/selinux-irc-2.20190609-r1.ebuild b/sec-policy/selinux-irc/selinux-irc-2.20190609-r1.ebuild
index 5fcd93148cb2..b5c726276812 100644
--- a/sec-policy/selinux-irc/selinux-irc-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-irc/selinux-irc-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-irc/selinux-irc-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..5fcd93148cb2
--- /dev/null
+++ b/sec-policy/selinux-irc/selinux-irc-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 883b97ad96ac..09ed0c3194f5 100644
--- a/sec-policy/selinux-ircd/Manifest
+++ b/sec-policy/selinux-ircd/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-ircd-2.20190201-r1.ebuild 275 BLAKE2B f335e64c99275fef0725c372b4e90350ab8bdb2bfa52fe30a72e2f4d3c807338837d77a470e904311cda56ec8808e6252ee8a06391f227dce10c5697828d08db SHA512 5a1fc8777494f4fcb021c1e0ff844175c9068d1409dd94adf87620e44f6c8a832a637aa75164cf20aa554f3d386aac0233dd5a07b4eb405148e214a9c0279e44
-EBUILD selinux-ircd-2.20190609-r1.ebuild 277 BLAKE2B 1d9465b1cc1c59a9070d47938467e409e78bd6b5db45090195eabd9c538471b5a473b8994ab76cc1eefb99f753a1986c24a07f01ffdbd671049d12d1ce13d2bd SHA512 7fdc775e664cecb066d4434962b55a1e646596830d7f4525c3104e3dcbfbb3bb0355413b3ea5dfd52721b10f8030f6e0d750e06257ed74984e83fa68b310aa3a
+EBUILD selinux-ircd-2.20190609-r1.ebuild 275 BLAKE2B f335e64c99275fef0725c372b4e90350ab8bdb2bfa52fe30a72e2f4d3c807338837d77a470e904311cda56ec8808e6252ee8a06391f227dce10c5697828d08db SHA512 5a1fc8777494f4fcb021c1e0ff844175c9068d1409dd94adf87620e44f6c8a832a637aa75164cf20aa554f3d386aac0233dd5a07b4eb405148e214a9c0279e44
+EBUILD selinux-ircd-2.20200818-r1.ebuild 277 BLAKE2B 1d9465b1cc1c59a9070d47938467e409e78bd6b5db45090195eabd9c538471b5a473b8994ab76cc1eefb99f753a1986c24a07f01ffdbd671049d12d1ce13d2bd SHA512 7fdc775e664cecb066d4434962b55a1e646596830d7f4525c3104e3dcbfbb3bb0355413b3ea5dfd52721b10f8030f6e0d750e06257ed74984e83fa68b310aa3a
 EBUILD selinux-ircd-9999.ebuild 280 BLAKE2B cf7f4d5b7138cf936a61079de60ebcd2fc0d0aa2ca96907f6ec86e652c2b93096fd33f5997dd45e39020c142e992eba4ca2f311e6ed87273a59f79aac6448c38 SHA512 67f6d19ef77ef464d85c5ecb78f5e6e94805ed78b37d9e77818735406d9e7a29382c5a933848ba549acc5a435af1a0ac68068d34547f1e245e06b2362c994268
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ircd/selinux-ircd-2.20190609-r1.ebuild b/sec-policy/selinux-ircd/selinux-ircd-2.20190609-r1.ebuild
index 385bb8893073..99d5126c869e 100644
--- a/sec-policy/selinux-ircd/selinux-ircd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-ircd/selinux-ircd-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-ircd/selinux-ircd-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..385bb8893073
--- /dev/null
+++ b/sec-policy/selinux-ircd/selinux-ircd-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 f879ce2d0362..31b56f2f3906 100644
--- a/sec-policy/selinux-irqbalance/Manifest
+++ b/sec-policy/selinux-irqbalance/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-irqbalance-2.20190201-r1.ebuild 287 BLAKE2B 2061d8cc8531660e9dbcc294820fc76c02151c75ce35c889a3d1f06b0c3b631e534030cb75a9ef6ad14caf1580f5cc2c6673ca8c03aef7dd95b2806d169023b2 SHA512 fc27980a7a4157e08883128bec5c30509be50baf88695bae994bdd10f3b3f55f6ed724630ee473762a651a43b1bffccfe6b48d66176b0f3e86699e368a71ffde
-EBUILD selinux-irqbalance-2.20190609-r1.ebuild 289 BLAKE2B 5f4b2b1e2f2354a490cf6517019f8d377c9d521f0a0d2d914fcf188f28f03f9d71e0c6793866505b48db4cfde07a0ca23264720e6f268997b0ea240db904a562 SHA512 f1d9927f9455953acf8d7bdc5914d64257063d63258386b1dcbbc9cc4bd70252941e80ff8a40f0fd0a4a96ecd98c153251d9fdac0ac57b50baf4f0e5de493411
+EBUILD selinux-irqbalance-2.20190609-r1.ebuild 287 BLAKE2B 2061d8cc8531660e9dbcc294820fc76c02151c75ce35c889a3d1f06b0c3b631e534030cb75a9ef6ad14caf1580f5cc2c6673ca8c03aef7dd95b2806d169023b2 SHA512 fc27980a7a4157e08883128bec5c30509be50baf88695bae994bdd10f3b3f55f6ed724630ee473762a651a43b1bffccfe6b48d66176b0f3e86699e368a71ffde
+EBUILD selinux-irqbalance-2.20200818-r1.ebuild 289 BLAKE2B 5f4b2b1e2f2354a490cf6517019f8d377c9d521f0a0d2d914fcf188f28f03f9d71e0c6793866505b48db4cfde07a0ca23264720e6f268997b0ea240db904a562 SHA512 f1d9927f9455953acf8d7bdc5914d64257063d63258386b1dcbbc9cc4bd70252941e80ff8a40f0fd0a4a96ecd98c153251d9fdac0ac57b50baf4f0e5de493411
 EBUILD selinux-irqbalance-9999.ebuild 292 BLAKE2B 4cfdf4ba03c8516684799e313f4c3559edf931dac90b869bf93aa615c78342ad6a250bdf148a9c01aa98b9a95ce1abc85982e76221ab10023a930049f5a41f7b SHA512 21f94784267b3c078ac282e7abd53392c52e5f5df9580cf37e54e2121d8d6ccffe9a0f14548cc734a83aaa048f95da8b38f11735c58ef3586b2fb94284ef2e11
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20190609-r1.ebuild b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20190609-r1.ebuild
index b06580074edf..aea0de17ee95 100644
--- a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..b06580074edf
--- /dev/null
+++ b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 c4090a80f2c2..111b13e42643 100644
--- a/sec-policy/selinux-jabber/Manifest
+++ b/sec-policy/selinux-jabber/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-jabber-2.20190201-r1.ebuild 279 BLAKE2B c6e0525d49b951a2656cbfd5301db8762198c4fdd67cc1cb413538085c40f7def7c1d23a2f3da6c51effac4531de12286712e1fd359a297be5711b07cfa8b441 SHA512 f2c228cf03aa9a2601783e9eb459ed8d966250d6e004f25e846477598e3cb286a422535916a6c1a98b3776a2266cd7c8ba8c7aad5f0e8db54528a493bedb09d1
-EBUILD selinux-jabber-2.20190609-r1.ebuild 281 BLAKE2B bf4aac75067e65caa8439c52ff79917c5b1df55abe00e7490c2b02dd9369100232866dee94a6db58c20a338f9a644543921d238e4d7144cfa175e1c0f673bc75 SHA512 0fbef72ec09bdcd45678dd005d9abdfc7bd4f4d5c1a2561a80fa210ffed74e24c11fc2101c7f359715d2f4f88b46424ba8c5b57f4d99f69c0ee77b4b4bb3cfea
+EBUILD selinux-jabber-2.20190609-r1.ebuild 279 BLAKE2B c6e0525d49b951a2656cbfd5301db8762198c4fdd67cc1cb413538085c40f7def7c1d23a2f3da6c51effac4531de12286712e1fd359a297be5711b07cfa8b441 SHA512 f2c228cf03aa9a2601783e9eb459ed8d966250d6e004f25e846477598e3cb286a422535916a6c1a98b3776a2266cd7c8ba8c7aad5f0e8db54528a493bedb09d1
+EBUILD selinux-jabber-2.20200818-r1.ebuild 281 BLAKE2B bf4aac75067e65caa8439c52ff79917c5b1df55abe00e7490c2b02dd9369100232866dee94a6db58c20a338f9a644543921d238e4d7144cfa175e1c0f673bc75 SHA512 0fbef72ec09bdcd45678dd005d9abdfc7bd4f4d5c1a2561a80fa210ffed74e24c11fc2101c7f359715d2f4f88b46424ba8c5b57f4d99f69c0ee77b4b4bb3cfea
 EBUILD selinux-jabber-9999.ebuild 284 BLAKE2B 39cd6d6e864b86fd529bae96d4924e9479ae456185f321ace36f74d6f71d1199d729f0bd6b593b53568b46b9ef4b5a891507d0a69219c5a75d28870b7542eb92 SHA512 90103398c26d29b8be1cc3d314867d88ddec0e936d34a0d7f0f218cbbcb78ad48a9e48bae04d8278b86020bc22eba227d22e7b6ca1d69d6310c785ddcd76d7b2
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-jabber/selinux-jabber-2.20190609-r1.ebuild b/sec-policy/selinux-jabber/selinux-jabber-2.20190609-r1.ebuild
index 2a9d7dd3db87..9c20766a44a8 100644
--- a/sec-policy/selinux-jabber/selinux-jabber-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-jabber/selinux-jabber-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-jabber/selinux-jabber-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..2a9d7dd3db87
--- /dev/null
+++ b/sec-policy/selinux-jabber/selinux-jabber-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 90a76e31f047..517b603743c5 100644
--- a/sec-policy/selinux-java/Manifest
+++ b/sec-policy/selinux-java/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-java-2.20190201-r1.ebuild 279 BLAKE2B d5abd5ffaf6e356992b0c6ddc6f2a34bca28d0eb8cff3e68a6268ce1ec578720fb6eae4239476cf01917ee33d5ad56ef9fafc1d39587da44c51d45b597f6d29c SHA512 f36794a527521ff0e87c306a1f2df071e9bd5acc29904ea4d7bb5e0f63daac38b8956a4d51be2d3010a1fe72c2f63d5312f0864ef806f9649e9aaf2a71ed18b7
-EBUILD selinux-java-2.20190609-r1.ebuild 281 BLAKE2B b384ca32c7ab2ad85f5ac683e23a09d1306551880f440b0767e94d9dad61822f7c72c2fede2ebac6aa67b445bfb872bd33a7137201dcde0ef2445aa8bf339901 SHA512 5b91c5b50812b06e7a96dedacf0958967a7680f5a5a6c214d2d525a1fe8c166930de7d6573c0ab9778b51679ee016ae0cbf3ea080d0957c9aebbff5e271aadad
+EBUILD selinux-java-2.20190609-r1.ebuild 279 BLAKE2B d5abd5ffaf6e356992b0c6ddc6f2a34bca28d0eb8cff3e68a6268ce1ec578720fb6eae4239476cf01917ee33d5ad56ef9fafc1d39587da44c51d45b597f6d29c SHA512 f36794a527521ff0e87c306a1f2df071e9bd5acc29904ea4d7bb5e0f63daac38b8956a4d51be2d3010a1fe72c2f63d5312f0864ef806f9649e9aaf2a71ed18b7
+EBUILD selinux-java-2.20200818-r1.ebuild 281 BLAKE2B b384ca32c7ab2ad85f5ac683e23a09d1306551880f440b0767e94d9dad61822f7c72c2fede2ebac6aa67b445bfb872bd33a7137201dcde0ef2445aa8bf339901 SHA512 5b91c5b50812b06e7a96dedacf0958967a7680f5a5a6c214d2d525a1fe8c166930de7d6573c0ab9778b51679ee016ae0cbf3ea080d0957c9aebbff5e271aadad
 EBUILD selinux-java-9999.ebuild 284 BLAKE2B c3328f8fc326b28b9fa4974341c716d7be73a07d2b02c92b8e1791b4e91e9f4608783b81b8bd3a782b77389898411a6250c6431d44419f42a387db2be7c9190d SHA512 ca10912bd5ea5d69b03ab482e20f4a31e9ce2f9a02bc66b36ccfb97f4c280e580e682f09ec6c98ed603c4ced8807534796848af24366a6f4a3321f8161b2a00b
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-java/selinux-java-2.20190609-r1.ebuild b/sec-policy/selinux-java/selinux-java-2.20190609-r1.ebuild
index 189192e72a4c..8da3069cde43 100644
--- a/sec-policy/selinux-java/selinux-java-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-java/selinux-java-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-java/selinux-java-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..189192e72a4c
--- /dev/null
+++ b/sec-policy/selinux-java/selinux-java-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 997b7c8c4d78..ca49d119332f 100644
--- a/sec-policy/selinux-kdeconnect/Manifest
+++ b/sec-policy/selinux-kdeconnect/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-kdeconnect-2.20190201-r1.ebuild 287 BLAKE2B 494e52a8c88cd0769d9b6845dbbaac569fca2adc0218e707284431ab9ef1e789a8256178fe6403b6bb0026da53381526590418e9b7dbffb8aabfa4b3f9d590e3 SHA512 2afca4cb4603c09ef54053c2b6a0eaa1afcb9ecf7d31fb8363d35e993bb43afdeb5cc289c0bc3096b2bb28790bc013e0bf163b9f5571c3d785ddd4d85dc6885c
-EBUILD selinux-kdeconnect-2.20190609-r1.ebuild 289 BLAKE2B 813c2bfc890198b7e07075997363b7876c67f232941368e4406b9682be11cb5cdd1d21cde0a06cc272ca03dd54211ca01e0373055b07ebd2c625ea7af9269b81 SHA512 8ea6b02be985b002d7ea532f0164994468083b5bcb6a2c53b3f351626bd330b14a002cbf1cb8928fc193e4b172197e3a178ec5e79d6a139564c522d800e5846d
+EBUILD selinux-kdeconnect-2.20190609-r1.ebuild 287 BLAKE2B 494e52a8c88cd0769d9b6845dbbaac569fca2adc0218e707284431ab9ef1e789a8256178fe6403b6bb0026da53381526590418e9b7dbffb8aabfa4b3f9d590e3 SHA512 2afca4cb4603c09ef54053c2b6a0eaa1afcb9ecf7d31fb8363d35e993bb43afdeb5cc289c0bc3096b2bb28790bc013e0bf163b9f5571c3d785ddd4d85dc6885c
+EBUILD selinux-kdeconnect-2.20200818-r1.ebuild 289 BLAKE2B 813c2bfc890198b7e07075997363b7876c67f232941368e4406b9682be11cb5cdd1d21cde0a06cc272ca03dd54211ca01e0373055b07ebd2c625ea7af9269b81 SHA512 8ea6b02be985b002d7ea532f0164994468083b5bcb6a2c53b3f351626bd330b14a002cbf1cb8928fc193e4b172197e3a178ec5e79d6a139564c522d800e5846d
 EBUILD selinux-kdeconnect-9999.ebuild 292 BLAKE2B 10c1307fab2823e6a570b3e174f1c4afacf42cc287ebe8dc322c3f33edc78e2984ec4ed961692e4d316e05db3f25aab9846511ccbd63075fcf15553176829007 SHA512 a7911804aa9a16c6b8decfc7b369f929e4fdc832677717d4c8bd3bd37ad4c5d2f23678c8af081e0ef7058ec7b0d76413061481383c89e46996ecface4e439f96
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20190609-r1.ebuild b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20190609-r1.ebuild
index e9688b31fdcd..c084accb0899 100644
--- a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..e9688b31fdcd
--- /dev/null
+++ b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 ed42127a4d3d..7e36edeac761 100644
--- a/sec-policy/selinux-kdump/Manifest
+++ b/sec-policy/selinux-kdump/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-kdump-2.20190201-r1.ebuild 277 BLAKE2B 1839e1ef13d8f29e0cce4f7c9fe01428e270eebcd9680d4d6c55328abf04447da8924fea2bdcf4a6f732a6c36364dbf9c0f879f0118ced229e772d0f4f3c699f SHA512 7f98f47588705e7774d444db88894513f19d7c1db2348d321759000e172afe6a05e23ef9b8947d6cc086f56d7083aea78bcadd3e04708b4e1b1716a5210412a8
-EBUILD selinux-kdump-2.20190609-r1.ebuild 279 BLAKE2B c23ff26dd7f4d2ade239269450aed3bdf83348087464836254159505851ce4c8c6ecccb3d753dea582b07b0ba3f84ec40375721ed3ab9a7f1197c17334d44d30 SHA512 90d9575912802fae216b558ae4dd60cf5d6fc52c98eaa3af4c33b78bb088a552bf206ea8852c742ffbc8ba1f9fae3c5b8d8ed10beb70e0d8877807e3bae92219
+EBUILD selinux-kdump-2.20190609-r1.ebuild 277 BLAKE2B 1839e1ef13d8f29e0cce4f7c9fe01428e270eebcd9680d4d6c55328abf04447da8924fea2bdcf4a6f732a6c36364dbf9c0f879f0118ced229e772d0f4f3c699f SHA512 7f98f47588705e7774d444db88894513f19d7c1db2348d321759000e172afe6a05e23ef9b8947d6cc086f56d7083aea78bcadd3e04708b4e1b1716a5210412a8
+EBUILD selinux-kdump-2.20200818-r1.ebuild 279 BLAKE2B c23ff26dd7f4d2ade239269450aed3bdf83348087464836254159505851ce4c8c6ecccb3d753dea582b07b0ba3f84ec40375721ed3ab9a7f1197c17334d44d30 SHA512 90d9575912802fae216b558ae4dd60cf5d6fc52c98eaa3af4c33b78bb088a552bf206ea8852c742ffbc8ba1f9fae3c5b8d8ed10beb70e0d8877807e3bae92219
 EBUILD selinux-kdump-9999.ebuild 282 BLAKE2B 90cb2c657ef57615ad1f35b004f3fdb53c636391a7e694e759d227f2ea204d90d9563bdf99ea6c56cbe057f598a6c3272c59d86c285f68feaf2f0e5e5d45380b SHA512 bb215372c7cf13641a8d0f4d3437e7ed09c59665d15ef186712ffd5ea81b19823c071fdb7f1772ce579b35ef21dd1a6e472fff704490f7a815acf6ed06532a8e
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-kdump/selinux-kdump-2.20190609-r1.ebuild b/sec-policy/selinux-kdump/selinux-kdump-2.20190609-r1.ebuild
index f44fd51b583d..3cd1801830b8 100644
--- a/sec-policy/selinux-kdump/selinux-kdump-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-kdump/selinux-kdump-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-kdump/selinux-kdump-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..f44fd51b583d
--- /dev/null
+++ b/sec-policy/selinux-kdump/selinux-kdump-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 090791339c12..eb7d225c33bf 100644
--- a/sec-policy/selinux-kerberos/Manifest
+++ b/sec-policy/selinux-kerberos/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-kerberos-2.20190201-r1.ebuild 283 BLAKE2B 4f4fdde5fc20001c2e4580818f39b34bb0b79cae676b07599d8cf256dcba00b4cedbc28ba02afcd7f42ea9e5766e0902bd0500549d30da6aa9389a3439c98a5f SHA512 fd57613f65ca50aa97c409da86b15112935ff6fc185b96184a3e40af0482f15d895448545b91f0171de4640d5f361405edfce0c34019090ed84a5e77882faf78
-EBUILD selinux-kerberos-2.20190609-r1.ebuild 285 BLAKE2B 9a3b2f7760bfd7591e54c401b3f0590662f93d53eb2594c48a090fb4d897ce75a3634182c4f46fa60db626605a3b0816ad6678c25f930be47f86e91ccaba795e SHA512 ab840d0561effe71c818718457efd11aaf752ec7a1561cb94945b8d67a6a4afcdb8a2149a923dc124398487c4613b8bc8f2efdababc7c96f1c428628ffcec04c
+EBUILD selinux-kerberos-2.20190609-r1.ebuild 283 BLAKE2B 4f4fdde5fc20001c2e4580818f39b34bb0b79cae676b07599d8cf256dcba00b4cedbc28ba02afcd7f42ea9e5766e0902bd0500549d30da6aa9389a3439c98a5f SHA512 fd57613f65ca50aa97c409da86b15112935ff6fc185b96184a3e40af0482f15d895448545b91f0171de4640d5f361405edfce0c34019090ed84a5e77882faf78
+EBUILD selinux-kerberos-2.20200818-r1.ebuild 285 BLAKE2B 9a3b2f7760bfd7591e54c401b3f0590662f93d53eb2594c48a090fb4d897ce75a3634182c4f46fa60db626605a3b0816ad6678c25f930be47f86e91ccaba795e SHA512 ab840d0561effe71c818718457efd11aaf752ec7a1561cb94945b8d67a6a4afcdb8a2149a923dc124398487c4613b8bc8f2efdababc7c96f1c428628ffcec04c
 EBUILD selinux-kerberos-9999.ebuild 288 BLAKE2B e98ebf9f5d4618460b6661c4c61593abc2c77baffeca23d761e7d7a108e2223706cef882ddbe20de60f29b21bccdb2ae1ba8e89493101539094fc5142bf4a8f9 SHA512 d786e2d320ac570278a1201494043bea677346194e604591b472d5420fef4146d6af60ca7855e3ddf836131a50d416646cbe4e4d874ec97bea174bcee3b909f4
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-kerberos/selinux-kerberos-2.20190609-r1.ebuild b/sec-policy/selinux-kerberos/selinux-kerberos-2.20190609-r1.ebuild
index e06bddfcf8be..0c1e835f8632 100644
--- a/sec-policy/selinux-kerberos/selinux-kerberos-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-kerberos/selinux-kerberos-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-kerberos/selinux-kerberos-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..e06bddfcf8be
--- /dev/null
+++ b/sec-policy/selinux-kerberos/selinux-kerberos-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 413fd18bc220..9d1162a60890 100644
--- a/sec-policy/selinux-kerneloops/Manifest
+++ b/sec-policy/selinux-kerneloops/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-kerneloops-2.20190201-r1.ebuild 287 BLAKE2B 3e7c0d257c03a8de0e40eb7a0b4f83bca20f18f5a1927912c53f6befca9765a527f03ffd38e69f10d3afb97797238945ecb982703f177203d378079b4b87c0fe SHA512 b16b21bf4fff03f05d1b449f6b66b9c0272a3180a80527b5b26b2cfb844943410035b87e7638bd48f42e32748763987f503995ed79ec3692eec64c81cc18c95a
-EBUILD selinux-kerneloops-2.20190609-r1.ebuild 289 BLAKE2B d141aa650f4e5a75a59543a3d898da5831656a53f9560bbaad1e0a3a1340eba32ae144da574d534a8f41e19bcd3c606ddf5559a7897149879d653aeb3282f4dc SHA512 d66f3a98f7181321c42a123d7f32088542c22c98c24191a34360002e12c83cffc2d85ee3f48978dabb53527bdba28ac2bd0a107f29ddac06e483ecccffcf9091
+EBUILD selinux-kerneloops-2.20190609-r1.ebuild 287 BLAKE2B 3e7c0d257c03a8de0e40eb7a0b4f83bca20f18f5a1927912c53f6befca9765a527f03ffd38e69f10d3afb97797238945ecb982703f177203d378079b4b87c0fe SHA512 b16b21bf4fff03f05d1b449f6b66b9c0272a3180a80527b5b26b2cfb844943410035b87e7638bd48f42e32748763987f503995ed79ec3692eec64c81cc18c95a
+EBUILD selinux-kerneloops-2.20200818-r1.ebuild 289 BLAKE2B d141aa650f4e5a75a59543a3d898da5831656a53f9560bbaad1e0a3a1340eba32ae144da574d534a8f41e19bcd3c606ddf5559a7897149879d653aeb3282f4dc SHA512 d66f3a98f7181321c42a123d7f32088542c22c98c24191a34360002e12c83cffc2d85ee3f48978dabb53527bdba28ac2bd0a107f29ddac06e483ecccffcf9091
 EBUILD selinux-kerneloops-9999.ebuild 292 BLAKE2B 60955babaece40d4c411eafb354d45d1ca776494fd277782e708cb4c39808d9a27cae662995cd4a76730f8e964b93807203259a920dd9019bf852180e95e41f3 SHA512 9aaca8b3fb0c733bf52b4d9cb0e2edc6601bdadc512d3e4905684a1cc302c500f2abcbf7686288e6ec1b58c27793b9bc5d891b076dc714e5f39ba5f7a1ee9675
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20190609-r1.ebuild b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20190609-r1.ebuild
index a4517b06e042..065d662724f3 100644
--- a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..a4517b06e042
--- /dev/null
+++ b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 60056729925c..dfc72441df43 100644
--- a/sec-policy/selinux-kismet/Manifest
+++ b/sec-policy/selinux-kismet/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-kismet-2.20190201-r1.ebuild 279 BLAKE2B 7a08592bc73eba9fcde5ec8f23a3a7506cdd7b77681dd03d2645c3d20c9c6c2ae5dc48dfb9a6ca7a79376074c17bbfc565b3c7c75852de636507b3ab37e23f4c SHA512 1566bf7a62bb52cdc2ccff7d909d6891ba3a44a56b5d0af8a3464aaa8a27f5d6952fd3c4c83b60e8bd215dac27f708d2e28ab38a311685e587407801b409da37
-EBUILD selinux-kismet-2.20190609-r1.ebuild 281 BLAKE2B 84affa8b38d41d0112d1b4f1424d4ad88eed0f359a2b75ca131c2deea23b05990be3f51f84f6e4f59d9e849a5be55d207b6bd44f34591f11ec6ff28e83b4426e SHA512 69bdcacf9e72d741bd64edbd7682604f4b6a01cfa1ecbcd098ccf5d74fa80b49b1e68fac7bcb4f43e541a778fc110dd9804f43a08a1a05c55f36043a53c48aa9
+EBUILD selinux-kismet-2.20190609-r1.ebuild 279 BLAKE2B 7a08592bc73eba9fcde5ec8f23a3a7506cdd7b77681dd03d2645c3d20c9c6c2ae5dc48dfb9a6ca7a79376074c17bbfc565b3c7c75852de636507b3ab37e23f4c SHA512 1566bf7a62bb52cdc2ccff7d909d6891ba3a44a56b5d0af8a3464aaa8a27f5d6952fd3c4c83b60e8bd215dac27f708d2e28ab38a311685e587407801b409da37
+EBUILD selinux-kismet-2.20200818-r1.ebuild 281 BLAKE2B 84affa8b38d41d0112d1b4f1424d4ad88eed0f359a2b75ca131c2deea23b05990be3f51f84f6e4f59d9e849a5be55d207b6bd44f34591f11ec6ff28e83b4426e SHA512 69bdcacf9e72d741bd64edbd7682604f4b6a01cfa1ecbcd098ccf5d74fa80b49b1e68fac7bcb4f43e541a778fc110dd9804f43a08a1a05c55f36043a53c48aa9
 EBUILD selinux-kismet-9999.ebuild 284 BLAKE2B e436b2aeeefb3dc0e98d1940c5c8cb7f8c7a1f57eccb4214cdffd56792512405eb63f54abf3ed47041be51dbc7050d58615e7f724d57205f809487647c7c40d3 SHA512 c49ff7522d192e34b808b974818a1fe51521d83790f7e48aacfc74fce033fc74b6f0ba145197826663f56ccda9a4a3438b062838324df96433cf7bf58f31f5c7
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-kismet/selinux-kismet-2.20190609-r1.ebuild b/sec-policy/selinux-kismet/selinux-kismet-2.20190609-r1.ebuild
index 9747c721084a..c301d6ecc7da 100644
--- a/sec-policy/selinux-kismet/selinux-kismet-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-kismet/selinux-kismet-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-kismet/selinux-kismet-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..9747c721084a
--- /dev/null
+++ b/sec-policy/selinux-kismet/selinux-kismet-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 39591bef3fb1..bc1a52322569 100644
--- a/sec-policy/selinux-ksmtuned/Manifest
+++ b/sec-policy/selinux-ksmtuned/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-ksmtuned-2.20190201-r1.ebuild 283 BLAKE2B ab4270e97b767c41fe852b34f1e9f94eebc0e63b062983a3415018b445b2fb2345e0f5a183c8a36f3b68e883382a387297e0e19fce724ebd1b00792c3d9daa35 SHA512 a52689efde12669969e8e47d2610d3e27304cf8481b77ae3063db54a893c2889638c103ba248c8e6b59418e49f7945ca63ff65aba54edbb3133c6b9e3151210a
-EBUILD selinux-ksmtuned-2.20190609-r1.ebuild 285 BLAKE2B dfe7290e559be5fd05d85a01241212146a27bf5b6c6481f85b2e048ea99621925936b1125286b7cee8a3b9fc10fe5942ece6f52cfa4ce84ae72856436ca17571 SHA512 746101ad721af0bbb9d6cde73848090f1714ba77c9e120b25dc231e269ecec6100c22b6b14b16d1fa622e19579b4449468190ef684d950608b6e26ec341fe2d1
+EBUILD selinux-ksmtuned-2.20190609-r1.ebuild 283 BLAKE2B ab4270e97b767c41fe852b34f1e9f94eebc0e63b062983a3415018b445b2fb2345e0f5a183c8a36f3b68e883382a387297e0e19fce724ebd1b00792c3d9daa35 SHA512 a52689efde12669969e8e47d2610d3e27304cf8481b77ae3063db54a893c2889638c103ba248c8e6b59418e49f7945ca63ff65aba54edbb3133c6b9e3151210a
+EBUILD selinux-ksmtuned-2.20200818-r1.ebuild 285 BLAKE2B dfe7290e559be5fd05d85a01241212146a27bf5b6c6481f85b2e048ea99621925936b1125286b7cee8a3b9fc10fe5942ece6f52cfa4ce84ae72856436ca17571 SHA512 746101ad721af0bbb9d6cde73848090f1714ba77c9e120b25dc231e269ecec6100c22b6b14b16d1fa622e19579b4449468190ef684d950608b6e26ec341fe2d1
 EBUILD selinux-ksmtuned-9999.ebuild 288 BLAKE2B 8b04cbbaafaeac90e208d0e5770a7262e339f70154028741ee4c0616b65c02fc42f52e99eac0915000b0d73bd4b5f93f5eeab3db6b7a511d01212648741ec60e SHA512 21d71bf60cdcfeb8d2589c2f4e753b560e4d645a0be90a6c0a4b185f827805f1a5c6505a03dade75ad1a33c27fc0cd328977f1ff8b94a828a667e4bc3ffe7497
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20190609-r1.ebuild b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20190609-r1.ebuild
index 6b501238bd32..16daac0e0a3a 100644
--- a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..6b501238bd32
--- /dev/null
+++ b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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-kudzu/Manifest b/sec-policy/selinux-kudzu/Manifest
index 684a431c8835..6d56e2830e4f 100644
--- a/sec-policy/selinux-kudzu/Manifest
+++ b/sec-policy/selinux-kudzu/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-kudzu-2.20190201-r1.ebuild 277 BLAKE2B 77967b6e4a385d4ba95381f562b878f6e947fa86d54e3a81d11d8e10ee8fc1bcb45f1218967fc62b497cc0fb557a4726e8da68c1eaca68ebf148435b99cc230a SHA512 9b2d26b1027761bb72bf3e1ea5431ee8bc8a72124c0864fcba223fa5f04ab3e013c6e6f45c4ab8228da5e6d2abcef35b64d358ee7719e93bc5bbe1334b99120e
-EBUILD selinux-kudzu-2.20190609-r1.ebuild 279 BLAKE2B 2a269a2212e59896751f2c63ec200bdd508e87107e2c0456edb3d18979f2c31dcdebe1902f2f48bda83d3e0536ba8a0c22db7717f37a4e2cb35e1d26ce5ca813 SHA512 6045d4c16224269ef5e4ba647452560e2f0630da5815a9afc88c46d59ed3b3586d088cb4e953679cee2cef4c873c6fdec1e9a196fa69e3b4b0be3c04fde7f0a1
+EBUILD selinux-kudzu-2.20190609-r1.ebuild 277 BLAKE2B 77967b6e4a385d4ba95381f562b878f6e947fa86d54e3a81d11d8e10ee8fc1bcb45f1218967fc62b497cc0fb557a4726e8da68c1eaca68ebf148435b99cc230a SHA512 9b2d26b1027761bb72bf3e1ea5431ee8bc8a72124c0864fcba223fa5f04ab3e013c6e6f45c4ab8228da5e6d2abcef35b64d358ee7719e93bc5bbe1334b99120e
+EBUILD selinux-kudzu-2.20200818-r1.ebuild 279 BLAKE2B 2a269a2212e59896751f2c63ec200bdd508e87107e2c0456edb3d18979f2c31dcdebe1902f2f48bda83d3e0536ba8a0c22db7717f37a4e2cb35e1d26ce5ca813 SHA512 6045d4c16224269ef5e4ba647452560e2f0630da5815a9afc88c46d59ed3b3586d088cb4e953679cee2cef4c873c6fdec1e9a196fa69e3b4b0be3c04fde7f0a1
 EBUILD selinux-kudzu-9999.ebuild 282 BLAKE2B b5a64b6bc7c028b9a3d16baca5d3faddc3559c02346d0e919c30da28d03f38aff7c8b1d54e5538e037501d94f5b7a408f41bb780df15acc5880ba2ebc6350f2c SHA512 3de947edd2f8958c8e98a2e43257af3f4762aeb44406649343ba72da06ce0c01bc44799feec15a555d82a5dccc1ec6c04b169d6ad8acdd7174970e3a8b9f6955
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-kudzu/selinux-kudzu-2.20190609-r1.ebuild b/sec-policy/selinux-kudzu/selinux-kudzu-2.20190609-r1.ebuild
index 16738b92d139..4e89d9490b68 100644
--- a/sec-policy/selinux-kudzu/selinux-kudzu-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-kudzu/selinux-kudzu-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for kudzu"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-kudzu/selinux-kudzu-2.20200818-r1.ebuild b/sec-policy/selinux-kudzu/selinux-kudzu-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..16738b92d139
--- /dev/null
+++ b/sec-policy/selinux-kudzu/selinux-kudzu-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="kudzu"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for kudzu"
+
+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 213e6e1d28e2..be3ac8d7e35b 100644
--- a/sec-policy/selinux-ldap/Manifest
+++ b/sec-policy/selinux-ldap/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-ldap-2.20190201-r1.ebuild 275 BLAKE2B 31ea95c2572ed900f869390344c0e39a320c1a0dd13d6aa0d0170c54b2519ca0424552d1dece8d8c090ed2d529bf4e6b9c253c3b331b0d6fde7a9460d02c8b20 SHA512 26f77f3d4da77233a30563a94f858ee3b3f247fd6687f0bed107df470d45511d7e876c9d3884770f72419f81a99bf3745c7b56ee8d2f6169e2737f89e2726cad
-EBUILD selinux-ldap-2.20190609-r1.ebuild 277 BLAKE2B e375cffb76d3b2920a2d7367dc9786078b9091149fc02b740826b9a02dd057b1a2f1178a6a3394c942a2707ef4ae4c699ede2f239d893093dba6ac51f5fd55a7 SHA512 2fbacd9b0be1f6edc337f5334635ad935738f9bcc57ac4b55a3c2f6d1ce575739f01ba44f99658c8c887a99e0df446b5bd96e63d5b4d31de40a470335c63b780
+EBUILD selinux-ldap-2.20190609-r1.ebuild 275 BLAKE2B 31ea95c2572ed900f869390344c0e39a320c1a0dd13d6aa0d0170c54b2519ca0424552d1dece8d8c090ed2d529bf4e6b9c253c3b331b0d6fde7a9460d02c8b20 SHA512 26f77f3d4da77233a30563a94f858ee3b3f247fd6687f0bed107df470d45511d7e876c9d3884770f72419f81a99bf3745c7b56ee8d2f6169e2737f89e2726cad
+EBUILD selinux-ldap-2.20200818-r1.ebuild 277 BLAKE2B e375cffb76d3b2920a2d7367dc9786078b9091149fc02b740826b9a02dd057b1a2f1178a6a3394c942a2707ef4ae4c699ede2f239d893093dba6ac51f5fd55a7 SHA512 2fbacd9b0be1f6edc337f5334635ad935738f9bcc57ac4b55a3c2f6d1ce575739f01ba44f99658c8c887a99e0df446b5bd96e63d5b4d31de40a470335c63b780
 EBUILD selinux-ldap-9999.ebuild 280 BLAKE2B 01f4feda196b3029b0c35a84b760f5587377b769e8632bd358775d7d3fc4272656625eacdab9947107f5b0cc32f3a55151dd43d95ce7fcc3369a056d71280d01 SHA512 e232af34d48b67d68428bf80c4f6077f89e651550858d0363d404ab660ed730caeffa09640bfd8a37716bea718994bdf00e520a4203e9d03aab1ffb863115298
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ldap/selinux-ldap-2.20190609-r1.ebuild b/sec-policy/selinux-ldap/selinux-ldap-2.20190609-r1.ebuild
index 1aafa4b5a73b..aaa85782ca29 100644
--- a/sec-policy/selinux-ldap/selinux-ldap-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-ldap/selinux-ldap-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-ldap/selinux-ldap-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..1aafa4b5a73b
--- /dev/null
+++ b/sec-policy/selinux-ldap/selinux-ldap-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 e7223b0fd785..d11819a40866 100644
--- a/sec-policy/selinux-links/Manifest
+++ b/sec-policy/selinux-links/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-links-2.20190201-r1.ebuild 277 BLAKE2B a729cacb89de0f5a4e74dac77a8401fb87726a0cb8ac56ea638385589dd59d3af65a243f285cb8e2308c3a3b453bb2412ae41a3bdd988ebe434e0bcae2267230 SHA512 be4f5c76c9ea80c4c145e17582979c6e22edfc43f0cdab6cd6e4e070cfc4b79eee6f29ef8dec1faf7b30fb84f251e920bfed272c174eb529c25ae5f7e2cf5992
-EBUILD selinux-links-2.20190609-r1.ebuild 279 BLAKE2B d6f60a7674f1416d10e701223cea16c74c3eaf8d08a37ff9e1ef4d691be6dd8afa189ffa0df7607081992f6723fb197fb71e6902237a5f54f80fcc422844cebf SHA512 fdfc05698e31939458200a7913a15c3589df6943b17391d08037f7b4e30d3def0cede3968d0c95947c4da89a460162a871ba249ba8aa914f8506b9d894eb1bf5
+EBUILD selinux-links-2.20190609-r1.ebuild 277 BLAKE2B a729cacb89de0f5a4e74dac77a8401fb87726a0cb8ac56ea638385589dd59d3af65a243f285cb8e2308c3a3b453bb2412ae41a3bdd988ebe434e0bcae2267230 SHA512 be4f5c76c9ea80c4c145e17582979c6e22edfc43f0cdab6cd6e4e070cfc4b79eee6f29ef8dec1faf7b30fb84f251e920bfed272c174eb529c25ae5f7e2cf5992
+EBUILD selinux-links-2.20200818-r1.ebuild 279 BLAKE2B d6f60a7674f1416d10e701223cea16c74c3eaf8d08a37ff9e1ef4d691be6dd8afa189ffa0df7607081992f6723fb197fb71e6902237a5f54f80fcc422844cebf SHA512 fdfc05698e31939458200a7913a15c3589df6943b17391d08037f7b4e30d3def0cede3968d0c95947c4da89a460162a871ba249ba8aa914f8506b9d894eb1bf5
 EBUILD selinux-links-9999.ebuild 282 BLAKE2B b186fbe9a6393f7f132b5d5318be26d81e8a8b666cecef8bb58bb6f76ccd1dba0f6c2b4817c52907fe593c2f9b3e83de49716f1c28a236b2e0056c6b33ecaf43 SHA512 4d694d9987975eaa2d0d25251318f641e772e259d73835a7e54c2d5928104850c0e33033da3d786472ff01cff0d527ba935f6e21afc0f0a0fb8f160153eac257
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-links/selinux-links-2.20190609-r1.ebuild b/sec-policy/selinux-links/selinux-links-2.20190609-r1.ebuild
index 809a9b1adb4d..0e7a13b9a2e2 100644
--- a/sec-policy/selinux-links/selinux-links-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-links/selinux-links-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-links/selinux-links-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..809a9b1adb4d
--- /dev/null
+++ b/sec-policy/selinux-links/selinux-links-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 14eaf0268132..26769a8c0035 100644
--- a/sec-policy/selinux-lircd/Manifest
+++ b/sec-policy/selinux-lircd/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-lircd-2.20190201-r1.ebuild 277 BLAKE2B 852848ab60d1bad38c4fb2e0747e2e964fcf7a96dfcbf648b7c509f817bf5cdfa6794297abbc2896a104eb7034314c302520e081428bf97b7b8a9e447a0311a8 SHA512 126f27e675494be8dd61f06ecf7e0e4ddb95aee4b0878030d6858ea69e59e247abafda271d1a1cfeaf400025ba24596131d4dfd7e916c160e3c76465289c0756
-EBUILD selinux-lircd-2.20190609-r1.ebuild 279 BLAKE2B a8cc6f8e0a86e33d407e7aed8e407d85be8bcf41a0a3b4d78f48bbc9aef6fc0865afa8fdf97bdc577844bdc4f26d1f0a4ba5064950abd095e5d3b5a87396f5e9 SHA512 1f0279b656ee66ee79eab21c6145e21d8a19a3d449f1a5c3e268f61630c3fefa198c3afd926ed45aaf86dd44fc8e7a3dc61d8b9a026f7b8676a8c811c61370ff
+EBUILD selinux-lircd-2.20190609-r1.ebuild 277 BLAKE2B 852848ab60d1bad38c4fb2e0747e2e964fcf7a96dfcbf648b7c509f817bf5cdfa6794297abbc2896a104eb7034314c302520e081428bf97b7b8a9e447a0311a8 SHA512 126f27e675494be8dd61f06ecf7e0e4ddb95aee4b0878030d6858ea69e59e247abafda271d1a1cfeaf400025ba24596131d4dfd7e916c160e3c76465289c0756
+EBUILD selinux-lircd-2.20200818-r1.ebuild 279 BLAKE2B a8cc6f8e0a86e33d407e7aed8e407d85be8bcf41a0a3b4d78f48bbc9aef6fc0865afa8fdf97bdc577844bdc4f26d1f0a4ba5064950abd095e5d3b5a87396f5e9 SHA512 1f0279b656ee66ee79eab21c6145e21d8a19a3d449f1a5c3e268f61630c3fefa198c3afd926ed45aaf86dd44fc8e7a3dc61d8b9a026f7b8676a8c811c61370ff
 EBUILD selinux-lircd-9999.ebuild 282 BLAKE2B 5799854e7055f7c7b2a99a48da449846a9f4dcc41feff7680ca73ef94506ba2049faaf7607117acb5cce27304dad3013b121c0589d621f8fe8ffea6c09475503 SHA512 20a0b3a22c3e3e7f80c28cde0d65690122281058f6abe4d87b35b03aa9da8ed5ee63c6b728f93f17549214867a29d0f86b877c4029d7c935c6cde1d280e10c84
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-lircd/selinux-lircd-2.20190609-r1.ebuild b/sec-policy/selinux-lircd/selinux-lircd-2.20190609-r1.ebuild
index 7f812628b7ce..18448d3ac07f 100644
--- a/sec-policy/selinux-lircd/selinux-lircd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-lircd/selinux-lircd-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-lircd/selinux-lircd-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..7f812628b7ce
--- /dev/null
+++ b/sec-policy/selinux-lircd/selinux-lircd-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 7aa8cec95d62..e79cf4e8eb65 100644
--- a/sec-policy/selinux-loadkeys/Manifest
+++ b/sec-policy/selinux-loadkeys/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-loadkeys-2.20190201-r1.ebuild 283 BLAKE2B 829a2f0ab38b02e4935f132a26fdf56a630b40b2c18563e129638fa755c35733b21d44826295f853645622004d6c33d93c6b9563b30a77d958ad8f733b2fe85e SHA512 4fd82ffad4f23c2abe5e710c4c555971a0e61e6a5cf8a6f2127c75f7741bcda31736ae328a94b412339ffa57974acc1a53a647c1622d8dfbb7c57c62e8ebcd74
-EBUILD selinux-loadkeys-2.20190609-r1.ebuild 285 BLAKE2B 1c227d184468750d717e51ef0402064c6bc4acd71fb0317cbdfb3ded745c8868f6f531df8ed3921a9d0e58c142e07230d222a43042757a928a177e553a4f0f0d SHA512 15c6933a4f26cf12651fe2e499d2d30a9e3c957a1183f6bdfdd99cba89a332c7b86f0187fa563050c8794b2eae0cc7d3bbb552cc9c790079cd6e5827156d3737
+EBUILD selinux-loadkeys-2.20190609-r1.ebuild 283 BLAKE2B 829a2f0ab38b02e4935f132a26fdf56a630b40b2c18563e129638fa755c35733b21d44826295f853645622004d6c33d93c6b9563b30a77d958ad8f733b2fe85e SHA512 4fd82ffad4f23c2abe5e710c4c555971a0e61e6a5cf8a6f2127c75f7741bcda31736ae328a94b412339ffa57974acc1a53a647c1622d8dfbb7c57c62e8ebcd74
+EBUILD selinux-loadkeys-2.20200818-r1.ebuild 285 BLAKE2B 1c227d184468750d717e51ef0402064c6bc4acd71fb0317cbdfb3ded745c8868f6f531df8ed3921a9d0e58c142e07230d222a43042757a928a177e553a4f0f0d SHA512 15c6933a4f26cf12651fe2e499d2d30a9e3c957a1183f6bdfdd99cba89a332c7b86f0187fa563050c8794b2eae0cc7d3bbb552cc9c790079cd6e5827156d3737
 EBUILD selinux-loadkeys-9999.ebuild 288 BLAKE2B 7eeab48b2f1c030540e20a6ca88584bd5382bb7b80a2dac76c8ca9d9a66feb645a544eb565b73a5be4fb9d9a02ef43d52ff03aaad257826650b2761d01d8d857 SHA512 be8ae78be2d5a542ae4d94c49c4697eda87bfafa1c242845a5835b6dd17a184dd482d3ba80314ba7776db5193696ee316927340f370cc11da99d5968f7d7209d
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20190609-r1.ebuild b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20190609-r1.ebuild
index 9a77439097ba..4560a75336fa 100644
--- a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..9a77439097ba
--- /dev/null
+++ b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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-lockdev/Manifest b/sec-policy/selinux-lockdev/Manifest
index e8e6cbd5b0e0..ed965a2aef57 100644
--- a/sec-policy/selinux-lockdev/Manifest
+++ b/sec-policy/selinux-lockdev/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-lockdev-2.20190201-r1.ebuild 281 BLAKE2B e6ffa3646e8b12c1dd1a33f55aed56a4123a26ca7b2124a3fbeedfd4f45a19324144a56c37432a2242a0ee7ede0dca64b8e9e04b72369a502363ed8ed0734130 SHA512 0f61b429f8ecef7386ccda63b30bad29f20d3db2fa8f2a89dce59f12896975a19a8a3dad71270d0806f5d41293328dfd1a7f7aa257467822df225e25adc02d17
-EBUILD selinux-lockdev-2.20190609-r1.ebuild 283 BLAKE2B 88ec909be199c57e8afe03beca6432dbaafa7c5881cbcab65f02099627b800c9bebaffcc1617ae36f3c434fc61cd7e7ebcd35604bb7ebeb97c73bbf55b75e123 SHA512 1bdf90460f8fc673ef8ffc5f7e96881e74aad129a3a2e269ba0d05bc98edfc6e39970f15568f8bf0537c20014f84f85c936891a7962f6377c8c4e3cd38821e50
+EBUILD selinux-lockdev-2.20190609-r1.ebuild 281 BLAKE2B e6ffa3646e8b12c1dd1a33f55aed56a4123a26ca7b2124a3fbeedfd4f45a19324144a56c37432a2242a0ee7ede0dca64b8e9e04b72369a502363ed8ed0734130 SHA512 0f61b429f8ecef7386ccda63b30bad29f20d3db2fa8f2a89dce59f12896975a19a8a3dad71270d0806f5d41293328dfd1a7f7aa257467822df225e25adc02d17
+EBUILD selinux-lockdev-2.20200818-r1.ebuild 283 BLAKE2B 88ec909be199c57e8afe03beca6432dbaafa7c5881cbcab65f02099627b800c9bebaffcc1617ae36f3c434fc61cd7e7ebcd35604bb7ebeb97c73bbf55b75e123 SHA512 1bdf90460f8fc673ef8ffc5f7e96881e74aad129a3a2e269ba0d05bc98edfc6e39970f15568f8bf0537c20014f84f85c936891a7962f6377c8c4e3cd38821e50
 EBUILD selinux-lockdev-9999.ebuild 286 BLAKE2B 45a899b2bba2a143403f2164b22fc2124ed64d9b5825bd98b4097ad1de252ac9febb7fed2841c74f5ec9c9b876f81b45be3238f41241584917728b47e6b9be91 SHA512 4cea30fcb506f50c644d4e6c646da7878750588367b4d1c8c942d60c9598b3669b255ea7497aa6778e018f035aaabd1a4c81d831d083b0c461ba4f93e86f4174
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-lockdev/selinux-lockdev-2.20190609-r1.ebuild b/sec-policy/selinux-lockdev/selinux-lockdev-2.20190609-r1.ebuild
index 147d05a97961..77de449548ba 100644
--- a/sec-policy/selinux-lockdev/selinux-lockdev-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-lockdev/selinux-lockdev-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for lockdev"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-lockdev/selinux-lockdev-2.20200818-r1.ebuild b/sec-policy/selinux-lockdev/selinux-lockdev-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..147d05a97961
--- /dev/null
+++ b/sec-policy/selinux-lockdev/selinux-lockdev-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="lockdev"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for lockdev"
+
+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 8e6eb1d86a6e..67995a9e60d9 100644
--- a/sec-policy/selinux-logrotate/Manifest
+++ b/sec-policy/selinux-logrotate/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-logrotate-2.20190201-r1.ebuild 285 BLAKE2B b82329427c598c7f05cfa390ff81cb150ab9c2f73ec550cb0d60f7a44a20cb6a573afeda058784a6147ee4435e6cfe502f0a64aea8094962945e3652a128c05e SHA512 c1102a97f3c1aecd94924c8559200f8bc419da5381f914c284616051c1a732c6320d5faa141e7c7a5d5772a3fc4d41dbfa385b82f7072955c27f1314dc98dcda
-EBUILD selinux-logrotate-2.20190609-r1.ebuild 287 BLAKE2B 2153e6bf5f5177a6990fa34849a5a739104e8ee7ab0b10f80b9afdc67b2a56a0b7685eb883ac0a2a2103b13c3204283861f076332b5fc6896f8cd84981ad9cb4 SHA512 a525fa1e017d52f8ac1e3cff848ce21e4fadc4d0e8629a650b699bb33c8a4221c39ff34ba21aed63a3d5ed7ff872cc3b0a229d461c831b396585416340725f1b
+EBUILD selinux-logrotate-2.20190609-r1.ebuild 285 BLAKE2B b82329427c598c7f05cfa390ff81cb150ab9c2f73ec550cb0d60f7a44a20cb6a573afeda058784a6147ee4435e6cfe502f0a64aea8094962945e3652a128c05e SHA512 c1102a97f3c1aecd94924c8559200f8bc419da5381f914c284616051c1a732c6320d5faa141e7c7a5d5772a3fc4d41dbfa385b82f7072955c27f1314dc98dcda
+EBUILD selinux-logrotate-2.20200818-r1.ebuild 287 BLAKE2B 2153e6bf5f5177a6990fa34849a5a739104e8ee7ab0b10f80b9afdc67b2a56a0b7685eb883ac0a2a2103b13c3204283861f076332b5fc6896f8cd84981ad9cb4 SHA512 a525fa1e017d52f8ac1e3cff848ce21e4fadc4d0e8629a650b699bb33c8a4221c39ff34ba21aed63a3d5ed7ff872cc3b0a229d461c831b396585416340725f1b
 EBUILD selinux-logrotate-9999.ebuild 290 BLAKE2B abdb8e1883eb7715bfe0dff8df18fb8cf8baa98562bea08192344ff9387e551d69cff904683146afcb98a5afda075262cf50933235cb5a69cb891c83d0bf18df SHA512 2e8ce5f999210e39bcd93e38ad8c15f41979119eb6ed0d3055e5c43d153298d67c39bb655400faaa2ae08cef5dcca3e3bc092fdee57889075c8e19c9b9f0110a
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-logrotate/selinux-logrotate-2.20190609-r1.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-2.20190609-r1.ebuild
index 43ce10056850..49f652b1d083 100644
--- a/sec-policy/selinux-logrotate/selinux-logrotate-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-logrotate/selinux-logrotate-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..43ce10056850
--- /dev/null
+++ b/sec-policy/selinux-logrotate/selinux-logrotate-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 e9cc795a33d9..617ff5c8a796 100644
--- a/sec-policy/selinux-logsentry/Manifest
+++ b/sec-policy/selinux-logsentry/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-logsentry-2.20190201-r1.ebuild 285 BLAKE2B a3b25819b0ba13aab559e2fac7d772e2fd465a70fe8e00ed5e361c3c27c3d745648952e86b3b88131f3872cf61eef604185950b8b3c320c997cce3be1a25f689 SHA512 c304f3bf589a54151c71a5849acfbbb024920f4aba1613c3088fc8e6a556f885ca405de2e2ae4a69c6fdf717bcfacd5a298ea851d8a44157d56ac855c2935df8
-EBUILD selinux-logsentry-2.20190609-r1.ebuild 287 BLAKE2B c178002c65c79a63f413c7653159a688d6efce08eae2b5abc427e028b10af80c6393bce2a965b57effc3e87a8d93c742af2d19f4b50161acf14b2340685d3b96 SHA512 fbb8e79a4e5cb12e3951270d6592f862c24db02d5fa95dca754c86a8affcf5f966a4a71f9a67bdc9225da2cac164ec3c02d1ab1a39398bc20c429f6d1668b940
+EBUILD selinux-logsentry-2.20190609-r1.ebuild 285 BLAKE2B a3b25819b0ba13aab559e2fac7d772e2fd465a70fe8e00ed5e361c3c27c3d745648952e86b3b88131f3872cf61eef604185950b8b3c320c997cce3be1a25f689 SHA512 c304f3bf589a54151c71a5849acfbbb024920f4aba1613c3088fc8e6a556f885ca405de2e2ae4a69c6fdf717bcfacd5a298ea851d8a44157d56ac855c2935df8
+EBUILD selinux-logsentry-2.20200818-r1.ebuild 287 BLAKE2B c178002c65c79a63f413c7653159a688d6efce08eae2b5abc427e028b10af80c6393bce2a965b57effc3e87a8d93c742af2d19f4b50161acf14b2340685d3b96 SHA512 fbb8e79a4e5cb12e3951270d6592f862c24db02d5fa95dca754c86a8affcf5f966a4a71f9a67bdc9225da2cac164ec3c02d1ab1a39398bc20c429f6d1668b940
 EBUILD selinux-logsentry-9999.ebuild 290 BLAKE2B 5e090f1ba430227e48658f6c4b0d4122fefe07202cf45acf8f3fb354318dbf7c542a38e1aaf7e87f70e09d5e8691cb1c9759e0a252650a6ac7c8ac32c63d5a84 SHA512 4934c2735777dddc82c9c16d8f1251d908249868179a39bb32dfe9273e3861b9e74036204a3c0c6b97ab1ed4fd552b9baaa8974e979030372792b169484cb44d
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-logsentry/selinux-logsentry-2.20190609-r1.ebuild b/sec-policy/selinux-logsentry/selinux-logsentry-2.20190609-r1.ebuild
index d1594d9d426d..7f91dd895116 100644
--- a/sec-policy/selinux-logsentry/selinux-logsentry-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-logsentry/selinux-logsentry-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-logsentry/selinux-logsentry-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..d1594d9d426d
--- /dev/null
+++ b/sec-policy/selinux-logsentry/selinux-logsentry-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 6f5af3e2e0a4..1a1dde9bc278 100644
--- a/sec-policy/selinux-logwatch/Manifest
+++ b/sec-policy/selinux-logwatch/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-logwatch-2.20190201-r1.ebuild 283 BLAKE2B 0621c670e01655b2b1b6c34576e87947fbed3fc98702302875f33d6343a645c9618920f36fb9749c6720722eb531bd71e7a4c53b760f4763aff39416f4ab1fbf SHA512 d4c5a2755b2f28893818da317eeae60dea900819e08f8379f09131a57717de58eb8250cb198693fd4564b300ba16fc44b8156f0e36d5a76e48419fdc03de5bbb
-EBUILD selinux-logwatch-2.20190609-r1.ebuild 285 BLAKE2B 4ba2af5acd5abf9627b4e7317d2e7d39dd755d037a88503eb56e2f935ecac72199924e292f39ccfbad7d15307e193e8240356c855067c01c30596ab11db2a7df SHA512 ac03b980263951465ac3417ea7a8c0158bf3d02992b9e8f47720e48237f522937d6f80d036d1bcde21437720b6ccee5f64fa71d32e06904bfc1986f43f960e50
+EBUILD selinux-logwatch-2.20190609-r1.ebuild 283 BLAKE2B 0621c670e01655b2b1b6c34576e87947fbed3fc98702302875f33d6343a645c9618920f36fb9749c6720722eb531bd71e7a4c53b760f4763aff39416f4ab1fbf SHA512 d4c5a2755b2f28893818da317eeae60dea900819e08f8379f09131a57717de58eb8250cb198693fd4564b300ba16fc44b8156f0e36d5a76e48419fdc03de5bbb
+EBUILD selinux-logwatch-2.20200818-r1.ebuild 285 BLAKE2B 4ba2af5acd5abf9627b4e7317d2e7d39dd755d037a88503eb56e2f935ecac72199924e292f39ccfbad7d15307e193e8240356c855067c01c30596ab11db2a7df SHA512 ac03b980263951465ac3417ea7a8c0158bf3d02992b9e8f47720e48237f522937d6f80d036d1bcde21437720b6ccee5f64fa71d32e06904bfc1986f43f960e50
 EBUILD selinux-logwatch-9999.ebuild 288 BLAKE2B 248713398dc92913c32cf45e80526bfed603494a233bb4c2561ea776ef84b43215a8a1fdc6305a888a922a87c3d8c42140c6cda0b1a121b2c70f4928db9dc379 SHA512 e1abc47a1dfe5b6342894f8c5a45cb718c687aa57414086069561ce86695061c72a8ee2f717ddbd895311f0a41398971be4fca5fef269774c27385374cabed3a
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-logwatch/selinux-logwatch-2.20190609-r1.ebuild b/sec-policy/selinux-logwatch/selinux-logwatch-2.20190609-r1.ebuild
index f9b53c2ebbab..3a234e51c806 100644
--- a/sec-policy/selinux-logwatch/selinux-logwatch-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-logwatch/selinux-logwatch-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-logwatch/selinux-logwatch-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..f9b53c2ebbab
--- /dev/null
+++ b/sec-policy/selinux-logwatch/selinux-logwatch-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 6fa91e9e75d1..98fce65f44e5 100644
--- a/sec-policy/selinux-lpd/Manifest
+++ b/sec-policy/selinux-lpd/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-lpd-2.20190201-r1.ebuild 273 BLAKE2B 930fa66f06056ec2325cb0992e25192f313b946ac3a353653ca515f9e4fcb0edef9723ff88ab0d69c8e1c6ae70a9fb98aa5f4f4e5700c98856d5fc5d864a303b SHA512 31ee06927ec7629dfcdcf05eb1930eba2eeaaf9df0b5d41a267f5c54885d825cdf9dc5d5cf67c08a43514e171e71bb2af5017dee41900d87a48db428094455f3
-EBUILD selinux-lpd-2.20190609-r1.ebuild 275 BLAKE2B 0bc29c0a49e9ea3ac21dfb00c601fc25cb45a159f7f803140f5ebe89371d357637995fe6bb769bea3b7dd1f438bc73b3abf9e5bd72a482987acbe78afaa520a5 SHA512 23b8e103e7ee24383574dc25630b465df1d185f79e65803d104769825b4c7f4a6a18dcd16f766da9ce57bc6bec41071cea95ddd1da8d1969edab8a3a6532a68d
+EBUILD selinux-lpd-2.20190609-r1.ebuild 273 BLAKE2B 930fa66f06056ec2325cb0992e25192f313b946ac3a353653ca515f9e4fcb0edef9723ff88ab0d69c8e1c6ae70a9fb98aa5f4f4e5700c98856d5fc5d864a303b SHA512 31ee06927ec7629dfcdcf05eb1930eba2eeaaf9df0b5d41a267f5c54885d825cdf9dc5d5cf67c08a43514e171e71bb2af5017dee41900d87a48db428094455f3
+EBUILD selinux-lpd-2.20200818-r1.ebuild 275 BLAKE2B 0bc29c0a49e9ea3ac21dfb00c601fc25cb45a159f7f803140f5ebe89371d357637995fe6bb769bea3b7dd1f438bc73b3abf9e5bd72a482987acbe78afaa520a5 SHA512 23b8e103e7ee24383574dc25630b465df1d185f79e65803d104769825b4c7f4a6a18dcd16f766da9ce57bc6bec41071cea95ddd1da8d1969edab8a3a6532a68d
 EBUILD selinux-lpd-9999.ebuild 278 BLAKE2B d1773e89aa8b7dd1995a41c57f7680ff8245d6c24b1924743845bfd0963d6c2fed49382375154270dc11af9420d26ff06a1b007f1e3ffef0b537ec11d5f33841 SHA512 23e918b22f639343ad5a913ec54c89628bc8de5cdb2f0ab861315df7b3c0944289e185c5f308a207f9c21d62689a02a230f3a194d28eaa07d6d9c9eb71145ad2
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-lpd/selinux-lpd-2.20190609-r1.ebuild b/sec-policy/selinux-lpd/selinux-lpd-2.20190609-r1.ebuild
index a851a7217945..b2c7d271bd5e 100644
--- a/sec-policy/selinux-lpd/selinux-lpd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-lpd/selinux-lpd-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-lpd/selinux-lpd-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..a851a7217945
--- /dev/null
+++ b/sec-policy/selinux-lpd/selinux-lpd-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 b98cb817e936..f01367fefa23 100644
--- a/sec-policy/selinux-mailman/Manifest
+++ b/sec-policy/selinux-mailman/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-mailman-2.20190201-r1.ebuild 281 BLAKE2B a630cd3e7376b1575273b5c7521a8d2da168ea77d7b808b3055b4f395565ea1a5c3b084fa1e32b1e38d65ca51b99c24ee95199720fd2197f81af1fbe08e68081 SHA512 9a6108e7a2b40e5cd5d2d76361917bab9de1a0d7d44e86474f6c5336c97e91deae47373ce9c80c40d3626bca7e1b6c283fdf44bb720e284084de9e8c72654cdb
-EBUILD selinux-mailman-2.20190609-r1.ebuild 283 BLAKE2B 1e3f4c956b6c9ca71eb40deb3962846b97c74350846065c1ffc0b5652eccbe75e59b74fb158666309bfa5790d0e1859d52e0f176da782778e396437be3e88422 SHA512 dd913bfe0c3c6a21a69a4cd68f0ea95ac3bb0629134c040b1d05b009fede10de793adeb1b8b85b1e20eef31ae90e0111ad127f592c1dec2bfcdf82ebf727f4fb
+EBUILD selinux-mailman-2.20190609-r1.ebuild 281 BLAKE2B a630cd3e7376b1575273b5c7521a8d2da168ea77d7b808b3055b4f395565ea1a5c3b084fa1e32b1e38d65ca51b99c24ee95199720fd2197f81af1fbe08e68081 SHA512 9a6108e7a2b40e5cd5d2d76361917bab9de1a0d7d44e86474f6c5336c97e91deae47373ce9c80c40d3626bca7e1b6c283fdf44bb720e284084de9e8c72654cdb
+EBUILD selinux-mailman-2.20200818-r1.ebuild 283 BLAKE2B 1e3f4c956b6c9ca71eb40deb3962846b97c74350846065c1ffc0b5652eccbe75e59b74fb158666309bfa5790d0e1859d52e0f176da782778e396437be3e88422 SHA512 dd913bfe0c3c6a21a69a4cd68f0ea95ac3bb0629134c040b1d05b009fede10de793adeb1b8b85b1e20eef31ae90e0111ad127f592c1dec2bfcdf82ebf727f4fb
 EBUILD selinux-mailman-9999.ebuild 286 BLAKE2B 3dea8a5c49f95fdb62226f5553654210440c7ecd1bb1fa24f0aa3bf1ee3fe05a18675a7c158fc5066db3266ca9b6f70944878a2eaabb44b76b832453559ca194 SHA512 101cb0988f956388cc5d10c183ebf8974eb7c99258f4aa9dae062f55c4c672ff753e7c8f447f37974b556d83dc67bbf719e6ec20978f0c1d0ccbd512fca66cc1
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-mailman/selinux-mailman-2.20190609-r1.ebuild b/sec-policy/selinux-mailman/selinux-mailman-2.20190609-r1.ebuild
index 4f0188cc4741..b42f37fc64b6 100644
--- a/sec-policy/selinux-mailman/selinux-mailman-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-mailman/selinux-mailman-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-mailman/selinux-mailman-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..4f0188cc4741
--- /dev/null
+++ b/sec-policy/selinux-mailman/selinux-mailman-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 63f8812dea25..78c81d7efb03 100644
--- a/sec-policy/selinux-makewhatis/Manifest
+++ b/sec-policy/selinux-makewhatis/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-makewhatis-2.20190201-r1.ebuild 287 BLAKE2B c2054e70d80b0574f66bbc0576408743ea3224ccb4f2bb0861369e63ef1ca7feabc72b9b4a29ecf691ea97ceaccf7b1043b915ac8394c7dc69791cc2fbeb129d SHA512 bdaa22cc8759a37abf24ca2d1f0db7b0187798594bb5e48faa22eddce62d9539f5341668f98bc56b05f88bca675c89f8daa81daada29e4cc1973d1642e452880
-EBUILD selinux-makewhatis-2.20190609-r1.ebuild 289 BLAKE2B 74e61ddafccac6bb68b93406211beb28096a44e671d1440c5bac45f095911d40c053ff269c5063a573bfb47f79d354c57651a0e3ee295447a7dd6b55783c2052 SHA512 7ca049c6c311f148f9084f3e440594df128b7f108078c8158df641893ce44c16a8e146ba102df3bfbe3e3d9be9b7f7fe3f20999460e661d9458eee10a0515341
+EBUILD selinux-makewhatis-2.20190609-r1.ebuild 287 BLAKE2B c2054e70d80b0574f66bbc0576408743ea3224ccb4f2bb0861369e63ef1ca7feabc72b9b4a29ecf691ea97ceaccf7b1043b915ac8394c7dc69791cc2fbeb129d SHA512 bdaa22cc8759a37abf24ca2d1f0db7b0187798594bb5e48faa22eddce62d9539f5341668f98bc56b05f88bca675c89f8daa81daada29e4cc1973d1642e452880
+EBUILD selinux-makewhatis-2.20200818-r1.ebuild 289 BLAKE2B 74e61ddafccac6bb68b93406211beb28096a44e671d1440c5bac45f095911d40c053ff269c5063a573bfb47f79d354c57651a0e3ee295447a7dd6b55783c2052 SHA512 7ca049c6c311f148f9084f3e440594df128b7f108078c8158df641893ce44c16a8e146ba102df3bfbe3e3d9be9b7f7fe3f20999460e661d9458eee10a0515341
 EBUILD selinux-makewhatis-9999.ebuild 292 BLAKE2B 1bb78baba1dd4fc078c4aed66ea51e0a85f0f23b4028daa4a875d38c89b32a9f587c758b2be1cb66e629a200ef6d469715e951347fe158adfa223705d175293e SHA512 023819defd024667a1dfa39a4c94bb09b2853107bdea8ceeacd772dfa200552190617e38bda37d7efb7ede2e6f08e468db06fb123e576c40457ae45c2bf88a8c
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20190609-r1.ebuild b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20190609-r1.ebuild
index 60ade6355dce..268267e945b3 100644
--- a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..60ade6355dce
--- /dev/null
+++ b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 07bae972f728..7548d71e911a 100644
--- a/sec-policy/selinux-mandb/Manifest
+++ b/sec-policy/selinux-mandb/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-mandb-2.20190201-r1.ebuild 277 BLAKE2B 9ac772a2d3edba6f2b1deb8809248eb2762d22618e2133be391c2cea9cfdf4d094258fc850e52072cd8855a2cddbc97e70e6e644b98c6af376b6f25de4c96955 SHA512 ed29fe1a629e939492067da4fc95b891d363fde299e63084f7bf8af343c925c3a37ba694184b486fec7d1da9c9d4cd9381b5a752c87eb859625598f54992f869
-EBUILD selinux-mandb-2.20190609-r1.ebuild 279 BLAKE2B 7968cd95f9ff8a85b15fd57ea3682d29a469c2c129d13755fad493e504a22d9c67464f57c90e84ec780f603cabd2024c75307adb2b96d4da9bbb9b8b95542066 SHA512 1e4751b4d08eb582dfc3e153960336386b3c70cda4c236dec03ffba3efbc506e45842849479e793ba7ce84824cf7c04daeb520df25c867b10940fa88210cda91
+EBUILD selinux-mandb-2.20190609-r1.ebuild 277 BLAKE2B 9ac772a2d3edba6f2b1deb8809248eb2762d22618e2133be391c2cea9cfdf4d094258fc850e52072cd8855a2cddbc97e70e6e644b98c6af376b6f25de4c96955 SHA512 ed29fe1a629e939492067da4fc95b891d363fde299e63084f7bf8af343c925c3a37ba694184b486fec7d1da9c9d4cd9381b5a752c87eb859625598f54992f869
+EBUILD selinux-mandb-2.20200818-r1.ebuild 279 BLAKE2B 7968cd95f9ff8a85b15fd57ea3682d29a469c2c129d13755fad493e504a22d9c67464f57c90e84ec780f603cabd2024c75307adb2b96d4da9bbb9b8b95542066 SHA512 1e4751b4d08eb582dfc3e153960336386b3c70cda4c236dec03ffba3efbc506e45842849479e793ba7ce84824cf7c04daeb520df25c867b10940fa88210cda91
 EBUILD selinux-mandb-9999.ebuild 282 BLAKE2B c7f353877a9b753c7db28d03f555f58035bff852e94dbf0a1a92d8a4dc602c19d615f1669ec66a608f23b6cb3244bafa5785b8687bc99d2804b697cc465cc88d SHA512 f222bf287d5bd0673646c22f3a5452273eebe0419cf489e55123c6908091b293f2c1633bedb258c58f0ae1fbc6c82e3d337efa0d7c8e7fd7cf26913e2d48af41
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-mandb/selinux-mandb-2.20190609-r1.ebuild b/sec-policy/selinux-mandb/selinux-mandb-2.20190609-r1.ebuild
index 24cbc9ad3470..e643eb2f28df 100644
--- a/sec-policy/selinux-mandb/selinux-mandb-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-mandb/selinux-mandb-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-mandb/selinux-mandb-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..24cbc9ad3470
--- /dev/null
+++ b/sec-policy/selinux-mandb/selinux-mandb-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 be91c54ce756..52534f1141d1 100644
--- a/sec-policy/selinux-mcelog/Manifest
+++ b/sec-policy/selinux-mcelog/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-mcelog-2.20190201-r1.ebuild 279 BLAKE2B f1c280daab33ad1c8292d465eef836b78429813ee18502630f878d330e7bc7d000a36397b4269f51eca4bfd7934674c916c6a05af50a2a3ffed81472f08a728d SHA512 e12e2570dfd3d400b57116ef349d3905588f111ec694fa1b53f1b2123da7b31e44bd321d42ed14d9238aa08dd9c5a94c62757b85296982b9bf5611f9e8d9b840
-EBUILD selinux-mcelog-2.20190609-r1.ebuild 281 BLAKE2B fd7942a06738211e7ba92f809cc119a982e3e61574be0383faa55bd77dfc1f14be55429ac79f0d6217c5f92cfcee7f4ef5236de67eed37d6a90338b5a9ea56e7 SHA512 61b9aaca7f19b5dc25fae2790fc48b70b7eb7bfc1abd2fd76291451204d188813ff6afb3817a48454e9add28d08f464c4a05b73da600850188c39e1b6630b511
+EBUILD selinux-mcelog-2.20190609-r1.ebuild 279 BLAKE2B f1c280daab33ad1c8292d465eef836b78429813ee18502630f878d330e7bc7d000a36397b4269f51eca4bfd7934674c916c6a05af50a2a3ffed81472f08a728d SHA512 e12e2570dfd3d400b57116ef349d3905588f111ec694fa1b53f1b2123da7b31e44bd321d42ed14d9238aa08dd9c5a94c62757b85296982b9bf5611f9e8d9b840
+EBUILD selinux-mcelog-2.20200818-r1.ebuild 281 BLAKE2B fd7942a06738211e7ba92f809cc119a982e3e61574be0383faa55bd77dfc1f14be55429ac79f0d6217c5f92cfcee7f4ef5236de67eed37d6a90338b5a9ea56e7 SHA512 61b9aaca7f19b5dc25fae2790fc48b70b7eb7bfc1abd2fd76291451204d188813ff6afb3817a48454e9add28d08f464c4a05b73da600850188c39e1b6630b511
 EBUILD selinux-mcelog-9999.ebuild 284 BLAKE2B 668c86d7f1cbfdd3ed92ba81da5a1fcfdd5c232aed055a1af451f54c6f0183958cc816570e3ddc1298c0b505cb7d5bd26098fd91dd37b26c49affb665e805891 SHA512 a73f4f43fe17ba9590925c24dbba1ec20e44ea27a4fbe443ea943265a9e0f88cd7540ec9b9e6a45e93525599c84bb86ac6f4f64c175ffa977c740f95b135875e
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-mcelog/selinux-mcelog-2.20190609-r1.ebuild b/sec-policy/selinux-mcelog/selinux-mcelog-2.20190609-r1.ebuild
index 6e326645dc79..ae3029b3bb01 100644
--- a/sec-policy/selinux-mcelog/selinux-mcelog-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-mcelog/selinux-mcelog-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-mcelog/selinux-mcelog-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..6e326645dc79
--- /dev/null
+++ b/sec-policy/selinux-mcelog/selinux-mcelog-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 9fad72a29111..70ed9cd18cb0 100644
--- a/sec-policy/selinux-memcached/Manifest
+++ b/sec-policy/selinux-memcached/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-memcached-2.20190201-r1.ebuild 285 BLAKE2B 185d4e6bf092abbc62ed965536bbda42b64660861e372f5774992c811d101bf6e14119e88ad32699743545a564f3de0492ea989e9366be3912c5fa480dbc0c83 SHA512 3b29fe6cd048cd8a27c78205324cd212c616f862508514ec22a8a3065a161a3fd179efcd5f7d707b52049d73d3c0208a7f59d7a402f666da32af723564c23a58
-EBUILD selinux-memcached-2.20190609-r1.ebuild 287 BLAKE2B aaa0805fb0f3dcbb43adbc279c17f2f73ff0f4b74bea8b50d1d13d74387374b558b30f9fdf27d9e0449baa4e4ceb3ad8e0776d015b9e04665c75031d3ef21708 SHA512 2355845c2ae7fd5a9a0e80739191b64d33fdeb05414a2033ff767d0be708b2d8c4e627bc67d051d6c9b12cee4699854aa62282b2f610e28cca14873a2e0cf103
+EBUILD selinux-memcached-2.20190609-r1.ebuild 285 BLAKE2B 185d4e6bf092abbc62ed965536bbda42b64660861e372f5774992c811d101bf6e14119e88ad32699743545a564f3de0492ea989e9366be3912c5fa480dbc0c83 SHA512 3b29fe6cd048cd8a27c78205324cd212c616f862508514ec22a8a3065a161a3fd179efcd5f7d707b52049d73d3c0208a7f59d7a402f666da32af723564c23a58
+EBUILD selinux-memcached-2.20200818-r1.ebuild 287 BLAKE2B aaa0805fb0f3dcbb43adbc279c17f2f73ff0f4b74bea8b50d1d13d74387374b558b30f9fdf27d9e0449baa4e4ceb3ad8e0776d015b9e04665c75031d3ef21708 SHA512 2355845c2ae7fd5a9a0e80739191b64d33fdeb05414a2033ff767d0be708b2d8c4e627bc67d051d6c9b12cee4699854aa62282b2f610e28cca14873a2e0cf103
 EBUILD selinux-memcached-9999.ebuild 290 BLAKE2B aff4daa07ce4e211b54249025f1fcdf858be87112fea8dde3960084600f1246c523f17545f184a7e4a5c978d359cce13fabe0576f8a941863bfacd03fe010ce6 SHA512 bc1cad12775a97ac9192fefadff1fee103055200f1c187f590e4ea7f312923212f159e836979e72978bc07e65ffce2b7a6e045da29858677d824676cf111ba17
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-memcached/selinux-memcached-2.20190609-r1.ebuild b/sec-policy/selinux-memcached/selinux-memcached-2.20190609-r1.ebuild
index 80f5971b8908..d24673999f84 100644
--- a/sec-policy/selinux-memcached/selinux-memcached-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-memcached/selinux-memcached-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-memcached/selinux-memcached-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..80f5971b8908
--- /dev/null
+++ b/sec-policy/selinux-memcached/selinux-memcached-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 089fcc57f9ed..eb67f6c4cf12 100644
--- a/sec-policy/selinux-milter/Manifest
+++ b/sec-policy/selinux-milter/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-milter-2.20190201-r1.ebuild 279 BLAKE2B e586c2da97749731eca9568bfb42e93e1869df6fe18eba4a00425717f03b6f02ae663f3dc6ae25f43027d58ced48c4acc1233e1e2e894d5a10e21896519f6778 SHA512 09a609e2227bfe4f7a53b811beb69a4a48c4b23eaf3b7e9092c0f604519603c67163225b5bc51e25b8bcd077b4428fcb751008332bfaf14947253a21b14e92d8
-EBUILD selinux-milter-2.20190609-r1.ebuild 281 BLAKE2B 5e32147c790ccfd44744440d7947102ec5b48de02f395d01adaf33b2cda8f3a941d4fb2cb340c668052cbedd9282bfbd5b3b1536cce70852b1c00d8395d34d75 SHA512 db8f03c41f1e28f1bf5972891322086315a865a905fea8ff850ebe13bc2a2b3bb29fa9da84f53d59abb468ac66eec0f1bb770772eb799be857256aee5f0c43fe
+EBUILD selinux-milter-2.20190609-r1.ebuild 279 BLAKE2B e586c2da97749731eca9568bfb42e93e1869df6fe18eba4a00425717f03b6f02ae663f3dc6ae25f43027d58ced48c4acc1233e1e2e894d5a10e21896519f6778 SHA512 09a609e2227bfe4f7a53b811beb69a4a48c4b23eaf3b7e9092c0f604519603c67163225b5bc51e25b8bcd077b4428fcb751008332bfaf14947253a21b14e92d8
+EBUILD selinux-milter-2.20200818-r1.ebuild 281 BLAKE2B 5e32147c790ccfd44744440d7947102ec5b48de02f395d01adaf33b2cda8f3a941d4fb2cb340c668052cbedd9282bfbd5b3b1536cce70852b1c00d8395d34d75 SHA512 db8f03c41f1e28f1bf5972891322086315a865a905fea8ff850ebe13bc2a2b3bb29fa9da84f53d59abb468ac66eec0f1bb770772eb799be857256aee5f0c43fe
 EBUILD selinux-milter-9999.ebuild 284 BLAKE2B 8cde0d2f190a4aab9134c8269fba989c4ef5a2503f38807a32f11150d244c2d3f90c43a17c65f35f2d1dfb3782f2d81e96f61c4b9afed2331b809ba65ec19eb6 SHA512 e04165cfc8464d5ec1dc4184745e45a638aee740105398735ab7baa5048d22aa046642e78b2e67cac401a46fe576441cd606b7c094b1153fa263cf283202ffe8
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-milter/selinux-milter-2.20190609-r1.ebuild b/sec-policy/selinux-milter/selinux-milter-2.20190609-r1.ebuild
index 2994d36053f5..fd47440b3a18 100644
--- a/sec-policy/selinux-milter/selinux-milter-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-milter/selinux-milter-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-milter/selinux-milter-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..2994d36053f5
--- /dev/null
+++ b/sec-policy/selinux-milter/selinux-milter-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 83d3e2edbc4b..ebd89a732bd2 100644
--- a/sec-policy/selinux-modemmanager/Manifest
+++ b/sec-policy/selinux-modemmanager/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-modemmanager-2.20190201-r1.ebuild 383 BLAKE2B af71b6f2af4017dc42979ca9a57751acebb6e66ce465c995cacd0c188777bd23dff21aa9ab1c034e66d3337572bb42f38fb9daed6e712bda17e13c1c05695671 SHA512 758f6e0ff6c12eecd11adec6c751b4e173f0de60bff9d2469c8fb49c57d89029915024c6840ba9895e8bd670941977b5609d6e90e01018a7a211e9d136dea33c
-EBUILD selinux-modemmanager-2.20190609-r1.ebuild 385 BLAKE2B 44a236f09deea33b8285bd8feac7a12f93d5943436aa7dff90c526f7131ebbb271bfbdca89d6f32230b7d035a03494b81bc2b990344ee01c8a672308125444e4 SHA512 80148cb0e970570fac4cb9c64fa31a941482335a739c0d1b00e91407f4acab97f1f940eab2df32d335c0f3ad349034db8a80c73387ba0b2ce916ac0fd4ce8fe8
+EBUILD selinux-modemmanager-2.20190609-r1.ebuild 383 BLAKE2B af71b6f2af4017dc42979ca9a57751acebb6e66ce465c995cacd0c188777bd23dff21aa9ab1c034e66d3337572bb42f38fb9daed6e712bda17e13c1c05695671 SHA512 758f6e0ff6c12eecd11adec6c751b4e173f0de60bff9d2469c8fb49c57d89029915024c6840ba9895e8bd670941977b5609d6e90e01018a7a211e9d136dea33c
+EBUILD selinux-modemmanager-2.20200818-r1.ebuild 385 BLAKE2B 44a236f09deea33b8285bd8feac7a12f93d5943436aa7dff90c526f7131ebbb271bfbdca89d6f32230b7d035a03494b81bc2b990344ee01c8a672308125444e4 SHA512 80148cb0e970570fac4cb9c64fa31a941482335a739c0d1b00e91407f4acab97f1f940eab2df32d335c0f3ad349034db8a80c73387ba0b2ce916ac0fd4ce8fe8
 EBUILD selinux-modemmanager-9999.ebuild 388 BLAKE2B 78b2dff5a614718f6407b2d1f6091a8c0f36f0c79df96bec233253eaa8607e09d4233bda62074c71b7c7b4bbdabafa461554ef6f83800b2cbb516cbd6dfe2c4c SHA512 945d1c2a6344a194751d51240ca61bd60708703b98f79bedd5174c7148d786266cc9031b03845bd52d923354c79d14bf4aa027c267b0a7fe364a5f8937543831
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20190609-r1.ebuild b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20190609-r1.ebuild
index 050cd0163794..c778c4505d57 100644
--- a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..050cd0163794
--- /dev/null
+++ b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20200818-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 29a807e6ec83..a3ddac697242 100644
--- a/sec-policy/selinux-mono/Manifest
+++ b/sec-policy/selinux-mono/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-mono-2.20190201-r1.ebuild 275 BLAKE2B c0e1c6d3f4b565a6b7b25758e4b5e19abf7742c89f7ccd7ca52db9b6dd179c143377013bcc838b83570efcd0cd261cce6c21ff5845dc78cd2fc6746648e926c4 SHA512 7cf9cd3744017213b64d1a96e4cec33209ed8db884e61c9bc598dab904bfb4300da223b689871e75245dc4f4a9f633c77c1dd5ecc8e3bd68ce7f6e0fa7d03606
-EBUILD selinux-mono-2.20190609-r1.ebuild 277 BLAKE2B ca8de0cec769bd91a5f8450aafcc1cf45b89079e5739db159c0c3a84610583a8eea7223bfe98bc7227eb15f0a3398173d317b04a8ff231d2507ff0a12fb9b63e SHA512 3dea98cbc4065b02d6f54c7195de15cc779d00589171651fd13f95c138d3f93d2f42a1d3422353db525a6f7adb2a76acb574a6574b52d625fa7aacfd1c8cc16a
+EBUILD selinux-mono-2.20190609-r1.ebuild 275 BLAKE2B c0e1c6d3f4b565a6b7b25758e4b5e19abf7742c89f7ccd7ca52db9b6dd179c143377013bcc838b83570efcd0cd261cce6c21ff5845dc78cd2fc6746648e926c4 SHA512 7cf9cd3744017213b64d1a96e4cec33209ed8db884e61c9bc598dab904bfb4300da223b689871e75245dc4f4a9f633c77c1dd5ecc8e3bd68ce7f6e0fa7d03606
+EBUILD selinux-mono-2.20200818-r1.ebuild 277 BLAKE2B ca8de0cec769bd91a5f8450aafcc1cf45b89079e5739db159c0c3a84610583a8eea7223bfe98bc7227eb15f0a3398173d317b04a8ff231d2507ff0a12fb9b63e SHA512 3dea98cbc4065b02d6f54c7195de15cc779d00589171651fd13f95c138d3f93d2f42a1d3422353db525a6f7adb2a76acb574a6574b52d625fa7aacfd1c8cc16a
 EBUILD selinux-mono-9999.ebuild 280 BLAKE2B 37649a353c91bc456a64764f69192db150a6fdc094dfd49ec7693e62342418623f3fbe4306e233fc2b3fce3d0861db2de5bd92486d8bc847a2c35e9bd5b81a2e SHA512 7f45183c37b12d00819febdf414dd812299beee66d37a71b78c63fb6acfc7645b33e0feed99df0ec68062faaf98b6fa3d5d635034b5bf462a05ed34ae51d0666
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-mono/selinux-mono-2.20190609-r1.ebuild b/sec-policy/selinux-mono/selinux-mono-2.20190609-r1.ebuild
index d4a9dd9f8c8e..bc8639aa0f9c 100644
--- a/sec-policy/selinux-mono/selinux-mono-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-mono/selinux-mono-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-mono/selinux-mono-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..d4a9dd9f8c8e
--- /dev/null
+++ b/sec-policy/selinux-mono/selinux-mono-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 bb9e6222b799..e3429444bb0d 100644
--- a/sec-policy/selinux-mozilla/Manifest
+++ b/sec-policy/selinux-mozilla/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-mozilla-2.20190201-r1.ebuild 383 BLAKE2B 884e3249671d226ec4daa509733f924ddbed4470c64450d04beb3bdc5803c76039840c568aad16550273f0124614fcab2e3ef10e1995fa5b97309be14f5c1a33 SHA512 05b1ded79f4573edfd02980275d812fb7472e1100ef3382e2aef032a56465595f35aa7d1d6f6a1522fe6955263f51afd02cce4bc168921e04d7319802945ecd0
-EBUILD selinux-mozilla-2.20190609-r1.ebuild 385 BLAKE2B 24beefe1957c420d241166ebbb9b0dd6f5c64f24c902e29629e35af5599c0e7f8d36dd9f18408f8e88a68a734dcf88f550f1cd4524a0ebb404c725415dd0cc16 SHA512 645f62b20ccfe9ba0c05e91e84d58a2203282acb674bcd49a97d4379395580f030eb77a41b61c7db4d8c0c263f4919fb22fb669a11a1f074dade7b3991109998
+EBUILD selinux-mozilla-2.20190609-r1.ebuild 383 BLAKE2B 884e3249671d226ec4daa509733f924ddbed4470c64450d04beb3bdc5803c76039840c568aad16550273f0124614fcab2e3ef10e1995fa5b97309be14f5c1a33 SHA512 05b1ded79f4573edfd02980275d812fb7472e1100ef3382e2aef032a56465595f35aa7d1d6f6a1522fe6955263f51afd02cce4bc168921e04d7319802945ecd0
+EBUILD selinux-mozilla-2.20200818-r1.ebuild 385 BLAKE2B 24beefe1957c420d241166ebbb9b0dd6f5c64f24c902e29629e35af5599c0e7f8d36dd9f18408f8e88a68a734dcf88f550f1cd4524a0ebb404c725415dd0cc16 SHA512 645f62b20ccfe9ba0c05e91e84d58a2203282acb674bcd49a97d4379395580f030eb77a41b61c7db4d8c0c263f4919fb22fb669a11a1f074dade7b3991109998
 EBUILD selinux-mozilla-9999.ebuild 388 BLAKE2B 087038236bf10c9392d65e5fe5f0ed46de60267cb25b406081cb51c48a9968f895d671880f3504e7d2a2018380c271e80ab090ab204f67087bb71e88ddb7a163 SHA512 b911f995a1b182b641a6d183fbaeb4a4820174b7038393f937b1603b9f07ff7b0338e2d2b9332c71a5195cb615bc255967e9ab065056a26222fb1637ce5c6fe3
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-mozilla/selinux-mozilla-2.20190609-r1.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-2.20190609-r1.ebuild
index b0d826dd03cc..070f4568b4eb 100644
--- a/sec-policy/selinux-mozilla/selinux-mozilla-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-mozilla/selinux-mozilla-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..b0d826dd03cc
--- /dev/null
+++ b/sec-policy/selinux-mozilla/selinux-mozilla-2.20200818-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 995db58ff5ba..61a52caea173 100644
--- a/sec-policy/selinux-mpd/Manifest
+++ b/sec-policy/selinux-mpd/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-mpd-2.20190201-r1.ebuild 273 BLAKE2B 8822d165310457fb64a2a8d96ac063bffcbb677aefa09488745f2b959757062a616e4856baef98f0896f8093e1ca25f39bb3a75313bf0e30312f62950fc47890 SHA512 3648614818192041ba3e00bd79b90efa551c4f068cface237bc7290b9e913d1b20d047b4bffa0e6911559322fffbc92a0cfef14f2cfd49b355f042a5126ae38b
-EBUILD selinux-mpd-2.20190609-r1.ebuild 275 BLAKE2B cd14db03ecf41975fc3197e5f32a2417b91e07f8ec14aba9219a77b45ed6554f1ef66ce252fee479b7c0c46f4eea68014b2d17e7b140d02e6fb0b6201199edfc SHA512 cfd2c84365b4fab2688e7b07e914309d850a8d4c201859098370868a15aa41a744c6009dda4eb50151240c5f6bccb9482567bb8de2cb4b7897eb7250bc2ffcbb
+EBUILD selinux-mpd-2.20190609-r1.ebuild 273 BLAKE2B 8822d165310457fb64a2a8d96ac063bffcbb677aefa09488745f2b959757062a616e4856baef98f0896f8093e1ca25f39bb3a75313bf0e30312f62950fc47890 SHA512 3648614818192041ba3e00bd79b90efa551c4f068cface237bc7290b9e913d1b20d047b4bffa0e6911559322fffbc92a0cfef14f2cfd49b355f042a5126ae38b
+EBUILD selinux-mpd-2.20200818-r1.ebuild 275 BLAKE2B cd14db03ecf41975fc3197e5f32a2417b91e07f8ec14aba9219a77b45ed6554f1ef66ce252fee479b7c0c46f4eea68014b2d17e7b140d02e6fb0b6201199edfc SHA512 cfd2c84365b4fab2688e7b07e914309d850a8d4c201859098370868a15aa41a744c6009dda4eb50151240c5f6bccb9482567bb8de2cb4b7897eb7250bc2ffcbb
 EBUILD selinux-mpd-9999.ebuild 278 BLAKE2B 3c8bd5a6195b8490a735539f4c0a839a21c85425803a40f646b29ceb87f3b4946c3d7bf6737e3f4307c51d1f0f24a90b8396a39a8744f87e71190f8380631c78 SHA512 145757bd0e249852b7b098ccb20222f6bd88adf3e0d81fadf28aa0fd81689ae63a547f1351b65f5a5924bcc4d19bd53e27800b0cf5b93c972b5e917218419dd3
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-mpd/selinux-mpd-2.20190609-r1.ebuild b/sec-policy/selinux-mpd/selinux-mpd-2.20190609-r1.ebuild
index 28d1755e470e..2a3affc8a356 100644
--- a/sec-policy/selinux-mpd/selinux-mpd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-mpd/selinux-mpd-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-mpd/selinux-mpd-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..28d1755e470e
--- /dev/null
+++ b/sec-policy/selinux-mpd/selinux-mpd-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 03c009029b6b..0858ac44878a 100644
--- a/sec-policy/selinux-mplayer/Manifest
+++ b/sec-policy/selinux-mplayer/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-mplayer-2.20190201-r1.ebuild 285 BLAKE2B 016d3eeb81ae1ad9dfb7ee4713770bf42d3053d08fa839b55c5e5a05fd2310d0b6ef0d1160bddb2b3cde3a1f2f935899ecf29959677e488bc8e2ef59a5187d0c SHA512 b1c878ed0f8c5097288da14c22627db2312094c3ac0fee32dbcf935534b5df3848739feadcf1ad1c0541dbe1553c9ee4d00fe7c8547d78ce682e5727a78efa13
-EBUILD selinux-mplayer-2.20190609-r1.ebuild 287 BLAKE2B cc2701c29b5ec8cd7f277b93ef5de4a69576c07b88ef6c1e8b0b03c157ff82a6d9beb246c899961da093125563bc9e8e7e38a7f6b986f8b0df4deb93198c20f6 SHA512 cf80287ce9ad31db8388822f5703755d08a8b560b932ba1546f309986c15a6d1f03db5d7ae8c61951d8412b74f7b599f1b3c308ecca53de1cd11913626f54318
+EBUILD selinux-mplayer-2.20190609-r1.ebuild 285 BLAKE2B 016d3eeb81ae1ad9dfb7ee4713770bf42d3053d08fa839b55c5e5a05fd2310d0b6ef0d1160bddb2b3cde3a1f2f935899ecf29959677e488bc8e2ef59a5187d0c SHA512 b1c878ed0f8c5097288da14c22627db2312094c3ac0fee32dbcf935534b5df3848739feadcf1ad1c0541dbe1553c9ee4d00fe7c8547d78ce682e5727a78efa13
+EBUILD selinux-mplayer-2.20200818-r1.ebuild 287 BLAKE2B cc2701c29b5ec8cd7f277b93ef5de4a69576c07b88ef6c1e8b0b03c157ff82a6d9beb246c899961da093125563bc9e8e7e38a7f6b986f8b0df4deb93198c20f6 SHA512 cf80287ce9ad31db8388822f5703755d08a8b560b932ba1546f309986c15a6d1f03db5d7ae8c61951d8412b74f7b599f1b3c308ecca53de1cd11913626f54318
 EBUILD selinux-mplayer-9999.ebuild 290 BLAKE2B 782c128836026f813a7efcc469599bd177824bbb0d1e63ce58dc41366234b24397b04430a66f83e3a9eeb7bdd069bcba1afe03a39610b719bc0b76eaf7f23573 SHA512 9af4ff961759c1104d8f6021b18a4cc498fd65939011a07e148f199388ea6755909236f8510605d52090332732c183c6b0da1b58cd72c175350102dbbb833693
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-mplayer/selinux-mplayer-2.20190609-r1.ebuild b/sec-policy/selinux-mplayer/selinux-mplayer-2.20190609-r1.ebuild
index ba26555b93b2..8dc0b1acce2c 100644
--- a/sec-policy/selinux-mplayer/selinux-mplayer-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-mplayer/selinux-mplayer-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-mplayer/selinux-mplayer-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..ba26555b93b2
--- /dev/null
+++ b/sec-policy/selinux-mplayer/selinux-mplayer-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 1501205d1b64..e91727b94d15 100644
--- a/sec-policy/selinux-mrtg/Manifest
+++ b/sec-policy/selinux-mrtg/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-mrtg-2.20190201-r1.ebuild 275 BLAKE2B 82ec1eb20dd22049692b41b06d58f7d5e4c8e1a5f3a723e78ed4ba567f35b17738f87aade014ee73ad0d1c3dc58389ed54df66de64a1317de28b0fad08722591 SHA512 ebbd7531ae2a4ec415a30321d6b8536de9830d2515266e18fbb87944a0d16e34a942d9b4a12043a51ce5050ebea6408086b689725ff279209519ea0c6d8eff6c
-EBUILD selinux-mrtg-2.20190609-r1.ebuild 277 BLAKE2B 140b1974e28d9c1ed03eff49c8ed7ce42d4034f1606b08ce18faa46071f04c0e167ff9faa62abbfe88a332f8589ad93644e71a7b7547ae5525de280cee2294fc SHA512 299eaeb05d048207e4c00097e068d448368c42df4324fa7918a08f3182ece9cbd48b7ff1d72132e08faa861f2a6d6e8296a3ea026897d7490c9dea4c989f5ad5
+EBUILD selinux-mrtg-2.20190609-r1.ebuild 275 BLAKE2B 82ec1eb20dd22049692b41b06d58f7d5e4c8e1a5f3a723e78ed4ba567f35b17738f87aade014ee73ad0d1c3dc58389ed54df66de64a1317de28b0fad08722591 SHA512 ebbd7531ae2a4ec415a30321d6b8536de9830d2515266e18fbb87944a0d16e34a942d9b4a12043a51ce5050ebea6408086b689725ff279209519ea0c6d8eff6c
+EBUILD selinux-mrtg-2.20200818-r1.ebuild 277 BLAKE2B 140b1974e28d9c1ed03eff49c8ed7ce42d4034f1606b08ce18faa46071f04c0e167ff9faa62abbfe88a332f8589ad93644e71a7b7547ae5525de280cee2294fc SHA512 299eaeb05d048207e4c00097e068d448368c42df4324fa7918a08f3182ece9cbd48b7ff1d72132e08faa861f2a6d6e8296a3ea026897d7490c9dea4c989f5ad5
 EBUILD selinux-mrtg-9999.ebuild 280 BLAKE2B 4eaa7b0378340dd55517c96aaac58fd8d8a8ee0645aa28625295ac9223668ae18db75f778b29885f32fda030d2867f3c1f827b954067594d5e630c99af68810b SHA512 0ccddae75c754c173ff0ba837664fe6988dca32909cf37f66fbad33b102d90817e9aabb7a2c4c01f708872449f96c3ea76009575aedab974f0fb6c49faed248f
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-mrtg/selinux-mrtg-2.20190609-r1.ebuild b/sec-policy/selinux-mrtg/selinux-mrtg-2.20190609-r1.ebuild
index 0135a93614be..fc9606ff5b50 100644
--- a/sec-policy/selinux-mrtg/selinux-mrtg-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-mrtg/selinux-mrtg-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-mrtg/selinux-mrtg-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..0135a93614be
--- /dev/null
+++ b/sec-policy/selinux-mrtg/selinux-mrtg-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 986c5d13b658..8764dea00961 100644
--- a/sec-policy/selinux-munin/Manifest
+++ b/sec-policy/selinux-munin/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-munin-2.20190201-r1.ebuild 373 BLAKE2B 18894fa79e099fbab5f7a992a27cad6fa0c426fc21cc5a0c32c00c2bdc1ed5ed052ab3c33b11f854ea5884c90c4654e1e1dde37fa741783db387cadf41061f85 SHA512 4e6e5221456bad0cc842f21e404d4ab569b3a5d4574fff1e3d230eea556e6655d54b5520446695fbe71f508ab35f805bb183ffe96757cd0c199aa549cad5ea1f
-EBUILD selinux-munin-2.20190609-r1.ebuild 375 BLAKE2B 0d06726d0b39ad69f7b8145b5215dd790cdb3becfc810a5f5bf62a368e06db2c4e14642d87e650f6ed1b1ac1b853bf843572068838d94caa4fd965b986246c08 SHA512 a2009d2ac4162ee773ab08a577908952542b83714f744229c3edc747b82999d6fb33ed2ceb22c6ff1f64c5904d3931581fd05d2262b7570e5b713e14607d1b17
+EBUILD selinux-munin-2.20190609-r1.ebuild 373 BLAKE2B 18894fa79e099fbab5f7a992a27cad6fa0c426fc21cc5a0c32c00c2bdc1ed5ed052ab3c33b11f854ea5884c90c4654e1e1dde37fa741783db387cadf41061f85 SHA512 4e6e5221456bad0cc842f21e404d4ab569b3a5d4574fff1e3d230eea556e6655d54b5520446695fbe71f508ab35f805bb183ffe96757cd0c199aa549cad5ea1f
+EBUILD selinux-munin-2.20200818-r1.ebuild 375 BLAKE2B 0d06726d0b39ad69f7b8145b5215dd790cdb3becfc810a5f5bf62a368e06db2c4e14642d87e650f6ed1b1ac1b853bf843572068838d94caa4fd965b986246c08 SHA512 a2009d2ac4162ee773ab08a577908952542b83714f744229c3edc747b82999d6fb33ed2ceb22c6ff1f64c5904d3931581fd05d2262b7570e5b713e14607d1b17
 EBUILD selinux-munin-9999.ebuild 378 BLAKE2B 84ec865cd89b81a185ea307cb5755cf9fe2e7751c37647fe53a403acda3c53650b280b8bcd02f393aa65cddf1849549b8434d15310f46c21124ed17ccee499fd SHA512 14f4a31bc763fba316ff87aa0c4cb42625d82720bd31d89cb4d7022e48f587ca34090cdb005bceb58c0da906b9093da557678addfb0f1e8fe16654cc242bf595
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-munin/selinux-munin-2.20190609-r1.ebuild b/sec-policy/selinux-munin/selinux-munin-2.20190609-r1.ebuild
index aa0755e10cbd..ca842c4104b2 100644
--- a/sec-policy/selinux-munin/selinux-munin-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-munin/selinux-munin-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-munin/selinux-munin-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..aa0755e10cbd
--- /dev/null
+++ b/sec-policy/selinux-munin/selinux-munin-2.20200818-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 0c3e5d60f8ea..37e553c02abf 100644
--- a/sec-policy/selinux-mutt/Manifest
+++ b/sec-policy/selinux-mutt/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-mutt-2.20190201-r1.ebuild 275 BLAKE2B 4678e6495d0ad049d93bbdad6d1c8d31b981de0e7e47c392cc146c1254a3508b5880437699adda0952bc77ec4b3475158eba8f4a524179145d752a0e0f45e32a SHA512 8bf00cdce8a56da8d24a7fbda4368377e600e24689e1531777e4128f109b9057a392f978ddd435c9e9150816ac2b0007112b7ff422364e7a00db195314b61f22
-EBUILD selinux-mutt-2.20190609-r1.ebuild 277 BLAKE2B 284100e50cd9683a949d64c4c7805d7b04ffc9e33aad75265109bc769e6a3b2397333e00ca19a3d94a50a6c398105bbb21fca783a770351c56b378a4f3e4ce84 SHA512 0f0878bf8c9410baf499a6f3e73a6d5328d7bbbc3d6eba790de0c3a5104d51a6f25fbbb2a447024c22c1b37f78774d9d0f8b387677845ab629d218d9fdaa954b
+EBUILD selinux-mutt-2.20190609-r1.ebuild 275 BLAKE2B 4678e6495d0ad049d93bbdad6d1c8d31b981de0e7e47c392cc146c1254a3508b5880437699adda0952bc77ec4b3475158eba8f4a524179145d752a0e0f45e32a SHA512 8bf00cdce8a56da8d24a7fbda4368377e600e24689e1531777e4128f109b9057a392f978ddd435c9e9150816ac2b0007112b7ff422364e7a00db195314b61f22
+EBUILD selinux-mutt-2.20200818-r1.ebuild 277 BLAKE2B 284100e50cd9683a949d64c4c7805d7b04ffc9e33aad75265109bc769e6a3b2397333e00ca19a3d94a50a6c398105bbb21fca783a770351c56b378a4f3e4ce84 SHA512 0f0878bf8c9410baf499a6f3e73a6d5328d7bbbc3d6eba790de0c3a5104d51a6f25fbbb2a447024c22c1b37f78774d9d0f8b387677845ab629d218d9fdaa954b
 EBUILD selinux-mutt-9999.ebuild 280 BLAKE2B be593f9696e8366b7eeb8bdddf9b8602d730af3fc053171e9dd4ff45c7f113ac01ec218c5751fc6b015591a5ec74845b8c84dc0c4ccd16895f6977747a34affc SHA512 557c68371585154e36bf0701617856c5228e62d60ea9487c6ebc3f80dd94a14bf9c11f0131b1d6a87424359a76dfeac9ca4003afb839190e2359b466d50fae2c
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-mutt/selinux-mutt-2.20190609-r1.ebuild b/sec-policy/selinux-mutt/selinux-mutt-2.20190609-r1.ebuild
index aa0b0e159f40..dc3b502a8751 100644
--- a/sec-policy/selinux-mutt/selinux-mutt-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-mutt/selinux-mutt-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-mutt/selinux-mutt-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..aa0b0e159f40
--- /dev/null
+++ b/sec-policy/selinux-mutt/selinux-mutt-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 bc21c4b36336..522321aaf4b5 100644
--- a/sec-policy/selinux-mysql/Manifest
+++ b/sec-policy/selinux-mysql/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-mysql-2.20190201-r1.ebuild 277 BLAKE2B 729c94a3d79deda2cf1adbb328d93389aa795ecde0a47e466cf485dfb417dcef351341c558353b3b2be27d036add93bf71038d068b779b41e30a7692a4d6e1e7 SHA512 c28302ef492b0b1dd67a7394cc1d831e2ae52df4a71597fb2018c1f64e1ce007677bf44fb1fbd8a05abe7b5378303a3d8aadf4901e928fc2001dd84997f29189
-EBUILD selinux-mysql-2.20190609-r1.ebuild 279 BLAKE2B a9de57df3aea1aac1c61ffb2896658d1d8abf08883b56a6f05d8d137b3431b844c8975a3f36f916208831d18afb5d529a411d4ae8569788ac1b5a244d17ca8df SHA512 b338b3995c6c7ccb7e51b170fcff803899e758f66648e8c9fd05e9462bb3d9777fc7619eac56c69aed594ddf0aabd14f5154c9c2c74313be0643de8ad89a9539
+EBUILD selinux-mysql-2.20190609-r1.ebuild 277 BLAKE2B 729c94a3d79deda2cf1adbb328d93389aa795ecde0a47e466cf485dfb417dcef351341c558353b3b2be27d036add93bf71038d068b779b41e30a7692a4d6e1e7 SHA512 c28302ef492b0b1dd67a7394cc1d831e2ae52df4a71597fb2018c1f64e1ce007677bf44fb1fbd8a05abe7b5378303a3d8aadf4901e928fc2001dd84997f29189
+EBUILD selinux-mysql-2.20200818-r1.ebuild 279 BLAKE2B a9de57df3aea1aac1c61ffb2896658d1d8abf08883b56a6f05d8d137b3431b844c8975a3f36f916208831d18afb5d529a411d4ae8569788ac1b5a244d17ca8df SHA512 b338b3995c6c7ccb7e51b170fcff803899e758f66648e8c9fd05e9462bb3d9777fc7619eac56c69aed594ddf0aabd14f5154c9c2c74313be0643de8ad89a9539
 EBUILD selinux-mysql-9999.ebuild 282 BLAKE2B 69aa3df600c88406291e4248b14b2bc99a0fefe7042498eb8cf1db770ad14c1b5f5731c31362ec27a35dfc69caedbb271e32e6b858328e53befdde1b4b19f1b8 SHA512 b7701d44f0fa344f79a1a045dee3fc556e2215950fbdd36317a90d67518ebadb8cd3e189ffa921b0e4af0944c63177bde77e1c3ac95c679ae5d821ad65e3bbc2
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-mysql/selinux-mysql-2.20190609-r1.ebuild b/sec-policy/selinux-mysql/selinux-mysql-2.20190609-r1.ebuild
index f5a96dd5d01e..33ccf44eae23 100644
--- a/sec-policy/selinux-mysql/selinux-mysql-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-mysql/selinux-mysql-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-mysql/selinux-mysql-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..f5a96dd5d01e
--- /dev/null
+++ b/sec-policy/selinux-mysql/selinux-mysql-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 e600a897a278..68c6bc3c811c 100644
--- a/sec-policy/selinux-nagios/Manifest
+++ b/sec-policy/selinux-nagios/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-nagios-2.20190201-r1.ebuild 375 BLAKE2B e260921af3335c61ac0a3bcf637a2d8adba7f1be487fbf4e0fec5450db4d08c56658c94a79430d533a5a7cc52c0ef58702e0fb6a78327ebdd2c6cf6916b19eb1 SHA512 fd1994ff7418b42223556f506660982d081bef928d1e34d3271af67b310d14383588f4afcb1d157b4417d96333c2c6ced88c0127f6405039677dc2733c699ecf
-EBUILD selinux-nagios-2.20190609-r1.ebuild 377 BLAKE2B 9e29c8c1c46c276489afb89243d3faa105513fcca272eae5c8d043fb0a8f73da082a3a2eca957788e95673bcaf65ea7751be0d0b506d85c9cb71647e9bfc3e15 SHA512 1175271c167a97675506393413597c0044dc8980d926fd03f9edf9a666e0da984597714efb422552b4ce681bcd1fb11d4e863f4252f8ff634353aa65f27a8036
+EBUILD selinux-nagios-2.20190609-r1.ebuild 375 BLAKE2B e260921af3335c61ac0a3bcf637a2d8adba7f1be487fbf4e0fec5450db4d08c56658c94a79430d533a5a7cc52c0ef58702e0fb6a78327ebdd2c6cf6916b19eb1 SHA512 fd1994ff7418b42223556f506660982d081bef928d1e34d3271af67b310d14383588f4afcb1d157b4417d96333c2c6ced88c0127f6405039677dc2733c699ecf
+EBUILD selinux-nagios-2.20200818-r1.ebuild 377 BLAKE2B 9e29c8c1c46c276489afb89243d3faa105513fcca272eae5c8d043fb0a8f73da082a3a2eca957788e95673bcaf65ea7751be0d0b506d85c9cb71647e9bfc3e15 SHA512 1175271c167a97675506393413597c0044dc8980d926fd03f9edf9a666e0da984597714efb422552b4ce681bcd1fb11d4e863f4252f8ff634353aa65f27a8036
 EBUILD selinux-nagios-9999.ebuild 380 BLAKE2B ce2fdc7a1acb4930ac92d88a46367e2ad14442979c04a66ed29fedbb0c5fcfbdaeaed9915df1d061a6082285173a475d5829eab59b7bb4fac01b86f3536b220a SHA512 087555cdd22fa69d09ef4ecf40d231619ef505f825892d08acc02e8e03351e670876a1046ccc6768bef744de86e789770f07075251817845fb2ce6688a8a8ba0
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20190609-r1.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20190609-r1.ebuild
index 81cda8601135..f4bf6669fef0 100644
--- a/sec-policy/selinux-nagios/selinux-nagios-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-nagios/selinux-nagios-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..81cda8601135
--- /dev/null
+++ b/sec-policy/selinux-nagios/selinux-nagios-2.20200818-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 bfcd95baf0ea..96b41fdc6e99 100644
--- a/sec-policy/selinux-ncftool/Manifest
+++ b/sec-policy/selinux-ncftool/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-ncftool-2.20190201-r1.ebuild 281 BLAKE2B e54aea88b7d35a737ecc7b4489abee893d90cbe694f984ff58c0f8831fee4478dcacbca79c58435db2f7917dedf8b2d25768f2adc23f6d687c4763160c78d743 SHA512 8b89f2898d680a59aaf806d95878d042b693f8548d6663e2629a65f43c8d3b95045bb968a305ceb7a8ed11089b78eff81a5e43ebb58826a8d84bdf9d0a3d54b0
-EBUILD selinux-ncftool-2.20190609-r1.ebuild 283 BLAKE2B ab59d548155b8edc8fd5983f3e0feed770d36bf41faeb96674e611e4f4b434610d7bdc4b8ba983ba2791a340b3c150ce1a99145b7b6e045e5f82547b5f091b5f SHA512 8e865421c7d7549aa3f27e948d355fcfbf6f1c1a78a07086b81475c727978644a59698c723c0938fcd0a1bf461b1802dd9a5126870b740cc7bbdc032e65dd9a4
+EBUILD selinux-ncftool-2.20190609-r1.ebuild 281 BLAKE2B e54aea88b7d35a737ecc7b4489abee893d90cbe694f984ff58c0f8831fee4478dcacbca79c58435db2f7917dedf8b2d25768f2adc23f6d687c4763160c78d743 SHA512 8b89f2898d680a59aaf806d95878d042b693f8548d6663e2629a65f43c8d3b95045bb968a305ceb7a8ed11089b78eff81a5e43ebb58826a8d84bdf9d0a3d54b0
+EBUILD selinux-ncftool-2.20200818-r1.ebuild 283 BLAKE2B ab59d548155b8edc8fd5983f3e0feed770d36bf41faeb96674e611e4f4b434610d7bdc4b8ba983ba2791a340b3c150ce1a99145b7b6e045e5f82547b5f091b5f SHA512 8e865421c7d7549aa3f27e948d355fcfbf6f1c1a78a07086b81475c727978644a59698c723c0938fcd0a1bf461b1802dd9a5126870b740cc7bbdc032e65dd9a4
 EBUILD selinux-ncftool-9999.ebuild 286 BLAKE2B 5b097eaa6f20b5687416c32d100233a26b9a378e7efcb250e8605cc88533c8abd698b05b516c04c5b12740ff305f43535a1c0021e72fada8a840fa05b98ec892 SHA512 c9b0322af75ddf288a0ab2c56c693f400c8e437cefbc7231b5633776608678fd4a528264ac4bfc499f95b6884b6ce1719fbfb9650664536078b2ae5b8bcd85fc
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ncftool/selinux-ncftool-2.20190609-r1.ebuild b/sec-policy/selinux-ncftool/selinux-ncftool-2.20190609-r1.ebuild
index 8ed25adee78b..6dca146d3481 100644
--- a/sec-policy/selinux-ncftool/selinux-ncftool-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-ncftool/selinux-ncftool-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-ncftool/selinux-ncftool-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..8ed25adee78b
--- /dev/null
+++ b/sec-policy/selinux-ncftool/selinux-ncftool-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 a98b9bb13877..95c563cc2c76 100644
--- a/sec-policy/selinux-networkmanager/Manifest
+++ b/sec-policy/selinux-networkmanager/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-networkmanager-2.20190201-r1.ebuild 295 BLAKE2B 16c2b045b18b128e4c9127045c1337ed5fd3d29f6e043d667d80cd052a4dfdd0003b23c6753f0090c607c4ce00c087d5003c265531f840f342f2cba65a3403ef SHA512 8effa9351798d54e559d3d61d22bd96aebe81062cc26c70ef23f8031551fb3b8491c99ffa862baf987c781c067de6059e2995f46a2c211153de81a1e313c94f9
-EBUILD selinux-networkmanager-2.20190609-r1.ebuild 297 BLAKE2B fa6626a2f87226191eee39c08fd91c587ed385da893cdc6b9f15c8da6e0b5de3ab0d3a926a88b0a29c7543a7e925e1f8cce17fbb1912faeb66b8c506fe42f2fa SHA512 a98fc972b04c90734c62763998b4c9891f6db290834ec6e588ee5a3381ccd3aeb400d8b170b5dc7a97c796417b1e1889538f040d61b6291f8f96d47568d8edc6
+EBUILD selinux-networkmanager-2.20190609-r1.ebuild 295 BLAKE2B 16c2b045b18b128e4c9127045c1337ed5fd3d29f6e043d667d80cd052a4dfdd0003b23c6753f0090c607c4ce00c087d5003c265531f840f342f2cba65a3403ef SHA512 8effa9351798d54e559d3d61d22bd96aebe81062cc26c70ef23f8031551fb3b8491c99ffa862baf987c781c067de6059e2995f46a2c211153de81a1e313c94f9
+EBUILD selinux-networkmanager-2.20200818-r1.ebuild 297 BLAKE2B fa6626a2f87226191eee39c08fd91c587ed385da893cdc6b9f15c8da6e0b5de3ab0d3a926a88b0a29c7543a7e925e1f8cce17fbb1912faeb66b8c506fe42f2fa SHA512 a98fc972b04c90734c62763998b4c9891f6db290834ec6e588ee5a3381ccd3aeb400d8b170b5dc7a97c796417b1e1889538f040d61b6291f8f96d47568d8edc6
 EBUILD selinux-networkmanager-9999.ebuild 300 BLAKE2B 9c79fbd5dffedddeb6cafb053bc099a57ad49d5c017ff80beda40d8cb38424c031bce948673d23a609a056881d944380812d614aad64fcec156dfe76feaf5240 SHA512 f10f062359a20f2c274b17a624ca9e8527688e1da5d04d03506698c4f2c8171b868d782089925448640bcc124701848c0e00d3a83d93863ed59761194a149617
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20190609-r1.ebuild b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20190609-r1.ebuild
index 47183f972429..e45cea85c0e8 100644
--- a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..47183f972429
--- /dev/null
+++ b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 5701173e3747..b0b3d528aa73 100644
--- a/sec-policy/selinux-nginx/Manifest
+++ b/sec-policy/selinux-nginx/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-nginx-2.20190201-r1.ebuild 372 BLAKE2B 80e25ee56b95a2d97f89ead571a83287e7597bded5e1b67ae89083e4355fbbde085150f1ea77e158ef67b7511804205412db4ace86d9580aa6e522bf90a617b8 SHA512 69dcf6b1807c39173c14c232222f03b6b83de03566a652cfb80faa29c44ddffa1e2db8df5fcefba97670a635f93ebab1226bfd863fa87379c5a9a89f62f97636
-EBUILD selinux-nginx-2.20190609-r1.ebuild 374 BLAKE2B ccffae3a3257fbabc8eecc582a0552d7cb872fd68f15a9937e3d6fba0b25c80db70f2ed9002cb6fc2dfba16199385fe62011e9f049818d3f105745e6f94d6126 SHA512 fab838e453a653bcaf5f82cc91c452830c9c817dc44ac8f5f6efbc3d9fdce729a0e315f7a653b10507d9a3eeb51b262446bf584f4217933d3683059a66e48235
+EBUILD selinux-nginx-2.20190609-r1.ebuild 372 BLAKE2B 80e25ee56b95a2d97f89ead571a83287e7597bded5e1b67ae89083e4355fbbde085150f1ea77e158ef67b7511804205412db4ace86d9580aa6e522bf90a617b8 SHA512 69dcf6b1807c39173c14c232222f03b6b83de03566a652cfb80faa29c44ddffa1e2db8df5fcefba97670a635f93ebab1226bfd863fa87379c5a9a89f62f97636
+EBUILD selinux-nginx-2.20200818-r1.ebuild 374 BLAKE2B ccffae3a3257fbabc8eecc582a0552d7cb872fd68f15a9937e3d6fba0b25c80db70f2ed9002cb6fc2dfba16199385fe62011e9f049818d3f105745e6f94d6126 SHA512 fab838e453a653bcaf5f82cc91c452830c9c817dc44ac8f5f6efbc3d9fdce729a0e315f7a653b10507d9a3eeb51b262446bf584f4217933d3683059a66e48235
 EBUILD selinux-nginx-9999.ebuild 377 BLAKE2B eda273645dca0d1db66f755b44ac36ff55427ec225ac242ce305e85bcfde41df960a3a00ecb16327519b61b82ec203dca056eef0c2c180c7182e2464df8f11c9 SHA512 eadb4bb94e96f8cb80a1a41bdba50dae50c990391d37fecc08a1fe50236d6b747a7087e8aa2a7cb4ecfb067f43554e65d98b3d589c326b3db72ac9e863d55baa
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-nginx/selinux-nginx-2.20190609-r1.ebuild b/sec-policy/selinux-nginx/selinux-nginx-2.20190609-r1.ebuild
index 68ebca1fd39f..2d6fbf714ba6 100644
--- a/sec-policy/selinux-nginx/selinux-nginx-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-nginx/selinux-nginx-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-nginx/selinux-nginx-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..68ebca1fd39f
--- /dev/null
+++ b/sec-policy/selinux-nginx/selinux-nginx-2.20200818-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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-nslcd/Manifest b/sec-policy/selinux-nslcd/Manifest
index 20c3ae36be3c..13d5483aa7a6 100644
--- a/sec-policy/selinux-nslcd/Manifest
+++ b/sec-policy/selinux-nslcd/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-nslcd-2.20190201-r1.ebuild 277 BLAKE2B b3f7412f595ddd4ae23c9e99fe30bdae2d2108337343f23ecb3faeffe40e1d2068207de23224facb5c4538b59a35d127ed1bfd69aa71d2a73192103f0f34487a SHA512 64b37d57301730da0c7fa926406dcf23c93c409e63bce76abd0f64ab251b6feaf0c134fb08e72f3e26910e755f1eded0854233bf7013adb98f745f217e974d14
-EBUILD selinux-nslcd-2.20190609-r1.ebuild 279 BLAKE2B a54484c40bd208ebb33e2b4072e7f3f706818c2ff1004d346c046ab9fbe2adf93f16c3ec1ba24bb45ec2553333612189c59a15f66a33964ad2a0ea9763804eb8 SHA512 53539a1d6cf28e33489bdbe578a2ac9e8be9a16759e9ea1ceefca43b1fb25fbe735dc105bda89d175bc3ec24e31180b85d4f33e1ac597c9ab655e3cc634f2bbe
+EBUILD selinux-nslcd-2.20190609-r1.ebuild 277 BLAKE2B b3f7412f595ddd4ae23c9e99fe30bdae2d2108337343f23ecb3faeffe40e1d2068207de23224facb5c4538b59a35d127ed1bfd69aa71d2a73192103f0f34487a SHA512 64b37d57301730da0c7fa926406dcf23c93c409e63bce76abd0f64ab251b6feaf0c134fb08e72f3e26910e755f1eded0854233bf7013adb98f745f217e974d14
+EBUILD selinux-nslcd-2.20200818-r1.ebuild 279 BLAKE2B a54484c40bd208ebb33e2b4072e7f3f706818c2ff1004d346c046ab9fbe2adf93f16c3ec1ba24bb45ec2553333612189c59a15f66a33964ad2a0ea9763804eb8 SHA512 53539a1d6cf28e33489bdbe578a2ac9e8be9a16759e9ea1ceefca43b1fb25fbe735dc105bda89d175bc3ec24e31180b85d4f33e1ac597c9ab655e3cc634f2bbe
 EBUILD selinux-nslcd-9999.ebuild 282 BLAKE2B c39f1955471d6461445ae1462f37ca55faef4b0afe9320665e0e6198e56b36e7fe7d9be0e9971d5ec191022556b74d09b1d69bda6ae6f485ccdc4b3aa312264a SHA512 bfb2c839f9694da97e55f0a16592ba60115e58e0d2590ef026a8d04c194513d8adc92d9ba24bc288fb80dcab75d2acb08763680ceb52c19f438350e8218e2301
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-nslcd/selinux-nslcd-2.20190609-r1.ebuild b/sec-policy/selinux-nslcd/selinux-nslcd-2.20190609-r1.ebuild
index bca1499ca9db..0b5f03ae48ec 100644
--- a/sec-policy/selinux-nslcd/selinux-nslcd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-nslcd/selinux-nslcd-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-nslcd/selinux-nslcd-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..bca1499ca9db
--- /dev/null
+++ b/sec-policy/selinux-nslcd/selinux-nslcd-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 54f28ff105d2..39c936ec8fd1 100644
--- a/sec-policy/selinux-ntop/Manifest
+++ b/sec-policy/selinux-ntop/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-ntop-2.20190201-r1.ebuild 275 BLAKE2B e53e56ac1c2dbf65a490c075169f9ca33516d9938750a28d6e1c3557604c5b7fba84eec4f1925a5ed6876e18b5b39d51bdede8317eefd839afabfcc309b953ed SHA512 137db26521c5851ff374a1a7153cc726af5a52bca9c3457731cbf1c1a8e8c43ee47b4a5487e621d32b0f624603262ee46a077fb37985e2c7eebaad4979a40e46
-EBUILD selinux-ntop-2.20190609-r1.ebuild 277 BLAKE2B 7def9e673ba0537f1c70542e91e2989e72bb7be7bb873d2709cd398996b0249854463114c8a7efbc9718166653f45d3f87e5e4baa48d19944b509d7a455e092e SHA512 2b2a61b9f8a645c51719bf406110395369a6bef19c6972d677e459ff1039a933c78a58660855bb5c25f4c93318698e440be98112b691db94acf6fca62e5c874e
+EBUILD selinux-ntop-2.20190609-r1.ebuild 275 BLAKE2B e53e56ac1c2dbf65a490c075169f9ca33516d9938750a28d6e1c3557604c5b7fba84eec4f1925a5ed6876e18b5b39d51bdede8317eefd839afabfcc309b953ed SHA512 137db26521c5851ff374a1a7153cc726af5a52bca9c3457731cbf1c1a8e8c43ee47b4a5487e621d32b0f624603262ee46a077fb37985e2c7eebaad4979a40e46
+EBUILD selinux-ntop-2.20200818-r1.ebuild 277 BLAKE2B 7def9e673ba0537f1c70542e91e2989e72bb7be7bb873d2709cd398996b0249854463114c8a7efbc9718166653f45d3f87e5e4baa48d19944b509d7a455e092e SHA512 2b2a61b9f8a645c51719bf406110395369a6bef19c6972d677e459ff1039a933c78a58660855bb5c25f4c93318698e440be98112b691db94acf6fca62e5c874e
 EBUILD selinux-ntop-9999.ebuild 280 BLAKE2B 286a5b459f8e6ddb3181b74c107560f6f04b0b673ef1016e3451b0040228cc32df1f7395c0d321b426a41277b18c94fbbfee7d5d2e47d48fbe104482b330b04a SHA512 c58a97c1025011aa96d5bde92646aef74d6a577beda85882b2f0da80678890b56834d05b0dcb65fc0bacce103b5307bcb164b52a55a8865e18c869d830d13b23
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ntop/selinux-ntop-2.20190609-r1.ebuild b/sec-policy/selinux-ntop/selinux-ntop-2.20190609-r1.ebuild
index fbdc78861eee..62cf12119e3b 100644
--- a/sec-policy/selinux-ntop/selinux-ntop-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-ntop/selinux-ntop-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-ntop/selinux-ntop-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..fbdc78861eee
--- /dev/null
+++ b/sec-policy/selinux-ntop/selinux-ntop-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 d2c7e53413d7..b8afe04350b2 100644
--- a/sec-policy/selinux-ntp/Manifest
+++ b/sec-policy/selinux-ntp/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-ntp-2.20190201-r1.ebuild 273 BLAKE2B c12dea9012d50b1d4cc587c284d56e380844cf78dfeaba9d92883af1c15746efbaf800fff59e31a9b277c347be23d857f618c43892fff65af7e3c355c69e291c SHA512 fbc5a963048599a51d1b2c1fff79dd7009276bb8132faa98bf0a73c93403b948918f8ed346baf84a576ea2226df99d323fecb047b7a9138902db2c4cecafd38f
-EBUILD selinux-ntp-2.20190609-r1.ebuild 275 BLAKE2B 0e23f8186205e8cc7aeddc07c39f9779d89bfcd5e011516cb802ea6da72321ed0f659f44e0f3325f67a99e54b7e8c306ec726161a2c678d5ccec2556a00a74c9 SHA512 5c4534d9fd91e339f39f66fd17cb6b1de69098d4198fc4568508ba533fc74a66c383b374394426ff05250a85d929cdfec53e4435e261366e83b9740c2f62d1bf
+EBUILD selinux-ntp-2.20190609-r1.ebuild 273 BLAKE2B c12dea9012d50b1d4cc587c284d56e380844cf78dfeaba9d92883af1c15746efbaf800fff59e31a9b277c347be23d857f618c43892fff65af7e3c355c69e291c SHA512 fbc5a963048599a51d1b2c1fff79dd7009276bb8132faa98bf0a73c93403b948918f8ed346baf84a576ea2226df99d323fecb047b7a9138902db2c4cecafd38f
+EBUILD selinux-ntp-2.20200818-r1.ebuild 275 BLAKE2B 0e23f8186205e8cc7aeddc07c39f9779d89bfcd5e011516cb802ea6da72321ed0f659f44e0f3325f67a99e54b7e8c306ec726161a2c678d5ccec2556a00a74c9 SHA512 5c4534d9fd91e339f39f66fd17cb6b1de69098d4198fc4568508ba533fc74a66c383b374394426ff05250a85d929cdfec53e4435e261366e83b9740c2f62d1bf
 EBUILD selinux-ntp-9999.ebuild 278 BLAKE2B 993af43fbca4180b117e3059436df5f458020c5ce1fec70f7df64c72e3f83ec034f9dd95f9f72f305bb90b006f1647feaad43cfb4a928db21680f4c41dde801f SHA512 9a3016ab9233de6ec29520895bae8a834992fd456accee562542766b19924394a5ce02addc51ccbe5cf73a88cb619b923e57f131f16090d019b2154178805d8f
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ntp/selinux-ntp-2.20190609-r1.ebuild b/sec-policy/selinux-ntp/selinux-ntp-2.20190609-r1.ebuild
index 62633ec04d11..b40a9d17b4f5 100644
--- a/sec-policy/selinux-ntp/selinux-ntp-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-ntp/selinux-ntp-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-ntp/selinux-ntp-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..62633ec04d11
--- /dev/null
+++ b/sec-policy/selinux-ntp/selinux-ntp-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 ea6ee3139f3b..d57b1966f71e 100644
--- a/sec-policy/selinux-nut/Manifest
+++ b/sec-policy/selinux-nut/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-nut-2.20190201-r1.ebuild 369 BLAKE2B 0550f096ac246525412f676b7ecffce720ccaa75434d71ec06aa14ada19816711c7f3aeb87fa7704701ea13bb66717078a82b5f31ab72f731d2406ff502e7778 SHA512 3402b4a8ed58b61fc25f91068b044736dbbe533addcd2f0e24cef2be3223644490c0bad1e589eed38813f74224b1ad5c742d0f04c79065b680113d2b6a16f411
-EBUILD selinux-nut-2.20190609-r1.ebuild 371 BLAKE2B b24f869f29bf9c56f12e55858ba6a9dde12ec5358d84d7e6177e426ae00499a53a3a54451f8a74c94fb704bd56ba1a276ccd4b2ef0d448b0e11736b4370ad715 SHA512 b6f15f7f037408ce4373a71011cf9434210ad0723071ac83a61c94934dd099bce30363402c8ed0f1153a873a46af13dbc4f29a4855f841cac0422da640c7253f
+EBUILD selinux-nut-2.20190609-r1.ebuild 369 BLAKE2B 0550f096ac246525412f676b7ecffce720ccaa75434d71ec06aa14ada19816711c7f3aeb87fa7704701ea13bb66717078a82b5f31ab72f731d2406ff502e7778 SHA512 3402b4a8ed58b61fc25f91068b044736dbbe533addcd2f0e24cef2be3223644490c0bad1e589eed38813f74224b1ad5c742d0f04c79065b680113d2b6a16f411
+EBUILD selinux-nut-2.20200818-r1.ebuild 371 BLAKE2B b24f869f29bf9c56f12e55858ba6a9dde12ec5358d84d7e6177e426ae00499a53a3a54451f8a74c94fb704bd56ba1a276ccd4b2ef0d448b0e11736b4370ad715 SHA512 b6f15f7f037408ce4373a71011cf9434210ad0723071ac83a61c94934dd099bce30363402c8ed0f1153a873a46af13dbc4f29a4855f841cac0422da640c7253f
 EBUILD selinux-nut-9999.ebuild 374 BLAKE2B 3ff37d650df15b2749a33e87ac97571238d86f5076af69d88b997cf36d04a2274249456a3d17b086c25a70f9b90fffc2e1f66fa160e5c81898d5f1db220806b6 SHA512 469184b594ae885b86caa1b1fe45748ddbbba4abbd4d377389216ac51c50f124db4a21157fc4b769ef61e6b17aa7fb1e825f9411643cf20098f2b424231557e9
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-nut/selinux-nut-2.20190609-r1.ebuild b/sec-policy/selinux-nut/selinux-nut-2.20190609-r1.ebuild
index 1c39e6a4afa8..83b6df01523b 100644
--- a/sec-policy/selinux-nut/selinux-nut-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-nut/selinux-nut-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-nut/selinux-nut-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..1c39e6a4afa8
--- /dev/null
+++ b/sec-policy/selinux-nut/selinux-nut-2.20200818-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 37cb118e4574..b9d905a34aa7 100644
--- a/sec-policy/selinux-nx/Manifest
+++ b/sec-policy/selinux-nx/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-nx-2.20190201-r1.ebuild 271 BLAKE2B 1b35de5c859ed15b79ace55734abf5eac91ec6baa5c5ec53308de93cb2b9ed38b5301b9269b5681f764dd9aa54c1e57bafec88264cd5b4c9c2dcb3d9a28a01a3 SHA512 5b6ec86e65c81992eb4c450149921c7c4137eff84f04e53f0ff8105f703bb997b40e4c77789ad9e8c7c6a38ee41f071dd4414e056e0d13b5c45d1cc116dbd445
-EBUILD selinux-nx-2.20190609-r1.ebuild 273 BLAKE2B 7df9a80399d68c9c014b744000f336c2bfffb5f3c18062e70d3f2c354d60b3ed8fe2fb327622b389b2d84984e3d72828331804ecf73e49205d56904d6ad6913e SHA512 ef8868769c63a1d1fddb15e57551ffbb32bdee7ff3a0b11b4fdb53e6ddde5c7e9140d17525407ffaf20921ac4db9a156c39b52a09ac794e8eabf71e0444384b3
+EBUILD selinux-nx-2.20190609-r1.ebuild 271 BLAKE2B 1b35de5c859ed15b79ace55734abf5eac91ec6baa5c5ec53308de93cb2b9ed38b5301b9269b5681f764dd9aa54c1e57bafec88264cd5b4c9c2dcb3d9a28a01a3 SHA512 5b6ec86e65c81992eb4c450149921c7c4137eff84f04e53f0ff8105f703bb997b40e4c77789ad9e8c7c6a38ee41f071dd4414e056e0d13b5c45d1cc116dbd445
+EBUILD selinux-nx-2.20200818-r1.ebuild 273 BLAKE2B 7df9a80399d68c9c014b744000f336c2bfffb5f3c18062e70d3f2c354d60b3ed8fe2fb327622b389b2d84984e3d72828331804ecf73e49205d56904d6ad6913e SHA512 ef8868769c63a1d1fddb15e57551ffbb32bdee7ff3a0b11b4fdb53e6ddde5c7e9140d17525407ffaf20921ac4db9a156c39b52a09ac794e8eabf71e0444384b3
 EBUILD selinux-nx-9999.ebuild 276 BLAKE2B 98e7536f4c6aade0906058697faff54f9a8e2dda25e0f910afbcad84f97d62ba0c6c6c25143de35bf47034c443afc6a15d365a24deefffbd389e2c0b26bdd18a SHA512 35ef3bacb487e5a6c8deecc5e155684a99147ad5be6e05b110f181f743b8092bf6992d6adfeabc19b962b143e7db15deab9472110926f72e1ad45be483522241
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-nx/selinux-nx-2.20190609-r1.ebuild b/sec-policy/selinux-nx/selinux-nx-2.20190609-r1.ebuild
index 59795ad5fd60..c4778537359d 100644
--- a/sec-policy/selinux-nx/selinux-nx-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-nx/selinux-nx-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-nx/selinux-nx-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..59795ad5fd60
--- /dev/null
+++ b/sec-policy/selinux-nx/selinux-nx-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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-oddjob/Manifest b/sec-policy/selinux-oddjob/Manifest
index 3265b4899411..9b61f025fc57 100644
--- a/sec-policy/selinux-oddjob/Manifest
+++ b/sec-policy/selinux-oddjob/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-oddjob-2.20190201-r1.ebuild 279 BLAKE2B 44fc11143f580f02f1c1abe7f7730a5a696c05a30f5f1b8618caa3e8c131b28bbf14ad78db373ddfec7cba7f862a8678ddd3a5896c86bd939758bef9bb4c6087 SHA512 fd8d57586f957e4b328230ef18e4af4e6e491e23c14dd28866afc5f27bf258f9b8c2f11ba0ab5977f9deac3212086bb2e915a9452679c612b2bfaf8c4b2c725d
-EBUILD selinux-oddjob-2.20190609-r1.ebuild 281 BLAKE2B f71e57ac79b2d5c967da8f8fb8db23f1cce3815132530ff69e75704451facfa7edce68196f102d7de8b1988e585a450c155830fa95485fccd799638f6deb616a SHA512 f0e328f4338b9481c2d984c0a5f5e51872acd22edbad19c84e5b980705f2fdb90a71b6ca8e4bcf21ee4f94cf2a03617ad7d66a12457c47fc817f917fa12c0079
+EBUILD selinux-oddjob-2.20190609-r1.ebuild 279 BLAKE2B 44fc11143f580f02f1c1abe7f7730a5a696c05a30f5f1b8618caa3e8c131b28bbf14ad78db373ddfec7cba7f862a8678ddd3a5896c86bd939758bef9bb4c6087 SHA512 fd8d57586f957e4b328230ef18e4af4e6e491e23c14dd28866afc5f27bf258f9b8c2f11ba0ab5977f9deac3212086bb2e915a9452679c612b2bfaf8c4b2c725d
+EBUILD selinux-oddjob-2.20200818-r1.ebuild 281 BLAKE2B f71e57ac79b2d5c967da8f8fb8db23f1cce3815132530ff69e75704451facfa7edce68196f102d7de8b1988e585a450c155830fa95485fccd799638f6deb616a SHA512 f0e328f4338b9481c2d984c0a5f5e51872acd22edbad19c84e5b980705f2fdb90a71b6ca8e4bcf21ee4f94cf2a03617ad7d66a12457c47fc817f917fa12c0079
 EBUILD selinux-oddjob-9999.ebuild 284 BLAKE2B ed63c6cafc7e1a1df2d386962a3b1ec55eb493748792a5c46afef4a2cad750a9330bb7bebe9621696ff179e9fe409bef1df81beb11c97ce844c0e9e9917ceb4d SHA512 c2f1755f7edaf9e044adbc145191bd93abc920c39b91bf4d404e48e9018210a0ea2a3d268e481e11c8a4c96babf5111f4cf13705c43a9261135f4fe9a082f89c
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-oddjob/selinux-oddjob-2.20190609-r1.ebuild b/sec-policy/selinux-oddjob/selinux-oddjob-2.20190609-r1.ebuild
index 58df45b08d61..504ae44fe9a2 100644
--- a/sec-policy/selinux-oddjob/selinux-oddjob-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-oddjob/selinux-oddjob-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-oddjob/selinux-oddjob-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..58df45b08d61
--- /dev/null
+++ b/sec-policy/selinux-oddjob/selinux-oddjob-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 c4bd93d5bb46..4c0953d07c32 100644
--- a/sec-policy/selinux-oident/Manifest
+++ b/sec-policy/selinux-oident/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-oident-2.20190201-r1.ebuild 279 BLAKE2B 759f3ad4d9b574d8b64804bbacfe5ed30a63fdce5b20a6ce99a1f0dd85d2bc797e817f351fcebcdabeb81814b1444d5d8f088dd32c8ee6b2cf98875da84d2a5c SHA512 10d21b8bdfedb7fbf38edd74e11e4b6fa6e7a7a6cf4355587a643a902f6d7636d319262f25b4cfded41a4771f5059e82858889a43eabb4c1097a5f30e457fe6e
-EBUILD selinux-oident-2.20190609-r1.ebuild 281 BLAKE2B 727502457342c051bc476f233fcaec61ecb3a5310d267e0f1ada56a8c06fdb96723458211afe68939a244a55aa90ee52c0c4a8440f5d0c28c90da3bf24aa2845 SHA512 594b8dbb17725dec1b5111729687823f7c3995534a3a34356b7aa4dc46d976797289afaa1b98faf693fa8a37be576d846078b550101477ed627ef61fbcdfc9c8
+EBUILD selinux-oident-2.20190609-r1.ebuild 279 BLAKE2B 759f3ad4d9b574d8b64804bbacfe5ed30a63fdce5b20a6ce99a1f0dd85d2bc797e817f351fcebcdabeb81814b1444d5d8f088dd32c8ee6b2cf98875da84d2a5c SHA512 10d21b8bdfedb7fbf38edd74e11e4b6fa6e7a7a6cf4355587a643a902f6d7636d319262f25b4cfded41a4771f5059e82858889a43eabb4c1097a5f30e457fe6e
+EBUILD selinux-oident-2.20200818-r1.ebuild 281 BLAKE2B 727502457342c051bc476f233fcaec61ecb3a5310d267e0f1ada56a8c06fdb96723458211afe68939a244a55aa90ee52c0c4a8440f5d0c28c90da3bf24aa2845 SHA512 594b8dbb17725dec1b5111729687823f7c3995534a3a34356b7aa4dc46d976797289afaa1b98faf693fa8a37be576d846078b550101477ed627ef61fbcdfc9c8
 EBUILD selinux-oident-9999.ebuild 284 BLAKE2B 442348f25d861e4e5f31e9b4c13efc4cec2f4a65ea87ebe3920299030ac02aa79a7ff4792c0eb1653fa16daa5b276c8645063f434cfba4ce1838811b9c409185 SHA512 ecc1190e8c53f85a39c31ffb5161f13ba84cc5fd693e5dc082e24215504e1d43b52da295fffc938c386a1a5d441a05d0b850eab09fc262f2ae476b33e1246f03
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-oident/selinux-oident-2.20190609-r1.ebuild b/sec-policy/selinux-oident/selinux-oident-2.20190609-r1.ebuild
index b90e9ee9776f..863e0f5420bf 100644
--- a/sec-policy/selinux-oident/selinux-oident-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-oident/selinux-oident-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-oident/selinux-oident-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..b90e9ee9776f
--- /dev/null
+++ b/sec-policy/selinux-oident/selinux-oident-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 a07bc2fffab3..4c85bd5e7b1c 100644
--- a/sec-policy/selinux-openct/Manifest
+++ b/sec-policy/selinux-openct/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-openct-2.20190201-r1.ebuild 279 BLAKE2B 7a2cb7239cd30fd655d1fafe209ddb38cff91e8b50e9de55f8be77faabd22d283e4b16e4a4b36ad9a1b6153088c3a029c26c4abb57e77bb9229a5d84b569ad7e SHA512 b98cd435513152795b4459d547b01ea6fdc54341107916b7ef14f707386ba9a5be518e4fb340c71f214aeb37b49a0f8758e70de929442766f73164206fe374e3
-EBUILD selinux-openct-2.20190609-r1.ebuild 281 BLAKE2B 7261b80232bc7404245cc7578360d71559de0a2a93a51322cfaf205e3348c5acf7008d36d82fcabeb46df26833e43fdde8f868767e7d8eca73b73b996cfd177c SHA512 f86381531ca33ee479aeb392244c7febcb47cb4943d6178a52f48a32f14af55e040fd6a93284bcd20126e56bd7f37043eed0e41506eec4ff0f7d1c3602530f20
+EBUILD selinux-openct-2.20190609-r1.ebuild 279 BLAKE2B 7a2cb7239cd30fd655d1fafe209ddb38cff91e8b50e9de55f8be77faabd22d283e4b16e4a4b36ad9a1b6153088c3a029c26c4abb57e77bb9229a5d84b569ad7e SHA512 b98cd435513152795b4459d547b01ea6fdc54341107916b7ef14f707386ba9a5be518e4fb340c71f214aeb37b49a0f8758e70de929442766f73164206fe374e3
+EBUILD selinux-openct-2.20200818-r1.ebuild 281 BLAKE2B 7261b80232bc7404245cc7578360d71559de0a2a93a51322cfaf205e3348c5acf7008d36d82fcabeb46df26833e43fdde8f868767e7d8eca73b73b996cfd177c SHA512 f86381531ca33ee479aeb392244c7febcb47cb4943d6178a52f48a32f14af55e040fd6a93284bcd20126e56bd7f37043eed0e41506eec4ff0f7d1c3602530f20
 EBUILD selinux-openct-9999.ebuild 284 BLAKE2B ae928c8dbd24d74563cdd5ff2c33c04954d6e07a5487676802739a8c8ce462698a64fae943b3275e5c3165eda22f9de33b4a5c1986dba91088e0a005fedb1265 SHA512 f70acdcca26423c00fd2bc50e7eb7dfca41da9002736e6e99fcd4a90f8e80faecd4b034512f597df758e0d8c3f902d46034296e06fde3b2432756f5a207bc09b
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-openct/selinux-openct-2.20190609-r1.ebuild b/sec-policy/selinux-openct/selinux-openct-2.20190609-r1.ebuild
index b4d08894f2a2..fcced3021952 100644
--- a/sec-policy/selinux-openct/selinux-openct-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-openct/selinux-openct-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-openct/selinux-openct-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..b4d08894f2a2
--- /dev/null
+++ b/sec-policy/selinux-openct/selinux-openct-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 93f8e3d5aeb2..2ce56c392e16 100644
--- a/sec-policy/selinux-openrc/Manifest
+++ b/sec-policy/selinux-openrc/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-openrc-2.20190201-r1.ebuild 279 BLAKE2B a449236e20a9fa1dbbfc56e801e65d0297768b4b2b3e1baa71ee7e8a43157b73c76e2afa5efaa4fb29fc6a1c72b99ea7a08ebb6ca67528fb370e37fb352dbc9b SHA512 8200500eb0253b1b643622cb3fb3055681d838b68d067ac0b97cdd8d31be52891e3fa0a0fd158d2aa52d40b3e64caf1b224fc47e3abdd544db412f2997b6078d
-EBUILD selinux-openrc-2.20190609-r1.ebuild 281 BLAKE2B bbe96c869096466ffb73f6a6f1914af16b8855b6c4ca3776bf6a24e98c6f57a06433c06d25afb0d8f41b005ba7037be8eb96eb995f56de0ef94f8820bf170452 SHA512 aad6bef6f133fb0b03f7f1850ef57836933c8066eefbe3bce1cf61f855845399f3cacdb1728cbdfbc7f5d189f6ee0d237d7ddae3fc5e0b3a6731dbc4493afd8d
+EBUILD selinux-openrc-2.20190609-r1.ebuild 279 BLAKE2B a449236e20a9fa1dbbfc56e801e65d0297768b4b2b3e1baa71ee7e8a43157b73c76e2afa5efaa4fb29fc6a1c72b99ea7a08ebb6ca67528fb370e37fb352dbc9b SHA512 8200500eb0253b1b643622cb3fb3055681d838b68d067ac0b97cdd8d31be52891e3fa0a0fd158d2aa52d40b3e64caf1b224fc47e3abdd544db412f2997b6078d
+EBUILD selinux-openrc-2.20200818-r1.ebuild 281 BLAKE2B bbe96c869096466ffb73f6a6f1914af16b8855b6c4ca3776bf6a24e98c6f57a06433c06d25afb0d8f41b005ba7037be8eb96eb995f56de0ef94f8820bf170452 SHA512 aad6bef6f133fb0b03f7f1850ef57836933c8066eefbe3bce1cf61f855845399f3cacdb1728cbdfbc7f5d189f6ee0d237d7ddae3fc5e0b3a6731dbc4493afd8d
 EBUILD selinux-openrc-9999.ebuild 284 BLAKE2B 313134eba93ce4e5bcde5cafe837ad5aab947074532079f15c1be7800a2416c0fb7488f7ee9f029b04d456731d008fcdc42bbb821ef7d03882596c041a123e26 SHA512 01f422752468623d55e3c674ba4f21dddb9c5d29646ea434ad11027a9379eefa2009078bd5111c1ac4f51be0f246cf7f540951939ccc6bf637d96e5a2e499c11
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-openrc/selinux-openrc-2.20190609-r1.ebuild b/sec-policy/selinux-openrc/selinux-openrc-2.20190609-r1.ebuild
index dea3563f66d0..44f108d670a2 100644
--- a/sec-policy/selinux-openrc/selinux-openrc-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-openrc/selinux-openrc-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-openrc/selinux-openrc-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..dea3563f66d0
--- /dev/null
+++ b/sec-policy/selinux-openrc/selinux-openrc-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 9620686e2bc9..a6561b35c8f6 100644
--- a/sec-policy/selinux-openvpn/Manifest
+++ b/sec-policy/selinux-openvpn/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-openvpn-2.20190201-r1.ebuild 281 BLAKE2B 3901343914a202fc70b486f548eac099cce66db5f4d311fbdcae92864619588fa98e86da01c22b710ee97e85228e769db497686c56a673992392626165f138b1 SHA512 91ef7e7ab0d229f1d345e2ca3849341518ce02d46a9b4e31f1b477a08454c1d5f57adb34e7fbe0ac71e9af11649a231eb15c5901dfe5bbf7a9603b38d14db23a
-EBUILD selinux-openvpn-2.20190609-r1.ebuild 283 BLAKE2B e24fb6409fe7004584d3076bc79ed70595755950792556c46ef8a6694649e23825b8cdd4a2f40fce41c3473da9f02de9ddbeba30e5a78f888eacd8bfd312ca9c SHA512 507fd6c149240bd099bd50febcde48756e60e53bb50b5b6cf1b3aabec5414e5b6c1913c839acb0ef6b1c1f4d84a1fd65e4ff4f5b142c1ba5e477c514b9686f35
+EBUILD selinux-openvpn-2.20190609-r1.ebuild 281 BLAKE2B 3901343914a202fc70b486f548eac099cce66db5f4d311fbdcae92864619588fa98e86da01c22b710ee97e85228e769db497686c56a673992392626165f138b1 SHA512 91ef7e7ab0d229f1d345e2ca3849341518ce02d46a9b4e31f1b477a08454c1d5f57adb34e7fbe0ac71e9af11649a231eb15c5901dfe5bbf7a9603b38d14db23a
+EBUILD selinux-openvpn-2.20200818-r1.ebuild 283 BLAKE2B e24fb6409fe7004584d3076bc79ed70595755950792556c46ef8a6694649e23825b8cdd4a2f40fce41c3473da9f02de9ddbeba30e5a78f888eacd8bfd312ca9c SHA512 507fd6c149240bd099bd50febcde48756e60e53bb50b5b6cf1b3aabec5414e5b6c1913c839acb0ef6b1c1f4d84a1fd65e4ff4f5b142c1ba5e477c514b9686f35
 EBUILD selinux-openvpn-9999.ebuild 286 BLAKE2B 9870b13ff62577402f2bf741e8cfc541f882e7996087e2de920b53c761ec45308e971506c7c0f1ef7abd174e99f5ac38cf6e343fc77c01112436d62d9c6b52a9 SHA512 5fb9eef8e6f7ddf9a2235a2a041bf0dcd92fba3ba96c78ec4885aa9b47670740dfa632f5bc85469e83ec7e1a02ed0bff9dd041bbed076b89a5e9cf2885472269
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-openvpn/selinux-openvpn-2.20190609-r1.ebuild b/sec-policy/selinux-openvpn/selinux-openvpn-2.20190609-r1.ebuild
index f7dcbc5e398c..ef1d67bb9881 100644
--- a/sec-policy/selinux-openvpn/selinux-openvpn-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-openvpn/selinux-openvpn-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-openvpn/selinux-openvpn-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..f7dcbc5e398c
--- /dev/null
+++ b/sec-policy/selinux-openvpn/selinux-openvpn-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 db8d1f3dc670..31cf35e088c8 100644
--- a/sec-policy/selinux-pan/Manifest
+++ b/sec-policy/selinux-pan/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-pan-2.20190201-r1.ebuild 371 BLAKE2B 02c3cfd92d4e428f1a938bf2eb48fb4b9bf2e9abe07e46a389bb0111d415877e5883d88cbb426f9bfd7ef221074fc1f541353f265704a6e33d06af3f023bf2cb SHA512 589774156f482267066ce616f33b69880a9ac44de8d881ad2bcde80c87e969912e09e4eaeb5b87611106d68a8b8f08c823f1c6e90820ad058b1f032ede3064fd
-EBUILD selinux-pan-2.20190609-r1.ebuild 373 BLAKE2B 56a7b1bb53f9d4d03aedc8140ab64523ffa34d9664d7d109645f3d2bb6e2d8d369a846270293b6a43356102084d3733855b06343e10b40e1a93e00020df2ed8a SHA512 90abb7eb1008b8ca96acc3d50b53157241c5151a492e316231994f6d538ba29aa5aa29f25547f4732b048723813a708c9ab24985befa819a21a0134623c058d5
+EBUILD selinux-pan-2.20190609-r1.ebuild 371 BLAKE2B 02c3cfd92d4e428f1a938bf2eb48fb4b9bf2e9abe07e46a389bb0111d415877e5883d88cbb426f9bfd7ef221074fc1f541353f265704a6e33d06af3f023bf2cb SHA512 589774156f482267066ce616f33b69880a9ac44de8d881ad2bcde80c87e969912e09e4eaeb5b87611106d68a8b8f08c823f1c6e90820ad058b1f032ede3064fd
+EBUILD selinux-pan-2.20200818-r1.ebuild 373 BLAKE2B 56a7b1bb53f9d4d03aedc8140ab64523ffa34d9664d7d109645f3d2bb6e2d8d369a846270293b6a43356102084d3733855b06343e10b40e1a93e00020df2ed8a SHA512 90abb7eb1008b8ca96acc3d50b53157241c5151a492e316231994f6d538ba29aa5aa29f25547f4732b048723813a708c9ab24985befa819a21a0134623c058d5
 EBUILD selinux-pan-9999.ebuild 376 BLAKE2B e23435e0a3c0f4b938459b37600c2cb4ed1b3b9f47e7f77946c517f36d700ebd2dc3a3d0ac683f43b04c831b87cf0e96879d0e23f0abdeaca8cd4ed36ef762b6 SHA512 582e855b3f35d5d2a54c44c09bc6ddda6de6547473e6aba04d6d1f6852c1524d6ce3e8c381e843979d5d3a8feb0bb7cf5f63e5578df3f4cb24fc55d002a270c4
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-pan/selinux-pan-2.20190609-r1.ebuild b/sec-policy/selinux-pan/selinux-pan-2.20190609-r1.ebuild
index 1503c2593652..80eb12670a63 100644
--- a/sec-policy/selinux-pan/selinux-pan-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-pan/selinux-pan-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-pan/selinux-pan-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..1503c2593652
--- /dev/null
+++ b/sec-policy/selinux-pan/selinux-pan-2.20200818-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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-pcmcia/Manifest b/sec-policy/selinux-pcmcia/Manifest
index 737b189afcfa..877c2f4a4977 100644
--- a/sec-policy/selinux-pcmcia/Manifest
+++ b/sec-policy/selinux-pcmcia/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-pcmcia-2.20190201-r1.ebuild 279 BLAKE2B 80d1c9c4391cc95929fca29942d85cfddbc1ac34c52516d4031b3d3500a95dad19830f2ba13738736ba9e73bc09463a7898734c7d1e7bb8bc89cc1ea02ef52ea SHA512 fe8df27652623af74dd091a2ae39c81ed67ec2285bf7bcaa70087bceca14beedfc5b04a380831156106e0d4442c60ed357ac7215b98cd4105687aa21e707639c
-EBUILD selinux-pcmcia-2.20190609-r1.ebuild 281 BLAKE2B 08dfa0f85738fd137dbfd9839f5179d24ef022d3848caa65e5fccb6ec43940a0d4ae24313a6b4b54603913159f8c23fed126cc751f94b5b95766d5681164c7a7 SHA512 94e89c183838588d84fce435055007808b3cad7eed2e7bcd1f77ed94eff22d41b94ad8ea2484b97b2dce912a5ed8182f5b1538b99d1e02b13972c4a776505ec9
+EBUILD selinux-pcmcia-2.20190609-r1.ebuild 279 BLAKE2B 80d1c9c4391cc95929fca29942d85cfddbc1ac34c52516d4031b3d3500a95dad19830f2ba13738736ba9e73bc09463a7898734c7d1e7bb8bc89cc1ea02ef52ea SHA512 fe8df27652623af74dd091a2ae39c81ed67ec2285bf7bcaa70087bceca14beedfc5b04a380831156106e0d4442c60ed357ac7215b98cd4105687aa21e707639c
+EBUILD selinux-pcmcia-2.20200818-r1.ebuild 281 BLAKE2B 08dfa0f85738fd137dbfd9839f5179d24ef022d3848caa65e5fccb6ec43940a0d4ae24313a6b4b54603913159f8c23fed126cc751f94b5b95766d5681164c7a7 SHA512 94e89c183838588d84fce435055007808b3cad7eed2e7bcd1f77ed94eff22d41b94ad8ea2484b97b2dce912a5ed8182f5b1538b99d1e02b13972c4a776505ec9
 EBUILD selinux-pcmcia-9999.ebuild 284 BLAKE2B 626e0b07b0dee2f76281f68fb70a5aa59fb4bb69ca58ddc57a8688b0cb251e99439a1c9cd73eb220d3f33d3be08df2399475243ca11be0357cf64627ab03abca SHA512 63d9e666ff23a5c0a824f7c834c157f405563c5f422d3b1a873af0f27648c3a269d247f292d23bf538e3d813f7d442e74401aa8ace5842beb589a0284e68caba
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20190609-r1.ebuild b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20190609-r1.ebuild
index 53a2eb2d6d43..d8101a720a87 100644
--- a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for pcmcia"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20200818-r1.ebuild b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..53a2eb2d6d43
--- /dev/null
+++ b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="pcmcia"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for pcmcia"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-pcscd/Manifest b/sec-policy/selinux-pcscd/Manifest
index cf516cff50ba..3eca6560568f 100644
--- a/sec-policy/selinux-pcscd/Manifest
+++ b/sec-policy/selinux-pcscd/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-pcscd-2.20190201-r1.ebuild 277 BLAKE2B 14af72f07e1b2d4a35080888afd938f1589e0aaecb161c99dfc8d23d75c3d823d675400bde8cb08b3bf787b3f679d3c7b799a8b29c8c6eb0af4b4bce76773066 SHA512 7af60c0e5d444be8883d7ef4ab016e2aff7441ad7f7991e4c92f55a77d967ed6f5999328c00f8c3e6955663cf115dfe82f8a1d18a8aca8b49e6e27abca570d9c
-EBUILD selinux-pcscd-2.20190609-r1.ebuild 279 BLAKE2B 99874230b286462bd5ecc25c3bfb2a630221dd39e32ac43ecc7c9eee63c9d252ff785db419609b6cbd008f14595848c29246c91e1f808d283963b8c780c92820 SHA512 5c41dacc7644bc9ea2b7fab3c761505b2024fc075c37cde20a108e2e97cc863293271e01bbfa3de73dcbaaf2a175da31ab138a90bcf6f905a0094dbf3cc6c995
+EBUILD selinux-pcscd-2.20190609-r1.ebuild 277 BLAKE2B 14af72f07e1b2d4a35080888afd938f1589e0aaecb161c99dfc8d23d75c3d823d675400bde8cb08b3bf787b3f679d3c7b799a8b29c8c6eb0af4b4bce76773066 SHA512 7af60c0e5d444be8883d7ef4ab016e2aff7441ad7f7991e4c92f55a77d967ed6f5999328c00f8c3e6955663cf115dfe82f8a1d18a8aca8b49e6e27abca570d9c
+EBUILD selinux-pcscd-2.20200818-r1.ebuild 279 BLAKE2B 99874230b286462bd5ecc25c3bfb2a630221dd39e32ac43ecc7c9eee63c9d252ff785db419609b6cbd008f14595848c29246c91e1f808d283963b8c780c92820 SHA512 5c41dacc7644bc9ea2b7fab3c761505b2024fc075c37cde20a108e2e97cc863293271e01bbfa3de73dcbaaf2a175da31ab138a90bcf6f905a0094dbf3cc6c995
 EBUILD selinux-pcscd-9999.ebuild 282 BLAKE2B cc4f115270f04182686dfb848d3f4fda0625644c6fb89d0d63998fbed53c39e2ff444a4c0a4a45996697a2cf94a853f13d600b3a76975cf233c8103b5189ffa0 SHA512 05127d9dca3198ffd2bbb71e7b7ca2463c6426ac15d093b0393785140e905695062421cdbdae9c552bf89f1ae7f50a545bbc38d20e0e46032b9cc7efae960c7e
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-pcscd/selinux-pcscd-2.20190609-r1.ebuild b/sec-policy/selinux-pcscd/selinux-pcscd-2.20190609-r1.ebuild
index bd02138a6f8b..4acb66f5c9db 100644
--- a/sec-policy/selinux-pcscd/selinux-pcscd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-pcscd/selinux-pcscd-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-pcscd/selinux-pcscd-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..bd02138a6f8b
--- /dev/null
+++ b/sec-policy/selinux-pcscd/selinux-pcscd-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 bf5a4147e9a8..a4aef46d5a0a 100644
--- a/sec-policy/selinux-phpfpm/Manifest
+++ b/sec-policy/selinux-phpfpm/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-phpfpm-2.20190201-r1.ebuild 375 BLAKE2B 089da64a70fbac8ac9d501782b1461bf0d96315719fdd6ad2c2907c07ac2d0cef52923e5844cdfca64caee95b7606bbe6e303c8d479ae1ddfdb3fbe40b3dfc7d SHA512 6d5ce0f583744237ffd5046672ff00fe0faed7775b4f457d1d1587a7d372141e4232b0b7176474365d5fc6d9d707cd779c66af3c4de548b884088b46d6440817
-EBUILD selinux-phpfpm-2.20190609-r1.ebuild 377 BLAKE2B 0b1174701d156d7dde63a3773990c2098cc0e3e790721e85711ec9fbb88b46951cd01922b74bcea83035d502c4b456e4960d0fd2884e7a0c5289f39de29fc809 SHA512 05c54e083b8d2d161baee23b74bdb13486c64937d5f9c6a6f652d201a299ea963a31408fd3c7e399df5f529586ea95d155a4ec5828adfa757a6817f285ba9b55
+EBUILD selinux-phpfpm-2.20190609-r1.ebuild 375 BLAKE2B 089da64a70fbac8ac9d501782b1461bf0d96315719fdd6ad2c2907c07ac2d0cef52923e5844cdfca64caee95b7606bbe6e303c8d479ae1ddfdb3fbe40b3dfc7d SHA512 6d5ce0f583744237ffd5046672ff00fe0faed7775b4f457d1d1587a7d372141e4232b0b7176474365d5fc6d9d707cd779c66af3c4de548b884088b46d6440817
+EBUILD selinux-phpfpm-2.20200818-r1.ebuild 377 BLAKE2B 0b1174701d156d7dde63a3773990c2098cc0e3e790721e85711ec9fbb88b46951cd01922b74bcea83035d502c4b456e4960d0fd2884e7a0c5289f39de29fc809 SHA512 05c54e083b8d2d161baee23b74bdb13486c64937d5f9c6a6f652d201a299ea963a31408fd3c7e399df5f529586ea95d155a4ec5828adfa757a6817f285ba9b55
 EBUILD selinux-phpfpm-9999.ebuild 380 BLAKE2B 3694c381aecfd427fbc3dc9069a729cdd0e923a6dc8b36e5204082acbf91f537274e52e40d27c1c60de3d1af42e904922dd45a8a5f4735cf2009f0fa3030314c SHA512 33a73b97d169cf0e27a135cf924041ba933e3aad3c65fb3fe028a814f7197c9eed3b01deffb2532a9783769cc66a69d877456a04028467227adaec315bd614fe
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20190609-r1.ebuild b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20190609-r1.ebuild
index 3a745cef6455..495a799ebde2 100644
--- a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..3a745cef6455
--- /dev/null
+++ b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20200818-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 73ae74ec006a..4b2f556d5e84 100644
--- a/sec-policy/selinux-plymouthd/Manifest
+++ b/sec-policy/selinux-plymouthd/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-plymouthd-2.20190201-r1.ebuild 285 BLAKE2B 58282aa8ea562e0d1bdc510a3cc5f80bb218d7d6b06e9c917ce282ca89cd9cfc1d7a1c45aac10913dbccf79c4d61b0848c75514a5730aee9d24233030a51b504 SHA512 f81ed583586eea182fc97f99f170e5d6534b9dc029e388dbb9c610fe178ff18d2c5cca8e944ebd9b06f8e53fdbfd9bbdbfa40c565be3b29028087b89e43e3fe5
-EBUILD selinux-plymouthd-2.20190609-r1.ebuild 287 BLAKE2B 34eae1fa3e449c554a4411e5df4e3efb6fc64d344b60930f46d7d7ffa17764c55def0312dc15acb8d7f5aa03ef67d338b7a732fa0e31ea90a21a45cc43ab7830 SHA512 893cef17e3703eb9c6aa89735eaff0facf6fbbbcb2a7bda2a972ca354a8c3a471b38215fb751bc5be3239996527c745e1312db88138bebb503276fe291563eb3
+EBUILD selinux-plymouthd-2.20190609-r1.ebuild 285 BLAKE2B 58282aa8ea562e0d1bdc510a3cc5f80bb218d7d6b06e9c917ce282ca89cd9cfc1d7a1c45aac10913dbccf79c4d61b0848c75514a5730aee9d24233030a51b504 SHA512 f81ed583586eea182fc97f99f170e5d6534b9dc029e388dbb9c610fe178ff18d2c5cca8e944ebd9b06f8e53fdbfd9bbdbfa40c565be3b29028087b89e43e3fe5
+EBUILD selinux-plymouthd-2.20200818-r1.ebuild 287 BLAKE2B 34eae1fa3e449c554a4411e5df4e3efb6fc64d344b60930f46d7d7ffa17764c55def0312dc15acb8d7f5aa03ef67d338b7a732fa0e31ea90a21a45cc43ab7830 SHA512 893cef17e3703eb9c6aa89735eaff0facf6fbbbcb2a7bda2a972ca354a8c3a471b38215fb751bc5be3239996527c745e1312db88138bebb503276fe291563eb3
 EBUILD selinux-plymouthd-9999.ebuild 290 BLAKE2B df4dcdeb44641d9d2a139c82074bb9cc100d9c84d43a3ca3b1a4ce11be7109a3291e695b4a5e7a8a0e03d469e7870c7e6155f25da25e9e49dbd63df008edc9b8 SHA512 8054bb24381253a5edcabc539c3fe020417749c741c214e22a40cf0215632f1ec213a55b842582ab4bda38b35039c0748615cb4d9f44225ff5e2164d50d37e85
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20190609-r1.ebuild b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20190609-r1.ebuild
index aeb8a9ab00a4..4d55cda939ad 100644
--- a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..aeb8a9ab00a4
--- /dev/null
+++ b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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-podsleuth/Manifest b/sec-policy/selinux-podsleuth/Manifest
index c3adced7acb6..06ec8ffd557e 100644
--- a/sec-policy/selinux-podsleuth/Manifest
+++ b/sec-policy/selinux-podsleuth/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-podsleuth-2.20190201-r1.ebuild 285 BLAKE2B fb843da9deaff224e99f07a7cde58c27ec0951038b765d9ddb260fc4c9be9a71a87fb9535139b512c028183e8deff881294c97aaf99b4b7157be693ba46c7933 SHA512 fcdee43eacc756d0be5b911c080c923f630a605e4de3721e92ffdfe22539497a2493640ddcd21c373a4eaa50361193118f37c4cc60496907abef189fb4499ffd
-EBUILD selinux-podsleuth-2.20190609-r1.ebuild 287 BLAKE2B 097d4d451300b484407b2b3f74ac4f56ac1870da6a8c66e76ccf93580feef9dab92216fe1e2896bbdef707fdcb34b712e316ae798367ed87bdf8704f69d38286 SHA512 23ab0841e758216041fd65da184d524147079228d3c15017b035faff029f8717de2e8de35f096621852b7eed1710435e80cceedf3df48532f5fb9523a31c5945
+EBUILD selinux-podsleuth-2.20190609-r1.ebuild 285 BLAKE2B fb843da9deaff224e99f07a7cde58c27ec0951038b765d9ddb260fc4c9be9a71a87fb9535139b512c028183e8deff881294c97aaf99b4b7157be693ba46c7933 SHA512 fcdee43eacc756d0be5b911c080c923f630a605e4de3721e92ffdfe22539497a2493640ddcd21c373a4eaa50361193118f37c4cc60496907abef189fb4499ffd
+EBUILD selinux-podsleuth-2.20200818-r1.ebuild 287 BLAKE2B 097d4d451300b484407b2b3f74ac4f56ac1870da6a8c66e76ccf93580feef9dab92216fe1e2896bbdef707fdcb34b712e316ae798367ed87bdf8704f69d38286 SHA512 23ab0841e758216041fd65da184d524147079228d3c15017b035faff029f8717de2e8de35f096621852b7eed1710435e80cceedf3df48532f5fb9523a31c5945
 EBUILD selinux-podsleuth-9999.ebuild 290 BLAKE2B 470400ab7c02d619486c00a23eb639a94bb272c639f8cf3b76c5a14c887921626b6d406df53bf08a305ba7ee184b7b59aaaae03aac95c2f93cdbfb4bcd51d964 SHA512 fd011e04a23cba4833c06489b0fb2ccf4d3f3ab5761a8fa46bdc6d4d3f055e5b513978b499eaa1e47478708c437254fcc059a31084f63f1092109a16b8ec871b
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20190609-r1.ebuild b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20190609-r1.ebuild
index ed5f848b5282..d1579186954e 100644
--- a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for podsleuth"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20200818-r1.ebuild b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..ed5f848b5282
--- /dev/null
+++ b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="podsleuth"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for podsleuth"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-policykit/Manifest b/sec-policy/selinux-policykit/Manifest
index ac852e65f831..82b6eff1c9a8 100644
--- a/sec-policy/selinux-policykit/Manifest
+++ b/sec-policy/selinux-policykit/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-policykit-2.20190201-r1.ebuild 285 BLAKE2B b2980d5d65e9e35f0278625fe2905e9ac2ddae5798e39012ccb07f46b8c179e18262206f35718cd957ccdfd441614ce5194510a2dde545e7dc799d229d196716 SHA512 505f3e842e8339f204659b908eecc27d0bf7f3f23ce1ef8cfb7a18262461e734b653195dd83125f2a676c05d7555c113b9ccba7a7c3a215ee119f0fa36c082f1
-EBUILD selinux-policykit-2.20190609-r1.ebuild 287 BLAKE2B 2f44323e96d97d826145bbe1e8ce3023f98fe46802df9fb3156ac6acfc6e88de990a1a1821f510270e3bf68a1c0fdb60229f6787d97544c5c01b46c0b5f862eb SHA512 13dfc29dad051e775ae7624691a53870563a649454a0b672c3c33e4a424f6983dc859a6ad29e900c519d2932aceef7d25623c9d8e33e5b2337bbfec3b22fe772
+EBUILD selinux-policykit-2.20190609-r1.ebuild 285 BLAKE2B b2980d5d65e9e35f0278625fe2905e9ac2ddae5798e39012ccb07f46b8c179e18262206f35718cd957ccdfd441614ce5194510a2dde545e7dc799d229d196716 SHA512 505f3e842e8339f204659b908eecc27d0bf7f3f23ce1ef8cfb7a18262461e734b653195dd83125f2a676c05d7555c113b9ccba7a7c3a215ee119f0fa36c082f1
+EBUILD selinux-policykit-2.20200818-r1.ebuild 287 BLAKE2B 2f44323e96d97d826145bbe1e8ce3023f98fe46802df9fb3156ac6acfc6e88de990a1a1821f510270e3bf68a1c0fdb60229f6787d97544c5c01b46c0b5f862eb SHA512 13dfc29dad051e775ae7624691a53870563a649454a0b672c3c33e4a424f6983dc859a6ad29e900c519d2932aceef7d25623c9d8e33e5b2337bbfec3b22fe772
 EBUILD selinux-policykit-9999.ebuild 290 BLAKE2B e6457b13ad609cb554c9c643cee15cb612e4ff1c0da36af70428f6d049f26a446fd9098c0da60598e0763b2051a5f82cc3f9317b630037185bfb71aea914f23b SHA512 555aabfc7d395dd31c9ca9e2a81ab80cba119aaa751636ba1be3fafb11d4e1c39db0e45f6dc0a8d2a6989dd8536a6d312a7c3abf6de6b8293047414151c13e19
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-policykit/selinux-policykit-2.20190609-r1.ebuild b/sec-policy/selinux-policykit/selinux-policykit-2.20190609-r1.ebuild
index b74309de53c1..7a87b59f78d8 100644
--- a/sec-policy/selinux-policykit/selinux-policykit-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-policykit/selinux-policykit-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-policykit/selinux-policykit-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..b74309de53c1
--- /dev/null
+++ b/sec-policy/selinux-policykit/selinux-policykit-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 f9a195929961..97b83aa8ea5e 100644
--- a/sec-policy/selinux-portmap/Manifest
+++ b/sec-policy/selinux-portmap/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-portmap-2.20190201-r1.ebuild 281 BLAKE2B c816423ad8a07d4736795eebda9f19f77ad1d1bb8fda617c41e8ea13acc6402a4ef36a27a0458c4f70b3cf8e1d90d0adc6ba76782d24b6d02a70e15c31021858 SHA512 29fe6804192f82b24b051641484e89c1934298651e0c1d19f0add6caa2f4892e38065ee00550467e1ebcd9f4b83ae6e42c6259b8bc5ef8e9e11c7943da98bd83
-EBUILD selinux-portmap-2.20190609-r1.ebuild 283 BLAKE2B ab9850ce86f327669e905e386c8c6625232a09dc0bf6e4056180198335419074d8fb1900ecf23c3ccfb7b81ef35a2edda14207d190e414e41f0486759c4a3c15 SHA512 03a73a13745c9fa37d96dd625deeb7940dcb3322254648f63d4d6e81f96574595d5848fe70abdc31800022da1af771bd6f3540967414beda7addca94be18499b
+EBUILD selinux-portmap-2.20190609-r1.ebuild 281 BLAKE2B c816423ad8a07d4736795eebda9f19f77ad1d1bb8fda617c41e8ea13acc6402a4ef36a27a0458c4f70b3cf8e1d90d0adc6ba76782d24b6d02a70e15c31021858 SHA512 29fe6804192f82b24b051641484e89c1934298651e0c1d19f0add6caa2f4892e38065ee00550467e1ebcd9f4b83ae6e42c6259b8bc5ef8e9e11c7943da98bd83
+EBUILD selinux-portmap-2.20200818-r1.ebuild 283 BLAKE2B ab9850ce86f327669e905e386c8c6625232a09dc0bf6e4056180198335419074d8fb1900ecf23c3ccfb7b81ef35a2edda14207d190e414e41f0486759c4a3c15 SHA512 03a73a13745c9fa37d96dd625deeb7940dcb3322254648f63d4d6e81f96574595d5848fe70abdc31800022da1af771bd6f3540967414beda7addca94be18499b
 EBUILD selinux-portmap-9999.ebuild 286 BLAKE2B cd2d46a257dabfcbc7266911be39612313339fc653d90b045077c078d409e4b8ba86dd45c93d339290b7e3907e1f8b0185e5254960ed8af4ccb9552357952cf0 SHA512 031c2e742020d1d87e12d4fc8f2dd4c4026d85722f6201bc3f302a08a1200a2d6c96bdd40f7f7ffa9de712eba74d7a34b560dd40ae0b5f7c84ad5aad75c96b26
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-portmap/selinux-portmap-2.20190609-r1.ebuild b/sec-policy/selinux-portmap/selinux-portmap-2.20190609-r1.ebuild
index 582bb25a891e..f115867a52e9 100644
--- a/sec-policy/selinux-portmap/selinux-portmap-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-portmap/selinux-portmap-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-portmap/selinux-portmap-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..582bb25a891e
--- /dev/null
+++ b/sec-policy/selinux-portmap/selinux-portmap-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 c29620ed81fa..cefd9e331d2b 100644
--- a/sec-policy/selinux-postfix/Manifest
+++ b/sec-policy/selinux-postfix/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-postfix-2.20190201-r1.ebuild 281 BLAKE2B 9bf98b6e6c89ffca92aa7336763741d66c6b49c1b19eea75a1975e1208a467dd220efa854586ae32808e005d4cdda4482910a5fb2dddebc71508e42ad631e4d0 SHA512 d4807f6291021980087697022b12ef3cf57c857aa271388622a845cdff7f5c9065b0ef5a68e2203646c6b74d10ba980b17f23ca397cb04ac6f96debeeb83fdfd
-EBUILD selinux-postfix-2.20190609-r1.ebuild 283 BLAKE2B c272a75a594e3800a78cd0d86e8192a6093d06a76436a0437d161809dd4a56d235b61b84aa506cc2f04edbb797e250cdebe9c9a32f83dc751ca00274fb5f4a58 SHA512 9c16c22d9935b7ac9d4377c18f50fc6c9b18fd60dc5376f2536299bd1abe9175ffafd03478c2eac18574f3fb5e8d3c5fd6fe888ca9b0f2f6e75e5a33f127306f
+EBUILD selinux-postfix-2.20190609-r1.ebuild 281 BLAKE2B 9bf98b6e6c89ffca92aa7336763741d66c6b49c1b19eea75a1975e1208a467dd220efa854586ae32808e005d4cdda4482910a5fb2dddebc71508e42ad631e4d0 SHA512 d4807f6291021980087697022b12ef3cf57c857aa271388622a845cdff7f5c9065b0ef5a68e2203646c6b74d10ba980b17f23ca397cb04ac6f96debeeb83fdfd
+EBUILD selinux-postfix-2.20200818-r1.ebuild 283 BLAKE2B c272a75a594e3800a78cd0d86e8192a6093d06a76436a0437d161809dd4a56d235b61b84aa506cc2f04edbb797e250cdebe9c9a32f83dc751ca00274fb5f4a58 SHA512 9c16c22d9935b7ac9d4377c18f50fc6c9b18fd60dc5376f2536299bd1abe9175ffafd03478c2eac18574f3fb5e8d3c5fd6fe888ca9b0f2f6e75e5a33f127306f
 EBUILD selinux-postfix-9999.ebuild 286 BLAKE2B f239731c6d6f3236a955a03ef8d7ca60a27415dbcdd78eb1c2bc20b744242ec02d82d08272cfeb4ae02478a187bb5ca676e9f40656339425927aa76866c01417 SHA512 de91b37db28205a960ad1d9aff1cbe139e31ff5a62aec56527e4ec31a9dc2b067acc5c14059a019c32b0c13f48ad4f4b5dc8dc5259e00cc8f93f8bed4cd56708
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-postfix/selinux-postfix-2.20190609-r1.ebuild b/sec-policy/selinux-postfix/selinux-postfix-2.20190609-r1.ebuild
index 1810a1f46fe0..7fece8996395 100644
--- a/sec-policy/selinux-postfix/selinux-postfix-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-postfix/selinux-postfix-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-postfix/selinux-postfix-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..1810a1f46fe0
--- /dev/null
+++ b/sec-policy/selinux-postfix/selinux-postfix-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 d491d288de82..81d321bfb066 100644
--- a/sec-policy/selinux-postgresql/Manifest
+++ b/sec-policy/selinux-postgresql/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-postgresql-2.20190201-r1.ebuild 287 BLAKE2B 7fa155ebcc3e9765b332e9aa05b2d7e83464dc1b8b4e2d160fb34ff9bc70084d34e392e3a33ea277fa9db488cccbc2f88e4f7357a01ec1d2eb9866fb63154164 SHA512 4bbd4eae98aefa5cf1ef8f7c8d691bbfa324d38f513962422f38fd5094c9f7d1517acf8897c8ae3715da4e8791893ac8944569e10faacaad3738e677d46e6147
-EBUILD selinux-postgresql-2.20190609-r1.ebuild 289 BLAKE2B 25b6eb5b3112729c94270adbee9c93be06bff109b093edf188207931ae1c753972fe52a09c35b5a28593754d09b4098ea66d267d3543b85872e262c69fe0d2fa SHA512 bc3222ca19fc3500767677ee87ef5238330809f0747eb75e653d0d4e462ebb5bc72bc51f13bde36303714423f705b0eb4e779d57a4410b6232d1a70c600a5bc7
+EBUILD selinux-postgresql-2.20190609-r1.ebuild 287 BLAKE2B 7fa155ebcc3e9765b332e9aa05b2d7e83464dc1b8b4e2d160fb34ff9bc70084d34e392e3a33ea277fa9db488cccbc2f88e4f7357a01ec1d2eb9866fb63154164 SHA512 4bbd4eae98aefa5cf1ef8f7c8d691bbfa324d38f513962422f38fd5094c9f7d1517acf8897c8ae3715da4e8791893ac8944569e10faacaad3738e677d46e6147
+EBUILD selinux-postgresql-2.20200818-r1.ebuild 289 BLAKE2B 25b6eb5b3112729c94270adbee9c93be06bff109b093edf188207931ae1c753972fe52a09c35b5a28593754d09b4098ea66d267d3543b85872e262c69fe0d2fa SHA512 bc3222ca19fc3500767677ee87ef5238330809f0747eb75e653d0d4e462ebb5bc72bc51f13bde36303714423f705b0eb4e779d57a4410b6232d1a70c600a5bc7
 EBUILD selinux-postgresql-9999.ebuild 292 BLAKE2B f87176c539de358e83d6f04024368ea88729256d8fc15f30acdc52e31b37c56cd7f1e0ea6f72707b27eb67212dc2a8dd33396328da8b5f7f3b601bd93483d734 SHA512 12b15dfb2acd99c39b2492aa8e1e7e44cdc8a7620a2bd02cdf964a01c63f5732a8b4b1ba735f870ec64e5720b4c58ce889123cc4538db1d0a05d0ab2b6bcfdf9
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-postgresql/selinux-postgresql-2.20190609-r1.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-2.20190609-r1.ebuild
index 7e67688965b5..ed2063ef6962 100644
--- a/sec-policy/selinux-postgresql/selinux-postgresql-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-postgresql/selinux-postgresql-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..7e67688965b5
--- /dev/null
+++ b/sec-policy/selinux-postgresql/selinux-postgresql-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 4db511f59f92..3d99866c492c 100644
--- a/sec-policy/selinux-postgrey/Manifest
+++ b/sec-policy/selinux-postgrey/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-postgrey-2.20190201-r1.ebuild 283 BLAKE2B 23e8a3848d40accaf9135e87e3e01418d4a745ac264cb7ad2ccd764a72e8dae31a5c4d71c66c3a710498818ec229ac0e7ac0f0a234cc550d7d60cecf60269146 SHA512 1303580290d65a85135b1e4522dd5a803f40e598c175f29d3f25a6fe309f9db47ed023ebf20367db7d4086b2f53997a5923ddac63b146a9772765c0bab7e883c
-EBUILD selinux-postgrey-2.20190609-r1.ebuild 285 BLAKE2B 09ec7807fb2405b19b69e3a95777478bc7f679f162697f0148f12c0be557c4f64b49aa053572b1ea3fe1509a2d8d37fd78bcde46b083479b1fc25cadd555accb SHA512 7a9dbfb1f58286488ca130c35c4596c12ee57adade2b230afeffc5d2eabbfe72cfa25f908fb7dc9d90528596e8590514a6aea5e0079dd4e4da73e08829501fa0
+EBUILD selinux-postgrey-2.20190609-r1.ebuild 283 BLAKE2B 23e8a3848d40accaf9135e87e3e01418d4a745ac264cb7ad2ccd764a72e8dae31a5c4d71c66c3a710498818ec229ac0e7ac0f0a234cc550d7d60cecf60269146 SHA512 1303580290d65a85135b1e4522dd5a803f40e598c175f29d3f25a6fe309f9db47ed023ebf20367db7d4086b2f53997a5923ddac63b146a9772765c0bab7e883c
+EBUILD selinux-postgrey-2.20200818-r1.ebuild 285 BLAKE2B 09ec7807fb2405b19b69e3a95777478bc7f679f162697f0148f12c0be557c4f64b49aa053572b1ea3fe1509a2d8d37fd78bcde46b083479b1fc25cadd555accb SHA512 7a9dbfb1f58286488ca130c35c4596c12ee57adade2b230afeffc5d2eabbfe72cfa25f908fb7dc9d90528596e8590514a6aea5e0079dd4e4da73e08829501fa0
 EBUILD selinux-postgrey-9999.ebuild 288 BLAKE2B 2d4ea4a66369f520ec7cae9e95725ee4874794f402a831caa3c94b1de10471a54e07a9d7ded3159851d0cd2cabf6e059ea2055b34f37590d7028df54d1dcf0f0 SHA512 654da8d40986edd4788f329e8cd2455d60ed1e6e5839ae49505447e3dff3cd3a5d4df74b8147d90a2ed7daa62869a050c367ce6fd333679432e7b72ac719c3af
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-postgrey/selinux-postgrey-2.20190609-r1.ebuild b/sec-policy/selinux-postgrey/selinux-postgrey-2.20190609-r1.ebuild
index a3f0489332c7..26bbd1343017 100644
--- a/sec-policy/selinux-postgrey/selinux-postgrey-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-postgrey/selinux-postgrey-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-postgrey/selinux-postgrey-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..a3f0489332c7
--- /dev/null
+++ b/sec-policy/selinux-postgrey/selinux-postgrey-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 c7a64a833abc..6c9166c04f7e 100644
--- a/sec-policy/selinux-ppp/Manifest
+++ b/sec-policy/selinux-ppp/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-ppp-2.20190201-r1.ebuild 273 BLAKE2B 8c81dc3767eed7822f1f328bf0a014e210f0de9a9961c00f80139ac739fb3a4786f2c8bd04631e348d9d6c0c1ac30ac8668cb02889e6fb2631c1d55e87cba2bd SHA512 56e284526a001887312936d1e0f1c9bcbf02b0918d7d12da33395f1d678abb6280fbe5fe4d818a2208d5c9898683b8fa30032e2e7048826ff56b807a0145c789
-EBUILD selinux-ppp-2.20190609-r1.ebuild 275 BLAKE2B 9bd282b03cbb655f7f0512bb4476e48bf254dbdcd95771ecd0ee04e5aa88465aa8cd6b4c07a2027cb739c54585142d5d821593656347c851f733a5bbf45f7fea SHA512 46f589de28149a8d48b3f96d519e90a9978382606f895487d20f2810dd9c9af6f19804b7668e1fe9852ef3223bb92b32045c562c091f9f10abe84e63100cbb50
+EBUILD selinux-ppp-2.20190609-r1.ebuild 273 BLAKE2B 8c81dc3767eed7822f1f328bf0a014e210f0de9a9961c00f80139ac739fb3a4786f2c8bd04631e348d9d6c0c1ac30ac8668cb02889e6fb2631c1d55e87cba2bd SHA512 56e284526a001887312936d1e0f1c9bcbf02b0918d7d12da33395f1d678abb6280fbe5fe4d818a2208d5c9898683b8fa30032e2e7048826ff56b807a0145c789
+EBUILD selinux-ppp-2.20200818-r1.ebuild 275 BLAKE2B 9bd282b03cbb655f7f0512bb4476e48bf254dbdcd95771ecd0ee04e5aa88465aa8cd6b4c07a2027cb739c54585142d5d821593656347c851f733a5bbf45f7fea SHA512 46f589de28149a8d48b3f96d519e90a9978382606f895487d20f2810dd9c9af6f19804b7668e1fe9852ef3223bb92b32045c562c091f9f10abe84e63100cbb50
 EBUILD selinux-ppp-9999.ebuild 278 BLAKE2B 596f8c07c02e2d942432234d601f100b68a3f6baf21132d790ea9b5bdb2e72b9c10ee5b95f8cf4ea9e40d3e81a255ae73d25d2bb8d3754a5be49db65ebf98c70 SHA512 2b6370f5d45ce0cf2447b70fbc2fd574a23b8581960c12c98bdbb03ba1649642be8d8da04130637db612012cca12b9d52a63f74afc54565763d87047e680c0f2
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ppp/selinux-ppp-2.20190609-r1.ebuild b/sec-policy/selinux-ppp/selinux-ppp-2.20190609-r1.ebuild
index f244bcc0de19..b56d8145fe51 100644
--- a/sec-policy/selinux-ppp/selinux-ppp-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-ppp/selinux-ppp-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-ppp/selinux-ppp-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..f244bcc0de19
--- /dev/null
+++ b/sec-policy/selinux-ppp/selinux-ppp-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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
index feaa1b4ec311..a4807f18f6d9 100644
--- a/sec-policy/selinux-prelink/Manifest
+++ b/sec-policy/selinux-prelink/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-prelink-2.20190201-r1.ebuild 281 BLAKE2B 7b4bba06207855fc4b87b9b433d9928b549671c4f0d8fa347bd50fc151dfc26bceb3d7ef07ad86908879582d487017e816e2155df3c1be90856f842be83ce621 SHA512 c54c22b25e250eaf4001b082565a3b22222a0a8ce9d704341719be20ac58a7ca45cb27fc7a7651007a47e46fbeaaceeaeafb5d8f139ad9ca7b826f18f4e8fdf4
-EBUILD selinux-prelink-2.20190609-r1.ebuild 283 BLAKE2B 7bc3ffe8630f0b9e66511702be222d066252fb6a92ab8b547c51bb931528828bd18c12e7000d591574a0fa2623d9b56a9dd9298690e09271a8a9adbdc9d63acb SHA512 f320c55acf21429d6dd65cb4c9f0085e2833bf1454b6a9b2e2777704295c208a41410ae62f6996a24be250e776efe51b95ea0e50d258b686b86e9f8927b1d202
+EBUILD selinux-prelink-2.20190609-r1.ebuild 281 BLAKE2B 7b4bba06207855fc4b87b9b433d9928b549671c4f0d8fa347bd50fc151dfc26bceb3d7ef07ad86908879582d487017e816e2155df3c1be90856f842be83ce621 SHA512 c54c22b25e250eaf4001b082565a3b22222a0a8ce9d704341719be20ac58a7ca45cb27fc7a7651007a47e46fbeaaceeaeafb5d8f139ad9ca7b826f18f4e8fdf4
+EBUILD selinux-prelink-2.20200818-r1.ebuild 283 BLAKE2B 7bc3ffe8630f0b9e66511702be222d066252fb6a92ab8b547c51bb931528828bd18c12e7000d591574a0fa2623d9b56a9dd9298690e09271a8a9adbdc9d63acb SHA512 f320c55acf21429d6dd65cb4c9f0085e2833bf1454b6a9b2e2777704295c208a41410ae62f6996a24be250e776efe51b95ea0e50d258b686b86e9f8927b1d202
 EBUILD selinux-prelink-9999.ebuild 286 BLAKE2B 5c56a88a0a74444bd24c5b50c631720af4e8d0920e5e0a3b40602f16a443cda67a1448efc8a9462943d0187d913b879784dcf25f100e09f781f3da64c593fe2e SHA512 55179e49f2fb5f194a7846460b71038544b7b2af3727b463fa3a9e15e18f2bf4981d102d3833a9fe7ca5adeeeefa8e42aba82b8374056571cce19b3db4f96d0a
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-prelink/selinux-prelink-2.20190609-r1.ebuild b/sec-policy/selinux-prelink/selinux-prelink-2.20190609-r1.ebuild
index e9fb700490b2..8172bbf9071d 100644
--- a/sec-policy/selinux-prelink/selinux-prelink-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-prelink/selinux-prelink-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for prelink"
 
 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-r1.ebuild b/sec-policy/selinux-prelink/selinux-prelink-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..e9fb700490b2
--- /dev/null
+++ b/sec-policy/selinux-prelink/selinux-prelink-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="prelink"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for prelink"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-prelude/Manifest b/sec-policy/selinux-prelude/Manifest
index 40106f33aa6a..8001c0b20e0a 100644
--- a/sec-policy/selinux-prelude/Manifest
+++ b/sec-policy/selinux-prelude/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-prelude-2.20190201-r1.ebuild 377 BLAKE2B 36729c48ac2ea726369673e2c448c7b1b500c2b54d5f5793400752eb40d7775a8935b8098f55acace87a32be169fb555ad51c8b0624fd56eb307480a41fd342c SHA512 81a1ede36ad804765689d895166a3e7182207f493c0c9d5bb8a9c157237421225e5390b1ae99f34e960c1c33406cfdd4b3298cc70ea1e4917776dd465e6933a6
-EBUILD selinux-prelude-2.20190609-r1.ebuild 379 BLAKE2B 1e6fc0250258e1461edd36be4148b0bb215ae2ce22cf40dad57b7f2525790310227ff1fac1fb19f4b476a08a97bd6c6ba6d8210a5d375a77a43655a710b2514a SHA512 0bba79b655d3236225aecc62a179ada1378e930cee7809954ffa1a6a75173fe03365c7ae807544d573eadb06f7f22b9c4dd1d063bfeaedbea2d5bfa3d5bcbabc
+EBUILD selinux-prelude-2.20190609-r1.ebuild 377 BLAKE2B 36729c48ac2ea726369673e2c448c7b1b500c2b54d5f5793400752eb40d7775a8935b8098f55acace87a32be169fb555ad51c8b0624fd56eb307480a41fd342c SHA512 81a1ede36ad804765689d895166a3e7182207f493c0c9d5bb8a9c157237421225e5390b1ae99f34e960c1c33406cfdd4b3298cc70ea1e4917776dd465e6933a6
+EBUILD selinux-prelude-2.20200818-r1.ebuild 379 BLAKE2B 1e6fc0250258e1461edd36be4148b0bb215ae2ce22cf40dad57b7f2525790310227ff1fac1fb19f4b476a08a97bd6c6ba6d8210a5d375a77a43655a710b2514a SHA512 0bba79b655d3236225aecc62a179ada1378e930cee7809954ffa1a6a75173fe03365c7ae807544d573eadb06f7f22b9c4dd1d063bfeaedbea2d5bfa3d5bcbabc
 EBUILD selinux-prelude-9999.ebuild 382 BLAKE2B a9d4e4af99d82d78c0079e42fe617f7853f79562cf716092ea21e0bd4b61247ac01d76b3c3674fd962cb87247fde1ef77f5723ff68da5aa7420d5bea37d2403a SHA512 b0044e9e25ed4ca4e75b5c6fa9adf0a8c3e03b7f2a5cce8b50390075028bf49f66273edaa26031ad8cb016923988c677bad614760df62851c25d325b00ec14b5
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-prelude/selinux-prelude-2.20190609-r1.ebuild b/sec-policy/selinux-prelude/selinux-prelude-2.20190609-r1.ebuild
index 81d376b156fb..afa5a0e304ac 100644
--- a/sec-policy/selinux-prelude/selinux-prelude-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-prelude/selinux-prelude-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-prelude/selinux-prelude-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..81d376b156fb
--- /dev/null
+++ b/sec-policy/selinux-prelude/selinux-prelude-2.20200818-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 5ad07f5a6b4e..e5a293d7dd29 100644
--- a/sec-policy/selinux-privoxy/Manifest
+++ b/sec-policy/selinux-privoxy/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-privoxy-2.20190201-r1.ebuild 281 BLAKE2B 9d4a68993832a1bdec4cb6e1cb552c0d8bd2e7ee149ee6ed4cb2f6ff582a34e3b02e3b8611c48cbeedfec88b449d08dda32ea031df8454e9da7c9778f77e118e SHA512 8fa84b5730db60a7503dddaa18c5fb2e82dbbcf9380ca58e9205a8ce678be9cce58d2a2a8fda78f369c9fde1fd87980c6050f2cd284b45ac70a0945d5e258cf4
-EBUILD selinux-privoxy-2.20190609-r1.ebuild 283 BLAKE2B b357514452afe6c0405a68965ba5fa6dc3605222926f22741a13c1c56491c96ed15f462d403a84180028003a0334aea576fe0b28f97f5fb7cab57df25e9131e3 SHA512 ebde1e10d5c471b476e9dc03ba0408be116fd977fdb597c5b4e099aeb67ea5960ef90e50d70398bc02dc5dd2fd276abd4538dffec79d5d62748f67529bf01337
+EBUILD selinux-privoxy-2.20190609-r1.ebuild 281 BLAKE2B 9d4a68993832a1bdec4cb6e1cb552c0d8bd2e7ee149ee6ed4cb2f6ff582a34e3b02e3b8611c48cbeedfec88b449d08dda32ea031df8454e9da7c9778f77e118e SHA512 8fa84b5730db60a7503dddaa18c5fb2e82dbbcf9380ca58e9205a8ce678be9cce58d2a2a8fda78f369c9fde1fd87980c6050f2cd284b45ac70a0945d5e258cf4
+EBUILD selinux-privoxy-2.20200818-r1.ebuild 283 BLAKE2B b357514452afe6c0405a68965ba5fa6dc3605222926f22741a13c1c56491c96ed15f462d403a84180028003a0334aea576fe0b28f97f5fb7cab57df25e9131e3 SHA512 ebde1e10d5c471b476e9dc03ba0408be116fd977fdb597c5b4e099aeb67ea5960ef90e50d70398bc02dc5dd2fd276abd4538dffec79d5d62748f67529bf01337
 EBUILD selinux-privoxy-9999.ebuild 286 BLAKE2B 0bb8e4ca634449ab11e30a2be826295aba049ce47f70ea35bc64fe644aa4ad0e733793be433589bf763f8ac558319b98f7a1dd4a71dc5a2dbf29d85e1a64a45b SHA512 f31d21bc65fd6a2fbbe556e44c24162c7dbbd5f862e050bee57420047fa92fa6b1ba8c6c270e628631f92d9c484bae880e6ae109bdb19256e7d446b84949a742
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-privoxy/selinux-privoxy-2.20190609-r1.ebuild b/sec-policy/selinux-privoxy/selinux-privoxy-2.20190609-r1.ebuild
index 1be8c83fa670..66b3bd046a89 100644
--- a/sec-policy/selinux-privoxy/selinux-privoxy-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-privoxy/selinux-privoxy-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-privoxy/selinux-privoxy-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..1be8c83fa670
--- /dev/null
+++ b/sec-policy/selinux-privoxy/selinux-privoxy-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 ed11299218a2..e0daa9247d29 100644
--- a/sec-policy/selinux-procmail/Manifest
+++ b/sec-policy/selinux-procmail/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-procmail-2.20190201-r1.ebuild 283 BLAKE2B 0ba492443995f6715a520ceba5d1cf9052dc1e669dafe591b4934d8474a15299ab12a3384fa5b6f32dfdb871de8dfe4682a6676728ee2170430566d16f6129b2 SHA512 963b7045b67b20631949acb81886648ba02bfbb0001c04f17f0ed8d7758668a9f134461612dcdac0bf0f54bd6f944139d10df9474a56df0b86675c2b31f95b57
-EBUILD selinux-procmail-2.20190609-r1.ebuild 285 BLAKE2B 69aee55525fe54dd2fc47117db418cdeac0fe2eb30f20ebbc1107bf42917ab5d7cd483263f827a45642da4c4069f430940197e5dbb0babd386d6f0f2dec59d23 SHA512 f16d65714726ddc3111cc13758ddd481369e5cc8dbe3a49fae3ad514c97d3af1bd0a34049fbf42e5e7feabf2bd90344c4c3fef9d2b589adad3cadbc1b9e37238
+EBUILD selinux-procmail-2.20190609-r1.ebuild 283 BLAKE2B 0ba492443995f6715a520ceba5d1cf9052dc1e669dafe591b4934d8474a15299ab12a3384fa5b6f32dfdb871de8dfe4682a6676728ee2170430566d16f6129b2 SHA512 963b7045b67b20631949acb81886648ba02bfbb0001c04f17f0ed8d7758668a9f134461612dcdac0bf0f54bd6f944139d10df9474a56df0b86675c2b31f95b57
+EBUILD selinux-procmail-2.20200818-r1.ebuild 285 BLAKE2B 69aee55525fe54dd2fc47117db418cdeac0fe2eb30f20ebbc1107bf42917ab5d7cd483263f827a45642da4c4069f430940197e5dbb0babd386d6f0f2dec59d23 SHA512 f16d65714726ddc3111cc13758ddd481369e5cc8dbe3a49fae3ad514c97d3af1bd0a34049fbf42e5e7feabf2bd90344c4c3fef9d2b589adad3cadbc1b9e37238
 EBUILD selinux-procmail-9999.ebuild 288 BLAKE2B 3d44034286fe53005b6ed83fdd160dad3da3aeac506d0de42356be15b7541e0ea6a645c77d67b67795c1b12e67f4e6f9ad27b92ac882e8d1b6db2432f7897b93 SHA512 8396d257dc8c819da4a6ab6957c539790325e38f4aa1949f57c900d9f7b7aa98f494a611916ab68419e748464383146589f2dcbcde95ccdac788dc37bc3d59fe
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-procmail/selinux-procmail-2.20190609-r1.ebuild b/sec-policy/selinux-procmail/selinux-procmail-2.20190609-r1.ebuild
index 194e7ef28eab..2cd5310e4d4c 100644
--- a/sec-policy/selinux-procmail/selinux-procmail-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-procmail/selinux-procmail-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-procmail/selinux-procmail-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..194e7ef28eab
--- /dev/null
+++ b/sec-policy/selinux-procmail/selinux-procmail-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 bf41d2e77a21..80807ead07cd 100644
--- a/sec-policy/selinux-psad/Manifest
+++ b/sec-policy/selinux-psad/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-psad-2.20190201-r1.ebuild 275 BLAKE2B 38eedf84ffc91f98d8e39f5c0ef80f492484021dbd3c1c36edacb3c101379d13f5a2fb2b84b04aaff68ea8736a3a746d085c60a943e8abeb738e98b19e64e366 SHA512 c996ee677514903f2a6156861a2e3090cf5e13081e9ace63a1a1d3d69a0c0c67682a8396bac806cc4879e9380b8078326553fc8cfae970d23e76d684a286fffb
-EBUILD selinux-psad-2.20190609-r1.ebuild 277 BLAKE2B 2fe861b036683a761b09fc3ad4c53d98f1293c229806d38dca28a6ca6b500115b0546087bdfb0fd7b196a56d67d78a219b976eccb0513721cd3b9a870bf0901e SHA512 ab17ee91d60c56281645ec2b6a52a918ae92855e8df4d41852c07dddfca35973d90007a0a43e2ad0c9c1e76459d1b3eed9d2a189b69e674c2b2c03b6a2696f41
+EBUILD selinux-psad-2.20190609-r1.ebuild 275 BLAKE2B 38eedf84ffc91f98d8e39f5c0ef80f492484021dbd3c1c36edacb3c101379d13f5a2fb2b84b04aaff68ea8736a3a746d085c60a943e8abeb738e98b19e64e366 SHA512 c996ee677514903f2a6156861a2e3090cf5e13081e9ace63a1a1d3d69a0c0c67682a8396bac806cc4879e9380b8078326553fc8cfae970d23e76d684a286fffb
+EBUILD selinux-psad-2.20200818-r1.ebuild 277 BLAKE2B 2fe861b036683a761b09fc3ad4c53d98f1293c229806d38dca28a6ca6b500115b0546087bdfb0fd7b196a56d67d78a219b976eccb0513721cd3b9a870bf0901e SHA512 ab17ee91d60c56281645ec2b6a52a918ae92855e8df4d41852c07dddfca35973d90007a0a43e2ad0c9c1e76459d1b3eed9d2a189b69e674c2b2c03b6a2696f41
 EBUILD selinux-psad-9999.ebuild 280 BLAKE2B 3d624e15111c821b914a4be688c3f6d87f14b607f6cea92cc7eb0f5e77bf3bf209b4825d4fc6037e70a3e1d5dc17df8a12102e71d799e67cb9e9dceff6dd00bb SHA512 35fb88cfae678bbf38960e4827348bb0016d56ec6d97bd9ca4c2f597d114dc003143d71649acf33a3c98322d854fb6d6e96691d429df6209d1d1c39ddee91c3a
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-psad/selinux-psad-2.20190609-r1.ebuild b/sec-policy/selinux-psad/selinux-psad-2.20190609-r1.ebuild
index 4c2b513a93ff..de2b7acdb2ab 100644
--- a/sec-policy/selinux-psad/selinux-psad-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-psad/selinux-psad-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-psad/selinux-psad-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..4c2b513a93ff
--- /dev/null
+++ b/sec-policy/selinux-psad/selinux-psad-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 e71d1d9e4b0c..75b4a80bc520 100644
--- a/sec-policy/selinux-publicfile/Manifest
+++ b/sec-policy/selinux-publicfile/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-publicfile-2.20190201-r1.ebuild 287 BLAKE2B f59014bbd52702c4476ad8c0750f722fdeacd2cf4db91f78e998032c6237bd3b43ef8cd22010150ff359fcb5d46b42391f4e1d5f1c6f289caa9359cb54960211 SHA512 f5d7ac2b6e92a91ca3372a39cb751e16a7f93a813d198b2ce53e905d2fd8e37e44b685e881deb265af4f4ca859a91cee41d5ac3915500f4a7433ad243a82c5ff
-EBUILD selinux-publicfile-2.20190609-r1.ebuild 289 BLAKE2B 32816713f4a336c67e7529944372f1d3b7f5ef3548a646b28618609d0726f9efb367b67a7ee41881f70a6bf7afae7d2c3e3ad9029d6baa3b547455631d0cd656 SHA512 a4b4777cd18b211a5f862684ad0d82d8bd982d70afde65aff4c8beaedbc91925137c83f894d360385be98d6530caf7a535563c84b5c1fb52b8d157d5603f126d
+EBUILD selinux-publicfile-2.20190609-r1.ebuild 287 BLAKE2B f59014bbd52702c4476ad8c0750f722fdeacd2cf4db91f78e998032c6237bd3b43ef8cd22010150ff359fcb5d46b42391f4e1d5f1c6f289caa9359cb54960211 SHA512 f5d7ac2b6e92a91ca3372a39cb751e16a7f93a813d198b2ce53e905d2fd8e37e44b685e881deb265af4f4ca859a91cee41d5ac3915500f4a7433ad243a82c5ff
+EBUILD selinux-publicfile-2.20200818-r1.ebuild 289 BLAKE2B 32816713f4a336c67e7529944372f1d3b7f5ef3548a646b28618609d0726f9efb367b67a7ee41881f70a6bf7afae7d2c3e3ad9029d6baa3b547455631d0cd656 SHA512 a4b4777cd18b211a5f862684ad0d82d8bd982d70afde65aff4c8beaedbc91925137c83f894d360385be98d6530caf7a535563c84b5c1fb52b8d157d5603f126d
 EBUILD selinux-publicfile-9999.ebuild 292 BLAKE2B 36b5fd272dd908229e230da571e13ac67aa5854c34b08392d32d5f3998f5d373b3eb834b45236cd01f5dcc688d6478fc2b3b3efb8f3c7499da14944ddc16188f SHA512 d2344359a6118563b25c2130579ba461272d8ae94e7d36c0f7e1ceb90167338eeac317fe13850422a3e77d18fa1c7de53f999c7086bfe7f27286c9b94d87da26
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-publicfile/selinux-publicfile-2.20190609-r1.ebuild b/sec-policy/selinux-publicfile/selinux-publicfile-2.20190609-r1.ebuild
index d50fe7ef35f9..fd7141671496 100644
--- a/sec-policy/selinux-publicfile/selinux-publicfile-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-publicfile/selinux-publicfile-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-publicfile/selinux-publicfile-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..d50fe7ef35f9
--- /dev/null
+++ b/sec-policy/selinux-publicfile/selinux-publicfile-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 1c2441ae6f9a..bded367fe6c8 100644
--- a/sec-policy/selinux-pulseaudio/Manifest
+++ b/sec-policy/selinux-pulseaudio/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-pulseaudio-2.20190201-r1.ebuild 287 BLAKE2B edde62e62f4d325c67dd1e0a065402fc075645ae94b1a990c66cd9b3a4ce264c97ee8b6a801a6a3b0f712d867fb394da6747e8c85520348ad8cbd290dff4109e SHA512 3f65d0cc73ec4eaa4557cb899e6a136eb2b2fb7a07ae3308e045c95bce0e789791eb0eb870fc88dde507a2c296f45124816e7b55a0d53ffc40bff22fe1d61517
-EBUILD selinux-pulseaudio-2.20190609-r1.ebuild 289 BLAKE2B c6a330d93461d2d242ca22ce89695dc2ef4c96ec1fa9d6fe0f560884d972d6a5083fff55de44a29a16ee853772418033b3d1fd55a1027fd19b9265f7c18d95bc SHA512 0f35c69b3b1ecc4c3d5ac93e86ac6240c1d1b469d3425942e7f5b91cd26a0ef55bcae47ccf91f0ba042a432f8955a03fbeb23609cb08caca94a6a3c38dc7f160
+EBUILD selinux-pulseaudio-2.20190609-r1.ebuild 287 BLAKE2B edde62e62f4d325c67dd1e0a065402fc075645ae94b1a990c66cd9b3a4ce264c97ee8b6a801a6a3b0f712d867fb394da6747e8c85520348ad8cbd290dff4109e SHA512 3f65d0cc73ec4eaa4557cb899e6a136eb2b2fb7a07ae3308e045c95bce0e789791eb0eb870fc88dde507a2c296f45124816e7b55a0d53ffc40bff22fe1d61517
+EBUILD selinux-pulseaudio-2.20200818-r1.ebuild 289 BLAKE2B c6a330d93461d2d242ca22ce89695dc2ef4c96ec1fa9d6fe0f560884d972d6a5083fff55de44a29a16ee853772418033b3d1fd55a1027fd19b9265f7c18d95bc SHA512 0f35c69b3b1ecc4c3d5ac93e86ac6240c1d1b469d3425942e7f5b91cd26a0ef55bcae47ccf91f0ba042a432f8955a03fbeb23609cb08caca94a6a3c38dc7f160
 EBUILD selinux-pulseaudio-9999.ebuild 292 BLAKE2B b6bf6d3ef5427df4767ac3705a0028c039a6af19799895cb5aeba474433354e199ea12edadb168bd5a9cf50f86eba7629ec0cec19c29e26093757e9e81eec630 SHA512 be4474160dbb460dfe45c167895b8d90aa18dae3a873284e5059f3758375c80c7587cd3d0a75c1cdc2d0c2cd7a39c1c0beb4a112d87034dfc704c333ef447df2
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20190609-r1.ebuild b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20190609-r1.ebuild
index 77825e6794ee..c9a025aac615 100644
--- a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..77825e6794ee
--- /dev/null
+++ b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 c9c8a3cdb022..93ef035e7744 100644
--- a/sec-policy/selinux-puppet/Manifest
+++ b/sec-policy/selinux-puppet/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-puppet-2.20190201-r1.ebuild 279 BLAKE2B f17f9fd15dc1c51693ded8a0cfa9dad8b50cf3a697962ec847a2a8741e5a781e431634825dea9b59a2dbaada0e0d1a6524ed7e18f9ada846fab4e5a5d8795f9c SHA512 4d7a270fe6b7f3b66857d24d5053f29acb248cd4f8f3dbcf6e697d4df0b65b3b0da0d2ed6fc6f0db73f679c90afc3d47c2d8e3d72e3d90e6f9a9feece4701ed5
-EBUILD selinux-puppet-2.20190609-r1.ebuild 281 BLAKE2B 4593c183d285e67a9acb698549c79274482a6be17eab5d4d73d6cebcee8984e8ca38375d221a68f3ed766efc7120e74d4b3ec62091ce34861812d4428d27640a SHA512 f236a2ab1823550451e52dfaa481b212520347d1731ca021b380cd740e86cf0cf30e953b3cf2e3e266b734df92f3f55ad69ba9a15979e7b8a4197808d3eb38c5
+EBUILD selinux-puppet-2.20190609-r1.ebuild 279 BLAKE2B f17f9fd15dc1c51693ded8a0cfa9dad8b50cf3a697962ec847a2a8741e5a781e431634825dea9b59a2dbaada0e0d1a6524ed7e18f9ada846fab4e5a5d8795f9c SHA512 4d7a270fe6b7f3b66857d24d5053f29acb248cd4f8f3dbcf6e697d4df0b65b3b0da0d2ed6fc6f0db73f679c90afc3d47c2d8e3d72e3d90e6f9a9feece4701ed5
+EBUILD selinux-puppet-2.20200818-r1.ebuild 281 BLAKE2B 4593c183d285e67a9acb698549c79274482a6be17eab5d4d73d6cebcee8984e8ca38375d221a68f3ed766efc7120e74d4b3ec62091ce34861812d4428d27640a SHA512 f236a2ab1823550451e52dfaa481b212520347d1731ca021b380cd740e86cf0cf30e953b3cf2e3e266b734df92f3f55ad69ba9a15979e7b8a4197808d3eb38c5
 EBUILD selinux-puppet-9999.ebuild 284 BLAKE2B df64162cec206e012dce2c3e7f8412d57a1a6b3c44e53d2473ca8b19e5ddeeda596a2d2ea6180a564dec7a9e14907ec9ec53973bb1115e3c5e73023f649c33c5 SHA512 fc0e7841d2c845cc6b1872c2db195598df5222ae366b231819a8ded80f95ccb26dfdf936fb21c8f21dcb253a7072ee69a22bc0bd5fc87c7763b0ffa453ffc249
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-puppet/selinux-puppet-2.20190609-r1.ebuild b/sec-policy/selinux-puppet/selinux-puppet-2.20190609-r1.ebuild
index df1aafed8a2d..fde8a4a757d7 100644
--- a/sec-policy/selinux-puppet/selinux-puppet-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-puppet/selinux-puppet-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-puppet/selinux-puppet-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..df1aafed8a2d
--- /dev/null
+++ b/sec-policy/selinux-puppet/selinux-puppet-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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-pyicqt/Manifest b/sec-policy/selinux-pyicqt/Manifest
index 1eb9bd485ecc..7e84586b4937 100644
--- a/sec-policy/selinux-pyicqt/Manifest
+++ b/sec-policy/selinux-pyicqt/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-pyicqt-2.20190201-r1.ebuild 279 BLAKE2B d003e81ef8067d9cce78d1ad911a14ba7f5c006adc5486177607c7d9f7ec7a24ccce65c3cd02cc9c3aceb77a4f6f309b04b1029cc520ab70f16b0a2e16547927 SHA512 d0ac5e93a361db8531082f47b9e9a48e239594be1a2e0d29971a149b4fef6ef7066e757dd009de905568e809503ae27fad783741faf3f5711c94e522dc2f20e2
-EBUILD selinux-pyicqt-2.20190609-r1.ebuild 281 BLAKE2B 0ea2137a4cc93801b3e4936cd73ef3adbfd4374783245d589adf5fd622b575907174ce47538d358e4b12834fe3f7328b68b3e863b9a55723788740c15bfd3a86 SHA512 a7f53e83466870911144a66dff3460d5832de9d685fc14ee39b996c69928f31a3a8d7dae0e301ea3d6ff84b763d897104ec24e01984ad37c779c0bc6d5bfcaf3
+EBUILD selinux-pyicqt-2.20190609-r1.ebuild 279 BLAKE2B d003e81ef8067d9cce78d1ad911a14ba7f5c006adc5486177607c7d9f7ec7a24ccce65c3cd02cc9c3aceb77a4f6f309b04b1029cc520ab70f16b0a2e16547927 SHA512 d0ac5e93a361db8531082f47b9e9a48e239594be1a2e0d29971a149b4fef6ef7066e757dd009de905568e809503ae27fad783741faf3f5711c94e522dc2f20e2
+EBUILD selinux-pyicqt-2.20200818-r1.ebuild 281 BLAKE2B 0ea2137a4cc93801b3e4936cd73ef3adbfd4374783245d589adf5fd622b575907174ce47538d358e4b12834fe3f7328b68b3e863b9a55723788740c15bfd3a86 SHA512 a7f53e83466870911144a66dff3460d5832de9d685fc14ee39b996c69928f31a3a8d7dae0e301ea3d6ff84b763d897104ec24e01984ad37c779c0bc6d5bfcaf3
 EBUILD selinux-pyicqt-9999.ebuild 284 BLAKE2B a3c4d36d80ec28b2c7fbd7e870226e53b8cec56d9b006f635efab26b74e525be837841b1b68847919a1811d8cbe08bcd26cd3e1b0506f741269efe3271187e42 SHA512 11e524dc27c233568660c53fbe9b34e046d590647130ce8d81ca6971a9b2203bafd9705bd31c07ec849025def4832ac974cd6970cc2cdea9f5cdb534fada287f
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20190609-r1.ebuild b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20190609-r1.ebuild
index 60fd3e2dd6de..88b384de99ec 100644
--- a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for pyicqt"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20200818-r1.ebuild b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..60fd3e2dd6de
--- /dev/null
+++ b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="pyicqt"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for pyicqt"
+
+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 816284d6f5b1..f088a94eef5e 100644
--- a/sec-policy/selinux-pyzor/Manifest
+++ b/sec-policy/selinux-pyzor/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-pyzor-2.20190201-r1.ebuild 277 BLAKE2B fce32157f155ed1de539056072ef7a9a531c91628f40f17553212bd98cbf18988ba0c4de809a4706e6a6d4d015deb6771a3d0769537ad8e1e1d74af37a0a4158 SHA512 73a921f3b5daf63d307fb82ee37d873b5dd794891669b9b4f18d21d3c508a0d654ae9d99c7716861748ddfd04dda9ba50331be4fb50e6b05a7fb1af4f9c167e8
-EBUILD selinux-pyzor-2.20190609-r1.ebuild 279 BLAKE2B 931ee3a9f03d126b94daa51fcfb6e0951038e5bf3ec8f58be830af7424ef5088bdb189dedc0fe3f95679c4fbef3ba5d11f8885a4791aec6dadf7485d97ebfb80 SHA512 9f519ec3b9f783045586256895d6970a4eff43df97484758397b6a7b5c655e5cc5e7c33dc1994575c47dede026b67c64463cc54f2d3071ea43cde3349f33b6db
+EBUILD selinux-pyzor-2.20190609-r1.ebuild 277 BLAKE2B fce32157f155ed1de539056072ef7a9a531c91628f40f17553212bd98cbf18988ba0c4de809a4706e6a6d4d015deb6771a3d0769537ad8e1e1d74af37a0a4158 SHA512 73a921f3b5daf63d307fb82ee37d873b5dd794891669b9b4f18d21d3c508a0d654ae9d99c7716861748ddfd04dda9ba50331be4fb50e6b05a7fb1af4f9c167e8
+EBUILD selinux-pyzor-2.20200818-r1.ebuild 279 BLAKE2B 931ee3a9f03d126b94daa51fcfb6e0951038e5bf3ec8f58be830af7424ef5088bdb189dedc0fe3f95679c4fbef3ba5d11f8885a4791aec6dadf7485d97ebfb80 SHA512 9f519ec3b9f783045586256895d6970a4eff43df97484758397b6a7b5c655e5cc5e7c33dc1994575c47dede026b67c64463cc54f2d3071ea43cde3349f33b6db
 EBUILD selinux-pyzor-9999.ebuild 282 BLAKE2B c9c8531557086e73c35bd01a60931e2bdff7f088f7d5fe77d2b1df405745d2f36909e3afebbb5abe071c3d62f45b9c02d2058b7d8fe3ad33e108b9e3c6fa6486 SHA512 4641d8fa4fd3784381e22af5e80549da82691dfcb174acb5c3cb60dd4a97446c9d7b6572b80b1f1ee98dd777c8d7dfdd8ad86db3e81214bcb2eab23d38764fc3
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-pyzor/selinux-pyzor-2.20190609-r1.ebuild b/sec-policy/selinux-pyzor/selinux-pyzor-2.20190609-r1.ebuild
index 9444ea11ac8c..ec57667a57d1 100644
--- a/sec-policy/selinux-pyzor/selinux-pyzor-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-pyzor/selinux-pyzor-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-pyzor/selinux-pyzor-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..9444ea11ac8c
--- /dev/null
+++ b/sec-policy/selinux-pyzor/selinux-pyzor-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 2107bea17d39..cc2171d953c3 100644
--- a/sec-policy/selinux-qemu/Manifest
+++ b/sec-policy/selinux-qemu/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-qemu-2.20190201-r1.ebuild 367 BLAKE2B b37e06d3494f6086963c4d0122fac46c00bd9701b1b35d556f090b2227f431edb94864aaaeee7d7fda2fa9dd53a466324783eccb9403b99f5d54c738af4e9848 SHA512 5724d5e53b5e879f3ac518cfc02ba530cf4277e2e82eecc05dfa90d040208fd8d01d07d5b9b1c1781b3a2fd79b8fc7c659dc569fb7d3d3fdf32db02a3c40ec83
-EBUILD selinux-qemu-2.20190609-r1.ebuild 369 BLAKE2B 2efcfd91667d809b7927cabc60c022a7436dfe968c5d422411f6ea9b150c09c6fcf3fb8e180ea1bb2011c6649bdc1ac3bc65f9faa7949cfe79af8b29c9bb067d SHA512 a602e25c165647dc97b7f0b77f4c678f6392dd5886d3481f67d1a28d0e8b65423305dd6bf807f26d24fb3ae09ba83e54858b57ed2eec83ea90e23cf1c5c9fccb
+EBUILD selinux-qemu-2.20190609-r1.ebuild 367 BLAKE2B b37e06d3494f6086963c4d0122fac46c00bd9701b1b35d556f090b2227f431edb94864aaaeee7d7fda2fa9dd53a466324783eccb9403b99f5d54c738af4e9848 SHA512 5724d5e53b5e879f3ac518cfc02ba530cf4277e2e82eecc05dfa90d040208fd8d01d07d5b9b1c1781b3a2fd79b8fc7c659dc569fb7d3d3fdf32db02a3c40ec83
+EBUILD selinux-qemu-2.20200818-r1.ebuild 369 BLAKE2B 2efcfd91667d809b7927cabc60c022a7436dfe968c5d422411f6ea9b150c09c6fcf3fb8e180ea1bb2011c6649bdc1ac3bc65f9faa7949cfe79af8b29c9bb067d SHA512 a602e25c165647dc97b7f0b77f4c678f6392dd5886d3481f67d1a28d0e8b65423305dd6bf807f26d24fb3ae09ba83e54858b57ed2eec83ea90e23cf1c5c9fccb
 EBUILD selinux-qemu-9999.ebuild 372 BLAKE2B 31893c722c8792c75422902ebd687e6fdc03610e780cb69ce40a71a0b0d9722d7b7cda49f5342c1c72219f04bea50873a3d136f7398439e5f5ffc956e7260df4 SHA512 290a9d9a84d524570cd372ec1fb17a437f660d327d1eeba72c58f0380c91a019e33153432ee231ebbf7634e99e672922ae9f2f877dd024fd5e2869482f5e91fd
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-qemu/selinux-qemu-2.20190609-r1.ebuild b/sec-policy/selinux-qemu/selinux-qemu-2.20190609-r1.ebuild
index 73ccfccaf4f2..340db38be4a5 100644
--- a/sec-policy/selinux-qemu/selinux-qemu-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-qemu/selinux-qemu-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-qemu/selinux-qemu-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..73ccfccaf4f2
--- /dev/null
+++ b/sec-policy/selinux-qemu/selinux-qemu-2.20200818-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 7605148cab15..374ed3be95e6 100644
--- a/sec-policy/selinux-qmail/Manifest
+++ b/sec-policy/selinux-qmail/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-qmail-2.20190201-r1.ebuild 277 BLAKE2B df1eefd6d3cad3d2fbf9f359a85c90bed4478b559de742a498161ee008cdba9f7729e1293dd7de2aaff09acf4a57569fb65bc918bdeffe78a14258a400857d4c SHA512 556e1801db80acfd7ce13174d924eb1fcd5086978a8e4a03df0f1816a5b038d0edeaf03ca62b9057edd755380c9cd40c6a2db9e11a8c32092836a1150bcaf8d9
-EBUILD selinux-qmail-2.20190609-r1.ebuild 279 BLAKE2B 602a476c140452db26705d8d43842e1dc73b2de7d53ca196100820aab5f2a0d054697a022e5f3908a49a31c8b9e855f0af84e60f2bb9cd9f25348d67890d30b5 SHA512 a0eb1cd2cd0e7f349f13f6fbc58ae96a6c87370892ccb89815b0317f3ecb460352f4c79ba0b32290622f25d2ffbb246720012ab8cb6c1c76b296854795418aaa
+EBUILD selinux-qmail-2.20190609-r1.ebuild 277 BLAKE2B df1eefd6d3cad3d2fbf9f359a85c90bed4478b559de742a498161ee008cdba9f7729e1293dd7de2aaff09acf4a57569fb65bc918bdeffe78a14258a400857d4c SHA512 556e1801db80acfd7ce13174d924eb1fcd5086978a8e4a03df0f1816a5b038d0edeaf03ca62b9057edd755380c9cd40c6a2db9e11a8c32092836a1150bcaf8d9
+EBUILD selinux-qmail-2.20200818-r1.ebuild 279 BLAKE2B 602a476c140452db26705d8d43842e1dc73b2de7d53ca196100820aab5f2a0d054697a022e5f3908a49a31c8b9e855f0af84e60f2bb9cd9f25348d67890d30b5 SHA512 a0eb1cd2cd0e7f349f13f6fbc58ae96a6c87370892ccb89815b0317f3ecb460352f4c79ba0b32290622f25d2ffbb246720012ab8cb6c1c76b296854795418aaa
 EBUILD selinux-qmail-9999.ebuild 282 BLAKE2B 53e932a141d0cba182d61ffda6c760909a027455a7372b1c9230fd87f1e8b56f816b9c6c0ef91a8534d8853ee3463f0df9e8fd162aa307a85dc511687dadd96f SHA512 f677790238f3a5c17b30970d720c29d314bca4909787235d9dcde5c41179832fdb9773cf078fa208f5ccd63b51c1668e66a9b65a39193e51af139af91b919cf7
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-qmail/selinux-qmail-2.20190609-r1.ebuild b/sec-policy/selinux-qmail/selinux-qmail-2.20190609-r1.ebuild
index a59316fe4e81..0cdd4b610587 100644
--- a/sec-policy/selinux-qmail/selinux-qmail-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-qmail/selinux-qmail-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-qmail/selinux-qmail-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..a59316fe4e81
--- /dev/null
+++ b/sec-policy/selinux-qmail/selinux-qmail-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 f0cf2cde956b..d0975c7433c6 100644
--- a/sec-policy/selinux-quota/Manifest
+++ b/sec-policy/selinux-quota/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-quota-2.20190201-r1.ebuild 277 BLAKE2B 4873435866ebf5a02df124aa213e5fc6cd0d8323cf85c4b579c8fc3e376befd2d0fdcec3b9b51e01a209fce1f4b23184e0a49c61bc722ae5978f99d30153efc0 SHA512 1bc30bf332cfdba0799a89116799794430615bc74cb9cb907924122b3f10ccb980035e513d933b5f7b6b8160968053fdbe2181b0fd9544b303c8f1de373a8138
-EBUILD selinux-quota-2.20190609-r1.ebuild 279 BLAKE2B ff61f3aadb01380221699faa59f9107d0148bbea11eba06381eb201ec97734d02b670724b00ef56772fc4da8f6725c6c9d7506f4fd4da5368087813446610cb4 SHA512 a5594a4f893c7725002540de7751221064de4330549a49fd351bfcd0924cb0baca8badc4de87bf610bc61262c75e4d345993d6630f1fa006d8a4bba4791cd490
+EBUILD selinux-quota-2.20190609-r1.ebuild 277 BLAKE2B 4873435866ebf5a02df124aa213e5fc6cd0d8323cf85c4b579c8fc3e376befd2d0fdcec3b9b51e01a209fce1f4b23184e0a49c61bc722ae5978f99d30153efc0 SHA512 1bc30bf332cfdba0799a89116799794430615bc74cb9cb907924122b3f10ccb980035e513d933b5f7b6b8160968053fdbe2181b0fd9544b303c8f1de373a8138
+EBUILD selinux-quota-2.20200818-r1.ebuild 279 BLAKE2B ff61f3aadb01380221699faa59f9107d0148bbea11eba06381eb201ec97734d02b670724b00ef56772fc4da8f6725c6c9d7506f4fd4da5368087813446610cb4 SHA512 a5594a4f893c7725002540de7751221064de4330549a49fd351bfcd0924cb0baca8badc4de87bf610bc61262c75e4d345993d6630f1fa006d8a4bba4791cd490
 EBUILD selinux-quota-9999.ebuild 282 BLAKE2B 9a3628c61a4eadbc4e231ea8f076420c3e60ebd0417209bd66fe7aab393a9957cc9b93d5e85aea5dac28b3ad923f2df09a6862ecfee5d479d9e00a46f49a8f73 SHA512 781b4988092c21e6d0d44aa1d53995bf41c2f05a3effee61e32184d78fffa63e7673a331b3b902e092dbf3a5df3cde8b9a8eb470c2e81f9e2f2335791d5bf20f
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-quota/selinux-quota-2.20190609-r1.ebuild b/sec-policy/selinux-quota/selinux-quota-2.20190609-r1.ebuild
index 56a5c61ab164..3e205072b165 100644
--- a/sec-policy/selinux-quota/selinux-quota-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-quota/selinux-quota-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-quota/selinux-quota-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..56a5c61ab164
--- /dev/null
+++ b/sec-policy/selinux-quota/selinux-quota-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 20774d648774..d5914995af75 100644
--- a/sec-policy/selinux-radius/Manifest
+++ b/sec-policy/selinux-radius/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-radius-2.20190201-r1.ebuild 279 BLAKE2B 3c7682615146b94e09fc7e90bca1eaa79fd5691da16b65fb0669a20284cd233bbc509f4d38837a1aeed9a873eee5559c7c8fcb9e223e8b015ceb86be284651e0 SHA512 3ff39216cd13c56573d97be8b777af1e915df22eab4f071bba11c4897b76ddb696e74e44cb724c993962dd3cceeb013c07ead234932db76981cf6ad4d26575f0
-EBUILD selinux-radius-2.20190609-r1.ebuild 281 BLAKE2B 471673a6e3653af4b80f5c5a08faed75007a39d174c536f4e001a3ef4e01e05ab889f960a8a400ef30c29221f48280d53462239c085bfb429cbc4e9fe75d83d1 SHA512 46d46324bb59b82e6a051f96fa792aff39023c422357f4ae7241d2e1a1226adafe2741a8c57703fcc11652a8bcf7198f2ddda6e337f4d6d29b891ef8252f5082
+EBUILD selinux-radius-2.20190609-r1.ebuild 279 BLAKE2B 3c7682615146b94e09fc7e90bca1eaa79fd5691da16b65fb0669a20284cd233bbc509f4d38837a1aeed9a873eee5559c7c8fcb9e223e8b015ceb86be284651e0 SHA512 3ff39216cd13c56573d97be8b777af1e915df22eab4f071bba11c4897b76ddb696e74e44cb724c993962dd3cceeb013c07ead234932db76981cf6ad4d26575f0
+EBUILD selinux-radius-2.20200818-r1.ebuild 281 BLAKE2B 471673a6e3653af4b80f5c5a08faed75007a39d174c536f4e001a3ef4e01e05ab889f960a8a400ef30c29221f48280d53462239c085bfb429cbc4e9fe75d83d1 SHA512 46d46324bb59b82e6a051f96fa792aff39023c422357f4ae7241d2e1a1226adafe2741a8c57703fcc11652a8bcf7198f2ddda6e337f4d6d29b891ef8252f5082
 EBUILD selinux-radius-9999.ebuild 284 BLAKE2B 52ad7967d96d4cfc6a03cc2af39ebe04a10589be7189672d249c9912fcfc6ad4b0e2e0796d8a5cd5dc8ffc4f071b3cc619b255e57249574d9744ee1cfa0247b0 SHA512 cb0df168e59b9d8488f2da4c114966bd5d85372441cbe5120ddd2077c58b9adace99ca3fabc672f20d81b275fe61b49dd775a5e52c411d2b3f93f8d4d07b26de
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-radius/selinux-radius-2.20190609-r1.ebuild b/sec-policy/selinux-radius/selinux-radius-2.20190609-r1.ebuild
index e13d36641ca7..38c3e54263ce 100644
--- a/sec-policy/selinux-radius/selinux-radius-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-radius/selinux-radius-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-radius/selinux-radius-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..e13d36641ca7
--- /dev/null
+++ b/sec-policy/selinux-radius/selinux-radius-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 c3a48f8752d8..b35326dbbe07 100644
--- a/sec-policy/selinux-radvd/Manifest
+++ b/sec-policy/selinux-radvd/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-radvd-2.20190201-r1.ebuild 277 BLAKE2B e1cfe171b940eda991c3756f9c0f26f55ec9ba561ad907fdcce409884c83201f8fc12fe09d9b31915807ff28f3766de7d836cec37d843c340651cfdaf5f40c12 SHA512 c072dc95eb8f061f0ac6a52c15a7366cf99daab1e52a8aa631f7857ccb90bb4a53a2576a00c11aea0db223611b938ef818fee6b8a480b5f345fa30fa4ac316cd
-EBUILD selinux-radvd-2.20190609-r1.ebuild 279 BLAKE2B 22c0bdb9a9455f8abaf313c92e0df44957de0cfb8ad9eedb5a592b9175506d3aaf5b2aaeb230dd54f83f431cd1fb295b049c233d8cf4c6ca0aa2859548fb86a5 SHA512 a52272286b8df9a18472f0a9a6c5153283431cfb6bc72c555ee1a032be7bd98d3f02f639be5e75539adffc4867e1be56817fd4afec6433fc0391a0457e7e9bf5
+EBUILD selinux-radvd-2.20190609-r1.ebuild 277 BLAKE2B e1cfe171b940eda991c3756f9c0f26f55ec9ba561ad907fdcce409884c83201f8fc12fe09d9b31915807ff28f3766de7d836cec37d843c340651cfdaf5f40c12 SHA512 c072dc95eb8f061f0ac6a52c15a7366cf99daab1e52a8aa631f7857ccb90bb4a53a2576a00c11aea0db223611b938ef818fee6b8a480b5f345fa30fa4ac316cd
+EBUILD selinux-radvd-2.20200818-r1.ebuild 279 BLAKE2B 22c0bdb9a9455f8abaf313c92e0df44957de0cfb8ad9eedb5a592b9175506d3aaf5b2aaeb230dd54f83f431cd1fb295b049c233d8cf4c6ca0aa2859548fb86a5 SHA512 a52272286b8df9a18472f0a9a6c5153283431cfb6bc72c555ee1a032be7bd98d3f02f639be5e75539adffc4867e1be56817fd4afec6433fc0391a0457e7e9bf5
 EBUILD selinux-radvd-9999.ebuild 282 BLAKE2B 47b306d9471279073b09c0dc5841e2729bffbca190fcb9db707b7966cc396c5099596a2b70f482d025e6fea791141bd46d08d896cfbda5fc3b1a7ee8bee726bb SHA512 c99ccc3553fb4b50cea4392a712f7b768734ac1a537ec8abb5d7b321769b2d0550871a9b1db5cb6fb59e3ae59ff8466831a163229e9ca9c6805abf797d7124ec
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-radvd/selinux-radvd-2.20190609-r1.ebuild b/sec-policy/selinux-radvd/selinux-radvd-2.20190609-r1.ebuild
index 43eb989eb155..81b55dfaa03a 100644
--- a/sec-policy/selinux-radvd/selinux-radvd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-radvd/selinux-radvd-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-radvd/selinux-radvd-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..43eb989eb155
--- /dev/null
+++ b/sec-policy/selinux-radvd/selinux-radvd-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 9fb47b95bb26..ba3186750ece 100644
--- a/sec-policy/selinux-razor/Manifest
+++ b/sec-policy/selinux-razor/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-razor-2.20190201-r1.ebuild 277 BLAKE2B 7d555e27dfc8a70204b4d55c97264393de7e60dbecfb144d75e697121a46d08f429feee94a1d78d3f71ac822a45a1dea00fe370dda14f81e51e2f2f49728224f SHA512 31d004ab897bc4ddee449c5a459975cc8e03a288430df5391ff2fa73d55a70b39b8646aa4be4907eceb1166da2f0a8aaf9352f6524798883fd766661eeff19f0
-EBUILD selinux-razor-2.20190609-r1.ebuild 279 BLAKE2B 66a13327b6499ff9db45a2efe440628910481557057cc21283cab966bb7945b6fffd7924cd8ca1ddc26836107d63d5fd3f2990a2fff5415296fe3ca84cfaad85 SHA512 f8b8493147d66d7cf9603d5c21d38e5356af478525414e099e747c24a75b582362b1289e3e6e9d22a780823190f5f4bff287d117d4b8a5e68433b0a0aa9b9822
+EBUILD selinux-razor-2.20190609-r1.ebuild 277 BLAKE2B 7d555e27dfc8a70204b4d55c97264393de7e60dbecfb144d75e697121a46d08f429feee94a1d78d3f71ac822a45a1dea00fe370dda14f81e51e2f2f49728224f SHA512 31d004ab897bc4ddee449c5a459975cc8e03a288430df5391ff2fa73d55a70b39b8646aa4be4907eceb1166da2f0a8aaf9352f6524798883fd766661eeff19f0
+EBUILD selinux-razor-2.20200818-r1.ebuild 279 BLAKE2B 66a13327b6499ff9db45a2efe440628910481557057cc21283cab966bb7945b6fffd7924cd8ca1ddc26836107d63d5fd3f2990a2fff5415296fe3ca84cfaad85 SHA512 f8b8493147d66d7cf9603d5c21d38e5356af478525414e099e747c24a75b582362b1289e3e6e9d22a780823190f5f4bff287d117d4b8a5e68433b0a0aa9b9822
 EBUILD selinux-razor-9999.ebuild 282 BLAKE2B fb9e7a656918bd74c0cd7322017c6be582062342105db8e8d16e4c88d1548041dd7f70d7d1b38888f2a6a00eeb3e3eb2ca734e641f6c6c86679f83bfc93c4c66 SHA512 6708837cf2c8f35da88f16b8af214f17945ed11da5cd379a1255ff8aec8002ac553589c7c1f8f08b918d38ff598d5fe821b6df90b89cb662c826e53ea6f7613c
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-razor/selinux-razor-2.20190609-r1.ebuild b/sec-policy/selinux-razor/selinux-razor-2.20190609-r1.ebuild
index 531856a3f333..56fdd0c5c393 100644
--- a/sec-policy/selinux-razor/selinux-razor-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-razor/selinux-razor-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-razor/selinux-razor-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..531856a3f333
--- /dev/null
+++ b/sec-policy/selinux-razor/selinux-razor-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 fbb1ad9a3651..90bb2cd9d74f 100644
--- a/sec-policy/selinux-redis/Manifest
+++ b/sec-policy/selinux-redis/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-redis-2.20190201-r1.ebuild 277 BLAKE2B 927268f70a375cb34cde082c7fd0c7bf14521e868724ed09b360bd2ccfde9804bae801d017320efbefa8c53bb59fb26580546b6cb6047c7b0300557fbf3a5c40 SHA512 dbbcbfd2282784268278d7bf8f583ba69bf1a71be225641271858bfe5c1d6c3cb4d2ca9a84d7ec936d8d07b89acbcc2edca216f9c9fcbccc273bc68224212fdb
-EBUILD selinux-redis-2.20190609-r1.ebuild 279 BLAKE2B 845ba1ac90776ec6df901e0c1da1d7da86a3cebd0118bb445c242e7792ae5abea6825d2dac55dd74599eb7fcd7d00c38b262784cfb94eee9126cb37c50507b04 SHA512 c18280de64a7fd9c0f9d21bddd5a893f6e6bd3ae490d0fb669311c588e2fe7d78c8a23a6fe4e44a642ffe0b1603c65e7239546c0367b849b8a837ba2c5f902ed
+EBUILD selinux-redis-2.20190609-r1.ebuild 277 BLAKE2B 927268f70a375cb34cde082c7fd0c7bf14521e868724ed09b360bd2ccfde9804bae801d017320efbefa8c53bb59fb26580546b6cb6047c7b0300557fbf3a5c40 SHA512 dbbcbfd2282784268278d7bf8f583ba69bf1a71be225641271858bfe5c1d6c3cb4d2ca9a84d7ec936d8d07b89acbcc2edca216f9c9fcbccc273bc68224212fdb
+EBUILD selinux-redis-2.20200818-r1.ebuild 279 BLAKE2B 845ba1ac90776ec6df901e0c1da1d7da86a3cebd0118bb445c242e7792ae5abea6825d2dac55dd74599eb7fcd7d00c38b262784cfb94eee9126cb37c50507b04 SHA512 c18280de64a7fd9c0f9d21bddd5a893f6e6bd3ae490d0fb669311c588e2fe7d78c8a23a6fe4e44a642ffe0b1603c65e7239546c0367b849b8a837ba2c5f902ed
 EBUILD selinux-redis-9999.ebuild 282 BLAKE2B a247a5b631780eff10b29591025cccc6d1d2677064abe04e5d355d485bc31ac8120fc07ed563526693ab40012d95618025c9fb8276f2142d123e079e1c00451f SHA512 4e97d304fece0880c6dcf7777cf8ab6c943ff18e87b3725636ffce066aee182ba56732e710994a5d5eb6d69c067f8f351bf2794a2da22c9b5ddc89908f02a09d
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-redis/selinux-redis-2.20190609-r1.ebuild b/sec-policy/selinux-redis/selinux-redis-2.20190609-r1.ebuild
index c12ad03d58ba..0a5cd1d0cdbf 100644
--- a/sec-policy/selinux-redis/selinux-redis-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-redis/selinux-redis-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-redis/selinux-redis-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..c12ad03d58ba
--- /dev/null
+++ b/sec-policy/selinux-redis/selinux-redis-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 b8cf3bc90a16..c5900ab0c47b 100644
--- a/sec-policy/selinux-remotelogin/Manifest
+++ b/sec-policy/selinux-remotelogin/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-remotelogin-2.20190201-r1.ebuild 289 BLAKE2B 5343f05e29cf8408593a5da41114de863230f9475de497d99dd3a959389ee73ecac77d2480c5c4e42c56cd90a4e96ab16386fb96c882563c49079483345d1b13 SHA512 800949a67ea9aa632331e28e49b1d21ee1289361328c9a4f913a652bbadc3fc4f4f6e13766c99e6a1e7fd626be933dd75aa2b516a01e329110a6788f109b8689
-EBUILD selinux-remotelogin-2.20190609-r1.ebuild 291 BLAKE2B 30a5ad39aada322b91ba595ef05522d4d7810ae418162de97f42035f5a0e350383245aaa7a82a3456042f55d357ad3265bc92db84fc009d2ee2d402987ca3036 SHA512 9edbcb1b1e899a15e367efa052405139efc1ef0335b76c2cba2bb1205fdf2af5091a1e39370c319d61d3ab573d66722e0e194cfb843e1436000cefb76346a120
+EBUILD selinux-remotelogin-2.20190609-r1.ebuild 289 BLAKE2B 5343f05e29cf8408593a5da41114de863230f9475de497d99dd3a959389ee73ecac77d2480c5c4e42c56cd90a4e96ab16386fb96c882563c49079483345d1b13 SHA512 800949a67ea9aa632331e28e49b1d21ee1289361328c9a4f913a652bbadc3fc4f4f6e13766c99e6a1e7fd626be933dd75aa2b516a01e329110a6788f109b8689
+EBUILD selinux-remotelogin-2.20200818-r1.ebuild 291 BLAKE2B 30a5ad39aada322b91ba595ef05522d4d7810ae418162de97f42035f5a0e350383245aaa7a82a3456042f55d357ad3265bc92db84fc009d2ee2d402987ca3036 SHA512 9edbcb1b1e899a15e367efa052405139efc1ef0335b76c2cba2bb1205fdf2af5091a1e39370c319d61d3ab573d66722e0e194cfb843e1436000cefb76346a120
 EBUILD selinux-remotelogin-9999.ebuild 294 BLAKE2B 63b287371033938240f0783f929e1005d9d413f31191faf92e097f7edf392b471199e05aad85a6b49bfa894fd9a48265a980be04528e58873a96d5267c4ff1c5 SHA512 d5415954e07c14040b19179c98b4b74b439eec621e8dcca9445f774ad97a6b84ba766c5c40883a27c100bfc6fe2fd4625f3a9358babb7061bbeda46608865e0e
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20190609-r1.ebuild b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20190609-r1.ebuild
index 4517b0a770b5..241229603230 100644
--- a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..4517b0a770b5
--- /dev/null
+++ b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 5f0de7ddef9e..4c4434ef1d12 100644
--- a/sec-policy/selinux-resolvconf/Manifest
+++ b/sec-policy/selinux-resolvconf/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-resolvconf-2.20190201-r1.ebuild 287 BLAKE2B 8c02f6f0b9051decf2f7d568a9416034367635b033622a2720ea9ad82de3de67e2d29d49453da993a165d992807c0e099301449050f4e59a349edce1e1dc6ed6 SHA512 340bab104b54af8b8ca3a0ce6dd8fc5c3ec2b30e6481fc82cd51c8b44868ce7aa175bb5716cd40e85734e780e03cb56ca00069ef0ae14e0c9db9937231c79b9b
-EBUILD selinux-resolvconf-2.20190609-r1.ebuild 289 BLAKE2B 6f460f4bb4ec75a74f071e19ca670a11d4a2a36c7f918972b03e3cb375ca6236c5a8345ac63b2820ccf3703d1a865ce127e8416ed944a7f3a330bca64b6e381a SHA512 180da0b1ad85ae93d3a52ca0e6fe846e57f34473b91834b046bb473f4815a5322aff2d0c56e8e3cda980bc1209ba61ca48b54f2f9c2fc8578c944eba416e1b22
+EBUILD selinux-resolvconf-2.20190609-r1.ebuild 287 BLAKE2B 8c02f6f0b9051decf2f7d568a9416034367635b033622a2720ea9ad82de3de67e2d29d49453da993a165d992807c0e099301449050f4e59a349edce1e1dc6ed6 SHA512 340bab104b54af8b8ca3a0ce6dd8fc5c3ec2b30e6481fc82cd51c8b44868ce7aa175bb5716cd40e85734e780e03cb56ca00069ef0ae14e0c9db9937231c79b9b
+EBUILD selinux-resolvconf-2.20200818-r1.ebuild 289 BLAKE2B 6f460f4bb4ec75a74f071e19ca670a11d4a2a36c7f918972b03e3cb375ca6236c5a8345ac63b2820ccf3703d1a865ce127e8416ed944a7f3a330bca64b6e381a SHA512 180da0b1ad85ae93d3a52ca0e6fe846e57f34473b91834b046bb473f4815a5322aff2d0c56e8e3cda980bc1209ba61ca48b54f2f9c2fc8578c944eba416e1b22
 EBUILD selinux-resolvconf-9999.ebuild 292 BLAKE2B e9255dfa570f0170534214ad71ab6d958e04b4486e38e1868b3a4f20ffcf1ad6b85a87faf71bf16b2916f88baa29f9d14d974a07f8348c34a33295dec6a88e32 SHA512 0d9703c493d70dc67bc268951856ffa8d441aa71176197725682b1e144554bffb8b138d9c7aeb92b5487e1500accef287b11fff38228109227d933af0f52b8c2
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20190609-r1.ebuild b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20190609-r1.ebuild
index b730467be8a2..0f62bf940870 100644
--- a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..b730467be8a2
--- /dev/null
+++ b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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-rgmanager/Manifest b/sec-policy/selinux-rgmanager/Manifest
index fbd42f5039b2..4f8579a0d7af 100644
--- a/sec-policy/selinux-rgmanager/Manifest
+++ b/sec-policy/selinux-rgmanager/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-rgmanager-2.20190201-r1.ebuild 285 BLAKE2B ce09af481f944d8643f53e19107480dfc21f102d2cc464cb669774b505ec8587ada119f0238fd33be58e4546e201f77e42387360d19a1bfa8f87178ebc10523b SHA512 5f339ba6cd31a4233f52c15dac5daaf9210f66128e8e265e68c24ab0904b4131378cf4ea45b41a1e3840dee797d89094ba341d203e5adb52d8a823f5f40d23fd
-EBUILD selinux-rgmanager-2.20190609-r1.ebuild 287 BLAKE2B e1c14b5b21803dcb431488d38a2587ef017a8510b487fa4e97faea69140783f42087955384dbbfab7b555571ec7f512a311c66bae12afe98e3fa82a3f4483c6f SHA512 4ec51162c5c1aab7cc503dbfe8e6754179f9508768c36f92ccf91df2bd768650e6f26e1b021ab696b900c59a62e3405e30e689ce00896ea6ccd3e10e31b32387
+EBUILD selinux-rgmanager-2.20190609-r1.ebuild 285 BLAKE2B ce09af481f944d8643f53e19107480dfc21f102d2cc464cb669774b505ec8587ada119f0238fd33be58e4546e201f77e42387360d19a1bfa8f87178ebc10523b SHA512 5f339ba6cd31a4233f52c15dac5daaf9210f66128e8e265e68c24ab0904b4131378cf4ea45b41a1e3840dee797d89094ba341d203e5adb52d8a823f5f40d23fd
+EBUILD selinux-rgmanager-2.20200818-r1.ebuild 287 BLAKE2B e1c14b5b21803dcb431488d38a2587ef017a8510b487fa4e97faea69140783f42087955384dbbfab7b555571ec7f512a311c66bae12afe98e3fa82a3f4483c6f SHA512 4ec51162c5c1aab7cc503dbfe8e6754179f9508768c36f92ccf91df2bd768650e6f26e1b021ab696b900c59a62e3405e30e689ce00896ea6ccd3e10e31b32387
 EBUILD selinux-rgmanager-9999.ebuild 290 BLAKE2B 68f162e3fafc0999d6c3f8dbba1733cd41f76694304533113ed2a232251fe65b74cc42e192bceea5256bc7bf7112ff3a137e971ec37435b6427fa31377c791ba SHA512 b0f5222906528215a62d1da520e785a6b86b7246f72b1906515b3988c127ce844dd40927dcd9d30a532184c888c6dc600ad34f40be4751fa5ac2d928074289ed
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20190609-r1.ebuild b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20190609-r1.ebuild
index 9822efb832cd..89a8babc012e 100644
--- a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rgmanager"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20200818-r1.ebuild b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..9822efb832cd
--- /dev/null
+++ b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="rgmanager"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rgmanager"
+
+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 a8b7adb821bd..eb605e608fdd 100644
--- a/sec-policy/selinux-rngd/Manifest
+++ b/sec-policy/selinux-rngd/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-rngd-2.20190201-r1.ebuild 275 BLAKE2B 5fff4f51f0fe4c8799232691402c3b49acea4844da3921017fb91bca6073d62cee422bee333b49328570b5abfccf9d987328a231d0f9afe3a8b3c6a9139e98a3 SHA512 1dccfef008fdc8c622cae17c30138a1ef6f62018dbc4d72a8a0b3933b84d5a21950e359ae25580cd18508d9102a80111902f4a5dc355b76a8ce84f2f014d802a
-EBUILD selinux-rngd-2.20190609-r1.ebuild 277 BLAKE2B 9d5cf91d1c686bb617ef427e68f1e681b1a13271ae1e862e13f0a9b81d2b4d9f532289dc39a011261e9fa0c894df8751fc7fb7b8bfecd6df5119e70b5290edb8 SHA512 3037623b14a0e7548e97a0cd451308d78f315f77a37def537067ff0c3b0c31ba248f32ab73ff317c762ad8214dd4bd6e8cf373355340bf95dbeb651e74599263
+EBUILD selinux-rngd-2.20190609-r1.ebuild 275 BLAKE2B 5fff4f51f0fe4c8799232691402c3b49acea4844da3921017fb91bca6073d62cee422bee333b49328570b5abfccf9d987328a231d0f9afe3a8b3c6a9139e98a3 SHA512 1dccfef008fdc8c622cae17c30138a1ef6f62018dbc4d72a8a0b3933b84d5a21950e359ae25580cd18508d9102a80111902f4a5dc355b76a8ce84f2f014d802a
+EBUILD selinux-rngd-2.20200818-r1.ebuild 277 BLAKE2B 9d5cf91d1c686bb617ef427e68f1e681b1a13271ae1e862e13f0a9b81d2b4d9f532289dc39a011261e9fa0c894df8751fc7fb7b8bfecd6df5119e70b5290edb8 SHA512 3037623b14a0e7548e97a0cd451308d78f315f77a37def537067ff0c3b0c31ba248f32ab73ff317c762ad8214dd4bd6e8cf373355340bf95dbeb651e74599263
 EBUILD selinux-rngd-9999.ebuild 280 BLAKE2B 267223020925423a1e68dd53c2b1c519a1b09f6259ae35b6c1ec81487d939cf5ac89d97eaf36660b9aaaa3ffb038340f7523319227f7540b381acd5eb29ace63 SHA512 88dfa6634ef9ef961b49b46b009cf9bf317455c1eded4f695d467ff0ffdc96dac3cde2eafe7ea3dfe766de165551fd68c3d50915333892a17028a8eddfb00258
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-rngd/selinux-rngd-2.20190609-r1.ebuild b/sec-policy/selinux-rngd/selinux-rngd-2.20190609-r1.ebuild
index 6034b2ac8250..354288ac5c95 100644
--- a/sec-policy/selinux-rngd/selinux-rngd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-rngd/selinux-rngd-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-rngd/selinux-rngd-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..6034b2ac8250
--- /dev/null
+++ b/sec-policy/selinux-rngd/selinux-rngd-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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-roundup/Manifest b/sec-policy/selinux-roundup/Manifest
index 4f25a5f3aba4..b7e5d93e413d 100644
--- a/sec-policy/selinux-roundup/Manifest
+++ b/sec-policy/selinux-roundup/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-roundup-2.20190201-r1.ebuild 281 BLAKE2B 0e9bed6d4a7edcf67afd3bada60fc8f322b82fcb77f01f2fd9bf893d96c05ec1f753ed0cafc2e39501effd619d6a0e9dc98cc5b6706a13be372bd172ceb5f472 SHA512 b674a84a978ed88001735bf39f8a375e784ca49d3d82d77b284ee9396fe4fc15092c19ec06d7f598807b7e3102ea7291ce0f94725b6a2bae902f83bd08ff8ac4
-EBUILD selinux-roundup-2.20190609-r1.ebuild 283 BLAKE2B b3e9d2d06a2a70d273710b686ec99c8666016419e9a0dba852d43c9ed32882ed3ba2177dd550ff162d54abdf6c0832f5a900fb7f6b02e8c41074bb8a246ba2c9 SHA512 4bba3a4fe51a68250c06debb2aaada78b04a96ff5d1c1a8a5898e9c49921ec19b16ca19e1694f232d3d5c696c68cae57273d6a3c1cc33a4ac319457fee69c5a9
+EBUILD selinux-roundup-2.20190609-r1.ebuild 281 BLAKE2B 0e9bed6d4a7edcf67afd3bada60fc8f322b82fcb77f01f2fd9bf893d96c05ec1f753ed0cafc2e39501effd619d6a0e9dc98cc5b6706a13be372bd172ceb5f472 SHA512 b674a84a978ed88001735bf39f8a375e784ca49d3d82d77b284ee9396fe4fc15092c19ec06d7f598807b7e3102ea7291ce0f94725b6a2bae902f83bd08ff8ac4
+EBUILD selinux-roundup-2.20200818-r1.ebuild 283 BLAKE2B b3e9d2d06a2a70d273710b686ec99c8666016419e9a0dba852d43c9ed32882ed3ba2177dd550ff162d54abdf6c0832f5a900fb7f6b02e8c41074bb8a246ba2c9 SHA512 4bba3a4fe51a68250c06debb2aaada78b04a96ff5d1c1a8a5898e9c49921ec19b16ca19e1694f232d3d5c696c68cae57273d6a3c1cc33a4ac319457fee69c5a9
 EBUILD selinux-roundup-9999.ebuild 286 BLAKE2B 4421b8cb967f862bded6c8a400ae2393c4c42c99fd0a587846672cf9323088ed6c4abd5b7b5cf28efe6c0c6e132da402fed126c1161a232a4eb73892b08aa7ce SHA512 9ebe58c06cceb80efb2c38fa8c87a39e6466dcd29a2de0a68bb4ede998a03eb3739a246b1722ff3aa98242686142147f09ad70c8f9f5825646cd73187a75dec3
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-roundup/selinux-roundup-2.20190609-r1.ebuild b/sec-policy/selinux-roundup/selinux-roundup-2.20190609-r1.ebuild
index f96eaca2a939..48dddce680e8 100644
--- a/sec-policy/selinux-roundup/selinux-roundup-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-roundup/selinux-roundup-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for roundup"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-roundup/selinux-roundup-2.20200818-r1.ebuild b/sec-policy/selinux-roundup/selinux-roundup-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..f96eaca2a939
--- /dev/null
+++ b/sec-policy/selinux-roundup/selinux-roundup-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="roundup"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for roundup"
+
+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 216e2ff38f2f..b37171dd9108 100644
--- a/sec-policy/selinux-rpc/Manifest
+++ b/sec-policy/selinux-rpc/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-rpc-2.20190201-r1.ebuild 273 BLAKE2B 8c205be1b6dff8d32ff74ee6c3327e2aef789a20542674ef09b72f5e0bb4bf81555c42d0fa1ed337f832c837ba462512369909ba4d08103fa0e0cf527624cf4a SHA512 4ddbf2c541995cedf12039b952e172d7f18c4c05e9e135741127d6f8ceb888269eea56ca015e4230d35fcc11634e9a2c7276a814240cb4d78bf4f9fb21ec0571
-EBUILD selinux-rpc-2.20190609-r1.ebuild 275 BLAKE2B 1d7fca0a859b357b2115e5374816e183fceea729960eea9ef589ab3f4eb86c03bf988af1ddcbbce510222bbc3a54b33e671b6fa768fdfa6263a83241e692ee44 SHA512 b4a3a224b819129ac724d469c6cf949dae8d2a99aaa7c47027127a5dd48fb0ad1637c036ce847f892d83573a31065e7a7c41d70796468e1577df55d20d1f812f
+EBUILD selinux-rpc-2.20190609-r1.ebuild 273 BLAKE2B 8c205be1b6dff8d32ff74ee6c3327e2aef789a20542674ef09b72f5e0bb4bf81555c42d0fa1ed337f832c837ba462512369909ba4d08103fa0e0cf527624cf4a SHA512 4ddbf2c541995cedf12039b952e172d7f18c4c05e9e135741127d6f8ceb888269eea56ca015e4230d35fcc11634e9a2c7276a814240cb4d78bf4f9fb21ec0571
+EBUILD selinux-rpc-2.20200818-r1.ebuild 275 BLAKE2B 1d7fca0a859b357b2115e5374816e183fceea729960eea9ef589ab3f4eb86c03bf988af1ddcbbce510222bbc3a54b33e671b6fa768fdfa6263a83241e692ee44 SHA512 b4a3a224b819129ac724d469c6cf949dae8d2a99aaa7c47027127a5dd48fb0ad1637c036ce847f892d83573a31065e7a7c41d70796468e1577df55d20d1f812f
 EBUILD selinux-rpc-9999.ebuild 278 BLAKE2B 1a4e5d6f1fde92a09772151a9a92ff8f6bcfd6244eeb386c964cafa414a713e9d21ecfdf9592c08806d3e40094f7af833c3180f5e3ba88ba2ee8c3bc98b9155b SHA512 c8eb5bf9ee5d19e0c6c45a496de656d5585ab661d8e9af823d9e5e03c952672b0b4da10b088f31188c0ec265e9d9810b7e2ca327d17084ee0ffd46cb4fa84889
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-rpc/selinux-rpc-2.20190609-r1.ebuild b/sec-policy/selinux-rpc/selinux-rpc-2.20190609-r1.ebuild
index c86a0f6c5dd3..2aed48d48a79 100644
--- a/sec-policy/selinux-rpc/selinux-rpc-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-rpc/selinux-rpc-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-rpc/selinux-rpc-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..c86a0f6c5dd3
--- /dev/null
+++ b/sec-policy/selinux-rpc/selinux-rpc-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 e2d8388e9a0e..d93992408dc2 100644
--- a/sec-policy/selinux-rpcbind/Manifest
+++ b/sec-policy/selinux-rpcbind/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-rpcbind-2.20190201-r1.ebuild 281 BLAKE2B 1e7ca05a478cfb2f54888a18cb58c41faf7108b2a0a00b426bd27500d41e3706901a06f06ac82a237c8b8f2957c177a8b7bc1dfc35a6519ce340d8dedb649aab SHA512 f4a9148e5dcb3055deb4dd1e0a46e96b0363725a198ac2b895734fe1a2771979719e81174447b6188dd3886ddc3726df5f0deaf8375b638a74079e553dc96d5a
-EBUILD selinux-rpcbind-2.20190609-r1.ebuild 283 BLAKE2B 022c0eebeed710290856d355d92ac26cfbf17d32883a04e33fc9b7bcd355b7a85c740ba63232ddc217dd50de7e993627420a9bcd8135cb76d9aa0ff78e27fdad SHA512 201785267e33d07a98daf789589b5e2536c3026fcfc2bb9d2a2d9b434767e79097ab55a8e56a836f4f3159b1f41ddf633a00948dec6aa46dc40a1e326a4c3f57
+EBUILD selinux-rpcbind-2.20190609-r1.ebuild 281 BLAKE2B 1e7ca05a478cfb2f54888a18cb58c41faf7108b2a0a00b426bd27500d41e3706901a06f06ac82a237c8b8f2957c177a8b7bc1dfc35a6519ce340d8dedb649aab SHA512 f4a9148e5dcb3055deb4dd1e0a46e96b0363725a198ac2b895734fe1a2771979719e81174447b6188dd3886ddc3726df5f0deaf8375b638a74079e553dc96d5a
+EBUILD selinux-rpcbind-2.20200818-r1.ebuild 283 BLAKE2B 022c0eebeed710290856d355d92ac26cfbf17d32883a04e33fc9b7bcd355b7a85c740ba63232ddc217dd50de7e993627420a9bcd8135cb76d9aa0ff78e27fdad SHA512 201785267e33d07a98daf789589b5e2536c3026fcfc2bb9d2a2d9b434767e79097ab55a8e56a836f4f3159b1f41ddf633a00948dec6aa46dc40a1e326a4c3f57
 EBUILD selinux-rpcbind-9999.ebuild 286 BLAKE2B 46241d1a7b69f0085b634d308f9535be1c96f6cc3bf3dddd9b99500d2cb9dd0b6d98dccd514a3686ea6a01a5ba2b150dab2f68406c47e563021fcd8e318938a1 SHA512 4a55f78657d78418b6ee4b4d9f7c06fe651555cf729556c236e26033d0f01fe12441defa1e6cbe6f153bf687f3a441df5863e476b35412ea665d672b76e94145
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20190609-r1.ebuild b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20190609-r1.ebuild
index 6a5985799806..20e9cf2815da 100644
--- a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..6a5985799806
--- /dev/null
+++ b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 c0c21313ce9b..b4b0b66db066 100644
--- a/sec-policy/selinux-rpm/Manifest
+++ b/sec-policy/selinux-rpm/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-rpm-2.20190201-r1.ebuild 273 BLAKE2B 9bf704dd99a8bacbb71636a17431c2edaf75f01c62ce831df0bc2883cbd6933a15e921210bc57f40ceeec2ca85e2441c9b5743d9454670257d606ffcd38ebd0f SHA512 e2f9b5752721d7a56687f4997fe703ab9283a3e30d79bb94a39f9494852e264c3bf3b980663cb2a2ea294a62849e8395c64ba991a7e04f2b0755fa44c8395124
-EBUILD selinux-rpm-2.20190609-r1.ebuild 275 BLAKE2B 0637d8f6de33033f482a116d405f68f27ceb081bb186f59c16cfa8430671fdc980fe7364aee2653fe4e525d8cbd2fdb0038217f5a5393604c1247a380e1a905b SHA512 d762abbaf80e78aacd28ac1ebd7ecea8cb0fc47b66f227ce0b54f1afc9a099a8cdef554d2bfff663a703d88cabe86cd29d4cd239c7b1394b7ef2f265db68d639
+EBUILD selinux-rpm-2.20190609-r1.ebuild 273 BLAKE2B 9bf704dd99a8bacbb71636a17431c2edaf75f01c62ce831df0bc2883cbd6933a15e921210bc57f40ceeec2ca85e2441c9b5743d9454670257d606ffcd38ebd0f SHA512 e2f9b5752721d7a56687f4997fe703ab9283a3e30d79bb94a39f9494852e264c3bf3b980663cb2a2ea294a62849e8395c64ba991a7e04f2b0755fa44c8395124
+EBUILD selinux-rpm-2.20200818-r1.ebuild 275 BLAKE2B 0637d8f6de33033f482a116d405f68f27ceb081bb186f59c16cfa8430671fdc980fe7364aee2653fe4e525d8cbd2fdb0038217f5a5393604c1247a380e1a905b SHA512 d762abbaf80e78aacd28ac1ebd7ecea8cb0fc47b66f227ce0b54f1afc9a099a8cdef554d2bfff663a703d88cabe86cd29d4cd239c7b1394b7ef2f265db68d639
 EBUILD selinux-rpm-9999.ebuild 278 BLAKE2B 90c29f8a6086b783670e7ca1efda8c880344d8879cf367d19b1a0ca700f13d8f132ddf3bc39434fe6de4e96d89b22ffecee7f407ad9ffad9117c2d26dc918417 SHA512 0225b020e6736da03e2e0429a462f325b25e004cd4f5d495756ae7b280153f461e9f103460344c58368a1ec5d5e164aa802c3bee4f20280239db582b70a78232
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-rpm/selinux-rpm-2.20190609-r1.ebuild b/sec-policy/selinux-rpm/selinux-rpm-2.20190609-r1.ebuild
index b544f0f441ce..8daca9ef96db 100644
--- a/sec-policy/selinux-rpm/selinux-rpm-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-rpm/selinux-rpm-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-rpm/selinux-rpm-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..b544f0f441ce
--- /dev/null
+++ b/sec-policy/selinux-rpm/selinux-rpm-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 d6392cdf80aa..ebfe4fe308b4 100644
--- a/sec-policy/selinux-rssh/Manifest
+++ b/sec-policy/selinux-rssh/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-rssh-2.20190201-r1.ebuild 275 BLAKE2B b5573fc27f907689b62fee6bd1189e389a995671557e2e946d485c0df94c7679593ce1387b3be93ffd3dad141375746288c47988929aafb4bc1cbdeac9e1203a SHA512 881f12332a6d52f5db80acc615e2130c23ced20a7464a870b38f8ea2441dac01b2dedec5252f214fbf31dd44aba7b5b77ac5c9c35c81f9dc677ff197fa1d5214
-EBUILD selinux-rssh-2.20190609-r1.ebuild 277 BLAKE2B 3607a46536a9c521fd24e642d76616dfddf215a88665cf4ee23ad283127badf3bc3cac486e12b454f8e2bb56c732337b25b79b26f93ca39041e38790de0470ea SHA512 3c182b9239ea8eb886a03a3ed7c30cb01425ac9d0b07cc0986fb8f1dd8fec6991b1783e0df1505f98857ac2b374c233ba8067cc520c640421d97aa6d3e99ef23
+EBUILD selinux-rssh-2.20190609-r1.ebuild 275 BLAKE2B b5573fc27f907689b62fee6bd1189e389a995671557e2e946d485c0df94c7679593ce1387b3be93ffd3dad141375746288c47988929aafb4bc1cbdeac9e1203a SHA512 881f12332a6d52f5db80acc615e2130c23ced20a7464a870b38f8ea2441dac01b2dedec5252f214fbf31dd44aba7b5b77ac5c9c35c81f9dc677ff197fa1d5214
+EBUILD selinux-rssh-2.20200818-r1.ebuild 277 BLAKE2B 3607a46536a9c521fd24e642d76616dfddf215a88665cf4ee23ad283127badf3bc3cac486e12b454f8e2bb56c732337b25b79b26f93ca39041e38790de0470ea SHA512 3c182b9239ea8eb886a03a3ed7c30cb01425ac9d0b07cc0986fb8f1dd8fec6991b1783e0df1505f98857ac2b374c233ba8067cc520c640421d97aa6d3e99ef23
 EBUILD selinux-rssh-9999.ebuild 280 BLAKE2B dbdd12de67cb4578fbb1bb1ea40f34dd0e9d5c50a36dffae635316b47b6f9b2b3875597668b4707e0a9551b561f89a4b141926250d15cb01f70f99aabd8e960a SHA512 a704cbe21a30bec0bea9adefd7a47f9d19b93be5118410c36976c5da088f84d89a33d2fc109e1af1f24b478cb04f7962fe95c4f2eaf5af1976f9386cfe61980f
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-rssh/selinux-rssh-2.20190609-r1.ebuild b/sec-policy/selinux-rssh/selinux-rssh-2.20190609-r1.ebuild
index 8f75fa48cbf2..755769e528e2 100644
--- a/sec-policy/selinux-rssh/selinux-rssh-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-rssh/selinux-rssh-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-rssh/selinux-rssh-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..8f75fa48cbf2
--- /dev/null
+++ b/sec-policy/selinux-rssh/selinux-rssh-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 ac31dfc3038a..f9ea947e8099 100644
--- a/sec-policy/selinux-rtkit/Manifest
+++ b/sec-policy/selinux-rtkit/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-rtkit-2.20190201-r1.ebuild 369 BLAKE2B 5bfa4d06cd51743a4c2f4e47e51ff85f6beeba6d5a4a2cb9b31121533c661acef9b71c08a4abfe3ab0144b6e73d4df8adc9da8653a9e10f0562c236a3608c485 SHA512 dd9a2fbfbf47bb235892c2ff465d9dbe9006d258898af9276a909a0209d26b3cd7f5400dc4c1b3bfe3cb03da93d49bcc53e29f69f4f957ec91694eaf2ed84bd6
-EBUILD selinux-rtkit-2.20190609-r1.ebuild 371 BLAKE2B 305dcbddda624d71d216bc42ad9fe3224c2bd652bbf375fabcdd555a81003ff6638cafcdd40878c0b8a83d2029cb9110bec987fddd973892cab4c149f3d6b923 SHA512 9654ee1d02faab11f0f273ef5255327e86ca6bc2a099dca512969d2d1818063e49ee3a15d3eb13a949994c4f3280684a7f578856a3229092086032a4eb593df7
+EBUILD selinux-rtkit-2.20190609-r1.ebuild 369 BLAKE2B 5bfa4d06cd51743a4c2f4e47e51ff85f6beeba6d5a4a2cb9b31121533c661acef9b71c08a4abfe3ab0144b6e73d4df8adc9da8653a9e10f0562c236a3608c485 SHA512 dd9a2fbfbf47bb235892c2ff465d9dbe9006d258898af9276a909a0209d26b3cd7f5400dc4c1b3bfe3cb03da93d49bcc53e29f69f4f957ec91694eaf2ed84bd6
+EBUILD selinux-rtkit-2.20200818-r1.ebuild 371 BLAKE2B 305dcbddda624d71d216bc42ad9fe3224c2bd652bbf375fabcdd555a81003ff6638cafcdd40878c0b8a83d2029cb9110bec987fddd973892cab4c149f3d6b923 SHA512 9654ee1d02faab11f0f273ef5255327e86ca6bc2a099dca512969d2d1818063e49ee3a15d3eb13a949994c4f3280684a7f578856a3229092086032a4eb593df7
 EBUILD selinux-rtkit-9999.ebuild 374 BLAKE2B c59a69259280f7f56d77c4e31f805f3fa6eea8b60dc5fb623e858fed40cca6ea8018baaff6a8affac9d67035b52ebb0e51ccb7d78090bb94e48a9edd814b8a2f SHA512 7c887a0a48ab266f3c8361554dd6c92bf2396cc454aef382d8dcdc8ceb66bf0bb3195beb3ba0002a6c1426f90da491c8d1e00640c4f83681c8f271244c5cae84
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-rtkit/selinux-rtkit-2.20190609-r1.ebuild b/sec-policy/selinux-rtkit/selinux-rtkit-2.20190609-r1.ebuild
index 58fdb82b561e..ebc3d3cf06f6 100644
--- a/sec-policy/selinux-rtkit/selinux-rtkit-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-rtkit/selinux-rtkit-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-rtkit/selinux-rtkit-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..58fdb82b561e
--- /dev/null
+++ b/sec-policy/selinux-rtkit/selinux-rtkit-2.20200818-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 035367f7bdec..ba5287da22a9 100644
--- a/sec-policy/selinux-rtorrent/Manifest
+++ b/sec-policy/selinux-rtorrent/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-rtorrent-2.20190201-r1.ebuild 283 BLAKE2B 20863745b3fd14c2529d67710be8197d088ce19068f19d72c6e966eb74396bf447e1017718573233360a53247b203adcf1363e95e840ff9a9657164d0cfb8cc0 SHA512 3ec3f2fdd3486472e6877f15b934416e110c43046a4bc704cc9b4b399457a1683576ca71315772097b5a9ed87bc895f6adad29665c113f2ef19931e2ac62586d
-EBUILD selinux-rtorrent-2.20190609-r1.ebuild 285 BLAKE2B d2d76052f307ffaee102b3d24ce6d4c1377333690383c81b6f2784acd5c696c916a224b54c76fc9088f735aa3f6ea3227e487646eefb9486b93d4ee2c51f3c88 SHA512 db7426e2f7358026c1e5795fa88bc276c89a44f540b04eeefae1350b6fa073f124e721152cb97414c7ff6a79236ff33f25ec1f35c7e5bc4cc58e3a365e3bf93d
+EBUILD selinux-rtorrent-2.20190609-r1.ebuild 283 BLAKE2B 20863745b3fd14c2529d67710be8197d088ce19068f19d72c6e966eb74396bf447e1017718573233360a53247b203adcf1363e95e840ff9a9657164d0cfb8cc0 SHA512 3ec3f2fdd3486472e6877f15b934416e110c43046a4bc704cc9b4b399457a1683576ca71315772097b5a9ed87bc895f6adad29665c113f2ef19931e2ac62586d
+EBUILD selinux-rtorrent-2.20200818-r1.ebuild 285 BLAKE2B d2d76052f307ffaee102b3d24ce6d4c1377333690383c81b6f2784acd5c696c916a224b54c76fc9088f735aa3f6ea3227e487646eefb9486b93d4ee2c51f3c88 SHA512 db7426e2f7358026c1e5795fa88bc276c89a44f540b04eeefae1350b6fa073f124e721152cb97414c7ff6a79236ff33f25ec1f35c7e5bc4cc58e3a365e3bf93d
 EBUILD selinux-rtorrent-9999.ebuild 288 BLAKE2B 5d078f32d7089481a39ca6936ef5603ec1e86e90fe96451872d6c8cb952b743c45dca4dc47fa997e937e1c8865396b437f1979bfaa43a168a8125eeff155f4ab SHA512 b739464aef942b18827729a74bbb14c979f8c9acdbfa4e648619b6b343b0c6a104a0c14517cb26fbfc465bcc65bf2292602862e6db10a22e59494c517a1a2a12
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20190609-r1.ebuild b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20190609-r1.ebuild
index f787f854b520..901fc63de3c6 100644
--- a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..f787f854b520
--- /dev/null
+++ b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 9e2379efb233..b64ac8695c31 100644
--- a/sec-policy/selinux-salt/Manifest
+++ b/sec-policy/selinux-salt/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-salt-2.20190201-r1.ebuild 275 BLAKE2B f04eb70cfab112cfc073f6e9b777eb9285ec34efb970f61f09eb1f7350be98ac2f1702875dc499331e1709c9a2d743892e22d18381ab0f9f9ab441bf22446a61 SHA512 710b5e57bbe32eb0de27020e143df22082ff657070f756d65bf6f31601c21a3e63ed7198a4359887f01a305274ba3427705bdd757603f27e195b5a81321ff914
-EBUILD selinux-salt-2.20190609-r1.ebuild 277 BLAKE2B aefdd8a0819ed3651eec753c43c9e1089c375655421a5ab85f48ca67038484f15081b6ae03f1718a7cf78638d18e7c14d38c9c0a28e4abd88760f9560b1b9739 SHA512 4912a580b054f418cc7fc66b13563aa4d643a2c47231c38abe762609df021b492a1efa432db9ab2caf1fab3d0146e5ffda332bb0462facf7ac6322e1701290d3
+EBUILD selinux-salt-2.20190609-r1.ebuild 275 BLAKE2B f04eb70cfab112cfc073f6e9b777eb9285ec34efb970f61f09eb1f7350be98ac2f1702875dc499331e1709c9a2d743892e22d18381ab0f9f9ab441bf22446a61 SHA512 710b5e57bbe32eb0de27020e143df22082ff657070f756d65bf6f31601c21a3e63ed7198a4359887f01a305274ba3427705bdd757603f27e195b5a81321ff914
+EBUILD selinux-salt-2.20200818-r1.ebuild 277 BLAKE2B aefdd8a0819ed3651eec753c43c9e1089c375655421a5ab85f48ca67038484f15081b6ae03f1718a7cf78638d18e7c14d38c9c0a28e4abd88760f9560b1b9739 SHA512 4912a580b054f418cc7fc66b13563aa4d643a2c47231c38abe762609df021b492a1efa432db9ab2caf1fab3d0146e5ffda332bb0462facf7ac6322e1701290d3
 EBUILD selinux-salt-9999.ebuild 280 BLAKE2B 57da261a6af90ce27eaad5ffd0ac852360239596d841e57aa45a74d39ddad21802c010b564007cffa6c41dfd4153b84e304b51abb3764adb64c812fff3bdee03 SHA512 c5c812652bd760a095b196d99640c98b30cc1b9ad1a8c6788bdd2c049db1034233715bbd000ac73f1534f9c2ce53e0458a4c5cab16df227b04fed246352c229a
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-salt/selinux-salt-2.20190609-r1.ebuild b/sec-policy/selinux-salt/selinux-salt-2.20190609-r1.ebuild
index 05742efd1e71..bca578fc21d4 100644
--- a/sec-policy/selinux-salt/selinux-salt-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-salt/selinux-salt-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-salt/selinux-salt-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..05742efd1e71
--- /dev/null
+++ b/sec-policy/selinux-salt/selinux-salt-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 39d215a4e377..7b2ac3fea048 100644
--- a/sec-policy/selinux-samba/Manifest
+++ b/sec-policy/selinux-samba/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-samba-2.20190201-r1.ebuild 277 BLAKE2B 88cb059e3026443d8403aecaff9ee2f6a7de5955215f690e1bb33ee625bda84728120565c119a6f95a1568d32c08f5cdcf45ceb35c68236293a516340e6ea0bf SHA512 c03c9efec2e6ec01a3875f0d1e4cd82fecc2d816504b6f440aada9c060118d8ec4ace7a432fbd7272fcdc5afecdabe1a2af19dee78618ff259bd2f6a823191f5
-EBUILD selinux-samba-2.20190609-r1.ebuild 279 BLAKE2B e0b9ef24123c6191a12c3270383bcdeb90e6357c3744db79f58a15a5e70a02e3de3c35ef79268fb10b30dd6c2bf21e1b820065fac6e50bc5f55d30eab451028e SHA512 bfdf6d8a31d0de1037ef8aedb6d68d32e7928bc9006e1d804590bf72d2b941abb477cff9611dc0eab6895205ef569e5d91511687e00c792139a9e6efaebf7806
+EBUILD selinux-samba-2.20190609-r1.ebuild 277 BLAKE2B 88cb059e3026443d8403aecaff9ee2f6a7de5955215f690e1bb33ee625bda84728120565c119a6f95a1568d32c08f5cdcf45ceb35c68236293a516340e6ea0bf SHA512 c03c9efec2e6ec01a3875f0d1e4cd82fecc2d816504b6f440aada9c060118d8ec4ace7a432fbd7272fcdc5afecdabe1a2af19dee78618ff259bd2f6a823191f5
+EBUILD selinux-samba-2.20200818-r1.ebuild 279 BLAKE2B e0b9ef24123c6191a12c3270383bcdeb90e6357c3744db79f58a15a5e70a02e3de3c35ef79268fb10b30dd6c2bf21e1b820065fac6e50bc5f55d30eab451028e SHA512 bfdf6d8a31d0de1037ef8aedb6d68d32e7928bc9006e1d804590bf72d2b941abb477cff9611dc0eab6895205ef569e5d91511687e00c792139a9e6efaebf7806
 EBUILD selinux-samba-9999.ebuild 282 BLAKE2B 3a7ab80a82719f320747810475b6eab63e1929215dbb7e95ef0a939de8c96a75fff45d61ebc0ef07f30a5c7ef75d994a60336bc369e62695e792b42189c887a6 SHA512 138863489e7fbe35ea4d2ae523e871786e0376ea7349453ee6d630e37f11b6a0e564a1fe50a5c620bcb57ae08bbdf584ce48101facb1d0b4942d5a286ff4fb3e
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-samba/selinux-samba-2.20190609-r1.ebuild b/sec-policy/selinux-samba/selinux-samba-2.20190609-r1.ebuild
index 813642665e2c..618fd14b6b47 100644
--- a/sec-policy/selinux-samba/selinux-samba-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-samba/selinux-samba-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-samba/selinux-samba-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..813642665e2c
--- /dev/null
+++ b/sec-policy/selinux-samba/selinux-samba-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 4de0a555e03d..4f1529569bf7 100644
--- a/sec-policy/selinux-sasl/Manifest
+++ b/sec-policy/selinux-sasl/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-sasl-2.20190201-r1.ebuild 275 BLAKE2B 9b00429d7622ae32bff528f572a1daf593d92141b9ddaf92e9724f7f673ee8695cb5fae8eb6cb96efa2c7fa66f72fa59fbc7719a006a64d7a4345963bcdbbff4 SHA512 0a5e2cd1c277f53b4d933043b6e07d22036357188a37c7643bf61b766078ca0424fb29b03c27d0e10a7c6322f0e1875b6d2c0b40e9520472f978454e584da8d9
-EBUILD selinux-sasl-2.20190609-r1.ebuild 277 BLAKE2B 214a7c392dcc3641a6a9021e357b7e3bcf412db78a6f7c2fb4a1dfb2ee83717dc2ec9d682540b6e7b7505ade463b06cdef55bf674aa53befa10902db8a298bce SHA512 ba4b8481052c981fe7610fe9c4c32b5350bbd937691a41be15bef7d09d4d83199b78b3dd85af76d8de3465511cade7936c7e6544422b499cd9204b64427194cf
+EBUILD selinux-sasl-2.20190609-r1.ebuild 275 BLAKE2B 9b00429d7622ae32bff528f572a1daf593d92141b9ddaf92e9724f7f673ee8695cb5fae8eb6cb96efa2c7fa66f72fa59fbc7719a006a64d7a4345963bcdbbff4 SHA512 0a5e2cd1c277f53b4d933043b6e07d22036357188a37c7643bf61b766078ca0424fb29b03c27d0e10a7c6322f0e1875b6d2c0b40e9520472f978454e584da8d9
+EBUILD selinux-sasl-2.20200818-r1.ebuild 277 BLAKE2B 214a7c392dcc3641a6a9021e357b7e3bcf412db78a6f7c2fb4a1dfb2ee83717dc2ec9d682540b6e7b7505ade463b06cdef55bf674aa53befa10902db8a298bce SHA512 ba4b8481052c981fe7610fe9c4c32b5350bbd937691a41be15bef7d09d4d83199b78b3dd85af76d8de3465511cade7936c7e6544422b499cd9204b64427194cf
 EBUILD selinux-sasl-9999.ebuild 280 BLAKE2B 31589652b5685c731873da4b72f2a853ccd29c9ab6ddd55380a07025b97121b20879dded6683e2c56a4f0fadf9c9ca6980d8e2c5ede2b42c1f66969ee44e0f1e SHA512 d21d7a904257464cd9b5f4d5891764639b403610ff6b39ae550ca2150131ad1e004341a04b723b644b5ff029deaa2f638441b4510d18de89c0cfb5833213a374
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-sasl/selinux-sasl-2.20190609-r1.ebuild b/sec-policy/selinux-sasl/selinux-sasl-2.20190609-r1.ebuild
index 3bf62b5455c0..52cd1ae23351 100644
--- a/sec-policy/selinux-sasl/selinux-sasl-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-sasl/selinux-sasl-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-sasl/selinux-sasl-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..3bf62b5455c0
--- /dev/null
+++ b/sec-policy/selinux-sasl/selinux-sasl-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 89998b3b1f8a..5b1ae019eea5 100644
--- a/sec-policy/selinux-screen/Manifest
+++ b/sec-policy/selinux-screen/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-screen-2.20190201-r1.ebuild 279 BLAKE2B 72da60f4b348baa52f7c6c64382e8513601383c47d79ef055390a5a202640c022d6d019936f08281a660ed4f8cf7dec0e3dada6b2aee6e9a87b67fd69986b22e SHA512 78909c24917c8390078fbd7b25adc0d56f1048023b214187d3cc13ecb2690f6388b6cf102cd502fce173bb5d1118fbc86c42da0c2c020f0ae87f1dcd277f7b17
-EBUILD selinux-screen-2.20190609-r1.ebuild 281 BLAKE2B adc702f2e3634493c7f5a46d22779a451622a12f665c26cb543df9d8a5359b12bab4960be190b321772a369ebd02a4915e93a5b987804eae96517b5b9f2fdddc SHA512 b04302f47650c9c50b6a4ea83027cf9e6c12b00ec899231e556c9edf0d84aa9a1fb8347aba346fd125fba2dcc05149fa3b989679405e58f8cbd14fdd67abe49e
+EBUILD selinux-screen-2.20190609-r1.ebuild 279 BLAKE2B 72da60f4b348baa52f7c6c64382e8513601383c47d79ef055390a5a202640c022d6d019936f08281a660ed4f8cf7dec0e3dada6b2aee6e9a87b67fd69986b22e SHA512 78909c24917c8390078fbd7b25adc0d56f1048023b214187d3cc13ecb2690f6388b6cf102cd502fce173bb5d1118fbc86c42da0c2c020f0ae87f1dcd277f7b17
+EBUILD selinux-screen-2.20200818-r1.ebuild 281 BLAKE2B adc702f2e3634493c7f5a46d22779a451622a12f665c26cb543df9d8a5359b12bab4960be190b321772a369ebd02a4915e93a5b987804eae96517b5b9f2fdddc SHA512 b04302f47650c9c50b6a4ea83027cf9e6c12b00ec899231e556c9edf0d84aa9a1fb8347aba346fd125fba2dcc05149fa3b989679405e58f8cbd14fdd67abe49e
 EBUILD selinux-screen-9999.ebuild 284 BLAKE2B 42b53559269510928a8caa16a762abadc99711b65e891874a6d5749ad28f9e9287b2fa9b83e017c23c301cd5f3a3d2dfd23841efc590629fe5d6434286d38044 SHA512 fc53f22da32d74ceb7728f2430c68e328d93508bfd9ed18809929e6edabad55d876950985d7edea50ecdb83f2ea4fb591525850baf02ca06db1593ac9cec47ab
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-screen/selinux-screen-2.20190609-r1.ebuild b/sec-policy/selinux-screen/selinux-screen-2.20190609-r1.ebuild
index 92256a1a8fcc..c44e2cb133fd 100644
--- a/sec-policy/selinux-screen/selinux-screen-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-screen/selinux-screen-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-screen/selinux-screen-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..92256a1a8fcc
--- /dev/null
+++ b/sec-policy/selinux-screen/selinux-screen-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 19ea3c60ad1e..553779d9085e 100644
--- a/sec-policy/selinux-sendmail/Manifest
+++ b/sec-policy/selinux-sendmail/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-sendmail-2.20190201-r1.ebuild 283 BLAKE2B 4870efd8b8279600e3e6a57dc99fb2ba051005ace385a49717431063036ace40760b645e3663ca5004eaeb614aee3563a85463704bc6a0bab98a61765dcf588f SHA512 436d50b5aaf3d2fc2cc77d574bb64a986b4daec4ba6449254a528b5528fad28cd590cd9421d7e53a3e5ab97286d97b6dc2214100cd470f1a228e83b7e974a9d7
-EBUILD selinux-sendmail-2.20190609-r1.ebuild 285 BLAKE2B ad520cc33b4744ac665b7554f82882a1b5c65697f91df4bc4ab29b4b3afdc3f6513da46cf2e929b0816d8b74688312bbe19341ff9b8b5455fe552e38fa378fae SHA512 468ddce085e6326dafe8ddd5dc6cd6623815c899c7dc08489b9dd02172aa28e5ed310567f3c3db7d5fdeaeefa4e30494cd7fb8003ef0674ee46b8ec7baa1351e
+EBUILD selinux-sendmail-2.20190609-r1.ebuild 283 BLAKE2B 4870efd8b8279600e3e6a57dc99fb2ba051005ace385a49717431063036ace40760b645e3663ca5004eaeb614aee3563a85463704bc6a0bab98a61765dcf588f SHA512 436d50b5aaf3d2fc2cc77d574bb64a986b4daec4ba6449254a528b5528fad28cd590cd9421d7e53a3e5ab97286d97b6dc2214100cd470f1a228e83b7e974a9d7
+EBUILD selinux-sendmail-2.20200818-r1.ebuild 285 BLAKE2B ad520cc33b4744ac665b7554f82882a1b5c65697f91df4bc4ab29b4b3afdc3f6513da46cf2e929b0816d8b74688312bbe19341ff9b8b5455fe552e38fa378fae SHA512 468ddce085e6326dafe8ddd5dc6cd6623815c899c7dc08489b9dd02172aa28e5ed310567f3c3db7d5fdeaeefa4e30494cd7fb8003ef0674ee46b8ec7baa1351e
 EBUILD selinux-sendmail-9999.ebuild 288 BLAKE2B 05bd10bec2bc966773d3e51dc12d1341317378e1b72b888f737c16eec36526d1ddc6e9e2c973c410e2947b3161ba3b880ea72ceb7fdcebf6e0914f57863212a3 SHA512 2709920be12f5982f9033b80a9a38145185494fb16fad5b9768a5d0b93cf27575d07fde46f790eda463194472c3747bec2da0541f2eca51738908df9c42958e6
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-sendmail/selinux-sendmail-2.20190609-r1.ebuild b/sec-policy/selinux-sendmail/selinux-sendmail-2.20190609-r1.ebuild
index db11f93080c5..c2df25cda294 100644
--- a/sec-policy/selinux-sendmail/selinux-sendmail-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-sendmail/selinux-sendmail-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-sendmail/selinux-sendmail-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..db11f93080c5
--- /dev/null
+++ b/sec-policy/selinux-sendmail/selinux-sendmail-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 3e09eb305f32..ab4cf9746335 100644
--- a/sec-policy/selinux-sensord/Manifest
+++ b/sec-policy/selinux-sensord/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-sensord-2.20190201-r1.ebuild 281 BLAKE2B 8d93a3540c6b5eee06cf0787946d71e75a32e31bfa8045a7b112312cb23bdb3a2ec9ead9707f165feef5cf3357b8d20cb4e1004f5d04be2b789857463d664047 SHA512 1f55e06b99655e463010f57ac9dbd78cda68ee8bfa04639bc3234fbad76d25b878335088b5f954ef333bcd306286e92a9c914552f5581879bb2f3befe3863d6f
-EBUILD selinux-sensord-2.20190609-r1.ebuild 283 BLAKE2B d953c7a90b9894c63a9adb8d67817cd8db2e685d000a40f0b7b2dde0392ed44606a8b178d86fb87abe55c1b0ac540bea9e0f9192238bf32fc7e9842f4859ce60 SHA512 e146a6516d3bfe249f4324f247b2a9113c5455aaaff0aaf3b02c498e2715e6ada348f97520a2551d5586dd04ae721ef17c5108f294405cacabfd4b6830a1d73c
+EBUILD selinux-sensord-2.20190609-r1.ebuild 281 BLAKE2B 8d93a3540c6b5eee06cf0787946d71e75a32e31bfa8045a7b112312cb23bdb3a2ec9ead9707f165feef5cf3357b8d20cb4e1004f5d04be2b789857463d664047 SHA512 1f55e06b99655e463010f57ac9dbd78cda68ee8bfa04639bc3234fbad76d25b878335088b5f954ef333bcd306286e92a9c914552f5581879bb2f3befe3863d6f
+EBUILD selinux-sensord-2.20200818-r1.ebuild 283 BLAKE2B d953c7a90b9894c63a9adb8d67817cd8db2e685d000a40f0b7b2dde0392ed44606a8b178d86fb87abe55c1b0ac540bea9e0f9192238bf32fc7e9842f4859ce60 SHA512 e146a6516d3bfe249f4324f247b2a9113c5455aaaff0aaf3b02c498e2715e6ada348f97520a2551d5586dd04ae721ef17c5108f294405cacabfd4b6830a1d73c
 EBUILD selinux-sensord-9999.ebuild 286 BLAKE2B 1477754bef285aed5fd5f9d03855b0be6ff3da0f3dd14da44adf2ba6acb44915a25623d7e5f70159e3a9e6d89ac3d5e5d8df0bd6fcc3d83194aa260b53973efe SHA512 8c9e7191d7d4a23ef0844ee6a53afb36a139dbbd9c8e4d25dca6887ad3a20287c47988e35686033f675d0c57e02cc7df6e91928b1269d130cc6c4f8222342935
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-sensord/selinux-sensord-2.20190609-r1.ebuild b/sec-policy/selinux-sensord/selinux-sensord-2.20190609-r1.ebuild
index 34aa09fdd723..cd5059fc9d7a 100644
--- a/sec-policy/selinux-sensord/selinux-sensord-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-sensord/selinux-sensord-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-sensord/selinux-sensord-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..34aa09fdd723
--- /dev/null
+++ b/sec-policy/selinux-sensord/selinux-sensord-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 074554d37173..4d85a9eab707 100644
--- a/sec-policy/selinux-shorewall/Manifest
+++ b/sec-policy/selinux-shorewall/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-shorewall-2.20190201-r1.ebuild 285 BLAKE2B a654b02c22fd5d094f1ae4057fb413829692ebc3d59e30d28b6d508bd8460d03215a0dfde6fface76aa6845bbed89e7c1ddd09e34c9cd2d643c5ebd7b4ed90d5 SHA512 39533ad8dca1a4c07e3007830b79508df3cdb9e9b4ca450e05c2ad3ac2de107f1221fc09ffdeb3877dda8d2a0c561addcb75d35ef44482bf3c20e6bfc7ea8649
-EBUILD selinux-shorewall-2.20190609-r1.ebuild 287 BLAKE2B 040cc943e8dd8ffd996d9db6bd4274e2dcb0335dd18ac6acbc88f24211e147b25662cdb7d6dadfc7352bd4c15794a27bc35eb3474542dfc3652874dd8da4716f SHA512 65fc9c8e555504d4d4fae5377ac183ea0ae8e67a83bc1091cbf4f3448430ac626a8f5b5724bcfc2712dbd8879be136da4edbfaa196ff4883dff91c9d6c06c7e8
+EBUILD selinux-shorewall-2.20190609-r1.ebuild 285 BLAKE2B a654b02c22fd5d094f1ae4057fb413829692ebc3d59e30d28b6d508bd8460d03215a0dfde6fface76aa6845bbed89e7c1ddd09e34c9cd2d643c5ebd7b4ed90d5 SHA512 39533ad8dca1a4c07e3007830b79508df3cdb9e9b4ca450e05c2ad3ac2de107f1221fc09ffdeb3877dda8d2a0c561addcb75d35ef44482bf3c20e6bfc7ea8649
+EBUILD selinux-shorewall-2.20200818-r1.ebuild 287 BLAKE2B 040cc943e8dd8ffd996d9db6bd4274e2dcb0335dd18ac6acbc88f24211e147b25662cdb7d6dadfc7352bd4c15794a27bc35eb3474542dfc3652874dd8da4716f SHA512 65fc9c8e555504d4d4fae5377ac183ea0ae8e67a83bc1091cbf4f3448430ac626a8f5b5724bcfc2712dbd8879be136da4edbfaa196ff4883dff91c9d6c06c7e8
 EBUILD selinux-shorewall-9999.ebuild 290 BLAKE2B e0dc076059142695f75a3b43b3ecd1fc0bf7de98ccf25d4b9c16b93e73606c09771d1a14dba6ff9521b8ec18d4580e30c4ea84533968acd82e6f4ad40b0152e1 SHA512 b5690dd0fedf4574f92f4a537474b38fe66a2ea5db5f64b0088a8e6652ae7694067f45bd95bdea0298353eecec7b1503e4e059e5e6e6e3bab6c1a11d1ca4866d
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-shorewall/selinux-shorewall-2.20190609-r1.ebuild b/sec-policy/selinux-shorewall/selinux-shorewall-2.20190609-r1.ebuild
index 5b145b254b2c..05281937cc49 100644
--- a/sec-policy/selinux-shorewall/selinux-shorewall-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-shorewall/selinux-shorewall-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-shorewall/selinux-shorewall-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..5b145b254b2c
--- /dev/null
+++ b/sec-policy/selinux-shorewall/selinux-shorewall-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 06b832c6655d..149197c2412d 100644
--- a/sec-policy/selinux-shutdown/Manifest
+++ b/sec-policy/selinux-shutdown/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-shutdown-2.20190201-r1.ebuild 283 BLAKE2B 14e7eb6f288ea0a4bf3c624fb2ecd1aaae328e0379516449a6ef07789a61f51023d7f73219237711b34420084edd29b3984d5c2223fde40be808be2999edaa9b SHA512 4cd508eaed6be39ad3b4c3f6f1e98e071bcbe4cf953be6d970756efbe49e8ea0c110c30482450280fe1f8257660cac1823aaa694f1ff7db6f264cdd53d679850
-EBUILD selinux-shutdown-2.20190609-r1.ebuild 285 BLAKE2B 18449a4357bab6b7fa993611dc52a449f6f39b1a49c33f236d8e021ed47c22ea93f67ac3ca3c7012919a2ea7274737cc7d4b7e816dd7abf2a6bbe5887fda3888 SHA512 abe85f94d40441b84e9f4780708ba4310e20644f71e82725aba3cd4a5342c6003d610cdcef62fbd18e507295163454890d01698cdddb2cd4bfee100976b66ce7
+EBUILD selinux-shutdown-2.20190609-r1.ebuild 283 BLAKE2B 14e7eb6f288ea0a4bf3c624fb2ecd1aaae328e0379516449a6ef07789a61f51023d7f73219237711b34420084edd29b3984d5c2223fde40be808be2999edaa9b SHA512 4cd508eaed6be39ad3b4c3f6f1e98e071bcbe4cf953be6d970756efbe49e8ea0c110c30482450280fe1f8257660cac1823aaa694f1ff7db6f264cdd53d679850
+EBUILD selinux-shutdown-2.20200818-r1.ebuild 285 BLAKE2B 18449a4357bab6b7fa993611dc52a449f6f39b1a49c33f236d8e021ed47c22ea93f67ac3ca3c7012919a2ea7274737cc7d4b7e816dd7abf2a6bbe5887fda3888 SHA512 abe85f94d40441b84e9f4780708ba4310e20644f71e82725aba3cd4a5342c6003d610cdcef62fbd18e507295163454890d01698cdddb2cd4bfee100976b66ce7
 EBUILD selinux-shutdown-9999.ebuild 288 BLAKE2B 73b5cbb17f267852552ac4bb81117a02a8caca7b3ce5cc831fbe81b1f6208438ddd182717b27cb4143d3e1bcdb5778a43c84778a45f10d1da25380034fdfd601 SHA512 7b7f9d741ee204b11534f65003cd7ef531daf381f2516a1ec12bdd53006ecd0bba6f48f1a437c37eeff1ad62d3dc82ab1c3b3f124f98f9c4f7a7d20b1c58fb98
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-shutdown/selinux-shutdown-2.20190609-r1.ebuild b/sec-policy/selinux-shutdown/selinux-shutdown-2.20190609-r1.ebuild
index f3e44d7a6581..e2a1e5b237f7 100644
--- a/sec-policy/selinux-shutdown/selinux-shutdown-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-shutdown/selinux-shutdown-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-shutdown/selinux-shutdown-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..f3e44d7a6581
--- /dev/null
+++ b/sec-policy/selinux-shutdown/selinux-shutdown-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 99ec89b579ab..1bfdab4c111b 100644
--- a/sec-policy/selinux-skype/Manifest
+++ b/sec-policy/selinux-skype/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-skype-2.20190201-r1.ebuild 379 BLAKE2B 5fe1b376770afb508566cb8a4c490b5faf571ab1e3d13d521debdada55657479b8886c67b001b06faefdbc30d4ff16abc6ad424909cbc3007be88111e77daac9 SHA512 13dd3675eb8349c9ed5986c8f1f078d73fdabd852cdb2be30b120ffaee6e2cf3f88d1af707581c4dedad68451e38e2edc6b08db425a13c85985fd6c37092abfe
-EBUILD selinux-skype-2.20190609-r1.ebuild 381 BLAKE2B 015136aded86fff16dfe7b35983f38e2b328bb7e77f2a6a1e88a90068f99245cf106bebc36a3b506ee93ea48375b7bf9d7b71a3b6f15a2a792313badd42e33dd SHA512 e509469a0eda97c1cf4623cd5e23f41816f7257b85ef3cc0b33c333aed4a05173226786444e404b0fc5cfac1081ba30b1bf31bfd5193619b639a40d274ac4abd
+EBUILD selinux-skype-2.20190609-r1.ebuild 379 BLAKE2B 5fe1b376770afb508566cb8a4c490b5faf571ab1e3d13d521debdada55657479b8886c67b001b06faefdbc30d4ff16abc6ad424909cbc3007be88111e77daac9 SHA512 13dd3675eb8349c9ed5986c8f1f078d73fdabd852cdb2be30b120ffaee6e2cf3f88d1af707581c4dedad68451e38e2edc6b08db425a13c85985fd6c37092abfe
+EBUILD selinux-skype-2.20200818-r1.ebuild 381 BLAKE2B 015136aded86fff16dfe7b35983f38e2b328bb7e77f2a6a1e88a90068f99245cf106bebc36a3b506ee93ea48375b7bf9d7b71a3b6f15a2a792313badd42e33dd SHA512 e509469a0eda97c1cf4623cd5e23f41816f7257b85ef3cc0b33c333aed4a05173226786444e404b0fc5cfac1081ba30b1bf31bfd5193619b639a40d274ac4abd
 EBUILD selinux-skype-9999.ebuild 384 BLAKE2B 187ccc988495b18da32a5bb24378ad36b8f735e678713f25c0d9af30ae2e2f77544fe32f8ace666910bef7b12fd9adfaf1eb1f2c9deba8311ed413950292bc63 SHA512 3b5ca908b5515ce49303986d0cbd4b9d957ec2d1dec18b782aa181c475f2cba719b15cca0b7afe60eed3e30e0c85ecdfd8ba7ea68b4a218fc49eab76405a99fe
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-skype/selinux-skype-2.20190609-r1.ebuild b/sec-policy/selinux-skype/selinux-skype-2.20190609-r1.ebuild
index 6aa818db38cc..ab8db9c3022a 100644
--- a/sec-policy/selinux-skype/selinux-skype-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-skype/selinux-skype-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-skype/selinux-skype-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..6aa818db38cc
--- /dev/null
+++ b/sec-policy/selinux-skype/selinux-skype-2.20200818-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 1ed2aec2e10f..ebe910dfdad0 100644
--- a/sec-policy/selinux-slocate/Manifest
+++ b/sec-policy/selinux-slocate/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-slocate-2.20190201-r1.ebuild 281 BLAKE2B 5436328f3845a2529ccd70a9e9ad8e745968c08c4557f991f7773598744824c2d4e8fa03eeb75788104403b33914f601ae48d8e536086a7e7c82895edd9c4635 SHA512 6b64dc152984fe27eae3a5e65cebc7013fbe4b5b385dccac827702e60d9b5871594db1e4b0106e1f0bc297d76fcea78c272c8c154069158375be52353f44017c
-EBUILD selinux-slocate-2.20190609-r1.ebuild 283 BLAKE2B c9e39930f4b0d4cae728ef17d6fdeca26b78d64624977da0699f63ac279abb954957020c2442b43debd69571858921b6e68654257ea0123dd179c1b0393fc03a SHA512 6c795d548a23b1b4bed8c57706f2143cf4e57b21dc3439595e519f9c3482d47244631523eaa996da0b1dfc85ec04a60dfd0b5fea258c8e441db8323caf3c07a6
+EBUILD selinux-slocate-2.20190609-r1.ebuild 281 BLAKE2B 5436328f3845a2529ccd70a9e9ad8e745968c08c4557f991f7773598744824c2d4e8fa03eeb75788104403b33914f601ae48d8e536086a7e7c82895edd9c4635 SHA512 6b64dc152984fe27eae3a5e65cebc7013fbe4b5b385dccac827702e60d9b5871594db1e4b0106e1f0bc297d76fcea78c272c8c154069158375be52353f44017c
+EBUILD selinux-slocate-2.20200818-r1.ebuild 283 BLAKE2B c9e39930f4b0d4cae728ef17d6fdeca26b78d64624977da0699f63ac279abb954957020c2442b43debd69571858921b6e68654257ea0123dd179c1b0393fc03a SHA512 6c795d548a23b1b4bed8c57706f2143cf4e57b21dc3439595e519f9c3482d47244631523eaa996da0b1dfc85ec04a60dfd0b5fea258c8e441db8323caf3c07a6
 EBUILD selinux-slocate-9999.ebuild 286 BLAKE2B 0715efebc68d1b4ee2a7239d1fd83179645afb669679e5a90ed00b18919d31d184aa1eabb05c9d169d7941b598642b790adfbdfbbb3032daa996fcac165048e8 SHA512 d2d2502092ad492c2419a96faa9e7d523c3851b7ea3532e14f484188ef728292a7e8895bb767a0215ab2a331e92afe685d9dc1786975ab5e325c2cbb95cf5f9b
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-slocate/selinux-slocate-2.20190609-r1.ebuild b/sec-policy/selinux-slocate/selinux-slocate-2.20190609-r1.ebuild
index 80f531b45b3f..f528206f4098 100644
--- a/sec-policy/selinux-slocate/selinux-slocate-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-slocate/selinux-slocate-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-slocate/selinux-slocate-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..80f531b45b3f
--- /dev/null
+++ b/sec-policy/selinux-slocate/selinux-slocate-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 97e551eb5664..0320626e7565 100644
--- a/sec-policy/selinux-slrnpull/Manifest
+++ b/sec-policy/selinux-slrnpull/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-slrnpull-2.20190201-r1.ebuild 283 BLAKE2B c99ef8bda57b644dd58a15f668eaef775abe36ded6dd70caef0eace559c25fa22c4c9b4413eda5e804cef80b71c1207689ddedf71247fba0ba25d472a994416d SHA512 3c884424eb7aeb832921e8f4bf33602c38a1384d0f6d75a56bacde41d2bce54b143b65d8cb025d988e2313b7cfee36ce69068747b4f43881dabef2848ee9fa59
-EBUILD selinux-slrnpull-2.20190609-r1.ebuild 285 BLAKE2B 9b998ce9feaa84354154f218f96f7bd3c17a149e0184943997b68d3bf4187439ed0ba763adb7f12ca8fd321a4c3e429abe9a0d63b5b283fa27cb9064bf515f91 SHA512 3974e3f4cb4652685fb218c6376537ed24a90832511d9052770186e5ced170c73932dfe35bd35c373150e78ebec8b92d8870ee90a0faeab0cad0a5ee2002998c
+EBUILD selinux-slrnpull-2.20190609-r1.ebuild 283 BLAKE2B c99ef8bda57b644dd58a15f668eaef775abe36ded6dd70caef0eace559c25fa22c4c9b4413eda5e804cef80b71c1207689ddedf71247fba0ba25d472a994416d SHA512 3c884424eb7aeb832921e8f4bf33602c38a1384d0f6d75a56bacde41d2bce54b143b65d8cb025d988e2313b7cfee36ce69068747b4f43881dabef2848ee9fa59
+EBUILD selinux-slrnpull-2.20200818-r1.ebuild 285 BLAKE2B 9b998ce9feaa84354154f218f96f7bd3c17a149e0184943997b68d3bf4187439ed0ba763adb7f12ca8fd321a4c3e429abe9a0d63b5b283fa27cb9064bf515f91 SHA512 3974e3f4cb4652685fb218c6376537ed24a90832511d9052770186e5ced170c73932dfe35bd35c373150e78ebec8b92d8870ee90a0faeab0cad0a5ee2002998c
 EBUILD selinux-slrnpull-9999.ebuild 288 BLAKE2B 2ba1e2a4615ea74ad8578654deb6df4ba75fa8e7e1859d7be00c6690b8bef01dd708decb0df77e3d44ce41b8d43690f72be88ef41dec1c2bcf685545c86f2451 SHA512 c1fead069940fa12bf34425698ce9b387d46a5a95364c9ca4c1373e2dacef9e4cb1d6ee6c94f092afd14adf2abf481c557936e58bfc2d9a56b1234b219b8aee4
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20190609-r1.ebuild b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20190609-r1.ebuild
index 0a98f5586f6f..b35c57cb8e0e 100644
--- a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..0a98f5586f6f
--- /dev/null
+++ b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 30281dc1b8fd..02830d8ac1a7 100644
--- a/sec-policy/selinux-smartmon/Manifest
+++ b/sec-policy/selinux-smartmon/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-smartmon-2.20190201-r1.ebuild 283 BLAKE2B b678b299ae6584d638140cf297b4daecb10a96de098f4e8ff52ac6846ee8166941f79da69bd402540d5af1b8c0f24b3f1e4630b738db70b0de561da41fead58b SHA512 264f2784cc85e2e178be9b3f941680e69633124889932bf3d39f9c02068b100907556053117b9b58924f22251bf6579e63ec29b93fc371022ecdb7c0b373dd2e
-EBUILD selinux-smartmon-2.20190609-r1.ebuild 285 BLAKE2B 8ecd730e0e95aacb14a64fa2f434d5a5553360c765e823b14ede91c38f372199166e862c55f5451be09afd661c45228879177c7c5ee9d9f4645e777cc6a6b190 SHA512 363069e5e6096a7341cb4a56f4c12cc71e5d4d9a8f03c8ef1bd2ace522b76849abdfdcf1b20af15e0cff613fb47cb6eb45f664a6bc19b30f382930fa7c35a56a
+EBUILD selinux-smartmon-2.20190609-r1.ebuild 283 BLAKE2B b678b299ae6584d638140cf297b4daecb10a96de098f4e8ff52ac6846ee8166941f79da69bd402540d5af1b8c0f24b3f1e4630b738db70b0de561da41fead58b SHA512 264f2784cc85e2e178be9b3f941680e69633124889932bf3d39f9c02068b100907556053117b9b58924f22251bf6579e63ec29b93fc371022ecdb7c0b373dd2e
+EBUILD selinux-smartmon-2.20200818-r1.ebuild 285 BLAKE2B 8ecd730e0e95aacb14a64fa2f434d5a5553360c765e823b14ede91c38f372199166e862c55f5451be09afd661c45228879177c7c5ee9d9f4645e777cc6a6b190 SHA512 363069e5e6096a7341cb4a56f4c12cc71e5d4d9a8f03c8ef1bd2ace522b76849abdfdcf1b20af15e0cff613fb47cb6eb45f664a6bc19b30f382930fa7c35a56a
 EBUILD selinux-smartmon-9999.ebuild 288 BLAKE2B fb04b2865227efd2fccca64b6fa2b3547729446b37fa75fd67b432eabda60efddca79d666965d4aebf3e8ddafb272ab6e98ce6750b8768deb31a66fa7964a652 SHA512 9b0129f60520fd135714aa8943473883e5a86b06117cb84a2f498b808e2589efcae0655880d701b8e50dd0e23820159ece4e6d2f04d23854ec3b6e6b125effc6
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-smartmon/selinux-smartmon-2.20190609-r1.ebuild b/sec-policy/selinux-smartmon/selinux-smartmon-2.20190609-r1.ebuild
index 35ed08ef1f30..47f287bf40d0 100644
--- a/sec-policy/selinux-smartmon/selinux-smartmon-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-smartmon/selinux-smartmon-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-smartmon/selinux-smartmon-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..35ed08ef1f30
--- /dev/null
+++ b/sec-policy/selinux-smartmon/selinux-smartmon-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 daded4213318..da600ab1035c 100644
--- a/sec-policy/selinux-smokeping/Manifest
+++ b/sec-policy/selinux-smokeping/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-smokeping-2.20190201-r1.ebuild 381 BLAKE2B 1fc869074042b5950ec3c4cca989a3ad665c249c08375dea164d4d5ceb3d2571339dccfbc960d18f479f29a027dd542149627605dea3e569618e9d539e53bc8c SHA512 0a0143271b44f88d8cd0bc87fc5de704d9902e35bc29d8d3a76b94c5a04ab27b4e8db5393face34d2f0436db16fc57606ea9fb1da3afb52ab13e17e07f66f6f3
-EBUILD selinux-smokeping-2.20190609-r1.ebuild 383 BLAKE2B a996962d6a9873552b68e4e0b0a2ee029170fe0447e9291faa981a5bb72a0085906256de239e55bb07c516a559fd6004162e9f88fc5ad115d4fad5d670874a5b SHA512 752a0616a133f3074c2dfeed8aa3f2c26c5a6279acf31447fc6acd898e87bb759e8ab34ff587d5e25a5214c06cfbab09ad8f23e4f60379073395b6a64a2606cc
+EBUILD selinux-smokeping-2.20190609-r1.ebuild 381 BLAKE2B 1fc869074042b5950ec3c4cca989a3ad665c249c08375dea164d4d5ceb3d2571339dccfbc960d18f479f29a027dd542149627605dea3e569618e9d539e53bc8c SHA512 0a0143271b44f88d8cd0bc87fc5de704d9902e35bc29d8d3a76b94c5a04ab27b4e8db5393face34d2f0436db16fc57606ea9fb1da3afb52ab13e17e07f66f6f3
+EBUILD selinux-smokeping-2.20200818-r1.ebuild 383 BLAKE2B a996962d6a9873552b68e4e0b0a2ee029170fe0447e9291faa981a5bb72a0085906256de239e55bb07c516a559fd6004162e9f88fc5ad115d4fad5d670874a5b SHA512 752a0616a133f3074c2dfeed8aa3f2c26c5a6279acf31447fc6acd898e87bb759e8ab34ff587d5e25a5214c06cfbab09ad8f23e4f60379073395b6a64a2606cc
 EBUILD selinux-smokeping-9999.ebuild 386 BLAKE2B 4fb7a6321172bae15450a494b7d2356f3be87d0e8a65b3b8683d8d1f07b33e15b56b8e0b7d9473e2b2b7553d2462f33c5fda8036a912f9e1f9a8011fac9d9d1e SHA512 5b33fc3d4ee6ea7128a1e1f7f40b95d35590935a7514c6a6d2b4a6678dd7ff14725ec68ceb6401e675e723fb4a9533f2f8fe42c31b7634cbc2a553fa72d92eab
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-smokeping/selinux-smokeping-2.20190609-r1.ebuild b/sec-policy/selinux-smokeping/selinux-smokeping-2.20190609-r1.ebuild
index 002a2c336c83..72e224ffccae 100644
--- a/sec-policy/selinux-smokeping/selinux-smokeping-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-smokeping/selinux-smokeping-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-smokeping/selinux-smokeping-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..002a2c336c83
--- /dev/null
+++ b/sec-policy/selinux-smokeping/selinux-smokeping-2.20200818-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 0d97473a569d..9f6ec652f80c 100644
--- a/sec-policy/selinux-snmp/Manifest
+++ b/sec-policy/selinux-snmp/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-snmp-2.20190201-r1.ebuild 275 BLAKE2B 73d27a9fe629e4365e061a38e88b2350a23f941bb990becc85966f1d11dac56b38bd754e8de91848d0e05f5953fb6d20edbbd900fc281c12dfe0385eb848a7bd SHA512 f2a522d2bdf6f91a1666eb887412f3ffc9901a03d41b6fe1bca4fa5cba62bc12bacf0b2b0c140577d69b0619ed767949a3ada364c66395dfe5b16f543133b229
-EBUILD selinux-snmp-2.20190609-r1.ebuild 277 BLAKE2B 37f5f9d24035f2e7bc78f980ec6711c44502ec3246f4bfa6b53890ba14ce99444628dd4e659a2d6a19e8fe5051c1fd4f9ce52a6ec5f72b894217dfd838051078 SHA512 cbc7e4740c12ddd060fb0c97fc9adc89d6d90987a2ac40197f87c2b53184581dd5e78f320688add06b48aae21c2650c7cd42a84a261105db161231d1a912f8f9
+EBUILD selinux-snmp-2.20190609-r1.ebuild 275 BLAKE2B 73d27a9fe629e4365e061a38e88b2350a23f941bb990becc85966f1d11dac56b38bd754e8de91848d0e05f5953fb6d20edbbd900fc281c12dfe0385eb848a7bd SHA512 f2a522d2bdf6f91a1666eb887412f3ffc9901a03d41b6fe1bca4fa5cba62bc12bacf0b2b0c140577d69b0619ed767949a3ada364c66395dfe5b16f543133b229
+EBUILD selinux-snmp-2.20200818-r1.ebuild 277 BLAKE2B 37f5f9d24035f2e7bc78f980ec6711c44502ec3246f4bfa6b53890ba14ce99444628dd4e659a2d6a19e8fe5051c1fd4f9ce52a6ec5f72b894217dfd838051078 SHA512 cbc7e4740c12ddd060fb0c97fc9adc89d6d90987a2ac40197f87c2b53184581dd5e78f320688add06b48aae21c2650c7cd42a84a261105db161231d1a912f8f9
 EBUILD selinux-snmp-9999.ebuild 280 BLAKE2B fdc1de3c130acb2ad327bc60f0a8fae76bdf581df0f8dcf676fd7eebd42093ebe3ea8909260e394d80396187cecf9ad886f336ec9e78bb5864c35874ea3093d4 SHA512 f276e9097ecdd94929cee8bbd6710b73658f6af77a6b2fad70c752187bef51a8ec01399152043dc6e2b1224e3947a18cd85ad180b3abae3bc2ee035cb062d934
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-snmp/selinux-snmp-2.20190609-r1.ebuild b/sec-policy/selinux-snmp/selinux-snmp-2.20190609-r1.ebuild
index c6c4f4e416fd..ef3fd5c05495 100644
--- a/sec-policy/selinux-snmp/selinux-snmp-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-snmp/selinux-snmp-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-snmp/selinux-snmp-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..c6c4f4e416fd
--- /dev/null
+++ b/sec-policy/selinux-snmp/selinux-snmp-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 2a4afae09fb2..f4cf1a4a4f34 100644
--- a/sec-policy/selinux-snort/Manifest
+++ b/sec-policy/selinux-snort/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-snort-2.20190201-r1.ebuild 277 BLAKE2B f0485ee3cb9639eddd2c68b5406ba792c141649270bf1ec38a7a13247ea5bf3f19aae0eea69c502d83d02852a5348f75effb2e17da67d1100e8a9dd36ebe7136 SHA512 3a0368af8c40876a94234e2cf766a29b60aa4b090aef9782626001d538e640daf7ddbdd3d19cac56fca260f9c585c1210c8d2d71453aee64ef5cf439f05226c5
-EBUILD selinux-snort-2.20190609-r1.ebuild 279 BLAKE2B 62f5ab9c9c5fefe1421a9cfed1612cf1e7ba7be597a31188d6bfcc8c74745c77ffbac800625eb9626531a447aabaa2275b840f34b16a7a1dd843907d4278c10d SHA512 5c09ff345f75b5741cbe8762b4049f757c1e534c3d9232f3bf95dba012715ee2a8a9638e0533719aa3d38e3ee6e42adb315105274558b0025d230c1d7d6b4bb8
+EBUILD selinux-snort-2.20190609-r1.ebuild 277 BLAKE2B f0485ee3cb9639eddd2c68b5406ba792c141649270bf1ec38a7a13247ea5bf3f19aae0eea69c502d83d02852a5348f75effb2e17da67d1100e8a9dd36ebe7136 SHA512 3a0368af8c40876a94234e2cf766a29b60aa4b090aef9782626001d538e640daf7ddbdd3d19cac56fca260f9c585c1210c8d2d71453aee64ef5cf439f05226c5
+EBUILD selinux-snort-2.20200818-r1.ebuild 279 BLAKE2B 62f5ab9c9c5fefe1421a9cfed1612cf1e7ba7be597a31188d6bfcc8c74745c77ffbac800625eb9626531a447aabaa2275b840f34b16a7a1dd843907d4278c10d SHA512 5c09ff345f75b5741cbe8762b4049f757c1e534c3d9232f3bf95dba012715ee2a8a9638e0533719aa3d38e3ee6e42adb315105274558b0025d230c1d7d6b4bb8
 EBUILD selinux-snort-9999.ebuild 282 BLAKE2B 3e7c5fd40314b1c5a5c5af2fbe27d5e6cfd81b055485dc937cff89a7cf246e44890c13b497309c54a841e3c0a67e18bd3c5666b26cd455e7bfdec884ba09b5c5 SHA512 4939c66daad5edb6104582021f6f6628912eb91c710b66b2b2c76522ca7b4b3fd41426c8c118380cbb4cba35e3b1ebcd609b62076d80620b29bae01f0e87cc2b
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-snort/selinux-snort-2.20190609-r1.ebuild b/sec-policy/selinux-snort/selinux-snort-2.20190609-r1.ebuild
index c77750a610b3..b438d449d2ae 100644
--- a/sec-policy/selinux-snort/selinux-snort-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-snort/selinux-snort-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-snort/selinux-snort-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..c77750a610b3
--- /dev/null
+++ b/sec-policy/selinux-snort/selinux-snort-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 c16e2ed926c4..3aa0c1786c17 100644
--- a/sec-policy/selinux-soundserver/Manifest
+++ b/sec-policy/selinux-soundserver/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-soundserver-2.20190201-r1.ebuild 289 BLAKE2B 2c9808d59016984e3245f09f5404eedf4d68e8b52a8f295f4a57347aa27a1e791d5ddcbd3d0e6aa586ed63d4528a2f9ef58bf43754452e641f8d4a3bf96bb6fd SHA512 5856ffc33319933e8491a4a453a86cd3b9c50acc3060390492aab9873a62d19c386f9654c2598125d141a5c715ee6b43aef78a893929ae96570a9709b419be11
-EBUILD selinux-soundserver-2.20190609-r1.ebuild 291 BLAKE2B f95a79b53ad72a60727d2592936e259e02557fe228afa299eee5170971e0dfbe3e8405bd1bcdb7774ac9669112ba86dfc2fed78da2825ef10455dfa75de69af0 SHA512 a3569de1bd7bd15c3175726a403b9156d112b894e72e6edba5e51b060b51f5315ce85e70fd18479be742ccbe7cad48a4cd34a2e4b94700fc4b186a2745a94e79
+EBUILD selinux-soundserver-2.20190609-r1.ebuild 289 BLAKE2B 2c9808d59016984e3245f09f5404eedf4d68e8b52a8f295f4a57347aa27a1e791d5ddcbd3d0e6aa586ed63d4528a2f9ef58bf43754452e641f8d4a3bf96bb6fd SHA512 5856ffc33319933e8491a4a453a86cd3b9c50acc3060390492aab9873a62d19c386f9654c2598125d141a5c715ee6b43aef78a893929ae96570a9709b419be11
+EBUILD selinux-soundserver-2.20200818-r1.ebuild 291 BLAKE2B f95a79b53ad72a60727d2592936e259e02557fe228afa299eee5170971e0dfbe3e8405bd1bcdb7774ac9669112ba86dfc2fed78da2825ef10455dfa75de69af0 SHA512 a3569de1bd7bd15c3175726a403b9156d112b894e72e6edba5e51b060b51f5315ce85e70fd18479be742ccbe7cad48a4cd34a2e4b94700fc4b186a2745a94e79
 EBUILD selinux-soundserver-9999.ebuild 294 BLAKE2B 89fb2e760276a729fc0f90956f05dbe69539876fa85e91a63001d84628147e6077cb93b8b4ea5a08e9d938a462fbdeb802b9b895cdb2c1a4e96571c60c8daebb SHA512 7d20be067ca82a2e6273756c93ee2ffd927fca285b921759d5112dc232fffde49804cfa081c9821b3f36f707f8802148fc330e3cc3da87ad7ef608e9fb87c662
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-soundserver/selinux-soundserver-2.20190609-r1.ebuild b/sec-policy/selinux-soundserver/selinux-soundserver-2.20190609-r1.ebuild
index a37829aa1e65..429a4df4015a 100644
--- a/sec-policy/selinux-soundserver/selinux-soundserver-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-soundserver/selinux-soundserver-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-soundserver/selinux-soundserver-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..a37829aa1e65
--- /dev/null
+++ b/sec-policy/selinux-soundserver/selinux-soundserver-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 7f4860bd577c..3304f1759396 100644
--- a/sec-policy/selinux-spamassassin/Manifest
+++ b/sec-policy/selinux-spamassassin/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-spamassassin-2.20190201-r1.ebuild 291 BLAKE2B a338ea5a5672dce881eaf9e52dde1eb336db50f392767338f32a26bbffdb98ec12efba30946e259215dee21bc18b942bbaa1c45299918fcdd5f41ce6bdf17c16 SHA512 7bd54a5250064423207150241c5eaba746d6643e2388bbede7e653c69fe8126327c1cf0b0ee0e4f88d4bcb15ccf69602823f336265e2aec42f27f8c7f6077940
-EBUILD selinux-spamassassin-2.20190609-r1.ebuild 293 BLAKE2B 698905fd4396a05f2e8043ab1bd51d64a58f901a8ae5ff3d22fd771941c2127f54678e8c5881df86c38ae5aac1247151aab802fa217c11f3a391f478aa6540e1 SHA512 93fe7f50bcdacd599963d3e0e6772e2c1a6e49a71ef00c963be66b32e263f3b813feda4928d97aa123cd7022cfd807bba4c93247914c4b9055dc98fbd186dc16
+EBUILD selinux-spamassassin-2.20190609-r1.ebuild 291 BLAKE2B a338ea5a5672dce881eaf9e52dde1eb336db50f392767338f32a26bbffdb98ec12efba30946e259215dee21bc18b942bbaa1c45299918fcdd5f41ce6bdf17c16 SHA512 7bd54a5250064423207150241c5eaba746d6643e2388bbede7e653c69fe8126327c1cf0b0ee0e4f88d4bcb15ccf69602823f336265e2aec42f27f8c7f6077940
+EBUILD selinux-spamassassin-2.20200818-r1.ebuild 293 BLAKE2B 698905fd4396a05f2e8043ab1bd51d64a58f901a8ae5ff3d22fd771941c2127f54678e8c5881df86c38ae5aac1247151aab802fa217c11f3a391f478aa6540e1 SHA512 93fe7f50bcdacd599963d3e0e6772e2c1a6e49a71ef00c963be66b32e263f3b813feda4928d97aa123cd7022cfd807bba4c93247914c4b9055dc98fbd186dc16
 EBUILD selinux-spamassassin-9999.ebuild 296 BLAKE2B 0adc2b5ac7277839776df66bcafc6b5d323c1eecee8c7147385864f4e8d2b76808e07a5ca66c03a84d6af2f1b8ce0d185e6bc2fe2b242cc0f6c5f2de8c9bcefd SHA512 abdf74bf6c3e288386658a9736c5ee51bed1f4a49c4f8b930d7495d787daab9629cc60ace2a6f981a54aa28cb63b4f33843252a892da309cd1ee05e43b44f375
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20190609-r1.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20190609-r1.ebuild
index 68e71ebad35f..70e5162f3498 100644
--- a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..68e71ebad35f
--- /dev/null
+++ b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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-speedtouch/Manifest b/sec-policy/selinux-speedtouch/Manifest
index 31721a2a1b2f..8f960f8a410d 100644
--- a/sec-policy/selinux-speedtouch/Manifest
+++ b/sec-policy/selinux-speedtouch/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-speedtouch-2.20190201-r1.ebuild 287 BLAKE2B 91b7c9d71e494f8abcdf6bbb23a4043eba586839998cbb51baea2167d938f9d26194938f58ab08dae530a7ee746370aca56fc4ab3116012e980be73db5ae9f3a SHA512 2bd3a369f45d26502c3f343200ea9295b2941998f625119b9f7988044b237251422f3492fb85a3582646f702ca08eda6b63574baa1d9ea2b09a8d009ae4459c2
-EBUILD selinux-speedtouch-2.20190609-r1.ebuild 289 BLAKE2B 5c5de5f25a744c21c3cc278b8ee19812fc81fed8d108ff2782fce002856fe651307235d8665dbe0deeb8d426b5c6e6005052d2c56d97df1145bda066ca42416a SHA512 cf9531ffbeb95768eb0d6bb6534de1f974908b8c6f78622e6288c994bd30eae221dd90fdedc2c411bf99b496c4d8a46a24a78630247830134e8b53b914af5424
+EBUILD selinux-speedtouch-2.20190609-r1.ebuild 287 BLAKE2B 91b7c9d71e494f8abcdf6bbb23a4043eba586839998cbb51baea2167d938f9d26194938f58ab08dae530a7ee746370aca56fc4ab3116012e980be73db5ae9f3a SHA512 2bd3a369f45d26502c3f343200ea9295b2941998f625119b9f7988044b237251422f3492fb85a3582646f702ca08eda6b63574baa1d9ea2b09a8d009ae4459c2
+EBUILD selinux-speedtouch-2.20200818-r1.ebuild 289 BLAKE2B 5c5de5f25a744c21c3cc278b8ee19812fc81fed8d108ff2782fce002856fe651307235d8665dbe0deeb8d426b5c6e6005052d2c56d97df1145bda066ca42416a SHA512 cf9531ffbeb95768eb0d6bb6534de1f974908b8c6f78622e6288c994bd30eae221dd90fdedc2c411bf99b496c4d8a46a24a78630247830134e8b53b914af5424
 EBUILD selinux-speedtouch-9999.ebuild 292 BLAKE2B f4a23b71c2311427d68e1ac946d80ccb1f12d888066d3e50f1ab43460b775f3a390e0e00ede50c6e1fb46691b1ad4f9c05638190f97aae33187f5f102f8aace7 SHA512 d92cfa1d0c8f557f7aed34c39cc0e15c74f304516f72285f36bcb0f24ffe5e3ad37123c19ed837b0e1cca5c9f673830afc4b08d4f4e8a6dbe1b27ec0bbeabf3e
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20190609-r1.ebuild b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20190609-r1.ebuild
index b20a7621ba4b..829da81326bd 100644
--- a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for speedtouch"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20200818-r1.ebuild b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..b20a7621ba4b
--- /dev/null
+++ b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="speedtouch"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for speedtouch"
+
+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 1e5933c07427..a2f0338e6bb4 100644
--- a/sec-policy/selinux-squid/Manifest
+++ b/sec-policy/selinux-squid/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-squid-2.20190201-r1.ebuild 373 BLAKE2B 885e8be9dafaa146bafd587381bdaae448b8eeebea3d2ac01706ed62fd5415874ad39e6843889397e210b9fe67fa7e55409ba177c5904cb991f629dcd6b8ad5b SHA512 825fce44d425433ac28994bc6bdecec3bbefd31534108621253decdd5bbd963b4f6bee345d2ff8c3f900a07766b46334ba1771749adf3545fb23663af6629eb8
-EBUILD selinux-squid-2.20190609-r1.ebuild 375 BLAKE2B 537febddd608108ba4af2c65d9ef50ffcb714532e105f11b77f1cb8d5abbda97d477c1af85b70edfb3757f89feea0a309f914eaa45fc951a6de45d10b1ca4f51 SHA512 5621d99c90b2ac184b5ea860edfe7e2e7d8e56765619511b7e9e3166ff9d556d7f04e9fb3bf5737618863931fd68c853d4ebf126b38685e1948bfc61a6b17662
+EBUILD selinux-squid-2.20190609-r1.ebuild 373 BLAKE2B 885e8be9dafaa146bafd587381bdaae448b8eeebea3d2ac01706ed62fd5415874ad39e6843889397e210b9fe67fa7e55409ba177c5904cb991f629dcd6b8ad5b SHA512 825fce44d425433ac28994bc6bdecec3bbefd31534108621253decdd5bbd963b4f6bee345d2ff8c3f900a07766b46334ba1771749adf3545fb23663af6629eb8
+EBUILD selinux-squid-2.20200818-r1.ebuild 375 BLAKE2B 537febddd608108ba4af2c65d9ef50ffcb714532e105f11b77f1cb8d5abbda97d477c1af85b70edfb3757f89feea0a309f914eaa45fc951a6de45d10b1ca4f51 SHA512 5621d99c90b2ac184b5ea860edfe7e2e7d8e56765619511b7e9e3166ff9d556d7f04e9fb3bf5737618863931fd68c853d4ebf126b38685e1948bfc61a6b17662
 EBUILD selinux-squid-9999.ebuild 378 BLAKE2B b7e5cc385a14d431e42c34f7f37c73ced8cd32ecf8715635812a3b43d864d3f913bd32fd350c51a48c7f0151efff88ec085e27fd9caec3826ec9e6a719b79d3d SHA512 8e5db7995e80e9ed63418ee90124ac63194b3a667b661576479887b604d184c44cc4b6ca85213192ad561a2de61b3851f718043f7d77eeb2d633228376fec4d9
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-squid/selinux-squid-2.20190609-r1.ebuild b/sec-policy/selinux-squid/selinux-squid-2.20190609-r1.ebuild
index 47d263f7fc0d..8dc370ba476e 100644
--- a/sec-policy/selinux-squid/selinux-squid-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-squid/selinux-squid-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-squid/selinux-squid-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..47d263f7fc0d
--- /dev/null
+++ b/sec-policy/selinux-squid/selinux-squid-2.20200818-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 78f92bb48c95..e0ff27ef539f 100644
--- a/sec-policy/selinux-sssd/Manifest
+++ b/sec-policy/selinux-sssd/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-sssd-2.20190201-r1.ebuild 275 BLAKE2B 5c248ba6396435f5c41598041df096caa7920fb070ebbab9f60697a212caaccec4ff5713decb29968cdf3717bb921126f2b619bcffaadf93fe2e3bc683272102 SHA512 c814224a8376179498d09381ce1f79a6528072e40c63e1bdd51ad1ec6408167e6b61d269461ca4e7dcd64d0499c2fad573413fe69bf7592d0a47438291d5f96e
-EBUILD selinux-sssd-2.20190609-r1.ebuild 277 BLAKE2B 267b7cd2dea6b8872cbc8524c36345bf99a15862879bbbf2745a13fa4882ff542498d268c291b60b93aa3811357990a977691670373c1dad805da35dabd7c5a6 SHA512 be97c8318562a0ef55b0707bc0783ec58dd1c3499751e2fc3d1cb3b7a4afa8dc1bdbf0a1f451cd39461c12f7064559180f8c6ae15b65fa0248aeeb722a8b3b2a
+EBUILD selinux-sssd-2.20190609-r1.ebuild 275 BLAKE2B 5c248ba6396435f5c41598041df096caa7920fb070ebbab9f60697a212caaccec4ff5713decb29968cdf3717bb921126f2b619bcffaadf93fe2e3bc683272102 SHA512 c814224a8376179498d09381ce1f79a6528072e40c63e1bdd51ad1ec6408167e6b61d269461ca4e7dcd64d0499c2fad573413fe69bf7592d0a47438291d5f96e
+EBUILD selinux-sssd-2.20200818-r1.ebuild 277 BLAKE2B 267b7cd2dea6b8872cbc8524c36345bf99a15862879bbbf2745a13fa4882ff542498d268c291b60b93aa3811357990a977691670373c1dad805da35dabd7c5a6 SHA512 be97c8318562a0ef55b0707bc0783ec58dd1c3499751e2fc3d1cb3b7a4afa8dc1bdbf0a1f451cd39461c12f7064559180f8c6ae15b65fa0248aeeb722a8b3b2a
 EBUILD selinux-sssd-9999.ebuild 280 BLAKE2B 5cb9d618f648f664f94fd81b0c28eccafd9a106d202e425612503d2969aae6f8eb4da80befaf19b336e53a05366097c6755117e432de95286b63329b1738e494 SHA512 f7ca2e7313587c7b7ed0c87094d0da8dc2aedad3a366d2491bd45af5200807a1556ccfcfd0b2ce173d9b909502fca0489ce0cc78bb79fdb63c4649086efd5cac
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-sssd/selinux-sssd-2.20190609-r1.ebuild b/sec-policy/selinux-sssd/selinux-sssd-2.20190609-r1.ebuild
index b1e2f759c581..b31faaf2a60e 100644
--- a/sec-policy/selinux-sssd/selinux-sssd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-sssd/selinux-sssd-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-sssd/selinux-sssd-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..b1e2f759c581
--- /dev/null
+++ b/sec-policy/selinux-sssd/selinux-sssd-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 24eec7b37fff..f142acf01eb2 100644
--- a/sec-policy/selinux-stunnel/Manifest
+++ b/sec-policy/selinux-stunnel/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-stunnel-2.20190201-r1.ebuild 281 BLAKE2B 6c6ab57feed40d7726421496a55389c71fddf846467e8ac4ee0007aa3bd97cc94d4aeb64a41f2073e12351dba298595dcd9caa40a19f5f00cb843b25735923d7 SHA512 efad942cd5e28fab4bf0a6b61167e2b1a47d3aa765a27781910edfd6838cb21ff797b14982d4c0dd5f59e1bc6a2a0e90b46b0570f10f0e2ae0eba171592eb8c9
-EBUILD selinux-stunnel-2.20190609-r1.ebuild 283 BLAKE2B 8f5adfe5fdb791f681c829e3f7ae23386463d8c7efca33c5975de27c16739656ba9150ff108ef5b81c8d560dea2f9b0c54ac373a46b6cef7457e8bd2ca6ee134 SHA512 f3cca4a120258b7ad71b069506c14f70b7cfc02719f4a70f630adec1c6f6a4f730b3a03d87edcfba927400523fd45970549b9706b5bf39ce30ded3193ebc046e
+EBUILD selinux-stunnel-2.20190609-r1.ebuild 281 BLAKE2B 6c6ab57feed40d7726421496a55389c71fddf846467e8ac4ee0007aa3bd97cc94d4aeb64a41f2073e12351dba298595dcd9caa40a19f5f00cb843b25735923d7 SHA512 efad942cd5e28fab4bf0a6b61167e2b1a47d3aa765a27781910edfd6838cb21ff797b14982d4c0dd5f59e1bc6a2a0e90b46b0570f10f0e2ae0eba171592eb8c9
+EBUILD selinux-stunnel-2.20200818-r1.ebuild 283 BLAKE2B 8f5adfe5fdb791f681c829e3f7ae23386463d8c7efca33c5975de27c16739656ba9150ff108ef5b81c8d560dea2f9b0c54ac373a46b6cef7457e8bd2ca6ee134 SHA512 f3cca4a120258b7ad71b069506c14f70b7cfc02719f4a70f630adec1c6f6a4f730b3a03d87edcfba927400523fd45970549b9706b5bf39ce30ded3193ebc046e
 EBUILD selinux-stunnel-9999.ebuild 286 BLAKE2B 6e7d1771c5d1e11b635497308a4c6d1e34763c6bb73a968194c905d3f1111bd503340ada8484100b8dcfc42f0cb150b36cc3bf2c99bb769990f5df8023bc675f SHA512 6f124f6c44fd5b3c2a7cd417d083f54abb561b7df84eca96368c877ac8ee0320210483c45e34199433a31340088bc68bfa89404a9a5e798b9a134ce7644468fc
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-stunnel/selinux-stunnel-2.20190609-r1.ebuild b/sec-policy/selinux-stunnel/selinux-stunnel-2.20190609-r1.ebuild
index 98fbbc9cd77d..87ed5e6a727f 100644
--- a/sec-policy/selinux-stunnel/selinux-stunnel-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-stunnel/selinux-stunnel-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-stunnel/selinux-stunnel-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..98fbbc9cd77d
--- /dev/null
+++ b/sec-policy/selinux-stunnel/selinux-stunnel-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 c9dde9c22f1f..aebca285918a 100644
--- a/sec-policy/selinux-subsonic/Manifest
+++ b/sec-policy/selinux-subsonic/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-subsonic-2.20190201-r1.ebuild 283 BLAKE2B e7306aa02db984d41307e894e19324b22db2f1f512cffcaa90aa00cf5ab79cf7d0f7744cdae472342fe211f767af061c8cbba40fd47a0178b7bf640af30578ae SHA512 13293a97acf3d1fe6db500661d285e9abd1f6c8bb07c1f25c627f07b8971ce1b44d7898d5aabc88377d3c4b38b968e5a4fc436afffb34e73813e0300dd7acbb2
-EBUILD selinux-subsonic-2.20190609-r1.ebuild 285 BLAKE2B 5c622e40d2e8e4a4820310e2e33d857fc3ef5edff5b9d3c364610af7cf446d797e154f98d958162c9895862aeaf909a952008c9f2c7a1e9b732026d9ee784351 SHA512 87108b73a03ac2a26e0c9be5d7f4fd21447134549eb6066f76b30f631d3615c0f2071624419ea4c7970c621a810981c6f752b56012bd264c707eada174091aa6
+EBUILD selinux-subsonic-2.20190609-r1.ebuild 283 BLAKE2B e7306aa02db984d41307e894e19324b22db2f1f512cffcaa90aa00cf5ab79cf7d0f7744cdae472342fe211f767af061c8cbba40fd47a0178b7bf640af30578ae SHA512 13293a97acf3d1fe6db500661d285e9abd1f6c8bb07c1f25c627f07b8971ce1b44d7898d5aabc88377d3c4b38b968e5a4fc436afffb34e73813e0300dd7acbb2
+EBUILD selinux-subsonic-2.20200818-r1.ebuild 285 BLAKE2B 5c622e40d2e8e4a4820310e2e33d857fc3ef5edff5b9d3c364610af7cf446d797e154f98d958162c9895862aeaf909a952008c9f2c7a1e9b732026d9ee784351 SHA512 87108b73a03ac2a26e0c9be5d7f4fd21447134549eb6066f76b30f631d3615c0f2071624419ea4c7970c621a810981c6f752b56012bd264c707eada174091aa6
 EBUILD selinux-subsonic-9999.ebuild 288 BLAKE2B 0deeeaafa3db256a979dddd65eaa35d905a40eb5c480c92b0c5c3ef5c5c4ae159d9276d6491b818a06988299786b765ded6e42f7131a231da415479d2c82c463 SHA512 449f5ae515587a3f1bbd359da3c63cdcf6f3dadbc0febd8ff32aecb0622e1133a225bccf57ade6f9e3f3b5b17389172061f178044539cd9df181bf55d1728133
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-subsonic/selinux-subsonic-2.20190609-r1.ebuild b/sec-policy/selinux-subsonic/selinux-subsonic-2.20190609-r1.ebuild
index 33ec7cd8b187..b2397d0e041d 100644
--- a/sec-policy/selinux-subsonic/selinux-subsonic-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-subsonic/selinux-subsonic-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-subsonic/selinux-subsonic-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..33ec7cd8b187
--- /dev/null
+++ b/sec-policy/selinux-subsonic/selinux-subsonic-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 a259fdd602ef..59899642d95a 100644
--- a/sec-policy/selinux-sudo/Manifest
+++ b/sec-policy/selinux-sudo/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-sudo-2.20190201-r1.ebuild 275 BLAKE2B 6e7928aada5c94058dd1b9f0b7508718c56404e0d6ad980eb43d3a5325bdadc24bade31fe9eee11ef00b44361ca1bd3b31f9b1687882c9c45df698d4dd4b80a1 SHA512 23d4d3f33c6aa11b393d97c5dc5c1c5534a4a4ea5ccd1a2a0a068c36ad709469b03dadd3cc972b2d570c46458fded80707e2855f87134e76419c114827c74bcd
-EBUILD selinux-sudo-2.20190609-r1.ebuild 277 BLAKE2B e0a33229f702bc5432e0fa42e79fcac9896363be93885184e6b62ff2ccaa579a3d418632036921f5f1ac0ef5fac6e7ba4a7236dbdfa7d7f0243d52bd9987b7b3 SHA512 ebf65314e8e0cd25a0d9eb94665907413a5cdd27ee1af6f3400b2cb2fc8ab5e2a0d05a8606ab4abf9be2fff1f890ee3d26baad8890353542183772bf33fa6807
+EBUILD selinux-sudo-2.20190609-r1.ebuild 275 BLAKE2B 6e7928aada5c94058dd1b9f0b7508718c56404e0d6ad980eb43d3a5325bdadc24bade31fe9eee11ef00b44361ca1bd3b31f9b1687882c9c45df698d4dd4b80a1 SHA512 23d4d3f33c6aa11b393d97c5dc5c1c5534a4a4ea5ccd1a2a0a068c36ad709469b03dadd3cc972b2d570c46458fded80707e2855f87134e76419c114827c74bcd
+EBUILD selinux-sudo-2.20200818-r1.ebuild 277 BLAKE2B e0a33229f702bc5432e0fa42e79fcac9896363be93885184e6b62ff2ccaa579a3d418632036921f5f1ac0ef5fac6e7ba4a7236dbdfa7d7f0243d52bd9987b7b3 SHA512 ebf65314e8e0cd25a0d9eb94665907413a5cdd27ee1af6f3400b2cb2fc8ab5e2a0d05a8606ab4abf9be2fff1f890ee3d26baad8890353542183772bf33fa6807
 EBUILD selinux-sudo-9999.ebuild 280 BLAKE2B fd217eec41d25001cf5b596e57da9a34cf08af28e3c902c9e8e0164bae7ded59b0a7fb5de2a1a730ce95673cc2b87ecbaa9c83c7f4eb2e8f9f35af79dffcf006 SHA512 6c7d1cf56357a71623cf5ac532e62768be49284e76410324cfd3bff4d1aef65a0cb41ca6be67020238708b2a20f6faa04c5495fd19c8aa147ab02f83fcf48458
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-sudo/selinux-sudo-2.20190609-r1.ebuild b/sec-policy/selinux-sudo/selinux-sudo-2.20190609-r1.ebuild
index c1bd4b9058d2..3240f526b439 100644
--- a/sec-policy/selinux-sudo/selinux-sudo-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-sudo/selinux-sudo-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-sudo/selinux-sudo-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..c1bd4b9058d2
--- /dev/null
+++ b/sec-policy/selinux-sudo/selinux-sudo-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 03e46e1ed959..d283c2faf914 100644
--- a/sec-policy/selinux-sxid/Manifest
+++ b/sec-policy/selinux-sxid/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-sxid-2.20190201-r1.ebuild 275 BLAKE2B 68ecbc21cc4f297e1d3aebd753c1e42dd5baa06e6d759ce184f9455693593276eea223d559607af1bf5a534be2c3d307b622f2cf4e64cd31070c019db6545340 SHA512 f3068b1b9ec3413f298139d0f74c03034c903410cb093e994873c1cf6329c3035ae3b27624174fe4386c808a223cd3623fd3e342b2e104768bc22c3a94215de2
-EBUILD selinux-sxid-2.20190609-r1.ebuild 277 BLAKE2B a896bcb37a4e5f8a90e058c41773541b32882b7192e14f72b11c2fb21894201b6269ffafbce3ddbb8920ceab03c352da9bd8cc060eb477ed9c3665f2adad859a SHA512 f6b2595554cdb3f5a71190342eab3e22e833f6ce4de63cef82061c041684d7303dc01602d005fc348a5815825804e27a91dca56f85dc7a6aa412e627123acb87
+EBUILD selinux-sxid-2.20190609-r1.ebuild 275 BLAKE2B 68ecbc21cc4f297e1d3aebd753c1e42dd5baa06e6d759ce184f9455693593276eea223d559607af1bf5a534be2c3d307b622f2cf4e64cd31070c019db6545340 SHA512 f3068b1b9ec3413f298139d0f74c03034c903410cb093e994873c1cf6329c3035ae3b27624174fe4386c808a223cd3623fd3e342b2e104768bc22c3a94215de2
+EBUILD selinux-sxid-2.20200818-r1.ebuild 277 BLAKE2B a896bcb37a4e5f8a90e058c41773541b32882b7192e14f72b11c2fb21894201b6269ffafbce3ddbb8920ceab03c352da9bd8cc060eb477ed9c3665f2adad859a SHA512 f6b2595554cdb3f5a71190342eab3e22e833f6ce4de63cef82061c041684d7303dc01602d005fc348a5815825804e27a91dca56f85dc7a6aa412e627123acb87
 EBUILD selinux-sxid-9999.ebuild 280 BLAKE2B a50df38fa8d78d9cd6c1678494b9cdbcd316405460fdb9a560923da0e7f9c5c2c4f8475c2ba95b513cf7c5eb144674c632e309ce73918b7487ede92e12814c2d SHA512 2f1bffd455c63d9392d795d50fecee3136ff9a80c2cb19d8a97d1ac2bbbe1d779f967bab6b99be838434dadb5cb996c43da80257c7a82852d31301e7fffd49bb
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-sxid/selinux-sxid-2.20190609-r1.ebuild b/sec-policy/selinux-sxid/selinux-sxid-2.20190609-r1.ebuild
index c5b9e3a423d2..9a268614e7a5 100644
--- a/sec-policy/selinux-sxid/selinux-sxid-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-sxid/selinux-sxid-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-sxid/selinux-sxid-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..c5b9e3a423d2
--- /dev/null
+++ b/sec-policy/selinux-sxid/selinux-sxid-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 9fc095110ab2..d0579abe81f7 100644
--- a/sec-policy/selinux-syncthing/Manifest
+++ b/sec-policy/selinux-syncthing/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-syncthing-2.20190201-r1.ebuild 285 BLAKE2B 334255c6b081e0a00ca143276d5458dbbfac617cfbbc586d38ef46ee61169bbe873b18c8bc2575a60970fc5f2a0a2c8614403b2c82fcf8a3e5aa4f2def185676 SHA512 4e4e77d1515b6f2c283482ad4f93881b78017e40a143f9b8be36e8be4caa7faa7a80c9434c70d0fb87496ce5c41e94444d282603b8219566caf602f4941d7e46
-EBUILD selinux-syncthing-2.20190609-r1.ebuild 287 BLAKE2B 94eb55f5d290047ea1c25958e5a5887314adff2674803464d81c87fb3728dc405a92e6b8c0f601b00790f918a667eaadf4dbc8fa9ac3d603ccadbaa13892af7b SHA512 89e0206923c6d4c1de630ab3298f643eec90232bd4e7ee78e1963a96d5c0123ccb827755b00a7ef32b46c3d588bf62e9277692e50324f2af20eb4a7219fbdda2
+EBUILD selinux-syncthing-2.20190609-r1.ebuild 285 BLAKE2B 334255c6b081e0a00ca143276d5458dbbfac617cfbbc586d38ef46ee61169bbe873b18c8bc2575a60970fc5f2a0a2c8614403b2c82fcf8a3e5aa4f2def185676 SHA512 4e4e77d1515b6f2c283482ad4f93881b78017e40a143f9b8be36e8be4caa7faa7a80c9434c70d0fb87496ce5c41e94444d282603b8219566caf602f4941d7e46
+EBUILD selinux-syncthing-2.20200818-r1.ebuild 287 BLAKE2B 94eb55f5d290047ea1c25958e5a5887314adff2674803464d81c87fb3728dc405a92e6b8c0f601b00790f918a667eaadf4dbc8fa9ac3d603ccadbaa13892af7b SHA512 89e0206923c6d4c1de630ab3298f643eec90232bd4e7ee78e1963a96d5c0123ccb827755b00a7ef32b46c3d588bf62e9277692e50324f2af20eb4a7219fbdda2
 EBUILD selinux-syncthing-9999.ebuild 290 BLAKE2B cbfcf886b65bad83e3c5b8dba3ad7fe64f80e097d145789b592ec4689e7bb0e46d7137adc2d83b74208a60afc1531ac50d594681eea4af1a6caaa75e47c3d1e1 SHA512 1ce639a1418c999346e461f1ece9f17b441ea0785aeb93c0b4292b56a26f763eaa17f061e56ff3d38da9aede4d4c48421a9843ba930cfc8194fad7eafb8765f1
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-syncthing/selinux-syncthing-2.20190609-r1.ebuild b/sec-policy/selinux-syncthing/selinux-syncthing-2.20190609-r1.ebuild
index b9d7a0a287bb..7ab1c868aaf4 100644
--- a/sec-policy/selinux-syncthing/selinux-syncthing-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-syncthing/selinux-syncthing-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-syncthing/selinux-syncthing-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..b9d7a0a287bb
--- /dev/null
+++ b/sec-policy/selinux-syncthing/selinux-syncthing-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 1a9b4e796386..bb7e7a4f052b 100644
--- a/sec-policy/selinux-sysstat/Manifest
+++ b/sec-policy/selinux-sysstat/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-sysstat-2.20190201-r1.ebuild 281 BLAKE2B a29ff809198c6e5eda129fa9b0a7faafcc77e165b116f1249bfd5fabc47c6e5f81adf06fc20ecbc646757fe29ec8eba2a4b232689169b79ae54db482bb11e201 SHA512 944f82805f5892f3b1e683a35c8c868d48366e89be517cad423dc4d539478350fb2eb7caa5fda1ccdb04a9a57db6e5a395eb8a941c3cd0d842b0d1170d4e1c3f
-EBUILD selinux-sysstat-2.20190609-r1.ebuild 283 BLAKE2B 8e1a01a2b1e26da8bdc3c90dde92c44a3f6080aa509017750550f97613793eb05b991c3ca1d9872f226bc1d12b82395aa2f288f2be0dbad5d0c5f0609e298c8b SHA512 d04d21f568d0cd1310b4554e4bc3386e91dc99278d5553ca2e7618a7ccb9d55b6a1792a0a28a05d29cb92667c1fdce8d9521f643a9501665c6b369e609949bf9
+EBUILD selinux-sysstat-2.20190609-r1.ebuild 281 BLAKE2B a29ff809198c6e5eda129fa9b0a7faafcc77e165b116f1249bfd5fabc47c6e5f81adf06fc20ecbc646757fe29ec8eba2a4b232689169b79ae54db482bb11e201 SHA512 944f82805f5892f3b1e683a35c8c868d48366e89be517cad423dc4d539478350fb2eb7caa5fda1ccdb04a9a57db6e5a395eb8a941c3cd0d842b0d1170d4e1c3f
+EBUILD selinux-sysstat-2.20200818-r1.ebuild 283 BLAKE2B 8e1a01a2b1e26da8bdc3c90dde92c44a3f6080aa509017750550f97613793eb05b991c3ca1d9872f226bc1d12b82395aa2f288f2be0dbad5d0c5f0609e298c8b SHA512 d04d21f568d0cd1310b4554e4bc3386e91dc99278d5553ca2e7618a7ccb9d55b6a1792a0a28a05d29cb92667c1fdce8d9521f643a9501665c6b369e609949bf9
 EBUILD selinux-sysstat-9999.ebuild 286 BLAKE2B 6dd55e5775ce70df80155c2f64cee20daca058005c70722e82801002212f6118abbdc2ead26c2bd1fc4579087c20d8d1b08275cab41bba375c34068730226466 SHA512 a0260f6c8a809c9516c778ad5707fdc485a12fc004e55bc8320a64b9bcb1278bc09dfaafe2f7cc7346e1c04966d1e4377a715b01a57258424ed0bf6fa2a6d4a2
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-sysstat/selinux-sysstat-2.20190609-r1.ebuild b/sec-policy/selinux-sysstat/selinux-sysstat-2.20190609-r1.ebuild
index a32fcfb19c6b..a13125cf8b01 100644
--- a/sec-policy/selinux-sysstat/selinux-sysstat-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-sysstat/selinux-sysstat-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-sysstat/selinux-sysstat-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..a32fcfb19c6b
--- /dev/null
+++ b/sec-policy/selinux-sysstat/selinux-sysstat-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 f20e77ddeb9a..d8d44f795592 100644
--- a/sec-policy/selinux-tboot/Manifest
+++ b/sec-policy/selinux-tboot/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-tboot-2.20190201-r1.ebuild 277 BLAKE2B 8d930c9ef0ce03bc878e4e12956a420870fa9831aa6401b2d2e27d3a849e75c9a26d95207b7860adb28346ea4f7ac9e38da9a8f86e71616acddca5aac9ad30fb SHA512 e661fba84f8965319720a19d668c81b5d6b0b3a6caf6e69056e9b98a626c07e6cf37c76401dac0fa58b63a64a46c6f0517ec4ab0f8ce0a52b6826e0d8db8545a
-EBUILD selinux-tboot-2.20190609-r1.ebuild 279 BLAKE2B bc9605d5eba988790e640a610df49418be85d3008b50851af78fa54694df476c16cb38ec7b96d0b8da00df14ff04f44b60cd46c67df42ab4cdff90eb3431b411 SHA512 e9203768914e138850464f1d7cb38f71b94fb977c3c63612a495e069bc57716e4ab05e34742cd4a1db7d9d29c12ba7d5c8e3962a020f0b78bfb7b39430c43731
+EBUILD selinux-tboot-2.20190609-r1.ebuild 277 BLAKE2B 8d930c9ef0ce03bc878e4e12956a420870fa9831aa6401b2d2e27d3a849e75c9a26d95207b7860adb28346ea4f7ac9e38da9a8f86e71616acddca5aac9ad30fb SHA512 e661fba84f8965319720a19d668c81b5d6b0b3a6caf6e69056e9b98a626c07e6cf37c76401dac0fa58b63a64a46c6f0517ec4ab0f8ce0a52b6826e0d8db8545a
+EBUILD selinux-tboot-2.20200818-r1.ebuild 279 BLAKE2B bc9605d5eba988790e640a610df49418be85d3008b50851af78fa54694df476c16cb38ec7b96d0b8da00df14ff04f44b60cd46c67df42ab4cdff90eb3431b411 SHA512 e9203768914e138850464f1d7cb38f71b94fb977c3c63612a495e069bc57716e4ab05e34742cd4a1db7d9d29c12ba7d5c8e3962a020f0b78bfb7b39430c43731
 EBUILD selinux-tboot-9999.ebuild 282 BLAKE2B 7edef37f5c6621c61010e44c102e470016b074696c01ee2353f86df412ef239239929d8815ce15b8281bcbbfd50df585847497c92a0965b209e3da4cc7dc6bc6 SHA512 9832fa0c900b345fea544ec0ba8a583bda65ce7e2d7d8b67b3ca053b399cb15019434722fc678cacfd03fdc1d1b7ac68a0725f90036cd6dcff760d27432ff3a5
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-tboot/selinux-tboot-2.20190609-r1.ebuild b/sec-policy/selinux-tboot/selinux-tboot-2.20190609-r1.ebuild
index 6497d71ce610..775911f750de 100644
--- a/sec-policy/selinux-tboot/selinux-tboot-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-tboot/selinux-tboot-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-tboot/selinux-tboot-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..6497d71ce610
--- /dev/null
+++ b/sec-policy/selinux-tboot/selinux-tboot-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 aaaa5a9b2c2e..4c866a4fc56f 100644
--- a/sec-policy/selinux-tcpd/Manifest
+++ b/sec-policy/selinux-tcpd/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-tcpd-2.20190201-r1.ebuild 369 BLAKE2B aa2e7b1295709250a9ec4d3410b57c196114779c003752eaaff276507fefe7149f732bfc911918ff5415cead5e5da52c22c64b7f2d064c76d5c8d7db6ec545e1 SHA512 3bc6615fbf7d0e364dd00af18a1d9262967383917dee55f334aca02096705e7d9726ad00cc162664883cd78b48dcf3111efef25ebf0d045977895582e468aeda
-EBUILD selinux-tcpd-2.20190609-r1.ebuild 371 BLAKE2B 45c75342f53bd64d59db96ecd618016c5a1e329432bb2b2f4043ca9e71623ae96b6470aaccbdaaafb7b48a3c1ea9eba4d18a8df40a1692d476b3772ee6c04333 SHA512 f49219c1f05cac03b56c440e05fb2e350dfc2b7f6995b89f5ec668d948fe34336f231b654c68f93200752e429616bc6269e97dcdcca412ddc4b0b24375049fc0
+EBUILD selinux-tcpd-2.20190609-r1.ebuild 369 BLAKE2B aa2e7b1295709250a9ec4d3410b57c196114779c003752eaaff276507fefe7149f732bfc911918ff5415cead5e5da52c22c64b7f2d064c76d5c8d7db6ec545e1 SHA512 3bc6615fbf7d0e364dd00af18a1d9262967383917dee55f334aca02096705e7d9726ad00cc162664883cd78b48dcf3111efef25ebf0d045977895582e468aeda
+EBUILD selinux-tcpd-2.20200818-r1.ebuild 371 BLAKE2B 45c75342f53bd64d59db96ecd618016c5a1e329432bb2b2f4043ca9e71623ae96b6470aaccbdaaafb7b48a3c1ea9eba4d18a8df40a1692d476b3772ee6c04333 SHA512 f49219c1f05cac03b56c440e05fb2e350dfc2b7f6995b89f5ec668d948fe34336f231b654c68f93200752e429616bc6269e97dcdcca412ddc4b0b24375049fc0
 EBUILD selinux-tcpd-9999.ebuild 374 BLAKE2B a28daa3dcbdcf008410b559ca759dcad5c749383e92d46f8ab75f4d19aeb7133012e8e563896ba202d103cef167ffc0e84e8bfa568814e42c900dc5ae95ba270 SHA512 a55dc5ff1872639822ae44f6e67d85d807b47030fcc3ff3f3798ae6867bb830fdb6d07873eddb4f98c3fad419c6d5b26e250bb34440c8eb434c230d8204fdc2a
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-tcpd/selinux-tcpd-2.20190609-r1.ebuild b/sec-policy/selinux-tcpd/selinux-tcpd-2.20190609-r1.ebuild
index 6c5547717f19..2e55abea5766 100644
--- a/sec-policy/selinux-tcpd/selinux-tcpd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-tcpd/selinux-tcpd-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-tcpd/selinux-tcpd-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..6c5547717f19
--- /dev/null
+++ b/sec-policy/selinux-tcpd/selinux-tcpd-2.20200818-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 0fd3b489c882..a7b6c8a03a75 100644
--- a/sec-policy/selinux-tcsd/Manifest
+++ b/sec-policy/selinux-tcsd/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-tcsd-2.20190201-r1.ebuild 275 BLAKE2B 0c158d22f23d0fd438d9bb758ac6d5fcd4d624ca08325428c76ba19c81a3c28903b25830c60d3672d2db5d376a3946eeaeffbc2e0e810e820dd4bbb0f0b83697 SHA512 66338412af5f0237503fb35762b419e00b0b874dfab6b38dbb4e40873c5c22901decae2f5b57cffe924e53c249087bfa2a07c213efbcd5ce75edcb4298551ebb
-EBUILD selinux-tcsd-2.20190609-r1.ebuild 277 BLAKE2B acc017be579b247aa26cea4f1cb13830fc12a115f2eb0bcf938e46e29907aae102eda21b8ba383064dc44b87b0d548ccdd45ed8689e49922763146c4a5b90a41 SHA512 7c83226d5dd31fd71a3f05bbe8b893ea34294534eadaa3d199fb0b5c48a455d33b7fe0a06dc8e023705444497a0dd74e17e6263dc7cc23946d376832b6abca70
+EBUILD selinux-tcsd-2.20190609-r1.ebuild 275 BLAKE2B 0c158d22f23d0fd438d9bb758ac6d5fcd4d624ca08325428c76ba19c81a3c28903b25830c60d3672d2db5d376a3946eeaeffbc2e0e810e820dd4bbb0f0b83697 SHA512 66338412af5f0237503fb35762b419e00b0b874dfab6b38dbb4e40873c5c22901decae2f5b57cffe924e53c249087bfa2a07c213efbcd5ce75edcb4298551ebb
+EBUILD selinux-tcsd-2.20200818-r1.ebuild 277 BLAKE2B acc017be579b247aa26cea4f1cb13830fc12a115f2eb0bcf938e46e29907aae102eda21b8ba383064dc44b87b0d548ccdd45ed8689e49922763146c4a5b90a41 SHA512 7c83226d5dd31fd71a3f05bbe8b893ea34294534eadaa3d199fb0b5c48a455d33b7fe0a06dc8e023705444497a0dd74e17e6263dc7cc23946d376832b6abca70
 EBUILD selinux-tcsd-9999.ebuild 280 BLAKE2B 6eb9cbd9df6421ad3e03eadf815c70ee0b8e99906bce0ecd3ee2149e312066eada15f4c8ca2f554306ae8258782e12f377e2a7079bab9aa69aef2fff13c285a0 SHA512 e09625a1b24703c31a84676322317fd70ad749b0ace429906753e8362b8643ecd79defd8b221373193e01a99865df9f8d3bf7ffe270b37be17712e3a926109ac
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-tcsd/selinux-tcsd-2.20190609-r1.ebuild b/sec-policy/selinux-tcsd/selinux-tcsd-2.20190609-r1.ebuild
index cac6ead34835..f373db8f23fa 100644
--- a/sec-policy/selinux-tcsd/selinux-tcsd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-tcsd/selinux-tcsd-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-tcsd/selinux-tcsd-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..cac6ead34835
--- /dev/null
+++ b/sec-policy/selinux-tcsd/selinux-tcsd-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 36f564fe1e65..4961c6a90b69 100644
--- a/sec-policy/selinux-telnet/Manifest
+++ b/sec-policy/selinux-telnet/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-telnet-2.20190201-r1.ebuild 385 BLAKE2B d7d4910f1b547668f075766c610278866cea1a43597f990070ae3a2eececf3aa155296e873c081d2a3ed8d14926fb15ff3f3115ece2b20d16d6d60e01ad2406c SHA512 09651d9c80a5981b332a3f21e19521a8b4457f7e2cfc04b8a2c2b6d0e805d81f7b8b33cf5b5bc5cbdbd0beb4c29e06498c0f6176ff11ab4f30922d23d40542b9
-EBUILD selinux-telnet-2.20190609-r1.ebuild 387 BLAKE2B 6f52a7e3a1dc9b46058fd4e31d77adb044eb76b383eeeaea3905ef94c80ebdbefc46391881ac5f7695ab16a2e72645f422816a49f2c5f6a0dfbbe4eef5d205fa SHA512 b9ba504f87721f5241dff2ff941bbf96a94aeb9a6a42b3ba1e4e1289cc473810016c89b9fa3e7f079ea38ab6916d57771deaccf363e55dc2aa83319d18098544
+EBUILD selinux-telnet-2.20190609-r1.ebuild 385 BLAKE2B d7d4910f1b547668f075766c610278866cea1a43597f990070ae3a2eececf3aa155296e873c081d2a3ed8d14926fb15ff3f3115ece2b20d16d6d60e01ad2406c SHA512 09651d9c80a5981b332a3f21e19521a8b4457f7e2cfc04b8a2c2b6d0e805d81f7b8b33cf5b5bc5cbdbd0beb4c29e06498c0f6176ff11ab4f30922d23d40542b9
+EBUILD selinux-telnet-2.20200818-r1.ebuild 387 BLAKE2B 6f52a7e3a1dc9b46058fd4e31d77adb044eb76b383eeeaea3905ef94c80ebdbefc46391881ac5f7695ab16a2e72645f422816a49f2c5f6a0dfbbe4eef5d205fa SHA512 b9ba504f87721f5241dff2ff941bbf96a94aeb9a6a42b3ba1e4e1289cc473810016c89b9fa3e7f079ea38ab6916d57771deaccf363e55dc2aa83319d18098544
 EBUILD selinux-telnet-9999.ebuild 390 BLAKE2B 606401438985b645ae4174842309515a3a777588f0aea464026d0d55c2afa3719a37691c8827d356296f2358d99bebf5284bede9702dc8fb6993590f1e9290a6 SHA512 017ef8ebfb57635bb5b45c616807427f6293ade2b055430944ffba85d297f91114dc24acca39dfd6b2117c0c52a343e30b1486599bfc1e8fcb66f7af49d67fe1
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-telnet/selinux-telnet-2.20190609-r1.ebuild b/sec-policy/selinux-telnet/selinux-telnet-2.20190609-r1.ebuild
index c8e8170ce44e..dbcac40d0959 100644
--- a/sec-policy/selinux-telnet/selinux-telnet-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-telnet/selinux-telnet-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-telnet/selinux-telnet-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..c8e8170ce44e
--- /dev/null
+++ b/sec-policy/selinux-telnet/selinux-telnet-2.20200818-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 4028bcf03093..3f7c3e0adbdc 100644
--- a/sec-policy/selinux-tftp/Manifest
+++ b/sec-policy/selinux-tftp/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-tftp-2.20190201-r1.ebuild 275 BLAKE2B 9f7f227089af0f732a9a341fda002d3444dc2f9a23114644208275d0f93420746e3503caad7b3b088b4320d169f12303c12ed56a401849697b1873be734e870a SHA512 cac8161c439cd6789b7bba3db8ccb79cedcb26743dee228637384faae87fd5d910caf56d644385ac8cbb4ae4d6a6fefae1f7abf4b2eb660146be2de49198dd59
-EBUILD selinux-tftp-2.20190609-r1.ebuild 277 BLAKE2B 8312e41bfc211d081105c6bf16f35b4fac672f4ad143cec04b7070c4335399defdff5c0243a5076d0d8eb9308f903897d9cf4731dfbe4260fe09e2a9155382df SHA512 ea647b7e39380afbe0f4e797d66c0983f0d1a08b5478760484bbb026740defc4a3546e8336c30e420fadf2f784024930c3d2741bd0b3de0159a26d1379be4dd0
+EBUILD selinux-tftp-2.20190609-r1.ebuild 275 BLAKE2B 9f7f227089af0f732a9a341fda002d3444dc2f9a23114644208275d0f93420746e3503caad7b3b088b4320d169f12303c12ed56a401849697b1873be734e870a SHA512 cac8161c439cd6789b7bba3db8ccb79cedcb26743dee228637384faae87fd5d910caf56d644385ac8cbb4ae4d6a6fefae1f7abf4b2eb660146be2de49198dd59
+EBUILD selinux-tftp-2.20200818-r1.ebuild 277 BLAKE2B 8312e41bfc211d081105c6bf16f35b4fac672f4ad143cec04b7070c4335399defdff5c0243a5076d0d8eb9308f903897d9cf4731dfbe4260fe09e2a9155382df SHA512 ea647b7e39380afbe0f4e797d66c0983f0d1a08b5478760484bbb026740defc4a3546e8336c30e420fadf2f784024930c3d2741bd0b3de0159a26d1379be4dd0
 EBUILD selinux-tftp-9999.ebuild 280 BLAKE2B 05f5bfbca7aa108f68b6126dfcc8eb63c6ec6650fc22640a6764bafe1dd53dc0bcb0f4983804a4fd7041e8e75650ca56a5248ae2c358d29fee8c99b6c773359b SHA512 09cfebeafab7e7ae75fc9cc2d7c7dbc6e438c50212d06cd013c28ca9ae5896b5137f82653acf3b98b4055c0afb300f641341d59aedf6d67709c665ae177a98b1
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-tftp/selinux-tftp-2.20190609-r1.ebuild b/sec-policy/selinux-tftp/selinux-tftp-2.20190609-r1.ebuild
index 9a569f5a6be3..979844036988 100644
--- a/sec-policy/selinux-tftp/selinux-tftp-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-tftp/selinux-tftp-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-tftp/selinux-tftp-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..9a569f5a6be3
--- /dev/null
+++ b/sec-policy/selinux-tftp/selinux-tftp-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 89272d26c127..63baf34db920 100644
--- a/sec-policy/selinux-tgtd/Manifest
+++ b/sec-policy/selinux-tgtd/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-tgtd-2.20190201-r1.ebuild 275 BLAKE2B 440b48c8d6a7ff6532d1d7436dca9d5de3a9f1e2e6641bc31b54e5dd74088dad4c9f1671eba952e82114a01af09fc02dd7d76766184ecfe9c4f82140ab0b8d9e SHA512 b5e30f711a2a7102ad0a27c68c76d15fb74f96062f4a200527fdd74fba0ff732737c34f4a3a11261965f1a894c616c829b6c8f2af2ff0a3a89549095efdde49c
-EBUILD selinux-tgtd-2.20190609-r1.ebuild 277 BLAKE2B 8c351a5b1c804b4c19fd95d8583c52e6a1a4bbecff4479627c6cf0b14c1962efb220968d25a1b057e3bde91ca004c6a57b68cdee00dff6929cf26f2ee65c2755 SHA512 6fd39446213a35b9285765ac399999f46d8bcfbcbf1d9f3d7f50e9db34b4ee787db853daff4e2faf36a66073895dbc9a3b1dbb6ccf2353154b82b4c44edc072b
+EBUILD selinux-tgtd-2.20190609-r1.ebuild 275 BLAKE2B 440b48c8d6a7ff6532d1d7436dca9d5de3a9f1e2e6641bc31b54e5dd74088dad4c9f1671eba952e82114a01af09fc02dd7d76766184ecfe9c4f82140ab0b8d9e SHA512 b5e30f711a2a7102ad0a27c68c76d15fb74f96062f4a200527fdd74fba0ff732737c34f4a3a11261965f1a894c616c829b6c8f2af2ff0a3a89549095efdde49c
+EBUILD selinux-tgtd-2.20200818-r1.ebuild 277 BLAKE2B 8c351a5b1c804b4c19fd95d8583c52e6a1a4bbecff4479627c6cf0b14c1962efb220968d25a1b057e3bde91ca004c6a57b68cdee00dff6929cf26f2ee65c2755 SHA512 6fd39446213a35b9285765ac399999f46d8bcfbcbf1d9f3d7f50e9db34b4ee787db853daff4e2faf36a66073895dbc9a3b1dbb6ccf2353154b82b4c44edc072b
 EBUILD selinux-tgtd-9999.ebuild 280 BLAKE2B 49d777f3f0ac9185d5ec51997b9b7030420607cfd7159f3a68249ded9a737629b147ac75d8e2792b771ae094c29827528472755e1b3737c6f81344ff150f3d1a SHA512 33a0e373697837325b242ea60e5abd10526059eb2448a92fd0da2de972dd9e6769f2a8789943ff54501c83b9922d2a04efc0911d8599fd42c70b8fc1ee0b4bcc
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-tgtd/selinux-tgtd-2.20190609-r1.ebuild b/sec-policy/selinux-tgtd/selinux-tgtd-2.20190609-r1.ebuild
index 1e67a6ac9115..57e01c6743b4 100644
--- a/sec-policy/selinux-tgtd/selinux-tgtd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-tgtd/selinux-tgtd-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-tgtd/selinux-tgtd-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..1e67a6ac9115
--- /dev/null
+++ b/sec-policy/selinux-tgtd/selinux-tgtd-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 ad9b2cdf891a..a0b6145fd7ce 100644
--- a/sec-policy/selinux-thunderbird/Manifest
+++ b/sec-policy/selinux-thunderbird/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-thunderbird-2.20190201-r1.ebuild 387 BLAKE2B d95651896a7848be99b7e8995d534717e17900cdb7b1ecd5a5a43f5815ce50680344d8bf87aaf0fcfdfb4d6e34f328d9c7d391472ad42acd4cfbf70f3cb1caeb SHA512 52cb0e22e8ec6bbe831becadf9fa0fca996b40e34b4e7d6c608e398a0f2ab0eae7608b203216c65bb693ccdf9d8ca103ceceb51f2c3848d6b0a84bd7d403ac52
-EBUILD selinux-thunderbird-2.20190609-r1.ebuild 389 BLAKE2B fc2945e2929812873dd1321d625b333a07209f2f2fe09e805cc528f7020305c7a2a32c1f32b6d5055688a922bd061acafefe07bf6dd714b4d71152accb1ce45d SHA512 bc2e50a48f860c97bf23655aad77ca4ec1461949b86f8633ec9010b250e97f631dcbc46a4c066256b727d71c42da81afae16e9095a1932a62d98aa4d92890165
+EBUILD selinux-thunderbird-2.20190609-r1.ebuild 387 BLAKE2B d95651896a7848be99b7e8995d534717e17900cdb7b1ecd5a5a43f5815ce50680344d8bf87aaf0fcfdfb4d6e34f328d9c7d391472ad42acd4cfbf70f3cb1caeb SHA512 52cb0e22e8ec6bbe831becadf9fa0fca996b40e34b4e7d6c608e398a0f2ab0eae7608b203216c65bb693ccdf9d8ca103ceceb51f2c3848d6b0a84bd7d403ac52
+EBUILD selinux-thunderbird-2.20200818-r1.ebuild 389 BLAKE2B fc2945e2929812873dd1321d625b333a07209f2f2fe09e805cc528f7020305c7a2a32c1f32b6d5055688a922bd061acafefe07bf6dd714b4d71152accb1ce45d SHA512 bc2e50a48f860c97bf23655aad77ca4ec1461949b86f8633ec9010b250e97f631dcbc46a4c066256b727d71c42da81afae16e9095a1932a62d98aa4d92890165
 EBUILD selinux-thunderbird-9999.ebuild 392 BLAKE2B 4edde12b5b0519a3923e2c037e1167009270c0bd54b710d01c58f6b25760e761f9882c765ccda12e0f4c69087840c45fae835155ff15e3b3bd1a3043f2c1da1b SHA512 f8ea22df554fa6d7e0733c025bdea23ef155bb0fbc439d90f4cf51daa494c054f916dea0e68469af41fa151f4a294530c9c7b03f21b3f556794421415c9cdc86
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20190609-r1.ebuild b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20190609-r1.ebuild
index b6b8a5d4a3fd..c14772e51c48 100644
--- a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..b6b8a5d4a3fd
--- /dev/null
+++ b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20200818-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 7a6688dd6e68..556d33590765 100644
--- a/sec-policy/selinux-timidity/Manifest
+++ b/sec-policy/selinux-timidity/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-timidity-2.20190201-r1.ebuild 283 BLAKE2B 2d9649f5543cac5a900a4a1e4191bc1c05f22118a97e52192791cad747162ca50d0682f687240109ec6ea0787e14990aa563e33294116a678677aba71a7d2b38 SHA512 17f798f3d4504fa7b89a6e950c2d60edde74ae74227c9cccc3a2e0ddde43818c98b69794c8ca8f4475822080a0b858e30e9f478125d446b07f32e440c49a8973
-EBUILD selinux-timidity-2.20190609-r1.ebuild 285 BLAKE2B 4b8f9cf32752001090de2bd7328812acf93cab4dc43d2b66457a671426eef0a3a3d221ea9a10a1e33ecc770a797919746b895e2b3d543cd4c84e66aa09a86082 SHA512 312dcc1be0b66d6abc8c5a08a84f8c51b137b3b4265a1a2af431be90086e0ad558d74e9083dac2535ffdf6f5f613039c4fc34e2c031c18932dd17dcde6725dfe
+EBUILD selinux-timidity-2.20190609-r1.ebuild 283 BLAKE2B 2d9649f5543cac5a900a4a1e4191bc1c05f22118a97e52192791cad747162ca50d0682f687240109ec6ea0787e14990aa563e33294116a678677aba71a7d2b38 SHA512 17f798f3d4504fa7b89a6e950c2d60edde74ae74227c9cccc3a2e0ddde43818c98b69794c8ca8f4475822080a0b858e30e9f478125d446b07f32e440c49a8973
+EBUILD selinux-timidity-2.20200818-r1.ebuild 285 BLAKE2B 4b8f9cf32752001090de2bd7328812acf93cab4dc43d2b66457a671426eef0a3a3d221ea9a10a1e33ecc770a797919746b895e2b3d543cd4c84e66aa09a86082 SHA512 312dcc1be0b66d6abc8c5a08a84f8c51b137b3b4265a1a2af431be90086e0ad558d74e9083dac2535ffdf6f5f613039c4fc34e2c031c18932dd17dcde6725dfe
 EBUILD selinux-timidity-9999.ebuild 288 BLAKE2B b0a98e55a1b6f3afbee3a385e271043a9584d4f4e8433ac130fd8ee3c96f7b13ba283213b45c1c77ab9305bd25e2e2aa88ad7b8b74ed5cafdd3780013e142ede SHA512 c640370807519cc241074798ccc3193a9ac90fb7f6761e46ff901d6989c3b75a9b5fc66848a7f5c884ebe67a232cd12514867f30d9664f7c6cef285d21a363e1
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-timidity/selinux-timidity-2.20190609-r1.ebuild b/sec-policy/selinux-timidity/selinux-timidity-2.20190609-r1.ebuild
index 6373d459afa1..bb061deee85e 100644
--- a/sec-policy/selinux-timidity/selinux-timidity-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-timidity/selinux-timidity-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-timidity/selinux-timidity-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..6373d459afa1
--- /dev/null
+++ b/sec-policy/selinux-timidity/selinux-timidity-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 ae52a8ad6c81..133a381f1be0 100644
--- a/sec-policy/selinux-tmpreaper/Manifest
+++ b/sec-policy/selinux-tmpreaper/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-tmpreaper-2.20190201-r1.ebuild 285 BLAKE2B b998e327d8e1f53f3fbce83c5ba041de9ab5f1cbcdde61a98d443cc1e6a21fe543091383d0c1dfd724119aa23c5e3a55e726a774ced10c2d9a64b7d26857dec8 SHA512 53b9bd46e7619c6988c3001ba03c098cd487b49cbbbf3df1d022fc0a48c88da5f6f33f5095b1f0cb6c80ef96e0145ef94e59983701b0d949e8e2623905540aff
-EBUILD selinux-tmpreaper-2.20190609-r1.ebuild 287 BLAKE2B b08a3b66ff4db3f7f3462ccaaf9734736c5ee55b645098190aaa8a9887431b909822a86d02293287f5e086a267162a8d8936b5e36841ec484ecb7e1fdaa172c6 SHA512 f61fe5b25af0603df4bc822061bfa4a57f8e76b0778945d65dba14a93fd4cf248327b69e49effbd89897d25937353c818abc3b727585328546c1724a59481270
+EBUILD selinux-tmpreaper-2.20190609-r1.ebuild 285 BLAKE2B b998e327d8e1f53f3fbce83c5ba041de9ab5f1cbcdde61a98d443cc1e6a21fe543091383d0c1dfd724119aa23c5e3a55e726a774ced10c2d9a64b7d26857dec8 SHA512 53b9bd46e7619c6988c3001ba03c098cd487b49cbbbf3df1d022fc0a48c88da5f6f33f5095b1f0cb6c80ef96e0145ef94e59983701b0d949e8e2623905540aff
+EBUILD selinux-tmpreaper-2.20200818-r1.ebuild 287 BLAKE2B b08a3b66ff4db3f7f3462ccaaf9734736c5ee55b645098190aaa8a9887431b909822a86d02293287f5e086a267162a8d8936b5e36841ec484ecb7e1fdaa172c6 SHA512 f61fe5b25af0603df4bc822061bfa4a57f8e76b0778945d65dba14a93fd4cf248327b69e49effbd89897d25937353c818abc3b727585328546c1724a59481270
 EBUILD selinux-tmpreaper-9999.ebuild 290 BLAKE2B 2527649cf5a2ad0d5605c95c96cbaddefc09e0d5e3a8badaee01c93f607e47845d98925637f941cdd1ed50abb68b7647904f3fcbc9055b37b66c56b57f0c47d4 SHA512 c4a045e537c99a55553d4f0dcaaed5d9eb12050e1898ca9192b929663bded2d65c1b0201bbfa4f241df979eb827556e3366053368155b89a2bf7a571fc977fa9
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20190609-r1.ebuild b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20190609-r1.ebuild
index 5d7d6467c65c..e26c0cf53352 100644
--- a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..5d7d6467c65c
--- /dev/null
+++ b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 8f2de3498259..4ed4a7c79b06 100644
--- a/sec-policy/selinux-tor/Manifest
+++ b/sec-policy/selinux-tor/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-tor-2.20190201-r1.ebuild 273 BLAKE2B 131332cb3779fcc000b431017e3ea9837cd9eaeef10ea58656e9877cc6866f2d2fdc301539fd19899e874be010233034dca7f9a249916a8809003df62ae7396d SHA512 ccc73ed226782bee5e93a6825d8fb35c4e6f6fc890c82602937855bd68e65c25b37603168ff24b752d66c4aad5d4c358c7091ed2d684ebff4684e16a29edf16b
-EBUILD selinux-tor-2.20190609-r1.ebuild 275 BLAKE2B 264c1e1abd3d5df9a6872a1e00f8f649da2f55e3d262df940c40ec1826150508557829e10d986e0e8ea97628dbe5ebd47a5d690d20d9a618b0be62adf7c2ce1e SHA512 5795313f889dc4f2479408b3720623aa3742d700de330c64be3e78cb33b4201e43ffae0ce84cffdd51ca569b7651775e98aaa61b83a2a7168f841cb21b406c82
+EBUILD selinux-tor-2.20190609-r1.ebuild 273 BLAKE2B 131332cb3779fcc000b431017e3ea9837cd9eaeef10ea58656e9877cc6866f2d2fdc301539fd19899e874be010233034dca7f9a249916a8809003df62ae7396d SHA512 ccc73ed226782bee5e93a6825d8fb35c4e6f6fc890c82602937855bd68e65c25b37603168ff24b752d66c4aad5d4c358c7091ed2d684ebff4684e16a29edf16b
+EBUILD selinux-tor-2.20200818-r1.ebuild 275 BLAKE2B 264c1e1abd3d5df9a6872a1e00f8f649da2f55e3d262df940c40ec1826150508557829e10d986e0e8ea97628dbe5ebd47a5d690d20d9a618b0be62adf7c2ce1e SHA512 5795313f889dc4f2479408b3720623aa3742d700de330c64be3e78cb33b4201e43ffae0ce84cffdd51ca569b7651775e98aaa61b83a2a7168f841cb21b406c82
 EBUILD selinux-tor-9999.ebuild 278 BLAKE2B 0a70e42a3a9c2e297ed165915dd240d27942e9893109f97f058bbef207532794460cff8282c8949d94a4829f1b83f4d71e0723f1fe31e6f191690ee86c481caa SHA512 5a62f313dee2a3cbfae56d56047abb1e36213fb80dfdad25c9939156f641cfd5516bb8e580cf1ebcb72106c48dc8ae8a66857f59d4cccd684092c08e0dc46423
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-tor/selinux-tor-2.20190609-r1.ebuild b/sec-policy/selinux-tor/selinux-tor-2.20190609-r1.ebuild
index 97a035e29a9b..1ed577178c60 100644
--- a/sec-policy/selinux-tor/selinux-tor-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-tor/selinux-tor-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-tor/selinux-tor-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..97a035e29a9b
--- /dev/null
+++ b/sec-policy/selinux-tor/selinux-tor-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 abbac196385c..4e31efaef6f3 100644
--- a/sec-policy/selinux-tripwire/Manifest
+++ b/sec-policy/selinux-tripwire/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-tripwire-2.20190201-r1.ebuild 283 BLAKE2B ccd98ca72969d8949fe63ae594dcb74d4290089e94e93d63222e88577e2327caf55937c8a612f96035d5dbfa2c4e901159600733a16b77e836ce9ac3607642c3 SHA512 704d837b2534be4397ce92c4bd1a776b17047f77e82daec9540c2bd422fdf7d9529e9a4c3a9fb487fe63d4a5807ec41a9b65bcf03621fbb2ac78ff8a123f3605
-EBUILD selinux-tripwire-2.20190609-r1.ebuild 285 BLAKE2B e5c8aee4403594ce1b287c26b6cba68b0a5348ca1d094dfb295c16354df4664ecdcfa90aee112368cad2be2c5ea48186dc3cded3adf7b29347f6ec6613a92e57 SHA512 a685a8b3e9cfefdf1844486bbe47f5eacce78be48d069007d18f310f040a9fae7a4e6baa05b3ebcc31b1e5eaea2391b2418ea57a715bde3fd0c9673291da65b3
+EBUILD selinux-tripwire-2.20190609-r1.ebuild 283 BLAKE2B ccd98ca72969d8949fe63ae594dcb74d4290089e94e93d63222e88577e2327caf55937c8a612f96035d5dbfa2c4e901159600733a16b77e836ce9ac3607642c3 SHA512 704d837b2534be4397ce92c4bd1a776b17047f77e82daec9540c2bd422fdf7d9529e9a4c3a9fb487fe63d4a5807ec41a9b65bcf03621fbb2ac78ff8a123f3605
+EBUILD selinux-tripwire-2.20200818-r1.ebuild 285 BLAKE2B e5c8aee4403594ce1b287c26b6cba68b0a5348ca1d094dfb295c16354df4664ecdcfa90aee112368cad2be2c5ea48186dc3cded3adf7b29347f6ec6613a92e57 SHA512 a685a8b3e9cfefdf1844486bbe47f5eacce78be48d069007d18f310f040a9fae7a4e6baa05b3ebcc31b1e5eaea2391b2418ea57a715bde3fd0c9673291da65b3
 EBUILD selinux-tripwire-9999.ebuild 288 BLAKE2B dc176e63b144a1745cc89da3b2cb7b3f0a32088fc57c24d5f0450bab59b241586fb3a660a3a86a43132466d1139858b609a7667da81d20d04584acffaa073e27 SHA512 3c6bdb088be56830df7815cdb56f0b4ae95bf1d97a7c937ee310c71957b41bfd903c85d6c112029d5075aaf7ec6bbe935a14984707f0b82661b5de88eba40774
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-tripwire/selinux-tripwire-2.20190609-r1.ebuild b/sec-policy/selinux-tripwire/selinux-tripwire-2.20190609-r1.ebuild
index 4186fe2f7c8e..87ec997968ea 100644
--- a/sec-policy/selinux-tripwire/selinux-tripwire-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-tripwire/selinux-tripwire-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-tripwire/selinux-tripwire-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..4186fe2f7c8e
--- /dev/null
+++ b/sec-policy/selinux-tripwire/selinux-tripwire-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 cf3117b4de51..129a789cb831 100644
--- a/sec-policy/selinux-ucspitcp/Manifest
+++ b/sec-policy/selinux-ucspitcp/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-ucspitcp-2.20190201-r1.ebuild 283 BLAKE2B b0960d3ec1d5a7b67d77d7ac1712098c3e2c0459ac750ef057b8b59e9db6e8ae77b99a2f7856ceb7978dd44059a9bec0e422412626f4b0205a19c59e05651fc3 SHA512 d4ec638c9a11a9a11de642367e724ad4713f9bca3f5712f313bf9c411ccbcea02b0493f9620994b7b6138f5de36868fd27cddab6bfffd8b68edb5b3db5f21902
-EBUILD selinux-ucspitcp-2.20190609-r1.ebuild 285 BLAKE2B e2c7f64288a5dca21f0432d4dda01b28b783678b5ab96aa4b4312dcbd41e90c35880c06ed9ca561dc43a26dd91c0d9bd37e88275620048669badb900ee26a61a SHA512 0bae871e80d8361dd8054c24175f0013234731ee7ba4b220332e42a05456b8daa754a10128a43d01258db78734a2056fd9a0e867ce341cd3df2a48dc327ce7f7
+EBUILD selinux-ucspitcp-2.20190609-r1.ebuild 283 BLAKE2B b0960d3ec1d5a7b67d77d7ac1712098c3e2c0459ac750ef057b8b59e9db6e8ae77b99a2f7856ceb7978dd44059a9bec0e422412626f4b0205a19c59e05651fc3 SHA512 d4ec638c9a11a9a11de642367e724ad4713f9bca3f5712f313bf9c411ccbcea02b0493f9620994b7b6138f5de36868fd27cddab6bfffd8b68edb5b3db5f21902
+EBUILD selinux-ucspitcp-2.20200818-r1.ebuild 285 BLAKE2B e2c7f64288a5dca21f0432d4dda01b28b783678b5ab96aa4b4312dcbd41e90c35880c06ed9ca561dc43a26dd91c0d9bd37e88275620048669badb900ee26a61a SHA512 0bae871e80d8361dd8054c24175f0013234731ee7ba4b220332e42a05456b8daa754a10128a43d01258db78734a2056fd9a0e867ce341cd3df2a48dc327ce7f7
 EBUILD selinux-ucspitcp-9999.ebuild 288 BLAKE2B a3803a5442460e2e3e8c0237f2aabf5250b41a484bd2711310b219203c03bec1b0a5278cb6a450d341ef83c9499369420b91728ac4319d4a9c92f1179e9ae7ff SHA512 78ba3554ee13bae7ccef94063bf137c9bb54f4caaacea99385a7a1d99468f0aedef4b688d3523df16dbd761cd9f2ef0056e1ab660519160b62a9bb9333e38d4a
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20190609-r1.ebuild b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20190609-r1.ebuild
index edac3f67e055..dff5feca0456 100644
--- a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..edac3f67e055
--- /dev/null
+++ b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 b9d6a7397acc..becb068f7089 100644
--- a/sec-policy/selinux-ulogd/Manifest
+++ b/sec-policy/selinux-ulogd/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-ulogd-2.20190201-r1.ebuild 277 BLAKE2B 5dcc0cc39d07cfb1d7f2d2714c1c9d1ac0e2d1bf5f92b6bfce809e462bb66b63c1b0e08e48f5574155332d7ec89c283d18662db98f38372611cce328a2a65153 SHA512 412e79d26982788e11dc98c997c4122534482c40b724bec8fbb4a7f65d86d529fbace3ffe5cca2d21c5dfec9275a3157d10822daf64cecd060a9613f20eaeb89
-EBUILD selinux-ulogd-2.20190609-r1.ebuild 279 BLAKE2B 98d825654e618bece1bc0b87cdf7dba90c8b9023280e361d186a62e8252cafae01763a1e68d20ce38727dc3b6b2a60ace9042a09d990c8f70e10ef0052f1cae9 SHA512 056fd0ffa2d0d509957d5a88dfabe4f8a1020eed9e364210896c1952925f36beb50b24255718ca3261056e792b130a98d1a2e74f16792303c2238ebcb199315e
+EBUILD selinux-ulogd-2.20190609-r1.ebuild 277 BLAKE2B 5dcc0cc39d07cfb1d7f2d2714c1c9d1ac0e2d1bf5f92b6bfce809e462bb66b63c1b0e08e48f5574155332d7ec89c283d18662db98f38372611cce328a2a65153 SHA512 412e79d26982788e11dc98c997c4122534482c40b724bec8fbb4a7f65d86d529fbace3ffe5cca2d21c5dfec9275a3157d10822daf64cecd060a9613f20eaeb89
+EBUILD selinux-ulogd-2.20200818-r1.ebuild 279 BLAKE2B 98d825654e618bece1bc0b87cdf7dba90c8b9023280e361d186a62e8252cafae01763a1e68d20ce38727dc3b6b2a60ace9042a09d990c8f70e10ef0052f1cae9 SHA512 056fd0ffa2d0d509957d5a88dfabe4f8a1020eed9e364210896c1952925f36beb50b24255718ca3261056e792b130a98d1a2e74f16792303c2238ebcb199315e
 EBUILD selinux-ulogd-9999.ebuild 282 BLAKE2B 271edd0a01d3d83716b0c49f60371d8e8ae30f0b99865225ae68fa4328b8938471c600d2ad62465c7d655fcc100f200da23c9efbc6d390e64cf5ae53424e5b21 SHA512 c7e5c24a84ea312fa348c75f8f382c1bed5cf919a3b43fe6f42e3a19ebee44457d57b3924b63e0c19fd60e0acb6fd66a7cac788a50c682ea193e6eec237f870c
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ulogd/selinux-ulogd-2.20190609-r1.ebuild b/sec-policy/selinux-ulogd/selinux-ulogd-2.20190609-r1.ebuild
index e5b99eadd827..04680ac1fd50 100644
--- a/sec-policy/selinux-ulogd/selinux-ulogd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-ulogd/selinux-ulogd-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-ulogd/selinux-ulogd-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..e5b99eadd827
--- /dev/null
+++ b/sec-policy/selinux-ulogd/selinux-ulogd-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 4cae1a96106b..254666120877 100644
--- a/sec-policy/selinux-uml/Manifest
+++ b/sec-policy/selinux-uml/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-uml-2.20190201-r1.ebuild 273 BLAKE2B ebe2a8ead24ce2ed1ba44455ca40fba890871bea8fb0e5eba791e80f95e6f42f8f012ba472ccd4472c732374534fd7fd456b60b19240ef51a79fb2a1f271e3d2 SHA512 930e9367014677112f28c34c008c3a8474c23f46906ae2a21da1c737c79f587e06825e706fd0e38bba5c5a128c1db6037818e1087fcc073361634fa4061e9b2d
-EBUILD selinux-uml-2.20190609-r1.ebuild 275 BLAKE2B 9109088baa57b286de84f78ad2b659ad50264e214d55663593ef2c740e68d2fcaa73cc21060990e21d613f717f36d1cfc328a2d9f616e6978bcdc428384ab762 SHA512 15a339ac5c23a733fb4f42f918c63aa52272789b2a3cc46e0b4ae3a3e63364b95bcdff32d7f61659cf52f4955603bc8e9110d325349ee64e885e9d3cbcd2f443
+EBUILD selinux-uml-2.20190609-r1.ebuild 273 BLAKE2B ebe2a8ead24ce2ed1ba44455ca40fba890871bea8fb0e5eba791e80f95e6f42f8f012ba472ccd4472c732374534fd7fd456b60b19240ef51a79fb2a1f271e3d2 SHA512 930e9367014677112f28c34c008c3a8474c23f46906ae2a21da1c737c79f587e06825e706fd0e38bba5c5a128c1db6037818e1087fcc073361634fa4061e9b2d
+EBUILD selinux-uml-2.20200818-r1.ebuild 275 BLAKE2B 9109088baa57b286de84f78ad2b659ad50264e214d55663593ef2c740e68d2fcaa73cc21060990e21d613f717f36d1cfc328a2d9f616e6978bcdc428384ab762 SHA512 15a339ac5c23a733fb4f42f918c63aa52272789b2a3cc46e0b4ae3a3e63364b95bcdff32d7f61659cf52f4955603bc8e9110d325349ee64e885e9d3cbcd2f443
 EBUILD selinux-uml-9999.ebuild 278 BLAKE2B 67c22ffca537045af49ededac58b90af9c187073538db06db9c0989052a1cea018c13737185bc6c464e6096aceb2596ad1fc7c52651495b9aedbaf483be85bb7 SHA512 629e261652ad69cd0b879bc17abc6d39d3da4bc99100bf7db812c995e5853ab66d301b0b1d6c17e8020efde84d9f8100c568e32224fca2a1411af1ba45ffc230
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-uml/selinux-uml-2.20190609-r1.ebuild b/sec-policy/selinux-uml/selinux-uml-2.20190609-r1.ebuild
index 734e3f6cd0e8..584fdcd94e0e 100644
--- a/sec-policy/selinux-uml/selinux-uml-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-uml/selinux-uml-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-uml/selinux-uml-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..734e3f6cd0e8
--- /dev/null
+++ b/sec-policy/selinux-uml/selinux-uml-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 c52d7fb0b38d..8136e1e36d7c 100644
--- a/sec-policy/selinux-unconfined/Manifest
+++ b/sec-policy/selinux-unconfined/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-unconfined-2.20190201-r1.ebuild 287 BLAKE2B 34a7074f83d3a412bda88dd3a476ab1d100f5b5ce61b6ab03563f52cc2c488f68a734054c6186cfdb1904080d9e3ffb27c2a25e2a81e7f1ef3a9e10e7472dab5 SHA512 6bb924e88d93d801503a9e3ed7e233b03d6ddbcceda9b29f7114635e70b9d4b644ca2c0f70396f9390a8280911e8cbe68e65b69647a4aa42e88721ed53bf67c5
-EBUILD selinux-unconfined-2.20190609-r1.ebuild 289 BLAKE2B 67df438c56155a53a7b9372c63419bd3713ab939c4df9fc1676f63253cca14596344eae92c6204871f4bb1188b6accc3006ba4dd8f942edca0a483fa41c239b6 SHA512 e08786cd691d12076f101620089013b75963a7c0448de3bd83a211f597f9a7d9579bef66e070cc541a2e53acb82bbebc63f6f9ad7cc1345db5cc824379731801
+EBUILD selinux-unconfined-2.20190609-r1.ebuild 287 BLAKE2B 34a7074f83d3a412bda88dd3a476ab1d100f5b5ce61b6ab03563f52cc2c488f68a734054c6186cfdb1904080d9e3ffb27c2a25e2a81e7f1ef3a9e10e7472dab5 SHA512 6bb924e88d93d801503a9e3ed7e233b03d6ddbcceda9b29f7114635e70b9d4b644ca2c0f70396f9390a8280911e8cbe68e65b69647a4aa42e88721ed53bf67c5
+EBUILD selinux-unconfined-2.20200818-r1.ebuild 289 BLAKE2B 67df438c56155a53a7b9372c63419bd3713ab939c4df9fc1676f63253cca14596344eae92c6204871f4bb1188b6accc3006ba4dd8f942edca0a483fa41c239b6 SHA512 e08786cd691d12076f101620089013b75963a7c0448de3bd83a211f597f9a7d9579bef66e070cc541a2e53acb82bbebc63f6f9ad7cc1345db5cc824379731801
 EBUILD selinux-unconfined-9999.ebuild 292 BLAKE2B 914fa1563758b053ff64220467e435a7a59ba0bfdcac5913b9609796ec6e678dc32efa6b0e247381404903db99dd3d79153e0bbacf57dc4e06c8e0d006160936 SHA512 4ca5def8ee8828cff09059b1474cd53a06b795353b15f5527f31e3a5e3efaab13adefed65367747fbda0cc8f07358a33e3400aa4e8ac82fa45948601692eef50
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-unconfined/selinux-unconfined-2.20190609-r1.ebuild b/sec-policy/selinux-unconfined/selinux-unconfined-2.20190609-r1.ebuild
index 77cfe2e29acf..b5dfca8c9ae9 100644
--- a/sec-policy/selinux-unconfined/selinux-unconfined-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-unconfined/selinux-unconfined-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-unconfined/selinux-unconfined-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..77cfe2e29acf
--- /dev/null
+++ b/sec-policy/selinux-unconfined/selinux-unconfined-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 74f181a31b53..80e604e57b80 100644
--- a/sec-policy/selinux-uptime/Manifest
+++ b/sec-policy/selinux-uptime/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-uptime-2.20190201-r1.ebuild 279 BLAKE2B 1bc1eb65bccb2bb7c80e535ab45d8b20e28df28684b5af62154df9eba51ba7c8cd34f55043b69a57313ea3cce6ad3214298026571e46566ef736f683e31760ab SHA512 b9c349eaf58f844cf66b65d43d83ad708af56a5ce78e0c47a9668a45f2fc54e86157e55ecc49e12f1f1f3b8da286e4b5519447879f0c75a3735a1dcd70088ca9
-EBUILD selinux-uptime-2.20190609-r1.ebuild 281 BLAKE2B d4147f87b15c10df44ef21851d2cb64cf558cbbcc509a49f124dcbb9e31365773ac669745f9971bdf3faa5a80168df8cf7396d0fedbd55c731ad54f87f7e8b02 SHA512 9d0d048d289d34bf50663ee068a8c605181d2d1d2b701ef6a709211f927439321825d571009e108b24ec0ad1e867b72967ed8964d894b1be41bada8dafd5f02f
+EBUILD selinux-uptime-2.20190609-r1.ebuild 279 BLAKE2B 1bc1eb65bccb2bb7c80e535ab45d8b20e28df28684b5af62154df9eba51ba7c8cd34f55043b69a57313ea3cce6ad3214298026571e46566ef736f683e31760ab SHA512 b9c349eaf58f844cf66b65d43d83ad708af56a5ce78e0c47a9668a45f2fc54e86157e55ecc49e12f1f1f3b8da286e4b5519447879f0c75a3735a1dcd70088ca9
+EBUILD selinux-uptime-2.20200818-r1.ebuild 281 BLAKE2B d4147f87b15c10df44ef21851d2cb64cf558cbbcc509a49f124dcbb9e31365773ac669745f9971bdf3faa5a80168df8cf7396d0fedbd55c731ad54f87f7e8b02 SHA512 9d0d048d289d34bf50663ee068a8c605181d2d1d2b701ef6a709211f927439321825d571009e108b24ec0ad1e867b72967ed8964d894b1be41bada8dafd5f02f
 EBUILD selinux-uptime-9999.ebuild 284 BLAKE2B 78cc257948b53ece40997fc64a4485f654edd36e5590a40be2e3a0f05761b72986e2a956d295dce808712d5112a557b745ec79e00f885e4592021442e761b217 SHA512 2b962f0e37309daaf3585d312c8b28a008ba8377df136028b6296561ac7eae07cfb6b0b1536aa6b05270043270e4f20d2e68130379e76025b0bda033ea784bd8
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-uptime/selinux-uptime-2.20190609-r1.ebuild b/sec-policy/selinux-uptime/selinux-uptime-2.20190609-r1.ebuild
index f34f0be1e2eb..f379344cf536 100644
--- a/sec-policy/selinux-uptime/selinux-uptime-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-uptime/selinux-uptime-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-uptime/selinux-uptime-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..f34f0be1e2eb
--- /dev/null
+++ b/sec-policy/selinux-uptime/selinux-uptime-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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-usbmuxd/Manifest b/sec-policy/selinux-usbmuxd/Manifest
index 3c9d9cece9f9..f6e724a8c94f 100644
--- a/sec-policy/selinux-usbmuxd/Manifest
+++ b/sec-policy/selinux-usbmuxd/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-usbmuxd-2.20190201-r1.ebuild 281 BLAKE2B 6897686f21679307acb4c462d5cdba0f351d36e49df077da305899d23bd7a23836727b8790382ffb38827b7f1484c319dbd78405f8a5f88d9bc9f2096d669a27 SHA512 c04817dc00d9d8eecf119eef3cc67bbc29bf9243d7eec1ad4850ff24d2e8a7766588496c3ca39d6c3b85348594d20216f132c9705663be40b40182c62030ab49
-EBUILD selinux-usbmuxd-2.20190609-r1.ebuild 283 BLAKE2B c56202cd9cf22bd30c590d785ad102891ca18c514346ec4950d8d1a1e2d0706def335fa5aadfd8a879ff55052fa27a5c848abeaa00e1c5873c22852633790b55 SHA512 624b2b55ad438f15a1686810fc9e5413a2f947856ed159e41b4f280ac9475fa85c47057ca92c440c1ac7eb18ba08398e32debc082f4fdb1b68456cd2aa94b073
+EBUILD selinux-usbmuxd-2.20190609-r1.ebuild 281 BLAKE2B 6897686f21679307acb4c462d5cdba0f351d36e49df077da305899d23bd7a23836727b8790382ffb38827b7f1484c319dbd78405f8a5f88d9bc9f2096d669a27 SHA512 c04817dc00d9d8eecf119eef3cc67bbc29bf9243d7eec1ad4850ff24d2e8a7766588496c3ca39d6c3b85348594d20216f132c9705663be40b40182c62030ab49
+EBUILD selinux-usbmuxd-2.20200818-r1.ebuild 283 BLAKE2B c56202cd9cf22bd30c590d785ad102891ca18c514346ec4950d8d1a1e2d0706def335fa5aadfd8a879ff55052fa27a5c848abeaa00e1c5873c22852633790b55 SHA512 624b2b55ad438f15a1686810fc9e5413a2f947856ed159e41b4f280ac9475fa85c47057ca92c440c1ac7eb18ba08398e32debc082f4fdb1b68456cd2aa94b073
 EBUILD selinux-usbmuxd-9999.ebuild 286 BLAKE2B 225a7eaf0f8c48afc6cde18fa9ff347f7d8e3b59ae81de1c546a8f59c76ac472f8d3648b91c841ec093a86c9bea6b5b28a1fd69950888a180fc941c4a967b8c7 SHA512 1b1c2c723d4d7e372b7b260a3ee43b9c731edd53f0da3a7616785ce1f2c7af9be4089e3361471d3f60fd486967217e7b17d345da327f9f98777155d79f40aa11
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20190609-r1.ebuild b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20190609-r1.ebuild
index 0db867bb0d59..82fa0322f998 100644
--- a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..0db867bb0d59
--- /dev/null
+++ b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 f672ba679332..f93655daae6e 100644
--- a/sec-policy/selinux-uucp/Manifest
+++ b/sec-policy/selinux-uucp/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-uucp-2.20190201-r1.ebuild 369 BLAKE2B 310aa51886741611f95bd6d3229f46f188a9f9b57e7c7f2599c666a7df098b292eb4c6deb21f4e478f52b7a5efabe8d8cfaaf812eff8dd62d8d8f8b96744eb97 SHA512 a2eff3d95877db3563fde7d878c8dc9083fb66afcdfc0836ce82a8895bed629f9c84aec89cc92db3614241fc30b68a4d5832ce2b6261bbede7f0a5c1bfef0ba4
-EBUILD selinux-uucp-2.20190609-r1.ebuild 371 BLAKE2B e756a9df1c56f406c6e7774a9397273c22725de74fc39f325edb64757f1e88c04a41ec2a99e68c4a871c7487bc22de5940af06f76ab72d2d61f63958a44fecc8 SHA512 83cefa45e622f47e5e42dc9916bdfb32edad99b9097009e032ee545273b2f4b277606b577827090c3245f0fbf34ae8b5a85b0525102caffcc3e6a782c246df38
+EBUILD selinux-uucp-2.20190609-r1.ebuild 369 BLAKE2B 310aa51886741611f95bd6d3229f46f188a9f9b57e7c7f2599c666a7df098b292eb4c6deb21f4e478f52b7a5efabe8d8cfaaf812eff8dd62d8d8f8b96744eb97 SHA512 a2eff3d95877db3563fde7d878c8dc9083fb66afcdfc0836ce82a8895bed629f9c84aec89cc92db3614241fc30b68a4d5832ce2b6261bbede7f0a5c1bfef0ba4
+EBUILD selinux-uucp-2.20200818-r1.ebuild 371 BLAKE2B e756a9df1c56f406c6e7774a9397273c22725de74fc39f325edb64757f1e88c04a41ec2a99e68c4a871c7487bc22de5940af06f76ab72d2d61f63958a44fecc8 SHA512 83cefa45e622f47e5e42dc9916bdfb32edad99b9097009e032ee545273b2f4b277606b577827090c3245f0fbf34ae8b5a85b0525102caffcc3e6a782c246df38
 EBUILD selinux-uucp-9999.ebuild 374 BLAKE2B b43917fad3380f37c043dc102680c66841db1dc8695e65dbee1b0e40406184b394397bb4a73f24e2fe7671a942bd3ee06c3996331fecb4040aaba70978b07e3d SHA512 f40375d8f5c935aa4c1eb223ba7e878bd9ea6674351cdd8aff2169959713aee58be1147270f1693675fc80785e99b5de0b821d913329afe25057b75898aae0ec
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-uucp/selinux-uucp-2.20190609-r1.ebuild b/sec-policy/selinux-uucp/selinux-uucp-2.20190609-r1.ebuild
index 5850b5885730..1cc80be15c6f 100644
--- a/sec-policy/selinux-uucp/selinux-uucp-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-uucp/selinux-uucp-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-uucp/selinux-uucp-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..5850b5885730
--- /dev/null
+++ b/sec-policy/selinux-uucp/selinux-uucp-2.20200818-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 d581f997490f..599bafccfd5c 100644
--- a/sec-policy/selinux-uwimap/Manifest
+++ b/sec-policy/selinux-uwimap/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-uwimap-2.20190201-r1.ebuild 279 BLAKE2B beea953b0dac410ffa7f3ca7e417c1329c91cb37a88b49e4e1ecb6330e6a126e26e6ce2db83bb69c0a10a7b4f02842f6d1d17860481dcf4b5dddb3493099c2e9 SHA512 a0537e4e9cc4a10803b48b13d218bad3d21dc97c5a0639a8953a7df4521ea3cb342e9cf43b01a94a165384481ba37d2d5966e055b17af425b4d970d7e956a07c
-EBUILD selinux-uwimap-2.20190609-r1.ebuild 281 BLAKE2B 688a64d74beaad52a6469829a6798d3dd994764d924cdb47c5ab5e845361422197885605d3630695233e73f65c093e10b1cf3173460b26eb63a3036325ed07fa SHA512 e4e481c9292e858418fce86152cb5a1ae01f42bff51e46b56c612e8cd1df8fb0ad0a614f958e211e437531d069e64fccc59a6625876f760eb02bfcd81023e21a
+EBUILD selinux-uwimap-2.20190609-r1.ebuild 279 BLAKE2B beea953b0dac410ffa7f3ca7e417c1329c91cb37a88b49e4e1ecb6330e6a126e26e6ce2db83bb69c0a10a7b4f02842f6d1d17860481dcf4b5dddb3493099c2e9 SHA512 a0537e4e9cc4a10803b48b13d218bad3d21dc97c5a0639a8953a7df4521ea3cb342e9cf43b01a94a165384481ba37d2d5966e055b17af425b4d970d7e956a07c
+EBUILD selinux-uwimap-2.20200818-r1.ebuild 281 BLAKE2B 688a64d74beaad52a6469829a6798d3dd994764d924cdb47c5ab5e845361422197885605d3630695233e73f65c093e10b1cf3173460b26eb63a3036325ed07fa SHA512 e4e481c9292e858418fce86152cb5a1ae01f42bff51e46b56c612e8cd1df8fb0ad0a614f958e211e437531d069e64fccc59a6625876f760eb02bfcd81023e21a
 EBUILD selinux-uwimap-9999.ebuild 284 BLAKE2B e6a617cdaaceadca1121513954c649500747428c27701619e7bf1e8d379dff8f0134eb25e6975c04eac61984d7ab19e40d2ef85a40a22b1452b6da4b0592c654 SHA512 cf20daef8204abad12f5fd44c7a56ec0b061a3485e578cc9f01dd1318363592e7f989646e5052509936661df51998a209b4c6704f9d567c533e55042952c0c54
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-uwimap/selinux-uwimap-2.20190609-r1.ebuild b/sec-policy/selinux-uwimap/selinux-uwimap-2.20190609-r1.ebuild
index be9fc2a2ec7c..d25d09577eac 100644
--- a/sec-policy/selinux-uwimap/selinux-uwimap-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-uwimap/selinux-uwimap-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-uwimap/selinux-uwimap-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..be9fc2a2ec7c
--- /dev/null
+++ b/sec-policy/selinux-uwimap/selinux-uwimap-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 13cd84c04507..66304ad8e1c4 100644
--- a/sec-policy/selinux-uwsgi/Manifest
+++ b/sec-policy/selinux-uwsgi/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-uwsgi-2.20190201-r1.ebuild 277 BLAKE2B 90acecc49ed9692e90db1752b8ee9ad28f34f3ad0c6a486b769cb7a56da165cf7b80100c19e603a99edf7b0154b21c1dbbbbe2bb12c74f018511f42c93ce904d SHA512 d3469826786157ba3942859c9e33abb345ef4ec13eaa39111b6af1450a87bc508ada367bebfffc40b2ef8237371410eb2a7309e59b43525ede15c4eb9122cb55
-EBUILD selinux-uwsgi-2.20190609-r1.ebuild 279 BLAKE2B a31f95ab70aa27ddd684c94dc3afde95688880e26171d39c258f5031d6f8a3c7be9483104d44c84e39b8770a2de5c0e069066d6504fc86cf9c4bd42f2c1e73de SHA512 a092c69d158f731541e542075f0665f0aa0f2d8d820e929d2b3c6dae7eb711db5bc2bff95d1488a8de430185eecd6178b7e1224ea105812d2f856c9a3b5e92ac
+EBUILD selinux-uwsgi-2.20190609-r1.ebuild 277 BLAKE2B 90acecc49ed9692e90db1752b8ee9ad28f34f3ad0c6a486b769cb7a56da165cf7b80100c19e603a99edf7b0154b21c1dbbbbe2bb12c74f018511f42c93ce904d SHA512 d3469826786157ba3942859c9e33abb345ef4ec13eaa39111b6af1450a87bc508ada367bebfffc40b2ef8237371410eb2a7309e59b43525ede15c4eb9122cb55
+EBUILD selinux-uwsgi-2.20200818-r1.ebuild 279 BLAKE2B a31f95ab70aa27ddd684c94dc3afde95688880e26171d39c258f5031d6f8a3c7be9483104d44c84e39b8770a2de5c0e069066d6504fc86cf9c4bd42f2c1e73de SHA512 a092c69d158f731541e542075f0665f0aa0f2d8d820e929d2b3c6dae7eb711db5bc2bff95d1488a8de430185eecd6178b7e1224ea105812d2f856c9a3b5e92ac
 EBUILD selinux-uwsgi-9999.ebuild 282 BLAKE2B 5dd0e9fb5d51973fcf59cf9c9e57ed6e5928c0085b2c37b1c9647f455d7aa9bb203c5d49cc9da554586baf130bde631eefceb2758a7ace82208fd22413d88574 SHA512 895532df4a13af9025d08e32904039bdd78fa647f36526c273077e88f6326e09c74ab2f6d48722a24911d62f5819a1f4f9a6fb0d907d5bde667d474c06b56668
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20190609-r1.ebuild b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20190609-r1.ebuild
index f66ead1560cc..f0a8fc63e2c6 100644
--- a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..f66ead1560cc
--- /dev/null
+++ b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 02c0ba6c4439..899d799b20f1 100644
--- a/sec-policy/selinux-varnishd/Manifest
+++ b/sec-policy/selinux-varnishd/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-varnishd-2.20190201-r1.ebuild 283 BLAKE2B b1df558436b2c54129b2acdd14e7a38975a220b1fa2c1d3605f2c5c99b4d7cb23682d77fba126b2aa7524581c8fc84e91d942f8d133836fd8a6ea0c007eb69e4 SHA512 e8de582734b979089238168e6f2074cc6aa900887b1ef19fee80a79cdfb3bd8bfb51e83ea341a60456bd5055cd363bc54c76bf188e312e2a8f6527dff1b07dd8
-EBUILD selinux-varnishd-2.20190609-r1.ebuild 285 BLAKE2B 54b279b27c4c024b6da25c27e1c5fa5323a9797e0e2ff06f639d2eae9fac08d2d9ba0502ea64266d4cb4740d7e444c607c3d6b029d564d8daaf94bc08210fa1f SHA512 b14fac2baaabfd2d77aa78f1b3904ab57d8ebbdd2c8b15694974d16b442663bc8b9fab3fd3e4a7031861a12b51a73bd9a6ecf44ee97f578957aa10407e0047eb
+EBUILD selinux-varnishd-2.20190609-r1.ebuild 283 BLAKE2B b1df558436b2c54129b2acdd14e7a38975a220b1fa2c1d3605f2c5c99b4d7cb23682d77fba126b2aa7524581c8fc84e91d942f8d133836fd8a6ea0c007eb69e4 SHA512 e8de582734b979089238168e6f2074cc6aa900887b1ef19fee80a79cdfb3bd8bfb51e83ea341a60456bd5055cd363bc54c76bf188e312e2a8f6527dff1b07dd8
+EBUILD selinux-varnishd-2.20200818-r1.ebuild 285 BLAKE2B 54b279b27c4c024b6da25c27e1c5fa5323a9797e0e2ff06f639d2eae9fac08d2d9ba0502ea64266d4cb4740d7e444c607c3d6b029d564d8daaf94bc08210fa1f SHA512 b14fac2baaabfd2d77aa78f1b3904ab57d8ebbdd2c8b15694974d16b442663bc8b9fab3fd3e4a7031861a12b51a73bd9a6ecf44ee97f578957aa10407e0047eb
 EBUILD selinux-varnishd-9999.ebuild 288 BLAKE2B a15aaba55702f0ef50ddc015c097194182226a46cf2a86c4786d89c0f9ca208ee16b14f90f3181a4699ef6211128dc722a4af8e0add6c5819e6f21001571c7b8 SHA512 1f7377c1ae265ec01caa24a961cd3e65f0488e4acf49a5780be7d139209aa8617d6869c864052a049cbbe286466950f82c42e665ffd58679f3a6cf890061f026
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-varnishd/selinux-varnishd-2.20190609-r1.ebuild b/sec-policy/selinux-varnishd/selinux-varnishd-2.20190609-r1.ebuild
index 37e630361be4..37c127035c87 100644
--- a/sec-policy/selinux-varnishd/selinux-varnishd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-varnishd/selinux-varnishd-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-varnishd/selinux-varnishd-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..37e630361be4
--- /dev/null
+++ b/sec-policy/selinux-varnishd/selinux-varnishd-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 984fc0d8471d..b8c71e3a3de3 100644
--- a/sec-policy/selinux-vbetool/Manifest
+++ b/sec-policy/selinux-vbetool/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-vbetool-2.20190201-r1.ebuild 281 BLAKE2B 47fb7322916c27362ee37a1721bfc5e2d6fcd479fb10f57fbd473773585b6e2a96d07bc5ba263dbcb20c7adaaa53339927d76f3117682cee679e6e0eb81896da SHA512 cd305370e1c08b49c1993036d2f6aa3e157313768c2bc5f411976acd358c44fe8972d8d72f4d6d71cedb4f362ccfec088b46e9a78fdf3f0c77dcf9a2d579fe09
-EBUILD selinux-vbetool-2.20190609-r1.ebuild 283 BLAKE2B 18bc0306922cd42ea6af2c496f4d172fdd529498eed53f840da27c46f1dff7e8fe00e9e0684d9d6cc23839cfdff5350f02854c2f91d984aead07f78e14fb3274 SHA512 5552bf3908a73e989cab6882a10dcbf6992e45fa213f6e5022d5c3f5df62da9d86d4f8d9dd17e69452be680e61edf5891d304a3b7203d9e75482d52ed4989017
+EBUILD selinux-vbetool-2.20190609-r1.ebuild 281 BLAKE2B 47fb7322916c27362ee37a1721bfc5e2d6fcd479fb10f57fbd473773585b6e2a96d07bc5ba263dbcb20c7adaaa53339927d76f3117682cee679e6e0eb81896da SHA512 cd305370e1c08b49c1993036d2f6aa3e157313768c2bc5f411976acd358c44fe8972d8d72f4d6d71cedb4f362ccfec088b46e9a78fdf3f0c77dcf9a2d579fe09
+EBUILD selinux-vbetool-2.20200818-r1.ebuild 283 BLAKE2B 18bc0306922cd42ea6af2c496f4d172fdd529498eed53f840da27c46f1dff7e8fe00e9e0684d9d6cc23839cfdff5350f02854c2f91d984aead07f78e14fb3274 SHA512 5552bf3908a73e989cab6882a10dcbf6992e45fa213f6e5022d5c3f5df62da9d86d4f8d9dd17e69452be680e61edf5891d304a3b7203d9e75482d52ed4989017
 EBUILD selinux-vbetool-9999.ebuild 286 BLAKE2B 48e76ef77370f7b83280bb8173399cccbd03c9427d11692536d224914ea1f0776c11997a4ca5a90f57593bb5004779a27b406b8bf2079d9c9e5f33a2e041b315 SHA512 eca9c21557c28284a42fa51e47abe441db5d297c8bdacb894907b6a97cad8d8324bd62262d118cb0aeb803d4082826904a886ee2ca3b57a5d8ac70eac1135d96
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-vbetool/selinux-vbetool-2.20190609-r1.ebuild b/sec-policy/selinux-vbetool/selinux-vbetool-2.20190609-r1.ebuild
index 998a7c3dbbd5..74dc36ca5928 100644
--- a/sec-policy/selinux-vbetool/selinux-vbetool-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-vbetool/selinux-vbetool-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-vbetool/selinux-vbetool-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..998a7c3dbbd5
--- /dev/null
+++ b/sec-policy/selinux-vbetool/selinux-vbetool-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 de5f57f6f85f..01ecfa90ce9b 100644
--- a/sec-policy/selinux-vdagent/Manifest
+++ b/sec-policy/selinux-vdagent/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-vdagent-2.20190201-r1.ebuild 281 BLAKE2B 85fb068beebf8e50793b64a9b1495f1a03723854c96acc8f2383e3f2a8d11e0dbb68ef1bc894040792b35344014ca3b92fffd1fda7b9340e4e38c5b854666775 SHA512 9003ded8d440c503f291891167964874d769fc35d690f3a98892db320612fe3756b0ca8056df8ba5a96e2c677fd5ad5ce394b1133034f9743be45f1712b8a7c2
-EBUILD selinux-vdagent-2.20190609-r1.ebuild 283 BLAKE2B 3482d796b85c6017f8c2dacfdee9ec3cf16b8e619858551fedf1ad0122b8a7bede859c5f310065bd4bdab3c6c20bfd96cb28777ed93a0b65cd9a191b87cfe30d SHA512 77d8d26247bb1ee354cfb25ca2ad842c780709e78b8476cee5b1d9ab19d6ee5877536aab2e0d6df8799eaa939a20ad21991224872fb3aff22b78bb04535ee9b6
+EBUILD selinux-vdagent-2.20190609-r1.ebuild 281 BLAKE2B 85fb068beebf8e50793b64a9b1495f1a03723854c96acc8f2383e3f2a8d11e0dbb68ef1bc894040792b35344014ca3b92fffd1fda7b9340e4e38c5b854666775 SHA512 9003ded8d440c503f291891167964874d769fc35d690f3a98892db320612fe3756b0ca8056df8ba5a96e2c677fd5ad5ce394b1133034f9743be45f1712b8a7c2
+EBUILD selinux-vdagent-2.20200818-r1.ebuild 283 BLAKE2B 3482d796b85c6017f8c2dacfdee9ec3cf16b8e619858551fedf1ad0122b8a7bede859c5f310065bd4bdab3c6c20bfd96cb28777ed93a0b65cd9a191b87cfe30d SHA512 77d8d26247bb1ee354cfb25ca2ad842c780709e78b8476cee5b1d9ab19d6ee5877536aab2e0d6df8799eaa939a20ad21991224872fb3aff22b78bb04535ee9b6
 EBUILD selinux-vdagent-9999.ebuild 286 BLAKE2B d4d4e81d18f67fcf8472892a7c1cad00a655d5740b5b25f5607112133d20e09e33da07041c57b43c62a12e38cbc939c6c351c2b5f0917b6f30c89b604626ce8e SHA512 a05c07a03d00370ddafc9c08c9d009e05db955bbcaaf6f282b69b10f89d7d20f1684ef656d78c7dba969354baabc398335bc0a6bb1203659ba8cd33db6bad0ab
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-vdagent/selinux-vdagent-2.20190609-r1.ebuild b/sec-policy/selinux-vdagent/selinux-vdagent-2.20190609-r1.ebuild
index 841867010152..e20f8b4bb5f7 100644
--- a/sec-policy/selinux-vdagent/selinux-vdagent-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-vdagent/selinux-vdagent-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-vdagent/selinux-vdagent-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..841867010152
--- /dev/null
+++ b/sec-policy/selinux-vdagent/selinux-vdagent-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 a51ea9af13a9..c510b176a596 100644
--- a/sec-policy/selinux-vde/Manifest
+++ b/sec-policy/selinux-vde/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-vde-2.20190201-r1.ebuild 273 BLAKE2B 30c4eb1f029a7d5e3636ca938f9e8b0f8b17060f12861f8244f267592b755c4b176b925c175012f4436aefb85338dc4975ae13e2f42f28243f6bb17609ab2bbe SHA512 b7a1f4fc18eeeb055980b52302a267bddfd71792bec58d140fbf42a7dbc8c2eaa9f2fafbeb1a46769bf754c93ebc7be9c7bbe69cb38b891436551804d904549e
-EBUILD selinux-vde-2.20190609-r1.ebuild 275 BLAKE2B dfaeca4d2d5d777598acd33ac9304f7c55cdc16361dcc19b0d6d6ec50e402c5105727dc0a4fb26f5782cd70117d2199c07ea3010c2072583cf36d8ce802b77a5 SHA512 714eba8a2ba748e2db579c3503dadc1a6d8dee28ca510ced900b221d7d6476f100d4d2b44bc4ba5588e3b60d436ad75be46c22afdf467f11006ebb4757c8e457
+EBUILD selinux-vde-2.20190609-r1.ebuild 273 BLAKE2B 30c4eb1f029a7d5e3636ca938f9e8b0f8b17060f12861f8244f267592b755c4b176b925c175012f4436aefb85338dc4975ae13e2f42f28243f6bb17609ab2bbe SHA512 b7a1f4fc18eeeb055980b52302a267bddfd71792bec58d140fbf42a7dbc8c2eaa9f2fafbeb1a46769bf754c93ebc7be9c7bbe69cb38b891436551804d904549e
+EBUILD selinux-vde-2.20200818-r1.ebuild 275 BLAKE2B dfaeca4d2d5d777598acd33ac9304f7c55cdc16361dcc19b0d6d6ec50e402c5105727dc0a4fb26f5782cd70117d2199c07ea3010c2072583cf36d8ce802b77a5 SHA512 714eba8a2ba748e2db579c3503dadc1a6d8dee28ca510ced900b221d7d6476f100d4d2b44bc4ba5588e3b60d436ad75be46c22afdf467f11006ebb4757c8e457
 EBUILD selinux-vde-9999.ebuild 278 BLAKE2B 46e6d278d18911c71de5f338a0874ee6e5622fdac5883688d7b61cce874d4e532b02108dcdfc069fcb493b4ea037fa8031384ce36ed00c39ab9909079db7a2d8 SHA512 976b560ddcc655e6b335dce354cf8b493c2c8b8719e4e75238405e250cecc635a19d28f2d4caaab64572270f66a35f520d97af1b785a41bdca61b35dc3c4149e
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-vde/selinux-vde-2.20190609-r1.ebuild b/sec-policy/selinux-vde/selinux-vde-2.20190609-r1.ebuild
index 7835ae11f9f3..1b2c0e80467e 100644
--- a/sec-policy/selinux-vde/selinux-vde-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-vde/selinux-vde-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-vde/selinux-vde-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..7835ae11f9f3
--- /dev/null
+++ b/sec-policy/selinux-vde/selinux-vde-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 2488c1d603f6..674bc3d28d61 100644
--- a/sec-policy/selinux-virt/Manifest
+++ b/sec-policy/selinux-virt/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-virt-2.20190201-r1.ebuild 275 BLAKE2B 55562e3594028f93fe64638d9f0f4b7f51c57e1a241adfe1c5a4a5127285eb619daeeb96767b591fca26d04cccb53b2781619e124a6f3af0decc88e85bfc93f5 SHA512 b95550cd39d85273495f0562947c0f54fc82b7940f83e9333c2e083827856f705128914650735faf633882b94233191ac580447da4f4b36eb4665e9b009fbf5d
-EBUILD selinux-virt-2.20190609-r1.ebuild 277 BLAKE2B 7233f2565fbe43a1dfe315115a77de01034155d2be8fe29eddc06647a31179f28aa7209d540fc5d9f3213ef0c5a73372392e91dd74df732a1723fb72dd24813c SHA512 9701ac07c5ce36f38d7431704ee8fa1f25b16b5fa38bf998bf5a6add1cac3f7cbddd6d46113e66627d90bbb88563a1d5997c56b7c84557dc8883a89a76a13916
+EBUILD selinux-virt-2.20190609-r1.ebuild 275 BLAKE2B 55562e3594028f93fe64638d9f0f4b7f51c57e1a241adfe1c5a4a5127285eb619daeeb96767b591fca26d04cccb53b2781619e124a6f3af0decc88e85bfc93f5 SHA512 b95550cd39d85273495f0562947c0f54fc82b7940f83e9333c2e083827856f705128914650735faf633882b94233191ac580447da4f4b36eb4665e9b009fbf5d
+EBUILD selinux-virt-2.20200818-r1.ebuild 277 BLAKE2B 7233f2565fbe43a1dfe315115a77de01034155d2be8fe29eddc06647a31179f28aa7209d540fc5d9f3213ef0c5a73372392e91dd74df732a1723fb72dd24813c SHA512 9701ac07c5ce36f38d7431704ee8fa1f25b16b5fa38bf998bf5a6add1cac3f7cbddd6d46113e66627d90bbb88563a1d5997c56b7c84557dc8883a89a76a13916
 EBUILD selinux-virt-9999.ebuild 280 BLAKE2B 14ba07355d3908297770fd5ae665d695d431d87eb44c970f0b49efc13fdc69da4af0930ca9f8e118200a26dc22100020289fce7a47bf88b4c17912738b1d77b6 SHA512 db70c6bc92fe8e5b50b0f798e8f5d90b54cbc2e7e1bcd29ac16ec5fee52b26f5a378164c61588c976c5fda880a6efff3e1f283a4fb712812ac505733129b023e
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-virt/selinux-virt-2.20190609-r1.ebuild b/sec-policy/selinux-virt/selinux-virt-2.20190609-r1.ebuild
index 06a776e84236..44711e5d751a 100644
--- a/sec-policy/selinux-virt/selinux-virt-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-virt/selinux-virt-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-virt/selinux-virt-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..06a776e84236
--- /dev/null
+++ b/sec-policy/selinux-virt/selinux-virt-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 53387b2bf731..56da219d7861 100644
--- a/sec-policy/selinux-vlock/Manifest
+++ b/sec-policy/selinux-vlock/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-vlock-2.20190201-r1.ebuild 277 BLAKE2B 68e108c0e46a9751a5ae19b8d03bd0768c3cdf043922fb4b9fcb1ec492c857f9f090c734ea92c42aa8904766f8a296a7de9a75b535acc52ade76910cdd70c0f6 SHA512 ef2c3a1e30bbf14617a08aaa50260ed3f1d280abd3a42edc45151b8f456f17c6fae1fdf41acfe45ea2d723720db1b36ee6c8c1b0d59f067d1f5ba67dc7abce01
-EBUILD selinux-vlock-2.20190609-r1.ebuild 279 BLAKE2B c3f8071b73cea50e296979673e5e9ce913b6b120156787c12c688b8dbd3ad63e979282333fcbdd8c9cf967c3151d6c452ab89dd67ec58f384bf294058112e337 SHA512 7bb30213850a4c889671f583b5bdb2ef7d28cc075e36f480142656c76d72f0420a1b409766ec359f3a8fd17d334184f58afdd553e612bb4d4523322a098a3ac7
+EBUILD selinux-vlock-2.20190609-r1.ebuild 277 BLAKE2B 68e108c0e46a9751a5ae19b8d03bd0768c3cdf043922fb4b9fcb1ec492c857f9f090c734ea92c42aa8904766f8a296a7de9a75b535acc52ade76910cdd70c0f6 SHA512 ef2c3a1e30bbf14617a08aaa50260ed3f1d280abd3a42edc45151b8f456f17c6fae1fdf41acfe45ea2d723720db1b36ee6c8c1b0d59f067d1f5ba67dc7abce01
+EBUILD selinux-vlock-2.20200818-r1.ebuild 279 BLAKE2B c3f8071b73cea50e296979673e5e9ce913b6b120156787c12c688b8dbd3ad63e979282333fcbdd8c9cf967c3151d6c452ab89dd67ec58f384bf294058112e337 SHA512 7bb30213850a4c889671f583b5bdb2ef7d28cc075e36f480142656c76d72f0420a1b409766ec359f3a8fd17d334184f58afdd553e612bb4d4523322a098a3ac7
 EBUILD selinux-vlock-9999.ebuild 282 BLAKE2B d33da539ee99c0a6bae25dd5f2f9235ada16384f7045c86f7548a51ffc933dee1bd0d8acbca620d77d15ee8d1201887b8788e73678479f34883f64f82d3d03a1 SHA512 6b8760cf974d5d3e4885f6706a6e9cea7328167f4fe98cd84d9d8e17c281e45a3dc414d0687a8a7baa853665cd9d72a94ec846d1c4c7a0d71ce529c657af910d
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-vlock/selinux-vlock-2.20190609-r1.ebuild b/sec-policy/selinux-vlock/selinux-vlock-2.20190609-r1.ebuild
index 318295df311d..9a10aa663c40 100644
--- a/sec-policy/selinux-vlock/selinux-vlock-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-vlock/selinux-vlock-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-vlock/selinux-vlock-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..318295df311d
--- /dev/null
+++ b/sec-policy/selinux-vlock/selinux-vlock-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 d80a5d58a5f7..9e0d9d5636db 100644
--- a/sec-policy/selinux-vmware/Manifest
+++ b/sec-policy/selinux-vmware/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-vmware-2.20190201-r1.ebuild 377 BLAKE2B 7e2f7ae3e796337f0c4f8869babc09e1d5a37e6987f57bea921b89a9527ac035eed575a6114e6be877f20b8f4748c7e9e30d33c5c4d7e2eda68ee36225ecc85b SHA512 da87cef25654143dedb6842507333600fcc1a5511b0871f9874ce37c07ea78b74d6367a81f69c5b0fe587702df5ae6f760bfc7324ddd4a21fb0d81feabac1d7b
-EBUILD selinux-vmware-2.20190609-r1.ebuild 379 BLAKE2B 15a55076f17d1bc3194f4db7673c069afa0b3fd99a66f424305148065d863426aef6a3bc27e701ea0bbf1a8f4c3e7d0287dfec6efc0cc959aa58cce1366cb63a SHA512 f2a09a778b0fcf60965578e8e7572e4d6919d30549293ced51969803f5aecf0f4ec05036985f7fa3cc4f5bf88fe5553b83333e83a8ee0fb6aa014c4f061dcd81
+EBUILD selinux-vmware-2.20190609-r1.ebuild 377 BLAKE2B 7e2f7ae3e796337f0c4f8869babc09e1d5a37e6987f57bea921b89a9527ac035eed575a6114e6be877f20b8f4748c7e9e30d33c5c4d7e2eda68ee36225ecc85b SHA512 da87cef25654143dedb6842507333600fcc1a5511b0871f9874ce37c07ea78b74d6367a81f69c5b0fe587702df5ae6f760bfc7324ddd4a21fb0d81feabac1d7b
+EBUILD selinux-vmware-2.20200818-r1.ebuild 379 BLAKE2B 15a55076f17d1bc3194f4db7673c069afa0b3fd99a66f424305148065d863426aef6a3bc27e701ea0bbf1a8f4c3e7d0287dfec6efc0cc959aa58cce1366cb63a SHA512 f2a09a778b0fcf60965578e8e7572e4d6919d30549293ced51969803f5aecf0f4ec05036985f7fa3cc4f5bf88fe5553b83333e83a8ee0fb6aa014c4f061dcd81
 EBUILD selinux-vmware-9999.ebuild 382 BLAKE2B 27f46ea2b411bce2c151110a30ee6f1c3bc54a1d738570cd2d36372f1e98ab61e522a31e88d2eca7fd65512c623bbbd7da1c803993bcc7c9a1339936f9d2ab00 SHA512 b6a1e2edb8097ee323dc4f478a236c76f295d3c40b884b3b25f44b14d86d7649ab6bb66913dfdee2434019d0643d467e27027605deea9f8a3125dbee84cf8697
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-vmware/selinux-vmware-2.20190609-r1.ebuild b/sec-policy/selinux-vmware/selinux-vmware-2.20190609-r1.ebuild
index 4963cd0a99df..9d6a7e941334 100644
--- a/sec-policy/selinux-vmware/selinux-vmware-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-vmware/selinux-vmware-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-vmware/selinux-vmware-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..4963cd0a99df
--- /dev/null
+++ b/sec-policy/selinux-vmware/selinux-vmware-2.20200818-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 a96288c17a2b..0d742fb61ab4 100644
--- a/sec-policy/selinux-vnstatd/Manifest
+++ b/sec-policy/selinux-vnstatd/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-vnstatd-2.20190201-r1.ebuild 281 BLAKE2B 27d9cf45e247792a8bb5447b8e7721a67c964b742e5c088166649e187407d80e139726efca62780e5b079187b411fa74a9c551cf1a907dd063824c6af6d9e3f9 SHA512 0cf2c85b7c6a0580a7cfdb58a76a459e4d2cc2c922a18bba56666f0b32444963704d0124e5f9bd90c2ee5f13099ed071a47218626e851a987791a3cfdd830633
-EBUILD selinux-vnstatd-2.20190609-r1.ebuild 283 BLAKE2B 5227d011c8c9848dce64ac6b32e4e6c2984af1dcefc43068941a16fd29545d880c4b3674bb42707c6ab2c55c9321af0f33d5f97c4f1d96c17a1898dd816c162b SHA512 450f3dec70dc66a01bea2685a1648915e02fc17e32a1094a7830c2d633ae6fb8d5493e80a71d813ecb10789c70f58d2650d3dc69f424deb132e402f54f1a6ba9
+EBUILD selinux-vnstatd-2.20190609-r1.ebuild 281 BLAKE2B 27d9cf45e247792a8bb5447b8e7721a67c964b742e5c088166649e187407d80e139726efca62780e5b079187b411fa74a9c551cf1a907dd063824c6af6d9e3f9 SHA512 0cf2c85b7c6a0580a7cfdb58a76a459e4d2cc2c922a18bba56666f0b32444963704d0124e5f9bd90c2ee5f13099ed071a47218626e851a987791a3cfdd830633
+EBUILD selinux-vnstatd-2.20200818-r1.ebuild 283 BLAKE2B 5227d011c8c9848dce64ac6b32e4e6c2984af1dcefc43068941a16fd29545d880c4b3674bb42707c6ab2c55c9321af0f33d5f97c4f1d96c17a1898dd816c162b SHA512 450f3dec70dc66a01bea2685a1648915e02fc17e32a1094a7830c2d633ae6fb8d5493e80a71d813ecb10789c70f58d2650d3dc69f424deb132e402f54f1a6ba9
 EBUILD selinux-vnstatd-9999.ebuild 286 BLAKE2B 1e1055af6cf9c203eeb4c785fad03254332a9b231d81434bf7183986f7f58fc8e81339ceee3d201a3bdfafb4a64f1bef058b404edb369f6a41861767d8961a45 SHA512 e37618c5e85424c9a68b927c08f2b014209e48e965d749b8692703d914674fde0d915a632db9633f2beba509b2ee41e46dc9676e3cee052ed0a6c87ac878ebfd
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20190609-r1.ebuild b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20190609-r1.ebuild
index a5e52bf160e9..8177e6533ae0 100644
--- a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..a5e52bf160e9
--- /dev/null
+++ b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 32135915b144..b228d364db7d 100644
--- a/sec-policy/selinux-vpn/Manifest
+++ b/sec-policy/selinux-vpn/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-vpn-2.20190201-r1.ebuild 273 BLAKE2B e52da9f4595ac959526dff9f2beecd318262ef7263542eca9299ed151f88137ccd12bf41dd226306cb6d308c8b211b20a0d1f48701c6ebc282ebbedd5befe170 SHA512 3cb9270a3c00ba1524c974e25ec0fd559a884fda4d24100466d5996eb63386d06d9c3b88fbda4dcbd3119a21490798b20b5930acbac2d19894f8261fde30bfbd
-EBUILD selinux-vpn-2.20190609-r1.ebuild 275 BLAKE2B cd6cab90183121f48eb13217b717d0d2cfc2e6e2a55e565cde0551b309d717867c7c4dc942f7e29999c6fa6c30c796241984f0361d28a143e54e16512da1c364 SHA512 5250e6f07c454984a3b13928a67515d919c73d5e43866bf48b545e6857869c1d2f3c305a8b2648ce1454b7114279884c0bd8217a0b34f36193a0f3d8ffc4e20e
+EBUILD selinux-vpn-2.20190609-r1.ebuild 273 BLAKE2B e52da9f4595ac959526dff9f2beecd318262ef7263542eca9299ed151f88137ccd12bf41dd226306cb6d308c8b211b20a0d1f48701c6ebc282ebbedd5befe170 SHA512 3cb9270a3c00ba1524c974e25ec0fd559a884fda4d24100466d5996eb63386d06d9c3b88fbda4dcbd3119a21490798b20b5930acbac2d19894f8261fde30bfbd
+EBUILD selinux-vpn-2.20200818-r1.ebuild 275 BLAKE2B cd6cab90183121f48eb13217b717d0d2cfc2e6e2a55e565cde0551b309d717867c7c4dc942f7e29999c6fa6c30c796241984f0361d28a143e54e16512da1c364 SHA512 5250e6f07c454984a3b13928a67515d919c73d5e43866bf48b545e6857869c1d2f3c305a8b2648ce1454b7114279884c0bd8217a0b34f36193a0f3d8ffc4e20e
 EBUILD selinux-vpn-9999.ebuild 278 BLAKE2B 37f73ab0a4df98a52b6784c2a04323f90a36cfa8c088eeb7bcc61f002f4c5b03fa76c2a9cbec6559ee706fcd6138b9e27dd4269d6668d23ac85042d4d672c48b SHA512 24e11526d91702ed2f558ae580be630670bd9e28cb665e77dfd34979f7e83a84454f0e8382a2b6a232cf3c30cd892245b5c04749110f4d1f035631d89965ca6b
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-vpn/selinux-vpn-2.20190609-r1.ebuild b/sec-policy/selinux-vpn/selinux-vpn-2.20190609-r1.ebuild
index 6415c53754a5..410ba76e08b4 100644
--- a/sec-policy/selinux-vpn/selinux-vpn-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-vpn/selinux-vpn-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-vpn/selinux-vpn-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..6415c53754a5
--- /dev/null
+++ b/sec-policy/selinux-vpn/selinux-vpn-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 1331117a7b38..4c91d029a0cd 100644
--- a/sec-policy/selinux-watchdog/Manifest
+++ b/sec-policy/selinux-watchdog/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-watchdog-2.20190201-r1.ebuild 283 BLAKE2B 1ec59d0cb22913024fcb6325490b989b79a293de1f563720d5191dcf0ad70823e59dee3296362a878f3f4b00dd2f24c805f5e07e2392018797996646f3448a9f SHA512 1312237f3a635a7fc0d2eb1553f000b7e3bdb2c485e486c308f7642ed0b609bd52ccbda5a4167faad82866fba3811e5b3ae3774b9fca1b79ba3c2e073ee40fbc
-EBUILD selinux-watchdog-2.20190609-r1.ebuild 285 BLAKE2B e5d8dc68d4f3b87779d0a5ed821c985c027c201de0f864b2293f7226f8fec60e78641cee9a34a7b5bcb727ca666b16f9460c95c650cd1e96cdac94dab72d278a SHA512 40821b8d2042523d109af8cd934d149e728bd0a7f83cd0a443ca4046172463aabdf99a2db73c28a2537882e686608821c3aff3402bc9e98a841e8561a03b1dc1
+EBUILD selinux-watchdog-2.20190609-r1.ebuild 283 BLAKE2B 1ec59d0cb22913024fcb6325490b989b79a293de1f563720d5191dcf0ad70823e59dee3296362a878f3f4b00dd2f24c805f5e07e2392018797996646f3448a9f SHA512 1312237f3a635a7fc0d2eb1553f000b7e3bdb2c485e486c308f7642ed0b609bd52ccbda5a4167faad82866fba3811e5b3ae3774b9fca1b79ba3c2e073ee40fbc
+EBUILD selinux-watchdog-2.20200818-r1.ebuild 285 BLAKE2B e5d8dc68d4f3b87779d0a5ed821c985c027c201de0f864b2293f7226f8fec60e78641cee9a34a7b5bcb727ca666b16f9460c95c650cd1e96cdac94dab72d278a SHA512 40821b8d2042523d109af8cd934d149e728bd0a7f83cd0a443ca4046172463aabdf99a2db73c28a2537882e686608821c3aff3402bc9e98a841e8561a03b1dc1
 EBUILD selinux-watchdog-9999.ebuild 288 BLAKE2B de80008069876fd138ec3e1a5a0aa91f238e142493c32efc6432c5d26b2af6b19bfff1e2de6fd63f1752cdb71bb690c978880deee8b046c28cbd596487966ef5 SHA512 c16cd886fa663552ab8e55b53c719b722fb4067549fad0951b176953b6d50465290aec20a1128e4a554980ad923b240417e890a1068d1812bf3045a7f034a4a1
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-watchdog/selinux-watchdog-2.20190609-r1.ebuild b/sec-policy/selinux-watchdog/selinux-watchdog-2.20190609-r1.ebuild
index faf0a41094b2..c86a01682697 100644
--- a/sec-policy/selinux-watchdog/selinux-watchdog-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-watchdog/selinux-watchdog-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-watchdog/selinux-watchdog-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..faf0a41094b2
--- /dev/null
+++ b/sec-policy/selinux-watchdog/selinux-watchdog-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 3504edf36b51..8f227eaa3563 100644
--- a/sec-policy/selinux-webalizer/Manifest
+++ b/sec-policy/selinux-webalizer/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-webalizer-2.20190201-r1.ebuild 382 BLAKE2B 150c2707998435fe0966a2d90b56af04938f0ab272aa09dbe893d3744e11b6686c6504a8b3fff126e734f746050d0cd085ea6d839808a0b3ae0a70005c62bdcb SHA512 c5b8df3032eac57687a95cce16a82ef15b729786f1a5a9661f1797b30bdabe45ea4c5ebb6ca8248423fae13348a05376a8fd3f361bd62ca2f743c63e0d9cf8de
-EBUILD selinux-webalizer-2.20190609-r1.ebuild 384 BLAKE2B f526dfe16148db5e8151c865135fef0b83aa2576aa2d1152565ed65c048a836edfe5da19d4e69127d0badebeb8574c144d3fe4496dbed473a3613d86cf6ea2fc SHA512 703052e00a2ca9de8a4bc35dce91e92e9c3cd608b7b47e9bca52a58e0cba34fa94ab1203457a714705605518ec071d2280b580bab922783cfff5808927fb3ed7
+EBUILD selinux-webalizer-2.20190609-r1.ebuild 382 BLAKE2B 150c2707998435fe0966a2d90b56af04938f0ab272aa09dbe893d3744e11b6686c6504a8b3fff126e734f746050d0cd085ea6d839808a0b3ae0a70005c62bdcb SHA512 c5b8df3032eac57687a95cce16a82ef15b729786f1a5a9661f1797b30bdabe45ea4c5ebb6ca8248423fae13348a05376a8fd3f361bd62ca2f743c63e0d9cf8de
+EBUILD selinux-webalizer-2.20200818-r1.ebuild 384 BLAKE2B f526dfe16148db5e8151c865135fef0b83aa2576aa2d1152565ed65c048a836edfe5da19d4e69127d0badebeb8574c144d3fe4496dbed473a3613d86cf6ea2fc SHA512 703052e00a2ca9de8a4bc35dce91e92e9c3cd608b7b47e9bca52a58e0cba34fa94ab1203457a714705605518ec071d2280b580bab922783cfff5808927fb3ed7
 EBUILD selinux-webalizer-9999.ebuild 387 BLAKE2B 21f96e823977f2cca93b1593391d6a45fdc57e9d0042ba26c3ffd3895136b07fb539fb0f1c96f727c45e82ad0da0f3b0b5b46875e3f1ef7a9ecdf7c5918ed5d0 SHA512 e83af1779b75f4ea3d8be0d9527b8eb596785c75115e661556b627984811b146fbaff81b885a98a65f51c692afe06bd0afc1c115e714269f47d165a658bf0d61
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-webalizer/selinux-webalizer-2.20190609-r1.ebuild b/sec-policy/selinux-webalizer/selinux-webalizer-2.20190609-r1.ebuild
index 25f964560135..6f7462b40d55 100644
--- a/sec-policy/selinux-webalizer/selinux-webalizer-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-webalizer/selinux-webalizer-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-webalizer/selinux-webalizer-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..25f964560135
--- /dev/null
+++ b/sec-policy/selinux-webalizer/selinux-webalizer-2.20200818-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 affb5cf7df93..c659ef0f2f9d 100644
--- a/sec-policy/selinux-wine/Manifest
+++ b/sec-policy/selinux-wine/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-wine-2.20190201-r1.ebuild 275 BLAKE2B 0fd3e56538df2548af786f9263163c2fe0a6889e4e3924200d20685e022042ad9b3e9e2937bc242a2d0cf35f22a4889db875f52bd8e2c6ebd774b42da18314ce SHA512 faeeebc0d0f9000c7dbf605f7c9268f5434fb98c914293b8587a860cd9b24386acb38c05a2198b006265687ec16f7ba424664cf500c41299f050bf31da236d12
-EBUILD selinux-wine-2.20190609-r1.ebuild 277 BLAKE2B cef9261846b5407a8fb2ca20ecd7f3280261118a67d9de07c056a40c0d18e5cd5120d47ca2ad74099558c1618c9556ed44d71aca2fdc1dad64d4cb810faca33f SHA512 91ad49f69144114e24261f39f63b28d550cca861d2edc713997c0f4f1b8a2f9237f48f69d2d79ca07564dac48002cddb476e76093b4319042d279079ab75e7bf
+EBUILD selinux-wine-2.20190609-r1.ebuild 275 BLAKE2B 0fd3e56538df2548af786f9263163c2fe0a6889e4e3924200d20685e022042ad9b3e9e2937bc242a2d0cf35f22a4889db875f52bd8e2c6ebd774b42da18314ce SHA512 faeeebc0d0f9000c7dbf605f7c9268f5434fb98c914293b8587a860cd9b24386acb38c05a2198b006265687ec16f7ba424664cf500c41299f050bf31da236d12
+EBUILD selinux-wine-2.20200818-r1.ebuild 277 BLAKE2B cef9261846b5407a8fb2ca20ecd7f3280261118a67d9de07c056a40c0d18e5cd5120d47ca2ad74099558c1618c9556ed44d71aca2fdc1dad64d4cb810faca33f SHA512 91ad49f69144114e24261f39f63b28d550cca861d2edc713997c0f4f1b8a2f9237f48f69d2d79ca07564dac48002cddb476e76093b4319042d279079ab75e7bf
 EBUILD selinux-wine-9999.ebuild 280 BLAKE2B 6ac8053a1d0135ad200352a52266ff4d32201dab255f015d5fac65984472ef78dd16da8f732da611cfa4b78db7f281fc122089894c09e1a6389336f8573cd116 SHA512 195e084c8d7c0d70444190146c90d0df9b2f44f5901c56c58da1908336bb36e92689eb03cd399663d06893902ada5c7f90055d45af52854405529e8def737e9e
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-wine/selinux-wine-2.20190609-r1.ebuild b/sec-policy/selinux-wine/selinux-wine-2.20190609-r1.ebuild
index 0bac3e4f6faa..d782e671f3e6 100644
--- a/sec-policy/selinux-wine/selinux-wine-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-wine/selinux-wine-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-wine/selinux-wine-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..0bac3e4f6faa
--- /dev/null
+++ b/sec-policy/selinux-wine/selinux-wine-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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-wireshark/Manifest b/sec-policy/selinux-wireshark/Manifest
index de5c767baf0d..0923f1634b74 100644
--- a/sec-policy/selinux-wireshark/Manifest
+++ b/sec-policy/selinux-wireshark/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-wireshark-2.20190201-r1.ebuild 285 BLAKE2B ed7bdd340f4cce9f367d24d0e6fb02aba83da5cf32bd258c13ecb5363a6c6f9eaca3f8662f39cb0178775515707aa36a3063220ed9816de8f8b7af4aa375f8c9 SHA512 2e1a00b2cb510131cd8fbea60649db98046255d0eb80907cc79357f7586764987b2b198aa008a52167e9d0a04566e5455d4217e2a4ce80367fe95bb231979050
-EBUILD selinux-wireshark-2.20190609-r1.ebuild 287 BLAKE2B c8606c89e55e9ae10d10eb3b7c6e0a2b54257a1accc318398a1554714442acf9eb3020fe0cbe83057beba42cb88c9dc085de489bf8bc42abd046b174f8bb2405 SHA512 1eb840bd4304b7fbb963114d26f4d877d715ba7aad8caaa8bd302bb9ef6de4b90dd5ae17d5e317789f32da55080a5056f2ed0b3c2f1a12d758445054cafcf8c9
+EBUILD selinux-wireshark-2.20190609-r1.ebuild 285 BLAKE2B ed7bdd340f4cce9f367d24d0e6fb02aba83da5cf32bd258c13ecb5363a6c6f9eaca3f8662f39cb0178775515707aa36a3063220ed9816de8f8b7af4aa375f8c9 SHA512 2e1a00b2cb510131cd8fbea60649db98046255d0eb80907cc79357f7586764987b2b198aa008a52167e9d0a04566e5455d4217e2a4ce80367fe95bb231979050
+EBUILD selinux-wireshark-2.20200818-r1.ebuild 287 BLAKE2B c8606c89e55e9ae10d10eb3b7c6e0a2b54257a1accc318398a1554714442acf9eb3020fe0cbe83057beba42cb88c9dc085de489bf8bc42abd046b174f8bb2405 SHA512 1eb840bd4304b7fbb963114d26f4d877d715ba7aad8caaa8bd302bb9ef6de4b90dd5ae17d5e317789f32da55080a5056f2ed0b3c2f1a12d758445054cafcf8c9
 EBUILD selinux-wireshark-9999.ebuild 290 BLAKE2B 43780d094095c62f082a43d6e0e301348608aceee2c842dbe2430d29aff1233bd5cf28321b950d7dcc1fc2d7dbe4e493cbe788d46d000b781208f7d4d6ed278a SHA512 5c388e106f93efcb578efe9997e6c6032f8f0a1201fc3e59f81d468dcc2abe2f845ca2724519aac960ec69bb1ca1fe344405a583108b5159f0ed680da902f52a
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-wireshark/selinux-wireshark-2.20190609-r1.ebuild b/sec-policy/selinux-wireshark/selinux-wireshark-2.20190609-r1.ebuild
index 71899125dd79..a1fbdb3141ad 100644
--- a/sec-policy/selinux-wireshark/selinux-wireshark-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-wireshark/selinux-wireshark-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-wireshark/selinux-wireshark-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..71899125dd79
--- /dev/null
+++ b/sec-policy/selinux-wireshark/selinux-wireshark-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 b60c3f98c93f..5ac365018d42 100644
--- a/sec-policy/selinux-wm/Manifest
+++ b/sec-policy/selinux-wm/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-wm-2.20190201-r1.ebuild 271 BLAKE2B feddafc4369b99d34917fec85039c0b38bf1c935881af4fc960dacfdb53545f4a3a87dab1aea924ac85011768d8bc1802d96bdfe96e98045bc61df581f46d464 SHA512 f6b17c011dbb69844b84b1fb7a80ec83d4511575965bca055e859ef989b0a3b54805b38d4813ce569475e2a15a8f91b73b511deaa350a62ef05427503e4737c2
-EBUILD selinux-wm-2.20190609-r1.ebuild 273 BLAKE2B deddc52a6d4b1b283503a48c8b8bafe21af5b966f097f3d96b856eb4804aa078cc25092e42894f0ef8592bea6fa849eabeea381486fa8019136ff3813b0f2dc5 SHA512 c4f8d05706e8db4b9ca84f39bbcf48957e8050fa27efa3cc07930afcf64640683574fb10ecac2b3b014ea156b93e3b6fc2c86d5ed48ef4c2c6bd2a8fdaa8482f
+EBUILD selinux-wm-2.20190609-r1.ebuild 271 BLAKE2B feddafc4369b99d34917fec85039c0b38bf1c935881af4fc960dacfdb53545f4a3a87dab1aea924ac85011768d8bc1802d96bdfe96e98045bc61df581f46d464 SHA512 f6b17c011dbb69844b84b1fb7a80ec83d4511575965bca055e859ef989b0a3b54805b38d4813ce569475e2a15a8f91b73b511deaa350a62ef05427503e4737c2
+EBUILD selinux-wm-2.20200818-r1.ebuild 273 BLAKE2B deddc52a6d4b1b283503a48c8b8bafe21af5b966f097f3d96b856eb4804aa078cc25092e42894f0ef8592bea6fa849eabeea381486fa8019136ff3813b0f2dc5 SHA512 c4f8d05706e8db4b9ca84f39bbcf48957e8050fa27efa3cc07930afcf64640683574fb10ecac2b3b014ea156b93e3b6fc2c86d5ed48ef4c2c6bd2a8fdaa8482f
 EBUILD selinux-wm-9999.ebuild 276 BLAKE2B ceb43c79d8a3c39acad10db42121226d1a7f6f3ed3d4cb58af558df9bfddcc31ff30360281f03144db1a42e811e0fa8ef91c43bb3465a1b0a62b4502e605fa1f SHA512 b3cc62de73af00aebe2ef7837873f2d70632107394280bd9bdc147de192fdec389e41d2bbf56dd962d38ab97f44aef19110a2570e6148f4fea38a7188353ffd4
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-wm/selinux-wm-2.20190609-r1.ebuild b/sec-policy/selinux-wm/selinux-wm-2.20190609-r1.ebuild
index 130a3873e558..ec73f98a2807 100644
--- a/sec-policy/selinux-wm/selinux-wm-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-wm/selinux-wm-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-wm/selinux-wm-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..130a3873e558
--- /dev/null
+++ b/sec-policy/selinux-wm/selinux-wm-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 278dc9986f86..2dd151f1f457 100644
--- a/sec-policy/selinux-xen/Manifest
+++ b/sec-policy/selinux-xen/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-xen-2.20190201-r1.ebuild 273 BLAKE2B 5c8d8a3eb267a918fb4d857e8283451676b6bbd469cd8af1da4c4a9f791c513b022e626f236bb0c41d8734a50bda32abea2e61a0fbf9cec377ee0a38490651d9 SHA512 12d9d1d2ecacd012b8d36262af75f7ce9b9910d5947b8d6f393e6d7d93d227d2f250dc97e5de3389d22e16fb91992f33b33acfffa89ff042ed7d7477dd82ba17
-EBUILD selinux-xen-2.20190609-r1.ebuild 275 BLAKE2B 77e72be4252031224f00448479c5d6d141d3c9e36e02b61d3dd8ddce986a228537111b9cfa86b8337422b0fa8906706c0d4b076ab7ecd0c2c9a2099c5c85adea SHA512 2c0f89ad9758afeab27f0ca7fe77cbc954ca273966a6ac99e712dee2cd1983fb5d993a42327916849ebbbafead7042d4544a4ab3cb4db4a917950722675044d8
+EBUILD selinux-xen-2.20190609-r1.ebuild 273 BLAKE2B 5c8d8a3eb267a918fb4d857e8283451676b6bbd469cd8af1da4c4a9f791c513b022e626f236bb0c41d8734a50bda32abea2e61a0fbf9cec377ee0a38490651d9 SHA512 12d9d1d2ecacd012b8d36262af75f7ce9b9910d5947b8d6f393e6d7d93d227d2f250dc97e5de3389d22e16fb91992f33b33acfffa89ff042ed7d7477dd82ba17
+EBUILD selinux-xen-2.20200818-r1.ebuild 275 BLAKE2B 77e72be4252031224f00448479c5d6d141d3c9e36e02b61d3dd8ddce986a228537111b9cfa86b8337422b0fa8906706c0d4b076ab7ecd0c2c9a2099c5c85adea SHA512 2c0f89ad9758afeab27f0ca7fe77cbc954ca273966a6ac99e712dee2cd1983fb5d993a42327916849ebbbafead7042d4544a4ab3cb4db4a917950722675044d8
 EBUILD selinux-xen-9999.ebuild 278 BLAKE2B 7f6d8695e84c14a0358193263925a62ffa2b5865ab2b62ec98f246ffffa5204dd6dc7da196525342b6ee84ba8ca28081b9cd492a0f907736d3e1933f9777a539 SHA512 3ce2dfa9c1136bfd76bbc8fe00788eef56a6258b834e336637258030229cc8c7b462596d8b85406c10b4e6ad0dbd6145ad68d937af1d94579e4519fb21e0a984
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-xen/selinux-xen-2.20190609-r1.ebuild b/sec-policy/selinux-xen/selinux-xen-2.20190609-r1.ebuild
index f272a35e3c1c..98105b7026dd 100644
--- a/sec-policy/selinux-xen/selinux-xen-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-xen/selinux-xen-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-xen/selinux-xen-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..f272a35e3c1c
--- /dev/null
+++ b/sec-policy/selinux-xen/selinux-xen-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 65486edc6ca2..9e64e3d31676 100644
--- a/sec-policy/selinux-xfs/Manifest
+++ b/sec-policy/selinux-xfs/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-xfs-2.20190201-r1.ebuild 273 BLAKE2B 00ed3ca31777de3c935aa226070ea7fca903949078434035569bd00303e3f7c7169d3ebab4bf8c4fca9a2ae97e6ab55be2bc98758eaa7bf8defd8d83457321eb SHA512 8eb4d58ab62da2310ec6f75d85c0e0a1a2390835c5ace4bac6b4ede130955cdca125c595f2a1e93779f930b28b7d63fae62dae52146a1ef845b620af8fba5de6
-EBUILD selinux-xfs-2.20190609-r1.ebuild 275 BLAKE2B b8b9a4263c66629b8dee6bd89961ab20706fb41861fd7519cde29190ce42dbc270cc070c30e51603f2476ce9bb8aa3d4e9a35e6fb3815b4652e05b6591961a8b SHA512 0098d1a02bfa96756a35bf1ec09d2ce888bd1fbf1d246e96e1ec62b7aa645b42359300f53380483498b79c5ddc4b5f0e0fad454d47d015ec00d810eeba0d5718
+EBUILD selinux-xfs-2.20190609-r1.ebuild 273 BLAKE2B 00ed3ca31777de3c935aa226070ea7fca903949078434035569bd00303e3f7c7169d3ebab4bf8c4fca9a2ae97e6ab55be2bc98758eaa7bf8defd8d83457321eb SHA512 8eb4d58ab62da2310ec6f75d85c0e0a1a2390835c5ace4bac6b4ede130955cdca125c595f2a1e93779f930b28b7d63fae62dae52146a1ef845b620af8fba5de6
+EBUILD selinux-xfs-2.20200818-r1.ebuild 275 BLAKE2B b8b9a4263c66629b8dee6bd89961ab20706fb41861fd7519cde29190ce42dbc270cc070c30e51603f2476ce9bb8aa3d4e9a35e6fb3815b4652e05b6591961a8b SHA512 0098d1a02bfa96756a35bf1ec09d2ce888bd1fbf1d246e96e1ec62b7aa645b42359300f53380483498b79c5ddc4b5f0e0fad454d47d015ec00d810eeba0d5718
 EBUILD selinux-xfs-9999.ebuild 278 BLAKE2B bd8287f9a079da787d4b10326dcb67d9336d3db0abc61a3c9cbc98bf48867a7eabea293179f5b58bd5757a168c95eea4b1fbca955340c88473631c5f0de6e7aa SHA512 50e653079f6b8c04df322f07f9cde1172f902a46a3451f6ec8fc7a27f094481799fed3fa8688840c7fdb5fb492d989ad4b82fa398fec30503ecfa741e5439b29
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-xfs/selinux-xfs-2.20190609-r1.ebuild b/sec-policy/selinux-xfs/selinux-xfs-2.20190609-r1.ebuild
index 4321254c44fd..aaf98f5fe9af 100644
--- a/sec-policy/selinux-xfs/selinux-xfs-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-xfs/selinux-xfs-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-xfs/selinux-xfs-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..4321254c44fd
--- /dev/null
+++ b/sec-policy/selinux-xfs/selinux-xfs-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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-xprint/Manifest b/sec-policy/selinux-xprint/Manifest
index d60910dac627..420d44b9ceb2 100644
--- a/sec-policy/selinux-xprint/Manifest
+++ b/sec-policy/selinux-xprint/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-xprint-2.20190201-r1.ebuild 279 BLAKE2B e9da20cc39ca840072cb0a6fc3756414c1e5bf7d2084f6d695613926dae939dc73ec2463d211aa64cedd3ebb9b0cb368de9546d75a2d036429069b6a14e3420c SHA512 183588aa3c252a5df4f873d23729291239b8c0a73562361ccc9196ba549c7fa6108236a10ebb9ca78ed8a3f7cc39d0688178e6fc9e17a9e73ee844ce81ce4036
-EBUILD selinux-xprint-2.20190609-r1.ebuild 281 BLAKE2B 4128a6f8fd2af563d26a3f615f79e7b0e4a4129e241170ba81c3a3ec38c0ada581ebce7124c28b8a915130632c6064e01da18e1433fc0377fc69e4fd4550e029 SHA512 94cde5173a5b40278d4a7b49988be7a17c24677f50f27ce995a591fbb2453eecdd2136ed06c4ad676ac5e871e3adaaa359191410da7c5f123541000dad771632
+EBUILD selinux-xprint-2.20190609-r1.ebuild 279 BLAKE2B e9da20cc39ca840072cb0a6fc3756414c1e5bf7d2084f6d695613926dae939dc73ec2463d211aa64cedd3ebb9b0cb368de9546d75a2d036429069b6a14e3420c SHA512 183588aa3c252a5df4f873d23729291239b8c0a73562361ccc9196ba549c7fa6108236a10ebb9ca78ed8a3f7cc39d0688178e6fc9e17a9e73ee844ce81ce4036
+EBUILD selinux-xprint-2.20200818-r1.ebuild 281 BLAKE2B 4128a6f8fd2af563d26a3f615f79e7b0e4a4129e241170ba81c3a3ec38c0ada581ebce7124c28b8a915130632c6064e01da18e1433fc0377fc69e4fd4550e029 SHA512 94cde5173a5b40278d4a7b49988be7a17c24677f50f27ce995a591fbb2453eecdd2136ed06c4ad676ac5e871e3adaaa359191410da7c5f123541000dad771632
 EBUILD selinux-xprint-9999.ebuild 284 BLAKE2B b36fd23f6b2b642e7ef3faafb97be17679b2b852714e079126161ffd1eb6a4ee0b3bf9b2b0d5db4b040528ed5de9f47d3067e8439653d210421d0816d9d6a2bc SHA512 e350e1cd920159f0f990205d79205a6f816aab15c01850e8f602afce0c982d2321f7268e032c9b53bb13f9f36d2e1f1a96707797d4e540aa7ba3d47f56d3f1e0
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-xprint/selinux-xprint-2.20190609-r1.ebuild b/sec-policy/selinux-xprint/selinux-xprint-2.20190609-r1.ebuild
index f912d471e9de..5fdeeaee49d6 100644
--- a/sec-policy/selinux-xprint/selinux-xprint-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-xprint/selinux-xprint-2.20190609-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for xprint"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-xprint/selinux-xprint-2.20200818-r1.ebuild b/sec-policy/selinux-xprint/selinux-xprint-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..f912d471e9de
--- /dev/null
+++ b/sec-policy/selinux-xprint/selinux-xprint-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="xprint"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for xprint"
+
+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 a7e134b49627..d28f55dd9780 100644
--- a/sec-policy/selinux-xscreensaver/Manifest
+++ b/sec-policy/selinux-xscreensaver/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-xscreensaver-2.20190201-r1.ebuild 389 BLAKE2B 7ae12eb40aca72fba630e5802ce603690b57b289fa605f5eee2ed68bb6b98bf516d5ef5a09e16d21564bf45b96f66b56cbab4581430b2cc6314c6aba12d6f620 SHA512 ee579a742789726b6668e8b4bb66f9da39e30bd5ec423af1966bc4b181ba5f7cbc7bfae7730c11a23d48c9e8b0b3f82912ea2685fdd28f769b35c074370543e2
-EBUILD selinux-xscreensaver-2.20190609-r1.ebuild 391 BLAKE2B c0a3b4d987537cfecec49b36d7558ec3f7c606cd43d94e61e51798034c2023b109e056c20dc616a522f16539d0cfedf1c30752ffbafb8b92b162e18b74971fdc SHA512 4ba9b5c65dbb8e8813832fbd52177762a1956d4ccfe630185ecfc2340896a7e4a907954ffe11aa06816d8c0d758a9c6b14af6b76d048b2723f94611ddf3e17ed
+EBUILD selinux-xscreensaver-2.20190609-r1.ebuild 389 BLAKE2B 7ae12eb40aca72fba630e5802ce603690b57b289fa605f5eee2ed68bb6b98bf516d5ef5a09e16d21564bf45b96f66b56cbab4581430b2cc6314c6aba12d6f620 SHA512 ee579a742789726b6668e8b4bb66f9da39e30bd5ec423af1966bc4b181ba5f7cbc7bfae7730c11a23d48c9e8b0b3f82912ea2685fdd28f769b35c074370543e2
+EBUILD selinux-xscreensaver-2.20200818-r1.ebuild 391 BLAKE2B c0a3b4d987537cfecec49b36d7558ec3f7c606cd43d94e61e51798034c2023b109e056c20dc616a522f16539d0cfedf1c30752ffbafb8b92b162e18b74971fdc SHA512 4ba9b5c65dbb8e8813832fbd52177762a1956d4ccfe630185ecfc2340896a7e4a907954ffe11aa06816d8c0d758a9c6b14af6b76d048b2723f94611ddf3e17ed
 EBUILD selinux-xscreensaver-9999.ebuild 394 BLAKE2B c34608a56e05b40a32cfa3f9c528c20fc97209e34e0aa767fa778412d60cc3ba32c0c2f7ab9144c44c1b9dc240ada13e2f255b9d39a3b9691043facdb9cdc0ba SHA512 7679b59ce73e0810dcb06075b1714a70c8a3ded10483594653348e9df4e5407dc80c187d2a07bdc53631a0688b050be756ed70b1386e38ad9db48febd4a90352
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20190609-r1.ebuild b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20190609-r1.ebuild
index eaa4325c772d..19aa684ca051 100644
--- a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..eaa4325c772d
--- /dev/null
+++ b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20200818-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 b12e15abeb54..e158a451d7d6 100644
--- a/sec-policy/selinux-xserver/Manifest
+++ b/sec-policy/selinux-xserver/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-xserver-2.20190201-r1.ebuild 281 BLAKE2B 28195b2ea31c6f9b091990a183c4f69faffa0c4d5f633edda8fcffeaff320c7f886065d474b05012d070a0c87f762421bfd4ef45f3b67d0a981c844ae6824b62 SHA512 17d01cf4a01c0530cfeca8228cef603f3811cfe068a09004525d8ca43c04c862f6e57d99b7229bb57b218eb2b3c85a8cf10f6821464c9259cd564df968978674
-EBUILD selinux-xserver-2.20190609-r1.ebuild 283 BLAKE2B 39da47b56979c493e7f724086a741df5ca1a29ea899061680813813a2ecf24b50ca6e5f486de6406333f02a4776110e97de070f7286e20d470570a68594a11e4 SHA512 20fa0c6186d526c13ad4a2663d186ba344e575477d8cc57ac1c98f3d54cb46f3739be3eda7d78fc3bd45a745250a341bc356f4635100a362f4f94a34269fea07
+EBUILD selinux-xserver-2.20190609-r1.ebuild 281 BLAKE2B 28195b2ea31c6f9b091990a183c4f69faffa0c4d5f633edda8fcffeaff320c7f886065d474b05012d070a0c87f762421bfd4ef45f3b67d0a981c844ae6824b62 SHA512 17d01cf4a01c0530cfeca8228cef603f3811cfe068a09004525d8ca43c04c862f6e57d99b7229bb57b218eb2b3c85a8cf10f6821464c9259cd564df968978674
+EBUILD selinux-xserver-2.20200818-r1.ebuild 283 BLAKE2B 39da47b56979c493e7f724086a741df5ca1a29ea899061680813813a2ecf24b50ca6e5f486de6406333f02a4776110e97de070f7286e20d470570a68594a11e4 SHA512 20fa0c6186d526c13ad4a2663d186ba344e575477d8cc57ac1c98f3d54cb46f3739be3eda7d78fc3bd45a745250a341bc356f4635100a362f4f94a34269fea07
 EBUILD selinux-xserver-9999.ebuild 286 BLAKE2B eea83d2520a5de9dec1cfab88adfb09b9df3238d1d515131e0b0f533bbfdb7925e8e64ef7ff1480cd1b5773ed3f527c1a7b055d13cd59a823acab8735aa7d116 SHA512 ecb2df0d6dc0411a68839802515b4e468c236352c1fabb465c9144ea2771728ab238d07ccee76c7fafd0db0a91e76a5c37d23d460d518ffeface9b1727cf61e1
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-xserver/selinux-xserver-2.20190609-r1.ebuild b/sec-policy/selinux-xserver/selinux-xserver-2.20190609-r1.ebuild
index 8521fba28180..aa953c3b87cf 100644
--- a/sec-policy/selinux-xserver/selinux-xserver-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-xserver/selinux-xserver-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-xserver/selinux-xserver-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..8521fba28180
--- /dev/null
+++ b/sec-policy/selinux-xserver/selinux-xserver-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 986d39f47b6e..63aa729b7da8 100644
--- a/sec-policy/selinux-zabbix/Manifest
+++ b/sec-policy/selinux-zabbix/Manifest
@@ -1,8 +1,11 @@
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
+DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
+DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-zabbix-2.20190201-r1.ebuild 279 BLAKE2B 9b7bd2f98af01553301ebc6e03534644be7f5941496ae97fa42e083480113fc808f10d347ee8f8aa16b2ebbcbd00956694d702866977ee19caaead0b11e74bec SHA512 0fde234a371633521694b64cb91f3cab8f4eb16bddf8dd45c1181780eaa21ea04bd8589357c6fd404715a1603579ca4cd1139d72581e57cd09fc7f35e4e65b26
-EBUILD selinux-zabbix-2.20190609-r1.ebuild 281 BLAKE2B 9f15a08fcbfca1721435adf35b60557268aab9d4ba373a57315d778280f02b1d43fc520d8b951da3715a126480369b170c66d7384794b2a4c34d5293da421782 SHA512 0e6c6285603b7962aed402d4b9ca04f8f2321cf906a05148f6eb975f5f13ce6570312e882ac36b06795949ddd217d65485c3344838f6d970992d7a33fe13e190
+EBUILD selinux-zabbix-2.20190609-r1.ebuild 279 BLAKE2B 9b7bd2f98af01553301ebc6e03534644be7f5941496ae97fa42e083480113fc808f10d347ee8f8aa16b2ebbcbd00956694d702866977ee19caaead0b11e74bec SHA512 0fde234a371633521694b64cb91f3cab8f4eb16bddf8dd45c1181780eaa21ea04bd8589357c6fd404715a1603579ca4cd1139d72581e57cd09fc7f35e4e65b26
+EBUILD selinux-zabbix-2.20200818-r1.ebuild 281 BLAKE2B 9f15a08fcbfca1721435adf35b60557268aab9d4ba373a57315d778280f02b1d43fc520d8b951da3715a126480369b170c66d7384794b2a4c34d5293da421782 SHA512 0e6c6285603b7962aed402d4b9ca04f8f2321cf906a05148f6eb975f5f13ce6570312e882ac36b06795949ddd217d65485c3344838f6d970992d7a33fe13e190
 EBUILD selinux-zabbix-9999.ebuild 284 BLAKE2B d3796eeb7bb6f0ced760038fe5d3c6820b85fbfc3f2b03fd2cabff71a0fa2b5f999fa49fd95034f408b66ea93f36f49cabcc09aa95c973e0a94d742ae2f151d5 SHA512 45b2ce218a2c9ec3369cd5e545387df527d3a21269fe09cba05cecac4c06e84abbdded320f636d304561cec109d966ef2170e94d08c7b2ad710487cfddfb8d35
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-zabbix/selinux-zabbix-2.20190609-r1.ebuild b/sec-policy/selinux-zabbix/selinux-zabbix-2.20190609-r1.ebuild
index 67821ef053af..42c39935e146 100644
--- a/sec-policy/selinux-zabbix/selinux-zabbix-2.20190609-r1.ebuild
+++ b/sec-policy/selinux-zabbix/selinux-zabbix-2.20190609-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.20200818-r1.ebuild b/sec-policy/selinux-zabbix/selinux-zabbix-2.20200818-r1.ebuild
new file mode 100644
index 000000000000..67821ef053af
--- /dev/null
+++ b/sec-policy/selinux-zabbix/selinux-zabbix-2.20200818-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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@redcorelinux.org>	2020-11-25 22:39:15 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
commit	d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree	0625f358789b5e015e49db139cc1dbc9be00428f /sec-policy
parent	2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)