gentoo resync : 10.11.2017

2052 files changed, 8007 insertions, 1536 deletions

diff --git a/sec-policy/selinux-abrt/Manifest b/sec-policy/selinux-abrt/Manifest
index 2208af33688c..8efc6acc9280 100644
--- a/sec-policy/selinux-abrt/Manifest
+++ b/sec-policy/selinux-abrt/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-abrt-2.20170204-r1.ebuild 279 SHA256 f839e330acdbc0d16fd27a245254a3c96171e32de5b767a206b5af790d1e3e03 SHA512 9e5423b92648474d6dfc6c96e5ab96ed53ca160263af40893187fc4855e96cbb7014ca545a110469e481cbfeb244b51ec38ad4b306e768e7b1f76ea1c1ed76ec WHIRLPOOL 0567b09747a11737214637fb434129582f7d90d79adbb847dc0f558ed1ba683bb16b0d4daa54baefe18e479e2d48d91e85bd4fd54fb61518732d57ddef7f5046
-EBUILD selinux-abrt-2.20170204-r2.ebuild 277 SHA256 e03a49d8635e96a4a8af29f27d02187fb6dce212a0c48210bc12a746570d6fa9 SHA512 e61df71668ad34b03ff1a94a98acd93bd283a62942ff5376667a9ed30ffcfe204895c321289d8e42cda5da2104bfcbc95993ca279d166e8d5857bb7e0ec2fe21 WHIRLPOOL c4f53c0834f12a96c4f69265aa4e91a7789b5bdbeb83ebb7fda821916e5200c50e43f5ccfe63c5f52ea8f2cf4d710ba4f9f2aec02bbc27e35a0a7cdc4ed8e58c
-EBUILD selinux-abrt-2.20170204-r3.ebuild 277 SHA256 e03a49d8635e96a4a8af29f27d02187fb6dce212a0c48210bc12a746570d6fa9 SHA512 e61df71668ad34b03ff1a94a98acd93bd283a62942ff5376667a9ed30ffcfe204895c321289d8e42cda5da2104bfcbc95993ca279d166e8d5857bb7e0ec2fe21 WHIRLPOOL c4f53c0834f12a96c4f69265aa4e91a7789b5bdbeb83ebb7fda821916e5200c50e43f5ccfe63c5f52ea8f2cf4d710ba4f9f2aec02bbc27e35a0a7cdc4ed8e58c
-EBUILD selinux-abrt-2.20170204-r4.ebuild 277 SHA256 e03a49d8635e96a4a8af29f27d02187fb6dce212a0c48210bc12a746570d6fa9 SHA512 e61df71668ad34b03ff1a94a98acd93bd283a62942ff5376667a9ed30ffcfe204895c321289d8e42cda5da2104bfcbc95993ca279d166e8d5857bb7e0ec2fe21 WHIRLPOOL c4f53c0834f12a96c4f69265aa4e91a7789b5bdbeb83ebb7fda821916e5200c50e43f5ccfe63c5f52ea8f2cf4d710ba4f9f2aec02bbc27e35a0a7cdc4ed8e58c
-EBUILD selinux-abrt-2.20170805-r2.ebuild 277 SHA256 e03a49d8635e96a4a8af29f27d02187fb6dce212a0c48210bc12a746570d6fa9 SHA512 e61df71668ad34b03ff1a94a98acd93bd283a62942ff5376667a9ed30ffcfe204895c321289d8e42cda5da2104bfcbc95993ca279d166e8d5857bb7e0ec2fe21 WHIRLPOOL c4f53c0834f12a96c4f69265aa4e91a7789b5bdbeb83ebb7fda821916e5200c50e43f5ccfe63c5f52ea8f2cf4d710ba4f9f2aec02bbc27e35a0a7cdc4ed8e58c
-EBUILD selinux-abrt-9999.ebuild 279 SHA256 f839e330acdbc0d16fd27a245254a3c96171e32de5b767a206b5af790d1e3e03 SHA512 9e5423b92648474d6dfc6c96e5ab96ed53ca160263af40893187fc4855e96cbb7014ca545a110469e481cbfeb244b51ec38ad4b306e768e7b1f76ea1c1ed76ec WHIRLPOOL 0567b09747a11737214637fb434129582f7d90d79adbb847dc0f558ed1ba683bb16b0d4daa54baefe18e479e2d48d91e85bd4fd54fb61518732d57ddef7f5046
+EBUILD selinux-abrt-2.20170204-r1.ebuild 280 SHA256 06cabb24e2774bd51287ae6c92442f81d0121957e13955691f46b5c600166650 SHA512 5c8482d26f83c82459cff7118f0890a9ea1c299695535670f5a22050a5cfde2511a4aa33b79b95c88c30316920deb889ddea9d6a1776bdd9c617148a5fde1bf1 WHIRLPOOL 446d7f9f84ac35fd0f7b67d193a617b8a999ab7d143ac1bac8ec5404863fef19bcee2abc49e2c5d2bd761bf418446ee68545e56ebc378bd22252f06f23aa37ed
+EBUILD selinux-abrt-2.20170204-r2.ebuild 278 SHA256 b4d5cc1d84bcca5f1150acf746d8b87cc47aad980312735667aa6271a4ce5874 SHA512 40c21e5f225e5e9cb372034da8b67db74762391cd5ede1a331d976c063d23dd49adf5ddd7c3015bd9757888856172778dd2b793e77514faed9e0d8f673e596b9 WHIRLPOOL 0f4d1c99e0e046ac20faeef4c9b0348a4c98324aea7afda721dc92227a52ad1c6c185a60e5cd45744bcbe8570fd721a291181533b6272b9168d7fb88db9c3b0d
+EBUILD selinux-abrt-2.20170204-r3.ebuild 278 SHA256 b4d5cc1d84bcca5f1150acf746d8b87cc47aad980312735667aa6271a4ce5874 SHA512 40c21e5f225e5e9cb372034da8b67db74762391cd5ede1a331d976c063d23dd49adf5ddd7c3015bd9757888856172778dd2b793e77514faed9e0d8f673e596b9 WHIRLPOOL 0f4d1c99e0e046ac20faeef4c9b0348a4c98324aea7afda721dc92227a52ad1c6c185a60e5cd45744bcbe8570fd721a291181533b6272b9168d7fb88db9c3b0d
+EBUILD selinux-abrt-2.20170204-r4.ebuild 278 SHA256 b4d5cc1d84bcca5f1150acf746d8b87cc47aad980312735667aa6271a4ce5874 SHA512 40c21e5f225e5e9cb372034da8b67db74762391cd5ede1a331d976c063d23dd49adf5ddd7c3015bd9757888856172778dd2b793e77514faed9e0d8f673e596b9 WHIRLPOOL 0f4d1c99e0e046ac20faeef4c9b0348a4c98324aea7afda721dc92227a52ad1c6c185a60e5cd45744bcbe8570fd721a291181533b6272b9168d7fb88db9c3b0d
+EBUILD selinux-abrt-2.20170805-r2.ebuild 278 SHA256 b4d5cc1d84bcca5f1150acf746d8b87cc47aad980312735667aa6271a4ce5874 SHA512 40c21e5f225e5e9cb372034da8b67db74762391cd5ede1a331d976c063d23dd49adf5ddd7c3015bd9757888856172778dd2b793e77514faed9e0d8f673e596b9 WHIRLPOOL 0f4d1c99e0e046ac20faeef4c9b0348a4c98324aea7afda721dc92227a52ad1c6c185a60e5cd45744bcbe8570fd721a291181533b6272b9168d7fb88db9c3b0d
+EBUILD selinux-abrt-2.20170805-r3.ebuild 280 SHA256 06cabb24e2774bd51287ae6c92442f81d0121957e13955691f46b5c600166650 SHA512 5c8482d26f83c82459cff7118f0890a9ea1c299695535670f5a22050a5cfde2511a4aa33b79b95c88c30316920deb889ddea9d6a1776bdd9c617148a5fde1bf1 WHIRLPOOL 446d7f9f84ac35fd0f7b67d193a617b8a999ab7d143ac1bac8ec5404863fef19bcee2abc49e2c5d2bd761bf418446ee68545e56ebc378bd22252f06f23aa37ed
+EBUILD selinux-abrt-9999.ebuild 280 SHA256 06cabb24e2774bd51287ae6c92442f81d0121957e13955691f46b5c600166650 SHA512 5c8482d26f83c82459cff7118f0890a9ea1c299695535670f5a22050a5cfde2511a4aa33b79b95c88c30316920deb889ddea9d6a1776bdd9c617148a5fde1bf1 WHIRLPOOL 446d7f9f84ac35fd0f7b67d193a617b8a999ab7d143ac1bac8ec5404863fef19bcee2abc49e2c5d2bd761bf418446ee68545e56ebc378bd22252f06f23aa37ed
 MISC ChangeLog 10387 SHA256 97a9b449c1722f02206c5073443b42cd7ad9816274954b599986084aa4e4fcf0 SHA512 a6ed180b08135d8ff4482dd728b5df84f92223c6083dfd03f90c3a8549d679eaa8dda4d3fd8f05a4251d9da1e312850a174fc700de56a7f940481fba5328637e WHIRLPOOL 031b1337af4de84ec41564312f68072e1746f1ed896ec72cc33fc6056268d7e49b23e10dcc1fc3db4662bbdb491e7cb8cbcbac1c145b83b4d4147a0b7bd05d57
 MISC ChangeLog-2015 6405 SHA256 1151b61a5549941c8152ce00af65d77ac1db833d3dd49de79d7757665d52c6cd SHA512 43af5d101b906663c9d1716835fa9349f37fe3827730e282138e5109058a520713fd0a5a4673c8ca310b268fcb5258d3c29a5e85ee49d81fbee6c3bade409d89 WHIRLPOOL 0ce29e7eb7b0f8197a60ac805f10b1f718d63d687dabb329acb076fa0d88f5aaf49e3ea9162148c002a076b87150a40f7ec1aa8ff93478e58775e1cb63305dea
 MISC metadata.xml 314 SHA256 648aee3cb079072343fbf62af8ae61dc2e770f282589d1b69fb121bf98118c6b SHA512 b3d4a77a87b4deac8607f1b27a93c8b98e56ab0006d47d295bbd6da521788e8259d0497cd7369de74908d8d50d592d7c2a866957cd472c66de603bdc4e07a28a WHIRLPOOL 277d54dfb34436b25abe5254bf40ac7793ca28ed0fcbace0648d529873757e948e09d3c3494ea1bbdb1fc78eec6fb69bcf3e7066fdd5722f336a0b3fdfa0b4be
diff --git a/sec-policy/selinux-abrt/selinux-abrt-2.20170204-r1.ebuild b/sec-policy/selinux-abrt/selinux-abrt-2.20170204-r1.ebuild
index 0fb7f076025d..fccfc9d3f0c7 100644
--- a/sec-policy/selinux-abrt/selinux-abrt-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-abrt/selinux-abrt-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-abrt/selinux-abrt-2.20170204-r2.ebuild b/sec-policy/selinux-abrt/selinux-abrt-2.20170204-r2.ebuild
index fc9d523b29b6..8bbf2f4b5b10 100644
--- a/sec-policy/selinux-abrt/selinux-abrt-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-abrt/selinux-abrt-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-abrt/selinux-abrt-2.20170204-r3.ebuild b/sec-policy/selinux-abrt/selinux-abrt-2.20170204-r3.ebuild
index fc9d523b29b6..8bbf2f4b5b10 100644
--- a/sec-policy/selinux-abrt/selinux-abrt-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-abrt/selinux-abrt-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-abrt/selinux-abrt-2.20170204-r4.ebuild b/sec-policy/selinux-abrt/selinux-abrt-2.20170204-r4.ebuild
index fc9d523b29b6..8bbf2f4b5b10 100644
--- a/sec-policy/selinux-abrt/selinux-abrt-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-abrt/selinux-abrt-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-abrt/selinux-abrt-2.20170805-r2.ebuild b/sec-policy/selinux-abrt/selinux-abrt-2.20170805-r2.ebuild
index fc9d523b29b6..8bbf2f4b5b10 100644
--- a/sec-policy/selinux-abrt/selinux-abrt-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-abrt/selinux-abrt-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-abrt/selinux-abrt-2.20170805-r3.ebuild b/sec-policy/selinux-abrt/selinux-abrt-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..fccfc9d3f0c7
--- /dev/null
+++ b/sec-policy/selinux-abrt/selinux-abrt-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="abrt"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for abrt"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-abrt/selinux-abrt-9999.ebuild b/sec-policy/selinux-abrt/selinux-abrt-9999.ebuild
index 0fb7f076025d..fccfc9d3f0c7 100644
--- a/sec-policy/selinux-abrt/selinux-abrt-9999.ebuild
+++ b/sec-policy/selinux-abrt/selinux-abrt-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-accountsd/Manifest b/sec-policy/selinux-accountsd/Manifest
index 7c6e8d856ba5..d2dbe53efbdd 100644
--- a/sec-policy/selinux-accountsd/Manifest
+++ b/sec-policy/selinux-accountsd/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-accountsd-2.20170204-r1.ebuild 382 SHA256 c2e6bc999108a9b5456a4cceb0c00c52ad9e0a637a93351859c9bb7b5f7acda3 SHA512 5fd5b94661bf56087e7eb8d8afcf60f47e0824d41420ff839eac0e1823d86c91270a3fb346f50bac51a167736290207454ab743c6dbd80572a9e1258338ea487 WHIRLPOOL b8fa843a012032b78623061cf57d49ec08ca1841fe7de2b0d2b89c0e8d96506b0a02c96a903cdcdb41757551b4fc2dabf9d215c7b15f7b349b7208216b72689a
-EBUILD selinux-accountsd-2.20170204-r2.ebuild 380 SHA256 33e5905e677c28103eba0ed2df464876b46f64cda2b094e922a6681f684c79ee SHA512 9350a334641e1f660edb38b4887a0060b3c98f21a9a0c84acd184e9f3bf589eefe428b5ea486730569d758d53b180a9581a0ce868ea87dc688d67abcdfbec9e4 WHIRLPOOL 4991321addd5a6b521bdf14eedfc155a1aa1ca68766b7221f359ac0b75f44a02773616ca553dca5ada7f0bed44a619b9998c0c796fa91b722f2cb4cd62b0f30e
-EBUILD selinux-accountsd-2.20170204-r3.ebuild 380 SHA256 33e5905e677c28103eba0ed2df464876b46f64cda2b094e922a6681f684c79ee SHA512 9350a334641e1f660edb38b4887a0060b3c98f21a9a0c84acd184e9f3bf589eefe428b5ea486730569d758d53b180a9581a0ce868ea87dc688d67abcdfbec9e4 WHIRLPOOL 4991321addd5a6b521bdf14eedfc155a1aa1ca68766b7221f359ac0b75f44a02773616ca553dca5ada7f0bed44a619b9998c0c796fa91b722f2cb4cd62b0f30e
-EBUILD selinux-accountsd-2.20170204-r4.ebuild 380 SHA256 33e5905e677c28103eba0ed2df464876b46f64cda2b094e922a6681f684c79ee SHA512 9350a334641e1f660edb38b4887a0060b3c98f21a9a0c84acd184e9f3bf589eefe428b5ea486730569d758d53b180a9581a0ce868ea87dc688d67abcdfbec9e4 WHIRLPOOL 4991321addd5a6b521bdf14eedfc155a1aa1ca68766b7221f359ac0b75f44a02773616ca553dca5ada7f0bed44a619b9998c0c796fa91b722f2cb4cd62b0f30e
-EBUILD selinux-accountsd-2.20170805-r2.ebuild 380 SHA256 33e5905e677c28103eba0ed2df464876b46f64cda2b094e922a6681f684c79ee SHA512 9350a334641e1f660edb38b4887a0060b3c98f21a9a0c84acd184e9f3bf589eefe428b5ea486730569d758d53b180a9581a0ce868ea87dc688d67abcdfbec9e4 WHIRLPOOL 4991321addd5a6b521bdf14eedfc155a1aa1ca68766b7221f359ac0b75f44a02773616ca553dca5ada7f0bed44a619b9998c0c796fa91b722f2cb4cd62b0f30e
-EBUILD selinux-accountsd-9999.ebuild 382 SHA256 c2e6bc999108a9b5456a4cceb0c00c52ad9e0a637a93351859c9bb7b5f7acda3 SHA512 5fd5b94661bf56087e7eb8d8afcf60f47e0824d41420ff839eac0e1823d86c91270a3fb346f50bac51a167736290207454ab743c6dbd80572a9e1258338ea487 WHIRLPOOL b8fa843a012032b78623061cf57d49ec08ca1841fe7de2b0d2b89c0e8d96506b0a02c96a903cdcdb41757551b4fc2dabf9d215c7b15f7b349b7208216b72689a
+EBUILD selinux-accountsd-2.20170204-r1.ebuild 383 SHA256 63cbe692fb803955fbc59da74e38aa6d3db76feac3249580ba7f48f290da2804 SHA512 91db923427caa52357bfd86cf5d10ce5e355ba2a71bac07994c5723ebb55ced8107bf874c079e20e34bb5cfcf3894aa3e3b68f4c3946b9f2749a464af3a53574 WHIRLPOOL a3aef3a7724a7c084f3af493d1411c50c0a3a97a5a13b5e0b26bfbca9833a8ec662f9a1be409cb1cb7bf2616eadfd38d1414242cc271f0bb179831a6f13cb0ed
+EBUILD selinux-accountsd-2.20170204-r2.ebuild 381 SHA256 151aab4f0a171573354dc9fb5d356a3f89a5a96a8868d10bfb4cd638a275b942 SHA512 2ffd1045017e2045f569a5be17b4ea9a3fa8143c68bea3133bdb0601db4e3feb75a3538dc0f004ee262de63de926a8e8419dbcbf2c3904cad90b3542a711e3e2 WHIRLPOOL 1679b1ba178c6cd6ca840af53440cae343f51f397f8d83ca10563af7633b7ac45523f5f8a2322b9a7a59a6779edf0d75d5d88b6483136a87f4d1d194e08e0b42
+EBUILD selinux-accountsd-2.20170204-r3.ebuild 381 SHA256 151aab4f0a171573354dc9fb5d356a3f89a5a96a8868d10bfb4cd638a275b942 SHA512 2ffd1045017e2045f569a5be17b4ea9a3fa8143c68bea3133bdb0601db4e3feb75a3538dc0f004ee262de63de926a8e8419dbcbf2c3904cad90b3542a711e3e2 WHIRLPOOL 1679b1ba178c6cd6ca840af53440cae343f51f397f8d83ca10563af7633b7ac45523f5f8a2322b9a7a59a6779edf0d75d5d88b6483136a87f4d1d194e08e0b42
+EBUILD selinux-accountsd-2.20170204-r4.ebuild 381 SHA256 151aab4f0a171573354dc9fb5d356a3f89a5a96a8868d10bfb4cd638a275b942 SHA512 2ffd1045017e2045f569a5be17b4ea9a3fa8143c68bea3133bdb0601db4e3feb75a3538dc0f004ee262de63de926a8e8419dbcbf2c3904cad90b3542a711e3e2 WHIRLPOOL 1679b1ba178c6cd6ca840af53440cae343f51f397f8d83ca10563af7633b7ac45523f5f8a2322b9a7a59a6779edf0d75d5d88b6483136a87f4d1d194e08e0b42
+EBUILD selinux-accountsd-2.20170805-r2.ebuild 381 SHA256 151aab4f0a171573354dc9fb5d356a3f89a5a96a8868d10bfb4cd638a275b942 SHA512 2ffd1045017e2045f569a5be17b4ea9a3fa8143c68bea3133bdb0601db4e3feb75a3538dc0f004ee262de63de926a8e8419dbcbf2c3904cad90b3542a711e3e2 WHIRLPOOL 1679b1ba178c6cd6ca840af53440cae343f51f397f8d83ca10563af7633b7ac45523f5f8a2322b9a7a59a6779edf0d75d5d88b6483136a87f4d1d194e08e0b42
+EBUILD selinux-accountsd-2.20170805-r3.ebuild 383 SHA256 63cbe692fb803955fbc59da74e38aa6d3db76feac3249580ba7f48f290da2804 SHA512 91db923427caa52357bfd86cf5d10ce5e355ba2a71bac07994c5723ebb55ced8107bf874c079e20e34bb5cfcf3894aa3e3b68f4c3946b9f2749a464af3a53574 WHIRLPOOL a3aef3a7724a7c084f3af493d1411c50c0a3a97a5a13b5e0b26bfbca9833a8ec662f9a1be409cb1cb7bf2616eadfd38d1414242cc271f0bb179831a6f13cb0ed
+EBUILD selinux-accountsd-9999.ebuild 383 SHA256 63cbe692fb803955fbc59da74e38aa6d3db76feac3249580ba7f48f290da2804 SHA512 91db923427caa52357bfd86cf5d10ce5e355ba2a71bac07994c5723ebb55ced8107bf874c079e20e34bb5cfcf3894aa3e3b68f4c3946b9f2749a464af3a53574 WHIRLPOOL a3aef3a7724a7c084f3af493d1411c50c0a3a97a5a13b5e0b26bfbca9833a8ec662f9a1be409cb1cb7bf2616eadfd38d1414242cc271f0bb179831a6f13cb0ed
 MISC ChangeLog 10887 SHA256 b5cb93533b55064b1dc978a65825d2e8ba4e24f9aa19ba8d909cf7e4fdc9400c SHA512 b33608dfe29ad503df38f74241a2c189e8b1754bd2dc17cde10816e346bb1a6b20a44f175c8b3567c6498ff8bee2fa98b437c683c2525cc555e4c517866b0ec5 WHIRLPOOL b153fa43a2f60e91d83815a7313c7d157456cfa4befdd6a93e2c91a0df615a37b601e269daf26c66525dac4d76d0f20a2c69f802fef0481661a53babe7fd3e36
 MISC ChangeLog-2015 5545 SHA256 9ab194ba0a4658784170479f0fb1434cb49cb0a27c20d11f74ad9e840fb86d56 SHA512 3d9d3710323a1b2837499e0629a307e5f4b53d3ef7ad2ade70ac7f32b6adb5cb6e23498f8c3b35d82b3e3c58a1dd298ce095a2d9698da817a82026be8300a588 WHIRLPOOL cb33a98782045bfc1fa5667db4558703efc83a09af1b08f15f5b7b29d688c3009b46b41e4d166258b8484d92a4009aada52507b017ee39ee83c2a7debea0b055
 MISC metadata.xml 319 SHA256 6966592d62cab2b2491f884d7cf32bdb1796b6ffdcd9cb9d333e79b6034c1584 SHA512 d6458bc554feed33eabcf07a330ffba0317fbf3fcd3704f93db022cf555ca2ab257b59c62bb903c8e104cf7f606248946907540e0cadd1854e39e2ea6878d9e4 WHIRLPOOL cd465ab8e4177a2d0731ca510545d492cc6b7c38a403b92f8defa1bf95ec58d372eb17dfcc2bfe2b129fab9922c2eb71274f97cb38a6a2fcefb2594cdc2b458a
diff --git a/sec-policy/selinux-accountsd/selinux-accountsd-2.20170204-r1.ebuild b/sec-policy/selinux-accountsd/selinux-accountsd-2.20170204-r1.ebuild
index b2ddca6ab06e..a1c85cb64604 100644
--- a/sec-policy/selinux-accountsd/selinux-accountsd-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-accountsd/selinux-accountsd-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-accountsd/selinux-accountsd-2.20170204-r2.ebuild b/sec-policy/selinux-accountsd/selinux-accountsd-2.20170204-r2.ebuild
index 55e0468ec340..e521b0dcc2e8 100644
--- a/sec-policy/selinux-accountsd/selinux-accountsd-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-accountsd/selinux-accountsd-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-accountsd/selinux-accountsd-2.20170204-r3.ebuild b/sec-policy/selinux-accountsd/selinux-accountsd-2.20170204-r3.ebuild
index 55e0468ec340..e521b0dcc2e8 100644
--- a/sec-policy/selinux-accountsd/selinux-accountsd-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-accountsd/selinux-accountsd-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-accountsd/selinux-accountsd-2.20170204-r4.ebuild b/sec-policy/selinux-accountsd/selinux-accountsd-2.20170204-r4.ebuild
index 55e0468ec340..e521b0dcc2e8 100644
--- a/sec-policy/selinux-accountsd/selinux-accountsd-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-accountsd/selinux-accountsd-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-accountsd/selinux-accountsd-2.20170805-r2.ebuild b/sec-policy/selinux-accountsd/selinux-accountsd-2.20170805-r2.ebuild
index 55e0468ec340..e521b0dcc2e8 100644
--- a/sec-policy/selinux-accountsd/selinux-accountsd-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-accountsd/selinux-accountsd-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-accountsd/selinux-accountsd-2.20170805-r3.ebuild b/sec-policy/selinux-accountsd/selinux-accountsd-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..a1c85cb64604
--- /dev/null
+++ b/sec-policy/selinux-accountsd/selinux-accountsd-2.20170805-r3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-accountsd/selinux-accountsd-9999.ebuild b/sec-policy/selinux-accountsd/selinux-accountsd-9999.ebuild
index b2ddca6ab06e..a1c85cb64604 100644
--- a/sec-policy/selinux-accountsd/selinux-accountsd-9999.ebuild
+++ b/sec-policy/selinux-accountsd/selinux-accountsd-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-acct/Manifest b/sec-policy/selinux-acct/Manifest
index 41cf320a9acb..8a35e25322fc 100644
--- a/sec-policy/selinux-acct/Manifest
+++ b/sec-policy/selinux-acct/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-acct-2.20170204-r1.ebuild 279 SHA256 fff7f19354184774ce065fe96ff88870b56ce9ce30ecc057133ee94fd914a22e SHA512 d669d579074b2c340b8bd8f9db110ee25a41575d44d1e0cc88747587864a4be7b440fe0a91c64843f769a41febca99a651141243f0f41a1d9f1bb45c3e8749de WHIRLPOOL b3ba57bf24ab294542582b466d72491a73ab20eb9fe695b6095dd9ab0510a7767c0c75994d8adf98992281fc1f403ec51e52bc9e7185bccf88f9dbfa2a9bca48
-EBUILD selinux-acct-2.20170204-r2.ebuild 277 SHA256 0f1630626575654e0762a6dd26a2d183f771767534313c989d9231ab3bc94b0a SHA512 57138be2bb14ae340d090fd527e386ef4e87b97ac5a7704a93b411f9c3ac80f7f733d04f83fc59783dbb204ce9a4487ea9e9ad059080dcfc760f8a474fad3739 WHIRLPOOL ae2d82ef82928c43ebf508d944cf168edf1113d5ca1d5cd339906989a3986b84c2c059ff08b438e5c3b1a93fa330505b82957140fc93feb90875928f0a5cd0a7
-EBUILD selinux-acct-2.20170204-r3.ebuild 277 SHA256 0f1630626575654e0762a6dd26a2d183f771767534313c989d9231ab3bc94b0a SHA512 57138be2bb14ae340d090fd527e386ef4e87b97ac5a7704a93b411f9c3ac80f7f733d04f83fc59783dbb204ce9a4487ea9e9ad059080dcfc760f8a474fad3739 WHIRLPOOL ae2d82ef82928c43ebf508d944cf168edf1113d5ca1d5cd339906989a3986b84c2c059ff08b438e5c3b1a93fa330505b82957140fc93feb90875928f0a5cd0a7
-EBUILD selinux-acct-2.20170204-r4.ebuild 277 SHA256 0f1630626575654e0762a6dd26a2d183f771767534313c989d9231ab3bc94b0a SHA512 57138be2bb14ae340d090fd527e386ef4e87b97ac5a7704a93b411f9c3ac80f7f733d04f83fc59783dbb204ce9a4487ea9e9ad059080dcfc760f8a474fad3739 WHIRLPOOL ae2d82ef82928c43ebf508d944cf168edf1113d5ca1d5cd339906989a3986b84c2c059ff08b438e5c3b1a93fa330505b82957140fc93feb90875928f0a5cd0a7
-EBUILD selinux-acct-2.20170805-r2.ebuild 277 SHA256 0f1630626575654e0762a6dd26a2d183f771767534313c989d9231ab3bc94b0a SHA512 57138be2bb14ae340d090fd527e386ef4e87b97ac5a7704a93b411f9c3ac80f7f733d04f83fc59783dbb204ce9a4487ea9e9ad059080dcfc760f8a474fad3739 WHIRLPOOL ae2d82ef82928c43ebf508d944cf168edf1113d5ca1d5cd339906989a3986b84c2c059ff08b438e5c3b1a93fa330505b82957140fc93feb90875928f0a5cd0a7
-EBUILD selinux-acct-9999.ebuild 279 SHA256 fff7f19354184774ce065fe96ff88870b56ce9ce30ecc057133ee94fd914a22e SHA512 d669d579074b2c340b8bd8f9db110ee25a41575d44d1e0cc88747587864a4be7b440fe0a91c64843f769a41febca99a651141243f0f41a1d9f1bb45c3e8749de WHIRLPOOL b3ba57bf24ab294542582b466d72491a73ab20eb9fe695b6095dd9ab0510a7767c0c75994d8adf98992281fc1f403ec51e52bc9e7185bccf88f9dbfa2a9bca48
+EBUILD selinux-acct-2.20170204-r1.ebuild 280 SHA256 5f9fe58c6de3e19a919fe4db1e800a80644a087f484fa1110683b69122b1ea8b SHA512 a886f62df0485964d557bac73f26b0b810f0a34968a7cb5e6e7301557b6e0a50b72590a0f784acd7e5c18c8b453b560ea83e49072a68dc88a90e00a25be5e081 WHIRLPOOL 5958b30d61e9a61c2945489bd476c14981e8f51796e9307b8f99d2f144ceb940fb809395397c2e4ae9706a29bc111ef06fd12ba17211e4e17a62b4c5d1276ef1
+EBUILD selinux-acct-2.20170204-r2.ebuild 278 SHA256 5e349258c9b77e154fb45bcae95f6dfa8c29f3989f9a663b908d50647b37779e SHA512 3db18b90a1415164b6dc91da522263cbfa9b985d89577415de67f4e8a8773d2c72d8ae9a3fbe11e2e021719bec82d8b7743bed2aef22d36d20db9eac477b23e6 WHIRLPOOL 49f3af74f73f45c074460e0b4740b9b7490c1eb8fb7b2d412350e36e9217afad926750c14a04df96f923e6c1ff57db08d07305a6fd8e2557e372440f4b9173fe
+EBUILD selinux-acct-2.20170204-r3.ebuild 278 SHA256 5e349258c9b77e154fb45bcae95f6dfa8c29f3989f9a663b908d50647b37779e SHA512 3db18b90a1415164b6dc91da522263cbfa9b985d89577415de67f4e8a8773d2c72d8ae9a3fbe11e2e021719bec82d8b7743bed2aef22d36d20db9eac477b23e6 WHIRLPOOL 49f3af74f73f45c074460e0b4740b9b7490c1eb8fb7b2d412350e36e9217afad926750c14a04df96f923e6c1ff57db08d07305a6fd8e2557e372440f4b9173fe
+EBUILD selinux-acct-2.20170204-r4.ebuild 278 SHA256 5e349258c9b77e154fb45bcae95f6dfa8c29f3989f9a663b908d50647b37779e SHA512 3db18b90a1415164b6dc91da522263cbfa9b985d89577415de67f4e8a8773d2c72d8ae9a3fbe11e2e021719bec82d8b7743bed2aef22d36d20db9eac477b23e6 WHIRLPOOL 49f3af74f73f45c074460e0b4740b9b7490c1eb8fb7b2d412350e36e9217afad926750c14a04df96f923e6c1ff57db08d07305a6fd8e2557e372440f4b9173fe
+EBUILD selinux-acct-2.20170805-r2.ebuild 278 SHA256 5e349258c9b77e154fb45bcae95f6dfa8c29f3989f9a663b908d50647b37779e SHA512 3db18b90a1415164b6dc91da522263cbfa9b985d89577415de67f4e8a8773d2c72d8ae9a3fbe11e2e021719bec82d8b7743bed2aef22d36d20db9eac477b23e6 WHIRLPOOL 49f3af74f73f45c074460e0b4740b9b7490c1eb8fb7b2d412350e36e9217afad926750c14a04df96f923e6c1ff57db08d07305a6fd8e2557e372440f4b9173fe
+EBUILD selinux-acct-2.20170805-r3.ebuild 280 SHA256 5f9fe58c6de3e19a919fe4db1e800a80644a087f484fa1110683b69122b1ea8b SHA512 a886f62df0485964d557bac73f26b0b810f0a34968a7cb5e6e7301557b6e0a50b72590a0f784acd7e5c18c8b453b560ea83e49072a68dc88a90e00a25be5e081 WHIRLPOOL 5958b30d61e9a61c2945489bd476c14981e8f51796e9307b8f99d2f144ceb940fb809395397c2e4ae9706a29bc111ef06fd12ba17211e4e17a62b4c5d1276ef1
+EBUILD selinux-acct-9999.ebuild 280 SHA256 5f9fe58c6de3e19a919fe4db1e800a80644a087f484fa1110683b69122b1ea8b SHA512 a886f62df0485964d557bac73f26b0b810f0a34968a7cb5e6e7301557b6e0a50b72590a0f784acd7e5c18c8b453b560ea83e49072a68dc88a90e00a25be5e081 WHIRLPOOL 5958b30d61e9a61c2945489bd476c14981e8f51796e9307b8f99d2f144ceb940fb809395397c2e4ae9706a29bc111ef06fd12ba17211e4e17a62b4c5d1276ef1
 MISC ChangeLog 10387 SHA256 87abeb7faac605c4dec813a7f2df3a4fd9ad7c046359d8df535a9f9fefef7c87 SHA512 4e59132cb24ea1726138d345da0e6a0f8d45f80ba1166ba1d0ce1c22dde36d79e792fa002ea4b19cce7e8d8a0ac54cc00d2826f55bec9ddfc7bde907226172ee WHIRLPOOL 79066f9a53919965fa2b683120f29926ed63a484a2343be56b9c1422151c97bdd5f476d7810923ae4fce0798c7e839255c131fb631cb623981e3a75306e8bea3
 MISC ChangeLog-2015 9738 SHA256 6c6b2c0992defeadca4c0e5b024fe2ced3f0449426a5b1c5240f1f15258723b0 SHA512 d8a49fcb5adffa8f08c3b7b9867f05dbe3d9fb3ea6a339382f688075af65847af62d5180e03edb082a5fdcea2f1188ef3f24e29d927969e26188aabfc61aee3c WHIRLPOOL d74b71b989bd662104150ead190e7e8dec6ef37a74b11a257719c45dfe71c3432851705d1f176f9c9454c6ff1cb5842753ab93a7b1b3c0b1454002ddde88f372
 MISC metadata.xml 314 SHA256 48d7d9e0af8682a43d2a6aa6040002291feda1e089b274207202d2f1c7b84edd SHA512 3baaefcdf1846cec59a14866f9a1bcd9a0fbad615069a45eb2c6d74df733533d10bb03adbeef08496c7c4462694649eb619ae36eccdf1e9e91740c495edcb054 WHIRLPOOL 1d2d5e837a7d8d9dc8d9aff8ade20a07c1c102d286c992049664328bd42e82aaca0bf264c58e011901f1b3a2136117aab5ca09ed6469629975c9a2e013339920
diff --git a/sec-policy/selinux-acct/selinux-acct-2.20170204-r1.ebuild b/sec-policy/selinux-acct/selinux-acct-2.20170204-r1.ebuild
index cdf063d852e2..ec9e00ae08e9 100644
--- a/sec-policy/selinux-acct/selinux-acct-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-acct/selinux-acct-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-acct/selinux-acct-2.20170204-r2.ebuild b/sec-policy/selinux-acct/selinux-acct-2.20170204-r2.ebuild
index c410272cd60e..1455ef2d30b4 100644
--- a/sec-policy/selinux-acct/selinux-acct-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-acct/selinux-acct-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-acct/selinux-acct-2.20170204-r3.ebuild b/sec-policy/selinux-acct/selinux-acct-2.20170204-r3.ebuild
index c410272cd60e..1455ef2d30b4 100644
--- a/sec-policy/selinux-acct/selinux-acct-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-acct/selinux-acct-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-acct/selinux-acct-2.20170204-r4.ebuild b/sec-policy/selinux-acct/selinux-acct-2.20170204-r4.ebuild
index c410272cd60e..1455ef2d30b4 100644
--- a/sec-policy/selinux-acct/selinux-acct-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-acct/selinux-acct-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-acct/selinux-acct-2.20170805-r2.ebuild b/sec-policy/selinux-acct/selinux-acct-2.20170805-r2.ebuild
index c410272cd60e..1455ef2d30b4 100644
--- a/sec-policy/selinux-acct/selinux-acct-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-acct/selinux-acct-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-acct/selinux-acct-2.20170805-r3.ebuild b/sec-policy/selinux-acct/selinux-acct-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..ec9e00ae08e9
--- /dev/null
+++ b/sec-policy/selinux-acct/selinux-acct-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="acct"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for acct"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-acct/selinux-acct-9999.ebuild b/sec-policy/selinux-acct/selinux-acct-9999.ebuild
index cdf063d852e2..ec9e00ae08e9 100644
--- a/sec-policy/selinux-acct/selinux-acct-9999.ebuild
+++ b/sec-policy/selinux-acct/selinux-acct-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ada/Manifest b/sec-policy/selinux-ada/Manifest
index d7bf9235ac63..15c1d3189085 100644
--- a/sec-policy/selinux-ada/Manifest
+++ b/sec-policy/selinux-ada/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-ada-2.20170204-r1.ebuild 277 SHA256 fc7cb7e6de95bfe5d85701f7ea36af65345372ec9e6133b507f4b92d215c1b00 SHA512 b26f5ac26248040e2257347d91ceec2db6150e1ebec471dc7ea98e0ee0de0c05e3e4ae87a5ec69f2ddbbb63b155ca41d322616ad6c7d81efd0c4b89bfc1f07d6 WHIRLPOOL fe4a23316b8757112e63d2f0391a8427a6ae862d7e29ab112df90a4d9d3692ef8ba356f7e39feb3a71451d5c1fc9cd3ef2b1ae37fb25991640350e27cd00728e
-EBUILD selinux-ada-2.20170204-r2.ebuild 275 SHA256 c97bda11de374290ab2454b90b338f5aba4103dd4523e6f20e6ab2f4e0d92624 SHA512 d5ee41d68720fd9da5f647679707b89b3faae3168ad9655494fcfa596c38490f22e8667fd6798f39f849828ea0b01978ab78a40198842c7bfc2e8ac1c8f4250c WHIRLPOOL 7c686cab3dd59bfb1ab5025baab6dad27f4db867171e4d916db1627f0242a1a44ff0a5e1b965cc4f3b1974fdfd19030c7a7a295b9edbd8767ca1dc386ee682fd
-EBUILD selinux-ada-2.20170204-r3.ebuild 275 SHA256 c97bda11de374290ab2454b90b338f5aba4103dd4523e6f20e6ab2f4e0d92624 SHA512 d5ee41d68720fd9da5f647679707b89b3faae3168ad9655494fcfa596c38490f22e8667fd6798f39f849828ea0b01978ab78a40198842c7bfc2e8ac1c8f4250c WHIRLPOOL 7c686cab3dd59bfb1ab5025baab6dad27f4db867171e4d916db1627f0242a1a44ff0a5e1b965cc4f3b1974fdfd19030c7a7a295b9edbd8767ca1dc386ee682fd
-EBUILD selinux-ada-2.20170204-r4.ebuild 275 SHA256 c97bda11de374290ab2454b90b338f5aba4103dd4523e6f20e6ab2f4e0d92624 SHA512 d5ee41d68720fd9da5f647679707b89b3faae3168ad9655494fcfa596c38490f22e8667fd6798f39f849828ea0b01978ab78a40198842c7bfc2e8ac1c8f4250c WHIRLPOOL 7c686cab3dd59bfb1ab5025baab6dad27f4db867171e4d916db1627f0242a1a44ff0a5e1b965cc4f3b1974fdfd19030c7a7a295b9edbd8767ca1dc386ee682fd
-EBUILD selinux-ada-2.20170805-r2.ebuild 275 SHA256 c97bda11de374290ab2454b90b338f5aba4103dd4523e6f20e6ab2f4e0d92624 SHA512 d5ee41d68720fd9da5f647679707b89b3faae3168ad9655494fcfa596c38490f22e8667fd6798f39f849828ea0b01978ab78a40198842c7bfc2e8ac1c8f4250c WHIRLPOOL 7c686cab3dd59bfb1ab5025baab6dad27f4db867171e4d916db1627f0242a1a44ff0a5e1b965cc4f3b1974fdfd19030c7a7a295b9edbd8767ca1dc386ee682fd
-EBUILD selinux-ada-9999.ebuild 277 SHA256 fc7cb7e6de95bfe5d85701f7ea36af65345372ec9e6133b507f4b92d215c1b00 SHA512 b26f5ac26248040e2257347d91ceec2db6150e1ebec471dc7ea98e0ee0de0c05e3e4ae87a5ec69f2ddbbb63b155ca41d322616ad6c7d81efd0c4b89bfc1f07d6 WHIRLPOOL fe4a23316b8757112e63d2f0391a8427a6ae862d7e29ab112df90a4d9d3692ef8ba356f7e39feb3a71451d5c1fc9cd3ef2b1ae37fb25991640350e27cd00728e
+EBUILD selinux-ada-2.20170204-r1.ebuild 278 SHA256 02f46c111edc6b331ee15d8c20d8847c8da4bbc297d635a15964346b7c65a083 SHA512 5d0a18b3e05909fb1ad4fc9433388c7f95907f15cddbd6524421cee0f570d122682af2c01b633bd14419af5209917514b4eee72181d525c2817a75a995c46be8 WHIRLPOOL ccbc7b3046e4a1e9a58c9b13abb29ab1c7dc2ceae2c153be125ea68dac5cfa051b61702d0b4593c3517a6f8debc5ad1c9f382e49f6cbcd267fb57d1c9d533930
+EBUILD selinux-ada-2.20170204-r2.ebuild 276 SHA256 0f0955eaacc133feba597fd169ecaf1be4ae61b4c97472b0929a4835b8184a07 SHA512 10a1ba0bb7df9fe09890e1a51faf7cb65927d6a285484b22f53299a1d7d42fd5acbf4592dd0e10083bbe30e777c4e94cb6383787a0f29bc88119f5637b2cb2f7 WHIRLPOOL 6ed04f2ad84e6bdd36512bc9ae5d9a3a1fe357ede737864e2e2c4d9843a5dc4431ebc447d5cb10da1e8a3bf69a86c5a98ceb98151671e1e5f79c5077e89719c1
+EBUILD selinux-ada-2.20170204-r3.ebuild 276 SHA256 0f0955eaacc133feba597fd169ecaf1be4ae61b4c97472b0929a4835b8184a07 SHA512 10a1ba0bb7df9fe09890e1a51faf7cb65927d6a285484b22f53299a1d7d42fd5acbf4592dd0e10083bbe30e777c4e94cb6383787a0f29bc88119f5637b2cb2f7 WHIRLPOOL 6ed04f2ad84e6bdd36512bc9ae5d9a3a1fe357ede737864e2e2c4d9843a5dc4431ebc447d5cb10da1e8a3bf69a86c5a98ceb98151671e1e5f79c5077e89719c1
+EBUILD selinux-ada-2.20170204-r4.ebuild 276 SHA256 0f0955eaacc133feba597fd169ecaf1be4ae61b4c97472b0929a4835b8184a07 SHA512 10a1ba0bb7df9fe09890e1a51faf7cb65927d6a285484b22f53299a1d7d42fd5acbf4592dd0e10083bbe30e777c4e94cb6383787a0f29bc88119f5637b2cb2f7 WHIRLPOOL 6ed04f2ad84e6bdd36512bc9ae5d9a3a1fe357ede737864e2e2c4d9843a5dc4431ebc447d5cb10da1e8a3bf69a86c5a98ceb98151671e1e5f79c5077e89719c1
+EBUILD selinux-ada-2.20170805-r2.ebuild 276 SHA256 0f0955eaacc133feba597fd169ecaf1be4ae61b4c97472b0929a4835b8184a07 SHA512 10a1ba0bb7df9fe09890e1a51faf7cb65927d6a285484b22f53299a1d7d42fd5acbf4592dd0e10083bbe30e777c4e94cb6383787a0f29bc88119f5637b2cb2f7 WHIRLPOOL 6ed04f2ad84e6bdd36512bc9ae5d9a3a1fe357ede737864e2e2c4d9843a5dc4431ebc447d5cb10da1e8a3bf69a86c5a98ceb98151671e1e5f79c5077e89719c1
+EBUILD selinux-ada-2.20170805-r3.ebuild 278 SHA256 02f46c111edc6b331ee15d8c20d8847c8da4bbc297d635a15964346b7c65a083 SHA512 5d0a18b3e05909fb1ad4fc9433388c7f95907f15cddbd6524421cee0f570d122682af2c01b633bd14419af5209917514b4eee72181d525c2817a75a995c46be8 WHIRLPOOL ccbc7b3046e4a1e9a58c9b13abb29ab1c7dc2ceae2c153be125ea68dac5cfa051b61702d0b4593c3517a6f8debc5ad1c9f382e49f6cbcd267fb57d1c9d533930
+EBUILD selinux-ada-9999.ebuild 278 SHA256 02f46c111edc6b331ee15d8c20d8847c8da4bbc297d635a15964346b7c65a083 SHA512 5d0a18b3e05909fb1ad4fc9433388c7f95907f15cddbd6524421cee0f570d122682af2c01b633bd14419af5209917514b4eee72181d525c2817a75a995c46be8 WHIRLPOOL ccbc7b3046e4a1e9a58c9b13abb29ab1c7dc2ceae2c153be125ea68dac5cfa051b61702d0b4593c3517a6f8debc5ad1c9f382e49f6cbcd267fb57d1c9d533930
 MISC ChangeLog 10295 SHA256 854129691a1dd0840a84050cea6d0075969c3343628000b834f7eee6326993f3 SHA512 73dcb63447eda63f0d193c7b9455859c1c55bd70923d2855d142a3cebafc219e6d631903c82950ea91de4e83192d435abd93586f7a9bdfe845ce7f835baf649e WHIRLPOOL 22976309b55956f87a9d22e1523ea53240a75a5b131bbd0cccdbdee218834a9e0a15ef10d2ef985be236681e4e8fe9c256539148bfa0ae1c598d18528eccdd44
 MISC ChangeLog-2015 9519 SHA256 d92ab554e753202a751410cb394077f93503a2f2455624f241b5472f894adf9d SHA512 20c2659ce5a09de26e01a16b8379f58d938d64d5370e4de49c84ff983c16fca98d87b3d9a05fb4b2f34c4b1e314b25efdc1cd80a9d2658fc7feabddeb8aae63a WHIRLPOOL 60b8a7fff99b4f77c7bd05825c76c6d2e294649a9f616fee0cc4025596ed6f224d7e60da46d88eae84d5a82ad2e423047739074c22ce6738190e27a3929c660f
 MISC metadata.xml 313 SHA256 5078441cf6e9ed140c1bdfb33669720778ae633438d1838035d3c522db52624d SHA512 9412dc7f263273b69ac4665caa58138477732b72b6c3f1fcbb09781127434b532d34384c40c2b92bb2e10396b2bc67135a8e767c4fdae16e253b39684104b4cc WHIRLPOOL f73e9667004b0253ef603facd6088b80f214153040cef7e8fafb95d7d20b1149e676d55c20a816562058130f4c17141c788775d9aa17102b6c4d5cb3dcc030b1
diff --git a/sec-policy/selinux-ada/selinux-ada-2.20170204-r1.ebuild b/sec-policy/selinux-ada/selinux-ada-2.20170204-r1.ebuild
index 2d54e9de6e5c..022f41b890f3 100644
--- a/sec-policy/selinux-ada/selinux-ada-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-ada/selinux-ada-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ada/selinux-ada-2.20170204-r2.ebuild b/sec-policy/selinux-ada/selinux-ada-2.20170204-r2.ebuild
index abd2b0bfa4da..2d5796f9461b 100644
--- a/sec-policy/selinux-ada/selinux-ada-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-ada/selinux-ada-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ada/selinux-ada-2.20170204-r3.ebuild b/sec-policy/selinux-ada/selinux-ada-2.20170204-r3.ebuild
index abd2b0bfa4da..2d5796f9461b 100644
--- a/sec-policy/selinux-ada/selinux-ada-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-ada/selinux-ada-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ada/selinux-ada-2.20170204-r4.ebuild b/sec-policy/selinux-ada/selinux-ada-2.20170204-r4.ebuild
index abd2b0bfa4da..2d5796f9461b 100644
--- a/sec-policy/selinux-ada/selinux-ada-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-ada/selinux-ada-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ada/selinux-ada-2.20170805-r2.ebuild b/sec-policy/selinux-ada/selinux-ada-2.20170805-r2.ebuild
index abd2b0bfa4da..2d5796f9461b 100644
--- a/sec-policy/selinux-ada/selinux-ada-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-ada/selinux-ada-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ada/selinux-ada-2.20170805-r3.ebuild b/sec-policy/selinux-ada/selinux-ada-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..022f41b890f3
--- /dev/null
+++ b/sec-policy/selinux-ada/selinux-ada-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="ada"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ada"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ada/selinux-ada-9999.ebuild b/sec-policy/selinux-ada/selinux-ada-9999.ebuild
index 2d54e9de6e5c..022f41b890f3 100644
--- a/sec-policy/selinux-ada/selinux-ada-9999.ebuild
+++ b/sec-policy/selinux-ada/selinux-ada-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-afs/Manifest b/sec-policy/selinux-afs/Manifest
index fef677eb98a6..6cbc521df4d0 100644
--- a/sec-policy/selinux-afs/Manifest
+++ b/sec-policy/selinux-afs/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-afs-2.20170204-r1.ebuild 277 SHA256 9ad6007fee8e0f7f394ee52eca653ca70161ce978f4351f6ae1ec6ccfac389d7 SHA512 c2352b7c905a0fab6808e2fe639cb08586a1789b6eaec457e6d1c74904f0a107e813cee35f10ece24b585d4e4b9543d60d5cabf0d7159347f8e12c2f9f61f7af WHIRLPOOL 9bb9e6619bef6590685e6df74856bd21942dc14c70cbc01ab68d132d657dd3e2910fefbf6cb6beaf18cf4d430bfe97be16d2c9e59eb6b48229feac291254834c
-EBUILD selinux-afs-2.20170204-r2.ebuild 275 SHA256 05dacbc753f2ad49de33134e95d0312462d868de01d15a6a08a9b006519a3adf SHA512 54df046c9ea9e8d6b3fcc0e8eaae965cbdc441642669134e4d1f63a792b067ba065d81259999017a7ff376cce36aa1cec2951961470a68cca944b69a16b5504d WHIRLPOOL 20de3358e544a51624bde9f0e8799d6b38263d770bd2f0aa77255306ff44d9eab28da16f041fa5d209acc4f50b8a60d6fdecea1e57e4dc465fccd629660213cd
-EBUILD selinux-afs-2.20170204-r3.ebuild 275 SHA256 05dacbc753f2ad49de33134e95d0312462d868de01d15a6a08a9b006519a3adf SHA512 54df046c9ea9e8d6b3fcc0e8eaae965cbdc441642669134e4d1f63a792b067ba065d81259999017a7ff376cce36aa1cec2951961470a68cca944b69a16b5504d WHIRLPOOL 20de3358e544a51624bde9f0e8799d6b38263d770bd2f0aa77255306ff44d9eab28da16f041fa5d209acc4f50b8a60d6fdecea1e57e4dc465fccd629660213cd
-EBUILD selinux-afs-2.20170204-r4.ebuild 275 SHA256 05dacbc753f2ad49de33134e95d0312462d868de01d15a6a08a9b006519a3adf SHA512 54df046c9ea9e8d6b3fcc0e8eaae965cbdc441642669134e4d1f63a792b067ba065d81259999017a7ff376cce36aa1cec2951961470a68cca944b69a16b5504d WHIRLPOOL 20de3358e544a51624bde9f0e8799d6b38263d770bd2f0aa77255306ff44d9eab28da16f041fa5d209acc4f50b8a60d6fdecea1e57e4dc465fccd629660213cd
-EBUILD selinux-afs-2.20170805-r2.ebuild 275 SHA256 05dacbc753f2ad49de33134e95d0312462d868de01d15a6a08a9b006519a3adf SHA512 54df046c9ea9e8d6b3fcc0e8eaae965cbdc441642669134e4d1f63a792b067ba065d81259999017a7ff376cce36aa1cec2951961470a68cca944b69a16b5504d WHIRLPOOL 20de3358e544a51624bde9f0e8799d6b38263d770bd2f0aa77255306ff44d9eab28da16f041fa5d209acc4f50b8a60d6fdecea1e57e4dc465fccd629660213cd
-EBUILD selinux-afs-9999.ebuild 277 SHA256 9ad6007fee8e0f7f394ee52eca653ca70161ce978f4351f6ae1ec6ccfac389d7 SHA512 c2352b7c905a0fab6808e2fe639cb08586a1789b6eaec457e6d1c74904f0a107e813cee35f10ece24b585d4e4b9543d60d5cabf0d7159347f8e12c2f9f61f7af WHIRLPOOL 9bb9e6619bef6590685e6df74856bd21942dc14c70cbc01ab68d132d657dd3e2910fefbf6cb6beaf18cf4d430bfe97be16d2c9e59eb6b48229feac291254834c
+EBUILD selinux-afs-2.20170204-r1.ebuild 278 SHA256 997c558b1def0a80e57ef8c60631586d6196cbd1fce896dcd7438daffe11b7a8 SHA512 6c7de1144da950f2b23bd461bca3d9d3e5019c8d3b9bde6668e29942207054390533897338f470a5ea33e35ff31ed64eec1233226507081c0b6874864fd206e4 WHIRLPOOL 4730700fb51bda9aa0817ba8adc5f282551073307de98f24e9cf21cb964c1d213aad2d90b2b70eda73439002c15f3086dab888faab8f94a25d760a123c87ceb7
+EBUILD selinux-afs-2.20170204-r2.ebuild 276 SHA256 aae553f595bd2e0a6e65e138bb466b84bc1c7855d4b470b27a06bda4b27610e0 SHA512 8e87bbe3c5f2dfc963b1624519d945e1ff9ab9ec8ecff2f7c7934a924969f616f3f4e664493e869a45e929813a559f1d40a37a331da9fe0950cb90308578036f WHIRLPOOL 0a3ba9159e92cbcade2e3fd6f8d693028af2a29a72b41ff1034c599808260a70c1b751df21d194d0858e165ed46a1aaad50885f7a3aafbb1f8ba6bd81020c13e
+EBUILD selinux-afs-2.20170204-r3.ebuild 276 SHA256 aae553f595bd2e0a6e65e138bb466b84bc1c7855d4b470b27a06bda4b27610e0 SHA512 8e87bbe3c5f2dfc963b1624519d945e1ff9ab9ec8ecff2f7c7934a924969f616f3f4e664493e869a45e929813a559f1d40a37a331da9fe0950cb90308578036f WHIRLPOOL 0a3ba9159e92cbcade2e3fd6f8d693028af2a29a72b41ff1034c599808260a70c1b751df21d194d0858e165ed46a1aaad50885f7a3aafbb1f8ba6bd81020c13e
+EBUILD selinux-afs-2.20170204-r4.ebuild 276 SHA256 aae553f595bd2e0a6e65e138bb466b84bc1c7855d4b470b27a06bda4b27610e0 SHA512 8e87bbe3c5f2dfc963b1624519d945e1ff9ab9ec8ecff2f7c7934a924969f616f3f4e664493e869a45e929813a559f1d40a37a331da9fe0950cb90308578036f WHIRLPOOL 0a3ba9159e92cbcade2e3fd6f8d693028af2a29a72b41ff1034c599808260a70c1b751df21d194d0858e165ed46a1aaad50885f7a3aafbb1f8ba6bd81020c13e
+EBUILD selinux-afs-2.20170805-r2.ebuild 276 SHA256 aae553f595bd2e0a6e65e138bb466b84bc1c7855d4b470b27a06bda4b27610e0 SHA512 8e87bbe3c5f2dfc963b1624519d945e1ff9ab9ec8ecff2f7c7934a924969f616f3f4e664493e869a45e929813a559f1d40a37a331da9fe0950cb90308578036f WHIRLPOOL 0a3ba9159e92cbcade2e3fd6f8d693028af2a29a72b41ff1034c599808260a70c1b751df21d194d0858e165ed46a1aaad50885f7a3aafbb1f8ba6bd81020c13e
+EBUILD selinux-afs-2.20170805-r3.ebuild 278 SHA256 997c558b1def0a80e57ef8c60631586d6196cbd1fce896dcd7438daffe11b7a8 SHA512 6c7de1144da950f2b23bd461bca3d9d3e5019c8d3b9bde6668e29942207054390533897338f470a5ea33e35ff31ed64eec1233226507081c0b6874864fd206e4 WHIRLPOOL 4730700fb51bda9aa0817ba8adc5f282551073307de98f24e9cf21cb964c1d213aad2d90b2b70eda73439002c15f3086dab888faab8f94a25d760a123c87ceb7
+EBUILD selinux-afs-9999.ebuild 278 SHA256 997c558b1def0a80e57ef8c60631586d6196cbd1fce896dcd7438daffe11b7a8 SHA512 6c7de1144da950f2b23bd461bca3d9d3e5019c8d3b9bde6668e29942207054390533897338f470a5ea33e35ff31ed64eec1233226507081c0b6874864fd206e4 WHIRLPOOL 4730700fb51bda9aa0817ba8adc5f282551073307de98f24e9cf21cb964c1d213aad2d90b2b70eda73439002c15f3086dab888faab8f94a25d760a123c87ceb7
 MISC ChangeLog 10295 SHA256 9ab9e9bc47b2e718ab2c028263d4c601c60b8a072b52b203771301f3094fba2d SHA512 e833dd455aaf44c4372f905a40f663129d28d5c7271a144ea3ef3516e9745397715077d94f6a90718708bf247e9d6e5ae984354e190e1e27ddb1d73b6eb1768b WHIRLPOOL 1ce5f6f44df723c4d740d781dd9f90b1e9331354b1c51b5e019b6c9e392c645b22c3996543115a40c129c22036e1d5481c706db8cad38a43bd99d1fab7f8a80c
 MISC ChangeLog-2015 9519 SHA256 715cd8ece8125bd71bdd197b96c79fdf4018aec6ddd816a4f5e1b4c0cf97a6e8 SHA512 346506e4ac379e836eac1b3205f5768d03f5bfeda1b907a38044508ac0d9eac27840da0b4d5bf1653ab1ab7dcfa6b7a4ec813791b8357607801a8351cc8db4e0 WHIRLPOOL 5874fe80c1e97cd339b13d8185b42f00702a0d0c2463729942c6c27717df8b270be00c7e9526444517b862cefda8ce1933c2c085f6472f3c7f55bf1a1388af03
 MISC metadata.xml 313 SHA256 c4d0472fd9b95709057d86d9b68787ff6e1f31797d389017335cfb0ea8f747f5 SHA512 b684826f0ad47ac371f231ebc834fbed092a7bc39730ca9aeb5a28eb1b604e19b21ec6e731b7f9f54f8e5580fe35dc87332dd44c37c9fba44c4bf78a7daa04ef WHIRLPOOL f92b3ee783de603d34bc00463552934c26e28c696cad01ebe1cb23f83524539965fcbda51dff6eb9297e4c53fda45afb3fe983b14c44a12a3368f6bc7f223eba
diff --git a/sec-policy/selinux-afs/selinux-afs-2.20170204-r1.ebuild b/sec-policy/selinux-afs/selinux-afs-2.20170204-r1.ebuild
index 591d4c98c2b6..2bc1bec56412 100644
--- a/sec-policy/selinux-afs/selinux-afs-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-afs/selinux-afs-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-afs/selinux-afs-2.20170204-r2.ebuild b/sec-policy/selinux-afs/selinux-afs-2.20170204-r2.ebuild
index 39923cbb131a..81eaa17a2782 100644
--- a/sec-policy/selinux-afs/selinux-afs-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-afs/selinux-afs-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-afs/selinux-afs-2.20170204-r3.ebuild b/sec-policy/selinux-afs/selinux-afs-2.20170204-r3.ebuild
index 39923cbb131a..81eaa17a2782 100644
--- a/sec-policy/selinux-afs/selinux-afs-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-afs/selinux-afs-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-afs/selinux-afs-2.20170204-r4.ebuild b/sec-policy/selinux-afs/selinux-afs-2.20170204-r4.ebuild
index 39923cbb131a..81eaa17a2782 100644
--- a/sec-policy/selinux-afs/selinux-afs-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-afs/selinux-afs-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-afs/selinux-afs-2.20170805-r2.ebuild b/sec-policy/selinux-afs/selinux-afs-2.20170805-r2.ebuild
index 39923cbb131a..81eaa17a2782 100644
--- a/sec-policy/selinux-afs/selinux-afs-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-afs/selinux-afs-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-afs/selinux-afs-2.20170805-r3.ebuild b/sec-policy/selinux-afs/selinux-afs-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..2bc1bec56412
--- /dev/null
+++ b/sec-policy/selinux-afs/selinux-afs-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-afs/selinux-afs-9999.ebuild b/sec-policy/selinux-afs/selinux-afs-9999.ebuild
index 591d4c98c2b6..2bc1bec56412 100644
--- a/sec-policy/selinux-afs/selinux-afs-9999.ebuild
+++ b/sec-policy/selinux-afs/selinux-afs-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-aide/Manifest b/sec-policy/selinux-aide/Manifest
index 3357543ab82d..d55426fe7698 100644
--- a/sec-policy/selinux-aide/Manifest
+++ b/sec-policy/selinux-aide/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-aide-2.20170204-r1.ebuild 279 SHA256 3dc475ce9be10e874eaa1a9d6b24784feb35fde5543ca72fd5e951dc20b05f0d SHA512 d9c734246d6b0a27724708f658e4d7f230ca1ae84d62da3627ce30aa993faa3615301f6eaa26edcff54763edd3eede6479ba40464fda2e02cf3d4147b9f504c9 WHIRLPOOL 29506e593776f9f05462cf74e477ea24e50c8c4e957272660ac7c14a08db19b0c47143b4e5f6f7077f81a0a669587713cef4b57bbccef864f19828250bcb6385
-EBUILD selinux-aide-2.20170204-r2.ebuild 277 SHA256 9761eaaf71ecccd2e107e7cb4538619c09d78e80e239d4bf4a6c61b29b6704cf SHA512 b28dc9ff0d0a7346d5a4f0c4c928a99b3caf9dac44479fa7b055d12f21fdbc101fb70317e78e07d7546ed61a8668d3cc16982d3f2c1e330f266e1e8cdd296a58 WHIRLPOOL 2713d738a62fc12d9ee0cb2094c251a7ba844921ebb5e7b0b0648200e5a09f2fecb1b6da9620b2453fad7d3aee31b78d575e8ab1f158c6db895a676eb30783a6
-EBUILD selinux-aide-2.20170204-r3.ebuild 277 SHA256 9761eaaf71ecccd2e107e7cb4538619c09d78e80e239d4bf4a6c61b29b6704cf SHA512 b28dc9ff0d0a7346d5a4f0c4c928a99b3caf9dac44479fa7b055d12f21fdbc101fb70317e78e07d7546ed61a8668d3cc16982d3f2c1e330f266e1e8cdd296a58 WHIRLPOOL 2713d738a62fc12d9ee0cb2094c251a7ba844921ebb5e7b0b0648200e5a09f2fecb1b6da9620b2453fad7d3aee31b78d575e8ab1f158c6db895a676eb30783a6
-EBUILD selinux-aide-2.20170204-r4.ebuild 277 SHA256 9761eaaf71ecccd2e107e7cb4538619c09d78e80e239d4bf4a6c61b29b6704cf SHA512 b28dc9ff0d0a7346d5a4f0c4c928a99b3caf9dac44479fa7b055d12f21fdbc101fb70317e78e07d7546ed61a8668d3cc16982d3f2c1e330f266e1e8cdd296a58 WHIRLPOOL 2713d738a62fc12d9ee0cb2094c251a7ba844921ebb5e7b0b0648200e5a09f2fecb1b6da9620b2453fad7d3aee31b78d575e8ab1f158c6db895a676eb30783a6
-EBUILD selinux-aide-2.20170805-r2.ebuild 277 SHA256 9761eaaf71ecccd2e107e7cb4538619c09d78e80e239d4bf4a6c61b29b6704cf SHA512 b28dc9ff0d0a7346d5a4f0c4c928a99b3caf9dac44479fa7b055d12f21fdbc101fb70317e78e07d7546ed61a8668d3cc16982d3f2c1e330f266e1e8cdd296a58 WHIRLPOOL 2713d738a62fc12d9ee0cb2094c251a7ba844921ebb5e7b0b0648200e5a09f2fecb1b6da9620b2453fad7d3aee31b78d575e8ab1f158c6db895a676eb30783a6
-EBUILD selinux-aide-9999.ebuild 279 SHA256 3dc475ce9be10e874eaa1a9d6b24784feb35fde5543ca72fd5e951dc20b05f0d SHA512 d9c734246d6b0a27724708f658e4d7f230ca1ae84d62da3627ce30aa993faa3615301f6eaa26edcff54763edd3eede6479ba40464fda2e02cf3d4147b9f504c9 WHIRLPOOL 29506e593776f9f05462cf74e477ea24e50c8c4e957272660ac7c14a08db19b0c47143b4e5f6f7077f81a0a669587713cef4b57bbccef864f19828250bcb6385
+EBUILD selinux-aide-2.20170204-r1.ebuild 280 SHA256 3e539211899756ab447caec709e1b4926d3b8adcaaa8a29fea90c44c4ad10dc4 SHA512 ad0739aed3be03055247b22fcb0d11ce645139e53675e410c26c77bc2cb9582c1b1e2881fc3c30e7fad700cd2851e464cef926a752b6c9249166754b8168cb98 WHIRLPOOL 1c679ef4bb5ac7036931dd3515975e1698c7014e45edc86d262d0b0eff755f79a15b9f22925b9020ce4bcb2d71a512ede8d58ea6b1b0bc2b09080bf2cb538779
+EBUILD selinux-aide-2.20170204-r2.ebuild 278 SHA256 1e087be25052830ab858a85e74575ea354918b5ed4e223cc64f02573ad4a2a93 SHA512 0ad3e0fb0d064fca7c5ef6654350ca020575a7aafa091ccdf16daa8dddf3b0767a8f7c1734ecaeeb8d7fd334e246db91c740f5b50aef0b88be9a6c9251e933f9 WHIRLPOOL 2cfc35b8d16fcfdbac00232630a5286d39c19874df92626481de13175fe6cdb2826b34d4db8bf671e09917419893078237c0c5a468a89467b913d27754efe769
+EBUILD selinux-aide-2.20170204-r3.ebuild 278 SHA256 1e087be25052830ab858a85e74575ea354918b5ed4e223cc64f02573ad4a2a93 SHA512 0ad3e0fb0d064fca7c5ef6654350ca020575a7aafa091ccdf16daa8dddf3b0767a8f7c1734ecaeeb8d7fd334e246db91c740f5b50aef0b88be9a6c9251e933f9 WHIRLPOOL 2cfc35b8d16fcfdbac00232630a5286d39c19874df92626481de13175fe6cdb2826b34d4db8bf671e09917419893078237c0c5a468a89467b913d27754efe769
+EBUILD selinux-aide-2.20170204-r4.ebuild 278 SHA256 1e087be25052830ab858a85e74575ea354918b5ed4e223cc64f02573ad4a2a93 SHA512 0ad3e0fb0d064fca7c5ef6654350ca020575a7aafa091ccdf16daa8dddf3b0767a8f7c1734ecaeeb8d7fd334e246db91c740f5b50aef0b88be9a6c9251e933f9 WHIRLPOOL 2cfc35b8d16fcfdbac00232630a5286d39c19874df92626481de13175fe6cdb2826b34d4db8bf671e09917419893078237c0c5a468a89467b913d27754efe769
+EBUILD selinux-aide-2.20170805-r2.ebuild 278 SHA256 1e087be25052830ab858a85e74575ea354918b5ed4e223cc64f02573ad4a2a93 SHA512 0ad3e0fb0d064fca7c5ef6654350ca020575a7aafa091ccdf16daa8dddf3b0767a8f7c1734ecaeeb8d7fd334e246db91c740f5b50aef0b88be9a6c9251e933f9 WHIRLPOOL 2cfc35b8d16fcfdbac00232630a5286d39c19874df92626481de13175fe6cdb2826b34d4db8bf671e09917419893078237c0c5a468a89467b913d27754efe769
+EBUILD selinux-aide-2.20170805-r3.ebuild 280 SHA256 3e539211899756ab447caec709e1b4926d3b8adcaaa8a29fea90c44c4ad10dc4 SHA512 ad0739aed3be03055247b22fcb0d11ce645139e53675e410c26c77bc2cb9582c1b1e2881fc3c30e7fad700cd2851e464cef926a752b6c9249166754b8168cb98 WHIRLPOOL 1c679ef4bb5ac7036931dd3515975e1698c7014e45edc86d262d0b0eff755f79a15b9f22925b9020ce4bcb2d71a512ede8d58ea6b1b0bc2b09080bf2cb538779
+EBUILD selinux-aide-9999.ebuild 280 SHA256 3e539211899756ab447caec709e1b4926d3b8adcaaa8a29fea90c44c4ad10dc4 SHA512 ad0739aed3be03055247b22fcb0d11ce645139e53675e410c26c77bc2cb9582c1b1e2881fc3c30e7fad700cd2851e464cef926a752b6c9249166754b8168cb98 WHIRLPOOL 1c679ef4bb5ac7036931dd3515975e1698c7014e45edc86d262d0b0eff755f79a15b9f22925b9020ce4bcb2d71a512ede8d58ea6b1b0bc2b09080bf2cb538779
 MISC ChangeLog 10387 SHA256 cf6ecb07144d8a26e8f52dae2edb20f230232ad4a89de35013bb382751f225ae SHA512 d50f211757f13bd03f7a4af951661869e3fabe6d73a35fbd7511e8e0c4a6eaf154828b4c67953ac1cd04479a779e0508f01dfdfaff78a068fa26f31da8d92072 WHIRLPOOL 030553eb604272ad1107c7a99b0196231032bbe9a6f672240037215519f2aab0c726052c6df9933c150449adfc4c8e4c6d1b9b097cbf5439d2a4d8d7d154573f
 MISC ChangeLog-2015 9632 SHA256 601417d0db7d8e4c54abb2b971fbaeff59408c4b602761ebdea78154bbdbea86 SHA512 50b36c0e507f0042c28ac97b3801e3f7011c00a5f1c5da96fce693394b884a351a7bcf0e096d41ce118fad58748f17f21e7bb40ee8f1287b7649f0c7ec2a7771 WHIRLPOOL 736e925820afcd63fc17dc6725442afad49e2e3536b2fcf1acaedbc8a8a6063c5ea0556925ad6b1638f4cedfa5995010fba877e8e3caaee13b39d429b28b8e58
 MISC metadata.xml 314 SHA256 d4d2cbea817dc7f3b4301d23579d9a0fdb619d3b16ab2c6c5cd76418d1ca7db5 SHA512 3ae94807091069e074f1efdd413a2acb748d0cae2f5ac3edaa1469536aebf9f8c1125298696dbaa50a48ee6ca1f212cf5e02c7ec2664b48633a2f345e4c5421d WHIRLPOOL 493aab0799b9ab2593194a318248edb6b28b980051f8a669d7378d290d267ed7f366a3185a8f452658bc8a95fd360a2bbcc27b6abfcc439fb1356a9abbc28ed3
diff --git a/sec-policy/selinux-aide/selinux-aide-2.20170204-r1.ebuild b/sec-policy/selinux-aide/selinux-aide-2.20170204-r1.ebuild
index 7df49b7d78dd..1788dc1864f5 100644
--- a/sec-policy/selinux-aide/selinux-aide-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-aide/selinux-aide-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-aide/selinux-aide-2.20170204-r2.ebuild b/sec-policy/selinux-aide/selinux-aide-2.20170204-r2.ebuild
index 2f5a49b24458..e0a1e68af6e4 100644
--- a/sec-policy/selinux-aide/selinux-aide-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-aide/selinux-aide-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-aide/selinux-aide-2.20170204-r3.ebuild b/sec-policy/selinux-aide/selinux-aide-2.20170204-r3.ebuild
index 2f5a49b24458..e0a1e68af6e4 100644
--- a/sec-policy/selinux-aide/selinux-aide-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-aide/selinux-aide-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-aide/selinux-aide-2.20170204-r4.ebuild b/sec-policy/selinux-aide/selinux-aide-2.20170204-r4.ebuild
index 2f5a49b24458..e0a1e68af6e4 100644
--- a/sec-policy/selinux-aide/selinux-aide-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-aide/selinux-aide-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-aide/selinux-aide-2.20170805-r2.ebuild b/sec-policy/selinux-aide/selinux-aide-2.20170805-r2.ebuild
index 2f5a49b24458..e0a1e68af6e4 100644
--- a/sec-policy/selinux-aide/selinux-aide-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-aide/selinux-aide-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-aide/selinux-aide-2.20170805-r3.ebuild b/sec-policy/selinux-aide/selinux-aide-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..1788dc1864f5
--- /dev/null
+++ b/sec-policy/selinux-aide/selinux-aide-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-aide/selinux-aide-9999.ebuild b/sec-policy/selinux-aide/selinux-aide-9999.ebuild
index 7df49b7d78dd..1788dc1864f5 100644
--- a/sec-policy/selinux-aide/selinux-aide-9999.ebuild
+++ b/sec-policy/selinux-aide/selinux-aide-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-alsa/Manifest b/sec-policy/selinux-alsa/Manifest
index c828c7588658..0952d2d6f32a 100644
--- a/sec-policy/selinux-alsa/Manifest
+++ b/sec-policy/selinux-alsa/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-alsa-2.20170204-r1.ebuild 279 SHA256 c77be21260b7fef572deaf2b378b90d628921c494c187bbe731b62c26cbe5efa SHA512 da95c943ff1611b2f5aad4ae76faef81e51a2368205551b3920989163774f3aca8f0a694b8808bbf01cf0e24475e4bbc1cc7299e482dfb6097daf83b41db182f WHIRLPOOL 469a6ee2ec436c09bb1542f45f0d0b3575e14275ee197ecd353a9dd6a568ce48fd72f19df1e51c803cd7ef75f30f6b5419b8d64ae1489adaf6afe479a2cd843b
-EBUILD selinux-alsa-2.20170204-r2.ebuild 277 SHA256 be46a54e1fef819998620a8ade3bdcf33debd935f65049419fa3da866fb3ce6f SHA512 d1902936de4b5010768ef07ffd54c0471947362679cefdeaaad2e0c133abf5854bd5614193bc5dd3fe494f0e8296a94d616063ac14869e5d100f01ade38ebcac WHIRLPOOL 981c392e0a77f41b97de89a650860a56ebc713b1faeb03d9bced909827ec1d47084474318914d293556efcf8dadc5e2d86a56c3a83282e55bb815126bcba721e
-EBUILD selinux-alsa-2.20170204-r3.ebuild 277 SHA256 be46a54e1fef819998620a8ade3bdcf33debd935f65049419fa3da866fb3ce6f SHA512 d1902936de4b5010768ef07ffd54c0471947362679cefdeaaad2e0c133abf5854bd5614193bc5dd3fe494f0e8296a94d616063ac14869e5d100f01ade38ebcac WHIRLPOOL 981c392e0a77f41b97de89a650860a56ebc713b1faeb03d9bced909827ec1d47084474318914d293556efcf8dadc5e2d86a56c3a83282e55bb815126bcba721e
-EBUILD selinux-alsa-2.20170204-r4.ebuild 277 SHA256 be46a54e1fef819998620a8ade3bdcf33debd935f65049419fa3da866fb3ce6f SHA512 d1902936de4b5010768ef07ffd54c0471947362679cefdeaaad2e0c133abf5854bd5614193bc5dd3fe494f0e8296a94d616063ac14869e5d100f01ade38ebcac WHIRLPOOL 981c392e0a77f41b97de89a650860a56ebc713b1faeb03d9bced909827ec1d47084474318914d293556efcf8dadc5e2d86a56c3a83282e55bb815126bcba721e
-EBUILD selinux-alsa-2.20170805-r2.ebuild 277 SHA256 be46a54e1fef819998620a8ade3bdcf33debd935f65049419fa3da866fb3ce6f SHA512 d1902936de4b5010768ef07ffd54c0471947362679cefdeaaad2e0c133abf5854bd5614193bc5dd3fe494f0e8296a94d616063ac14869e5d100f01ade38ebcac WHIRLPOOL 981c392e0a77f41b97de89a650860a56ebc713b1faeb03d9bced909827ec1d47084474318914d293556efcf8dadc5e2d86a56c3a83282e55bb815126bcba721e
-EBUILD selinux-alsa-9999.ebuild 279 SHA256 c77be21260b7fef572deaf2b378b90d628921c494c187bbe731b62c26cbe5efa SHA512 da95c943ff1611b2f5aad4ae76faef81e51a2368205551b3920989163774f3aca8f0a694b8808bbf01cf0e24475e4bbc1cc7299e482dfb6097daf83b41db182f WHIRLPOOL 469a6ee2ec436c09bb1542f45f0d0b3575e14275ee197ecd353a9dd6a568ce48fd72f19df1e51c803cd7ef75f30f6b5419b8d64ae1489adaf6afe479a2cd843b
+EBUILD selinux-alsa-2.20170204-r1.ebuild 280 SHA256 4b68624555a93db6889f59c1b57a628bacbce691df9fc1579745af7f15ac25a8 SHA512 3674a694f9763e43a752bf2a2707d509451a52175b91d60a186280363ec7adc66a73980ab36045b536e2ee3e95455799c0c38a63912163e9e40569e9024bc6ea WHIRLPOOL 7883243554495dc1651ab779bba89c7651dbc7d890c805770fde3dfd2a9205aa5615638b35e21bf89426c7263693cf29f23b11e8f2e1a47e66a3a08ec6572172
+EBUILD selinux-alsa-2.20170204-r2.ebuild 278 SHA256 ebed39f9420918fc4d5c3c6363e8bc76985447a18db40f6e3d568e870dd0a7d3 SHA512 7ec518ad0e13fa68e76b75b3f67701157104e80ef13249950ed497b697b79306d019655b71957de0cbb20c182964ff84f7541c7bc2a0e24174c0923266fd7d61 WHIRLPOOL 69e744154baf2508b64d4a715e6e96bc23b8aaa930d6c713e4c5bdfff09748eb54aa00cbc337213ee9b18c510e2d03b6804009398c2194cb2b13d35ac202dd67
+EBUILD selinux-alsa-2.20170204-r3.ebuild 278 SHA256 ebed39f9420918fc4d5c3c6363e8bc76985447a18db40f6e3d568e870dd0a7d3 SHA512 7ec518ad0e13fa68e76b75b3f67701157104e80ef13249950ed497b697b79306d019655b71957de0cbb20c182964ff84f7541c7bc2a0e24174c0923266fd7d61 WHIRLPOOL 69e744154baf2508b64d4a715e6e96bc23b8aaa930d6c713e4c5bdfff09748eb54aa00cbc337213ee9b18c510e2d03b6804009398c2194cb2b13d35ac202dd67
+EBUILD selinux-alsa-2.20170204-r4.ebuild 278 SHA256 ebed39f9420918fc4d5c3c6363e8bc76985447a18db40f6e3d568e870dd0a7d3 SHA512 7ec518ad0e13fa68e76b75b3f67701157104e80ef13249950ed497b697b79306d019655b71957de0cbb20c182964ff84f7541c7bc2a0e24174c0923266fd7d61 WHIRLPOOL 69e744154baf2508b64d4a715e6e96bc23b8aaa930d6c713e4c5bdfff09748eb54aa00cbc337213ee9b18c510e2d03b6804009398c2194cb2b13d35ac202dd67
+EBUILD selinux-alsa-2.20170805-r2.ebuild 278 SHA256 ebed39f9420918fc4d5c3c6363e8bc76985447a18db40f6e3d568e870dd0a7d3 SHA512 7ec518ad0e13fa68e76b75b3f67701157104e80ef13249950ed497b697b79306d019655b71957de0cbb20c182964ff84f7541c7bc2a0e24174c0923266fd7d61 WHIRLPOOL 69e744154baf2508b64d4a715e6e96bc23b8aaa930d6c713e4c5bdfff09748eb54aa00cbc337213ee9b18c510e2d03b6804009398c2194cb2b13d35ac202dd67
+EBUILD selinux-alsa-2.20170805-r3.ebuild 280 SHA256 4b68624555a93db6889f59c1b57a628bacbce691df9fc1579745af7f15ac25a8 SHA512 3674a694f9763e43a752bf2a2707d509451a52175b91d60a186280363ec7adc66a73980ab36045b536e2ee3e95455799c0c38a63912163e9e40569e9024bc6ea WHIRLPOOL 7883243554495dc1651ab779bba89c7651dbc7d890c805770fde3dfd2a9205aa5615638b35e21bf89426c7263693cf29f23b11e8f2e1a47e66a3a08ec6572172
+EBUILD selinux-alsa-9999.ebuild 280 SHA256 4b68624555a93db6889f59c1b57a628bacbce691df9fc1579745af7f15ac25a8 SHA512 3674a694f9763e43a752bf2a2707d509451a52175b91d60a186280363ec7adc66a73980ab36045b536e2ee3e95455799c0c38a63912163e9e40569e9024bc6ea WHIRLPOOL 7883243554495dc1651ab779bba89c7651dbc7d890c805770fde3dfd2a9205aa5615638b35e21bf89426c7263693cf29f23b11e8f2e1a47e66a3a08ec6572172
 MISC ChangeLog 10387 SHA256 ba5307f7be6a61c2bc6c3a30543b3520af36bb946facca80a1cf72471e144034 SHA512 cfcc0117329b753e17ce809ed76a848668a45f32bb508c70f318a823f27d4b56851babe9aa35b883190225f57e48fbdb67c873b0b2cb67db5f459a1a37377704 WHIRLPOOL b88010c2793d748c5365a70c4c783d8809a83828278b5425740815c13e90e57063f3da6c0becc889b03e590a99a2341c4ebf65ffddb54c1a6eca220f39fec079
 MISC ChangeLog-2015 10073 SHA256 3a60f4d811c4404b8fae4ddac5a0d6e8c8678f92329b042c20cc6ffa310c64d6 SHA512 bb59c1fda405ea5b7c6ad405c636c7433111dc5365599718a895ba495187b51bc0cc421c61bba8e810414ac9c79c23729513fc50eaceaacedc3c5b00abc6770c WHIRLPOOL e29484498331918929ac5973daefb758f55b06c391b13baec131198310113951f974e2966cc5e3c2c1910807a0541dce892a93ce05f904cecd2948f4510063d5
 MISC metadata.xml 314 SHA256 86af43bfe4350fa41fc5acb384017d692f041a7a46fa8774f6a4b46f6a95897a SHA512 dec699cdcba4fb0219f7fb71afbfca634d1a5767121078a206289fda39d33a622f2986064e29f16548290f4ca8aa71150667e92fbb4d799ece93209b2f1967c2 WHIRLPOOL 201c46a47d22d0f7f2961f2abb30b87c446aeea673239b554c9a48ba81ac6489bb0d955392f9e561a5338fac312873c64b5167cb57759098e2d6b06bd2e5d46d
diff --git a/sec-policy/selinux-alsa/selinux-alsa-2.20170204-r1.ebuild b/sec-policy/selinux-alsa/selinux-alsa-2.20170204-r1.ebuild
index b4e25c2b527c..b0c22d727324 100644
--- a/sec-policy/selinux-alsa/selinux-alsa-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-alsa/selinux-alsa-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-alsa/selinux-alsa-2.20170204-r2.ebuild b/sec-policy/selinux-alsa/selinux-alsa-2.20170204-r2.ebuild
index d58820b7f0b7..7779979544f7 100644
--- a/sec-policy/selinux-alsa/selinux-alsa-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-alsa/selinux-alsa-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-alsa/selinux-alsa-2.20170204-r3.ebuild b/sec-policy/selinux-alsa/selinux-alsa-2.20170204-r3.ebuild
index d58820b7f0b7..7779979544f7 100644
--- a/sec-policy/selinux-alsa/selinux-alsa-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-alsa/selinux-alsa-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-alsa/selinux-alsa-2.20170204-r4.ebuild b/sec-policy/selinux-alsa/selinux-alsa-2.20170204-r4.ebuild
index d58820b7f0b7..7779979544f7 100644
--- a/sec-policy/selinux-alsa/selinux-alsa-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-alsa/selinux-alsa-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-alsa/selinux-alsa-2.20170805-r2.ebuild b/sec-policy/selinux-alsa/selinux-alsa-2.20170805-r2.ebuild
index d58820b7f0b7..7779979544f7 100644
--- a/sec-policy/selinux-alsa/selinux-alsa-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-alsa/selinux-alsa-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-alsa/selinux-alsa-2.20170805-r3.ebuild b/sec-policy/selinux-alsa/selinux-alsa-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..b0c22d727324
--- /dev/null
+++ b/sec-policy/selinux-alsa/selinux-alsa-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-alsa/selinux-alsa-9999.ebuild b/sec-policy/selinux-alsa/selinux-alsa-9999.ebuild
index b4e25c2b527c..b0c22d727324 100644
--- a/sec-policy/selinux-alsa/selinux-alsa-9999.ebuild
+++ b/sec-policy/selinux-alsa/selinux-alsa-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-amanda/Manifest b/sec-policy/selinux-amanda/Manifest
index f85d19d284e9..49787f5ef0f7 100644
--- a/sec-policy/selinux-amanda/Manifest
+++ b/sec-policy/selinux-amanda/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-amanda-2.20170204-r1.ebuild 377 SHA256 16df60ca0139a1779bd6b600ee12508df2624925c31318f2789cd0148a264f9e SHA512 a07be98716b427beb46b073bdf7bac2d8c2270d2682c4e1975731108863423b99f05c2571251a221516810a0d7e0ecbc5bee6808669d7be3868e479a5198fb90 WHIRLPOOL 62518fe163a2a4519ff54c8125ce66b9a21472d3f7be870f300fc968e5a8b7fc148d58469b0dfb2a879b20dfeb028fc0e0d64d8bca657350d63bf5cdb626031f
-EBUILD selinux-amanda-2.20170204-r2.ebuild 375 SHA256 c4bdcd46c89860e15d9a2fa79aab61218c133509a763272a09e7423ba95025e7 SHA512 e006f1ff1f5f593a8ea709bf4196fdb9ec927f05838992691d8c53aa9c3d4e6afd2bccc71ca236f530cbe7448158f106c25e8749444b8fb08071a26f5d2ca57a WHIRLPOOL 9ce0f2395a70c5b4e763932a203dea375b82afe54b426fa262e5719b5fefe60ae5f7f2bacdd9acc25cafbda944e1dd36fbeb431f8459f95983498ce854fd9021
-EBUILD selinux-amanda-2.20170204-r3.ebuild 375 SHA256 c4bdcd46c89860e15d9a2fa79aab61218c133509a763272a09e7423ba95025e7 SHA512 e006f1ff1f5f593a8ea709bf4196fdb9ec927f05838992691d8c53aa9c3d4e6afd2bccc71ca236f530cbe7448158f106c25e8749444b8fb08071a26f5d2ca57a WHIRLPOOL 9ce0f2395a70c5b4e763932a203dea375b82afe54b426fa262e5719b5fefe60ae5f7f2bacdd9acc25cafbda944e1dd36fbeb431f8459f95983498ce854fd9021
-EBUILD selinux-amanda-2.20170204-r4.ebuild 375 SHA256 c4bdcd46c89860e15d9a2fa79aab61218c133509a763272a09e7423ba95025e7 SHA512 e006f1ff1f5f593a8ea709bf4196fdb9ec927f05838992691d8c53aa9c3d4e6afd2bccc71ca236f530cbe7448158f106c25e8749444b8fb08071a26f5d2ca57a WHIRLPOOL 9ce0f2395a70c5b4e763932a203dea375b82afe54b426fa262e5719b5fefe60ae5f7f2bacdd9acc25cafbda944e1dd36fbeb431f8459f95983498ce854fd9021
-EBUILD selinux-amanda-2.20170805-r2.ebuild 375 SHA256 c4bdcd46c89860e15d9a2fa79aab61218c133509a763272a09e7423ba95025e7 SHA512 e006f1ff1f5f593a8ea709bf4196fdb9ec927f05838992691d8c53aa9c3d4e6afd2bccc71ca236f530cbe7448158f106c25e8749444b8fb08071a26f5d2ca57a WHIRLPOOL 9ce0f2395a70c5b4e763932a203dea375b82afe54b426fa262e5719b5fefe60ae5f7f2bacdd9acc25cafbda944e1dd36fbeb431f8459f95983498ce854fd9021
-EBUILD selinux-amanda-9999.ebuild 377 SHA256 16df60ca0139a1779bd6b600ee12508df2624925c31318f2789cd0148a264f9e SHA512 a07be98716b427beb46b073bdf7bac2d8c2270d2682c4e1975731108863423b99f05c2571251a221516810a0d7e0ecbc5bee6808669d7be3868e479a5198fb90 WHIRLPOOL 62518fe163a2a4519ff54c8125ce66b9a21472d3f7be870f300fc968e5a8b7fc148d58469b0dfb2a879b20dfeb028fc0e0d64d8bca657350d63bf5cdb626031f
+EBUILD selinux-amanda-2.20170204-r1.ebuild 378 SHA256 131c249dfa5918fdd0f095fde1c20a2334726ed69cc9c93e99bf77c0b9346833 SHA512 c9232febe94e63d87f68d9117dd4c23ad1f8b8ff989c478847d302173208dfe2ebfd3eb23f157d2ea2dcb56d4b2e5bab5e4ed2f9c10bb39849254fda1af08f10 WHIRLPOOL d7ea35228c191f62183267cd040d802619989888bf2e2938191bdc562b2616c43d8108fd18211fefae0c10c12e5d1e2689f56a5c5615726ba2f64238de6ab6c5
+EBUILD selinux-amanda-2.20170204-r2.ebuild 376 SHA256 d79e10088224986e13b9daf7968a0139598d5251b47ef4b013d48327ae6c376d SHA512 3d7966fb334b9804265ec6d1d98bf19f838dbc21766eb4e2c185afaa18d45f256e6a3df2f55b65f69c764c6ee5fc68d328c123c0a8b85705c5ec039eb718c865 WHIRLPOOL 4879d52e5fb85ac999ef6f8f630b00c6b4a72b13e8e039697f297920f722c1d24e866f693bd1f48c163db8dbe8090acdebc795acd6164ad0ff5226a8b03c935c
+EBUILD selinux-amanda-2.20170204-r3.ebuild 376 SHA256 d79e10088224986e13b9daf7968a0139598d5251b47ef4b013d48327ae6c376d SHA512 3d7966fb334b9804265ec6d1d98bf19f838dbc21766eb4e2c185afaa18d45f256e6a3df2f55b65f69c764c6ee5fc68d328c123c0a8b85705c5ec039eb718c865 WHIRLPOOL 4879d52e5fb85ac999ef6f8f630b00c6b4a72b13e8e039697f297920f722c1d24e866f693bd1f48c163db8dbe8090acdebc795acd6164ad0ff5226a8b03c935c
+EBUILD selinux-amanda-2.20170204-r4.ebuild 376 SHA256 d79e10088224986e13b9daf7968a0139598d5251b47ef4b013d48327ae6c376d SHA512 3d7966fb334b9804265ec6d1d98bf19f838dbc21766eb4e2c185afaa18d45f256e6a3df2f55b65f69c764c6ee5fc68d328c123c0a8b85705c5ec039eb718c865 WHIRLPOOL 4879d52e5fb85ac999ef6f8f630b00c6b4a72b13e8e039697f297920f722c1d24e866f693bd1f48c163db8dbe8090acdebc795acd6164ad0ff5226a8b03c935c
+EBUILD selinux-amanda-2.20170805-r2.ebuild 376 SHA256 d79e10088224986e13b9daf7968a0139598d5251b47ef4b013d48327ae6c376d SHA512 3d7966fb334b9804265ec6d1d98bf19f838dbc21766eb4e2c185afaa18d45f256e6a3df2f55b65f69c764c6ee5fc68d328c123c0a8b85705c5ec039eb718c865 WHIRLPOOL 4879d52e5fb85ac999ef6f8f630b00c6b4a72b13e8e039697f297920f722c1d24e866f693bd1f48c163db8dbe8090acdebc795acd6164ad0ff5226a8b03c935c
+EBUILD selinux-amanda-2.20170805-r3.ebuild 378 SHA256 131c249dfa5918fdd0f095fde1c20a2334726ed69cc9c93e99bf77c0b9346833 SHA512 c9232febe94e63d87f68d9117dd4c23ad1f8b8ff989c478847d302173208dfe2ebfd3eb23f157d2ea2dcb56d4b2e5bab5e4ed2f9c10bb39849254fda1af08f10 WHIRLPOOL d7ea35228c191f62183267cd040d802619989888bf2e2938191bdc562b2616c43d8108fd18211fefae0c10c12e5d1e2689f56a5c5615726ba2f64238de6ab6c5
+EBUILD selinux-amanda-9999.ebuild 378 SHA256 131c249dfa5918fdd0f095fde1c20a2334726ed69cc9c93e99bf77c0b9346833 SHA512 c9232febe94e63d87f68d9117dd4c23ad1f8b8ff989c478847d302173208dfe2ebfd3eb23f157d2ea2dcb56d4b2e5bab5e4ed2f9c10bb39849254fda1af08f10 WHIRLPOOL d7ea35228c191f62183267cd040d802619989888bf2e2938191bdc562b2616c43d8108fd18211fefae0c10c12e5d1e2689f56a5c5615726ba2f64238de6ab6c5
 MISC ChangeLog 10571 SHA256 bdd7245a9c5340372f4c86ce366672b420fc84b1500b47a3914c93a27fdb0fc6 SHA512 a3254372d9f8553d33462813db54bb7b899a8d098cb298c609a1ab1bd09c7ec73acf5a91a7421a37e6cadb45a94b30ddc968cee93204d38048bc2ccc8db80ece WHIRLPOOL 4305ac5da41a707361b7536a4de0fe3b6424f95ed37b64a063417bb7730191f3b5564236863370fcfd1d58a226450142c14e0eec45cd2dbb864d817385517e27
 MISC ChangeLog-2015 10315 SHA256 850e77697218b6ff0adf3d6440d895f8f276b6b30025520958d5505cb0952ca4 SHA512 abb78b9be8713b3c2fffb187ab2335b8c822a35d894a832df80c7e22a4b80d121486ea9108d8fdf17919f9871d00ebfdd5de902e3544dec941add3f85f479de7 WHIRLPOOL 0b6a62e6031366f661654fa2a4581748104ef3869ea6fc0e04a80ee0c39f4d7ce077a5445929a8e07e2b5e6091ac3f937b05f72844781c1f0ccf44756bef52bd
 MISC metadata.xml 316 SHA256 9cf0b977346b07c6ea517c00fd0fb8887031c81884b32e858a4217b9fd5c1ca1 SHA512 175f419f4f7218403e30c562aea9be81f919761be0aec6ff0e931328e2f4b0c260f80f1ef9d883507e86fb749e73049fdd45d30851df3eee7ad0c915d0e89284 WHIRLPOOL 08d9bafd154bc000d43183c8cfb3dd3d5edac9a257a96324031268140c59b63bebe3578bf1ba0ea2d16231eb0e75155c7921bc66ec96f9bb4ddbfd08f79b5640
diff --git a/sec-policy/selinux-amanda/selinux-amanda-2.20170204-r1.ebuild b/sec-policy/selinux-amanda/selinux-amanda-2.20170204-r1.ebuild
index b92f21ceff2e..852ae5b812fb 100644
--- a/sec-policy/selinux-amanda/selinux-amanda-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-amanda/selinux-amanda-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-amanda/selinux-amanda-2.20170204-r2.ebuild b/sec-policy/selinux-amanda/selinux-amanda-2.20170204-r2.ebuild
index 73507480e9ee..009f7e3b1e9a 100644
--- a/sec-policy/selinux-amanda/selinux-amanda-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-amanda/selinux-amanda-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-amanda/selinux-amanda-2.20170204-r3.ebuild b/sec-policy/selinux-amanda/selinux-amanda-2.20170204-r3.ebuild
index 73507480e9ee..009f7e3b1e9a 100644
--- a/sec-policy/selinux-amanda/selinux-amanda-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-amanda/selinux-amanda-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-amanda/selinux-amanda-2.20170204-r4.ebuild b/sec-policy/selinux-amanda/selinux-amanda-2.20170204-r4.ebuild
index 73507480e9ee..009f7e3b1e9a 100644
--- a/sec-policy/selinux-amanda/selinux-amanda-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-amanda/selinux-amanda-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-amanda/selinux-amanda-2.20170805-r2.ebuild b/sec-policy/selinux-amanda/selinux-amanda-2.20170805-r2.ebuild
index 73507480e9ee..009f7e3b1e9a 100644
--- a/sec-policy/selinux-amanda/selinux-amanda-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-amanda/selinux-amanda-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-amanda/selinux-amanda-2.20170805-r3.ebuild b/sec-policy/selinux-amanda/selinux-amanda-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..852ae5b812fb
--- /dev/null
+++ b/sec-policy/selinux-amanda/selinux-amanda-2.20170805-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-amanda/selinux-amanda-9999.ebuild b/sec-policy/selinux-amanda/selinux-amanda-9999.ebuild
index b92f21ceff2e..852ae5b812fb 100644
--- a/sec-policy/selinux-amanda/selinux-amanda-9999.ebuild
+++ b/sec-policy/selinux-amanda/selinux-amanda-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-amavis/Manifest b/sec-policy/selinux-amavis/Manifest
index cd77d238a88a..5cd505e38e12 100644
--- a/sec-policy/selinux-amavis/Manifest
+++ b/sec-policy/selinux-amavis/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-amavis-2.20170204-r1.ebuild 283 SHA256 bad6dbe17f96ef23c196d54a5a893987adccf4c76c6ebec085153ea10c35d85d SHA512 b04aa998731e440d618340f4c2f3360e0f31988da1dba5e56876e9c3139d44ae2d5afebba10af9a0e635a832f8c0e3b49d0c23dea65907341ed202508c223f1f WHIRLPOOL 242c42cb1f5830173dc324add685723d3a2f20d893283b0a5221448be3e2eda1f54ae93b00979c503be704f6b4d588f966374c91e9f0e0ce9344a0fd54490956
-EBUILD selinux-amavis-2.20170204-r2.ebuild 281 SHA256 c9d0f907958045e209b7d533fd999fb74b3a3aec249136b28764bc6f8677891e SHA512 c590e802d1a5e412d742ab83eb9c7164b623878f49d2676eb33a58a8e96eb29ec57b461faa014f0e443c0aefb86f729c805aec7df7105362d9df38774e04c83c WHIRLPOOL 7ee0c7f1eb3c947ce9be0079e20ff4055684d019c39d3b3de1373c912cce481873180387cf83e67ffbf7e0490f676dea6af9bd40594b284fe9e7c4fb87917a9d
-EBUILD selinux-amavis-2.20170204-r3.ebuild 281 SHA256 c9d0f907958045e209b7d533fd999fb74b3a3aec249136b28764bc6f8677891e SHA512 c590e802d1a5e412d742ab83eb9c7164b623878f49d2676eb33a58a8e96eb29ec57b461faa014f0e443c0aefb86f729c805aec7df7105362d9df38774e04c83c WHIRLPOOL 7ee0c7f1eb3c947ce9be0079e20ff4055684d019c39d3b3de1373c912cce481873180387cf83e67ffbf7e0490f676dea6af9bd40594b284fe9e7c4fb87917a9d
-EBUILD selinux-amavis-2.20170204-r4.ebuild 281 SHA256 c9d0f907958045e209b7d533fd999fb74b3a3aec249136b28764bc6f8677891e SHA512 c590e802d1a5e412d742ab83eb9c7164b623878f49d2676eb33a58a8e96eb29ec57b461faa014f0e443c0aefb86f729c805aec7df7105362d9df38774e04c83c WHIRLPOOL 7ee0c7f1eb3c947ce9be0079e20ff4055684d019c39d3b3de1373c912cce481873180387cf83e67ffbf7e0490f676dea6af9bd40594b284fe9e7c4fb87917a9d
-EBUILD selinux-amavis-2.20170805-r2.ebuild 281 SHA256 c9d0f907958045e209b7d533fd999fb74b3a3aec249136b28764bc6f8677891e SHA512 c590e802d1a5e412d742ab83eb9c7164b623878f49d2676eb33a58a8e96eb29ec57b461faa014f0e443c0aefb86f729c805aec7df7105362d9df38774e04c83c WHIRLPOOL 7ee0c7f1eb3c947ce9be0079e20ff4055684d019c39d3b3de1373c912cce481873180387cf83e67ffbf7e0490f676dea6af9bd40594b284fe9e7c4fb87917a9d
-EBUILD selinux-amavis-9999.ebuild 283 SHA256 bad6dbe17f96ef23c196d54a5a893987adccf4c76c6ebec085153ea10c35d85d SHA512 b04aa998731e440d618340f4c2f3360e0f31988da1dba5e56876e9c3139d44ae2d5afebba10af9a0e635a832f8c0e3b49d0c23dea65907341ed202508c223f1f WHIRLPOOL 242c42cb1f5830173dc324add685723d3a2f20d893283b0a5221448be3e2eda1f54ae93b00979c503be704f6b4d588f966374c91e9f0e0ce9344a0fd54490956
+EBUILD selinux-amavis-2.20170204-r1.ebuild 284 SHA256 f0faa71a22fd9cd8b78dbb9d3e9d740b04f795d2e783cfc1a8a73f64353daf24 SHA512 886df583cbb9d96132651e58a92487acfe62a58985de5ab51f03f740c91b3db9c8d5a1010a28718c8ff6e0ad997506b479ca46f705c3ff7e94c3da764154ded7 WHIRLPOOL 0512853fb5800ecf3602b83c2ff1ea1911c5633fd88a5ed5bca662210c0ff385157b303c51d03d2e53592e79ae01cc6369c51238db17b5f7e6d1d02e9e952ab5
+EBUILD selinux-amavis-2.20170204-r2.ebuild 282 SHA256 e2737dbb5cf73359935487bada2e60917074fb7cca19d4b0ecea96c96611b8bd SHA512 b9c77582980466ae78e87cfaf21b909c507e048fa54072ba1d0c25567b07c0d2bd0368a178e7605a5d5faae8d04831f062a1941de2b15dc38d72d619a4337adc WHIRLPOOL 78b74f2b55aace8d3815bc0f67843a6765071c79c46c2e0220ad73bd9ac4aedadb3f84b9ce8bd5ae59ce4cb0b2bfb871893fe3230df85e39e29b47a9721a5c0f
+EBUILD selinux-amavis-2.20170204-r3.ebuild 282 SHA256 e2737dbb5cf73359935487bada2e60917074fb7cca19d4b0ecea96c96611b8bd SHA512 b9c77582980466ae78e87cfaf21b909c507e048fa54072ba1d0c25567b07c0d2bd0368a178e7605a5d5faae8d04831f062a1941de2b15dc38d72d619a4337adc WHIRLPOOL 78b74f2b55aace8d3815bc0f67843a6765071c79c46c2e0220ad73bd9ac4aedadb3f84b9ce8bd5ae59ce4cb0b2bfb871893fe3230df85e39e29b47a9721a5c0f
+EBUILD selinux-amavis-2.20170204-r4.ebuild 282 SHA256 e2737dbb5cf73359935487bada2e60917074fb7cca19d4b0ecea96c96611b8bd SHA512 b9c77582980466ae78e87cfaf21b909c507e048fa54072ba1d0c25567b07c0d2bd0368a178e7605a5d5faae8d04831f062a1941de2b15dc38d72d619a4337adc WHIRLPOOL 78b74f2b55aace8d3815bc0f67843a6765071c79c46c2e0220ad73bd9ac4aedadb3f84b9ce8bd5ae59ce4cb0b2bfb871893fe3230df85e39e29b47a9721a5c0f
+EBUILD selinux-amavis-2.20170805-r2.ebuild 282 SHA256 e2737dbb5cf73359935487bada2e60917074fb7cca19d4b0ecea96c96611b8bd SHA512 b9c77582980466ae78e87cfaf21b909c507e048fa54072ba1d0c25567b07c0d2bd0368a178e7605a5d5faae8d04831f062a1941de2b15dc38d72d619a4337adc WHIRLPOOL 78b74f2b55aace8d3815bc0f67843a6765071c79c46c2e0220ad73bd9ac4aedadb3f84b9ce8bd5ae59ce4cb0b2bfb871893fe3230df85e39e29b47a9721a5c0f
+EBUILD selinux-amavis-2.20170805-r3.ebuild 284 SHA256 f0faa71a22fd9cd8b78dbb9d3e9d740b04f795d2e783cfc1a8a73f64353daf24 SHA512 886df583cbb9d96132651e58a92487acfe62a58985de5ab51f03f740c91b3db9c8d5a1010a28718c8ff6e0ad997506b479ca46f705c3ff7e94c3da764154ded7 WHIRLPOOL 0512853fb5800ecf3602b83c2ff1ea1911c5633fd88a5ed5bca662210c0ff385157b303c51d03d2e53592e79ae01cc6369c51238db17b5f7e6d1d02e9e952ab5
+EBUILD selinux-amavis-9999.ebuild 284 SHA256 f0faa71a22fd9cd8b78dbb9d3e9d740b04f795d2e783cfc1a8a73f64353daf24 SHA512 886df583cbb9d96132651e58a92487acfe62a58985de5ab51f03f740c91b3db9c8d5a1010a28718c8ff6e0ad997506b479ca46f705c3ff7e94c3da764154ded7 WHIRLPOOL 0512853fb5800ecf3602b83c2ff1ea1911c5633fd88a5ed5bca662210c0ff385157b303c51d03d2e53592e79ae01cc6369c51238db17b5f7e6d1d02e9e952ab5
 MISC ChangeLog 10571 SHA256 d90e839ceafab32c9193ad04f4fcc154c3cdfb917f647dd43632dcd2489cd2ba SHA512 12776eb661924f947b0be3ab65a226277920fbef148e319720a8b48ff9c0b5c62aebe86b241c0b847632c9e0a9c2a0d2ac44ef5e204ff6982c0450f2074c6a48 WHIRLPOOL 4ea8afa67637516146703c61d665252d402939b2ab3073be2aa0311c8d9fbe2783aa86a13fdaefaf79ed2e228bf19245ade7d33ca83a6b797f9fc877a1ae8076
 MISC ChangeLog-2015 10674 SHA256 60b7ea1ae3fc3890e47ea2737dc763d55c9e713f0df4be62819836618809c4af SHA512 6a6b60cb0f637bb86b6cfe65fc9eb24ca9154decd300d7ab003b0cdf2951c3dbd756de21f45b6155cbd4dec1cf66f2ff194dfbae96c1641de27e390f2279a671 WHIRLPOOL 442e626ca9ae664ac1ce320cc3b2da89be63aa521c46ba166bacf56ec81200a2233e43249c12b7d85a1639d85872a194ec71d12a9a4f0c2cc7d7adfb6caafb05
 MISC metadata.xml 316 SHA256 8085cabccd3227b7e43d2fd9329ad97dc8016000d7efa28600942ae83ea11bb3 SHA512 fe718a2ad4043b9e7a44e68158c792a8f27f604632640d186fdedc222e3d6c9c74cbcb5e39e443df698aa33ba699e7d056974843e62b9f9616524dc718f5965b WHIRLPOOL 4f7ed7feeed9e2c02e46dd86e5f378f77d8bc84f1b07263f4ca860f777b610909b5f2a7a09de8394dc86861da1124fc3a00f1c3d8bfbd563082ca467813bed8d
diff --git a/sec-policy/selinux-amavis/selinux-amavis-2.20170204-r1.ebuild b/sec-policy/selinux-amavis/selinux-amavis-2.20170204-r1.ebuild
index c304b0d0eaf4..965eab088ddd 100644
--- a/sec-policy/selinux-amavis/selinux-amavis-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-amavis/selinux-amavis-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-amavis/selinux-amavis-2.20170204-r2.ebuild b/sec-policy/selinux-amavis/selinux-amavis-2.20170204-r2.ebuild
index ec1b48788de2..d960edbb1189 100644
--- a/sec-policy/selinux-amavis/selinux-amavis-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-amavis/selinux-amavis-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-amavis/selinux-amavis-2.20170204-r3.ebuild b/sec-policy/selinux-amavis/selinux-amavis-2.20170204-r3.ebuild
index ec1b48788de2..d960edbb1189 100644
--- a/sec-policy/selinux-amavis/selinux-amavis-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-amavis/selinux-amavis-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-amavis/selinux-amavis-2.20170204-r4.ebuild b/sec-policy/selinux-amavis/selinux-amavis-2.20170204-r4.ebuild
index ec1b48788de2..d960edbb1189 100644
--- a/sec-policy/selinux-amavis/selinux-amavis-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-amavis/selinux-amavis-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-amavis/selinux-amavis-2.20170805-r2.ebuild b/sec-policy/selinux-amavis/selinux-amavis-2.20170805-r2.ebuild
index ec1b48788de2..d960edbb1189 100644
--- a/sec-policy/selinux-amavis/selinux-amavis-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-amavis/selinux-amavis-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-amavis/selinux-amavis-2.20170805-r3.ebuild b/sec-policy/selinux-amavis/selinux-amavis-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..965eab088ddd
--- /dev/null
+++ b/sec-policy/selinux-amavis/selinux-amavis-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-amavis/selinux-amavis-9999.ebuild b/sec-policy/selinux-amavis/selinux-amavis-9999.ebuild
index c304b0d0eaf4..965eab088ddd 100644
--- a/sec-policy/selinux-amavis/selinux-amavis-9999.ebuild
+++ b/sec-policy/selinux-amavis/selinux-amavis-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-android/Manifest b/sec-policy/selinux-android/Manifest
index 4c0c38bdde0e..53f778dbe70a 100644
--- a/sec-policy/selinux-android/Manifest
+++ b/sec-policy/selinux-android/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-android-2.20170204-r1.ebuild 434 SHA256 9b617829a9a9630ba2a08e858b239d984f8c1d1536a6c2091d1a62e8499e71cc SHA512 7ce4e9f90f8cf2dde45a846e7f41344c104cb51e028029c2e7f44da2f2caad196cdd5d3221378a2667751c3952d3e25fc764f6f059407b2f17a7230c2f8bcc5f WHIRLPOOL 8cedff24f54efb176385517e9849b6a2898896af5f37bbefecadb7c1cd81555a303552dcd9195d6be6ae1ef0f4034559f04c591c229b5cc68f1d3f347b20aa6c
-EBUILD selinux-android-2.20170204-r2.ebuild 432 SHA256 6926bd8a7d5b9d8e2eaa4858755ee0c5dda4d4f6c2c0b50648640d43413a725f SHA512 b4712f26067dfa384a3a0f7fbc14b2a9edc87acbcc63697c38715fbb3a0f3b83d28794a0528dfc1c417bdd516d9051d68b933efb34654eec4133d1f89707da78 WHIRLPOOL 81a967b7d798bac33ee8865e6f4217ed636e5b896349b4113869db53acb47b7d8bbf9da6a508fd7c035864430d79ad65bdc853fd9d1e3b619f215388d17c366d
-EBUILD selinux-android-2.20170204-r3.ebuild 432 SHA256 6926bd8a7d5b9d8e2eaa4858755ee0c5dda4d4f6c2c0b50648640d43413a725f SHA512 b4712f26067dfa384a3a0f7fbc14b2a9edc87acbcc63697c38715fbb3a0f3b83d28794a0528dfc1c417bdd516d9051d68b933efb34654eec4133d1f89707da78 WHIRLPOOL 81a967b7d798bac33ee8865e6f4217ed636e5b896349b4113869db53acb47b7d8bbf9da6a508fd7c035864430d79ad65bdc853fd9d1e3b619f215388d17c366d
-EBUILD selinux-android-2.20170204-r4.ebuild 432 SHA256 6926bd8a7d5b9d8e2eaa4858755ee0c5dda4d4f6c2c0b50648640d43413a725f SHA512 b4712f26067dfa384a3a0f7fbc14b2a9edc87acbcc63697c38715fbb3a0f3b83d28794a0528dfc1c417bdd516d9051d68b933efb34654eec4133d1f89707da78 WHIRLPOOL 81a967b7d798bac33ee8865e6f4217ed636e5b896349b4113869db53acb47b7d8bbf9da6a508fd7c035864430d79ad65bdc853fd9d1e3b619f215388d17c366d
-EBUILD selinux-android-2.20170805-r2.ebuild 432 SHA256 6926bd8a7d5b9d8e2eaa4858755ee0c5dda4d4f6c2c0b50648640d43413a725f SHA512 b4712f26067dfa384a3a0f7fbc14b2a9edc87acbcc63697c38715fbb3a0f3b83d28794a0528dfc1c417bdd516d9051d68b933efb34654eec4133d1f89707da78 WHIRLPOOL 81a967b7d798bac33ee8865e6f4217ed636e5b896349b4113869db53acb47b7d8bbf9da6a508fd7c035864430d79ad65bdc853fd9d1e3b619f215388d17c366d
-EBUILD selinux-android-9999.ebuild 434 SHA256 9b617829a9a9630ba2a08e858b239d984f8c1d1536a6c2091d1a62e8499e71cc SHA512 7ce4e9f90f8cf2dde45a846e7f41344c104cb51e028029c2e7f44da2f2caad196cdd5d3221378a2667751c3952d3e25fc764f6f059407b2f17a7230c2f8bcc5f WHIRLPOOL 8cedff24f54efb176385517e9849b6a2898896af5f37bbefecadb7c1cd81555a303552dcd9195d6be6ae1ef0f4034559f04c591c229b5cc68f1d3f347b20aa6c
+EBUILD selinux-android-2.20170204-r1.ebuild 435 SHA256 03c8671a873d7f8af148e471fd8ac517178eb04dba29794bb4d1c49452d7513e SHA512 0814b60ee0f7846b2331d0d509bedd45f0a49d9194fac9a60bda177d942f68aca68b313a97182e5deb07d1b7f523ad86979a5e65c189c97374b94ce651e69a76 WHIRLPOOL e2804542088a9f29375d715190e30e7d876f6ca789bc0e2b9f8a3e79042a9e3f3a6783d3a87028d30b23dd8f3a72f18f556948aff736a158e343545adba991b8
+EBUILD selinux-android-2.20170204-r2.ebuild 433 SHA256 ed06e0ddd27cee07c05bdff00b165d4bbf762a14e5173ea0ed88c27f13fbbf72 SHA512 33dfa31a5b903babf01005a7415a332fe5e9bf3525c78f197ee6fea0b7b1dcfd7f37d542fb94b924b34099ee979fd62004c5b52c419ac0f0d70b3064c294a4a2 WHIRLPOOL 0833efd3994c821447a43b3b7060c37b55f69b1d4b38e308d9f68dc1b63736095087e2af63bc329d091a270cbbc815519935ea839024544abd633a38be0b0ede
+EBUILD selinux-android-2.20170204-r3.ebuild 433 SHA256 ed06e0ddd27cee07c05bdff00b165d4bbf762a14e5173ea0ed88c27f13fbbf72 SHA512 33dfa31a5b903babf01005a7415a332fe5e9bf3525c78f197ee6fea0b7b1dcfd7f37d542fb94b924b34099ee979fd62004c5b52c419ac0f0d70b3064c294a4a2 WHIRLPOOL 0833efd3994c821447a43b3b7060c37b55f69b1d4b38e308d9f68dc1b63736095087e2af63bc329d091a270cbbc815519935ea839024544abd633a38be0b0ede
+EBUILD selinux-android-2.20170204-r4.ebuild 433 SHA256 ed06e0ddd27cee07c05bdff00b165d4bbf762a14e5173ea0ed88c27f13fbbf72 SHA512 33dfa31a5b903babf01005a7415a332fe5e9bf3525c78f197ee6fea0b7b1dcfd7f37d542fb94b924b34099ee979fd62004c5b52c419ac0f0d70b3064c294a4a2 WHIRLPOOL 0833efd3994c821447a43b3b7060c37b55f69b1d4b38e308d9f68dc1b63736095087e2af63bc329d091a270cbbc815519935ea839024544abd633a38be0b0ede
+EBUILD selinux-android-2.20170805-r2.ebuild 433 SHA256 ed06e0ddd27cee07c05bdff00b165d4bbf762a14e5173ea0ed88c27f13fbbf72 SHA512 33dfa31a5b903babf01005a7415a332fe5e9bf3525c78f197ee6fea0b7b1dcfd7f37d542fb94b924b34099ee979fd62004c5b52c419ac0f0d70b3064c294a4a2 WHIRLPOOL 0833efd3994c821447a43b3b7060c37b55f69b1d4b38e308d9f68dc1b63736095087e2af63bc329d091a270cbbc815519935ea839024544abd633a38be0b0ede
+EBUILD selinux-android-2.20170805-r3.ebuild 435 SHA256 03c8671a873d7f8af148e471fd8ac517178eb04dba29794bb4d1c49452d7513e SHA512 0814b60ee0f7846b2331d0d509bedd45f0a49d9194fac9a60bda177d942f68aca68b313a97182e5deb07d1b7f523ad86979a5e65c189c97374b94ce651e69a76 WHIRLPOOL e2804542088a9f29375d715190e30e7d876f6ca789bc0e2b9f8a3e79042a9e3f3a6783d3a87028d30b23dd8f3a72f18f556948aff736a158e343545adba991b8
+EBUILD selinux-android-9999.ebuild 435 SHA256 03c8671a873d7f8af148e471fd8ac517178eb04dba29794bb4d1c49452d7513e SHA512 0814b60ee0f7846b2331d0d509bedd45f0a49d9194fac9a60bda177d942f68aca68b313a97182e5deb07d1b7f523ad86979a5e65c189c97374b94ce651e69a76 WHIRLPOOL e2804542088a9f29375d715190e30e7d876f6ca789bc0e2b9f8a3e79042a9e3f3a6783d3a87028d30b23dd8f3a72f18f556948aff736a158e343545adba991b8
 MISC ChangeLog 10433 SHA256 bd1d45cd00546b3a8b968d380c3a089c0fb9abb16a732030b90ca710c2d2d475 SHA512 c5375a0daab5ffb82a1afdbfcf1d64c4e9f12c54ab545dee5ec520d9a6fd07412310deca7ecf20efc831fb56f0839ec011ca5057e88be6fe26bac11cec6999bf WHIRLPOOL 65b96dd203875dbe11d2ed2838e4e5c6e9827f6841d62c53597a415db31f89c7568b18db741cd20328dcf989743f0bcfaee854cf2207092e4ee809c3c3daa417
 MISC ChangeLog-2015 3237 SHA256 74b6d20f949801e07a6375131f6855aa9b2116dc354304c2b6d6f0f642ed1768 SHA512 3132a254c1a9dd17c687dec13ae747d54a1f687648ce6b59f130355c6916da1f0f2f9f5725c2668bd26bc757c2068eb4d8772d7959d40f1e9b0b4c6fb3dd06aa WHIRLPOOL ea4bd4be6d1e4be3a86264b31c026658639e8ad31b3ed1bde9a95ee25020578741eed76f88a022fed0f088357401926be55e807b822b93587a9574a67ecad42f
 MISC metadata.xml 317 SHA256 a5cb34f3eb3b9f38bf0af04ff2650cf9c47aaeaeaf400d50e95ed1fc28132357 SHA512 fdaad87814ab78792c7bb30ba017e2f7ae7e25dd11701b2cca62c6847f5f79a59d453865aee812ce0c1d6842f9ba1867ac0206fecfd2edbc40da6ee45f56a428 WHIRLPOOL c5500f7e50211a98c502ff3bf004a247752c69fbedb00b0a12a4607d0cb85d3eb7be5672d679203ea1506d820a142c7ab2cb7233947fd03a931067ba8325b931
diff --git a/sec-policy/selinux-android/selinux-android-2.20170204-r1.ebuild b/sec-policy/selinux-android/selinux-android-2.20170204-r1.ebuild
index 9dd31c4d3d9c..9c8c811f3570 100644
--- a/sec-policy/selinux-android/selinux-android-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-android/selinux-android-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-android/selinux-android-2.20170204-r2.ebuild b/sec-policy/selinux-android/selinux-android-2.20170204-r2.ebuild
index eccfbe5a9c2f..754819bc2276 100644
--- a/sec-policy/selinux-android/selinux-android-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-android/selinux-android-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-android/selinux-android-2.20170204-r3.ebuild b/sec-policy/selinux-android/selinux-android-2.20170204-r3.ebuild
index eccfbe5a9c2f..754819bc2276 100644
--- a/sec-policy/selinux-android/selinux-android-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-android/selinux-android-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-android/selinux-android-2.20170204-r4.ebuild b/sec-policy/selinux-android/selinux-android-2.20170204-r4.ebuild
index eccfbe5a9c2f..754819bc2276 100644
--- a/sec-policy/selinux-android/selinux-android-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-android/selinux-android-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-android/selinux-android-2.20170805-r2.ebuild b/sec-policy/selinux-android/selinux-android-2.20170805-r2.ebuild
index eccfbe5a9c2f..754819bc2276 100644
--- a/sec-policy/selinux-android/selinux-android-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-android/selinux-android-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-android/selinux-android-2.20170805-r3.ebuild b/sec-policy/selinux-android/selinux-android-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..9c8c811f3570
--- /dev/null
+++ b/sec-policy/selinux-android/selinux-android-2.20170805-r3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-android/selinux-android-9999.ebuild b/sec-policy/selinux-android/selinux-android-9999.ebuild
index 9dd31c4d3d9c..9c8c811f3570 100644
--- a/sec-policy/selinux-android/selinux-android-9999.ebuild
+++ b/sec-policy/selinux-android/selinux-android-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-apache/Manifest b/sec-policy/selinux-apache/Manifest
index fd67bdb4cdd8..79392347d24a 100644
--- a/sec-policy/selinux-apache/Manifest
+++ b/sec-policy/selinux-apache/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-apache-2.20170204-r1.ebuild 383 SHA256 fb9462f08c4390048d55f388f63d11d9b3b4eaadbb05d01d2f9615f150526e59 SHA512 b898c8c65f1154fbc5ebd6f3a7b3e2a7254c0bcee965980ab01d41ccbe312ac1fea03f705ab97698da41f7a54bd4f17eaca8d37e0eda55a107f6ce80e368fa23 WHIRLPOOL 70ff8f91f216e00c368e6fd5553981a4e5229e8dc4b16607ae4af5ec3abfc03c6a7eaaeaa70f7eabf391fb55ee04ebeb15e2922a5e50dfdf1a4afc14a75fbc02
-EBUILD selinux-apache-2.20170204-r2.ebuild 381 SHA256 71cc0e5f300e8e8377958fd81fc9a1ec897a3f176dd353c6b18c7f6361a13458 SHA512 a35cd70c0cbe58bdc511573b6455f880b610b9fb952dfa4652254ec4d02faa7c9f9e2cee7c0b17b7fbd7a73b85796f28a0d914e630df6740d5ca1811a6bb49b8 WHIRLPOOL 734aa816f8d058564fb8cac4e018c0820c77f424e27efcc8761454bf9bb6fe74e61d217cd3f200d40e80c6026410ae0db7d89528315487e74058890a2f7bf958
-EBUILD selinux-apache-2.20170204-r3.ebuild 381 SHA256 71cc0e5f300e8e8377958fd81fc9a1ec897a3f176dd353c6b18c7f6361a13458 SHA512 a35cd70c0cbe58bdc511573b6455f880b610b9fb952dfa4652254ec4d02faa7c9f9e2cee7c0b17b7fbd7a73b85796f28a0d914e630df6740d5ca1811a6bb49b8 WHIRLPOOL 734aa816f8d058564fb8cac4e018c0820c77f424e27efcc8761454bf9bb6fe74e61d217cd3f200d40e80c6026410ae0db7d89528315487e74058890a2f7bf958
-EBUILD selinux-apache-2.20170204-r4.ebuild 381 SHA256 71cc0e5f300e8e8377958fd81fc9a1ec897a3f176dd353c6b18c7f6361a13458 SHA512 a35cd70c0cbe58bdc511573b6455f880b610b9fb952dfa4652254ec4d02faa7c9f9e2cee7c0b17b7fbd7a73b85796f28a0d914e630df6740d5ca1811a6bb49b8 WHIRLPOOL 734aa816f8d058564fb8cac4e018c0820c77f424e27efcc8761454bf9bb6fe74e61d217cd3f200d40e80c6026410ae0db7d89528315487e74058890a2f7bf958
-EBUILD selinux-apache-2.20170805-r2.ebuild 381 SHA256 71cc0e5f300e8e8377958fd81fc9a1ec897a3f176dd353c6b18c7f6361a13458 SHA512 a35cd70c0cbe58bdc511573b6455f880b610b9fb952dfa4652254ec4d02faa7c9f9e2cee7c0b17b7fbd7a73b85796f28a0d914e630df6740d5ca1811a6bb49b8 WHIRLPOOL 734aa816f8d058564fb8cac4e018c0820c77f424e27efcc8761454bf9bb6fe74e61d217cd3f200d40e80c6026410ae0db7d89528315487e74058890a2f7bf958
-EBUILD selinux-apache-9999.ebuild 383 SHA256 fb9462f08c4390048d55f388f63d11d9b3b4eaadbb05d01d2f9615f150526e59 SHA512 b898c8c65f1154fbc5ebd6f3a7b3e2a7254c0bcee965980ab01d41ccbe312ac1fea03f705ab97698da41f7a54bd4f17eaca8d37e0eda55a107f6ce80e368fa23 WHIRLPOOL 70ff8f91f216e00c368e6fd5553981a4e5229e8dc4b16607ae4af5ec3abfc03c6a7eaaeaa70f7eabf391fb55ee04ebeb15e2922a5e50dfdf1a4afc14a75fbc02
+EBUILD selinux-apache-2.20170204-r1.ebuild 384 SHA256 a83fdba8f1e747b7425b45f40bb356f2b1a40f1c7d7e7fbc8880536e9c45d0a9 SHA512 9f03a7c6160ce61df1f7047b1e50fde73b392cc2cef433b0cecaeefc06412ab7626f3d8642b0fa601240330a907deb38e2cd62bb321cc50dd8e177c97e7bd59b WHIRLPOOL 6feab8cd0a0874486f1df7e78868eac1c82fc11466383d7a2667f1d98f0a6c500f5aafc45eec462becddc96da954a04019d29bd43a4317a113bf328cbf55b24a
+EBUILD selinux-apache-2.20170204-r2.ebuild 382 SHA256 ac5e3cc54dd324a6f2082b60b32d14aed7fcb20f1193da908992f98720e88bb8 SHA512 3440db6eedc2193ebcc61a57c3f3ffaefac2439a6560e2c3f994ba1ea85e9b3d862ae84f1cf78af09ca81231115469b2081d60ff3bbd4c375281aeed3cf94f54 WHIRLPOOL 18d78074e11ec59aff53726a8411082736e19fe17b6d1292904611cf59563064a65e7034a903ba590a42ab5fa5a17d41a4d6942325f59b49cdf8d1606e1dc5ee
+EBUILD selinux-apache-2.20170204-r3.ebuild 382 SHA256 ac5e3cc54dd324a6f2082b60b32d14aed7fcb20f1193da908992f98720e88bb8 SHA512 3440db6eedc2193ebcc61a57c3f3ffaefac2439a6560e2c3f994ba1ea85e9b3d862ae84f1cf78af09ca81231115469b2081d60ff3bbd4c375281aeed3cf94f54 WHIRLPOOL 18d78074e11ec59aff53726a8411082736e19fe17b6d1292904611cf59563064a65e7034a903ba590a42ab5fa5a17d41a4d6942325f59b49cdf8d1606e1dc5ee
+EBUILD selinux-apache-2.20170204-r4.ebuild 382 SHA256 ac5e3cc54dd324a6f2082b60b32d14aed7fcb20f1193da908992f98720e88bb8 SHA512 3440db6eedc2193ebcc61a57c3f3ffaefac2439a6560e2c3f994ba1ea85e9b3d862ae84f1cf78af09ca81231115469b2081d60ff3bbd4c375281aeed3cf94f54 WHIRLPOOL 18d78074e11ec59aff53726a8411082736e19fe17b6d1292904611cf59563064a65e7034a903ba590a42ab5fa5a17d41a4d6942325f59b49cdf8d1606e1dc5ee
+EBUILD selinux-apache-2.20170805-r2.ebuild 382 SHA256 ac5e3cc54dd324a6f2082b60b32d14aed7fcb20f1193da908992f98720e88bb8 SHA512 3440db6eedc2193ebcc61a57c3f3ffaefac2439a6560e2c3f994ba1ea85e9b3d862ae84f1cf78af09ca81231115469b2081d60ff3bbd4c375281aeed3cf94f54 WHIRLPOOL 18d78074e11ec59aff53726a8411082736e19fe17b6d1292904611cf59563064a65e7034a903ba590a42ab5fa5a17d41a4d6942325f59b49cdf8d1606e1dc5ee
+EBUILD selinux-apache-2.20170805-r3.ebuild 384 SHA256 a83fdba8f1e747b7425b45f40bb356f2b1a40f1c7d7e7fbc8880536e9c45d0a9 SHA512 9f03a7c6160ce61df1f7047b1e50fde73b392cc2cef433b0cecaeefc06412ab7626f3d8642b0fa601240330a907deb38e2cd62bb321cc50dd8e177c97e7bd59b WHIRLPOOL 6feab8cd0a0874486f1df7e78868eac1c82fc11466383d7a2667f1d98f0a6c500f5aafc45eec462becddc96da954a04019d29bd43a4317a113bf328cbf55b24a
+EBUILD selinux-apache-9999.ebuild 384 SHA256 a83fdba8f1e747b7425b45f40bb356f2b1a40f1c7d7e7fbc8880536e9c45d0a9 SHA512 9f03a7c6160ce61df1f7047b1e50fde73b392cc2cef433b0cecaeefc06412ab7626f3d8642b0fa601240330a907deb38e2cd62bb321cc50dd8e177c97e7bd59b WHIRLPOOL 6feab8cd0a0874486f1df7e78868eac1c82fc11466383d7a2667f1d98f0a6c500f5aafc45eec462becddc96da954a04019d29bd43a4317a113bf328cbf55b24a
 MISC ChangeLog 10653 SHA256 2db69b81a75fafd051794ad609e7491887737bb57b36e4a51309ecd347c7bd84 SHA512 04f6543024abcadea041f195fceaf57b0733fafd56026d3018e00047e832309340669dd3960e54ea5dfb39f292c4c103afbf04491a114c08efd1cda7d8e5ed73 WHIRLPOOL 45aad63350f460a30d4ecfd62e4e252cf68693e7661c1d8d7e0baebf056556629ae884ee9ac7064e1daa8a1bbce83d9099c53cbcddd415fd25dac17422c10b2c
 MISC ChangeLog-2015 14423 SHA256 5b9dc9519fc93e5f9e8f01703d229f0d74191b81c59c8080e4eaf895705d2cce SHA512 ed0c379fb5173c16688eb25cd8fcfac9a26731acff1dedee1513d0c246bf6b5ef63091e96a66951603362ef189642a39f06b372a2da702a5ad26a4f5eb9c394f WHIRLPOOL 1e2444edfb0f5d43d78d385d2ef135bebafc67a20e091afb651fd1fbd29758c1b095b4c829f71655e3c117317d622efa014d74a6b07f595fdb61d58bab41e5db
 MISC metadata.xml 316 SHA256 c5a6d2d4279005656cc7b97fefd79c810365301684adb73993e6e5e3fe94c6d6 SHA512 f8795858dc0c9f6b6384f67f6f83c6a59ba1da9ba3c1ef070604e2fbade2f202e88ca876e995512da3f89c1b0f163e8e206734c1f4a78a4170307a6840976293 WHIRLPOOL ecbb046be3090061e300b86a443d62b967a1d4b22fdff002921a765653c7b63d29182d8cc78bb69671a2ac1c6f4684dab4fb00a113037d74aa7fb2e32967e39f
diff --git a/sec-policy/selinux-apache/selinux-apache-2.20170204-r1.ebuild b/sec-policy/selinux-apache/selinux-apache-2.20170204-r1.ebuild
index b6f853af9c48..4e93a6c2168f 100644
--- a/sec-policy/selinux-apache/selinux-apache-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-apache/selinux-apache-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-apache/selinux-apache-2.20170204-r2.ebuild b/sec-policy/selinux-apache/selinux-apache-2.20170204-r2.ebuild
index 56400781bb3a..8af33686fcbe 100644
--- a/sec-policy/selinux-apache/selinux-apache-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-apache/selinux-apache-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-apache/selinux-apache-2.20170204-r3.ebuild b/sec-policy/selinux-apache/selinux-apache-2.20170204-r3.ebuild
index 56400781bb3a..8af33686fcbe 100644
--- a/sec-policy/selinux-apache/selinux-apache-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-apache/selinux-apache-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-apache/selinux-apache-2.20170204-r4.ebuild b/sec-policy/selinux-apache/selinux-apache-2.20170204-r4.ebuild
index 56400781bb3a..8af33686fcbe 100644
--- a/sec-policy/selinux-apache/selinux-apache-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-apache/selinux-apache-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-apache/selinux-apache-2.20170805-r2.ebuild b/sec-policy/selinux-apache/selinux-apache-2.20170805-r2.ebuild
index 56400781bb3a..8af33686fcbe 100644
--- a/sec-policy/selinux-apache/selinux-apache-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-apache/selinux-apache-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-apache/selinux-apache-2.20170805-r3.ebuild b/sec-policy/selinux-apache/selinux-apache-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..4e93a6c2168f
--- /dev/null
+++ b/sec-policy/selinux-apache/selinux-apache-2.20170805-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-apache/selinux-apache-9999.ebuild b/sec-policy/selinux-apache/selinux-apache-9999.ebuild
index b6f853af9c48..4e93a6c2168f 100644
--- a/sec-policy/selinux-apache/selinux-apache-9999.ebuild
+++ b/sec-policy/selinux-apache/selinux-apache-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-apcupsd/Manifest b/sec-policy/selinux-apcupsd/Manifest
index 32984997ef4c..bca8708aad95 100644
--- a/sec-policy/selinux-apcupsd/Manifest
+++ b/sec-policy/selinux-apcupsd/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-apcupsd-2.20170204-r1.ebuild 381 SHA256 884cd852490ac8e085ceb24eaac1ab7b7bb9824ed463a4c762fece10ee93e144 SHA512 5d01e7db4d76680ae335a0e694ea63d8c5b1321359ebaf45fa0f60e59ac0823af2d4aa81069bb4a2c4a9eceef69f087cf41d4039442533a57aafada347509341 WHIRLPOOL aa02b489af6f397aa76050328af9110c3c64fd0fe2f8605c55beef24154b1b32cd47fe4c9d394f10404ee900567a2dbecca0de49fca1e0b85a10a25df6d336bc
-EBUILD selinux-apcupsd-2.20170204-r2.ebuild 379 SHA256 036c6c8c0147c28cce28798e2f287c9be9a724126f97704ac3e7d3799e1dca6c SHA512 f886a4d4e6cd64a784de9899feaa3d87baa97e65cff97ef4c8e9e26260c7c6a65fa5464f978d6387e69890d92c31e6ec7ac99ebf3af4ac9162c0dde7e1d534dc WHIRLPOOL 29d42d275f8e57a91476264e391d01a1b794ad33a2b1b04d1f8ff139dc01977a63bddef9e9db416c71e370bc367929aab23a3e3255549b940408f9d95e3f518b
-EBUILD selinux-apcupsd-2.20170204-r3.ebuild 379 SHA256 036c6c8c0147c28cce28798e2f287c9be9a724126f97704ac3e7d3799e1dca6c SHA512 f886a4d4e6cd64a784de9899feaa3d87baa97e65cff97ef4c8e9e26260c7c6a65fa5464f978d6387e69890d92c31e6ec7ac99ebf3af4ac9162c0dde7e1d534dc WHIRLPOOL 29d42d275f8e57a91476264e391d01a1b794ad33a2b1b04d1f8ff139dc01977a63bddef9e9db416c71e370bc367929aab23a3e3255549b940408f9d95e3f518b
-EBUILD selinux-apcupsd-2.20170204-r4.ebuild 379 SHA256 036c6c8c0147c28cce28798e2f287c9be9a724126f97704ac3e7d3799e1dca6c SHA512 f886a4d4e6cd64a784de9899feaa3d87baa97e65cff97ef4c8e9e26260c7c6a65fa5464f978d6387e69890d92c31e6ec7ac99ebf3af4ac9162c0dde7e1d534dc WHIRLPOOL 29d42d275f8e57a91476264e391d01a1b794ad33a2b1b04d1f8ff139dc01977a63bddef9e9db416c71e370bc367929aab23a3e3255549b940408f9d95e3f518b
-EBUILD selinux-apcupsd-2.20170805-r2.ebuild 379 SHA256 036c6c8c0147c28cce28798e2f287c9be9a724126f97704ac3e7d3799e1dca6c SHA512 f886a4d4e6cd64a784de9899feaa3d87baa97e65cff97ef4c8e9e26260c7c6a65fa5464f978d6387e69890d92c31e6ec7ac99ebf3af4ac9162c0dde7e1d534dc WHIRLPOOL 29d42d275f8e57a91476264e391d01a1b794ad33a2b1b04d1f8ff139dc01977a63bddef9e9db416c71e370bc367929aab23a3e3255549b940408f9d95e3f518b
-EBUILD selinux-apcupsd-9999.ebuild 381 SHA256 884cd852490ac8e085ceb24eaac1ab7b7bb9824ed463a4c762fece10ee93e144 SHA512 5d01e7db4d76680ae335a0e694ea63d8c5b1321359ebaf45fa0f60e59ac0823af2d4aa81069bb4a2c4a9eceef69f087cf41d4039442533a57aafada347509341 WHIRLPOOL aa02b489af6f397aa76050328af9110c3c64fd0fe2f8605c55beef24154b1b32cd47fe4c9d394f10404ee900567a2dbecca0de49fca1e0b85a10a25df6d336bc
+EBUILD selinux-apcupsd-2.20170204-r1.ebuild 382 SHA256 09fcca6a8d32061e82040f3063a388a96f1f963d07a0d95b261677f0b33de12f SHA512 80e0949835c0c0b0a514af3cb932c22ff0a78ef7c1284209b91ee94e085edb5f23ea2c71d32c35cfb18013abc9a3b9fc445227e048194241d5f88e423a0244b2 WHIRLPOOL d66c668cf9b15e2b53691f69c12873c3df0610ed8cbad5a93638ddb2ae642b01464920c86d774970606595270acb5f451464d93b70d0b5c3f0eec2618d40dcb2
+EBUILD selinux-apcupsd-2.20170204-r2.ebuild 380 SHA256 eb2bc9059e3a74d54e4ae7327dac1ff42e3cb47e4fadcca3cac9ea222459d768 SHA512 3bde712a9d9e6e07aad57ae2c1f4d856bcf8d52198631b5633724594d27b8c058faa3aedd4446e64768075b49133e1e257ef4f86463413ab58b59b77ce74a513 WHIRLPOOL f37c398b6067f6465f7dabccacec0a9878acd406f5097d64661024e76f7d344d5f3b3f1eafeb931e25a3530404aabf12e8e91f3ffebcfa99c8bf9e0de747e87a
+EBUILD selinux-apcupsd-2.20170204-r3.ebuild 380 SHA256 eb2bc9059e3a74d54e4ae7327dac1ff42e3cb47e4fadcca3cac9ea222459d768 SHA512 3bde712a9d9e6e07aad57ae2c1f4d856bcf8d52198631b5633724594d27b8c058faa3aedd4446e64768075b49133e1e257ef4f86463413ab58b59b77ce74a513 WHIRLPOOL f37c398b6067f6465f7dabccacec0a9878acd406f5097d64661024e76f7d344d5f3b3f1eafeb931e25a3530404aabf12e8e91f3ffebcfa99c8bf9e0de747e87a
+EBUILD selinux-apcupsd-2.20170204-r4.ebuild 380 SHA256 eb2bc9059e3a74d54e4ae7327dac1ff42e3cb47e4fadcca3cac9ea222459d768 SHA512 3bde712a9d9e6e07aad57ae2c1f4d856bcf8d52198631b5633724594d27b8c058faa3aedd4446e64768075b49133e1e257ef4f86463413ab58b59b77ce74a513 WHIRLPOOL f37c398b6067f6465f7dabccacec0a9878acd406f5097d64661024e76f7d344d5f3b3f1eafeb931e25a3530404aabf12e8e91f3ffebcfa99c8bf9e0de747e87a
+EBUILD selinux-apcupsd-2.20170805-r2.ebuild 380 SHA256 eb2bc9059e3a74d54e4ae7327dac1ff42e3cb47e4fadcca3cac9ea222459d768 SHA512 3bde712a9d9e6e07aad57ae2c1f4d856bcf8d52198631b5633724594d27b8c058faa3aedd4446e64768075b49133e1e257ef4f86463413ab58b59b77ce74a513 WHIRLPOOL f37c398b6067f6465f7dabccacec0a9878acd406f5097d64661024e76f7d344d5f3b3f1eafeb931e25a3530404aabf12e8e91f3ffebcfa99c8bf9e0de747e87a
+EBUILD selinux-apcupsd-2.20170805-r3.ebuild 382 SHA256 09fcca6a8d32061e82040f3063a388a96f1f963d07a0d95b261677f0b33de12f SHA512 80e0949835c0c0b0a514af3cb932c22ff0a78ef7c1284209b91ee94e085edb5f23ea2c71d32c35cfb18013abc9a3b9fc445227e048194241d5f88e423a0244b2 WHIRLPOOL d66c668cf9b15e2b53691f69c12873c3df0610ed8cbad5a93638ddb2ae642b01464920c86d774970606595270acb5f451464d93b70d0b5c3f0eec2618d40dcb2
+EBUILD selinux-apcupsd-9999.ebuild 382 SHA256 09fcca6a8d32061e82040f3063a388a96f1f963d07a0d95b261677f0b33de12f SHA512 80e0949835c0c0b0a514af3cb932c22ff0a78ef7c1284209b91ee94e085edb5f23ea2c71d32c35cfb18013abc9a3b9fc445227e048194241d5f88e423a0244b2 WHIRLPOOL d66c668cf9b15e2b53691f69c12873c3df0610ed8cbad5a93638ddb2ae642b01464920c86d774970606595270acb5f451464d93b70d0b5c3f0eec2618d40dcb2
 MISC ChangeLog 10687 SHA256 954e580b5a9440c5206ef330d2827231d6ff6ceb77a731d6f03ffe9b9970110e SHA512 1dbbd86ff314781f56bdae49d987e7a958cb0715d38385acc216d555def801ab3e0dc71206ba268e1de09dbb6d3b335b724cf679d8d3bd425f6de27150642fa3 WHIRLPOOL b6ecff95672722a88fd38d6cb0332b58b47daa15fc4f8ebb02bb2ac5bf1f79c7ef4a2b5669998dafb9efaf6194045cca12bbb95e8de0a1fdbffd49f6b9d8897f
 MISC ChangeLog-2015 10219 SHA256 0bb2330b0e78968acb30c8619065ab1980f0ad957bed9b6dbe1893f208ff36a5 SHA512 2f611f34647b7a91855013a544873a1363b2907af2ebe1f76ab16e610a8caba44b92b989677a8b9acc5d594eddb644ad2350543432f3788d766b76acb5a6fad4 WHIRLPOOL a7eda08f30f07f9dd380b0e513106e3d4fd05067b5bb2e455961c158d529ac503bbf09d5e6133cdf885d4e4ad59a803046a37b7c10664291542284029c2febcb
 MISC metadata.xml 317 SHA256 d3209025070f628df9bc1d0456d90fa68c9b298d0702fd993a43ce9712649357 SHA512 60b1efe0a05b69802dc9be53e4420921416667159ec6a0803a119c1ef4524cf9178ef60521f1f5a12c62c3d405ca3fc145f71aedbffa14190933614091379a01 WHIRLPOOL ffed7126c69c0d5541d5c459b587312ea8b5611a815b6526b7fa10e4dc0e303ddf3f794ea27685a4b3328b4bd66a21b01f653071be5e3c92bc7a1077d57f9ef5
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170204-r1.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170204-r1.ebuild
index b273b570e892..44ec399af7be 100644
--- a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170204-r2.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170204-r2.ebuild
index 82a76c3d7cb8..18f55a8b17ad 100644
--- a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170204-r3.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170204-r3.ebuild
index 82a76c3d7cb8..18f55a8b17ad 100644
--- a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170204-r4.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170204-r4.ebuild
index 82a76c3d7cb8..18f55a8b17ad 100644
--- a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170805-r2.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170805-r2.ebuild
index 82a76c3d7cb8..18f55a8b17ad 100644
--- a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170805-r3.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..44ec399af7be
--- /dev/null
+++ b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170805-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-apcupsd/selinux-apcupsd-9999.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-9999.ebuild
index b273b570e892..44ec399af7be 100644
--- a/sec-policy/selinux-apcupsd/selinux-apcupsd-9999.ebuild
+++ b/sec-policy/selinux-apcupsd/selinux-apcupsd-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-apm/Manifest b/sec-policy/selinux-apm/Manifest
index e37fa66b322b..552299bd86ef 100644
--- a/sec-policy/selinux-apm/Manifest
+++ b/sec-policy/selinux-apm/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-apm-2.20170204-r1.ebuild 277 SHA256 5bb286d57e3e389b85591a8f6bca71b25dcd4028241c91dae2550040efe2cba6 SHA512 a461f75117abe898253c80996bd15cc9b1b052a2d64c7347aea5898fac384fbb9b051229a36d0c005a3b76ad6477874066f628861db75c3fb3d5f49d18743305 WHIRLPOOL 31edd9e0b462e5066d0521870b22cf692e92d0653bf200a593bd8c3063615c41cdf4a40c780a3e2a06fe411f7ca3806a1ed8fe863c0fc1750b26e50507f7cf3d
-EBUILD selinux-apm-2.20170204-r2.ebuild 275 SHA256 d2d53397608f1eed82c903acb934c2125d88f601c7f0831329ed9cca649d1f28 SHA512 5c117c75fc24ff2110845f90259362eec16dda28648e1a3206b87c24eb2e9f1fd766e96a774d3e7f7635724ff65086c16d26f20938334cde0b8128a7b645fe5a WHIRLPOOL 9c174ec25d9a392ca77c9912c3823a2d3b0f8561f1b3e67ca1356980679c21e2b5b6e23da2bd9273738e5ea49108d1a5550684a351bdf75c45db160f2d341bfc
-EBUILD selinux-apm-2.20170204-r3.ebuild 275 SHA256 d2d53397608f1eed82c903acb934c2125d88f601c7f0831329ed9cca649d1f28 SHA512 5c117c75fc24ff2110845f90259362eec16dda28648e1a3206b87c24eb2e9f1fd766e96a774d3e7f7635724ff65086c16d26f20938334cde0b8128a7b645fe5a WHIRLPOOL 9c174ec25d9a392ca77c9912c3823a2d3b0f8561f1b3e67ca1356980679c21e2b5b6e23da2bd9273738e5ea49108d1a5550684a351bdf75c45db160f2d341bfc
-EBUILD selinux-apm-2.20170204-r4.ebuild 810 SHA256 5d1b626888fd3af7718bfd6351c56162e413188888c88adaf6ea4864edf75170 SHA512 b47a790511b8673d92a8f5e11fbd98a57710a58f4ef34d8484e8869ebbf8f3a792b5dfc95d604057b06c5073f6879449ee3dc5983ebe67675c84352b3ed6006f WHIRLPOOL 73eb90c6613189251f876ddc73cab26601486c78a3150d85b0a0a6ac09ffa7924534b688e63a8ff6d42d6b284e5556538c36fb965a5e5b659e287f1ff3500ac5
-EBUILD selinux-apm-2.20170805-r2.ebuild 810 SHA256 5d1b626888fd3af7718bfd6351c56162e413188888c88adaf6ea4864edf75170 SHA512 b47a790511b8673d92a8f5e11fbd98a57710a58f4ef34d8484e8869ebbf8f3a792b5dfc95d604057b06c5073f6879449ee3dc5983ebe67675c84352b3ed6006f WHIRLPOOL 73eb90c6613189251f876ddc73cab26601486c78a3150d85b0a0a6ac09ffa7924534b688e63a8ff6d42d6b284e5556538c36fb965a5e5b659e287f1ff3500ac5
-EBUILD selinux-apm-9999.ebuild 812 SHA256 a605c68af5b1999f3bba166beba9abdc37b8d6021c2524e123238bd00629d861 SHA512 22d15c8eb4d0d141bd00b70f671f4256cc0144f1b2e131e78545dc06b72eac6e7fb4e732d3adc7cb81a27d246d3ad489b7fd3a4f82585061a735197a71a26a27 WHIRLPOOL 168f8b94ac75b25453cfb192c352b5c01d6027416bc4d61fe9f73cc09e3448e685085dd530ee198afcc1a376fabc6f87e42dba05f0df4c1be8092c37bb3854e3
+EBUILD selinux-apm-2.20170204-r1.ebuild 278 SHA256 410cba402104c0818deb40b030c4b77518694e2db5eace4cd84bdbe4b5813081 SHA512 71b805fa94fb3c6e4c34a869474fff3994341b54ff5ec2132d0f65769475296761b61a1a65823b052debb4ba3e0a9ab014908ea3be50b0f2c5f30f46138cb3ae WHIRLPOOL bb666f56d06dba7f2be3710164978b53ec864c90bbb6a1ae39c232929e1c7753b93cb2deb9bf66a144d0a4017b2349e5f46d7248146177e06281cbce42dbecc8
+EBUILD selinux-apm-2.20170204-r2.ebuild 276 SHA256 ab7477063f13768e5f978315cb2c028934c895b4ea209a066174f0ae7a71cb6b SHA512 f3e5540fa9a87de8eb11ab7f1f7a3df25b99a05391fd73344c0b1e357a829394944c68d2da29bacf4de1d19c1bb327b8f9d20830b373a62847770496dd1be5ea WHIRLPOOL 8429236bbf2a7e1c72325169e4291747f377ffd1b38915bf7504e84348627c076ccf71ef64940c0be4cf40fda3cf0a872f7f4b90e13d9089e4038826cb65af46
+EBUILD selinux-apm-2.20170204-r3.ebuild 276 SHA256 ab7477063f13768e5f978315cb2c028934c895b4ea209a066174f0ae7a71cb6b SHA512 f3e5540fa9a87de8eb11ab7f1f7a3df25b99a05391fd73344c0b1e357a829394944c68d2da29bacf4de1d19c1bb327b8f9d20830b373a62847770496dd1be5ea WHIRLPOOL 8429236bbf2a7e1c72325169e4291747f377ffd1b38915bf7504e84348627c076ccf71ef64940c0be4cf40fda3cf0a872f7f4b90e13d9089e4038826cb65af46
+EBUILD selinux-apm-2.20170204-r4.ebuild 811 SHA256 42059adbca47b54c7de37760b45809cf5f94c38d546d041aebeabb7d62e7ac84 SHA512 300c7da3a2b0887cab82be2e21c5cabc3667115d3e0574b361992da0a5ead5946e5f9d288e1dc387c04c4f618d8526837b7bd7043f57ebaa5d41499dcdb68b3d WHIRLPOOL 9e1ec270914aa3f8f968c86b347dc7ba4a3df4c223a8cb9b55d18d08307c78b93bff46e085a1f7dc4b90bacfb0910535ccbb788fca3569f432b9eed927034c67
+EBUILD selinux-apm-2.20170805-r2.ebuild 811 SHA256 42059adbca47b54c7de37760b45809cf5f94c38d546d041aebeabb7d62e7ac84 SHA512 300c7da3a2b0887cab82be2e21c5cabc3667115d3e0574b361992da0a5ead5946e5f9d288e1dc387c04c4f618d8526837b7bd7043f57ebaa5d41499dcdb68b3d WHIRLPOOL 9e1ec270914aa3f8f968c86b347dc7ba4a3df4c223a8cb9b55d18d08307c78b93bff46e085a1f7dc4b90bacfb0910535ccbb788fca3569f432b9eed927034c67
+EBUILD selinux-apm-2.20170805-r3.ebuild 813 SHA256 d696eae08ce459708924f5af7cdc55fd725dd88c0eaa7d010c5b9354bd4b765a SHA512 9633fea36343b9c84a6fce2bb8d69ce9f70c5a37946c5c65d069579d900afaff66298ee9714103511a11022bec3821c29b47134f89c00611d9914a99310504c6 WHIRLPOOL 550ce94da2c3d29c4836bc55ddc31a8fccb5ae5f77960bbfd8ef26221e3e8f618c426f8464f493746dfebf8af21758cb81d613f30a10784a1fbab1d47c9037bb
+EBUILD selinux-apm-9999.ebuild 813 SHA256 d696eae08ce459708924f5af7cdc55fd725dd88c0eaa7d010c5b9354bd4b765a SHA512 9633fea36343b9c84a6fce2bb8d69ce9f70c5a37946c5c65d069579d900afaff66298ee9714103511a11022bec3821c29b47134f89c00611d9914a99310504c6 WHIRLPOOL 550ce94da2c3d29c4836bc55ddc31a8fccb5ae5f77960bbfd8ef26221e3e8f618c426f8464f493746dfebf8af21758cb81d613f30a10784a1fbab1d47c9037bb
 MISC ChangeLog 10295 SHA256 2752f58c14ca6e943adc7d682982b49c1c5b0891778779de425dbde1cf251386 SHA512 702659b1260ed1a6c8fdff2ea2a0481e1f19a3c80fa28a1b8759ea9699662d363c689a06b576495cabded5639c38607af2cbb0a470625f3025d617750ce9e3b4 WHIRLPOOL 5200d399b5d3ba4aa9d4b2cc88bd7b49002f3527814027e1625b548fa8d0410b63b4e05734718ff03b91d1c98da702e88f04b45b5db7307708b0dbd61c2c7eea
 MISC ChangeLog-2015 9665 SHA256 8e6247125635be948112b324f621a304809d5771c01c37e91a69e770d4671598 SHA512 89b2f46e7b998f1961b128419f571b103dbc726235d82927ef0b88a98e40f996ee89546e57e8908d92b202449cfa7b0a7f0ccfd1b8f4da48e53b606e3042ac64 WHIRLPOOL 5f41f8dadd320a3b648297b82c0d143411d52e5c62455a7634ac606fd2ffb9a182c5769396235865ea91b0028dd0cc565117383e4495237b293b6f64d270ef5e
 MISC metadata.xml 313 SHA256 0721871343e22ecc7fcd958c6cf9ec56392c75b4bff44a86fba543a472881141 SHA512 9616055313d194ea536d3d633887c199e71a976f044e357de7da9da4e53b274105869f4c85539133d66ced469fab27d44524251bb389dbdbf3298d7799baec3a WHIRLPOOL 261eb3592fb51c60003c7ca94bc22477dc402dee430cc17989140e708f4aceb912973e9241b63500be19e4e66bad192c19cfdc1a978c187990fa22df04dfc15b
diff --git a/sec-policy/selinux-apm/selinux-apm-2.20170204-r1.ebuild b/sec-policy/selinux-apm/selinux-apm-2.20170204-r1.ebuild
index ab7e0ae282bf..31e7844ae58c 100644
--- a/sec-policy/selinux-apm/selinux-apm-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-apm/selinux-apm-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-apm/selinux-apm-2.20170204-r2.ebuild b/sec-policy/selinux-apm/selinux-apm-2.20170204-r2.ebuild
index eadfe7588da8..0c59387a149a 100644
--- a/sec-policy/selinux-apm/selinux-apm-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-apm/selinux-apm-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-apm/selinux-apm-2.20170204-r3.ebuild b/sec-policy/selinux-apm/selinux-apm-2.20170204-r3.ebuild
index eadfe7588da8..0c59387a149a 100644
--- a/sec-policy/selinux-apm/selinux-apm-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-apm/selinux-apm-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-apm/selinux-apm-2.20170204-r4.ebuild b/sec-policy/selinux-apm/selinux-apm-2.20170204-r4.ebuild
index 7f19dbd541e2..d0e664f67c7b 100644
--- a/sec-policy/selinux-apm/selinux-apm-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-apm/selinux-apm-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-apm/selinux-apm-2.20170805-r2.ebuild b/sec-policy/selinux-apm/selinux-apm-2.20170805-r2.ebuild
index 7f19dbd541e2..d0e664f67c7b 100644
--- a/sec-policy/selinux-apm/selinux-apm-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-apm/selinux-apm-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-apm/selinux-apm-2.20170805-r3.ebuild b/sec-policy/selinux-apm/selinux-apm-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..d389ead90e00
--- /dev/null
+++ b/sec-policy/selinux-apm/selinux-apm-2.20170805-r3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-apm/selinux-apm-9999.ebuild b/sec-policy/selinux-apm/selinux-apm-9999.ebuild
index a77ab52b395f..d389ead90e00 100644
--- a/sec-policy/selinux-apm/selinux-apm-9999.ebuild
+++ b/sec-policy/selinux-apm/selinux-apm-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-arpwatch/Manifest b/sec-policy/selinux-arpwatch/Manifest
index 2bd4cfb35765..9b2e8ff7173f 100644
--- a/sec-policy/selinux-arpwatch/Manifest
+++ b/sec-policy/selinux-arpwatch/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-arpwatch-2.20170204-r1.ebuild 287 SHA256 a6e7d8592d27b73d52d20301a5c25e9e736eaebc04f14a5fb0d10fffee7f771d SHA512 6ac572c8009881074fee299f6519a424de15675b50458f96d157ec2e4cc3013f6ddad712de40d23d0d4f01a568b9c5929f359260f099bb0ca51de8bff0ffb1ae WHIRLPOOL 25f51c7ea075086cd94a668d4a8740e902bb44bd0af45bf5c7f7eeabbd9b14c2e3fba1433770bcfa20496a94c24353cb6108041da6604b92447d689b32b61eb2
-EBUILD selinux-arpwatch-2.20170204-r2.ebuild 285 SHA256 661dc66b9468202005f1c203ca4e0192f191ad944123a8db8c1b33ed8556644d SHA512 c4ddb069224574fdb4fdffb5499a176f914ef836a78919c461c9f5c97920f2f82a007de35b7f9a70ba8d9e699392b222efdfeb90dcdf1aa7fc3a27583d976321 WHIRLPOOL 73cfbf942391c12f7f5aca2fa718fa3de8e7e6bd2253e00b25624c614c196d9aa4df5dc3d9174cb2f68e4c70d1437a0ab00e6cfe1a13712afaa1da433c2112ab
-EBUILD selinux-arpwatch-2.20170204-r3.ebuild 285 SHA256 661dc66b9468202005f1c203ca4e0192f191ad944123a8db8c1b33ed8556644d SHA512 c4ddb069224574fdb4fdffb5499a176f914ef836a78919c461c9f5c97920f2f82a007de35b7f9a70ba8d9e699392b222efdfeb90dcdf1aa7fc3a27583d976321 WHIRLPOOL 73cfbf942391c12f7f5aca2fa718fa3de8e7e6bd2253e00b25624c614c196d9aa4df5dc3d9174cb2f68e4c70d1437a0ab00e6cfe1a13712afaa1da433c2112ab
-EBUILD selinux-arpwatch-2.20170204-r4.ebuild 285 SHA256 661dc66b9468202005f1c203ca4e0192f191ad944123a8db8c1b33ed8556644d SHA512 c4ddb069224574fdb4fdffb5499a176f914ef836a78919c461c9f5c97920f2f82a007de35b7f9a70ba8d9e699392b222efdfeb90dcdf1aa7fc3a27583d976321 WHIRLPOOL 73cfbf942391c12f7f5aca2fa718fa3de8e7e6bd2253e00b25624c614c196d9aa4df5dc3d9174cb2f68e4c70d1437a0ab00e6cfe1a13712afaa1da433c2112ab
-EBUILD selinux-arpwatch-2.20170805-r2.ebuild 285 SHA256 661dc66b9468202005f1c203ca4e0192f191ad944123a8db8c1b33ed8556644d SHA512 c4ddb069224574fdb4fdffb5499a176f914ef836a78919c461c9f5c97920f2f82a007de35b7f9a70ba8d9e699392b222efdfeb90dcdf1aa7fc3a27583d976321 WHIRLPOOL 73cfbf942391c12f7f5aca2fa718fa3de8e7e6bd2253e00b25624c614c196d9aa4df5dc3d9174cb2f68e4c70d1437a0ab00e6cfe1a13712afaa1da433c2112ab
-EBUILD selinux-arpwatch-9999.ebuild 287 SHA256 a6e7d8592d27b73d52d20301a5c25e9e736eaebc04f14a5fb0d10fffee7f771d SHA512 6ac572c8009881074fee299f6519a424de15675b50458f96d157ec2e4cc3013f6ddad712de40d23d0d4f01a568b9c5929f359260f099bb0ca51de8bff0ffb1ae WHIRLPOOL 25f51c7ea075086cd94a668d4a8740e902bb44bd0af45bf5c7f7eeabbd9b14c2e3fba1433770bcfa20496a94c24353cb6108041da6604b92447d689b32b61eb2
+EBUILD selinux-arpwatch-2.20170204-r1.ebuild 288 SHA256 9c93bb30dd83f95c31c56b8ce17c290dcc2632aaae8aa6603e6bfc538193a051 SHA512 fdef4b3a1739d93f6a0c3e294561d339cb1c3825ddbecb3ff1ea91fdfabce1fd37d48f518bceea576a3097f9b78958374b9ff282c4d1371f93145d41bc32a7ee WHIRLPOOL d7409e05b9ac1b4f799f6f5b083d2c57e43221480714e51a51e6e1cd4d66b53badbd7ad4dba1ad45fe5c6fe4ba16131d37583bc0d68db747a50158f1267ba16a
+EBUILD selinux-arpwatch-2.20170204-r2.ebuild 286 SHA256 fcfb98cf6dcc6e54f047f38f142c6eba339f9dc203a6128db6598806c37af20d SHA512 32bcb935ef7d40f4e2a8470a1b20796cc6addcf68171541c14f72e302b617033f299a9bcb342f17db34a92736a5c38637f7c32995dc2932c99131f84ffc93de5 WHIRLPOOL ce0da6dfaf0d6ba2f5ae2cf8ee1da44c581871f6c7fbfb681a5245ad28084213da6490ec03390610d812e647c6f487cc90c844165cc6082f16f09b9f1f6a1de3
+EBUILD selinux-arpwatch-2.20170204-r3.ebuild 286 SHA256 fcfb98cf6dcc6e54f047f38f142c6eba339f9dc203a6128db6598806c37af20d SHA512 32bcb935ef7d40f4e2a8470a1b20796cc6addcf68171541c14f72e302b617033f299a9bcb342f17db34a92736a5c38637f7c32995dc2932c99131f84ffc93de5 WHIRLPOOL ce0da6dfaf0d6ba2f5ae2cf8ee1da44c581871f6c7fbfb681a5245ad28084213da6490ec03390610d812e647c6f487cc90c844165cc6082f16f09b9f1f6a1de3
+EBUILD selinux-arpwatch-2.20170204-r4.ebuild 286 SHA256 fcfb98cf6dcc6e54f047f38f142c6eba339f9dc203a6128db6598806c37af20d SHA512 32bcb935ef7d40f4e2a8470a1b20796cc6addcf68171541c14f72e302b617033f299a9bcb342f17db34a92736a5c38637f7c32995dc2932c99131f84ffc93de5 WHIRLPOOL ce0da6dfaf0d6ba2f5ae2cf8ee1da44c581871f6c7fbfb681a5245ad28084213da6490ec03390610d812e647c6f487cc90c844165cc6082f16f09b9f1f6a1de3
+EBUILD selinux-arpwatch-2.20170805-r2.ebuild 286 SHA256 fcfb98cf6dcc6e54f047f38f142c6eba339f9dc203a6128db6598806c37af20d SHA512 32bcb935ef7d40f4e2a8470a1b20796cc6addcf68171541c14f72e302b617033f299a9bcb342f17db34a92736a5c38637f7c32995dc2932c99131f84ffc93de5 WHIRLPOOL ce0da6dfaf0d6ba2f5ae2cf8ee1da44c581871f6c7fbfb681a5245ad28084213da6490ec03390610d812e647c6f487cc90c844165cc6082f16f09b9f1f6a1de3
+EBUILD selinux-arpwatch-2.20170805-r3.ebuild 288 SHA256 9c93bb30dd83f95c31c56b8ce17c290dcc2632aaae8aa6603e6bfc538193a051 SHA512 fdef4b3a1739d93f6a0c3e294561d339cb1c3825ddbecb3ff1ea91fdfabce1fd37d48f518bceea576a3097f9b78958374b9ff282c4d1371f93145d41bc32a7ee WHIRLPOOL d7409e05b9ac1b4f799f6f5b083d2c57e43221480714e51a51e6e1cd4d66b53badbd7ad4dba1ad45fe5c6fe4ba16131d37583bc0d68db747a50158f1267ba16a
+EBUILD selinux-arpwatch-9999.ebuild 288 SHA256 9c93bb30dd83f95c31c56b8ce17c290dcc2632aaae8aa6603e6bfc538193a051 SHA512 fdef4b3a1739d93f6a0c3e294561d339cb1c3825ddbecb3ff1ea91fdfabce1fd37d48f518bceea576a3097f9b78958374b9ff282c4d1371f93145d41bc32a7ee WHIRLPOOL d7409e05b9ac1b4f799f6f5b083d2c57e43221480714e51a51e6e1cd4d66b53badbd7ad4dba1ad45fe5c6fe4ba16131d37583bc0d68db747a50158f1267ba16a
 MISC ChangeLog 10793 SHA256 93d5a7f5fe98c1283a5b26847a7b91a4f638b322df241ee625fac5e6bc0adecc SHA512 fb4fd812cc6ccdf82f88a4f1f017606b80b3a42f32a0609508b79e90a91d03a5b5f49fe191a9b847b9de3bd7a256cd792e6de78f54563541f1cb475a98fce019 WHIRLPOOL 76f3473d0df2840fa7c4d82c4a5ea7a9b38ebdbdcb59faba035f2407ad841f33ed8782c53f696cb731f075262969dc56d8f16e03d9e288e941a5b7491388d934
 MISC ChangeLog-2015 13448 SHA256 aecd5bd903f119acdb8b01427e92d90b5b1c33d99a308f2c5672b0857e0acbc7 SHA512 8e524a7c23b7a8fcecc0a5ca6f542da9ea67e410f75f976332a4b78b593e653a3250bfc452f9d667263b71c3483469f9551840c1ea7edfe3537615c97aebf974 WHIRLPOOL 28ccc79dc8019c3fc578f9be3e0d830df962c6f5314edd311472d311892b30f0d8b8abc821f17322f424bcf905565c863d678abff76128e0e19f5500f5dcdbc8
 MISC metadata.xml 318 SHA256 3a55ce2c12260340fc76c5faeb8fa7409ae758bc01477bbddeed9b2a60461c0a SHA512 4917bd6c1284df4face1c8b14e2df39187fb36bd5094fd460bd324bebfdd69b825b783daab79ff957b77579ddfaef98ff65121a78cc15cbbcae37e8fea53d8db WHIRLPOOL 3701ea8b032f81c62a798cea3ef79aa11b9069d2b83fca112766b01e17f3b391d21de573cba5a500a91463fcf38c99d4852d136defc85561e566e822173878e3
diff --git a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20170204-r1.ebuild b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20170204-r1.ebuild
index b9af5c9b2e77..7d675ca0f2fe 100644
--- a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20170204-r2.ebuild b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20170204-r2.ebuild
index d7d59743a60e..750ca85588f5 100644
--- a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20170204-r3.ebuild b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20170204-r3.ebuild
index d7d59743a60e..750ca85588f5 100644
--- a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20170204-r4.ebuild b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20170204-r4.ebuild
index d7d59743a60e..750ca85588f5 100644
--- a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20170805-r2.ebuild b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20170805-r2.ebuild
index d7d59743a60e..750ca85588f5 100644
--- a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20170805-r3.ebuild b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..7d675ca0f2fe
--- /dev/null
+++ b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-arpwatch/selinux-arpwatch-9999.ebuild b/sec-policy/selinux-arpwatch/selinux-arpwatch-9999.ebuild
index b9af5c9b2e77..7d675ca0f2fe 100644
--- a/sec-policy/selinux-arpwatch/selinux-arpwatch-9999.ebuild
+++ b/sec-policy/selinux-arpwatch/selinux-arpwatch-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-asterisk/Manifest b/sec-policy/selinux-asterisk/Manifest
index a14f8b21d40d..d2bc593b7646 100644
--- a/sec-policy/selinux-asterisk/Manifest
+++ b/sec-policy/selinux-asterisk/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-asterisk-2.20170204-r1.ebuild 287 SHA256 8601621e2df14a0ec803f07bd55c05caf30f68ba575ab243e553a4b2ab401d6d SHA512 ed9f56ae1cf1c6cb5f8196cb23c5579abae841f0b01ab623cc905c223b857d355fdaa5e3fd5def1d9adca41edf6d4e55009370a750cf7fe3ef1d07d4b3ce3431 WHIRLPOOL 83ada670460d880a448b55c95283f18c2d8d859cdd8fde7f137df4836dd7f47940da0f11d0a34c105f766326c492e43e69c40198e897850ef887e92ce3127511
-EBUILD selinux-asterisk-2.20170204-r2.ebuild 285 SHA256 a11d6821d115180d675f4f07d14be31176d32929f27d5ab94e637127f017944d SHA512 cb61bf17e422e9bb257c777d9d66d8767802c13e31bbc07c242c6460d30c23cfea573a74aa512016125ab41f0cf3a93c4df0e7fbe59160f808dc902e1d3924b9 WHIRLPOOL 503560080c99cd554444c21c4642ad7c8629b20436f43e69e906f5eec211d468302aace6ae3221c9bffa8d010d46f50065298cc6afadf0291805ebc7798513a5
-EBUILD selinux-asterisk-2.20170204-r3.ebuild 285 SHA256 a11d6821d115180d675f4f07d14be31176d32929f27d5ab94e637127f017944d SHA512 cb61bf17e422e9bb257c777d9d66d8767802c13e31bbc07c242c6460d30c23cfea573a74aa512016125ab41f0cf3a93c4df0e7fbe59160f808dc902e1d3924b9 WHIRLPOOL 503560080c99cd554444c21c4642ad7c8629b20436f43e69e906f5eec211d468302aace6ae3221c9bffa8d010d46f50065298cc6afadf0291805ebc7798513a5
-EBUILD selinux-asterisk-2.20170204-r4.ebuild 285 SHA256 a11d6821d115180d675f4f07d14be31176d32929f27d5ab94e637127f017944d SHA512 cb61bf17e422e9bb257c777d9d66d8767802c13e31bbc07c242c6460d30c23cfea573a74aa512016125ab41f0cf3a93c4df0e7fbe59160f808dc902e1d3924b9 WHIRLPOOL 503560080c99cd554444c21c4642ad7c8629b20436f43e69e906f5eec211d468302aace6ae3221c9bffa8d010d46f50065298cc6afadf0291805ebc7798513a5
-EBUILD selinux-asterisk-2.20170805-r2.ebuild 285 SHA256 a11d6821d115180d675f4f07d14be31176d32929f27d5ab94e637127f017944d SHA512 cb61bf17e422e9bb257c777d9d66d8767802c13e31bbc07c242c6460d30c23cfea573a74aa512016125ab41f0cf3a93c4df0e7fbe59160f808dc902e1d3924b9 WHIRLPOOL 503560080c99cd554444c21c4642ad7c8629b20436f43e69e906f5eec211d468302aace6ae3221c9bffa8d010d46f50065298cc6afadf0291805ebc7798513a5
-EBUILD selinux-asterisk-9999.ebuild 287 SHA256 8601621e2df14a0ec803f07bd55c05caf30f68ba575ab243e553a4b2ab401d6d SHA512 ed9f56ae1cf1c6cb5f8196cb23c5579abae841f0b01ab623cc905c223b857d355fdaa5e3fd5def1d9adca41edf6d4e55009370a750cf7fe3ef1d07d4b3ce3431 WHIRLPOOL 83ada670460d880a448b55c95283f18c2d8d859cdd8fde7f137df4836dd7f47940da0f11d0a34c105f766326c492e43e69c40198e897850ef887e92ce3127511
+EBUILD selinux-asterisk-2.20170204-r1.ebuild 288 SHA256 ceddf87775c73500ff4dae94833775064749d411d3722bbcc67179855ceb5b2e SHA512 bb5c57d0b1760a5835a6ff3c6eb88fbd47141127a47624369dfd2d95015e9e11e92b750fde136073535a46c7eeb50f2de2e8d3390b857d21e71d18db2d4f4ac4 WHIRLPOOL aafa4fc0b2067e26411d88ab8ef5a3fa8134d766585004be59b10c26d999cb887db646733e1aace5e8ddaaf15e3ec2db9f3969da5c742e12b3336d113aa14b90
+EBUILD selinux-asterisk-2.20170204-r2.ebuild 286 SHA256 4167b49c2680c56fbb9e1438273a6f1f24b77377c1314465d511f27b865d40ef SHA512 d16ec877300871ff493b261b809e20e7aa2306834307e8425152b68531c1ffeca5f73d1ed8d0aab1028c7481d542bb8c523799f10929e0f9ad47148e428067a7 WHIRLPOOL 73d25af32c5a22caf24bc93d499973cc48554b23bf26dcae430108c4917f362771b1ce4b9c1d20a16142d27ed2eb839dc53c1c662fa8748ece4c2baef2f68ced
+EBUILD selinux-asterisk-2.20170204-r3.ebuild 286 SHA256 4167b49c2680c56fbb9e1438273a6f1f24b77377c1314465d511f27b865d40ef SHA512 d16ec877300871ff493b261b809e20e7aa2306834307e8425152b68531c1ffeca5f73d1ed8d0aab1028c7481d542bb8c523799f10929e0f9ad47148e428067a7 WHIRLPOOL 73d25af32c5a22caf24bc93d499973cc48554b23bf26dcae430108c4917f362771b1ce4b9c1d20a16142d27ed2eb839dc53c1c662fa8748ece4c2baef2f68ced
+EBUILD selinux-asterisk-2.20170204-r4.ebuild 286 SHA256 4167b49c2680c56fbb9e1438273a6f1f24b77377c1314465d511f27b865d40ef SHA512 d16ec877300871ff493b261b809e20e7aa2306834307e8425152b68531c1ffeca5f73d1ed8d0aab1028c7481d542bb8c523799f10929e0f9ad47148e428067a7 WHIRLPOOL 73d25af32c5a22caf24bc93d499973cc48554b23bf26dcae430108c4917f362771b1ce4b9c1d20a16142d27ed2eb839dc53c1c662fa8748ece4c2baef2f68ced
+EBUILD selinux-asterisk-2.20170805-r2.ebuild 286 SHA256 4167b49c2680c56fbb9e1438273a6f1f24b77377c1314465d511f27b865d40ef SHA512 d16ec877300871ff493b261b809e20e7aa2306834307e8425152b68531c1ffeca5f73d1ed8d0aab1028c7481d542bb8c523799f10929e0f9ad47148e428067a7 WHIRLPOOL 73d25af32c5a22caf24bc93d499973cc48554b23bf26dcae430108c4917f362771b1ce4b9c1d20a16142d27ed2eb839dc53c1c662fa8748ece4c2baef2f68ced
+EBUILD selinux-asterisk-2.20170805-r3.ebuild 288 SHA256 ceddf87775c73500ff4dae94833775064749d411d3722bbcc67179855ceb5b2e SHA512 bb5c57d0b1760a5835a6ff3c6eb88fbd47141127a47624369dfd2d95015e9e11e92b750fde136073535a46c7eeb50f2de2e8d3390b857d21e71d18db2d4f4ac4 WHIRLPOOL aafa4fc0b2067e26411d88ab8ef5a3fa8134d766585004be59b10c26d999cb887db646733e1aace5e8ddaaf15e3ec2db9f3969da5c742e12b3336d113aa14b90
+EBUILD selinux-asterisk-9999.ebuild 288 SHA256 ceddf87775c73500ff4dae94833775064749d411d3722bbcc67179855ceb5b2e SHA512 bb5c57d0b1760a5835a6ff3c6eb88fbd47141127a47624369dfd2d95015e9e11e92b750fde136073535a46c7eeb50f2de2e8d3390b857d21e71d18db2d4f4ac4 WHIRLPOOL aafa4fc0b2067e26411d88ab8ef5a3fa8134d766585004be59b10c26d999cb887db646733e1aace5e8ddaaf15e3ec2db9f3969da5c742e12b3336d113aa14b90
 MISC ChangeLog 10793 SHA256 a672ee6c59a95725afc5f847f2d82425e02f65b14a769a7f887d4109b986e5ed SHA512 738c108139eeca2c5fb27dd3a8cdf3759dd0b3c55a74b76e6ed5c2bc68663e3b0c91ed55ebd98caccf09f45c5461de723f67225850d668b645a0872bfddb27ea WHIRLPOOL aeed186de5caec0c618527e195e8d4b63b4004ed2e09d841d83c1e529111c1935c3901ba30de5cbc20b4f8e44eca62bfc866f524df992b80e38771fb1ba4b4cf
 MISC ChangeLog-2015 13155 SHA256 a00b543185f44958ba511a824ddc247458539c8376034933f520dd560ffd4564 SHA512 a529a63d71eef72721fcd2de9a8edea01b413305c5fcf7e0e7c1671e35d93cedce6030dc45375b90a9d9e1eabde6a923c43fa994141cf3a83152ab157d2a212e WHIRLPOOL 27632a7563536f40d9a003ed21d10e731161e1894afd1733f94989f92a5d85d28f58970a4b4c8e812aba1aa7beb34fe2a2a6e09ea03596f53552a85674128f67
 MISC metadata.xml 318 SHA256 89d011dd2a4ba69ca080ccec2ea98b47c21cb9ae63584688e0f8803549bd2d38 SHA512 33015c2f0865e82401513b3615960fa0f13b51839ab82fe874f3134d1d4240ad4ac5f7c34b0cb3b6db50fb6f5860634db84281ec6518de23d4d56f2e9cf20ae5 WHIRLPOOL ccead0bdb8184c30d71aa772182f34b28daf4955613dab1fe09fd4f4e3939bb451e56684b6713e5fa4b05afd61fbcb0432f0f57d35857e83162de66b2c0de34e
diff --git a/sec-policy/selinux-asterisk/selinux-asterisk-2.20170204-r1.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-2.20170204-r1.ebuild
index 5896f02f326e..30bc3aaba1a8 100644
--- a/sec-policy/selinux-asterisk/selinux-asterisk-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-asterisk/selinux-asterisk-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-asterisk/selinux-asterisk-2.20170204-r2.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-2.20170204-r2.ebuild
index fd1a1e74c464..62ff34ffcdf0 100644
--- a/sec-policy/selinux-asterisk/selinux-asterisk-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-asterisk/selinux-asterisk-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-asterisk/selinux-asterisk-2.20170204-r3.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-2.20170204-r3.ebuild
index fd1a1e74c464..62ff34ffcdf0 100644
--- a/sec-policy/selinux-asterisk/selinux-asterisk-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-asterisk/selinux-asterisk-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-asterisk/selinux-asterisk-2.20170204-r4.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-2.20170204-r4.ebuild
index fd1a1e74c464..62ff34ffcdf0 100644
--- a/sec-policy/selinux-asterisk/selinux-asterisk-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-asterisk/selinux-asterisk-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-asterisk/selinux-asterisk-2.20170805-r2.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-2.20170805-r2.ebuild
index fd1a1e74c464..62ff34ffcdf0 100644
--- a/sec-policy/selinux-asterisk/selinux-asterisk-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-asterisk/selinux-asterisk-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-asterisk/selinux-asterisk-2.20170805-r3.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..30bc3aaba1a8
--- /dev/null
+++ b/sec-policy/selinux-asterisk/selinux-asterisk-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-asterisk/selinux-asterisk-9999.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-9999.ebuild
index 5896f02f326e..30bc3aaba1a8 100644
--- a/sec-policy/selinux-asterisk/selinux-asterisk-9999.ebuild
+++ b/sec-policy/selinux-asterisk/selinux-asterisk-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-at/Manifest b/sec-policy/selinux-at/Manifest
index b86c3f17cc38..018ea8dcab3e 100644
--- a/sec-policy/selinux-at/Manifest
+++ b/sec-policy/selinux-at/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-at-2.20170204-r1.ebuild 275 SHA256 42d4133c5f7c6fb910aebd442606e0876b285548795039a66732f801f794253a SHA512 9ed1e373b55b5c23dc2d7a6975cb4ebf849cf153ff45cc780f97dc1cd4ade503821790d85727f20de31bd722547b9b9f38f6f26004b0c7480a921dd3874d3098 WHIRLPOOL 066e79af29677bd578034364fe696e61e613a2078a0e4c77009d0b0115a689a7ed8c614ea0113063a644f9dd133fc80c6b3576fa6cfe13ce0cabf3414c6019b5
-EBUILD selinux-at-2.20170204-r2.ebuild 273 SHA256 9b28e3627570ab421e910766e3006fef0659c34ecbff99961b1fa640bdae8fb7 SHA512 99caef03c7410f01855a64c590bc141dd16f978f75f922e344332c5aa81ef2c586599f4bcc9ef452d9911cf1f7613132c141e4b4213f5f24dfef6e2d7dc57434 WHIRLPOOL bac342288be215351241f046da0a6a02c5ba26e087ec19a2bd5147e821c05ae1605ff185efeea60c2b82c2d6a6c69e5875260c69d4fc7eb6f3a024315a5c30df
-EBUILD selinux-at-2.20170204-r3.ebuild 273 SHA256 9b28e3627570ab421e910766e3006fef0659c34ecbff99961b1fa640bdae8fb7 SHA512 99caef03c7410f01855a64c590bc141dd16f978f75f922e344332c5aa81ef2c586599f4bcc9ef452d9911cf1f7613132c141e4b4213f5f24dfef6e2d7dc57434 WHIRLPOOL bac342288be215351241f046da0a6a02c5ba26e087ec19a2bd5147e821c05ae1605ff185efeea60c2b82c2d6a6c69e5875260c69d4fc7eb6f3a024315a5c30df
-EBUILD selinux-at-2.20170204-r4.ebuild 273 SHA256 9b28e3627570ab421e910766e3006fef0659c34ecbff99961b1fa640bdae8fb7 SHA512 99caef03c7410f01855a64c590bc141dd16f978f75f922e344332c5aa81ef2c586599f4bcc9ef452d9911cf1f7613132c141e4b4213f5f24dfef6e2d7dc57434 WHIRLPOOL bac342288be215351241f046da0a6a02c5ba26e087ec19a2bd5147e821c05ae1605ff185efeea60c2b82c2d6a6c69e5875260c69d4fc7eb6f3a024315a5c30df
-EBUILD selinux-at-2.20170805-r2.ebuild 273 SHA256 9b28e3627570ab421e910766e3006fef0659c34ecbff99961b1fa640bdae8fb7 SHA512 99caef03c7410f01855a64c590bc141dd16f978f75f922e344332c5aa81ef2c586599f4bcc9ef452d9911cf1f7613132c141e4b4213f5f24dfef6e2d7dc57434 WHIRLPOOL bac342288be215351241f046da0a6a02c5ba26e087ec19a2bd5147e821c05ae1605ff185efeea60c2b82c2d6a6c69e5875260c69d4fc7eb6f3a024315a5c30df
-EBUILD selinux-at-9999.ebuild 275 SHA256 42d4133c5f7c6fb910aebd442606e0876b285548795039a66732f801f794253a SHA512 9ed1e373b55b5c23dc2d7a6975cb4ebf849cf153ff45cc780f97dc1cd4ade503821790d85727f20de31bd722547b9b9f38f6f26004b0c7480a921dd3874d3098 WHIRLPOOL 066e79af29677bd578034364fe696e61e613a2078a0e4c77009d0b0115a689a7ed8c614ea0113063a644f9dd133fc80c6b3576fa6cfe13ce0cabf3414c6019b5
+EBUILD selinux-at-2.20170204-r1.ebuild 276 SHA256 69e05e2641ca4a128c42d81c91e552f2a5e61ff35833ef332a38a6921e1f7dc9 SHA512 c1992b4d225439daddf525fafab1f144a43b33e1855fa58e7b2b1f6a628ad4b7720f50d9e33b6b66ff17761c3fb2aa2ef50c0010047dea766f10a3106dddf7df WHIRLPOOL 08b3537c54d74da999179ad2aec0695b9fd476e81d673f56423ada71208664e551adf9a2c50e1a4c4c58d84e012f1743a571c47cec7338b3d18f9ce85a3d2991
+EBUILD selinux-at-2.20170204-r2.ebuild 274 SHA256 a4fb59886ebaa3b8147b57ee56d48f501e7368b0bc37b158800954621bc84975 SHA512 3251f55edec1da13d3535228f22e01e58ea2ebe84506df205c2c67265358178e402d777f95881bcc915dbbac772f28c94516edf5f67e6915fe6dc89b4bf5ec88 WHIRLPOOL faf4479e8e1d4c4e04808c5152b2eeecb38f4482ddceb98537bb8217ce3e48d06ffb971618612326d21ae5db58e733b9153e1f23ea4b09d78d1e6deda4404f8a
+EBUILD selinux-at-2.20170204-r3.ebuild 274 SHA256 a4fb59886ebaa3b8147b57ee56d48f501e7368b0bc37b158800954621bc84975 SHA512 3251f55edec1da13d3535228f22e01e58ea2ebe84506df205c2c67265358178e402d777f95881bcc915dbbac772f28c94516edf5f67e6915fe6dc89b4bf5ec88 WHIRLPOOL faf4479e8e1d4c4e04808c5152b2eeecb38f4482ddceb98537bb8217ce3e48d06ffb971618612326d21ae5db58e733b9153e1f23ea4b09d78d1e6deda4404f8a
+EBUILD selinux-at-2.20170204-r4.ebuild 274 SHA256 a4fb59886ebaa3b8147b57ee56d48f501e7368b0bc37b158800954621bc84975 SHA512 3251f55edec1da13d3535228f22e01e58ea2ebe84506df205c2c67265358178e402d777f95881bcc915dbbac772f28c94516edf5f67e6915fe6dc89b4bf5ec88 WHIRLPOOL faf4479e8e1d4c4e04808c5152b2eeecb38f4482ddceb98537bb8217ce3e48d06ffb971618612326d21ae5db58e733b9153e1f23ea4b09d78d1e6deda4404f8a
+EBUILD selinux-at-2.20170805-r2.ebuild 274 SHA256 a4fb59886ebaa3b8147b57ee56d48f501e7368b0bc37b158800954621bc84975 SHA512 3251f55edec1da13d3535228f22e01e58ea2ebe84506df205c2c67265358178e402d777f95881bcc915dbbac772f28c94516edf5f67e6915fe6dc89b4bf5ec88 WHIRLPOOL faf4479e8e1d4c4e04808c5152b2eeecb38f4482ddceb98537bb8217ce3e48d06ffb971618612326d21ae5db58e733b9153e1f23ea4b09d78d1e6deda4404f8a
+EBUILD selinux-at-2.20170805-r3.ebuild 276 SHA256 69e05e2641ca4a128c42d81c91e552f2a5e61ff35833ef332a38a6921e1f7dc9 SHA512 c1992b4d225439daddf525fafab1f144a43b33e1855fa58e7b2b1f6a628ad4b7720f50d9e33b6b66ff17761c3fb2aa2ef50c0010047dea766f10a3106dddf7df WHIRLPOOL 08b3537c54d74da999179ad2aec0695b9fd476e81d673f56423ada71208664e551adf9a2c50e1a4c4c58d84e012f1743a571c47cec7338b3d18f9ce85a3d2991
+EBUILD selinux-at-9999.ebuild 276 SHA256 69e05e2641ca4a128c42d81c91e552f2a5e61ff35833ef332a38a6921e1f7dc9 SHA512 c1992b4d225439daddf525fafab1f144a43b33e1855fa58e7b2b1f6a628ad4b7720f50d9e33b6b66ff17761c3fb2aa2ef50c0010047dea766f10a3106dddf7df WHIRLPOOL 08b3537c54d74da999179ad2aec0695b9fd476e81d673f56423ada71208664e551adf9a2c50e1a4c4c58d84e012f1743a571c47cec7338b3d18f9ce85a3d2991
 MISC ChangeLog 10203 SHA256 153ed602251435c2cb2ad6708d5469dfbaebbb5512293708e6703d9aefd0f3e7 SHA512 4ee52b70684c021d6004c1dd78a4636a7bf2ef355bccb51b18fc0b67b4f4f5b00a95c04d34e13133ef6fc3385f816e10c7db452aa53f81e74d86dad737638b22 WHIRLPOOL b2ea4dd0d2f9824b863a835c7c353ddf606e23162c7c602a24adc15056f2f0a8b0caa3034c72fc9693bf1ac3ee5371fc0a774aa9fd4bc31ad795750f7c6aece4
 MISC ChangeLog-2015 6925 SHA256 2b263e2d304d8e361ecba5dd7bc06e859b4fe2bd0d71a30407bf8ccf9e3863da SHA512 a89d5392cd0d7cfc238849a46bd484018762c3d5c7f06bb0c7174c8210ee7472d22ea6c1e87af49524c61ad7f59e1afe80e84d71231709e205d36197b0629211 WHIRLPOOL d13a0ab883df54dd26d0a436425d96484241af3029441691e92cf566c219938462d5cbc741635c866ff5bfe133b43203f1c34d113f30f7174b721740a539dc0f
 MISC metadata.xml 312 SHA256 fc5de68ded639adec9511d154b9817fe89a8bf827bc966a8c4930a05d7c6c65e SHA512 0d8118c4453dfb4796c10532034c98ab3ed08255c27881959dfa818486918c9c36616d0b9921fbe5af35f238593d6b39011d48a9c8b302e577ea2ee7ed5fd333 WHIRLPOOL b4ee3bf3ca26b39e6c8a761373617c225dcee9ae9c8b74fa9067c9bf0a935e069fdb72690d6dd1d211ac5131d2624f3d3b3e7052e5f07b08bd04e64c367bbe8d
diff --git a/sec-policy/selinux-at/selinux-at-2.20170204-r1.ebuild b/sec-policy/selinux-at/selinux-at-2.20170204-r1.ebuild
index 7ec195de48be..60be724ec280 100644
--- a/sec-policy/selinux-at/selinux-at-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-at/selinux-at-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-at/selinux-at-2.20170204-r2.ebuild b/sec-policy/selinux-at/selinux-at-2.20170204-r2.ebuild
index 317da6084a3f..2033d520758c 100644
--- a/sec-policy/selinux-at/selinux-at-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-at/selinux-at-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-at/selinux-at-2.20170204-r3.ebuild b/sec-policy/selinux-at/selinux-at-2.20170204-r3.ebuild
index 317da6084a3f..2033d520758c 100644
--- a/sec-policy/selinux-at/selinux-at-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-at/selinux-at-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-at/selinux-at-2.20170204-r4.ebuild b/sec-policy/selinux-at/selinux-at-2.20170204-r4.ebuild
index 317da6084a3f..2033d520758c 100644
--- a/sec-policy/selinux-at/selinux-at-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-at/selinux-at-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-at/selinux-at-2.20170805-r2.ebuild b/sec-policy/selinux-at/selinux-at-2.20170805-r2.ebuild
index 317da6084a3f..2033d520758c 100644
--- a/sec-policy/selinux-at/selinux-at-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-at/selinux-at-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-at/selinux-at-2.20170805-r3.ebuild b/sec-policy/selinux-at/selinux-at-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..60be724ec280
--- /dev/null
+++ b/sec-policy/selinux-at/selinux-at-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-at/selinux-at-9999.ebuild b/sec-policy/selinux-at/selinux-at-9999.ebuild
index 7ec195de48be..60be724ec280 100644
--- a/sec-policy/selinux-at/selinux-at-9999.ebuild
+++ b/sec-policy/selinux-at/selinux-at-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-automount/Manifest b/sec-policy/selinux-automount/Manifest
index d78075bc2e09..9dfbf341a4a0 100644
--- a/sec-policy/selinux-automount/Manifest
+++ b/sec-policy/selinux-automount/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-automount-2.20170204-r1.ebuild 289 SHA256 24b4d35d7c1c8789aea8afd0e6fb5f7b3cb44eeed579422845fb88f4d43fd8c6 SHA512 4179a837c44e3370f2614245b89beae81180898610ba71ca81c634cea65df9de8ce1cd3f071581ff962bd02013f3f19fa543fa69afc1c9f40c4219e03211ac3e WHIRLPOOL cd543a9867ee61cf8ff440646ac9695d8c7a2b23788b6fce840baefba999f6008d1d236a8fcc849822ff9763886a482b6adf85c9a3ccb6716fdbd25dc0666d8e
-EBUILD selinux-automount-2.20170204-r2.ebuild 287 SHA256 cc29c1c49c647b8cb4fa78c2df6d1e519a3b83ff4daffa8affbfc47611f0d34a SHA512 273c55deba4dd39b4661768ea802098905dd1868e0a4b9853e038de80fb2da1c35793a726efde92648ab5e486e0b5da05d249ae7949f7cebe24f344a607218b2 WHIRLPOOL ac0fd72b9ff2f4d2a08ed8154ea0ecfc9fd8424f9360d196e6dcf8910d4bebc2436bd10def9fc1f12f4f63731084809f8cda72b084947680d8aedb8749b40651
-EBUILD selinux-automount-2.20170204-r3.ebuild 287 SHA256 cc29c1c49c647b8cb4fa78c2df6d1e519a3b83ff4daffa8affbfc47611f0d34a SHA512 273c55deba4dd39b4661768ea802098905dd1868e0a4b9853e038de80fb2da1c35793a726efde92648ab5e486e0b5da05d249ae7949f7cebe24f344a607218b2 WHIRLPOOL ac0fd72b9ff2f4d2a08ed8154ea0ecfc9fd8424f9360d196e6dcf8910d4bebc2436bd10def9fc1f12f4f63731084809f8cda72b084947680d8aedb8749b40651
-EBUILD selinux-automount-2.20170204-r4.ebuild 287 SHA256 cc29c1c49c647b8cb4fa78c2df6d1e519a3b83ff4daffa8affbfc47611f0d34a SHA512 273c55deba4dd39b4661768ea802098905dd1868e0a4b9853e038de80fb2da1c35793a726efde92648ab5e486e0b5da05d249ae7949f7cebe24f344a607218b2 WHIRLPOOL ac0fd72b9ff2f4d2a08ed8154ea0ecfc9fd8424f9360d196e6dcf8910d4bebc2436bd10def9fc1f12f4f63731084809f8cda72b084947680d8aedb8749b40651
-EBUILD selinux-automount-2.20170805-r2.ebuild 287 SHA256 cc29c1c49c647b8cb4fa78c2df6d1e519a3b83ff4daffa8affbfc47611f0d34a SHA512 273c55deba4dd39b4661768ea802098905dd1868e0a4b9853e038de80fb2da1c35793a726efde92648ab5e486e0b5da05d249ae7949f7cebe24f344a607218b2 WHIRLPOOL ac0fd72b9ff2f4d2a08ed8154ea0ecfc9fd8424f9360d196e6dcf8910d4bebc2436bd10def9fc1f12f4f63731084809f8cda72b084947680d8aedb8749b40651
-EBUILD selinux-automount-9999.ebuild 289 SHA256 24b4d35d7c1c8789aea8afd0e6fb5f7b3cb44eeed579422845fb88f4d43fd8c6 SHA512 4179a837c44e3370f2614245b89beae81180898610ba71ca81c634cea65df9de8ce1cd3f071581ff962bd02013f3f19fa543fa69afc1c9f40c4219e03211ac3e WHIRLPOOL cd543a9867ee61cf8ff440646ac9695d8c7a2b23788b6fce840baefba999f6008d1d236a8fcc849822ff9763886a482b6adf85c9a3ccb6716fdbd25dc0666d8e
+EBUILD selinux-automount-2.20170204-r1.ebuild 290 SHA256 896e8e97463e5589d34405a8b2f54128e78d0d1ae2675dca05f576644f5d8cc6 SHA512 c7ed768a3a3b47d1941b0cd096503aae8e4210262044701840e3a0c3653e00353f0fb9ddd6fff93bef452580fd0b7165220ecd5fbb78724002c538a457db5d57 WHIRLPOOL 9524f916fe4985f8a2cced7643aecaa913cccc1267e00ebb4b742117ff102eb4c4ff9988ed8978d4071927a17044b8ccc3f9c6d4a62de238a102045e57fbcfec
+EBUILD selinux-automount-2.20170204-r2.ebuild 288 SHA256 276b567301ef057472c6dd82897276372b590de248663a36968d3b31a0b22494 SHA512 a761bd9151a620aad48d4f3d6f35a79ef83df07a8b13c295f0e0d8877c572df70dbb540a38120b97e5d35c6ada94be5aed7ad07503ccb26b491067ad9532dbb0 WHIRLPOOL dbcdffbd5c2faa06022b772f2f3a207c3a039a72dbd3b89dae764a53eb89554312c9c9c109d477ce692822f0fca88f6434697501cf962ed9d413651626a0e0f8
+EBUILD selinux-automount-2.20170204-r3.ebuild 288 SHA256 276b567301ef057472c6dd82897276372b590de248663a36968d3b31a0b22494 SHA512 a761bd9151a620aad48d4f3d6f35a79ef83df07a8b13c295f0e0d8877c572df70dbb540a38120b97e5d35c6ada94be5aed7ad07503ccb26b491067ad9532dbb0 WHIRLPOOL dbcdffbd5c2faa06022b772f2f3a207c3a039a72dbd3b89dae764a53eb89554312c9c9c109d477ce692822f0fca88f6434697501cf962ed9d413651626a0e0f8
+EBUILD selinux-automount-2.20170204-r4.ebuild 288 SHA256 276b567301ef057472c6dd82897276372b590de248663a36968d3b31a0b22494 SHA512 a761bd9151a620aad48d4f3d6f35a79ef83df07a8b13c295f0e0d8877c572df70dbb540a38120b97e5d35c6ada94be5aed7ad07503ccb26b491067ad9532dbb0 WHIRLPOOL dbcdffbd5c2faa06022b772f2f3a207c3a039a72dbd3b89dae764a53eb89554312c9c9c109d477ce692822f0fca88f6434697501cf962ed9d413651626a0e0f8
+EBUILD selinux-automount-2.20170805-r2.ebuild 288 SHA256 276b567301ef057472c6dd82897276372b590de248663a36968d3b31a0b22494 SHA512 a761bd9151a620aad48d4f3d6f35a79ef83df07a8b13c295f0e0d8877c572df70dbb540a38120b97e5d35c6ada94be5aed7ad07503ccb26b491067ad9532dbb0 WHIRLPOOL dbcdffbd5c2faa06022b772f2f3a207c3a039a72dbd3b89dae764a53eb89554312c9c9c109d477ce692822f0fca88f6434697501cf962ed9d413651626a0e0f8
+EBUILD selinux-automount-2.20170805-r3.ebuild 290 SHA256 896e8e97463e5589d34405a8b2f54128e78d0d1ae2675dca05f576644f5d8cc6 SHA512 c7ed768a3a3b47d1941b0cd096503aae8e4210262044701840e3a0c3653e00353f0fb9ddd6fff93bef452580fd0b7165220ecd5fbb78724002c538a457db5d57 WHIRLPOOL 9524f916fe4985f8a2cced7643aecaa913cccc1267e00ebb4b742117ff102eb4c4ff9988ed8978d4071927a17044b8ccc3f9c6d4a62de238a102045e57fbcfec
+EBUILD selinux-automount-9999.ebuild 290 SHA256 896e8e97463e5589d34405a8b2f54128e78d0d1ae2675dca05f576644f5d8cc6 SHA512 c7ed768a3a3b47d1941b0cd096503aae8e4210262044701840e3a0c3653e00353f0fb9ddd6fff93bef452580fd0b7165220ecd5fbb78724002c538a457db5d57 WHIRLPOOL 9524f916fe4985f8a2cced7643aecaa913cccc1267e00ebb4b742117ff102eb4c4ff9988ed8978d4071927a17044b8ccc3f9c6d4a62de238a102045e57fbcfec
 MISC ChangeLog 10887 SHA256 8e364b6363940788fd455c50b518772649bcaa06725fce78b46f49abd64e176b SHA512 0347d25c587092146b874ea33c30f4dd137ab76178823ddf781052adc9ae4392d85179374d499da9cdc7e5bc1910dc442c6155fb603b24db59e92d308667ebf3 WHIRLPOOL 6914eee3ffc2c99b008a69d005db3a124a6c4f372f3986141a9b5a054dc1b1a7af07aed6869f3bc73615f43d6ff31ef1cd9e900334164954ce584e9536d193d7
 MISC ChangeLog-2015 10217 SHA256 de1c37271b6fadd04d7e716ce613ab14304140258d31348e26014b5bfdf8f47f SHA512 6f820162b4bb2493a94723b73f5dfcdad759e908f0addf790ebd587dfee27b0abcfd9f0bb1fb914018700e027ee44aba95dbbb18c0fefc3c6bd55c5d0c792e5e WHIRLPOOL 889cda005b449aca6087fd4530628edf8ddd02b482cc2a68c8f253483cbd8f5dfc60508197f8d7ff827690fd641aecdf9a9d727a6f4c32fefc3df8570d9ac428
 MISC metadata.xml 319 SHA256 3e139e899073990a2a94e7fe2c35cbcfa8bfe8a0928152c00d16d5ccaeedcf7e SHA512 df7fb7f023892cb790bb12bcf25abd4ed0bffe469cfcdffa399d0e3f13535e5a9b29c8aebc8ef11c9171f033da569597c9824cf1789d1042e0493f4d14aa6fec WHIRLPOOL 0f01639551b6a4e04a4aff519cf78193791000a8de9b4f0998e38b979c867f26c3dde1eb672f09a9e1f02c0ca48975ac20d962bae3fd6fa81bee83a899523a57
diff --git a/sec-policy/selinux-automount/selinux-automount-2.20170204-r1.ebuild b/sec-policy/selinux-automount/selinux-automount-2.20170204-r1.ebuild
index 1693e12222ca..908d5219c7b3 100644
--- a/sec-policy/selinux-automount/selinux-automount-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-automount/selinux-automount-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-automount/selinux-automount-2.20170204-r2.ebuild b/sec-policy/selinux-automount/selinux-automount-2.20170204-r2.ebuild
index 65de1c0d535d..a3cfbe6ac4f2 100644
--- a/sec-policy/selinux-automount/selinux-automount-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-automount/selinux-automount-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-automount/selinux-automount-2.20170204-r3.ebuild b/sec-policy/selinux-automount/selinux-automount-2.20170204-r3.ebuild
index 65de1c0d535d..a3cfbe6ac4f2 100644
--- a/sec-policy/selinux-automount/selinux-automount-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-automount/selinux-automount-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-automount/selinux-automount-2.20170204-r4.ebuild b/sec-policy/selinux-automount/selinux-automount-2.20170204-r4.ebuild
index 65de1c0d535d..a3cfbe6ac4f2 100644
--- a/sec-policy/selinux-automount/selinux-automount-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-automount/selinux-automount-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-automount/selinux-automount-2.20170805-r2.ebuild b/sec-policy/selinux-automount/selinux-automount-2.20170805-r2.ebuild
index 65de1c0d535d..a3cfbe6ac4f2 100644
--- a/sec-policy/selinux-automount/selinux-automount-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-automount/selinux-automount-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-automount/selinux-automount-2.20170805-r3.ebuild b/sec-policy/selinux-automount/selinux-automount-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..908d5219c7b3
--- /dev/null
+++ b/sec-policy/selinux-automount/selinux-automount-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-automount/selinux-automount-9999.ebuild b/sec-policy/selinux-automount/selinux-automount-9999.ebuild
index 1693e12222ca..908d5219c7b3 100644
--- a/sec-policy/selinux-automount/selinux-automount-9999.ebuild
+++ b/sec-policy/selinux-automount/selinux-automount-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-avahi/Manifest b/sec-policy/selinux-avahi/Manifest
index aa73d4401cc6..7fc416825cdb 100644
--- a/sec-policy/selinux-avahi/Manifest
+++ b/sec-policy/selinux-avahi/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-avahi-2.20170204-r1.ebuild 281 SHA256 a9c7e95b6216dd36d35dfe81ad49b10235bc61eecce8420f07716393e271fa65 SHA512 fbb1611f355a34fe8e3dea8c749a9b8d106cafb14eb60b25436fea0eb1023ce2df8a85419f443ee0a9faeb32ddcdf3a636fc1cbdd949774d2aef8bc9dc9b1307 WHIRLPOOL 345e582693a995eccd4660ad0b3766ba3a1840edc414baa90a9fa517ff727937a34d0872df4c6c3f9251a63d8f535b153205e098ecdf95353493317b97906b2d
-EBUILD selinux-avahi-2.20170204-r2.ebuild 279 SHA256 407897ff6f0fca68be3984f5b6d505ff105ef36bfa20fb059084c8a69965e043 SHA512 3798c903ef9f861c0520073f32706f75d774b867965f47e2349943a76301bebe4c6b3bad38292ed9c79b531180eb5edad9f265903b918db947c03867c7583bc6 WHIRLPOOL ca870a860986bc0d93c5470b70d77aa814423eac7b8469517fb37b3a73e45cca8dc6d1a953ac64d2930c4522349ca6091597d0bee52171e8f8931a585e2ae6ff
-EBUILD selinux-avahi-2.20170204-r3.ebuild 279 SHA256 407897ff6f0fca68be3984f5b6d505ff105ef36bfa20fb059084c8a69965e043 SHA512 3798c903ef9f861c0520073f32706f75d774b867965f47e2349943a76301bebe4c6b3bad38292ed9c79b531180eb5edad9f265903b918db947c03867c7583bc6 WHIRLPOOL ca870a860986bc0d93c5470b70d77aa814423eac7b8469517fb37b3a73e45cca8dc6d1a953ac64d2930c4522349ca6091597d0bee52171e8f8931a585e2ae6ff
-EBUILD selinux-avahi-2.20170204-r4.ebuild 279 SHA256 407897ff6f0fca68be3984f5b6d505ff105ef36bfa20fb059084c8a69965e043 SHA512 3798c903ef9f861c0520073f32706f75d774b867965f47e2349943a76301bebe4c6b3bad38292ed9c79b531180eb5edad9f265903b918db947c03867c7583bc6 WHIRLPOOL ca870a860986bc0d93c5470b70d77aa814423eac7b8469517fb37b3a73e45cca8dc6d1a953ac64d2930c4522349ca6091597d0bee52171e8f8931a585e2ae6ff
-EBUILD selinux-avahi-2.20170805-r2.ebuild 279 SHA256 407897ff6f0fca68be3984f5b6d505ff105ef36bfa20fb059084c8a69965e043 SHA512 3798c903ef9f861c0520073f32706f75d774b867965f47e2349943a76301bebe4c6b3bad38292ed9c79b531180eb5edad9f265903b918db947c03867c7583bc6 WHIRLPOOL ca870a860986bc0d93c5470b70d77aa814423eac7b8469517fb37b3a73e45cca8dc6d1a953ac64d2930c4522349ca6091597d0bee52171e8f8931a585e2ae6ff
-EBUILD selinux-avahi-9999.ebuild 281 SHA256 a9c7e95b6216dd36d35dfe81ad49b10235bc61eecce8420f07716393e271fa65 SHA512 fbb1611f355a34fe8e3dea8c749a9b8d106cafb14eb60b25436fea0eb1023ce2df8a85419f443ee0a9faeb32ddcdf3a636fc1cbdd949774d2aef8bc9dc9b1307 WHIRLPOOL 345e582693a995eccd4660ad0b3766ba3a1840edc414baa90a9fa517ff727937a34d0872df4c6c3f9251a63d8f535b153205e098ecdf95353493317b97906b2d
+EBUILD selinux-avahi-2.20170204-r1.ebuild 282 SHA256 2d4f83beaaf5c9ecb538be379c54fdcc4bb3f04f80b7164de4c9cf74adcf407a SHA512 543d6968dad88ce5d0a661320723af462587091ce8e253e63fb19a12afabb5082d9e52353189d00f61966b7b9fc763786208c84335fd686d08c894b58c3ff6d1 WHIRLPOOL bbf0899805ddebe85f97d7eef32e943e621baab551c36a5ae10854da99961d4b41a60aba5656cc871f50f6fcf95087d5ec64c5d18ed8fa811504c35aeefe6103
+EBUILD selinux-avahi-2.20170204-r2.ebuild 280 SHA256 3db60a141b8e94df2edca277fa118c032da4b3aaf1c62674d4dca8121fa9ffea SHA512 07930eca88272ab1d895b5640ceee40f5eef1e4a71e890649096cad16516badefe298661eda73216333918367bfa5ecc24f0c5f2a45eee97094a3a96bfca9e16 WHIRLPOOL 8af6936671f496d648e4843b3b37599ffad2aad32460b834a2b46e576cdcd6c855137351132a92effe770c7e10f7f6ad9f7a488177dcea852c5ad5f4f8cf1ea6
+EBUILD selinux-avahi-2.20170204-r3.ebuild 280 SHA256 3db60a141b8e94df2edca277fa118c032da4b3aaf1c62674d4dca8121fa9ffea SHA512 07930eca88272ab1d895b5640ceee40f5eef1e4a71e890649096cad16516badefe298661eda73216333918367bfa5ecc24f0c5f2a45eee97094a3a96bfca9e16 WHIRLPOOL 8af6936671f496d648e4843b3b37599ffad2aad32460b834a2b46e576cdcd6c855137351132a92effe770c7e10f7f6ad9f7a488177dcea852c5ad5f4f8cf1ea6
+EBUILD selinux-avahi-2.20170204-r4.ebuild 280 SHA256 3db60a141b8e94df2edca277fa118c032da4b3aaf1c62674d4dca8121fa9ffea SHA512 07930eca88272ab1d895b5640ceee40f5eef1e4a71e890649096cad16516badefe298661eda73216333918367bfa5ecc24f0c5f2a45eee97094a3a96bfca9e16 WHIRLPOOL 8af6936671f496d648e4843b3b37599ffad2aad32460b834a2b46e576cdcd6c855137351132a92effe770c7e10f7f6ad9f7a488177dcea852c5ad5f4f8cf1ea6
+EBUILD selinux-avahi-2.20170805-r2.ebuild 280 SHA256 3db60a141b8e94df2edca277fa118c032da4b3aaf1c62674d4dca8121fa9ffea SHA512 07930eca88272ab1d895b5640ceee40f5eef1e4a71e890649096cad16516badefe298661eda73216333918367bfa5ecc24f0c5f2a45eee97094a3a96bfca9e16 WHIRLPOOL 8af6936671f496d648e4843b3b37599ffad2aad32460b834a2b46e576cdcd6c855137351132a92effe770c7e10f7f6ad9f7a488177dcea852c5ad5f4f8cf1ea6
+EBUILD selinux-avahi-2.20170805-r3.ebuild 282 SHA256 2d4f83beaaf5c9ecb538be379c54fdcc4bb3f04f80b7164de4c9cf74adcf407a SHA512 543d6968dad88ce5d0a661320723af462587091ce8e253e63fb19a12afabb5082d9e52353189d00f61966b7b9fc763786208c84335fd686d08c894b58c3ff6d1 WHIRLPOOL bbf0899805ddebe85f97d7eef32e943e621baab551c36a5ae10854da99961d4b41a60aba5656cc871f50f6fcf95087d5ec64c5d18ed8fa811504c35aeefe6103
+EBUILD selinux-avahi-9999.ebuild 282 SHA256 2d4f83beaaf5c9ecb538be379c54fdcc4bb3f04f80b7164de4c9cf74adcf407a SHA512 543d6968dad88ce5d0a661320723af462587091ce8e253e63fb19a12afabb5082d9e52353189d00f61966b7b9fc763786208c84335fd686d08c894b58c3ff6d1 WHIRLPOOL bbf0899805ddebe85f97d7eef32e943e621baab551c36a5ae10854da99961d4b41a60aba5656cc871f50f6fcf95087d5ec64c5d18ed8fa811504c35aeefe6103
 MISC ChangeLog 10479 SHA256 4dde8499d984da7890178fda94d62e690ad687dd9f0ed2c03f573e847a4ba1a8 SHA512 33ed42244bb2f1b9916d33b9790845c63a37a59ca5276283a36fd409936ad8d2a44ecbc09a084fe75bde725c7fd6c03ff8a24b9da5649205fe896651c81d08fa WHIRLPOOL 4ae396ba58c4821ce1059448e9944e68a3b86d55dad24f7daff7808d91ee448dc61617287916e84ffd13771b82485ec1c6250a2b751961525ac4bdc28af4ac2a
 MISC ChangeLog-2015 11604 SHA256 e11f7efd9cd9df5f980218cec912e0e9bb4718ad6d6de633310ae1184196b281 SHA512 7f92839f414e43ee1685013eb6e3554f08f2b290cb62fde04e979c1a48e17e07bfa9a1e62ca1f909cf6e8f420ba3c9559cf3ddbb94037523c130fc255cd9be48 WHIRLPOOL caefd069be7f721deb3c64a251b11fbf564924120b71c5c9a5bd64ce1db171dde675db2777d08b529dfe3ba8e53a13df363754da5d6d98e04f63f0b4d09d04d7
 MISC metadata.xml 315 SHA256 3b4b865923eddcf041111764e714e18244b8343039a2750f95e326980e6a22b6 SHA512 891d4ca0710d0f8ebbeaae86e71ff03f0011ded5cdafde29af66684e39f27ab8a6ff3b447b9138434503938484b7c9947c1f386a67860acb316ed1fdd91177e3 WHIRLPOOL 364cd4dd86bf67be40da70399abdfc3c96cdc2032769a3ce1a4243d7e2163e94986fba5727ffeb1f46aa02ed96c2ac5c9f9316c7e1115819b2b8280b131c8a72
diff --git a/sec-policy/selinux-avahi/selinux-avahi-2.20170204-r1.ebuild b/sec-policy/selinux-avahi/selinux-avahi-2.20170204-r1.ebuild
index fdfc7b3f9eab..f6123cfbbb86 100644
--- a/sec-policy/selinux-avahi/selinux-avahi-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-avahi/selinux-avahi-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-avahi/selinux-avahi-2.20170204-r2.ebuild b/sec-policy/selinux-avahi/selinux-avahi-2.20170204-r2.ebuild
index ac4ed68c1115..70871b2b615d 100644
--- a/sec-policy/selinux-avahi/selinux-avahi-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-avahi/selinux-avahi-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-avahi/selinux-avahi-2.20170204-r3.ebuild b/sec-policy/selinux-avahi/selinux-avahi-2.20170204-r3.ebuild
index ac4ed68c1115..70871b2b615d 100644
--- a/sec-policy/selinux-avahi/selinux-avahi-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-avahi/selinux-avahi-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-avahi/selinux-avahi-2.20170204-r4.ebuild b/sec-policy/selinux-avahi/selinux-avahi-2.20170204-r4.ebuild
index ac4ed68c1115..70871b2b615d 100644
--- a/sec-policy/selinux-avahi/selinux-avahi-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-avahi/selinux-avahi-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-avahi/selinux-avahi-2.20170805-r2.ebuild b/sec-policy/selinux-avahi/selinux-avahi-2.20170805-r2.ebuild
index ac4ed68c1115..70871b2b615d 100644
--- a/sec-policy/selinux-avahi/selinux-avahi-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-avahi/selinux-avahi-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-avahi/selinux-avahi-2.20170805-r3.ebuild b/sec-policy/selinux-avahi/selinux-avahi-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..f6123cfbbb86
--- /dev/null
+++ b/sec-policy/selinux-avahi/selinux-avahi-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-avahi/selinux-avahi-9999.ebuild b/sec-policy/selinux-avahi/selinux-avahi-9999.ebuild
index fdfc7b3f9eab..f6123cfbbb86 100644
--- a/sec-policy/selinux-avahi/selinux-avahi-9999.ebuild
+++ b/sec-policy/selinux-avahi/selinux-avahi-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-awstats/Manifest b/sec-policy/selinux-awstats/Manifest
index e876229e0941..2cccc68effab 100644
--- a/sec-policy/selinux-awstats/Manifest
+++ b/sec-policy/selinux-awstats/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-awstats-2.20170204-r1.ebuild 381 SHA256 6da57dd0a425af0263bd788895443bba169e1792e0fbc90487ff94d0b25daa0e SHA512 ec73605f9ec7dde163c893b64f896a613ed3351c5d230cf3f1f815b887e03fa89ae9b84826138369d05cc282e50554349f7e3b469ee3e3091966658decb5b30c WHIRLPOOL 5c80389bd28531300275d0a431f4fff3522f50662ff25547de3d7c2647c7b9936025c26d1f565d4145cafca2b2ae58e3b491299af0ef8e24e2fb97dc0d370314
-EBUILD selinux-awstats-2.20170204-r2.ebuild 379 SHA256 34fcab75554dcfede6be7e00e55319829d5f852fb8a867899d1a986d33d72111 SHA512 66425502516c1cd2ddcc7879fa7a23bc8aeb433ba3ef04d812c8783de84976f54e7f1a6556d1a0e7528a883ee2b908faf5ea86ec7476ee5df3b76ede85dc0e45 WHIRLPOOL 9a81096182221258f798b3baf5dc73a141c4972564dc6bf5310e9495b52c1ac20cbe5a7bdce997220745a89811ec7e5e826cb51a478e9e7583630c2c7d2e7b9c
-EBUILD selinux-awstats-2.20170204-r3.ebuild 379 SHA256 34fcab75554dcfede6be7e00e55319829d5f852fb8a867899d1a986d33d72111 SHA512 66425502516c1cd2ddcc7879fa7a23bc8aeb433ba3ef04d812c8783de84976f54e7f1a6556d1a0e7528a883ee2b908faf5ea86ec7476ee5df3b76ede85dc0e45 WHIRLPOOL 9a81096182221258f798b3baf5dc73a141c4972564dc6bf5310e9495b52c1ac20cbe5a7bdce997220745a89811ec7e5e826cb51a478e9e7583630c2c7d2e7b9c
-EBUILD selinux-awstats-2.20170204-r4.ebuild 379 SHA256 34fcab75554dcfede6be7e00e55319829d5f852fb8a867899d1a986d33d72111 SHA512 66425502516c1cd2ddcc7879fa7a23bc8aeb433ba3ef04d812c8783de84976f54e7f1a6556d1a0e7528a883ee2b908faf5ea86ec7476ee5df3b76ede85dc0e45 WHIRLPOOL 9a81096182221258f798b3baf5dc73a141c4972564dc6bf5310e9495b52c1ac20cbe5a7bdce997220745a89811ec7e5e826cb51a478e9e7583630c2c7d2e7b9c
-EBUILD selinux-awstats-2.20170805-r2.ebuild 379 SHA256 34fcab75554dcfede6be7e00e55319829d5f852fb8a867899d1a986d33d72111 SHA512 66425502516c1cd2ddcc7879fa7a23bc8aeb433ba3ef04d812c8783de84976f54e7f1a6556d1a0e7528a883ee2b908faf5ea86ec7476ee5df3b76ede85dc0e45 WHIRLPOOL 9a81096182221258f798b3baf5dc73a141c4972564dc6bf5310e9495b52c1ac20cbe5a7bdce997220745a89811ec7e5e826cb51a478e9e7583630c2c7d2e7b9c
-EBUILD selinux-awstats-9999.ebuild 381 SHA256 6da57dd0a425af0263bd788895443bba169e1792e0fbc90487ff94d0b25daa0e SHA512 ec73605f9ec7dde163c893b64f896a613ed3351c5d230cf3f1f815b887e03fa89ae9b84826138369d05cc282e50554349f7e3b469ee3e3091966658decb5b30c WHIRLPOOL 5c80389bd28531300275d0a431f4fff3522f50662ff25547de3d7c2647c7b9936025c26d1f565d4145cafca2b2ae58e3b491299af0ef8e24e2fb97dc0d370314
+EBUILD selinux-awstats-2.20170204-r1.ebuild 382 SHA256 ccf3c76efc613b5e6c06241905d87c78fa46c1f61279acd00dbc171a4ae7551f SHA512 c9268dbe2875d2dc40b3a2a47849f98997bae255315f9fbf44dcf8639f3a69c331d047fc13ba1ab46bc011687ff0fae69d3c83d337eb1b8ba4661216d1df2d39 WHIRLPOOL 25da2c1df27eb0f19cb1a73ed13e9749622e0ea96a10a281fb993fd5d67cfbaf3e20a71e997a14043265fc7cb22f52c94c79d1631f41dd56265cd05a98d2210e
+EBUILD selinux-awstats-2.20170204-r2.ebuild 380 SHA256 7f7aba79be2e468122a5799b364a208c011c0edd6b37d0433c6deea881ef42aa SHA512 78217b121ee717950300bf74b20baeff3799f21848dc3cebdfdd3062898f6ebaf2c49959d1c2a7921dbe52b06fb713443733729c0915476121e193b06b3f1c30 WHIRLPOOL 5f101a920b3ce02c9fcfe4a91e9b8a091a7a03f4730b167cdde2f5a781dd763e3c09de0f394b58a2c0bfd807a0caea4fe1f4bcd497758cb75777757ce7c17c2c
+EBUILD selinux-awstats-2.20170204-r3.ebuild 380 SHA256 7f7aba79be2e468122a5799b364a208c011c0edd6b37d0433c6deea881ef42aa SHA512 78217b121ee717950300bf74b20baeff3799f21848dc3cebdfdd3062898f6ebaf2c49959d1c2a7921dbe52b06fb713443733729c0915476121e193b06b3f1c30 WHIRLPOOL 5f101a920b3ce02c9fcfe4a91e9b8a091a7a03f4730b167cdde2f5a781dd763e3c09de0f394b58a2c0bfd807a0caea4fe1f4bcd497758cb75777757ce7c17c2c
+EBUILD selinux-awstats-2.20170204-r4.ebuild 380 SHA256 7f7aba79be2e468122a5799b364a208c011c0edd6b37d0433c6deea881ef42aa SHA512 78217b121ee717950300bf74b20baeff3799f21848dc3cebdfdd3062898f6ebaf2c49959d1c2a7921dbe52b06fb713443733729c0915476121e193b06b3f1c30 WHIRLPOOL 5f101a920b3ce02c9fcfe4a91e9b8a091a7a03f4730b167cdde2f5a781dd763e3c09de0f394b58a2c0bfd807a0caea4fe1f4bcd497758cb75777757ce7c17c2c
+EBUILD selinux-awstats-2.20170805-r2.ebuild 380 SHA256 7f7aba79be2e468122a5799b364a208c011c0edd6b37d0433c6deea881ef42aa SHA512 78217b121ee717950300bf74b20baeff3799f21848dc3cebdfdd3062898f6ebaf2c49959d1c2a7921dbe52b06fb713443733729c0915476121e193b06b3f1c30 WHIRLPOOL 5f101a920b3ce02c9fcfe4a91e9b8a091a7a03f4730b167cdde2f5a781dd763e3c09de0f394b58a2c0bfd807a0caea4fe1f4bcd497758cb75777757ce7c17c2c
+EBUILD selinux-awstats-2.20170805-r3.ebuild 382 SHA256 ccf3c76efc613b5e6c06241905d87c78fa46c1f61279acd00dbc171a4ae7551f SHA512 c9268dbe2875d2dc40b3a2a47849f98997bae255315f9fbf44dcf8639f3a69c331d047fc13ba1ab46bc011687ff0fae69d3c83d337eb1b8ba4661216d1df2d39 WHIRLPOOL 25da2c1df27eb0f19cb1a73ed13e9749622e0ea96a10a281fb993fd5d67cfbaf3e20a71e997a14043265fc7cb22f52c94c79d1631f41dd56265cd05a98d2210e
+EBUILD selinux-awstats-9999.ebuild 382 SHA256 ccf3c76efc613b5e6c06241905d87c78fa46c1f61279acd00dbc171a4ae7551f SHA512 c9268dbe2875d2dc40b3a2a47849f98997bae255315f9fbf44dcf8639f3a69c331d047fc13ba1ab46bc011687ff0fae69d3c83d337eb1b8ba4661216d1df2d39 WHIRLPOOL 25da2c1df27eb0f19cb1a73ed13e9749622e0ea96a10a281fb993fd5d67cfbaf3e20a71e997a14043265fc7cb22f52c94c79d1631f41dd56265cd05a98d2210e
 MISC ChangeLog 10687 SHA256 77294d103ad48e69a05c300117731364c79d6fdbf0236017b58b070dccf3397e SHA512 b858ba51abcd99da967bfaa9bd3428fddde94a0154db0e286aee9156600e4de6e17570f7b2f30b7a0df4d1e80f0f19deca1e893d92dd7ed07f9918fe1a0e92de WHIRLPOOL e5dcd88dde096e2e70dfc1cb55382dcebde41c729c027b859062336ecc81bfdf83b3b74dc8f7a4580a9df776c67865dbc43f81dc90377953ed86332a815e6341
 MISC ChangeLog-2015 10212 SHA256 98005be52cfa71f2cc9d76a10819b8fa47eee3f33a0cff543ecdc9999f8823c5 SHA512 6279c0c2ada58b14b7c6b01c0d81c5ac3ba52cb85715f93cc565862d9f62a7e2ea1e6bb36ccb1634a518c380ded430ca42228e6ec03640a965c93a068d5d0dca WHIRLPOOL f5c0b097fe8656baffc09fe1d4060c99c1ce29fb20b80cce7aa076a9fee62c8e95fc6a6cfb01062bef3effcd040bd551ed769754677312191e2d0cbb82822d1d
 MISC metadata.xml 317 SHA256 23d457b8295696aa2a58c514b5e6f7553828bfbb1f1f063a025a72bd3a817ede SHA512 0b9ddebb84974b0eef29ff4eb9b3449593d2652944d17648e297db2a6f301531c1c003efac88215970b739b9e6c2fc733e21edb3257f2138ce8aa95047a70fa9 WHIRLPOOL d5cd22d10fb4358f45b418df2d8676d27785fce53d06d0f2d696bed92679ce0e2bb712f9f2a9385ea21c5d680449d6129e15cf9a4831e11a0a18dba4089db3d2
diff --git a/sec-policy/selinux-awstats/selinux-awstats-2.20170204-r1.ebuild b/sec-policy/selinux-awstats/selinux-awstats-2.20170204-r1.ebuild
index 5b3a5e6a3169..09e5c4fe1978 100644
--- a/sec-policy/selinux-awstats/selinux-awstats-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-awstats/selinux-awstats-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-awstats/selinux-awstats-2.20170204-r2.ebuild b/sec-policy/selinux-awstats/selinux-awstats-2.20170204-r2.ebuild
index 444adabf3fc1..95cae5acdab5 100644
--- a/sec-policy/selinux-awstats/selinux-awstats-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-awstats/selinux-awstats-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-awstats/selinux-awstats-2.20170204-r3.ebuild b/sec-policy/selinux-awstats/selinux-awstats-2.20170204-r3.ebuild
index 444adabf3fc1..95cae5acdab5 100644
--- a/sec-policy/selinux-awstats/selinux-awstats-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-awstats/selinux-awstats-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-awstats/selinux-awstats-2.20170204-r4.ebuild b/sec-policy/selinux-awstats/selinux-awstats-2.20170204-r4.ebuild
index 444adabf3fc1..95cae5acdab5 100644
--- a/sec-policy/selinux-awstats/selinux-awstats-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-awstats/selinux-awstats-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-awstats/selinux-awstats-2.20170805-r2.ebuild b/sec-policy/selinux-awstats/selinux-awstats-2.20170805-r2.ebuild
index 444adabf3fc1..95cae5acdab5 100644
--- a/sec-policy/selinux-awstats/selinux-awstats-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-awstats/selinux-awstats-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-awstats/selinux-awstats-2.20170805-r3.ebuild b/sec-policy/selinux-awstats/selinux-awstats-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..09e5c4fe1978
--- /dev/null
+++ b/sec-policy/selinux-awstats/selinux-awstats-2.20170805-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-awstats/selinux-awstats-9999.ebuild b/sec-policy/selinux-awstats/selinux-awstats-9999.ebuild
index 5b3a5e6a3169..09e5c4fe1978 100644
--- a/sec-policy/selinux-awstats/selinux-awstats-9999.ebuild
+++ b/sec-policy/selinux-awstats/selinux-awstats-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-backup/Manifest b/sec-policy/selinux-backup/Manifest
index 158344accc88..e098d6898f2d 100644
--- a/sec-policy/selinux-backup/Manifest
+++ b/sec-policy/selinux-backup/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-backup-2.20170204-r1.ebuild 296 SHA256 35d5614e0a3232cc867d594987b9f3f350af7f3e77f4d9fd70396809d4bd967b SHA512 68764eb2b1d018a3b37914557a245d63e380bdaff0ebf0712dc9ccb97cc95eb30c3e38433f16dd248c3c6915bcf145cfa6422680bf4f32485bd19f5f6e70fc9d WHIRLPOOL 255824614ed47a306873a74b221bf975fa812c3f0c482fb99c84a6b4492ff29162c34a5250581457551a2a08b14c402dd4ee2f74873ced18048f2d958d992ba4
-EBUILD selinux-backup-2.20170204-r2.ebuild 294 SHA256 141c6b431c8378aab56543178827863d42e5a9d2a1da07034e26c6936fd11eb5 SHA512 b2448e1c45903855e9f09db21cfe36f51444ce08d7ec7e4c601bccada2500b48f7d79ef299392e9df8286fcf72f37b4110a37ad97c1d9c8f80701c92ff3dfc9a WHIRLPOOL 8bcd3bf99ca959c2d7a1734c7e8245ee7768c69fb3f653bb667ce815a915c91b87e76fd15e1c1b8e7d52779f62110e0b2e40771a5a89347e6359126429cb14e4
-EBUILD selinux-backup-2.20170204-r3.ebuild 294 SHA256 141c6b431c8378aab56543178827863d42e5a9d2a1da07034e26c6936fd11eb5 SHA512 b2448e1c45903855e9f09db21cfe36f51444ce08d7ec7e4c601bccada2500b48f7d79ef299392e9df8286fcf72f37b4110a37ad97c1d9c8f80701c92ff3dfc9a WHIRLPOOL 8bcd3bf99ca959c2d7a1734c7e8245ee7768c69fb3f653bb667ce815a915c91b87e76fd15e1c1b8e7d52779f62110e0b2e40771a5a89347e6359126429cb14e4
-EBUILD selinux-backup-2.20170204-r4.ebuild 294 SHA256 141c6b431c8378aab56543178827863d42e5a9d2a1da07034e26c6936fd11eb5 SHA512 b2448e1c45903855e9f09db21cfe36f51444ce08d7ec7e4c601bccada2500b48f7d79ef299392e9df8286fcf72f37b4110a37ad97c1d9c8f80701c92ff3dfc9a WHIRLPOOL 8bcd3bf99ca959c2d7a1734c7e8245ee7768c69fb3f653bb667ce815a915c91b87e76fd15e1c1b8e7d52779f62110e0b2e40771a5a89347e6359126429cb14e4
-EBUILD selinux-backup-2.20170805-r2.ebuild 294 SHA256 141c6b431c8378aab56543178827863d42e5a9d2a1da07034e26c6936fd11eb5 SHA512 b2448e1c45903855e9f09db21cfe36f51444ce08d7ec7e4c601bccada2500b48f7d79ef299392e9df8286fcf72f37b4110a37ad97c1d9c8f80701c92ff3dfc9a WHIRLPOOL 8bcd3bf99ca959c2d7a1734c7e8245ee7768c69fb3f653bb667ce815a915c91b87e76fd15e1c1b8e7d52779f62110e0b2e40771a5a89347e6359126429cb14e4
-EBUILD selinux-backup-9999.ebuild 296 SHA256 35d5614e0a3232cc867d594987b9f3f350af7f3e77f4d9fd70396809d4bd967b SHA512 68764eb2b1d018a3b37914557a245d63e380bdaff0ebf0712dc9ccb97cc95eb30c3e38433f16dd248c3c6915bcf145cfa6422680bf4f32485bd19f5f6e70fc9d WHIRLPOOL 255824614ed47a306873a74b221bf975fa812c3f0c482fb99c84a6b4492ff29162c34a5250581457551a2a08b14c402dd4ee2f74873ced18048f2d958d992ba4
+EBUILD selinux-backup-2.20170204-r1.ebuild 297 SHA256 07b223e4075cd878ae2a28fadcf92600e6d8475839886578ef78d4981c9396c0 SHA512 8a0ae54d4e036fc16b7cd2684c1f41a0c406dee0a5fd78e51a4413339d198ee338a1350dea3ed9265533711490db40423b6de59684d5cad1f0b9f5824e2d9ae8 WHIRLPOOL ceaa62fab9c091233f9c61647da4b3669009e49ff5e64d2821a2457a96555e91427158ca2c007be03368c0e3cf73c0e66ef0eb801f6669d9803a00de09976152
+EBUILD selinux-backup-2.20170204-r2.ebuild 295 SHA256 7c51e140db26d636708d311b315f91bad39532bb6b47dd859ee65f71dbc75efe SHA512 9f249ae0c1dc164957bbee7b230858b3b7eb8714623c476380382d82b6b7243eca2e75fcedb0e12f4d1b66c10b57f62ec632fad5180618e8df22550ca1d6de6d WHIRLPOOL d6dfeadf3fa3a001b10e3f22637d7ca43358a0aacc0614e784253f1b85e54951896438611096015d7c92b81f88d30f0916d95cd61f4c58d548609c48bd85a4c9
+EBUILD selinux-backup-2.20170204-r3.ebuild 295 SHA256 7c51e140db26d636708d311b315f91bad39532bb6b47dd859ee65f71dbc75efe SHA512 9f249ae0c1dc164957bbee7b230858b3b7eb8714623c476380382d82b6b7243eca2e75fcedb0e12f4d1b66c10b57f62ec632fad5180618e8df22550ca1d6de6d WHIRLPOOL d6dfeadf3fa3a001b10e3f22637d7ca43358a0aacc0614e784253f1b85e54951896438611096015d7c92b81f88d30f0916d95cd61f4c58d548609c48bd85a4c9
+EBUILD selinux-backup-2.20170204-r4.ebuild 295 SHA256 7c51e140db26d636708d311b315f91bad39532bb6b47dd859ee65f71dbc75efe SHA512 9f249ae0c1dc164957bbee7b230858b3b7eb8714623c476380382d82b6b7243eca2e75fcedb0e12f4d1b66c10b57f62ec632fad5180618e8df22550ca1d6de6d WHIRLPOOL d6dfeadf3fa3a001b10e3f22637d7ca43358a0aacc0614e784253f1b85e54951896438611096015d7c92b81f88d30f0916d95cd61f4c58d548609c48bd85a4c9
+EBUILD selinux-backup-2.20170805-r2.ebuild 295 SHA256 7c51e140db26d636708d311b315f91bad39532bb6b47dd859ee65f71dbc75efe SHA512 9f249ae0c1dc164957bbee7b230858b3b7eb8714623c476380382d82b6b7243eca2e75fcedb0e12f4d1b66c10b57f62ec632fad5180618e8df22550ca1d6de6d WHIRLPOOL d6dfeadf3fa3a001b10e3f22637d7ca43358a0aacc0614e784253f1b85e54951896438611096015d7c92b81f88d30f0916d95cd61f4c58d548609c48bd85a4c9
+EBUILD selinux-backup-2.20170805-r3.ebuild 297 SHA256 07b223e4075cd878ae2a28fadcf92600e6d8475839886578ef78d4981c9396c0 SHA512 8a0ae54d4e036fc16b7cd2684c1f41a0c406dee0a5fd78e51a4413339d198ee338a1350dea3ed9265533711490db40423b6de59684d5cad1f0b9f5824e2d9ae8 WHIRLPOOL ceaa62fab9c091233f9c61647da4b3669009e49ff5e64d2821a2457a96555e91427158ca2c007be03368c0e3cf73c0e66ef0eb801f6669d9803a00de09976152
+EBUILD selinux-backup-9999.ebuild 297 SHA256 07b223e4075cd878ae2a28fadcf92600e6d8475839886578ef78d4981c9396c0 SHA512 8a0ae54d4e036fc16b7cd2684c1f41a0c406dee0a5fd78e51a4413339d198ee338a1350dea3ed9265533711490db40423b6de59684d5cad1f0b9f5824e2d9ae8 WHIRLPOOL ceaa62fab9c091233f9c61647da4b3669009e49ff5e64d2821a2457a96555e91427158ca2c007be03368c0e3cf73c0e66ef0eb801f6669d9803a00de09976152
 MISC ChangeLog 10571 SHA256 55e4614c3659a966200f29e039c27eb32e64be83860d9f1d263d1dc811b2eefd SHA512 aeb0fc7dd8f557f2efa7d6b708a527d7277eaaa650a58726f3f402722ab197422dc75e7f81155e9cc30c53d866d53a0d3076386d1eaddc0f867afb636a6b3f54 WHIRLPOOL 6e52f2d167d734b9d8d030eff2282adcfbca178aac21fbc1019f26d8f45b4fa036b555d5bfe350b6b856847cdd4a5617c79cea4aa0eb110668d6a9da6d1eb358
 MISC ChangeLog-2015 6566 SHA256 7f680254421e3a8cc7b668b2aa6bf89bb3301194859cccc6078cbccafa0fa414 SHA512 9d4635c9a91d6a5248ff71176c7e5829b06c854fcc4bfc62679ecc51a412da5b5fb03779e96efd42c24ac39d19a6fdab2ed427dc86aad5001ed433fe2bf6d751 WHIRLPOOL 662d19225f42c163c94bec5b9032f6e2313d252cebce7063d4035ca104ef4f3a14fcef0ddb9d243312c15ea7ef30153bcc5e8f074bdd503c6679cb0879418bee
 MISC metadata.xml 329 SHA256 5288a8032df8147400a4aa55f18023f633f0a13c0b558ef56670ae9f02ee186c SHA512 0c171ebf47304dac2737f47f0b7246540d41a8b14a59b7354b64ec0a0dd70345fe0fb634cd8c03636b9a8c3510bede5d1a9a12f072e6c91fae04734d334d1f20 WHIRLPOOL 73ea33e4d0a21f15d2318f2c468e7c69f4f9f0c66336f0581d05413126cc1ccfe71683e26b8ed00364382986071a771f36fd31acd0b25317b49d453a9730e897
diff --git a/sec-policy/selinux-backup/selinux-backup-2.20170204-r1.ebuild b/sec-policy/selinux-backup/selinux-backup-2.20170204-r1.ebuild
index b5c95f6061f7..df29db3b1fcb 100644
--- a/sec-policy/selinux-backup/selinux-backup-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-backup/selinux-backup-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-backup/selinux-backup-2.20170204-r2.ebuild b/sec-policy/selinux-backup/selinux-backup-2.20170204-r2.ebuild
index 708a13735c0e..b29860f1c7e0 100644
--- a/sec-policy/selinux-backup/selinux-backup-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-backup/selinux-backup-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-backup/selinux-backup-2.20170204-r3.ebuild b/sec-policy/selinux-backup/selinux-backup-2.20170204-r3.ebuild
index 708a13735c0e..b29860f1c7e0 100644
--- a/sec-policy/selinux-backup/selinux-backup-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-backup/selinux-backup-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-backup/selinux-backup-2.20170204-r4.ebuild b/sec-policy/selinux-backup/selinux-backup-2.20170204-r4.ebuild
index 708a13735c0e..b29860f1c7e0 100644
--- a/sec-policy/selinux-backup/selinux-backup-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-backup/selinux-backup-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-backup/selinux-backup-2.20170805-r2.ebuild b/sec-policy/selinux-backup/selinux-backup-2.20170805-r2.ebuild
index 708a13735c0e..b29860f1c7e0 100644
--- a/sec-policy/selinux-backup/selinux-backup-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-backup/selinux-backup-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-backup/selinux-backup-2.20170805-r3.ebuild b/sec-policy/selinux-backup/selinux-backup-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..df29db3b1fcb
--- /dev/null
+++ b/sec-policy/selinux-backup/selinux-backup-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-backup/selinux-backup-9999.ebuild b/sec-policy/selinux-backup/selinux-backup-9999.ebuild
index b5c95f6061f7..df29db3b1fcb 100644
--- a/sec-policy/selinux-backup/selinux-backup-9999.ebuild
+++ b/sec-policy/selinux-backup/selinux-backup-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-bacula/Manifest b/sec-policy/selinux-bacula/Manifest
index 9c4db70b4c9d..862a915e78d7 100644
--- a/sec-policy/selinux-bacula/Manifest
+++ b/sec-policy/selinux-bacula/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-bacula-2.20170204-r1.ebuild 283 SHA256 e51c8fd6b7dbaf09737c8df9b45040b23558b6b97e0e88bacf9e900686f27b44 SHA512 ff897655e13ddfc6cc30ecf2faac90fb75f495a8b5a56fc3e2d0f6c7b872048df513efabdd5dda323117ff63e363cc684b3088dca4f963d75af7ce8d4026dcf6 WHIRLPOOL b3004e8c3850d7cc30880bb67eb9ebe1b9d75d34afd5698be7a8e3be91ef8f9e89f785c0a3c7f47f685f28ff19d27df2950036532db28c7200e40f8643f1e2ed
-EBUILD selinux-bacula-2.20170204-r2.ebuild 281 SHA256 c282a6f6b9eb4ca49a7cef0387c40d7c67709b38b3db0777825b117cc9e6869f SHA512 060eb9c659551df72c296261c00c574cf8ab1e3a1e88d48c6a393633104a9ce8ec9f309e2ce3b5a8d230275a52d12d483d710dd55cb7d1b7cf99e3a2462a2070 WHIRLPOOL 88f90070dfabcfcb14441c6cd91f626be907f912f2e90c09435ad1d175aa69f12cca207d92f83ff30e68a5aff434afd6661ee734bce3f45a3187c215c98ace66
-EBUILD selinux-bacula-2.20170204-r3.ebuild 281 SHA256 c282a6f6b9eb4ca49a7cef0387c40d7c67709b38b3db0777825b117cc9e6869f SHA512 060eb9c659551df72c296261c00c574cf8ab1e3a1e88d48c6a393633104a9ce8ec9f309e2ce3b5a8d230275a52d12d483d710dd55cb7d1b7cf99e3a2462a2070 WHIRLPOOL 88f90070dfabcfcb14441c6cd91f626be907f912f2e90c09435ad1d175aa69f12cca207d92f83ff30e68a5aff434afd6661ee734bce3f45a3187c215c98ace66
-EBUILD selinux-bacula-2.20170204-r4.ebuild 281 SHA256 c282a6f6b9eb4ca49a7cef0387c40d7c67709b38b3db0777825b117cc9e6869f SHA512 060eb9c659551df72c296261c00c574cf8ab1e3a1e88d48c6a393633104a9ce8ec9f309e2ce3b5a8d230275a52d12d483d710dd55cb7d1b7cf99e3a2462a2070 WHIRLPOOL 88f90070dfabcfcb14441c6cd91f626be907f912f2e90c09435ad1d175aa69f12cca207d92f83ff30e68a5aff434afd6661ee734bce3f45a3187c215c98ace66
-EBUILD selinux-bacula-2.20170805-r2.ebuild 281 SHA256 c282a6f6b9eb4ca49a7cef0387c40d7c67709b38b3db0777825b117cc9e6869f SHA512 060eb9c659551df72c296261c00c574cf8ab1e3a1e88d48c6a393633104a9ce8ec9f309e2ce3b5a8d230275a52d12d483d710dd55cb7d1b7cf99e3a2462a2070 WHIRLPOOL 88f90070dfabcfcb14441c6cd91f626be907f912f2e90c09435ad1d175aa69f12cca207d92f83ff30e68a5aff434afd6661ee734bce3f45a3187c215c98ace66
-EBUILD selinux-bacula-9999.ebuild 283 SHA256 e51c8fd6b7dbaf09737c8df9b45040b23558b6b97e0e88bacf9e900686f27b44 SHA512 ff897655e13ddfc6cc30ecf2faac90fb75f495a8b5a56fc3e2d0f6c7b872048df513efabdd5dda323117ff63e363cc684b3088dca4f963d75af7ce8d4026dcf6 WHIRLPOOL b3004e8c3850d7cc30880bb67eb9ebe1b9d75d34afd5698be7a8e3be91ef8f9e89f785c0a3c7f47f685f28ff19d27df2950036532db28c7200e40f8643f1e2ed
+EBUILD selinux-bacula-2.20170204-r1.ebuild 284 SHA256 fcd23cb671e63b9f0498322dfc14029f55ce25560b313cb752cbd30c9c767320 SHA512 e3fbaced964a16f3dae73e21b6c50fbead88d7c8930613422472efea20c2f3c5179fcd06f7070adaa64dad5340cf76496e368af3dd626de2c5b5dfea75f8490d WHIRLPOOL eda19e76229c6962fc58628f9bed6c4d9c99243cb2ca9d38a2cec19db8b839f2b1fcf951645244638779023351293b79939b28ea0ea0876a4aa2d358d666bb19
+EBUILD selinux-bacula-2.20170204-r2.ebuild 282 SHA256 03e325d69f731267abb0af0aac34eaa698770d7291b31f75da2e72ae3e769bd7 SHA512 fb68dbdd6441bb5a88b9328519abd70d6ec1b7fa5a9acf28c8d9cec4edec27736a7ba7e7fb857e1e1a991681c90244171a3d1a420039ee8f7bbf1d5d3e2683b6 WHIRLPOOL dd779f9f19d35a35519f24355d3eae22d20300a51c7d991275014cd1a0088a9953262aa542d4cf3ba9f3d5c810a257403a81e8a0c5128487d2e63dd715bc764d
+EBUILD selinux-bacula-2.20170204-r3.ebuild 282 SHA256 03e325d69f731267abb0af0aac34eaa698770d7291b31f75da2e72ae3e769bd7 SHA512 fb68dbdd6441bb5a88b9328519abd70d6ec1b7fa5a9acf28c8d9cec4edec27736a7ba7e7fb857e1e1a991681c90244171a3d1a420039ee8f7bbf1d5d3e2683b6 WHIRLPOOL dd779f9f19d35a35519f24355d3eae22d20300a51c7d991275014cd1a0088a9953262aa542d4cf3ba9f3d5c810a257403a81e8a0c5128487d2e63dd715bc764d
+EBUILD selinux-bacula-2.20170204-r4.ebuild 282 SHA256 03e325d69f731267abb0af0aac34eaa698770d7291b31f75da2e72ae3e769bd7 SHA512 fb68dbdd6441bb5a88b9328519abd70d6ec1b7fa5a9acf28c8d9cec4edec27736a7ba7e7fb857e1e1a991681c90244171a3d1a420039ee8f7bbf1d5d3e2683b6 WHIRLPOOL dd779f9f19d35a35519f24355d3eae22d20300a51c7d991275014cd1a0088a9953262aa542d4cf3ba9f3d5c810a257403a81e8a0c5128487d2e63dd715bc764d
+EBUILD selinux-bacula-2.20170805-r2.ebuild 282 SHA256 03e325d69f731267abb0af0aac34eaa698770d7291b31f75da2e72ae3e769bd7 SHA512 fb68dbdd6441bb5a88b9328519abd70d6ec1b7fa5a9acf28c8d9cec4edec27736a7ba7e7fb857e1e1a991681c90244171a3d1a420039ee8f7bbf1d5d3e2683b6 WHIRLPOOL dd779f9f19d35a35519f24355d3eae22d20300a51c7d991275014cd1a0088a9953262aa542d4cf3ba9f3d5c810a257403a81e8a0c5128487d2e63dd715bc764d
+EBUILD selinux-bacula-2.20170805-r3.ebuild 284 SHA256 fcd23cb671e63b9f0498322dfc14029f55ce25560b313cb752cbd30c9c767320 SHA512 e3fbaced964a16f3dae73e21b6c50fbead88d7c8930613422472efea20c2f3c5179fcd06f7070adaa64dad5340cf76496e368af3dd626de2c5b5dfea75f8490d WHIRLPOOL eda19e76229c6962fc58628f9bed6c4d9c99243cb2ca9d38a2cec19db8b839f2b1fcf951645244638779023351293b79939b28ea0ea0876a4aa2d358d666bb19
+EBUILD selinux-bacula-9999.ebuild 284 SHA256 fcd23cb671e63b9f0498322dfc14029f55ce25560b313cb752cbd30c9c767320 SHA512 e3fbaced964a16f3dae73e21b6c50fbead88d7c8930613422472efea20c2f3c5179fcd06f7070adaa64dad5340cf76496e368af3dd626de2c5b5dfea75f8490d WHIRLPOOL eda19e76229c6962fc58628f9bed6c4d9c99243cb2ca9d38a2cec19db8b839f2b1fcf951645244638779023351293b79939b28ea0ea0876a4aa2d358d666bb19
 MISC ChangeLog 10571 SHA256 13eb202920a6f0b784455a270bb1b400f5d791d3d98ff8318ea598b2d932a067 SHA512 d4cfae600e93dc7056d352df6a0a83080aa76c8ff40dee8e8d26c962e9037fd747b8ad2113c99d048b0fae2fdcc241ba1995798c5d44581ea989faafe6b57762 WHIRLPOOL a79daadc2d7e409d74e9101500837c169d04a39b5267259130e136a98b92f2bd9a898b3fa57c9b82e98c3c4952e44ecbe8f5b819e0bb7454e187dae944ecca67
 MISC ChangeLog-2015 9543 SHA256 b84e312e3257ee5323696c16a3c641be8d3dbbf4a97204cb809c748e3390cf2c SHA512 65acc020a9cde048fe5e69738731d5098f115346b49014837bafcef28009dbff0515ef3a23724983ec26509c9868a098352a51274ff89a2e00687acb00fbeaf7 WHIRLPOOL 03466e4e0321d79f53c8f50678c47e8075680d6f77186cc1cca6eafe2837c8ba0b142872386e884a53ed729e3a4d67f503ddded7c242c605fb1efffb22308214
 MISC metadata.xml 316 SHA256 b8cfbee799dd5050ab7a153cf49ed5e1968a646d7c420e9da809e024d64e92c5 SHA512 372cf73fefff21230ab25228a49d88abf1d32ba3dbb9241ebcba8d18b6802f8ac4965ff05f92f680cbc3057115b8821eeb6be263ee187f17b1ef563fa8d22d1f WHIRLPOOL cd5f49f4abf42451f200bab186da5d3ce96a26db81ea26a5c62504cee6b1d05c8c285f5ad35634200482e7912b472f62ca3ffdb74803129ab70e5c19252c1406
diff --git a/sec-policy/selinux-bacula/selinux-bacula-2.20170204-r1.ebuild b/sec-policy/selinux-bacula/selinux-bacula-2.20170204-r1.ebuild
index f597d1943c51..c56d67a6f4af 100644
--- a/sec-policy/selinux-bacula/selinux-bacula-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-bacula/selinux-bacula-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-bacula/selinux-bacula-2.20170204-r2.ebuild b/sec-policy/selinux-bacula/selinux-bacula-2.20170204-r2.ebuild
index 702d49c78f38..cde85a82b54b 100644
--- a/sec-policy/selinux-bacula/selinux-bacula-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-bacula/selinux-bacula-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-bacula/selinux-bacula-2.20170204-r3.ebuild b/sec-policy/selinux-bacula/selinux-bacula-2.20170204-r3.ebuild
index 702d49c78f38..cde85a82b54b 100644
--- a/sec-policy/selinux-bacula/selinux-bacula-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-bacula/selinux-bacula-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-bacula/selinux-bacula-2.20170204-r4.ebuild b/sec-policy/selinux-bacula/selinux-bacula-2.20170204-r4.ebuild
index 702d49c78f38..cde85a82b54b 100644
--- a/sec-policy/selinux-bacula/selinux-bacula-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-bacula/selinux-bacula-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-bacula/selinux-bacula-2.20170805-r2.ebuild b/sec-policy/selinux-bacula/selinux-bacula-2.20170805-r2.ebuild
index 702d49c78f38..cde85a82b54b 100644
--- a/sec-policy/selinux-bacula/selinux-bacula-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-bacula/selinux-bacula-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-bacula/selinux-bacula-2.20170805-r3.ebuild b/sec-policy/selinux-bacula/selinux-bacula-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..c56d67a6f4af
--- /dev/null
+++ b/sec-policy/selinux-bacula/selinux-bacula-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-bacula/selinux-bacula-9999.ebuild b/sec-policy/selinux-bacula/selinux-bacula-9999.ebuild
index f597d1943c51..c56d67a6f4af 100644
--- a/sec-policy/selinux-bacula/selinux-bacula-9999.ebuild
+++ b/sec-policy/selinux-bacula/selinux-bacula-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-base-policy/Manifest b/sec-policy/selinux-base-policy/Manifest
index 7b308e025e17..bfac57c2a730 100644
--- a/sec-policy/selinux-base-policy/Manifest
+++ b/sec-policy/selinux-base-policy/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-base-policy-2.20170204-r1.ebuild 3785 SHA256 af6ceeab3e25f151cef6b3ee8ddaeb832732458d9f48ed8d523b94681a8574bc SHA512 2fccc6f97fe7b550d1c1a801ea9f9093e80c16a5e07f1933e2d65d07b4779e11d24d33274a8b9c6f766e88d27b7cc7b4f9e718970cf6fbe85430500f06aec094 WHIRLPOOL 4badd90e88f6eb9ca7f0c325c1494d9f8dca4846b3f7ba3d4381d4e36e323da33bfeda92ca26fc895f8916735e0757d8a9b001af6382101fb248f1dd4adbd872
-EBUILD selinux-base-policy-2.20170204-r2.ebuild 3783 SHA256 308ae90be47da1992bbd462a11e00bbfddeca57bbb8d56606ba20e72424113da SHA512 42d4ec15e487bec67bd2fa375d0fcb81ac17e056a0e2216aa424e4c14ae04cb35a8dd10096e1d2491c806f9f59a9d3f969b9d75ff14e0aed69d39d803a3b8269 WHIRLPOOL 053c81a37dad887a9a27fd96000b4a36a6fb2980c539fdd516714e39aae1e3e88dbfe9eccac8d3899a6b4a61a1e0ba4ae778436dceab3d5690810439a1f5d8ce
-EBUILD selinux-base-policy-2.20170204-r3.ebuild 3783 SHA256 308ae90be47da1992bbd462a11e00bbfddeca57bbb8d56606ba20e72424113da SHA512 42d4ec15e487bec67bd2fa375d0fcb81ac17e056a0e2216aa424e4c14ae04cb35a8dd10096e1d2491c806f9f59a9d3f969b9d75ff14e0aed69d39d803a3b8269 WHIRLPOOL 053c81a37dad887a9a27fd96000b4a36a6fb2980c539fdd516714e39aae1e3e88dbfe9eccac8d3899a6b4a61a1e0ba4ae778436dceab3d5690810439a1f5d8ce
-EBUILD selinux-base-policy-2.20170204-r4.ebuild 3783 SHA256 308ae90be47da1992bbd462a11e00bbfddeca57bbb8d56606ba20e72424113da SHA512 42d4ec15e487bec67bd2fa375d0fcb81ac17e056a0e2216aa424e4c14ae04cb35a8dd10096e1d2491c806f9f59a9d3f969b9d75ff14e0aed69d39d803a3b8269 WHIRLPOOL 053c81a37dad887a9a27fd96000b4a36a6fb2980c539fdd516714e39aae1e3e88dbfe9eccac8d3899a6b4a61a1e0ba4ae778436dceab3d5690810439a1f5d8ce
-EBUILD selinux-base-policy-2.20170805-r2.ebuild 3730 SHA256 a29d3acfb65e135cb136cdb14648ffb08f34a1d616afbaabcc4efe29b1e94e37 SHA512 d74a1aad9f730e1d35885da00c9eaf247da3f65ddd2c1dcc620978125e4f817d89156269c2c93779974a5a4ed4321c895599d4ffa1f1df5397e5e16dc56909e3 WHIRLPOOL ec4ca0220a2855e2ff7e7551f2787705e9cb3a79bdcf0242164377d59fc9d9dbfd4acca9711bd80c1607855b1ff8e92f6b62370d5482c67ebc150ae20b2b279a
-EBUILD selinux-base-policy-9999.ebuild 3732 SHA256 68998a4b49a64b47f4605ce58b58857b4cf9073161dae4a45fc259e912a48273 SHA512 7a1ee4a7ff58a6a11561a08289d7acd10f20ae1d85f51aaa3426e809418e95d0a2cc1da3b8127109c2710c38cc3137c1238a0a9440f361e1c7d300cdde134355 WHIRLPOOL 7c481534b39f8ef2f5f5a22e9eaf62941cb0032737299349d43f5e296d3a5796ce2e8df554c6ce1b78266ea7b71761aefb6f4fdb0565c07921aec58c56b6f767
+EBUILD selinux-base-policy-2.20170204-r1.ebuild 3786 SHA256 61494586cdb50a55477acbfa4987572a34f949c43dc1288bf9f4a9a3dcadf7b1 SHA512 c9ad330b65b72d08a864877d563c5de522939a8a0a747641317b3cb70c8ba3c7c11a64d039011865fb4f012f9b00befffb2f7a729e1ba9965bac93b15e930bc5 WHIRLPOOL 1a77dcfcbd6f7aec1df6a5d55af68c4de8496d0094a3eecdc5cb79886ab89a4bf1c742098d2919d34b672fd4392f145936cb651f4fd384fa6df436d293d80a09
+EBUILD selinux-base-policy-2.20170204-r2.ebuild 3784 SHA256 51468f237a036a0fdf5e4e19e53d0d76f2f4228c765cd37f55744993ec2e65b4 SHA512 8fe89ca7392cff717e83b358535eb68126562f6a94fc0f8d2d3d0d4a991dc7fa6c28cde728c4a1a9ab5f78608f9931c91660c505abd7685be0dd7e8007cb189c WHIRLPOOL 72dfd103b807bc4ab2e6cd12c6e897a3af60631ec558eb81019df4114d1ed93bae146253db100bdb1764c88ca661d88d462529029045b28254184d7570a27251
+EBUILD selinux-base-policy-2.20170204-r3.ebuild 3784 SHA256 51468f237a036a0fdf5e4e19e53d0d76f2f4228c765cd37f55744993ec2e65b4 SHA512 8fe89ca7392cff717e83b358535eb68126562f6a94fc0f8d2d3d0d4a991dc7fa6c28cde728c4a1a9ab5f78608f9931c91660c505abd7685be0dd7e8007cb189c WHIRLPOOL 72dfd103b807bc4ab2e6cd12c6e897a3af60631ec558eb81019df4114d1ed93bae146253db100bdb1764c88ca661d88d462529029045b28254184d7570a27251
+EBUILD selinux-base-policy-2.20170204-r4.ebuild 3784 SHA256 51468f237a036a0fdf5e4e19e53d0d76f2f4228c765cd37f55744993ec2e65b4 SHA512 8fe89ca7392cff717e83b358535eb68126562f6a94fc0f8d2d3d0d4a991dc7fa6c28cde728c4a1a9ab5f78608f9931c91660c505abd7685be0dd7e8007cb189c WHIRLPOOL 72dfd103b807bc4ab2e6cd12c6e897a3af60631ec558eb81019df4114d1ed93bae146253db100bdb1764c88ca661d88d462529029045b28254184d7570a27251
+EBUILD selinux-base-policy-2.20170805-r2.ebuild 3731 SHA256 1b168de854d3e9128e507e7ae596e63a39b9461c4155558bc6dc26920b4c2855 SHA512 acf60b729293958f5eccdd45214b5aace93ed86b926511c802da2f6da75ec60617e00adb980dcc9873b519811130378bbf4fb25de6256328b701043a5bebd3d0 WHIRLPOOL d7c8ebd6e7d4dbdbe998e5046fb8a72d4670fc9025ebfb05193d1c23387ed170bd66042a00339628f738645dab99f4aad45ac64124fd85948285c5e663776401
+EBUILD selinux-base-policy-2.20170805-r3.ebuild 3733 SHA256 ccba3ef4ff3cb84008515cf4fef78355c32fcf21fe9c461047bffe5aa7533d21 SHA512 4718bfed0759c58ad9a115beb90b8769973985d3ca6e0cdb8cb6ab4afc16da4aa7dde1fea3b4d06ba3c8de87a8e394a905db076444c54d15e0a7c4b37148e934 WHIRLPOOL 0412e0ea9cc5880310655d11607f41b5a2690321c3949f45b5283804fa269853bdb226c4837dd01122457e55e86ce746726715f91d93cd029161d844066aac6e
+EBUILD selinux-base-policy-9999.ebuild 3733 SHA256 ccba3ef4ff3cb84008515cf4fef78355c32fcf21fe9c461047bffe5aa7533d21 SHA512 4718bfed0759c58ad9a115beb90b8769973985d3ca6e0cdb8cb6ab4afc16da4aa7dde1fea3b4d06ba3c8de87a8e394a905db076444c54d15e0a7c4b37148e934 WHIRLPOOL 0412e0ea9cc5880310655d11607f41b5a2690321c3949f45b5283804fa269853bdb226c4837dd01122457e55e86ce746726715f91d93cd029161d844066aac6e
 MISC ChangeLog 11824 SHA256 50fed5d43a2c0f20e25c4f80a094b5ebe9123ca086544faf4e21ade20ab2f819 SHA512 b15a5e70be0d28d1bba0a9f09c48365b66626af8ec208d43fb3f290a6b7721f6314235660ea40053281aa4cb2f599ddc67138dd8ac00f101d1f3c35a20f6ec55 WHIRLPOOL 5626440b3b5b09a482ca00db0611491862b1e1f95a04945f92cfd6cd6972c163054445828e23867fc5d95ae1a08f556210c3c40142f534b2247a4e1747141244
 MISC ChangeLog-2015 37983 SHA256 9afe421ec7ee0070935467542733506d95667b765a81d4a2d04499dc7119383c SHA512 94774e4537bde4e9e3e25c389f19a3b890325c1db062c81eaf10ad4d824416207945a16d4ea8e0a7990bd16b2e5b8f159d63987f73130cbed898a396d5553961 WHIRLPOOL f00483d2643d51b0986faebf2388337c06a51bddf4db20148b3df862002435ff01c909881051876e43e4b6967aa2ecca1ae5a309d88dfdc18a3575878b541545
 MISC metadata.xml 534 SHA256 54947d1696b3ab8c1191b2c2bee635415704f2ed8616434a66cbb089094dcb4d SHA512 d8340bec9d0ec0feb396b17b53a6d53e3caa7ddd1efdc5e5de07baf86592ad0526d08fc08908295cf18a915eef1c7429c72970d56967162b2390eed6f28c822a WHIRLPOOL 2ffdc514d87d9dad75ec5da7f06e929293793aa4ce79783aa819e4f8e1944345f02a74c759883510ef946c7e49a5f1a92bdc0ac637c505d03fa7ecf41aa554e3
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r1.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r1.ebuild
index edbda7e12245..6782cb719303 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 if [[ ${PV} == 9999* ]]; then
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r2.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r2.ebuild
index a3a8db14e5dd..dfe1dece31a5 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 if [[ ${PV} == 9999* ]]; then
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r3.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r3.ebuild
index a3a8db14e5dd..dfe1dece31a5 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 if [[ ${PV} == 9999* ]]; then
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r4.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r4.ebuild
index a3a8db14e5dd..dfe1dece31a5 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 if [[ ${PV} == 9999* ]]; then
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r2.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r2.ebuild
index 1bd217f0e7cb..c3e966881051 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 if [[ ${PV} == 9999* ]]; then
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r3.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..111bd5737731
--- /dev/null
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r3.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-${PV}.tar.bz2
+			https://dev.gentoo.org/~swift/patches/${PN}/patchbundle-${PN}-${PVR}.tar.bz2"
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+
+HOMEPAGE="https://www.gentoo.org/proj/en/hardened/selinux/"
+DESCRIPTION="SELinux policy for core modules"
+
+IUSE="systemd +unconfined"
+
+PDEPEND="unconfined? ( sec-policy/selinux-unconfined )"
+DEPEND="=sec-policy/selinux-base-${PVR}[systemd?]"
+
+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 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_setup() {
+	if use systemd; then
+		MODS="${MODS} systemd"
+	fi
+}
+
+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 -C "${S}"/${i} || die "${i} compile failed"
+	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 || die "Failed to add ${j}.pp to ${i}"
+		done
+	done
+}
+
+pkg_postinst() {
+	# 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 /usr/share/selinux/${i} || die "Could not enter /usr/share/selinux/${i}"
+
+		semodule -s ${i} ${COMMAND} || die "Failed to load in base and modules ${MODS} in the $i policy store"
+	done
+
+	# 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
+}
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
index f659283bd427..111bd5737731 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 if [[ ${PV} == 9999* ]]; then
diff --git a/sec-policy/selinux-base/Manifest b/sec-policy/selinux-base/Manifest
index 5d780e2f7048..e786e5f0c472 100644
--- a/sec-policy/selinux-base/Manifest
+++ b/sec-policy/selinux-base/Manifest
@@ -5,14 +5,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-base-2.20170204-r1.ebuild 4283 SHA256 2045c7040354e213bb9883cf2399e2aabe76919c3eb525b66b145cc732c8fb56 SHA512 5f9d15c88c71d27f9807a410a4d08b7324b7cd3fb21a949593742752647f0350ccc7cbb6698f6a4ba10c2646ca03ff288bbd1b53c09b7213d56c6cec51ee81c6 WHIRLPOOL f75fb9abf90af37a931af9148d20b1b8b6960ee3a2da3295ecb363943c5b71b8e89539609362262aecf2a0e726610fec24496f94914ac7053633fbeed505ce2e
-EBUILD selinux-base-2.20170204-r2.ebuild 4281 SHA256 d74bfd175b58ab297974da77a10104f3e594b3da79f19844074a372bf6c43686 SHA512 1828b6ee088a07ed84a34cb7ae73f8199a1e31856020911b9e1f7b7bbdd430dc409ebe74f49b78fa5690c12257dd0bdca6074455d065d0a7607400ae358fa24e WHIRLPOOL ab712a2fc705a9d410e3552b36a44a109caf821e4d61854aad3ab85b51b1b35bd9a31d2c7bdba5569649e60894ace0a930860a1a9a3ebc161c625cab42dfa9da
-EBUILD selinux-base-2.20170204-r3.ebuild 4281 SHA256 d74bfd175b58ab297974da77a10104f3e594b3da79f19844074a372bf6c43686 SHA512 1828b6ee088a07ed84a34cb7ae73f8199a1e31856020911b9e1f7b7bbdd430dc409ebe74f49b78fa5690c12257dd0bdca6074455d065d0a7607400ae358fa24e WHIRLPOOL ab712a2fc705a9d410e3552b36a44a109caf821e4d61854aad3ab85b51b1b35bd9a31d2c7bdba5569649e60894ace0a930860a1a9a3ebc161c625cab42dfa9da
-EBUILD selinux-base-2.20170204-r4.ebuild 4281 SHA256 d74bfd175b58ab297974da77a10104f3e594b3da79f19844074a372bf6c43686 SHA512 1828b6ee088a07ed84a34cb7ae73f8199a1e31856020911b9e1f7b7bbdd430dc409ebe74f49b78fa5690c12257dd0bdca6074455d065d0a7607400ae358fa24e WHIRLPOOL ab712a2fc705a9d410e3552b36a44a109caf821e4d61854aad3ab85b51b1b35bd9a31d2c7bdba5569649e60894ace0a930860a1a9a3ebc161c625cab42dfa9da
-EBUILD selinux-base-2.20170805-r2.ebuild 4228 SHA256 ed5009808215ce4f90999cd5ef7d006d3b5a9bb07f86edade0e191d8fa289afb SHA512 8fb4b06682a8f670f15577f826054e5baf2c51c566adb38922325265480b8d24fe72deeec30e267e26656279925b41ef7f258c522a4f96bf39f30bcb77e7093b WHIRLPOOL 848b511335992deadce5065cffc051af5c81f8bdf25981e5d006b0074aab6be19237573b5ad4718fcdb5b745d25f1db3f31cbee16862a4d4a7929e0f678124ed
-EBUILD selinux-base-9999.ebuild 4230 SHA256 9f3f1ce2ee37bd9bfc382dde0cc00ff3a4d0e80bc6a30fbcf3df2182479179d6 SHA512 d4d46d31b3a585529b086e6c2f3d3f1d291dbce76795e18b95fe40bbd42624e7f5e3530ff73ee822d0d7f22e6792e57503c665a59e60c03b11816e4c9c7a55b8 WHIRLPOOL a54618eac096e829e2f3c40ec9732d5cb25181a9d3a3496aebf5d687db556ab10f0a35007ea90abb94312e705f96b4153ea7549ea23b61ff90fe567d9ddf8e01
+EBUILD selinux-base-2.20170204-r1.ebuild 4284 SHA256 1bad95de192490f0a98f3ba4c3de03e03fc8c72ee4b8909123daef57f62766f0 SHA512 a33229c688249f633db2a8279a236d141b8c3958381c180bf2072982773dbb02750f108df855afd4e1ec04eca660ae2d42f492b57cd3ff01e60bfabaaefe331b WHIRLPOOL a92fb098445c19772cabec225516aaaa2b1c429b6e70d1723c9a4a4081895f0fdc69a30eade382a49dd174918b8dc702060fdafbd6cc2546ca724bd7d2f2aac8
+EBUILD selinux-base-2.20170204-r2.ebuild 4282 SHA256 293bbbb3cb1672ac988b40cb9895f4b96745193affe11f086a57dafba554e696 SHA512 afb5b7d59305173fef1a5e44d8bd67d97bb0c9f3c2546f9dfc33c63fdeb48dd97468c8c7f3ec7c8eab458c490298199e306bfa327034a21983dd03e6d78bfce1 WHIRLPOOL 7292209abd9060dce10ca8f2defb2e8171540c47a471dc49597a0f55e95187b5b06fc8f86663335e66c0e6df00770f34e621b231f35725b3bf1714239ac07ea8
+EBUILD selinux-base-2.20170204-r3.ebuild 4282 SHA256 293bbbb3cb1672ac988b40cb9895f4b96745193affe11f086a57dafba554e696 SHA512 afb5b7d59305173fef1a5e44d8bd67d97bb0c9f3c2546f9dfc33c63fdeb48dd97468c8c7f3ec7c8eab458c490298199e306bfa327034a21983dd03e6d78bfce1 WHIRLPOOL 7292209abd9060dce10ca8f2defb2e8171540c47a471dc49597a0f55e95187b5b06fc8f86663335e66c0e6df00770f34e621b231f35725b3bf1714239ac07ea8
+EBUILD selinux-base-2.20170204-r4.ebuild 4282 SHA256 293bbbb3cb1672ac988b40cb9895f4b96745193affe11f086a57dafba554e696 SHA512 afb5b7d59305173fef1a5e44d8bd67d97bb0c9f3c2546f9dfc33c63fdeb48dd97468c8c7f3ec7c8eab458c490298199e306bfa327034a21983dd03e6d78bfce1 WHIRLPOOL 7292209abd9060dce10ca8f2defb2e8171540c47a471dc49597a0f55e95187b5b06fc8f86663335e66c0e6df00770f34e621b231f35725b3bf1714239ac07ea8
+EBUILD selinux-base-2.20170805-r2.ebuild 4229 SHA256 1ef02c83583f91719096c2c51ce29508d867a16d8f05184259da3b24911cd50d SHA512 d3bd2b7e545472924817350746d5fcc086982f20ba0108caa49486d9673debff82be89cefc7fc61584f621a50259c3bc7a0432bba1d7778c958f942193e87dc2 WHIRLPOOL a03cf7333e08c4e469dfa5a6f05d39c41ff8c046f4c4ba7e5a5072efe58dcc111ad4fcbbe5e48bf16e9c8c157194456f63a48a1f84576a1132b20994390fde46
+EBUILD selinux-base-2.20170805-r3.ebuild 4231 SHA256 49cb98cd59102868e3569a73a149b65fb1725db2162641f25c146ae7e946f583 SHA512 95efa50852b58394c254efea11aec254bf211c01bc1187c9d34131869adf90540650aa9eb43994020c37677547a51a100ae083d04386e6fc23e46f33c4cccfe7 WHIRLPOOL e945aa86c7d15c566ab13545d03abe3ddfbf50be5f55e7363641954a4a553e3d3dea437dcf4985b79baa32f0ac0f454645b90b6ef1a72a9ba52b74d71c338122
+EBUILD selinux-base-9999.ebuild 4231 SHA256 49cb98cd59102868e3569a73a149b65fb1725db2162641f25c146ae7e946f583 SHA512 95efa50852b58394c254efea11aec254bf211c01bc1187c9d34131869adf90540650aa9eb43994020c37677547a51a100ae083d04386e6fc23e46f33c4cccfe7 WHIRLPOOL e945aa86c7d15c566ab13545d03abe3ddfbf50be5f55e7363641954a4a553e3d3dea437dcf4985b79baa32f0ac0f454645b90b6ef1a72a9ba52b74d71c338122
 MISC ChangeLog 11474 SHA256 720edf02c93409fbf9f47d7227c521f237ca176789b2711aae7bec4445b23343 SHA512 572f128ffae5796642e7354c582bf2e83a5e0046f990ea8cfffc0fba483308ef14e8dde0dfbb8cda9774dcb7034d6fbdff0865738b94c5eb034296c8ad761508 WHIRLPOOL 0875e083554ea6fedb09694dd5096f1c25d19eab1390775e2803a8598fdf86250a1683fe110c6f5c41a0668d702252350dcb8eb084a622aec0beb4316d0d516a
 MISC ChangeLog-2015 12707 SHA256 59c70e3c1b23f9b8bb615a42f32f8da9ea4ccebe10908609dba01e88ff37d018 SHA512 c8c7770c1a1bdf0ab26ccf02f4195a4415f7db5251b5f38b0e04465694958bdfacfe7deb3b1bed7a202714c97fdd5a55a61ee2c46589a2f54603884aaa88a8b2 WHIRLPOOL 8f671f10e665bb3ce1b78503b736d480e3f5f5deaa1a764d9f11d0126e94476e0f88e93e82481a25a3afb54b83ff50fdd133441a41e3c095973e82a83ecbc4a3
 MISC metadata.xml 839 SHA256 05db545aa93b5c7597fec186f3e2bcb9062ed9008c6e69946586a653a3c45c06 SHA512 330017a98a3f9f4e6d6004955eb939c8d9c1c92fe6d091f78cdd7d2f6a02838c67a8a3268f38dad7df27f909ff51dc295d5de748f9767a257b5dad36c74d921a WHIRLPOOL 110e3f9d11169d733dcae7f5acb5a08f1e3170f3f7ee2dd9899b42969b4c4774279e2d07dfd5f49b0844a7c07812843ef6490b97759713be6c8709b96c0ecccb
diff --git a/sec-policy/selinux-base/selinux-base-2.20170204-r1.ebuild b/sec-policy/selinux-base/selinux-base-2.20170204-r1.ebuild
index cd02886e86f5..e868d90864de 100644
--- a/sec-policy/selinux-base/selinux-base-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-base/selinux-base-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 if [[ ${PV} == 9999* ]]; then
diff --git a/sec-policy/selinux-base/selinux-base-2.20170204-r2.ebuild b/sec-policy/selinux-base/selinux-base-2.20170204-r2.ebuild
index b96acf9ce544..71409d1bb6cc 100644
--- a/sec-policy/selinux-base/selinux-base-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-base/selinux-base-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 if [[ ${PV} == 9999* ]]; then
diff --git a/sec-policy/selinux-base/selinux-base-2.20170204-r3.ebuild b/sec-policy/selinux-base/selinux-base-2.20170204-r3.ebuild
index b96acf9ce544..71409d1bb6cc 100644
--- a/sec-policy/selinux-base/selinux-base-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-base/selinux-base-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 if [[ ${PV} == 9999* ]]; then
diff --git a/sec-policy/selinux-base/selinux-base-2.20170204-r4.ebuild b/sec-policy/selinux-base/selinux-base-2.20170204-r4.ebuild
index b96acf9ce544..71409d1bb6cc 100644
--- a/sec-policy/selinux-base/selinux-base-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-base/selinux-base-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 if [[ ${PV} == 9999* ]]; then
diff --git a/sec-policy/selinux-base/selinux-base-2.20170805-r2.ebuild b/sec-policy/selinux-base/selinux-base-2.20170805-r2.ebuild
index 74380e8b8f9e..c2ac18ef37a6 100644
--- a/sec-policy/selinux-base/selinux-base-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-base/selinux-base-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 if [[ ${PV} == 9999* ]]; then
diff --git a/sec-policy/selinux-base/selinux-base-2.20170805-r3.ebuild b/sec-policy/selinux-base/selinux-base-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..75f0679ab23e
--- /dev/null
+++ b/sec-policy/selinux-base/selinux-base-2.20170805-r3.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-${PV}.tar.bz2
+			https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-${PVR}.tar.bz2"
+
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+
+IUSE="doc +open_perms +peer_perms systemd +ubac +unconfined"
+
+DESCRIPTION="Gentoo base policy for SELinux"
+HOMEPAGE="https://www.gentoo.org/proj/en/hardened/selinux/"
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND=">=sys-apps/policycoreutils-2.3
+	virtual/udev"
+DEPEND="${RDEPEND}
+	sys-devel/m4
+	>=sys-apps/checkpolicy-2.3"
+
+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 peer_perms; then
+		sed -i -e '/network_peer_controls/d' \
+			"${S}/refpolicy/policy/policy_capabilities" || die
+	fi
+
+	if ! use open_perms; then
+		sed -i -e '/open_perms/d' \
+			"${S}/refpolicy/policy/policy_capabilities" || die
+	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 || die "Make conf failed"
+
+	# 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 \
+			|| die "${i} install failed."
+
+		emake DESTDIR="${D}" install-headers \
+			|| die "${i} headers install failed."
+
+		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 5643a40494e6..75f0679ab23e 100644
--- a/sec-policy/selinux-base/selinux-base-9999.ebuild
+++ b/sec-policy/selinux-base/selinux-base-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 if [[ ${PV} == 9999* ]]; then
diff --git a/sec-policy/selinux-bind/Manifest b/sec-policy/selinux-bind/Manifest
index a43f4289c859..cfa9f9232953 100644
--- a/sec-policy/selinux-bind/Manifest
+++ b/sec-policy/selinux-bind/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-bind-2.20170204-r1.ebuild 279 SHA256 cdee42861b32186abab25e7ec7fdac56c3c3786ebf95649f59127646fd0790c8 SHA512 81ea10180c1826924d0bc99ed7b8252813f89df4b52b4c27cf4fd6377f41723b9487586ffca55a970e9f1f7c65b392d48e3804283abe432e51848848827127b1 WHIRLPOOL 33f2920f348de5304374c4ef87bc9a169e73f5edb169ca959efec46b4668580f839672538042debeb1d65cb81b86f2f295a7c763b0e9fbd495b15e9fe1d43966
-EBUILD selinux-bind-2.20170204-r2.ebuild 277 SHA256 d0c9044cc0d4709da46c9cbcff10e2dbd5855c0a71fb574c8ffed326a4c4bb12 SHA512 e6fd9159b1432d0ffb397aacabcb3f85488c732aac198df46895e1adbfc53f354e1f193065aa0b56b6af077310cdf88040592d79dda3d9c8106dced4e745d570 WHIRLPOOL 001d56b1cf6bf25ce5727d236d6a3c53eccf7aab177b4e9c033f52080c11aedad5427c0f5ad7a4ea0a71717169827c1a40953feb6f632f18a2ab594ef0b85d0e
-EBUILD selinux-bind-2.20170204-r3.ebuild 277 SHA256 d0c9044cc0d4709da46c9cbcff10e2dbd5855c0a71fb574c8ffed326a4c4bb12 SHA512 e6fd9159b1432d0ffb397aacabcb3f85488c732aac198df46895e1adbfc53f354e1f193065aa0b56b6af077310cdf88040592d79dda3d9c8106dced4e745d570 WHIRLPOOL 001d56b1cf6bf25ce5727d236d6a3c53eccf7aab177b4e9c033f52080c11aedad5427c0f5ad7a4ea0a71717169827c1a40953feb6f632f18a2ab594ef0b85d0e
-EBUILD selinux-bind-2.20170204-r4.ebuild 277 SHA256 d0c9044cc0d4709da46c9cbcff10e2dbd5855c0a71fb574c8ffed326a4c4bb12 SHA512 e6fd9159b1432d0ffb397aacabcb3f85488c732aac198df46895e1adbfc53f354e1f193065aa0b56b6af077310cdf88040592d79dda3d9c8106dced4e745d570 WHIRLPOOL 001d56b1cf6bf25ce5727d236d6a3c53eccf7aab177b4e9c033f52080c11aedad5427c0f5ad7a4ea0a71717169827c1a40953feb6f632f18a2ab594ef0b85d0e
-EBUILD selinux-bind-2.20170805-r2.ebuild 277 SHA256 d0c9044cc0d4709da46c9cbcff10e2dbd5855c0a71fb574c8ffed326a4c4bb12 SHA512 e6fd9159b1432d0ffb397aacabcb3f85488c732aac198df46895e1adbfc53f354e1f193065aa0b56b6af077310cdf88040592d79dda3d9c8106dced4e745d570 WHIRLPOOL 001d56b1cf6bf25ce5727d236d6a3c53eccf7aab177b4e9c033f52080c11aedad5427c0f5ad7a4ea0a71717169827c1a40953feb6f632f18a2ab594ef0b85d0e
-EBUILD selinux-bind-9999.ebuild 279 SHA256 cdee42861b32186abab25e7ec7fdac56c3c3786ebf95649f59127646fd0790c8 SHA512 81ea10180c1826924d0bc99ed7b8252813f89df4b52b4c27cf4fd6377f41723b9487586ffca55a970e9f1f7c65b392d48e3804283abe432e51848848827127b1 WHIRLPOOL 33f2920f348de5304374c4ef87bc9a169e73f5edb169ca959efec46b4668580f839672538042debeb1d65cb81b86f2f295a7c763b0e9fbd495b15e9fe1d43966
+EBUILD selinux-bind-2.20170204-r1.ebuild 280 SHA256 16891875b8b023dc689814f8cb82782a38ab3eed3780f22f870d78a7d9ee7d3b SHA512 9de3bf8f814083fb9bdb081df25a328707ea790fc8ffb3da8c1d592772cb5d51a5dbf2032942a68d7bfbeeb0894d565f6d68ae413ca61e4208817b2fcaa99411 WHIRLPOOL e168fd9f73c788b30c67af5b957bd4bd06b98fa9aa3743bcb5d14723affa27627acfb6e7cd41321f9177708d4ac56decd462187ac5654151a9fb4741f82746a6
+EBUILD selinux-bind-2.20170204-r2.ebuild 278 SHA256 cd92cb5172076f76a34bdf95bb9a6c1130c1e2eb9bd201c352f3c6b4ab29d77f SHA512 051e510b34ecc9f2a7d7ae73873601fd33ebf8abe0fe652dbd2ad24029bc3a0dee41bf7b538c22fcd841646af3afdce95aed6efc1de9e07f544c916428e86cc8 WHIRLPOOL 0cf2c09e55f7d45c33336e18d977e8e83a306f9071725f22790ad440dd445b0afab5e31aa4bfb0d6b16395e6b23dc48cf91b5a745b3c1a635fd3c7d524a10ddb
+EBUILD selinux-bind-2.20170204-r3.ebuild 278 SHA256 cd92cb5172076f76a34bdf95bb9a6c1130c1e2eb9bd201c352f3c6b4ab29d77f SHA512 051e510b34ecc9f2a7d7ae73873601fd33ebf8abe0fe652dbd2ad24029bc3a0dee41bf7b538c22fcd841646af3afdce95aed6efc1de9e07f544c916428e86cc8 WHIRLPOOL 0cf2c09e55f7d45c33336e18d977e8e83a306f9071725f22790ad440dd445b0afab5e31aa4bfb0d6b16395e6b23dc48cf91b5a745b3c1a635fd3c7d524a10ddb
+EBUILD selinux-bind-2.20170204-r4.ebuild 278 SHA256 cd92cb5172076f76a34bdf95bb9a6c1130c1e2eb9bd201c352f3c6b4ab29d77f SHA512 051e510b34ecc9f2a7d7ae73873601fd33ebf8abe0fe652dbd2ad24029bc3a0dee41bf7b538c22fcd841646af3afdce95aed6efc1de9e07f544c916428e86cc8 WHIRLPOOL 0cf2c09e55f7d45c33336e18d977e8e83a306f9071725f22790ad440dd445b0afab5e31aa4bfb0d6b16395e6b23dc48cf91b5a745b3c1a635fd3c7d524a10ddb
+EBUILD selinux-bind-2.20170805-r2.ebuild 278 SHA256 cd92cb5172076f76a34bdf95bb9a6c1130c1e2eb9bd201c352f3c6b4ab29d77f SHA512 051e510b34ecc9f2a7d7ae73873601fd33ebf8abe0fe652dbd2ad24029bc3a0dee41bf7b538c22fcd841646af3afdce95aed6efc1de9e07f544c916428e86cc8 WHIRLPOOL 0cf2c09e55f7d45c33336e18d977e8e83a306f9071725f22790ad440dd445b0afab5e31aa4bfb0d6b16395e6b23dc48cf91b5a745b3c1a635fd3c7d524a10ddb
+EBUILD selinux-bind-2.20170805-r3.ebuild 280 SHA256 16891875b8b023dc689814f8cb82782a38ab3eed3780f22f870d78a7d9ee7d3b SHA512 9de3bf8f814083fb9bdb081df25a328707ea790fc8ffb3da8c1d592772cb5d51a5dbf2032942a68d7bfbeeb0894d565f6d68ae413ca61e4208817b2fcaa99411 WHIRLPOOL e168fd9f73c788b30c67af5b957bd4bd06b98fa9aa3743bcb5d14723affa27627acfb6e7cd41321f9177708d4ac56decd462187ac5654151a9fb4741f82746a6
+EBUILD selinux-bind-9999.ebuild 280 SHA256 16891875b8b023dc689814f8cb82782a38ab3eed3780f22f870d78a7d9ee7d3b SHA512 9de3bf8f814083fb9bdb081df25a328707ea790fc8ffb3da8c1d592772cb5d51a5dbf2032942a68d7bfbeeb0894d565f6d68ae413ca61e4208817b2fcaa99411 WHIRLPOOL e168fd9f73c788b30c67af5b957bd4bd06b98fa9aa3743bcb5d14723affa27627acfb6e7cd41321f9177708d4ac56decd462187ac5654151a9fb4741f82746a6
 MISC ChangeLog 10387 SHA256 cf8f6a25bc6e4ee55276e38d4583b0a70cc0f25fef984a4957bec74bc9cb8354 SHA512 0020b64aea25afb96124e32c8845a21fee9d53371c7161c1694eac5225ec6de7fd1db395130f9940c525a928a813a3155e4b65965292c63cb3dfd2c72359a823 WHIRLPOOL e8ce623303fb99ff3d1020ca56003e94c94a5abdcce5b534060ec26a6a5176fea4812184835eb2cb111caa353c50c58b96d6846d6ffb3cff291f536459b2c7e7
 MISC ChangeLog-2015 13766 SHA256 b08b4140e55d04e212e78b3678afa886c82a2e8937983ed3d34b892d256d2a43 SHA512 c28c6f3284778abb84b0606c927da09d6badf428117d0a7d76ec96d4c6271bac53efac9e98c06b904bec46f26b8e9b96274a54093fe8dc98af0fa4dd62fc61fd WHIRLPOOL 560a677d391fc9fe20bda7a42404b909b1c8fcbf781f32f614ddc2914500b6c67ce89ade93a205572229896bbb4bb9af17ca381806991bcf3392f86acb9fd78d
 MISC metadata.xml 314 SHA256 df1af92dc78d0652ac3c3fbe20a812f3832f22f55a3ed3fbd91ba70790df73d4 SHA512 9062d22c1c459260c2f1202823ac2bc9e2a6ba8214380785a6f92b5eeb2470017249d24e64e1abc92dfe58910a45b860f5b81cfdc0643198b5c5bf84e6598372 WHIRLPOOL 6add85602fde4d6bf120e3622c4be2a2fbc5307ce49f0015225fac1dc98e1365ad27da32f3177e600ad2567d2d4b9bba381920376a29bc6f9adc33bae418f836
diff --git a/sec-policy/selinux-bind/selinux-bind-2.20170204-r1.ebuild b/sec-policy/selinux-bind/selinux-bind-2.20170204-r1.ebuild
index 285020619b1a..b3da5a34f97f 100644
--- a/sec-policy/selinux-bind/selinux-bind-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-bind/selinux-bind-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-bind/selinux-bind-2.20170204-r2.ebuild b/sec-policy/selinux-bind/selinux-bind-2.20170204-r2.ebuild
index 5c17322dca2a..f7758b06f680 100644
--- a/sec-policy/selinux-bind/selinux-bind-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-bind/selinux-bind-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-bind/selinux-bind-2.20170204-r3.ebuild b/sec-policy/selinux-bind/selinux-bind-2.20170204-r3.ebuild
index 5c17322dca2a..f7758b06f680 100644
--- a/sec-policy/selinux-bind/selinux-bind-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-bind/selinux-bind-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-bind/selinux-bind-2.20170204-r4.ebuild b/sec-policy/selinux-bind/selinux-bind-2.20170204-r4.ebuild
index 5c17322dca2a..f7758b06f680 100644
--- a/sec-policy/selinux-bind/selinux-bind-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-bind/selinux-bind-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-bind/selinux-bind-2.20170805-r2.ebuild b/sec-policy/selinux-bind/selinux-bind-2.20170805-r2.ebuild
index 5c17322dca2a..f7758b06f680 100644
--- a/sec-policy/selinux-bind/selinux-bind-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-bind/selinux-bind-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-bind/selinux-bind-2.20170805-r3.ebuild b/sec-policy/selinux-bind/selinux-bind-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..b3da5a34f97f
--- /dev/null
+++ b/sec-policy/selinux-bind/selinux-bind-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-bind/selinux-bind-9999.ebuild b/sec-policy/selinux-bind/selinux-bind-9999.ebuild
index 285020619b1a..b3da5a34f97f 100644
--- a/sec-policy/selinux-bind/selinux-bind-9999.ebuild
+++ b/sec-policy/selinux-bind/selinux-bind-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-bitcoin/Manifest b/sec-policy/selinux-bitcoin/Manifest
index 90eaf9d949d5..d1a8d6e7b93f 100644
--- a/sec-policy/selinux-bitcoin/Manifest
+++ b/sec-policy/selinux-bitcoin/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-bitcoin-2.20170204-r1.ebuild 285 SHA256 e29773e5078a7ee878a410e4bec38bebbf40fffe6fa2238bbcda79ced6c3da39 SHA512 7f4a5e51f9d969711b464ffa8d3d3106200e416f55298bea25c99dd06ff1dc882d70219047f93e1a020e2c3e1ec689d6739e9386bf5da4371e96aef9712b7ff6 WHIRLPOOL e24ee4f0b4f9122e48fbe30fd418556036757ad2cfdb7c01129d66c904da8cadb73ee9219cd9e81af8763979303d62aa2c04a4ff8a684947fae32e7cedc3d52f
-EBUILD selinux-bitcoin-2.20170204-r2.ebuild 283 SHA256 1c9487bce5d7a12e06f3466f52aa33ee8a0a9ff2394ff0a18a380fa1a01121ad SHA512 48c58f26bccb3bc2107ea10e0fed9f3f9e82a7666a2fb6638196d150b093bfc29a750a4e8aa6cf07db2b03013aeb0842d580a49058f4228f2cecdc97724e887a WHIRLPOOL d311e585b0e121cf39453290eb4cee72ac685edacfe3d247ef4c0fb019ebba4050107cf11badfb8ce0a151fcb799e0da249e092694706cc160e4f23de45a88b8
-EBUILD selinux-bitcoin-2.20170204-r3.ebuild 283 SHA256 1c9487bce5d7a12e06f3466f52aa33ee8a0a9ff2394ff0a18a380fa1a01121ad SHA512 48c58f26bccb3bc2107ea10e0fed9f3f9e82a7666a2fb6638196d150b093bfc29a750a4e8aa6cf07db2b03013aeb0842d580a49058f4228f2cecdc97724e887a WHIRLPOOL d311e585b0e121cf39453290eb4cee72ac685edacfe3d247ef4c0fb019ebba4050107cf11badfb8ce0a151fcb799e0da249e092694706cc160e4f23de45a88b8
-EBUILD selinux-bitcoin-2.20170204-r4.ebuild 283 SHA256 1c9487bce5d7a12e06f3466f52aa33ee8a0a9ff2394ff0a18a380fa1a01121ad SHA512 48c58f26bccb3bc2107ea10e0fed9f3f9e82a7666a2fb6638196d150b093bfc29a750a4e8aa6cf07db2b03013aeb0842d580a49058f4228f2cecdc97724e887a WHIRLPOOL d311e585b0e121cf39453290eb4cee72ac685edacfe3d247ef4c0fb019ebba4050107cf11badfb8ce0a151fcb799e0da249e092694706cc160e4f23de45a88b8
-EBUILD selinux-bitcoin-2.20170805-r2.ebuild 283 SHA256 1c9487bce5d7a12e06f3466f52aa33ee8a0a9ff2394ff0a18a380fa1a01121ad SHA512 48c58f26bccb3bc2107ea10e0fed9f3f9e82a7666a2fb6638196d150b093bfc29a750a4e8aa6cf07db2b03013aeb0842d580a49058f4228f2cecdc97724e887a WHIRLPOOL d311e585b0e121cf39453290eb4cee72ac685edacfe3d247ef4c0fb019ebba4050107cf11badfb8ce0a151fcb799e0da249e092694706cc160e4f23de45a88b8
-EBUILD selinux-bitcoin-9999.ebuild 285 SHA256 e29773e5078a7ee878a410e4bec38bebbf40fffe6fa2238bbcda79ced6c3da39 SHA512 7f4a5e51f9d969711b464ffa8d3d3106200e416f55298bea25c99dd06ff1dc882d70219047f93e1a020e2c3e1ec689d6739e9386bf5da4371e96aef9712b7ff6 WHIRLPOOL e24ee4f0b4f9122e48fbe30fd418556036757ad2cfdb7c01129d66c904da8cadb73ee9219cd9e81af8763979303d62aa2c04a4ff8a684947fae32e7cedc3d52f
+EBUILD selinux-bitcoin-2.20170204-r1.ebuild 286 SHA256 0038e519304d653f5a0cba67c3d11433ed0a9b8dc89b464c3ba4c4ac46faa93d SHA512 f1e5269dd9b9ef50bb14ef6b6e2ea269ef12deee7640b16dde8d8977a626f677d3b8ac24398f9ac58bdce8bcdf60f2a43857ff052cca35ac2d6fb956f7aa9d3f WHIRLPOOL 1ad06d1877c312a4d4931712121ea74e889648f872131df3b35dc0aef75ed53b834fcf60fd5e5d06126dd6a8697f479488732b1691ef7ef849695e6f0e7e83f0
+EBUILD selinux-bitcoin-2.20170204-r2.ebuild 284 SHA256 a62e1569555cae9209872c18977b8e585a62cb231f799f5819b90a826e12d1da SHA512 1b561adec5af2c32e2306a0e16372321b98a7f1290a65580f9e44d72cf34fad1ba45408fb58c5161f306756b4b897afe6f6786551c15cc800b460a481281017e WHIRLPOOL 1a43c9209b21d1cec7e3558e97f903497ab8424c665afe5b26b13ee17066c2e9e3b0674b1512a9e8bfb07c65470c2f047f55e7e64cf15331c3dca3cc88c37440
+EBUILD selinux-bitcoin-2.20170204-r3.ebuild 284 SHA256 a62e1569555cae9209872c18977b8e585a62cb231f799f5819b90a826e12d1da SHA512 1b561adec5af2c32e2306a0e16372321b98a7f1290a65580f9e44d72cf34fad1ba45408fb58c5161f306756b4b897afe6f6786551c15cc800b460a481281017e WHIRLPOOL 1a43c9209b21d1cec7e3558e97f903497ab8424c665afe5b26b13ee17066c2e9e3b0674b1512a9e8bfb07c65470c2f047f55e7e64cf15331c3dca3cc88c37440
+EBUILD selinux-bitcoin-2.20170204-r4.ebuild 284 SHA256 a62e1569555cae9209872c18977b8e585a62cb231f799f5819b90a826e12d1da SHA512 1b561adec5af2c32e2306a0e16372321b98a7f1290a65580f9e44d72cf34fad1ba45408fb58c5161f306756b4b897afe6f6786551c15cc800b460a481281017e WHIRLPOOL 1a43c9209b21d1cec7e3558e97f903497ab8424c665afe5b26b13ee17066c2e9e3b0674b1512a9e8bfb07c65470c2f047f55e7e64cf15331c3dca3cc88c37440
+EBUILD selinux-bitcoin-2.20170805-r2.ebuild 284 SHA256 a62e1569555cae9209872c18977b8e585a62cb231f799f5819b90a826e12d1da SHA512 1b561adec5af2c32e2306a0e16372321b98a7f1290a65580f9e44d72cf34fad1ba45408fb58c5161f306756b4b897afe6f6786551c15cc800b460a481281017e WHIRLPOOL 1a43c9209b21d1cec7e3558e97f903497ab8424c665afe5b26b13ee17066c2e9e3b0674b1512a9e8bfb07c65470c2f047f55e7e64cf15331c3dca3cc88c37440
+EBUILD selinux-bitcoin-2.20170805-r3.ebuild 286 SHA256 0038e519304d653f5a0cba67c3d11433ed0a9b8dc89b464c3ba4c4ac46faa93d SHA512 f1e5269dd9b9ef50bb14ef6b6e2ea269ef12deee7640b16dde8d8977a626f677d3b8ac24398f9ac58bdce8bcdf60f2a43857ff052cca35ac2d6fb956f7aa9d3f WHIRLPOOL 1ad06d1877c312a4d4931712121ea74e889648f872131df3b35dc0aef75ed53b834fcf60fd5e5d06126dd6a8697f479488732b1691ef7ef849695e6f0e7e83f0
+EBUILD selinux-bitcoin-9999.ebuild 286 SHA256 0038e519304d653f5a0cba67c3d11433ed0a9b8dc89b464c3ba4c4ac46faa93d SHA512 f1e5269dd9b9ef50bb14ef6b6e2ea269ef12deee7640b16dde8d8977a626f677d3b8ac24398f9ac58bdce8bcdf60f2a43857ff052cca35ac2d6fb956f7aa9d3f WHIRLPOOL 1ad06d1877c312a4d4931712121ea74e889648f872131df3b35dc0aef75ed53b834fcf60fd5e5d06126dd6a8697f479488732b1691ef7ef849695e6f0e7e83f0
 MISC ChangeLog 10032 SHA256 ccfe1559d9ce8ecda618e91ffd5edcf9489ff7dc54a47ebedace82e57ca6226d SHA512 aeacda5f131afeb921e8d0880910cfe85b7ecd3651a8626bb3c63dff5e026d41853dce40d5775ef464ed8f78427fa16cbd07cc99e08b1f2f2f105c95e65e1166 WHIRLPOOL 627208663754291bc1bfd995334c268bfc7d013a41a7aa139961176ef9106b5a59d019bf0d3a9f8f83c02156074af7d13e6d38ba0ed32a97f78fae76c2c0a512
 MISC ChangeLog-2015 2257 SHA256 a54349252bac0d89195c8821771c1234da8c4c5d17f0f945e72530ca56890f60 SHA512 79326741aeaa8a24feb723f4d9c6c405dd91ee5831a076dbdce453aec2f300d4b420b3e3b5080a435d0044217c16acc2b3096369a44768296be4d9a2c1b144f8 WHIRLPOOL 5fd49c2d43891d531278a065a516bdc70244ff844931d60ec0e9bb4ade6481079261a5058173ddb940166f1990f2887a044a7fcf30d152d4723b6d3ac148a7a6
 MISC metadata.xml 317 SHA256 3bc8ddd2a2626a9301fe8a75942ba7f4dd0325a60df564c9f3edd5666654facc SHA512 3478dc7035310237bd5df88943831b1ec05b7c8975c0d275a67b2f0c216a3447942077c131244efa347bbb8cdf91543e290a2d84f153e603fcc492e4079e7537 WHIRLPOOL 3984fea76bf3fa2437256dfb80325d9e600b7cb5ec796dcde12ac161daf09a0ec1b54933b128e6d30fc47ca0d9e8c41205f0ac62dea035660f43f46cf70c95f1
diff --git a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20170204-r1.ebuild b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20170204-r1.ebuild
index d02fed932c8e..24a913d8dba5 100644
--- a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20170204-r2.ebuild b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20170204-r2.ebuild
index 9a8c2b09c017..a2b7fd41fa87 100644
--- a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20170204-r3.ebuild b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20170204-r3.ebuild
index 9a8c2b09c017..a2b7fd41fa87 100644
--- a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20170204-r4.ebuild b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20170204-r4.ebuild
index 9a8c2b09c017..a2b7fd41fa87 100644
--- a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20170805-r2.ebuild b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20170805-r2.ebuild
index 9a8c2b09c017..a2b7fd41fa87 100644
--- a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20170805-r3.ebuild b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..24a913d8dba5
--- /dev/null
+++ b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-bitcoin/selinux-bitcoin-9999.ebuild b/sec-policy/selinux-bitcoin/selinux-bitcoin-9999.ebuild
index d02fed932c8e..24a913d8dba5 100644
--- a/sec-policy/selinux-bitcoin/selinux-bitcoin-9999.ebuild
+++ b/sec-policy/selinux-bitcoin/selinux-bitcoin-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-bitlbee/Manifest b/sec-policy/selinux-bitlbee/Manifest
index 382230537133..6cca09aad470 100644
--- a/sec-policy/selinux-bitlbee/Manifest
+++ b/sec-policy/selinux-bitlbee/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-bitlbee-2.20170204-r1.ebuild 380 SHA256 119a0de870701746da26149a074ff1e56c69dec931553eb6479d83e3d586b7ae SHA512 a207cde51849c15354543d31f74f3abbec20f275ddae2f1b2a456df1e3c5cff24616bc9a69c2edb3f120acdc09be5da6469a05201254d2d044f090044941c46a WHIRLPOOL e5a2aaa894fed5ef156c9113ba2cceb6df6dfcf6b76a49f303f70cfa7a975a522642febf25d6b0bdcc1239550f17e54d4578c1669924242225799483aa3e2805
-EBUILD selinux-bitlbee-2.20170204-r2.ebuild 378 SHA256 89c18a6c79ef331c8e982ff208f9b7b476eedc9ef873f65df0792c0d87b5cdbb SHA512 caad1b0813eec0d56cf42e6546181e5624ade36a76a934504bc1190e675b3bd7720c1d851c6e2778f060f871f6936220d3185740fcb8bd1d8f89dd43cf1d5b22 WHIRLPOOL 36039aff0c39a2942a0e17925f6e810e024977720a4aae036fe1032fd561ca0f06c37af327d49268e572ec9d2e1aee0393dc832df5c22e4409f62160a23478fa
-EBUILD selinux-bitlbee-2.20170204-r3.ebuild 378 SHA256 89c18a6c79ef331c8e982ff208f9b7b476eedc9ef873f65df0792c0d87b5cdbb SHA512 caad1b0813eec0d56cf42e6546181e5624ade36a76a934504bc1190e675b3bd7720c1d851c6e2778f060f871f6936220d3185740fcb8bd1d8f89dd43cf1d5b22 WHIRLPOOL 36039aff0c39a2942a0e17925f6e810e024977720a4aae036fe1032fd561ca0f06c37af327d49268e572ec9d2e1aee0393dc832df5c22e4409f62160a23478fa
-EBUILD selinux-bitlbee-2.20170204-r4.ebuild 378 SHA256 89c18a6c79ef331c8e982ff208f9b7b476eedc9ef873f65df0792c0d87b5cdbb SHA512 caad1b0813eec0d56cf42e6546181e5624ade36a76a934504bc1190e675b3bd7720c1d851c6e2778f060f871f6936220d3185740fcb8bd1d8f89dd43cf1d5b22 WHIRLPOOL 36039aff0c39a2942a0e17925f6e810e024977720a4aae036fe1032fd561ca0f06c37af327d49268e572ec9d2e1aee0393dc832df5c22e4409f62160a23478fa
-EBUILD selinux-bitlbee-2.20170805-r2.ebuild 378 SHA256 89c18a6c79ef331c8e982ff208f9b7b476eedc9ef873f65df0792c0d87b5cdbb SHA512 caad1b0813eec0d56cf42e6546181e5624ade36a76a934504bc1190e675b3bd7720c1d851c6e2778f060f871f6936220d3185740fcb8bd1d8f89dd43cf1d5b22 WHIRLPOOL 36039aff0c39a2942a0e17925f6e810e024977720a4aae036fe1032fd561ca0f06c37af327d49268e572ec9d2e1aee0393dc832df5c22e4409f62160a23478fa
-EBUILD selinux-bitlbee-9999.ebuild 380 SHA256 119a0de870701746da26149a074ff1e56c69dec931553eb6479d83e3d586b7ae SHA512 a207cde51849c15354543d31f74f3abbec20f275ddae2f1b2a456df1e3c5cff24616bc9a69c2edb3f120acdc09be5da6469a05201254d2d044f090044941c46a WHIRLPOOL e5a2aaa894fed5ef156c9113ba2cceb6df6dfcf6b76a49f303f70cfa7a975a522642febf25d6b0bdcc1239550f17e54d4578c1669924242225799483aa3e2805
+EBUILD selinux-bitlbee-2.20170204-r1.ebuild 381 SHA256 63b020b883548337596235e434225b92013a8dade5754ec239897427855cda9f SHA512 59b945bf366a671ca180664f6d3906b4bfe78bab6e822ae1121b1206d5b1a7607fc4a968421fe49ec26198983261ee0c5e1ed911f48effdd6383d3ee850fc076 WHIRLPOOL 9a8998f6b0424f2e971eba1589cec13b013cae8439d96aaefc809d54be2f425986309e23176597b6cbf46dbb066fc212afd32df341aac22158aa79df7acee977
+EBUILD selinux-bitlbee-2.20170204-r2.ebuild 379 SHA256 cd48d960646e4e7d7fa59ea955ee4c04025c172474e785f7689a429ce00c7274 SHA512 4f0561d002239b822bfc3761ff18694115bc95a3216ce7ee1307e1bef7bec3873c3ac84a2387b11e2ed974cee54ef9ccb2880aa003a741b2dc2470260885d845 WHIRLPOOL 8881ff929549c4fc256d0678aa05ab850a32cc423075f482ea936a9431e466a9c30b8eab25575d95721981ef6c5a615bc66965d5ec1d390e0b346faa8504f7b4
+EBUILD selinux-bitlbee-2.20170204-r3.ebuild 379 SHA256 cd48d960646e4e7d7fa59ea955ee4c04025c172474e785f7689a429ce00c7274 SHA512 4f0561d002239b822bfc3761ff18694115bc95a3216ce7ee1307e1bef7bec3873c3ac84a2387b11e2ed974cee54ef9ccb2880aa003a741b2dc2470260885d845 WHIRLPOOL 8881ff929549c4fc256d0678aa05ab850a32cc423075f482ea936a9431e466a9c30b8eab25575d95721981ef6c5a615bc66965d5ec1d390e0b346faa8504f7b4
+EBUILD selinux-bitlbee-2.20170204-r4.ebuild 379 SHA256 cd48d960646e4e7d7fa59ea955ee4c04025c172474e785f7689a429ce00c7274 SHA512 4f0561d002239b822bfc3761ff18694115bc95a3216ce7ee1307e1bef7bec3873c3ac84a2387b11e2ed974cee54ef9ccb2880aa003a741b2dc2470260885d845 WHIRLPOOL 8881ff929549c4fc256d0678aa05ab850a32cc423075f482ea936a9431e466a9c30b8eab25575d95721981ef6c5a615bc66965d5ec1d390e0b346faa8504f7b4
+EBUILD selinux-bitlbee-2.20170805-r2.ebuild 379 SHA256 cd48d960646e4e7d7fa59ea955ee4c04025c172474e785f7689a429ce00c7274 SHA512 4f0561d002239b822bfc3761ff18694115bc95a3216ce7ee1307e1bef7bec3873c3ac84a2387b11e2ed974cee54ef9ccb2880aa003a741b2dc2470260885d845 WHIRLPOOL 8881ff929549c4fc256d0678aa05ab850a32cc423075f482ea936a9431e466a9c30b8eab25575d95721981ef6c5a615bc66965d5ec1d390e0b346faa8504f7b4
+EBUILD selinux-bitlbee-2.20170805-r3.ebuild 381 SHA256 63b020b883548337596235e434225b92013a8dade5754ec239897427855cda9f SHA512 59b945bf366a671ca180664f6d3906b4bfe78bab6e822ae1121b1206d5b1a7607fc4a968421fe49ec26198983261ee0c5e1ed911f48effdd6383d3ee850fc076 WHIRLPOOL 9a8998f6b0424f2e971eba1589cec13b013cae8439d96aaefc809d54be2f425986309e23176597b6cbf46dbb066fc212afd32df341aac22158aa79df7acee977
+EBUILD selinux-bitlbee-9999.ebuild 381 SHA256 63b020b883548337596235e434225b92013a8dade5754ec239897427855cda9f SHA512 59b945bf366a671ca180664f6d3906b4bfe78bab6e822ae1121b1206d5b1a7607fc4a968421fe49ec26198983261ee0c5e1ed911f48effdd6383d3ee850fc076 WHIRLPOOL 9a8998f6b0424f2e971eba1589cec13b013cae8439d96aaefc809d54be2f425986309e23176597b6cbf46dbb066fc212afd32df341aac22158aa79df7acee977
 MISC ChangeLog 10687 SHA256 c83f14782d45467e08184f5e0417571abdae5840ba6c654dcead75a427de98a5 SHA512 3514545ad2a1174b89e9d3ee619842798a4896a96dc0e07df935782c6e7b41c9903998841303d26612dd2b029d24447307507b62551bd2d51c59177f4ce87ab7 WHIRLPOOL c05bd1a93e7003d23ef04c5f9bee4d5548195c2e5718888daef4ad227505b65298f47f8afed583bd7d516e3784ac38d4dc44dd90f7e9fa3b60fcee6e4036a587
 MISC ChangeLog-2015 10247 SHA256 c53f03b1d685e03e34cbe75c424f5b2c982c77e7ff59d9963b7bb363c41b7d33 SHA512 9091a021526d4b6f034b82d309fdb2c837783ac6550353b6754c86f1c4edfe01799ea7f3839fca767f86e13839be33dff6a598d6c1da07ea5634432e83fb8bb7 WHIRLPOOL 7f4711114b668e68556bf0f75a4c22e2bc6bb9b6bd2808425dddfda91a18d03923ab65c273c9d42a1b9869e476900f3314bded030fa8fb9e043289c31578feba
 MISC metadata.xml 317 SHA256 d809dd6e7207b0d0432461532bc72bb8dcdf6f549ba46bbda5ec1426c7101009 SHA512 551ce283639086916b90d0e0da81e66946c957e946c333fd4b11d482e57483e6adfe5145417e37bc7bb7ee47da60b645e34271e82ffe86cb05e22f65da348df9 WHIRLPOOL ebb8dda65b56a193596b84641ef2d9bb1f2af6b33d452d2b3498b34499e9b2dbaa1fc9a225e8b16f156559569c0c09089a50a5fc93d58be3bd220a0b3d009fc1
diff --git a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20170204-r1.ebuild b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20170204-r1.ebuild
index cb0ede86fd25..e5e8a067939d 100644
--- a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20170204-r2.ebuild b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20170204-r2.ebuild
index 1aeed8f638c6..7ccc7d516bc1 100644
--- a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20170204-r3.ebuild b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20170204-r3.ebuild
index 1aeed8f638c6..7ccc7d516bc1 100644
--- a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20170204-r4.ebuild b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20170204-r4.ebuild
index 1aeed8f638c6..7ccc7d516bc1 100644
--- a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20170805-r2.ebuild b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20170805-r2.ebuild
index 1aeed8f638c6..7ccc7d516bc1 100644
--- a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20170805-r3.ebuild b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..e5e8a067939d
--- /dev/null
+++ b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20170805-r3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-bitlbee/selinux-bitlbee-9999.ebuild b/sec-policy/selinux-bitlbee/selinux-bitlbee-9999.ebuild
index cb0ede86fd25..e5e8a067939d 100644
--- a/sec-policy/selinux-bitlbee/selinux-bitlbee-9999.ebuild
+++ b/sec-policy/selinux-bitlbee/selinux-bitlbee-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-bluetooth/Manifest b/sec-policy/selinux-bluetooth/Manifest
index a4766b2879ec..2becb9bdffe9 100644
--- a/sec-policy/selinux-bluetooth/Manifest
+++ b/sec-policy/selinux-bluetooth/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-bluetooth-2.20170204-r1.ebuild 289 SHA256 fbf4aa6d6574a7a256c031eec8730b5016d8aafcaf7d4b439eed93b488e07bae SHA512 9110795d8c29e16c9ea8435dd778f427debe58579066c2334564c5b1a39f83834aa92521cff9b6b44913353ec0208165c249ea059a7d64a8d3f83880b7b929f6 WHIRLPOOL 8896fa0abfbe6ab0e8fe6597022da110a3e771ed8541a039fe3a3c71112440ed0dc840f0777e99cb809100cffe4e040db6c17ab12a088026a38283d01ecdb1ca
-EBUILD selinux-bluetooth-2.20170204-r2.ebuild 287 SHA256 7b81a6a71447d5d77573f782a1558b402672e23a9cf2297149b15335ce5707fb SHA512 f27991c29bd6785ff8dff56e55ac0da961dd842491989582377278642fb70687f96e844d9b40cc0db1b552fff9d7cd3f62ee95ed60477578d1e9b213b304b9f7 WHIRLPOOL d5ea2607164aa2db73f679d2840ee4273ae0db33185b33404f2c9bab166b40970180c5db05dcca6ab74f8b90386a274a7c5f50038eafd76724fc0c8d452d211b
-EBUILD selinux-bluetooth-2.20170204-r3.ebuild 287 SHA256 7b81a6a71447d5d77573f782a1558b402672e23a9cf2297149b15335ce5707fb SHA512 f27991c29bd6785ff8dff56e55ac0da961dd842491989582377278642fb70687f96e844d9b40cc0db1b552fff9d7cd3f62ee95ed60477578d1e9b213b304b9f7 WHIRLPOOL d5ea2607164aa2db73f679d2840ee4273ae0db33185b33404f2c9bab166b40970180c5db05dcca6ab74f8b90386a274a7c5f50038eafd76724fc0c8d452d211b
-EBUILD selinux-bluetooth-2.20170204-r4.ebuild 287 SHA256 7b81a6a71447d5d77573f782a1558b402672e23a9cf2297149b15335ce5707fb SHA512 f27991c29bd6785ff8dff56e55ac0da961dd842491989582377278642fb70687f96e844d9b40cc0db1b552fff9d7cd3f62ee95ed60477578d1e9b213b304b9f7 WHIRLPOOL d5ea2607164aa2db73f679d2840ee4273ae0db33185b33404f2c9bab166b40970180c5db05dcca6ab74f8b90386a274a7c5f50038eafd76724fc0c8d452d211b
-EBUILD selinux-bluetooth-2.20170805-r2.ebuild 287 SHA256 7b81a6a71447d5d77573f782a1558b402672e23a9cf2297149b15335ce5707fb SHA512 f27991c29bd6785ff8dff56e55ac0da961dd842491989582377278642fb70687f96e844d9b40cc0db1b552fff9d7cd3f62ee95ed60477578d1e9b213b304b9f7 WHIRLPOOL d5ea2607164aa2db73f679d2840ee4273ae0db33185b33404f2c9bab166b40970180c5db05dcca6ab74f8b90386a274a7c5f50038eafd76724fc0c8d452d211b
-EBUILD selinux-bluetooth-9999.ebuild 289 SHA256 fbf4aa6d6574a7a256c031eec8730b5016d8aafcaf7d4b439eed93b488e07bae SHA512 9110795d8c29e16c9ea8435dd778f427debe58579066c2334564c5b1a39f83834aa92521cff9b6b44913353ec0208165c249ea059a7d64a8d3f83880b7b929f6 WHIRLPOOL 8896fa0abfbe6ab0e8fe6597022da110a3e771ed8541a039fe3a3c71112440ed0dc840f0777e99cb809100cffe4e040db6c17ab12a088026a38283d01ecdb1ca
+EBUILD selinux-bluetooth-2.20170204-r1.ebuild 290 SHA256 82f86931f6d7019c30e0e91fc44542137660dddb55b82217ae8db312a6ed2d7d SHA512 1660976a4a77219d76e9ca55b6bcc7074d5a97b1abcb18232bf335bbeab39a60f19852216b1e8dd6f8483503d8dbffafe2e509bc8564c7f7a0daf79de341ed7a WHIRLPOOL 16150fff443f2aeacb0bdc41e2ea77c5d512108db9bc31d111e01966567bdaccf738c3ae04909a8c2debd4a9cd43daba36a73a2eeb5477ae1d86af41ad991ec6
+EBUILD selinux-bluetooth-2.20170204-r2.ebuild 288 SHA256 63ccff6ee4a75737358a101c7193d36a644676b35dad331720c55ba55265e9be SHA512 aceda81c8802289b6e34f86d342c26f5b8d36cf2fdd713c1d9571c0631dd961fa0f605ecbeebe3fb6b17ad90906d7d6170c1d18b16945214f8ea4aef41ef21bb WHIRLPOOL dad61fd65deae03c5078b82f876b67701d54e0fbd20b5fe2d3eb16179dd38869e8d57dcc8cb79c6e864d49564553394cb814b2948b002757b5ad18ae33a3f57c
+EBUILD selinux-bluetooth-2.20170204-r3.ebuild 288 SHA256 63ccff6ee4a75737358a101c7193d36a644676b35dad331720c55ba55265e9be SHA512 aceda81c8802289b6e34f86d342c26f5b8d36cf2fdd713c1d9571c0631dd961fa0f605ecbeebe3fb6b17ad90906d7d6170c1d18b16945214f8ea4aef41ef21bb WHIRLPOOL dad61fd65deae03c5078b82f876b67701d54e0fbd20b5fe2d3eb16179dd38869e8d57dcc8cb79c6e864d49564553394cb814b2948b002757b5ad18ae33a3f57c
+EBUILD selinux-bluetooth-2.20170204-r4.ebuild 288 SHA256 63ccff6ee4a75737358a101c7193d36a644676b35dad331720c55ba55265e9be SHA512 aceda81c8802289b6e34f86d342c26f5b8d36cf2fdd713c1d9571c0631dd961fa0f605ecbeebe3fb6b17ad90906d7d6170c1d18b16945214f8ea4aef41ef21bb WHIRLPOOL dad61fd65deae03c5078b82f876b67701d54e0fbd20b5fe2d3eb16179dd38869e8d57dcc8cb79c6e864d49564553394cb814b2948b002757b5ad18ae33a3f57c
+EBUILD selinux-bluetooth-2.20170805-r2.ebuild 288 SHA256 63ccff6ee4a75737358a101c7193d36a644676b35dad331720c55ba55265e9be SHA512 aceda81c8802289b6e34f86d342c26f5b8d36cf2fdd713c1d9571c0631dd961fa0f605ecbeebe3fb6b17ad90906d7d6170c1d18b16945214f8ea4aef41ef21bb WHIRLPOOL dad61fd65deae03c5078b82f876b67701d54e0fbd20b5fe2d3eb16179dd38869e8d57dcc8cb79c6e864d49564553394cb814b2948b002757b5ad18ae33a3f57c
+EBUILD selinux-bluetooth-2.20170805-r3.ebuild 290 SHA256 82f86931f6d7019c30e0e91fc44542137660dddb55b82217ae8db312a6ed2d7d SHA512 1660976a4a77219d76e9ca55b6bcc7074d5a97b1abcb18232bf335bbeab39a60f19852216b1e8dd6f8483503d8dbffafe2e509bc8564c7f7a0daf79de341ed7a WHIRLPOOL 16150fff443f2aeacb0bdc41e2ea77c5d512108db9bc31d111e01966567bdaccf738c3ae04909a8c2debd4a9cd43daba36a73a2eeb5477ae1d86af41ad991ec6
+EBUILD selinux-bluetooth-9999.ebuild 290 SHA256 82f86931f6d7019c30e0e91fc44542137660dddb55b82217ae8db312a6ed2d7d SHA512 1660976a4a77219d76e9ca55b6bcc7074d5a97b1abcb18232bf335bbeab39a60f19852216b1e8dd6f8483503d8dbffafe2e509bc8564c7f7a0daf79de341ed7a WHIRLPOOL 16150fff443f2aeacb0bdc41e2ea77c5d512108db9bc31d111e01966567bdaccf738c3ae04909a8c2debd4a9cd43daba36a73a2eeb5477ae1d86af41ad991ec6
 MISC ChangeLog 10887 SHA256 08ba31f30b3ef207a9a010aa0503168c257bcc2916910504f1e13f5a95ad23a6 SHA512 9cb6c009df1136d6dacc451a2b26c2e67a4d804bb27aa3a9898375e85ab807335e4d95fffa33e65dc766247000a12572ac959dfa7c6ba975855ce97cba83a588 WHIRLPOOL 42a1bdc9b868b5a041bf4e38af644db3088c197d70e68bae9a0bf9b15bae787a39f92ccf7e23f96d90b5275a3dc3012b570e5fb74f08355901cbb4dd91a41c16
 MISC ChangeLog-2015 10375 SHA256 917c38ba74a6d9c43ef65e6e965ddef15670fc6fe852c1a166669bc25d6370e3 SHA512 ce2bbc79426afa7e4ba090abf243224273474a3dfc010bb52b8083c2fc35b7b742bcdc28bbc009750a935b794e1bb1ef4c2690b2c0272d84882d03c43c321d90 WHIRLPOOL 84df08ab10fcb8e9e7d9e2d24104d487f0e3cdbd80a7d95a097bbae6fb73c16fb654c001c44011f50a164ceac329ab1ba3c26627af9668840ad49a10659fa2e0
 MISC metadata.xml 319 SHA256 827b4639d869533be1e78fe08d2aed71627da1fedca8d874f8bcb1c2d6aa2509 SHA512 23cc2ad068f0758998957a4d8cfaa9f2ee39fbd8a7dee48834f6907611229e2d623f78b8f169eaf1cae6c66665d663d28d9072b98506947de8c6d84ca0398c0a WHIRLPOOL ea372d850cda30aabf0526961f67ccf4c07b9c3b41e76ce5cfd2593a6f9c5b2733cdc311048b367405120659bacdb322675a5c22016ec825c5a0fccbd0acd63d
diff --git a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20170204-r1.ebuild b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20170204-r1.ebuild
index af3363f3325c..a32d89d332ef 100644
--- a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20170204-r2.ebuild b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20170204-r2.ebuild
index 9e26f4069cb4..9a5acf93c291 100644
--- a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20170204-r3.ebuild b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20170204-r3.ebuild
index 9e26f4069cb4..9a5acf93c291 100644
--- a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20170204-r4.ebuild b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20170204-r4.ebuild
index 9e26f4069cb4..9a5acf93c291 100644
--- a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20170805-r2.ebuild b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20170805-r2.ebuild
index 9e26f4069cb4..9a5acf93c291 100644
--- a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20170805-r3.ebuild b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..a32d89d332ef
--- /dev/null
+++ b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-bluetooth/selinux-bluetooth-9999.ebuild b/sec-policy/selinux-bluetooth/selinux-bluetooth-9999.ebuild
index af3363f3325c..a32d89d332ef 100644
--- a/sec-policy/selinux-bluetooth/selinux-bluetooth-9999.ebuild
+++ b/sec-policy/selinux-bluetooth/selinux-bluetooth-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-brctl/Manifest b/sec-policy/selinux-brctl/Manifest
index e65a8f6e2ece..c336cc4681b7 100644
--- a/sec-policy/selinux-brctl/Manifest
+++ b/sec-policy/selinux-brctl/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-brctl-2.20170204-r1.ebuild 281 SHA256 ea8b6dc44109df8afa90a27c354b37036a6155a76baa7e24c9d2e7bf2e375b83 SHA512 b8540bc0c93206998d66d3ffe85974d3e46cb3fa7b086f4fd30a5e67c763a35fb031c4af483c33bbc11db5e74d8e3743053b30082a23bed1a7f665766c5a2c3e WHIRLPOOL 7f785ebfeb79ddd33432115e35e4631b2fa61e416c26f13c23bffff0c23cbd0c3c962b1dff9a5e5b53f5e286c9b9c8127125da5dcb8abd5d9297797cb6887630
-EBUILD selinux-brctl-2.20170204-r2.ebuild 279 SHA256 cd98a19d0f987e662b764836f18ca7a363ad4cffc697c7f10f59131a270b528f SHA512 42fc94a422dc67d01799429ffef94a2410093b6190c86f3a43f6dc40c42cdacb54c3a52d4a221fdbe5afe31b7ca021f583450edadd574877e27091d87d3b4d3f WHIRLPOOL 232ecdb4cd95dc083d4a6241e808c526f4ce55a943304fa704e7579131a1d871e0b692302083c901bb18c507e374afd2ff7d4f90872c520ca2c8edf0a4d5c5be
-EBUILD selinux-brctl-2.20170204-r3.ebuild 279 SHA256 cd98a19d0f987e662b764836f18ca7a363ad4cffc697c7f10f59131a270b528f SHA512 42fc94a422dc67d01799429ffef94a2410093b6190c86f3a43f6dc40c42cdacb54c3a52d4a221fdbe5afe31b7ca021f583450edadd574877e27091d87d3b4d3f WHIRLPOOL 232ecdb4cd95dc083d4a6241e808c526f4ce55a943304fa704e7579131a1d871e0b692302083c901bb18c507e374afd2ff7d4f90872c520ca2c8edf0a4d5c5be
-EBUILD selinux-brctl-2.20170204-r4.ebuild 279 SHA256 cd98a19d0f987e662b764836f18ca7a363ad4cffc697c7f10f59131a270b528f SHA512 42fc94a422dc67d01799429ffef94a2410093b6190c86f3a43f6dc40c42cdacb54c3a52d4a221fdbe5afe31b7ca021f583450edadd574877e27091d87d3b4d3f WHIRLPOOL 232ecdb4cd95dc083d4a6241e808c526f4ce55a943304fa704e7579131a1d871e0b692302083c901bb18c507e374afd2ff7d4f90872c520ca2c8edf0a4d5c5be
-EBUILD selinux-brctl-2.20170805-r2.ebuild 279 SHA256 cd98a19d0f987e662b764836f18ca7a363ad4cffc697c7f10f59131a270b528f SHA512 42fc94a422dc67d01799429ffef94a2410093b6190c86f3a43f6dc40c42cdacb54c3a52d4a221fdbe5afe31b7ca021f583450edadd574877e27091d87d3b4d3f WHIRLPOOL 232ecdb4cd95dc083d4a6241e808c526f4ce55a943304fa704e7579131a1d871e0b692302083c901bb18c507e374afd2ff7d4f90872c520ca2c8edf0a4d5c5be
-EBUILD selinux-brctl-9999.ebuild 281 SHA256 ea8b6dc44109df8afa90a27c354b37036a6155a76baa7e24c9d2e7bf2e375b83 SHA512 b8540bc0c93206998d66d3ffe85974d3e46cb3fa7b086f4fd30a5e67c763a35fb031c4af483c33bbc11db5e74d8e3743053b30082a23bed1a7f665766c5a2c3e WHIRLPOOL 7f785ebfeb79ddd33432115e35e4631b2fa61e416c26f13c23bffff0c23cbd0c3c962b1dff9a5e5b53f5e286c9b9c8127125da5dcb8abd5d9297797cb6887630
+EBUILD selinux-brctl-2.20170204-r1.ebuild 282 SHA256 8e5305070b201ea78b6f8f6f73d79b65108581200ec728972516e3493529451c SHA512 34232e7421d68bf8f5c87dcecf113316ff582ad01c701d771b393a630b1ec267eb8bfec5193ca06b7e8169d853cdce4923aadaa61170aa058d97c1c72aad5ed6 WHIRLPOOL 3945af5b4f60b6fe447b70d562a031f8e75fc471ba170446b055ea0561a6cae8b7090d40cfdc97ebdd3578212cd5c9dfb9c8641bc33dfe68725b444dd3c5ed2e
+EBUILD selinux-brctl-2.20170204-r2.ebuild 280 SHA256 1014964b4f8d7ea1251e676c8568cd2317545938bd232d07d9e7bf5293b1d30e SHA512 24ae0ddc85f833bf7d52e310befdf5a75a8869db07d224433963454ea9f65efa0336015898130a3072ae1471e67593120e63f43a77e0d0b0823c2ce8e85da1a0 WHIRLPOOL d5067b7a2d33caf47d41bc338b99df66aad4620a1accb24a0b8c01d97eaadd72afdcaea682fdf8657a78b2c326fe172d20b0ef103c75a3076c5083097a27dc57
+EBUILD selinux-brctl-2.20170204-r3.ebuild 280 SHA256 1014964b4f8d7ea1251e676c8568cd2317545938bd232d07d9e7bf5293b1d30e SHA512 24ae0ddc85f833bf7d52e310befdf5a75a8869db07d224433963454ea9f65efa0336015898130a3072ae1471e67593120e63f43a77e0d0b0823c2ce8e85da1a0 WHIRLPOOL d5067b7a2d33caf47d41bc338b99df66aad4620a1accb24a0b8c01d97eaadd72afdcaea682fdf8657a78b2c326fe172d20b0ef103c75a3076c5083097a27dc57
+EBUILD selinux-brctl-2.20170204-r4.ebuild 280 SHA256 1014964b4f8d7ea1251e676c8568cd2317545938bd232d07d9e7bf5293b1d30e SHA512 24ae0ddc85f833bf7d52e310befdf5a75a8869db07d224433963454ea9f65efa0336015898130a3072ae1471e67593120e63f43a77e0d0b0823c2ce8e85da1a0 WHIRLPOOL d5067b7a2d33caf47d41bc338b99df66aad4620a1accb24a0b8c01d97eaadd72afdcaea682fdf8657a78b2c326fe172d20b0ef103c75a3076c5083097a27dc57
+EBUILD selinux-brctl-2.20170805-r2.ebuild 280 SHA256 1014964b4f8d7ea1251e676c8568cd2317545938bd232d07d9e7bf5293b1d30e SHA512 24ae0ddc85f833bf7d52e310befdf5a75a8869db07d224433963454ea9f65efa0336015898130a3072ae1471e67593120e63f43a77e0d0b0823c2ce8e85da1a0 WHIRLPOOL d5067b7a2d33caf47d41bc338b99df66aad4620a1accb24a0b8c01d97eaadd72afdcaea682fdf8657a78b2c326fe172d20b0ef103c75a3076c5083097a27dc57
+EBUILD selinux-brctl-2.20170805-r3.ebuild 282 SHA256 8e5305070b201ea78b6f8f6f73d79b65108581200ec728972516e3493529451c SHA512 34232e7421d68bf8f5c87dcecf113316ff582ad01c701d771b393a630b1ec267eb8bfec5193ca06b7e8169d853cdce4923aadaa61170aa058d97c1c72aad5ed6 WHIRLPOOL 3945af5b4f60b6fe447b70d562a031f8e75fc471ba170446b055ea0561a6cae8b7090d40cfdc97ebdd3578212cd5c9dfb9c8641bc33dfe68725b444dd3c5ed2e
+EBUILD selinux-brctl-9999.ebuild 282 SHA256 8e5305070b201ea78b6f8f6f73d79b65108581200ec728972516e3493529451c SHA512 34232e7421d68bf8f5c87dcecf113316ff582ad01c701d771b393a630b1ec267eb8bfec5193ca06b7e8169d853cdce4923aadaa61170aa058d97c1c72aad5ed6 WHIRLPOOL 3945af5b4f60b6fe447b70d562a031f8e75fc471ba170446b055ea0561a6cae8b7090d40cfdc97ebdd3578212cd5c9dfb9c8641bc33dfe68725b444dd3c5ed2e
 MISC ChangeLog 10479 SHA256 f18c48b85078458612c0009bf3c1940871b9e41db5e54bd6e70ba6fc35fdc93b SHA512 07152c534e9408c52610086d9f6f0b5682de01bd2758d8960a16b555e3aa696309135977998c105c0c32752268ce75279f61595f91ba61b2ee69371f3957ac9b WHIRLPOOL 1282774b329b4e72debc02169df0010aed6db58ed6979021da1b7a4932064ff69f92b057b2f5eccbfa074aef549ec3a2e7f1fd2b0ae89e7af407b247fe496fde
 MISC ChangeLog-2015 9745 SHA256 15cf7a66ef1f633442a2ae5188ef7aea2cd6fd7e969528921e15fa527ce7b37e SHA512 ccfeed4df96fe92ae1e55cf0f8c90f16cbb61cf5d7e792647037c27e479c5ac73d5d68ff4a6e4042f8be2d465bfd1777b1f90288ec556e689146bcbf67395e84 WHIRLPOOL 84cdc11899de7d6cd25e1a3f132f8ebb1ee96eb7e473d56f525a0c037f827f4d5a66d21cea33aa4e6fa85ccf151f46cd3606e0a1388dee1259f955a36bef7298
 MISC metadata.xml 315 SHA256 e61ad18e6889937d2a140b4f39d502412507994f28aef8dc666063dc6cb9b528 SHA512 23d754daa42126bda3f13dca1fc91726bf4562978ce88efacaefe003b19365c97356b716db8a53a12f99b119fbfd890dbe9d6d782e63cee9722c61cb047f65f6 WHIRLPOOL 70f39925f438a1923003badd20505d60dcd98d470bb89495aadffd655315a036dc14216b973cc36a8789e25e57ec57548b80cf0d1610fbff93a358df946c8d52
diff --git a/sec-policy/selinux-brctl/selinux-brctl-2.20170204-r1.ebuild b/sec-policy/selinux-brctl/selinux-brctl-2.20170204-r1.ebuild
index 590e6c4830ad..65ee67a2614d 100644
--- a/sec-policy/selinux-brctl/selinux-brctl-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-brctl/selinux-brctl-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-brctl/selinux-brctl-2.20170204-r2.ebuild b/sec-policy/selinux-brctl/selinux-brctl-2.20170204-r2.ebuild
index e343ee23a14f..794feb3c8c3d 100644
--- a/sec-policy/selinux-brctl/selinux-brctl-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-brctl/selinux-brctl-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-brctl/selinux-brctl-2.20170204-r3.ebuild b/sec-policy/selinux-brctl/selinux-brctl-2.20170204-r3.ebuild
index e343ee23a14f..794feb3c8c3d 100644
--- a/sec-policy/selinux-brctl/selinux-brctl-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-brctl/selinux-brctl-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-brctl/selinux-brctl-2.20170204-r4.ebuild b/sec-policy/selinux-brctl/selinux-brctl-2.20170204-r4.ebuild
index e343ee23a14f..794feb3c8c3d 100644
--- a/sec-policy/selinux-brctl/selinux-brctl-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-brctl/selinux-brctl-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-brctl/selinux-brctl-2.20170805-r2.ebuild b/sec-policy/selinux-brctl/selinux-brctl-2.20170805-r2.ebuild
index e343ee23a14f..794feb3c8c3d 100644
--- a/sec-policy/selinux-brctl/selinux-brctl-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-brctl/selinux-brctl-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-brctl/selinux-brctl-2.20170805-r3.ebuild b/sec-policy/selinux-brctl/selinux-brctl-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..65ee67a2614d
--- /dev/null
+++ b/sec-policy/selinux-brctl/selinux-brctl-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-brctl/selinux-brctl-9999.ebuild b/sec-policy/selinux-brctl/selinux-brctl-9999.ebuild
index 590e6c4830ad..65ee67a2614d 100644
--- a/sec-policy/selinux-brctl/selinux-brctl-9999.ebuild
+++ b/sec-policy/selinux-brctl/selinux-brctl-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cachefilesd/Manifest b/sec-policy/selinux-cachefilesd/Manifest
index 95a46594d83b..8bc3ad7ecaf3 100644
--- a/sec-policy/selinux-cachefilesd/Manifest
+++ b/sec-policy/selinux-cachefilesd/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-cachefilesd-2.20170204-r1.ebuild 293 SHA256 dc1a3c4d35a61a3bb51b461a9a844e499ba62f98f7115e066b2c9c0f033d6c1e SHA512 b884b680e482ea264d7dee79b0ea77d803cf7ac086862cda44b21f83880ed679acbc643df2073c4fb24f7ee24ff445ab9d768d3777e83f4f69e17a1f67308c24 WHIRLPOOL 392e7f5920b6ff9b529fd98d4c94fcb94a5eca665f9338873e96d818b4ecda30bea54086ed00ce4b069601438f057da2cbca0029f51e5213abae8f9f781f3080
-EBUILD selinux-cachefilesd-2.20170204-r2.ebuild 291 SHA256 4034f80ad79288c18b2f85785875db6799ca6e394951085db9ee1214c00b54db SHA512 c67eed2036cbacc79cacc9a0cdad60536150291576876dfe5bdaa321f8748a5ec749fd10eff6961db44f278ba11a7745b29c96188a2cd5049b64c50aac40986a WHIRLPOOL ac9d1043d83a1b29474bf9aebcd99305df66580a7c532767003ffafa8e9df80a5a28fabd64e8867be95828f52f7106da214108a89e501fe45ca638200d8863a4
-EBUILD selinux-cachefilesd-2.20170204-r3.ebuild 291 SHA256 4034f80ad79288c18b2f85785875db6799ca6e394951085db9ee1214c00b54db SHA512 c67eed2036cbacc79cacc9a0cdad60536150291576876dfe5bdaa321f8748a5ec749fd10eff6961db44f278ba11a7745b29c96188a2cd5049b64c50aac40986a WHIRLPOOL ac9d1043d83a1b29474bf9aebcd99305df66580a7c532767003ffafa8e9df80a5a28fabd64e8867be95828f52f7106da214108a89e501fe45ca638200d8863a4
-EBUILD selinux-cachefilesd-2.20170204-r4.ebuild 291 SHA256 4034f80ad79288c18b2f85785875db6799ca6e394951085db9ee1214c00b54db SHA512 c67eed2036cbacc79cacc9a0cdad60536150291576876dfe5bdaa321f8748a5ec749fd10eff6961db44f278ba11a7745b29c96188a2cd5049b64c50aac40986a WHIRLPOOL ac9d1043d83a1b29474bf9aebcd99305df66580a7c532767003ffafa8e9df80a5a28fabd64e8867be95828f52f7106da214108a89e501fe45ca638200d8863a4
-EBUILD selinux-cachefilesd-2.20170805-r2.ebuild 291 SHA256 4034f80ad79288c18b2f85785875db6799ca6e394951085db9ee1214c00b54db SHA512 c67eed2036cbacc79cacc9a0cdad60536150291576876dfe5bdaa321f8748a5ec749fd10eff6961db44f278ba11a7745b29c96188a2cd5049b64c50aac40986a WHIRLPOOL ac9d1043d83a1b29474bf9aebcd99305df66580a7c532767003ffafa8e9df80a5a28fabd64e8867be95828f52f7106da214108a89e501fe45ca638200d8863a4
-EBUILD selinux-cachefilesd-9999.ebuild 293 SHA256 dc1a3c4d35a61a3bb51b461a9a844e499ba62f98f7115e066b2c9c0f033d6c1e SHA512 b884b680e482ea264d7dee79b0ea77d803cf7ac086862cda44b21f83880ed679acbc643df2073c4fb24f7ee24ff445ab9d768d3777e83f4f69e17a1f67308c24 WHIRLPOOL 392e7f5920b6ff9b529fd98d4c94fcb94a5eca665f9338873e96d818b4ecda30bea54086ed00ce4b069601438f057da2cbca0029f51e5213abae8f9f781f3080
+EBUILD selinux-cachefilesd-2.20170204-r1.ebuild 294 SHA256 c59f182004eafee0ea028fb1b3d8952c0228145aaeae2f9ce7fdd036d29d6b08 SHA512 02229a442a31e2d61fa068dbd33e68e7b171cab470d29e983a5697d99c750bc78c41dde8d9c80bea83704423c9ecf7cfc03c297ab03af4158b355b7ba9b381ab WHIRLPOOL 1655cbc9fdbfc4b2a1414e40f46fa540d5a91cfc8cacf4afa4ccb88b9e2dfe46fb68a1101f86f0396ce68e5d814ffa5ce291a710a611b0e7ff9b2abf714ae142
+EBUILD selinux-cachefilesd-2.20170204-r2.ebuild 292 SHA256 2fb1dc91b3b18955b21e62955bbab55a715a78d3be406f839fc218effa46a223 SHA512 3ad9418f3c042837b83f85c23fbae8b157aa130d3d08f585a4dc971f5f6fc0a9bc43e63de4a410e0f1c0e84dc12ac0952a5b0408ad59d0a854ad242a3056bc3e WHIRLPOOL bc61fd8d4fe12dd1c0d2dafb2c544a80b390500a15c18a713bc77a85d73470f53322d824f2da4303f8cd1e86ac3f0fe31df5f677b742c6e5eafac610379fde97
+EBUILD selinux-cachefilesd-2.20170204-r3.ebuild 292 SHA256 2fb1dc91b3b18955b21e62955bbab55a715a78d3be406f839fc218effa46a223 SHA512 3ad9418f3c042837b83f85c23fbae8b157aa130d3d08f585a4dc971f5f6fc0a9bc43e63de4a410e0f1c0e84dc12ac0952a5b0408ad59d0a854ad242a3056bc3e WHIRLPOOL bc61fd8d4fe12dd1c0d2dafb2c544a80b390500a15c18a713bc77a85d73470f53322d824f2da4303f8cd1e86ac3f0fe31df5f677b742c6e5eafac610379fde97
+EBUILD selinux-cachefilesd-2.20170204-r4.ebuild 292 SHA256 2fb1dc91b3b18955b21e62955bbab55a715a78d3be406f839fc218effa46a223 SHA512 3ad9418f3c042837b83f85c23fbae8b157aa130d3d08f585a4dc971f5f6fc0a9bc43e63de4a410e0f1c0e84dc12ac0952a5b0408ad59d0a854ad242a3056bc3e WHIRLPOOL bc61fd8d4fe12dd1c0d2dafb2c544a80b390500a15c18a713bc77a85d73470f53322d824f2da4303f8cd1e86ac3f0fe31df5f677b742c6e5eafac610379fde97
+EBUILD selinux-cachefilesd-2.20170805-r2.ebuild 292 SHA256 2fb1dc91b3b18955b21e62955bbab55a715a78d3be406f839fc218effa46a223 SHA512 3ad9418f3c042837b83f85c23fbae8b157aa130d3d08f585a4dc971f5f6fc0a9bc43e63de4a410e0f1c0e84dc12ac0952a5b0408ad59d0a854ad242a3056bc3e WHIRLPOOL bc61fd8d4fe12dd1c0d2dafb2c544a80b390500a15c18a713bc77a85d73470f53322d824f2da4303f8cd1e86ac3f0fe31df5f677b742c6e5eafac610379fde97
+EBUILD selinux-cachefilesd-2.20170805-r3.ebuild 294 SHA256 c59f182004eafee0ea028fb1b3d8952c0228145aaeae2f9ce7fdd036d29d6b08 SHA512 02229a442a31e2d61fa068dbd33e68e7b171cab470d29e983a5697d99c750bc78c41dde8d9c80bea83704423c9ecf7cfc03c297ab03af4158b355b7ba9b381ab WHIRLPOOL 1655cbc9fdbfc4b2a1414e40f46fa540d5a91cfc8cacf4afa4ccb88b9e2dfe46fb68a1101f86f0396ce68e5d814ffa5ce291a710a611b0e7ff9b2abf714ae142
+EBUILD selinux-cachefilesd-9999.ebuild 294 SHA256 c59f182004eafee0ea028fb1b3d8952c0228145aaeae2f9ce7fdd036d29d6b08 SHA512 02229a442a31e2d61fa068dbd33e68e7b171cab470d29e983a5697d99c750bc78c41dde8d9c80bea83704423c9ecf7cfc03c297ab03af4158b355b7ba9b381ab WHIRLPOOL 1655cbc9fdbfc4b2a1414e40f46fa540d5a91cfc8cacf4afa4ccb88b9e2dfe46fb68a1101f86f0396ce68e5d814ffa5ce291a710a611b0e7ff9b2abf714ae142
 MISC ChangeLog 11071 SHA256 136afbfd359b6d2b5c4bafaa6979c26dd374243cedc2f0116ffe458f8f122b74 SHA512 7234f518361abcaa561c1433db9c6b3fa355d54d7c38ebd2989408207b87814216e6f239cf90f8be807af55f58e54143580edc11cdebbf55e5385a580a58843c WHIRLPOOL 0bdc72a462f1c704e2501d4b33d32f0baae9c83b5636af10259ff3ffc15b6c5ed4e465417cd15f0acc365a71448d8b6fc6e9f4cb9af2e1e7d976e1c311325a6f
 MISC ChangeLog-2015 5449 SHA256 35860e4571f397c0a3f8a22ab5b34b7018c0ff2de16411e916e872aef760200d SHA512 79430ab7c2d8f778eea4a133df72c3127cd0dc87243ecb2e97044242a3d936541fbec3de35142483ee9783d1afa08e3710f58512a0e928e170d994349879c33f WHIRLPOOL df13daf41b67214a9c28142b2c01d9d48389499ec36eb463d9ebe533708d972c0f7695349d6d4ead38dda767b54e1543256feb8e95c4793a8a3435b950b1c91f
 MISC metadata.xml 321 SHA256 da80202587c83a516c8dbc7e0de03d84d8de86b0f77db93064ce3a94d7ccdef7 SHA512 16b6e111c04de229332ccf3c692d634e1f0fd1d832495e580bd0c5371b220fb07aed2c3ce2391c775b839902099d6bc342d3e190b70ae1ac3f07fdf93fb67077 WHIRLPOOL f4fe1d1a02c95a964b786012cb3eab1d3321d2f60e57074e89b7b122ad89840d54cf0679e0f9890c4b131d3b8ccd6c26882e6c84ed39c3c38947c35be6b90b09
diff --git a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20170204-r1.ebuild b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20170204-r1.ebuild
index 0af6648c5153..165217dc1f47 100644
--- a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20170204-r2.ebuild b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20170204-r2.ebuild
index db4291353af9..b1a424794c25 100644
--- a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20170204-r3.ebuild b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20170204-r3.ebuild
index db4291353af9..b1a424794c25 100644
--- a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20170204-r4.ebuild b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20170204-r4.ebuild
index db4291353af9..b1a424794c25 100644
--- a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20170805-r2.ebuild b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20170805-r2.ebuild
index db4291353af9..b1a424794c25 100644
--- a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20170805-r3.ebuild b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..165217dc1f47
--- /dev/null
+++ b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-cachefilesd/selinux-cachefilesd-9999.ebuild b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-9999.ebuild
index 0af6648c5153..165217dc1f47 100644
--- a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-9999.ebuild
+++ b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-calamaris/Manifest b/sec-policy/selinux-calamaris/Manifest
index e7d3787c1b9c..9e40f9bde2b5 100644
--- a/sec-policy/selinux-calamaris/Manifest
+++ b/sec-policy/selinux-calamaris/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-calamaris-2.20170204-r1.ebuild 289 SHA256 a6c6cb3c5d23d02679d7fc5b1db0abe1028e983e56456c06142b321b835264c7 SHA512 afd69e612825611f0c30cf052a27bd0468ad700b7a753e22153e951b3c27934e9a55bce8df0eddfe47da6cf0d0eb1b64b03025c8dbec694e431a94dbdcde5885 WHIRLPOOL 535e38157c84046ee1975bb8968941c655184f66328ed404722e6eed9d92dc280e7f64fd5ac7b00a779bb76ee35a6edbc79bed48fd13faa273ba38964af3fa9a
-EBUILD selinux-calamaris-2.20170204-r2.ebuild 287 SHA256 024b1478f817b40419c1ef2695420d22da028d159ecb672e8c3cc09a7a27582f SHA512 a38c08bcf2ddc9b13e68f494f11cb17af9d8e2f90d9c842449bf7a252508fcc9bb2674333ecb8da7a7bdf54f37780117802803ecd4abc96e18144aef327c0fdb WHIRLPOOL 72f59dadbeb36fb735c88ea8d13d6c2d02ecf9065214b086427dab7a39dfe62c2ae8afc10494102ca06de57690c3e61256d8ece04afebdc0d5c45cdcc590b9c9
-EBUILD selinux-calamaris-2.20170204-r3.ebuild 287 SHA256 024b1478f817b40419c1ef2695420d22da028d159ecb672e8c3cc09a7a27582f SHA512 a38c08bcf2ddc9b13e68f494f11cb17af9d8e2f90d9c842449bf7a252508fcc9bb2674333ecb8da7a7bdf54f37780117802803ecd4abc96e18144aef327c0fdb WHIRLPOOL 72f59dadbeb36fb735c88ea8d13d6c2d02ecf9065214b086427dab7a39dfe62c2ae8afc10494102ca06de57690c3e61256d8ece04afebdc0d5c45cdcc590b9c9
-EBUILD selinux-calamaris-2.20170204-r4.ebuild 287 SHA256 024b1478f817b40419c1ef2695420d22da028d159ecb672e8c3cc09a7a27582f SHA512 a38c08bcf2ddc9b13e68f494f11cb17af9d8e2f90d9c842449bf7a252508fcc9bb2674333ecb8da7a7bdf54f37780117802803ecd4abc96e18144aef327c0fdb WHIRLPOOL 72f59dadbeb36fb735c88ea8d13d6c2d02ecf9065214b086427dab7a39dfe62c2ae8afc10494102ca06de57690c3e61256d8ece04afebdc0d5c45cdcc590b9c9
-EBUILD selinux-calamaris-2.20170805-r2.ebuild 287 SHA256 024b1478f817b40419c1ef2695420d22da028d159ecb672e8c3cc09a7a27582f SHA512 a38c08bcf2ddc9b13e68f494f11cb17af9d8e2f90d9c842449bf7a252508fcc9bb2674333ecb8da7a7bdf54f37780117802803ecd4abc96e18144aef327c0fdb WHIRLPOOL 72f59dadbeb36fb735c88ea8d13d6c2d02ecf9065214b086427dab7a39dfe62c2ae8afc10494102ca06de57690c3e61256d8ece04afebdc0d5c45cdcc590b9c9
-EBUILD selinux-calamaris-9999.ebuild 289 SHA256 a6c6cb3c5d23d02679d7fc5b1db0abe1028e983e56456c06142b321b835264c7 SHA512 afd69e612825611f0c30cf052a27bd0468ad700b7a753e22153e951b3c27934e9a55bce8df0eddfe47da6cf0d0eb1b64b03025c8dbec694e431a94dbdcde5885 WHIRLPOOL 535e38157c84046ee1975bb8968941c655184f66328ed404722e6eed9d92dc280e7f64fd5ac7b00a779bb76ee35a6edbc79bed48fd13faa273ba38964af3fa9a
+EBUILD selinux-calamaris-2.20170204-r1.ebuild 290 SHA256 1c9b6c0b1b2c0da5da275c817d709a2424eee186e5671dc1d3d204e512e41598 SHA512 5fd542093da3e601c2ec603ee0b7a38ee6f13c9b2712641d00af7f9365935953953b699d08bfcccc83286060da4d2b1c35700ea2d402c962de7ee32956578f2a WHIRLPOOL d1a246d4859c18b3e287acec7c5b8c3139b13825825b134227f99dd27c49ea39e5fa81dcb0791a09a61460036df9410d62665e1e13f82f64b3417e56a06d68a5
+EBUILD selinux-calamaris-2.20170204-r2.ebuild 288 SHA256 1b11f1cd919c0168b6ee7ab64397f831e05ca663ce90c7881e322ff396f8ede7 SHA512 d6982b3122558254960aa40194dae45b6a42d1f6760bad4c3dcf30a0480646120f7aeb51029c711950a39a71674e426644bddc9c8aa6b53ec4fe28d1f666cd59 WHIRLPOOL 7200d405d0979fcb5b0113a2bcae90a5a860106020b6f97c882180c25d39b3e770b72f1c37ea273653aebdf7d41c4102c4f61e796708e15a17a7f7219b8f7380
+EBUILD selinux-calamaris-2.20170204-r3.ebuild 288 SHA256 1b11f1cd919c0168b6ee7ab64397f831e05ca663ce90c7881e322ff396f8ede7 SHA512 d6982b3122558254960aa40194dae45b6a42d1f6760bad4c3dcf30a0480646120f7aeb51029c711950a39a71674e426644bddc9c8aa6b53ec4fe28d1f666cd59 WHIRLPOOL 7200d405d0979fcb5b0113a2bcae90a5a860106020b6f97c882180c25d39b3e770b72f1c37ea273653aebdf7d41c4102c4f61e796708e15a17a7f7219b8f7380
+EBUILD selinux-calamaris-2.20170204-r4.ebuild 288 SHA256 1b11f1cd919c0168b6ee7ab64397f831e05ca663ce90c7881e322ff396f8ede7 SHA512 d6982b3122558254960aa40194dae45b6a42d1f6760bad4c3dcf30a0480646120f7aeb51029c711950a39a71674e426644bddc9c8aa6b53ec4fe28d1f666cd59 WHIRLPOOL 7200d405d0979fcb5b0113a2bcae90a5a860106020b6f97c882180c25d39b3e770b72f1c37ea273653aebdf7d41c4102c4f61e796708e15a17a7f7219b8f7380
+EBUILD selinux-calamaris-2.20170805-r2.ebuild 288 SHA256 1b11f1cd919c0168b6ee7ab64397f831e05ca663ce90c7881e322ff396f8ede7 SHA512 d6982b3122558254960aa40194dae45b6a42d1f6760bad4c3dcf30a0480646120f7aeb51029c711950a39a71674e426644bddc9c8aa6b53ec4fe28d1f666cd59 WHIRLPOOL 7200d405d0979fcb5b0113a2bcae90a5a860106020b6f97c882180c25d39b3e770b72f1c37ea273653aebdf7d41c4102c4f61e796708e15a17a7f7219b8f7380
+EBUILD selinux-calamaris-2.20170805-r3.ebuild 290 SHA256 1c9b6c0b1b2c0da5da275c817d709a2424eee186e5671dc1d3d204e512e41598 SHA512 5fd542093da3e601c2ec603ee0b7a38ee6f13c9b2712641d00af7f9365935953953b699d08bfcccc83286060da4d2b1c35700ea2d402c962de7ee32956578f2a WHIRLPOOL d1a246d4859c18b3e287acec7c5b8c3139b13825825b134227f99dd27c49ea39e5fa81dcb0791a09a61460036df9410d62665e1e13f82f64b3417e56a06d68a5
+EBUILD selinux-calamaris-9999.ebuild 290 SHA256 1c9b6c0b1b2c0da5da275c817d709a2424eee186e5671dc1d3d204e512e41598 SHA512 5fd542093da3e601c2ec603ee0b7a38ee6f13c9b2712641d00af7f9365935953953b699d08bfcccc83286060da4d2b1c35700ea2d402c962de7ee32956578f2a WHIRLPOOL d1a246d4859c18b3e287acec7c5b8c3139b13825825b134227f99dd27c49ea39e5fa81dcb0791a09a61460036df9410d62665e1e13f82f64b3417e56a06d68a5
 MISC ChangeLog 10887 SHA256 3dd231d2f0abca9fea592026ad3f65e0539dba30f36d8220de35757243017b46 SHA512 9600c0ee18d6ab30d0f5e58b25ee9e1d3e8efddefa1544f4cef6caf433965e793241b534603fb4cce4237ae34d6a704b88fc9b4065b1765ed3c43c72c2051368 WHIRLPOOL 7f889ad3bad24b996d0559c05dd535572410c4c255202182b9597ba7d568b9944e3cf89e6c053702192520e2e8048000b87f63fb838ceb684cecc149796c0097
 MISC ChangeLog-2015 10221 SHA256 e2699471a161466f634e52000d9ecbdf6b4bdc3b1399adaa15f1e2977797e9aa SHA512 4e2177cbb0215b764de69525cef18ff7c4eb966d84daaf22c49a4c801ebfc29c4cbcb21d4d5f530a08171eb385f8e9a2c968efe89cd11ae3ce33dc289cb764e4 WHIRLPOOL b97b2fcf0f324c0b8db1e83e27f6f7cd6e7972a2bc1cacd56ca6d8714bfda4affb0ae93c60fdcd6447e7e77fe8a0b078e5da4b334791113d2d3986d3150d1f0f
 MISC metadata.xml 319 SHA256 7b1ca7bc6c17d2fe83be62e0d4f52d1fdfa2d78c163609eea330e3bdaddb694d SHA512 edaf87737833fd3c1d0d956adb41875d96d4dbaa0f0c709c5ca8e7645e1eef616871d7e0b20b5cbd8cbbbe3710d5b694c5436cc0b30e21228fd2e3291d201ea1 WHIRLPOOL 0402fff6f31b7b68a4266f1352614bca2ec24140c533443aaa002bcc8c277bd489773f4cabd20ffe77ad9b6fad93110c854e47a6908e817bc01a1afdac8a056a
diff --git a/sec-policy/selinux-calamaris/selinux-calamaris-2.20170204-r1.ebuild b/sec-policy/selinux-calamaris/selinux-calamaris-2.20170204-r1.ebuild
index 1c0875a4a04e..01ab06cafe39 100644
--- a/sec-policy/selinux-calamaris/selinux-calamaris-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-calamaris/selinux-calamaris-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-calamaris/selinux-calamaris-2.20170204-r2.ebuild b/sec-policy/selinux-calamaris/selinux-calamaris-2.20170204-r2.ebuild
index 1547926c303f..1e304e912d33 100644
--- a/sec-policy/selinux-calamaris/selinux-calamaris-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-calamaris/selinux-calamaris-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-calamaris/selinux-calamaris-2.20170204-r3.ebuild b/sec-policy/selinux-calamaris/selinux-calamaris-2.20170204-r3.ebuild
index 1547926c303f..1e304e912d33 100644
--- a/sec-policy/selinux-calamaris/selinux-calamaris-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-calamaris/selinux-calamaris-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-calamaris/selinux-calamaris-2.20170204-r4.ebuild b/sec-policy/selinux-calamaris/selinux-calamaris-2.20170204-r4.ebuild
index 1547926c303f..1e304e912d33 100644
--- a/sec-policy/selinux-calamaris/selinux-calamaris-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-calamaris/selinux-calamaris-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-calamaris/selinux-calamaris-2.20170805-r2.ebuild b/sec-policy/selinux-calamaris/selinux-calamaris-2.20170805-r2.ebuild
index 1547926c303f..1e304e912d33 100644
--- a/sec-policy/selinux-calamaris/selinux-calamaris-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-calamaris/selinux-calamaris-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-calamaris/selinux-calamaris-2.20170805-r3.ebuild b/sec-policy/selinux-calamaris/selinux-calamaris-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..01ab06cafe39
--- /dev/null
+++ b/sec-policy/selinux-calamaris/selinux-calamaris-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-calamaris/selinux-calamaris-9999.ebuild b/sec-policy/selinux-calamaris/selinux-calamaris-9999.ebuild
index 1c0875a4a04e..01ab06cafe39 100644
--- a/sec-policy/selinux-calamaris/selinux-calamaris-9999.ebuild
+++ b/sec-policy/selinux-calamaris/selinux-calamaris-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-canna/Manifest b/sec-policy/selinux-canna/Manifest
index c517885ebec2..f822390c573b 100644
--- a/sec-policy/selinux-canna/Manifest
+++ b/sec-policy/selinux-canna/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-canna-2.20170204-r1.ebuild 281 SHA256 d3a0795acddef78cdcd6a01fc5a91e3e6b01d327cefd3fe4132a85fb723bde62 SHA512 7d0651dea4f0ee79849005e833cd26f32cbb9d9254446716fdc1e409d7ba60cc37f0b0b5456e8674c49818c4297fea8dfe85ecd6119dfe716b70794b57dd384f WHIRLPOOL 3e65cd69a81e9988745aa38a1b48b3938428461f815426e76e6f7201371459c4a3a4e4c999ad67f4ca9470f1b61d09770bc1d3c1eb0d42a524863c6d116c331c
-EBUILD selinux-canna-2.20170204-r2.ebuild 279 SHA256 4df5873ae283c1bcd8204c8ef7468646d9231be9aed751e3f7c0e3993ca73b79 SHA512 7cc4426b409be35ee7187759d6fc2386db782fffb341d2299c692a4cb5da3e443554b0554bc8d9ce03ed2947f76dca1c230882d5d604f444c21dedbafa4d12e1 WHIRLPOOL 94004deeba064ec2e06331d688154a25660ac3d1a326ca6ca080f42a8b47595b7b765696f99d7c8a7698382da9c2c2c5cebc857622b1e35b4f931a9732cf5b43
-EBUILD selinux-canna-2.20170204-r3.ebuild 279 SHA256 4df5873ae283c1bcd8204c8ef7468646d9231be9aed751e3f7c0e3993ca73b79 SHA512 7cc4426b409be35ee7187759d6fc2386db782fffb341d2299c692a4cb5da3e443554b0554bc8d9ce03ed2947f76dca1c230882d5d604f444c21dedbafa4d12e1 WHIRLPOOL 94004deeba064ec2e06331d688154a25660ac3d1a326ca6ca080f42a8b47595b7b765696f99d7c8a7698382da9c2c2c5cebc857622b1e35b4f931a9732cf5b43
-EBUILD selinux-canna-2.20170204-r4.ebuild 279 SHA256 4df5873ae283c1bcd8204c8ef7468646d9231be9aed751e3f7c0e3993ca73b79 SHA512 7cc4426b409be35ee7187759d6fc2386db782fffb341d2299c692a4cb5da3e443554b0554bc8d9ce03ed2947f76dca1c230882d5d604f444c21dedbafa4d12e1 WHIRLPOOL 94004deeba064ec2e06331d688154a25660ac3d1a326ca6ca080f42a8b47595b7b765696f99d7c8a7698382da9c2c2c5cebc857622b1e35b4f931a9732cf5b43
-EBUILD selinux-canna-2.20170805-r2.ebuild 279 SHA256 4df5873ae283c1bcd8204c8ef7468646d9231be9aed751e3f7c0e3993ca73b79 SHA512 7cc4426b409be35ee7187759d6fc2386db782fffb341d2299c692a4cb5da3e443554b0554bc8d9ce03ed2947f76dca1c230882d5d604f444c21dedbafa4d12e1 WHIRLPOOL 94004deeba064ec2e06331d688154a25660ac3d1a326ca6ca080f42a8b47595b7b765696f99d7c8a7698382da9c2c2c5cebc857622b1e35b4f931a9732cf5b43
-EBUILD selinux-canna-9999.ebuild 281 SHA256 d3a0795acddef78cdcd6a01fc5a91e3e6b01d327cefd3fe4132a85fb723bde62 SHA512 7d0651dea4f0ee79849005e833cd26f32cbb9d9254446716fdc1e409d7ba60cc37f0b0b5456e8674c49818c4297fea8dfe85ecd6119dfe716b70794b57dd384f WHIRLPOOL 3e65cd69a81e9988745aa38a1b48b3938428461f815426e76e6f7201371459c4a3a4e4c999ad67f4ca9470f1b61d09770bc1d3c1eb0d42a524863c6d116c331c
+EBUILD selinux-canna-2.20170204-r1.ebuild 282 SHA256 af479a7cecae85f6fff935cad67d8e3d336fa66f39941965a9da5e2c288bc8a8 SHA512 9212bab3d830a0c4bf5d7209176882dca0d22c335c6aa6f08ba521d94405853971ebe08bd27f245614401ecb7e04e073e0293ccf8157b6df3cddcc338df03f1c WHIRLPOOL 14ae98df917d37b9bba15d96861fd8be391a6a435497005c16c122d13e991dc34840534999b07db03bb1c899bdee77ec5af05db1314361912f3d0a8bb2d079e4
+EBUILD selinux-canna-2.20170204-r2.ebuild 280 SHA256 1aba3beae9afae589a96df30d598693852668821193de19ccb79f3d58a7265ce SHA512 77789ec8872f8e47ee1c1401a91dee93312b371740e95273beb730a22f83ac17af64e638d400c41d09d419a43413740416503f8a358de48a339fc4a6b8ea64d5 WHIRLPOOL 77dd40280d92b73b15539854bcb955ea7aa9567cd5873cfa2d7d854e608d2c106475a65443bc35851cbbecdd22d83045f36dd13d6c4eeb41f7b5d3e918decded
+EBUILD selinux-canna-2.20170204-r3.ebuild 280 SHA256 1aba3beae9afae589a96df30d598693852668821193de19ccb79f3d58a7265ce SHA512 77789ec8872f8e47ee1c1401a91dee93312b371740e95273beb730a22f83ac17af64e638d400c41d09d419a43413740416503f8a358de48a339fc4a6b8ea64d5 WHIRLPOOL 77dd40280d92b73b15539854bcb955ea7aa9567cd5873cfa2d7d854e608d2c106475a65443bc35851cbbecdd22d83045f36dd13d6c4eeb41f7b5d3e918decded
+EBUILD selinux-canna-2.20170204-r4.ebuild 280 SHA256 1aba3beae9afae589a96df30d598693852668821193de19ccb79f3d58a7265ce SHA512 77789ec8872f8e47ee1c1401a91dee93312b371740e95273beb730a22f83ac17af64e638d400c41d09d419a43413740416503f8a358de48a339fc4a6b8ea64d5 WHIRLPOOL 77dd40280d92b73b15539854bcb955ea7aa9567cd5873cfa2d7d854e608d2c106475a65443bc35851cbbecdd22d83045f36dd13d6c4eeb41f7b5d3e918decded
+EBUILD selinux-canna-2.20170805-r2.ebuild 280 SHA256 1aba3beae9afae589a96df30d598693852668821193de19ccb79f3d58a7265ce SHA512 77789ec8872f8e47ee1c1401a91dee93312b371740e95273beb730a22f83ac17af64e638d400c41d09d419a43413740416503f8a358de48a339fc4a6b8ea64d5 WHIRLPOOL 77dd40280d92b73b15539854bcb955ea7aa9567cd5873cfa2d7d854e608d2c106475a65443bc35851cbbecdd22d83045f36dd13d6c4eeb41f7b5d3e918decded
+EBUILD selinux-canna-2.20170805-r3.ebuild 282 SHA256 af479a7cecae85f6fff935cad67d8e3d336fa66f39941965a9da5e2c288bc8a8 SHA512 9212bab3d830a0c4bf5d7209176882dca0d22c335c6aa6f08ba521d94405853971ebe08bd27f245614401ecb7e04e073e0293ccf8157b6df3cddcc338df03f1c WHIRLPOOL 14ae98df917d37b9bba15d96861fd8be391a6a435497005c16c122d13e991dc34840534999b07db03bb1c899bdee77ec5af05db1314361912f3d0a8bb2d079e4
+EBUILD selinux-canna-9999.ebuild 282 SHA256 af479a7cecae85f6fff935cad67d8e3d336fa66f39941965a9da5e2c288bc8a8 SHA512 9212bab3d830a0c4bf5d7209176882dca0d22c335c6aa6f08ba521d94405853971ebe08bd27f245614401ecb7e04e073e0293ccf8157b6df3cddcc338df03f1c WHIRLPOOL 14ae98df917d37b9bba15d96861fd8be391a6a435497005c16c122d13e991dc34840534999b07db03bb1c899bdee77ec5af05db1314361912f3d0a8bb2d079e4
 MISC ChangeLog 10479 SHA256 1f5861e6db62c7b5d9ab75009bf9591c2ea0b64f76fe8eda6d0894db3cad8cff SHA512 15149f3695746a9e2a162b1a91f4c03092f348583c6320d3bc559556abe59a09d512c4c45fe34f4de7e18e1f3e0b8b19b0d8a4d48a5d9f52531750f5f2fa464a WHIRLPOOL 4e7a9cbf2bca8a699bcbad3e71f284e95c8f9ce3d328cb9c7e027429d9410445ffd2bdab32a9a2c70271a19450f910ca785ab6c776f012b57e3bc5c974ca1cfb
 MISC ChangeLog-2015 9749 SHA256 0c3df018d99fa15ffa583d2b1884801229b425bb3f51355f3f1432f205783db0 SHA512 043ee8a836117ed4e2f25bc7cad481b9f1c527824e788b1a1e032d0e2fd64313f2ee1d8a415042d26b1b4325051a9c759fa88965b9d896d5ae3d8d0662f394fe WHIRLPOOL 8feb66cbc084e4b2c7a4500d1b545039cfc116be871df3b159c8ac1acc51a45c28a54632f5a824346e2a31c45a977d74ac027662fe5a7802faac4627a56d46a2
 MISC metadata.xml 315 SHA256 9d123c2fdb5a7a60a8d329c21aad84f762fdd2bf90869b903e14a84e39fb10ee SHA512 e769ff18487231316820a744d1567208e4ed3d329e1eb7ddabdaece562292189ac0486732261c737339d40687019319baccc52ddfa2a99b2a75cde4a4b450ee9 WHIRLPOOL c7c0411cefbebb57a69e76a54cfc976caeb5262d106930050ffef24c585d3433cacf0686238dae00f58901092715fca2e49c39a23e81c6eb5f94af52ed61a7bd
diff --git a/sec-policy/selinux-canna/selinux-canna-2.20170204-r1.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20170204-r1.ebuild
index 7ab6dee0db17..82d4746419dd 100644
--- a/sec-policy/selinux-canna/selinux-canna-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-canna/selinux-canna-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-canna/selinux-canna-2.20170204-r2.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20170204-r2.ebuild
index 75f9da1a74fe..2c5275adcd00 100644
--- a/sec-policy/selinux-canna/selinux-canna-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-canna/selinux-canna-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-canna/selinux-canna-2.20170204-r3.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20170204-r3.ebuild
index 75f9da1a74fe..2c5275adcd00 100644
--- a/sec-policy/selinux-canna/selinux-canna-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-canna/selinux-canna-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-canna/selinux-canna-2.20170204-r4.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20170204-r4.ebuild
index 75f9da1a74fe..2c5275adcd00 100644
--- a/sec-policy/selinux-canna/selinux-canna-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-canna/selinux-canna-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-canna/selinux-canna-2.20170805-r2.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20170805-r2.ebuild
index 75f9da1a74fe..2c5275adcd00 100644
--- a/sec-policy/selinux-canna/selinux-canna-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-canna/selinux-canna-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-canna/selinux-canna-2.20170805-r3.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..82d4746419dd
--- /dev/null
+++ b/sec-policy/selinux-canna/selinux-canna-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-canna/selinux-canna-9999.ebuild b/sec-policy/selinux-canna/selinux-canna-9999.ebuild
index 7ab6dee0db17..82d4746419dd 100644
--- a/sec-policy/selinux-canna/selinux-canna-9999.ebuild
+++ b/sec-policy/selinux-canna/selinux-canna-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ccs/Manifest b/sec-policy/selinux-ccs/Manifest
index 9c153415745e..0ba0dd8f201e 100644
--- a/sec-policy/selinux-ccs/Manifest
+++ b/sec-policy/selinux-ccs/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-ccs-2.20170204-r1.ebuild 277 SHA256 8ee5cf2add2a3fceb10c122e401a6a10050e42a9300370cb0ad63b134e6feed1 SHA512 9ef146b81bf5620ba2a7b95fba008efcdfee93fb5faba530b87fbb44bead7225568a8a493fef369b8c56ee7ecf875634fa2d9a0581f2eb6604a92fc3cd24beab WHIRLPOOL a46374960c2b325d52e65d958ba658410982e6b5bf8d32b49e6914ea28e0e357176dad0b746d0eeac05e621b6b58c976ab4975428457795d7a19cd57cc23f334
-EBUILD selinux-ccs-2.20170204-r2.ebuild 275 SHA256 6814eb1ff1ee9e6601fd5c5abb111d05ce1e0c1e1b4868dffe6df1fba1b77fc8 SHA512 7597c6cbbde51260efb6b177e8d0b1cadfe6ea89d9b43d3038b78ab5d3b9e847ed51c29167bdbc66a4533aa1ccceda71c0f3568243a1c351c250fa8e56b75c43 WHIRLPOOL 9a95dbbfdeec8f56d053987b938ab0275dbc42e2212a0c0bbe86b23d376d4ff7cf5b6dd6df82870d3ae7bfbb4519ced5b86a52675ba0e010fbbf7fa2357c78f9
-EBUILD selinux-ccs-2.20170204-r3.ebuild 275 SHA256 6814eb1ff1ee9e6601fd5c5abb111d05ce1e0c1e1b4868dffe6df1fba1b77fc8 SHA512 7597c6cbbde51260efb6b177e8d0b1cadfe6ea89d9b43d3038b78ab5d3b9e847ed51c29167bdbc66a4533aa1ccceda71c0f3568243a1c351c250fa8e56b75c43 WHIRLPOOL 9a95dbbfdeec8f56d053987b938ab0275dbc42e2212a0c0bbe86b23d376d4ff7cf5b6dd6df82870d3ae7bfbb4519ced5b86a52675ba0e010fbbf7fa2357c78f9
-EBUILD selinux-ccs-2.20170204-r4.ebuild 275 SHA256 6814eb1ff1ee9e6601fd5c5abb111d05ce1e0c1e1b4868dffe6df1fba1b77fc8 SHA512 7597c6cbbde51260efb6b177e8d0b1cadfe6ea89d9b43d3038b78ab5d3b9e847ed51c29167bdbc66a4533aa1ccceda71c0f3568243a1c351c250fa8e56b75c43 WHIRLPOOL 9a95dbbfdeec8f56d053987b938ab0275dbc42e2212a0c0bbe86b23d376d4ff7cf5b6dd6df82870d3ae7bfbb4519ced5b86a52675ba0e010fbbf7fa2357c78f9
-EBUILD selinux-ccs-2.20170805-r2.ebuild 275 SHA256 6814eb1ff1ee9e6601fd5c5abb111d05ce1e0c1e1b4868dffe6df1fba1b77fc8 SHA512 7597c6cbbde51260efb6b177e8d0b1cadfe6ea89d9b43d3038b78ab5d3b9e847ed51c29167bdbc66a4533aa1ccceda71c0f3568243a1c351c250fa8e56b75c43 WHIRLPOOL 9a95dbbfdeec8f56d053987b938ab0275dbc42e2212a0c0bbe86b23d376d4ff7cf5b6dd6df82870d3ae7bfbb4519ced5b86a52675ba0e010fbbf7fa2357c78f9
-EBUILD selinux-ccs-9999.ebuild 277 SHA256 8ee5cf2add2a3fceb10c122e401a6a10050e42a9300370cb0ad63b134e6feed1 SHA512 9ef146b81bf5620ba2a7b95fba008efcdfee93fb5faba530b87fbb44bead7225568a8a493fef369b8c56ee7ecf875634fa2d9a0581f2eb6604a92fc3cd24beab WHIRLPOOL a46374960c2b325d52e65d958ba658410982e6b5bf8d32b49e6914ea28e0e357176dad0b746d0eeac05e621b6b58c976ab4975428457795d7a19cd57cc23f334
+EBUILD selinux-ccs-2.20170204-r1.ebuild 278 SHA256 bddc5464fa8432e3f8295c786e4ce365e8305d8168f47819778b9c929f2b93e2 SHA512 8e6bf6e263393257e88a758c5ba401fc3637b0345921daa44d09bac915c8ede3050f6d655dd84b66d5b587514b0f2b192c43aa90793055dea0dc0db78088d4cb WHIRLPOOL 68fdb67da8533e27a5a0e27fb0c4e4c17e8aa79970c25d8f7e6da055e75191c5a7b84874b95d0051b6708791e8a6e5ac777148273a3ce86d796c54de40c469b5
+EBUILD selinux-ccs-2.20170204-r2.ebuild 276 SHA256 4554818588c8dc24d99d606ec9657a638a46a5131aac588e0f3b9524a2150983 SHA512 74c3e230e63410c78b467910cd2ece14175fdc81326c4b422b9f27fb7b2c22e5ac8e90b1caccf88481c41b81799ba67871b7f2129ba36ba79587716a99322618 WHIRLPOOL 22ab24739f4472d1ee02dbf411351546ddfc86fe6eef2bad956c81812d194f3906eb7bb273fa079526054a23057a29420722d27ecd117237dd59c8b511da78ea
+EBUILD selinux-ccs-2.20170204-r3.ebuild 276 SHA256 4554818588c8dc24d99d606ec9657a638a46a5131aac588e0f3b9524a2150983 SHA512 74c3e230e63410c78b467910cd2ece14175fdc81326c4b422b9f27fb7b2c22e5ac8e90b1caccf88481c41b81799ba67871b7f2129ba36ba79587716a99322618 WHIRLPOOL 22ab24739f4472d1ee02dbf411351546ddfc86fe6eef2bad956c81812d194f3906eb7bb273fa079526054a23057a29420722d27ecd117237dd59c8b511da78ea
+EBUILD selinux-ccs-2.20170204-r4.ebuild 276 SHA256 4554818588c8dc24d99d606ec9657a638a46a5131aac588e0f3b9524a2150983 SHA512 74c3e230e63410c78b467910cd2ece14175fdc81326c4b422b9f27fb7b2c22e5ac8e90b1caccf88481c41b81799ba67871b7f2129ba36ba79587716a99322618 WHIRLPOOL 22ab24739f4472d1ee02dbf411351546ddfc86fe6eef2bad956c81812d194f3906eb7bb273fa079526054a23057a29420722d27ecd117237dd59c8b511da78ea
+EBUILD selinux-ccs-2.20170805-r2.ebuild 276 SHA256 4554818588c8dc24d99d606ec9657a638a46a5131aac588e0f3b9524a2150983 SHA512 74c3e230e63410c78b467910cd2ece14175fdc81326c4b422b9f27fb7b2c22e5ac8e90b1caccf88481c41b81799ba67871b7f2129ba36ba79587716a99322618 WHIRLPOOL 22ab24739f4472d1ee02dbf411351546ddfc86fe6eef2bad956c81812d194f3906eb7bb273fa079526054a23057a29420722d27ecd117237dd59c8b511da78ea
+EBUILD selinux-ccs-2.20170805-r3.ebuild 278 SHA256 bddc5464fa8432e3f8295c786e4ce365e8305d8168f47819778b9c929f2b93e2 SHA512 8e6bf6e263393257e88a758c5ba401fc3637b0345921daa44d09bac915c8ede3050f6d655dd84b66d5b587514b0f2b192c43aa90793055dea0dc0db78088d4cb WHIRLPOOL 68fdb67da8533e27a5a0e27fb0c4e4c17e8aa79970c25d8f7e6da055e75191c5a7b84874b95d0051b6708791e8a6e5ac777148273a3ce86d796c54de40c469b5
+EBUILD selinux-ccs-9999.ebuild 278 SHA256 bddc5464fa8432e3f8295c786e4ce365e8305d8168f47819778b9c929f2b93e2 SHA512 8e6bf6e263393257e88a758c5ba401fc3637b0345921daa44d09bac915c8ede3050f6d655dd84b66d5b587514b0f2b192c43aa90793055dea0dc0db78088d4cb WHIRLPOOL 68fdb67da8533e27a5a0e27fb0c4e4c17e8aa79970c25d8f7e6da055e75191c5a7b84874b95d0051b6708791e8a6e5ac777148273a3ce86d796c54de40c469b5
 MISC ChangeLog 10295 SHA256 6944eb5f02e912d7952d8807a32dc6f538fbddcfa58bfea2a958ef55e334b600 SHA512 40a2c8178d356597732b6bb741698f5c89a6f751c3c606c44ce472eb1e0da4d6d74eac6eaf1b1a3d2ece3e4ddbe0da04eaa9a788523fde919a019ff4a6491f4c WHIRLPOOL d07b2a54b50033c16af6f060bf2af47d02bc7c989f03714e3fe94fcb6703d79c9cc2b29d0c8504a764146877fa91508387805785af52c05b28f0a4d341d90bed
 MISC ChangeLog-2015 9523 SHA256 52bb877c8631ac975b20a30f41bed45663a104a1c25d419b747cd934bd009cff SHA512 8ccb379c3663395f8a19b0dc24b19214f37eda4fb77fb8bc53632daf6178e6e72203b018a3855fd15e23a7405c19d649256e90ecc4489c92539b6ce01ba06782 WHIRLPOOL 09617da0958a981dbbb49cf5037c95e433d9ca0fe7548026cb1f6ac499c785d96a6ac5ca9ad03753e9ad68e6aeac7b4bd11222d866840e83e2b4fb441f6cafb9
 MISC metadata.xml 313 SHA256 e9820942c2c673c2d05d20af5f04c10390a322254a979069f916691a0eefa58b SHA512 be700477be516907f457fa88bce00b34cb30c8ba470736e40f8cb180c1c8e19ad8888df8e45d41c0d283dad0396ccea00477026222a5cf2936bc4f82b6261ac6 WHIRLPOOL 5447c1a853cddf7f9afa4acd4b577d66247143224df4dad5626dc311dc99b96bd21ce985fe951e38162d555fa2457ecf432f7cbaba3586c0488b1bf7013d3971
diff --git a/sec-policy/selinux-ccs/selinux-ccs-2.20170204-r1.ebuild b/sec-policy/selinux-ccs/selinux-ccs-2.20170204-r1.ebuild
index aadf63e82d7a..f9d2983ed2dc 100644
--- a/sec-policy/selinux-ccs/selinux-ccs-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-ccs/selinux-ccs-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ccs/selinux-ccs-2.20170204-r2.ebuild b/sec-policy/selinux-ccs/selinux-ccs-2.20170204-r2.ebuild
index ffd51da1ee03..1d8cdadadb25 100644
--- a/sec-policy/selinux-ccs/selinux-ccs-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-ccs/selinux-ccs-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ccs/selinux-ccs-2.20170204-r3.ebuild b/sec-policy/selinux-ccs/selinux-ccs-2.20170204-r3.ebuild
index ffd51da1ee03..1d8cdadadb25 100644
--- a/sec-policy/selinux-ccs/selinux-ccs-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-ccs/selinux-ccs-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ccs/selinux-ccs-2.20170204-r4.ebuild b/sec-policy/selinux-ccs/selinux-ccs-2.20170204-r4.ebuild
index ffd51da1ee03..1d8cdadadb25 100644
--- a/sec-policy/selinux-ccs/selinux-ccs-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-ccs/selinux-ccs-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ccs/selinux-ccs-2.20170805-r2.ebuild b/sec-policy/selinux-ccs/selinux-ccs-2.20170805-r2.ebuild
index ffd51da1ee03..1d8cdadadb25 100644
--- a/sec-policy/selinux-ccs/selinux-ccs-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-ccs/selinux-ccs-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ccs/selinux-ccs-2.20170805-r3.ebuild b/sec-policy/selinux-ccs/selinux-ccs-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..f9d2983ed2dc
--- /dev/null
+++ b/sec-policy/selinux-ccs/selinux-ccs-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-ccs/selinux-ccs-9999.ebuild b/sec-policy/selinux-ccs/selinux-ccs-9999.ebuild
index aadf63e82d7a..f9d2983ed2dc 100644
--- a/sec-policy/selinux-ccs/selinux-ccs-9999.ebuild
+++ b/sec-policy/selinux-ccs/selinux-ccs-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cdrecord/Manifest b/sec-policy/selinux-cdrecord/Manifest
index 47571e8b89bf..cc085eef7fd4 100644
--- a/sec-policy/selinux-cdrecord/Manifest
+++ b/sec-policy/selinux-cdrecord/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-cdrecord-2.20170204-r1.ebuild 287 SHA256 9f9e97f5cb8a40077b644d65b4f8d8a5b78627aaffb81fea06996401180a892c SHA512 1896a57f67cc70f985af8a1666f20c43ce4cdf9f44e196e8cc61b59d5d15fd1f1eefe4d2b3e64938db4f73b0c310feaeae7530349b5286684ca7157a2e6748fc WHIRLPOOL cd3baa576b1cd709c65d3e4915d8d38db678f598fff29b3ede9169235ff49c93df038daebcf6c3c688204dd5d08a4e16da29ed1539843431b81a3ecfa0827e4b
-EBUILD selinux-cdrecord-2.20170204-r2.ebuild 285 SHA256 a57abf0b867b6b6ca8e64906d90afafd3e03215f90d09b707a43ac2d024051b0 SHA512 14db72ee3428367fd9d21bae477f65ba3ed70c4a1c967dde8c0bdaff3629a3a9d6535b13a3b662460234ffc5ba21c0e96a63361d902a30c327511c1d733481f7 WHIRLPOOL e493eda98abd16bf14a3c14d40061962e9506409c350883c7abfecc0daed41ae263b76d23cc4b8cb228b84a2772d0eca21ee3fe6ee43d8b05669727153ce9eb8
-EBUILD selinux-cdrecord-2.20170204-r3.ebuild 285 SHA256 a57abf0b867b6b6ca8e64906d90afafd3e03215f90d09b707a43ac2d024051b0 SHA512 14db72ee3428367fd9d21bae477f65ba3ed70c4a1c967dde8c0bdaff3629a3a9d6535b13a3b662460234ffc5ba21c0e96a63361d902a30c327511c1d733481f7 WHIRLPOOL e493eda98abd16bf14a3c14d40061962e9506409c350883c7abfecc0daed41ae263b76d23cc4b8cb228b84a2772d0eca21ee3fe6ee43d8b05669727153ce9eb8
-EBUILD selinux-cdrecord-2.20170204-r4.ebuild 285 SHA256 a57abf0b867b6b6ca8e64906d90afafd3e03215f90d09b707a43ac2d024051b0 SHA512 14db72ee3428367fd9d21bae477f65ba3ed70c4a1c967dde8c0bdaff3629a3a9d6535b13a3b662460234ffc5ba21c0e96a63361d902a30c327511c1d733481f7 WHIRLPOOL e493eda98abd16bf14a3c14d40061962e9506409c350883c7abfecc0daed41ae263b76d23cc4b8cb228b84a2772d0eca21ee3fe6ee43d8b05669727153ce9eb8
-EBUILD selinux-cdrecord-2.20170805-r2.ebuild 285 SHA256 a57abf0b867b6b6ca8e64906d90afafd3e03215f90d09b707a43ac2d024051b0 SHA512 14db72ee3428367fd9d21bae477f65ba3ed70c4a1c967dde8c0bdaff3629a3a9d6535b13a3b662460234ffc5ba21c0e96a63361d902a30c327511c1d733481f7 WHIRLPOOL e493eda98abd16bf14a3c14d40061962e9506409c350883c7abfecc0daed41ae263b76d23cc4b8cb228b84a2772d0eca21ee3fe6ee43d8b05669727153ce9eb8
-EBUILD selinux-cdrecord-9999.ebuild 287 SHA256 9f9e97f5cb8a40077b644d65b4f8d8a5b78627aaffb81fea06996401180a892c SHA512 1896a57f67cc70f985af8a1666f20c43ce4cdf9f44e196e8cc61b59d5d15fd1f1eefe4d2b3e64938db4f73b0c310feaeae7530349b5286684ca7157a2e6748fc WHIRLPOOL cd3baa576b1cd709c65d3e4915d8d38db678f598fff29b3ede9169235ff49c93df038daebcf6c3c688204dd5d08a4e16da29ed1539843431b81a3ecfa0827e4b
+EBUILD selinux-cdrecord-2.20170204-r1.ebuild 288 SHA256 5f5d71217468163a22161ce2d15b87a5d214b326b84acbb1da877612d8af5b54 SHA512 846af34522a894e474feb5d7a4c63e9189ac357a497c1212051cb8139d6016efbd5d094b3480fae3219c056449ba607e5f5087cca6fd6aeb6d0ceeb26fb81fbd WHIRLPOOL 7d0ac3b3574b68914791c968f64cf0d10a7b0ff3eb0381bd986af714103076bfce9e66af06a62c764e10fb88a85148ce2e43d8599cefa60f115d3e2ec6a8d254
+EBUILD selinux-cdrecord-2.20170204-r2.ebuild 286 SHA256 de2da2863540bb03472b3bb49416a0257f8d38181f95d540ce2f5a5e6631c475 SHA512 7532c3c1a208bb37d9285352ee799265f01d73023759db09ee7da9928520c60503404c0ae981813290009892992241424440e82e25d109e01a92f92d368baa2d WHIRLPOOL fb4472173142eccc5f8f2bd105f45f883bc75995cdb6d8b1af8c067d4370c4fa3dc03f0ef84e5d25c2b087ff086e869c0a8f365bfa11d5182705bf9487c0b974
+EBUILD selinux-cdrecord-2.20170204-r3.ebuild 286 SHA256 de2da2863540bb03472b3bb49416a0257f8d38181f95d540ce2f5a5e6631c475 SHA512 7532c3c1a208bb37d9285352ee799265f01d73023759db09ee7da9928520c60503404c0ae981813290009892992241424440e82e25d109e01a92f92d368baa2d WHIRLPOOL fb4472173142eccc5f8f2bd105f45f883bc75995cdb6d8b1af8c067d4370c4fa3dc03f0ef84e5d25c2b087ff086e869c0a8f365bfa11d5182705bf9487c0b974
+EBUILD selinux-cdrecord-2.20170204-r4.ebuild 286 SHA256 de2da2863540bb03472b3bb49416a0257f8d38181f95d540ce2f5a5e6631c475 SHA512 7532c3c1a208bb37d9285352ee799265f01d73023759db09ee7da9928520c60503404c0ae981813290009892992241424440e82e25d109e01a92f92d368baa2d WHIRLPOOL fb4472173142eccc5f8f2bd105f45f883bc75995cdb6d8b1af8c067d4370c4fa3dc03f0ef84e5d25c2b087ff086e869c0a8f365bfa11d5182705bf9487c0b974
+EBUILD selinux-cdrecord-2.20170805-r2.ebuild 286 SHA256 de2da2863540bb03472b3bb49416a0257f8d38181f95d540ce2f5a5e6631c475 SHA512 7532c3c1a208bb37d9285352ee799265f01d73023759db09ee7da9928520c60503404c0ae981813290009892992241424440e82e25d109e01a92f92d368baa2d WHIRLPOOL fb4472173142eccc5f8f2bd105f45f883bc75995cdb6d8b1af8c067d4370c4fa3dc03f0ef84e5d25c2b087ff086e869c0a8f365bfa11d5182705bf9487c0b974
+EBUILD selinux-cdrecord-2.20170805-r3.ebuild 288 SHA256 5f5d71217468163a22161ce2d15b87a5d214b326b84acbb1da877612d8af5b54 SHA512 846af34522a894e474feb5d7a4c63e9189ac357a497c1212051cb8139d6016efbd5d094b3480fae3219c056449ba607e5f5087cca6fd6aeb6d0ceeb26fb81fbd WHIRLPOOL 7d0ac3b3574b68914791c968f64cf0d10a7b0ff3eb0381bd986af714103076bfce9e66af06a62c764e10fb88a85148ce2e43d8599cefa60f115d3e2ec6a8d254
+EBUILD selinux-cdrecord-9999.ebuild 288 SHA256 5f5d71217468163a22161ce2d15b87a5d214b326b84acbb1da877612d8af5b54 SHA512 846af34522a894e474feb5d7a4c63e9189ac357a497c1212051cb8139d6016efbd5d094b3480fae3219c056449ba607e5f5087cca6fd6aeb6d0ceeb26fb81fbd WHIRLPOOL 7d0ac3b3574b68914791c968f64cf0d10a7b0ff3eb0381bd986af714103076bfce9e66af06a62c764e10fb88a85148ce2e43d8599cefa60f115d3e2ec6a8d254
 MISC ChangeLog 10793 SHA256 3cf22339c0d837913097e6549f15ecdc0a31e3ad7f5667dea0e2a0e9fb45892a SHA512 8842cff62abcd6a1b538976d87926551bf54ecf77fb7aa3a2b5449e055c0b6f7eaacbd7f3012f4d7b6e79e34e573d4aa2eebc7bef74e57e8577a4568d2b921d7 WHIRLPOOL 034e4a9b5b2cb0a3e5b4435207dc26ae126a3468fb744cecb4c77c4d71bfb493c98daa7f98147d0601fc4f08f2b277e2c1f4e799d1b5e8f84a0ba6b7337d44de
 MISC ChangeLog-2015 10102 SHA256 72ded1e6f4b4000ffee7e22a12c2479bccc684e2974ebdd7075ccf9ce3498a7b SHA512 9f4d127a235e6b9f39f18b490a10a568be1e4e2ed45224ecebe6a6af2b1ec966caac93f7198f7148eec594794528d29eea40e68a9ffec59360eb273715040cae WHIRLPOOL c90e4e621dc0188d76eaa0988cb5f64905b97f96ca9aa3dd41eead8fe99d6f03547500657ab19cbc8af68befe01f9eb7113806c80b5cedacf0e096f11c88ab8f
 MISC metadata.xml 318 SHA256 6a8d4823441c312a4e21a4276969a3b5c7c60791f8e3398078be4e909b27a340 SHA512 c2a9030ca10cf81b9eb40957e99c3dd31bef004c7bf94da5bef7013ca32a224e65e21a6ccb93b91db873b5b9b68e3aa482e332c870976920e5939c83266d182a WHIRLPOOL 66e29985bfa9947ef4758caf6b5d08f458ed4941fcb477bea8e544757d37a49bfb5e1a9acc444851e1a4a53e90ae8c0ab4dc6c874db5c618d320cf6fa4fa8590
diff --git a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20170204-r1.ebuild b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20170204-r1.ebuild
index 008f196c46ce..ba2c56444f42 100644
--- a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20170204-r2.ebuild b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20170204-r2.ebuild
index 6cb59ebb9c1b..b8e9c33e8dbd 100644
--- a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20170204-r3.ebuild b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20170204-r3.ebuild
index 6cb59ebb9c1b..b8e9c33e8dbd 100644
--- a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20170204-r4.ebuild b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20170204-r4.ebuild
index 6cb59ebb9c1b..b8e9c33e8dbd 100644
--- a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20170805-r2.ebuild b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20170805-r2.ebuild
index 6cb59ebb9c1b..b8e9c33e8dbd 100644
--- a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20170805-r3.ebuild b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..ba2c56444f42
--- /dev/null
+++ b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-cdrecord/selinux-cdrecord-9999.ebuild b/sec-policy/selinux-cdrecord/selinux-cdrecord-9999.ebuild
index 008f196c46ce..ba2c56444f42 100644
--- a/sec-policy/selinux-cdrecord/selinux-cdrecord-9999.ebuild
+++ b/sec-policy/selinux-cdrecord/selinux-cdrecord-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ceph/Manifest b/sec-policy/selinux-ceph/Manifest
index 8d0dfc34a9a0..5697537d3005 100644
--- a/sec-policy/selinux-ceph/Manifest
+++ b/sec-policy/selinux-ceph/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-ceph-2.20170204-r1.ebuild 279 SHA256 c72a6d089492a2fd539b7758a3d8b59e802ae773e9f29e4cd14a2dd22a1b4529 SHA512 f45a3f87c8b5fe1cf83ab854f78499f18375703c30977ce6776732f9bb01be841c1ee4ea923d4e71374a72dcf9b03f017123580b9469fbc36a61244d092822fb WHIRLPOOL 5404fcc33f1fb1eea4684eb4365057bb0789b50d192c82d01dade989960acebfb34793777a40f2ddf06d1b95b6d3b621a9fc137375eb4c76977c1b706362938e
-EBUILD selinux-ceph-2.20170204-r2.ebuild 277 SHA256 0fbcce3d7464fefa91211cdf68257651893bb0c1f2c6ff64fcd446c0659f5787 SHA512 646948418dfa8c559fccef44b37493959e210ef9a7d0e7fd12554e7a1f758e44f5f6af9d85b817c4d87b7f1c33938f5fa500e8c80cd015f2685d89993dbcb478 WHIRLPOOL 63be504ef5ff1fca6996fe64cdf3fbf4169f723bce6d6bb9b58000c220fb7a59d783b92187ae709c162a387fd8ac9b0a30fc0eaf5ffcdc96361f233c3df7e4e9
-EBUILD selinux-ceph-2.20170204-r3.ebuild 277 SHA256 0fbcce3d7464fefa91211cdf68257651893bb0c1f2c6ff64fcd446c0659f5787 SHA512 646948418dfa8c559fccef44b37493959e210ef9a7d0e7fd12554e7a1f758e44f5f6af9d85b817c4d87b7f1c33938f5fa500e8c80cd015f2685d89993dbcb478 WHIRLPOOL 63be504ef5ff1fca6996fe64cdf3fbf4169f723bce6d6bb9b58000c220fb7a59d783b92187ae709c162a387fd8ac9b0a30fc0eaf5ffcdc96361f233c3df7e4e9
-EBUILD selinux-ceph-2.20170204-r4.ebuild 277 SHA256 0fbcce3d7464fefa91211cdf68257651893bb0c1f2c6ff64fcd446c0659f5787 SHA512 646948418dfa8c559fccef44b37493959e210ef9a7d0e7fd12554e7a1f758e44f5f6af9d85b817c4d87b7f1c33938f5fa500e8c80cd015f2685d89993dbcb478 WHIRLPOOL 63be504ef5ff1fca6996fe64cdf3fbf4169f723bce6d6bb9b58000c220fb7a59d783b92187ae709c162a387fd8ac9b0a30fc0eaf5ffcdc96361f233c3df7e4e9
-EBUILD selinux-ceph-2.20170805-r2.ebuild 277 SHA256 0fbcce3d7464fefa91211cdf68257651893bb0c1f2c6ff64fcd446c0659f5787 SHA512 646948418dfa8c559fccef44b37493959e210ef9a7d0e7fd12554e7a1f758e44f5f6af9d85b817c4d87b7f1c33938f5fa500e8c80cd015f2685d89993dbcb478 WHIRLPOOL 63be504ef5ff1fca6996fe64cdf3fbf4169f723bce6d6bb9b58000c220fb7a59d783b92187ae709c162a387fd8ac9b0a30fc0eaf5ffcdc96361f233c3df7e4e9
-EBUILD selinux-ceph-9999.ebuild 279 SHA256 c72a6d089492a2fd539b7758a3d8b59e802ae773e9f29e4cd14a2dd22a1b4529 SHA512 f45a3f87c8b5fe1cf83ab854f78499f18375703c30977ce6776732f9bb01be841c1ee4ea923d4e71374a72dcf9b03f017123580b9469fbc36a61244d092822fb WHIRLPOOL 5404fcc33f1fb1eea4684eb4365057bb0789b50d192c82d01dade989960acebfb34793777a40f2ddf06d1b95b6d3b621a9fc137375eb4c76977c1b706362938e
+EBUILD selinux-ceph-2.20170204-r1.ebuild 280 SHA256 6e2a53aca34a35dc3225b9cca302b477e3f9b8362521f908c025c518bc74041d SHA512 f1eedf0cdc4c5bbcdc216c17acc7ab3e09444d59b08b3ccbb4e353357f48b2551c3f5842e1f6a3abcec87789963ff94fc3442d3338ba098032e26e9b68e53cb7 WHIRLPOOL eeffcb532667731b6c00da2b7df46553b23de0515966e138d7e28510a5f81fdf0228a97b4f27bf577bab0fc77574c69196c17dec0be369eedcb7a6b95d2132be
+EBUILD selinux-ceph-2.20170204-r2.ebuild 278 SHA256 efba34121e0e44c2776055f06f674e4ebdfdfc89f5f52c0c4b92cf464720dcbc SHA512 c2428f63e72b3ccb9060bdbec6ebd5f8d67eace8d59a2c8aa307db496d568e644c5b0522245c61ab5271a23990a2b6ad21205872395cc02bee2d674cbee7787a WHIRLPOOL 3662cf173426feb62c110e5f29394e206b7f84a3c27a9d46d6a417867233df650b04c8dbdbf82bfac6b29f73ed8c2a49ee62e3b5f7839591f27d43e708094afc
+EBUILD selinux-ceph-2.20170204-r3.ebuild 278 SHA256 efba34121e0e44c2776055f06f674e4ebdfdfc89f5f52c0c4b92cf464720dcbc SHA512 c2428f63e72b3ccb9060bdbec6ebd5f8d67eace8d59a2c8aa307db496d568e644c5b0522245c61ab5271a23990a2b6ad21205872395cc02bee2d674cbee7787a WHIRLPOOL 3662cf173426feb62c110e5f29394e206b7f84a3c27a9d46d6a417867233df650b04c8dbdbf82bfac6b29f73ed8c2a49ee62e3b5f7839591f27d43e708094afc
+EBUILD selinux-ceph-2.20170204-r4.ebuild 278 SHA256 efba34121e0e44c2776055f06f674e4ebdfdfc89f5f52c0c4b92cf464720dcbc SHA512 c2428f63e72b3ccb9060bdbec6ebd5f8d67eace8d59a2c8aa307db496d568e644c5b0522245c61ab5271a23990a2b6ad21205872395cc02bee2d674cbee7787a WHIRLPOOL 3662cf173426feb62c110e5f29394e206b7f84a3c27a9d46d6a417867233df650b04c8dbdbf82bfac6b29f73ed8c2a49ee62e3b5f7839591f27d43e708094afc
+EBUILD selinux-ceph-2.20170805-r2.ebuild 278 SHA256 efba34121e0e44c2776055f06f674e4ebdfdfc89f5f52c0c4b92cf464720dcbc SHA512 c2428f63e72b3ccb9060bdbec6ebd5f8d67eace8d59a2c8aa307db496d568e644c5b0522245c61ab5271a23990a2b6ad21205872395cc02bee2d674cbee7787a WHIRLPOOL 3662cf173426feb62c110e5f29394e206b7f84a3c27a9d46d6a417867233df650b04c8dbdbf82bfac6b29f73ed8c2a49ee62e3b5f7839591f27d43e708094afc
+EBUILD selinux-ceph-2.20170805-r3.ebuild 280 SHA256 6e2a53aca34a35dc3225b9cca302b477e3f9b8362521f908c025c518bc74041d SHA512 f1eedf0cdc4c5bbcdc216c17acc7ab3e09444d59b08b3ccbb4e353357f48b2551c3f5842e1f6a3abcec87789963ff94fc3442d3338ba098032e26e9b68e53cb7 WHIRLPOOL eeffcb532667731b6c00da2b7df46553b23de0515966e138d7e28510a5f81fdf0228a97b4f27bf577bab0fc77574c69196c17dec0be369eedcb7a6b95d2132be
+EBUILD selinux-ceph-9999.ebuild 280 SHA256 6e2a53aca34a35dc3225b9cca302b477e3f9b8362521f908c025c518bc74041d SHA512 f1eedf0cdc4c5bbcdc216c17acc7ab3e09444d59b08b3ccbb4e353357f48b2551c3f5842e1f6a3abcec87789963ff94fc3442d3338ba098032e26e9b68e53cb7 WHIRLPOOL eeffcb532667731b6c00da2b7df46553b23de0515966e138d7e28510a5f81fdf0228a97b4f27bf577bab0fc77574c69196c17dec0be369eedcb7a6b95d2132be
 MISC ChangeLog 8865 SHA256 674e473aa36aa8c753a04627d0aa19a5c18d9b1e83a350288d93f9310bd7eab2 SHA512 22587fa68c50999f2c2938cfb8deba2c72ada52e87fb4efd361c0e76ad14764ae56d99e054a21577419cd2d00c14949fdf530b1e7f857a7512f5b3d7103b7762 WHIRLPOOL 827b3bfcffb94c57dd073b1734e0897c59b0a3fc7121d34873d15700d10b96ee63708b7909efdb5c0cba781439e6c2ec06e0f41564868e55136bfaaa73fce546
 MISC ChangeLog-2015 557 SHA256 3faae1c3e0eca570cf5fc5f53820b487fe518dc4676fc503670e5b14f0cec338 SHA512 14ba9caa09f57ee68da0a45b6471909751f8a52c37092ad9bfc479fe85d51ace2cb03ed9e121f6e777417ad4f6e086eeee3a2054b70c715f9b7ceb4c2b0f6f2f WHIRLPOOL 904e8c8e6e851e4b10f2b38dd5f37fa4722c52aca7cec1c28f13f43b1fec26c52e1cfe398e22416338e44727e88131cfe921d792898ff9b749bc7375a011778b
 MISC metadata.xml 314 SHA256 5bd5a245f3e58c48555827bbee9d41af242902d83f8e4967edf3c381a8af6876 SHA512 d3e9c09959bfad3e2f60aa141354eac5cdbdee34df07f06c04a6af6564b1ad8396d2f220eadf6c7c883ee0e33c755537f0adfc2ec1039bb61b0ec90a9d07d282 WHIRLPOOL 5aeed6d621dc896bfc19baff2f8c8ebaadaf2e4628d80050fbab9ae061b4cdb8882e73cc62a4a81bcdc6a866deebb29aea9518d3f26c38286778d3bc20a3d1ef
diff --git a/sec-policy/selinux-ceph/selinux-ceph-2.20170204-r1.ebuild b/sec-policy/selinux-ceph/selinux-ceph-2.20170204-r1.ebuild
index cc48f84f260b..99d200867dfb 100644
--- a/sec-policy/selinux-ceph/selinux-ceph-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-ceph/selinux-ceph-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ceph/selinux-ceph-2.20170204-r2.ebuild b/sec-policy/selinux-ceph/selinux-ceph-2.20170204-r2.ebuild
index 479b8c84927b..2718ef75f150 100644
--- a/sec-policy/selinux-ceph/selinux-ceph-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-ceph/selinux-ceph-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ceph/selinux-ceph-2.20170204-r3.ebuild b/sec-policy/selinux-ceph/selinux-ceph-2.20170204-r3.ebuild
index 479b8c84927b..2718ef75f150 100644
--- a/sec-policy/selinux-ceph/selinux-ceph-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-ceph/selinux-ceph-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ceph/selinux-ceph-2.20170204-r4.ebuild b/sec-policy/selinux-ceph/selinux-ceph-2.20170204-r4.ebuild
index 479b8c84927b..2718ef75f150 100644
--- a/sec-policy/selinux-ceph/selinux-ceph-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-ceph/selinux-ceph-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ceph/selinux-ceph-2.20170805-r2.ebuild b/sec-policy/selinux-ceph/selinux-ceph-2.20170805-r2.ebuild
index 479b8c84927b..2718ef75f150 100644
--- a/sec-policy/selinux-ceph/selinux-ceph-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-ceph/selinux-ceph-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ceph/selinux-ceph-2.20170805-r3.ebuild b/sec-policy/selinux-ceph/selinux-ceph-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..99d200867dfb
--- /dev/null
+++ b/sec-policy/selinux-ceph/selinux-ceph-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-ceph/selinux-ceph-9999.ebuild b/sec-policy/selinux-ceph/selinux-ceph-9999.ebuild
index cc48f84f260b..99d200867dfb 100644
--- a/sec-policy/selinux-ceph/selinux-ceph-9999.ebuild
+++ b/sec-policy/selinux-ceph/selinux-ceph-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cgmanager/Manifest b/sec-policy/selinux-cgmanager/Manifest
index 26f314f7f52c..f1769ee80f04 100644
--- a/sec-policy/selinux-cgmanager/Manifest
+++ b/sec-policy/selinux-cgmanager/Manifest
@@ -3,13 +3,15 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-cgmanager-2.20170204-r1.ebuild 289 SHA256 9858cc4334be077c0b429109109ecf031f0cccd52106871439bfce36e2f6b1ea SHA512 4c90637fd419dc68df512d271f0a2533d72057680bad3e50b2a9db3a5cc53623bfd20b0eddc230f995d5b111b6409a6799dd0d02f06d6663669ee0572a0daf38 WHIRLPOOL f52ae02fc728e2b288ab02a37a9b90690399701c97d606949b3b2414edc02b6d2a8a675f2bd60b9406bbc7436d62ea26da20197795bfb774b4bffc1c21685922
-EBUILD selinux-cgmanager-2.20170204-r2.ebuild 287 SHA256 4ed094beaf4d9816f4b6dc5e9956dfa090c6b08d3af8436ffa7d9bb6c81991c0 SHA512 e7eb939aeda82aee09bb7a93919f658ff6f45c381b69452fc54faef1c04553e83439a0ee3dd48a9eb1349506b9ac01b31f0b5ee49a870b49393f30c892a79b5e WHIRLPOOL 316ad3137fe722158e41c3a4edf7395dddecc72589468548ff861d2905cb681538080dc3a52249fa15152462c1d84a94421ceef106c4b5e50a9ddce5127df40f
-EBUILD selinux-cgmanager-2.20170204-r3.ebuild 287 SHA256 4ed094beaf4d9816f4b6dc5e9956dfa090c6b08d3af8436ffa7d9bb6c81991c0 SHA512 e7eb939aeda82aee09bb7a93919f658ff6f45c381b69452fc54faef1c04553e83439a0ee3dd48a9eb1349506b9ac01b31f0b5ee49a870b49393f30c892a79b5e WHIRLPOOL 316ad3137fe722158e41c3a4edf7395dddecc72589468548ff861d2905cb681538080dc3a52249fa15152462c1d84a94421ceef106c4b5e50a9ddce5127df40f
-EBUILD selinux-cgmanager-2.20170204-r4.ebuild 287 SHA256 4ed094beaf4d9816f4b6dc5e9956dfa090c6b08d3af8436ffa7d9bb6c81991c0 SHA512 e7eb939aeda82aee09bb7a93919f658ff6f45c381b69452fc54faef1c04553e83439a0ee3dd48a9eb1349506b9ac01b31f0b5ee49a870b49393f30c892a79b5e WHIRLPOOL 316ad3137fe722158e41c3a4edf7395dddecc72589468548ff861d2905cb681538080dc3a52249fa15152462c1d84a94421ceef106c4b5e50a9ddce5127df40f
-EBUILD selinux-cgmanager-2.20170805-r2.ebuild 287 SHA256 4ed094beaf4d9816f4b6dc5e9956dfa090c6b08d3af8436ffa7d9bb6c81991c0 SHA512 e7eb939aeda82aee09bb7a93919f658ff6f45c381b69452fc54faef1c04553e83439a0ee3dd48a9eb1349506b9ac01b31f0b5ee49a870b49393f30c892a79b5e WHIRLPOOL 316ad3137fe722158e41c3a4edf7395dddecc72589468548ff861d2905cb681538080dc3a52249fa15152462c1d84a94421ceef106c4b5e50a9ddce5127df40f
-EBUILD selinux-cgmanager-9999.ebuild 289 SHA256 9858cc4334be077c0b429109109ecf031f0cccd52106871439bfce36e2f6b1ea SHA512 4c90637fd419dc68df512d271f0a2533d72057680bad3e50b2a9db3a5cc53623bfd20b0eddc230f995d5b111b6409a6799dd0d02f06d6663669ee0572a0daf38 WHIRLPOOL f52ae02fc728e2b288ab02a37a9b90690399701c97d606949b3b2414edc02b6d2a8a675f2bd60b9406bbc7436d62ea26da20197795bfb774b4bffc1c21685922
+EBUILD selinux-cgmanager-2.20170204-r1.ebuild 290 SHA256 e4113ef093c59cccae6fa812cf2b9bc1fff3d8091853cadb64a2f3cd815cf674 SHA512 e9c75fb1fc3721cd04dc8e4994e83458301be804ec2cda723ccac0ab42d9bd63d1b7958bcdc9cfbeb3f714941af3ca855164419403c9d2519c93ba47c20648cd WHIRLPOOL 2177d80cca88660bf659d0bcbbee857944fa5bdbf88deed04c034cf9fd1fe23e68a50c29f10c3d326b8060c7114d15079e264ecc58a649d492dbfba22180e923
+EBUILD selinux-cgmanager-2.20170204-r2.ebuild 288 SHA256 521ac78c307a7541865d883a21509043b496150e84bac73a8c6ffa2f822e94fd SHA512 9e267f92f7b77c4a9fcad86e54f9b2592a42b6cb2c8b27fedaf2d236db427a376e5c0490d3b0d39927ef4ff4a89943534b04af65efb75650f62cf2bf89a83ba6 WHIRLPOOL b51e5d79d40b07c5b3bf69bf72e6d9071b169701df7c8dbfc2b4ffeecb06c03d590751c0ef8af5a96b659b74fb72f2f60f13ab8dfe48bee48a969548f7e4854e
+EBUILD selinux-cgmanager-2.20170204-r3.ebuild 288 SHA256 521ac78c307a7541865d883a21509043b496150e84bac73a8c6ffa2f822e94fd SHA512 9e267f92f7b77c4a9fcad86e54f9b2592a42b6cb2c8b27fedaf2d236db427a376e5c0490d3b0d39927ef4ff4a89943534b04af65efb75650f62cf2bf89a83ba6 WHIRLPOOL b51e5d79d40b07c5b3bf69bf72e6d9071b169701df7c8dbfc2b4ffeecb06c03d590751c0ef8af5a96b659b74fb72f2f60f13ab8dfe48bee48a969548f7e4854e
+EBUILD selinux-cgmanager-2.20170204-r4.ebuild 288 SHA256 521ac78c307a7541865d883a21509043b496150e84bac73a8c6ffa2f822e94fd SHA512 9e267f92f7b77c4a9fcad86e54f9b2592a42b6cb2c8b27fedaf2d236db427a376e5c0490d3b0d39927ef4ff4a89943534b04af65efb75650f62cf2bf89a83ba6 WHIRLPOOL b51e5d79d40b07c5b3bf69bf72e6d9071b169701df7c8dbfc2b4ffeecb06c03d590751c0ef8af5a96b659b74fb72f2f60f13ab8dfe48bee48a969548f7e4854e
+EBUILD selinux-cgmanager-2.20170805-r2.ebuild 288 SHA256 521ac78c307a7541865d883a21509043b496150e84bac73a8c6ffa2f822e94fd SHA512 9e267f92f7b77c4a9fcad86e54f9b2592a42b6cb2c8b27fedaf2d236db427a376e5c0490d3b0d39927ef4ff4a89943534b04af65efb75650f62cf2bf89a83ba6 WHIRLPOOL b51e5d79d40b07c5b3bf69bf72e6d9071b169701df7c8dbfc2b4ffeecb06c03d590751c0ef8af5a96b659b74fb72f2f60f13ab8dfe48bee48a969548f7e4854e
+EBUILD selinux-cgmanager-2.20170805-r3.ebuild 290 SHA256 e4113ef093c59cccae6fa812cf2b9bc1fff3d8091853cadb64a2f3cd815cf674 SHA512 e9c75fb1fc3721cd04dc8e4994e83458301be804ec2cda723ccac0ab42d9bd63d1b7958bcdc9cfbeb3f714941af3ca855164419403c9d2519c93ba47c20648cd WHIRLPOOL 2177d80cca88660bf659d0bcbbee857944fa5bdbf88deed04c034cf9fd1fe23e68a50c29f10c3d326b8060c7114d15079e264ecc58a649d492dbfba22180e923
+EBUILD selinux-cgmanager-9999.ebuild 290 SHA256 e4113ef093c59cccae6fa812cf2b9bc1fff3d8091853cadb64a2f3cd815cf674 SHA512 e9c75fb1fc3721cd04dc8e4994e83458301be804ec2cda723ccac0ab42d9bd63d1b7958bcdc9cfbeb3f714941af3ca855164419403c9d2519c93ba47c20648cd WHIRLPOOL 2177d80cca88660bf659d0bcbbee857944fa5bdbf88deed04c034cf9fd1fe23e68a50c29f10c3d326b8060c7114d15079e264ecc58a649d492dbfba22180e923
 MISC ChangeLog 7301 SHA256 75acc51f31ee8f02cfd94b4ef6cffab0e2eabaf40acef6e443a5905b4dc36972 SHA512 cec58fe3892b652f390985c7375f704f16a34225d8042a53537ef67fc4b92c738f03cde532c824a6d79a372ebea059d03d75a13898a2efd55a1a79ec403a7c57 WHIRLPOOL 2800d86236cb43e0e70c2e70d1353708de015af7eda474c5a90de736af1ceff3a26fe3e53e5cf4384165a218e946ad5c51742adfbae1b9d82b46bea664767fe4
 MISC metadata.xml 338 SHA256 b0e2d8bc58e5fd9d52cdead0d686c738aecedde3d69b52c00c0222bf03337757 SHA512 94f4ae40489fd875bd8c5fd8e57c5e103909205e1cc872e706d44192eb045c646b9f8f5225acd74eac0f10cdcf06a8c30a9e0d8305d6913666ecf780e40faeb8 WHIRLPOOL debf017d5110cafd6736a69925fcf47ca4f335a83918e45f5aa7ed5311131ef2b716532b4116322d5c7f45f66b617ae22b2436c0476a4163917df776570dd871
diff --git a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20170204-r1.ebuild b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20170204-r1.ebuild
index cf68e170a408..b04b419ed7ec 100644
--- a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20170204-r2.ebuild b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20170204-r2.ebuild
index 0e4351fcb644..24e72162f472 100644
--- a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20170204-r3.ebuild b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20170204-r3.ebuild
index 0e4351fcb644..24e72162f472 100644
--- a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20170204-r4.ebuild b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20170204-r4.ebuild
index 0e4351fcb644..24e72162f472 100644
--- a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20170805-r2.ebuild b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20170805-r2.ebuild
index 0e4351fcb644..24e72162f472 100644
--- a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20170805-r3.ebuild b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..b04b419ed7ec
--- /dev/null
+++ b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-cgmanager/selinux-cgmanager-9999.ebuild b/sec-policy/selinux-cgmanager/selinux-cgmanager-9999.ebuild
index cf68e170a408..b04b419ed7ec 100644
--- a/sec-policy/selinux-cgmanager/selinux-cgmanager-9999.ebuild
+++ b/sec-policy/selinux-cgmanager/selinux-cgmanager-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cgroup/Manifest b/sec-policy/selinux-cgroup/Manifest
index 570ae0722104..56c0a1c942f6 100644
--- a/sec-policy/selinux-cgroup/Manifest
+++ b/sec-policy/selinux-cgroup/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-cgroup-2.20170204-r1.ebuild 283 SHA256 1fb61e82dffc7330c48730d1f917dc23a09a829a0c0c73e140416d2e080bdb09 SHA512 9e502e00975f302d0953d8237f93891feaa892d9755e03a5d2d3a0f05ccf968a1bc1268341f3dc640f67c11b6e55dc68ae36a2db058bb934d93ed4c37601d5e6 WHIRLPOOL 41fabb01819bf02601adbdfc751846c75579e843e5a131338d2959b07de79ab716f566936a6c9aba23032eddc810007b0688ab34ce6b44fb24345db2b18deddc
-EBUILD selinux-cgroup-2.20170204-r2.ebuild 281 SHA256 5c41d46cb4e3f8aa12b9c15e5669afa11a8b6cade2f3ea0851a427fb55567438 SHA512 9ba509d7200432a567f6d97241f0f676952f325499262802034a8086b6944ab1dfd83829323caafd0dd5dbde9d10e3189562ab2ae24ce182fdecefedea94e001 WHIRLPOOL 3f00b4b12aaf44970446b1c7851944c614660ccf64496272f7407e3a35e78ea8bf65df3eb7f3f04d8686d0f846b4d6b671c6c29b5ed465256cccf50855e6dcff
-EBUILD selinux-cgroup-2.20170204-r3.ebuild 281 SHA256 5c41d46cb4e3f8aa12b9c15e5669afa11a8b6cade2f3ea0851a427fb55567438 SHA512 9ba509d7200432a567f6d97241f0f676952f325499262802034a8086b6944ab1dfd83829323caafd0dd5dbde9d10e3189562ab2ae24ce182fdecefedea94e001 WHIRLPOOL 3f00b4b12aaf44970446b1c7851944c614660ccf64496272f7407e3a35e78ea8bf65df3eb7f3f04d8686d0f846b4d6b671c6c29b5ed465256cccf50855e6dcff
-EBUILD selinux-cgroup-2.20170204-r4.ebuild 281 SHA256 5c41d46cb4e3f8aa12b9c15e5669afa11a8b6cade2f3ea0851a427fb55567438 SHA512 9ba509d7200432a567f6d97241f0f676952f325499262802034a8086b6944ab1dfd83829323caafd0dd5dbde9d10e3189562ab2ae24ce182fdecefedea94e001 WHIRLPOOL 3f00b4b12aaf44970446b1c7851944c614660ccf64496272f7407e3a35e78ea8bf65df3eb7f3f04d8686d0f846b4d6b671c6c29b5ed465256cccf50855e6dcff
-EBUILD selinux-cgroup-2.20170805-r2.ebuild 281 SHA256 5c41d46cb4e3f8aa12b9c15e5669afa11a8b6cade2f3ea0851a427fb55567438 SHA512 9ba509d7200432a567f6d97241f0f676952f325499262802034a8086b6944ab1dfd83829323caafd0dd5dbde9d10e3189562ab2ae24ce182fdecefedea94e001 WHIRLPOOL 3f00b4b12aaf44970446b1c7851944c614660ccf64496272f7407e3a35e78ea8bf65df3eb7f3f04d8686d0f846b4d6b671c6c29b5ed465256cccf50855e6dcff
-EBUILD selinux-cgroup-9999.ebuild 283 SHA256 1fb61e82dffc7330c48730d1f917dc23a09a829a0c0c73e140416d2e080bdb09 SHA512 9e502e00975f302d0953d8237f93891feaa892d9755e03a5d2d3a0f05ccf968a1bc1268341f3dc640f67c11b6e55dc68ae36a2db058bb934d93ed4c37601d5e6 WHIRLPOOL 41fabb01819bf02601adbdfc751846c75579e843e5a131338d2959b07de79ab716f566936a6c9aba23032eddc810007b0688ab34ce6b44fb24345db2b18deddc
+EBUILD selinux-cgroup-2.20170204-r1.ebuild 284 SHA256 a8d1c0316767338aa08e0f6b4e0f619e854882662c1ef4e7d5d9be7af1d007e8 SHA512 fae06d6e543a4fa116cfa4429057b95eaa225372bbd50ed5dc8c285b69c6278f229dbf4e78cef2ade12b8b81ec901ed8aa3eb906b7dbcbf54abcfee3452a2e1f WHIRLPOOL e5d30afec7aaf9fe390aeb5f52d3042ad62a9a39e0ada35e524c6b504a745a2ef5bfcf7fbfa48bb02f94add3ebb529709a6707db9f844fd2280977972fcb7590
+EBUILD selinux-cgroup-2.20170204-r2.ebuild 282 SHA256 91ac3a3a3f4a93b1cf73bb05be20ac31c149115e62778141a35361cf22d269e7 SHA512 fdf21dca57bede74f9a8222a42959bcc41107b01e4b28f65aa4a1c5ed55005677311ab3b4ba972cb32eabfd432930c3e9dee72231b9d2b85d058a84b666ec189 WHIRLPOOL 97b15837341f5472bec53de2286c733b0d735d48070b0625b1feffa078690a59e8837f8a5e6fd3d89c38a4a1fe66fb59b59c6a3fcfa6bccf94103b5a8353a9fb
+EBUILD selinux-cgroup-2.20170204-r3.ebuild 282 SHA256 91ac3a3a3f4a93b1cf73bb05be20ac31c149115e62778141a35361cf22d269e7 SHA512 fdf21dca57bede74f9a8222a42959bcc41107b01e4b28f65aa4a1c5ed55005677311ab3b4ba972cb32eabfd432930c3e9dee72231b9d2b85d058a84b666ec189 WHIRLPOOL 97b15837341f5472bec53de2286c733b0d735d48070b0625b1feffa078690a59e8837f8a5e6fd3d89c38a4a1fe66fb59b59c6a3fcfa6bccf94103b5a8353a9fb
+EBUILD selinux-cgroup-2.20170204-r4.ebuild 282 SHA256 91ac3a3a3f4a93b1cf73bb05be20ac31c149115e62778141a35361cf22d269e7 SHA512 fdf21dca57bede74f9a8222a42959bcc41107b01e4b28f65aa4a1c5ed55005677311ab3b4ba972cb32eabfd432930c3e9dee72231b9d2b85d058a84b666ec189 WHIRLPOOL 97b15837341f5472bec53de2286c733b0d735d48070b0625b1feffa078690a59e8837f8a5e6fd3d89c38a4a1fe66fb59b59c6a3fcfa6bccf94103b5a8353a9fb
+EBUILD selinux-cgroup-2.20170805-r2.ebuild 282 SHA256 91ac3a3a3f4a93b1cf73bb05be20ac31c149115e62778141a35361cf22d269e7 SHA512 fdf21dca57bede74f9a8222a42959bcc41107b01e4b28f65aa4a1c5ed55005677311ab3b4ba972cb32eabfd432930c3e9dee72231b9d2b85d058a84b666ec189 WHIRLPOOL 97b15837341f5472bec53de2286c733b0d735d48070b0625b1feffa078690a59e8837f8a5e6fd3d89c38a4a1fe66fb59b59c6a3fcfa6bccf94103b5a8353a9fb
+EBUILD selinux-cgroup-2.20170805-r3.ebuild 284 SHA256 a8d1c0316767338aa08e0f6b4e0f619e854882662c1ef4e7d5d9be7af1d007e8 SHA512 fae06d6e543a4fa116cfa4429057b95eaa225372bbd50ed5dc8c285b69c6278f229dbf4e78cef2ade12b8b81ec901ed8aa3eb906b7dbcbf54abcfee3452a2e1f WHIRLPOOL e5d30afec7aaf9fe390aeb5f52d3042ad62a9a39e0ada35e524c6b504a745a2ef5bfcf7fbfa48bb02f94add3ebb529709a6707db9f844fd2280977972fcb7590
+EBUILD selinux-cgroup-9999.ebuild 284 SHA256 a8d1c0316767338aa08e0f6b4e0f619e854882662c1ef4e7d5d9be7af1d007e8 SHA512 fae06d6e543a4fa116cfa4429057b95eaa225372bbd50ed5dc8c285b69c6278f229dbf4e78cef2ade12b8b81ec901ed8aa3eb906b7dbcbf54abcfee3452a2e1f WHIRLPOOL e5d30afec7aaf9fe390aeb5f52d3042ad62a9a39e0ada35e524c6b504a745a2ef5bfcf7fbfa48bb02f94add3ebb529709a6707db9f844fd2280977972fcb7590
 MISC ChangeLog 10571 SHA256 509e42f310435f24276428451266c1140da7e1d0496e67bde43911bed7d6876a SHA512 c9ce98fbe6b976c27f83acebadc46bca69eee698810cad7ca79b80ca5b1cf1b1c450d88660307194b3c33a4d40bfbcc77d424205c8284728bf186ebfed190e8c WHIRLPOOL 7b7971f818a2e1ebc878ff95ecea14191373e7101ae328dbc3d481df0cf6316d17b6cdde6f611ce2a3f07b3250cd59042bd92bb05f827d9a4bdfc9d252381253
 MISC ChangeLog-2015 9862 SHA256 83486fce1ed083268e4ac257dfac059e00814ccf8b21548e072d58026c487eae SHA512 575aa60b93d98885ce734a32a248da767a4b94a37304913b62919de93fd04cd14e79e4cda4f3886447c2dc63b1f7db9b01b5d1b38db8c1e57a6bbaa59a603829 WHIRLPOOL ddda69dc8ed479317d5752eb45d60ca1e4efd5e26100c564402c693d506c936d0f02298ce2f41759985b1f9b9175e55f60d938edcdf4913922dd6ee8df26ffd2
 MISC metadata.xml 316 SHA256 f64b15d6533aece7a9ecb0013fe62983cb100c8e68ecad7a1b7f779b824b25e8 SHA512 5f6f16a1e6e45cc3483dda299489e6cb5ef903f60d2a9831e234bac9bcff876dcf382a51ba0151905bb876053339ec95802298838f22821bee7c3b3f4cdb1bda WHIRLPOOL 14a58229b22b2bea76f5dae23f17ece46d944d0b37d6181ca5b8a7f561ec0438be32074972f87f342f20d1ac7490e7e44c4ca1991aae33ed990470a20b7075ea
diff --git a/sec-policy/selinux-cgroup/selinux-cgroup-2.20170204-r1.ebuild b/sec-policy/selinux-cgroup/selinux-cgroup-2.20170204-r1.ebuild
index 09beb0faa6f5..48e62f2483f0 100644
--- a/sec-policy/selinux-cgroup/selinux-cgroup-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-cgroup/selinux-cgroup-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cgroup/selinux-cgroup-2.20170204-r2.ebuild b/sec-policy/selinux-cgroup/selinux-cgroup-2.20170204-r2.ebuild
index 0985b0ab1098..bc51a313709b 100644
--- a/sec-policy/selinux-cgroup/selinux-cgroup-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-cgroup/selinux-cgroup-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cgroup/selinux-cgroup-2.20170204-r3.ebuild b/sec-policy/selinux-cgroup/selinux-cgroup-2.20170204-r3.ebuild
index 0985b0ab1098..bc51a313709b 100644
--- a/sec-policy/selinux-cgroup/selinux-cgroup-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-cgroup/selinux-cgroup-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cgroup/selinux-cgroup-2.20170204-r4.ebuild b/sec-policy/selinux-cgroup/selinux-cgroup-2.20170204-r4.ebuild
index 0985b0ab1098..bc51a313709b 100644
--- a/sec-policy/selinux-cgroup/selinux-cgroup-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-cgroup/selinux-cgroup-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cgroup/selinux-cgroup-2.20170805-r2.ebuild b/sec-policy/selinux-cgroup/selinux-cgroup-2.20170805-r2.ebuild
index 0985b0ab1098..bc51a313709b 100644
--- a/sec-policy/selinux-cgroup/selinux-cgroup-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-cgroup/selinux-cgroup-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cgroup/selinux-cgroup-2.20170805-r3.ebuild b/sec-policy/selinux-cgroup/selinux-cgroup-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..48e62f2483f0
--- /dev/null
+++ b/sec-policy/selinux-cgroup/selinux-cgroup-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-cgroup/selinux-cgroup-9999.ebuild b/sec-policy/selinux-cgroup/selinux-cgroup-9999.ebuild
index 09beb0faa6f5..48e62f2483f0 100644
--- a/sec-policy/selinux-cgroup/selinux-cgroup-9999.ebuild
+++ b/sec-policy/selinux-cgroup/selinux-cgroup-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-chromium/Manifest b/sec-policy/selinux-chromium/Manifest
index ccff04e62543..40b1eebab05a 100644
--- a/sec-policy/selinux-chromium/Manifest
+++ b/sec-policy/selinux-chromium/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-chromium-2.20170204-r1.ebuild 390 SHA256 ac3c5cdf9ea837388e6bd4700c9a20e7e149a4e096ed141909b4338fa371e40a SHA512 32a37268ea6f99dff2c7fa43e292a1a8a6a0d00350f63c4556f09395b9242576e617a189a063c5d9b35129866e9c6ac5ee440a5e09d8c0fe604e62eb64c69492 WHIRLPOOL 5ace9937b9c84dbd320d05b3a1c2b4dd7e73c91c978957d3c11cf3bd8cf176f82e99db1c016ca603e9d239fd862dc4c4fb0e154d00746fadd20a93a801435449
-EBUILD selinux-chromium-2.20170204-r2.ebuild 388 SHA256 0fb8bf30ab2ff467a278c303d3244a8e6176cb3db775c8334c101a24f6b6d864 SHA512 b89e86ab7aeb316f5d28826447f48b7ac2fe90d0b1663bd5adc176c7e77dc2349e935600c7c58244d37530d0d614028ef125599701e4175acffcc95bfd26736d WHIRLPOOL 7e0d9e876d533d29feb96bfc135952f5eb143647732218fa1a5e2d3528c80d458847e02a87395a3ad7305aeb9f897e2fed6aa69e8534c316b2a71dac644b2f1c
-EBUILD selinux-chromium-2.20170204-r3.ebuild 388 SHA256 0fb8bf30ab2ff467a278c303d3244a8e6176cb3db775c8334c101a24f6b6d864 SHA512 b89e86ab7aeb316f5d28826447f48b7ac2fe90d0b1663bd5adc176c7e77dc2349e935600c7c58244d37530d0d614028ef125599701e4175acffcc95bfd26736d WHIRLPOOL 7e0d9e876d533d29feb96bfc135952f5eb143647732218fa1a5e2d3528c80d458847e02a87395a3ad7305aeb9f897e2fed6aa69e8534c316b2a71dac644b2f1c
-EBUILD selinux-chromium-2.20170204-r4.ebuild 388 SHA256 0fb8bf30ab2ff467a278c303d3244a8e6176cb3db775c8334c101a24f6b6d864 SHA512 b89e86ab7aeb316f5d28826447f48b7ac2fe90d0b1663bd5adc176c7e77dc2349e935600c7c58244d37530d0d614028ef125599701e4175acffcc95bfd26736d WHIRLPOOL 7e0d9e876d533d29feb96bfc135952f5eb143647732218fa1a5e2d3528c80d458847e02a87395a3ad7305aeb9f897e2fed6aa69e8534c316b2a71dac644b2f1c
-EBUILD selinux-chromium-2.20170805-r2.ebuild 388 SHA256 0fb8bf30ab2ff467a278c303d3244a8e6176cb3db775c8334c101a24f6b6d864 SHA512 b89e86ab7aeb316f5d28826447f48b7ac2fe90d0b1663bd5adc176c7e77dc2349e935600c7c58244d37530d0d614028ef125599701e4175acffcc95bfd26736d WHIRLPOOL 7e0d9e876d533d29feb96bfc135952f5eb143647732218fa1a5e2d3528c80d458847e02a87395a3ad7305aeb9f897e2fed6aa69e8534c316b2a71dac644b2f1c
-EBUILD selinux-chromium-9999.ebuild 390 SHA256 ac3c5cdf9ea837388e6bd4700c9a20e7e149a4e096ed141909b4338fa371e40a SHA512 32a37268ea6f99dff2c7fa43e292a1a8a6a0d00350f63c4556f09395b9242576e617a189a063c5d9b35129866e9c6ac5ee440a5e09d8c0fe604e62eb64c69492 WHIRLPOOL 5ace9937b9c84dbd320d05b3a1c2b4dd7e73c91c978957d3c11cf3bd8cf176f82e99db1c016ca603e9d239fd862dc4c4fb0e154d00746fadd20a93a801435449
+EBUILD selinux-chromium-2.20170204-r1.ebuild 391 SHA256 ebc632413768a27a6a347994a9b16852078967e311b36aaa61511c5efaba3788 SHA512 882fcdb7998ea5a014dd71be392ab9e918187e0c6e8394a8df5a877edbed748ffee214457997949d94557541f9f953d12d46c7e374aea6c8b8ec3bdd14697258 WHIRLPOOL 9bbd7496efd451388843ffae0758c84044348ff7c688d78d75ea03fddd23052be651ed167bcfe2022ab0c4aa32add272f6fd95e0134975db32ccf1572cfb52ac
+EBUILD selinux-chromium-2.20170204-r2.ebuild 389 SHA256 6db94a55afefb3f5baa7c14cc5047a5761a044a06a99d000928c4f056cf541a3 SHA512 7d3928d5fbe50c3ebd0f753c8d4c4825e14e193da09f6790d98b88b3ffa9a1cfdf3d9df9f022edd975ea70fab37b9e33bd8bbe913a9e8d1a1efac8ab2c38c2bd WHIRLPOOL 5c9028b4d209a841cb9352e07e140e27bf670c122cec38b63d443ee7f5bb476a33e3c7c300441ba0ec5c27cf8b9d0a1ab0b970aa6f287e74eafa06822db67296
+EBUILD selinux-chromium-2.20170204-r3.ebuild 389 SHA256 6db94a55afefb3f5baa7c14cc5047a5761a044a06a99d000928c4f056cf541a3 SHA512 7d3928d5fbe50c3ebd0f753c8d4c4825e14e193da09f6790d98b88b3ffa9a1cfdf3d9df9f022edd975ea70fab37b9e33bd8bbe913a9e8d1a1efac8ab2c38c2bd WHIRLPOOL 5c9028b4d209a841cb9352e07e140e27bf670c122cec38b63d443ee7f5bb476a33e3c7c300441ba0ec5c27cf8b9d0a1ab0b970aa6f287e74eafa06822db67296
+EBUILD selinux-chromium-2.20170204-r4.ebuild 389 SHA256 6db94a55afefb3f5baa7c14cc5047a5761a044a06a99d000928c4f056cf541a3 SHA512 7d3928d5fbe50c3ebd0f753c8d4c4825e14e193da09f6790d98b88b3ffa9a1cfdf3d9df9f022edd975ea70fab37b9e33bd8bbe913a9e8d1a1efac8ab2c38c2bd WHIRLPOOL 5c9028b4d209a841cb9352e07e140e27bf670c122cec38b63d443ee7f5bb476a33e3c7c300441ba0ec5c27cf8b9d0a1ab0b970aa6f287e74eafa06822db67296
+EBUILD selinux-chromium-2.20170805-r2.ebuild 389 SHA256 6db94a55afefb3f5baa7c14cc5047a5761a044a06a99d000928c4f056cf541a3 SHA512 7d3928d5fbe50c3ebd0f753c8d4c4825e14e193da09f6790d98b88b3ffa9a1cfdf3d9df9f022edd975ea70fab37b9e33bd8bbe913a9e8d1a1efac8ab2c38c2bd WHIRLPOOL 5c9028b4d209a841cb9352e07e140e27bf670c122cec38b63d443ee7f5bb476a33e3c7c300441ba0ec5c27cf8b9d0a1ab0b970aa6f287e74eafa06822db67296
+EBUILD selinux-chromium-2.20170805-r3.ebuild 391 SHA256 ebc632413768a27a6a347994a9b16852078967e311b36aaa61511c5efaba3788 SHA512 882fcdb7998ea5a014dd71be392ab9e918187e0c6e8394a8df5a877edbed748ffee214457997949d94557541f9f953d12d46c7e374aea6c8b8ec3bdd14697258 WHIRLPOOL 9bbd7496efd451388843ffae0758c84044348ff7c688d78d75ea03fddd23052be651ed167bcfe2022ab0c4aa32add272f6fd95e0134975db32ccf1572cfb52ac
+EBUILD selinux-chromium-9999.ebuild 391 SHA256 ebc632413768a27a6a347994a9b16852078967e311b36aaa61511c5efaba3788 SHA512 882fcdb7998ea5a014dd71be392ab9e918187e0c6e8394a8df5a877edbed748ffee214457997949d94557541f9f953d12d46c7e374aea6c8b8ec3bdd14697258 WHIRLPOOL 9bbd7496efd451388843ffae0758c84044348ff7c688d78d75ea03fddd23052be651ed167bcfe2022ab0c4aa32add272f6fd95e0134975db32ccf1572cfb52ac
 MISC ChangeLog 10793 SHA256 b71754ae5b0efccea0b7da6ec72645200c6d7a94cf77ac44c39df5a057222265 SHA512 6e4fa4cb20b4fa60637f620dd3e91ede274aaec272d4dd0b6dcd09ac6b15fbb768a5d5552012c833822787fde09de71feb1f2df9f0eaed804b1858198c6b1a1a WHIRLPOOL 6a31ec7e0268ea501da9dcc8d5fd18effe1b0744e50bd2e4d3cd3ded03fbb7cd73fab49e3361c0001fac3f0a4fe3e5b5f60ad77d0cfd4b72a676122dc462312a
 MISC ChangeLog-2015 8762 SHA256 8b71781e87b27964e910595d69d5ae64f75246b3711492249ec789dde860bad5 SHA512 40ae8a97675c02eb2229fb1ea99ba28da898f96312ac77c6eea54b5077ae501bed4bcb56478175e613027238496c5de7d7c96f9a18f28cd34c6562c241a01984 WHIRLPOOL 8ae913d5b6d5c356ee79a162095a038faa6f40fc0b76bd19f5333d5c8cf7f19f77b95241e20ccacbe4929c9fc921f76734c7c1060346660763ff167152611f41
 MISC metadata.xml 318 SHA256 a202029b08d7e00f42da59ce2b952805835c467cc1eaa57ddcc9e654e62d0cf8 SHA512 35a3ae361b20adc58424c078918cfb959fb4ed36ec73789d171ae30628b37da1444f9a028138a56aa6d3cb5605ecdaa48695bc8608dc0df54647492c07c88846 WHIRLPOOL 6b357b271dc89eb26682e8ef39effda695ba2e1463bbd055e5eb0574ea23129848ac2d248793d8c637701688f2aa876bbf3fc49e2f1654574d39ae99a22cf3e8
diff --git a/sec-policy/selinux-chromium/selinux-chromium-2.20170204-r1.ebuild b/sec-policy/selinux-chromium/selinux-chromium-2.20170204-r1.ebuild
index 4aedd2604ff0..385e71fce9da 100644
--- a/sec-policy/selinux-chromium/selinux-chromium-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-chromium/selinux-chromium-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE="alsa"
diff --git a/sec-policy/selinux-chromium/selinux-chromium-2.20170204-r2.ebuild b/sec-policy/selinux-chromium/selinux-chromium-2.20170204-r2.ebuild
index 1ee5a1905560..4785cfb100af 100644
--- a/sec-policy/selinux-chromium/selinux-chromium-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-chromium/selinux-chromium-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE="alsa"
diff --git a/sec-policy/selinux-chromium/selinux-chromium-2.20170204-r3.ebuild b/sec-policy/selinux-chromium/selinux-chromium-2.20170204-r3.ebuild
index 1ee5a1905560..4785cfb100af 100644
--- a/sec-policy/selinux-chromium/selinux-chromium-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-chromium/selinux-chromium-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE="alsa"
diff --git a/sec-policy/selinux-chromium/selinux-chromium-2.20170204-r4.ebuild b/sec-policy/selinux-chromium/selinux-chromium-2.20170204-r4.ebuild
index 1ee5a1905560..4785cfb100af 100644
--- a/sec-policy/selinux-chromium/selinux-chromium-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-chromium/selinux-chromium-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE="alsa"
diff --git a/sec-policy/selinux-chromium/selinux-chromium-2.20170805-r2.ebuild b/sec-policy/selinux-chromium/selinux-chromium-2.20170805-r2.ebuild
index 1ee5a1905560..4785cfb100af 100644
--- a/sec-policy/selinux-chromium/selinux-chromium-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-chromium/selinux-chromium-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE="alsa"
diff --git a/sec-policy/selinux-chromium/selinux-chromium-2.20170805-r3.ebuild b/sec-policy/selinux-chromium/selinux-chromium-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..385e71fce9da
--- /dev/null
+++ b/sec-policy/selinux-chromium/selinux-chromium-2.20170805-r3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-chromium/selinux-chromium-9999.ebuild b/sec-policy/selinux-chromium/selinux-chromium-9999.ebuild
index 4aedd2604ff0..385e71fce9da 100644
--- a/sec-policy/selinux-chromium/selinux-chromium-9999.ebuild
+++ b/sec-policy/selinux-chromium/selinux-chromium-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE="alsa"
diff --git a/sec-policy/selinux-chronyd/Manifest b/sec-policy/selinux-chronyd/Manifest
index 54aa5f29bc0c..fa7834087d28 100644
--- a/sec-policy/selinux-chronyd/Manifest
+++ b/sec-policy/selinux-chronyd/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-chronyd-2.20170204-r1.ebuild 285 SHA256 55ff7e24d56ae81f50bac574e6fffd71888dc7c32b86c184f02d0e6764503f70 SHA512 97a8eb32a894a812ee7edb1296401075af2aa26f833a80f583d538abb3c6923d8cf23a080d54373cb9a30dddeaea8e00cd08f3f18ccb683166ae87b74166f8fa WHIRLPOOL ebb95ff89fc247dec826016960dbe92349fdc08fe144f70d510a9fed6795a6e9efdc87010a0e61a006de2d9bbc0b575766fa7bddf75fad764e7173a24b818b80
-EBUILD selinux-chronyd-2.20170204-r2.ebuild 283 SHA256 6a4da95be2eb368fb9cac580e106a9203f977f5df0848f349eb58e3d40837ebc SHA512 1c626ba98228ee9c3f1537101447ed4035568adc2a006226e16e9a0fddea8216ce24ab31d815df0e9fa9add3c20e4ca371ad67caa2b06e071ae1612aaab84b2f WHIRLPOOL dfa3b1e33b23d8d9fadf22fdb26d55220f809285d2c81d06c05294dabbab20b5bbe38f4bbaec33cf1b4de164d42df7892b6f929c2d96a2dc39d84967336433be
-EBUILD selinux-chronyd-2.20170204-r3.ebuild 283 SHA256 6a4da95be2eb368fb9cac580e106a9203f977f5df0848f349eb58e3d40837ebc SHA512 1c626ba98228ee9c3f1537101447ed4035568adc2a006226e16e9a0fddea8216ce24ab31d815df0e9fa9add3c20e4ca371ad67caa2b06e071ae1612aaab84b2f WHIRLPOOL dfa3b1e33b23d8d9fadf22fdb26d55220f809285d2c81d06c05294dabbab20b5bbe38f4bbaec33cf1b4de164d42df7892b6f929c2d96a2dc39d84967336433be
-EBUILD selinux-chronyd-2.20170204-r4.ebuild 283 SHA256 6a4da95be2eb368fb9cac580e106a9203f977f5df0848f349eb58e3d40837ebc SHA512 1c626ba98228ee9c3f1537101447ed4035568adc2a006226e16e9a0fddea8216ce24ab31d815df0e9fa9add3c20e4ca371ad67caa2b06e071ae1612aaab84b2f WHIRLPOOL dfa3b1e33b23d8d9fadf22fdb26d55220f809285d2c81d06c05294dabbab20b5bbe38f4bbaec33cf1b4de164d42df7892b6f929c2d96a2dc39d84967336433be
-EBUILD selinux-chronyd-2.20170805-r2.ebuild 283 SHA256 6a4da95be2eb368fb9cac580e106a9203f977f5df0848f349eb58e3d40837ebc SHA512 1c626ba98228ee9c3f1537101447ed4035568adc2a006226e16e9a0fddea8216ce24ab31d815df0e9fa9add3c20e4ca371ad67caa2b06e071ae1612aaab84b2f WHIRLPOOL dfa3b1e33b23d8d9fadf22fdb26d55220f809285d2c81d06c05294dabbab20b5bbe38f4bbaec33cf1b4de164d42df7892b6f929c2d96a2dc39d84967336433be
-EBUILD selinux-chronyd-9999.ebuild 285 SHA256 55ff7e24d56ae81f50bac574e6fffd71888dc7c32b86c184f02d0e6764503f70 SHA512 97a8eb32a894a812ee7edb1296401075af2aa26f833a80f583d538abb3c6923d8cf23a080d54373cb9a30dddeaea8e00cd08f3f18ccb683166ae87b74166f8fa WHIRLPOOL ebb95ff89fc247dec826016960dbe92349fdc08fe144f70d510a9fed6795a6e9efdc87010a0e61a006de2d9bbc0b575766fa7bddf75fad764e7173a24b818b80
+EBUILD selinux-chronyd-2.20170204-r1.ebuild 286 SHA256 4ca5f0215ab565b50544754f72d55eeb0ad561790a58084c0e0f628e14cd1fc8 SHA512 f53c87cfa595925f0b6f109bf91632184be76b1fe0c7a7ed5086963646b9c74ace1a7d4725ba357f7eeef77a7f9dc7d89af8308ad423b24019cc35c13198acbe WHIRLPOOL 53747291b32a834afb7f618465655847618689b45bd571d17de821b55694556c94b5700ad911a61574da6684d275a76f6c837e7f0139f78280aa7633cc1f02c3
+EBUILD selinux-chronyd-2.20170204-r2.ebuild 284 SHA256 ffb17c80438c48891212c38439442a97abecc0daf4fb53119cbb2e0966be402d SHA512 35ce841f97a197fb78648d25be1a188670424cb07ecc1a20682a70004fc16fdc33bd60190e4d0228de12edf4ac52f42fba3b03dfc80a8aa7527c39724331604a WHIRLPOOL 1335732153adcc3faee1aa12916ab85d1f815eac5d8b68579c6c7bcf60ba401918dba7edb9af6758ed8d354bebeed578b9fce1501af239335266c791f2e6e001
+EBUILD selinux-chronyd-2.20170204-r3.ebuild 284 SHA256 ffb17c80438c48891212c38439442a97abecc0daf4fb53119cbb2e0966be402d SHA512 35ce841f97a197fb78648d25be1a188670424cb07ecc1a20682a70004fc16fdc33bd60190e4d0228de12edf4ac52f42fba3b03dfc80a8aa7527c39724331604a WHIRLPOOL 1335732153adcc3faee1aa12916ab85d1f815eac5d8b68579c6c7bcf60ba401918dba7edb9af6758ed8d354bebeed578b9fce1501af239335266c791f2e6e001
+EBUILD selinux-chronyd-2.20170204-r4.ebuild 284 SHA256 ffb17c80438c48891212c38439442a97abecc0daf4fb53119cbb2e0966be402d SHA512 35ce841f97a197fb78648d25be1a188670424cb07ecc1a20682a70004fc16fdc33bd60190e4d0228de12edf4ac52f42fba3b03dfc80a8aa7527c39724331604a WHIRLPOOL 1335732153adcc3faee1aa12916ab85d1f815eac5d8b68579c6c7bcf60ba401918dba7edb9af6758ed8d354bebeed578b9fce1501af239335266c791f2e6e001
+EBUILD selinux-chronyd-2.20170805-r2.ebuild 284 SHA256 ffb17c80438c48891212c38439442a97abecc0daf4fb53119cbb2e0966be402d SHA512 35ce841f97a197fb78648d25be1a188670424cb07ecc1a20682a70004fc16fdc33bd60190e4d0228de12edf4ac52f42fba3b03dfc80a8aa7527c39724331604a WHIRLPOOL 1335732153adcc3faee1aa12916ab85d1f815eac5d8b68579c6c7bcf60ba401918dba7edb9af6758ed8d354bebeed578b9fce1501af239335266c791f2e6e001
+EBUILD selinux-chronyd-2.20170805-r3.ebuild 286 SHA256 4ca5f0215ab565b50544754f72d55eeb0ad561790a58084c0e0f628e14cd1fc8 SHA512 f53c87cfa595925f0b6f109bf91632184be76b1fe0c7a7ed5086963646b9c74ace1a7d4725ba357f7eeef77a7f9dc7d89af8308ad423b24019cc35c13198acbe WHIRLPOOL 53747291b32a834afb7f618465655847618689b45bd571d17de821b55694556c94b5700ad911a61574da6684d275a76f6c837e7f0139f78280aa7633cc1f02c3
+EBUILD selinux-chronyd-9999.ebuild 286 SHA256 4ca5f0215ab565b50544754f72d55eeb0ad561790a58084c0e0f628e14cd1fc8 SHA512 f53c87cfa595925f0b6f109bf91632184be76b1fe0c7a7ed5086963646b9c74ace1a7d4725ba357f7eeef77a7f9dc7d89af8308ad423b24019cc35c13198acbe WHIRLPOOL 53747291b32a834afb7f618465655847618689b45bd571d17de821b55694556c94b5700ad911a61574da6684d275a76f6c837e7f0139f78280aa7633cc1f02c3
 MISC ChangeLog 10687 SHA256 11f5037d9525853ab566e5cddef5fac6976307d4d11ba284ed9da93d6f59ab2c SHA512 b1cc5e0a57b28e849fa211d971acb539256e4dabbcc1f4cda24832d68a37a93aff742a2ff36ed7e0c7ce2b84ba599f7e264de79cb4985f674153459c332c7189 WHIRLPOOL 37d90bd022001cd51d68055fc5d66a7f974eb6d89d9b9c2ce5c07924feb03d5190487743b5961a3420a0804d268df049ce1cb4a8e7e72182d9494e94c194fb43
 MISC ChangeLog-2015 9977 SHA256 6dc9461e8a0e9a3bfea77035e0c64bcf7d9a8650c03078516e523fa2e579635b SHA512 3fd0396d1eb2d47ef0541554ab9533fa67375520d96963fcec6ab5181e5cb3fe0511c8729a10be200a4500c8c4f1b22e8f59511526c6ad7450d64bd70f228601 WHIRLPOOL ecba33f88f9b53b1393cc29438fa5d9506f4ed3d1086d924c2649636e4c38d951b8f189f318e0f0d5d186fc7fc74f2e15a10759c3a8e8c03683b8533ab2daeae
 MISC metadata.xml 317 SHA256 00fa1bdbde70cf6f4aad7284054e5a0bc71546bbbc9e2ad45fc4ce6a667d30e9 SHA512 567ce0e458597f415e01f706a700f210e033acf7887684adc26a51f57e8587a6b48a74c75cee937d0a69123ad4884a0e1e889a5227989681349564f9d02b4c85 WHIRLPOOL f513f544b7ce3a0757ab27c9adf949713b85b469bef9e3bca13565c67885243a35338279d90349667143538a1ce88a16ab810d942a9d3893e643c5b6a96732c5
diff --git a/sec-policy/selinux-chronyd/selinux-chronyd-2.20170204-r1.ebuild b/sec-policy/selinux-chronyd/selinux-chronyd-2.20170204-r1.ebuild
index 5eca1a0e6db5..e8394421bf40 100644
--- a/sec-policy/selinux-chronyd/selinux-chronyd-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-chronyd/selinux-chronyd-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-chronyd/selinux-chronyd-2.20170204-r2.ebuild b/sec-policy/selinux-chronyd/selinux-chronyd-2.20170204-r2.ebuild
index 5e7171749655..d1960499b90d 100644
--- a/sec-policy/selinux-chronyd/selinux-chronyd-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-chronyd/selinux-chronyd-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-chronyd/selinux-chronyd-2.20170204-r3.ebuild b/sec-policy/selinux-chronyd/selinux-chronyd-2.20170204-r3.ebuild
index 5e7171749655..d1960499b90d 100644
--- a/sec-policy/selinux-chronyd/selinux-chronyd-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-chronyd/selinux-chronyd-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-chronyd/selinux-chronyd-2.20170204-r4.ebuild b/sec-policy/selinux-chronyd/selinux-chronyd-2.20170204-r4.ebuild
index 5e7171749655..d1960499b90d 100644
--- a/sec-policy/selinux-chronyd/selinux-chronyd-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-chronyd/selinux-chronyd-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-chronyd/selinux-chronyd-2.20170805-r2.ebuild b/sec-policy/selinux-chronyd/selinux-chronyd-2.20170805-r2.ebuild
index 5e7171749655..d1960499b90d 100644
--- a/sec-policy/selinux-chronyd/selinux-chronyd-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-chronyd/selinux-chronyd-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-chronyd/selinux-chronyd-2.20170805-r3.ebuild b/sec-policy/selinux-chronyd/selinux-chronyd-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..e8394421bf40
--- /dev/null
+++ b/sec-policy/selinux-chronyd/selinux-chronyd-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-chronyd/selinux-chronyd-9999.ebuild b/sec-policy/selinux-chronyd/selinux-chronyd-9999.ebuild
index 5eca1a0e6db5..e8394421bf40 100644
--- a/sec-policy/selinux-chronyd/selinux-chronyd-9999.ebuild
+++ b/sec-policy/selinux-chronyd/selinux-chronyd-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-clamav/Manifest b/sec-policy/selinux-clamav/Manifest
index 8068e06f387d..dd24312c0b9a 100644
--- a/sec-policy/selinux-clamav/Manifest
+++ b/sec-policy/selinux-clamav/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-clamav-2.20170204-r1.ebuild 283 SHA256 530c431d3c7071b953eeb6cb4ee1fbe9eda5883688399460264a050bfcdfeae6 SHA512 b322773a5cd4a3235a2ae6960192bb438b3fdf0e72450e9313b0444c7471e6c94276b6b59bc22e52642a3983009fab34235c83b6bbc8bef4ae9b7d7263de322a WHIRLPOOL cf345a5323458acc0510c2b62431daa8283275337d8c1097a3f27edc17cc864ae5c803bed9273fbb67105ceabd370dd274fa3e2f44347edaae35d2de0e0eb4d1
-EBUILD selinux-clamav-2.20170204-r2.ebuild 281 SHA256 c30a8f679def3ef8c9bc1c4df184f671e3479aa185f1dfa2566c8424c6c76bbf SHA512 fc48b4f67f218c85887f1dd87d4a02f3373e216140fed4b81ca69c217dde28596c5c758943da382e00b196c03969509d09cebfeaef1bb099ae148e7693fbfb96 WHIRLPOOL 7a1982f56e6c7543b9891517d5cc07b6bb085f297a55efce1c2a915e692f3093bcb939830d046e34ff5e6b11ebccff23241ef0dce9c40a3bab38623bc62a7f68
-EBUILD selinux-clamav-2.20170204-r3.ebuild 281 SHA256 c30a8f679def3ef8c9bc1c4df184f671e3479aa185f1dfa2566c8424c6c76bbf SHA512 fc48b4f67f218c85887f1dd87d4a02f3373e216140fed4b81ca69c217dde28596c5c758943da382e00b196c03969509d09cebfeaef1bb099ae148e7693fbfb96 WHIRLPOOL 7a1982f56e6c7543b9891517d5cc07b6bb085f297a55efce1c2a915e692f3093bcb939830d046e34ff5e6b11ebccff23241ef0dce9c40a3bab38623bc62a7f68
-EBUILD selinux-clamav-2.20170204-r4.ebuild 281 SHA256 c30a8f679def3ef8c9bc1c4df184f671e3479aa185f1dfa2566c8424c6c76bbf SHA512 fc48b4f67f218c85887f1dd87d4a02f3373e216140fed4b81ca69c217dde28596c5c758943da382e00b196c03969509d09cebfeaef1bb099ae148e7693fbfb96 WHIRLPOOL 7a1982f56e6c7543b9891517d5cc07b6bb085f297a55efce1c2a915e692f3093bcb939830d046e34ff5e6b11ebccff23241ef0dce9c40a3bab38623bc62a7f68
-EBUILD selinux-clamav-2.20170805-r2.ebuild 281 SHA256 c30a8f679def3ef8c9bc1c4df184f671e3479aa185f1dfa2566c8424c6c76bbf SHA512 fc48b4f67f218c85887f1dd87d4a02f3373e216140fed4b81ca69c217dde28596c5c758943da382e00b196c03969509d09cebfeaef1bb099ae148e7693fbfb96 WHIRLPOOL 7a1982f56e6c7543b9891517d5cc07b6bb085f297a55efce1c2a915e692f3093bcb939830d046e34ff5e6b11ebccff23241ef0dce9c40a3bab38623bc62a7f68
-EBUILD selinux-clamav-9999.ebuild 283 SHA256 530c431d3c7071b953eeb6cb4ee1fbe9eda5883688399460264a050bfcdfeae6 SHA512 b322773a5cd4a3235a2ae6960192bb438b3fdf0e72450e9313b0444c7471e6c94276b6b59bc22e52642a3983009fab34235c83b6bbc8bef4ae9b7d7263de322a WHIRLPOOL cf345a5323458acc0510c2b62431daa8283275337d8c1097a3f27edc17cc864ae5c803bed9273fbb67105ceabd370dd274fa3e2f44347edaae35d2de0e0eb4d1
+EBUILD selinux-clamav-2.20170204-r1.ebuild 284 SHA256 2f798ccb8dc0cfbe8f35f0e07a0d97f1113c9ea93e54029f6f2378436be5738a SHA512 41181ad8ee7b2b5cdda4c31ceab788339e52d70dd878ef8a8e76f4f2b9b673ad8175b5edb98e558b49af36c027d48f7eb09449f63fca011eba4d44537a841124 WHIRLPOOL 223572103e2e5afba3aaeac65d27e7a295b14f1040d41bf8c5b84ea7767c28d9a4fa5788ea80bd0e9fddf98efd1fac3ccc50e5ec0097ada52bceb6402324321c
+EBUILD selinux-clamav-2.20170204-r2.ebuild 282 SHA256 0c87c9f4a8c34de1487c8ea87a5fdac2da77ca4c0f3c46ee8b69c914c7db0fea SHA512 e5d6609195b663d687284b407d044aa1fadaf8057d29cc58cd10270b9a73871da92802b94eddb0db6535109aa3b45d48972e32c202771f375f4f2c7fea90d3f2 WHIRLPOOL b0468d6ff789cf94642f96da1b720ad6fab0bda70580e5071a90550ba6488f323b1732299cd4b70e17ed2c0c67305229ad0f4217c96813b87c2f9b06948c3821
+EBUILD selinux-clamav-2.20170204-r3.ebuild 282 SHA256 0c87c9f4a8c34de1487c8ea87a5fdac2da77ca4c0f3c46ee8b69c914c7db0fea SHA512 e5d6609195b663d687284b407d044aa1fadaf8057d29cc58cd10270b9a73871da92802b94eddb0db6535109aa3b45d48972e32c202771f375f4f2c7fea90d3f2 WHIRLPOOL b0468d6ff789cf94642f96da1b720ad6fab0bda70580e5071a90550ba6488f323b1732299cd4b70e17ed2c0c67305229ad0f4217c96813b87c2f9b06948c3821
+EBUILD selinux-clamav-2.20170204-r4.ebuild 282 SHA256 0c87c9f4a8c34de1487c8ea87a5fdac2da77ca4c0f3c46ee8b69c914c7db0fea SHA512 e5d6609195b663d687284b407d044aa1fadaf8057d29cc58cd10270b9a73871da92802b94eddb0db6535109aa3b45d48972e32c202771f375f4f2c7fea90d3f2 WHIRLPOOL b0468d6ff789cf94642f96da1b720ad6fab0bda70580e5071a90550ba6488f323b1732299cd4b70e17ed2c0c67305229ad0f4217c96813b87c2f9b06948c3821
+EBUILD selinux-clamav-2.20170805-r2.ebuild 282 SHA256 0c87c9f4a8c34de1487c8ea87a5fdac2da77ca4c0f3c46ee8b69c914c7db0fea SHA512 e5d6609195b663d687284b407d044aa1fadaf8057d29cc58cd10270b9a73871da92802b94eddb0db6535109aa3b45d48972e32c202771f375f4f2c7fea90d3f2 WHIRLPOOL b0468d6ff789cf94642f96da1b720ad6fab0bda70580e5071a90550ba6488f323b1732299cd4b70e17ed2c0c67305229ad0f4217c96813b87c2f9b06948c3821
+EBUILD selinux-clamav-2.20170805-r3.ebuild 284 SHA256 2f798ccb8dc0cfbe8f35f0e07a0d97f1113c9ea93e54029f6f2378436be5738a SHA512 41181ad8ee7b2b5cdda4c31ceab788339e52d70dd878ef8a8e76f4f2b9b673ad8175b5edb98e558b49af36c027d48f7eb09449f63fca011eba4d44537a841124 WHIRLPOOL 223572103e2e5afba3aaeac65d27e7a295b14f1040d41bf8c5b84ea7767c28d9a4fa5788ea80bd0e9fddf98efd1fac3ccc50e5ec0097ada52bceb6402324321c
+EBUILD selinux-clamav-9999.ebuild 284 SHA256 2f798ccb8dc0cfbe8f35f0e07a0d97f1113c9ea93e54029f6f2378436be5738a SHA512 41181ad8ee7b2b5cdda4c31ceab788339e52d70dd878ef8a8e76f4f2b9b673ad8175b5edb98e558b49af36c027d48f7eb09449f63fca011eba4d44537a841124 WHIRLPOOL 223572103e2e5afba3aaeac65d27e7a295b14f1040d41bf8c5b84ea7767c28d9a4fa5788ea80bd0e9fddf98efd1fac3ccc50e5ec0097ada52bceb6402324321c
 MISC ChangeLog 10571 SHA256 a915871970586c932c0f6fdc14c3a1fbc490a87710bc254954afe299ef06f0d5 SHA512 23e3fed2cd0785c1c7bb86981a3347a83cbc44544f003a198e76526d81b594b4a9d50c68c4cd1822cdce96c5af50997853ebc16ee7973dcb3e2fc3e24cb99185 WHIRLPOOL d1b90d685efe162aedac098629ead1f0456b01bdf06a35231e58d891a05225675315f496ed1db1a96db89883e547f86cb523202e9ec3f9ca91c183c5c9ac014f
 MISC ChangeLog-2015 13436 SHA256 e61306561eb7ff3b0bcd1fc8db1cb7ec3f586316d43e8492932f79fe75dcd449 SHA512 f5c771e12755db7e0ebffb69d7e02b86ddc6a14ccdda5a0103a70df827854f91ba420a7fe78f4b42ec330fd35ae9666e0e2660c8086f586f4ae2e82fa73e9b04 WHIRLPOOL 94b553541b047324120a8b96fdff482f536a1b8b592956885a35bb0ff050be95285786f4bfdba2ffab1c9c26b69b2bc55d16c05be5397c5fed1798760d6ad6af
 MISC metadata.xml 316 SHA256 700e4a4e2e4085a327ca74dc30215926b3082b7c8f9837aca9d15f54dae2bc97 SHA512 f1979723a6f2267cb7614e961f3af14fb84e05912d27c2a153695abb993c4d406c9558c12a3cc1ea1e44b7592dcbdf28573708fcb27cf5defa0608c58f00fbd7 WHIRLPOOL 43f8a23b46f181af33ce5298e5f3d859b65a15a74a0cc59796f81ec2d7ebbd58d760d7c36c2d44bb59317d3c4c596d750359fdde5160462410821329c6416051
diff --git a/sec-policy/selinux-clamav/selinux-clamav-2.20170204-r1.ebuild b/sec-policy/selinux-clamav/selinux-clamav-2.20170204-r1.ebuild
index 17e5fb448e43..cc2182e6c321 100644
--- a/sec-policy/selinux-clamav/selinux-clamav-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-clamav/selinux-clamav-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-clamav/selinux-clamav-2.20170204-r2.ebuild b/sec-policy/selinux-clamav/selinux-clamav-2.20170204-r2.ebuild
index 1dc69503bca8..cf4980f98ff0 100644
--- a/sec-policy/selinux-clamav/selinux-clamav-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-clamav/selinux-clamav-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-clamav/selinux-clamav-2.20170204-r3.ebuild b/sec-policy/selinux-clamav/selinux-clamav-2.20170204-r3.ebuild
index 1dc69503bca8..cf4980f98ff0 100644
--- a/sec-policy/selinux-clamav/selinux-clamav-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-clamav/selinux-clamav-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-clamav/selinux-clamav-2.20170204-r4.ebuild b/sec-policy/selinux-clamav/selinux-clamav-2.20170204-r4.ebuild
index 1dc69503bca8..cf4980f98ff0 100644
--- a/sec-policy/selinux-clamav/selinux-clamav-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-clamav/selinux-clamav-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-clamav/selinux-clamav-2.20170805-r2.ebuild b/sec-policy/selinux-clamav/selinux-clamav-2.20170805-r2.ebuild
index 1dc69503bca8..cf4980f98ff0 100644
--- a/sec-policy/selinux-clamav/selinux-clamav-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-clamav/selinux-clamav-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-clamav/selinux-clamav-2.20170805-r3.ebuild b/sec-policy/selinux-clamav/selinux-clamav-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..cc2182e6c321
--- /dev/null
+++ b/sec-policy/selinux-clamav/selinux-clamav-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-clamav/selinux-clamav-9999.ebuild b/sec-policy/selinux-clamav/selinux-clamav-9999.ebuild
index 17e5fb448e43..cc2182e6c321 100644
--- a/sec-policy/selinux-clamav/selinux-clamav-9999.ebuild
+++ b/sec-policy/selinux-clamav/selinux-clamav-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-clockspeed/Manifest b/sec-policy/selinux-clockspeed/Manifest
index 849507cc4247..8623f5aa8d92 100644
--- a/sec-policy/selinux-clockspeed/Manifest
+++ b/sec-policy/selinux-clockspeed/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-clockspeed-2.20170204-r1.ebuild 291 SHA256 921b6e6200164fbd95b367ed88b19fe21063ad3203ab109efd47e3cd0e3d1c9d SHA512 7b29e0d454a61e28679777a4b6a35633df53995ed503339928b7b10b4f34ceb40e1f85c70f1cd66064f962cd74cdf3fdb97d79a342a16dd4db2428cd9eb9355c WHIRLPOOL 8b540658247bb672967686bb0c624f9928ce50013e76a01c14b033a5cb2de55511b22f9cf3fc4644279ce7aaff0171d6e1d91de30370822c06ad1123b4d2a708
-EBUILD selinux-clockspeed-2.20170204-r2.ebuild 289 SHA256 fdab465d6307cc8326f574f275d8f9805d305480681f02e08571f56a2d77f00f SHA512 243f06b7d0a4cf5940e500d03873c2c96d9783dbd9494179ce66d983ac5361153491578b7890ac2734ac7d6de4b605c9c75fcd607c0c6e5e9dd1443085bda336 WHIRLPOOL bfec678ec0d78a6dc382ce9fbcb24a3248f318f4d17f725b0a1307974ad39247de171a8ece8176d43ece61c54fd5a042f454fe3e5a9a16949354e8bcbe7ccd4c
-EBUILD selinux-clockspeed-2.20170204-r3.ebuild 289 SHA256 fdab465d6307cc8326f574f275d8f9805d305480681f02e08571f56a2d77f00f SHA512 243f06b7d0a4cf5940e500d03873c2c96d9783dbd9494179ce66d983ac5361153491578b7890ac2734ac7d6de4b605c9c75fcd607c0c6e5e9dd1443085bda336 WHIRLPOOL bfec678ec0d78a6dc382ce9fbcb24a3248f318f4d17f725b0a1307974ad39247de171a8ece8176d43ece61c54fd5a042f454fe3e5a9a16949354e8bcbe7ccd4c
-EBUILD selinux-clockspeed-2.20170204-r4.ebuild 289 SHA256 fdab465d6307cc8326f574f275d8f9805d305480681f02e08571f56a2d77f00f SHA512 243f06b7d0a4cf5940e500d03873c2c96d9783dbd9494179ce66d983ac5361153491578b7890ac2734ac7d6de4b605c9c75fcd607c0c6e5e9dd1443085bda336 WHIRLPOOL bfec678ec0d78a6dc382ce9fbcb24a3248f318f4d17f725b0a1307974ad39247de171a8ece8176d43ece61c54fd5a042f454fe3e5a9a16949354e8bcbe7ccd4c
-EBUILD selinux-clockspeed-2.20170805-r2.ebuild 289 SHA256 fdab465d6307cc8326f574f275d8f9805d305480681f02e08571f56a2d77f00f SHA512 243f06b7d0a4cf5940e500d03873c2c96d9783dbd9494179ce66d983ac5361153491578b7890ac2734ac7d6de4b605c9c75fcd607c0c6e5e9dd1443085bda336 WHIRLPOOL bfec678ec0d78a6dc382ce9fbcb24a3248f318f4d17f725b0a1307974ad39247de171a8ece8176d43ece61c54fd5a042f454fe3e5a9a16949354e8bcbe7ccd4c
-EBUILD selinux-clockspeed-9999.ebuild 291 SHA256 921b6e6200164fbd95b367ed88b19fe21063ad3203ab109efd47e3cd0e3d1c9d SHA512 7b29e0d454a61e28679777a4b6a35633df53995ed503339928b7b10b4f34ceb40e1f85c70f1cd66064f962cd74cdf3fdb97d79a342a16dd4db2428cd9eb9355c WHIRLPOOL 8b540658247bb672967686bb0c624f9928ce50013e76a01c14b033a5cb2de55511b22f9cf3fc4644279ce7aaff0171d6e1d91de30370822c06ad1123b4d2a708
+EBUILD selinux-clockspeed-2.20170204-r1.ebuild 292 SHA256 635806cdf527d443ea96dbe4d27e2f3c25034067716646b966088e15e0e71ae2 SHA512 661ac8ce4cfd795057a4991c4a733004801eda5c68819c7551a0b1a68962ff8163e38c9d17a0b4e1b68372f6055a287e06dea4a25f461e9695e8e54494135c1c WHIRLPOOL 4088d4f864516e28f35628dd850cb336586b034091b78b500b44f7ab7c6e72ea16294b2820e9d974e333377a6e22631c28354c55d9eee7afe63689371171c8e5
+EBUILD selinux-clockspeed-2.20170204-r2.ebuild 290 SHA256 31b29eb145a565888bc0fdc55cc6cdbb85576f39c6bf2e5ffd988e03b5fc9fda SHA512 23566f25eac5ec927aa59e9159e5c0e58704870aa2b0055c225165c52b0ff6d12031ca6c7a7624179f3e150289ec478c97da243351c36570b10de68843a9505b WHIRLPOOL 04f32fa51eb7876c9a945a5cdab6a6892b9affc5a04a14ebdacd91d335262a43b25ca2ef048a77110b81b0c26c67fc7df9b0d7341e278f4e8574fbbddcc9e72a
+EBUILD selinux-clockspeed-2.20170204-r3.ebuild 290 SHA256 31b29eb145a565888bc0fdc55cc6cdbb85576f39c6bf2e5ffd988e03b5fc9fda SHA512 23566f25eac5ec927aa59e9159e5c0e58704870aa2b0055c225165c52b0ff6d12031ca6c7a7624179f3e150289ec478c97da243351c36570b10de68843a9505b WHIRLPOOL 04f32fa51eb7876c9a945a5cdab6a6892b9affc5a04a14ebdacd91d335262a43b25ca2ef048a77110b81b0c26c67fc7df9b0d7341e278f4e8574fbbddcc9e72a
+EBUILD selinux-clockspeed-2.20170204-r4.ebuild 290 SHA256 31b29eb145a565888bc0fdc55cc6cdbb85576f39c6bf2e5ffd988e03b5fc9fda SHA512 23566f25eac5ec927aa59e9159e5c0e58704870aa2b0055c225165c52b0ff6d12031ca6c7a7624179f3e150289ec478c97da243351c36570b10de68843a9505b WHIRLPOOL 04f32fa51eb7876c9a945a5cdab6a6892b9affc5a04a14ebdacd91d335262a43b25ca2ef048a77110b81b0c26c67fc7df9b0d7341e278f4e8574fbbddcc9e72a
+EBUILD selinux-clockspeed-2.20170805-r2.ebuild 290 SHA256 31b29eb145a565888bc0fdc55cc6cdbb85576f39c6bf2e5ffd988e03b5fc9fda SHA512 23566f25eac5ec927aa59e9159e5c0e58704870aa2b0055c225165c52b0ff6d12031ca6c7a7624179f3e150289ec478c97da243351c36570b10de68843a9505b WHIRLPOOL 04f32fa51eb7876c9a945a5cdab6a6892b9affc5a04a14ebdacd91d335262a43b25ca2ef048a77110b81b0c26c67fc7df9b0d7341e278f4e8574fbbddcc9e72a
+EBUILD selinux-clockspeed-2.20170805-r3.ebuild 292 SHA256 635806cdf527d443ea96dbe4d27e2f3c25034067716646b966088e15e0e71ae2 SHA512 661ac8ce4cfd795057a4991c4a733004801eda5c68819c7551a0b1a68962ff8163e38c9d17a0b4e1b68372f6055a287e06dea4a25f461e9695e8e54494135c1c WHIRLPOOL 4088d4f864516e28f35628dd850cb336586b034091b78b500b44f7ab7c6e72ea16294b2820e9d974e333377a6e22631c28354c55d9eee7afe63689371171c8e5
+EBUILD selinux-clockspeed-9999.ebuild 292 SHA256 635806cdf527d443ea96dbe4d27e2f3c25034067716646b966088e15e0e71ae2 SHA512 661ac8ce4cfd795057a4991c4a733004801eda5c68819c7551a0b1a68962ff8163e38c9d17a0b4e1b68372f6055a287e06dea4a25f461e9695e8e54494135c1c WHIRLPOOL 4088d4f864516e28f35628dd850cb336586b034091b78b500b44f7ab7c6e72ea16294b2820e9d974e333377a6e22631c28354c55d9eee7afe63689371171c8e5
 MISC ChangeLog 10979 SHA256 f1993fa3f5c83e9f43a8d63dc7ba535b197080b1a804d18d5d2d1d60fc16d8c7 SHA512 db3db81e5f685316e8819722218e49eee960034129c0c2044dfc3239b2bbe9e33cd4ef94d1a6c5e4689f4d3ce7bb37036bd4ac8832b54a0eaceaec21352a7097 WHIRLPOOL 7cda5383ebc1ec28d0579e4ec1ca7247a99f22a24c14489a95b6d37dcd451585bbb9d414770426c2a66b2ca7769ed6d4c4d80a905f9c993d2f079419d519a907
 MISC ChangeLog-2015 14255 SHA256 b653fc9e83ee7b2a6ac80aa0d8e941dee7123f8fd495851a0c35167591635abc SHA512 03169233d7e24ee30a14b29602abf1ba4f940298b3a093d304ceccafd3ce7609447085e2ecfb6aff3aa67f548bd9bac9fced4a0205ef1746ad4a16dcb1b9a267 WHIRLPOOL 908f481c1f2fc1aa070d53cc37991279951ca99a0248ad9643050a7a272bf1e8d1341bb242f9e7cc0cc61ea1492ba39440032fa50e9ec59c54e9cfd98eec507a
 MISC metadata.xml 320 SHA256 7df3733060e2dfcdee0b3d348bcd7a5eb4e2921476f526f4d21d4842a30eb478 SHA512 7bafbbd72540c4ce4cda253f41f30180c5eaad307c5f53b87e0415587e2aa119204daed097e2db7d3ab025d48313ad4b0c9e5af5e1b0d31b640e099fe7ef3254 WHIRLPOOL 6ed783669f82103641b79b2c5ae64daa29bf1c3c361876af1099375d35590bd55fc90d9b738b6a97e961cf485aa384805446d4acdc35537066538ae89aca6d5a
diff --git a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20170204-r1.ebuild b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20170204-r1.ebuild
index 5906e0239a8b..748170655bd3 100644
--- a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20170204-r2.ebuild b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20170204-r2.ebuild
index bed8a5b5b6d3..9818b65bed95 100644
--- a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20170204-r3.ebuild b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20170204-r3.ebuild
index bed8a5b5b6d3..9818b65bed95 100644
--- a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20170204-r4.ebuild b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20170204-r4.ebuild
index bed8a5b5b6d3..9818b65bed95 100644
--- a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20170805-r2.ebuild b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20170805-r2.ebuild
index bed8a5b5b6d3..9818b65bed95 100644
--- a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20170805-r3.ebuild b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..748170655bd3
--- /dev/null
+++ b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-clockspeed/selinux-clockspeed-9999.ebuild b/sec-policy/selinux-clockspeed/selinux-clockspeed-9999.ebuild
index 5906e0239a8b..748170655bd3 100644
--- a/sec-policy/selinux-clockspeed/selinux-clockspeed-9999.ebuild
+++ b/sec-policy/selinux-clockspeed/selinux-clockspeed-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-collectd/Manifest b/sec-policy/selinux-collectd/Manifest
index e435985fce91..fd3f393aace8 100644
--- a/sec-policy/selinux-collectd/Manifest
+++ b/sec-policy/selinux-collectd/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-collectd-2.20170204-r1.ebuild 385 SHA256 35e1c12b07f4ae7427eb1015acd5490bc83b1ddcb3ba08f42deddd76b508060b SHA512 416b9e59b62b0961450bd5ec0952f1152539910d21ce1f8a03c9f95a3bd58c9d423e309c27f4cf4353e26f226b9797fa5a0d420604e56a6b6d5efa2c80415da2 WHIRLPOOL aaa05047929678042758cde34d3d9cda3c0c27e95cf8352232bc2cb7318dcae3e3915a629ad9fe1964306f09220ef006414e89c15ec31e3871adb328538e3965
-EBUILD selinux-collectd-2.20170204-r2.ebuild 383 SHA256 80931aeefefadb917ae4dbdf8ccfdb5a9fc95a035d535be78cabdde99d8b7111 SHA512 868ab23f2086e297397500c831fb9d796d8bd5e290084eec4f0f80aab97cbf4960c2dd94a60a2c4eb00bd30b4ad3feea2665c08987b27871c378704a82a5197a WHIRLPOOL 29c0df36b9031f7852bd034f23e9c1c9cc44881016fbc032dd93b9107e4afaa8caf1748a5b73f51fc5f1d67dae5aaee8af0d51bbae90737c02c342c879b4f1b6
-EBUILD selinux-collectd-2.20170204-r3.ebuild 383 SHA256 80931aeefefadb917ae4dbdf8ccfdb5a9fc95a035d535be78cabdde99d8b7111 SHA512 868ab23f2086e297397500c831fb9d796d8bd5e290084eec4f0f80aab97cbf4960c2dd94a60a2c4eb00bd30b4ad3feea2665c08987b27871c378704a82a5197a WHIRLPOOL 29c0df36b9031f7852bd034f23e9c1c9cc44881016fbc032dd93b9107e4afaa8caf1748a5b73f51fc5f1d67dae5aaee8af0d51bbae90737c02c342c879b4f1b6
-EBUILD selinux-collectd-2.20170204-r4.ebuild 383 SHA256 80931aeefefadb917ae4dbdf8ccfdb5a9fc95a035d535be78cabdde99d8b7111 SHA512 868ab23f2086e297397500c831fb9d796d8bd5e290084eec4f0f80aab97cbf4960c2dd94a60a2c4eb00bd30b4ad3feea2665c08987b27871c378704a82a5197a WHIRLPOOL 29c0df36b9031f7852bd034f23e9c1c9cc44881016fbc032dd93b9107e4afaa8caf1748a5b73f51fc5f1d67dae5aaee8af0d51bbae90737c02c342c879b4f1b6
-EBUILD selinux-collectd-2.20170805-r2.ebuild 383 SHA256 80931aeefefadb917ae4dbdf8ccfdb5a9fc95a035d535be78cabdde99d8b7111 SHA512 868ab23f2086e297397500c831fb9d796d8bd5e290084eec4f0f80aab97cbf4960c2dd94a60a2c4eb00bd30b4ad3feea2665c08987b27871c378704a82a5197a WHIRLPOOL 29c0df36b9031f7852bd034f23e9c1c9cc44881016fbc032dd93b9107e4afaa8caf1748a5b73f51fc5f1d67dae5aaee8af0d51bbae90737c02c342c879b4f1b6
-EBUILD selinux-collectd-9999.ebuild 385 SHA256 35e1c12b07f4ae7427eb1015acd5490bc83b1ddcb3ba08f42deddd76b508060b SHA512 416b9e59b62b0961450bd5ec0952f1152539910d21ce1f8a03c9f95a3bd58c9d423e309c27f4cf4353e26f226b9797fa5a0d420604e56a6b6d5efa2c80415da2 WHIRLPOOL aaa05047929678042758cde34d3d9cda3c0c27e95cf8352232bc2cb7318dcae3e3915a629ad9fe1964306f09220ef006414e89c15ec31e3871adb328538e3965
+EBUILD selinux-collectd-2.20170204-r1.ebuild 386 SHA256 939152fc491cb27ad9c04ac6e07c9c8f531c855ffb1e414794fb5c1bb4019b60 SHA512 c2a06fd6c26ced5c718636b6f62a9b61c9daa888ed02921f7dce2899f6ae6e28ebebe8bc187937fda760fe625c8c261e864d78b24d40e6676fd26d1151fbb342 WHIRLPOOL 5fa296a59121bebc80bc9dc91d859326d42bc5d1e35030456424df0e1aadcc02f96ef7bb8c79ad90f1eb63c6889f3b067e35d4b488311e162626309a28e7b57c
+EBUILD selinux-collectd-2.20170204-r2.ebuild 384 SHA256 de9fe1375746e5b867ef54ef63aa40bc00ebcdca75ef79570a7ba64479a92d61 SHA512 e76aba36518e7080ca51093bd644ac296345dc5ed3f61b6b5a5b08f9bd2ea61ee9e7927269944bd09d54db13c3b9c4d09e722159cd1493b6cd49e0d2e317609d WHIRLPOOL de29af3b038b5f659a047c0e880f24ee2c53560dbfc76e635ad04b1202e1cbc8f8135c1b3bd09db55395f5f3af51ed922cde5946b1e2b17769a6b296e5997192
+EBUILD selinux-collectd-2.20170204-r3.ebuild 384 SHA256 de9fe1375746e5b867ef54ef63aa40bc00ebcdca75ef79570a7ba64479a92d61 SHA512 e76aba36518e7080ca51093bd644ac296345dc5ed3f61b6b5a5b08f9bd2ea61ee9e7927269944bd09d54db13c3b9c4d09e722159cd1493b6cd49e0d2e317609d WHIRLPOOL de29af3b038b5f659a047c0e880f24ee2c53560dbfc76e635ad04b1202e1cbc8f8135c1b3bd09db55395f5f3af51ed922cde5946b1e2b17769a6b296e5997192
+EBUILD selinux-collectd-2.20170204-r4.ebuild 384 SHA256 de9fe1375746e5b867ef54ef63aa40bc00ebcdca75ef79570a7ba64479a92d61 SHA512 e76aba36518e7080ca51093bd644ac296345dc5ed3f61b6b5a5b08f9bd2ea61ee9e7927269944bd09d54db13c3b9c4d09e722159cd1493b6cd49e0d2e317609d WHIRLPOOL de29af3b038b5f659a047c0e880f24ee2c53560dbfc76e635ad04b1202e1cbc8f8135c1b3bd09db55395f5f3af51ed922cde5946b1e2b17769a6b296e5997192
+EBUILD selinux-collectd-2.20170805-r2.ebuild 384 SHA256 de9fe1375746e5b867ef54ef63aa40bc00ebcdca75ef79570a7ba64479a92d61 SHA512 e76aba36518e7080ca51093bd644ac296345dc5ed3f61b6b5a5b08f9bd2ea61ee9e7927269944bd09d54db13c3b9c4d09e722159cd1493b6cd49e0d2e317609d WHIRLPOOL de29af3b038b5f659a047c0e880f24ee2c53560dbfc76e635ad04b1202e1cbc8f8135c1b3bd09db55395f5f3af51ed922cde5946b1e2b17769a6b296e5997192
+EBUILD selinux-collectd-2.20170805-r3.ebuild 386 SHA256 939152fc491cb27ad9c04ac6e07c9c8f531c855ffb1e414794fb5c1bb4019b60 SHA512 c2a06fd6c26ced5c718636b6f62a9b61c9daa888ed02921f7dce2899f6ae6e28ebebe8bc187937fda760fe625c8c261e864d78b24d40e6676fd26d1151fbb342 WHIRLPOOL 5fa296a59121bebc80bc9dc91d859326d42bc5d1e35030456424df0e1aadcc02f96ef7bb8c79ad90f1eb63c6889f3b067e35d4b488311e162626309a28e7b57c
+EBUILD selinux-collectd-9999.ebuild 386 SHA256 939152fc491cb27ad9c04ac6e07c9c8f531c855ffb1e414794fb5c1bb4019b60 SHA512 c2a06fd6c26ced5c718636b6f62a9b61c9daa888ed02921f7dce2899f6ae6e28ebebe8bc187937fda760fe625c8c261e864d78b24d40e6676fd26d1151fbb342 WHIRLPOOL 5fa296a59121bebc80bc9dc91d859326d42bc5d1e35030456424df0e1aadcc02f96ef7bb8c79ad90f1eb63c6889f3b067e35d4b488311e162626309a28e7b57c
 MISC ChangeLog 10793 SHA256 4f6452f51738175cf3ba0395b51ad19f253ae9e4c9bacdb393043c12681fc0a4 SHA512 a1935f51302eff2160b08862953ff6599401c58769befdff1b384e1fc729f49721e632c5d216b6a6dade98cc14bc9f39e85db24c3e77a3ca118dba4e07896622 WHIRLPOOL 7af357ba48422264f9fb3cbcc585fe488013a98541e92663504b9c1795a40e774860bcade97d3955c52d92104458b8e9d20b67f6bcd85cd60b2d9a7c98c6b4bf
 MISC ChangeLog-2015 4772 SHA256 a8a031531bb0a7f432ced46dc2f163ef61f9c2b24cc38cd554d6579b0325c86f SHA512 2eee4e5e37ab758d28e08dc7b641104e1d28f233ea7038e769b154c899c2a51c5f0e8bf38ebc2f5661239b6e837fbd37fc5a12d9985347bb199ccb16133d662a WHIRLPOOL 42309edbd6f995c8a737a1a2c41ff63ea0ba7277588c63203a28b8c9cd55864dc6c577b401a12ed57c40576c9c45b9bde8916760e2b6e05720e6ae4e5c93465b
 MISC metadata.xml 318 SHA256 905032e7d0982779a9b53cdf165cf755e4c6a5e281b9cb09388b01fd3837031e SHA512 6da5121253ae7018f81cc66a816a364e836e226e2e679f245acd61d6bdbe5fed013032bc4d3f38b917a4372a436ee08b53d0c379b9daa3f8ef6c7797fcd59b54 WHIRLPOOL 036e1f810a866b4a2c3a97c3014f7aae3512a39cdfa9d9b7d62b193c44e6d819932236848db6f897976954aa36a8246ef44229825a514c11fb64003d5dc2d797
diff --git a/sec-policy/selinux-collectd/selinux-collectd-2.20170204-r1.ebuild b/sec-policy/selinux-collectd/selinux-collectd-2.20170204-r1.ebuild
index 96bf89365d63..814ff4a9f1b1 100644
--- a/sec-policy/selinux-collectd/selinux-collectd-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-collectd/selinux-collectd-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-collectd/selinux-collectd-2.20170204-r2.ebuild b/sec-policy/selinux-collectd/selinux-collectd-2.20170204-r2.ebuild
index e7b491fb3a33..8ff30ae5f2e1 100644
--- a/sec-policy/selinux-collectd/selinux-collectd-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-collectd/selinux-collectd-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-collectd/selinux-collectd-2.20170204-r3.ebuild b/sec-policy/selinux-collectd/selinux-collectd-2.20170204-r3.ebuild
index e7b491fb3a33..8ff30ae5f2e1 100644
--- a/sec-policy/selinux-collectd/selinux-collectd-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-collectd/selinux-collectd-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-collectd/selinux-collectd-2.20170204-r4.ebuild b/sec-policy/selinux-collectd/selinux-collectd-2.20170204-r4.ebuild
index e7b491fb3a33..8ff30ae5f2e1 100644
--- a/sec-policy/selinux-collectd/selinux-collectd-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-collectd/selinux-collectd-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-collectd/selinux-collectd-2.20170805-r2.ebuild b/sec-policy/selinux-collectd/selinux-collectd-2.20170805-r2.ebuild
index e7b491fb3a33..8ff30ae5f2e1 100644
--- a/sec-policy/selinux-collectd/selinux-collectd-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-collectd/selinux-collectd-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-collectd/selinux-collectd-2.20170805-r3.ebuild b/sec-policy/selinux-collectd/selinux-collectd-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..814ff4a9f1b1
--- /dev/null
+++ b/sec-policy/selinux-collectd/selinux-collectd-2.20170805-r3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-collectd/selinux-collectd-9999.ebuild b/sec-policy/selinux-collectd/selinux-collectd-9999.ebuild
index 96bf89365d63..814ff4a9f1b1 100644
--- a/sec-policy/selinux-collectd/selinux-collectd-9999.ebuild
+++ b/sec-policy/selinux-collectd/selinux-collectd-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-consolekit/Manifest b/sec-policy/selinux-consolekit/Manifest
index 524eb86e9de3..39b572922937 100644
--- a/sec-policy/selinux-consolekit/Manifest
+++ b/sec-policy/selinux-consolekit/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-consolekit-2.20170204-r1.ebuild 291 SHA256 3fc625089e6e38009adf8deb58d93994bb2d59574deb165678ad174175e420b6 SHA512 7af6407a45ad6070cecc7770dd49f69e6674765aead4c6ad00f33b370fab37efd9e3c2de0b2b9198671341f0a11c92a219985ee8dc2412cf3912bfa381e49d51 WHIRLPOOL 1dcd3893e91135bc3900a42930bf52b334b3046eb6d800f79f9ae07ab15b48e47b9c6b324a3b63add8152f805f0a183fce28e23ae60883eace39fb0fc0d12bf6
-EBUILD selinux-consolekit-2.20170204-r2.ebuild 289 SHA256 1e30e7ad6dec2d25b723c0225efe97b874b8fd267cc26d224bdbfdeeb4daff2b SHA512 6b094193b9c26577d6992ff2a8d7f179692e03bdaf1ec770a48460e49765cc761741df458d5df191965b70ced7fe04da912af8f292b524a8d6bede85476e68ae WHIRLPOOL b5e431e04a75e27810d774e4304c8aa10a1e762adae48bab11720a54a80414daf66275bc9982874500a69bcb7d0aba58595c90184a358338308d2edae6b91760
-EBUILD selinux-consolekit-2.20170204-r3.ebuild 289 SHA256 1e30e7ad6dec2d25b723c0225efe97b874b8fd267cc26d224bdbfdeeb4daff2b SHA512 6b094193b9c26577d6992ff2a8d7f179692e03bdaf1ec770a48460e49765cc761741df458d5df191965b70ced7fe04da912af8f292b524a8d6bede85476e68ae WHIRLPOOL b5e431e04a75e27810d774e4304c8aa10a1e762adae48bab11720a54a80414daf66275bc9982874500a69bcb7d0aba58595c90184a358338308d2edae6b91760
-EBUILD selinux-consolekit-2.20170204-r4.ebuild 289 SHA256 1e30e7ad6dec2d25b723c0225efe97b874b8fd267cc26d224bdbfdeeb4daff2b SHA512 6b094193b9c26577d6992ff2a8d7f179692e03bdaf1ec770a48460e49765cc761741df458d5df191965b70ced7fe04da912af8f292b524a8d6bede85476e68ae WHIRLPOOL b5e431e04a75e27810d774e4304c8aa10a1e762adae48bab11720a54a80414daf66275bc9982874500a69bcb7d0aba58595c90184a358338308d2edae6b91760
-EBUILD selinux-consolekit-2.20170805-r2.ebuild 289 SHA256 1e30e7ad6dec2d25b723c0225efe97b874b8fd267cc26d224bdbfdeeb4daff2b SHA512 6b094193b9c26577d6992ff2a8d7f179692e03bdaf1ec770a48460e49765cc761741df458d5df191965b70ced7fe04da912af8f292b524a8d6bede85476e68ae WHIRLPOOL b5e431e04a75e27810d774e4304c8aa10a1e762adae48bab11720a54a80414daf66275bc9982874500a69bcb7d0aba58595c90184a358338308d2edae6b91760
-EBUILD selinux-consolekit-9999.ebuild 291 SHA256 3fc625089e6e38009adf8deb58d93994bb2d59574deb165678ad174175e420b6 SHA512 7af6407a45ad6070cecc7770dd49f69e6674765aead4c6ad00f33b370fab37efd9e3c2de0b2b9198671341f0a11c92a219985ee8dc2412cf3912bfa381e49d51 WHIRLPOOL 1dcd3893e91135bc3900a42930bf52b334b3046eb6d800f79f9ae07ab15b48e47b9c6b324a3b63add8152f805f0a183fce28e23ae60883eace39fb0fc0d12bf6
+EBUILD selinux-consolekit-2.20170204-r1.ebuild 292 SHA256 b87936804e72c87ae2dd63f34f19c4e973dad6dd620b5801be4eea43171b3602 SHA512 7c854971f86b8498f139b14fdc6b5cacff7fdb25a7be2717998abe0cd8a08afc9f69f5f9eef508369ca446d94a870aad397318c7d4b8b4b2fdb99ad4732cff7e WHIRLPOOL 18274e22e4c7828e946bb843ec86b7482042cdaccc26397ef6f534ba977f131d0a3b6d08e7e3810754a3f86f022e4c5b2ac0a7c92ca8d26899f78fabbf8ae65a
+EBUILD selinux-consolekit-2.20170204-r2.ebuild 290 SHA256 1299b2c88717a193b3e2ea0ed5f6292a1e35473e18e38c26ae87c023753d68dd SHA512 d8777ac810defa34ec2d5b22df1e5ec04ea96298f131cad805ee77c838f30724dccc6d9de66de3e3badfdffec95c5b4751fd3905982cf7d111e56bc4d573c565 WHIRLPOOL c4e1ab25c8522068bd38e49a9fbd3d54ae6a9f2c275642d3371c96785a1f95cb6ef5c50d85dba183d614a23b1fa1c223ff1dc8154bab666f676815024f0f8375
+EBUILD selinux-consolekit-2.20170204-r3.ebuild 290 SHA256 1299b2c88717a193b3e2ea0ed5f6292a1e35473e18e38c26ae87c023753d68dd SHA512 d8777ac810defa34ec2d5b22df1e5ec04ea96298f131cad805ee77c838f30724dccc6d9de66de3e3badfdffec95c5b4751fd3905982cf7d111e56bc4d573c565 WHIRLPOOL c4e1ab25c8522068bd38e49a9fbd3d54ae6a9f2c275642d3371c96785a1f95cb6ef5c50d85dba183d614a23b1fa1c223ff1dc8154bab666f676815024f0f8375
+EBUILD selinux-consolekit-2.20170204-r4.ebuild 290 SHA256 1299b2c88717a193b3e2ea0ed5f6292a1e35473e18e38c26ae87c023753d68dd SHA512 d8777ac810defa34ec2d5b22df1e5ec04ea96298f131cad805ee77c838f30724dccc6d9de66de3e3badfdffec95c5b4751fd3905982cf7d111e56bc4d573c565 WHIRLPOOL c4e1ab25c8522068bd38e49a9fbd3d54ae6a9f2c275642d3371c96785a1f95cb6ef5c50d85dba183d614a23b1fa1c223ff1dc8154bab666f676815024f0f8375
+EBUILD selinux-consolekit-2.20170805-r2.ebuild 290 SHA256 1299b2c88717a193b3e2ea0ed5f6292a1e35473e18e38c26ae87c023753d68dd SHA512 d8777ac810defa34ec2d5b22df1e5ec04ea96298f131cad805ee77c838f30724dccc6d9de66de3e3badfdffec95c5b4751fd3905982cf7d111e56bc4d573c565 WHIRLPOOL c4e1ab25c8522068bd38e49a9fbd3d54ae6a9f2c275642d3371c96785a1f95cb6ef5c50d85dba183d614a23b1fa1c223ff1dc8154bab666f676815024f0f8375
+EBUILD selinux-consolekit-2.20170805-r3.ebuild 292 SHA256 b87936804e72c87ae2dd63f34f19c4e973dad6dd620b5801be4eea43171b3602 SHA512 7c854971f86b8498f139b14fdc6b5cacff7fdb25a7be2717998abe0cd8a08afc9f69f5f9eef508369ca446d94a870aad397318c7d4b8b4b2fdb99ad4732cff7e WHIRLPOOL 18274e22e4c7828e946bb843ec86b7482042cdaccc26397ef6f534ba977f131d0a3b6d08e7e3810754a3f86f022e4c5b2ac0a7c92ca8d26899f78fabbf8ae65a
+EBUILD selinux-consolekit-9999.ebuild 292 SHA256 b87936804e72c87ae2dd63f34f19c4e973dad6dd620b5801be4eea43171b3602 SHA512 7c854971f86b8498f139b14fdc6b5cacff7fdb25a7be2717998abe0cd8a08afc9f69f5f9eef508369ca446d94a870aad397318c7d4b8b4b2fdb99ad4732cff7e WHIRLPOOL 18274e22e4c7828e946bb843ec86b7482042cdaccc26397ef6f534ba977f131d0a3b6d08e7e3810754a3f86f022e4c5b2ac0a7c92ca8d26899f78fabbf8ae65a
 MISC ChangeLog 10979 SHA256 ed72901d513db7c2a9bc2304178bbab8e94b33da246fb030e9e0e9ce68593137 SHA512 37bcea7cecb6adcd570ae11368a6c1ce084df1f44ca07d8c752bc4c29353171a335ecd24529be32dbd312b4d3583952c17b0f4c08fb064c74c14b8a80984916c WHIRLPOOL 305900d4b345c600b909f836a40a50e66de3ce24482b1812be6772982dfa83e13e14b98ac5185c9ea62b9ae8f2dbb014add1eb389916b7632a129ca23bf3acd2
 MISC ChangeLog-2015 10346 SHA256 25baf8fcd7cf9303f5586d1522b487804e23104ee8ef6af1d3bae8072931cfb7 SHA512 37079f2b2aa40ddf713faa7635503d829e31bb3e831a6d56ebafce5e7e184aa6ccbafc459d3fa80bcfe34532cdb46972301898df2dc3ea6f8d12f7da672b43e7 WHIRLPOOL 18876c35ee93316a5a1ffd68e3ffdc45695f4f25c09db8a5f436eef927b2996a66ed15ee4aa6dcd0aa5f4be010b73183b6ed209661bbad5f6a0cf2bef6544497
 MISC metadata.xml 320 SHA256 a4e4ff03e10b274e78d3daeb893245b54edc4adf56c265bc500a50574b08cf43 SHA512 2cec206212671d162d6ae717d104543e9dbc5efa80f01f72d6aa1a7cd1863577b58d80b57cae6259ade3f4a88a12a5a1cbbacc060739f012879468be0ea03e3a WHIRLPOOL e2fc004fc59bec93dba51840a73544e8a530938ee8726e03ba58a346806478570f5b8b8eeaff5d03905cacbbf82007bb8f53b7c78afaf6092e187be9132aa634
diff --git a/sec-policy/selinux-consolekit/selinux-consolekit-2.20170204-r1.ebuild b/sec-policy/selinux-consolekit/selinux-consolekit-2.20170204-r1.ebuild
index ec37ea06931e..c306c4a21f00 100644
--- a/sec-policy/selinux-consolekit/selinux-consolekit-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-consolekit/selinux-consolekit-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-consolekit/selinux-consolekit-2.20170204-r2.ebuild b/sec-policy/selinux-consolekit/selinux-consolekit-2.20170204-r2.ebuild
index b4cb3f742e48..05ee08f64f2c 100644
--- a/sec-policy/selinux-consolekit/selinux-consolekit-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-consolekit/selinux-consolekit-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-consolekit/selinux-consolekit-2.20170204-r3.ebuild b/sec-policy/selinux-consolekit/selinux-consolekit-2.20170204-r3.ebuild
index b4cb3f742e48..05ee08f64f2c 100644
--- a/sec-policy/selinux-consolekit/selinux-consolekit-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-consolekit/selinux-consolekit-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-consolekit/selinux-consolekit-2.20170204-r4.ebuild b/sec-policy/selinux-consolekit/selinux-consolekit-2.20170204-r4.ebuild
index b4cb3f742e48..05ee08f64f2c 100644
--- a/sec-policy/selinux-consolekit/selinux-consolekit-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-consolekit/selinux-consolekit-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-consolekit/selinux-consolekit-2.20170805-r2.ebuild b/sec-policy/selinux-consolekit/selinux-consolekit-2.20170805-r2.ebuild
index b4cb3f742e48..05ee08f64f2c 100644
--- a/sec-policy/selinux-consolekit/selinux-consolekit-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-consolekit/selinux-consolekit-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-consolekit/selinux-consolekit-2.20170805-r3.ebuild b/sec-policy/selinux-consolekit/selinux-consolekit-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..c306c4a21f00
--- /dev/null
+++ b/sec-policy/selinux-consolekit/selinux-consolekit-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="consolekit"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for consolekit"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-consolekit/selinux-consolekit-9999.ebuild b/sec-policy/selinux-consolekit/selinux-consolekit-9999.ebuild
index ec37ea06931e..c306c4a21f00 100644
--- a/sec-policy/selinux-consolekit/selinux-consolekit-9999.ebuild
+++ b/sec-policy/selinux-consolekit/selinux-consolekit-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-corosync/Manifest b/sec-policy/selinux-corosync/Manifest
index fb95bd516ae4..2e5b03957479 100644
--- a/sec-policy/selinux-corosync/Manifest
+++ b/sec-policy/selinux-corosync/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-corosync-2.20170204-r1.ebuild 287 SHA256 4302c0fc7db3967194a583f0ef3459ad79314f471753d03b24e24d894385c238 SHA512 578b1d433695d2847c2e1d21f9ea44ad8e0bba1a6dca5cebb02c1d4f6523dc10aca841527baa15c78ceaec2fdc8c99f0927d515e1083892fce6856e3b4194401 WHIRLPOOL c615395ae6f2d1f2f442f481cad5e34959357a8d044eb671a7399ba526e636fa7c58ac1e64bbe5c8e0962e45b72c6d60e41a3683778ac313123e596604d10b06
-EBUILD selinux-corosync-2.20170204-r2.ebuild 285 SHA256 fab9d5aaa2a62354feea9541ae2760492ec79a35986ae5ca4ddc30779912bcac SHA512 0e1c54c4f607d53a6f7ea70aa7b51ee044433187e4ca4579d81904e63169eac08947f87f0cc6a44134f90d9ae2dd2d13e9088b21049bb966be7e7e39a1332a4f WHIRLPOOL 278d2b98aeab2b81b4b912288094e380b868b384de6e1cb356d7c233f986cec72dab12ea980796e0c2c71785e6f3377c75d67f5873ca1c194fadb6c2aa9caae0
-EBUILD selinux-corosync-2.20170204-r3.ebuild 285 SHA256 fab9d5aaa2a62354feea9541ae2760492ec79a35986ae5ca4ddc30779912bcac SHA512 0e1c54c4f607d53a6f7ea70aa7b51ee044433187e4ca4579d81904e63169eac08947f87f0cc6a44134f90d9ae2dd2d13e9088b21049bb966be7e7e39a1332a4f WHIRLPOOL 278d2b98aeab2b81b4b912288094e380b868b384de6e1cb356d7c233f986cec72dab12ea980796e0c2c71785e6f3377c75d67f5873ca1c194fadb6c2aa9caae0
-EBUILD selinux-corosync-2.20170204-r4.ebuild 285 SHA256 fab9d5aaa2a62354feea9541ae2760492ec79a35986ae5ca4ddc30779912bcac SHA512 0e1c54c4f607d53a6f7ea70aa7b51ee044433187e4ca4579d81904e63169eac08947f87f0cc6a44134f90d9ae2dd2d13e9088b21049bb966be7e7e39a1332a4f WHIRLPOOL 278d2b98aeab2b81b4b912288094e380b868b384de6e1cb356d7c233f986cec72dab12ea980796e0c2c71785e6f3377c75d67f5873ca1c194fadb6c2aa9caae0
-EBUILD selinux-corosync-2.20170805-r2.ebuild 285 SHA256 fab9d5aaa2a62354feea9541ae2760492ec79a35986ae5ca4ddc30779912bcac SHA512 0e1c54c4f607d53a6f7ea70aa7b51ee044433187e4ca4579d81904e63169eac08947f87f0cc6a44134f90d9ae2dd2d13e9088b21049bb966be7e7e39a1332a4f WHIRLPOOL 278d2b98aeab2b81b4b912288094e380b868b384de6e1cb356d7c233f986cec72dab12ea980796e0c2c71785e6f3377c75d67f5873ca1c194fadb6c2aa9caae0
-EBUILD selinux-corosync-9999.ebuild 287 SHA256 4302c0fc7db3967194a583f0ef3459ad79314f471753d03b24e24d894385c238 SHA512 578b1d433695d2847c2e1d21f9ea44ad8e0bba1a6dca5cebb02c1d4f6523dc10aca841527baa15c78ceaec2fdc8c99f0927d515e1083892fce6856e3b4194401 WHIRLPOOL c615395ae6f2d1f2f442f481cad5e34959357a8d044eb671a7399ba526e636fa7c58ac1e64bbe5c8e0962e45b72c6d60e41a3683778ac313123e596604d10b06
+EBUILD selinux-corosync-2.20170204-r1.ebuild 288 SHA256 223d04908b03e88aca62710e293bc5159c214a94e0c0b8bf021aa41e309f9044 SHA512 d75940e7d1a0c95fe3cd3af159c41db3738d1ec9ac4432c063f56a8f6cc318b9672050f39f159dba04365c64f3701ea28cb430c9a241f7da2767867a60fdb62f WHIRLPOOL 938bfcba223c9c444f12ae1cf7d66bf02f26e8a0e2de2b747acf9de1ffa538782d8336ae6e3892de23b83cd95d845fd799841c51670ea4f2c821963aba9c229f
+EBUILD selinux-corosync-2.20170204-r2.ebuild 286 SHA256 923ba4a226fc0d1c983739c760ffc4b189094702ce9bcf5f3edfebdc535aa866 SHA512 9c0cef8de814520979decea4a00c04eddac23470e4e5380b2c72d413d8acb754c254cb92d3943e95c6b17de799d6180a104f57bfc8c0a6b2333dfd20c1c9ec1e WHIRLPOOL ffb75b0b4789d1eb348e976b200b71c17d1536250800b0bd17949b2434a076b6256b1b587de6809d84585623532c3744dd959f64120d88a8debb31e85aa0b0d2
+EBUILD selinux-corosync-2.20170204-r3.ebuild 286 SHA256 923ba4a226fc0d1c983739c760ffc4b189094702ce9bcf5f3edfebdc535aa866 SHA512 9c0cef8de814520979decea4a00c04eddac23470e4e5380b2c72d413d8acb754c254cb92d3943e95c6b17de799d6180a104f57bfc8c0a6b2333dfd20c1c9ec1e WHIRLPOOL ffb75b0b4789d1eb348e976b200b71c17d1536250800b0bd17949b2434a076b6256b1b587de6809d84585623532c3744dd959f64120d88a8debb31e85aa0b0d2
+EBUILD selinux-corosync-2.20170204-r4.ebuild 286 SHA256 923ba4a226fc0d1c983739c760ffc4b189094702ce9bcf5f3edfebdc535aa866 SHA512 9c0cef8de814520979decea4a00c04eddac23470e4e5380b2c72d413d8acb754c254cb92d3943e95c6b17de799d6180a104f57bfc8c0a6b2333dfd20c1c9ec1e WHIRLPOOL ffb75b0b4789d1eb348e976b200b71c17d1536250800b0bd17949b2434a076b6256b1b587de6809d84585623532c3744dd959f64120d88a8debb31e85aa0b0d2
+EBUILD selinux-corosync-2.20170805-r2.ebuild 286 SHA256 923ba4a226fc0d1c983739c760ffc4b189094702ce9bcf5f3edfebdc535aa866 SHA512 9c0cef8de814520979decea4a00c04eddac23470e4e5380b2c72d413d8acb754c254cb92d3943e95c6b17de799d6180a104f57bfc8c0a6b2333dfd20c1c9ec1e WHIRLPOOL ffb75b0b4789d1eb348e976b200b71c17d1536250800b0bd17949b2434a076b6256b1b587de6809d84585623532c3744dd959f64120d88a8debb31e85aa0b0d2
+EBUILD selinux-corosync-2.20170805-r3.ebuild 288 SHA256 223d04908b03e88aca62710e293bc5159c214a94e0c0b8bf021aa41e309f9044 SHA512 d75940e7d1a0c95fe3cd3af159c41db3738d1ec9ac4432c063f56a8f6cc318b9672050f39f159dba04365c64f3701ea28cb430c9a241f7da2767867a60fdb62f WHIRLPOOL 938bfcba223c9c444f12ae1cf7d66bf02f26e8a0e2de2b747acf9de1ffa538782d8336ae6e3892de23b83cd95d845fd799841c51670ea4f2c821963aba9c229f
+EBUILD selinux-corosync-9999.ebuild 288 SHA256 223d04908b03e88aca62710e293bc5159c214a94e0c0b8bf021aa41e309f9044 SHA512 d75940e7d1a0c95fe3cd3af159c41db3738d1ec9ac4432c063f56a8f6cc318b9672050f39f159dba04365c64f3701ea28cb430c9a241f7da2767867a60fdb62f WHIRLPOOL 938bfcba223c9c444f12ae1cf7d66bf02f26e8a0e2de2b747acf9de1ffa538782d8336ae6e3892de23b83cd95d845fd799841c51670ea4f2c821963aba9c229f
 MISC ChangeLog 10793 SHA256 185447a829bcfd72714b1c3e553264b733fdf9bed6eac86c3c65b234ff04df7e SHA512 5a0e46966c689ba1b5b78e1a0eb60c1c659d9ce5d94b4c0f71941d62a18d9b53ef40ee84756b16ee61eff79e7dd8bc6aa201ebf403d4d52c97f4192c3339b36b WHIRLPOOL e9ae93893b295fc55fe82cc1ca61d3e8b437f7f77c4ce2875e51b76f02300822f4c317b15e72a1eb5c2986f90ae464724f84cff7262c71ef5e494b23c39003ff
 MISC ChangeLog-2015 10102 SHA256 fb8441da215a65847bb8bfc4c43be8bcfd5837729936308e3bee59de8d190d60 SHA512 1726566c7b207b58cec55fb1521d719740b1a688033198d66b0bf289de7a8e871f99baac7e17c46863d5716d8c3ed57e2ca5b1fff1637ffec00a1b3c53330cd7 WHIRLPOOL 5982bbc9e1aafd106f387308bd6e38970fc726086c5e79adf595251d1d1390446e705b8364e730b054d270041ba2034000e5129a3c837c63b333f49b652eb9c6
 MISC metadata.xml 318 SHA256 8e33f11c6cf6bb1823294b19949519b4b4f31e6f54de6ea6f86237afb7c09bfd SHA512 13956c6e5e42d77e6588be5abeb1adeda5d425aa0187a430aad4f5c69cf28ff34d5d8afd83c0a2965454ffc2500f3c5f8c3300e8bb4992b9e1de5a501d0497b1 WHIRLPOOL db02e966546bb52a41b4a69c159d614da25ab1a510e4c6e5ee7f5154216a87a0694473013e3cfc442b5f0b69bfe934e8a09470fe26649be10f6ce9cfb037fb6a
diff --git a/sec-policy/selinux-corosync/selinux-corosync-2.20170204-r1.ebuild b/sec-policy/selinux-corosync/selinux-corosync-2.20170204-r1.ebuild
index 2f71652a0a4b..3e8874f582ed 100644
--- a/sec-policy/selinux-corosync/selinux-corosync-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-corosync/selinux-corosync-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-corosync/selinux-corosync-2.20170204-r2.ebuild b/sec-policy/selinux-corosync/selinux-corosync-2.20170204-r2.ebuild
index c19030e46697..a5e3c2a8632c 100644
--- a/sec-policy/selinux-corosync/selinux-corosync-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-corosync/selinux-corosync-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-corosync/selinux-corosync-2.20170204-r3.ebuild b/sec-policy/selinux-corosync/selinux-corosync-2.20170204-r3.ebuild
index c19030e46697..a5e3c2a8632c 100644
--- a/sec-policy/selinux-corosync/selinux-corosync-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-corosync/selinux-corosync-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-corosync/selinux-corosync-2.20170204-r4.ebuild b/sec-policy/selinux-corosync/selinux-corosync-2.20170204-r4.ebuild
index c19030e46697..a5e3c2a8632c 100644
--- a/sec-policy/selinux-corosync/selinux-corosync-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-corosync/selinux-corosync-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-corosync/selinux-corosync-2.20170805-r2.ebuild b/sec-policy/selinux-corosync/selinux-corosync-2.20170805-r2.ebuild
index c19030e46697..a5e3c2a8632c 100644
--- a/sec-policy/selinux-corosync/selinux-corosync-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-corosync/selinux-corosync-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-corosync/selinux-corosync-2.20170805-r3.ebuild b/sec-policy/selinux-corosync/selinux-corosync-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..3e8874f582ed
--- /dev/null
+++ b/sec-policy/selinux-corosync/selinux-corosync-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-corosync/selinux-corosync-9999.ebuild b/sec-policy/selinux-corosync/selinux-corosync-9999.ebuild
index 2f71652a0a4b..3e8874f582ed 100644
--- a/sec-policy/selinux-corosync/selinux-corosync-9999.ebuild
+++ b/sec-policy/selinux-corosync/selinux-corosync-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-couchdb/Manifest b/sec-policy/selinux-couchdb/Manifest
index f5f2bbc810f3..78860f811bf2 100644
--- a/sec-policy/selinux-couchdb/Manifest
+++ b/sec-policy/selinux-couchdb/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-couchdb-2.20170204-r1.ebuild 285 SHA256 9fb8c51c540412009d3fe04f8a6e6d200f2ea57f8449c6985d953416745be225 SHA512 822ecfaeb2b6d25970a603de657405d813f6e725ff269c5dc7050d2bec9ccf1eaccc6fb046d340544e81667e81aa75b2a975881fff77208c5eee980ffa501c47 WHIRLPOOL 97e75ab29a412ca1acba683c82e978a21c35c1f3df026acd7ef7e3d7f1c5c03cf8dfffb63fa756044f7191e146fdaa9f9a1b2eaae09a27e5fa769ac483eeaff2
-EBUILD selinux-couchdb-2.20170204-r2.ebuild 283 SHA256 c434aaa8698adcfce8721d594ec7dc7c7007d3e12cd3a06c8e5571234dec2290 SHA512 14e49f6e44044530d46133ceeeb37db391db33c774ae2e22b1a89d962d955417908cc165ab84d82f79d9fac6214743d73eedd8ae5ce3e345e0d4315ecf9a2d3f WHIRLPOOL 3d3d797bf39cba66fdb5f978e3745da49a6114dd8dd6da534148afe74681c2a250d7a24802d8f63ae6e7ef6b8ba2691ace8978b7ffde4d897b17d90960f7dcb4
-EBUILD selinux-couchdb-2.20170204-r3.ebuild 283 SHA256 c434aaa8698adcfce8721d594ec7dc7c7007d3e12cd3a06c8e5571234dec2290 SHA512 14e49f6e44044530d46133ceeeb37db391db33c774ae2e22b1a89d962d955417908cc165ab84d82f79d9fac6214743d73eedd8ae5ce3e345e0d4315ecf9a2d3f WHIRLPOOL 3d3d797bf39cba66fdb5f978e3745da49a6114dd8dd6da534148afe74681c2a250d7a24802d8f63ae6e7ef6b8ba2691ace8978b7ffde4d897b17d90960f7dcb4
-EBUILD selinux-couchdb-2.20170204-r4.ebuild 283 SHA256 c434aaa8698adcfce8721d594ec7dc7c7007d3e12cd3a06c8e5571234dec2290 SHA512 14e49f6e44044530d46133ceeeb37db391db33c774ae2e22b1a89d962d955417908cc165ab84d82f79d9fac6214743d73eedd8ae5ce3e345e0d4315ecf9a2d3f WHIRLPOOL 3d3d797bf39cba66fdb5f978e3745da49a6114dd8dd6da534148afe74681c2a250d7a24802d8f63ae6e7ef6b8ba2691ace8978b7ffde4d897b17d90960f7dcb4
-EBUILD selinux-couchdb-2.20170805-r2.ebuild 283 SHA256 c434aaa8698adcfce8721d594ec7dc7c7007d3e12cd3a06c8e5571234dec2290 SHA512 14e49f6e44044530d46133ceeeb37db391db33c774ae2e22b1a89d962d955417908cc165ab84d82f79d9fac6214743d73eedd8ae5ce3e345e0d4315ecf9a2d3f WHIRLPOOL 3d3d797bf39cba66fdb5f978e3745da49a6114dd8dd6da534148afe74681c2a250d7a24802d8f63ae6e7ef6b8ba2691ace8978b7ffde4d897b17d90960f7dcb4
-EBUILD selinux-couchdb-9999.ebuild 285 SHA256 9fb8c51c540412009d3fe04f8a6e6d200f2ea57f8449c6985d953416745be225 SHA512 822ecfaeb2b6d25970a603de657405d813f6e725ff269c5dc7050d2bec9ccf1eaccc6fb046d340544e81667e81aa75b2a975881fff77208c5eee980ffa501c47 WHIRLPOOL 97e75ab29a412ca1acba683c82e978a21c35c1f3df026acd7ef7e3d7f1c5c03cf8dfffb63fa756044f7191e146fdaa9f9a1b2eaae09a27e5fa769ac483eeaff2
+EBUILD selinux-couchdb-2.20170204-r1.ebuild 286 SHA256 c2af312731a45ffcbd436e8a12f03569badbc502cfef9242f3f83213b9bd183e SHA512 c8182dd937ccb08b6abf56909b4f0ccdac0559239684ee7753ce576f444baf9d71653159f5bd828331c1af194ae682b3e927249c4fdf0f83c2a868933d404f22 WHIRLPOOL 2b9b0b1e81bd73a0b6a842a8cd742825c6b8b9861062eee78bcefa759df726f94c6ab667510e1a9a8d4cdab67865d5f30b8df078cf0c1634e35c5e179fe02bc1
+EBUILD selinux-couchdb-2.20170204-r2.ebuild 284 SHA256 e321398b4d976dde4d4ea335d3805cced9ba9adb5f4684da32f1c84b90137ce7 SHA512 af7e90767834a5fbbccbb17f86cad6ca20aaf3a724294d15c64079b4c5197daa5bec6452af87468600c1945b6c2ecb9a11171c118cf820b71da2145d83e084e5 WHIRLPOOL fa4683e78d5419647ba75252a370ec6317c17747ccc8e774c47960e18508cf80f6a251a2d1e6a0da7e40b85b0e3592a73f75c1c74241973a1915dec516d52c70
+EBUILD selinux-couchdb-2.20170204-r3.ebuild 284 SHA256 e321398b4d976dde4d4ea335d3805cced9ba9adb5f4684da32f1c84b90137ce7 SHA512 af7e90767834a5fbbccbb17f86cad6ca20aaf3a724294d15c64079b4c5197daa5bec6452af87468600c1945b6c2ecb9a11171c118cf820b71da2145d83e084e5 WHIRLPOOL fa4683e78d5419647ba75252a370ec6317c17747ccc8e774c47960e18508cf80f6a251a2d1e6a0da7e40b85b0e3592a73f75c1c74241973a1915dec516d52c70
+EBUILD selinux-couchdb-2.20170204-r4.ebuild 284 SHA256 e321398b4d976dde4d4ea335d3805cced9ba9adb5f4684da32f1c84b90137ce7 SHA512 af7e90767834a5fbbccbb17f86cad6ca20aaf3a724294d15c64079b4c5197daa5bec6452af87468600c1945b6c2ecb9a11171c118cf820b71da2145d83e084e5 WHIRLPOOL fa4683e78d5419647ba75252a370ec6317c17747ccc8e774c47960e18508cf80f6a251a2d1e6a0da7e40b85b0e3592a73f75c1c74241973a1915dec516d52c70
+EBUILD selinux-couchdb-2.20170805-r2.ebuild 284 SHA256 e321398b4d976dde4d4ea335d3805cced9ba9adb5f4684da32f1c84b90137ce7 SHA512 af7e90767834a5fbbccbb17f86cad6ca20aaf3a724294d15c64079b4c5197daa5bec6452af87468600c1945b6c2ecb9a11171c118cf820b71da2145d83e084e5 WHIRLPOOL fa4683e78d5419647ba75252a370ec6317c17747ccc8e774c47960e18508cf80f6a251a2d1e6a0da7e40b85b0e3592a73f75c1c74241973a1915dec516d52c70
+EBUILD selinux-couchdb-2.20170805-r3.ebuild 286 SHA256 c2af312731a45ffcbd436e8a12f03569badbc502cfef9242f3f83213b9bd183e SHA512 c8182dd937ccb08b6abf56909b4f0ccdac0559239684ee7753ce576f444baf9d71653159f5bd828331c1af194ae682b3e927249c4fdf0f83c2a868933d404f22 WHIRLPOOL 2b9b0b1e81bd73a0b6a842a8cd742825c6b8b9861062eee78bcefa759df726f94c6ab667510e1a9a8d4cdab67865d5f30b8df078cf0c1634e35c5e179fe02bc1
+EBUILD selinux-couchdb-9999.ebuild 286 SHA256 c2af312731a45ffcbd436e8a12f03569badbc502cfef9242f3f83213b9bd183e SHA512 c8182dd937ccb08b6abf56909b4f0ccdac0559239684ee7753ce576f444baf9d71653159f5bd828331c1af194ae682b3e927249c4fdf0f83c2a868933d404f22 WHIRLPOOL 2b9b0b1e81bd73a0b6a842a8cd742825c6b8b9861062eee78bcefa759df726f94c6ab667510e1a9a8d4cdab67865d5f30b8df078cf0c1634e35c5e179fe02bc1
 MISC ChangeLog 10687 SHA256 d224e30d7f59bd634a758f1c290887a84af886321e0fc085fe1ec79fabba2e1f SHA512 6c906de8c7d3cb6316191a38aa72293b6a3de7a02e1625ec2364035ec50a04739c3357fe5076d7a1f976e841d80f31b87e983f6dc1e4c9eb9c0f2a9ffc5ecf4d WHIRLPOOL 0d66fe8a0d0a9e808a7cce6714498044c7cd2653038a8a875c7e9b23485797598c8de76630fd815c51b698b257400df5bc62962cd64f6c3404ee297a2173e67a
 MISC ChangeLog-2015 5222 SHA256 5a58e2f9146eadce2225651a4275b2ad0c15d85242ca42d5695e17a71f9a1f78 SHA512 26d18f83be1acaa1186a14c3ac87ec07ee839128bb8166805becd8543f1886e9d546454e858fe71779427cc80151db5296a918fb67fe7bbca783ea3fda8f067c WHIRLPOOL a8a8cda19351b61d6da18e5e5dc7bb1b3afb201d1c757b6501123504a9949d7f601caaf1fd42b854d814a11c2e1f03b15c60cad499fe47868896194ff8539005
 MISC metadata.xml 317 SHA256 480d54004148972d8fe60b5b1819a15c3d8395301744d8da60482700a73ac2ca SHA512 43fda061c7a92dc5b9602aa01616bd876000263114982314135e8e544c1b209b55438736c3287ea456faba6f7666564d66cac0897ea4c8c29a0211ddd86b7dd9 WHIRLPOOL 13623cc8824cc181fcbd83028adc2551408962fc445417672d3627527b767e3c3d977e65deb3d22797f4dceb896aacbc12771628de8b1afcd5a037d21e0fc62b
diff --git a/sec-policy/selinux-couchdb/selinux-couchdb-2.20170204-r1.ebuild b/sec-policy/selinux-couchdb/selinux-couchdb-2.20170204-r1.ebuild
index 2ecd81ecc253..6d8c2b236897 100644
--- a/sec-policy/selinux-couchdb/selinux-couchdb-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-couchdb/selinux-couchdb-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-couchdb/selinux-couchdb-2.20170204-r2.ebuild b/sec-policy/selinux-couchdb/selinux-couchdb-2.20170204-r2.ebuild
index 7e2cf7cf1246..424eb13f89ea 100644
--- a/sec-policy/selinux-couchdb/selinux-couchdb-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-couchdb/selinux-couchdb-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-couchdb/selinux-couchdb-2.20170204-r3.ebuild b/sec-policy/selinux-couchdb/selinux-couchdb-2.20170204-r3.ebuild
index 7e2cf7cf1246..424eb13f89ea 100644
--- a/sec-policy/selinux-couchdb/selinux-couchdb-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-couchdb/selinux-couchdb-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-couchdb/selinux-couchdb-2.20170204-r4.ebuild b/sec-policy/selinux-couchdb/selinux-couchdb-2.20170204-r4.ebuild
index 7e2cf7cf1246..424eb13f89ea 100644
--- a/sec-policy/selinux-couchdb/selinux-couchdb-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-couchdb/selinux-couchdb-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-couchdb/selinux-couchdb-2.20170805-r2.ebuild b/sec-policy/selinux-couchdb/selinux-couchdb-2.20170805-r2.ebuild
index 7e2cf7cf1246..424eb13f89ea 100644
--- a/sec-policy/selinux-couchdb/selinux-couchdb-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-couchdb/selinux-couchdb-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-couchdb/selinux-couchdb-2.20170805-r3.ebuild b/sec-policy/selinux-couchdb/selinux-couchdb-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..6d8c2b236897
--- /dev/null
+++ b/sec-policy/selinux-couchdb/selinux-couchdb-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-couchdb/selinux-couchdb-9999.ebuild b/sec-policy/selinux-couchdb/selinux-couchdb-9999.ebuild
index 2ecd81ecc253..6d8c2b236897 100644
--- a/sec-policy/selinux-couchdb/selinux-couchdb-9999.ebuild
+++ b/sec-policy/selinux-couchdb/selinux-couchdb-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-courier/Manifest b/sec-policy/selinux-courier/Manifest
index 898e6b9e5552..3103057e6654 100644
--- a/sec-policy/selinux-courier/Manifest
+++ b/sec-policy/selinux-courier/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-courier-2.20170204-r1.ebuild 285 SHA256 6fb77e07dad52567ce1f386c4441e188b476338d604175c23b6ed1b51d20aad1 SHA512 c96ae674e144c510b218a37bc88bca27bb3fb6bd053d9ef44396e4042d11eef0f5feaa559e374010fa52b4af06e72a60326aa3a98b1413a1c0473c244065bce4 WHIRLPOOL 493221ce615a0a7a4f83943e1890f5f10eb6c083f5e0922b16760ece733918457ecbd3692f577055f1dcd5bb15ee40625184c4d1b8e4c410302cebc6d0cf033f
-EBUILD selinux-courier-2.20170204-r2.ebuild 283 SHA256 af1232518d8a3cec2bcab384b077902026b0d192fc8abfd2e576c330892664a3 SHA512 0b42f827cb79d31bea442c7c54a5e79c076ccc9b668362abbedc330d0b43461cfef8dc01ff139b758b56c44ce310dbab933b1e41c286ad2e6583cb9f5deee977 WHIRLPOOL d82077123ce443a65bb4475964046566354fcdf68815b0cfc818842ce986f8962b60e839264164a2adada36082b8f7599cf3dd9baeb508b6c901ff349350e5e9
-EBUILD selinux-courier-2.20170204-r3.ebuild 283 SHA256 af1232518d8a3cec2bcab384b077902026b0d192fc8abfd2e576c330892664a3 SHA512 0b42f827cb79d31bea442c7c54a5e79c076ccc9b668362abbedc330d0b43461cfef8dc01ff139b758b56c44ce310dbab933b1e41c286ad2e6583cb9f5deee977 WHIRLPOOL d82077123ce443a65bb4475964046566354fcdf68815b0cfc818842ce986f8962b60e839264164a2adada36082b8f7599cf3dd9baeb508b6c901ff349350e5e9
-EBUILD selinux-courier-2.20170204-r4.ebuild 283 SHA256 af1232518d8a3cec2bcab384b077902026b0d192fc8abfd2e576c330892664a3 SHA512 0b42f827cb79d31bea442c7c54a5e79c076ccc9b668362abbedc330d0b43461cfef8dc01ff139b758b56c44ce310dbab933b1e41c286ad2e6583cb9f5deee977 WHIRLPOOL d82077123ce443a65bb4475964046566354fcdf68815b0cfc818842ce986f8962b60e839264164a2adada36082b8f7599cf3dd9baeb508b6c901ff349350e5e9
-EBUILD selinux-courier-2.20170805-r2.ebuild 283 SHA256 af1232518d8a3cec2bcab384b077902026b0d192fc8abfd2e576c330892664a3 SHA512 0b42f827cb79d31bea442c7c54a5e79c076ccc9b668362abbedc330d0b43461cfef8dc01ff139b758b56c44ce310dbab933b1e41c286ad2e6583cb9f5deee977 WHIRLPOOL d82077123ce443a65bb4475964046566354fcdf68815b0cfc818842ce986f8962b60e839264164a2adada36082b8f7599cf3dd9baeb508b6c901ff349350e5e9
-EBUILD selinux-courier-9999.ebuild 285 SHA256 6fb77e07dad52567ce1f386c4441e188b476338d604175c23b6ed1b51d20aad1 SHA512 c96ae674e144c510b218a37bc88bca27bb3fb6bd053d9ef44396e4042d11eef0f5feaa559e374010fa52b4af06e72a60326aa3a98b1413a1c0473c244065bce4 WHIRLPOOL 493221ce615a0a7a4f83943e1890f5f10eb6c083f5e0922b16760ece733918457ecbd3692f577055f1dcd5bb15ee40625184c4d1b8e4c410302cebc6d0cf033f
+EBUILD selinux-courier-2.20170204-r1.ebuild 286 SHA256 d8432aa681bd6038644ab2a26c37f878810bcd61fda83422b8b3c4bd7a036695 SHA512 8cd5fdd8c204e86fbeb23dea5748cb2653981ffe885ae7a2c5d63b44bf50da71c8b421f1e41113601da5ed705326d3e2d52dd8ce293485706eaeabead02d6c39 WHIRLPOOL 8e4660407eeee75f69dc72f4b0eaa27197ee4711a5e4894ac9150112af7ebe4386e4fa1c04ed575f103de8c371836ad0369c06bb5971d196c6ed0f91d52718a9
+EBUILD selinux-courier-2.20170204-r2.ebuild 284 SHA256 7e819116f5a2cd7785fd59b614d9af98a7e673041cb14efb9fb18aa99911052f SHA512 d7aaa3294b8f8c511ed86b98b1b31f94d558517ec3916f9cda115d7527280dd407dc2b5b07d9a98b153ecb87851692dcbd6cbf5e519861172b69c2e43dfe7e1b WHIRLPOOL d9e4370df3388c8c712a9c99f4a6404f4c705ae70e75628c6a33d4d6f744ce69c6b2091e97e92dbaff008a89bba2771d6122138b226f7d00f2abac6ed6b6270f
+EBUILD selinux-courier-2.20170204-r3.ebuild 284 SHA256 7e819116f5a2cd7785fd59b614d9af98a7e673041cb14efb9fb18aa99911052f SHA512 d7aaa3294b8f8c511ed86b98b1b31f94d558517ec3916f9cda115d7527280dd407dc2b5b07d9a98b153ecb87851692dcbd6cbf5e519861172b69c2e43dfe7e1b WHIRLPOOL d9e4370df3388c8c712a9c99f4a6404f4c705ae70e75628c6a33d4d6f744ce69c6b2091e97e92dbaff008a89bba2771d6122138b226f7d00f2abac6ed6b6270f
+EBUILD selinux-courier-2.20170204-r4.ebuild 284 SHA256 7e819116f5a2cd7785fd59b614d9af98a7e673041cb14efb9fb18aa99911052f SHA512 d7aaa3294b8f8c511ed86b98b1b31f94d558517ec3916f9cda115d7527280dd407dc2b5b07d9a98b153ecb87851692dcbd6cbf5e519861172b69c2e43dfe7e1b WHIRLPOOL d9e4370df3388c8c712a9c99f4a6404f4c705ae70e75628c6a33d4d6f744ce69c6b2091e97e92dbaff008a89bba2771d6122138b226f7d00f2abac6ed6b6270f
+EBUILD selinux-courier-2.20170805-r2.ebuild 284 SHA256 7e819116f5a2cd7785fd59b614d9af98a7e673041cb14efb9fb18aa99911052f SHA512 d7aaa3294b8f8c511ed86b98b1b31f94d558517ec3916f9cda115d7527280dd407dc2b5b07d9a98b153ecb87851692dcbd6cbf5e519861172b69c2e43dfe7e1b WHIRLPOOL d9e4370df3388c8c712a9c99f4a6404f4c705ae70e75628c6a33d4d6f744ce69c6b2091e97e92dbaff008a89bba2771d6122138b226f7d00f2abac6ed6b6270f
+EBUILD selinux-courier-2.20170805-r3.ebuild 286 SHA256 d8432aa681bd6038644ab2a26c37f878810bcd61fda83422b8b3c4bd7a036695 SHA512 8cd5fdd8c204e86fbeb23dea5748cb2653981ffe885ae7a2c5d63b44bf50da71c8b421f1e41113601da5ed705326d3e2d52dd8ce293485706eaeabead02d6c39 WHIRLPOOL 8e4660407eeee75f69dc72f4b0eaa27197ee4711a5e4894ac9150112af7ebe4386e4fa1c04ed575f103de8c371836ad0369c06bb5971d196c6ed0f91d52718a9
+EBUILD selinux-courier-9999.ebuild 286 SHA256 d8432aa681bd6038644ab2a26c37f878810bcd61fda83422b8b3c4bd7a036695 SHA512 8cd5fdd8c204e86fbeb23dea5748cb2653981ffe885ae7a2c5d63b44bf50da71c8b421f1e41113601da5ed705326d3e2d52dd8ce293485706eaeabead02d6c39 WHIRLPOOL 8e4660407eeee75f69dc72f4b0eaa27197ee4711a5e4894ac9150112af7ebe4386e4fa1c04ed575f103de8c371836ad0369c06bb5971d196c6ed0f91d52718a9
 MISC ChangeLog 10687 SHA256 3c70fe5d4aec9e0eb9c1715e26842dbca886dbdf9d19113ad2bd057aeb9f2dea SHA512 3b6160068dde2bc5a5cd85f8210810550a795f327745d24df94a3ced0c01ec1f0ea1a52a2d6d80201acf7422f50722e7e1556855fe32e54268afddd6c27a3e93 WHIRLPOOL 90ea1e7d8b5c18845981e8ea338e9eee125ed649632156ceca89cab6cb9ee3e85fd8df417f65b22eb41a294fd7f064c755f016574bc3426e029512abb7bd2442
 MISC ChangeLog-2015 16134 SHA256 2bc04c90f4f94b5831ac260b5d411b0358b9ce329c27463d7fea9697ccc739c8 SHA512 628175024b7804072b3948b9d005e4cc4278cddd4c7bdbaae22ae87c01d5146f2e2f10de0d833991a05c1760bd13ccd9ae5e94e1ad70dec046cfae60046f2a61 WHIRLPOOL a9d822f0fe73407a9306faf3b81b7ca526791c87a4aba67a95c28b058408484b2913551f709b82e0644b63c65cacd6f0ae13f46ac40f2dbbae2d8831aa5fd3e8
 MISC metadata.xml 317 SHA256 9682b1e279cf4b2f5cd88fd4542f1cb86b486f7ca84a5a92b2e8f749148deef5 SHA512 90512d732a7e87c960108c4ab698a7d4205d016bc019a7e90a5776eeee024393354bafcdf07774cba6cbf028ba54003897cd732a48591905407cc32c672085e9 WHIRLPOOL 31c8d1f74c1465b0799cf7a4dd9e56cc91314459f5e786d3daf5b0cbbe195e8e0cbedab9dda78dff73b0ec47828429b768a6e641373c7db158ed18264bc7d2e1
diff --git a/sec-policy/selinux-courier/selinux-courier-2.20170204-r1.ebuild b/sec-policy/selinux-courier/selinux-courier-2.20170204-r1.ebuild
index 5f473e030df1..f5edf27c3631 100644
--- a/sec-policy/selinux-courier/selinux-courier-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-courier/selinux-courier-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-courier/selinux-courier-2.20170204-r2.ebuild b/sec-policy/selinux-courier/selinux-courier-2.20170204-r2.ebuild
index 347cb9c87475..bd2859fe885e 100644
--- a/sec-policy/selinux-courier/selinux-courier-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-courier/selinux-courier-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-courier/selinux-courier-2.20170204-r3.ebuild b/sec-policy/selinux-courier/selinux-courier-2.20170204-r3.ebuild
index 347cb9c87475..bd2859fe885e 100644
--- a/sec-policy/selinux-courier/selinux-courier-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-courier/selinux-courier-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-courier/selinux-courier-2.20170204-r4.ebuild b/sec-policy/selinux-courier/selinux-courier-2.20170204-r4.ebuild
index 347cb9c87475..bd2859fe885e 100644
--- a/sec-policy/selinux-courier/selinux-courier-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-courier/selinux-courier-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-courier/selinux-courier-2.20170805-r2.ebuild b/sec-policy/selinux-courier/selinux-courier-2.20170805-r2.ebuild
index 347cb9c87475..bd2859fe885e 100644
--- a/sec-policy/selinux-courier/selinux-courier-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-courier/selinux-courier-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-courier/selinux-courier-2.20170805-r3.ebuild b/sec-policy/selinux-courier/selinux-courier-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..f5edf27c3631
--- /dev/null
+++ b/sec-policy/selinux-courier/selinux-courier-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-courier/selinux-courier-9999.ebuild b/sec-policy/selinux-courier/selinux-courier-9999.ebuild
index 5f473e030df1..f5edf27c3631 100644
--- a/sec-policy/selinux-courier/selinux-courier-9999.ebuild
+++ b/sec-policy/selinux-courier/selinux-courier-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cpucontrol/Manifest b/sec-policy/selinux-cpucontrol/Manifest
index eb933d8a9d66..da14074d334a 100644
--- a/sec-policy/selinux-cpucontrol/Manifest
+++ b/sec-policy/selinux-cpucontrol/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-cpucontrol-2.20170204-r1.ebuild 291 SHA256 4d5e299ef78dbab803a3e6fdbdecb36fa73bf1579d47d59a302f965bde0aca60 SHA512 5bf71b742b6069d6109365359b0273e96a694d02b763b38c31dba1f69f2d2e29d48fec5781b9650aecd2735f5f621dc14b339c8b7ba2a204fd424fd1f7b3d17a WHIRLPOOL 6ebf50b463d61abb74be08675129a3f913112437f682e838352c92e1a00b170dda12002a099b54b7816993685e21bb3c6e720cdc3f7bc7f78773c8a9f26ce624
-EBUILD selinux-cpucontrol-2.20170204-r2.ebuild 289 SHA256 e8813249c7779fff01c32ac1943953f9b5ea3844e50a9da6e21d043ec991b64e SHA512 fb00db0009ddff106c42dacc598f710f6136025690236ef08c9c2360345c37f576e2b6368c40989deb674828a9593b469dad2746569c38d8f06c3bee35c3467b WHIRLPOOL 3e5f6c86516bacd5c0224cb80d74ad7368241f77392bdb854012b6e9913cdcf2b1951bc2ef2f7d6b48fecfa17a3e41ac336454b02721f3fb6b22ab0245946e1e
-EBUILD selinux-cpucontrol-2.20170204-r3.ebuild 289 SHA256 e8813249c7779fff01c32ac1943953f9b5ea3844e50a9da6e21d043ec991b64e SHA512 fb00db0009ddff106c42dacc598f710f6136025690236ef08c9c2360345c37f576e2b6368c40989deb674828a9593b469dad2746569c38d8f06c3bee35c3467b WHIRLPOOL 3e5f6c86516bacd5c0224cb80d74ad7368241f77392bdb854012b6e9913cdcf2b1951bc2ef2f7d6b48fecfa17a3e41ac336454b02721f3fb6b22ab0245946e1e
-EBUILD selinux-cpucontrol-2.20170204-r4.ebuild 289 SHA256 e8813249c7779fff01c32ac1943953f9b5ea3844e50a9da6e21d043ec991b64e SHA512 fb00db0009ddff106c42dacc598f710f6136025690236ef08c9c2360345c37f576e2b6368c40989deb674828a9593b469dad2746569c38d8f06c3bee35c3467b WHIRLPOOL 3e5f6c86516bacd5c0224cb80d74ad7368241f77392bdb854012b6e9913cdcf2b1951bc2ef2f7d6b48fecfa17a3e41ac336454b02721f3fb6b22ab0245946e1e
-EBUILD selinux-cpucontrol-2.20170805-r2.ebuild 289 SHA256 e8813249c7779fff01c32ac1943953f9b5ea3844e50a9da6e21d043ec991b64e SHA512 fb00db0009ddff106c42dacc598f710f6136025690236ef08c9c2360345c37f576e2b6368c40989deb674828a9593b469dad2746569c38d8f06c3bee35c3467b WHIRLPOOL 3e5f6c86516bacd5c0224cb80d74ad7368241f77392bdb854012b6e9913cdcf2b1951bc2ef2f7d6b48fecfa17a3e41ac336454b02721f3fb6b22ab0245946e1e
-EBUILD selinux-cpucontrol-9999.ebuild 291 SHA256 4d5e299ef78dbab803a3e6fdbdecb36fa73bf1579d47d59a302f965bde0aca60 SHA512 5bf71b742b6069d6109365359b0273e96a694d02b763b38c31dba1f69f2d2e29d48fec5781b9650aecd2735f5f621dc14b339c8b7ba2a204fd424fd1f7b3d17a WHIRLPOOL 6ebf50b463d61abb74be08675129a3f913112437f682e838352c92e1a00b170dda12002a099b54b7816993685e21bb3c6e720cdc3f7bc7f78773c8a9f26ce624
+EBUILD selinux-cpucontrol-2.20170204-r1.ebuild 292 SHA256 1695921cbbfc8d6029fe3153f64f965f370b373d84e01093ccddc8fc80c78d02 SHA512 7afc55c524e9723f582da69e727c8a3188b359a4073d603de91029b75bd621d310cd0ded9e8f100010c6b50d762e5f410d2d71dc5e73856479cf31a229a8d70e WHIRLPOOL 37f84f27df1ecee9df3dbbfd4af4ceb3e045c50f166ccf0fd97c6d8a672da4634a9d00c0d6e8119f97f71319b822bd460336bbb18e04dcd5dff1df527c5927af
+EBUILD selinux-cpucontrol-2.20170204-r2.ebuild 290 SHA256 94a6a9802a71302c985ac8f0a9ca19a8d10e76579e83fbf3847e641f02a60d90 SHA512 5b11cc1ec281a94e3486a844424a289f4f794ee9bcf6f3c0b3513147df28f86e05f83b49fa58f7bd431930b3ef8ed791a95eb9f889287a0256f1448a6cc28370 WHIRLPOOL 5b5831f0596db7362c169bdfc2d5cea4fced2b9773781e34dfaaa66c550267cb8baee8b4248e9643b858480672f01ea631509e114256406511b9500c2254077f
+EBUILD selinux-cpucontrol-2.20170204-r3.ebuild 290 SHA256 94a6a9802a71302c985ac8f0a9ca19a8d10e76579e83fbf3847e641f02a60d90 SHA512 5b11cc1ec281a94e3486a844424a289f4f794ee9bcf6f3c0b3513147df28f86e05f83b49fa58f7bd431930b3ef8ed791a95eb9f889287a0256f1448a6cc28370 WHIRLPOOL 5b5831f0596db7362c169bdfc2d5cea4fced2b9773781e34dfaaa66c550267cb8baee8b4248e9643b858480672f01ea631509e114256406511b9500c2254077f
+EBUILD selinux-cpucontrol-2.20170204-r4.ebuild 290 SHA256 94a6a9802a71302c985ac8f0a9ca19a8d10e76579e83fbf3847e641f02a60d90 SHA512 5b11cc1ec281a94e3486a844424a289f4f794ee9bcf6f3c0b3513147df28f86e05f83b49fa58f7bd431930b3ef8ed791a95eb9f889287a0256f1448a6cc28370 WHIRLPOOL 5b5831f0596db7362c169bdfc2d5cea4fced2b9773781e34dfaaa66c550267cb8baee8b4248e9643b858480672f01ea631509e114256406511b9500c2254077f
+EBUILD selinux-cpucontrol-2.20170805-r2.ebuild 290 SHA256 94a6a9802a71302c985ac8f0a9ca19a8d10e76579e83fbf3847e641f02a60d90 SHA512 5b11cc1ec281a94e3486a844424a289f4f794ee9bcf6f3c0b3513147df28f86e05f83b49fa58f7bd431930b3ef8ed791a95eb9f889287a0256f1448a6cc28370 WHIRLPOOL 5b5831f0596db7362c169bdfc2d5cea4fced2b9773781e34dfaaa66c550267cb8baee8b4248e9643b858480672f01ea631509e114256406511b9500c2254077f
+EBUILD selinux-cpucontrol-2.20170805-r3.ebuild 292 SHA256 1695921cbbfc8d6029fe3153f64f965f370b373d84e01093ccddc8fc80c78d02 SHA512 7afc55c524e9723f582da69e727c8a3188b359a4073d603de91029b75bd621d310cd0ded9e8f100010c6b50d762e5f410d2d71dc5e73856479cf31a229a8d70e WHIRLPOOL 37f84f27df1ecee9df3dbbfd4af4ceb3e045c50f166ccf0fd97c6d8a672da4634a9d00c0d6e8119f97f71319b822bd460336bbb18e04dcd5dff1df527c5927af
+EBUILD selinux-cpucontrol-9999.ebuild 292 SHA256 1695921cbbfc8d6029fe3153f64f965f370b373d84e01093ccddc8fc80c78d02 SHA512 7afc55c524e9723f582da69e727c8a3188b359a4073d603de91029b75bd621d310cd0ded9e8f100010c6b50d762e5f410d2d71dc5e73856479cf31a229a8d70e WHIRLPOOL 37f84f27df1ecee9df3dbbfd4af4ceb3e045c50f166ccf0fd97c6d8a672da4634a9d00c0d6e8119f97f71319b822bd460336bbb18e04dcd5dff1df527c5927af
 MISC ChangeLog 10979 SHA256 32bac4f3b70a6ad62818c3fdf00cdfc3ad26d932704b76d0cb32d72fc6f71d95 SHA512 9399841dd348eb4e5ba99d79cd010a19ccffcfa699f423756979c368c582a80053425834dda19a9886729bcb09ced3fee57f020d2d8ea9fa465d8f562395e729 WHIRLPOOL 19b2f1c8b2d3b234d6848dbfe25285e364fb789c867cd1054d9b6651c7471b774796bb6d41a6054f52a60642c52f0f9897083cdbbdd28cf4b099a4831dc564ff
 MISC ChangeLog-2015 10334 SHA256 7212412651051431dedc396d92881eead4bf6d9056e5d83eed4ab4ff4574ed2b SHA512 5de7f67f6fd8911c69c0c23d39e58f64170421b9785399319b82905f185249cb59e45259d1dfc54fe8624933e00d384701b7a4ae390987be5077544de6c1bff8 WHIRLPOOL 3922060be2a0622a1029354abb8653c1abd6e7f957c534a3a606a7afc4ec408e58f88e8cafbd0f79b6d5091f32e08b11a77f09025a1eb0d48f7693707b227a6a
 MISC metadata.xml 320 SHA256 935dfa15c99a75ceaf03a8ebabfe8d8edcc98e5578ebf1243785041d3790632a SHA512 f51c895b670b210dfd339f77a0abdaf240d3a85dfda0de494d3128fe21d9e14e28d4b98cee9af199273ac96c58dc66f2344363b7c7d9fd744291c9027825a86d WHIRLPOOL 629dc6a5b12d6342614e038f30051f2a19ebc3291e110ff90218a5fe802816d15f26e4b7486c8815160df31b5bd95160b3c981305a0609c43fb2ccdb778676d4
diff --git a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20170204-r1.ebuild b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20170204-r1.ebuild
index e83185a032a1..3a0cfda0dc6f 100644
--- a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20170204-r2.ebuild b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20170204-r2.ebuild
index 9c2317f5ad94..313aff5ad2fd 100644
--- a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20170204-r3.ebuild b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20170204-r3.ebuild
index 9c2317f5ad94..313aff5ad2fd 100644
--- a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20170204-r4.ebuild b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20170204-r4.ebuild
index 9c2317f5ad94..313aff5ad2fd 100644
--- a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20170805-r2.ebuild b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20170805-r2.ebuild
index 9c2317f5ad94..313aff5ad2fd 100644
--- a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20170805-r3.ebuild b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..3a0cfda0dc6f
--- /dev/null
+++ b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-cpucontrol/selinux-cpucontrol-9999.ebuild b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-9999.ebuild
index e83185a032a1..3a0cfda0dc6f 100644
--- a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-9999.ebuild
+++ b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cpufreqselector/Manifest b/sec-policy/selinux-cpufreqselector/Manifest
index 365cfe67d4ec..73d5e1885593 100644
--- a/sec-policy/selinux-cpufreqselector/Manifest
+++ b/sec-policy/selinux-cpufreqselector/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-cpufreqselector-2.20170204-r1.ebuild 301 SHA256 4b30a83c7a8620bf92003fd3f1a0b300c7f8560b4bb48fba0500c25a074a5620 SHA512 61156e06a62a89627775d1f64b29af14d50839c9ac7cf16db58761d8ebf490c2293c0ef9b36a1558e8c3062b0b3168ce1a7903d4b1d2ea3fe9a41c088fa5fd61 WHIRLPOOL a97c4bfecb9eacd55486e706fabdaf7899fb5839637d923b87f0ea6e1293ae806d4de22ada29982d7ed8814741a215ff9b050a4f74479be8fc621fabaa570e9f
-EBUILD selinux-cpufreqselector-2.20170204-r2.ebuild 299 SHA256 58fc7c85f23a5d266ce5b02f4cfff2e969e91b49792764c55ada8a605088fc6f SHA512 72c0cfab5181c368424340acf78fe3d2e82e6e91c41b1025b8911136d9d4832ecdf074d3889da6ad043059f6519424e53eb3bf9c29127ae4d19c6c9a57bd1f10 WHIRLPOOL c49c3c99700e3f63604a08c301b486387c0e6eb50f2d5e0df64e39f3eea2023985a74e538bd2fe668884a2545089e836282506e156eb693ff73fa168911c7b00
-EBUILD selinux-cpufreqselector-2.20170204-r3.ebuild 299 SHA256 58fc7c85f23a5d266ce5b02f4cfff2e969e91b49792764c55ada8a605088fc6f SHA512 72c0cfab5181c368424340acf78fe3d2e82e6e91c41b1025b8911136d9d4832ecdf074d3889da6ad043059f6519424e53eb3bf9c29127ae4d19c6c9a57bd1f10 WHIRLPOOL c49c3c99700e3f63604a08c301b486387c0e6eb50f2d5e0df64e39f3eea2023985a74e538bd2fe668884a2545089e836282506e156eb693ff73fa168911c7b00
-EBUILD selinux-cpufreqselector-2.20170204-r4.ebuild 299 SHA256 58fc7c85f23a5d266ce5b02f4cfff2e969e91b49792764c55ada8a605088fc6f SHA512 72c0cfab5181c368424340acf78fe3d2e82e6e91c41b1025b8911136d9d4832ecdf074d3889da6ad043059f6519424e53eb3bf9c29127ae4d19c6c9a57bd1f10 WHIRLPOOL c49c3c99700e3f63604a08c301b486387c0e6eb50f2d5e0df64e39f3eea2023985a74e538bd2fe668884a2545089e836282506e156eb693ff73fa168911c7b00
-EBUILD selinux-cpufreqselector-2.20170805-r2.ebuild 299 SHA256 58fc7c85f23a5d266ce5b02f4cfff2e969e91b49792764c55ada8a605088fc6f SHA512 72c0cfab5181c368424340acf78fe3d2e82e6e91c41b1025b8911136d9d4832ecdf074d3889da6ad043059f6519424e53eb3bf9c29127ae4d19c6c9a57bd1f10 WHIRLPOOL c49c3c99700e3f63604a08c301b486387c0e6eb50f2d5e0df64e39f3eea2023985a74e538bd2fe668884a2545089e836282506e156eb693ff73fa168911c7b00
-EBUILD selinux-cpufreqselector-9999.ebuild 301 SHA256 4b30a83c7a8620bf92003fd3f1a0b300c7f8560b4bb48fba0500c25a074a5620 SHA512 61156e06a62a89627775d1f64b29af14d50839c9ac7cf16db58761d8ebf490c2293c0ef9b36a1558e8c3062b0b3168ce1a7903d4b1d2ea3fe9a41c088fa5fd61 WHIRLPOOL a97c4bfecb9eacd55486e706fabdaf7899fb5839637d923b87f0ea6e1293ae806d4de22ada29982d7ed8814741a215ff9b050a4f74479be8fc621fabaa570e9f
+EBUILD selinux-cpufreqselector-2.20170204-r1.ebuild 302 SHA256 27df764ecbc91f68311687fed136dda9aef5d1fbca06a201c04729f1a0a1675a SHA512 b79ae2784c81f7f795e480914f7228c8d1e1eeb03e2f82119c74d3b5f318ebc60a83a5601b37d973c350a3d42a9bff8103b43e921f29d47ccec07eb6d8858ca5 WHIRLPOOL 3a8c2e1aa13aa202032f2217ef7291199bce81bd3d263e2b5176a03ec04ac820beda457ee29069150fad58bfb5c0abb1ab6d23d8e9cf678cf4e7f6dde726da8e
+EBUILD selinux-cpufreqselector-2.20170204-r2.ebuild 300 SHA256 a415f4a64fb7d0c1a17e8da71626c3638f7bb88b8a7fdea5da264e1acc30bfcc SHA512 b2e3927168bb49784727f3ae80be79325eada1637a61f5ee384eba7cf0eec723d5f1557d6d79fcfe9964a16c2770c0d0f70a56f4d78d3df227750640099abfa2 WHIRLPOOL f6154d23f26521b45085cd39c60900f56a49ca661041b6977a7522ae8f4e4bd9597f654c5053da6b2daad417db22fb920dff716b49c63261dea8bf69fccf9906
+EBUILD selinux-cpufreqselector-2.20170204-r3.ebuild 300 SHA256 a415f4a64fb7d0c1a17e8da71626c3638f7bb88b8a7fdea5da264e1acc30bfcc SHA512 b2e3927168bb49784727f3ae80be79325eada1637a61f5ee384eba7cf0eec723d5f1557d6d79fcfe9964a16c2770c0d0f70a56f4d78d3df227750640099abfa2 WHIRLPOOL f6154d23f26521b45085cd39c60900f56a49ca661041b6977a7522ae8f4e4bd9597f654c5053da6b2daad417db22fb920dff716b49c63261dea8bf69fccf9906
+EBUILD selinux-cpufreqselector-2.20170204-r4.ebuild 300 SHA256 a415f4a64fb7d0c1a17e8da71626c3638f7bb88b8a7fdea5da264e1acc30bfcc SHA512 b2e3927168bb49784727f3ae80be79325eada1637a61f5ee384eba7cf0eec723d5f1557d6d79fcfe9964a16c2770c0d0f70a56f4d78d3df227750640099abfa2 WHIRLPOOL f6154d23f26521b45085cd39c60900f56a49ca661041b6977a7522ae8f4e4bd9597f654c5053da6b2daad417db22fb920dff716b49c63261dea8bf69fccf9906
+EBUILD selinux-cpufreqselector-2.20170805-r2.ebuild 300 SHA256 a415f4a64fb7d0c1a17e8da71626c3638f7bb88b8a7fdea5da264e1acc30bfcc SHA512 b2e3927168bb49784727f3ae80be79325eada1637a61f5ee384eba7cf0eec723d5f1557d6d79fcfe9964a16c2770c0d0f70a56f4d78d3df227750640099abfa2 WHIRLPOOL f6154d23f26521b45085cd39c60900f56a49ca661041b6977a7522ae8f4e4bd9597f654c5053da6b2daad417db22fb920dff716b49c63261dea8bf69fccf9906
+EBUILD selinux-cpufreqselector-2.20170805-r3.ebuild 302 SHA256 27df764ecbc91f68311687fed136dda9aef5d1fbca06a201c04729f1a0a1675a SHA512 b79ae2784c81f7f795e480914f7228c8d1e1eeb03e2f82119c74d3b5f318ebc60a83a5601b37d973c350a3d42a9bff8103b43e921f29d47ccec07eb6d8858ca5 WHIRLPOOL 3a8c2e1aa13aa202032f2217ef7291199bce81bd3d263e2b5176a03ec04ac820beda457ee29069150fad58bfb5c0abb1ab6d23d8e9cf678cf4e7f6dde726da8e
+EBUILD selinux-cpufreqselector-9999.ebuild 302 SHA256 27df764ecbc91f68311687fed136dda9aef5d1fbca06a201c04729f1a0a1675a SHA512 b79ae2784c81f7f795e480914f7228c8d1e1eeb03e2f82119c74d3b5f318ebc60a83a5601b37d973c350a3d42a9bff8103b43e921f29d47ccec07eb6d8858ca5 WHIRLPOOL 3a8c2e1aa13aa202032f2217ef7291199bce81bd3d263e2b5176a03ec04ac820beda457ee29069150fad58bfb5c0abb1ab6d23d8e9cf678cf4e7f6dde726da8e
 MISC ChangeLog 11445 SHA256 d3a2e2cb418d8ac070a5bd5eb609085e6041f2ce3c0b5a6bd2fa7a1f96fc4d30 SHA512 de763204130b6bc79cad5a074c87ecd718f2bd5ef3851d99041becd585e406a09389334747b3674e35d22de0354512a09aae4978731c7de4d87ecb06275c4832 WHIRLPOOL 3a28ecf6c68ce25d8f9aa22be8b721044afd74f69dab327657edce1420c8b4b40ed40768c55671c38d8fbeb5ce17d0971adf04170aee9079f993e8d4ea8ef796
 MISC ChangeLog-2015 10917 SHA256 d83ee34e0002e7d055fdb2d005ec0b5b45c117aaacdf4137fe3b817a30f87f99 SHA512 fc07d8829bf79b285773087bd5d550b8ce2c345f8130d57b6df9a37d974da3f24060075dbefcbf2183310cc74247a27eed21e86c5f63abe58ce26d2eaf33f930 WHIRLPOOL e0b8a766a4c0d0c6ef1eb2aad38cd2ce6e4478a3ec198dc17570d7157f34e52d9f04574f39526a46b6b91b98f75bf79e5ef76c3c71637b1e2fa80fc0b0781b40
 MISC metadata.xml 325 SHA256 0406bf61ecfb89a32ed8d205f5882c3c1a90e6b7aa40ecdac6cdc378b92d5dcb SHA512 0aef2f311fb25142a08caca6f25f0b1a903631e4742c79dc79afda113e0cbfc6be2ea807afd10b2f31acd8aec3810864614e685e89b83f664f9e1955d4e8ea3b WHIRLPOOL 4218368aeb922d7f656a78abc8c11417d8bcb3cd91bdecd045f5f6a502610d8e7c3b8aa8c211019fe0b3ab33917274a03fca59561df1082c55d9be2484462d34
diff --git a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20170204-r1.ebuild b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20170204-r1.ebuild
index f0034ef05b6a..31d48df30f19 100644
--- a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20170204-r2.ebuild b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20170204-r2.ebuild
index 55dab6ed4b16..33095e87ded9 100644
--- a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20170204-r3.ebuild b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20170204-r3.ebuild
index 55dab6ed4b16..33095e87ded9 100644
--- a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20170204-r4.ebuild b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20170204-r4.ebuild
index 55dab6ed4b16..33095e87ded9 100644
--- a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20170805-r2.ebuild b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20170805-r2.ebuild
index 55dab6ed4b16..33095e87ded9 100644
--- a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20170805-r3.ebuild b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..31d48df30f19
--- /dev/null
+++ b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-cpufreqselector/selinux-cpufreqselector-9999.ebuild b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-9999.ebuild
index f0034ef05b6a..31d48df30f19 100644
--- a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-9999.ebuild
+++ b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cups/Manifest b/sec-policy/selinux-cups/Manifest
index 11ffd18f1458..0679620a44b9 100644
--- a/sec-policy/selinux-cups/Manifest
+++ b/sec-policy/selinux-cups/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-cups-2.20170204-r1.ebuild 369 SHA256 0adb0a96ed06db4f625a7290f4f69451f1d25277c1a8b15fa9aabf27400b6439 SHA512 2e12aef1856ac6295087ea86a21dc4784421ccbf2e736b850a58ca5a424eed71eeda7d1bcdbfcf305c5aa76ba2aa8b75ac3b8664bff29cc437f398c2e9218e36 WHIRLPOOL d9bc314e249e36d376029117790747e0178dc0a0eebe9019d21b57cc4ba5e52f6d6e9dbcdea7c0b614d376f62d2ccec7567c30000714d997cd8bf8b80f372e67
-EBUILD selinux-cups-2.20170204-r2.ebuild 367 SHA256 d03e2eeadd2765ae0d538d36177137f36953c41d25616a8b4b0d3fe2622f169f SHA512 9439def7f7f5eca7032e139e0dec5b85e504035cca0f7c9c9d6a367e4eea0fff5cd68dda59fdf991a0a59bd8fd31516ffb6254c82d16771f5a651dc5735044c4 WHIRLPOOL 8f35034d2440d0773735854fabbc1de15fc921d2a8626cd5e8de6d7e072ef44befe2ef19779a3343f1a5701a1a279a715ce836c8db03060b18924dd09d763ef6
-EBUILD selinux-cups-2.20170204-r3.ebuild 367 SHA256 d03e2eeadd2765ae0d538d36177137f36953c41d25616a8b4b0d3fe2622f169f SHA512 9439def7f7f5eca7032e139e0dec5b85e504035cca0f7c9c9d6a367e4eea0fff5cd68dda59fdf991a0a59bd8fd31516ffb6254c82d16771f5a651dc5735044c4 WHIRLPOOL 8f35034d2440d0773735854fabbc1de15fc921d2a8626cd5e8de6d7e072ef44befe2ef19779a3343f1a5701a1a279a715ce836c8db03060b18924dd09d763ef6
-EBUILD selinux-cups-2.20170204-r4.ebuild 367 SHA256 d03e2eeadd2765ae0d538d36177137f36953c41d25616a8b4b0d3fe2622f169f SHA512 9439def7f7f5eca7032e139e0dec5b85e504035cca0f7c9c9d6a367e4eea0fff5cd68dda59fdf991a0a59bd8fd31516ffb6254c82d16771f5a651dc5735044c4 WHIRLPOOL 8f35034d2440d0773735854fabbc1de15fc921d2a8626cd5e8de6d7e072ef44befe2ef19779a3343f1a5701a1a279a715ce836c8db03060b18924dd09d763ef6
-EBUILD selinux-cups-2.20170805-r2.ebuild 367 SHA256 d03e2eeadd2765ae0d538d36177137f36953c41d25616a8b4b0d3fe2622f169f SHA512 9439def7f7f5eca7032e139e0dec5b85e504035cca0f7c9c9d6a367e4eea0fff5cd68dda59fdf991a0a59bd8fd31516ffb6254c82d16771f5a651dc5735044c4 WHIRLPOOL 8f35034d2440d0773735854fabbc1de15fc921d2a8626cd5e8de6d7e072ef44befe2ef19779a3343f1a5701a1a279a715ce836c8db03060b18924dd09d763ef6
-EBUILD selinux-cups-9999.ebuild 369 SHA256 0adb0a96ed06db4f625a7290f4f69451f1d25277c1a8b15fa9aabf27400b6439 SHA512 2e12aef1856ac6295087ea86a21dc4784421ccbf2e736b850a58ca5a424eed71eeda7d1bcdbfcf305c5aa76ba2aa8b75ac3b8664bff29cc437f398c2e9218e36 WHIRLPOOL d9bc314e249e36d376029117790747e0178dc0a0eebe9019d21b57cc4ba5e52f6d6e9dbcdea7c0b614d376f62d2ccec7567c30000714d997cd8bf8b80f372e67
+EBUILD selinux-cups-2.20170204-r1.ebuild 370 SHA256 41bdd1ab4300ce5fe5006f3b62f4f96946b639e0b6c7048c50a66497db204d8b SHA512 0c096742effbe529a141e668a61b53a5095bf1eb35e1a15b26282993da1a0f42a8519e43a722b2d8124343fd3370de780f60964db71d5b6674777d47bf7fee13 WHIRLPOOL 04d00128c1bdaa198dab176b617e5e9acf0bf3fce36a8a1956fec63058d539c0a9ea6a3d404c4a786bcf9e7a101117e79b1b8767435ae5deff78e786495d0388
+EBUILD selinux-cups-2.20170204-r2.ebuild 368 SHA256 b9ca26f524a3ee4f5216f97c4713ce0b85ad3bf19212defb717a8d761edf9004 SHA512 4571219c1f2bf80f92462acefa4fe9d1ab5b9700b57e9b82ed9028e5389447776d68547cb6706599615c2078c2a6661197e3f6d1d51b8695b2f2e1423e70e6a6 WHIRLPOOL 5763548a49d81910b0557b8f17c01f3f3f6af843d5453b72b02bac28a6bbcf1328b404cfd6134d276ac63d7844c0a64540abb54509824e588230811a228638c5
+EBUILD selinux-cups-2.20170204-r3.ebuild 368 SHA256 b9ca26f524a3ee4f5216f97c4713ce0b85ad3bf19212defb717a8d761edf9004 SHA512 4571219c1f2bf80f92462acefa4fe9d1ab5b9700b57e9b82ed9028e5389447776d68547cb6706599615c2078c2a6661197e3f6d1d51b8695b2f2e1423e70e6a6 WHIRLPOOL 5763548a49d81910b0557b8f17c01f3f3f6af843d5453b72b02bac28a6bbcf1328b404cfd6134d276ac63d7844c0a64540abb54509824e588230811a228638c5
+EBUILD selinux-cups-2.20170204-r4.ebuild 368 SHA256 b9ca26f524a3ee4f5216f97c4713ce0b85ad3bf19212defb717a8d761edf9004 SHA512 4571219c1f2bf80f92462acefa4fe9d1ab5b9700b57e9b82ed9028e5389447776d68547cb6706599615c2078c2a6661197e3f6d1d51b8695b2f2e1423e70e6a6 WHIRLPOOL 5763548a49d81910b0557b8f17c01f3f3f6af843d5453b72b02bac28a6bbcf1328b404cfd6134d276ac63d7844c0a64540abb54509824e588230811a228638c5
+EBUILD selinux-cups-2.20170805-r2.ebuild 368 SHA256 b9ca26f524a3ee4f5216f97c4713ce0b85ad3bf19212defb717a8d761edf9004 SHA512 4571219c1f2bf80f92462acefa4fe9d1ab5b9700b57e9b82ed9028e5389447776d68547cb6706599615c2078c2a6661197e3f6d1d51b8695b2f2e1423e70e6a6 WHIRLPOOL 5763548a49d81910b0557b8f17c01f3f3f6af843d5453b72b02bac28a6bbcf1328b404cfd6134d276ac63d7844c0a64540abb54509824e588230811a228638c5
+EBUILD selinux-cups-2.20170805-r3.ebuild 370 SHA256 41bdd1ab4300ce5fe5006f3b62f4f96946b639e0b6c7048c50a66497db204d8b SHA512 0c096742effbe529a141e668a61b53a5095bf1eb35e1a15b26282993da1a0f42a8519e43a722b2d8124343fd3370de780f60964db71d5b6674777d47bf7fee13 WHIRLPOOL 04d00128c1bdaa198dab176b617e5e9acf0bf3fce36a8a1956fec63058d539c0a9ea6a3d404c4a786bcf9e7a101117e79b1b8767435ae5deff78e786495d0388
+EBUILD selinux-cups-9999.ebuild 370 SHA256 41bdd1ab4300ce5fe5006f3b62f4f96946b639e0b6c7048c50a66497db204d8b SHA512 0c096742effbe529a141e668a61b53a5095bf1eb35e1a15b26282993da1a0f42a8519e43a722b2d8124343fd3370de780f60964db71d5b6674777d47bf7fee13 WHIRLPOOL 04d00128c1bdaa198dab176b617e5e9acf0bf3fce36a8a1956fec63058d539c0a9ea6a3d404c4a786bcf9e7a101117e79b1b8767435ae5deff78e786495d0388
 MISC ChangeLog 10387 SHA256 450ce75ac0050da473929f3ae4caf2258aad46119db266c70f44c9bb43df05ce SHA512 4744e53fc0d4b87ffe3b29ab7e729bae4885b8644679656495aafcf002e67a2948749f38c26991fe3cf530db2e2dcf3ea90802b0c9eb616809375af201ad241e WHIRLPOOL 10f472945ce11463fab4dec5ada07809faddfd6d3a34fa34779c486ba015c913e890ea006695a266183f25cbcd755056226a416f59c52712eb2bccb2a86d50ea
 MISC ChangeLog-2015 11577 SHA256 fed53b1b581bc91c5f7b5a1238e09904b38ec0933bdecc407dd47ea1703283c4 SHA512 4f8075ee744de9f5e4afa407894ed79e5380f46772989f29e7f047b2881d8660c0b3297ce7e7c444d17b89ab6d73c3ef3b316f559df68eefd0ce1c98e8bbf6d2 WHIRLPOOL ca6af4a4636fbbc926f74f0bdb78db792f0a0884c897a6d623e969675a007f3260a41c408bb4b7de5c3de6f1006ba8c202fb7de3144af39c73b1d98d33990539
 MISC metadata.xml 314 SHA256 91a402d57d19bfca1b0d208dbc4931a5eee9a2b32b0223f017b446cb9107d93d SHA512 3e3d89bc53170e64971ce9e3effcd321f19a95b2ceaaf97a8a3212121848c3bdc88d6f1d2a1211efd04209165c1cd24e54a2cda9bdc841d9dc3470e3aa7e23a7 WHIRLPOOL f4f836a7a8e8f075038c131078c3d5ce32ef0b4fd8af5cd4a56709395d254dfabde32a9d4cce68d9d59dc799c8b22171a3e2cbce7b7c1cb463fda0ea7da8f895
diff --git a/sec-policy/selinux-cups/selinux-cups-2.20170204-r1.ebuild b/sec-policy/selinux-cups/selinux-cups-2.20170204-r1.ebuild
index 0184aaabf113..f7f3da060978 100644
--- a/sec-policy/selinux-cups/selinux-cups-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-cups/selinux-cups-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cups/selinux-cups-2.20170204-r2.ebuild b/sec-policy/selinux-cups/selinux-cups-2.20170204-r2.ebuild
index d65cbc4a343d..f5d7e97be718 100644
--- a/sec-policy/selinux-cups/selinux-cups-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-cups/selinux-cups-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cups/selinux-cups-2.20170204-r3.ebuild b/sec-policy/selinux-cups/selinux-cups-2.20170204-r3.ebuild
index d65cbc4a343d..f5d7e97be718 100644
--- a/sec-policy/selinux-cups/selinux-cups-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-cups/selinux-cups-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cups/selinux-cups-2.20170204-r4.ebuild b/sec-policy/selinux-cups/selinux-cups-2.20170204-r4.ebuild
index d65cbc4a343d..f5d7e97be718 100644
--- a/sec-policy/selinux-cups/selinux-cups-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-cups/selinux-cups-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cups/selinux-cups-2.20170805-r2.ebuild b/sec-policy/selinux-cups/selinux-cups-2.20170805-r2.ebuild
index d65cbc4a343d..f5d7e97be718 100644
--- a/sec-policy/selinux-cups/selinux-cups-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-cups/selinux-cups-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cups/selinux-cups-2.20170805-r3.ebuild b/sec-policy/selinux-cups/selinux-cups-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..f7f3da060978
--- /dev/null
+++ b/sec-policy/selinux-cups/selinux-cups-2.20170805-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-cups/selinux-cups-9999.ebuild b/sec-policy/selinux-cups/selinux-cups-9999.ebuild
index 0184aaabf113..f7f3da060978 100644
--- a/sec-policy/selinux-cups/selinux-cups-9999.ebuild
+++ b/sec-policy/selinux-cups/selinux-cups-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cvs/Manifest b/sec-policy/selinux-cvs/Manifest
index eba8eac73f92..e82f2883456d 100644
--- a/sec-policy/selinux-cvs/Manifest
+++ b/sec-policy/selinux-cvs/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-cvs-2.20170204-r1.ebuild 425 SHA256 b67d846b7ac28d290f7dd7fa7d0093194ca4f4b992c40ff9683ccd1fb7718b9e SHA512 99557f9915629ac05f29e8fcb14c34fc85cbf6c9ab3b0e0f10163d2bcf0d86da93210edda81475f2c613f144a29d67e068ce981a49a30b7fb4bdc5c14c4481e9 WHIRLPOOL 0a1dc8eee2328026d4458942e87c67485b33e2c1955e8232554e026b023f3467bd17e75b6fc2c2f472c8e18445c48263ea9fe4ffc895ce56a0473c8a09f6ae55
-EBUILD selinux-cvs-2.20170204-r2.ebuild 423 SHA256 bb4b8954d98141b2365f1cee022692b47fc84e35f89ff91029b8b77be305ffaf SHA512 192c9e66428033c80247b8e2db2803b0f16addce9397ad79b95d10ba2f4adf49b185e6ef526378744afc4b83582a09a18eaeabae075b0fa3dd508cfead4f613b WHIRLPOOL d9390c2ee251ff5bf5b9bc544e4d60da1b73ff1653917184b30d8fcc8ad21373c83838ee45e16b2c89ef40ee53d3a41806990f6648c839dcc18f2af0a1a16bba
-EBUILD selinux-cvs-2.20170204-r3.ebuild 423 SHA256 bb4b8954d98141b2365f1cee022692b47fc84e35f89ff91029b8b77be305ffaf SHA512 192c9e66428033c80247b8e2db2803b0f16addce9397ad79b95d10ba2f4adf49b185e6ef526378744afc4b83582a09a18eaeabae075b0fa3dd508cfead4f613b WHIRLPOOL d9390c2ee251ff5bf5b9bc544e4d60da1b73ff1653917184b30d8fcc8ad21373c83838ee45e16b2c89ef40ee53d3a41806990f6648c839dcc18f2af0a1a16bba
-EBUILD selinux-cvs-2.20170204-r4.ebuild 423 SHA256 bb4b8954d98141b2365f1cee022692b47fc84e35f89ff91029b8b77be305ffaf SHA512 192c9e66428033c80247b8e2db2803b0f16addce9397ad79b95d10ba2f4adf49b185e6ef526378744afc4b83582a09a18eaeabae075b0fa3dd508cfead4f613b WHIRLPOOL d9390c2ee251ff5bf5b9bc544e4d60da1b73ff1653917184b30d8fcc8ad21373c83838ee45e16b2c89ef40ee53d3a41806990f6648c839dcc18f2af0a1a16bba
-EBUILD selinux-cvs-2.20170805-r2.ebuild 423 SHA256 bb4b8954d98141b2365f1cee022692b47fc84e35f89ff91029b8b77be305ffaf SHA512 192c9e66428033c80247b8e2db2803b0f16addce9397ad79b95d10ba2f4adf49b185e6ef526378744afc4b83582a09a18eaeabae075b0fa3dd508cfead4f613b WHIRLPOOL d9390c2ee251ff5bf5b9bc544e4d60da1b73ff1653917184b30d8fcc8ad21373c83838ee45e16b2c89ef40ee53d3a41806990f6648c839dcc18f2af0a1a16bba
-EBUILD selinux-cvs-9999.ebuild 425 SHA256 b67d846b7ac28d290f7dd7fa7d0093194ca4f4b992c40ff9683ccd1fb7718b9e SHA512 99557f9915629ac05f29e8fcb14c34fc85cbf6c9ab3b0e0f10163d2bcf0d86da93210edda81475f2c613f144a29d67e068ce981a49a30b7fb4bdc5c14c4481e9 WHIRLPOOL 0a1dc8eee2328026d4458942e87c67485b33e2c1955e8232554e026b023f3467bd17e75b6fc2c2f472c8e18445c48263ea9fe4ffc895ce56a0473c8a09f6ae55
+EBUILD selinux-cvs-2.20170204-r1.ebuild 426 SHA256 3c1cb736836734a735be939c27d994abc44a0aad33d4774549c8a5464916b5eb SHA512 a77b3e31cee5d5e262a50c0e98a33219d5e3868bb3639fdbe9683ab67d725bb04540a424d0915d83db31031dfbadf7c030ad7ca050ff170988268e7447277fde WHIRLPOOL 76fc380c046d1be568ecf91b0d1a4ff052cbed73fec72c7fa28f961a99c3b2eb5839c030f2261ef651b69ca48785f51c280ff70ad713273d9fe936b5bb84d3bc
+EBUILD selinux-cvs-2.20170204-r2.ebuild 424 SHA256 e605402e3af14a11e0b2428fe6bd84de5531843a9cadeeda4bcacffaf74b6e26 SHA512 32f107944ca64ba946da8922adeadfc79751e6e90efa57df96b6166b0148a1221a9ee36e671d4968d7ab78f5468d7bf01f0a2a065ff124fd3cc7ab1ab12f8c50 WHIRLPOOL a1c4e76b2417446c0d1a834707adc41073366a0de55fe4fc8edece6e620f8d2f63040664d25fc7fce96fdcafaa588b35d12e23418810eb6ecced1dbf5e81153e
+EBUILD selinux-cvs-2.20170204-r3.ebuild 424 SHA256 e605402e3af14a11e0b2428fe6bd84de5531843a9cadeeda4bcacffaf74b6e26 SHA512 32f107944ca64ba946da8922adeadfc79751e6e90efa57df96b6166b0148a1221a9ee36e671d4968d7ab78f5468d7bf01f0a2a065ff124fd3cc7ab1ab12f8c50 WHIRLPOOL a1c4e76b2417446c0d1a834707adc41073366a0de55fe4fc8edece6e620f8d2f63040664d25fc7fce96fdcafaa588b35d12e23418810eb6ecced1dbf5e81153e
+EBUILD selinux-cvs-2.20170204-r4.ebuild 424 SHA256 e605402e3af14a11e0b2428fe6bd84de5531843a9cadeeda4bcacffaf74b6e26 SHA512 32f107944ca64ba946da8922adeadfc79751e6e90efa57df96b6166b0148a1221a9ee36e671d4968d7ab78f5468d7bf01f0a2a065ff124fd3cc7ab1ab12f8c50 WHIRLPOOL a1c4e76b2417446c0d1a834707adc41073366a0de55fe4fc8edece6e620f8d2f63040664d25fc7fce96fdcafaa588b35d12e23418810eb6ecced1dbf5e81153e
+EBUILD selinux-cvs-2.20170805-r2.ebuild 424 SHA256 e605402e3af14a11e0b2428fe6bd84de5531843a9cadeeda4bcacffaf74b6e26 SHA512 32f107944ca64ba946da8922adeadfc79751e6e90efa57df96b6166b0148a1221a9ee36e671d4968d7ab78f5468d7bf01f0a2a065ff124fd3cc7ab1ab12f8c50 WHIRLPOOL a1c4e76b2417446c0d1a834707adc41073366a0de55fe4fc8edece6e620f8d2f63040664d25fc7fce96fdcafaa588b35d12e23418810eb6ecced1dbf5e81153e
+EBUILD selinux-cvs-2.20170805-r3.ebuild 426 SHA256 3c1cb736836734a735be939c27d994abc44a0aad33d4774549c8a5464916b5eb SHA512 a77b3e31cee5d5e262a50c0e98a33219d5e3868bb3639fdbe9683ab67d725bb04540a424d0915d83db31031dfbadf7c030ad7ca050ff170988268e7447277fde WHIRLPOOL 76fc380c046d1be568ecf91b0d1a4ff052cbed73fec72c7fa28f961a99c3b2eb5839c030f2261ef651b69ca48785f51c280ff70ad713273d9fe936b5bb84d3bc
+EBUILD selinux-cvs-9999.ebuild 426 SHA256 3c1cb736836734a735be939c27d994abc44a0aad33d4774549c8a5464916b5eb SHA512 a77b3e31cee5d5e262a50c0e98a33219d5e3868bb3639fdbe9683ab67d725bb04540a424d0915d83db31031dfbadf7c030ad7ca050ff170988268e7447277fde WHIRLPOOL 76fc380c046d1be568ecf91b0d1a4ff052cbed73fec72c7fa28f961a99c3b2eb5839c030f2261ef651b69ca48785f51c280ff70ad713273d9fe936b5bb84d3bc
 MISC ChangeLog 10295 SHA256 cdbc59ebec08720049ed408aff83fbda66a5c3d2afc4fd486412a2f8f7fc9965 SHA512 7292f0ad815bc55234ebf3aecaa8ccacc2c1425b3e0d5f9347f9dadc9a91f31947a93acf079483ddc35e5d3b8225ea3f76f6c97032273d7947919ffb09745c69 WHIRLPOOL ffb9ee916ab144e42dda416fb54c67aa5cd541140f9efdece3611cd4a28d26829fbd89d94faacf3769331b3fd8ace26b9f8678619db2e099569fedafe1ed2ca9
 MISC ChangeLog-2015 9806 SHA256 a7f45c1c53004671566de9dc02a3dc96fd0e1daf33d7e02db3b3988bd6893399 SHA512 998d3f539f74d20ca46d83389d549c6409b05936b71f16f36288d4cf93354bcd129a5d298162ff63595367341e2ceb61dacb7a7699ae9c4d21c90794220c13ec WHIRLPOOL b3b91a51e499ce62c86fbd92f07bf891d871e1bd818e477adfaffa8936e30fdd5bf012b5ba2f209da0f285c623544063a2cf855f4aca987d8619e1a73ba3737e
 MISC metadata.xml 313 SHA256 77282a43c9025ce0e16dcd0b7fbdf1f015b79a79ab302229124408b2fbc5c69f SHA512 6d7001e06d985c2395e10c6272950a5bc76279c60ad5ca17d54fbe12e449c2b6485fc5d3e88775f4ab2a3d9c5ccbc37f412a783a7841ba54901f34a520f8c5b1 WHIRLPOOL 4085082105ebf4cd6e56a12beaf51726d64ec6424453c31e316e5936aa0687eccc5620435d28fd1001b1693651ec785ec51ba55f8a4f9367fd43442be323aef2
diff --git a/sec-policy/selinux-cvs/selinux-cvs-2.20170204-r1.ebuild b/sec-policy/selinux-cvs/selinux-cvs-2.20170204-r1.ebuild
index d6b511781ba5..5dfc34680758 100644
--- a/sec-policy/selinux-cvs/selinux-cvs-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-cvs/selinux-cvs-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cvs/selinux-cvs-2.20170204-r2.ebuild b/sec-policy/selinux-cvs/selinux-cvs-2.20170204-r2.ebuild
index 0792f31f58d6..01387904e784 100644
--- a/sec-policy/selinux-cvs/selinux-cvs-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-cvs/selinux-cvs-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cvs/selinux-cvs-2.20170204-r3.ebuild b/sec-policy/selinux-cvs/selinux-cvs-2.20170204-r3.ebuild
index 0792f31f58d6..01387904e784 100644
--- a/sec-policy/selinux-cvs/selinux-cvs-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-cvs/selinux-cvs-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cvs/selinux-cvs-2.20170204-r4.ebuild b/sec-policy/selinux-cvs/selinux-cvs-2.20170204-r4.ebuild
index 0792f31f58d6..01387904e784 100644
--- a/sec-policy/selinux-cvs/selinux-cvs-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-cvs/selinux-cvs-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cvs/selinux-cvs-2.20170805-r2.ebuild b/sec-policy/selinux-cvs/selinux-cvs-2.20170805-r2.ebuild
index 0792f31f58d6..01387904e784 100644
--- a/sec-policy/selinux-cvs/selinux-cvs-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-cvs/selinux-cvs-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cvs/selinux-cvs-2.20170805-r3.ebuild b/sec-policy/selinux-cvs/selinux-cvs-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..5dfc34680758
--- /dev/null
+++ b/sec-policy/selinux-cvs/selinux-cvs-2.20170805-r3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-cvs/selinux-cvs-9999.ebuild b/sec-policy/selinux-cvs/selinux-cvs-9999.ebuild
index d6b511781ba5..5dfc34680758 100644
--- a/sec-policy/selinux-cvs/selinux-cvs-9999.ebuild
+++ b/sec-policy/selinux-cvs/selinux-cvs-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cyphesis/Manifest b/sec-policy/selinux-cyphesis/Manifest
index 68276446fe63..d5a1643d7a93 100644
--- a/sec-policy/selinux-cyphesis/Manifest
+++ b/sec-policy/selinux-cyphesis/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-cyphesis-2.20170204-r1.ebuild 287 SHA256 e3825c2af3db28e699edef1db8aa3b406c36b7b9320ea2ba712547d67afb36d9 SHA512 547d8fd55529e31d59351e4669b95cb03415764d83102399042f65a6565717d916fb3a1c23350025019893b29b384deb60b35ebd7100e3aaa3a19ef3d69d005e WHIRLPOOL 73ce950d196522d505aae56d8bfbf35db63e7f34f3c57dafbd656545b5dad67ac134042097bc857e815333dfac2ffb33f27ad7786006d0d9be559193766ceac4
-EBUILD selinux-cyphesis-2.20170204-r2.ebuild 285 SHA256 fd55a950d1c3cec88aab3c0eb3a43667f7067b195928a7639fcd25ca21be2a41 SHA512 7dae4ebe790bedf54c6935043b48e30c50214b134e0f703dba01d039bd6518a7f302fb148b7720f182cd9e3470d7bd711f9eb96535a3998f143d82bc6931200b WHIRLPOOL de6045daea6e8262201a445578707dfe99d9ad235e6970dd4bb3b23a4017d72dfbff73ab743760563cd177db7afeccabc91bd2960c3092756723c1ee4dc5f29c
-EBUILD selinux-cyphesis-2.20170204-r3.ebuild 285 SHA256 fd55a950d1c3cec88aab3c0eb3a43667f7067b195928a7639fcd25ca21be2a41 SHA512 7dae4ebe790bedf54c6935043b48e30c50214b134e0f703dba01d039bd6518a7f302fb148b7720f182cd9e3470d7bd711f9eb96535a3998f143d82bc6931200b WHIRLPOOL de6045daea6e8262201a445578707dfe99d9ad235e6970dd4bb3b23a4017d72dfbff73ab743760563cd177db7afeccabc91bd2960c3092756723c1ee4dc5f29c
-EBUILD selinux-cyphesis-2.20170204-r4.ebuild 285 SHA256 fd55a950d1c3cec88aab3c0eb3a43667f7067b195928a7639fcd25ca21be2a41 SHA512 7dae4ebe790bedf54c6935043b48e30c50214b134e0f703dba01d039bd6518a7f302fb148b7720f182cd9e3470d7bd711f9eb96535a3998f143d82bc6931200b WHIRLPOOL de6045daea6e8262201a445578707dfe99d9ad235e6970dd4bb3b23a4017d72dfbff73ab743760563cd177db7afeccabc91bd2960c3092756723c1ee4dc5f29c
-EBUILD selinux-cyphesis-2.20170805-r2.ebuild 285 SHA256 fd55a950d1c3cec88aab3c0eb3a43667f7067b195928a7639fcd25ca21be2a41 SHA512 7dae4ebe790bedf54c6935043b48e30c50214b134e0f703dba01d039bd6518a7f302fb148b7720f182cd9e3470d7bd711f9eb96535a3998f143d82bc6931200b WHIRLPOOL de6045daea6e8262201a445578707dfe99d9ad235e6970dd4bb3b23a4017d72dfbff73ab743760563cd177db7afeccabc91bd2960c3092756723c1ee4dc5f29c
-EBUILD selinux-cyphesis-9999.ebuild 287 SHA256 e3825c2af3db28e699edef1db8aa3b406c36b7b9320ea2ba712547d67afb36d9 SHA512 547d8fd55529e31d59351e4669b95cb03415764d83102399042f65a6565717d916fb3a1c23350025019893b29b384deb60b35ebd7100e3aaa3a19ef3d69d005e WHIRLPOOL 73ce950d196522d505aae56d8bfbf35db63e7f34f3c57dafbd656545b5dad67ac134042097bc857e815333dfac2ffb33f27ad7786006d0d9be559193766ceac4
+EBUILD selinux-cyphesis-2.20170204-r1.ebuild 288 SHA256 4e7bcd03c8d5579701666b46ce624671e60876ca54205eddc240ddd9f02ccb03 SHA512 39e3f96100867221df4721cbe46d2c3f32cfa9d2b7f311eaadf85804389a21c66dda332d3fe2a16070d7b7c69429d18df0dbcc9af3402cf8c5102b00f1ce03db WHIRLPOOL fa164c7cd3210bca30e2d36c7b18b99383c2017aeeb0f2b2b877c663d678827db2ceee315609b79234efb4d0bd9817f5ccb561bd77f7f136e02f72919dcd552d
+EBUILD selinux-cyphesis-2.20170204-r2.ebuild 286 SHA256 2c2be0d01598f8fa789c3a85b5c1cd7e1b4111154d2dc1bc18435b4b17421ae9 SHA512 5e037d0f6f90d07cf2a56f0e4920b06449d1c4f55b9f8b69d5efa831b88396a02cf9ad80c364f72039aca2ebd1f75fefb2b5c071bd52391e10be89e59384a353 WHIRLPOOL ebb1d15ccb5ac813c6dc72d5ed1388d69ffcdec62e9ce410c59e39f970e6538760fe73418d0215414435e381c6e9bc76490d8c094e714c073ac2f70ea7b6f38c
+EBUILD selinux-cyphesis-2.20170204-r3.ebuild 286 SHA256 2c2be0d01598f8fa789c3a85b5c1cd7e1b4111154d2dc1bc18435b4b17421ae9 SHA512 5e037d0f6f90d07cf2a56f0e4920b06449d1c4f55b9f8b69d5efa831b88396a02cf9ad80c364f72039aca2ebd1f75fefb2b5c071bd52391e10be89e59384a353 WHIRLPOOL ebb1d15ccb5ac813c6dc72d5ed1388d69ffcdec62e9ce410c59e39f970e6538760fe73418d0215414435e381c6e9bc76490d8c094e714c073ac2f70ea7b6f38c
+EBUILD selinux-cyphesis-2.20170204-r4.ebuild 286 SHA256 2c2be0d01598f8fa789c3a85b5c1cd7e1b4111154d2dc1bc18435b4b17421ae9 SHA512 5e037d0f6f90d07cf2a56f0e4920b06449d1c4f55b9f8b69d5efa831b88396a02cf9ad80c364f72039aca2ebd1f75fefb2b5c071bd52391e10be89e59384a353 WHIRLPOOL ebb1d15ccb5ac813c6dc72d5ed1388d69ffcdec62e9ce410c59e39f970e6538760fe73418d0215414435e381c6e9bc76490d8c094e714c073ac2f70ea7b6f38c
+EBUILD selinux-cyphesis-2.20170805-r2.ebuild 286 SHA256 2c2be0d01598f8fa789c3a85b5c1cd7e1b4111154d2dc1bc18435b4b17421ae9 SHA512 5e037d0f6f90d07cf2a56f0e4920b06449d1c4f55b9f8b69d5efa831b88396a02cf9ad80c364f72039aca2ebd1f75fefb2b5c071bd52391e10be89e59384a353 WHIRLPOOL ebb1d15ccb5ac813c6dc72d5ed1388d69ffcdec62e9ce410c59e39f970e6538760fe73418d0215414435e381c6e9bc76490d8c094e714c073ac2f70ea7b6f38c
+EBUILD selinux-cyphesis-2.20170805-r3.ebuild 288 SHA256 4e7bcd03c8d5579701666b46ce624671e60876ca54205eddc240ddd9f02ccb03 SHA512 39e3f96100867221df4721cbe46d2c3f32cfa9d2b7f311eaadf85804389a21c66dda332d3fe2a16070d7b7c69429d18df0dbcc9af3402cf8c5102b00f1ce03db WHIRLPOOL fa164c7cd3210bca30e2d36c7b18b99383c2017aeeb0f2b2b877c663d678827db2ceee315609b79234efb4d0bd9817f5ccb561bd77f7f136e02f72919dcd552d
+EBUILD selinux-cyphesis-9999.ebuild 288 SHA256 4e7bcd03c8d5579701666b46ce624671e60876ca54205eddc240ddd9f02ccb03 SHA512 39e3f96100867221df4721cbe46d2c3f32cfa9d2b7f311eaadf85804389a21c66dda332d3fe2a16070d7b7c69429d18df0dbcc9af3402cf8c5102b00f1ce03db WHIRLPOOL fa164c7cd3210bca30e2d36c7b18b99383c2017aeeb0f2b2b877c663d678827db2ceee315609b79234efb4d0bd9817f5ccb561bd77f7f136e02f72919dcd552d
 MISC ChangeLog 10793 SHA256 c13aa66bb4f1b004cd5ef322364f072cb0cbb4493f02f86645fa9088f4809fb2 SHA512 b35684654328d28db439ecabe6df133f30354d6bac357b949420329120341a429f0bcd71cec42b79a5ffab52f3f44769a7e6f2f75824c0ba9aab74d8b1606fd2 WHIRLPOOL b9fefb28d11f8852f8bc26f5077a56df1a19f8d14559e455d3deaf4ba82913ff7bfa443b0c003ee004206dc37659a99fa15b45a3bf428f5d60b2a6d29de083e3
 MISC ChangeLog-2015 10102 SHA256 d5bb5eed14000ea12565c196c40328d20b7057a9fecf575231860e70b3ea7726 SHA512 33077f37346f80531507cb9c7624a4cc1b20540c24371e29b9954e2c263d25660f2ccf0492ae3a5b4af9dea972b5adb519d5a5238f468c96e046731c3ce3828a WHIRLPOOL 9b70d67321af3f0337a41c34dc2682766979084f4f72f22269887aefed96433fb997b66658e15dfcdfe59c5941f3a16a2703adfea73fe99b988af94837a96bb0
 MISC metadata.xml 318 SHA256 055c0f69a8f42bbe7b0a2e81255ecf5c6248049680c2f2233b40d4f811023994 SHA512 58e70c654d22bceeb06ee1f89577451cdf23871d63bb17427e18da11d7adb5edf7f20264ca4cc934be2b44e471973addaf717e0254f2814217f5a0a25309be2e WHIRLPOOL b646d91ad6ec583d6082ad658a1ac7556753e508c63fdd757ab9cd303fef87c13ee78e23c6865b2e01b3cd28e797a7c4fbbe8c6a04fbb92d32c48aca2919613b
diff --git a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20170204-r1.ebuild b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20170204-r1.ebuild
index adbd55ac5bd0..01ba8f935e3e 100644
--- a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20170204-r2.ebuild b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20170204-r2.ebuild
index e8878c23dc65..24ef891db8cc 100644
--- a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20170204-r3.ebuild b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20170204-r3.ebuild
index e8878c23dc65..24ef891db8cc 100644
--- a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20170204-r4.ebuild b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20170204-r4.ebuild
index e8878c23dc65..24ef891db8cc 100644
--- a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20170805-r2.ebuild b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20170805-r2.ebuild
index e8878c23dc65..24ef891db8cc 100644
--- a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20170805-r3.ebuild b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..01ba8f935e3e
--- /dev/null
+++ b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-cyphesis/selinux-cyphesis-9999.ebuild b/sec-policy/selinux-cyphesis/selinux-cyphesis-9999.ebuild
index adbd55ac5bd0..01ba8f935e3e 100644
--- a/sec-policy/selinux-cyphesis/selinux-cyphesis-9999.ebuild
+++ b/sec-policy/selinux-cyphesis/selinux-cyphesis-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-daemontools/Manifest b/sec-policy/selinux-daemontools/Manifest
index 808e20a8fe77..0a3df493c735 100644
--- a/sec-policy/selinux-daemontools/Manifest
+++ b/sec-policy/selinux-daemontools/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-daemontools-2.20170204-r1.ebuild 293 SHA256 3eec7b65d42fa4996ed89b588206a1387131a9a3430b54086a5f6c2f534af48e SHA512 c223028fdd5733a91a23527e60a912189a2bf3beecc2e6abb34b080f460c2399b7a211e8afe8b91131486fd9402fe8dfe531aaf9374a0da7738e294d8874243b WHIRLPOOL ff01d0b8d1a8a2b0a23cb1e0e9bd109563089c80a0dcbd5deb0686a9515bd9680abe267fc702cb9fdf2a92d02f10eec1532481e9ca5ecd524517a5ad077b4eaf
-EBUILD selinux-daemontools-2.20170204-r2.ebuild 291 SHA256 33a7df3adaf3e306b70eb6d2895d56ed8a05c4395d05020a28a3e3f7552f6059 SHA512 e637c0f65b22fbe23e434f0e921c1a372dd105876b9c96ad95e9fec1638316780f694da85123e8bac6a7db15e60a1f750467b9967342d927fe72beb1d29eae9a WHIRLPOOL c021fefc85f1fd755b3e8a3e61e0feb4699d92531f4ec22c653eef9b9a69b299acee29fdfa7d442a390103d8a024df7cbbe273aec5910c0bda28616ab93c31cb
-EBUILD selinux-daemontools-2.20170204-r3.ebuild 291 SHA256 33a7df3adaf3e306b70eb6d2895d56ed8a05c4395d05020a28a3e3f7552f6059 SHA512 e637c0f65b22fbe23e434f0e921c1a372dd105876b9c96ad95e9fec1638316780f694da85123e8bac6a7db15e60a1f750467b9967342d927fe72beb1d29eae9a WHIRLPOOL c021fefc85f1fd755b3e8a3e61e0feb4699d92531f4ec22c653eef9b9a69b299acee29fdfa7d442a390103d8a024df7cbbe273aec5910c0bda28616ab93c31cb
-EBUILD selinux-daemontools-2.20170204-r4.ebuild 291 SHA256 33a7df3adaf3e306b70eb6d2895d56ed8a05c4395d05020a28a3e3f7552f6059 SHA512 e637c0f65b22fbe23e434f0e921c1a372dd105876b9c96ad95e9fec1638316780f694da85123e8bac6a7db15e60a1f750467b9967342d927fe72beb1d29eae9a WHIRLPOOL c021fefc85f1fd755b3e8a3e61e0feb4699d92531f4ec22c653eef9b9a69b299acee29fdfa7d442a390103d8a024df7cbbe273aec5910c0bda28616ab93c31cb
-EBUILD selinux-daemontools-2.20170805-r2.ebuild 291 SHA256 33a7df3adaf3e306b70eb6d2895d56ed8a05c4395d05020a28a3e3f7552f6059 SHA512 e637c0f65b22fbe23e434f0e921c1a372dd105876b9c96ad95e9fec1638316780f694da85123e8bac6a7db15e60a1f750467b9967342d927fe72beb1d29eae9a WHIRLPOOL c021fefc85f1fd755b3e8a3e61e0feb4699d92531f4ec22c653eef9b9a69b299acee29fdfa7d442a390103d8a024df7cbbe273aec5910c0bda28616ab93c31cb
-EBUILD selinux-daemontools-9999.ebuild 293 SHA256 3eec7b65d42fa4996ed89b588206a1387131a9a3430b54086a5f6c2f534af48e SHA512 c223028fdd5733a91a23527e60a912189a2bf3beecc2e6abb34b080f460c2399b7a211e8afe8b91131486fd9402fe8dfe531aaf9374a0da7738e294d8874243b WHIRLPOOL ff01d0b8d1a8a2b0a23cb1e0e9bd109563089c80a0dcbd5deb0686a9515bd9680abe267fc702cb9fdf2a92d02f10eec1532481e9ca5ecd524517a5ad077b4eaf
+EBUILD selinux-daemontools-2.20170204-r1.ebuild 294 SHA256 f9d583073a1b5ea4bb4d33b166a597bd5f9fbb9861313ee15939f67aa4cbf9ff SHA512 3753ab23a1031a11bd0f01c8e2f64d6a09ebaaae9dd8e368c21ada26d7bc09aae884d1ea341b37b5f0ee39c6d263774440280809af78f0382a3b5837c921cf81 WHIRLPOOL 68c4b792befcf6d6cb11259a099bcf7b2eb3a13805c4aa7bbbaf90c0ff679f6e5ef67135323980430d7d6226cd2e0de4d71a4f7bd9abe4439b5f5df3d95c24a1
+EBUILD selinux-daemontools-2.20170204-r2.ebuild 292 SHA256 4a85a80be035bdf2f42757013ae4a27c6b7a4c2985d27731c1c14505f998ee1c SHA512 0218613a7884241ad11e5c02f09f6124c527f517457a3cc6f3c23dce979bf1267dc967115519b1f78657b2ce2d1932f84483f4815ae27d75c23792c537dfb879 WHIRLPOOL 5a2089bd3dfffc3a4ce94b2c9b77e196ab71954bc94d8211b4a88993ffb323857c0638a7e092a1d5f36a7878e7e939c15c0b63b779b2dfe7cf8c41734975c3f7
+EBUILD selinux-daemontools-2.20170204-r3.ebuild 292 SHA256 4a85a80be035bdf2f42757013ae4a27c6b7a4c2985d27731c1c14505f998ee1c SHA512 0218613a7884241ad11e5c02f09f6124c527f517457a3cc6f3c23dce979bf1267dc967115519b1f78657b2ce2d1932f84483f4815ae27d75c23792c537dfb879 WHIRLPOOL 5a2089bd3dfffc3a4ce94b2c9b77e196ab71954bc94d8211b4a88993ffb323857c0638a7e092a1d5f36a7878e7e939c15c0b63b779b2dfe7cf8c41734975c3f7
+EBUILD selinux-daemontools-2.20170204-r4.ebuild 292 SHA256 4a85a80be035bdf2f42757013ae4a27c6b7a4c2985d27731c1c14505f998ee1c SHA512 0218613a7884241ad11e5c02f09f6124c527f517457a3cc6f3c23dce979bf1267dc967115519b1f78657b2ce2d1932f84483f4815ae27d75c23792c537dfb879 WHIRLPOOL 5a2089bd3dfffc3a4ce94b2c9b77e196ab71954bc94d8211b4a88993ffb323857c0638a7e092a1d5f36a7878e7e939c15c0b63b779b2dfe7cf8c41734975c3f7
+EBUILD selinux-daemontools-2.20170805-r2.ebuild 292 SHA256 4a85a80be035bdf2f42757013ae4a27c6b7a4c2985d27731c1c14505f998ee1c SHA512 0218613a7884241ad11e5c02f09f6124c527f517457a3cc6f3c23dce979bf1267dc967115519b1f78657b2ce2d1932f84483f4815ae27d75c23792c537dfb879 WHIRLPOOL 5a2089bd3dfffc3a4ce94b2c9b77e196ab71954bc94d8211b4a88993ffb323857c0638a7e092a1d5f36a7878e7e939c15c0b63b779b2dfe7cf8c41734975c3f7
+EBUILD selinux-daemontools-2.20170805-r3.ebuild 294 SHA256 f9d583073a1b5ea4bb4d33b166a597bd5f9fbb9861313ee15939f67aa4cbf9ff SHA512 3753ab23a1031a11bd0f01c8e2f64d6a09ebaaae9dd8e368c21ada26d7bc09aae884d1ea341b37b5f0ee39c6d263774440280809af78f0382a3b5837c921cf81 WHIRLPOOL 68c4b792befcf6d6cb11259a099bcf7b2eb3a13805c4aa7bbbaf90c0ff679f6e5ef67135323980430d7d6226cd2e0de4d71a4f7bd9abe4439b5f5df3d95c24a1
+EBUILD selinux-daemontools-9999.ebuild 294 SHA256 f9d583073a1b5ea4bb4d33b166a597bd5f9fbb9861313ee15939f67aa4cbf9ff SHA512 3753ab23a1031a11bd0f01c8e2f64d6a09ebaaae9dd8e368c21ada26d7bc09aae884d1ea341b37b5f0ee39c6d263774440280809af78f0382a3b5837c921cf81 WHIRLPOOL 68c4b792befcf6d6cb11259a099bcf7b2eb3a13805c4aa7bbbaf90c0ff679f6e5ef67135323980430d7d6226cd2e0de4d71a4f7bd9abe4439b5f5df3d95c24a1
 MISC ChangeLog 11071 SHA256 e3790525716f23663d64353bae6927f409622b542bf175a69b3befd971fa1aa4 SHA512 c9e4b94000aa0d5ae47be6e5d222bd8f43431c5855575f7c6e0e2969d9a21be870a1a8288449959a9a230e08634399350318cacf6f282e0c9551ebb60469a541 WHIRLPOOL 743b3a58e100aba6c79e0014815814c47e3b3573d4320e519ba9a89f7f7bc6da15b0df63d4055c61f371ca54dd572ba605a14288bae253ecc88d73274c8c038d
 MISC ChangeLog-2015 15890 SHA256 69dd9470bdcf5ae797d5654e2730a05bcaa8f29dc762c9465178c7fc602bf6b6 SHA512 b102bd1704a1e5d5710d73a14097f137046220aeafe9dba60b998bfb690f7919112734e08a8991156eeb05e60ccf554ee235499961a59e1a8d9dedbc764a6726 WHIRLPOOL 8a9130a64045886d9e6b47668a9dd6cb8cd021168684917f29360912fd511f06a682eb350c8f3af6b4551d8abf298c1eddfe0110ca2f25a134d1e2ab734efab0
 MISC metadata.xml 321 SHA256 748b2d92fa7246f38add96a40899a29d25653318a39eb457490cde255faa62dc SHA512 2b805bc57fdb8ce67f8628d2ff8e97923ecd5f3ed6502bab2a97fda612f613c5af1964fe33f0b110757d2f60c795ff1b2b94e89c2f4cc4508d148fbfd20c12e1 WHIRLPOOL a74cc49a6dd415cd4daaf45d4e3061827b2c8c67b4f5096b87f489363d65bcf33fbfebc5162abb96d1d06b2cf83751dc1c9818c16e049f184ebf0e1513da48a2
diff --git a/sec-policy/selinux-daemontools/selinux-daemontools-2.20170204-r1.ebuild b/sec-policy/selinux-daemontools/selinux-daemontools-2.20170204-r1.ebuild
index e589705c1787..550743a1d4d6 100644
--- a/sec-policy/selinux-daemontools/selinux-daemontools-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-daemontools/selinux-daemontools-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-daemontools/selinux-daemontools-2.20170204-r2.ebuild b/sec-policy/selinux-daemontools/selinux-daemontools-2.20170204-r2.ebuild
index d6fc7ffc1408..1f23f5162145 100644
--- a/sec-policy/selinux-daemontools/selinux-daemontools-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-daemontools/selinux-daemontools-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-daemontools/selinux-daemontools-2.20170204-r3.ebuild b/sec-policy/selinux-daemontools/selinux-daemontools-2.20170204-r3.ebuild
index d6fc7ffc1408..1f23f5162145 100644
--- a/sec-policy/selinux-daemontools/selinux-daemontools-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-daemontools/selinux-daemontools-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-daemontools/selinux-daemontools-2.20170204-r4.ebuild b/sec-policy/selinux-daemontools/selinux-daemontools-2.20170204-r4.ebuild
index d6fc7ffc1408..1f23f5162145 100644
--- a/sec-policy/selinux-daemontools/selinux-daemontools-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-daemontools/selinux-daemontools-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-daemontools/selinux-daemontools-2.20170805-r2.ebuild b/sec-policy/selinux-daemontools/selinux-daemontools-2.20170805-r2.ebuild
index d6fc7ffc1408..1f23f5162145 100644
--- a/sec-policy/selinux-daemontools/selinux-daemontools-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-daemontools/selinux-daemontools-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-daemontools/selinux-daemontools-2.20170805-r3.ebuild b/sec-policy/selinux-daemontools/selinux-daemontools-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..550743a1d4d6
--- /dev/null
+++ b/sec-policy/selinux-daemontools/selinux-daemontools-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-daemontools/selinux-daemontools-9999.ebuild b/sec-policy/selinux-daemontools/selinux-daemontools-9999.ebuild
index e589705c1787..550743a1d4d6 100644
--- a/sec-policy/selinux-daemontools/selinux-daemontools-9999.ebuild
+++ b/sec-policy/selinux-daemontools/selinux-daemontools-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dante/Manifest b/sec-policy/selinux-dante/Manifest
index ea53e518fc40..96e2e0d0a144 100644
--- a/sec-policy/selinux-dante/Manifest
+++ b/sec-policy/selinux-dante/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-dante-2.20170204-r1.ebuild 281 SHA256 9c4fa8e241d15e829b6d2157430191a926bacd60dcd57e100d9a57fe8cd5a691 SHA512 36ff64374e9afbf78d2ed50647d20cb8e3ff9527821d16121e5a3443996de4a85fff3314071c421f29bb7cab5b81b84c9e488368d2dd12f42890cc9509c9a45f WHIRLPOOL 13421eb6e91ef74e0c2f6759d96c7caed122ebfc8d1260b33e90287a512bcd7e72a5581fecaf5b4ebb4267852b26d8ac8d2a3b046ecbace6c691fe296470f39c
-EBUILD selinux-dante-2.20170204-r2.ebuild 279 SHA256 d624a0a7fad77b70d247b4299deba121e94c181c9a9254026ecece9c0224d16f SHA512 ba317ea4747b6195b03d3779cbf45481cdf1968454b8a5a9203d003c40ac7c9d6181511b6b715f3aa5562eca48e8980f76c600172af204bcb70ad6ab07ca5613 WHIRLPOOL 6adc9ce699928266a25fd0a788c0912e2951b32b2e3eceb1734cde37f85abb1529997343febe3f425144a8cfed914888a2655366d1d05a826ee55776c0e76b82
-EBUILD selinux-dante-2.20170204-r3.ebuild 279 SHA256 d624a0a7fad77b70d247b4299deba121e94c181c9a9254026ecece9c0224d16f SHA512 ba317ea4747b6195b03d3779cbf45481cdf1968454b8a5a9203d003c40ac7c9d6181511b6b715f3aa5562eca48e8980f76c600172af204bcb70ad6ab07ca5613 WHIRLPOOL 6adc9ce699928266a25fd0a788c0912e2951b32b2e3eceb1734cde37f85abb1529997343febe3f425144a8cfed914888a2655366d1d05a826ee55776c0e76b82
-EBUILD selinux-dante-2.20170204-r4.ebuild 279 SHA256 d624a0a7fad77b70d247b4299deba121e94c181c9a9254026ecece9c0224d16f SHA512 ba317ea4747b6195b03d3779cbf45481cdf1968454b8a5a9203d003c40ac7c9d6181511b6b715f3aa5562eca48e8980f76c600172af204bcb70ad6ab07ca5613 WHIRLPOOL 6adc9ce699928266a25fd0a788c0912e2951b32b2e3eceb1734cde37f85abb1529997343febe3f425144a8cfed914888a2655366d1d05a826ee55776c0e76b82
-EBUILD selinux-dante-2.20170805-r2.ebuild 279 SHA256 d624a0a7fad77b70d247b4299deba121e94c181c9a9254026ecece9c0224d16f SHA512 ba317ea4747b6195b03d3779cbf45481cdf1968454b8a5a9203d003c40ac7c9d6181511b6b715f3aa5562eca48e8980f76c600172af204bcb70ad6ab07ca5613 WHIRLPOOL 6adc9ce699928266a25fd0a788c0912e2951b32b2e3eceb1734cde37f85abb1529997343febe3f425144a8cfed914888a2655366d1d05a826ee55776c0e76b82
-EBUILD selinux-dante-9999.ebuild 281 SHA256 9c4fa8e241d15e829b6d2157430191a926bacd60dcd57e100d9a57fe8cd5a691 SHA512 36ff64374e9afbf78d2ed50647d20cb8e3ff9527821d16121e5a3443996de4a85fff3314071c421f29bb7cab5b81b84c9e488368d2dd12f42890cc9509c9a45f WHIRLPOOL 13421eb6e91ef74e0c2f6759d96c7caed122ebfc8d1260b33e90287a512bcd7e72a5581fecaf5b4ebb4267852b26d8ac8d2a3b046ecbace6c691fe296470f39c
+EBUILD selinux-dante-2.20170204-r1.ebuild 282 SHA256 23679ec15dcaa03793b3e0b85077fa9cc2d689b9f03cb71352eff1d4558ef9ac SHA512 ee684018536da113a47cb31d5b172bbc951210db50798f158eb83bba85f9214c5e6140de284fb2ed6af4f55874c32034e05c364269f33bdcd922bb417d7d73ea WHIRLPOOL 944a363bcee00a38c624ddd58467631d99acdc477983243fa8bcb84dc8cfceed4f697a961dbe3a27d43158a5048371daca12aa073009bdc7098856548a6f0bec
+EBUILD selinux-dante-2.20170204-r2.ebuild 280 SHA256 0d9f3d2fa511986d885d9893ed18673c57e1398efbd7f1038f34b544d18308a9 SHA512 9433451947b874fcecfb4d17acd3fa685c44c64b2442426247112b71194bb8431d6c9415a55d1e5d05641e51463de8193f82379bf1a7a1d23af5803833986271 WHIRLPOOL 9bb0999c95a7f4b24a3bcfb1a8aba95ff4512ec0b13ee780377d536bff596d1c2333bda37f6390cb8c735750b7af4ec50ea36a2c399d4f3755db53c19199d39f
+EBUILD selinux-dante-2.20170204-r3.ebuild 280 SHA256 0d9f3d2fa511986d885d9893ed18673c57e1398efbd7f1038f34b544d18308a9 SHA512 9433451947b874fcecfb4d17acd3fa685c44c64b2442426247112b71194bb8431d6c9415a55d1e5d05641e51463de8193f82379bf1a7a1d23af5803833986271 WHIRLPOOL 9bb0999c95a7f4b24a3bcfb1a8aba95ff4512ec0b13ee780377d536bff596d1c2333bda37f6390cb8c735750b7af4ec50ea36a2c399d4f3755db53c19199d39f
+EBUILD selinux-dante-2.20170204-r4.ebuild 280 SHA256 0d9f3d2fa511986d885d9893ed18673c57e1398efbd7f1038f34b544d18308a9 SHA512 9433451947b874fcecfb4d17acd3fa685c44c64b2442426247112b71194bb8431d6c9415a55d1e5d05641e51463de8193f82379bf1a7a1d23af5803833986271 WHIRLPOOL 9bb0999c95a7f4b24a3bcfb1a8aba95ff4512ec0b13ee780377d536bff596d1c2333bda37f6390cb8c735750b7af4ec50ea36a2c399d4f3755db53c19199d39f
+EBUILD selinux-dante-2.20170805-r2.ebuild 280 SHA256 0d9f3d2fa511986d885d9893ed18673c57e1398efbd7f1038f34b544d18308a9 SHA512 9433451947b874fcecfb4d17acd3fa685c44c64b2442426247112b71194bb8431d6c9415a55d1e5d05641e51463de8193f82379bf1a7a1d23af5803833986271 WHIRLPOOL 9bb0999c95a7f4b24a3bcfb1a8aba95ff4512ec0b13ee780377d536bff596d1c2333bda37f6390cb8c735750b7af4ec50ea36a2c399d4f3755db53c19199d39f
+EBUILD selinux-dante-2.20170805-r3.ebuild 282 SHA256 23679ec15dcaa03793b3e0b85077fa9cc2d689b9f03cb71352eff1d4558ef9ac SHA512 ee684018536da113a47cb31d5b172bbc951210db50798f158eb83bba85f9214c5e6140de284fb2ed6af4f55874c32034e05c364269f33bdcd922bb417d7d73ea WHIRLPOOL 944a363bcee00a38c624ddd58467631d99acdc477983243fa8bcb84dc8cfceed4f697a961dbe3a27d43158a5048371daca12aa073009bdc7098856548a6f0bec
+EBUILD selinux-dante-9999.ebuild 282 SHA256 23679ec15dcaa03793b3e0b85077fa9cc2d689b9f03cb71352eff1d4558ef9ac SHA512 ee684018536da113a47cb31d5b172bbc951210db50798f158eb83bba85f9214c5e6140de284fb2ed6af4f55874c32034e05c364269f33bdcd922bb417d7d73ea WHIRLPOOL 944a363bcee00a38c624ddd58467631d99acdc477983243fa8bcb84dc8cfceed4f697a961dbe3a27d43158a5048371daca12aa073009bdc7098856548a6f0bec
 MISC ChangeLog 10479 SHA256 2f1c69286d6d137963cdd7075ead7dbbb7897b57b80af8bde9eb19a23c1f18ab SHA512 ebad8bb0e53571dda7fb24de3d26f9a3c8a49540d0837c9a6a2d4ecfffbdb0188604058237fa22921d85fad08a5aa026031a332916bc8935a57ab671037e418a WHIRLPOOL 1785733bf0470aef47f6aeb711380b90b8b18a6c702df768c0b1738cdb335888b1d76d17299bf739b862ab77f75b6a7d21f09a537b1407a40b65c1a0736eb531
 MISC ChangeLog-2015 13347 SHA256 9ee4718d3807b62451c0633759a043d3e6e2d9e6ac35851f3a053bcd367aa70c SHA512 094cc3f1e45cbee8c4a870ef182ff455997107b62d2df0645308595b1a21afb2c0e775ba015acdb953eedb3e5cd28d3e3a1dea0ee77978cc865fee6b3d13296c WHIRLPOOL 7d046b4c99760cbaf7c6cdb597648c7046b0d48af840203aa9b9ca92cce2ae4a42791f3dca23776a358e170d8dba417fefa165fe2f2e9d742163e597971593ac
 MISC metadata.xml 315 SHA256 d64b57ad9b31d2e3b8306ef156b0e0b54bd35ad05f82c269f120650f3688c85f SHA512 e9a60869542dab4e36aa4a2cdc6bbcbb12a825ba498aefc79d3a3ffbc6b3f22025ec4ab0fce073c983a6a3c4f9d144e2dd9f6019f74e641ec6876c6a3d3ce25b WHIRLPOOL d446bd3ea7091f6453052a3735f10be7ec3b58e40732dc00d773218e060dd4030ebd9495e842b528eebc5f4319cddfce70ee56697f382b3c3b0933260abb57c6
diff --git a/sec-policy/selinux-dante/selinux-dante-2.20170204-r1.ebuild b/sec-policy/selinux-dante/selinux-dante-2.20170204-r1.ebuild
index 49d429c80f62..e2de99289f2e 100644
--- a/sec-policy/selinux-dante/selinux-dante-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-dante/selinux-dante-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dante/selinux-dante-2.20170204-r2.ebuild b/sec-policy/selinux-dante/selinux-dante-2.20170204-r2.ebuild
index a724ada4656f..3557637d05e8 100644
--- a/sec-policy/selinux-dante/selinux-dante-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-dante/selinux-dante-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dante/selinux-dante-2.20170204-r3.ebuild b/sec-policy/selinux-dante/selinux-dante-2.20170204-r3.ebuild
index a724ada4656f..3557637d05e8 100644
--- a/sec-policy/selinux-dante/selinux-dante-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-dante/selinux-dante-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dante/selinux-dante-2.20170204-r4.ebuild b/sec-policy/selinux-dante/selinux-dante-2.20170204-r4.ebuild
index a724ada4656f..3557637d05e8 100644
--- a/sec-policy/selinux-dante/selinux-dante-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-dante/selinux-dante-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dante/selinux-dante-2.20170805-r2.ebuild b/sec-policy/selinux-dante/selinux-dante-2.20170805-r2.ebuild
index a724ada4656f..3557637d05e8 100644
--- a/sec-policy/selinux-dante/selinux-dante-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-dante/selinux-dante-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dante/selinux-dante-2.20170805-r3.ebuild b/sec-policy/selinux-dante/selinux-dante-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..e2de99289f2e
--- /dev/null
+++ b/sec-policy/selinux-dante/selinux-dante-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-dante/selinux-dante-9999.ebuild b/sec-policy/selinux-dante/selinux-dante-9999.ebuild
index 49d429c80f62..e2de99289f2e 100644
--- a/sec-policy/selinux-dante/selinux-dante-9999.ebuild
+++ b/sec-policy/selinux-dante/selinux-dante-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dbadm/Manifest b/sec-policy/selinux-dbadm/Manifest
index 665d8fd10d68..f00a30303e36 100644
--- a/sec-policy/selinux-dbadm/Manifest
+++ b/sec-policy/selinux-dbadm/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-dbadm-2.20170204-r1.ebuild 281 SHA256 cdde86a6c9644a0e3c8e9b23e50f865952496c4d97d97275939a1c8982b87e0a SHA512 22c1376dc13a647bcbcce629da223799b779b79647947224f26fce0fbb9951be0cac52505ef086adc2cc6ada0e2d818824b64e8c8b432bf41b64746dde2c3ed1 WHIRLPOOL d1902887e608d1fea3da08ddd8ed559c5482cc894836b1329300aa775c471019fe2609e7d608ee218a898735cd004e8f4fc3694407fd645c4d15ba4a7e68ca52
-EBUILD selinux-dbadm-2.20170204-r2.ebuild 279 SHA256 16701c9824d26999fc2acb073cbd2dbc2c27201e9994c6814a56378bb727677f SHA512 68cf9d3d08a2ffb037a9317e2f2bcf51f15e04ad19cf5334472d8aa636afe0026283f30aa56f436cf886b63ed91d9755716ab962e910d8cbcefddb252c570267 WHIRLPOOL 3d29be1bbd3ec7678330ab91907e34ec10bf1f64fba7ab679987182d0ad72bea7fc9a43897c8cdde9f8fa6dbdbb92563244332ddfbc62e4dfc6aec16293c31d8
-EBUILD selinux-dbadm-2.20170204-r3.ebuild 279 SHA256 16701c9824d26999fc2acb073cbd2dbc2c27201e9994c6814a56378bb727677f SHA512 68cf9d3d08a2ffb037a9317e2f2bcf51f15e04ad19cf5334472d8aa636afe0026283f30aa56f436cf886b63ed91d9755716ab962e910d8cbcefddb252c570267 WHIRLPOOL 3d29be1bbd3ec7678330ab91907e34ec10bf1f64fba7ab679987182d0ad72bea7fc9a43897c8cdde9f8fa6dbdbb92563244332ddfbc62e4dfc6aec16293c31d8
-EBUILD selinux-dbadm-2.20170204-r4.ebuild 279 SHA256 16701c9824d26999fc2acb073cbd2dbc2c27201e9994c6814a56378bb727677f SHA512 68cf9d3d08a2ffb037a9317e2f2bcf51f15e04ad19cf5334472d8aa636afe0026283f30aa56f436cf886b63ed91d9755716ab962e910d8cbcefddb252c570267 WHIRLPOOL 3d29be1bbd3ec7678330ab91907e34ec10bf1f64fba7ab679987182d0ad72bea7fc9a43897c8cdde9f8fa6dbdbb92563244332ddfbc62e4dfc6aec16293c31d8
-EBUILD selinux-dbadm-2.20170805-r2.ebuild 279 SHA256 16701c9824d26999fc2acb073cbd2dbc2c27201e9994c6814a56378bb727677f SHA512 68cf9d3d08a2ffb037a9317e2f2bcf51f15e04ad19cf5334472d8aa636afe0026283f30aa56f436cf886b63ed91d9755716ab962e910d8cbcefddb252c570267 WHIRLPOOL 3d29be1bbd3ec7678330ab91907e34ec10bf1f64fba7ab679987182d0ad72bea7fc9a43897c8cdde9f8fa6dbdbb92563244332ddfbc62e4dfc6aec16293c31d8
-EBUILD selinux-dbadm-9999.ebuild 281 SHA256 cdde86a6c9644a0e3c8e9b23e50f865952496c4d97d97275939a1c8982b87e0a SHA512 22c1376dc13a647bcbcce629da223799b779b79647947224f26fce0fbb9951be0cac52505ef086adc2cc6ada0e2d818824b64e8c8b432bf41b64746dde2c3ed1 WHIRLPOOL d1902887e608d1fea3da08ddd8ed559c5482cc894836b1329300aa775c471019fe2609e7d608ee218a898735cd004e8f4fc3694407fd645c4d15ba4a7e68ca52
+EBUILD selinux-dbadm-2.20170204-r1.ebuild 282 SHA256 ccbd8cbf9e1853cfb4fd7debc360a37da41a7c1eb938502e0884f8c27a2dd6b1 SHA512 338b04a5a7b1748de3b8c7f6c75996bb6328287980a101cdc6831cb2a308cb9e0f4a6781d0b9044cd081bab3f875b6dfe29ec2a21bda2985e5cbe2196c4a2110 WHIRLPOOL a5ded9d89486d5f880b91e907e896cfed4199d6e907e4c90f6e814e79d426c324f7775a2a37dd18746e2cace6e1b041f100800206f568f94ca067bae3c6d2f79
+EBUILD selinux-dbadm-2.20170204-r2.ebuild 280 SHA256 4436ce18572f6d8fe5a54c8620dc041102770619152ce144bdf23ae4a7f93f4c SHA512 16f4a497cdbbcfc03349c5506c8821cf817e9db84995241e5522f3084bc7045faaea0c46ddfa63d83aa07f946ee84bb4e86c16b8614cfa9cebd71fcabce92a89 WHIRLPOOL 65a2c0cda624d675f6bfd73e1d85c0edca699957d183d35598fc2cff7d9274708453006e0332cbb8fe57b6d432bf0607ae1e0a3ee66e1da1fb8495c46f919a8c
+EBUILD selinux-dbadm-2.20170204-r3.ebuild 280 SHA256 4436ce18572f6d8fe5a54c8620dc041102770619152ce144bdf23ae4a7f93f4c SHA512 16f4a497cdbbcfc03349c5506c8821cf817e9db84995241e5522f3084bc7045faaea0c46ddfa63d83aa07f946ee84bb4e86c16b8614cfa9cebd71fcabce92a89 WHIRLPOOL 65a2c0cda624d675f6bfd73e1d85c0edca699957d183d35598fc2cff7d9274708453006e0332cbb8fe57b6d432bf0607ae1e0a3ee66e1da1fb8495c46f919a8c
+EBUILD selinux-dbadm-2.20170204-r4.ebuild 280 SHA256 4436ce18572f6d8fe5a54c8620dc041102770619152ce144bdf23ae4a7f93f4c SHA512 16f4a497cdbbcfc03349c5506c8821cf817e9db84995241e5522f3084bc7045faaea0c46ddfa63d83aa07f946ee84bb4e86c16b8614cfa9cebd71fcabce92a89 WHIRLPOOL 65a2c0cda624d675f6bfd73e1d85c0edca699957d183d35598fc2cff7d9274708453006e0332cbb8fe57b6d432bf0607ae1e0a3ee66e1da1fb8495c46f919a8c
+EBUILD selinux-dbadm-2.20170805-r2.ebuild 280 SHA256 4436ce18572f6d8fe5a54c8620dc041102770619152ce144bdf23ae4a7f93f4c SHA512 16f4a497cdbbcfc03349c5506c8821cf817e9db84995241e5522f3084bc7045faaea0c46ddfa63d83aa07f946ee84bb4e86c16b8614cfa9cebd71fcabce92a89 WHIRLPOOL 65a2c0cda624d675f6bfd73e1d85c0edca699957d183d35598fc2cff7d9274708453006e0332cbb8fe57b6d432bf0607ae1e0a3ee66e1da1fb8495c46f919a8c
+EBUILD selinux-dbadm-2.20170805-r3.ebuild 282 SHA256 ccbd8cbf9e1853cfb4fd7debc360a37da41a7c1eb938502e0884f8c27a2dd6b1 SHA512 338b04a5a7b1748de3b8c7f6c75996bb6328287980a101cdc6831cb2a308cb9e0f4a6781d0b9044cd081bab3f875b6dfe29ec2a21bda2985e5cbe2196c4a2110 WHIRLPOOL a5ded9d89486d5f880b91e907e896cfed4199d6e907e4c90f6e814e79d426c324f7775a2a37dd18746e2cace6e1b041f100800206f568f94ca067bae3c6d2f79
+EBUILD selinux-dbadm-9999.ebuild 282 SHA256 ccbd8cbf9e1853cfb4fd7debc360a37da41a7c1eb938502e0884f8c27a2dd6b1 SHA512 338b04a5a7b1748de3b8c7f6c75996bb6328287980a101cdc6831cb2a308cb9e0f4a6781d0b9044cd081bab3f875b6dfe29ec2a21bda2985e5cbe2196c4a2110 WHIRLPOOL a5ded9d89486d5f880b91e907e896cfed4199d6e907e4c90f6e814e79d426c324f7775a2a37dd18746e2cace6e1b041f100800206f568f94ca067bae3c6d2f79
 MISC ChangeLog 10479 SHA256 3955653aac902b602625068c094750e5896e0dc9e23bcb44d2b6b001f192791a SHA512 456d2e0f30fbef647b630fe94cf261ff0dd1282f8330f640a303043976ae535efa60c56541cca24f676ec51fa5e4d9f94d1165012cd2c5d3057d8c07e29631ce WHIRLPOOL c40df88400c9467be89ccf0e0d50ad12d55c1b99a1634cc5cbbfc512052d95f0e341ad554193f57e0a2f4f28bbfe4d55838100d0df24734616d2dd94f3dc31e0
 MISC ChangeLog-2015 7645 SHA256 11c2a14316a9e67f3de4f731ae25900536c656c958786db142886d45d14e9521 SHA512 c6a6397950cc5a87166d457a3c8442e05e9ebd7e4f7d2cce977eca5583f07dcc041fcfdf10730bb763aa05145de6bd067d72272884d5d592e385083bab748f3d WHIRLPOOL 1a4545661ec0df21892899916db0f0053a038c2ed4b076c2bdfb59e210c4a0391100c29a6607c2ab3ab1a03194b03e01e8fe0fe266aca2a2797ee1bd0728f57c
 MISC metadata.xml 315 SHA256 4cb81cf14adb19ef94cb95a0c4b3fc49c12b37b4f98ab32010e2449d3d94df7a SHA512 c87f64c70f1f825f314d5febb85d0172d528a8e643472d4c47f3b9e0fc28e89fdb62e0f5bd77813bd2239e13b22310d152e34768d69a99f4240d1c2aa43e5bd0 WHIRLPOOL 644a7ba668a9e36d8f561d33090c1a4c7c7086dcd3bffc86e99a821ba0ae4bb4a680a1d504e68ae69bb7d959535e14d8703029a8c04f9b0c0ca683a586998bab
diff --git a/sec-policy/selinux-dbadm/selinux-dbadm-2.20170204-r1.ebuild b/sec-policy/selinux-dbadm/selinux-dbadm-2.20170204-r1.ebuild
index 0c1d365bac19..6fa3539250e5 100644
--- a/sec-policy/selinux-dbadm/selinux-dbadm-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-dbadm/selinux-dbadm-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dbadm/selinux-dbadm-2.20170204-r2.ebuild b/sec-policy/selinux-dbadm/selinux-dbadm-2.20170204-r2.ebuild
index 850358c56759..ecf1d5968039 100644
--- a/sec-policy/selinux-dbadm/selinux-dbadm-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-dbadm/selinux-dbadm-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dbadm/selinux-dbadm-2.20170204-r3.ebuild b/sec-policy/selinux-dbadm/selinux-dbadm-2.20170204-r3.ebuild
index 850358c56759..ecf1d5968039 100644
--- a/sec-policy/selinux-dbadm/selinux-dbadm-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-dbadm/selinux-dbadm-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dbadm/selinux-dbadm-2.20170204-r4.ebuild b/sec-policy/selinux-dbadm/selinux-dbadm-2.20170204-r4.ebuild
index 850358c56759..ecf1d5968039 100644
--- a/sec-policy/selinux-dbadm/selinux-dbadm-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-dbadm/selinux-dbadm-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dbadm/selinux-dbadm-2.20170805-r2.ebuild b/sec-policy/selinux-dbadm/selinux-dbadm-2.20170805-r2.ebuild
index 850358c56759..ecf1d5968039 100644
--- a/sec-policy/selinux-dbadm/selinux-dbadm-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-dbadm/selinux-dbadm-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dbadm/selinux-dbadm-2.20170805-r3.ebuild b/sec-policy/selinux-dbadm/selinux-dbadm-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..6fa3539250e5
--- /dev/null
+++ b/sec-policy/selinux-dbadm/selinux-dbadm-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-dbadm/selinux-dbadm-9999.ebuild b/sec-policy/selinux-dbadm/selinux-dbadm-9999.ebuild
index 0c1d365bac19..6fa3539250e5 100644
--- a/sec-policy/selinux-dbadm/selinux-dbadm-9999.ebuild
+++ b/sec-policy/selinux-dbadm/selinux-dbadm-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dbskk/Manifest b/sec-policy/selinux-dbskk/Manifest
index a80dc56f3dc8..c9fe38c8f696 100644
--- a/sec-policy/selinux-dbskk/Manifest
+++ b/sec-policy/selinux-dbskk/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-dbskk-2.20170204-r1.ebuild 375 SHA256 da38d2af2a5848207200aa7f16f0b0536dd8473b527266efb453cd612ba9c6aa SHA512 58abcf92292eb6ad36e07121addc5103bab3c837d7d85b759b2d59bb4c1c5d73611de0cbd96f1a7496378ca65e838739778815cd767348c534708ea124bc95ce WHIRLPOOL 69caa1801f61264888e86647ce2960f2aebc732500bc38c7fd7ea43f694e5288bc41e0da04ca9f96856b5037a4b0cb2f4ca26bbb348b063bfbfedc1f37200c2e
-EBUILD selinux-dbskk-2.20170204-r2.ebuild 373 SHA256 4c6632d0b0d54b8e2c527cacbac89daced0c3c0d2404304df0b9495befa2ec63 SHA512 05c1ae407a7c2349ab84b3f0ce956da0355bd62f5336f3b8cabb8e03c4f70b8162c713947dae7992ead2bb69666f07296d7af8b0e39e29ed921b23d1958007ae WHIRLPOOL 0efc152ae371f946d23329ec50302c6df97ba70eddb91b3ecc3e39d5fdd9a98964cbe18eca8156c807a5b087798af90e1a7096c0be1225c8956ba718c3a3e60c
-EBUILD selinux-dbskk-2.20170204-r3.ebuild 373 SHA256 4c6632d0b0d54b8e2c527cacbac89daced0c3c0d2404304df0b9495befa2ec63 SHA512 05c1ae407a7c2349ab84b3f0ce956da0355bd62f5336f3b8cabb8e03c4f70b8162c713947dae7992ead2bb69666f07296d7af8b0e39e29ed921b23d1958007ae WHIRLPOOL 0efc152ae371f946d23329ec50302c6df97ba70eddb91b3ecc3e39d5fdd9a98964cbe18eca8156c807a5b087798af90e1a7096c0be1225c8956ba718c3a3e60c
-EBUILD selinux-dbskk-2.20170204-r4.ebuild 373 SHA256 4c6632d0b0d54b8e2c527cacbac89daced0c3c0d2404304df0b9495befa2ec63 SHA512 05c1ae407a7c2349ab84b3f0ce956da0355bd62f5336f3b8cabb8e03c4f70b8162c713947dae7992ead2bb69666f07296d7af8b0e39e29ed921b23d1958007ae WHIRLPOOL 0efc152ae371f946d23329ec50302c6df97ba70eddb91b3ecc3e39d5fdd9a98964cbe18eca8156c807a5b087798af90e1a7096c0be1225c8956ba718c3a3e60c
-EBUILD selinux-dbskk-2.20170805-r2.ebuild 373 SHA256 4c6632d0b0d54b8e2c527cacbac89daced0c3c0d2404304df0b9495befa2ec63 SHA512 05c1ae407a7c2349ab84b3f0ce956da0355bd62f5336f3b8cabb8e03c4f70b8162c713947dae7992ead2bb69666f07296d7af8b0e39e29ed921b23d1958007ae WHIRLPOOL 0efc152ae371f946d23329ec50302c6df97ba70eddb91b3ecc3e39d5fdd9a98964cbe18eca8156c807a5b087798af90e1a7096c0be1225c8956ba718c3a3e60c
-EBUILD selinux-dbskk-9999.ebuild 375 SHA256 da38d2af2a5848207200aa7f16f0b0536dd8473b527266efb453cd612ba9c6aa SHA512 58abcf92292eb6ad36e07121addc5103bab3c837d7d85b759b2d59bb4c1c5d73611de0cbd96f1a7496378ca65e838739778815cd767348c534708ea124bc95ce WHIRLPOOL 69caa1801f61264888e86647ce2960f2aebc732500bc38c7fd7ea43f694e5288bc41e0da04ca9f96856b5037a4b0cb2f4ca26bbb348b063bfbfedc1f37200c2e
+EBUILD selinux-dbskk-2.20170204-r1.ebuild 376 SHA256 67a7ee0eedd4408cb3fdef6da172b75b48f4ee250b02d65005162126cbbf5149 SHA512 13e1d2877bf9ccb9b8d3d23927d7e66062124ed515c2d7d65a94719af5124468d8725705df957108afae243b4c0a479e928f805651fa4123b6680d0a103399dc WHIRLPOOL 2fa62f62ea7aa5cc140b9e5d4f2b9ab3c22ab97b34f7e312d968c226c95f69adeabc63d9f247b2e3e192e60cddb17c85499568663fe92dca851bd83f8e70dceb
+EBUILD selinux-dbskk-2.20170204-r2.ebuild 374 SHA256 c9a9e7eed9160ee79393a06f1666615ddf581342ee4794e06e034c7c6f4c6423 SHA512 f4819930cbdac8e9305aa67d02babe9453cd4348413e1629001367333b6cc3b5db7bd5d2c64073a1ce95bd043141a285e68aafdf621cdcc21d56163b6f129724 WHIRLPOOL fb73045da7c0a86f90a6094bcbd72d1a135a92647fc6ee42b790c0fa2ab52f97bb28ad086dd661aee2a6d503a6a34114c5f177f35793750b09793e04ffc0520d
+EBUILD selinux-dbskk-2.20170204-r3.ebuild 374 SHA256 c9a9e7eed9160ee79393a06f1666615ddf581342ee4794e06e034c7c6f4c6423 SHA512 f4819930cbdac8e9305aa67d02babe9453cd4348413e1629001367333b6cc3b5db7bd5d2c64073a1ce95bd043141a285e68aafdf621cdcc21d56163b6f129724 WHIRLPOOL fb73045da7c0a86f90a6094bcbd72d1a135a92647fc6ee42b790c0fa2ab52f97bb28ad086dd661aee2a6d503a6a34114c5f177f35793750b09793e04ffc0520d
+EBUILD selinux-dbskk-2.20170204-r4.ebuild 374 SHA256 c9a9e7eed9160ee79393a06f1666615ddf581342ee4794e06e034c7c6f4c6423 SHA512 f4819930cbdac8e9305aa67d02babe9453cd4348413e1629001367333b6cc3b5db7bd5d2c64073a1ce95bd043141a285e68aafdf621cdcc21d56163b6f129724 WHIRLPOOL fb73045da7c0a86f90a6094bcbd72d1a135a92647fc6ee42b790c0fa2ab52f97bb28ad086dd661aee2a6d503a6a34114c5f177f35793750b09793e04ffc0520d
+EBUILD selinux-dbskk-2.20170805-r2.ebuild 374 SHA256 c9a9e7eed9160ee79393a06f1666615ddf581342ee4794e06e034c7c6f4c6423 SHA512 f4819930cbdac8e9305aa67d02babe9453cd4348413e1629001367333b6cc3b5db7bd5d2c64073a1ce95bd043141a285e68aafdf621cdcc21d56163b6f129724 WHIRLPOOL fb73045da7c0a86f90a6094bcbd72d1a135a92647fc6ee42b790c0fa2ab52f97bb28ad086dd661aee2a6d503a6a34114c5f177f35793750b09793e04ffc0520d
+EBUILD selinux-dbskk-2.20170805-r3.ebuild 376 SHA256 67a7ee0eedd4408cb3fdef6da172b75b48f4ee250b02d65005162126cbbf5149 SHA512 13e1d2877bf9ccb9b8d3d23927d7e66062124ed515c2d7d65a94719af5124468d8725705df957108afae243b4c0a479e928f805651fa4123b6680d0a103399dc WHIRLPOOL 2fa62f62ea7aa5cc140b9e5d4f2b9ab3c22ab97b34f7e312d968c226c95f69adeabc63d9f247b2e3e192e60cddb17c85499568663fe92dca851bd83f8e70dceb
+EBUILD selinux-dbskk-9999.ebuild 376 SHA256 67a7ee0eedd4408cb3fdef6da172b75b48f4ee250b02d65005162126cbbf5149 SHA512 13e1d2877bf9ccb9b8d3d23927d7e66062124ed515c2d7d65a94719af5124468d8725705df957108afae243b4c0a479e928f805651fa4123b6680d0a103399dc WHIRLPOOL 2fa62f62ea7aa5cc140b9e5d4f2b9ab3c22ab97b34f7e312d968c226c95f69adeabc63d9f247b2e3e192e60cddb17c85499568663fe92dca851bd83f8e70dceb
 MISC ChangeLog 10479 SHA256 f7406321ece5c23cae1354e6a97d136d37dfde3d60f8064999a0e4190bfe0d6b SHA512 6387860f33afc1d3764131316001e379ccd9b4ab5745cd67aa563f77e1f0172aec863c27a38a7830932029ae3193fc23cd9af655c2c76d3f79095c63be2316f7 WHIRLPOOL c8dc33bf85461f09142e9d7c71ab2f31b94ca723265db774abcb730716bb4aeebb8dced3502bb6753b85326a0fbd6b4b7935c280c00b3651ca37cdf9b9fa4d0c
 MISC ChangeLog-2015 10014 SHA256 f3833484500e17896b07a4256ac9d82369a3d04cdbda078abc40cb7223e330ff SHA512 308f2a1f9bae1af670cc5fa420a87db80eb1ee22d1f08d4b2ba5d0a7e1a7e3513d0216ca246a1059eab0f7fde5a8dcc43ad6f1b028d6848df769958908ef88ba WHIRLPOOL 9b95fcdfac3ab84ffa9c062cb722256a0f856a1289090f1203386c55e2c5e3a6894824d7ca953b119b2fcad0b613e4e32a26fd49b4a9cef48db85fac0a52ef4c
 MISC metadata.xml 315 SHA256 398e5634635a12c7ef361e227623dbc510856cc043785d76104449b05bde5a93 SHA512 6343c4ff0f737a41d7651884b4193cb14fa546125723e032c1f9e277a006fc321102a081b8017388c3d7001bebbec12ad4b83c0b2e347e8abdb01ef41a4d5945 WHIRLPOOL 5b62968abc41eb63881b8f00762db222dde36350a1bd923fadf9bac6dae6f08e523b4497da1b91fe692d2e06b4d0b74cd9cc9939649a00f2bcab21e5fb7e066a
diff --git a/sec-policy/selinux-dbskk/selinux-dbskk-2.20170204-r1.ebuild b/sec-policy/selinux-dbskk/selinux-dbskk-2.20170204-r1.ebuild
index 71026baa37c4..6c92882d3140 100644
--- a/sec-policy/selinux-dbskk/selinux-dbskk-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-dbskk/selinux-dbskk-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dbskk/selinux-dbskk-2.20170204-r2.ebuild b/sec-policy/selinux-dbskk/selinux-dbskk-2.20170204-r2.ebuild
index f2c92be93861..c08daf48574f 100644
--- a/sec-policy/selinux-dbskk/selinux-dbskk-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-dbskk/selinux-dbskk-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dbskk/selinux-dbskk-2.20170204-r3.ebuild b/sec-policy/selinux-dbskk/selinux-dbskk-2.20170204-r3.ebuild
index f2c92be93861..c08daf48574f 100644
--- a/sec-policy/selinux-dbskk/selinux-dbskk-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-dbskk/selinux-dbskk-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dbskk/selinux-dbskk-2.20170204-r4.ebuild b/sec-policy/selinux-dbskk/selinux-dbskk-2.20170204-r4.ebuild
index f2c92be93861..c08daf48574f 100644
--- a/sec-policy/selinux-dbskk/selinux-dbskk-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-dbskk/selinux-dbskk-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dbskk/selinux-dbskk-2.20170805-r2.ebuild b/sec-policy/selinux-dbskk/selinux-dbskk-2.20170805-r2.ebuild
index f2c92be93861..c08daf48574f 100644
--- a/sec-policy/selinux-dbskk/selinux-dbskk-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-dbskk/selinux-dbskk-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dbskk/selinux-dbskk-2.20170805-r3.ebuild b/sec-policy/selinux-dbskk/selinux-dbskk-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..6c92882d3140
--- /dev/null
+++ b/sec-policy/selinux-dbskk/selinux-dbskk-2.20170805-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-dbskk/selinux-dbskk-9999.ebuild b/sec-policy/selinux-dbskk/selinux-dbskk-9999.ebuild
index 71026baa37c4..6c92882d3140 100644
--- a/sec-policy/selinux-dbskk/selinux-dbskk-9999.ebuild
+++ b/sec-policy/selinux-dbskk/selinux-dbskk-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dbus/Manifest b/sec-policy/selinux-dbus/Manifest
index 27bfda35f819..a2253dad0efd 100644
--- a/sec-policy/selinux-dbus/Manifest
+++ b/sec-policy/selinux-dbus/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-dbus-2.20170204-r1.ebuild 279 SHA256 414085522a463e8633eeee67f31a59cfded449e9ec0fcb94cc8fd75107a8f547 SHA512 15f015ded24991ba85682a0b9ea093f96e7adaadc564fe2c20906940236873479f9dc07e1b46621394d26012eb8c5103dbd937b8160b928e69ff085d26cd6598 WHIRLPOOL 7a7e375dc65b191ac32789b8a6ffccac28c97786b0dd594d68401053f91ffd389c009c9846a69c08b444e6649f60648e957bc06a227af361a6925c0ffbdb44d4
-EBUILD selinux-dbus-2.20170204-r2.ebuild 277 SHA256 6a0acae91011812fa4dbeb46afa80466fb56dab7c872f2859599a7e33983640c SHA512 aa86d56495c7bf3354608040776317f49a4020ad10cd0b05faf590c80015b872300af8e3d4479908bfbdedb31c35f189509e629e28d726e1bda9e90d8b42a0c1 WHIRLPOOL 946f9d2b44f275636e5872f6fb8c0e5bfb9b9ad62785dee779838412262d31d656a849e707232998b083cbd4512b0a88b969f12a7dddd7d5d26e4dfd1d528330
-EBUILD selinux-dbus-2.20170204-r3.ebuild 277 SHA256 6a0acae91011812fa4dbeb46afa80466fb56dab7c872f2859599a7e33983640c SHA512 aa86d56495c7bf3354608040776317f49a4020ad10cd0b05faf590c80015b872300af8e3d4479908bfbdedb31c35f189509e629e28d726e1bda9e90d8b42a0c1 WHIRLPOOL 946f9d2b44f275636e5872f6fb8c0e5bfb9b9ad62785dee779838412262d31d656a849e707232998b083cbd4512b0a88b969f12a7dddd7d5d26e4dfd1d528330
-EBUILD selinux-dbus-2.20170204-r4.ebuild 277 SHA256 6a0acae91011812fa4dbeb46afa80466fb56dab7c872f2859599a7e33983640c SHA512 aa86d56495c7bf3354608040776317f49a4020ad10cd0b05faf590c80015b872300af8e3d4479908bfbdedb31c35f189509e629e28d726e1bda9e90d8b42a0c1 WHIRLPOOL 946f9d2b44f275636e5872f6fb8c0e5bfb9b9ad62785dee779838412262d31d656a849e707232998b083cbd4512b0a88b969f12a7dddd7d5d26e4dfd1d528330
-EBUILD selinux-dbus-2.20170805-r2.ebuild 277 SHA256 6a0acae91011812fa4dbeb46afa80466fb56dab7c872f2859599a7e33983640c SHA512 aa86d56495c7bf3354608040776317f49a4020ad10cd0b05faf590c80015b872300af8e3d4479908bfbdedb31c35f189509e629e28d726e1bda9e90d8b42a0c1 WHIRLPOOL 946f9d2b44f275636e5872f6fb8c0e5bfb9b9ad62785dee779838412262d31d656a849e707232998b083cbd4512b0a88b969f12a7dddd7d5d26e4dfd1d528330
-EBUILD selinux-dbus-9999.ebuild 279 SHA256 414085522a463e8633eeee67f31a59cfded449e9ec0fcb94cc8fd75107a8f547 SHA512 15f015ded24991ba85682a0b9ea093f96e7adaadc564fe2c20906940236873479f9dc07e1b46621394d26012eb8c5103dbd937b8160b928e69ff085d26cd6598 WHIRLPOOL 7a7e375dc65b191ac32789b8a6ffccac28c97786b0dd594d68401053f91ffd389c009c9846a69c08b444e6649f60648e957bc06a227af361a6925c0ffbdb44d4
+EBUILD selinux-dbus-2.20170204-r1.ebuild 280 SHA256 aa784b913fad5a810ebae5dea2b9f26d4f28112965e99ca70875343d7008ea5f SHA512 931f64ffd9ebdb05344c2d7494862bdd5f943f298caf7d2fac9d6579bf8781206f22bd7eda4a0dc1aa9ed1a199af0f8020fbcc68964876b6aaf742dfea2e550c WHIRLPOOL eeeb213e08e8e1509244e77e62a4967de8b1bbea52493cdbea6532e60800f0d67c35255461bf5e48d2f96ba8239d78ce0d73063cd483203cb04ebec76603ee9e
+EBUILD selinux-dbus-2.20170204-r2.ebuild 278 SHA256 728ca09661efc579bf6caf840fa4b417f37d1f128a43387b91de37ada17be9c6 SHA512 d824b702f1e297e08e3eabf09ce5a1b16875819be4b70a1dc6c88ba767741cf6c813ab0e9f8a03f04ad3dc4736d37e278b8b49a71ae58d55ef63472b50011ce9 WHIRLPOOL 1f49e6a45d3c03e8ae329ea1ce6e99c97f184f217c4cc33975993f81c7039171ae5e471c49ce853b6357a014cf11870afff7c05acbeae4f4e544a0bf6a8681e8
+EBUILD selinux-dbus-2.20170204-r3.ebuild 278 SHA256 728ca09661efc579bf6caf840fa4b417f37d1f128a43387b91de37ada17be9c6 SHA512 d824b702f1e297e08e3eabf09ce5a1b16875819be4b70a1dc6c88ba767741cf6c813ab0e9f8a03f04ad3dc4736d37e278b8b49a71ae58d55ef63472b50011ce9 WHIRLPOOL 1f49e6a45d3c03e8ae329ea1ce6e99c97f184f217c4cc33975993f81c7039171ae5e471c49ce853b6357a014cf11870afff7c05acbeae4f4e544a0bf6a8681e8
+EBUILD selinux-dbus-2.20170204-r4.ebuild 278 SHA256 728ca09661efc579bf6caf840fa4b417f37d1f128a43387b91de37ada17be9c6 SHA512 d824b702f1e297e08e3eabf09ce5a1b16875819be4b70a1dc6c88ba767741cf6c813ab0e9f8a03f04ad3dc4736d37e278b8b49a71ae58d55ef63472b50011ce9 WHIRLPOOL 1f49e6a45d3c03e8ae329ea1ce6e99c97f184f217c4cc33975993f81c7039171ae5e471c49ce853b6357a014cf11870afff7c05acbeae4f4e544a0bf6a8681e8
+EBUILD selinux-dbus-2.20170805-r2.ebuild 278 SHA256 728ca09661efc579bf6caf840fa4b417f37d1f128a43387b91de37ada17be9c6 SHA512 d824b702f1e297e08e3eabf09ce5a1b16875819be4b70a1dc6c88ba767741cf6c813ab0e9f8a03f04ad3dc4736d37e278b8b49a71ae58d55ef63472b50011ce9 WHIRLPOOL 1f49e6a45d3c03e8ae329ea1ce6e99c97f184f217c4cc33975993f81c7039171ae5e471c49ce853b6357a014cf11870afff7c05acbeae4f4e544a0bf6a8681e8
+EBUILD selinux-dbus-2.20170805-r3.ebuild 280 SHA256 aa784b913fad5a810ebae5dea2b9f26d4f28112965e99ca70875343d7008ea5f SHA512 931f64ffd9ebdb05344c2d7494862bdd5f943f298caf7d2fac9d6579bf8781206f22bd7eda4a0dc1aa9ed1a199af0f8020fbcc68964876b6aaf742dfea2e550c WHIRLPOOL eeeb213e08e8e1509244e77e62a4967de8b1bbea52493cdbea6532e60800f0d67c35255461bf5e48d2f96ba8239d78ce0d73063cd483203cb04ebec76603ee9e
+EBUILD selinux-dbus-9999.ebuild 280 SHA256 aa784b913fad5a810ebae5dea2b9f26d4f28112965e99ca70875343d7008ea5f SHA512 931f64ffd9ebdb05344c2d7494862bdd5f943f298caf7d2fac9d6579bf8781206f22bd7eda4a0dc1aa9ed1a199af0f8020fbcc68964876b6aaf742dfea2e550c WHIRLPOOL eeeb213e08e8e1509244e77e62a4967de8b1bbea52493cdbea6532e60800f0d67c35255461bf5e48d2f96ba8239d78ce0d73063cd483203cb04ebec76603ee9e
 MISC ChangeLog 10387 SHA256 6b02febf15a10efb569f43e7939437b6486c0ee61c3367af90f68dcaaf178246 SHA512 9f4f650fd1d3dc3ad6a98b183053d44c67464660c4dbec0ce9ca6ea316acbaa8f889a8615bd61dd765a0994b8497161a76f1221963648bb1dd03534d40f21f53 WHIRLPOOL 438ef37ed33deda2da2c14fd86e9b67838030312f83c8aa5b7f4c7656d71287c75b34f5c0b1858c82b2a6bb847e9d5452c8d9a33d34a3b669101f4e4475985b0
 MISC ChangeLog-2015 12276 SHA256 46e5b9fa0d1ae2971471717c6aaa19c0c3e64f6ec9f704a9cccaf1b993269cc5 SHA512 1074e274cb29afba6a4dc2501afa1a398ac4efa4e14615f8bb7197ffb0a05ece3142571a50c8dee18e9099deae952ba065eae69353947a3e9eddbb3ea21cffaf WHIRLPOOL ab0722f521cb7cba96433192af2c2973e499c69da77c283b593b8222e8141256de36c4dfe56bb0607c3593442defc5a0614fdf4ec91214deeb689e7743e76049
 MISC metadata.xml 314 SHA256 6bd7686caab766daf8fa959716fc8f73f839279d359a0ac378fa16ea329a305b SHA512 a92e00860f8191520785ee5e38c2f824330b7d7f625813e3be52cbf1a46262b32e6a110663a8842423dc6f1d27ceffac15142847a8d8da6e6e249d8c69328a92 WHIRLPOOL 60b948c58535160b3c5d37ebbd3366a7ba7ca327692a2a4c0c537518aabec34edbf20ae0c59b182f4bf35e85bfa673e7cb2c3bd98f206c30e60fa719a7448f37
diff --git a/sec-policy/selinux-dbus/selinux-dbus-2.20170204-r1.ebuild b/sec-policy/selinux-dbus/selinux-dbus-2.20170204-r1.ebuild
index 93d4e50acba2..16443054382f 100644
--- a/sec-policy/selinux-dbus/selinux-dbus-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-dbus/selinux-dbus-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dbus/selinux-dbus-2.20170204-r2.ebuild b/sec-policy/selinux-dbus/selinux-dbus-2.20170204-r2.ebuild
index 87c21f85148d..f96c24e0ab6b 100644
--- a/sec-policy/selinux-dbus/selinux-dbus-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-dbus/selinux-dbus-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dbus/selinux-dbus-2.20170204-r3.ebuild b/sec-policy/selinux-dbus/selinux-dbus-2.20170204-r3.ebuild
index 87c21f85148d..f96c24e0ab6b 100644
--- a/sec-policy/selinux-dbus/selinux-dbus-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-dbus/selinux-dbus-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dbus/selinux-dbus-2.20170204-r4.ebuild b/sec-policy/selinux-dbus/selinux-dbus-2.20170204-r4.ebuild
index 87c21f85148d..f96c24e0ab6b 100644
--- a/sec-policy/selinux-dbus/selinux-dbus-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-dbus/selinux-dbus-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dbus/selinux-dbus-2.20170805-r2.ebuild b/sec-policy/selinux-dbus/selinux-dbus-2.20170805-r2.ebuild
index 87c21f85148d..f96c24e0ab6b 100644
--- a/sec-policy/selinux-dbus/selinux-dbus-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-dbus/selinux-dbus-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dbus/selinux-dbus-2.20170805-r3.ebuild b/sec-policy/selinux-dbus/selinux-dbus-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..16443054382f
--- /dev/null
+++ b/sec-policy/selinux-dbus/selinux-dbus-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-dbus/selinux-dbus-9999.ebuild b/sec-policy/selinux-dbus/selinux-dbus-9999.ebuild
index 93d4e50acba2..16443054382f 100644
--- a/sec-policy/selinux-dbus/selinux-dbus-9999.ebuild
+++ b/sec-policy/selinux-dbus/selinux-dbus-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dcc/Manifest b/sec-policy/selinux-dcc/Manifest
index 57938715637a..dce0e9c9f7b8 100644
--- a/sec-policy/selinux-dcc/Manifest
+++ b/sec-policy/selinux-dcc/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-dcc-2.20170204-r1.ebuild 277 SHA256 0b7028750ab95a4d467d9b794fe3cb9e3bb7d59949ffb847c72f90107709f24e SHA512 2a44242ee1264d688a8ba951a8cbf050835a116b2e5f7129b014f7c08dea32f409b5c21fbb74c4063b60efc80e8b0538f3a7de16844b27f25504ba05db28abac WHIRLPOOL c839da985e8bdebf836a247105737912c38993fe0f6ed913e6f159e4b7ba95de1635a3dd051dbda44f012da6bfddca0242e1d06cb7007236eb7aa28f91c3677c
-EBUILD selinux-dcc-2.20170204-r2.ebuild 275 SHA256 31964e9e698c4da69184ab68f2cc7997c11715cd5c404d5ecb3b1b5be037962b SHA512 03b17fdb77e38a835044b6fd27643db44895e9f078fca7552fb9746ad9d1fd85bd77989ae436b207ae3d7d9c24f8c2a2f2d5a11b5122b4b608f892b2a78e5225 WHIRLPOOL 54a2b371feb8494f0f9da7ccbcbe083612ba7bde5cd2b002ace48be6148a22b9072a5602e9e878c41820e75d46aa6bbb7ac026c1fb8193eed95db4682825693c
-EBUILD selinux-dcc-2.20170204-r3.ebuild 275 SHA256 31964e9e698c4da69184ab68f2cc7997c11715cd5c404d5ecb3b1b5be037962b SHA512 03b17fdb77e38a835044b6fd27643db44895e9f078fca7552fb9746ad9d1fd85bd77989ae436b207ae3d7d9c24f8c2a2f2d5a11b5122b4b608f892b2a78e5225 WHIRLPOOL 54a2b371feb8494f0f9da7ccbcbe083612ba7bde5cd2b002ace48be6148a22b9072a5602e9e878c41820e75d46aa6bbb7ac026c1fb8193eed95db4682825693c
-EBUILD selinux-dcc-2.20170204-r4.ebuild 275 SHA256 31964e9e698c4da69184ab68f2cc7997c11715cd5c404d5ecb3b1b5be037962b SHA512 03b17fdb77e38a835044b6fd27643db44895e9f078fca7552fb9746ad9d1fd85bd77989ae436b207ae3d7d9c24f8c2a2f2d5a11b5122b4b608f892b2a78e5225 WHIRLPOOL 54a2b371feb8494f0f9da7ccbcbe083612ba7bde5cd2b002ace48be6148a22b9072a5602e9e878c41820e75d46aa6bbb7ac026c1fb8193eed95db4682825693c
-EBUILD selinux-dcc-2.20170805-r2.ebuild 275 SHA256 31964e9e698c4da69184ab68f2cc7997c11715cd5c404d5ecb3b1b5be037962b SHA512 03b17fdb77e38a835044b6fd27643db44895e9f078fca7552fb9746ad9d1fd85bd77989ae436b207ae3d7d9c24f8c2a2f2d5a11b5122b4b608f892b2a78e5225 WHIRLPOOL 54a2b371feb8494f0f9da7ccbcbe083612ba7bde5cd2b002ace48be6148a22b9072a5602e9e878c41820e75d46aa6bbb7ac026c1fb8193eed95db4682825693c
-EBUILD selinux-dcc-9999.ebuild 277 SHA256 0b7028750ab95a4d467d9b794fe3cb9e3bb7d59949ffb847c72f90107709f24e SHA512 2a44242ee1264d688a8ba951a8cbf050835a116b2e5f7129b014f7c08dea32f409b5c21fbb74c4063b60efc80e8b0538f3a7de16844b27f25504ba05db28abac WHIRLPOOL c839da985e8bdebf836a247105737912c38993fe0f6ed913e6f159e4b7ba95de1635a3dd051dbda44f012da6bfddca0242e1d06cb7007236eb7aa28f91c3677c
+EBUILD selinux-dcc-2.20170204-r1.ebuild 278 SHA256 4e54cdcd7367262b70c369e56ef4521b455492cd20a372623f142e03df30c526 SHA512 61e037454bf3f2ede1912f7e94f825c06934eff668b517ef5e4b58e18e62caa3fa79b50122a27d46f501499d0540c98b81259ac1d8a01645345e56e999ebf362 WHIRLPOOL 11c411eec8b684ee2b3b17af8acbbcf7b23e94278f9754e1abd234726a4bb725f591c42704fd701f5022eda4b90c82126cc7e3bf62529e9b21085b6c2e1c915f
+EBUILD selinux-dcc-2.20170204-r2.ebuild 276 SHA256 1fbf026c82a3900b32da72e5f5e27a581fcabe106ee6fef17b0aa3407fc67dbd SHA512 7a7c222e13c28249a46c96bc390933301b0efffd123d4fda2eabfb6a84e6c5a8fecd13b21977499d8401d778ba7df1cc2ef54eb1b04d7fc17bf825932b27b94f WHIRLPOOL 0ce4fe77e7aee693d2be1f9a4c55316b91a53599964c2cb29f870ae2b2b3a515bbd872368190de22377925ebd947cec6773984b5c114bd083ff0e8baa0dac11c
+EBUILD selinux-dcc-2.20170204-r3.ebuild 276 SHA256 1fbf026c82a3900b32da72e5f5e27a581fcabe106ee6fef17b0aa3407fc67dbd SHA512 7a7c222e13c28249a46c96bc390933301b0efffd123d4fda2eabfb6a84e6c5a8fecd13b21977499d8401d778ba7df1cc2ef54eb1b04d7fc17bf825932b27b94f WHIRLPOOL 0ce4fe77e7aee693d2be1f9a4c55316b91a53599964c2cb29f870ae2b2b3a515bbd872368190de22377925ebd947cec6773984b5c114bd083ff0e8baa0dac11c
+EBUILD selinux-dcc-2.20170204-r4.ebuild 276 SHA256 1fbf026c82a3900b32da72e5f5e27a581fcabe106ee6fef17b0aa3407fc67dbd SHA512 7a7c222e13c28249a46c96bc390933301b0efffd123d4fda2eabfb6a84e6c5a8fecd13b21977499d8401d778ba7df1cc2ef54eb1b04d7fc17bf825932b27b94f WHIRLPOOL 0ce4fe77e7aee693d2be1f9a4c55316b91a53599964c2cb29f870ae2b2b3a515bbd872368190de22377925ebd947cec6773984b5c114bd083ff0e8baa0dac11c
+EBUILD selinux-dcc-2.20170805-r2.ebuild 276 SHA256 1fbf026c82a3900b32da72e5f5e27a581fcabe106ee6fef17b0aa3407fc67dbd SHA512 7a7c222e13c28249a46c96bc390933301b0efffd123d4fda2eabfb6a84e6c5a8fecd13b21977499d8401d778ba7df1cc2ef54eb1b04d7fc17bf825932b27b94f WHIRLPOOL 0ce4fe77e7aee693d2be1f9a4c55316b91a53599964c2cb29f870ae2b2b3a515bbd872368190de22377925ebd947cec6773984b5c114bd083ff0e8baa0dac11c
+EBUILD selinux-dcc-2.20170805-r3.ebuild 278 SHA256 4e54cdcd7367262b70c369e56ef4521b455492cd20a372623f142e03df30c526 SHA512 61e037454bf3f2ede1912f7e94f825c06934eff668b517ef5e4b58e18e62caa3fa79b50122a27d46f501499d0540c98b81259ac1d8a01645345e56e999ebf362 WHIRLPOOL 11c411eec8b684ee2b3b17af8acbbcf7b23e94278f9754e1abd234726a4bb725f591c42704fd701f5022eda4b90c82126cc7e3bf62529e9b21085b6c2e1c915f
+EBUILD selinux-dcc-9999.ebuild 278 SHA256 4e54cdcd7367262b70c369e56ef4521b455492cd20a372623f142e03df30c526 SHA512 61e037454bf3f2ede1912f7e94f825c06934eff668b517ef5e4b58e18e62caa3fa79b50122a27d46f501499d0540c98b81259ac1d8a01645345e56e999ebf362 WHIRLPOOL 11c411eec8b684ee2b3b17af8acbbcf7b23e94278f9754e1abd234726a4bb725f591c42704fd701f5022eda4b90c82126cc7e3bf62529e9b21085b6c2e1c915f
 MISC ChangeLog 10295 SHA256 d17d844ea429b1fc9343f9cc2cc808bf0edb43c607454aedecc433bcf5cb3c4e SHA512 ff5e31dacca6dfd22b0d45355ccf6efa10102c89f2b007c500a1acfa762c7424b963fe5220a550ec3fce19700fc8e9a6f9f66aada4976fb42dc645a0e177fd44 WHIRLPOOL a78b7bf272609599e5e4274878e3e0e6cebf3219f7e111f9e0b3ae63cd7457b90930bd8c9c7e740e56ed5aa2e83db6c18369bab54da6eed367eb3620e39b5ae6
 MISC ChangeLog-2015 9523 SHA256 4b8471421cc4eec3ca95f150b22ea90121b7d54629f2375cbefee16782480d77 SHA512 3f4c141a67697e6fde7a948d0856e9b88a5f498caea3fe0335cac2bf015642908efee54bce8cfeeaf7661149d345b1580f4be0b662cd9eecb55221245b18ff58 WHIRLPOOL 3a6ef4fb10e36f1c2901feb2cde7cc9ab7c8f125acea902070ec5eea777e1b8bd6f6148f23a45d617f06161b7fafd9d8f55a2d3d7f469d27d406062f261757e7
 MISC metadata.xml 313 SHA256 3b617327d9779c68f287e2059cb601c2273e00435377537f2426dd890428152b SHA512 ef501f3bda02fad46ab6b41261dbab964ddfc5afe9db0717e95e417dc9836858c6b6bec1942ae37e9f8cb9c2c7661acf032e15488aab5442dd072d41ec7e156f WHIRLPOOL e1bd3db5e605a0703f0a69c2122b64e55cb2665ac9227ff6d9af8057847bd8715bed210c1a2901e76eac5cb65ea89772fa064b75f491d1f24e287b5d7b8c6e42
diff --git a/sec-policy/selinux-dcc/selinux-dcc-2.20170204-r1.ebuild b/sec-policy/selinux-dcc/selinux-dcc-2.20170204-r1.ebuild
index c8d43f4b3b97..7d7eb206a34a 100644
--- a/sec-policy/selinux-dcc/selinux-dcc-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-dcc/selinux-dcc-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dcc/selinux-dcc-2.20170204-r2.ebuild b/sec-policy/selinux-dcc/selinux-dcc-2.20170204-r2.ebuild
index 3968734eaa9e..9878e953a6df 100644
--- a/sec-policy/selinux-dcc/selinux-dcc-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-dcc/selinux-dcc-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dcc/selinux-dcc-2.20170204-r3.ebuild b/sec-policy/selinux-dcc/selinux-dcc-2.20170204-r3.ebuild
index 3968734eaa9e..9878e953a6df 100644
--- a/sec-policy/selinux-dcc/selinux-dcc-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-dcc/selinux-dcc-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dcc/selinux-dcc-2.20170204-r4.ebuild b/sec-policy/selinux-dcc/selinux-dcc-2.20170204-r4.ebuild
index 3968734eaa9e..9878e953a6df 100644
--- a/sec-policy/selinux-dcc/selinux-dcc-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-dcc/selinux-dcc-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dcc/selinux-dcc-2.20170805-r2.ebuild b/sec-policy/selinux-dcc/selinux-dcc-2.20170805-r2.ebuild
index 3968734eaa9e..9878e953a6df 100644
--- a/sec-policy/selinux-dcc/selinux-dcc-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-dcc/selinux-dcc-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dcc/selinux-dcc-2.20170805-r3.ebuild b/sec-policy/selinux-dcc/selinux-dcc-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..7d7eb206a34a
--- /dev/null
+++ b/sec-policy/selinux-dcc/selinux-dcc-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-dcc/selinux-dcc-9999.ebuild b/sec-policy/selinux-dcc/selinux-dcc-9999.ebuild
index c8d43f4b3b97..7d7eb206a34a 100644
--- a/sec-policy/selinux-dcc/selinux-dcc-9999.ebuild
+++ b/sec-policy/selinux-dcc/selinux-dcc-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ddclient/Manifest b/sec-policy/selinux-ddclient/Manifest
index dec47799d3c9..00cebd25a550 100644
--- a/sec-policy/selinux-ddclient/Manifest
+++ b/sec-policy/selinux-ddclient/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-ddclient-2.20170204-r1.ebuild 287 SHA256 9f89f38d56bfd9adb3ea7c41b1863718c10f149fbfc3f26d4e23e25446757afa SHA512 3d7ab06fb6dbecf4e9d9572040f5414017a2d2ecd2342382eab36ba9466e64a61550f030d9bbaf9fab7c44520227728e878c8d727e7f5359c5be30abc1edda34 WHIRLPOOL b4af1e32d5694d3267e2d2a7f51485ac057ac47d6ffb5fdd8d7c90f8da02b6e8e8287222c13856230a06df210de4b4affb7978fa00bbfce6ffac7406d39367c8
-EBUILD selinux-ddclient-2.20170204-r2.ebuild 285 SHA256 6b3cb6ff68bcbf23998619c12a08338365834bb2f2c3192c0188134d06b3bfce SHA512 95494cebbf850696a0ec8b384d9b381412a72a72941d69d7af227fb762ccff5431f000eee45ae06ffbdb7e4e4dc2a518fcc10f10c270e13ef0c0882149a7a8c3 WHIRLPOOL 540caf1d7d4420108d82d830cc5a5abb2842283a89faaaa7231dc0c2e9a368c091061d27eebe2b6c58789c2a515182a02bace8a37c96d55ce0c62377b23115f5
-EBUILD selinux-ddclient-2.20170204-r3.ebuild 285 SHA256 6b3cb6ff68bcbf23998619c12a08338365834bb2f2c3192c0188134d06b3bfce SHA512 95494cebbf850696a0ec8b384d9b381412a72a72941d69d7af227fb762ccff5431f000eee45ae06ffbdb7e4e4dc2a518fcc10f10c270e13ef0c0882149a7a8c3 WHIRLPOOL 540caf1d7d4420108d82d830cc5a5abb2842283a89faaaa7231dc0c2e9a368c091061d27eebe2b6c58789c2a515182a02bace8a37c96d55ce0c62377b23115f5
-EBUILD selinux-ddclient-2.20170204-r4.ebuild 285 SHA256 6b3cb6ff68bcbf23998619c12a08338365834bb2f2c3192c0188134d06b3bfce SHA512 95494cebbf850696a0ec8b384d9b381412a72a72941d69d7af227fb762ccff5431f000eee45ae06ffbdb7e4e4dc2a518fcc10f10c270e13ef0c0882149a7a8c3 WHIRLPOOL 540caf1d7d4420108d82d830cc5a5abb2842283a89faaaa7231dc0c2e9a368c091061d27eebe2b6c58789c2a515182a02bace8a37c96d55ce0c62377b23115f5
-EBUILD selinux-ddclient-2.20170805-r2.ebuild 285 SHA256 6b3cb6ff68bcbf23998619c12a08338365834bb2f2c3192c0188134d06b3bfce SHA512 95494cebbf850696a0ec8b384d9b381412a72a72941d69d7af227fb762ccff5431f000eee45ae06ffbdb7e4e4dc2a518fcc10f10c270e13ef0c0882149a7a8c3 WHIRLPOOL 540caf1d7d4420108d82d830cc5a5abb2842283a89faaaa7231dc0c2e9a368c091061d27eebe2b6c58789c2a515182a02bace8a37c96d55ce0c62377b23115f5
-EBUILD selinux-ddclient-9999.ebuild 287 SHA256 9f89f38d56bfd9adb3ea7c41b1863718c10f149fbfc3f26d4e23e25446757afa SHA512 3d7ab06fb6dbecf4e9d9572040f5414017a2d2ecd2342382eab36ba9466e64a61550f030d9bbaf9fab7c44520227728e878c8d727e7f5359c5be30abc1edda34 WHIRLPOOL b4af1e32d5694d3267e2d2a7f51485ac057ac47d6ffb5fdd8d7c90f8da02b6e8e8287222c13856230a06df210de4b4affb7978fa00bbfce6ffac7406d39367c8
+EBUILD selinux-ddclient-2.20170204-r1.ebuild 288 SHA256 5d7e8812b6731fc89690677dd9378d5d532fc0b5d7328d6fb0cace553f48637d SHA512 8aa32b9852c6784c6ecdb9a60dd9e1c702b5ae63a72ad5c28de479c75de546fa04f04f4a40396aaeb991426eb94183c76911435ae7810374b2ec97ec7777a725 WHIRLPOOL bff674ddd8d2b309f39a8f255e8016fa1245853f4d260b25980c78dee06b135e50d8dacec6bcfe1dcdbf9c29568ee6d9ff49ea4cd243b5a1226264cc214fc959
+EBUILD selinux-ddclient-2.20170204-r2.ebuild 286 SHA256 ae7ae11b54c1f421447dd8c22169780f5474e91199f9fa7fcc449f87c9e09359 SHA512 a2fc27c07165180b3769432cf970d1be519ab318d613ba4018814ce6b53134a53d215f428d70be96b233b7e12b3ca019726c6034286e350f9af0c3db02dc2c17 WHIRLPOOL b964cc06a673c31e02b216534d6d8d9c4f02c788a4ddd40f56987e8de656706db9be85bf1b38f73a1fae3b4c633e2aeaae1b77b778f49062ad26e6f9249cdc36
+EBUILD selinux-ddclient-2.20170204-r3.ebuild 286 SHA256 ae7ae11b54c1f421447dd8c22169780f5474e91199f9fa7fcc449f87c9e09359 SHA512 a2fc27c07165180b3769432cf970d1be519ab318d613ba4018814ce6b53134a53d215f428d70be96b233b7e12b3ca019726c6034286e350f9af0c3db02dc2c17 WHIRLPOOL b964cc06a673c31e02b216534d6d8d9c4f02c788a4ddd40f56987e8de656706db9be85bf1b38f73a1fae3b4c633e2aeaae1b77b778f49062ad26e6f9249cdc36
+EBUILD selinux-ddclient-2.20170204-r4.ebuild 286 SHA256 ae7ae11b54c1f421447dd8c22169780f5474e91199f9fa7fcc449f87c9e09359 SHA512 a2fc27c07165180b3769432cf970d1be519ab318d613ba4018814ce6b53134a53d215f428d70be96b233b7e12b3ca019726c6034286e350f9af0c3db02dc2c17 WHIRLPOOL b964cc06a673c31e02b216534d6d8d9c4f02c788a4ddd40f56987e8de656706db9be85bf1b38f73a1fae3b4c633e2aeaae1b77b778f49062ad26e6f9249cdc36
+EBUILD selinux-ddclient-2.20170805-r2.ebuild 286 SHA256 ae7ae11b54c1f421447dd8c22169780f5474e91199f9fa7fcc449f87c9e09359 SHA512 a2fc27c07165180b3769432cf970d1be519ab318d613ba4018814ce6b53134a53d215f428d70be96b233b7e12b3ca019726c6034286e350f9af0c3db02dc2c17 WHIRLPOOL b964cc06a673c31e02b216534d6d8d9c4f02c788a4ddd40f56987e8de656706db9be85bf1b38f73a1fae3b4c633e2aeaae1b77b778f49062ad26e6f9249cdc36
+EBUILD selinux-ddclient-2.20170805-r3.ebuild 288 SHA256 5d7e8812b6731fc89690677dd9378d5d532fc0b5d7328d6fb0cace553f48637d SHA512 8aa32b9852c6784c6ecdb9a60dd9e1c702b5ae63a72ad5c28de479c75de546fa04f04f4a40396aaeb991426eb94183c76911435ae7810374b2ec97ec7777a725 WHIRLPOOL bff674ddd8d2b309f39a8f255e8016fa1245853f4d260b25980c78dee06b135e50d8dacec6bcfe1dcdbf9c29568ee6d9ff49ea4cd243b5a1226264cc214fc959
+EBUILD selinux-ddclient-9999.ebuild 288 SHA256 5d7e8812b6731fc89690677dd9378d5d532fc0b5d7328d6fb0cace553f48637d SHA512 8aa32b9852c6784c6ecdb9a60dd9e1c702b5ae63a72ad5c28de479c75de546fa04f04f4a40396aaeb991426eb94183c76911435ae7810374b2ec97ec7777a725 WHIRLPOOL bff674ddd8d2b309f39a8f255e8016fa1245853f4d260b25980c78dee06b135e50d8dacec6bcfe1dcdbf9c29568ee6d9ff49ea4cd243b5a1226264cc214fc959
 MISC ChangeLog 10793 SHA256 ed88c47d0f8e1d14e3dcd5883f1da6948328c964cc47b406c1f367a5e1639b60 SHA512 975a01e876ffe05ed6e37c7b53bb039e25b8edff4d5df9bb9dc4463e36437af30e81fd84a9b1b926c0d96b6dd3d981aefefba227ea2b39fb7c142239ba75bf11 WHIRLPOOL 7ee09eb39a7838ef13b6073023a264e289540e0c28fe2195640f4c7e9d5e87f856e01f2167e0eadd721765c5ca7c07ea1fe0c15ebd893e9c48d590c4d986ed7f
 MISC ChangeLog-2015 10102 SHA256 335fa8b80d2b74167dea41eb317b01a934240d937aa4879f6b2f977bc33e6b38 SHA512 0ccc91233de1636e9039993604a166b5546e6fc5294892fa64177b0076509aa0d3115589feca65bc12cd27e251dc837dcc09717211c51dadd0ec97a6be7d4c90 WHIRLPOOL 2363189826f37661592b2b7a40dc28387c8602245dfabad6a3987f10645ba770aa83f5c9406569029fad33526f1537e3f62edcc998192b67f84b8ca1ede9418f
 MISC metadata.xml 318 SHA256 ee34670d81e225a80b45a9420e98502963175df6a75a75f02890f4a5223e4cc7 SHA512 e02add998ae60515272a524c40bc4fc3f31d2ea91f1690badb7c8fee19a99f0b84d4909f04c4e0f65af614a295e1177ddad05479dfd5b9f3ab620cc536b7dc40 WHIRLPOOL d25ee841438075a788d24e9a61a49183d5cb695294c8367179005da28163c39eea176b3a52d4bd4091089210872bca05a470d17099e35b36641bfb15886b9121
diff --git a/sec-policy/selinux-ddclient/selinux-ddclient-2.20170204-r1.ebuild b/sec-policy/selinux-ddclient/selinux-ddclient-2.20170204-r1.ebuild
index bf3523795b22..ddf11df4075d 100644
--- a/sec-policy/selinux-ddclient/selinux-ddclient-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-ddclient/selinux-ddclient-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ddclient/selinux-ddclient-2.20170204-r2.ebuild b/sec-policy/selinux-ddclient/selinux-ddclient-2.20170204-r2.ebuild
index 8d9d2d6b1381..c331ba78ff2c 100644
--- a/sec-policy/selinux-ddclient/selinux-ddclient-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-ddclient/selinux-ddclient-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ddclient/selinux-ddclient-2.20170204-r3.ebuild b/sec-policy/selinux-ddclient/selinux-ddclient-2.20170204-r3.ebuild
index 8d9d2d6b1381..c331ba78ff2c 100644
--- a/sec-policy/selinux-ddclient/selinux-ddclient-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-ddclient/selinux-ddclient-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ddclient/selinux-ddclient-2.20170204-r4.ebuild b/sec-policy/selinux-ddclient/selinux-ddclient-2.20170204-r4.ebuild
index 8d9d2d6b1381..c331ba78ff2c 100644
--- a/sec-policy/selinux-ddclient/selinux-ddclient-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-ddclient/selinux-ddclient-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ddclient/selinux-ddclient-2.20170805-r2.ebuild b/sec-policy/selinux-ddclient/selinux-ddclient-2.20170805-r2.ebuild
index 8d9d2d6b1381..c331ba78ff2c 100644
--- a/sec-policy/selinux-ddclient/selinux-ddclient-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-ddclient/selinux-ddclient-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ddclient/selinux-ddclient-2.20170805-r3.ebuild b/sec-policy/selinux-ddclient/selinux-ddclient-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..ddf11df4075d
--- /dev/null
+++ b/sec-policy/selinux-ddclient/selinux-ddclient-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-ddclient/selinux-ddclient-9999.ebuild b/sec-policy/selinux-ddclient/selinux-ddclient-9999.ebuild
index bf3523795b22..ddf11df4075d 100644
--- a/sec-policy/selinux-ddclient/selinux-ddclient-9999.ebuild
+++ b/sec-policy/selinux-ddclient/selinux-ddclient-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ddcprobe/Manifest b/sec-policy/selinux-ddcprobe/Manifest
index 189a73ccb625..7b2ed880ee92 100644
--- a/sec-policy/selinux-ddcprobe/Manifest
+++ b/sec-policy/selinux-ddcprobe/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-ddcprobe-2.20170204-r1.ebuild 287 SHA256 83f66ed88412c95bcfdbbe7ab8b2e370d4849b41833e065b7a71bec9d42f2846 SHA512 c95058cc4907c2e9c0f2299e6bdf4e4a97a30e305763792c564c7535f08e3bf0eb6dae84dfdefc9b8d762eb1e05e6223612fe3f292a11c89ab7a003026fdba01 WHIRLPOOL 7aa8d8d1283a62e191db99a08b1885d98725a800d3f6f680cdc032040933e413f2c843831b54a7326b6aa89f5a260b017aae2e6f1c809e556ee8fd9f76bc2d6f
-EBUILD selinux-ddcprobe-2.20170204-r2.ebuild 285 SHA256 3fce7400f0679303eba729f903c900ac3f45765319c1c20087f65049b5170da2 SHA512 b7c9bedc72b9c5275bca3180f7dfa4232949ca518b71a5c33a368338162aae1469a5b65cfb5241ef3357c5490e7188efb079cb77e7c7bccad6bef904c0195be3 WHIRLPOOL 44aaa1e235b19dd51d40e3378ff731ad751e00a4e723fb1b9efc2a4f9a6e038b39f6a91c85dd606de031b6536f099b18e3a393b514734e8d9742c390a136f07c
-EBUILD selinux-ddcprobe-2.20170204-r3.ebuild 285 SHA256 3fce7400f0679303eba729f903c900ac3f45765319c1c20087f65049b5170da2 SHA512 b7c9bedc72b9c5275bca3180f7dfa4232949ca518b71a5c33a368338162aae1469a5b65cfb5241ef3357c5490e7188efb079cb77e7c7bccad6bef904c0195be3 WHIRLPOOL 44aaa1e235b19dd51d40e3378ff731ad751e00a4e723fb1b9efc2a4f9a6e038b39f6a91c85dd606de031b6536f099b18e3a393b514734e8d9742c390a136f07c
-EBUILD selinux-ddcprobe-2.20170204-r4.ebuild 285 SHA256 3fce7400f0679303eba729f903c900ac3f45765319c1c20087f65049b5170da2 SHA512 b7c9bedc72b9c5275bca3180f7dfa4232949ca518b71a5c33a368338162aae1469a5b65cfb5241ef3357c5490e7188efb079cb77e7c7bccad6bef904c0195be3 WHIRLPOOL 44aaa1e235b19dd51d40e3378ff731ad751e00a4e723fb1b9efc2a4f9a6e038b39f6a91c85dd606de031b6536f099b18e3a393b514734e8d9742c390a136f07c
-EBUILD selinux-ddcprobe-2.20170805-r2.ebuild 285 SHA256 3fce7400f0679303eba729f903c900ac3f45765319c1c20087f65049b5170da2 SHA512 b7c9bedc72b9c5275bca3180f7dfa4232949ca518b71a5c33a368338162aae1469a5b65cfb5241ef3357c5490e7188efb079cb77e7c7bccad6bef904c0195be3 WHIRLPOOL 44aaa1e235b19dd51d40e3378ff731ad751e00a4e723fb1b9efc2a4f9a6e038b39f6a91c85dd606de031b6536f099b18e3a393b514734e8d9742c390a136f07c
-EBUILD selinux-ddcprobe-9999.ebuild 287 SHA256 83f66ed88412c95bcfdbbe7ab8b2e370d4849b41833e065b7a71bec9d42f2846 SHA512 c95058cc4907c2e9c0f2299e6bdf4e4a97a30e305763792c564c7535f08e3bf0eb6dae84dfdefc9b8d762eb1e05e6223612fe3f292a11c89ab7a003026fdba01 WHIRLPOOL 7aa8d8d1283a62e191db99a08b1885d98725a800d3f6f680cdc032040933e413f2c843831b54a7326b6aa89f5a260b017aae2e6f1c809e556ee8fd9f76bc2d6f
+EBUILD selinux-ddcprobe-2.20170204-r1.ebuild 288 SHA256 a050fd1b88b95f212ad5b8567ca87555e0986bc886eeec6ef7342c7ddab2b4f0 SHA512 6fcbca94028ecee22f9f25526e19f4cd468f79773273432689864d723886a6b5f4ada57bea9da738eb6dc6c1d95bac63a2a416a39c1bcfe509ad979a4ca76b41 WHIRLPOOL dac9d0d73dea304caf0e2c2cb10dd15f81b7125a0acbdc47cc6fed850329fa45f20d51ce4e130bd3195794f085f334a8827e2528f5523f86f90b41e3a2964ae2
+EBUILD selinux-ddcprobe-2.20170204-r2.ebuild 286 SHA256 0d822d1746674ffab2e31fac35be2ac2ea480c7765baef08d4ec35934675030b SHA512 4ccf5ae0099d08d7531760d08856d81750d7f70703e7e5411420786806deceae81b988f515a49b3caf08bd0cd37292fdbe887ef2a8faa6578838634a64383a45 WHIRLPOOL 1fa548371d05e39e3d0685225ac925d5619d22f533df972b978205370b01d8f2da6c54e632a09ba8cc90000ca36039e606555f672592286cb6e3103afef66642
+EBUILD selinux-ddcprobe-2.20170204-r3.ebuild 286 SHA256 0d822d1746674ffab2e31fac35be2ac2ea480c7765baef08d4ec35934675030b SHA512 4ccf5ae0099d08d7531760d08856d81750d7f70703e7e5411420786806deceae81b988f515a49b3caf08bd0cd37292fdbe887ef2a8faa6578838634a64383a45 WHIRLPOOL 1fa548371d05e39e3d0685225ac925d5619d22f533df972b978205370b01d8f2da6c54e632a09ba8cc90000ca36039e606555f672592286cb6e3103afef66642
+EBUILD selinux-ddcprobe-2.20170204-r4.ebuild 286 SHA256 0d822d1746674ffab2e31fac35be2ac2ea480c7765baef08d4ec35934675030b SHA512 4ccf5ae0099d08d7531760d08856d81750d7f70703e7e5411420786806deceae81b988f515a49b3caf08bd0cd37292fdbe887ef2a8faa6578838634a64383a45 WHIRLPOOL 1fa548371d05e39e3d0685225ac925d5619d22f533df972b978205370b01d8f2da6c54e632a09ba8cc90000ca36039e606555f672592286cb6e3103afef66642
+EBUILD selinux-ddcprobe-2.20170805-r2.ebuild 286 SHA256 0d822d1746674ffab2e31fac35be2ac2ea480c7765baef08d4ec35934675030b SHA512 4ccf5ae0099d08d7531760d08856d81750d7f70703e7e5411420786806deceae81b988f515a49b3caf08bd0cd37292fdbe887ef2a8faa6578838634a64383a45 WHIRLPOOL 1fa548371d05e39e3d0685225ac925d5619d22f533df972b978205370b01d8f2da6c54e632a09ba8cc90000ca36039e606555f672592286cb6e3103afef66642
+EBUILD selinux-ddcprobe-2.20170805-r3.ebuild 288 SHA256 a050fd1b88b95f212ad5b8567ca87555e0986bc886eeec6ef7342c7ddab2b4f0 SHA512 6fcbca94028ecee22f9f25526e19f4cd468f79773273432689864d723886a6b5f4ada57bea9da738eb6dc6c1d95bac63a2a416a39c1bcfe509ad979a4ca76b41 WHIRLPOOL dac9d0d73dea304caf0e2c2cb10dd15f81b7125a0acbdc47cc6fed850329fa45f20d51ce4e130bd3195794f085f334a8827e2528f5523f86f90b41e3a2964ae2
+EBUILD selinux-ddcprobe-9999.ebuild 288 SHA256 a050fd1b88b95f212ad5b8567ca87555e0986bc886eeec6ef7342c7ddab2b4f0 SHA512 6fcbca94028ecee22f9f25526e19f4cd468f79773273432689864d723886a6b5f4ada57bea9da738eb6dc6c1d95bac63a2a416a39c1bcfe509ad979a4ca76b41 WHIRLPOOL dac9d0d73dea304caf0e2c2cb10dd15f81b7125a0acbdc47cc6fed850329fa45f20d51ce4e130bd3195794f085f334a8827e2528f5523f86f90b41e3a2964ae2
 MISC ChangeLog 10793 SHA256 79b9c07ad2463fd2f3241f7120a976ebf0c6e23a211e7b5dc50eaecac596aaae SHA512 adc6945e45aa6c7d6f5cbaa39f8187d02244fdeba03abf375972dccb381a16ebfa5f08d50691a15f9c1be548a00ddfb722392f54405a59e8974bfe6be2f869c0 WHIRLPOOL c1b7d938de9be341e1aa2cb7b4684b66f9dd105b51bb1d4660d10748bf4cdc8758f4e779189be5f50abdba0cb3a13e4098a8b3a06d256d2ee9bf9cb93c727965
 MISC ChangeLog-2015 10102 SHA256 af02fdb462b714f4f39e2fffc886eede2479abcabd739eafa9295ba649587875 SHA512 99c40c07f56079b7de4ca4e3520c5c2cdfdf5fd3179cdbf42eaadb0faf969864f36b88badf49df17638e70cd44ce395e70691e53b136f6a5e047039fca12d9ca WHIRLPOOL ef6d7665124a5abe2adc0f9af0dbf6aadf80c7b1e2cc2872ac03bd5a46b9ea9ca2238ab1ffdb92ba85f31e5799283dd2c1ab1c218c3687e11d5654b259626eb6
 MISC metadata.xml 318 SHA256 b33947a3356b52071a9135ac40be48caabbd5f99ce2656a8b9bb6bce6c7086b1 SHA512 70b987e8cfc216fc7f312aee7a1b4dea757f886dac76ebfcd6dd367b2454d02ff6dee1b11c16324cf3c5c005fdf6d74a209503d82c74b1472275ac059d99498d WHIRLPOOL 25638aaaecbfbf9aef39e83fb0075512450704d3f9c03b483b6b0e579602476fc544953df1d59b8253e04517a0aa156d1f9cf487b65f0809a444002873993916
diff --git a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20170204-r1.ebuild b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20170204-r1.ebuild
index a97198412815..570d37c13b71 100644
--- a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20170204-r2.ebuild b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20170204-r2.ebuild
index c2e1c2803047..429e77fdd693 100644
--- a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20170204-r3.ebuild b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20170204-r3.ebuild
index c2e1c2803047..429e77fdd693 100644
--- a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20170204-r4.ebuild b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20170204-r4.ebuild
index c2e1c2803047..429e77fdd693 100644
--- a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20170805-r2.ebuild b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20170805-r2.ebuild
index c2e1c2803047..429e77fdd693 100644
--- a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20170805-r3.ebuild b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..570d37c13b71
--- /dev/null
+++ b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-ddcprobe/selinux-ddcprobe-9999.ebuild b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-9999.ebuild
index a97198412815..570d37c13b71 100644
--- a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-9999.ebuild
+++ b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-denyhosts/Manifest b/sec-policy/selinux-denyhosts/Manifest
index 876f473bee74..c28f884a4ad4 100644
--- a/sec-policy/selinux-denyhosts/Manifest
+++ b/sec-policy/selinux-denyhosts/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-denyhosts-2.20170204-r1.ebuild 289 SHA256 ab6153ad26edfe029abdd4deee812f48a2f7514c4a341bbb9d0451d0cad43de2 SHA512 de061678d9a13e57611f64a88c70c97039e438a9571c1ea814b8813999c598a4285660bb287a93875414c7bf8cc848e7d0ee5465d3fa2612e852e10447b9c381 WHIRLPOOL b8001422316347ba837dc03f5fd4774f775c086ec923ce9158f37a187ce5fd140e0991e7bca60eaea75aff5dd6802d63bd36a9837c10904177465dcfa82f7887
-EBUILD selinux-denyhosts-2.20170204-r2.ebuild 287 SHA256 bae52f96297991dc992eb4664046ca544817c917ce9e1cd576c6a609fb4b1d44 SHA512 d14f7fd03cd05dc678a36f3dc4e084e0c02109f21e3cae148f699be8429662cf396abffdcd4b1ee40f9fb92fad4d70c04433255e0e1755ddbe9ac5d8fa522273 WHIRLPOOL ea8486ed6182eaf11c8ef36b55941c66546dd096ec42bbb2fa2409a2d9e16eb19d0daed6fd4484895ce7bd93d744d55f42c11f7585ebc6cfe52f5f8282b07174
-EBUILD selinux-denyhosts-2.20170204-r3.ebuild 287 SHA256 bae52f96297991dc992eb4664046ca544817c917ce9e1cd576c6a609fb4b1d44 SHA512 d14f7fd03cd05dc678a36f3dc4e084e0c02109f21e3cae148f699be8429662cf396abffdcd4b1ee40f9fb92fad4d70c04433255e0e1755ddbe9ac5d8fa522273 WHIRLPOOL ea8486ed6182eaf11c8ef36b55941c66546dd096ec42bbb2fa2409a2d9e16eb19d0daed6fd4484895ce7bd93d744d55f42c11f7585ebc6cfe52f5f8282b07174
-EBUILD selinux-denyhosts-2.20170204-r4.ebuild 287 SHA256 bae52f96297991dc992eb4664046ca544817c917ce9e1cd576c6a609fb4b1d44 SHA512 d14f7fd03cd05dc678a36f3dc4e084e0c02109f21e3cae148f699be8429662cf396abffdcd4b1ee40f9fb92fad4d70c04433255e0e1755ddbe9ac5d8fa522273 WHIRLPOOL ea8486ed6182eaf11c8ef36b55941c66546dd096ec42bbb2fa2409a2d9e16eb19d0daed6fd4484895ce7bd93d744d55f42c11f7585ebc6cfe52f5f8282b07174
-EBUILD selinux-denyhosts-2.20170805-r2.ebuild 287 SHA256 bae52f96297991dc992eb4664046ca544817c917ce9e1cd576c6a609fb4b1d44 SHA512 d14f7fd03cd05dc678a36f3dc4e084e0c02109f21e3cae148f699be8429662cf396abffdcd4b1ee40f9fb92fad4d70c04433255e0e1755ddbe9ac5d8fa522273 WHIRLPOOL ea8486ed6182eaf11c8ef36b55941c66546dd096ec42bbb2fa2409a2d9e16eb19d0daed6fd4484895ce7bd93d744d55f42c11f7585ebc6cfe52f5f8282b07174
-EBUILD selinux-denyhosts-9999.ebuild 289 SHA256 ab6153ad26edfe029abdd4deee812f48a2f7514c4a341bbb9d0451d0cad43de2 SHA512 de061678d9a13e57611f64a88c70c97039e438a9571c1ea814b8813999c598a4285660bb287a93875414c7bf8cc848e7d0ee5465d3fa2612e852e10447b9c381 WHIRLPOOL b8001422316347ba837dc03f5fd4774f775c086ec923ce9158f37a187ce5fd140e0991e7bca60eaea75aff5dd6802d63bd36a9837c10904177465dcfa82f7887
+EBUILD selinux-denyhosts-2.20170204-r1.ebuild 290 SHA256 9abf4e1859c5c0c6c09558622a64a01e083c2bc8769da65da1a313365d46d396 SHA512 d6461fe5594de0a81bb7ff107a28b98b1e44143d127210b61102a6648c30cbf5ff3fa395b0b7aa97c15956c3dc852f85e6b01613effc1e85bd08535e8e446b48 WHIRLPOOL b1fafdea5cdbae0ea10326d47f1e76e5f05f30a92aa33b28e03f89f6b68f1eec24ffc08cb52651a9e1eb29d8f7d2c8b4cddc17af8e51c2d4ba1f21a3d2498235
+EBUILD selinux-denyhosts-2.20170204-r2.ebuild 288 SHA256 28eca84bf0eca040989bc11bc15742c458e39326537acd59735b1cc1e214a646 SHA512 fa24859870763b68e0e4112e61a1a4aed0047a6c5793b264d5eb0eeedd46182e7a9006927969158bf09504bbc6f132413fbfbd20276129532d9c69351343d9ed WHIRLPOOL 03ffecadf71d0e1d642138f9e14af4e3f841be29d3eea6fc8afc21d8a7efa218b59b2ca6f45bd5fe03069fbbd6e715f8dbaa5a579ade2e1ffefac7d18c340899
+EBUILD selinux-denyhosts-2.20170204-r3.ebuild 288 SHA256 28eca84bf0eca040989bc11bc15742c458e39326537acd59735b1cc1e214a646 SHA512 fa24859870763b68e0e4112e61a1a4aed0047a6c5793b264d5eb0eeedd46182e7a9006927969158bf09504bbc6f132413fbfbd20276129532d9c69351343d9ed WHIRLPOOL 03ffecadf71d0e1d642138f9e14af4e3f841be29d3eea6fc8afc21d8a7efa218b59b2ca6f45bd5fe03069fbbd6e715f8dbaa5a579ade2e1ffefac7d18c340899
+EBUILD selinux-denyhosts-2.20170204-r4.ebuild 288 SHA256 28eca84bf0eca040989bc11bc15742c458e39326537acd59735b1cc1e214a646 SHA512 fa24859870763b68e0e4112e61a1a4aed0047a6c5793b264d5eb0eeedd46182e7a9006927969158bf09504bbc6f132413fbfbd20276129532d9c69351343d9ed WHIRLPOOL 03ffecadf71d0e1d642138f9e14af4e3f841be29d3eea6fc8afc21d8a7efa218b59b2ca6f45bd5fe03069fbbd6e715f8dbaa5a579ade2e1ffefac7d18c340899
+EBUILD selinux-denyhosts-2.20170805-r2.ebuild 288 SHA256 28eca84bf0eca040989bc11bc15742c458e39326537acd59735b1cc1e214a646 SHA512 fa24859870763b68e0e4112e61a1a4aed0047a6c5793b264d5eb0eeedd46182e7a9006927969158bf09504bbc6f132413fbfbd20276129532d9c69351343d9ed WHIRLPOOL 03ffecadf71d0e1d642138f9e14af4e3f841be29d3eea6fc8afc21d8a7efa218b59b2ca6f45bd5fe03069fbbd6e715f8dbaa5a579ade2e1ffefac7d18c340899
+EBUILD selinux-denyhosts-2.20170805-r3.ebuild 290 SHA256 9abf4e1859c5c0c6c09558622a64a01e083c2bc8769da65da1a313365d46d396 SHA512 d6461fe5594de0a81bb7ff107a28b98b1e44143d127210b61102a6648c30cbf5ff3fa395b0b7aa97c15956c3dc852f85e6b01613effc1e85bd08535e8e446b48 WHIRLPOOL b1fafdea5cdbae0ea10326d47f1e76e5f05f30a92aa33b28e03f89f6b68f1eec24ffc08cb52651a9e1eb29d8f7d2c8b4cddc17af8e51c2d4ba1f21a3d2498235
+EBUILD selinux-denyhosts-9999.ebuild 290 SHA256 9abf4e1859c5c0c6c09558622a64a01e083c2bc8769da65da1a313365d46d396 SHA512 d6461fe5594de0a81bb7ff107a28b98b1e44143d127210b61102a6648c30cbf5ff3fa395b0b7aa97c15956c3dc852f85e6b01613effc1e85bd08535e8e446b48 WHIRLPOOL b1fafdea5cdbae0ea10326d47f1e76e5f05f30a92aa33b28e03f89f6b68f1eec24ffc08cb52651a9e1eb29d8f7d2c8b4cddc17af8e51c2d4ba1f21a3d2498235
 MISC ChangeLog 10887 SHA256 aeb550cc49a69f00cfe38714161072453e12359b50dfc1d0db317522878bd7bc SHA512 21696c1f0243984bf1b5222501eb932db7f11c8d93a933905fab78f764f140ba9efe0e9846451ccc0903a67117d905ab8bfb92a5d8e89a3c97aa702e7eb1fa08 WHIRLPOOL f444eb20126123e0cd82c58a0fc40b179d4f46b1eb915c216b3612c986b60422a475f6e9b7a62340f2088c520edd5fbae6fb34ed6399b67f6ed3c0e2c862fada
 MISC ChangeLog-2015 9957 SHA256 681b962695bda19989239640e21457c0e6b732ee57dd964b4e451e506b6e387b SHA512 3d86e412f0a896de06683cd9b21e88f6ef97c9f3a91592cda329287eff45276f3f69f377571c60852781fa3cb6ce229e1b41bc3e1df7b911d5df4bb9589b26a0 WHIRLPOOL ab3f6895bc374f2f4503ccbdcc85aa3b412e93216024b6c12eb086dc701ec94db5250514cd075ae944c10ed75a21f572aa9d8c8bd763bc47e07bf9cfcecedae2
 MISC metadata.xml 319 SHA256 4687b36aabf935f966042e9d49c1d447ae49c97fa0cd57d0465bd6cb08f129ca SHA512 b1f81195c4854d94076bf7a5117c4191ba41a58acc7a8922c0a8aecf5ea7ebed3e870c1dfaee33b4be5906a7c420ca6362c4e782304309b74ca769b56054dc80 WHIRLPOOL c5beb7ca882b666fdcc20e9680d57be7f032be2535423770365d41c03ce377838770ede2996b5320174e00434f2ac73c93c8be5d257530e3f782e62e81f87bca
diff --git a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20170204-r1.ebuild b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20170204-r1.ebuild
index bd5360b3e849..bfa1effa9131 100644
--- a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20170204-r2.ebuild b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20170204-r2.ebuild
index 63d7262722be..dd82b4469eb7 100644
--- a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20170204-r3.ebuild b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20170204-r3.ebuild
index 63d7262722be..dd82b4469eb7 100644
--- a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20170204-r4.ebuild b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20170204-r4.ebuild
index 63d7262722be..dd82b4469eb7 100644
--- a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20170805-r2.ebuild b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20170805-r2.ebuild
index 63d7262722be..dd82b4469eb7 100644
--- a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20170805-r3.ebuild b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..bfa1effa9131
--- /dev/null
+++ b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-denyhosts/selinux-denyhosts-9999.ebuild b/sec-policy/selinux-denyhosts/selinux-denyhosts-9999.ebuild
index bd5360b3e849..bfa1effa9131 100644
--- a/sec-policy/selinux-denyhosts/selinux-denyhosts-9999.ebuild
+++ b/sec-policy/selinux-denyhosts/selinux-denyhosts-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-devicekit/Manifest b/sec-policy/selinux-devicekit/Manifest
index 934bb881e156..413cb924269c 100644
--- a/sec-policy/selinux-devicekit/Manifest
+++ b/sec-policy/selinux-devicekit/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-devicekit-2.20170204-r1.ebuild 382 SHA256 fe99ff60aac01a9a20086b2a83900b61641c74bea4732139deaefb16dc24f078 SHA512 8b3489d8aa51317b6efb9cafe5f6f8b6e940706e95b4b8836cc5ce37de312950c3c0d9c81abc79fc538d0d3adcd8a01d2a193831bd3a7ef5c6bbcba86c36aaeb WHIRLPOOL ecb8c2b443f3432e6ef6975547315021bd125451bdf14675fcd553e9527ea21b1f3be8b16de5774dc6eea244b3be8587d67544f6e8fd8d01dfce343851e888cb
-EBUILD selinux-devicekit-2.20170204-r2.ebuild 380 SHA256 4396b7c8048c7f531cd988661982ff8d9bc6fe0defadb76633261adc5e24fed4 SHA512 b9d8db361dd06573782e13d74f10825c54d885c96d7a119180baaee808b13b518bfd2b9dc4826043d72feeb53d7c912635f2b756431729ac44dae3af4e2b5379 WHIRLPOOL f11cfff6f361c03ea9521d56b01a02ae08d509f679341b4e87985561d48cc3d173716e56ac2f9d810caa2d570664a7bb89c0d067d6e0295d0c9ef7b8743d7762
-EBUILD selinux-devicekit-2.20170204-r3.ebuild 380 SHA256 4396b7c8048c7f531cd988661982ff8d9bc6fe0defadb76633261adc5e24fed4 SHA512 b9d8db361dd06573782e13d74f10825c54d885c96d7a119180baaee808b13b518bfd2b9dc4826043d72feeb53d7c912635f2b756431729ac44dae3af4e2b5379 WHIRLPOOL f11cfff6f361c03ea9521d56b01a02ae08d509f679341b4e87985561d48cc3d173716e56ac2f9d810caa2d570664a7bb89c0d067d6e0295d0c9ef7b8743d7762
-EBUILD selinux-devicekit-2.20170204-r4.ebuild 380 SHA256 4396b7c8048c7f531cd988661982ff8d9bc6fe0defadb76633261adc5e24fed4 SHA512 b9d8db361dd06573782e13d74f10825c54d885c96d7a119180baaee808b13b518bfd2b9dc4826043d72feeb53d7c912635f2b756431729ac44dae3af4e2b5379 WHIRLPOOL f11cfff6f361c03ea9521d56b01a02ae08d509f679341b4e87985561d48cc3d173716e56ac2f9d810caa2d570664a7bb89c0d067d6e0295d0c9ef7b8743d7762
-EBUILD selinux-devicekit-2.20170805-r2.ebuild 380 SHA256 4396b7c8048c7f531cd988661982ff8d9bc6fe0defadb76633261adc5e24fed4 SHA512 b9d8db361dd06573782e13d74f10825c54d885c96d7a119180baaee808b13b518bfd2b9dc4826043d72feeb53d7c912635f2b756431729ac44dae3af4e2b5379 WHIRLPOOL f11cfff6f361c03ea9521d56b01a02ae08d509f679341b4e87985561d48cc3d173716e56ac2f9d810caa2d570664a7bb89c0d067d6e0295d0c9ef7b8743d7762
-EBUILD selinux-devicekit-9999.ebuild 382 SHA256 fe99ff60aac01a9a20086b2a83900b61641c74bea4732139deaefb16dc24f078 SHA512 8b3489d8aa51317b6efb9cafe5f6f8b6e940706e95b4b8836cc5ce37de312950c3c0d9c81abc79fc538d0d3adcd8a01d2a193831bd3a7ef5c6bbcba86c36aaeb WHIRLPOOL ecb8c2b443f3432e6ef6975547315021bd125451bdf14675fcd553e9527ea21b1f3be8b16de5774dc6eea244b3be8587d67544f6e8fd8d01dfce343851e888cb
+EBUILD selinux-devicekit-2.20170204-r1.ebuild 383 SHA256 d6a6828374183e0a3986231065fd3f56fef9f7f9f39c10f45f662c789a6bb247 SHA512 3b73da7e828fd7fb63a2c410a45f7ed52af1a8fab3479bcaf95fdd9d6a33dcc7e7b314daca172f62952f0b7d2d77b0e25f73576334b5b0e99bb5a2b5572ef975 WHIRLPOOL 8c41e4b81f9340b3280eb6af1b2b1b12b5d38ca82a6608610cc2f904ffd339531487538c12cdfa41e84e6dda2e03a6a8d43a4f3f8515d70e2a3d53c88d8b6be5
+EBUILD selinux-devicekit-2.20170204-r2.ebuild 381 SHA256 00acfb912efa2a4fe1cf204dc7b6f237dbcf99701c8eb5c8f4d0737bb46798c2 SHA512 b7d5c5cc4581ee80d9ee8d5388fe589e3427ec20f23c1bc07b5ff33ecc7c4fe33830dc60807ce7bfc08f9a8de8b8fbac7ae10417c639c9c06901b37d831f0281 WHIRLPOOL 9b80da984d39ddccea5604d8d4dccc878ace2e73ccb71a45a033549c64ee52f786fd804c8ed384cd3b5e27d810ef9876ba2fbb0a8a956059d36e6aac9aff8912
+EBUILD selinux-devicekit-2.20170204-r3.ebuild 381 SHA256 00acfb912efa2a4fe1cf204dc7b6f237dbcf99701c8eb5c8f4d0737bb46798c2 SHA512 b7d5c5cc4581ee80d9ee8d5388fe589e3427ec20f23c1bc07b5ff33ecc7c4fe33830dc60807ce7bfc08f9a8de8b8fbac7ae10417c639c9c06901b37d831f0281 WHIRLPOOL 9b80da984d39ddccea5604d8d4dccc878ace2e73ccb71a45a033549c64ee52f786fd804c8ed384cd3b5e27d810ef9876ba2fbb0a8a956059d36e6aac9aff8912
+EBUILD selinux-devicekit-2.20170204-r4.ebuild 381 SHA256 00acfb912efa2a4fe1cf204dc7b6f237dbcf99701c8eb5c8f4d0737bb46798c2 SHA512 b7d5c5cc4581ee80d9ee8d5388fe589e3427ec20f23c1bc07b5ff33ecc7c4fe33830dc60807ce7bfc08f9a8de8b8fbac7ae10417c639c9c06901b37d831f0281 WHIRLPOOL 9b80da984d39ddccea5604d8d4dccc878ace2e73ccb71a45a033549c64ee52f786fd804c8ed384cd3b5e27d810ef9876ba2fbb0a8a956059d36e6aac9aff8912
+EBUILD selinux-devicekit-2.20170805-r2.ebuild 381 SHA256 00acfb912efa2a4fe1cf204dc7b6f237dbcf99701c8eb5c8f4d0737bb46798c2 SHA512 b7d5c5cc4581ee80d9ee8d5388fe589e3427ec20f23c1bc07b5ff33ecc7c4fe33830dc60807ce7bfc08f9a8de8b8fbac7ae10417c639c9c06901b37d831f0281 WHIRLPOOL 9b80da984d39ddccea5604d8d4dccc878ace2e73ccb71a45a033549c64ee52f786fd804c8ed384cd3b5e27d810ef9876ba2fbb0a8a956059d36e6aac9aff8912
+EBUILD selinux-devicekit-2.20170805-r3.ebuild 383 SHA256 d6a6828374183e0a3986231065fd3f56fef9f7f9f39c10f45f662c789a6bb247 SHA512 3b73da7e828fd7fb63a2c410a45f7ed52af1a8fab3479bcaf95fdd9d6a33dcc7e7b314daca172f62952f0b7d2d77b0e25f73576334b5b0e99bb5a2b5572ef975 WHIRLPOOL 8c41e4b81f9340b3280eb6af1b2b1b12b5d38ca82a6608610cc2f904ffd339531487538c12cdfa41e84e6dda2e03a6a8d43a4f3f8515d70e2a3d53c88d8b6be5
+EBUILD selinux-devicekit-9999.ebuild 383 SHA256 d6a6828374183e0a3986231065fd3f56fef9f7f9f39c10f45f662c789a6bb247 SHA512 3b73da7e828fd7fb63a2c410a45f7ed52af1a8fab3479bcaf95fdd9d6a33dcc7e7b314daca172f62952f0b7d2d77b0e25f73576334b5b0e99bb5a2b5572ef975 WHIRLPOOL 8c41e4b81f9340b3280eb6af1b2b1b12b5d38ca82a6608610cc2f904ffd339531487538c12cdfa41e84e6dda2e03a6a8d43a4f3f8515d70e2a3d53c88d8b6be5
 MISC ChangeLog 10887 SHA256 23f7b269b9597b0a044b1bb40b7469b5ced8acdebeb9d73b480c8e1c8cc8cd99 SHA512 9717b57fcfc0f976efc4c975db725144e9f14a0296f0f85e95459d29469b6210267afc0b253353a6ef12b52ca21814e20c496d5b92ce31cb69c0535616cafcfc WHIRLPOOL 3f8e7006330efef508f2e3ee54b40181e830d4d9e1a60d3b5142d090085b226954f42be1de008a7f6ce2524f529c112638d65357916aec79a77525fc5b9cf349
 MISC ChangeLog-2015 8624 SHA256 d34e53bc642ad6ed81c156a7ff97c5420e423c10d8b51b5ca0fc22c109f32539 SHA512 d4549a053b6503c1228af841cdc8db7366637bbf35bb4ee1c94d98829d18b2b785d4ec22718198a0d41c37604a2c600fc78a32799a2ba47a5a8791a1f8b1bc4e WHIRLPOOL 68b177fe9ca8d03386196d0d65875a23c5487be7417b54fb6059858ddccc949d5c5b6c0da5a6b5873154e3c5cc320992c7f05d8c07c31d4572cd15a1f540eac7
 MISC metadata.xml 319 SHA256 34c7486f74331d8d2e93f0da596e92f3915567f997024f3a884500f08743da84 SHA512 050e2d0054e24c19050680c508a5e92d1d452a36ea729cc92fd503a66ea58b0a8a67c002684c8a7ea7a93c0562b518ec5f51df62007f0d1643a335cab86a9275 WHIRLPOOL e414b5dee27bbcb5c97a215dd58e7dfc27c1983f4642d7bef174f0a932a6da576c382094382eaefb074d9e07a246c0fb5df0e86ca278aa62e48040e75f9a823a
diff --git a/sec-policy/selinux-devicekit/selinux-devicekit-2.20170204-r1.ebuild b/sec-policy/selinux-devicekit/selinux-devicekit-2.20170204-r1.ebuild
index 7e87037e2cc2..7fe49468301f 100644
--- a/sec-policy/selinux-devicekit/selinux-devicekit-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-devicekit/selinux-devicekit-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-devicekit/selinux-devicekit-2.20170204-r2.ebuild b/sec-policy/selinux-devicekit/selinux-devicekit-2.20170204-r2.ebuild
index cc1d7394ab82..d125b8879229 100644
--- a/sec-policy/selinux-devicekit/selinux-devicekit-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-devicekit/selinux-devicekit-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-devicekit/selinux-devicekit-2.20170204-r3.ebuild b/sec-policy/selinux-devicekit/selinux-devicekit-2.20170204-r3.ebuild
index cc1d7394ab82..d125b8879229 100644
--- a/sec-policy/selinux-devicekit/selinux-devicekit-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-devicekit/selinux-devicekit-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-devicekit/selinux-devicekit-2.20170204-r4.ebuild b/sec-policy/selinux-devicekit/selinux-devicekit-2.20170204-r4.ebuild
index cc1d7394ab82..d125b8879229 100644
--- a/sec-policy/selinux-devicekit/selinux-devicekit-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-devicekit/selinux-devicekit-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-devicekit/selinux-devicekit-2.20170805-r2.ebuild b/sec-policy/selinux-devicekit/selinux-devicekit-2.20170805-r2.ebuild
index cc1d7394ab82..d125b8879229 100644
--- a/sec-policy/selinux-devicekit/selinux-devicekit-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-devicekit/selinux-devicekit-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-devicekit/selinux-devicekit-2.20170805-r3.ebuild b/sec-policy/selinux-devicekit/selinux-devicekit-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..7fe49468301f
--- /dev/null
+++ b/sec-policy/selinux-devicekit/selinux-devicekit-2.20170805-r3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-devicekit/selinux-devicekit-9999.ebuild b/sec-policy/selinux-devicekit/selinux-devicekit-9999.ebuild
index 7e87037e2cc2..7fe49468301f 100644
--- a/sec-policy/selinux-devicekit/selinux-devicekit-9999.ebuild
+++ b/sec-policy/selinux-devicekit/selinux-devicekit-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dhcp/Manifest b/sec-policy/selinux-dhcp/Manifest
index ec73e526a0ed..169142d43999 100644
--- a/sec-policy/selinux-dhcp/Manifest
+++ b/sec-policy/selinux-dhcp/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-dhcp-2.20170204-r1.ebuild 279 SHA256 05b1263042aabadcbf58e1ac033f196200b9f4be878812665aaaf6dafd8a2c50 SHA512 015e4f4fb91e00788bafd10e8590293eb7694165b08b9115ff884c10ea6d588d42d601e265065c03d22891d7685cd510803b946948e361e3acf10f49f6b3f950 WHIRLPOOL ba35e2a098b60737ca99de48a8a92a0d1be8d92d8b09865e94b1ddddb7a8280cfd99ae1394d7ca1b7e8bda94b73b421f9052eb759ada64291b54a0a4a54e34fc
-EBUILD selinux-dhcp-2.20170204-r2.ebuild 277 SHA256 e8bcce4c0952c2f12fce0ef11a543f530bb1b4ca549aeb2eb663ed179c6a3bd9 SHA512 c9b585e052424a9b5e2f8ab94daa3c001ca2c2ee02955675db1231bd18f21749250a0411ecfd210013c2f2c572998cc496fecd0f04b5d6ed5f0ca801296bb459 WHIRLPOOL 1e728ff45fc9e6350e56c4eb20e94d90c7694b2ed0625855c89c9c22cb834961cee3c52d2f1ab2e74b15e922663cee0e563854922758570d17f89581e899568f
-EBUILD selinux-dhcp-2.20170204-r3.ebuild 277 SHA256 e8bcce4c0952c2f12fce0ef11a543f530bb1b4ca549aeb2eb663ed179c6a3bd9 SHA512 c9b585e052424a9b5e2f8ab94daa3c001ca2c2ee02955675db1231bd18f21749250a0411ecfd210013c2f2c572998cc496fecd0f04b5d6ed5f0ca801296bb459 WHIRLPOOL 1e728ff45fc9e6350e56c4eb20e94d90c7694b2ed0625855c89c9c22cb834961cee3c52d2f1ab2e74b15e922663cee0e563854922758570d17f89581e899568f
-EBUILD selinux-dhcp-2.20170204-r4.ebuild 277 SHA256 e8bcce4c0952c2f12fce0ef11a543f530bb1b4ca549aeb2eb663ed179c6a3bd9 SHA512 c9b585e052424a9b5e2f8ab94daa3c001ca2c2ee02955675db1231bd18f21749250a0411ecfd210013c2f2c572998cc496fecd0f04b5d6ed5f0ca801296bb459 WHIRLPOOL 1e728ff45fc9e6350e56c4eb20e94d90c7694b2ed0625855c89c9c22cb834961cee3c52d2f1ab2e74b15e922663cee0e563854922758570d17f89581e899568f
-EBUILD selinux-dhcp-2.20170805-r2.ebuild 277 SHA256 e8bcce4c0952c2f12fce0ef11a543f530bb1b4ca549aeb2eb663ed179c6a3bd9 SHA512 c9b585e052424a9b5e2f8ab94daa3c001ca2c2ee02955675db1231bd18f21749250a0411ecfd210013c2f2c572998cc496fecd0f04b5d6ed5f0ca801296bb459 WHIRLPOOL 1e728ff45fc9e6350e56c4eb20e94d90c7694b2ed0625855c89c9c22cb834961cee3c52d2f1ab2e74b15e922663cee0e563854922758570d17f89581e899568f
-EBUILD selinux-dhcp-9999.ebuild 279 SHA256 05b1263042aabadcbf58e1ac033f196200b9f4be878812665aaaf6dafd8a2c50 SHA512 015e4f4fb91e00788bafd10e8590293eb7694165b08b9115ff884c10ea6d588d42d601e265065c03d22891d7685cd510803b946948e361e3acf10f49f6b3f950 WHIRLPOOL ba35e2a098b60737ca99de48a8a92a0d1be8d92d8b09865e94b1ddddb7a8280cfd99ae1394d7ca1b7e8bda94b73b421f9052eb759ada64291b54a0a4a54e34fc
+EBUILD selinux-dhcp-2.20170204-r1.ebuild 280 SHA256 cbb021cac1a84213e1bdcf2a986f0b4f9c3994c7f461573915ed301009938536 SHA512 58cd17a389f588c818941d1f1962b5876a5939e872c2eef89e0318e8c9a26d604de65c1a3ad311bb5ff7127edde70a1e1ff86357bd3f9f1adb8f0128a47344ed WHIRLPOOL 0ae590fcf777bbd94dd29249f4f4ce30b281ac3b562fead94d6bffc099db54ad9676e23c7a53b61665c5fba66258134daa8d3ea0140ecb24464827899a765718
+EBUILD selinux-dhcp-2.20170204-r2.ebuild 278 SHA256 0afe4eddb01d20603e40770ff81b8044e2d15ce1ee7d1f4e049ed57628b7c196 SHA512 cd3a108de1d88e1a0dc2182c68a768ba6639123cb7ad0d1063a8de310d43d6132c69161439414da1e113cecf89eec36bc50195492f19483182e917f4c84445a2 WHIRLPOOL bf212c0c83aa0a648501c8ebc2b33f02e2ea8354470d2d1517e11d96e2e7cdf43ee9f2d4159c2239c013af6a2eeec1e0e7dec9270b3da0a4553852cac98a4a92
+EBUILD selinux-dhcp-2.20170204-r3.ebuild 278 SHA256 0afe4eddb01d20603e40770ff81b8044e2d15ce1ee7d1f4e049ed57628b7c196 SHA512 cd3a108de1d88e1a0dc2182c68a768ba6639123cb7ad0d1063a8de310d43d6132c69161439414da1e113cecf89eec36bc50195492f19483182e917f4c84445a2 WHIRLPOOL bf212c0c83aa0a648501c8ebc2b33f02e2ea8354470d2d1517e11d96e2e7cdf43ee9f2d4159c2239c013af6a2eeec1e0e7dec9270b3da0a4553852cac98a4a92
+EBUILD selinux-dhcp-2.20170204-r4.ebuild 278 SHA256 0afe4eddb01d20603e40770ff81b8044e2d15ce1ee7d1f4e049ed57628b7c196 SHA512 cd3a108de1d88e1a0dc2182c68a768ba6639123cb7ad0d1063a8de310d43d6132c69161439414da1e113cecf89eec36bc50195492f19483182e917f4c84445a2 WHIRLPOOL bf212c0c83aa0a648501c8ebc2b33f02e2ea8354470d2d1517e11d96e2e7cdf43ee9f2d4159c2239c013af6a2eeec1e0e7dec9270b3da0a4553852cac98a4a92
+EBUILD selinux-dhcp-2.20170805-r2.ebuild 278 SHA256 0afe4eddb01d20603e40770ff81b8044e2d15ce1ee7d1f4e049ed57628b7c196 SHA512 cd3a108de1d88e1a0dc2182c68a768ba6639123cb7ad0d1063a8de310d43d6132c69161439414da1e113cecf89eec36bc50195492f19483182e917f4c84445a2 WHIRLPOOL bf212c0c83aa0a648501c8ebc2b33f02e2ea8354470d2d1517e11d96e2e7cdf43ee9f2d4159c2239c013af6a2eeec1e0e7dec9270b3da0a4553852cac98a4a92
+EBUILD selinux-dhcp-2.20170805-r3.ebuild 280 SHA256 cbb021cac1a84213e1bdcf2a986f0b4f9c3994c7f461573915ed301009938536 SHA512 58cd17a389f588c818941d1f1962b5876a5939e872c2eef89e0318e8c9a26d604de65c1a3ad311bb5ff7127edde70a1e1ff86357bd3f9f1adb8f0128a47344ed WHIRLPOOL 0ae590fcf777bbd94dd29249f4f4ce30b281ac3b562fead94d6bffc099db54ad9676e23c7a53b61665c5fba66258134daa8d3ea0140ecb24464827899a765718
+EBUILD selinux-dhcp-9999.ebuild 280 SHA256 cbb021cac1a84213e1bdcf2a986f0b4f9c3994c7f461573915ed301009938536 SHA512 58cd17a389f588c818941d1f1962b5876a5939e872c2eef89e0318e8c9a26d604de65c1a3ad311bb5ff7127edde70a1e1ff86357bd3f9f1adb8f0128a47344ed WHIRLPOOL 0ae590fcf777bbd94dd29249f4f4ce30b281ac3b562fead94d6bffc099db54ad9676e23c7a53b61665c5fba66258134daa8d3ea0140ecb24464827899a765718
 MISC ChangeLog 10387 SHA256 ded9f267dd584ae268c49b79da56cb9faf1e4455aefc8ed1773486875ba9ba6a SHA512 92a7e65493d94475da80dc942fdebdc6b37b2f40fc23f1b025e0c845c0dee8314291d80a70029ef0e6b66c6446fd52e68da1159e3e8feb49e438f828af8dfe5f WHIRLPOOL 3157de278ff0e8168cada893428c9fc2a1dad35be56111f367fcdc2587b5c923357ac5fbe811a2f414bd4630be82901d53f990e309b5ef3c405b0edbfdb0407a
 MISC ChangeLog-2015 15180 SHA256 8e61bbb95965fdab69fd41524a57ca870f916914baa535feaebcfaeeb71aa3ab SHA512 0b4fdeef3f8ba3b7ea46b36e1637389876bbae1f750526cc7b42621de0ffe0e4c16ad23d2d1dbf72b04ae18eab56c21e4b10b320cb839682c3a6a89965bfff0d WHIRLPOOL aea70b7fdf58e6ab152f2fd38c1ea3cb54f6c5b0d10c9cea56af281e83f64c7ac8ddfaa9e2adbfa1ce5541dd941693d9f0a8c099baf7e9e521ad77209cef660c
 MISC metadata.xml 314 SHA256 a8bc667aa2a527605bf65dbe081254b98de0b0f481df70e051ecf5235957a3f9 SHA512 40ea84ff6d5136b2da274d6a300e6c3daa1fdcbc7df92538895e071c37c2cbb6520949c4cf42ff9056dff84ff773e042748e6b8fc07d9253cb8ef5542001931b WHIRLPOOL 1490e6a3d0cb3b23b0e59699678a18afadc86101a2ae757ae121f7c3aa064b24de53b238312f69d91475c15ba38dced7587ae8d3b49b4dea2ab3e7697a0cd92c
diff --git a/sec-policy/selinux-dhcp/selinux-dhcp-2.20170204-r1.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-2.20170204-r1.ebuild
index 0b497e27da90..520dbcd29dc2 100644
--- a/sec-policy/selinux-dhcp/selinux-dhcp-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-dhcp/selinux-dhcp-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dhcp/selinux-dhcp-2.20170204-r2.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-2.20170204-r2.ebuild
index 5aaf772410b5..fd486e8a3107 100644
--- a/sec-policy/selinux-dhcp/selinux-dhcp-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-dhcp/selinux-dhcp-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dhcp/selinux-dhcp-2.20170204-r3.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-2.20170204-r3.ebuild
index 5aaf772410b5..fd486e8a3107 100644
--- a/sec-policy/selinux-dhcp/selinux-dhcp-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-dhcp/selinux-dhcp-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dhcp/selinux-dhcp-2.20170204-r4.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-2.20170204-r4.ebuild
index 5aaf772410b5..fd486e8a3107 100644
--- a/sec-policy/selinux-dhcp/selinux-dhcp-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-dhcp/selinux-dhcp-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dhcp/selinux-dhcp-2.20170805-r2.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-2.20170805-r2.ebuild
index 5aaf772410b5..fd486e8a3107 100644
--- a/sec-policy/selinux-dhcp/selinux-dhcp-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-dhcp/selinux-dhcp-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dhcp/selinux-dhcp-2.20170805-r3.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..520dbcd29dc2
--- /dev/null
+++ b/sec-policy/selinux-dhcp/selinux-dhcp-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-dhcp/selinux-dhcp-9999.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-9999.ebuild
index 0b497e27da90..520dbcd29dc2 100644
--- a/sec-policy/selinux-dhcp/selinux-dhcp-9999.ebuild
+++ b/sec-policy/selinux-dhcp/selinux-dhcp-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dictd/Manifest b/sec-policy/selinux-dictd/Manifest
index 18169082a626..9f454a432993 100644
--- a/sec-policy/selinux-dictd/Manifest
+++ b/sec-policy/selinux-dictd/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-dictd-2.20170204-r1.ebuild 281 SHA256 6e3654fae3dad43a361b73b4aac167874f188ffbf6c1c26350fdf77cb85bb3b3 SHA512 7fc8bdc86b4af2c614f62a30bc8aa522e47aa31985001676c2b74fbfa9872656b5694ac4bc9dcf0f094ddbbd549c4ba38b6ab02dbbb678bc7a9ad09bc66af214 WHIRLPOOL 5d7ce16ed8407ff5f1eb3aa190ddaa5b6d5cebd5148bcde0f2dd99081baf8bfd2b04349b20433fe7b24e1d7ce069d491306510b6ae1fae7954c59f11014dfb0c
-EBUILD selinux-dictd-2.20170204-r2.ebuild 279 SHA256 c7daf3e543c259e654806af6c19e47530fcf0c4b7708354641e98e22c0f9ea39 SHA512 08f1e69b56a5470231a19b6f7d144d9308e3246b3ec637d4d81b42ffa93c2c210b67571c103fb39a68b77fe653bb764f5f1f08cb79e390197cfb47d81415039e WHIRLPOOL c27b4b2a8054e47cbb1d44390d04e3b148b2741c3d0738efed025187956550fe071603d3e402596c0e8a79b1b2cd75d8826a4eb231c6b9665464e0fab882ce38
-EBUILD selinux-dictd-2.20170204-r3.ebuild 279 SHA256 c7daf3e543c259e654806af6c19e47530fcf0c4b7708354641e98e22c0f9ea39 SHA512 08f1e69b56a5470231a19b6f7d144d9308e3246b3ec637d4d81b42ffa93c2c210b67571c103fb39a68b77fe653bb764f5f1f08cb79e390197cfb47d81415039e WHIRLPOOL c27b4b2a8054e47cbb1d44390d04e3b148b2741c3d0738efed025187956550fe071603d3e402596c0e8a79b1b2cd75d8826a4eb231c6b9665464e0fab882ce38
-EBUILD selinux-dictd-2.20170204-r4.ebuild 279 SHA256 c7daf3e543c259e654806af6c19e47530fcf0c4b7708354641e98e22c0f9ea39 SHA512 08f1e69b56a5470231a19b6f7d144d9308e3246b3ec637d4d81b42ffa93c2c210b67571c103fb39a68b77fe653bb764f5f1f08cb79e390197cfb47d81415039e WHIRLPOOL c27b4b2a8054e47cbb1d44390d04e3b148b2741c3d0738efed025187956550fe071603d3e402596c0e8a79b1b2cd75d8826a4eb231c6b9665464e0fab882ce38
-EBUILD selinux-dictd-2.20170805-r2.ebuild 279 SHA256 c7daf3e543c259e654806af6c19e47530fcf0c4b7708354641e98e22c0f9ea39 SHA512 08f1e69b56a5470231a19b6f7d144d9308e3246b3ec637d4d81b42ffa93c2c210b67571c103fb39a68b77fe653bb764f5f1f08cb79e390197cfb47d81415039e WHIRLPOOL c27b4b2a8054e47cbb1d44390d04e3b148b2741c3d0738efed025187956550fe071603d3e402596c0e8a79b1b2cd75d8826a4eb231c6b9665464e0fab882ce38
-EBUILD selinux-dictd-9999.ebuild 281 SHA256 6e3654fae3dad43a361b73b4aac167874f188ffbf6c1c26350fdf77cb85bb3b3 SHA512 7fc8bdc86b4af2c614f62a30bc8aa522e47aa31985001676c2b74fbfa9872656b5694ac4bc9dcf0f094ddbbd549c4ba38b6ab02dbbb678bc7a9ad09bc66af214 WHIRLPOOL 5d7ce16ed8407ff5f1eb3aa190ddaa5b6d5cebd5148bcde0f2dd99081baf8bfd2b04349b20433fe7b24e1d7ce069d491306510b6ae1fae7954c59f11014dfb0c
+EBUILD selinux-dictd-2.20170204-r1.ebuild 282 SHA256 e05bc60166200a940a9a7dad7a51cfbd69d104b48e0b328479546f9d728b67c3 SHA512 a5af417f0329bc8939f6e20b53dafcf09bd16abf8729ee352540471c087abf49f638306a1e0f5a24536cefe3567b101570d0fbd2671c9287b0cb91d0da4e41c2 WHIRLPOOL 8d4ff30a89169fcdefef621f5c530c4aee17d9ecedb25be2db5eea99d555df0d06aef7a180b6fffce3f9eaf4225b57d14e331df58bc94c3c93e21c1252b59620
+EBUILD selinux-dictd-2.20170204-r2.ebuild 280 SHA256 86a254ad1be6997a30118e67ce0d03bf156cdc19514462da73107d9be816f8c6 SHA512 aad88ffa0de3ceccc46f0120b922b463e73dbb8649697baca6bedd0d63911e3392fe960aaa04e340753d1e7d01607b898ab5da84ec6b1cf0ecc78b4fc8fa9552 WHIRLPOOL dbb52298514bc1f9bb02b00608526011fff0bc3be554d41669e416ffe2ed962eb0dc016741d76f2999068711b9dcc5e153ef2efc81b1d8df093c560d7a54f6cd
+EBUILD selinux-dictd-2.20170204-r3.ebuild 280 SHA256 86a254ad1be6997a30118e67ce0d03bf156cdc19514462da73107d9be816f8c6 SHA512 aad88ffa0de3ceccc46f0120b922b463e73dbb8649697baca6bedd0d63911e3392fe960aaa04e340753d1e7d01607b898ab5da84ec6b1cf0ecc78b4fc8fa9552 WHIRLPOOL dbb52298514bc1f9bb02b00608526011fff0bc3be554d41669e416ffe2ed962eb0dc016741d76f2999068711b9dcc5e153ef2efc81b1d8df093c560d7a54f6cd
+EBUILD selinux-dictd-2.20170204-r4.ebuild 280 SHA256 86a254ad1be6997a30118e67ce0d03bf156cdc19514462da73107d9be816f8c6 SHA512 aad88ffa0de3ceccc46f0120b922b463e73dbb8649697baca6bedd0d63911e3392fe960aaa04e340753d1e7d01607b898ab5da84ec6b1cf0ecc78b4fc8fa9552 WHIRLPOOL dbb52298514bc1f9bb02b00608526011fff0bc3be554d41669e416ffe2ed962eb0dc016741d76f2999068711b9dcc5e153ef2efc81b1d8df093c560d7a54f6cd
+EBUILD selinux-dictd-2.20170805-r2.ebuild 280 SHA256 86a254ad1be6997a30118e67ce0d03bf156cdc19514462da73107d9be816f8c6 SHA512 aad88ffa0de3ceccc46f0120b922b463e73dbb8649697baca6bedd0d63911e3392fe960aaa04e340753d1e7d01607b898ab5da84ec6b1cf0ecc78b4fc8fa9552 WHIRLPOOL dbb52298514bc1f9bb02b00608526011fff0bc3be554d41669e416ffe2ed962eb0dc016741d76f2999068711b9dcc5e153ef2efc81b1d8df093c560d7a54f6cd
+EBUILD selinux-dictd-2.20170805-r3.ebuild 282 SHA256 e05bc60166200a940a9a7dad7a51cfbd69d104b48e0b328479546f9d728b67c3 SHA512 a5af417f0329bc8939f6e20b53dafcf09bd16abf8729ee352540471c087abf49f638306a1e0f5a24536cefe3567b101570d0fbd2671c9287b0cb91d0da4e41c2 WHIRLPOOL 8d4ff30a89169fcdefef621f5c530c4aee17d9ecedb25be2db5eea99d555df0d06aef7a180b6fffce3f9eaf4225b57d14e331df58bc94c3c93e21c1252b59620
+EBUILD selinux-dictd-9999.ebuild 282 SHA256 e05bc60166200a940a9a7dad7a51cfbd69d104b48e0b328479546f9d728b67c3 SHA512 a5af417f0329bc8939f6e20b53dafcf09bd16abf8729ee352540471c087abf49f638306a1e0f5a24536cefe3567b101570d0fbd2671c9287b0cb91d0da4e41c2 WHIRLPOOL 8d4ff30a89169fcdefef621f5c530c4aee17d9ecedb25be2db5eea99d555df0d06aef7a180b6fffce3f9eaf4225b57d14e331df58bc94c3c93e21c1252b59620
 MISC ChangeLog 10479 SHA256 70459168bdc71be0a4eaebc6b235eee99019f2b25021fcf46ce9d25da1ede7f5 SHA512 fa3e8945397df7c002a0b7beb410e0528ebe1828a2bd0aa6a98fdb344123dc38886814724ee066e8d462e96dbae7fc66ab681c5ab8e7d827a4d855e267a77565 WHIRLPOOL 4057dfa7c28c2aef65b3c4ef723cfaa0d5af74c71f16f0093bdd0fe23b7f36321c3bf00cb009c7bfd232660d4cece0f7e6013aa25d293c18962e1a1c7f59cf7f
 MISC ChangeLog-2015 9749 SHA256 48d604450170308551add79b8f67193d8120cf66b1f420b1bb2ea702191af27b SHA512 5ac3e0f0eb4902a6e2193dd3f3cb2415a02a4072be57bbd1d7c12906a212e68ef8b5b8267a838f9317fe2caac0c10b9843c0f65f174c778a3f6fac1b179191fa WHIRLPOOL 675d3bb6d422dc0b19fc94874d124c3053fefeacaa32d01e804f1f1d0bede1f6a926bc67e7253638fb39b01cd26be7192c4fbedbc241ed5de779eba027546e89
 MISC metadata.xml 315 SHA256 2c4c16119becb3a2964eeee08df6f06fe47f28440881610666ceed5810762180 SHA512 02c4865816cef6be48361eae1ae305c74b1c0808a4f56b5eb8d2ac31526eed898d6b4d506ed7c649d387c0cb10f4915289a218dfe40b78a3ca14f613a39f4157 WHIRLPOOL cfe0636399cd4924370e9c9edc925b4939cb21737c79e67efebee548018a7860b6ce4ed4b37221209807eb7e48c55398d1760488a481ddaecb64bfc299c3c30b
diff --git a/sec-policy/selinux-dictd/selinux-dictd-2.20170204-r1.ebuild b/sec-policy/selinux-dictd/selinux-dictd-2.20170204-r1.ebuild
index 0651f1b1251e..dd7cf2f34df0 100644
--- a/sec-policy/selinux-dictd/selinux-dictd-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-dictd/selinux-dictd-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dictd/selinux-dictd-2.20170204-r2.ebuild b/sec-policy/selinux-dictd/selinux-dictd-2.20170204-r2.ebuild
index 0f19562e7aea..3bc15bd2b29c 100644
--- a/sec-policy/selinux-dictd/selinux-dictd-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-dictd/selinux-dictd-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dictd/selinux-dictd-2.20170204-r3.ebuild b/sec-policy/selinux-dictd/selinux-dictd-2.20170204-r3.ebuild
index 0f19562e7aea..3bc15bd2b29c 100644
--- a/sec-policy/selinux-dictd/selinux-dictd-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-dictd/selinux-dictd-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dictd/selinux-dictd-2.20170204-r4.ebuild b/sec-policy/selinux-dictd/selinux-dictd-2.20170204-r4.ebuild
index 0f19562e7aea..3bc15bd2b29c 100644
--- a/sec-policy/selinux-dictd/selinux-dictd-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-dictd/selinux-dictd-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dictd/selinux-dictd-2.20170805-r2.ebuild b/sec-policy/selinux-dictd/selinux-dictd-2.20170805-r2.ebuild
index 0f19562e7aea..3bc15bd2b29c 100644
--- a/sec-policy/selinux-dictd/selinux-dictd-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-dictd/selinux-dictd-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dictd/selinux-dictd-2.20170805-r3.ebuild b/sec-policy/selinux-dictd/selinux-dictd-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..dd7cf2f34df0
--- /dev/null
+++ b/sec-policy/selinux-dictd/selinux-dictd-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-dictd/selinux-dictd-9999.ebuild b/sec-policy/selinux-dictd/selinux-dictd-9999.ebuild
index 0651f1b1251e..dd7cf2f34df0 100644
--- a/sec-policy/selinux-dictd/selinux-dictd-9999.ebuild
+++ b/sec-policy/selinux-dictd/selinux-dictd-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dirsrv/Manifest b/sec-policy/selinux-dirsrv/Manifest
index 650cebacc061..605923028e5b 100644
--- a/sec-policy/selinux-dirsrv/Manifest
+++ b/sec-policy/selinux-dirsrv/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-dirsrv-2.20170204-r1.ebuild 283 SHA256 59e41acf3e2a49ee675f81ecbcb8fd7d6b9da6eb0f2c001dcddb94d8a8c42ae4 SHA512 87ba738546a42bf69516ec960a2d69881a15406c9abf2f7c0417ada6b29aade516918d9d265ecb5b0f252a59aee7ba1ca8fab0dd03ab4ab0ce5c055f6234059b WHIRLPOOL 90ccf3841b142011c73f43b88921ec51d8d78e40e750eb704cea4c065b1c6f764972a8722a6d0dbaf886e37b17192ac5e7601dde112956b7d9f459a200a1b199
-EBUILD selinux-dirsrv-2.20170204-r2.ebuild 281 SHA256 53f2e929caba4dc27d14b226536783f39998f9a0ed36f1c1cd27d26f3860b17e SHA512 6b101706e379f8a9b410eca97870e0343230347841da845f19dab17b8433776d4e8309c2650cfa350cd1be1a2e68583c9bd287e9aaa76c2651ff7b02d09893a2 WHIRLPOOL 155e6040fb5d8ff1be75a1cac4137e6241aab894fdf959e26a671baa2732f01818c4a30e11715ed430098e21d9555e93887dfc083fa6c964c3d27b6b9eb5a58d
-EBUILD selinux-dirsrv-2.20170204-r3.ebuild 281 SHA256 53f2e929caba4dc27d14b226536783f39998f9a0ed36f1c1cd27d26f3860b17e SHA512 6b101706e379f8a9b410eca97870e0343230347841da845f19dab17b8433776d4e8309c2650cfa350cd1be1a2e68583c9bd287e9aaa76c2651ff7b02d09893a2 WHIRLPOOL 155e6040fb5d8ff1be75a1cac4137e6241aab894fdf959e26a671baa2732f01818c4a30e11715ed430098e21d9555e93887dfc083fa6c964c3d27b6b9eb5a58d
-EBUILD selinux-dirsrv-2.20170204-r4.ebuild 281 SHA256 53f2e929caba4dc27d14b226536783f39998f9a0ed36f1c1cd27d26f3860b17e SHA512 6b101706e379f8a9b410eca97870e0343230347841da845f19dab17b8433776d4e8309c2650cfa350cd1be1a2e68583c9bd287e9aaa76c2651ff7b02d09893a2 WHIRLPOOL 155e6040fb5d8ff1be75a1cac4137e6241aab894fdf959e26a671baa2732f01818c4a30e11715ed430098e21d9555e93887dfc083fa6c964c3d27b6b9eb5a58d
-EBUILD selinux-dirsrv-2.20170805-r2.ebuild 281 SHA256 53f2e929caba4dc27d14b226536783f39998f9a0ed36f1c1cd27d26f3860b17e SHA512 6b101706e379f8a9b410eca97870e0343230347841da845f19dab17b8433776d4e8309c2650cfa350cd1be1a2e68583c9bd287e9aaa76c2651ff7b02d09893a2 WHIRLPOOL 155e6040fb5d8ff1be75a1cac4137e6241aab894fdf959e26a671baa2732f01818c4a30e11715ed430098e21d9555e93887dfc083fa6c964c3d27b6b9eb5a58d
-EBUILD selinux-dirsrv-9999.ebuild 283 SHA256 59e41acf3e2a49ee675f81ecbcb8fd7d6b9da6eb0f2c001dcddb94d8a8c42ae4 SHA512 87ba738546a42bf69516ec960a2d69881a15406c9abf2f7c0417ada6b29aade516918d9d265ecb5b0f252a59aee7ba1ca8fab0dd03ab4ab0ce5c055f6234059b WHIRLPOOL 90ccf3841b142011c73f43b88921ec51d8d78e40e750eb704cea4c065b1c6f764972a8722a6d0dbaf886e37b17192ac5e7601dde112956b7d9f459a200a1b199
+EBUILD selinux-dirsrv-2.20170204-r1.ebuild 284 SHA256 e5aa89b30441d3a18e651651b11609f3e87de06b26ac55a6f08e9979607a50af SHA512 1cdd5c18721c8ca813ebae53d74c4f01ba5df84899383ea9b3320f78a1c77bcce98d8256fd3a67c6f82655270f00d95553fb186043c71278dbc1e7246072a135 WHIRLPOOL d3d86116ac0a2256af7729e9bb123621654eb3ad1eed7b673b9804376c4e7562fd9ba1ba275b2c6e3c752ab2d3dc7ec16f69709e9d76b4fa58de94020b223632
+EBUILD selinux-dirsrv-2.20170204-r2.ebuild 282 SHA256 4748752b47464bf6f64f9ac896a6bf30da18c086c3d9d6b6d4b877ed16e927c3 SHA512 324337fc9a497bd592b06b0c338e98815e153f5abd54a6e326bbc33723ad601af2b072e8512e03aacb65c760480f7b559bf28a1dd4ffba1c33b871b4481330ff WHIRLPOOL f94dda93a6ff8056ba64bc60c06679de86b60d80e53f43f8f7c1b72c2553fe581ba4c09aaf97a3d4ed572997149eb24588a055fba544c17d71abc4daf8442a6f
+EBUILD selinux-dirsrv-2.20170204-r3.ebuild 282 SHA256 4748752b47464bf6f64f9ac896a6bf30da18c086c3d9d6b6d4b877ed16e927c3 SHA512 324337fc9a497bd592b06b0c338e98815e153f5abd54a6e326bbc33723ad601af2b072e8512e03aacb65c760480f7b559bf28a1dd4ffba1c33b871b4481330ff WHIRLPOOL f94dda93a6ff8056ba64bc60c06679de86b60d80e53f43f8f7c1b72c2553fe581ba4c09aaf97a3d4ed572997149eb24588a055fba544c17d71abc4daf8442a6f
+EBUILD selinux-dirsrv-2.20170204-r4.ebuild 282 SHA256 4748752b47464bf6f64f9ac896a6bf30da18c086c3d9d6b6d4b877ed16e927c3 SHA512 324337fc9a497bd592b06b0c338e98815e153f5abd54a6e326bbc33723ad601af2b072e8512e03aacb65c760480f7b559bf28a1dd4ffba1c33b871b4481330ff WHIRLPOOL f94dda93a6ff8056ba64bc60c06679de86b60d80e53f43f8f7c1b72c2553fe581ba4c09aaf97a3d4ed572997149eb24588a055fba544c17d71abc4daf8442a6f
+EBUILD selinux-dirsrv-2.20170805-r2.ebuild 282 SHA256 4748752b47464bf6f64f9ac896a6bf30da18c086c3d9d6b6d4b877ed16e927c3 SHA512 324337fc9a497bd592b06b0c338e98815e153f5abd54a6e326bbc33723ad601af2b072e8512e03aacb65c760480f7b559bf28a1dd4ffba1c33b871b4481330ff WHIRLPOOL f94dda93a6ff8056ba64bc60c06679de86b60d80e53f43f8f7c1b72c2553fe581ba4c09aaf97a3d4ed572997149eb24588a055fba544c17d71abc4daf8442a6f
+EBUILD selinux-dirsrv-2.20170805-r3.ebuild 284 SHA256 e5aa89b30441d3a18e651651b11609f3e87de06b26ac55a6f08e9979607a50af SHA512 1cdd5c18721c8ca813ebae53d74c4f01ba5df84899383ea9b3320f78a1c77bcce98d8256fd3a67c6f82655270f00d95553fb186043c71278dbc1e7246072a135 WHIRLPOOL d3d86116ac0a2256af7729e9bb123621654eb3ad1eed7b673b9804376c4e7562fd9ba1ba275b2c6e3c752ab2d3dc7ec16f69709e9d76b4fa58de94020b223632
+EBUILD selinux-dirsrv-9999.ebuild 284 SHA256 e5aa89b30441d3a18e651651b11609f3e87de06b26ac55a6f08e9979607a50af SHA512 1cdd5c18721c8ca813ebae53d74c4f01ba5df84899383ea9b3320f78a1c77bcce98d8256fd3a67c6f82655270f00d95553fb186043c71278dbc1e7246072a135 WHIRLPOOL d3d86116ac0a2256af7729e9bb123621654eb3ad1eed7b673b9804376c4e7562fd9ba1ba275b2c6e3c752ab2d3dc7ec16f69709e9d76b4fa58de94020b223632
 MISC ChangeLog 10571 SHA256 ea5f64dfcaf666222ff0b2cf8159c9cfe67fd47a8796c13548aa9934480ec21f SHA512 c8c6965e8486f19a5f7b81adf1fc609e575f3fa2cdfad267e36cf7675a471012f3a26716a5489cc335de60690eb009ba4c674034781f580c2c6f5a54f727f7bf WHIRLPOOL 3a673ffb94580cb03f74682143290c459ce972dcfd23f6644620eae45c09a7db602870b3f60579f69e587a97f4756c366cad253da8b0479b4175791d5f5e1199
 MISC ChangeLog-2015 7260 SHA256 6f5648363228734b2c0a34f090476a186453e12e6a9528c7c862d164c42f4859 SHA512 d5dc18e98fb517626d31701c7654dbd933bb94944a79be1cdb5408bcacc26da70c13e73443d2fcc6e690902a0992a048832a4b1684f6d509834a0c42871badcc WHIRLPOOL 708f1ecd520016f6d3238e50b8284035c71d92cccef1f436d46c71ef8b800bdbeeb07b42f28b3ffac9fa02a7046487ace9532884453c98ea64278003cfb8bd21
 MISC metadata.xml 316 SHA256 ba3d95f4c647033e19fb78f2241b0895d2c6df1c8699d59039f19ee595bf1657 SHA512 9392b125315ce8aaeac508910a071d09007a8cf56fbeaf82a935af65958599622d3eeef89eef93c72e2cac81582a4d1dc5ddace14e255764db5df80d9553cb50 WHIRLPOOL 32ab1fb8f9f4fe62a48462c65b39ed2243fe8d72a94838d3ec435a04b5b6f3fcf0f5a9e18e22b12e317b0ed26e1918ae2ba393c323c5064afa671343a8184a16
diff --git a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20170204-r1.ebuild b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20170204-r1.ebuild
index d0c78aa966f4..5192f6530f14 100644
--- a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20170204-r2.ebuild b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20170204-r2.ebuild
index 0456a3772432..fdea3c6062de 100644
--- a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20170204-r3.ebuild b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20170204-r3.ebuild
index 0456a3772432..fdea3c6062de 100644
--- a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20170204-r4.ebuild b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20170204-r4.ebuild
index 0456a3772432..fdea3c6062de 100644
--- a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20170805-r2.ebuild b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20170805-r2.ebuild
index 0456a3772432..fdea3c6062de 100644
--- a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20170805-r3.ebuild b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..5192f6530f14
--- /dev/null
+++ b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-dirsrv/selinux-dirsrv-9999.ebuild b/sec-policy/selinux-dirsrv/selinux-dirsrv-9999.ebuild
index d0c78aa966f4..5192f6530f14 100644
--- a/sec-policy/selinux-dirsrv/selinux-dirsrv-9999.ebuild
+++ b/sec-policy/selinux-dirsrv/selinux-dirsrv-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-distcc/Manifest b/sec-policy/selinux-distcc/Manifest
index d30522bc95e7..e76bec074b2f 100644
--- a/sec-policy/selinux-distcc/Manifest
+++ b/sec-policy/selinux-distcc/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-distcc-2.20170204-r1.ebuild 283 SHA256 ea172a64f0708c26a1cd8e1322c309334ebdbcfd7f1e66351c3b1cb3902b044b SHA512 8d9dba82ee826561c4bc98d400684fe267947aa1b58793adea3460c2fd8f00a9c03a503d950130c804385d7c74b5b5c05dfa6a84ac2e94d7e0b3ed189b39cae2 WHIRLPOOL 412f0b47577dd9724e83f7ef091a561022b1c250cafac23d400893bb5f517855f102c0eedcede16dbf4abc7d9fc3a02d18d63f242645a17da9856864bebe496e
-EBUILD selinux-distcc-2.20170204-r2.ebuild 281 SHA256 d60d98fa53d302fc81dd52680dad71249712ca45a4292f7a58b4ffdb3f1e7c01 SHA512 f2a53aa002dd284733241eb50fc3c29fd7fdc5d9da939ee723ac2187acb96ab9bb39f5a96ea1192c05779596b86fead8b4417d938e6244ce0f84ce2dfe6d73a5 WHIRLPOOL ed103c1975556c8e5041e0a2b3069dff126b013b090fa15c5b12c345be17ec154bc4ad9d692f0c38f45419e76316a87fbaf53be2962a7a14ba98396ea4131bdd
-EBUILD selinux-distcc-2.20170204-r3.ebuild 281 SHA256 d60d98fa53d302fc81dd52680dad71249712ca45a4292f7a58b4ffdb3f1e7c01 SHA512 f2a53aa002dd284733241eb50fc3c29fd7fdc5d9da939ee723ac2187acb96ab9bb39f5a96ea1192c05779596b86fead8b4417d938e6244ce0f84ce2dfe6d73a5 WHIRLPOOL ed103c1975556c8e5041e0a2b3069dff126b013b090fa15c5b12c345be17ec154bc4ad9d692f0c38f45419e76316a87fbaf53be2962a7a14ba98396ea4131bdd
-EBUILD selinux-distcc-2.20170204-r4.ebuild 281 SHA256 d60d98fa53d302fc81dd52680dad71249712ca45a4292f7a58b4ffdb3f1e7c01 SHA512 f2a53aa002dd284733241eb50fc3c29fd7fdc5d9da939ee723ac2187acb96ab9bb39f5a96ea1192c05779596b86fead8b4417d938e6244ce0f84ce2dfe6d73a5 WHIRLPOOL ed103c1975556c8e5041e0a2b3069dff126b013b090fa15c5b12c345be17ec154bc4ad9d692f0c38f45419e76316a87fbaf53be2962a7a14ba98396ea4131bdd
-EBUILD selinux-distcc-2.20170805-r2.ebuild 281 SHA256 d60d98fa53d302fc81dd52680dad71249712ca45a4292f7a58b4ffdb3f1e7c01 SHA512 f2a53aa002dd284733241eb50fc3c29fd7fdc5d9da939ee723ac2187acb96ab9bb39f5a96ea1192c05779596b86fead8b4417d938e6244ce0f84ce2dfe6d73a5 WHIRLPOOL ed103c1975556c8e5041e0a2b3069dff126b013b090fa15c5b12c345be17ec154bc4ad9d692f0c38f45419e76316a87fbaf53be2962a7a14ba98396ea4131bdd
-EBUILD selinux-distcc-9999.ebuild 283 SHA256 ea172a64f0708c26a1cd8e1322c309334ebdbcfd7f1e66351c3b1cb3902b044b SHA512 8d9dba82ee826561c4bc98d400684fe267947aa1b58793adea3460c2fd8f00a9c03a503d950130c804385d7c74b5b5c05dfa6a84ac2e94d7e0b3ed189b39cae2 WHIRLPOOL 412f0b47577dd9724e83f7ef091a561022b1c250cafac23d400893bb5f517855f102c0eedcede16dbf4abc7d9fc3a02d18d63f242645a17da9856864bebe496e
+EBUILD selinux-distcc-2.20170204-r1.ebuild 284 SHA256 5976474219cd87402e62e52bc14137bf5b4ed0807467ffc220ea4cad689c7e9e SHA512 13edfc37c4d512915db725ba4dbb7ecad9646532bd20f63340d2fbac8785d3c52232aafb28c3a94c0b472a10da4076e05d9b4b72a04f64b00b091fa2b6ccd619 WHIRLPOOL 5a92b0dbec3a28c29527c4a164812b349ea82ddb17d8ba329b4d71c43fe62c6bce540d345917f06f39fd31ce5b4f88c1558a498588bde0be25c228d52dcee025
+EBUILD selinux-distcc-2.20170204-r2.ebuild 282 SHA256 4c0637d05cc03989c34a3d82961caebe80bbaaf9103bd4fa2cc11038544c3d85 SHA512 aef164f27845c9d60a3687fb86830e9cb79894ef56cdd0f47eba595e7c01936d877a66ebe07a898bfae665af6a5495f9a41f7c442fb1c90310592d68ddcda425 WHIRLPOOL d290738e91e21cfc4320e75f707ab4954fb53201e2f5b71f1b7e709fc6a3aa87b5aeafcc5449d47f2899fd4b26fe12b372d116508f39654686cbbf2450e1adb4
+EBUILD selinux-distcc-2.20170204-r3.ebuild 282 SHA256 4c0637d05cc03989c34a3d82961caebe80bbaaf9103bd4fa2cc11038544c3d85 SHA512 aef164f27845c9d60a3687fb86830e9cb79894ef56cdd0f47eba595e7c01936d877a66ebe07a898bfae665af6a5495f9a41f7c442fb1c90310592d68ddcda425 WHIRLPOOL d290738e91e21cfc4320e75f707ab4954fb53201e2f5b71f1b7e709fc6a3aa87b5aeafcc5449d47f2899fd4b26fe12b372d116508f39654686cbbf2450e1adb4
+EBUILD selinux-distcc-2.20170204-r4.ebuild 282 SHA256 4c0637d05cc03989c34a3d82961caebe80bbaaf9103bd4fa2cc11038544c3d85 SHA512 aef164f27845c9d60a3687fb86830e9cb79894ef56cdd0f47eba595e7c01936d877a66ebe07a898bfae665af6a5495f9a41f7c442fb1c90310592d68ddcda425 WHIRLPOOL d290738e91e21cfc4320e75f707ab4954fb53201e2f5b71f1b7e709fc6a3aa87b5aeafcc5449d47f2899fd4b26fe12b372d116508f39654686cbbf2450e1adb4
+EBUILD selinux-distcc-2.20170805-r2.ebuild 282 SHA256 4c0637d05cc03989c34a3d82961caebe80bbaaf9103bd4fa2cc11038544c3d85 SHA512 aef164f27845c9d60a3687fb86830e9cb79894ef56cdd0f47eba595e7c01936d877a66ebe07a898bfae665af6a5495f9a41f7c442fb1c90310592d68ddcda425 WHIRLPOOL d290738e91e21cfc4320e75f707ab4954fb53201e2f5b71f1b7e709fc6a3aa87b5aeafcc5449d47f2899fd4b26fe12b372d116508f39654686cbbf2450e1adb4
+EBUILD selinux-distcc-2.20170805-r3.ebuild 284 SHA256 5976474219cd87402e62e52bc14137bf5b4ed0807467ffc220ea4cad689c7e9e SHA512 13edfc37c4d512915db725ba4dbb7ecad9646532bd20f63340d2fbac8785d3c52232aafb28c3a94c0b472a10da4076e05d9b4b72a04f64b00b091fa2b6ccd619 WHIRLPOOL 5a92b0dbec3a28c29527c4a164812b349ea82ddb17d8ba329b4d71c43fe62c6bce540d345917f06f39fd31ce5b4f88c1558a498588bde0be25c228d52dcee025
+EBUILD selinux-distcc-9999.ebuild 284 SHA256 5976474219cd87402e62e52bc14137bf5b4ed0807467ffc220ea4cad689c7e9e SHA512 13edfc37c4d512915db725ba4dbb7ecad9646532bd20f63340d2fbac8785d3c52232aafb28c3a94c0b472a10da4076e05d9b4b72a04f64b00b091fa2b6ccd619 WHIRLPOOL 5a92b0dbec3a28c29527c4a164812b349ea82ddb17d8ba329b4d71c43fe62c6bce540d345917f06f39fd31ce5b4f88c1558a498588bde0be25c228d52dcee025
 MISC ChangeLog 10571 SHA256 85c666a2ce38f9a2446373f19e9536357d9f34d594ff0c934706e752c451c794 SHA512 b27545fef43f77ac6e82ef5678367fadf274b5a7aa3b483093edf0ec50904fbd5aa967d9773ed5773a49bdaa358b009caf41ed5c03ddb9cad3612a629734b931 WHIRLPOOL 0f4f7fac904e2dc2122c487201fd4f7cdb0030aab0507f5e4b323b8609f69a83b266c23cf6e395ae63aeb2cffa729b27fdd8d284c4e5dd1f8f187fc2f0a1e605
 MISC ChangeLog-2015 12658 SHA256 12836c67486dcfcb7f947127ca2201e30afc9e0db31cc2238942326fd9e5b8af SHA512 1f04b8029262aa6f10234458496bd3e96d86e99ab64a3d289941faf864fa82a28b4f5b5bb2882d21dfe80b00c93f50db9733f14efaaa6d83dea86dd548cd1196 WHIRLPOOL 3c616fa13303bfa34d64688fa9d6a94fa07f92846be2eb10ebbea19988f25eabbd5e0e5545e1749db437c5d4ac61dc67b5f4fb6b57396144cdc9d273234a8145
 MISC metadata.xml 316 SHA256 d0a380d78a2edd6847eb5a935053fd7434ffc3ffb9605fd05ca5b895dea2bf75 SHA512 d11cb8bc6cf54e4c1ba0e2e00ef18db5c5a91e3138347156c04b2e4bc9cd002220c5406d19020993746fa41014b85e80d779a82a80c2db01b8bae02aea6d1fa4 WHIRLPOOL 15a3e087e3d6c35a3a30c662ebd9a97a115aba5cff0ceaa3bb4d78d51f98c3a40c7fabd5e4a8cc6e6e6f50fc9c7d774d4df4f2bc2e5290eb665ff9aeed622f51
diff --git a/sec-policy/selinux-distcc/selinux-distcc-2.20170204-r1.ebuild b/sec-policy/selinux-distcc/selinux-distcc-2.20170204-r1.ebuild
index 014ad2237ee8..3c4706bd83ad 100644
--- a/sec-policy/selinux-distcc/selinux-distcc-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-distcc/selinux-distcc-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-distcc/selinux-distcc-2.20170204-r2.ebuild b/sec-policy/selinux-distcc/selinux-distcc-2.20170204-r2.ebuild
index e99a0ab50f00..6cf879968a47 100644
--- a/sec-policy/selinux-distcc/selinux-distcc-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-distcc/selinux-distcc-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-distcc/selinux-distcc-2.20170204-r3.ebuild b/sec-policy/selinux-distcc/selinux-distcc-2.20170204-r3.ebuild
index e99a0ab50f00..6cf879968a47 100644
--- a/sec-policy/selinux-distcc/selinux-distcc-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-distcc/selinux-distcc-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-distcc/selinux-distcc-2.20170204-r4.ebuild b/sec-policy/selinux-distcc/selinux-distcc-2.20170204-r4.ebuild
index e99a0ab50f00..6cf879968a47 100644
--- a/sec-policy/selinux-distcc/selinux-distcc-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-distcc/selinux-distcc-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-distcc/selinux-distcc-2.20170805-r2.ebuild b/sec-policy/selinux-distcc/selinux-distcc-2.20170805-r2.ebuild
index e99a0ab50f00..6cf879968a47 100644
--- a/sec-policy/selinux-distcc/selinux-distcc-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-distcc/selinux-distcc-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-distcc/selinux-distcc-2.20170805-r3.ebuild b/sec-policy/selinux-distcc/selinux-distcc-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..3c4706bd83ad
--- /dev/null
+++ b/sec-policy/selinux-distcc/selinux-distcc-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-distcc/selinux-distcc-9999.ebuild b/sec-policy/selinux-distcc/selinux-distcc-9999.ebuild
index 014ad2237ee8..3c4706bd83ad 100644
--- a/sec-policy/selinux-distcc/selinux-distcc-9999.ebuild
+++ b/sec-policy/selinux-distcc/selinux-distcc-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-djbdns/Manifest b/sec-policy/selinux-djbdns/Manifest
index 782a20a43390..a8ee99cc8b26 100644
--- a/sec-policy/selinux-djbdns/Manifest
+++ b/sec-policy/selinux-djbdns/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-djbdns-2.20170204-r1.ebuild 447 SHA256 d6d1fd4621ffee82fc61fd4e8e6bb8ea6f21df5e08736b3dfdf8832b0699d6ce SHA512 03377908e70e94cddc3d4144ee46f0729309c1404d96035b5c96b5e4e539855d20486717640f8f4b41d6a1add895d5012ec95273b7be0cd1a5dd197901fe6ef3 WHIRLPOOL 269f36a73b44e6bff9058a815df161feef4f27739e6f162ca235af1adbc054caa8301af7d591f1a1f5be9745264ba2fd3ad8a8cde99efe729fd8dad008c8bd71
-EBUILD selinux-djbdns-2.20170204-r2.ebuild 445 SHA256 3bfff4dcde98023da0d64d77ce732037372e9961de34c840f53b2a9ea1725b95 SHA512 d0b3e2f59c0b5564493807578e10d226bfc20b9868319fef0eb3401660f2c435a557375ddaf5a0282abeaecdfbdf3c7de1ef15df95e3fd85b78131bde88dd302 WHIRLPOOL 4ebb9935d82dad8799f719b4ba29be6a837902edd646212b9a6cfa6937157e55b5dc8f73e5ddea54259e18d3f114a547eae41713c6b5708c09023f4bd08ee8a2
-EBUILD selinux-djbdns-2.20170204-r3.ebuild 445 SHA256 3bfff4dcde98023da0d64d77ce732037372e9961de34c840f53b2a9ea1725b95 SHA512 d0b3e2f59c0b5564493807578e10d226bfc20b9868319fef0eb3401660f2c435a557375ddaf5a0282abeaecdfbdf3c7de1ef15df95e3fd85b78131bde88dd302 WHIRLPOOL 4ebb9935d82dad8799f719b4ba29be6a837902edd646212b9a6cfa6937157e55b5dc8f73e5ddea54259e18d3f114a547eae41713c6b5708c09023f4bd08ee8a2
-EBUILD selinux-djbdns-2.20170204-r4.ebuild 445 SHA256 3bfff4dcde98023da0d64d77ce732037372e9961de34c840f53b2a9ea1725b95 SHA512 d0b3e2f59c0b5564493807578e10d226bfc20b9868319fef0eb3401660f2c435a557375ddaf5a0282abeaecdfbdf3c7de1ef15df95e3fd85b78131bde88dd302 WHIRLPOOL 4ebb9935d82dad8799f719b4ba29be6a837902edd646212b9a6cfa6937157e55b5dc8f73e5ddea54259e18d3f114a547eae41713c6b5708c09023f4bd08ee8a2
-EBUILD selinux-djbdns-2.20170805-r2.ebuild 445 SHA256 3bfff4dcde98023da0d64d77ce732037372e9961de34c840f53b2a9ea1725b95 SHA512 d0b3e2f59c0b5564493807578e10d226bfc20b9868319fef0eb3401660f2c435a557375ddaf5a0282abeaecdfbdf3c7de1ef15df95e3fd85b78131bde88dd302 WHIRLPOOL 4ebb9935d82dad8799f719b4ba29be6a837902edd646212b9a6cfa6937157e55b5dc8f73e5ddea54259e18d3f114a547eae41713c6b5708c09023f4bd08ee8a2
-EBUILD selinux-djbdns-9999.ebuild 447 SHA256 d6d1fd4621ffee82fc61fd4e8e6bb8ea6f21df5e08736b3dfdf8832b0699d6ce SHA512 03377908e70e94cddc3d4144ee46f0729309c1404d96035b5c96b5e4e539855d20486717640f8f4b41d6a1add895d5012ec95273b7be0cd1a5dd197901fe6ef3 WHIRLPOOL 269f36a73b44e6bff9058a815df161feef4f27739e6f162ca235af1adbc054caa8301af7d591f1a1f5be9745264ba2fd3ad8a8cde99efe729fd8dad008c8bd71
+EBUILD selinux-djbdns-2.20170204-r1.ebuild 448 SHA256 456a43331fcf2e9108055e3b37cb2bdf1ee3f6113d54deec2a69b637278c341d SHA512 765262cd6c4e0d260aa609166b23dee4103ac456355fd95498b209e01d1186cf189c472a0b6fdc1f20e9777830d8588419c3d424cf0a14bfe6b32f12825a222d WHIRLPOOL 0d740f665058a76cc5d69e95f3b57c6666a765ff79bf18e573b7158e5ab986e558d281429af86ab1e8227bf1467a3e0486a73e84942e6a26d14f9521b488dcf2
+EBUILD selinux-djbdns-2.20170204-r2.ebuild 446 SHA256 9e6f457873e12f07d66294d5f1dc5e3b3f72366792d638f2e9e19b1bd211508d SHA512 f2a351d846917e15918a79df6f30d5ca9bf037401bd4cc385d0e1fb41fd8ad8996169fd23dc439cc301812d82b026b76411861640ca76d49888d976df1e0b87c WHIRLPOOL 281fd23129756ae0001da5ef6b528c3b0dd3cebd25c73095f4eb86f961aa51851baac9ac7f35a206051720d8792fab0e220c4c566e26b0d6fb5686a011fbfec9
+EBUILD selinux-djbdns-2.20170204-r3.ebuild 446 SHA256 9e6f457873e12f07d66294d5f1dc5e3b3f72366792d638f2e9e19b1bd211508d SHA512 f2a351d846917e15918a79df6f30d5ca9bf037401bd4cc385d0e1fb41fd8ad8996169fd23dc439cc301812d82b026b76411861640ca76d49888d976df1e0b87c WHIRLPOOL 281fd23129756ae0001da5ef6b528c3b0dd3cebd25c73095f4eb86f961aa51851baac9ac7f35a206051720d8792fab0e220c4c566e26b0d6fb5686a011fbfec9
+EBUILD selinux-djbdns-2.20170204-r4.ebuild 446 SHA256 9e6f457873e12f07d66294d5f1dc5e3b3f72366792d638f2e9e19b1bd211508d SHA512 f2a351d846917e15918a79df6f30d5ca9bf037401bd4cc385d0e1fb41fd8ad8996169fd23dc439cc301812d82b026b76411861640ca76d49888d976df1e0b87c WHIRLPOOL 281fd23129756ae0001da5ef6b528c3b0dd3cebd25c73095f4eb86f961aa51851baac9ac7f35a206051720d8792fab0e220c4c566e26b0d6fb5686a011fbfec9
+EBUILD selinux-djbdns-2.20170805-r2.ebuild 446 SHA256 9e6f457873e12f07d66294d5f1dc5e3b3f72366792d638f2e9e19b1bd211508d SHA512 f2a351d846917e15918a79df6f30d5ca9bf037401bd4cc385d0e1fb41fd8ad8996169fd23dc439cc301812d82b026b76411861640ca76d49888d976df1e0b87c WHIRLPOOL 281fd23129756ae0001da5ef6b528c3b0dd3cebd25c73095f4eb86f961aa51851baac9ac7f35a206051720d8792fab0e220c4c566e26b0d6fb5686a011fbfec9
+EBUILD selinux-djbdns-2.20170805-r3.ebuild 448 SHA256 456a43331fcf2e9108055e3b37cb2bdf1ee3f6113d54deec2a69b637278c341d SHA512 765262cd6c4e0d260aa609166b23dee4103ac456355fd95498b209e01d1186cf189c472a0b6fdc1f20e9777830d8588419c3d424cf0a14bfe6b32f12825a222d WHIRLPOOL 0d740f665058a76cc5d69e95f3b57c6666a765ff79bf18e573b7158e5ab986e558d281429af86ab1e8227bf1467a3e0486a73e84942e6a26d14f9521b488dcf2
+EBUILD selinux-djbdns-9999.ebuild 448 SHA256 456a43331fcf2e9108055e3b37cb2bdf1ee3f6113d54deec2a69b637278c341d SHA512 765262cd6c4e0d260aa609166b23dee4103ac456355fd95498b209e01d1186cf189c472a0b6fdc1f20e9777830d8588419c3d424cf0a14bfe6b32f12825a222d WHIRLPOOL 0d740f665058a76cc5d69e95f3b57c6666a765ff79bf18e573b7158e5ab986e558d281429af86ab1e8227bf1467a3e0486a73e84942e6a26d14f9521b488dcf2
 MISC ChangeLog 10571 SHA256 d759aa9de3f33c067ab60a5645fb8b6a893dc841df676a9d3b765a08a040bc9b SHA512 e7bf371052649ea01458bbe000a7dc180cd9710cc154d7004d15f00e0780e708e312b670a17e854d496e1818ab371275373e1be9765a88961b10580c9bd72b78 WHIRLPOOL 39db89fd9fc03599f709b48e487eca129e782b87d4d1a76dce1f91a51d3ee9d8cb54dc1093feec9a08372de35b59e947814d2ced53f16e4a7747ab6eb360417e
 MISC ChangeLog-2015 13566 SHA256 8748b41fe408ea4dd4270cace9342fa9c8ff0eaead669a2e40c1946b0d8d3709 SHA512 8614582a5ea1a5126d3117b0bd4578947990023e1e56a8756520c01649b031e1924a9a921cfab68f7cc7228c118538866475f06d6cad30419dd271de44be415b WHIRLPOOL 4875f1393c9baeb6a41ed6caa1d116f5cb2e1758b537d49854e82414797ade090684f2e733904e0ea2fe5af1d1d7674bf5fdb87648c285936ee90dfaa673ea7e
 MISC metadata.xml 316 SHA256 591f3da65fdc5e5a734e7e27bbdb824eb21f5e30eaa24b21ebd528346380196a SHA512 7431b1e50c034acffe00d3aabdf88c497390908543c1e4b13ae47532d5b9519bd8c5a4b3062c8df790c218a5880a06ca425f8cb1b114f62cad5038b54f8e2587 WHIRLPOOL 2e8c228fdb7cde05e29fe1d333ab31fe645f98b74473949f4b810e601dc035dce1293750ba7e46f98ce9b4ab2eb0f4a0008bef9040f59a6478df3f01cc96e55b
diff --git a/sec-policy/selinux-djbdns/selinux-djbdns-2.20170204-r1.ebuild b/sec-policy/selinux-djbdns/selinux-djbdns-2.20170204-r1.ebuild
index 7a51aeb9cd60..8d7216ec1da2 100644
--- a/sec-policy/selinux-djbdns/selinux-djbdns-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-djbdns/selinux-djbdns-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-djbdns/selinux-djbdns-2.20170204-r2.ebuild b/sec-policy/selinux-djbdns/selinux-djbdns-2.20170204-r2.ebuild
index 3f1b80499bed..6af0fe9551b2 100644
--- a/sec-policy/selinux-djbdns/selinux-djbdns-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-djbdns/selinux-djbdns-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-djbdns/selinux-djbdns-2.20170204-r3.ebuild b/sec-policy/selinux-djbdns/selinux-djbdns-2.20170204-r3.ebuild
index 3f1b80499bed..6af0fe9551b2 100644
--- a/sec-policy/selinux-djbdns/selinux-djbdns-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-djbdns/selinux-djbdns-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-djbdns/selinux-djbdns-2.20170204-r4.ebuild b/sec-policy/selinux-djbdns/selinux-djbdns-2.20170204-r4.ebuild
index 3f1b80499bed..6af0fe9551b2 100644
--- a/sec-policy/selinux-djbdns/selinux-djbdns-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-djbdns/selinux-djbdns-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-djbdns/selinux-djbdns-2.20170805-r2.ebuild b/sec-policy/selinux-djbdns/selinux-djbdns-2.20170805-r2.ebuild
index 3f1b80499bed..6af0fe9551b2 100644
--- a/sec-policy/selinux-djbdns/selinux-djbdns-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-djbdns/selinux-djbdns-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-djbdns/selinux-djbdns-2.20170805-r3.ebuild b/sec-policy/selinux-djbdns/selinux-djbdns-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..8d7216ec1da2
--- /dev/null
+++ b/sec-policy/selinux-djbdns/selinux-djbdns-2.20170805-r3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-djbdns/selinux-djbdns-9999.ebuild b/sec-policy/selinux-djbdns/selinux-djbdns-9999.ebuild
index 7a51aeb9cd60..8d7216ec1da2 100644
--- a/sec-policy/selinux-djbdns/selinux-djbdns-9999.ebuild
+++ b/sec-policy/selinux-djbdns/selinux-djbdns-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dkim/Manifest b/sec-policy/selinux-dkim/Manifest
index b25862635778..4bef59a42339 100644
--- a/sec-policy/selinux-dkim/Manifest
+++ b/sec-policy/selinux-dkim/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-dkim-2.20170204-r1.ebuild 376 SHA256 5063bfa33b02bf38a9f11ec5c9904d7655b6d2f9dbf8f4cfb391a85e0583f1c8 SHA512 66c4d8af91028faaf6a0e142b7db622fc28159dbc2e6c1de06c003d13c7e8628b15f0f9e48a40a1c6a91a73415d50b7397f860d716d311ee7c083ee85b0cf59c WHIRLPOOL 0af465ef0ea96479bc6afdb67f436eeed1f242c786ae27f765a832cfd1d33f49e6169ff70cf4665d095b5e7f816894692126cf2b8841de40cf3828f789433b1c
-EBUILD selinux-dkim-2.20170204-r2.ebuild 374 SHA256 3a8ff599aa62e1f0568e6208d0c2d8214a85331aa5895833f748d04fab65d111 SHA512 f037940b796eaebc9a0a69cbd940083232c7c5ec1caa1ab375a901143c4b3ad9369ff16935b6d8877f8ff5f8b0a4aae0c462deb2b339100fa89b465f9cd25630 WHIRLPOOL f721463fbcc1a87763b7542d4492ece63c00c20d0397c1395d52c9147dfd423cd5e2991808a8e628046c3aa04b5eebbe390e2de0d2ad0ec813c8008a1782f8d0
-EBUILD selinux-dkim-2.20170204-r3.ebuild 374 SHA256 3a8ff599aa62e1f0568e6208d0c2d8214a85331aa5895833f748d04fab65d111 SHA512 f037940b796eaebc9a0a69cbd940083232c7c5ec1caa1ab375a901143c4b3ad9369ff16935b6d8877f8ff5f8b0a4aae0c462deb2b339100fa89b465f9cd25630 WHIRLPOOL f721463fbcc1a87763b7542d4492ece63c00c20d0397c1395d52c9147dfd423cd5e2991808a8e628046c3aa04b5eebbe390e2de0d2ad0ec813c8008a1782f8d0
-EBUILD selinux-dkim-2.20170204-r4.ebuild 374 SHA256 3a8ff599aa62e1f0568e6208d0c2d8214a85331aa5895833f748d04fab65d111 SHA512 f037940b796eaebc9a0a69cbd940083232c7c5ec1caa1ab375a901143c4b3ad9369ff16935b6d8877f8ff5f8b0a4aae0c462deb2b339100fa89b465f9cd25630 WHIRLPOOL f721463fbcc1a87763b7542d4492ece63c00c20d0397c1395d52c9147dfd423cd5e2991808a8e628046c3aa04b5eebbe390e2de0d2ad0ec813c8008a1782f8d0
-EBUILD selinux-dkim-2.20170805-r2.ebuild 374 SHA256 3a8ff599aa62e1f0568e6208d0c2d8214a85331aa5895833f748d04fab65d111 SHA512 f037940b796eaebc9a0a69cbd940083232c7c5ec1caa1ab375a901143c4b3ad9369ff16935b6d8877f8ff5f8b0a4aae0c462deb2b339100fa89b465f9cd25630 WHIRLPOOL f721463fbcc1a87763b7542d4492ece63c00c20d0397c1395d52c9147dfd423cd5e2991808a8e628046c3aa04b5eebbe390e2de0d2ad0ec813c8008a1782f8d0
-EBUILD selinux-dkim-9999.ebuild 376 SHA256 5063bfa33b02bf38a9f11ec5c9904d7655b6d2f9dbf8f4cfb391a85e0583f1c8 SHA512 66c4d8af91028faaf6a0e142b7db622fc28159dbc2e6c1de06c003d13c7e8628b15f0f9e48a40a1c6a91a73415d50b7397f860d716d311ee7c083ee85b0cf59c WHIRLPOOL 0af465ef0ea96479bc6afdb67f436eeed1f242c786ae27f765a832cfd1d33f49e6169ff70cf4665d095b5e7f816894692126cf2b8841de40cf3828f789433b1c
+EBUILD selinux-dkim-2.20170204-r1.ebuild 377 SHA256 6af3917f0d2ffa6bd71cec70ce4744f96b7e17b47752794192897f71c849dfbd SHA512 20338b7f29629d8d25d1eb5590057263f6ecc7cb2bf953e3c3b5ba2632919e8068825f8a7e837ad482453292b7bd8a58d2e95b95e0c72b2cf2991ba0faef7820 WHIRLPOOL fd74bde164713eda4c6392dbea8c4a3413ec3241ea8734acb88302e237b201ac60b4242fbc838f44be756590cd2613ba66f28249cc238893e6e6a637616118f1
+EBUILD selinux-dkim-2.20170204-r2.ebuild 375 SHA256 e2da167581f8d51e8a3f3274997bebc7e0ba02a20f13106ac27ae99b61664afd SHA512 0af0c48a6418fb9f5b30189516ccabadd61e3abf673f4d82d3b72d15b1b981b4faa0a88425e7430c57e6a9e54c6da24dea6b9118522bedfba63d301376553b56 WHIRLPOOL eddc4f977d2af6d7685d43a2ba54e5a4968c306d75fecf3144068bccebe05ab2aa91925d1f7ed21e157bfeac07a6b3e62861759a810b496af7d833071c37d892
+EBUILD selinux-dkim-2.20170204-r3.ebuild 375 SHA256 e2da167581f8d51e8a3f3274997bebc7e0ba02a20f13106ac27ae99b61664afd SHA512 0af0c48a6418fb9f5b30189516ccabadd61e3abf673f4d82d3b72d15b1b981b4faa0a88425e7430c57e6a9e54c6da24dea6b9118522bedfba63d301376553b56 WHIRLPOOL eddc4f977d2af6d7685d43a2ba54e5a4968c306d75fecf3144068bccebe05ab2aa91925d1f7ed21e157bfeac07a6b3e62861759a810b496af7d833071c37d892
+EBUILD selinux-dkim-2.20170204-r4.ebuild 375 SHA256 e2da167581f8d51e8a3f3274997bebc7e0ba02a20f13106ac27ae99b61664afd SHA512 0af0c48a6418fb9f5b30189516ccabadd61e3abf673f4d82d3b72d15b1b981b4faa0a88425e7430c57e6a9e54c6da24dea6b9118522bedfba63d301376553b56 WHIRLPOOL eddc4f977d2af6d7685d43a2ba54e5a4968c306d75fecf3144068bccebe05ab2aa91925d1f7ed21e157bfeac07a6b3e62861759a810b496af7d833071c37d892
+EBUILD selinux-dkim-2.20170805-r2.ebuild 375 SHA256 e2da167581f8d51e8a3f3274997bebc7e0ba02a20f13106ac27ae99b61664afd SHA512 0af0c48a6418fb9f5b30189516ccabadd61e3abf673f4d82d3b72d15b1b981b4faa0a88425e7430c57e6a9e54c6da24dea6b9118522bedfba63d301376553b56 WHIRLPOOL eddc4f977d2af6d7685d43a2ba54e5a4968c306d75fecf3144068bccebe05ab2aa91925d1f7ed21e157bfeac07a6b3e62861759a810b496af7d833071c37d892
+EBUILD selinux-dkim-2.20170805-r3.ebuild 377 SHA256 6af3917f0d2ffa6bd71cec70ce4744f96b7e17b47752794192897f71c849dfbd SHA512 20338b7f29629d8d25d1eb5590057263f6ecc7cb2bf953e3c3b5ba2632919e8068825f8a7e837ad482453292b7bd8a58d2e95b95e0c72b2cf2991ba0faef7820 WHIRLPOOL fd74bde164713eda4c6392dbea8c4a3413ec3241ea8734acb88302e237b201ac60b4242fbc838f44be756590cd2613ba66f28249cc238893e6e6a637616118f1
+EBUILD selinux-dkim-9999.ebuild 377 SHA256 6af3917f0d2ffa6bd71cec70ce4744f96b7e17b47752794192897f71c849dfbd SHA512 20338b7f29629d8d25d1eb5590057263f6ecc7cb2bf953e3c3b5ba2632919e8068825f8a7e837ad482453292b7bd8a58d2e95b95e0c72b2cf2991ba0faef7820 WHIRLPOOL fd74bde164713eda4c6392dbea8c4a3413ec3241ea8734acb88302e237b201ac60b4242fbc838f44be756590cd2613ba66f28249cc238893e6e6a637616118f1
 MISC ChangeLog 10387 SHA256 0503b031b47f32d349ec6dab2a824bd95e2f8c9cf3f6b6dbc55589db9cc62441 SHA512 130add136aff0a1c24fefa808ea13aa955004e6f7680077e0a1fc3101a7518e0e3e4a8e40030e536cb2d393f967642d6052431f54bbffce9ee6e1ea878d79a14 WHIRLPOOL 5ff74f10d631f6f792a8ecf1c4f8f7727da243a844e9f3fe34c6da3e7249378195b373132b4a88cb396f9ebe5f71e7934f3a1c66159dd3688f9cd2419a745e8c
 MISC ChangeLog-2015 9914 SHA256 6c8ba400505a61c84deaa570884ff10d7ef6e166fc2d2acc477f336cef736699 SHA512 16af1cd4d1ea08a7b011bdee21828208f49a20cffe61314793a6cc92d18f4ce3393cbb385720ec9f32a9330b83fd33c228fbdc70ef4a2faf6c14d7e471a140c6 WHIRLPOOL da719b0c6b462f521262e56988656e7812640b856db9161bb4be40f8266f8b4b0737c573bbdf7e010ed9f77507060c07a9483abf0845937d1a70ad0512c433c5
 MISC metadata.xml 314 SHA256 4f97d8c06eabc47c86e5ee9ed9346bf5958b2ee352e09973c04f659262f8f095 SHA512 a38550fb1e03f39702b4f45f068d6726aea262a480a35360e055b2ab98accf4f83395ff3f566babce8a75d3b654eb5b2cc729fcdac5441426494750b6eb59120 WHIRLPOOL 37dbea053045a0868be425bd243f546a5459f2c096348b4d3e85577c8987c33965772fec4507826fc6cf802bf503ae21ac8309b45cb2adec84d68cf0a670d320
diff --git a/sec-policy/selinux-dkim/selinux-dkim-2.20170204-r1.ebuild b/sec-policy/selinux-dkim/selinux-dkim-2.20170204-r1.ebuild
index 18a1f62de063..cd6a5e88374e 100644
--- a/sec-policy/selinux-dkim/selinux-dkim-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-dkim/selinux-dkim-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dkim/selinux-dkim-2.20170204-r2.ebuild b/sec-policy/selinux-dkim/selinux-dkim-2.20170204-r2.ebuild
index 5fe9239999e2..e8bc10bc3959 100644
--- a/sec-policy/selinux-dkim/selinux-dkim-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-dkim/selinux-dkim-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dkim/selinux-dkim-2.20170204-r3.ebuild b/sec-policy/selinux-dkim/selinux-dkim-2.20170204-r3.ebuild
index 5fe9239999e2..e8bc10bc3959 100644
--- a/sec-policy/selinux-dkim/selinux-dkim-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-dkim/selinux-dkim-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dkim/selinux-dkim-2.20170204-r4.ebuild b/sec-policy/selinux-dkim/selinux-dkim-2.20170204-r4.ebuild
index 5fe9239999e2..e8bc10bc3959 100644
--- a/sec-policy/selinux-dkim/selinux-dkim-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-dkim/selinux-dkim-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dkim/selinux-dkim-2.20170805-r2.ebuild b/sec-policy/selinux-dkim/selinux-dkim-2.20170805-r2.ebuild
index 5fe9239999e2..e8bc10bc3959 100644
--- a/sec-policy/selinux-dkim/selinux-dkim-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-dkim/selinux-dkim-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dkim/selinux-dkim-2.20170805-r3.ebuild b/sec-policy/selinux-dkim/selinux-dkim-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..cd6a5e88374e
--- /dev/null
+++ b/sec-policy/selinux-dkim/selinux-dkim-2.20170805-r3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-dkim/selinux-dkim-9999.ebuild b/sec-policy/selinux-dkim/selinux-dkim-9999.ebuild
index 18a1f62de063..cd6a5e88374e 100644
--- a/sec-policy/selinux-dkim/selinux-dkim-9999.ebuild
+++ b/sec-policy/selinux-dkim/selinux-dkim-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dmidecode/Manifest b/sec-policy/selinux-dmidecode/Manifest
index 284fc11fcf64..aca7fc580112 100644
--- a/sec-policy/selinux-dmidecode/Manifest
+++ b/sec-policy/selinux-dmidecode/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-dmidecode-2.20170204-r1.ebuild 289 SHA256 c9885915501cdc6375d5038576041ec19a2ecce3a3f0e8a25314959617ce9c9a SHA512 80207587c80096f1ced2567be70e805dc8dc7e834ca016043b2db61e35b7ade155048456fa0521f27f9d22af652cb3ed379868c25c590177cbb366856b70662b WHIRLPOOL 51ffb54fb64a4724d022ea7a10db5c4e23cf48238ee17f77dc8426399ee68e873713df96e7476bb38a3671d99dc673ae2dc7a79969a74c242dcce631bf444fd6
-EBUILD selinux-dmidecode-2.20170204-r2.ebuild 287 SHA256 5b3e7d00da58608a19f9e4735bfc073fe3a8e5ecb463f7696fda27c3eff4730c SHA512 5f9ec660bce03f4df5f0fb6e444464fd972ca4236143e1a6df2b777cf82cb5352b4ee3f548848a658baa254c981718ee0b5c0be8fdef8a2f85afd2befae40625 WHIRLPOOL 772d162ae5464dd2bded7f5c61061a87192a24d94fb8559edab3e98feee11fef9cd35ff86905a34419d1c9c9ffd1ae03baa2895360c700da98d2ff49befeb434
-EBUILD selinux-dmidecode-2.20170204-r3.ebuild 287 SHA256 5b3e7d00da58608a19f9e4735bfc073fe3a8e5ecb463f7696fda27c3eff4730c SHA512 5f9ec660bce03f4df5f0fb6e444464fd972ca4236143e1a6df2b777cf82cb5352b4ee3f548848a658baa254c981718ee0b5c0be8fdef8a2f85afd2befae40625 WHIRLPOOL 772d162ae5464dd2bded7f5c61061a87192a24d94fb8559edab3e98feee11fef9cd35ff86905a34419d1c9c9ffd1ae03baa2895360c700da98d2ff49befeb434
-EBUILD selinux-dmidecode-2.20170204-r4.ebuild 287 SHA256 5b3e7d00da58608a19f9e4735bfc073fe3a8e5ecb463f7696fda27c3eff4730c SHA512 5f9ec660bce03f4df5f0fb6e444464fd972ca4236143e1a6df2b777cf82cb5352b4ee3f548848a658baa254c981718ee0b5c0be8fdef8a2f85afd2befae40625 WHIRLPOOL 772d162ae5464dd2bded7f5c61061a87192a24d94fb8559edab3e98feee11fef9cd35ff86905a34419d1c9c9ffd1ae03baa2895360c700da98d2ff49befeb434
-EBUILD selinux-dmidecode-2.20170805-r2.ebuild 287 SHA256 5b3e7d00da58608a19f9e4735bfc073fe3a8e5ecb463f7696fda27c3eff4730c SHA512 5f9ec660bce03f4df5f0fb6e444464fd972ca4236143e1a6df2b777cf82cb5352b4ee3f548848a658baa254c981718ee0b5c0be8fdef8a2f85afd2befae40625 WHIRLPOOL 772d162ae5464dd2bded7f5c61061a87192a24d94fb8559edab3e98feee11fef9cd35ff86905a34419d1c9c9ffd1ae03baa2895360c700da98d2ff49befeb434
-EBUILD selinux-dmidecode-9999.ebuild 289 SHA256 c9885915501cdc6375d5038576041ec19a2ecce3a3f0e8a25314959617ce9c9a SHA512 80207587c80096f1ced2567be70e805dc8dc7e834ca016043b2db61e35b7ade155048456fa0521f27f9d22af652cb3ed379868c25c590177cbb366856b70662b WHIRLPOOL 51ffb54fb64a4724d022ea7a10db5c4e23cf48238ee17f77dc8426399ee68e873713df96e7476bb38a3671d99dc673ae2dc7a79969a74c242dcce631bf444fd6
+EBUILD selinux-dmidecode-2.20170204-r1.ebuild 290 SHA256 e256f082603a8d11f2ea154865ffafe2aac4acc67ad3ca7c28b17ba5aa0ab379 SHA512 6d44adcf84c02343a2977547a73140b8c1581e9a9b27ea0db5da827ac93143148e914052f0a9fb202199104f7ec354ccd24d0159fa465c6f495a549b0b33a79d WHIRLPOOL 4b7f936a1058b0b31cc80a29bca8288f92b01a2ca24b7e0dc8342a8ae050105ff9d2c036c238a5e79ef0dd623b58618b12119e90a589ca2326d1eb03281a06e9
+EBUILD selinux-dmidecode-2.20170204-r2.ebuild 288 SHA256 9a3bda1d77b255cc72906a25ac1e68e27dabaec6c95f6886fc5283f5c333f80a SHA512 b1c83dd19a8e304ba1fc552a8c79099d42f9d5159878c7e704a38afae7cf9075b5356a10cb2f51ed08567a86f3cf1e73b241a4e3be4ec646b2b50368a57c5533 WHIRLPOOL 67d2b051f677eb9098edc4fa555b46ecf09f66ed018a45d16d3a37c86e666936e6d7a2e1033d1d7b2def8658d98aeda3405b7db557e9924f123b39609f66fded
+EBUILD selinux-dmidecode-2.20170204-r3.ebuild 288 SHA256 9a3bda1d77b255cc72906a25ac1e68e27dabaec6c95f6886fc5283f5c333f80a SHA512 b1c83dd19a8e304ba1fc552a8c79099d42f9d5159878c7e704a38afae7cf9075b5356a10cb2f51ed08567a86f3cf1e73b241a4e3be4ec646b2b50368a57c5533 WHIRLPOOL 67d2b051f677eb9098edc4fa555b46ecf09f66ed018a45d16d3a37c86e666936e6d7a2e1033d1d7b2def8658d98aeda3405b7db557e9924f123b39609f66fded
+EBUILD selinux-dmidecode-2.20170204-r4.ebuild 288 SHA256 9a3bda1d77b255cc72906a25ac1e68e27dabaec6c95f6886fc5283f5c333f80a SHA512 b1c83dd19a8e304ba1fc552a8c79099d42f9d5159878c7e704a38afae7cf9075b5356a10cb2f51ed08567a86f3cf1e73b241a4e3be4ec646b2b50368a57c5533 WHIRLPOOL 67d2b051f677eb9098edc4fa555b46ecf09f66ed018a45d16d3a37c86e666936e6d7a2e1033d1d7b2def8658d98aeda3405b7db557e9924f123b39609f66fded
+EBUILD selinux-dmidecode-2.20170805-r2.ebuild 288 SHA256 9a3bda1d77b255cc72906a25ac1e68e27dabaec6c95f6886fc5283f5c333f80a SHA512 b1c83dd19a8e304ba1fc552a8c79099d42f9d5159878c7e704a38afae7cf9075b5356a10cb2f51ed08567a86f3cf1e73b241a4e3be4ec646b2b50368a57c5533 WHIRLPOOL 67d2b051f677eb9098edc4fa555b46ecf09f66ed018a45d16d3a37c86e666936e6d7a2e1033d1d7b2def8658d98aeda3405b7db557e9924f123b39609f66fded
+EBUILD selinux-dmidecode-2.20170805-r3.ebuild 290 SHA256 e256f082603a8d11f2ea154865ffafe2aac4acc67ad3ca7c28b17ba5aa0ab379 SHA512 6d44adcf84c02343a2977547a73140b8c1581e9a9b27ea0db5da827ac93143148e914052f0a9fb202199104f7ec354ccd24d0159fa465c6f495a549b0b33a79d WHIRLPOOL 4b7f936a1058b0b31cc80a29bca8288f92b01a2ca24b7e0dc8342a8ae050105ff9d2c036c238a5e79ef0dd623b58618b12119e90a589ca2326d1eb03281a06e9
+EBUILD selinux-dmidecode-9999.ebuild 290 SHA256 e256f082603a8d11f2ea154865ffafe2aac4acc67ad3ca7c28b17ba5aa0ab379 SHA512 6d44adcf84c02343a2977547a73140b8c1581e9a9b27ea0db5da827ac93143148e914052f0a9fb202199104f7ec354ccd24d0159fa465c6f495a549b0b33a79d WHIRLPOOL 4b7f936a1058b0b31cc80a29bca8288f92b01a2ca24b7e0dc8342a8ae050105ff9d2c036c238a5e79ef0dd623b58618b12119e90a589ca2326d1eb03281a06e9
 MISC ChangeLog 10887 SHA256 f79d1206fef09859bd559df6d2cfdae54f99aff50c84d82ec16c6d5f0b080be2 SHA512 b9b5803abc0d8403bbbb14af571a22a129ee84c834ecf0bc1abb53e61b62886cbfe754c427e72781cd8efe58f6b283ccdb86406039880cc806368c63d4120314 WHIRLPOOL 819892c10c2899657efdbec6f21d17a1674a3255c4eb54e74bd2e3f7f838030d4ccd2725dbc27dc24c163454943a349aff37df16ba1ef2edef991db83f81a0fa
 MISC ChangeLog-2015 10221 SHA256 67ccb138196eb18fdaae568bd87a2ebd0385cc7b5f68b7c5384144a4e999da6a SHA512 361ee1dcf4fd9ef9767f6ce2266c5319658a0de1fdfcf28cdbf57dacce2b97c35431962a44257359948da8b56755801b877d2a4600cba543925a15fba1fac278 WHIRLPOOL 97105d9db8476d37157155af91279b1bc3ac49e7ce2985a92b968f516700ff38d9c4aade4ac3a89376717cc582ffda8992cd3780e82a33387053c9a51d84e007
 MISC metadata.xml 319 SHA256 8275a4ea90d9400e1cfb9cd6f8fc3a938ea17a45813c12fac00bfd8223b5b9c4 SHA512 d866eeed95bad62f746cb0576f592abc6f0728661fa06563d55146ccacddcc50e9154d0c7bb0b673acae16ef0f80dd80b70763a810d829920cc6e0483b7830ec WHIRLPOOL 58658c323d6fcc38c5c8361f048b226cf812c1251d7f793eb9c6598ac391529654d998fd1714095be6b51af96cd86d9cb87ee173f60264bdd9e3c1e1b252ac00
diff --git a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20170204-r1.ebuild b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20170204-r1.ebuild
index d28f04aaaeb3..f8577819b41a 100644
--- a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20170204-r2.ebuild b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20170204-r2.ebuild
index c387a31a35b4..bd6f8395e534 100644
--- a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20170204-r3.ebuild b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20170204-r3.ebuild
index c387a31a35b4..bd6f8395e534 100644
--- a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20170204-r4.ebuild b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20170204-r4.ebuild
index c387a31a35b4..bd6f8395e534 100644
--- a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20170805-r2.ebuild b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20170805-r2.ebuild
index c387a31a35b4..bd6f8395e534 100644
--- a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20170805-r3.ebuild b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..f8577819b41a
--- /dev/null
+++ b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-dmidecode/selinux-dmidecode-9999.ebuild b/sec-policy/selinux-dmidecode/selinux-dmidecode-9999.ebuild
index d28f04aaaeb3..f8577819b41a 100644
--- a/sec-policy/selinux-dmidecode/selinux-dmidecode-9999.ebuild
+++ b/sec-policy/selinux-dmidecode/selinux-dmidecode-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dnsmasq/Manifest b/sec-policy/selinux-dnsmasq/Manifest
index ccf690eff67c..8bd117720ef1 100644
--- a/sec-policy/selinux-dnsmasq/Manifest
+++ b/sec-policy/selinux-dnsmasq/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-dnsmasq-2.20170204-r1.ebuild 285 SHA256 f33c1c7ca83d5ae3e088bd0fd172da99417847d10ceb6adce29d63bcd0a684eb SHA512 8a5db9af01a79bbd09f34c31c7a7a3ebac03db751d4802785e39b93fdf7e92c2f369d9a253bbdf9a61c6f700f7709698fa756fc3d057855776ce75ad87341f79 WHIRLPOOL 555087920d2e98588d255b384047c723231166954f17a55b722daadd21d6d2c3939ca9ea6440601b247e2b8ed57fc12a4808455f1c7ffea2f520777ebaa275d1
-EBUILD selinux-dnsmasq-2.20170204-r2.ebuild 283 SHA256 a3257adb463a8a6cf10e70cffe5a53d1cd5646c841df1ea32006aa962a375b0b SHA512 ab3d8c8f97c812f4268749d02acce4a523c685a11fe94815785705a83bf1c87a97317c9c7c22690a3790375f6392957abee775995db25f30d6da8fb44d59cf0d WHIRLPOOL 11e78ea5d708be62a3f973e4af090f015fa76c92722d479b511ea224f8c8486401917395cd8509e42e3c11220ccdd67b4f7d483af54f351026d7586610be7b74
-EBUILD selinux-dnsmasq-2.20170204-r3.ebuild 283 SHA256 a3257adb463a8a6cf10e70cffe5a53d1cd5646c841df1ea32006aa962a375b0b SHA512 ab3d8c8f97c812f4268749d02acce4a523c685a11fe94815785705a83bf1c87a97317c9c7c22690a3790375f6392957abee775995db25f30d6da8fb44d59cf0d WHIRLPOOL 11e78ea5d708be62a3f973e4af090f015fa76c92722d479b511ea224f8c8486401917395cd8509e42e3c11220ccdd67b4f7d483af54f351026d7586610be7b74
-EBUILD selinux-dnsmasq-2.20170204-r4.ebuild 283 SHA256 a3257adb463a8a6cf10e70cffe5a53d1cd5646c841df1ea32006aa962a375b0b SHA512 ab3d8c8f97c812f4268749d02acce4a523c685a11fe94815785705a83bf1c87a97317c9c7c22690a3790375f6392957abee775995db25f30d6da8fb44d59cf0d WHIRLPOOL 11e78ea5d708be62a3f973e4af090f015fa76c92722d479b511ea224f8c8486401917395cd8509e42e3c11220ccdd67b4f7d483af54f351026d7586610be7b74
-EBUILD selinux-dnsmasq-2.20170805-r2.ebuild 283 SHA256 a3257adb463a8a6cf10e70cffe5a53d1cd5646c841df1ea32006aa962a375b0b SHA512 ab3d8c8f97c812f4268749d02acce4a523c685a11fe94815785705a83bf1c87a97317c9c7c22690a3790375f6392957abee775995db25f30d6da8fb44d59cf0d WHIRLPOOL 11e78ea5d708be62a3f973e4af090f015fa76c92722d479b511ea224f8c8486401917395cd8509e42e3c11220ccdd67b4f7d483af54f351026d7586610be7b74
-EBUILD selinux-dnsmasq-9999.ebuild 285 SHA256 f33c1c7ca83d5ae3e088bd0fd172da99417847d10ceb6adce29d63bcd0a684eb SHA512 8a5db9af01a79bbd09f34c31c7a7a3ebac03db751d4802785e39b93fdf7e92c2f369d9a253bbdf9a61c6f700f7709698fa756fc3d057855776ce75ad87341f79 WHIRLPOOL 555087920d2e98588d255b384047c723231166954f17a55b722daadd21d6d2c3939ca9ea6440601b247e2b8ed57fc12a4808455f1c7ffea2f520777ebaa275d1
+EBUILD selinux-dnsmasq-2.20170204-r1.ebuild 286 SHA256 a5c40af1a172369076c0602c53a625946eb5befde650d7075c5bbce50a90629d SHA512 bbecf4664cc6925f7803003df8cf9525e66e351b2f8c16053db6bc6ae2223187b0d35faac1d7e42500ca3f2df407ed7ba65cbda33413a3e6de134eb8f1ec3b26 WHIRLPOOL cec582b0cdf15458fa5804e79ef3931caf3577781aa008cfed088e3f700538f5ad6d86c4772d06d7a8d101dc6df2f42c0c9ed64780ecd428cd7081c95c123c95
+EBUILD selinux-dnsmasq-2.20170204-r2.ebuild 284 SHA256 859eeec23697d5f9fbb8c21e167df50ff0362fe2f178d3d11f22dcb7cb6655c5 SHA512 05701aa342642590702d9a2a489237b1f167750be3706ebdb5f2b2c1b34330d76075e545285eac73b65385bc680f36b8dd76a3616dd47929240323e4c085de24 WHIRLPOOL cc47dec0ddf534ae6d974a20299712d3f49a873f1d3c32d3142edde05d193cfeda6acb07577daff26e69b9920c6afc93f6d2982483ccc70e18ae58a34a45141e
+EBUILD selinux-dnsmasq-2.20170204-r3.ebuild 284 SHA256 859eeec23697d5f9fbb8c21e167df50ff0362fe2f178d3d11f22dcb7cb6655c5 SHA512 05701aa342642590702d9a2a489237b1f167750be3706ebdb5f2b2c1b34330d76075e545285eac73b65385bc680f36b8dd76a3616dd47929240323e4c085de24 WHIRLPOOL cc47dec0ddf534ae6d974a20299712d3f49a873f1d3c32d3142edde05d193cfeda6acb07577daff26e69b9920c6afc93f6d2982483ccc70e18ae58a34a45141e
+EBUILD selinux-dnsmasq-2.20170204-r4.ebuild 284 SHA256 859eeec23697d5f9fbb8c21e167df50ff0362fe2f178d3d11f22dcb7cb6655c5 SHA512 05701aa342642590702d9a2a489237b1f167750be3706ebdb5f2b2c1b34330d76075e545285eac73b65385bc680f36b8dd76a3616dd47929240323e4c085de24 WHIRLPOOL cc47dec0ddf534ae6d974a20299712d3f49a873f1d3c32d3142edde05d193cfeda6acb07577daff26e69b9920c6afc93f6d2982483ccc70e18ae58a34a45141e
+EBUILD selinux-dnsmasq-2.20170805-r2.ebuild 284 SHA256 859eeec23697d5f9fbb8c21e167df50ff0362fe2f178d3d11f22dcb7cb6655c5 SHA512 05701aa342642590702d9a2a489237b1f167750be3706ebdb5f2b2c1b34330d76075e545285eac73b65385bc680f36b8dd76a3616dd47929240323e4c085de24 WHIRLPOOL cc47dec0ddf534ae6d974a20299712d3f49a873f1d3c32d3142edde05d193cfeda6acb07577daff26e69b9920c6afc93f6d2982483ccc70e18ae58a34a45141e
+EBUILD selinux-dnsmasq-2.20170805-r3.ebuild 286 SHA256 a5c40af1a172369076c0602c53a625946eb5befde650d7075c5bbce50a90629d SHA512 bbecf4664cc6925f7803003df8cf9525e66e351b2f8c16053db6bc6ae2223187b0d35faac1d7e42500ca3f2df407ed7ba65cbda33413a3e6de134eb8f1ec3b26 WHIRLPOOL cec582b0cdf15458fa5804e79ef3931caf3577781aa008cfed088e3f700538f5ad6d86c4772d06d7a8d101dc6df2f42c0c9ed64780ecd428cd7081c95c123c95
+EBUILD selinux-dnsmasq-9999.ebuild 286 SHA256 a5c40af1a172369076c0602c53a625946eb5befde650d7075c5bbce50a90629d SHA512 bbecf4664cc6925f7803003df8cf9525e66e351b2f8c16053db6bc6ae2223187b0d35faac1d7e42500ca3f2df407ed7ba65cbda33413a3e6de134eb8f1ec3b26 WHIRLPOOL cec582b0cdf15458fa5804e79ef3931caf3577781aa008cfed088e3f700538f5ad6d86c4772d06d7a8d101dc6df2f42c0c9ed64780ecd428cd7081c95c123c95
 MISC ChangeLog 10687 SHA256 1b20aa40949f7a316e3b8b42510fb566809f89bffe91291365d1b161c10f320f SHA512 d006c17e36b1ee1aae1ed90a4cd45087776a3a0905ac3df1a9356eb80c9ccaa1f309a5a874ad65f07a370324a6b397057e477a3f5ed58d727f9a214f2b5b814a WHIRLPOOL b5da0148b67518727153e1943788aea86337b13ffb3ea4f498f7fbc1bbb8b8b86aa527a663c33987c75fb5685928c4289acabbdc4580a080498804ea02858143
 MISC ChangeLog-2015 11509 SHA256 bd82bc0c956658e2970d76ffd03697c835c307d913c1d52f8ee00721c729e6f8 SHA512 3044b597163324a7a6fc80a9d2ff4ce6893ca52aa6ad4ed17676394d1c8a7a8e358965028c0471666d8c0e6e38fc5da618c6d1a11584f2bcfffb23dbbf098578 WHIRLPOOL 1f516e31969a48435be599fa04f81048cab4a4aae20dbda6088d9968efebde6b3f401eab1b2f6c4d96b7d02cf56ec39cc0e4458b88265f8ce97294b22c559d57
 MISC metadata.xml 317 SHA256 391638ed8a0c88899b06c535c85aaf03a3f2cc08789f45135eeacf610b89760d SHA512 badb018cf0e4f48bf7394d4c8b882cae63fbd47755668c58159f23f2ae6b5ff18d15f17790eb6721f2585cdb307e37f3430c9616641581dab70ef3b866157464 WHIRLPOOL a5f6c8042007aeb3053496d9301596533e7a3d55d0854c9e6c8c70c337c6fe51993c8070a0c41eda5849e9006dbc82d8b6449d129d68bf85e691fd0148d5020d
diff --git a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20170204-r1.ebuild b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20170204-r1.ebuild
index 0f923c3cd441..898a5615d884 100644
--- a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20170204-r2.ebuild b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20170204-r2.ebuild
index f56a5f789c1c..3b6d5fbe2cf5 100644
--- a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20170204-r3.ebuild b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20170204-r3.ebuild
index f56a5f789c1c..3b6d5fbe2cf5 100644
--- a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20170204-r4.ebuild b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20170204-r4.ebuild
index f56a5f789c1c..3b6d5fbe2cf5 100644
--- a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20170805-r2.ebuild b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20170805-r2.ebuild
index f56a5f789c1c..3b6d5fbe2cf5 100644
--- a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20170805-r3.ebuild b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..898a5615d884
--- /dev/null
+++ b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-dnsmasq/selinux-dnsmasq-9999.ebuild b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-9999.ebuild
index 0f923c3cd441..898a5615d884 100644
--- a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-9999.ebuild
+++ b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dovecot/Manifest b/sec-policy/selinux-dovecot/Manifest
index 62b96b810128..65301184037d 100644
--- a/sec-policy/selinux-dovecot/Manifest
+++ b/sec-policy/selinux-dovecot/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-dovecot-2.20170204-r1.ebuild 285 SHA256 f156241252ca0a62991d8c57af0554d1d30c66b791feed324a50d5c972dbc30c SHA512 a9ea65d9102494d309aba62713da50e174ac0f7f7088f66c1910e28d000f34e231f6afc6699c252a0c412f3b8420c9de94a51c1ae415fd91fc57c28ac5863601 WHIRLPOOL 659a92ea88733ad16958ae6c2dbb0016f5ee3dfe31c4cfa7e402142ae58dc126514842b6c973f83048e9d69772716313e778a722eb09afbe045c3b822d422767
-EBUILD selinux-dovecot-2.20170204-r2.ebuild 283 SHA256 fbe8e24c8fc5095026d5cac72101fb3013647ab4312284f7b5e89ff45cc9f8c6 SHA512 e05b3f7d85c7dfd7ed11af5e05cc9179ffd8951220838ca8a7143945a5cbc72c91b8443c867de005dedb281dbb06cf46a56f8c61448be23165052b0c0a8627fe WHIRLPOOL 8be6296c38154789cf9d107734cf356dbd234aa5d3f8498d9bb79f2e55c812cb70c27e2224b7431516a20f6d595e02fe2a5486908bb1b5530e2faffdc5478cb5
-EBUILD selinux-dovecot-2.20170204-r3.ebuild 283 SHA256 fbe8e24c8fc5095026d5cac72101fb3013647ab4312284f7b5e89ff45cc9f8c6 SHA512 e05b3f7d85c7dfd7ed11af5e05cc9179ffd8951220838ca8a7143945a5cbc72c91b8443c867de005dedb281dbb06cf46a56f8c61448be23165052b0c0a8627fe WHIRLPOOL 8be6296c38154789cf9d107734cf356dbd234aa5d3f8498d9bb79f2e55c812cb70c27e2224b7431516a20f6d595e02fe2a5486908bb1b5530e2faffdc5478cb5
-EBUILD selinux-dovecot-2.20170204-r4.ebuild 283 SHA256 fbe8e24c8fc5095026d5cac72101fb3013647ab4312284f7b5e89ff45cc9f8c6 SHA512 e05b3f7d85c7dfd7ed11af5e05cc9179ffd8951220838ca8a7143945a5cbc72c91b8443c867de005dedb281dbb06cf46a56f8c61448be23165052b0c0a8627fe WHIRLPOOL 8be6296c38154789cf9d107734cf356dbd234aa5d3f8498d9bb79f2e55c812cb70c27e2224b7431516a20f6d595e02fe2a5486908bb1b5530e2faffdc5478cb5
-EBUILD selinux-dovecot-2.20170805-r2.ebuild 283 SHA256 fbe8e24c8fc5095026d5cac72101fb3013647ab4312284f7b5e89ff45cc9f8c6 SHA512 e05b3f7d85c7dfd7ed11af5e05cc9179ffd8951220838ca8a7143945a5cbc72c91b8443c867de005dedb281dbb06cf46a56f8c61448be23165052b0c0a8627fe WHIRLPOOL 8be6296c38154789cf9d107734cf356dbd234aa5d3f8498d9bb79f2e55c812cb70c27e2224b7431516a20f6d595e02fe2a5486908bb1b5530e2faffdc5478cb5
-EBUILD selinux-dovecot-9999.ebuild 285 SHA256 f156241252ca0a62991d8c57af0554d1d30c66b791feed324a50d5c972dbc30c SHA512 a9ea65d9102494d309aba62713da50e174ac0f7f7088f66c1910e28d000f34e231f6afc6699c252a0c412f3b8420c9de94a51c1ae415fd91fc57c28ac5863601 WHIRLPOOL 659a92ea88733ad16958ae6c2dbb0016f5ee3dfe31c4cfa7e402142ae58dc126514842b6c973f83048e9d69772716313e778a722eb09afbe045c3b822d422767
+EBUILD selinux-dovecot-2.20170204-r1.ebuild 286 SHA256 deb45d35ec1dd4e63da09f90f56d218587df871fc6d30d19fdafea6d6d9b7c96 SHA512 3e885e9fc01b6b601079754e67f4589a16eecf840f02280ca998b44b2a5d0f96f463fe4c3df59c78fc707a349384afb1f138be79e0874456b0d0604154a5ffec WHIRLPOOL b600abea2b931e8b41658b88156c9020d072fe24d055d8c11be8002eed0f4ed62264f24d3861e7eea517b533cba6c33dd62300d7955f2e450d1afdb8b631cce1
+EBUILD selinux-dovecot-2.20170204-r2.ebuild 284 SHA256 63eb603050f9055cf167a19dd0799d9bffb9563de19d1a457a4b61deba691dee SHA512 c885dfcafeb86cfe3ead3dd11f04d9f4d4552a260af53f34568ebd6a9f065a64122c3b5fd4cb7812401dfda37f992a735bd5db1e196f8387822694cff90dc464 WHIRLPOOL 59ac77b2bbc437e38344217f0a88e266a880b5e44fb3f31bb8d341300c3c553fc59f13eae081987b23ca38de6a9d0e1ae4b09736335d7263ee11f82a264d5b00
+EBUILD selinux-dovecot-2.20170204-r3.ebuild 284 SHA256 63eb603050f9055cf167a19dd0799d9bffb9563de19d1a457a4b61deba691dee SHA512 c885dfcafeb86cfe3ead3dd11f04d9f4d4552a260af53f34568ebd6a9f065a64122c3b5fd4cb7812401dfda37f992a735bd5db1e196f8387822694cff90dc464 WHIRLPOOL 59ac77b2bbc437e38344217f0a88e266a880b5e44fb3f31bb8d341300c3c553fc59f13eae081987b23ca38de6a9d0e1ae4b09736335d7263ee11f82a264d5b00
+EBUILD selinux-dovecot-2.20170204-r4.ebuild 284 SHA256 63eb603050f9055cf167a19dd0799d9bffb9563de19d1a457a4b61deba691dee SHA512 c885dfcafeb86cfe3ead3dd11f04d9f4d4552a260af53f34568ebd6a9f065a64122c3b5fd4cb7812401dfda37f992a735bd5db1e196f8387822694cff90dc464 WHIRLPOOL 59ac77b2bbc437e38344217f0a88e266a880b5e44fb3f31bb8d341300c3c553fc59f13eae081987b23ca38de6a9d0e1ae4b09736335d7263ee11f82a264d5b00
+EBUILD selinux-dovecot-2.20170805-r2.ebuild 284 SHA256 63eb603050f9055cf167a19dd0799d9bffb9563de19d1a457a4b61deba691dee SHA512 c885dfcafeb86cfe3ead3dd11f04d9f4d4552a260af53f34568ebd6a9f065a64122c3b5fd4cb7812401dfda37f992a735bd5db1e196f8387822694cff90dc464 WHIRLPOOL 59ac77b2bbc437e38344217f0a88e266a880b5e44fb3f31bb8d341300c3c553fc59f13eae081987b23ca38de6a9d0e1ae4b09736335d7263ee11f82a264d5b00
+EBUILD selinux-dovecot-2.20170805-r3.ebuild 286 SHA256 deb45d35ec1dd4e63da09f90f56d218587df871fc6d30d19fdafea6d6d9b7c96 SHA512 3e885e9fc01b6b601079754e67f4589a16eecf840f02280ca998b44b2a5d0f96f463fe4c3df59c78fc707a349384afb1f138be79e0874456b0d0604154a5ffec WHIRLPOOL b600abea2b931e8b41658b88156c9020d072fe24d055d8c11be8002eed0f4ed62264f24d3861e7eea517b533cba6c33dd62300d7955f2e450d1afdb8b631cce1
+EBUILD selinux-dovecot-9999.ebuild 286 SHA256 deb45d35ec1dd4e63da09f90f56d218587df871fc6d30d19fdafea6d6d9b7c96 SHA512 3e885e9fc01b6b601079754e67f4589a16eecf840f02280ca998b44b2a5d0f96f463fe4c3df59c78fc707a349384afb1f138be79e0874456b0d0604154a5ffec WHIRLPOOL b600abea2b931e8b41658b88156c9020d072fe24d055d8c11be8002eed0f4ed62264f24d3861e7eea517b533cba6c33dd62300d7955f2e450d1afdb8b631cce1
 MISC ChangeLog 10687 SHA256 742f4a0698835a132e144c1be13efd57a6627336ae3be0a3de5562e0289fac62 SHA512 f2c38102ef1032fd82146ddb417fbc0efba84141276dd889f915b8cbc7ac19da88661dc641b2ff670208e2879e10c1c50a8280fda13b11123f9766a947a63165 WHIRLPOOL 08675e0a88dad9d740acd9ae8b11ea29762bf6ab184e6b647da366d09f63fbbc652d6ee107f13154721410075750f7df7f2ca7d42d1911e8b78be6519a5e196e
 MISC ChangeLog-2015 9977 SHA256 8bc020a8d3cb8ea23531a3db0aad21121145dfdde2f06df3419d55df19880f94 SHA512 60c4402e4344878d9a234e84ac9a9e1507be5db5960b40edfea9cd25f6c06ab3d4dd8360e3af71824e3cb337b1d91e964ce8402b574c40b7805e4fa77a05db55 WHIRLPOOL ed5265e747aa09778a8a1ee804220f87ae602edb23d32701acff5a61c093f94f1fb23e0383b4bf4c9abeb5868054dd1c587d0f1f51d3afa05dba78d17958e424
 MISC metadata.xml 317 SHA256 92fec298e8336f97593f30b4f216b99ce71c07bca2ec9a4aac3ec414ad1e11e3 SHA512 c48caae167d778fc011c650d92060756d568ec1b57957f7b581d93acd0ceed15f2da615c9cdc4571765935e9f62b073211e90c79cc19727aee2b0fcc13a23510 WHIRLPOOL efd36f93392c52232dcb255c124a703b07bef67f947323c6678434c8878e65b6f8d8dd9d6e545ed660c5929eebc8ecbdc05362248e35bc535dbe00f5c14c5f10
diff --git a/sec-policy/selinux-dovecot/selinux-dovecot-2.20170204-r1.ebuild b/sec-policy/selinux-dovecot/selinux-dovecot-2.20170204-r1.ebuild
index eae9f07ea288..0d2ff0050289 100644
--- a/sec-policy/selinux-dovecot/selinux-dovecot-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-dovecot/selinux-dovecot-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dovecot/selinux-dovecot-2.20170204-r2.ebuild b/sec-policy/selinux-dovecot/selinux-dovecot-2.20170204-r2.ebuild
index 14fb9b1deebe..27872911b461 100644
--- a/sec-policy/selinux-dovecot/selinux-dovecot-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-dovecot/selinux-dovecot-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dovecot/selinux-dovecot-2.20170204-r3.ebuild b/sec-policy/selinux-dovecot/selinux-dovecot-2.20170204-r3.ebuild
index 14fb9b1deebe..27872911b461 100644
--- a/sec-policy/selinux-dovecot/selinux-dovecot-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-dovecot/selinux-dovecot-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dovecot/selinux-dovecot-2.20170204-r4.ebuild b/sec-policy/selinux-dovecot/selinux-dovecot-2.20170204-r4.ebuild
index 14fb9b1deebe..27872911b461 100644
--- a/sec-policy/selinux-dovecot/selinux-dovecot-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-dovecot/selinux-dovecot-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dovecot/selinux-dovecot-2.20170805-r2.ebuild b/sec-policy/selinux-dovecot/selinux-dovecot-2.20170805-r2.ebuild
index 14fb9b1deebe..27872911b461 100644
--- a/sec-policy/selinux-dovecot/selinux-dovecot-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-dovecot/selinux-dovecot-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dovecot/selinux-dovecot-2.20170805-r3.ebuild b/sec-policy/selinux-dovecot/selinux-dovecot-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..0d2ff0050289
--- /dev/null
+++ b/sec-policy/selinux-dovecot/selinux-dovecot-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-dovecot/selinux-dovecot-9999.ebuild b/sec-policy/selinux-dovecot/selinux-dovecot-9999.ebuild
index eae9f07ea288..0d2ff0050289 100644
--- a/sec-policy/selinux-dovecot/selinux-dovecot-9999.ebuild
+++ b/sec-policy/selinux-dovecot/selinux-dovecot-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dpkg/Manifest b/sec-policy/selinux-dpkg/Manifest
index 7a09ec170a0a..b3c6014dec44 100644
--- a/sec-policy/selinux-dpkg/Manifest
+++ b/sec-policy/selinux-dpkg/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-dpkg-2.20170204-r1.ebuild 279 SHA256 76cbadff54f32e0641a5127bbb9226607c658cc4a686bb7fa574323385f1268f SHA512 f01dba9bc53260578fbf688b3e201591b17bd58f7be1ab4fc33a74795be3a2687e40784d813ddaf76766fcc1123ec970c7b5d4704d5ae7b64822ae7cd989ef8e WHIRLPOOL b68c24ff7402612c5392926a23a79c9f83e789303b11e8065ca3bd469612c9d1aaadcc387649e7eefa636b2f125fab80f131dda7df871921a48b9596a220a1e0
-EBUILD selinux-dpkg-2.20170204-r2.ebuild 277 SHA256 5c9670a54509a98893012d49465394a38d1fa837c7420ba2295f0d8b69e7d23f SHA512 7f117dc1ffc00744d1809922d22dd45cb29da0dc041227749a42ce5ace65bac5e9ef7963057ec16bc540d47a30bc0df0f6f43d98f60a29fae56a23f68ae488c4 WHIRLPOOL 0040fa60e1ac6c94eb93e0a64f2ce68893cefc0a4dfb021c4b1154e01c71b0046d4789b37b7b79f695e47d3ab68a7491eb5a5c2c6a1e1d33a29f4cd8b4f27d93
-EBUILD selinux-dpkg-2.20170204-r3.ebuild 277 SHA256 5c9670a54509a98893012d49465394a38d1fa837c7420ba2295f0d8b69e7d23f SHA512 7f117dc1ffc00744d1809922d22dd45cb29da0dc041227749a42ce5ace65bac5e9ef7963057ec16bc540d47a30bc0df0f6f43d98f60a29fae56a23f68ae488c4 WHIRLPOOL 0040fa60e1ac6c94eb93e0a64f2ce68893cefc0a4dfb021c4b1154e01c71b0046d4789b37b7b79f695e47d3ab68a7491eb5a5c2c6a1e1d33a29f4cd8b4f27d93
-EBUILD selinux-dpkg-2.20170204-r4.ebuild 277 SHA256 5c9670a54509a98893012d49465394a38d1fa837c7420ba2295f0d8b69e7d23f SHA512 7f117dc1ffc00744d1809922d22dd45cb29da0dc041227749a42ce5ace65bac5e9ef7963057ec16bc540d47a30bc0df0f6f43d98f60a29fae56a23f68ae488c4 WHIRLPOOL 0040fa60e1ac6c94eb93e0a64f2ce68893cefc0a4dfb021c4b1154e01c71b0046d4789b37b7b79f695e47d3ab68a7491eb5a5c2c6a1e1d33a29f4cd8b4f27d93
-EBUILD selinux-dpkg-2.20170805-r2.ebuild 277 SHA256 5c9670a54509a98893012d49465394a38d1fa837c7420ba2295f0d8b69e7d23f SHA512 7f117dc1ffc00744d1809922d22dd45cb29da0dc041227749a42ce5ace65bac5e9ef7963057ec16bc540d47a30bc0df0f6f43d98f60a29fae56a23f68ae488c4 WHIRLPOOL 0040fa60e1ac6c94eb93e0a64f2ce68893cefc0a4dfb021c4b1154e01c71b0046d4789b37b7b79f695e47d3ab68a7491eb5a5c2c6a1e1d33a29f4cd8b4f27d93
-EBUILD selinux-dpkg-9999.ebuild 279 SHA256 76cbadff54f32e0641a5127bbb9226607c658cc4a686bb7fa574323385f1268f SHA512 f01dba9bc53260578fbf688b3e201591b17bd58f7be1ab4fc33a74795be3a2687e40784d813ddaf76766fcc1123ec970c7b5d4704d5ae7b64822ae7cd989ef8e WHIRLPOOL b68c24ff7402612c5392926a23a79c9f83e789303b11e8065ca3bd469612c9d1aaadcc387649e7eefa636b2f125fab80f131dda7df871921a48b9596a220a1e0
+EBUILD selinux-dpkg-2.20170204-r1.ebuild 280 SHA256 cc45c98ac69c867fa1bffb99b762e823056113b8b4aab23fba4ea1006e955366 SHA512 b8964968ac607b07a1f5ec861bb3ea3037a7c2df27e15207bb3c843e0b7ab8d345c63bccbe3ad68bfd8db13613a282a3b07e7fa3746c751a2ed8e68a0f4bf5d0 WHIRLPOOL 36384a80e150563b449cac93d6a79cee95fb91ca1e7d66a812706fe3dfd5f4e19edc51891a1fcf1ed02c6478a5bc61f9c3b8d15e4c2514f625fd8335a2f74e6e
+EBUILD selinux-dpkg-2.20170204-r2.ebuild 278 SHA256 f0cdaf2a8b6d415008a20f920580bfe06d137dbf717b3d6b5b6a5231b1aeb813 SHA512 155b8d1eb1b3c5152c46d1468f61527662111379815a56e2d87b49ada1ace28cf6d3431adb9743740f3d16a226ad5b1f54e75cfe557c3db28be20a4f0e876890 WHIRLPOOL 96c816f453204c46a11771592f617042df39e50f9923040a4a2a130ae4a698b1c8ec0ba226d66f8e45b9baf5788c5bd43701fdd7a9fb4e934728ecdfafab79e3
+EBUILD selinux-dpkg-2.20170204-r3.ebuild 278 SHA256 f0cdaf2a8b6d415008a20f920580bfe06d137dbf717b3d6b5b6a5231b1aeb813 SHA512 155b8d1eb1b3c5152c46d1468f61527662111379815a56e2d87b49ada1ace28cf6d3431adb9743740f3d16a226ad5b1f54e75cfe557c3db28be20a4f0e876890 WHIRLPOOL 96c816f453204c46a11771592f617042df39e50f9923040a4a2a130ae4a698b1c8ec0ba226d66f8e45b9baf5788c5bd43701fdd7a9fb4e934728ecdfafab79e3
+EBUILD selinux-dpkg-2.20170204-r4.ebuild 278 SHA256 f0cdaf2a8b6d415008a20f920580bfe06d137dbf717b3d6b5b6a5231b1aeb813 SHA512 155b8d1eb1b3c5152c46d1468f61527662111379815a56e2d87b49ada1ace28cf6d3431adb9743740f3d16a226ad5b1f54e75cfe557c3db28be20a4f0e876890 WHIRLPOOL 96c816f453204c46a11771592f617042df39e50f9923040a4a2a130ae4a698b1c8ec0ba226d66f8e45b9baf5788c5bd43701fdd7a9fb4e934728ecdfafab79e3
+EBUILD selinux-dpkg-2.20170805-r2.ebuild 278 SHA256 f0cdaf2a8b6d415008a20f920580bfe06d137dbf717b3d6b5b6a5231b1aeb813 SHA512 155b8d1eb1b3c5152c46d1468f61527662111379815a56e2d87b49ada1ace28cf6d3431adb9743740f3d16a226ad5b1f54e75cfe557c3db28be20a4f0e876890 WHIRLPOOL 96c816f453204c46a11771592f617042df39e50f9923040a4a2a130ae4a698b1c8ec0ba226d66f8e45b9baf5788c5bd43701fdd7a9fb4e934728ecdfafab79e3
+EBUILD selinux-dpkg-2.20170805-r3.ebuild 280 SHA256 cc45c98ac69c867fa1bffb99b762e823056113b8b4aab23fba4ea1006e955366 SHA512 b8964968ac607b07a1f5ec861bb3ea3037a7c2df27e15207bb3c843e0b7ab8d345c63bccbe3ad68bfd8db13613a282a3b07e7fa3746c751a2ed8e68a0f4bf5d0 WHIRLPOOL 36384a80e150563b449cac93d6a79cee95fb91ca1e7d66a812706fe3dfd5f4e19edc51891a1fcf1ed02c6478a5bc61f9c3b8d15e4c2514f625fd8335a2f74e6e
+EBUILD selinux-dpkg-9999.ebuild 280 SHA256 cc45c98ac69c867fa1bffb99b762e823056113b8b4aab23fba4ea1006e955366 SHA512 b8964968ac607b07a1f5ec861bb3ea3037a7c2df27e15207bb3c843e0b7ab8d345c63bccbe3ad68bfd8db13613a282a3b07e7fa3746c751a2ed8e68a0f4bf5d0 WHIRLPOOL 36384a80e150563b449cac93d6a79cee95fb91ca1e7d66a812706fe3dfd5f4e19edc51891a1fcf1ed02c6478a5bc61f9c3b8d15e4c2514f625fd8335a2f74e6e
 MISC ChangeLog 10387 SHA256 8941ec2856e5de8ec3007e0e6bd0279b0b1ad62f7a8ca37c191b36c61f364e8d SHA512 ce183ddd760376229aabde1016f89acb35f0fb68760271088a5e8080da04b1d550cca190b834d47d81b911e704971004353b76bbb0d3c0762cd1813d7c2f7018 WHIRLPOOL 039aceb904a8cc9f789d39e7d7d6b4a73802aac3554b467b86791358fa9d88b168577fca957d5782ab754c334b5f5488b30f64f5328a9cfcbc92223d1efc9404
 MISC ChangeLog-2015 9376 SHA256 a5c5e84039767db0c5e0dd5347b43870dd445f34eaa0779eaf87739d656edff2 SHA512 f698ad97c871740b9513e3d70b8a72e4d34a5593bc075002672f514db373d95df7316975a53e8293baa4c34f042e1e42735cbbe374b0b8be6ced6419309cf181 WHIRLPOOL fd3af6370fc18dbeae4e2651a4103bb9f2cffdcf8166fc4086c5c38603d88c2f1b9533da14e7749c034e067902736e3c4e77f069c00383f8565617bd4f2418ec
 MISC metadata.xml 314 SHA256 6a41a9132aba35ef7e1320237675e42005f5670dff0b086c5ae279a56a0cc43b SHA512 4dc73eaa9a7604687d8a74bac77bd1f595a1e5f10916589fcee39af23db6afec167d30a3f7851eebcc1c942684ce71651fbbbe98d2dae98d8a2d892b314896b3 WHIRLPOOL e22655ae74fab500a905774fab88823b80a0adaa67d8a971f137b7ee9064e72603fadf1dd6e000053d225f416409234b826fae5ed17c36874c9af7d141427243
diff --git a/sec-policy/selinux-dpkg/selinux-dpkg-2.20170204-r1.ebuild b/sec-policy/selinux-dpkg/selinux-dpkg-2.20170204-r1.ebuild
index 55b197c9fa10..0c6a27f0f0c6 100644
--- a/sec-policy/selinux-dpkg/selinux-dpkg-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-dpkg/selinux-dpkg-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dpkg/selinux-dpkg-2.20170204-r2.ebuild b/sec-policy/selinux-dpkg/selinux-dpkg-2.20170204-r2.ebuild
index 20580c5b704c..aec4a7de2677 100644
--- a/sec-policy/selinux-dpkg/selinux-dpkg-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-dpkg/selinux-dpkg-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dpkg/selinux-dpkg-2.20170204-r3.ebuild b/sec-policy/selinux-dpkg/selinux-dpkg-2.20170204-r3.ebuild
index 20580c5b704c..aec4a7de2677 100644
--- a/sec-policy/selinux-dpkg/selinux-dpkg-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-dpkg/selinux-dpkg-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dpkg/selinux-dpkg-2.20170204-r4.ebuild b/sec-policy/selinux-dpkg/selinux-dpkg-2.20170204-r4.ebuild
index 20580c5b704c..aec4a7de2677 100644
--- a/sec-policy/selinux-dpkg/selinux-dpkg-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-dpkg/selinux-dpkg-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dpkg/selinux-dpkg-2.20170805-r2.ebuild b/sec-policy/selinux-dpkg/selinux-dpkg-2.20170805-r2.ebuild
index 20580c5b704c..aec4a7de2677 100644
--- a/sec-policy/selinux-dpkg/selinux-dpkg-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-dpkg/selinux-dpkg-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dpkg/selinux-dpkg-2.20170805-r3.ebuild b/sec-policy/selinux-dpkg/selinux-dpkg-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..0c6a27f0f0c6
--- /dev/null
+++ b/sec-policy/selinux-dpkg/selinux-dpkg-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-dpkg/selinux-dpkg-9999.ebuild b/sec-policy/selinux-dpkg/selinux-dpkg-9999.ebuild
index 55b197c9fa10..0c6a27f0f0c6 100644
--- a/sec-policy/selinux-dpkg/selinux-dpkg-9999.ebuild
+++ b/sec-policy/selinux-dpkg/selinux-dpkg-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dracut/Manifest b/sec-policy/selinux-dracut/Manifest
index 8f89b4f8d5c1..a544868f326c 100644
--- a/sec-policy/selinux-dracut/Manifest
+++ b/sec-policy/selinux-dracut/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-dracut-2.20170204-r1.ebuild 283 SHA256 157ffd48851c542ad5f4f294714c32a3855230b95bf76c7b133dd974236508fa SHA512 97578e503d47b7761e43507ff58d37293d24d4a8c74ab06274bede75cb3a8940f9324b8c97c5558eccfd83e0558b3b37e95d0d8ca6478eeebaad1874c1785c54 WHIRLPOOL 786236c567cfef9ff2d2a95fce7d09ed1a04b0ba99e4ccc09fba67c0c600121fce17fc46293a51b8eccccf9ad08cce7ee20a3c40e37fd29e1cea62d1d3abae02
-EBUILD selinux-dracut-2.20170204-r2.ebuild 281 SHA256 9bf095e61c781166cdd75dfede4cad3cf2994c2c3ef3eea8dfd17cf24300fb09 SHA512 9733ad4f03cef19c9b6371559b09c215e281f561b5d7ae7b251490ffd49102c9bf1c8049b9cac2220fb8acc48b2a338c25a6692ab3685b9b755864053652e0ef WHIRLPOOL 0d50d37171d9e6df8019dbc289532b1e6d71a8014a1e304a64b40a2427bafc5fed77658171ea2f650d88b1ff76e506a05075265a90609277da15e4e6b2c0fd0e
-EBUILD selinux-dracut-2.20170204-r3.ebuild 281 SHA256 9bf095e61c781166cdd75dfede4cad3cf2994c2c3ef3eea8dfd17cf24300fb09 SHA512 9733ad4f03cef19c9b6371559b09c215e281f561b5d7ae7b251490ffd49102c9bf1c8049b9cac2220fb8acc48b2a338c25a6692ab3685b9b755864053652e0ef WHIRLPOOL 0d50d37171d9e6df8019dbc289532b1e6d71a8014a1e304a64b40a2427bafc5fed77658171ea2f650d88b1ff76e506a05075265a90609277da15e4e6b2c0fd0e
-EBUILD selinux-dracut-2.20170204-r4.ebuild 281 SHA256 9bf095e61c781166cdd75dfede4cad3cf2994c2c3ef3eea8dfd17cf24300fb09 SHA512 9733ad4f03cef19c9b6371559b09c215e281f561b5d7ae7b251490ffd49102c9bf1c8049b9cac2220fb8acc48b2a338c25a6692ab3685b9b755864053652e0ef WHIRLPOOL 0d50d37171d9e6df8019dbc289532b1e6d71a8014a1e304a64b40a2427bafc5fed77658171ea2f650d88b1ff76e506a05075265a90609277da15e4e6b2c0fd0e
-EBUILD selinux-dracut-2.20170805-r2.ebuild 281 SHA256 9bf095e61c781166cdd75dfede4cad3cf2994c2c3ef3eea8dfd17cf24300fb09 SHA512 9733ad4f03cef19c9b6371559b09c215e281f561b5d7ae7b251490ffd49102c9bf1c8049b9cac2220fb8acc48b2a338c25a6692ab3685b9b755864053652e0ef WHIRLPOOL 0d50d37171d9e6df8019dbc289532b1e6d71a8014a1e304a64b40a2427bafc5fed77658171ea2f650d88b1ff76e506a05075265a90609277da15e4e6b2c0fd0e
-EBUILD selinux-dracut-9999.ebuild 283 SHA256 157ffd48851c542ad5f4f294714c32a3855230b95bf76c7b133dd974236508fa SHA512 97578e503d47b7761e43507ff58d37293d24d4a8c74ab06274bede75cb3a8940f9324b8c97c5558eccfd83e0558b3b37e95d0d8ca6478eeebaad1874c1785c54 WHIRLPOOL 786236c567cfef9ff2d2a95fce7d09ed1a04b0ba99e4ccc09fba67c0c600121fce17fc46293a51b8eccccf9ad08cce7ee20a3c40e37fd29e1cea62d1d3abae02
+EBUILD selinux-dracut-2.20170204-r1.ebuild 284 SHA256 59ac565d30954a55c346d43fead658eebb2aafdf51940b2662512a26266c0b7b SHA512 d8b035f9060f8515b57d7d617b475977ec585a5b6ead185d885fea6f7912bef07cbce8616946f984d7128604f28e6f8636e940ee00ef49f1baf48b116eeb5666 WHIRLPOOL f5c9f1657bc534ae60d0b880b65a0ad461e138310e996b9c14f77ace0488a510ddbaea135dcb0fb2ec1fce21db43e5a34bc7e6385b068f25351b3037253d8123
+EBUILD selinux-dracut-2.20170204-r2.ebuild 282 SHA256 6965e36463414d2633c622590353dcc86fd8d5caf0ae0c1364dfd085c302b652 SHA512 cf681974b73e6f750a5b7918314a644e8ac421894a0ef804c379fbb90d2fbd7f54744267d54102ea476ca081e80d78da527919ce0ebbb75659fd094c14b9a6d5 WHIRLPOOL 5a4796450edf6b2e148a7d63749748644abe8a28dd99317d91b6b4ec38ea1687cbfa51f8360bb4d15e8fd0f58b20a9f3e36f515da383f064b75b3e1f6bb2f48d
+EBUILD selinux-dracut-2.20170204-r3.ebuild 282 SHA256 6965e36463414d2633c622590353dcc86fd8d5caf0ae0c1364dfd085c302b652 SHA512 cf681974b73e6f750a5b7918314a644e8ac421894a0ef804c379fbb90d2fbd7f54744267d54102ea476ca081e80d78da527919ce0ebbb75659fd094c14b9a6d5 WHIRLPOOL 5a4796450edf6b2e148a7d63749748644abe8a28dd99317d91b6b4ec38ea1687cbfa51f8360bb4d15e8fd0f58b20a9f3e36f515da383f064b75b3e1f6bb2f48d
+EBUILD selinux-dracut-2.20170204-r4.ebuild 282 SHA256 6965e36463414d2633c622590353dcc86fd8d5caf0ae0c1364dfd085c302b652 SHA512 cf681974b73e6f750a5b7918314a644e8ac421894a0ef804c379fbb90d2fbd7f54744267d54102ea476ca081e80d78da527919ce0ebbb75659fd094c14b9a6d5 WHIRLPOOL 5a4796450edf6b2e148a7d63749748644abe8a28dd99317d91b6b4ec38ea1687cbfa51f8360bb4d15e8fd0f58b20a9f3e36f515da383f064b75b3e1f6bb2f48d
+EBUILD selinux-dracut-2.20170805-r2.ebuild 282 SHA256 6965e36463414d2633c622590353dcc86fd8d5caf0ae0c1364dfd085c302b652 SHA512 cf681974b73e6f750a5b7918314a644e8ac421894a0ef804c379fbb90d2fbd7f54744267d54102ea476ca081e80d78da527919ce0ebbb75659fd094c14b9a6d5 WHIRLPOOL 5a4796450edf6b2e148a7d63749748644abe8a28dd99317d91b6b4ec38ea1687cbfa51f8360bb4d15e8fd0f58b20a9f3e36f515da383f064b75b3e1f6bb2f48d
+EBUILD selinux-dracut-2.20170805-r3.ebuild 284 SHA256 59ac565d30954a55c346d43fead658eebb2aafdf51940b2662512a26266c0b7b SHA512 d8b035f9060f8515b57d7d617b475977ec585a5b6ead185d885fea6f7912bef07cbce8616946f984d7128604f28e6f8636e940ee00ef49f1baf48b116eeb5666 WHIRLPOOL f5c9f1657bc534ae60d0b880b65a0ad461e138310e996b9c14f77ace0488a510ddbaea135dcb0fb2ec1fce21db43e5a34bc7e6385b068f25351b3037253d8123
+EBUILD selinux-dracut-9999.ebuild 284 SHA256 59ac565d30954a55c346d43fead658eebb2aafdf51940b2662512a26266c0b7b SHA512 d8b035f9060f8515b57d7d617b475977ec585a5b6ead185d885fea6f7912bef07cbce8616946f984d7128604f28e6f8636e940ee00ef49f1baf48b116eeb5666 WHIRLPOOL f5c9f1657bc534ae60d0b880b65a0ad461e138310e996b9c14f77ace0488a510ddbaea135dcb0fb2ec1fce21db43e5a34bc7e6385b068f25351b3037253d8123
 MISC ChangeLog 10571 SHA256 c00530d48c105d94d156a06a6e13a32119849aafde8a67bf167cedafb4a06265 SHA512 4f8330eaf4a39876b4ad675bad83f64d83d117ee4d36d445556e3969cee1f9e4626dcb1f0fad35496cd1c86cd6b6a2a1156cf1ba9697d28303ad06d87a4534a7 WHIRLPOOL eccbf76ab9c0ebf484a32a37c160e75c6ee0b6844ce65bd5318728c874ec9627dce3466a7d112a30bb2ab6b75428d01f05fc6dbb9a1e5b3b3c3911febe0d231a
 MISC ChangeLog-2015 9536 SHA256 124e76056586e7c841e103d911a24e82299b110a95480daf5d21e914116514c5 SHA512 da4cd3fbb627ad0f8b956095641716406231b54817dd2c537da456e13a9100223ff3d35031956991127ea745c9b34c5ae6a57fe70e4063e6bfb1dd71f918e1f6 WHIRLPOOL 804617de1cf3323a35be1226ebcaed0a11f2836b417eb5bdbf94a85562af03c28c3da9749112fbc037b836cded560c6955e16a65203a138e75aa1aedf4ca74d1
 MISC metadata.xml 316 SHA256 6ec409911057a09302e8661f7b8fbc85cde4ef119fb1a62ee00180b905708734 SHA512 ba6cf5bed2367c69a18d097224989ea7c5208b718f670d040634afad0a017f15ff370bfe7012bc71880b2e234fbb85a0831976c77bc4ed46328607724dd0bfe3 WHIRLPOOL 529941ea983c7f808ef6c993e664b650e63d65e525b239cc584544f3310490b3b6993c6585d898b4976f7645af879f45330a2f0949f126f4c53c0555f793f96a
diff --git a/sec-policy/selinux-dracut/selinux-dracut-2.20170204-r1.ebuild b/sec-policy/selinux-dracut/selinux-dracut-2.20170204-r1.ebuild
index 412e35021821..75c012e1a920 100644
--- a/sec-policy/selinux-dracut/selinux-dracut-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-dracut/selinux-dracut-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dracut/selinux-dracut-2.20170204-r2.ebuild b/sec-policy/selinux-dracut/selinux-dracut-2.20170204-r2.ebuild
index a67133244373..cf5ba1764a89 100644
--- a/sec-policy/selinux-dracut/selinux-dracut-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-dracut/selinux-dracut-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dracut/selinux-dracut-2.20170204-r3.ebuild b/sec-policy/selinux-dracut/selinux-dracut-2.20170204-r3.ebuild
index a67133244373..cf5ba1764a89 100644
--- a/sec-policy/selinux-dracut/selinux-dracut-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-dracut/selinux-dracut-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dracut/selinux-dracut-2.20170204-r4.ebuild b/sec-policy/selinux-dracut/selinux-dracut-2.20170204-r4.ebuild
index a67133244373..cf5ba1764a89 100644
--- a/sec-policy/selinux-dracut/selinux-dracut-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-dracut/selinux-dracut-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dracut/selinux-dracut-2.20170805-r2.ebuild b/sec-policy/selinux-dracut/selinux-dracut-2.20170805-r2.ebuild
index a67133244373..cf5ba1764a89 100644
--- a/sec-policy/selinux-dracut/selinux-dracut-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-dracut/selinux-dracut-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dracut/selinux-dracut-2.20170805-r3.ebuild b/sec-policy/selinux-dracut/selinux-dracut-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..75c012e1a920
--- /dev/null
+++ b/sec-policy/selinux-dracut/selinux-dracut-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-dracut/selinux-dracut-9999.ebuild b/sec-policy/selinux-dracut/selinux-dracut-9999.ebuild
index 412e35021821..75c012e1a920 100644
--- a/sec-policy/selinux-dracut/selinux-dracut-9999.ebuild
+++ b/sec-policy/selinux-dracut/selinux-dracut-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dropbox/Manifest b/sec-policy/selinux-dropbox/Manifest
index b1bda019d815..55a01a4ce4e1 100644
--- a/sec-policy/selinux-dropbox/Manifest
+++ b/sec-policy/selinux-dropbox/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-dropbox-2.20170204-r1.ebuild 433 SHA256 ccd1c5f69e0b73e706c919d69158883fe1d2805001e8661db951d4c269ce9be4 SHA512 ffbe663abad1031db0ad90cd52b6cc23844ededaeeaa2358263f9646e77297e5c34c7c1ef077be4d5d79d3dbc3cb3ff3d55778f1e901a07263b2bf2403115e4d WHIRLPOOL ce663d1ecc4989ff1e8f31dbb9aa2e3941180c7fc88fc136c1bb69743dfff2b35ccd33d7e87f85285a66a150253f78f04d6cfd131718a5fdb4013c717e1f68f3
-EBUILD selinux-dropbox-2.20170204-r2.ebuild 431 SHA256 4676dacaabf3848849c00b8ea17c929b39d154e6cf066a24d667658317f5f8de SHA512 53fb3b961ca60e234e1516620f449dacb1cd18088bb4bd134912ff23363c980d0b710037e32414c24dbdb6471688435c83dfc3c409a5f8bf5ae9f797bad7a84c WHIRLPOOL 4f2709143448c0c5fd32555809a4d83bc6805615053fa2c259651dc9bc8aa39efeb3121914575248cbf68f3add85af643c22d2c004ab7b04e3e116d595dbc9dd
-EBUILD selinux-dropbox-2.20170204-r3.ebuild 431 SHA256 4676dacaabf3848849c00b8ea17c929b39d154e6cf066a24d667658317f5f8de SHA512 53fb3b961ca60e234e1516620f449dacb1cd18088bb4bd134912ff23363c980d0b710037e32414c24dbdb6471688435c83dfc3c409a5f8bf5ae9f797bad7a84c WHIRLPOOL 4f2709143448c0c5fd32555809a4d83bc6805615053fa2c259651dc9bc8aa39efeb3121914575248cbf68f3add85af643c22d2c004ab7b04e3e116d595dbc9dd
-EBUILD selinux-dropbox-2.20170204-r4.ebuild 431 SHA256 4676dacaabf3848849c00b8ea17c929b39d154e6cf066a24d667658317f5f8de SHA512 53fb3b961ca60e234e1516620f449dacb1cd18088bb4bd134912ff23363c980d0b710037e32414c24dbdb6471688435c83dfc3c409a5f8bf5ae9f797bad7a84c WHIRLPOOL 4f2709143448c0c5fd32555809a4d83bc6805615053fa2c259651dc9bc8aa39efeb3121914575248cbf68f3add85af643c22d2c004ab7b04e3e116d595dbc9dd
-EBUILD selinux-dropbox-2.20170805-r2.ebuild 431 SHA256 4676dacaabf3848849c00b8ea17c929b39d154e6cf066a24d667658317f5f8de SHA512 53fb3b961ca60e234e1516620f449dacb1cd18088bb4bd134912ff23363c980d0b710037e32414c24dbdb6471688435c83dfc3c409a5f8bf5ae9f797bad7a84c WHIRLPOOL 4f2709143448c0c5fd32555809a4d83bc6805615053fa2c259651dc9bc8aa39efeb3121914575248cbf68f3add85af643c22d2c004ab7b04e3e116d595dbc9dd
-EBUILD selinux-dropbox-9999.ebuild 433 SHA256 ccd1c5f69e0b73e706c919d69158883fe1d2805001e8661db951d4c269ce9be4 SHA512 ffbe663abad1031db0ad90cd52b6cc23844ededaeeaa2358263f9646e77297e5c34c7c1ef077be4d5d79d3dbc3cb3ff3d55778f1e901a07263b2bf2403115e4d WHIRLPOOL ce663d1ecc4989ff1e8f31dbb9aa2e3941180c7fc88fc136c1bb69743dfff2b35ccd33d7e87f85285a66a150253f78f04d6cfd131718a5fdb4013c717e1f68f3
+EBUILD selinux-dropbox-2.20170204-r1.ebuild 434 SHA256 89c7ccfcbaaf2f90a62689d360cfb6072620742fa2b9ce7985ed6bbd74c8834d SHA512 ad5ebcf263461e126a58582f187faa3c0a18a56ae2d0ef0d481db0915c4af88cca50deee77831449dcbad9f9ef001c27fe61e1b5561537e6a3ae41019f33ce2c WHIRLPOOL 9c22c68767acbfb7f187762cbf1d1d42974b78001105fa72ff6ec7aaa3f9837249b2c9d7ad6d6d83db2d9ecc85aed6dd6358947af94cdf6475b308fa298ac764
+EBUILD selinux-dropbox-2.20170204-r2.ebuild 432 SHA256 4e79694e2d5548c41c7119ba298cf0136b7cdad983bdb38698fc15c52f4cbf3e SHA512 4a403280a7ebeb38601d394fd9ea5955e7d39b1ed0dc9eb0517bece8a93274f2791162e36d610adc7bf4322b263ac35aa75420fb18a6420d7bf5da339f2bedb8 WHIRLPOOL 42fdc5cbbea000eb5089c1ea6c324406994b510cdfe5d51731ab4361047e9038bc5d6b378aac83f00ba1de3dd9056308604b8f66c5c72d615454f75575a47228
+EBUILD selinux-dropbox-2.20170204-r3.ebuild 432 SHA256 4e79694e2d5548c41c7119ba298cf0136b7cdad983bdb38698fc15c52f4cbf3e SHA512 4a403280a7ebeb38601d394fd9ea5955e7d39b1ed0dc9eb0517bece8a93274f2791162e36d610adc7bf4322b263ac35aa75420fb18a6420d7bf5da339f2bedb8 WHIRLPOOL 42fdc5cbbea000eb5089c1ea6c324406994b510cdfe5d51731ab4361047e9038bc5d6b378aac83f00ba1de3dd9056308604b8f66c5c72d615454f75575a47228
+EBUILD selinux-dropbox-2.20170204-r4.ebuild 432 SHA256 4e79694e2d5548c41c7119ba298cf0136b7cdad983bdb38698fc15c52f4cbf3e SHA512 4a403280a7ebeb38601d394fd9ea5955e7d39b1ed0dc9eb0517bece8a93274f2791162e36d610adc7bf4322b263ac35aa75420fb18a6420d7bf5da339f2bedb8 WHIRLPOOL 42fdc5cbbea000eb5089c1ea6c324406994b510cdfe5d51731ab4361047e9038bc5d6b378aac83f00ba1de3dd9056308604b8f66c5c72d615454f75575a47228
+EBUILD selinux-dropbox-2.20170805-r2.ebuild 432 SHA256 4e79694e2d5548c41c7119ba298cf0136b7cdad983bdb38698fc15c52f4cbf3e SHA512 4a403280a7ebeb38601d394fd9ea5955e7d39b1ed0dc9eb0517bece8a93274f2791162e36d610adc7bf4322b263ac35aa75420fb18a6420d7bf5da339f2bedb8 WHIRLPOOL 42fdc5cbbea000eb5089c1ea6c324406994b510cdfe5d51731ab4361047e9038bc5d6b378aac83f00ba1de3dd9056308604b8f66c5c72d615454f75575a47228
+EBUILD selinux-dropbox-2.20170805-r3.ebuild 434 SHA256 89c7ccfcbaaf2f90a62689d360cfb6072620742fa2b9ce7985ed6bbd74c8834d SHA512 ad5ebcf263461e126a58582f187faa3c0a18a56ae2d0ef0d481db0915c4af88cca50deee77831449dcbad9f9ef001c27fe61e1b5561537e6a3ae41019f33ce2c WHIRLPOOL 9c22c68767acbfb7f187762cbf1d1d42974b78001105fa72ff6ec7aaa3f9837249b2c9d7ad6d6d83db2d9ecc85aed6dd6358947af94cdf6475b308fa298ac764
+EBUILD selinux-dropbox-9999.ebuild 434 SHA256 89c7ccfcbaaf2f90a62689d360cfb6072620742fa2b9ce7985ed6bbd74c8834d SHA512 ad5ebcf263461e126a58582f187faa3c0a18a56ae2d0ef0d481db0915c4af88cca50deee77831449dcbad9f9ef001c27fe61e1b5561537e6a3ae41019f33ce2c WHIRLPOOL 9c22c68767acbfb7f187762cbf1d1d42974b78001105fa72ff6ec7aaa3f9837249b2c9d7ad6d6d83db2d9ecc85aed6dd6358947af94cdf6475b308fa298ac764
 MISC ChangeLog 10687 SHA256 47a337b60cc1356dc2c7519a52bc004d61e8200b7fd4f8b20f514a8177639a0b SHA512 521f2c6e8a249683eb90994a1c716a27561bee8740f9e8b23ae66fe3280728d690350c50d1ba56c4d0044e170367abaa68d0185d17a1ea2a9fbd0399c2654d37 WHIRLPOOL 5dd28a8ffd73fb4a1cad76c0528546bbc02c37ea00a143ac3e8dd44e9fbedc0f8e92c4e170fca809262f920497ba509b08ff6de45c89091630165e15577cbc19
 MISC ChangeLog-2015 4294 SHA256 2950c27f86368cd63cfa86fb66ece4b8c4d57a164b60f74ad85714d99ab7197c SHA512 3cf98d757ada938aacf5bcda8ece7cef7a1906164bd6d377f82893ac0d4e7a816ee16cf637d141b5b3004dbb952969623de82b7fed078fa4295622928d4e690a WHIRLPOOL 48c2aea05d5b6c1a06bfaf7bc470c20732373ab31809466b50aaf873eb75d0a7027ef660f02d13ad7617edb9e4b9577604a1f23403ebda37ae311a2760a8637c
 MISC metadata.xml 317 SHA256 85d99356f5b8747e2bb46a0a3af114573bb01683b8c92759ec9debe3233f03c1 SHA512 9f232635f6084134360a64b5f1fcf84580b5df46feff6d897d4a53651329ca930ca23b15ae40316748a2914cddff3358b49bdb15bf7312973d6a9ada604dc717 WHIRLPOOL 5f5d07534ab3f7c5ffa11577e83bb69580671cbed55bc35da95d96659ec1ff62fd5dacead81e7026f82e410e728c02ffa85aa80f02eead55ebcc169132948f7b
diff --git a/sec-policy/selinux-dropbox/selinux-dropbox-2.20170204-r1.ebuild b/sec-policy/selinux-dropbox/selinux-dropbox-2.20170204-r1.ebuild
index 84b7f3c7fcd7..70286e8066b8 100644
--- a/sec-policy/selinux-dropbox/selinux-dropbox-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-dropbox/selinux-dropbox-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dropbox/selinux-dropbox-2.20170204-r2.ebuild b/sec-policy/selinux-dropbox/selinux-dropbox-2.20170204-r2.ebuild
index 63d2474691dc..363f44cec3e0 100644
--- a/sec-policy/selinux-dropbox/selinux-dropbox-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-dropbox/selinux-dropbox-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dropbox/selinux-dropbox-2.20170204-r3.ebuild b/sec-policy/selinux-dropbox/selinux-dropbox-2.20170204-r3.ebuild
index 63d2474691dc..363f44cec3e0 100644
--- a/sec-policy/selinux-dropbox/selinux-dropbox-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-dropbox/selinux-dropbox-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dropbox/selinux-dropbox-2.20170204-r4.ebuild b/sec-policy/selinux-dropbox/selinux-dropbox-2.20170204-r4.ebuild
index 63d2474691dc..363f44cec3e0 100644
--- a/sec-policy/selinux-dropbox/selinux-dropbox-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-dropbox/selinux-dropbox-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dropbox/selinux-dropbox-2.20170805-r2.ebuild b/sec-policy/selinux-dropbox/selinux-dropbox-2.20170805-r2.ebuild
index 63d2474691dc..363f44cec3e0 100644
--- a/sec-policy/selinux-dropbox/selinux-dropbox-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-dropbox/selinux-dropbox-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-dropbox/selinux-dropbox-2.20170805-r3.ebuild b/sec-policy/selinux-dropbox/selinux-dropbox-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..70286e8066b8
--- /dev/null
+++ b/sec-policy/selinux-dropbox/selinux-dropbox-2.20170805-r3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-dropbox/selinux-dropbox-9999.ebuild b/sec-policy/selinux-dropbox/selinux-dropbox-9999.ebuild
index 84b7f3c7fcd7..70286e8066b8 100644
--- a/sec-policy/selinux-dropbox/selinux-dropbox-9999.ebuild
+++ b/sec-policy/selinux-dropbox/selinux-dropbox-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-entropyd/Manifest b/sec-policy/selinux-entropyd/Manifest
index 87c02e5ce4a5..f3ec1e3d8f94 100644
--- a/sec-policy/selinux-entropyd/Manifest
+++ b/sec-policy/selinux-entropyd/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-entropyd-2.20170204-r1.ebuild 287 SHA256 970d3dd064e1803722260da2e94766aaffae12ae86f349afe940f2218e0261f1 SHA512 a61844ad86476859aaaf770d6634166a045057dcbf9e914f0be7d10c965fef53bde41adb7188608c5ce3f444ef0ad412d670c2b7921f0d1b12b5950a9d6e3de1 WHIRLPOOL f06a06d787f6941903c05df530b7ac75a456a56917ce2c0006c978915612234094be50ce9fd87b5842e019a2baaa0f73f7dfc36d8eca3bec25af935a55ae4bb9
-EBUILD selinux-entropyd-2.20170204-r2.ebuild 285 SHA256 a410289ea70452983fad8c83fca544d1bfde12eed5f6a52ec72249fd17cab9f0 SHA512 02b9e5aac04e8af7b143968e7438400d4acacacb93f19cc466b73572bdfdbddbc6bc56db9a58489e3de9bade2959c77cfd7b40df8b556aac22add92263864a9e WHIRLPOOL e107b261bb5dc28ddf1bcadfe2ce69facced89678127c89226fb4857c7acb4c6e693ac2c95cb0d7569b3c972c4dfec98b89c8b5ff19b56f09d1184507586a018
-EBUILD selinux-entropyd-2.20170204-r3.ebuild 285 SHA256 a410289ea70452983fad8c83fca544d1bfde12eed5f6a52ec72249fd17cab9f0 SHA512 02b9e5aac04e8af7b143968e7438400d4acacacb93f19cc466b73572bdfdbddbc6bc56db9a58489e3de9bade2959c77cfd7b40df8b556aac22add92263864a9e WHIRLPOOL e107b261bb5dc28ddf1bcadfe2ce69facced89678127c89226fb4857c7acb4c6e693ac2c95cb0d7569b3c972c4dfec98b89c8b5ff19b56f09d1184507586a018
-EBUILD selinux-entropyd-2.20170204-r4.ebuild 285 SHA256 a410289ea70452983fad8c83fca544d1bfde12eed5f6a52ec72249fd17cab9f0 SHA512 02b9e5aac04e8af7b143968e7438400d4acacacb93f19cc466b73572bdfdbddbc6bc56db9a58489e3de9bade2959c77cfd7b40df8b556aac22add92263864a9e WHIRLPOOL e107b261bb5dc28ddf1bcadfe2ce69facced89678127c89226fb4857c7acb4c6e693ac2c95cb0d7569b3c972c4dfec98b89c8b5ff19b56f09d1184507586a018
-EBUILD selinux-entropyd-2.20170805-r2.ebuild 285 SHA256 a410289ea70452983fad8c83fca544d1bfde12eed5f6a52ec72249fd17cab9f0 SHA512 02b9e5aac04e8af7b143968e7438400d4acacacb93f19cc466b73572bdfdbddbc6bc56db9a58489e3de9bade2959c77cfd7b40df8b556aac22add92263864a9e WHIRLPOOL e107b261bb5dc28ddf1bcadfe2ce69facced89678127c89226fb4857c7acb4c6e693ac2c95cb0d7569b3c972c4dfec98b89c8b5ff19b56f09d1184507586a018
-EBUILD selinux-entropyd-9999.ebuild 287 SHA256 970d3dd064e1803722260da2e94766aaffae12ae86f349afe940f2218e0261f1 SHA512 a61844ad86476859aaaf770d6634166a045057dcbf9e914f0be7d10c965fef53bde41adb7188608c5ce3f444ef0ad412d670c2b7921f0d1b12b5950a9d6e3de1 WHIRLPOOL f06a06d787f6941903c05df530b7ac75a456a56917ce2c0006c978915612234094be50ce9fd87b5842e019a2baaa0f73f7dfc36d8eca3bec25af935a55ae4bb9
+EBUILD selinux-entropyd-2.20170204-r1.ebuild 288 SHA256 bb89e21ffd0258a53596bd21dffe450ed8053fa13d862a5358f22e2bf9039670 SHA512 532df8d2ae82fceb83249e47c25450f1a73f7249b1e31a345862baa04401529a06bd2ebf1777a3294f46d1a1c164eea0b38e1a193cdc2b7d0d0b1fef02cde23a WHIRLPOOL 675664964700779afe5035dc66ce8846f9fd219f48e5ca0cb28f4b87fb27bd64e7b7e2c2cf402c2675a53677c0da6c7077e13c18f76e914843c04e1ac8edcd37
+EBUILD selinux-entropyd-2.20170204-r2.ebuild 286 SHA256 8df260f4c31e3819c53a6fcdc0970fb010b1d20205e8eab0d76d92d94a87c5b0 SHA512 6059aa795bc1561bf747b6884465c57793a3b4d392a8c4ba89e69212362f7a6affc70ba01095f49f3a461731b240f99fdc565975631dc7af872e4ed5425f75d1 WHIRLPOOL 727e231612f98f59a9f6e7dbba7cf560c165de7b866021ed2011fa60cacbd65f0e7555f4706c6944cfa9dde985b23651c81657594e437edcd39b8dfc21537872
+EBUILD selinux-entropyd-2.20170204-r3.ebuild 286 SHA256 8df260f4c31e3819c53a6fcdc0970fb010b1d20205e8eab0d76d92d94a87c5b0 SHA512 6059aa795bc1561bf747b6884465c57793a3b4d392a8c4ba89e69212362f7a6affc70ba01095f49f3a461731b240f99fdc565975631dc7af872e4ed5425f75d1 WHIRLPOOL 727e231612f98f59a9f6e7dbba7cf560c165de7b866021ed2011fa60cacbd65f0e7555f4706c6944cfa9dde985b23651c81657594e437edcd39b8dfc21537872
+EBUILD selinux-entropyd-2.20170204-r4.ebuild 286 SHA256 8df260f4c31e3819c53a6fcdc0970fb010b1d20205e8eab0d76d92d94a87c5b0 SHA512 6059aa795bc1561bf747b6884465c57793a3b4d392a8c4ba89e69212362f7a6affc70ba01095f49f3a461731b240f99fdc565975631dc7af872e4ed5425f75d1 WHIRLPOOL 727e231612f98f59a9f6e7dbba7cf560c165de7b866021ed2011fa60cacbd65f0e7555f4706c6944cfa9dde985b23651c81657594e437edcd39b8dfc21537872
+EBUILD selinux-entropyd-2.20170805-r2.ebuild 286 SHA256 8df260f4c31e3819c53a6fcdc0970fb010b1d20205e8eab0d76d92d94a87c5b0 SHA512 6059aa795bc1561bf747b6884465c57793a3b4d392a8c4ba89e69212362f7a6affc70ba01095f49f3a461731b240f99fdc565975631dc7af872e4ed5425f75d1 WHIRLPOOL 727e231612f98f59a9f6e7dbba7cf560c165de7b866021ed2011fa60cacbd65f0e7555f4706c6944cfa9dde985b23651c81657594e437edcd39b8dfc21537872
+EBUILD selinux-entropyd-2.20170805-r3.ebuild 288 SHA256 bb89e21ffd0258a53596bd21dffe450ed8053fa13d862a5358f22e2bf9039670 SHA512 532df8d2ae82fceb83249e47c25450f1a73f7249b1e31a345862baa04401529a06bd2ebf1777a3294f46d1a1c164eea0b38e1a193cdc2b7d0d0b1fef02cde23a WHIRLPOOL 675664964700779afe5035dc66ce8846f9fd219f48e5ca0cb28f4b87fb27bd64e7b7e2c2cf402c2675a53677c0da6c7077e13c18f76e914843c04e1ac8edcd37
+EBUILD selinux-entropyd-9999.ebuild 288 SHA256 bb89e21ffd0258a53596bd21dffe450ed8053fa13d862a5358f22e2bf9039670 SHA512 532df8d2ae82fceb83249e47c25450f1a73f7249b1e31a345862baa04401529a06bd2ebf1777a3294f46d1a1c164eea0b38e1a193cdc2b7d0d0b1fef02cde23a WHIRLPOOL 675664964700779afe5035dc66ce8846f9fd219f48e5ca0cb28f4b87fb27bd64e7b7e2c2cf402c2675a53677c0da6c7077e13c18f76e914843c04e1ac8edcd37
 MISC ChangeLog 10793 SHA256 fd1044d009fad5e35ccb247e294f85174b85cc460751b03284de04c7e1a1b01b SHA512 43886b416b8a8789a27e1b80022790ffa31cb346fcd75a229f49d2911af27cda91b6174828e907da4d4be70aaab175ba611a198ec7c42910eb0a60e80675ba7c WHIRLPOOL 00d0a5cfd3676205ab157e3ecf212907a03cd2ea47af77041eb02c3c3c59a5bab459dec49c901a9eb28ff8b4425c02d23541ae586bfd4797c7b4495111e3ff9b
 MISC ChangeLog-2015 9957 SHA256 02365eb2e8cdfbab23f1c061e55a1cf5a083fe29077be83256da730227956ac4 SHA512 70b9cb347ead5b660f747d896c72dc2a039747974efe119e84e726421e90bed89ea8f9dd92a068cbe98fffd56237ddc140ec366372f9d08381528cb7e22cb516 WHIRLPOOL 1333b2eeb29b042865e5e7369e9c3eff2a5522a573924bce023306d7393892085fbb1e996e3dffbff572f9f9b6e3db8c709fe7736b7477cfab33af2474d7c28d
 MISC metadata.xml 333 SHA256 f35be56c702cf612a5f97cceb0a358fabdf14fcb4d4e0788fd42a8278189bdd2 SHA512 0d80f8560f5d0dd12ac9913f52a7d6ce5f96567b727fd68c7f66ee96edb25dd5adc168bf2618c6992d56d96c049ac44240621ae576b46b536f4851dad9c049cf WHIRLPOOL 43a208eb200271da8eff369d0a435070e0508edfbd4efb2a46739d0c5e6b5a7e125d0e48352977fa98b21a3d0a1f8c0245ecf0228b5325880a519bdef85e5d71
diff --git a/sec-policy/selinux-entropyd/selinux-entropyd-2.20170204-r1.ebuild b/sec-policy/selinux-entropyd/selinux-entropyd-2.20170204-r1.ebuild
index a6573e9a1272..be9434592141 100644
--- a/sec-policy/selinux-entropyd/selinux-entropyd-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-entropyd/selinux-entropyd-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-entropyd/selinux-entropyd-2.20170204-r2.ebuild b/sec-policy/selinux-entropyd/selinux-entropyd-2.20170204-r2.ebuild
index be2b08db23ce..b161e431a80f 100644
--- a/sec-policy/selinux-entropyd/selinux-entropyd-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-entropyd/selinux-entropyd-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-entropyd/selinux-entropyd-2.20170204-r3.ebuild b/sec-policy/selinux-entropyd/selinux-entropyd-2.20170204-r3.ebuild
index be2b08db23ce..b161e431a80f 100644
--- a/sec-policy/selinux-entropyd/selinux-entropyd-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-entropyd/selinux-entropyd-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-entropyd/selinux-entropyd-2.20170204-r4.ebuild b/sec-policy/selinux-entropyd/selinux-entropyd-2.20170204-r4.ebuild
index be2b08db23ce..b161e431a80f 100644
--- a/sec-policy/selinux-entropyd/selinux-entropyd-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-entropyd/selinux-entropyd-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-entropyd/selinux-entropyd-2.20170805-r2.ebuild b/sec-policy/selinux-entropyd/selinux-entropyd-2.20170805-r2.ebuild
index be2b08db23ce..b161e431a80f 100644
--- a/sec-policy/selinux-entropyd/selinux-entropyd-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-entropyd/selinux-entropyd-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-entropyd/selinux-entropyd-2.20170805-r3.ebuild b/sec-policy/selinux-entropyd/selinux-entropyd-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..be9434592141
--- /dev/null
+++ b/sec-policy/selinux-entropyd/selinux-entropyd-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-entropyd/selinux-entropyd-9999.ebuild b/sec-policy/selinux-entropyd/selinux-entropyd-9999.ebuild
index a6573e9a1272..be9434592141 100644
--- a/sec-policy/selinux-entropyd/selinux-entropyd-9999.ebuild
+++ b/sec-policy/selinux-entropyd/selinux-entropyd-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-evolution/Manifest b/sec-policy/selinux-evolution/Manifest
index 2fb95094afbc..b80c80bb8a3e 100644
--- a/sec-policy/selinux-evolution/Manifest
+++ b/sec-policy/selinux-evolution/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-evolution-2.20170204-r1.ebuild 387 SHA256 b2a39e1d48f745a6255740bd8c54ed19e96645d2a120e0f7db42b5425574792f SHA512 1fc1ed4adf0b124520fba30de174a43a2ce684e6a89a9fcb6381cd2aab9dfa7eec26db23b04e7dfe52af31d37bb9953329dc01b92680c32ac1c9e882b54e649a WHIRLPOOL 68c1b5d3d14d3ffc7dffb305bd257f9bd8bb4e9903f02d81225780205a936e0494c91776c0c00c8892dbef091411d9b0c773ac8ac9410804cea986a6cfbfe6c3
-EBUILD selinux-evolution-2.20170204-r2.ebuild 385 SHA256 46b3dfb5b788e5011f29ca6257b426e4122fdcc4c7daea944d266b56c2913c4b SHA512 2db71e61ba7f2b4bdd2f95c4f55b84aff09bf439b8d3c79c9b56d7d186cd592f182e6ce977c7d6c148f86b7a8361c8fc922ff33271488bb08cb5ce2c5b129251 WHIRLPOOL d0c645a1948109b572bcce0f9d1b1dfa23783d80bec170a6b5df64b1c212256bc94fd8c97219336e2c9a0b2019d8ee5484d5d579b7d5182332cd5449966cba3c
-EBUILD selinux-evolution-2.20170204-r3.ebuild 385 SHA256 46b3dfb5b788e5011f29ca6257b426e4122fdcc4c7daea944d266b56c2913c4b SHA512 2db71e61ba7f2b4bdd2f95c4f55b84aff09bf439b8d3c79c9b56d7d186cd592f182e6ce977c7d6c148f86b7a8361c8fc922ff33271488bb08cb5ce2c5b129251 WHIRLPOOL d0c645a1948109b572bcce0f9d1b1dfa23783d80bec170a6b5df64b1c212256bc94fd8c97219336e2c9a0b2019d8ee5484d5d579b7d5182332cd5449966cba3c
-EBUILD selinux-evolution-2.20170204-r4.ebuild 385 SHA256 46b3dfb5b788e5011f29ca6257b426e4122fdcc4c7daea944d266b56c2913c4b SHA512 2db71e61ba7f2b4bdd2f95c4f55b84aff09bf439b8d3c79c9b56d7d186cd592f182e6ce977c7d6c148f86b7a8361c8fc922ff33271488bb08cb5ce2c5b129251 WHIRLPOOL d0c645a1948109b572bcce0f9d1b1dfa23783d80bec170a6b5df64b1c212256bc94fd8c97219336e2c9a0b2019d8ee5484d5d579b7d5182332cd5449966cba3c
-EBUILD selinux-evolution-2.20170805-r2.ebuild 385 SHA256 46b3dfb5b788e5011f29ca6257b426e4122fdcc4c7daea944d266b56c2913c4b SHA512 2db71e61ba7f2b4bdd2f95c4f55b84aff09bf439b8d3c79c9b56d7d186cd592f182e6ce977c7d6c148f86b7a8361c8fc922ff33271488bb08cb5ce2c5b129251 WHIRLPOOL d0c645a1948109b572bcce0f9d1b1dfa23783d80bec170a6b5df64b1c212256bc94fd8c97219336e2c9a0b2019d8ee5484d5d579b7d5182332cd5449966cba3c
-EBUILD selinux-evolution-9999.ebuild 387 SHA256 b2a39e1d48f745a6255740bd8c54ed19e96645d2a120e0f7db42b5425574792f SHA512 1fc1ed4adf0b124520fba30de174a43a2ce684e6a89a9fcb6381cd2aab9dfa7eec26db23b04e7dfe52af31d37bb9953329dc01b92680c32ac1c9e882b54e649a WHIRLPOOL 68c1b5d3d14d3ffc7dffb305bd257f9bd8bb4e9903f02d81225780205a936e0494c91776c0c00c8892dbef091411d9b0c773ac8ac9410804cea986a6cfbfe6c3
+EBUILD selinux-evolution-2.20170204-r1.ebuild 388 SHA256 f025ace00856c17e8bf0bdbf7cd0483ddd63aaa3b2ec9a2ac16beda0b6f469eb SHA512 60b6b46027fbefd7288ff2863455d9a40f55395b4560b8c38fb0b081747473f9cc7c1dffc37aa62766b70781578cceed32d3bf9f3067309e760c49c5f6b14435 WHIRLPOOL 83395c50afa15e09f1731e8b25dbd73d4ca8c01d1c24cd4c7257824d04e2f1aa27d70949de77878117784c7c860fbdf070b7e67c424331a5b8147218fc0cce7e
+EBUILD selinux-evolution-2.20170204-r2.ebuild 386 SHA256 1616fbc77b650171fab5f29d52c5c64947f1363ba831b76fb3ccab2100c8d042 SHA512 47bc347d2a71635eaea7d0ec93dbc320d4dbf2df986f4282480be80b323a404cbcfcc0a298f5f7540a793fc168f10be39f41bba81dc7e34ac9ac06e8ae7f899c WHIRLPOOL 511dfbdbf1fc2e0f641e98480bf092b53ebba20a56b496b80acf503e87bd5d722544444d70912ba22bc42779a949265181360b7670d9febb1452fd55bf6e528a
+EBUILD selinux-evolution-2.20170204-r3.ebuild 386 SHA256 1616fbc77b650171fab5f29d52c5c64947f1363ba831b76fb3ccab2100c8d042 SHA512 47bc347d2a71635eaea7d0ec93dbc320d4dbf2df986f4282480be80b323a404cbcfcc0a298f5f7540a793fc168f10be39f41bba81dc7e34ac9ac06e8ae7f899c WHIRLPOOL 511dfbdbf1fc2e0f641e98480bf092b53ebba20a56b496b80acf503e87bd5d722544444d70912ba22bc42779a949265181360b7670d9febb1452fd55bf6e528a
+EBUILD selinux-evolution-2.20170204-r4.ebuild 386 SHA256 1616fbc77b650171fab5f29d52c5c64947f1363ba831b76fb3ccab2100c8d042 SHA512 47bc347d2a71635eaea7d0ec93dbc320d4dbf2df986f4282480be80b323a404cbcfcc0a298f5f7540a793fc168f10be39f41bba81dc7e34ac9ac06e8ae7f899c WHIRLPOOL 511dfbdbf1fc2e0f641e98480bf092b53ebba20a56b496b80acf503e87bd5d722544444d70912ba22bc42779a949265181360b7670d9febb1452fd55bf6e528a
+EBUILD selinux-evolution-2.20170805-r2.ebuild 386 SHA256 1616fbc77b650171fab5f29d52c5c64947f1363ba831b76fb3ccab2100c8d042 SHA512 47bc347d2a71635eaea7d0ec93dbc320d4dbf2df986f4282480be80b323a404cbcfcc0a298f5f7540a793fc168f10be39f41bba81dc7e34ac9ac06e8ae7f899c WHIRLPOOL 511dfbdbf1fc2e0f641e98480bf092b53ebba20a56b496b80acf503e87bd5d722544444d70912ba22bc42779a949265181360b7670d9febb1452fd55bf6e528a
+EBUILD selinux-evolution-2.20170805-r3.ebuild 388 SHA256 f025ace00856c17e8bf0bdbf7cd0483ddd63aaa3b2ec9a2ac16beda0b6f469eb SHA512 60b6b46027fbefd7288ff2863455d9a40f55395b4560b8c38fb0b081747473f9cc7c1dffc37aa62766b70781578cceed32d3bf9f3067309e760c49c5f6b14435 WHIRLPOOL 83395c50afa15e09f1731e8b25dbd73d4ca8c01d1c24cd4c7257824d04e2f1aa27d70949de77878117784c7c860fbdf070b7e67c424331a5b8147218fc0cce7e
+EBUILD selinux-evolution-9999.ebuild 388 SHA256 f025ace00856c17e8bf0bdbf7cd0483ddd63aaa3b2ec9a2ac16beda0b6f469eb SHA512 60b6b46027fbefd7288ff2863455d9a40f55395b4560b8c38fb0b081747473f9cc7c1dffc37aa62766b70781578cceed32d3bf9f3067309e760c49c5f6b14435 WHIRLPOOL 83395c50afa15e09f1731e8b25dbd73d4ca8c01d1c24cd4c7257824d04e2f1aa27d70949de77878117784c7c860fbdf070b7e67c424331a5b8147218fc0cce7e
 MISC ChangeLog 10887 SHA256 8e088984668b8c17cbbbd0f5f58b3e9de5db5832642806b5d0122c4fbe12ddfb SHA512 de6ed120e4e077a5a81f4d9d3720061d343e870017156472bc5ccb4508c15ff93c46b6d3e5b2f8bdcc1ded02810a2d9321184c920187db53626951f048f0d07f WHIRLPOOL 37000e3a3bc4c544824025acf99baf06c9a211ba2b6a6dad8d38f3428518db58199bcdba7c717fa6a30ed0786015cdc2eb421a7cb4d51927e258fe34b0e2685e
 MISC ChangeLog-2015 10485 SHA256 d15e71333f32be63608fc1d788565d258d329074e4a6dc6c400d33539078c7c9 SHA512 04ab39740637de0d9a910cddba7614db967446476652621cf5b528421766b32316e4951ac09c608a5e21a7b70d45b5e64d1f11d7352ffee080a846f23ecd512b WHIRLPOOL 3e28e6daeaa9af00611f24410177a749775ce892c95d58475d69297b8555a2db49241299cfcbdf19f9a9435dd1be853ef7ef4b5167c9dd18c63dfd9cb433a6d6
 MISC metadata.xml 319 SHA256 449a6dfa523cbd63cfedf29e609c5c974aacdbbf67aabb00c45a2997f51f459a SHA512 5fd8bf75b73ea55686dc7d253d26fd4fb43cd89e46e141ee4fcb4da6b4ea9056aafb499f0bdc5e7d3cf15fb286497e05402a282d21f93ae6d18bd6b2cef0f0b4 WHIRLPOOL 9739981ba41efa43ee7644a7983b1def6050bb6d960420e0858b91df44a40e66f29234211c19fb25386cc9f6077c487c977e76817f78c88edce6e6d0db4d834c
diff --git a/sec-policy/selinux-evolution/selinux-evolution-2.20170204-r1.ebuild b/sec-policy/selinux-evolution/selinux-evolution-2.20170204-r1.ebuild
index c5ac9c45f078..16c61488cca9 100644
--- a/sec-policy/selinux-evolution/selinux-evolution-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-evolution/selinux-evolution-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-evolution/selinux-evolution-2.20170204-r2.ebuild b/sec-policy/selinux-evolution/selinux-evolution-2.20170204-r2.ebuild
index e625a7863c8f..91acf3bb059b 100644
--- a/sec-policy/selinux-evolution/selinux-evolution-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-evolution/selinux-evolution-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-evolution/selinux-evolution-2.20170204-r3.ebuild b/sec-policy/selinux-evolution/selinux-evolution-2.20170204-r3.ebuild
index e625a7863c8f..91acf3bb059b 100644
--- a/sec-policy/selinux-evolution/selinux-evolution-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-evolution/selinux-evolution-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-evolution/selinux-evolution-2.20170204-r4.ebuild b/sec-policy/selinux-evolution/selinux-evolution-2.20170204-r4.ebuild
index e625a7863c8f..91acf3bb059b 100644
--- a/sec-policy/selinux-evolution/selinux-evolution-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-evolution/selinux-evolution-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-evolution/selinux-evolution-2.20170805-r2.ebuild b/sec-policy/selinux-evolution/selinux-evolution-2.20170805-r2.ebuild
index e625a7863c8f..91acf3bb059b 100644
--- a/sec-policy/selinux-evolution/selinux-evolution-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-evolution/selinux-evolution-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-evolution/selinux-evolution-2.20170805-r3.ebuild b/sec-policy/selinux-evolution/selinux-evolution-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..16c61488cca9
--- /dev/null
+++ b/sec-policy/selinux-evolution/selinux-evolution-2.20170805-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-evolution/selinux-evolution-9999.ebuild b/sec-policy/selinux-evolution/selinux-evolution-9999.ebuild
index c5ac9c45f078..16c61488cca9 100644
--- a/sec-policy/selinux-evolution/selinux-evolution-9999.ebuild
+++ b/sec-policy/selinux-evolution/selinux-evolution-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-exim/Manifest b/sec-policy/selinux-exim/Manifest
index 5127507214d6..0e486a2c5863 100644
--- a/sec-policy/selinux-exim/Manifest
+++ b/sec-policy/selinux-exim/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-exim-2.20170204-r1.ebuild 279 SHA256 07f40d8d4b013ab81aa1a44c3c964acc43ec8e50929a0b326717e97de9e8a079 SHA512 6a84e8689edcb6b86bcd38dd5e6c16923a7e9269439433829592dae493fc35f1ada88edc58b0430a295ea3c1b896f1e3c7422bff49dc852d6c5920ea77e012a9 WHIRLPOOL ee2f9dbbc00afe177ce4f1fc434468189d41330f870b412904874e8b5a3fc07229dcfa6a9a1dbb40ac575c1a8d08a5bf565a6bec9fcea868e6517743bad00d49
-EBUILD selinux-exim-2.20170204-r2.ebuild 277 SHA256 742654cb9729c15afa1922eff0dee6dc76cdf987a26333c58527abde6fdae73b SHA512 cb22687d463fcd6d7b2e6350a97e0136a97f967611a57e58ab1fd8995e5af7d95259f859ea59bcd95a6f4003f12159aa0db41f91e4fbc1374e4a35ded35ed624 WHIRLPOOL db8c855e0c6ace22b50d0475c467fae583a7cb79c22f5269de926b546d0481d3b0fc13c405e9788ef29ef944c97f01a63a65c6d2d19a1165fdfab3346687bb4d
-EBUILD selinux-exim-2.20170204-r3.ebuild 277 SHA256 742654cb9729c15afa1922eff0dee6dc76cdf987a26333c58527abde6fdae73b SHA512 cb22687d463fcd6d7b2e6350a97e0136a97f967611a57e58ab1fd8995e5af7d95259f859ea59bcd95a6f4003f12159aa0db41f91e4fbc1374e4a35ded35ed624 WHIRLPOOL db8c855e0c6ace22b50d0475c467fae583a7cb79c22f5269de926b546d0481d3b0fc13c405e9788ef29ef944c97f01a63a65c6d2d19a1165fdfab3346687bb4d
-EBUILD selinux-exim-2.20170204-r4.ebuild 277 SHA256 742654cb9729c15afa1922eff0dee6dc76cdf987a26333c58527abde6fdae73b SHA512 cb22687d463fcd6d7b2e6350a97e0136a97f967611a57e58ab1fd8995e5af7d95259f859ea59bcd95a6f4003f12159aa0db41f91e4fbc1374e4a35ded35ed624 WHIRLPOOL db8c855e0c6ace22b50d0475c467fae583a7cb79c22f5269de926b546d0481d3b0fc13c405e9788ef29ef944c97f01a63a65c6d2d19a1165fdfab3346687bb4d
-EBUILD selinux-exim-2.20170805-r2.ebuild 277 SHA256 742654cb9729c15afa1922eff0dee6dc76cdf987a26333c58527abde6fdae73b SHA512 cb22687d463fcd6d7b2e6350a97e0136a97f967611a57e58ab1fd8995e5af7d95259f859ea59bcd95a6f4003f12159aa0db41f91e4fbc1374e4a35ded35ed624 WHIRLPOOL db8c855e0c6ace22b50d0475c467fae583a7cb79c22f5269de926b546d0481d3b0fc13c405e9788ef29ef944c97f01a63a65c6d2d19a1165fdfab3346687bb4d
-EBUILD selinux-exim-9999.ebuild 279 SHA256 07f40d8d4b013ab81aa1a44c3c964acc43ec8e50929a0b326717e97de9e8a079 SHA512 6a84e8689edcb6b86bcd38dd5e6c16923a7e9269439433829592dae493fc35f1ada88edc58b0430a295ea3c1b896f1e3c7422bff49dc852d6c5920ea77e012a9 WHIRLPOOL ee2f9dbbc00afe177ce4f1fc434468189d41330f870b412904874e8b5a3fc07229dcfa6a9a1dbb40ac575c1a8d08a5bf565a6bec9fcea868e6517743bad00d49
+EBUILD selinux-exim-2.20170204-r1.ebuild 280 SHA256 adb21717866cc2e01ef286574a70c240d737f086380a9222a31c182645c98e9b SHA512 01ab22b764f32bb29f8c3091358bbf61521ef355f8b64b804983c6a9ea4d3ddd8529bb44cb64ef40f7404b4606910cc7a258a2cf0b0179945a92b899e19362b4 WHIRLPOOL c8052ed3344721ada197ff51232e9880eecb73a78e4dfa0d54580a2faf58051eee9fe869ad8f6dc329e0ad8388d72f4174705e719756126febc9cbab0ba0effd
+EBUILD selinux-exim-2.20170204-r2.ebuild 278 SHA256 227af8cc1d0f16700eb608093bdceb65245140a38d3562afbd6ebaff256427e9 SHA512 7f86e624b8cb9e83c2f4f75b82b2e3e6885b6f0dd17e66999eacc9c3c29322f6542d8a691e54b3e775264fb683e3960e6a2c096e53e05c74169c73f6bab88286 WHIRLPOOL b4fa82fca7606e70e3007421aa74abdb9dc43c04220ccb311b2cb8d3aa4804e3c805322a6da5f8cf2a5d532170f5a7136a236f1f88b4cda2b27866747fa8766b
+EBUILD selinux-exim-2.20170204-r3.ebuild 278 SHA256 227af8cc1d0f16700eb608093bdceb65245140a38d3562afbd6ebaff256427e9 SHA512 7f86e624b8cb9e83c2f4f75b82b2e3e6885b6f0dd17e66999eacc9c3c29322f6542d8a691e54b3e775264fb683e3960e6a2c096e53e05c74169c73f6bab88286 WHIRLPOOL b4fa82fca7606e70e3007421aa74abdb9dc43c04220ccb311b2cb8d3aa4804e3c805322a6da5f8cf2a5d532170f5a7136a236f1f88b4cda2b27866747fa8766b
+EBUILD selinux-exim-2.20170204-r4.ebuild 278 SHA256 227af8cc1d0f16700eb608093bdceb65245140a38d3562afbd6ebaff256427e9 SHA512 7f86e624b8cb9e83c2f4f75b82b2e3e6885b6f0dd17e66999eacc9c3c29322f6542d8a691e54b3e775264fb683e3960e6a2c096e53e05c74169c73f6bab88286 WHIRLPOOL b4fa82fca7606e70e3007421aa74abdb9dc43c04220ccb311b2cb8d3aa4804e3c805322a6da5f8cf2a5d532170f5a7136a236f1f88b4cda2b27866747fa8766b
+EBUILD selinux-exim-2.20170805-r2.ebuild 278 SHA256 227af8cc1d0f16700eb608093bdceb65245140a38d3562afbd6ebaff256427e9 SHA512 7f86e624b8cb9e83c2f4f75b82b2e3e6885b6f0dd17e66999eacc9c3c29322f6542d8a691e54b3e775264fb683e3960e6a2c096e53e05c74169c73f6bab88286 WHIRLPOOL b4fa82fca7606e70e3007421aa74abdb9dc43c04220ccb311b2cb8d3aa4804e3c805322a6da5f8cf2a5d532170f5a7136a236f1f88b4cda2b27866747fa8766b
+EBUILD selinux-exim-2.20170805-r3.ebuild 280 SHA256 adb21717866cc2e01ef286574a70c240d737f086380a9222a31c182645c98e9b SHA512 01ab22b764f32bb29f8c3091358bbf61521ef355f8b64b804983c6a9ea4d3ddd8529bb44cb64ef40f7404b4606910cc7a258a2cf0b0179945a92b899e19362b4 WHIRLPOOL c8052ed3344721ada197ff51232e9880eecb73a78e4dfa0d54580a2faf58051eee9fe869ad8f6dc329e0ad8388d72f4174705e719756126febc9cbab0ba0effd
+EBUILD selinux-exim-9999.ebuild 280 SHA256 adb21717866cc2e01ef286574a70c240d737f086380a9222a31c182645c98e9b SHA512 01ab22b764f32bb29f8c3091358bbf61521ef355f8b64b804983c6a9ea4d3ddd8529bb44cb64ef40f7404b4606910cc7a258a2cf0b0179945a92b899e19362b4 WHIRLPOOL c8052ed3344721ada197ff51232e9880eecb73a78e4dfa0d54580a2faf58051eee9fe869ad8f6dc329e0ad8388d72f4174705e719756126febc9cbab0ba0effd
 MISC ChangeLog 10387 SHA256 d4daba1592b22238d3e93ad0c79e10481e4d8a3708313b8e2da630d3996c9cdb SHA512 aa636c9f22357104ac27f1ba300d883253e945fa61e9745e7c7b2df3acbc0c5a378db2784e728627ca7a27c826ae47c299c36784f6761909c16b7044481ed1a3 WHIRLPOOL d83de033ce21b49fb7c0e4cbe5aec65fa3df834b725177439dd5acbddef7d6ad13ee747829ea9f5822c56a5a37588c214aff16826525e2abc357baa354e73d18
 MISC ChangeLog-2015 9636 SHA256 a4d5051d2831ce38a91c62804948519bf9ab68533aeae9e39b3645335af28df0 SHA512 b7ad9ca3e52a9d5057ad1aa77315a381d5b1595c8c76bc734f00a1bd0100d25120fbca6c019acaf4148883aa97a4dd0a792153c385adbd95d8ae9b8b6e7cf821 WHIRLPOOL 21a8754193230d198c758462c6a22c286f7ea34f381179913e31fbd1037201aef32ad2e02e118e9d00e724c6a95c0d7750921ce712b0c8b6eaa7222238b15323
 MISC metadata.xml 314 SHA256 f4428e4cd3d45a210c5658b6b4cf43960d77d31c4b78e5652b20f6dca1c65ef0 SHA512 219657ec49c7edd6b2f78c3edcd2f06a9a5e12324988bb3dba22f3da68903ea42f9cdbd48ddd95a21abe6b59b27244e6c654869dee7db1a653ab7bc89fd36b1a WHIRLPOOL ecd99ecf5fc95a380e916cca2637fd3e354f9586eeca806a8f6edf7897836835964cbb5320c5942ffe8e0cf7e7ebe74b64dce3ebf408f61347aae681c390587f
diff --git a/sec-policy/selinux-exim/selinux-exim-2.20170204-r1.ebuild b/sec-policy/selinux-exim/selinux-exim-2.20170204-r1.ebuild
index c67f5127bc7a..0a93a9896758 100644
--- a/sec-policy/selinux-exim/selinux-exim-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-exim/selinux-exim-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-exim/selinux-exim-2.20170204-r2.ebuild b/sec-policy/selinux-exim/selinux-exim-2.20170204-r2.ebuild
index 1df755119bba..04c9e431e452 100644
--- a/sec-policy/selinux-exim/selinux-exim-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-exim/selinux-exim-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-exim/selinux-exim-2.20170204-r3.ebuild b/sec-policy/selinux-exim/selinux-exim-2.20170204-r3.ebuild
index 1df755119bba..04c9e431e452 100644
--- a/sec-policy/selinux-exim/selinux-exim-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-exim/selinux-exim-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-exim/selinux-exim-2.20170204-r4.ebuild b/sec-policy/selinux-exim/selinux-exim-2.20170204-r4.ebuild
index 1df755119bba..04c9e431e452 100644
--- a/sec-policy/selinux-exim/selinux-exim-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-exim/selinux-exim-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-exim/selinux-exim-2.20170805-r2.ebuild b/sec-policy/selinux-exim/selinux-exim-2.20170805-r2.ebuild
index 1df755119bba..04c9e431e452 100644
--- a/sec-policy/selinux-exim/selinux-exim-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-exim/selinux-exim-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-exim/selinux-exim-2.20170805-r3.ebuild b/sec-policy/selinux-exim/selinux-exim-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..0a93a9896758
--- /dev/null
+++ b/sec-policy/selinux-exim/selinux-exim-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-exim/selinux-exim-9999.ebuild b/sec-policy/selinux-exim/selinux-exim-9999.ebuild
index c67f5127bc7a..0a93a9896758 100644
--- a/sec-policy/selinux-exim/selinux-exim-9999.ebuild
+++ b/sec-policy/selinux-exim/selinux-exim-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-fail2ban/Manifest b/sec-policy/selinux-fail2ban/Manifest
index 66f98f0733c1..f1edf5416f44 100644
--- a/sec-policy/selinux-fail2ban/Manifest
+++ b/sec-policy/selinux-fail2ban/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-fail2ban-2.20170204-r1.ebuild 287 SHA256 56e10969f61396ff69c5513be03460f057b11dac4920cf59eb80e7384a6aafd8 SHA512 9ff088f091d994af3fdd5cb6add75d6b41c2c2cfe3fe6abd125abe902d512302a7b97913c7b1da736f694c1b798fa4ab9820e77132c880e2f471fcb97821baad WHIRLPOOL 97e49c1f17acf15dc3e42e803f42db74c84ccc95e032184ea7802d66818f8d7257d562c6143cd777ac49fc05aa3a9384cb4e344ab261120ed4f16ddb2814d719
-EBUILD selinux-fail2ban-2.20170204-r2.ebuild 285 SHA256 8977726dded82ee76bd9cc5250016ed64f68d91fc94ec939ebb5ad627817bd76 SHA512 2570ab2c65e491ac2e6d48d1ea93d871edd3d98505ab7e7df13ff1fdc2d7a6674e4f547f7948170c7edf335d136d1e29483550d8cd4bf3b532266eac8d3e600c WHIRLPOOL 5a3235651b6e6655bec55f9d31e33b3c855dafc602104c73dc3fd191eb58820d33053f22a8e45c7520be40d92a757bbf4f11b49211ae1d73af89a4c0be896775
-EBUILD selinux-fail2ban-2.20170204-r3.ebuild 285 SHA256 8977726dded82ee76bd9cc5250016ed64f68d91fc94ec939ebb5ad627817bd76 SHA512 2570ab2c65e491ac2e6d48d1ea93d871edd3d98505ab7e7df13ff1fdc2d7a6674e4f547f7948170c7edf335d136d1e29483550d8cd4bf3b532266eac8d3e600c WHIRLPOOL 5a3235651b6e6655bec55f9d31e33b3c855dafc602104c73dc3fd191eb58820d33053f22a8e45c7520be40d92a757bbf4f11b49211ae1d73af89a4c0be896775
-EBUILD selinux-fail2ban-2.20170204-r4.ebuild 285 SHA256 8977726dded82ee76bd9cc5250016ed64f68d91fc94ec939ebb5ad627817bd76 SHA512 2570ab2c65e491ac2e6d48d1ea93d871edd3d98505ab7e7df13ff1fdc2d7a6674e4f547f7948170c7edf335d136d1e29483550d8cd4bf3b532266eac8d3e600c WHIRLPOOL 5a3235651b6e6655bec55f9d31e33b3c855dafc602104c73dc3fd191eb58820d33053f22a8e45c7520be40d92a757bbf4f11b49211ae1d73af89a4c0be896775
-EBUILD selinux-fail2ban-2.20170805-r2.ebuild 285 SHA256 8977726dded82ee76bd9cc5250016ed64f68d91fc94ec939ebb5ad627817bd76 SHA512 2570ab2c65e491ac2e6d48d1ea93d871edd3d98505ab7e7df13ff1fdc2d7a6674e4f547f7948170c7edf335d136d1e29483550d8cd4bf3b532266eac8d3e600c WHIRLPOOL 5a3235651b6e6655bec55f9d31e33b3c855dafc602104c73dc3fd191eb58820d33053f22a8e45c7520be40d92a757bbf4f11b49211ae1d73af89a4c0be896775
-EBUILD selinux-fail2ban-9999.ebuild 287 SHA256 56e10969f61396ff69c5513be03460f057b11dac4920cf59eb80e7384a6aafd8 SHA512 9ff088f091d994af3fdd5cb6add75d6b41c2c2cfe3fe6abd125abe902d512302a7b97913c7b1da736f694c1b798fa4ab9820e77132c880e2f471fcb97821baad WHIRLPOOL 97e49c1f17acf15dc3e42e803f42db74c84ccc95e032184ea7802d66818f8d7257d562c6143cd777ac49fc05aa3a9384cb4e344ab261120ed4f16ddb2814d719
+EBUILD selinux-fail2ban-2.20170204-r1.ebuild 288 SHA256 486667cc455447cdb99f957763d54ae55fdb4da892b51a3bc0d0f94e9cd7ac55 SHA512 e53629026965f59981ead269c101c2ca14463f2a27eb484b71411fc5dedc938236ac1c95592e314b07af91e9bb58537e9b7c46305b8805eb1d15c013befcbe3b WHIRLPOOL d036fa556aea430852a010a7ac20dfd6684ad34ad1790e92cf55ea20b93f71f909586588ad5f04a5e3c358204dab6475fdfaa27237f0cd35c20c7e7ecf497bb6
+EBUILD selinux-fail2ban-2.20170204-r2.ebuild 286 SHA256 37fcd3ecbb44835adefc271bd23441e1472bf47bb26e5f83bd0c027115b7213a SHA512 dd737ec119e99aca5bda7a557b89ec6b9c74f068ae884121962d32c0ad5a8f88f260315bf0299a9ee8d1aa81079d6852a1792ff60d18bb86c08c383676495592 WHIRLPOOL b56571825877d1e47e93582adc033a71b759d9e4c816bbbdbfffe01db9b7fedcd07a325406068851a5da3313d889216b6f8a4e3fb0afbe183bfdb172a578cd49
+EBUILD selinux-fail2ban-2.20170204-r3.ebuild 286 SHA256 37fcd3ecbb44835adefc271bd23441e1472bf47bb26e5f83bd0c027115b7213a SHA512 dd737ec119e99aca5bda7a557b89ec6b9c74f068ae884121962d32c0ad5a8f88f260315bf0299a9ee8d1aa81079d6852a1792ff60d18bb86c08c383676495592 WHIRLPOOL b56571825877d1e47e93582adc033a71b759d9e4c816bbbdbfffe01db9b7fedcd07a325406068851a5da3313d889216b6f8a4e3fb0afbe183bfdb172a578cd49
+EBUILD selinux-fail2ban-2.20170204-r4.ebuild 286 SHA256 37fcd3ecbb44835adefc271bd23441e1472bf47bb26e5f83bd0c027115b7213a SHA512 dd737ec119e99aca5bda7a557b89ec6b9c74f068ae884121962d32c0ad5a8f88f260315bf0299a9ee8d1aa81079d6852a1792ff60d18bb86c08c383676495592 WHIRLPOOL b56571825877d1e47e93582adc033a71b759d9e4c816bbbdbfffe01db9b7fedcd07a325406068851a5da3313d889216b6f8a4e3fb0afbe183bfdb172a578cd49
+EBUILD selinux-fail2ban-2.20170805-r2.ebuild 286 SHA256 37fcd3ecbb44835adefc271bd23441e1472bf47bb26e5f83bd0c027115b7213a SHA512 dd737ec119e99aca5bda7a557b89ec6b9c74f068ae884121962d32c0ad5a8f88f260315bf0299a9ee8d1aa81079d6852a1792ff60d18bb86c08c383676495592 WHIRLPOOL b56571825877d1e47e93582adc033a71b759d9e4c816bbbdbfffe01db9b7fedcd07a325406068851a5da3313d889216b6f8a4e3fb0afbe183bfdb172a578cd49
+EBUILD selinux-fail2ban-2.20170805-r3.ebuild 288 SHA256 486667cc455447cdb99f957763d54ae55fdb4da892b51a3bc0d0f94e9cd7ac55 SHA512 e53629026965f59981ead269c101c2ca14463f2a27eb484b71411fc5dedc938236ac1c95592e314b07af91e9bb58537e9b7c46305b8805eb1d15c013befcbe3b WHIRLPOOL d036fa556aea430852a010a7ac20dfd6684ad34ad1790e92cf55ea20b93f71f909586588ad5f04a5e3c358204dab6475fdfaa27237f0cd35c20c7e7ecf497bb6
+EBUILD selinux-fail2ban-9999.ebuild 288 SHA256 486667cc455447cdb99f957763d54ae55fdb4da892b51a3bc0d0f94e9cd7ac55 SHA512 e53629026965f59981ead269c101c2ca14463f2a27eb484b71411fc5dedc938236ac1c95592e314b07af91e9bb58537e9b7c46305b8805eb1d15c013befcbe3b WHIRLPOOL d036fa556aea430852a010a7ac20dfd6684ad34ad1790e92cf55ea20b93f71f909586588ad5f04a5e3c358204dab6475fdfaa27237f0cd35c20c7e7ecf497bb6
 MISC ChangeLog 10793 SHA256 eeb5a330cefd1856fafb6988bd75e737cd0ae3af46bde52bd1da098a3a5026e1 SHA512 e0a2667f2060f4c03937b4dcbaadbe928cad0a4252518f26f638cfdc90cca7ecca3597e00c18e90b56c55fe8e902eb486ba433dc4c8062a33747f422866e28e3 WHIRLPOOL 1393fb00801e7d916b45f15848ed975e88c865c495da5c9a77e0737cc05b122d0f1295c5ce70a5ce6fd82326b72fd6cdcfc541a6091980b0dd54cb9cd08a30e9
 MISC ChangeLog-2015 10795 SHA256 a25ffa546b3f67c3157a561153b165444c340e93a57bc505c60cb68771683413 SHA512 09ed9d624102092d1155c47401fb9f7d8a7ad5c5aa3fab2f8e9844a5934a2db347a5c0a6724bc300da4c20bd49288eeea06a66d8a4418555dfcf2f7ba645d94e WHIRLPOOL 97870a6ac96a7cc98db2273491ffad05700c0ff6ad4d4be9ceae6dff4481aa597f676b3374d0194304948b33ff8bc30c9c280b8e31635544bc80d09ba00b1208
 MISC metadata.xml 318 SHA256 f5f498a8bd9c101c4dfe323bb6fa8cb50d5b78d673b93a993f9bae8bbe78c41d SHA512 e3d5af97c4cc7917dd015904de3badbecf54cf8fd3c10c294d33d3bee38b5b7b0b82888ebfac3afbc7d9b53b15e876bd16be1ba5a6567e7736a30bb1c1995349 WHIRLPOOL 8c88d7f656b77db52754d12bfeaec8a9770c1398f9ef99c7fccc8234b10d1c420444118788ebce99f45aee75abdbf4af32419fafd1f1d8340144811c6936ca17
diff --git a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20170204-r1.ebuild b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20170204-r1.ebuild
index a33833041df0..b52254f9da68 100644
--- a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20170204-r2.ebuild b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20170204-r2.ebuild
index 3221f4ae8778..845bdb9e2354 100644
--- a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20170204-r3.ebuild b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20170204-r3.ebuild
index 3221f4ae8778..845bdb9e2354 100644
--- a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20170204-r4.ebuild b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20170204-r4.ebuild
index 3221f4ae8778..845bdb9e2354 100644
--- a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20170805-r2.ebuild b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20170805-r2.ebuild
index 3221f4ae8778..845bdb9e2354 100644
--- a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20170805-r3.ebuild b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..b52254f9da68
--- /dev/null
+++ b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-fail2ban/selinux-fail2ban-9999.ebuild b/sec-policy/selinux-fail2ban/selinux-fail2ban-9999.ebuild
index a33833041df0..b52254f9da68 100644
--- a/sec-policy/selinux-fail2ban/selinux-fail2ban-9999.ebuild
+++ b/sec-policy/selinux-fail2ban/selinux-fail2ban-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-fetchmail/Manifest b/sec-policy/selinux-fetchmail/Manifest
index 23acf962b986..b837aca9f0bd 100644
--- a/sec-policy/selinux-fetchmail/Manifest
+++ b/sec-policy/selinux-fetchmail/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-fetchmail-2.20170204-r1.ebuild 289 SHA256 17ef787cc99d8f5bc36667a9c590993e2773b7850f545513707510c0c4bd6237 SHA512 6642c5efae3afcea45d6908e2161eb68ebfe6fb2bb73a894ac11d50e4c8d596808dd36edb6ff22974cd1a627b7a4a1bdf4bdefd6532a98f15aa1547bf2dbd297 WHIRLPOOL 300d4003ad4f45bd076ac5a20d00496e86316cb937f616b6e937252848228b7dbd496ba8e7edec3bcf1228f52ad997866017f5e63aacf3d3652b88a51d847bff
-EBUILD selinux-fetchmail-2.20170204-r2.ebuild 287 SHA256 81b47080006aa709580c051f151f120b8d56621249580f4885dd3937c88db478 SHA512 046baa46f3fa5e52be39b9a33c75a1e18d26977275a0e99f3cdf1471b20ff4cdde36b3891668e7e74e58dcd64c6e651ea0b5fd89942782aaf3aa7c3b3a9d3bad WHIRLPOOL aca104865b89e2eb5040e02c2002b8912842784285e408759589424c00a40a19c0b759d47f72638f57f46d3bcc80d90a65284bc6d1f628ddd2d395b87a59f4d9
-EBUILD selinux-fetchmail-2.20170204-r3.ebuild 287 SHA256 81b47080006aa709580c051f151f120b8d56621249580f4885dd3937c88db478 SHA512 046baa46f3fa5e52be39b9a33c75a1e18d26977275a0e99f3cdf1471b20ff4cdde36b3891668e7e74e58dcd64c6e651ea0b5fd89942782aaf3aa7c3b3a9d3bad WHIRLPOOL aca104865b89e2eb5040e02c2002b8912842784285e408759589424c00a40a19c0b759d47f72638f57f46d3bcc80d90a65284bc6d1f628ddd2d395b87a59f4d9
-EBUILD selinux-fetchmail-2.20170204-r4.ebuild 287 SHA256 81b47080006aa709580c051f151f120b8d56621249580f4885dd3937c88db478 SHA512 046baa46f3fa5e52be39b9a33c75a1e18d26977275a0e99f3cdf1471b20ff4cdde36b3891668e7e74e58dcd64c6e651ea0b5fd89942782aaf3aa7c3b3a9d3bad WHIRLPOOL aca104865b89e2eb5040e02c2002b8912842784285e408759589424c00a40a19c0b759d47f72638f57f46d3bcc80d90a65284bc6d1f628ddd2d395b87a59f4d9
-EBUILD selinux-fetchmail-2.20170805-r2.ebuild 287 SHA256 81b47080006aa709580c051f151f120b8d56621249580f4885dd3937c88db478 SHA512 046baa46f3fa5e52be39b9a33c75a1e18d26977275a0e99f3cdf1471b20ff4cdde36b3891668e7e74e58dcd64c6e651ea0b5fd89942782aaf3aa7c3b3a9d3bad WHIRLPOOL aca104865b89e2eb5040e02c2002b8912842784285e408759589424c00a40a19c0b759d47f72638f57f46d3bcc80d90a65284bc6d1f628ddd2d395b87a59f4d9
-EBUILD selinux-fetchmail-9999.ebuild 289 SHA256 17ef787cc99d8f5bc36667a9c590993e2773b7850f545513707510c0c4bd6237 SHA512 6642c5efae3afcea45d6908e2161eb68ebfe6fb2bb73a894ac11d50e4c8d596808dd36edb6ff22974cd1a627b7a4a1bdf4bdefd6532a98f15aa1547bf2dbd297 WHIRLPOOL 300d4003ad4f45bd076ac5a20d00496e86316cb937f616b6e937252848228b7dbd496ba8e7edec3bcf1228f52ad997866017f5e63aacf3d3652b88a51d847bff
+EBUILD selinux-fetchmail-2.20170204-r1.ebuild 290 SHA256 f6b0d3fe95f916859655501c61f38cb86a3b0e29ea7d34551d7fd606631e5fce SHA512 8ff07ba58d3055cc4028043089e65f2b3d249640bdbb20035b6c351334a8ced22654d36edf0f5afcd1cb4c398707964892c00c71ee3fe06bd732ec56d9e6efda WHIRLPOOL cdc107fcaaee5e7017f3c9986cc988194863f06ba40e3db27ef93e364a925872c07ceb32355cff7c8f9e698d8df08d7152d9f8601e20ad1b01496aad0f125227
+EBUILD selinux-fetchmail-2.20170204-r2.ebuild 288 SHA256 a596b04f8f047a9809e3a3d8df57a2a0a72cba9d3a98477aba97da1ae1f0d458 SHA512 240af1340e2354cc0c2d67ff55900a69baa6db3007cb75eaa6235ef170611bfd1e2729e0d454d353b94ec01d59ab7619912e020d944900880804cc90cbe0de95 WHIRLPOOL 253c06b187db138fa269b1bb12a630c58751628de1b536b189c9ac5e13df8225ecf5e37b0c07681de348737ff0bb99899ca46ed041d07f3fb3511d3b01cd9e5d
+EBUILD selinux-fetchmail-2.20170204-r3.ebuild 288 SHA256 a596b04f8f047a9809e3a3d8df57a2a0a72cba9d3a98477aba97da1ae1f0d458 SHA512 240af1340e2354cc0c2d67ff55900a69baa6db3007cb75eaa6235ef170611bfd1e2729e0d454d353b94ec01d59ab7619912e020d944900880804cc90cbe0de95 WHIRLPOOL 253c06b187db138fa269b1bb12a630c58751628de1b536b189c9ac5e13df8225ecf5e37b0c07681de348737ff0bb99899ca46ed041d07f3fb3511d3b01cd9e5d
+EBUILD selinux-fetchmail-2.20170204-r4.ebuild 288 SHA256 a596b04f8f047a9809e3a3d8df57a2a0a72cba9d3a98477aba97da1ae1f0d458 SHA512 240af1340e2354cc0c2d67ff55900a69baa6db3007cb75eaa6235ef170611bfd1e2729e0d454d353b94ec01d59ab7619912e020d944900880804cc90cbe0de95 WHIRLPOOL 253c06b187db138fa269b1bb12a630c58751628de1b536b189c9ac5e13df8225ecf5e37b0c07681de348737ff0bb99899ca46ed041d07f3fb3511d3b01cd9e5d
+EBUILD selinux-fetchmail-2.20170805-r2.ebuild 288 SHA256 a596b04f8f047a9809e3a3d8df57a2a0a72cba9d3a98477aba97da1ae1f0d458 SHA512 240af1340e2354cc0c2d67ff55900a69baa6db3007cb75eaa6235ef170611bfd1e2729e0d454d353b94ec01d59ab7619912e020d944900880804cc90cbe0de95 WHIRLPOOL 253c06b187db138fa269b1bb12a630c58751628de1b536b189c9ac5e13df8225ecf5e37b0c07681de348737ff0bb99899ca46ed041d07f3fb3511d3b01cd9e5d
+EBUILD selinux-fetchmail-2.20170805-r3.ebuild 290 SHA256 f6b0d3fe95f916859655501c61f38cb86a3b0e29ea7d34551d7fd606631e5fce SHA512 8ff07ba58d3055cc4028043089e65f2b3d249640bdbb20035b6c351334a8ced22654d36edf0f5afcd1cb4c398707964892c00c71ee3fe06bd732ec56d9e6efda WHIRLPOOL cdc107fcaaee5e7017f3c9986cc988194863f06ba40e3db27ef93e364a925872c07ceb32355cff7c8f9e698d8df08d7152d9f8601e20ad1b01496aad0f125227
+EBUILD selinux-fetchmail-9999.ebuild 290 SHA256 f6b0d3fe95f916859655501c61f38cb86a3b0e29ea7d34551d7fd606631e5fce SHA512 8ff07ba58d3055cc4028043089e65f2b3d249640bdbb20035b6c351334a8ced22654d36edf0f5afcd1cb4c398707964892c00c71ee3fe06bd732ec56d9e6efda WHIRLPOOL cdc107fcaaee5e7017f3c9986cc988194863f06ba40e3db27ef93e364a925872c07ceb32355cff7c8f9e698d8df08d7152d9f8601e20ad1b01496aad0f125227
 MISC ChangeLog 10887 SHA256 4b231be0c0dc865dd1b4cd0c7db71b303efe9eef7966aa2879225e2ab4f20ce7 SHA512 1bb773d13a19177481b3df0d3c1c9694ecf03f66d087a75b5e6c1e17f222788c2dc498a511417fe2a1400a95f6c2aa7cff0d45bb686cf24c7801708e1c11eb63 WHIRLPOOL db6297be74090474014b8cdaa692ae495c0e9e43a46e1bf607d930cb03d9582c5e267d441b0e3d0ad4ac92dbdd029af3a8529073c143e7ca003bd57d35cf1629
 MISC ChangeLog-2015 10221 SHA256 93d207cbc764d9a873d22fcc88a9e99a3dd480ffa68d305654afe6995520f3c9 SHA512 f0023a79430f262c6b42c53fbe907ccd2251e9e46a150518fdb9258d3c7f5024afde88b4f0a71525dc5cadcee670178359b5cd9b395ab2942d8a8a6bb60e5d37 WHIRLPOOL 66194cd299910023957fc8905c20f519626a4c591ce99c05314436a9d609717b1751931e254ba3860683fb4e4989a0e933f9d26fa3b33c6c7a14c05be4f4d8ee
 MISC metadata.xml 319 SHA256 8c8a824338820f0c9de2b35db6276e0b503fbaed410beec1a3ef179aab83979c SHA512 7e8e5cc8a4d87c86538ce4d507c43763e77be4819715c302c6c616fd6d84c010c109fba0ee147ed4dee2398f5d924e28561b4d9fb4b8c7f99acb8861ac05b472 WHIRLPOOL 93b4bad54a37abae03eb2fc8961a2a464f52a21b3a46979e4e7962e4711c602e1194c8f5b51651db1d385ce8255d7085fbbf67b7604467c64c56016e0a15c3bf
diff --git a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20170204-r1.ebuild b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20170204-r1.ebuild
index 3a97d08eb1fd..3f6a235d2487 100644
--- a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20170204-r2.ebuild b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20170204-r2.ebuild
index 4a01688735f9..66140edae922 100644
--- a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20170204-r3.ebuild b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20170204-r3.ebuild
index 4a01688735f9..66140edae922 100644
--- a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20170204-r4.ebuild b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20170204-r4.ebuild
index 4a01688735f9..66140edae922 100644
--- a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20170805-r2.ebuild b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20170805-r2.ebuild
index 4a01688735f9..66140edae922 100644
--- a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20170805-r3.ebuild b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..3f6a235d2487
--- /dev/null
+++ b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-fetchmail/selinux-fetchmail-9999.ebuild b/sec-policy/selinux-fetchmail/selinux-fetchmail-9999.ebuild
index 3a97d08eb1fd..3f6a235d2487 100644
--- a/sec-policy/selinux-fetchmail/selinux-fetchmail-9999.ebuild
+++ b/sec-policy/selinux-fetchmail/selinux-fetchmail-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-finger/Manifest b/sec-policy/selinux-finger/Manifest
index 29eb8efe69ab..e7d87c251ef2 100644
--- a/sec-policy/selinux-finger/Manifest
+++ b/sec-policy/selinux-finger/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-finger-2.20170204-r1.ebuild 378 SHA256 4241ec2c319c1abf8b9b3a15a1c25060e99cc5043dc48c1def5debb549b28ba9 SHA512 1086c4789810bdba2ca91427186686cef2ad8e4e6def01272e783c1f96f4ddaf266ae942191eba46f854ad635c9e1f9cace384bce85a81cb65064ed846bbad64 WHIRLPOOL 50de51637ffb5e18e5b87c5fe00d323ef84a7f0aeb6943d1ac5444369bed580b20f46836193b4402a52064bc7abcc663403c2549b615207979be3d84d919de12
-EBUILD selinux-finger-2.20170204-r2.ebuild 376 SHA256 c406292e9a07d1bed6218706a7db79ad304caf58c32421c6f8a1b808d6790b36 SHA512 9d0a4a2584083997d64145ae587ff6004f996e162cf29d56961ccce7e81ce849628a71b0ba69849a64224ad066553436e1a59af3cfacee01efcf13ddc3e9ac79 WHIRLPOOL d8737384a524a28025c5af9ded843cdbd3324a0811f532912b9059158d1037d361de728fe777a0fff0546cbe8c5345b6f97a319ccae40c65ffbca0df01a96996
-EBUILD selinux-finger-2.20170204-r3.ebuild 376 SHA256 c406292e9a07d1bed6218706a7db79ad304caf58c32421c6f8a1b808d6790b36 SHA512 9d0a4a2584083997d64145ae587ff6004f996e162cf29d56961ccce7e81ce849628a71b0ba69849a64224ad066553436e1a59af3cfacee01efcf13ddc3e9ac79 WHIRLPOOL d8737384a524a28025c5af9ded843cdbd3324a0811f532912b9059158d1037d361de728fe777a0fff0546cbe8c5345b6f97a319ccae40c65ffbca0df01a96996
-EBUILD selinux-finger-2.20170204-r4.ebuild 376 SHA256 c406292e9a07d1bed6218706a7db79ad304caf58c32421c6f8a1b808d6790b36 SHA512 9d0a4a2584083997d64145ae587ff6004f996e162cf29d56961ccce7e81ce849628a71b0ba69849a64224ad066553436e1a59af3cfacee01efcf13ddc3e9ac79 WHIRLPOOL d8737384a524a28025c5af9ded843cdbd3324a0811f532912b9059158d1037d361de728fe777a0fff0546cbe8c5345b6f97a319ccae40c65ffbca0df01a96996
-EBUILD selinux-finger-2.20170805-r2.ebuild 376 SHA256 c406292e9a07d1bed6218706a7db79ad304caf58c32421c6f8a1b808d6790b36 SHA512 9d0a4a2584083997d64145ae587ff6004f996e162cf29d56961ccce7e81ce849628a71b0ba69849a64224ad066553436e1a59af3cfacee01efcf13ddc3e9ac79 WHIRLPOOL d8737384a524a28025c5af9ded843cdbd3324a0811f532912b9059158d1037d361de728fe777a0fff0546cbe8c5345b6f97a319ccae40c65ffbca0df01a96996
-EBUILD selinux-finger-9999.ebuild 378 SHA256 4241ec2c319c1abf8b9b3a15a1c25060e99cc5043dc48c1def5debb549b28ba9 SHA512 1086c4789810bdba2ca91427186686cef2ad8e4e6def01272e783c1f96f4ddaf266ae942191eba46f854ad635c9e1f9cace384bce85a81cb65064ed846bbad64 WHIRLPOOL 50de51637ffb5e18e5b87c5fe00d323ef84a7f0aeb6943d1ac5444369bed580b20f46836193b4402a52064bc7abcc663403c2549b615207979be3d84d919de12
+EBUILD selinux-finger-2.20170204-r1.ebuild 379 SHA256 bfa402b123d0f93221bc997c4b9f177645d7b2686e91399affb58692e7583e34 SHA512 88c1c9c746a4c19b16deac479d5d22197f0f2ff040541bd1648b505aac33929bf4b94f2c429d048ca6d0cce0cf98291c2fa41bbf1175ca7f966b24eacc31a2e0 WHIRLPOOL ae69c1fc973263642a8842ef610d4cd19dbd452abf2323088da404c0cbc5d98281eed37f48333b578a24547687614516733f2c462b28322effabb910e127dcc6
+EBUILD selinux-finger-2.20170204-r2.ebuild 377 SHA256 e75a32e07467148db6983a60b59aadef892765424ed10d6de50e2c9d1e526ae7 SHA512 1f4ce42ec01a318be586e92aea495c867d60e04d14c7fd08bf40b3bb410b34593a8ed3501d61e85d34fe1bac212811af46322290fd631c3e4acd7279a171c802 WHIRLPOOL 2a2560e596f1bc2250b43da363541390ea2ff99defcb317f92c6949473b1381547b3b6616b9e03071010f591d88a4593b873d0d6b766a9c1ad0d295367c45c8e
+EBUILD selinux-finger-2.20170204-r3.ebuild 377 SHA256 e75a32e07467148db6983a60b59aadef892765424ed10d6de50e2c9d1e526ae7 SHA512 1f4ce42ec01a318be586e92aea495c867d60e04d14c7fd08bf40b3bb410b34593a8ed3501d61e85d34fe1bac212811af46322290fd631c3e4acd7279a171c802 WHIRLPOOL 2a2560e596f1bc2250b43da363541390ea2ff99defcb317f92c6949473b1381547b3b6616b9e03071010f591d88a4593b873d0d6b766a9c1ad0d295367c45c8e
+EBUILD selinux-finger-2.20170204-r4.ebuild 377 SHA256 e75a32e07467148db6983a60b59aadef892765424ed10d6de50e2c9d1e526ae7 SHA512 1f4ce42ec01a318be586e92aea495c867d60e04d14c7fd08bf40b3bb410b34593a8ed3501d61e85d34fe1bac212811af46322290fd631c3e4acd7279a171c802 WHIRLPOOL 2a2560e596f1bc2250b43da363541390ea2ff99defcb317f92c6949473b1381547b3b6616b9e03071010f591d88a4593b873d0d6b766a9c1ad0d295367c45c8e
+EBUILD selinux-finger-2.20170805-r2.ebuild 377 SHA256 e75a32e07467148db6983a60b59aadef892765424ed10d6de50e2c9d1e526ae7 SHA512 1f4ce42ec01a318be586e92aea495c867d60e04d14c7fd08bf40b3bb410b34593a8ed3501d61e85d34fe1bac212811af46322290fd631c3e4acd7279a171c802 WHIRLPOOL 2a2560e596f1bc2250b43da363541390ea2ff99defcb317f92c6949473b1381547b3b6616b9e03071010f591d88a4593b873d0d6b766a9c1ad0d295367c45c8e
+EBUILD selinux-finger-2.20170805-r3.ebuild 379 SHA256 bfa402b123d0f93221bc997c4b9f177645d7b2686e91399affb58692e7583e34 SHA512 88c1c9c746a4c19b16deac479d5d22197f0f2ff040541bd1648b505aac33929bf4b94f2c429d048ca6d0cce0cf98291c2fa41bbf1175ca7f966b24eacc31a2e0 WHIRLPOOL ae69c1fc973263642a8842ef610d4cd19dbd452abf2323088da404c0cbc5d98281eed37f48333b578a24547687614516733f2c462b28322effabb910e127dcc6
+EBUILD selinux-finger-9999.ebuild 379 SHA256 bfa402b123d0f93221bc997c4b9f177645d7b2686e91399affb58692e7583e34 SHA512 88c1c9c746a4c19b16deac479d5d22197f0f2ff040541bd1648b505aac33929bf4b94f2c429d048ca6d0cce0cf98291c2fa41bbf1175ca7f966b24eacc31a2e0 WHIRLPOOL ae69c1fc973263642a8842ef610d4cd19dbd452abf2323088da404c0cbc5d98281eed37f48333b578a24547687614516733f2c462b28322effabb910e127dcc6
 MISC ChangeLog 10571 SHA256 eab5aff9540b68cef91d1c8f1265d8cc2628de0f9a1f3e3ee0cc7f0fcd7e0ebf SHA512 3141f9c3c25c9e1ee314d0e110e417d03196fe9187d69e93eeb88fcd01142a103befbf05abafa7ab89572f178f940f4359e32e0b5db0cb5a2c96ea763d4c259f WHIRLPOOL 4b129c960cde79caee947defa2056c2eed71ccdcd71187feca952086faa2e912e16b290a74069003ba34068d8a6d58d7e0cf7bed436a355cc526c3afc8e7c60b
 MISC ChangeLog-2015 10019 SHA256 34275be45ab1791edc1de1be14488edcc23fb632699b95493b74cc2697c61cb2 SHA512 426c064fcf072bdebf4fe0c1d0a766f34cbda4d970c31af5970d25402632d7ec182ac290a7bbb39c2498f98a8a16b54a29af90386ade2816ef1d41e76f3235ec WHIRLPOOL d128f5490789390d5243569b855553c7d4559ff91b24f8aa2fb8b20d12bc7ae94bdd728e35fdec2d847a34209c18990b42127495c6aa50874d69f1d53e262e20
 MISC metadata.xml 316 SHA256 f1f1e4e8fd96be1fa9957012f8f0c8c32e382839e114ca11a0d3acd28a85a82a SHA512 52daa0a0cca3fc954aafb579561bbd1c68d17cb2b1ab8f03b0de5be5a6d0c02dcdd1c1384a6b55dfe83e41ebf62da5dd3cb39bc11e03eacab82b18ce198ab8a7 WHIRLPOOL 42e236c422d707c3c4f86547a1efe60317f25d46c6ae1a99bd933f2abdb83c1830f03c4e9351e6d37c8cbdb4767c22608669db611ea3eeb721ebc4570397126d
diff --git a/sec-policy/selinux-finger/selinux-finger-2.20170204-r1.ebuild b/sec-policy/selinux-finger/selinux-finger-2.20170204-r1.ebuild
index 809bb064c8dd..eb23f0062012 100644
--- a/sec-policy/selinux-finger/selinux-finger-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-finger/selinux-finger-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-finger/selinux-finger-2.20170204-r2.ebuild b/sec-policy/selinux-finger/selinux-finger-2.20170204-r2.ebuild
index 12dcd9718c92..db0f3afa26f2 100644
--- a/sec-policy/selinux-finger/selinux-finger-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-finger/selinux-finger-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-finger/selinux-finger-2.20170204-r3.ebuild b/sec-policy/selinux-finger/selinux-finger-2.20170204-r3.ebuild
index 12dcd9718c92..db0f3afa26f2 100644
--- a/sec-policy/selinux-finger/selinux-finger-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-finger/selinux-finger-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-finger/selinux-finger-2.20170204-r4.ebuild b/sec-policy/selinux-finger/selinux-finger-2.20170204-r4.ebuild
index 12dcd9718c92..db0f3afa26f2 100644
--- a/sec-policy/selinux-finger/selinux-finger-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-finger/selinux-finger-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-finger/selinux-finger-2.20170805-r2.ebuild b/sec-policy/selinux-finger/selinux-finger-2.20170805-r2.ebuild
index 12dcd9718c92..db0f3afa26f2 100644
--- a/sec-policy/selinux-finger/selinux-finger-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-finger/selinux-finger-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-finger/selinux-finger-2.20170805-r3.ebuild b/sec-policy/selinux-finger/selinux-finger-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..eb23f0062012
--- /dev/null
+++ b/sec-policy/selinux-finger/selinux-finger-2.20170805-r3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-finger/selinux-finger-9999.ebuild b/sec-policy/selinux-finger/selinux-finger-9999.ebuild
index 809bb064c8dd..eb23f0062012 100644
--- a/sec-policy/selinux-finger/selinux-finger-9999.ebuild
+++ b/sec-policy/selinux-finger/selinux-finger-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-flash/Manifest b/sec-policy/selinux-flash/Manifest
index 14ff2a1e00ff..f03fcb6ed7ec 100644
--- a/sec-policy/selinux-flash/Manifest
+++ b/sec-policy/selinux-flash/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-flash-2.20170204-r1.ebuild 281 SHA256 510dad9a94bc65b3d9e47c4c07e450069197e719c3ba28fb279266d774d27ab8 SHA512 673c533703dc9c502db4e3f8811d22fc06d4626082e61ec24bb90dde97756aa6f86b5bbc164de3fe9a6eb841283342da4170b2363eec75e98a0fc67b97bf6afe WHIRLPOOL a96c8e2bbbd56268d09dd8e06f7350bc2c8e8ff9007d87ef503ad4999bcb13d68ca314a8f385a82ea706cd013302bac5536fa4c628500b830a4d0fd6724d2121
-EBUILD selinux-flash-2.20170204-r2.ebuild 279 SHA256 3d58e358d12ce65b63af878a1f60eabf986dd793f50ce6accd31b11e62fc0cdc SHA512 0060ce158ec61f634ace1aff75136d138847da64aff2e03b8fe6459a2cdf068d2989a6b425fc4dce095b72b226f8f8e0d751e055bc645816e1f7b69059cef45f WHIRLPOOL 5d5dc362a9fec419409e533c7095c1305ee3645501b1b5a0c654b79c980ba9d2d867ed0854b80675cf53df713575703c259538dc11f7fb9a7432206f1db2b9db
-EBUILD selinux-flash-2.20170204-r3.ebuild 279 SHA256 3d58e358d12ce65b63af878a1f60eabf986dd793f50ce6accd31b11e62fc0cdc SHA512 0060ce158ec61f634ace1aff75136d138847da64aff2e03b8fe6459a2cdf068d2989a6b425fc4dce095b72b226f8f8e0d751e055bc645816e1f7b69059cef45f WHIRLPOOL 5d5dc362a9fec419409e533c7095c1305ee3645501b1b5a0c654b79c980ba9d2d867ed0854b80675cf53df713575703c259538dc11f7fb9a7432206f1db2b9db
-EBUILD selinux-flash-2.20170204-r4.ebuild 279 SHA256 3d58e358d12ce65b63af878a1f60eabf986dd793f50ce6accd31b11e62fc0cdc SHA512 0060ce158ec61f634ace1aff75136d138847da64aff2e03b8fe6459a2cdf068d2989a6b425fc4dce095b72b226f8f8e0d751e055bc645816e1f7b69059cef45f WHIRLPOOL 5d5dc362a9fec419409e533c7095c1305ee3645501b1b5a0c654b79c980ba9d2d867ed0854b80675cf53df713575703c259538dc11f7fb9a7432206f1db2b9db
-EBUILD selinux-flash-2.20170805-r2.ebuild 279 SHA256 3d58e358d12ce65b63af878a1f60eabf986dd793f50ce6accd31b11e62fc0cdc SHA512 0060ce158ec61f634ace1aff75136d138847da64aff2e03b8fe6459a2cdf068d2989a6b425fc4dce095b72b226f8f8e0d751e055bc645816e1f7b69059cef45f WHIRLPOOL 5d5dc362a9fec419409e533c7095c1305ee3645501b1b5a0c654b79c980ba9d2d867ed0854b80675cf53df713575703c259538dc11f7fb9a7432206f1db2b9db
-EBUILD selinux-flash-9999.ebuild 281 SHA256 510dad9a94bc65b3d9e47c4c07e450069197e719c3ba28fb279266d774d27ab8 SHA512 673c533703dc9c502db4e3f8811d22fc06d4626082e61ec24bb90dde97756aa6f86b5bbc164de3fe9a6eb841283342da4170b2363eec75e98a0fc67b97bf6afe WHIRLPOOL a96c8e2bbbd56268d09dd8e06f7350bc2c8e8ff9007d87ef503ad4999bcb13d68ca314a8f385a82ea706cd013302bac5536fa4c628500b830a4d0fd6724d2121
+EBUILD selinux-flash-2.20170204-r1.ebuild 282 SHA256 97004528fa8e5cb5a84ee029f6eccfa1a0bfb6710d19761d21abcefcf63c35d2 SHA512 693a00499184276b494b9bcf6999968407d9a3f1f789d62a93f488e9522c86c816da1ef208a234de0da3406f70799316d71e37147bb65389ee12e56727844bf5 WHIRLPOOL 4b6bc4e48499080aea6ab2fe3633aa87ea941b1698e74a69f5e1fff63656e58b593276c72475358d7f91a28c4bcf8f628688888e64a02269f16983ac33ca4f5d
+EBUILD selinux-flash-2.20170204-r2.ebuild 280 SHA256 f90d0ef50cbc8dd6f3aabe2c0068b1309a3b242916a3293bcc73099127a5d483 SHA512 f02542149abf6b4ddf112b52e6ad85f0f54d98a6a79449d00a54bd38848354ad65edbb808e02601b3f04f83155eab7f549efb13d7f3784b935a585b3623708d3 WHIRLPOOL fb34e95b55743f634376cd277ffb27637a3803e73c49980308b996c781771513a163965981e909dd2995383739bf68db0fb64ec083b79ff2376bfa9c6a1449e2
+EBUILD selinux-flash-2.20170204-r3.ebuild 280 SHA256 f90d0ef50cbc8dd6f3aabe2c0068b1309a3b242916a3293bcc73099127a5d483 SHA512 f02542149abf6b4ddf112b52e6ad85f0f54d98a6a79449d00a54bd38848354ad65edbb808e02601b3f04f83155eab7f549efb13d7f3784b935a585b3623708d3 WHIRLPOOL fb34e95b55743f634376cd277ffb27637a3803e73c49980308b996c781771513a163965981e909dd2995383739bf68db0fb64ec083b79ff2376bfa9c6a1449e2
+EBUILD selinux-flash-2.20170204-r4.ebuild 280 SHA256 f90d0ef50cbc8dd6f3aabe2c0068b1309a3b242916a3293bcc73099127a5d483 SHA512 f02542149abf6b4ddf112b52e6ad85f0f54d98a6a79449d00a54bd38848354ad65edbb808e02601b3f04f83155eab7f549efb13d7f3784b935a585b3623708d3 WHIRLPOOL fb34e95b55743f634376cd277ffb27637a3803e73c49980308b996c781771513a163965981e909dd2995383739bf68db0fb64ec083b79ff2376bfa9c6a1449e2
+EBUILD selinux-flash-2.20170805-r2.ebuild 280 SHA256 f90d0ef50cbc8dd6f3aabe2c0068b1309a3b242916a3293bcc73099127a5d483 SHA512 f02542149abf6b4ddf112b52e6ad85f0f54d98a6a79449d00a54bd38848354ad65edbb808e02601b3f04f83155eab7f549efb13d7f3784b935a585b3623708d3 WHIRLPOOL fb34e95b55743f634376cd277ffb27637a3803e73c49980308b996c781771513a163965981e909dd2995383739bf68db0fb64ec083b79ff2376bfa9c6a1449e2
+EBUILD selinux-flash-2.20170805-r3.ebuild 282 SHA256 97004528fa8e5cb5a84ee029f6eccfa1a0bfb6710d19761d21abcefcf63c35d2 SHA512 693a00499184276b494b9bcf6999968407d9a3f1f789d62a93f488e9522c86c816da1ef208a234de0da3406f70799316d71e37147bb65389ee12e56727844bf5 WHIRLPOOL 4b6bc4e48499080aea6ab2fe3633aa87ea941b1698e74a69f5e1fff63656e58b593276c72475358d7f91a28c4bcf8f628688888e64a02269f16983ac33ca4f5d
+EBUILD selinux-flash-9999.ebuild 282 SHA256 97004528fa8e5cb5a84ee029f6eccfa1a0bfb6710d19761d21abcefcf63c35d2 SHA512 693a00499184276b494b9bcf6999968407d9a3f1f789d62a93f488e9522c86c816da1ef208a234de0da3406f70799316d71e37147bb65389ee12e56727844bf5 WHIRLPOOL 4b6bc4e48499080aea6ab2fe3633aa87ea941b1698e74a69f5e1fff63656e58b593276c72475358d7f91a28c4bcf8f628688888e64a02269f16983ac33ca4f5d
 MISC ChangeLog 10479 SHA256 ba692e49c824f3951916d4e882412762cee3d08caf250da086ca724bb31c9ae3 SHA512 4904456058ae070eb0995f50b9abd31a8d9c5510e1dc4b865df30f449b4b957c5a05a15cfd3d83eab5575fd16c270e7ff7075048a6aaa1e91999fd7e6488dded WHIRLPOOL 38c53c63056bb36164322820501cb251f4f9276d49e64ee42cec72994207edba2d65743caf7522ca01a498c0de746171c4f2047b8fe517f2fd7626d9a75cba6e
 MISC ChangeLog-2015 8123 SHA256 1dd68c6173a126d78b7fe465e1c9517efea6e4f7dccc5e4abf25c7b64238340c SHA512 2dbfacc0a6f6e0f4d6971fedf5deda3007cdc5ca2d9ece476ebf8531ee862d01df034f11681ebff2920565982c21758b7029766adee6c4a6103e1423c0c11aa4 WHIRLPOOL 262b2991759d959f71efa84f16c587889f16ef003cc07f244513fbff2a58803c747a18fcd573a923f724132d3df07778cba2d4a2c0ef27caca12e7348c2e248d
 MISC metadata.xml 326 SHA256 e0792e4bbfdc7bff214d851b6eee129fde9b349882e53a3be38d8011181d6e1a SHA512 0534363003255e27ff839750cb0a7363afe38894d5ffda86dca467dcc0c25cd0de3c186ae856391d3466602eedde24599fee66c2a2786bb662da5abb646a9d50 WHIRLPOOL f7e33dce66d0bf4d8c56d8be21141fa4c23bdf08ce24c965fed69875633f7a3ed6d8e8adce2ad65f7653e40eed93707ac77b77b5f90fd3ea6588af7f5e599d6e
diff --git a/sec-policy/selinux-flash/selinux-flash-2.20170204-r1.ebuild b/sec-policy/selinux-flash/selinux-flash-2.20170204-r1.ebuild
index 73d5f46dca89..b72f895854fe 100644
--- a/sec-policy/selinux-flash/selinux-flash-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-flash/selinux-flash-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-flash/selinux-flash-2.20170204-r2.ebuild b/sec-policy/selinux-flash/selinux-flash-2.20170204-r2.ebuild
index d488829750f2..c323d6d1b044 100644
--- a/sec-policy/selinux-flash/selinux-flash-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-flash/selinux-flash-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-flash/selinux-flash-2.20170204-r3.ebuild b/sec-policy/selinux-flash/selinux-flash-2.20170204-r3.ebuild
index d488829750f2..c323d6d1b044 100644
--- a/sec-policy/selinux-flash/selinux-flash-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-flash/selinux-flash-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-flash/selinux-flash-2.20170204-r4.ebuild b/sec-policy/selinux-flash/selinux-flash-2.20170204-r4.ebuild
index d488829750f2..c323d6d1b044 100644
--- a/sec-policy/selinux-flash/selinux-flash-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-flash/selinux-flash-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-flash/selinux-flash-2.20170805-r2.ebuild b/sec-policy/selinux-flash/selinux-flash-2.20170805-r2.ebuild
index d488829750f2..c323d6d1b044 100644
--- a/sec-policy/selinux-flash/selinux-flash-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-flash/selinux-flash-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-flash/selinux-flash-2.20170805-r3.ebuild b/sec-policy/selinux-flash/selinux-flash-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..b72f895854fe
--- /dev/null
+++ b/sec-policy/selinux-flash/selinux-flash-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-flash/selinux-flash-9999.ebuild b/sec-policy/selinux-flash/selinux-flash-9999.ebuild
index 73d5f46dca89..b72f895854fe 100644
--- a/sec-policy/selinux-flash/selinux-flash-9999.ebuild
+++ b/sec-policy/selinux-flash/selinux-flash-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-fprintd/Manifest b/sec-policy/selinux-fprintd/Manifest
index 9e1c0d98846f..f85f24b2d2b9 100644
--- a/sec-policy/selinux-fprintd/Manifest
+++ b/sec-policy/selinux-fprintd/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-fprintd-2.20170204-r1.ebuild 377 SHA256 c5585f5aeb2034f3fccbe6dcb3554a4266104a03de8c1f8993fe779d3ac0dfa5 SHA512 a534086ef73e7ae9f6e740e60eb0fe42722cc271e9494ac42e28f66c92789b2eadcc7a49baae8c4a416ab677d4c82897100c4b27f55e534753365e07082fe67f WHIRLPOOL 2538703374a3d4b1340ab22474fba0d2c21de878386c5cbc47586825606425a925ca0d9f6943d3f16f752ee395c293c47dccc86c55f1760ab045c95c75b393e8
-EBUILD selinux-fprintd-2.20170204-r2.ebuild 375 SHA256 1a2af5f01bbae3951f4186e30834cc91b8e586394ea5ffe4148b245a2fe6ab83 SHA512 33608b7c7ec6525b2727c9b033f2089b22bc36152b9fadad9894488f70829e1b9c663ff8a7e307783249af314f83d1b54648893c5b42904baf69b5f54cc9881e WHIRLPOOL 51df867f69990ec4e68c9e93b0902ea265cb05cf5566d75a24f9729342b04ebb030ae92aded0fbed55147adc10a3b8e9eeafa0b3f577ce851ffc66c59dc68d07
-EBUILD selinux-fprintd-2.20170204-r3.ebuild 375 SHA256 1a2af5f01bbae3951f4186e30834cc91b8e586394ea5ffe4148b245a2fe6ab83 SHA512 33608b7c7ec6525b2727c9b033f2089b22bc36152b9fadad9894488f70829e1b9c663ff8a7e307783249af314f83d1b54648893c5b42904baf69b5f54cc9881e WHIRLPOOL 51df867f69990ec4e68c9e93b0902ea265cb05cf5566d75a24f9729342b04ebb030ae92aded0fbed55147adc10a3b8e9eeafa0b3f577ce851ffc66c59dc68d07
-EBUILD selinux-fprintd-2.20170204-r4.ebuild 375 SHA256 1a2af5f01bbae3951f4186e30834cc91b8e586394ea5ffe4148b245a2fe6ab83 SHA512 33608b7c7ec6525b2727c9b033f2089b22bc36152b9fadad9894488f70829e1b9c663ff8a7e307783249af314f83d1b54648893c5b42904baf69b5f54cc9881e WHIRLPOOL 51df867f69990ec4e68c9e93b0902ea265cb05cf5566d75a24f9729342b04ebb030ae92aded0fbed55147adc10a3b8e9eeafa0b3f577ce851ffc66c59dc68d07
-EBUILD selinux-fprintd-2.20170805-r2.ebuild 375 SHA256 1a2af5f01bbae3951f4186e30834cc91b8e586394ea5ffe4148b245a2fe6ab83 SHA512 33608b7c7ec6525b2727c9b033f2089b22bc36152b9fadad9894488f70829e1b9c663ff8a7e307783249af314f83d1b54648893c5b42904baf69b5f54cc9881e WHIRLPOOL 51df867f69990ec4e68c9e93b0902ea265cb05cf5566d75a24f9729342b04ebb030ae92aded0fbed55147adc10a3b8e9eeafa0b3f577ce851ffc66c59dc68d07
-EBUILD selinux-fprintd-9999.ebuild 377 SHA256 c5585f5aeb2034f3fccbe6dcb3554a4266104a03de8c1f8993fe779d3ac0dfa5 SHA512 a534086ef73e7ae9f6e740e60eb0fe42722cc271e9494ac42e28f66c92789b2eadcc7a49baae8c4a416ab677d4c82897100c4b27f55e534753365e07082fe67f WHIRLPOOL 2538703374a3d4b1340ab22474fba0d2c21de878386c5cbc47586825606425a925ca0d9f6943d3f16f752ee395c293c47dccc86c55f1760ab045c95c75b393e8
+EBUILD selinux-fprintd-2.20170204-r1.ebuild 378 SHA256 99f9f6b920707ff21933112e7af43c70cd1d1c5d4d62ea13b5f146593748b47e SHA512 7c44ff20bf43e7d9ba3ccd844759ce7e423b4e72214b84ce4c25cde3e876b6fbe21cbd8880ee5f89220b825719135cf4e677a93b6d7f138d16a6d7035609bed9 WHIRLPOOL dec63a0ca1288d5f15f6700ef19ed39206aab142eb197e991d946b2df175ea3751093aea357a54fdf5feb5b2b4df12e640d96fe95cfae27de43feaa70d7fa30c
+EBUILD selinux-fprintd-2.20170204-r2.ebuild 376 SHA256 6bf5dd8ab896c5ba316a4c43204d9b8c90c398175926d1be6d71bc09340ec82f SHA512 367d01eeb451d55109349bf19487c4931c46ffe0cd85af3d1c7c043f1b4d44c90f6491212087c110a66c5d679c821bb19cce03cd6ff321b8d81531b35529c3a3 WHIRLPOOL 04c6f45989a3c57b7654457a984d132a49af0a46db6a4175e24c91a9f6f99550ce59f17406781194a8f59e2578892745b9988da653ca4f86e30d64cd23ab70d7
+EBUILD selinux-fprintd-2.20170204-r3.ebuild 376 SHA256 6bf5dd8ab896c5ba316a4c43204d9b8c90c398175926d1be6d71bc09340ec82f SHA512 367d01eeb451d55109349bf19487c4931c46ffe0cd85af3d1c7c043f1b4d44c90f6491212087c110a66c5d679c821bb19cce03cd6ff321b8d81531b35529c3a3 WHIRLPOOL 04c6f45989a3c57b7654457a984d132a49af0a46db6a4175e24c91a9f6f99550ce59f17406781194a8f59e2578892745b9988da653ca4f86e30d64cd23ab70d7
+EBUILD selinux-fprintd-2.20170204-r4.ebuild 376 SHA256 6bf5dd8ab896c5ba316a4c43204d9b8c90c398175926d1be6d71bc09340ec82f SHA512 367d01eeb451d55109349bf19487c4931c46ffe0cd85af3d1c7c043f1b4d44c90f6491212087c110a66c5d679c821bb19cce03cd6ff321b8d81531b35529c3a3 WHIRLPOOL 04c6f45989a3c57b7654457a984d132a49af0a46db6a4175e24c91a9f6f99550ce59f17406781194a8f59e2578892745b9988da653ca4f86e30d64cd23ab70d7
+EBUILD selinux-fprintd-2.20170805-r2.ebuild 376 SHA256 6bf5dd8ab896c5ba316a4c43204d9b8c90c398175926d1be6d71bc09340ec82f SHA512 367d01eeb451d55109349bf19487c4931c46ffe0cd85af3d1c7c043f1b4d44c90f6491212087c110a66c5d679c821bb19cce03cd6ff321b8d81531b35529c3a3 WHIRLPOOL 04c6f45989a3c57b7654457a984d132a49af0a46db6a4175e24c91a9f6f99550ce59f17406781194a8f59e2578892745b9988da653ca4f86e30d64cd23ab70d7
+EBUILD selinux-fprintd-2.20170805-r3.ebuild 378 SHA256 99f9f6b920707ff21933112e7af43c70cd1d1c5d4d62ea13b5f146593748b47e SHA512 7c44ff20bf43e7d9ba3ccd844759ce7e423b4e72214b84ce4c25cde3e876b6fbe21cbd8880ee5f89220b825719135cf4e677a93b6d7f138d16a6d7035609bed9 WHIRLPOOL dec63a0ca1288d5f15f6700ef19ed39206aab142eb197e991d946b2df175ea3751093aea357a54fdf5feb5b2b4df12e640d96fe95cfae27de43feaa70d7fa30c
+EBUILD selinux-fprintd-9999.ebuild 378 SHA256 99f9f6b920707ff21933112e7af43c70cd1d1c5d4d62ea13b5f146593748b47e SHA512 7c44ff20bf43e7d9ba3ccd844759ce7e423b4e72214b84ce4c25cde3e876b6fbe21cbd8880ee5f89220b825719135cf4e677a93b6d7f138d16a6d7035609bed9 WHIRLPOOL dec63a0ca1288d5f15f6700ef19ed39206aab142eb197e991d946b2df175ea3751093aea357a54fdf5feb5b2b4df12e640d96fe95cfae27de43feaa70d7fa30c
 MISC ChangeLog 10687 SHA256 a2a93d90d06a937bd908e6dd2d24e0642adab326500882b00451a2b558823c3b SHA512 5ca890665f0f1138dbbb3faa7ad0f88847d2be159029736e5c2734e02db73dbc0ae49ef8384378d9871305eb421802822ce45d98c642ce930336c8b9de97daab WHIRLPOOL 49d926e50697acec9b343a12263d1b2608453313d686538ac8235fe0b12a1af9d62c2473be9b351f4a4e61b65c3da98812ba24b6ea8391b266e8afe8575ccadc
 MISC ChangeLog-2015 10245 SHA256 859d5d142c2905fa8f4880dbcd4e555658488015f8bf8010b9c9c84d9900ddb4 SHA512 3710feb799e9e288bbd8e35253a15c3a24e98db5c8cceef308b0c02a9df96c14ae94b717832a189f35f4bbf5708994a79b60bb07d1292cea466b00495f094e13 WHIRLPOOL efd5f7b2fa6ef0e0cd1c3e415513f517bb1ed3686fb21f2929ee548ab49724698dfb0a418cbf99907a930d0c1a723649826f610bbf0ed35f334b5959ad75f787
 MISC metadata.xml 317 SHA256 dbe281edf027409241cffc2ebd31bc936f6a1b7c41dd60030267150c8fc64880 SHA512 b81abea30f23855ef1ab888e412acae6e66013ed0805219a09cdf6b89dfb06bb76f009aa4adb2caf880b4db26193af2fd90d4d95b74e94568438687dbc578d19 WHIRLPOOL 188e126ac8559020c0c19194eaef6c461d492f467e09e5bf246f381dd3012b2701becd2d1108451f59d745f2b2dfc6681554ca797c53db59dab7d1a340e06317
diff --git a/sec-policy/selinux-fprintd/selinux-fprintd-2.20170204-r1.ebuild b/sec-policy/selinux-fprintd/selinux-fprintd-2.20170204-r1.ebuild
index 0801db7732d1..d302e23cb97d 100644
--- a/sec-policy/selinux-fprintd/selinux-fprintd-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-fprintd/selinux-fprintd-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-fprintd/selinux-fprintd-2.20170204-r2.ebuild b/sec-policy/selinux-fprintd/selinux-fprintd-2.20170204-r2.ebuild
index 832fea62767d..a683af902859 100644
--- a/sec-policy/selinux-fprintd/selinux-fprintd-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-fprintd/selinux-fprintd-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-fprintd/selinux-fprintd-2.20170204-r3.ebuild b/sec-policy/selinux-fprintd/selinux-fprintd-2.20170204-r3.ebuild
index 832fea62767d..a683af902859 100644
--- a/sec-policy/selinux-fprintd/selinux-fprintd-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-fprintd/selinux-fprintd-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-fprintd/selinux-fprintd-2.20170204-r4.ebuild b/sec-policy/selinux-fprintd/selinux-fprintd-2.20170204-r4.ebuild
index 832fea62767d..a683af902859 100644
--- a/sec-policy/selinux-fprintd/selinux-fprintd-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-fprintd/selinux-fprintd-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-fprintd/selinux-fprintd-2.20170805-r2.ebuild b/sec-policy/selinux-fprintd/selinux-fprintd-2.20170805-r2.ebuild
index 832fea62767d..a683af902859 100644
--- a/sec-policy/selinux-fprintd/selinux-fprintd-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-fprintd/selinux-fprintd-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-fprintd/selinux-fprintd-2.20170805-r3.ebuild b/sec-policy/selinux-fprintd/selinux-fprintd-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..d302e23cb97d
--- /dev/null
+++ b/sec-policy/selinux-fprintd/selinux-fprintd-2.20170805-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-fprintd/selinux-fprintd-9999.ebuild b/sec-policy/selinux-fprintd/selinux-fprintd-9999.ebuild
index 0801db7732d1..d302e23cb97d 100644
--- a/sec-policy/selinux-fprintd/selinux-fprintd-9999.ebuild
+++ b/sec-policy/selinux-fprintd/selinux-fprintd-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ftp/Manifest b/sec-policy/selinux-ftp/Manifest
index cbef3528c83b..9fcd08fa2024 100644
--- a/sec-policy/selinux-ftp/Manifest
+++ b/sec-policy/selinux-ftp/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-ftp-2.20170204-r1.ebuild 277 SHA256 61ef53f94a1b61dfe7243614245f940fdb127e4eb55b469701937c3d1a4b52ab SHA512 3e073be679805e3bf51fd1b0bf73d5c7711b61e4655147ca52957e7f477cc56de8a548e73a2a7a1fd8aa71bd73e98042163152bd4ab511389a68a07e953f2629 WHIRLPOOL f4ba6ff4fe60d006baab47e6bc7a19de4a192cef40f470e21a8c7744792824527a4b00a096f93787ca389b08b6a566f2d1eaa14a0d15bf6ed4dc21f66124fc62
-EBUILD selinux-ftp-2.20170204-r2.ebuild 275 SHA256 d096ef61a5788479a665d8f998345b86f7e72e49774f767eed75d3dd6c6d8194 SHA512 f3eaf153f3e2e7d25b02c6291ced1a14018facdf8b094ebf3dfcb5f1a0dbb76cdb3bb5478136d0f61d410ff12d52ddf66620dfe64adabf5a42dc251013d8d54c WHIRLPOOL b1a9fec3025988c2dde04137fbdc5ee1248e0677a3689842b1fb114190ab1d3987d73c010202b26ae667887a1fdb3ef44ea0ea51ac08fd21cd0bf9b76267fc79
-EBUILD selinux-ftp-2.20170204-r3.ebuild 275 SHA256 d096ef61a5788479a665d8f998345b86f7e72e49774f767eed75d3dd6c6d8194 SHA512 f3eaf153f3e2e7d25b02c6291ced1a14018facdf8b094ebf3dfcb5f1a0dbb76cdb3bb5478136d0f61d410ff12d52ddf66620dfe64adabf5a42dc251013d8d54c WHIRLPOOL b1a9fec3025988c2dde04137fbdc5ee1248e0677a3689842b1fb114190ab1d3987d73c010202b26ae667887a1fdb3ef44ea0ea51ac08fd21cd0bf9b76267fc79
-EBUILD selinux-ftp-2.20170204-r4.ebuild 275 SHA256 d096ef61a5788479a665d8f998345b86f7e72e49774f767eed75d3dd6c6d8194 SHA512 f3eaf153f3e2e7d25b02c6291ced1a14018facdf8b094ebf3dfcb5f1a0dbb76cdb3bb5478136d0f61d410ff12d52ddf66620dfe64adabf5a42dc251013d8d54c WHIRLPOOL b1a9fec3025988c2dde04137fbdc5ee1248e0677a3689842b1fb114190ab1d3987d73c010202b26ae667887a1fdb3ef44ea0ea51ac08fd21cd0bf9b76267fc79
-EBUILD selinux-ftp-2.20170805-r2.ebuild 275 SHA256 d096ef61a5788479a665d8f998345b86f7e72e49774f767eed75d3dd6c6d8194 SHA512 f3eaf153f3e2e7d25b02c6291ced1a14018facdf8b094ebf3dfcb5f1a0dbb76cdb3bb5478136d0f61d410ff12d52ddf66620dfe64adabf5a42dc251013d8d54c WHIRLPOOL b1a9fec3025988c2dde04137fbdc5ee1248e0677a3689842b1fb114190ab1d3987d73c010202b26ae667887a1fdb3ef44ea0ea51ac08fd21cd0bf9b76267fc79
-EBUILD selinux-ftp-9999.ebuild 277 SHA256 61ef53f94a1b61dfe7243614245f940fdb127e4eb55b469701937c3d1a4b52ab SHA512 3e073be679805e3bf51fd1b0bf73d5c7711b61e4655147ca52957e7f477cc56de8a548e73a2a7a1fd8aa71bd73e98042163152bd4ab511389a68a07e953f2629 WHIRLPOOL f4ba6ff4fe60d006baab47e6bc7a19de4a192cef40f470e21a8c7744792824527a4b00a096f93787ca389b08b6a566f2d1eaa14a0d15bf6ed4dc21f66124fc62
+EBUILD selinux-ftp-2.20170204-r1.ebuild 278 SHA256 feac5948b5e450492f0c7e8e00fec2d14d6409c0b5e9ecb365d80e500cb9f3d9 SHA512 224834fc17de3d8aa1869721f6385d16c6fcae5df2a7f4f00633b1f0491f79f791a0bdc1be6660a555edd623bd28e00772c3e4a321d0dda9aed59d1b31279223 WHIRLPOOL f57316532e69e093d64e92787929e1e21bd801f2408cceaf896c4326f19f5c913493929666eb199b81a6064dacfb3dadee14ff9b1add0a7f61032a9edfe3e03f
+EBUILD selinux-ftp-2.20170204-r2.ebuild 276 SHA256 fbfaa6e3a59e4f3e5eca6d751b924430552672f8e4a2b55880af4186709a32e3 SHA512 e6da029767e22934af7e09443ccb370025ce5b4241a67ac61e2cb47784c0692d0c9a2393f03c75debe84b3a2d30cb5f99fb8d2816b899de38c87add603f953fc WHIRLPOOL 2ab1d7d7d902ba69fc0ea74f045a275da61f62a2bf8542590fe9834598221f1fe05178fa7015fa629b5771a7f2f82fe6cf8b5bac7eb473e9f8a6823a146d2076
+EBUILD selinux-ftp-2.20170204-r3.ebuild 276 SHA256 fbfaa6e3a59e4f3e5eca6d751b924430552672f8e4a2b55880af4186709a32e3 SHA512 e6da029767e22934af7e09443ccb370025ce5b4241a67ac61e2cb47784c0692d0c9a2393f03c75debe84b3a2d30cb5f99fb8d2816b899de38c87add603f953fc WHIRLPOOL 2ab1d7d7d902ba69fc0ea74f045a275da61f62a2bf8542590fe9834598221f1fe05178fa7015fa629b5771a7f2f82fe6cf8b5bac7eb473e9f8a6823a146d2076
+EBUILD selinux-ftp-2.20170204-r4.ebuild 276 SHA256 fbfaa6e3a59e4f3e5eca6d751b924430552672f8e4a2b55880af4186709a32e3 SHA512 e6da029767e22934af7e09443ccb370025ce5b4241a67ac61e2cb47784c0692d0c9a2393f03c75debe84b3a2d30cb5f99fb8d2816b899de38c87add603f953fc WHIRLPOOL 2ab1d7d7d902ba69fc0ea74f045a275da61f62a2bf8542590fe9834598221f1fe05178fa7015fa629b5771a7f2f82fe6cf8b5bac7eb473e9f8a6823a146d2076
+EBUILD selinux-ftp-2.20170805-r2.ebuild 276 SHA256 fbfaa6e3a59e4f3e5eca6d751b924430552672f8e4a2b55880af4186709a32e3 SHA512 e6da029767e22934af7e09443ccb370025ce5b4241a67ac61e2cb47784c0692d0c9a2393f03c75debe84b3a2d30cb5f99fb8d2816b899de38c87add603f953fc WHIRLPOOL 2ab1d7d7d902ba69fc0ea74f045a275da61f62a2bf8542590fe9834598221f1fe05178fa7015fa629b5771a7f2f82fe6cf8b5bac7eb473e9f8a6823a146d2076
+EBUILD selinux-ftp-2.20170805-r3.ebuild 278 SHA256 feac5948b5e450492f0c7e8e00fec2d14d6409c0b5e9ecb365d80e500cb9f3d9 SHA512 224834fc17de3d8aa1869721f6385d16c6fcae5df2a7f4f00633b1f0491f79f791a0bdc1be6660a555edd623bd28e00772c3e4a321d0dda9aed59d1b31279223 WHIRLPOOL f57316532e69e093d64e92787929e1e21bd801f2408cceaf896c4326f19f5c913493929666eb199b81a6064dacfb3dadee14ff9b1add0a7f61032a9edfe3e03f
+EBUILD selinux-ftp-9999.ebuild 278 SHA256 feac5948b5e450492f0c7e8e00fec2d14d6409c0b5e9ecb365d80e500cb9f3d9 SHA512 224834fc17de3d8aa1869721f6385d16c6fcae5df2a7f4f00633b1f0491f79f791a0bdc1be6660a555edd623bd28e00772c3e4a321d0dda9aed59d1b31279223 WHIRLPOOL f57316532e69e093d64e92787929e1e21bd801f2408cceaf896c4326f19f5c913493929666eb199b81a6064dacfb3dadee14ff9b1add0a7f61032a9edfe3e03f
 MISC ChangeLog 10295 SHA256 7f310ef20bb5d26ce8929b1b78a4a80eacf30e92a5b4b7e59f1af5f585a4cd38 SHA512 42118cdb7a4118a763b1d2073f381f97d18e312a758684d0ff6a90465d45944873a535677895c2c0850ac39d7237fb059e59901a382edadf2d3fbac7cd3f9a1e WHIRLPOOL b29c20e06c8dbecf45e23761cd6e1c9baf2effba95db8af10bbfa633911706cd0f2e64e39e9431896fc8e3bea85ee5ffde777f7449db5edfe18fe56b9407e8ed
 MISC ChangeLog-2015 9559 SHA256 4e2ddf358d5e573aec55161d66bd53578f128a381117b38d5572c036c0b8c50c SHA512 82cd25475a4ed77e607051ae6df33e5a0da92e1308d2e4be816a6dfc125d14f93074199cbebfec3b68fd9e9d6e5f1fe1f9fdc471f7ad518bbf66c45f99a8f32a WHIRLPOOL e37d56b8edcb3640cbea3f1015b0a1038df3ce76953186db0cb5b29488a7356db2702af9300b27834af2d99585e16fe11ac656e54dbf093bfc15c6f453971c58
 MISC metadata.xml 313 SHA256 aaced15dbf5df877d4c41e683c85828cfb0724a904caacc16fd1989adc1e5012 SHA512 766f08c10b53ad30173f64f9ca3306cc2441442a6dfb3fd48d485bd0c3c2bb95896e447f6e1d94db1b6808c111489e2e5c2f40c64b1642303d801c99d1fe8c57 WHIRLPOOL c9e70d0e137523ffbee7a48886b9170ef603b7d214d15d264f8907e244b82b43be7f8f1e0770794482db41ef23569b98fd7d31a5893b0189658f7b535e5870f9
diff --git a/sec-policy/selinux-ftp/selinux-ftp-2.20170204-r1.ebuild b/sec-policy/selinux-ftp/selinux-ftp-2.20170204-r1.ebuild
index 3c38021ce1ac..8e0376cb5ebb 100644
--- a/sec-policy/selinux-ftp/selinux-ftp-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-ftp/selinux-ftp-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ftp/selinux-ftp-2.20170204-r2.ebuild b/sec-policy/selinux-ftp/selinux-ftp-2.20170204-r2.ebuild
index c2506bd96c8e..9d26c095cd26 100644
--- a/sec-policy/selinux-ftp/selinux-ftp-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-ftp/selinux-ftp-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ftp/selinux-ftp-2.20170204-r3.ebuild b/sec-policy/selinux-ftp/selinux-ftp-2.20170204-r3.ebuild
index c2506bd96c8e..9d26c095cd26 100644
--- a/sec-policy/selinux-ftp/selinux-ftp-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-ftp/selinux-ftp-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ftp/selinux-ftp-2.20170204-r4.ebuild b/sec-policy/selinux-ftp/selinux-ftp-2.20170204-r4.ebuild
index c2506bd96c8e..9d26c095cd26 100644
--- a/sec-policy/selinux-ftp/selinux-ftp-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-ftp/selinux-ftp-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ftp/selinux-ftp-2.20170805-r2.ebuild b/sec-policy/selinux-ftp/selinux-ftp-2.20170805-r2.ebuild
index c2506bd96c8e..9d26c095cd26 100644
--- a/sec-policy/selinux-ftp/selinux-ftp-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-ftp/selinux-ftp-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ftp/selinux-ftp-2.20170805-r3.ebuild b/sec-policy/selinux-ftp/selinux-ftp-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..8e0376cb5ebb
--- /dev/null
+++ b/sec-policy/selinux-ftp/selinux-ftp-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-ftp/selinux-ftp-9999.ebuild b/sec-policy/selinux-ftp/selinux-ftp-9999.ebuild
index 3c38021ce1ac..8e0376cb5ebb 100644
--- a/sec-policy/selinux-ftp/selinux-ftp-9999.ebuild
+++ b/sec-policy/selinux-ftp/selinux-ftp-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-games/Manifest b/sec-policy/selinux-games/Manifest
index 52e2a9a08ccf..ca49ed66ed3d 100644
--- a/sec-policy/selinux-games/Manifest
+++ b/sec-policy/selinux-games/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-games-2.20170204-r1.ebuild 281 SHA256 0df22aa269efa26fd6421f357ef6ed0eb2b489e4853558fc34161b522d50c14b SHA512 d9b868a3a16a029e4ab70629c45ec78c47329432185bc984c55214d3c5915673694404f07121952b00d93ecc9d63815b6c19fa12c1bea0c33802776e97a7cdf6 WHIRLPOOL cc06217e99d120ffe24625be6958e45493c29567b0b566dc24445594f04f4cb885d98f3ac76db7babc507f24b450305bf3193ad4586e8882ee5ff9c4a8addb97
-EBUILD selinux-games-2.20170204-r2.ebuild 279 SHA256 2756665307ba1f19b1d27b97348d267ee2aa99275f0335d9a442a72654c29a9e SHA512 56331bc4e256f820d4014da1d16db9bff0856beaf58078afee0eb4e56d23811410ff2d35a93b046b9b990ef69ed342f3b5cfcc2d206f8e8153a59e5b52cbe9e3 WHIRLPOOL 0851e10d089f3ef38d0235bd6170c28fdd25f0a4f3f4adca331cb694386546f5a9c1161c831377bd7556876646665097128de2452ecc782d4e5247d2aa608b7e
-EBUILD selinux-games-2.20170204-r3.ebuild 279 SHA256 2756665307ba1f19b1d27b97348d267ee2aa99275f0335d9a442a72654c29a9e SHA512 56331bc4e256f820d4014da1d16db9bff0856beaf58078afee0eb4e56d23811410ff2d35a93b046b9b990ef69ed342f3b5cfcc2d206f8e8153a59e5b52cbe9e3 WHIRLPOOL 0851e10d089f3ef38d0235bd6170c28fdd25f0a4f3f4adca331cb694386546f5a9c1161c831377bd7556876646665097128de2452ecc782d4e5247d2aa608b7e
-EBUILD selinux-games-2.20170204-r4.ebuild 279 SHA256 2756665307ba1f19b1d27b97348d267ee2aa99275f0335d9a442a72654c29a9e SHA512 56331bc4e256f820d4014da1d16db9bff0856beaf58078afee0eb4e56d23811410ff2d35a93b046b9b990ef69ed342f3b5cfcc2d206f8e8153a59e5b52cbe9e3 WHIRLPOOL 0851e10d089f3ef38d0235bd6170c28fdd25f0a4f3f4adca331cb694386546f5a9c1161c831377bd7556876646665097128de2452ecc782d4e5247d2aa608b7e
-EBUILD selinux-games-2.20170805-r2.ebuild 279 SHA256 2756665307ba1f19b1d27b97348d267ee2aa99275f0335d9a442a72654c29a9e SHA512 56331bc4e256f820d4014da1d16db9bff0856beaf58078afee0eb4e56d23811410ff2d35a93b046b9b990ef69ed342f3b5cfcc2d206f8e8153a59e5b52cbe9e3 WHIRLPOOL 0851e10d089f3ef38d0235bd6170c28fdd25f0a4f3f4adca331cb694386546f5a9c1161c831377bd7556876646665097128de2452ecc782d4e5247d2aa608b7e
-EBUILD selinux-games-9999.ebuild 281 SHA256 0df22aa269efa26fd6421f357ef6ed0eb2b489e4853558fc34161b522d50c14b SHA512 d9b868a3a16a029e4ab70629c45ec78c47329432185bc984c55214d3c5915673694404f07121952b00d93ecc9d63815b6c19fa12c1bea0c33802776e97a7cdf6 WHIRLPOOL cc06217e99d120ffe24625be6958e45493c29567b0b566dc24445594f04f4cb885d98f3ac76db7babc507f24b450305bf3193ad4586e8882ee5ff9c4a8addb97
+EBUILD selinux-games-2.20170204-r1.ebuild 282 SHA256 f062bde08dc22a32e1b9188ed71d4406f6a7ba5344ba74e5777cb5844fac5f73 SHA512 8d2292aac43ddd08870c6418c473bfd57ca7c9e4a6f745273f9ab94616a1749674c38bdf788592ffb84ebd79a155dc07e46948a8798c526d1ab75d24c9408066 WHIRLPOOL dbbbe2e9c334adf563c5d7766a24ef07906cd8673c73848d8526ffd42a6a5a7ff0293b45acb0f2f56c5e114bc777c0930f07442f8bbd312da6ef38033b04e177
+EBUILD selinux-games-2.20170204-r2.ebuild 280 SHA256 e2499896b0b898a0bc56958521e5b2d1c023563f7d9ee528cf61515c3fa23786 SHA512 164274c9a33d9bd0210568b4294ec61994a41ac04c99951aa68dd9ad596d2120a0228f3c40b95d44418807e3a9cb5548a136b8d7e095c9cb666196d399eedfc0 WHIRLPOOL 5d9b8fef4871f0c43aaebed43c4fc06a05d82a9f10f21f74c2677751050b6bfe3b21303c15e5372f2120768923c519404effa8c9ef40a88d9674d07157c79f0f
+EBUILD selinux-games-2.20170204-r3.ebuild 280 SHA256 e2499896b0b898a0bc56958521e5b2d1c023563f7d9ee528cf61515c3fa23786 SHA512 164274c9a33d9bd0210568b4294ec61994a41ac04c99951aa68dd9ad596d2120a0228f3c40b95d44418807e3a9cb5548a136b8d7e095c9cb666196d399eedfc0 WHIRLPOOL 5d9b8fef4871f0c43aaebed43c4fc06a05d82a9f10f21f74c2677751050b6bfe3b21303c15e5372f2120768923c519404effa8c9ef40a88d9674d07157c79f0f
+EBUILD selinux-games-2.20170204-r4.ebuild 280 SHA256 e2499896b0b898a0bc56958521e5b2d1c023563f7d9ee528cf61515c3fa23786 SHA512 164274c9a33d9bd0210568b4294ec61994a41ac04c99951aa68dd9ad596d2120a0228f3c40b95d44418807e3a9cb5548a136b8d7e095c9cb666196d399eedfc0 WHIRLPOOL 5d9b8fef4871f0c43aaebed43c4fc06a05d82a9f10f21f74c2677751050b6bfe3b21303c15e5372f2120768923c519404effa8c9ef40a88d9674d07157c79f0f
+EBUILD selinux-games-2.20170805-r2.ebuild 280 SHA256 e2499896b0b898a0bc56958521e5b2d1c023563f7d9ee528cf61515c3fa23786 SHA512 164274c9a33d9bd0210568b4294ec61994a41ac04c99951aa68dd9ad596d2120a0228f3c40b95d44418807e3a9cb5548a136b8d7e095c9cb666196d399eedfc0 WHIRLPOOL 5d9b8fef4871f0c43aaebed43c4fc06a05d82a9f10f21f74c2677751050b6bfe3b21303c15e5372f2120768923c519404effa8c9ef40a88d9674d07157c79f0f
+EBUILD selinux-games-2.20170805-r3.ebuild 282 SHA256 f062bde08dc22a32e1b9188ed71d4406f6a7ba5344ba74e5777cb5844fac5f73 SHA512 8d2292aac43ddd08870c6418c473bfd57ca7c9e4a6f745273f9ab94616a1749674c38bdf788592ffb84ebd79a155dc07e46948a8798c526d1ab75d24c9408066 WHIRLPOOL dbbbe2e9c334adf563c5d7766a24ef07906cd8673c73848d8526ffd42a6a5a7ff0293b45acb0f2f56c5e114bc777c0930f07442f8bbd312da6ef38033b04e177
+EBUILD selinux-games-9999.ebuild 282 SHA256 f062bde08dc22a32e1b9188ed71d4406f6a7ba5344ba74e5777cb5844fac5f73 SHA512 8d2292aac43ddd08870c6418c473bfd57ca7c9e4a6f745273f9ab94616a1749674c38bdf788592ffb84ebd79a155dc07e46948a8798c526d1ab75d24c9408066 WHIRLPOOL dbbbe2e9c334adf563c5d7766a24ef07906cd8673c73848d8526ffd42a6a5a7ff0293b45acb0f2f56c5e114bc777c0930f07442f8bbd312da6ef38033b04e177
 MISC ChangeLog 10479 SHA256 33101ba515ad3687275311afb53c26733e690640c27df4aaf1588c9699393a69 SHA512 ed1bd1004217580cbd2790829b4db5179fc53b8a3d4aae885d53cfea664f83db6a4f4127472be71047d85c63e390c4b81bcb1903cb0e3c08c0b8993acd8c366b WHIRLPOOL 2fae899b204b2fdb09269ee0083b66955ab44f2150e1166e55f7048e7ac3a6b754e3f8feac651d48de46baabeee4b2547675c8067a97bdffdf6c97300e37e792
 MISC ChangeLog-2015 11247 SHA256 fd0a67951299ca71120c81a5209d61d52211f119e0bfb64bdbdbc726576d7dba SHA512 5c4327b0624b9deab9d5075b8c03a759b2f2f06398b2756e5f49826035c8936902d31977d1eaa1c0c35a35a89547b6b3f773e44458ed5f952500ca2fb0b5934c WHIRLPOOL 76f5306bbb7eebcef183c2ba965b751f19aec7a066634b1d106d3b00c4ba0d226616ea85f5ffe3bd7b1c8dd04ea47bca8283f50d0aa2d55593913a090352c97b
 MISC metadata.xml 315 SHA256 89e4a7355dd028b80d6f9c71472e4a110bb4cef1fed2239c741ebafbb2393796 SHA512 056daa36a74927c8200145591e5fbabc9404fea497de85f944ab497c9b75507a34c7f40696829dbdb5d7d7edb8a74e8bc4fce97acba3ec84bbdf8000a106544b WHIRLPOOL e82ea95226d22a0b38bb07a40d8e6d9ea72df47be9ed7d954c7c0ded13c3a3edf1f9304cc40093c835301d06889921f98ece007126c08045cf686b4ca4044308
diff --git a/sec-policy/selinux-games/selinux-games-2.20170204-r1.ebuild b/sec-policy/selinux-games/selinux-games-2.20170204-r1.ebuild
index 9e70aea20468..4c24909e61d9 100644
--- a/sec-policy/selinux-games/selinux-games-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-games/selinux-games-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-games/selinux-games-2.20170204-r2.ebuild b/sec-policy/selinux-games/selinux-games-2.20170204-r2.ebuild
index 700162983c2e..d512c656bda1 100644
--- a/sec-policy/selinux-games/selinux-games-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-games/selinux-games-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-games/selinux-games-2.20170204-r3.ebuild b/sec-policy/selinux-games/selinux-games-2.20170204-r3.ebuild
index 700162983c2e..d512c656bda1 100644
--- a/sec-policy/selinux-games/selinux-games-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-games/selinux-games-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-games/selinux-games-2.20170204-r4.ebuild b/sec-policy/selinux-games/selinux-games-2.20170204-r4.ebuild
index 700162983c2e..d512c656bda1 100644
--- a/sec-policy/selinux-games/selinux-games-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-games/selinux-games-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-games/selinux-games-2.20170805-r2.ebuild b/sec-policy/selinux-games/selinux-games-2.20170805-r2.ebuild
index 700162983c2e..d512c656bda1 100644
--- a/sec-policy/selinux-games/selinux-games-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-games/selinux-games-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-games/selinux-games-2.20170805-r3.ebuild b/sec-policy/selinux-games/selinux-games-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..4c24909e61d9
--- /dev/null
+++ b/sec-policy/selinux-games/selinux-games-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-games/selinux-games-9999.ebuild b/sec-policy/selinux-games/selinux-games-9999.ebuild
index 9e70aea20468..4c24909e61d9 100644
--- a/sec-policy/selinux-games/selinux-games-9999.ebuild
+++ b/sec-policy/selinux-games/selinux-games-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-gatekeeper/Manifest b/sec-policy/selinux-gatekeeper/Manifest
index 4d36a90ff9a9..c53b535c16ac 100644
--- a/sec-policy/selinux-gatekeeper/Manifest
+++ b/sec-policy/selinux-gatekeeper/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-gatekeeper-2.20170204-r1.ebuild 291 SHA256 10bb09df485f629ff87ef274e1dd5919708080ff19464d0bf40af6970e41a796 SHA512 e6b727ce34bd6e7d2014975d40bb8049aeb192b89a666a3c08f83a4c37d043de4b85706ffadf7c563acbf57fc460941f6f2f898f3d257a62e6b5a934b9dc8b26 WHIRLPOOL 950f97a3df68524f5faf65ce52b1c47139d340eb3741c040fd139a02f8fb021ff285d7098988b40eb94551cbc04ac121bbc20c10d249f72c570f9ea7e2c7a013
-EBUILD selinux-gatekeeper-2.20170204-r2.ebuild 289 SHA256 b0465a3470ef5e82f0a4042b1304d0b12bf40da2fced586ab83cd2f87dd755dd SHA512 479d4afabbdcc493c87727ec6aa807c8c64333579b3b9a36c8f4a257b5334a0c25a6ac09a0614ae19f333012eb223a7f44efada08786873fcc797287aaa5a8ea WHIRLPOOL 54a15d9aa71cea0c01358f97aff087834383f427e6ba1190e2cdb519dac0d5a663fc3003c5cce01c77ce7be589639bfff2e5716803aeb1b36f474832538c44ed
-EBUILD selinux-gatekeeper-2.20170204-r3.ebuild 289 SHA256 b0465a3470ef5e82f0a4042b1304d0b12bf40da2fced586ab83cd2f87dd755dd SHA512 479d4afabbdcc493c87727ec6aa807c8c64333579b3b9a36c8f4a257b5334a0c25a6ac09a0614ae19f333012eb223a7f44efada08786873fcc797287aaa5a8ea WHIRLPOOL 54a15d9aa71cea0c01358f97aff087834383f427e6ba1190e2cdb519dac0d5a663fc3003c5cce01c77ce7be589639bfff2e5716803aeb1b36f474832538c44ed
-EBUILD selinux-gatekeeper-2.20170204-r4.ebuild 289 SHA256 b0465a3470ef5e82f0a4042b1304d0b12bf40da2fced586ab83cd2f87dd755dd SHA512 479d4afabbdcc493c87727ec6aa807c8c64333579b3b9a36c8f4a257b5334a0c25a6ac09a0614ae19f333012eb223a7f44efada08786873fcc797287aaa5a8ea WHIRLPOOL 54a15d9aa71cea0c01358f97aff087834383f427e6ba1190e2cdb519dac0d5a663fc3003c5cce01c77ce7be589639bfff2e5716803aeb1b36f474832538c44ed
-EBUILD selinux-gatekeeper-2.20170805-r2.ebuild 289 SHA256 b0465a3470ef5e82f0a4042b1304d0b12bf40da2fced586ab83cd2f87dd755dd SHA512 479d4afabbdcc493c87727ec6aa807c8c64333579b3b9a36c8f4a257b5334a0c25a6ac09a0614ae19f333012eb223a7f44efada08786873fcc797287aaa5a8ea WHIRLPOOL 54a15d9aa71cea0c01358f97aff087834383f427e6ba1190e2cdb519dac0d5a663fc3003c5cce01c77ce7be589639bfff2e5716803aeb1b36f474832538c44ed
-EBUILD selinux-gatekeeper-9999.ebuild 291 SHA256 10bb09df485f629ff87ef274e1dd5919708080ff19464d0bf40af6970e41a796 SHA512 e6b727ce34bd6e7d2014975d40bb8049aeb192b89a666a3c08f83a4c37d043de4b85706ffadf7c563acbf57fc460941f6f2f898f3d257a62e6b5a934b9dc8b26 WHIRLPOOL 950f97a3df68524f5faf65ce52b1c47139d340eb3741c040fd139a02f8fb021ff285d7098988b40eb94551cbc04ac121bbc20c10d249f72c570f9ea7e2c7a013
+EBUILD selinux-gatekeeper-2.20170204-r1.ebuild 292 SHA256 318ca9b85abff7337ec76d2fe9490594d811981bda09c4c85616d6fbbfb3d6d1 SHA512 151b0dec849d4533b68f3d8be0b465a2b441bfe8f38ac9cf0a0e6845966140139591dbbd9f3348801eacd9930358490a1a581448fe9993c134c45eb38025cc87 WHIRLPOOL 8f47905c42750c28b1e2758aa8e2e71e5869bac914fbe4c5cbd7c716158f1522a81f705630b4563d99dc1b3d3c844cd57bc1c5e17d80a9ab85d869e2c6115630
+EBUILD selinux-gatekeeper-2.20170204-r2.ebuild 290 SHA256 2b70832bae207e21e9b4f5bdb5c65ff423659c978fc328170be84d04b125efbf SHA512 e2b72d453e1b39bed45c1ac2135fb7a7043fea216cedba176fcf87033606b3c0bdbf015832573f474bc0107ae26baf301165d5105ae0fdcdbe4f86f2fbc0ea67 WHIRLPOOL 18a425abce6641b82ac9e4622a2bb40c24dd7b8b6e38a2d933cb02a0882ad7ec35cdb64432cad40ae532370dd0fb545c97171478dbb09f675b1aecec4689ade0
+EBUILD selinux-gatekeeper-2.20170204-r3.ebuild 290 SHA256 2b70832bae207e21e9b4f5bdb5c65ff423659c978fc328170be84d04b125efbf SHA512 e2b72d453e1b39bed45c1ac2135fb7a7043fea216cedba176fcf87033606b3c0bdbf015832573f474bc0107ae26baf301165d5105ae0fdcdbe4f86f2fbc0ea67 WHIRLPOOL 18a425abce6641b82ac9e4622a2bb40c24dd7b8b6e38a2d933cb02a0882ad7ec35cdb64432cad40ae532370dd0fb545c97171478dbb09f675b1aecec4689ade0
+EBUILD selinux-gatekeeper-2.20170204-r4.ebuild 290 SHA256 2b70832bae207e21e9b4f5bdb5c65ff423659c978fc328170be84d04b125efbf SHA512 e2b72d453e1b39bed45c1ac2135fb7a7043fea216cedba176fcf87033606b3c0bdbf015832573f474bc0107ae26baf301165d5105ae0fdcdbe4f86f2fbc0ea67 WHIRLPOOL 18a425abce6641b82ac9e4622a2bb40c24dd7b8b6e38a2d933cb02a0882ad7ec35cdb64432cad40ae532370dd0fb545c97171478dbb09f675b1aecec4689ade0
+EBUILD selinux-gatekeeper-2.20170805-r2.ebuild 290 SHA256 2b70832bae207e21e9b4f5bdb5c65ff423659c978fc328170be84d04b125efbf SHA512 e2b72d453e1b39bed45c1ac2135fb7a7043fea216cedba176fcf87033606b3c0bdbf015832573f474bc0107ae26baf301165d5105ae0fdcdbe4f86f2fbc0ea67 WHIRLPOOL 18a425abce6641b82ac9e4622a2bb40c24dd7b8b6e38a2d933cb02a0882ad7ec35cdb64432cad40ae532370dd0fb545c97171478dbb09f675b1aecec4689ade0
+EBUILD selinux-gatekeeper-2.20170805-r3.ebuild 292 SHA256 318ca9b85abff7337ec76d2fe9490594d811981bda09c4c85616d6fbbfb3d6d1 SHA512 151b0dec849d4533b68f3d8be0b465a2b441bfe8f38ac9cf0a0e6845966140139591dbbd9f3348801eacd9930358490a1a581448fe9993c134c45eb38025cc87 WHIRLPOOL 8f47905c42750c28b1e2758aa8e2e71e5869bac914fbe4c5cbd7c716158f1522a81f705630b4563d99dc1b3d3c844cd57bc1c5e17d80a9ab85d869e2c6115630
+EBUILD selinux-gatekeeper-9999.ebuild 292 SHA256 318ca9b85abff7337ec76d2fe9490594d811981bda09c4c85616d6fbbfb3d6d1 SHA512 151b0dec849d4533b68f3d8be0b465a2b441bfe8f38ac9cf0a0e6845966140139591dbbd9f3348801eacd9930358490a1a581448fe9993c134c45eb38025cc87 WHIRLPOOL 8f47905c42750c28b1e2758aa8e2e71e5869bac914fbe4c5cbd7c716158f1522a81f705630b4563d99dc1b3d3c844cd57bc1c5e17d80a9ab85d869e2c6115630
 MISC ChangeLog 10979 SHA256 e596fa2f731c8899237eca581ba4a460a164f223a500fd34ba8b27ad1ea60aed SHA512 9c652c317ea1995899ae9a05c2be906d1e3801ef7e0011392c2f1e7585b114004102e3b9abd790d9b01aa566fe2ea6c0488262158f5fcff757e7a0bb980edfb0 WHIRLPOOL e8ab1239c71e180f1963c7916ffdfa431a0b4bba3c7ce907e3552129d0345f97299eb72f9c7429c48d937ed73bdb8db1503a4cee08cf259aa6900ba1cc47d10a
 MISC ChangeLog-2015 10334 SHA256 44a89e5af2b0143c8bdc0a51d7c57106516c18f82f0ec94554f2e06ca0a6fd15 SHA512 aa40e3a8379a91adf6b6383ffc2e7eb30cb0e0e3ee9bf6cb1968be058ffb31dbd014656320bc17e3293e06a24eef6bece03584ee4c62f439661ec1e4f350bd72 WHIRLPOOL 2aa896e64f2a45ce0a7ba58e6a762795858e7fa038d09de110b24fab4855e1c1e1b67a326cabe04efb600376715864616a11b87151712f64fe547d20102da7ff
 MISC metadata.xml 320 SHA256 67f6f8d1c94acfe4c3a71507372a9bf14e23de1c8efff69b8194db54c6f9a695 SHA512 d03bbe8a36c743c5a8ec79df643d4075e1edb314f2d37b6579e155acd141e3d1c08d8c070f0690c899b166fa469e2774a546132f19353c81a541f831087aa55b WHIRLPOOL 7d4399cc61ca9ac01b9af45988bade90ebb61fd8430ce8731159b124f8d52543cf29fddedc23ccb1a4681df4cde1960ba0d418f8b7123ad66b2671a580a694f7
diff --git a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20170204-r1.ebuild b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20170204-r1.ebuild
index cf2229230b11..1c7fb8d34324 100644
--- a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20170204-r2.ebuild b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20170204-r2.ebuild
index 54845ec415eb..ceccf09bb602 100644
--- a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20170204-r3.ebuild b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20170204-r3.ebuild
index 54845ec415eb..ceccf09bb602 100644
--- a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20170204-r4.ebuild b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20170204-r4.ebuild
index 54845ec415eb..ceccf09bb602 100644
--- a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20170805-r2.ebuild b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20170805-r2.ebuild
index 54845ec415eb..ceccf09bb602 100644
--- a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20170805-r3.ebuild b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..1c7fb8d34324
--- /dev/null
+++ b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-gatekeeper/selinux-gatekeeper-9999.ebuild b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-9999.ebuild
index cf2229230b11..1c7fb8d34324 100644
--- a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-9999.ebuild
+++ b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-git/Manifest b/sec-policy/selinux-git/Manifest
index a3558dc76adc..207d70084342 100644
--- a/sec-policy/selinux-git/Manifest
+++ b/sec-policy/selinux-git/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-git-2.20170204-r1.ebuild 373 SHA256 88c1ef3f2b91833ebf28b1c5099d0cd90e46bd2f753168e076678e7286f94689 SHA512 6349d5b29010369e7226b53a9b7097f77e9ec0cec886667dea3496756d1bc1a7de687439e0d3be849f74e56edf200d2720278e8264f295fbd39276e0c3ceedd0 WHIRLPOOL 8b9207ee4d2c4e60d56c8af9a77649772e4f923b518a43972605c7b5437c28b341a4235f38e5334313e7bd21da81176b154e22d9335234ad6f6acd4c21e61312
-EBUILD selinux-git-2.20170204-r2.ebuild 371 SHA256 3dace3f02cc71211dc64da7b3a77c9222325752d7e8021c0f8ef305a2993b43b SHA512 521d0e05d040f712ae16efaf99995d746fcff2574db4af7d1314fb2bfea129010b9f82196f0ba0c5a3cbea27d4e07f411b1a7d7637cd709c493878af2acc70a1 WHIRLPOOL c3dccdb41958b802a1ad70ba26f59afd430430989445ccc5ef4d3691f1d5827c34531fd5952cee28ab55b9b66dd5a893150850989055f715fd42800c876a11a1
-EBUILD selinux-git-2.20170204-r3.ebuild 371 SHA256 3dace3f02cc71211dc64da7b3a77c9222325752d7e8021c0f8ef305a2993b43b SHA512 521d0e05d040f712ae16efaf99995d746fcff2574db4af7d1314fb2bfea129010b9f82196f0ba0c5a3cbea27d4e07f411b1a7d7637cd709c493878af2acc70a1 WHIRLPOOL c3dccdb41958b802a1ad70ba26f59afd430430989445ccc5ef4d3691f1d5827c34531fd5952cee28ab55b9b66dd5a893150850989055f715fd42800c876a11a1
-EBUILD selinux-git-2.20170204-r4.ebuild 371 SHA256 3dace3f02cc71211dc64da7b3a77c9222325752d7e8021c0f8ef305a2993b43b SHA512 521d0e05d040f712ae16efaf99995d746fcff2574db4af7d1314fb2bfea129010b9f82196f0ba0c5a3cbea27d4e07f411b1a7d7637cd709c493878af2acc70a1 WHIRLPOOL c3dccdb41958b802a1ad70ba26f59afd430430989445ccc5ef4d3691f1d5827c34531fd5952cee28ab55b9b66dd5a893150850989055f715fd42800c876a11a1
-EBUILD selinux-git-2.20170805-r2.ebuild 371 SHA256 3dace3f02cc71211dc64da7b3a77c9222325752d7e8021c0f8ef305a2993b43b SHA512 521d0e05d040f712ae16efaf99995d746fcff2574db4af7d1314fb2bfea129010b9f82196f0ba0c5a3cbea27d4e07f411b1a7d7637cd709c493878af2acc70a1 WHIRLPOOL c3dccdb41958b802a1ad70ba26f59afd430430989445ccc5ef4d3691f1d5827c34531fd5952cee28ab55b9b66dd5a893150850989055f715fd42800c876a11a1
-EBUILD selinux-git-9999.ebuild 373 SHA256 88c1ef3f2b91833ebf28b1c5099d0cd90e46bd2f753168e076678e7286f94689 SHA512 6349d5b29010369e7226b53a9b7097f77e9ec0cec886667dea3496756d1bc1a7de687439e0d3be849f74e56edf200d2720278e8264f295fbd39276e0c3ceedd0 WHIRLPOOL 8b9207ee4d2c4e60d56c8af9a77649772e4f923b518a43972605c7b5437c28b341a4235f38e5334313e7bd21da81176b154e22d9335234ad6f6acd4c21e61312
+EBUILD selinux-git-2.20170204-r1.ebuild 374 SHA256 c5a3a7d65ced4ca5b973a78e26350035c25ab48b837cb8c6e46a6f209c99f223 SHA512 61118174098f658adb0c617c867bac82ddf8adfe4b3e70282ff8d52da961d9eb517a349357c1a8f6fd39e48effbfa94fc24d41a206f19513e402cf0a3daee5a0 WHIRLPOOL aefe4328cd4edd46963ee79406251a8b52d205d415320f3086aecc5008da2bb70caa525ca1810c5499527c7d2731fa96198aab77b0dd63064989e4a59a6ef7cb
+EBUILD selinux-git-2.20170204-r2.ebuild 372 SHA256 d3eeb34eed7425b45efba6656bff43b1daf61622bec495c28e74e56b20626cef SHA512 960473bce9ba66eebe09bbd3361bea582419dd1fdc230c3928f8640f9f6fd0ae63a840a2dbe500f2270e77e0cfa8fa468309eb494e6b1ac0feb3bd1e373dc5be WHIRLPOOL a6f7d4418df641a961e121bc8f5cfd4d2e289e74b881e8f7e320adecff11b030818e0784aeae3a4ad64c02d9a7a4117c643265632b6b4ed96855f7d7d8aef412
+EBUILD selinux-git-2.20170204-r3.ebuild 372 SHA256 d3eeb34eed7425b45efba6656bff43b1daf61622bec495c28e74e56b20626cef SHA512 960473bce9ba66eebe09bbd3361bea582419dd1fdc230c3928f8640f9f6fd0ae63a840a2dbe500f2270e77e0cfa8fa468309eb494e6b1ac0feb3bd1e373dc5be WHIRLPOOL a6f7d4418df641a961e121bc8f5cfd4d2e289e74b881e8f7e320adecff11b030818e0784aeae3a4ad64c02d9a7a4117c643265632b6b4ed96855f7d7d8aef412
+EBUILD selinux-git-2.20170204-r4.ebuild 372 SHA256 d3eeb34eed7425b45efba6656bff43b1daf61622bec495c28e74e56b20626cef SHA512 960473bce9ba66eebe09bbd3361bea582419dd1fdc230c3928f8640f9f6fd0ae63a840a2dbe500f2270e77e0cfa8fa468309eb494e6b1ac0feb3bd1e373dc5be WHIRLPOOL a6f7d4418df641a961e121bc8f5cfd4d2e289e74b881e8f7e320adecff11b030818e0784aeae3a4ad64c02d9a7a4117c643265632b6b4ed96855f7d7d8aef412
+EBUILD selinux-git-2.20170805-r2.ebuild 372 SHA256 d3eeb34eed7425b45efba6656bff43b1daf61622bec495c28e74e56b20626cef SHA512 960473bce9ba66eebe09bbd3361bea582419dd1fdc230c3928f8640f9f6fd0ae63a840a2dbe500f2270e77e0cfa8fa468309eb494e6b1ac0feb3bd1e373dc5be WHIRLPOOL a6f7d4418df641a961e121bc8f5cfd4d2e289e74b881e8f7e320adecff11b030818e0784aeae3a4ad64c02d9a7a4117c643265632b6b4ed96855f7d7d8aef412
+EBUILD selinux-git-2.20170805-r3.ebuild 374 SHA256 c5a3a7d65ced4ca5b973a78e26350035c25ab48b837cb8c6e46a6f209c99f223 SHA512 61118174098f658adb0c617c867bac82ddf8adfe4b3e70282ff8d52da961d9eb517a349357c1a8f6fd39e48effbfa94fc24d41a206f19513e402cf0a3daee5a0 WHIRLPOOL aefe4328cd4edd46963ee79406251a8b52d205d415320f3086aecc5008da2bb70caa525ca1810c5499527c7d2731fa96198aab77b0dd63064989e4a59a6ef7cb
+EBUILD selinux-git-9999.ebuild 374 SHA256 c5a3a7d65ced4ca5b973a78e26350035c25ab48b837cb8c6e46a6f209c99f223 SHA512 61118174098f658adb0c617c867bac82ddf8adfe4b3e70282ff8d52da961d9eb517a349357c1a8f6fd39e48effbfa94fc24d41a206f19513e402cf0a3daee5a0 WHIRLPOOL aefe4328cd4edd46963ee79406251a8b52d205d415320f3086aecc5008da2bb70caa525ca1810c5499527c7d2731fa96198aab77b0dd63064989e4a59a6ef7cb
 MISC ChangeLog 9257 SHA256 931bfb20b31b91bdc510b2f9b51c9b5025d79191ead5e015bce83247125150e1 SHA512 2f44dde741d7849201a132b3d201d1b1259b04195356e3be8975e52d8ef4f3f487ff58d9fc3ae2f13806aaae063960f9c125a1b62b6fa399019b7487d9e984e3 WHIRLPOOL c37ad8113ad63c5600d832d8c52746ed7ceedb2b45f59485d1a5094652e5639f5daf9746d4bd8d17197a0bf10fe18cffcf79fd715af5b166dac85ebae9fcaef9
 MISC ChangeLog-2015 1705 SHA256 67cd008eab0b8ee6d08cc3a48e5df4004f955f510ef51e18c1334e41ba7a8052 SHA512 665b0b301a8d7f9f4f59d5ed31e4fc729b4d050071aa009530965e737a5e0905675bf0110ad208ba78c78fd46283587c65032925e869ee916e0d58963ffbe8f9 WHIRLPOOL 1e77a570c0b92464eefb6a61bb759e40afefb8b60eadaf3e88c9fb15807306227e6ee80679b26d29b4a2ddf4f712195d1c24ac58dcbaa92929b052db7f4b3470
 MISC metadata.xml 313 SHA256 a1ef083006cf3b2b660584f7d9229021a6a7a4be2f2d08758ad7cdc154e44401 SHA512 907a80ca3d13826b0ddf500695e9d568cc90a3708a4fa87d442a9b32b93f94795d8d5bb8cfb191a95fc1eae4173c4bdba8192e427606ce6c74b00aa8d25239b6 WHIRLPOOL 99aabb8f5cae2d1678d089c09c757e519938bdc871084b54376fcbe4249d2867aa79a920c3e97e6b2c69967893f497a578547fd4f58a8247b7c72ee570b3346e
diff --git a/sec-policy/selinux-git/selinux-git-2.20170204-r1.ebuild b/sec-policy/selinux-git/selinux-git-2.20170204-r1.ebuild
index a54d6a229c55..7efd60bfe073 100644
--- a/sec-policy/selinux-git/selinux-git-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-git/selinux-git-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-git/selinux-git-2.20170204-r2.ebuild b/sec-policy/selinux-git/selinux-git-2.20170204-r2.ebuild
index 3d121eeead67..2e5c586bcc2c 100644
--- a/sec-policy/selinux-git/selinux-git-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-git/selinux-git-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-git/selinux-git-2.20170204-r3.ebuild b/sec-policy/selinux-git/selinux-git-2.20170204-r3.ebuild
index 3d121eeead67..2e5c586bcc2c 100644
--- a/sec-policy/selinux-git/selinux-git-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-git/selinux-git-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-git/selinux-git-2.20170204-r4.ebuild b/sec-policy/selinux-git/selinux-git-2.20170204-r4.ebuild
index 3d121eeead67..2e5c586bcc2c 100644
--- a/sec-policy/selinux-git/selinux-git-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-git/selinux-git-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-git/selinux-git-2.20170805-r2.ebuild b/sec-policy/selinux-git/selinux-git-2.20170805-r2.ebuild
index 3d121eeead67..2e5c586bcc2c 100644
--- a/sec-policy/selinux-git/selinux-git-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-git/selinux-git-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-git/selinux-git-2.20170805-r3.ebuild b/sec-policy/selinux-git/selinux-git-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..7efd60bfe073
--- /dev/null
+++ b/sec-policy/selinux-git/selinux-git-2.20170805-r3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-git/selinux-git-9999.ebuild b/sec-policy/selinux-git/selinux-git-9999.ebuild
index a54d6a229c55..7efd60bfe073 100644
--- a/sec-policy/selinux-git/selinux-git-9999.ebuild
+++ b/sec-policy/selinux-git/selinux-git-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-gitosis/Manifest b/sec-policy/selinux-gitosis/Manifest
index bcc72409a0b0..48753d24329e 100644
--- a/sec-policy/selinux-gitosis/Manifest
+++ b/sec-policy/selinux-gitosis/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-gitosis-2.20170204-r1.ebuild 285 SHA256 67234e53ebee91df922fdff726af029ef0a7f14cb14e71139fcb280371b7b3ec SHA512 103b8db22589f1c68dbdb37a056b525b0944f4f0bf4e0e47531b9827921d46126eb108b288928403a4a9535c47a1ee3990ab15065601e6f06ed9e87729f819f8 WHIRLPOOL 6fbdb73bbb0977be18ffdde7a2399032dd0564853550b79d81b1e884f95d207cb1996ee4d0b73495bea85be826acfe2ab9be95389ded098eb00a394c3c54e1bd
-EBUILD selinux-gitosis-2.20170204-r2.ebuild 283 SHA256 cd320cc8969b9aa4fb1aaf892737b1a42aba1031e5ed05560b0f7b934e98a0d2 SHA512 d6ffca9c6f146f4d922909282b178cd0ce5e777339d0512be9569f3fdcca17f31ccceefe6ad79c9bb87445e2a2f3a9a83bbde8f02ca7e1ca3bcc9f5b768ae1f4 WHIRLPOOL 172b9a8f613d3db21b7910cc737a48c7ffa4392e63e6af71dd84a4df37db03eb9642dbd4d2f0582218c73fd6c28df33daf4583f778c0fc2634a558a9237fbdd9
-EBUILD selinux-gitosis-2.20170204-r3.ebuild 283 SHA256 cd320cc8969b9aa4fb1aaf892737b1a42aba1031e5ed05560b0f7b934e98a0d2 SHA512 d6ffca9c6f146f4d922909282b178cd0ce5e777339d0512be9569f3fdcca17f31ccceefe6ad79c9bb87445e2a2f3a9a83bbde8f02ca7e1ca3bcc9f5b768ae1f4 WHIRLPOOL 172b9a8f613d3db21b7910cc737a48c7ffa4392e63e6af71dd84a4df37db03eb9642dbd4d2f0582218c73fd6c28df33daf4583f778c0fc2634a558a9237fbdd9
-EBUILD selinux-gitosis-2.20170204-r4.ebuild 283 SHA256 cd320cc8969b9aa4fb1aaf892737b1a42aba1031e5ed05560b0f7b934e98a0d2 SHA512 d6ffca9c6f146f4d922909282b178cd0ce5e777339d0512be9569f3fdcca17f31ccceefe6ad79c9bb87445e2a2f3a9a83bbde8f02ca7e1ca3bcc9f5b768ae1f4 WHIRLPOOL 172b9a8f613d3db21b7910cc737a48c7ffa4392e63e6af71dd84a4df37db03eb9642dbd4d2f0582218c73fd6c28df33daf4583f778c0fc2634a558a9237fbdd9
-EBUILD selinux-gitosis-2.20170805-r2.ebuild 283 SHA256 cd320cc8969b9aa4fb1aaf892737b1a42aba1031e5ed05560b0f7b934e98a0d2 SHA512 d6ffca9c6f146f4d922909282b178cd0ce5e777339d0512be9569f3fdcca17f31ccceefe6ad79c9bb87445e2a2f3a9a83bbde8f02ca7e1ca3bcc9f5b768ae1f4 WHIRLPOOL 172b9a8f613d3db21b7910cc737a48c7ffa4392e63e6af71dd84a4df37db03eb9642dbd4d2f0582218c73fd6c28df33daf4583f778c0fc2634a558a9237fbdd9
-EBUILD selinux-gitosis-9999.ebuild 285 SHA256 67234e53ebee91df922fdff726af029ef0a7f14cb14e71139fcb280371b7b3ec SHA512 103b8db22589f1c68dbdb37a056b525b0944f4f0bf4e0e47531b9827921d46126eb108b288928403a4a9535c47a1ee3990ab15065601e6f06ed9e87729f819f8 WHIRLPOOL 6fbdb73bbb0977be18ffdde7a2399032dd0564853550b79d81b1e884f95d207cb1996ee4d0b73495bea85be826acfe2ab9be95389ded098eb00a394c3c54e1bd
+EBUILD selinux-gitosis-2.20170204-r1.ebuild 286 SHA256 04f53fd07050e11f342676d03f1ca89bf5f1bd661906ec3612ad9ed92e0f6064 SHA512 51e8548c8395447f8be3ce3d8e3ffdbd380a24fcfc927d765062008016d97e1b1b504815bdbf55bf863607e713607a9c0c508269a06c0310a3a57d4a448c627f WHIRLPOOL e96b4dffb96cddd90dd0827ce5086960f2c6a20fa486c6886c2ecccf091381ca15e2a03fd2d46356c94a2542a15ac52a921cf048ba8bd2c06dfcc94406e39bf4
+EBUILD selinux-gitosis-2.20170204-r2.ebuild 284 SHA256 796e4e731eff4dccf6608f5de7db1e6d5d9f05aced12cac848d66a4745a95944 SHA512 1913ac1d59f9f57ebf7736ac7624f3b37d07cf2082861984973d7a2ba62088f2a01822524d3915554e5dccfc1cf6eb5f30f05482631b4bca8d7a35996e1c37e5 WHIRLPOOL f96d7a2abcdf4fcaa477a425b0230d411b7c42a11e99a6d0caae6b482256aa339f33f0b1b7546f64d5ad88df2ee740ae1f7ffdb42bb35ac5a54161c41413201f
+EBUILD selinux-gitosis-2.20170204-r3.ebuild 284 SHA256 796e4e731eff4dccf6608f5de7db1e6d5d9f05aced12cac848d66a4745a95944 SHA512 1913ac1d59f9f57ebf7736ac7624f3b37d07cf2082861984973d7a2ba62088f2a01822524d3915554e5dccfc1cf6eb5f30f05482631b4bca8d7a35996e1c37e5 WHIRLPOOL f96d7a2abcdf4fcaa477a425b0230d411b7c42a11e99a6d0caae6b482256aa339f33f0b1b7546f64d5ad88df2ee740ae1f7ffdb42bb35ac5a54161c41413201f
+EBUILD selinux-gitosis-2.20170204-r4.ebuild 284 SHA256 796e4e731eff4dccf6608f5de7db1e6d5d9f05aced12cac848d66a4745a95944 SHA512 1913ac1d59f9f57ebf7736ac7624f3b37d07cf2082861984973d7a2ba62088f2a01822524d3915554e5dccfc1cf6eb5f30f05482631b4bca8d7a35996e1c37e5 WHIRLPOOL f96d7a2abcdf4fcaa477a425b0230d411b7c42a11e99a6d0caae6b482256aa339f33f0b1b7546f64d5ad88df2ee740ae1f7ffdb42bb35ac5a54161c41413201f
+EBUILD selinux-gitosis-2.20170805-r2.ebuild 284 SHA256 796e4e731eff4dccf6608f5de7db1e6d5d9f05aced12cac848d66a4745a95944 SHA512 1913ac1d59f9f57ebf7736ac7624f3b37d07cf2082861984973d7a2ba62088f2a01822524d3915554e5dccfc1cf6eb5f30f05482631b4bca8d7a35996e1c37e5 WHIRLPOOL f96d7a2abcdf4fcaa477a425b0230d411b7c42a11e99a6d0caae6b482256aa339f33f0b1b7546f64d5ad88df2ee740ae1f7ffdb42bb35ac5a54161c41413201f
+EBUILD selinux-gitosis-2.20170805-r3.ebuild 286 SHA256 04f53fd07050e11f342676d03f1ca89bf5f1bd661906ec3612ad9ed92e0f6064 SHA512 51e8548c8395447f8be3ce3d8e3ffdbd380a24fcfc927d765062008016d97e1b1b504815bdbf55bf863607e713607a9c0c508269a06c0310a3a57d4a448c627f WHIRLPOOL e96b4dffb96cddd90dd0827ce5086960f2c6a20fa486c6886c2ecccf091381ca15e2a03fd2d46356c94a2542a15ac52a921cf048ba8bd2c06dfcc94406e39bf4
+EBUILD selinux-gitosis-9999.ebuild 286 SHA256 04f53fd07050e11f342676d03f1ca89bf5f1bd661906ec3612ad9ed92e0f6064 SHA512 51e8548c8395447f8be3ce3d8e3ffdbd380a24fcfc927d765062008016d97e1b1b504815bdbf55bf863607e713607a9c0c508269a06c0310a3a57d4a448c627f WHIRLPOOL e96b4dffb96cddd90dd0827ce5086960f2c6a20fa486c6886c2ecccf091381ca15e2a03fd2d46356c94a2542a15ac52a921cf048ba8bd2c06dfcc94406e39bf4
 MISC ChangeLog 10687 SHA256 d22039b273679d231c12fc37f1f34f63f9cef3619724365fc848e5de9b78e4bc SHA512 d0c8a62c43b7ac2f4fe236a5f06aa8c35c120565bdd8f2e36210f65a7a0f342f83a62f08b4f5f0a28d28b38cac52306438a7279a8c5e59d4971148e89ccc9a33 WHIRLPOOL d689c3a4c9bc740b9b69f99c60237667dd98eafb8cc31259c3a75dd62fa4695bf84b2408052daf297dff4075fa92f45665f330a25918909cf88b66716d9d85b2
 MISC ChangeLog-2015 9977 SHA256 a4f912d30d3712dcfc55c308a0f396f1104d94ac40ad6ed5666be04663b91b61 SHA512 642d049272db62442a8e39395adbe309ed33aebe2e718adece37fafba191da5071667a342ef01a9fdb4063d148a1a04d3e03068aa312cc3fe357b327e06e6142 WHIRLPOOL 63e36f3475d0cb1a6f498ac120b9c47a6eafa3ff3fc118f499515cafdd1f67b0d893ec73bb49f3c8aa3de8f7eabcb2bebfa40ddd876693d07ffec5d24b6a0ba7
 MISC metadata.xml 317 SHA256 24237f6fa285fd17f95cbe73a25a270f234b6f8904d538dbe87fd359c5e632bb SHA512 aaf3e9dc008475b8fa3eea3471cc12fbac3ff7473303649cc8d4189513657f0dbf7ddb9b9cce659220ef4100a4560d551547886923c7cf43e12316c6bde03d17 WHIRLPOOL 8be5d50b04235bfbf48d39b07dbecfe17942f8be6e2eee7de8e237f11473a3adeedd13ee806edb8e999f0977a4a5821e68f7223540f515f3045e7631b0d48b87
diff --git a/sec-policy/selinux-gitosis/selinux-gitosis-2.20170204-r1.ebuild b/sec-policy/selinux-gitosis/selinux-gitosis-2.20170204-r1.ebuild
index f5c14b4076e0..995d98230feb 100644
--- a/sec-policy/selinux-gitosis/selinux-gitosis-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-gitosis/selinux-gitosis-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-gitosis/selinux-gitosis-2.20170204-r2.ebuild b/sec-policy/selinux-gitosis/selinux-gitosis-2.20170204-r2.ebuild
index 0b1978d0d0d9..a8675b63b73f 100644
--- a/sec-policy/selinux-gitosis/selinux-gitosis-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-gitosis/selinux-gitosis-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-gitosis/selinux-gitosis-2.20170204-r3.ebuild b/sec-policy/selinux-gitosis/selinux-gitosis-2.20170204-r3.ebuild
index 0b1978d0d0d9..a8675b63b73f 100644
--- a/sec-policy/selinux-gitosis/selinux-gitosis-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-gitosis/selinux-gitosis-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-gitosis/selinux-gitosis-2.20170204-r4.ebuild b/sec-policy/selinux-gitosis/selinux-gitosis-2.20170204-r4.ebuild
index 0b1978d0d0d9..a8675b63b73f 100644
--- a/sec-policy/selinux-gitosis/selinux-gitosis-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-gitosis/selinux-gitosis-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-gitosis/selinux-gitosis-2.20170805-r2.ebuild b/sec-policy/selinux-gitosis/selinux-gitosis-2.20170805-r2.ebuild
index 0b1978d0d0d9..a8675b63b73f 100644
--- a/sec-policy/selinux-gitosis/selinux-gitosis-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-gitosis/selinux-gitosis-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-gitosis/selinux-gitosis-2.20170805-r3.ebuild b/sec-policy/selinux-gitosis/selinux-gitosis-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..995d98230feb
--- /dev/null
+++ b/sec-policy/selinux-gitosis/selinux-gitosis-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-gitosis/selinux-gitosis-9999.ebuild b/sec-policy/selinux-gitosis/selinux-gitosis-9999.ebuild
index f5c14b4076e0..995d98230feb 100644
--- a/sec-policy/selinux-gitosis/selinux-gitosis-9999.ebuild
+++ b/sec-policy/selinux-gitosis/selinux-gitosis-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-gnome/Manifest b/sec-policy/selinux-gnome/Manifest
index 4f08c0642244..c8222889a620 100644
--- a/sec-policy/selinux-gnome/Manifest
+++ b/sec-policy/selinux-gnome/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-gnome-2.20170204-r1.ebuild 281 SHA256 f2f08b74ebd1f5d2f649533e04d8376f526d0e5759bef9bb915c8cd33d25dc58 SHA512 ae153a2884d62340a2a75a12001a2aa9f814037aff7dbf577bc56242006f3a3b4d2e736d3383fd5296183d233a9815ad069708e79a4b82c19ca8f402385ae3da WHIRLPOOL d8ed258975c3112a90082140f2a93d5d8846fe51ab56d5d352b2ddbe952ed87fd063adaf35557df4f945fd36839aaf07a8643602b58805d3334f8a8b68639add
-EBUILD selinux-gnome-2.20170204-r2.ebuild 279 SHA256 fd540fe9b91878ee01491f02b24f6743fbda365bc602b5cbb6bfc2c53b732268 SHA512 22d22d1c276906cc953959c84a4b05530e24be3747ef529237a58952be00ce17a586cf43a59ae0959f089fb04429511fa413a170503c084825a2807087a16bc4 WHIRLPOOL e8f9b79bcd8f5fb4dbb8d56f5291fa3114c3758b86d7f98382d054b26a5cbaa8cd314ae1a151b0dad4082f47521d8de4ecfbf8e8dcbd929ac52c7c19c385a025
-EBUILD selinux-gnome-2.20170204-r3.ebuild 279 SHA256 fd540fe9b91878ee01491f02b24f6743fbda365bc602b5cbb6bfc2c53b732268 SHA512 22d22d1c276906cc953959c84a4b05530e24be3747ef529237a58952be00ce17a586cf43a59ae0959f089fb04429511fa413a170503c084825a2807087a16bc4 WHIRLPOOL e8f9b79bcd8f5fb4dbb8d56f5291fa3114c3758b86d7f98382d054b26a5cbaa8cd314ae1a151b0dad4082f47521d8de4ecfbf8e8dcbd929ac52c7c19c385a025
-EBUILD selinux-gnome-2.20170204-r4.ebuild 279 SHA256 fd540fe9b91878ee01491f02b24f6743fbda365bc602b5cbb6bfc2c53b732268 SHA512 22d22d1c276906cc953959c84a4b05530e24be3747ef529237a58952be00ce17a586cf43a59ae0959f089fb04429511fa413a170503c084825a2807087a16bc4 WHIRLPOOL e8f9b79bcd8f5fb4dbb8d56f5291fa3114c3758b86d7f98382d054b26a5cbaa8cd314ae1a151b0dad4082f47521d8de4ecfbf8e8dcbd929ac52c7c19c385a025
-EBUILD selinux-gnome-2.20170805-r2.ebuild 279 SHA256 fd540fe9b91878ee01491f02b24f6743fbda365bc602b5cbb6bfc2c53b732268 SHA512 22d22d1c276906cc953959c84a4b05530e24be3747ef529237a58952be00ce17a586cf43a59ae0959f089fb04429511fa413a170503c084825a2807087a16bc4 WHIRLPOOL e8f9b79bcd8f5fb4dbb8d56f5291fa3114c3758b86d7f98382d054b26a5cbaa8cd314ae1a151b0dad4082f47521d8de4ecfbf8e8dcbd929ac52c7c19c385a025
-EBUILD selinux-gnome-9999.ebuild 281 SHA256 f2f08b74ebd1f5d2f649533e04d8376f526d0e5759bef9bb915c8cd33d25dc58 SHA512 ae153a2884d62340a2a75a12001a2aa9f814037aff7dbf577bc56242006f3a3b4d2e736d3383fd5296183d233a9815ad069708e79a4b82c19ca8f402385ae3da WHIRLPOOL d8ed258975c3112a90082140f2a93d5d8846fe51ab56d5d352b2ddbe952ed87fd063adaf35557df4f945fd36839aaf07a8643602b58805d3334f8a8b68639add
+EBUILD selinux-gnome-2.20170204-r1.ebuild 282 SHA256 4cc77fead2b38f612e1940f42e97463d505639a867befd57b2b11c222358ceb0 SHA512 c74c5392e1bae262f9290aa8e8296b7d2e21efa08b793c2779e0335c1fe6c9fa3136d5d52279f95729e297656475518e5d4ce72e669f968722a16e4a55ef1a35 WHIRLPOOL 80ac6431b5dab538630475b3777957862666b3d6e06643e1c0fd7b94698725b82ef70890ac6fac7aace7d6231e10b04629060496579d3e577caae51a2963191e
+EBUILD selinux-gnome-2.20170204-r2.ebuild 280 SHA256 ac2a7054b0c4bebf8341e75faffc68f2dadd36a5b5678d4f68adc6552ce21731 SHA512 b58d0f03ab3dd7db70f5983f3393fe0b8d0e2be1f82e0a89bc7784a615bf0226df399f872616ec052a51f029c72fc85f818d40eb4c7524a7190202bf87c20dd2 WHIRLPOOL 1af9726ab10bd2eeb98ec5fafbea242c3613bd7075916bf9a41c6ce5c25209f86f4c405f5cb24c53cf297a9a2243f9256354eed909186eca365cd09d74856375
+EBUILD selinux-gnome-2.20170204-r3.ebuild 280 SHA256 ac2a7054b0c4bebf8341e75faffc68f2dadd36a5b5678d4f68adc6552ce21731 SHA512 b58d0f03ab3dd7db70f5983f3393fe0b8d0e2be1f82e0a89bc7784a615bf0226df399f872616ec052a51f029c72fc85f818d40eb4c7524a7190202bf87c20dd2 WHIRLPOOL 1af9726ab10bd2eeb98ec5fafbea242c3613bd7075916bf9a41c6ce5c25209f86f4c405f5cb24c53cf297a9a2243f9256354eed909186eca365cd09d74856375
+EBUILD selinux-gnome-2.20170204-r4.ebuild 280 SHA256 ac2a7054b0c4bebf8341e75faffc68f2dadd36a5b5678d4f68adc6552ce21731 SHA512 b58d0f03ab3dd7db70f5983f3393fe0b8d0e2be1f82e0a89bc7784a615bf0226df399f872616ec052a51f029c72fc85f818d40eb4c7524a7190202bf87c20dd2 WHIRLPOOL 1af9726ab10bd2eeb98ec5fafbea242c3613bd7075916bf9a41c6ce5c25209f86f4c405f5cb24c53cf297a9a2243f9256354eed909186eca365cd09d74856375
+EBUILD selinux-gnome-2.20170805-r2.ebuild 280 SHA256 ac2a7054b0c4bebf8341e75faffc68f2dadd36a5b5678d4f68adc6552ce21731 SHA512 b58d0f03ab3dd7db70f5983f3393fe0b8d0e2be1f82e0a89bc7784a615bf0226df399f872616ec052a51f029c72fc85f818d40eb4c7524a7190202bf87c20dd2 WHIRLPOOL 1af9726ab10bd2eeb98ec5fafbea242c3613bd7075916bf9a41c6ce5c25209f86f4c405f5cb24c53cf297a9a2243f9256354eed909186eca365cd09d74856375
+EBUILD selinux-gnome-2.20170805-r3.ebuild 282 SHA256 4cc77fead2b38f612e1940f42e97463d505639a867befd57b2b11c222358ceb0 SHA512 c74c5392e1bae262f9290aa8e8296b7d2e21efa08b793c2779e0335c1fe6c9fa3136d5d52279f95729e297656475518e5d4ce72e669f968722a16e4a55ef1a35 WHIRLPOOL 80ac6431b5dab538630475b3777957862666b3d6e06643e1c0fd7b94698725b82ef70890ac6fac7aace7d6231e10b04629060496579d3e577caae51a2963191e
+EBUILD selinux-gnome-9999.ebuild 282 SHA256 4cc77fead2b38f612e1940f42e97463d505639a867befd57b2b11c222358ceb0 SHA512 c74c5392e1bae262f9290aa8e8296b7d2e21efa08b793c2779e0335c1fe6c9fa3136d5d52279f95729e297656475518e5d4ce72e669f968722a16e4a55ef1a35 WHIRLPOOL 80ac6431b5dab538630475b3777957862666b3d6e06643e1c0fd7b94698725b82ef70890ac6fac7aace7d6231e10b04629060496579d3e577caae51a2963191e
 MISC ChangeLog 10479 SHA256 4baf772341ead6f01a271d89a6acd1bea3a409b0b3283f84864f6b893402d497 SHA512 e328bf1b258c5ba02e3801e318cbf3b8ed2eb31e07764eb501840386f037a334e3f611f5456c1d0a2aef5a2657ad8b79fa5f0d6873714a21483aa575379938e8 WHIRLPOOL 37dfd587829e8b3ffc437835205bee57cfea84fd99b716a324cdb02fdbaa1fc9c6828e32dcd6577856a20f750daf9a793060deda574b28379290f2bb8446a2f6
 MISC ChangeLog-2015 9928 SHA256 ba999ab62ad7c1db854f5bafca1282a83988e8ef50ead7b2d64eedca24bc43d7 SHA512 b64e5b4a7187b851ab48ebc112855a3c9315295ddbee31f88004479e16448851f95cf5a01814b962a701f47d2adbb739e79ee0a7b1548ca6f67746553a1aa230 WHIRLPOOL 40795843b1c271996f46ea094f2e8925932ed9b982650c58ad7bf37112aff11bde489b6e0a615c592b25cbe01e19a67f4f26f8fc0c7e5857fa143563c0df4986
 MISC metadata.xml 315 SHA256 b33b670d6302c426e416e77220d934bdab57d65addee5f95f8b61fcb66dc9a3e SHA512 31d6b3a85661d1b7438e748deb4b92fb4908ace1ee215381d47953c265a75f171b58138d775e9bc1c55aeeb1e375e0ebbc6f6d98e9292fcb27a83e79975f54f3 WHIRLPOOL 8f13c7bce2f946d7f3d3e559b8ed1ca31cc6ce30b2627aec14a0eaee8eb8b617317573431b77c2283aef747fc2750102477b66910dcec6182aba79d8180c502b
diff --git a/sec-policy/selinux-gnome/selinux-gnome-2.20170204-r1.ebuild b/sec-policy/selinux-gnome/selinux-gnome-2.20170204-r1.ebuild
index d66cf5db6d23..092756b47a10 100644
--- a/sec-policy/selinux-gnome/selinux-gnome-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-gnome/selinux-gnome-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-gnome/selinux-gnome-2.20170204-r2.ebuild b/sec-policy/selinux-gnome/selinux-gnome-2.20170204-r2.ebuild
index 3b72b7702887..3053d928e565 100644
--- a/sec-policy/selinux-gnome/selinux-gnome-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-gnome/selinux-gnome-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-gnome/selinux-gnome-2.20170204-r3.ebuild b/sec-policy/selinux-gnome/selinux-gnome-2.20170204-r3.ebuild
index 3b72b7702887..3053d928e565 100644
--- a/sec-policy/selinux-gnome/selinux-gnome-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-gnome/selinux-gnome-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-gnome/selinux-gnome-2.20170204-r4.ebuild b/sec-policy/selinux-gnome/selinux-gnome-2.20170204-r4.ebuild
index 3b72b7702887..3053d928e565 100644
--- a/sec-policy/selinux-gnome/selinux-gnome-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-gnome/selinux-gnome-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-gnome/selinux-gnome-2.20170805-r2.ebuild b/sec-policy/selinux-gnome/selinux-gnome-2.20170805-r2.ebuild
index 3b72b7702887..3053d928e565 100644
--- a/sec-policy/selinux-gnome/selinux-gnome-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-gnome/selinux-gnome-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-gnome/selinux-gnome-2.20170805-r3.ebuild b/sec-policy/selinux-gnome/selinux-gnome-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..092756b47a10
--- /dev/null
+++ b/sec-policy/selinux-gnome/selinux-gnome-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-gnome/selinux-gnome-9999.ebuild b/sec-policy/selinux-gnome/selinux-gnome-9999.ebuild
index d66cf5db6d23..092756b47a10 100644
--- a/sec-policy/selinux-gnome/selinux-gnome-9999.ebuild
+++ b/sec-policy/selinux-gnome/selinux-gnome-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-googletalk/Manifest b/sec-policy/selinux-googletalk/Manifest
index 03ea3fbbd2d6..10b0305cbde2 100644
--- a/sec-policy/selinux-googletalk/Manifest
+++ b/sec-policy/selinux-googletalk/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-googletalk-2.20170204-r1.ebuild 295 SHA256 c28559ddc422092fcf8e5a1955c77ab06057a9f6c7058ef35cc89c6986889e00 SHA512 f157cbd4e98ae29b770ed82042eea59c7fce610c7383fab28c54b8fc5c598fe14a3e8876fa593aed91e1b194089b456d847e96d713720fa00c55096ef4020804 WHIRLPOOL 49ac60a4462675dd5f8708b1f0b58ecfae5692ebcb91ec36514e37bfe770284cb7fa2cb53b662c7092084182fbfb83c84189777a5b8989944b384783a7803cba
-EBUILD selinux-googletalk-2.20170204-r2.ebuild 293 SHA256 04578212d74792da627248799fee616bc2541025b27648e304bd5b7837e64105 SHA512 b6c2d8cbea33d17e2c820784ba85ea4b1f8a7a46507431695544761a0048464bfb2a00d88958e2785b346ec323e14d841b026f7046a14f82ccc692e310bd181f WHIRLPOOL 79d4855d91a0f17220fb4e059abd80405cd8b77848b34d816dca976d63fbc4d62b04ea775a758c59e7c472fb83d1dac6a73e3b26ed920de55f71da549a55809f
-EBUILD selinux-googletalk-2.20170204-r3.ebuild 293 SHA256 04578212d74792da627248799fee616bc2541025b27648e304bd5b7837e64105 SHA512 b6c2d8cbea33d17e2c820784ba85ea4b1f8a7a46507431695544761a0048464bfb2a00d88958e2785b346ec323e14d841b026f7046a14f82ccc692e310bd181f WHIRLPOOL 79d4855d91a0f17220fb4e059abd80405cd8b77848b34d816dca976d63fbc4d62b04ea775a758c59e7c472fb83d1dac6a73e3b26ed920de55f71da549a55809f
-EBUILD selinux-googletalk-2.20170204-r4.ebuild 293 SHA256 04578212d74792da627248799fee616bc2541025b27648e304bd5b7837e64105 SHA512 b6c2d8cbea33d17e2c820784ba85ea4b1f8a7a46507431695544761a0048464bfb2a00d88958e2785b346ec323e14d841b026f7046a14f82ccc692e310bd181f WHIRLPOOL 79d4855d91a0f17220fb4e059abd80405cd8b77848b34d816dca976d63fbc4d62b04ea775a758c59e7c472fb83d1dac6a73e3b26ed920de55f71da549a55809f
-EBUILD selinux-googletalk-2.20170805-r2.ebuild 293 SHA256 04578212d74792da627248799fee616bc2541025b27648e304bd5b7837e64105 SHA512 b6c2d8cbea33d17e2c820784ba85ea4b1f8a7a46507431695544761a0048464bfb2a00d88958e2785b346ec323e14d841b026f7046a14f82ccc692e310bd181f WHIRLPOOL 79d4855d91a0f17220fb4e059abd80405cd8b77848b34d816dca976d63fbc4d62b04ea775a758c59e7c472fb83d1dac6a73e3b26ed920de55f71da549a55809f
-EBUILD selinux-googletalk-9999.ebuild 295 SHA256 c28559ddc422092fcf8e5a1955c77ab06057a9f6c7058ef35cc89c6986889e00 SHA512 f157cbd4e98ae29b770ed82042eea59c7fce610c7383fab28c54b8fc5c598fe14a3e8876fa593aed91e1b194089b456d847e96d713720fa00c55096ef4020804 WHIRLPOOL 49ac60a4462675dd5f8708b1f0b58ecfae5692ebcb91ec36514e37bfe770284cb7fa2cb53b662c7092084182fbfb83c84189777a5b8989944b384783a7803cba
+EBUILD selinux-googletalk-2.20170204-r1.ebuild 296 SHA256 0f214da11c52e85d54c7f0e5697fe1a89cf79364b912264baadcaddf7ce2bf1c SHA512 c8e6acd0c6991be782be496556d9228b89537f0571eef01202f558b0aaf3b943cda029e9ea1dccd9d73b2d339d7eab8b7e3200a0916a701924052df01ae8a929 WHIRLPOOL 2169ff0959ab70e60337ba7542880d5f01331f322ca724c2e8d438403a930fc320614f891f0823b104ec705fce2a299be42ba3de50716214cb121fd0a3299614
+EBUILD selinux-googletalk-2.20170204-r2.ebuild 294 SHA256 76462b8872bd3f4b17ba6e110cb1bfa37f43da54ab1edee518547902a7ff2c55 SHA512 fcb9de8065b8456db8e880a38cd6110be8e432a6cb32ef34c094d7ced1029b2fba0169f709d4b837ae87afa1e7a57c907a0b733dc1ecbb453d2bd419a7919bc6 WHIRLPOOL c0f6219b74b59f1e81379763935f40a23a3dc61e9f0c41d699199ef0a6f3e13b47dfb83df730fcc712400faedd11c9bcd74d929a79e03d9023a8d78a73e13541
+EBUILD selinux-googletalk-2.20170204-r3.ebuild 294 SHA256 76462b8872bd3f4b17ba6e110cb1bfa37f43da54ab1edee518547902a7ff2c55 SHA512 fcb9de8065b8456db8e880a38cd6110be8e432a6cb32ef34c094d7ced1029b2fba0169f709d4b837ae87afa1e7a57c907a0b733dc1ecbb453d2bd419a7919bc6 WHIRLPOOL c0f6219b74b59f1e81379763935f40a23a3dc61e9f0c41d699199ef0a6f3e13b47dfb83df730fcc712400faedd11c9bcd74d929a79e03d9023a8d78a73e13541
+EBUILD selinux-googletalk-2.20170204-r4.ebuild 294 SHA256 76462b8872bd3f4b17ba6e110cb1bfa37f43da54ab1edee518547902a7ff2c55 SHA512 fcb9de8065b8456db8e880a38cd6110be8e432a6cb32ef34c094d7ced1029b2fba0169f709d4b837ae87afa1e7a57c907a0b733dc1ecbb453d2bd419a7919bc6 WHIRLPOOL c0f6219b74b59f1e81379763935f40a23a3dc61e9f0c41d699199ef0a6f3e13b47dfb83df730fcc712400faedd11c9bcd74d929a79e03d9023a8d78a73e13541
+EBUILD selinux-googletalk-2.20170805-r2.ebuild 294 SHA256 76462b8872bd3f4b17ba6e110cb1bfa37f43da54ab1edee518547902a7ff2c55 SHA512 fcb9de8065b8456db8e880a38cd6110be8e432a6cb32ef34c094d7ced1029b2fba0169f709d4b837ae87afa1e7a57c907a0b733dc1ecbb453d2bd419a7919bc6 WHIRLPOOL c0f6219b74b59f1e81379763935f40a23a3dc61e9f0c41d699199ef0a6f3e13b47dfb83df730fcc712400faedd11c9bcd74d929a79e03d9023a8d78a73e13541
+EBUILD selinux-googletalk-2.20170805-r3.ebuild 296 SHA256 0f214da11c52e85d54c7f0e5697fe1a89cf79364b912264baadcaddf7ce2bf1c SHA512 c8e6acd0c6991be782be496556d9228b89537f0571eef01202f558b0aaf3b943cda029e9ea1dccd9d73b2d339d7eab8b7e3200a0916a701924052df01ae8a929 WHIRLPOOL 2169ff0959ab70e60337ba7542880d5f01331f322ca724c2e8d438403a930fc320614f891f0823b104ec705fce2a299be42ba3de50716214cb121fd0a3299614
+EBUILD selinux-googletalk-9999.ebuild 296 SHA256 0f214da11c52e85d54c7f0e5697fe1a89cf79364b912264baadcaddf7ce2bf1c SHA512 c8e6acd0c6991be782be496556d9228b89537f0571eef01202f558b0aaf3b943cda029e9ea1dccd9d73b2d339d7eab8b7e3200a0916a701924052df01ae8a929 WHIRLPOOL 2169ff0959ab70e60337ba7542880d5f01331f322ca724c2e8d438403a930fc320614f891f0823b104ec705fce2a299be42ba3de50716214cb121fd0a3299614
 MISC ChangeLog 10979 SHA256 d52e5aaf4fe04f59d975ac5a4ae02ab66e5f0b551b51320576d21dd76e588bf4 SHA512 0b33893e9758ee48a44cf130b8d45eec2dd3c888699f0f160782fee23364f9d49dcc0ba353e416f807eb29a483bb584b4dd07fa782b56df51d431b22c2d1c42f WHIRLPOOL 32e2abd22b33ac834c2ce17044b7a12b96a6dfc9c3a9b163f68c281eef18117d30b60b5e94def99d65b6f37a115309970bcb25e02382ac32317d5c381203cea9
 MISC ChangeLog-2015 7526 SHA256 6e86b8845f2d877eb52bfcdf9e5d1e2926d3a49abba8544df77bb1e4c9669afe SHA512 fcdbea06486cdc8f38ece92403454494011366fabb6aa7da69e88a1c0758f08a072b6b14ab1221fb28f175f95f812adbd6137fa2d3bb107c842fc90966279872 WHIRLPOOL 5027b53cc0c31a895da8226e7234e0ee317a9939261cae507646112d8f1068786926e42730d80f1a9106f892cd904e56efea96eee202e772bea8c15989904102
 MISC metadata.xml 321 SHA256 4683f3b8854b5da0633efbcd13a96d38489dfb697a2a83387d298b64755ea7e4 SHA512 e09997299b9a7ed78be623f1158549b24d507e8393f47da561094dc216cfbd5f715ab169875c3faa42025da80972d825c55fac9335392731d7a181f78c41286b WHIRLPOOL 1faaeb80b0b0299bd882ce9dd90069aade616316115b20cef95dda10141da8510f7c91b3339e7a882364924712287466537fac143dc6b3a316cd86d5429a02be
diff --git a/sec-policy/selinux-googletalk/selinux-googletalk-2.20170204-r1.ebuild b/sec-policy/selinux-googletalk/selinux-googletalk-2.20170204-r1.ebuild
index 2fb714e54902..7acb35a9c323 100644
--- a/sec-policy/selinux-googletalk/selinux-googletalk-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-googletalk/selinux-googletalk-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE="alsa"
diff --git a/sec-policy/selinux-googletalk/selinux-googletalk-2.20170204-r2.ebuild b/sec-policy/selinux-googletalk/selinux-googletalk-2.20170204-r2.ebuild
index 8320338ca1ff..485e75461fa7 100644
--- a/sec-policy/selinux-googletalk/selinux-googletalk-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-googletalk/selinux-googletalk-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE="alsa"
diff --git a/sec-policy/selinux-googletalk/selinux-googletalk-2.20170204-r3.ebuild b/sec-policy/selinux-googletalk/selinux-googletalk-2.20170204-r3.ebuild
index 8320338ca1ff..485e75461fa7 100644
--- a/sec-policy/selinux-googletalk/selinux-googletalk-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-googletalk/selinux-googletalk-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE="alsa"
diff --git a/sec-policy/selinux-googletalk/selinux-googletalk-2.20170204-r4.ebuild b/sec-policy/selinux-googletalk/selinux-googletalk-2.20170204-r4.ebuild
index 8320338ca1ff..485e75461fa7 100644
--- a/sec-policy/selinux-googletalk/selinux-googletalk-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-googletalk/selinux-googletalk-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE="alsa"
diff --git a/sec-policy/selinux-googletalk/selinux-googletalk-2.20170805-r2.ebuild b/sec-policy/selinux-googletalk/selinux-googletalk-2.20170805-r2.ebuild
index 8320338ca1ff..485e75461fa7 100644
--- a/sec-policy/selinux-googletalk/selinux-googletalk-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-googletalk/selinux-googletalk-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE="alsa"
diff --git a/sec-policy/selinux-googletalk/selinux-googletalk-2.20170805-r3.ebuild b/sec-policy/selinux-googletalk/selinux-googletalk-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..7acb35a9c323
--- /dev/null
+++ b/sec-policy/selinux-googletalk/selinux-googletalk-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-googletalk/selinux-googletalk-9999.ebuild b/sec-policy/selinux-googletalk/selinux-googletalk-9999.ebuild
index 2fb714e54902..7acb35a9c323 100644
--- a/sec-policy/selinux-googletalk/selinux-googletalk-9999.ebuild
+++ b/sec-policy/selinux-googletalk/selinux-googletalk-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE="alsa"
diff --git a/sec-policy/selinux-gorg/Manifest b/sec-policy/selinux-gorg/Manifest
index 0485c26805df..f6081c0159f6 100644
--- a/sec-policy/selinux-gorg/Manifest
+++ b/sec-policy/selinux-gorg/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-gorg-2.20170204-r1.ebuild 279 SHA256 a02ae44a0e84515322b94669422d2f905670cba0c6f9ac49cb0cc3f2fa2b6f42 SHA512 c5cca4dd372d29e844fa1be0c19f2018cd3fd08d3b5cdc79ad8dc32e86496c0f10c27fb4681b77f79feec39108806cc1ce171f3892114c55afa26cc9bcfdcefa WHIRLPOOL 07400ad1fdfe7394fbb6cb4d9a91143aad9b98c2142d8d222f034ef756023dd226d332bcde69ee73bd532337a1f838b1929c79225ed16fcd2c3bc452d5e0b9e1
-EBUILD selinux-gorg-2.20170204-r2.ebuild 277 SHA256 bf6f48c29fccc4314715c8d0d6f855a739a4eea2da0b80aafd6b32525bdb88d9 SHA512 817897f086715c6a4b3d84f091ff72c44eca81239e69ebf45404245367088172416c1a7764b86a6e3e0504c6e7667b14f31fb9331ca8208b26af2f9f9eacadad WHIRLPOOL 8694785fac4c4102ce894ed8138751d6337ce93cea063dcef5a0ac79df14d99c1b83fe0685fe104b9d6361c3a1395ca9341fb583a2739795d66160d569c96475
-EBUILD selinux-gorg-2.20170204-r3.ebuild 277 SHA256 bf6f48c29fccc4314715c8d0d6f855a739a4eea2da0b80aafd6b32525bdb88d9 SHA512 817897f086715c6a4b3d84f091ff72c44eca81239e69ebf45404245367088172416c1a7764b86a6e3e0504c6e7667b14f31fb9331ca8208b26af2f9f9eacadad WHIRLPOOL 8694785fac4c4102ce894ed8138751d6337ce93cea063dcef5a0ac79df14d99c1b83fe0685fe104b9d6361c3a1395ca9341fb583a2739795d66160d569c96475
-EBUILD selinux-gorg-2.20170204-r4.ebuild 277 SHA256 bf6f48c29fccc4314715c8d0d6f855a739a4eea2da0b80aafd6b32525bdb88d9 SHA512 817897f086715c6a4b3d84f091ff72c44eca81239e69ebf45404245367088172416c1a7764b86a6e3e0504c6e7667b14f31fb9331ca8208b26af2f9f9eacadad WHIRLPOOL 8694785fac4c4102ce894ed8138751d6337ce93cea063dcef5a0ac79df14d99c1b83fe0685fe104b9d6361c3a1395ca9341fb583a2739795d66160d569c96475
-EBUILD selinux-gorg-2.20170805-r2.ebuild 277 SHA256 bf6f48c29fccc4314715c8d0d6f855a739a4eea2da0b80aafd6b32525bdb88d9 SHA512 817897f086715c6a4b3d84f091ff72c44eca81239e69ebf45404245367088172416c1a7764b86a6e3e0504c6e7667b14f31fb9331ca8208b26af2f9f9eacadad WHIRLPOOL 8694785fac4c4102ce894ed8138751d6337ce93cea063dcef5a0ac79df14d99c1b83fe0685fe104b9d6361c3a1395ca9341fb583a2739795d66160d569c96475
-EBUILD selinux-gorg-9999.ebuild 279 SHA256 a02ae44a0e84515322b94669422d2f905670cba0c6f9ac49cb0cc3f2fa2b6f42 SHA512 c5cca4dd372d29e844fa1be0c19f2018cd3fd08d3b5cdc79ad8dc32e86496c0f10c27fb4681b77f79feec39108806cc1ce171f3892114c55afa26cc9bcfdcefa WHIRLPOOL 07400ad1fdfe7394fbb6cb4d9a91143aad9b98c2142d8d222f034ef756023dd226d332bcde69ee73bd532337a1f838b1929c79225ed16fcd2c3bc452d5e0b9e1
+EBUILD selinux-gorg-2.20170204-r1.ebuild 280 SHA256 5bb35042a0f97768ee7fc163caed4fcff546b23391172984f01462a306515584 SHA512 a9656bbef538f64cb147f4ffa22f05ccae099e293ddf1a683703d7e22b528b5df801a0f78a4eeb8b68c2e6d763209e0599f9f7936ba3b9c85750bcd902b2129a WHIRLPOOL 73ca9dd246e58937b95f969045047c9fc5f72bcb5e72b60fc8cecd7198722af874546a126bed985f0685663e3f90c580490116a046a87b7162fac77881b88651
+EBUILD selinux-gorg-2.20170204-r2.ebuild 278 SHA256 44aea6c242273f553519b4a70041e3ee43b56e61f95256348933fda45fad145a SHA512 f51686b852d508bb39bdf5d3fb94ae0da4079837b6b21e45adacd868d97ad99e7eec8ae872d14c5a68ee002fb62e39701ab33d827192763e72d8dcde351eb4cd WHIRLPOOL a1575fb2326a90d30272d717c502e8bc1258e424858e8cfc245019a221b1a236093957cab6f2487648c385abf631402ccd6c043e59dbf2e4be0c94378195e504
+EBUILD selinux-gorg-2.20170204-r3.ebuild 278 SHA256 44aea6c242273f553519b4a70041e3ee43b56e61f95256348933fda45fad145a SHA512 f51686b852d508bb39bdf5d3fb94ae0da4079837b6b21e45adacd868d97ad99e7eec8ae872d14c5a68ee002fb62e39701ab33d827192763e72d8dcde351eb4cd WHIRLPOOL a1575fb2326a90d30272d717c502e8bc1258e424858e8cfc245019a221b1a236093957cab6f2487648c385abf631402ccd6c043e59dbf2e4be0c94378195e504
+EBUILD selinux-gorg-2.20170204-r4.ebuild 278 SHA256 44aea6c242273f553519b4a70041e3ee43b56e61f95256348933fda45fad145a SHA512 f51686b852d508bb39bdf5d3fb94ae0da4079837b6b21e45adacd868d97ad99e7eec8ae872d14c5a68ee002fb62e39701ab33d827192763e72d8dcde351eb4cd WHIRLPOOL a1575fb2326a90d30272d717c502e8bc1258e424858e8cfc245019a221b1a236093957cab6f2487648c385abf631402ccd6c043e59dbf2e4be0c94378195e504
+EBUILD selinux-gorg-2.20170805-r2.ebuild 278 SHA256 44aea6c242273f553519b4a70041e3ee43b56e61f95256348933fda45fad145a SHA512 f51686b852d508bb39bdf5d3fb94ae0da4079837b6b21e45adacd868d97ad99e7eec8ae872d14c5a68ee002fb62e39701ab33d827192763e72d8dcde351eb4cd WHIRLPOOL a1575fb2326a90d30272d717c502e8bc1258e424858e8cfc245019a221b1a236093957cab6f2487648c385abf631402ccd6c043e59dbf2e4be0c94378195e504
+EBUILD selinux-gorg-2.20170805-r3.ebuild 280 SHA256 5bb35042a0f97768ee7fc163caed4fcff546b23391172984f01462a306515584 SHA512 a9656bbef538f64cb147f4ffa22f05ccae099e293ddf1a683703d7e22b528b5df801a0f78a4eeb8b68c2e6d763209e0599f9f7936ba3b9c85750bcd902b2129a WHIRLPOOL 73ca9dd246e58937b95f969045047c9fc5f72bcb5e72b60fc8cecd7198722af874546a126bed985f0685663e3f90c580490116a046a87b7162fac77881b88651
+EBUILD selinux-gorg-9999.ebuild 280 SHA256 5bb35042a0f97768ee7fc163caed4fcff546b23391172984f01462a306515584 SHA512 a9656bbef538f64cb147f4ffa22f05ccae099e293ddf1a683703d7e22b528b5df801a0f78a4eeb8b68c2e6d763209e0599f9f7936ba3b9c85750bcd902b2129a WHIRLPOOL 73ca9dd246e58937b95f969045047c9fc5f72bcb5e72b60fc8cecd7198722af874546a126bed985f0685663e3f90c580490116a046a87b7162fac77881b88651
 MISC ChangeLog 10387 SHA256 d8bb650996035baf2e018cb03caccd92fca0dd799135f664c714d3b7a4169d16 SHA512 27518fea784ba2d60f74d7c4229e3795a04c692598a26a48028d7868e9646e9ffaacfd5d2aa095f963e57c264872fd4db50e34cac7f88718b08036b3056608a3 WHIRLPOOL cfba606729d4b7ac3bcb464c8117ddf4939aeff3677bf89ebc902810b33ce08325f75eac3d80b61da320f6e2ad21634f75dabb2a0cf232b55f405340ec597b93
 MISC ChangeLog-2015 10199 SHA256 dbe7e6e59a2e6f3d8aeddcdead9734de1eb94a1ab436f635059d376c52f7e5fd SHA512 5e5d257281f80941a0011ade6a06e716ee2606ce62d03d79eec9bdee06fceb1af7f28311c3570b31ca4c12dd4de7efa1f4bed395ae4951dab491290dafdc3cec WHIRLPOOL 0a30215031563c352d05bc4234465adb8782047deea33e979da0f10dc12cdd1d3e960bed3a01b3256f781089d49982b2bac59bfb75e26dbcaf4890ca7b35aaa9
 MISC metadata.xml 314 SHA256 ab6010d7105a22ef00fb13f984db00e2e9d0908f2ef2fa005c942b47cb3e3427 SHA512 bbbf21e449ca7c6bc287093a5c8f42db23f0f41f41316b7b5f08e7a1bcbcdd3e54c2e79bbeec9533ef78c2a8ef5e6c029ffad2f02eee7532e219fef42b0f99b8 WHIRLPOOL 1e5947bc87da8e705339e41919ca39c7660ffa070d3bc50ae9a1b3e34c01b5f22e68150dd059299174c155f4ba6922771a403792148c1336565ce370d36518c9
diff --git a/sec-policy/selinux-gorg/selinux-gorg-2.20170204-r1.ebuild b/sec-policy/selinux-gorg/selinux-gorg-2.20170204-r1.ebuild
index ecdcafd2c906..f4eff5e13fcf 100644
--- a/sec-policy/selinux-gorg/selinux-gorg-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-gorg/selinux-gorg-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-gorg/selinux-gorg-2.20170204-r2.ebuild b/sec-policy/selinux-gorg/selinux-gorg-2.20170204-r2.ebuild
index 074dbb595a42..447dca165e3a 100644
--- a/sec-policy/selinux-gorg/selinux-gorg-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-gorg/selinux-gorg-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-gorg/selinux-gorg-2.20170204-r3.ebuild b/sec-policy/selinux-gorg/selinux-gorg-2.20170204-r3.ebuild
index 074dbb595a42..447dca165e3a 100644
--- a/sec-policy/selinux-gorg/selinux-gorg-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-gorg/selinux-gorg-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-gorg/selinux-gorg-2.20170204-r4.ebuild b/sec-policy/selinux-gorg/selinux-gorg-2.20170204-r4.ebuild
index 074dbb595a42..447dca165e3a 100644
--- a/sec-policy/selinux-gorg/selinux-gorg-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-gorg/selinux-gorg-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-gorg/selinux-gorg-2.20170805-r2.ebuild b/sec-policy/selinux-gorg/selinux-gorg-2.20170805-r2.ebuild
index 074dbb595a42..447dca165e3a 100644
--- a/sec-policy/selinux-gorg/selinux-gorg-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-gorg/selinux-gorg-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-gorg/selinux-gorg-2.20170805-r3.ebuild b/sec-policy/selinux-gorg/selinux-gorg-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..f4eff5e13fcf
--- /dev/null
+++ b/sec-policy/selinux-gorg/selinux-gorg-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-gorg/selinux-gorg-9999.ebuild b/sec-policy/selinux-gorg/selinux-gorg-9999.ebuild
index ecdcafd2c906..f4eff5e13fcf 100644
--- a/sec-policy/selinux-gorg/selinux-gorg-9999.ebuild
+++ b/sec-policy/selinux-gorg/selinux-gorg-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-gpg/Manifest b/sec-policy/selinux-gpg/Manifest
index b36668e46594..9883e175db98 100644
--- a/sec-policy/selinux-gpg/Manifest
+++ b/sec-policy/selinux-gpg/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-gpg-2.20170204-r1.ebuild 277 SHA256 31de050073c7edc264c37669a1117e64b51f37b7dc896dc64cf675e932140afe SHA512 40123e7c86833b01444b254a25f1706e545da82ae0231ad2337ee0b782d3e07ff5f640b7dcbfd929f9ed625d04a630c89a39e88dcc0f9f0d098f8486fa9acf25 WHIRLPOOL 42b2ee7dcdd194a79f55936dfc65a81fa67fef46360c01a9c27f2e4f6e3e69c890030fe26002b55f752056b423afbabfdf6d4a64bb113df41e147d8fe1442811
-EBUILD selinux-gpg-2.20170204-r2.ebuild 275 SHA256 05ee91e8974474a670669896c66565dcf32946d74e37c52292b3dc52dbdba078 SHA512 5aa9158933d671ee59fcca527623245ac812e92c8fdae50bc5a4f89e6aeaa591a892626e2ac9a2c124411d205fff16da4d24be439a6b809bd6771027eb59aa19 WHIRLPOOL a7b8ee4af1a81fbec8afafdd5a6376093fd2f669926a98ab2dd668067445df0371bb003c09d7dcf34137bc4205ad8915247681f40e941e64247593502290b52c
-EBUILD selinux-gpg-2.20170204-r3.ebuild 275 SHA256 05ee91e8974474a670669896c66565dcf32946d74e37c52292b3dc52dbdba078 SHA512 5aa9158933d671ee59fcca527623245ac812e92c8fdae50bc5a4f89e6aeaa591a892626e2ac9a2c124411d205fff16da4d24be439a6b809bd6771027eb59aa19 WHIRLPOOL a7b8ee4af1a81fbec8afafdd5a6376093fd2f669926a98ab2dd668067445df0371bb003c09d7dcf34137bc4205ad8915247681f40e941e64247593502290b52c
-EBUILD selinux-gpg-2.20170204-r4.ebuild 275 SHA256 05ee91e8974474a670669896c66565dcf32946d74e37c52292b3dc52dbdba078 SHA512 5aa9158933d671ee59fcca527623245ac812e92c8fdae50bc5a4f89e6aeaa591a892626e2ac9a2c124411d205fff16da4d24be439a6b809bd6771027eb59aa19 WHIRLPOOL a7b8ee4af1a81fbec8afafdd5a6376093fd2f669926a98ab2dd668067445df0371bb003c09d7dcf34137bc4205ad8915247681f40e941e64247593502290b52c
-EBUILD selinux-gpg-2.20170805-r2.ebuild 275 SHA256 05ee91e8974474a670669896c66565dcf32946d74e37c52292b3dc52dbdba078 SHA512 5aa9158933d671ee59fcca527623245ac812e92c8fdae50bc5a4f89e6aeaa591a892626e2ac9a2c124411d205fff16da4d24be439a6b809bd6771027eb59aa19 WHIRLPOOL a7b8ee4af1a81fbec8afafdd5a6376093fd2f669926a98ab2dd668067445df0371bb003c09d7dcf34137bc4205ad8915247681f40e941e64247593502290b52c
-EBUILD selinux-gpg-9999.ebuild 277 SHA256 31de050073c7edc264c37669a1117e64b51f37b7dc896dc64cf675e932140afe SHA512 40123e7c86833b01444b254a25f1706e545da82ae0231ad2337ee0b782d3e07ff5f640b7dcbfd929f9ed625d04a630c89a39e88dcc0f9f0d098f8486fa9acf25 WHIRLPOOL 42b2ee7dcdd194a79f55936dfc65a81fa67fef46360c01a9c27f2e4f6e3e69c890030fe26002b55f752056b423afbabfdf6d4a64bb113df41e147d8fe1442811
+EBUILD selinux-gpg-2.20170204-r1.ebuild 278 SHA256 2178743e661b67f0d2c0096ed13e7ce462893ba82eaa8564e148141896f5b7bf SHA512 65d4d8cb15d99c8fa0095c1bfdc88521cdb688f41e8f92ecb53da7aa07bbdd0deb6aec750a0c1704d29e04d380cd0989635b904ab1850ca9c338ee4622a36306 WHIRLPOOL 09f1188e99ed32d570e30834c266d1b320281b1e716e83900f267f17abb2a375d003cdd89acab0d4e33e8d166d53a4c8cfb99f9b1f69d134969b3961387252f8
+EBUILD selinux-gpg-2.20170204-r2.ebuild 276 SHA256 feeb1a78a9a438097e59b08dff92d43018922c940a654fbd75e4772aeac0704e SHA512 70eb06d51999bc1cbbe8c14df3bc5729eca2f0057b0e95564aeaa011b68c7bc9e8f1d2bba262a04b40bfb5511bc6d9d42b278280bcf2d04c3dcad3f44c2139c7 WHIRLPOOL 2aba57cdc2b2e51d1c9f434cbb3c58e7d760711a52ba369b8bbc31851d28b5cc89d9f1d1cd0c8f8fa5c3d080c8ffa283b22fdced7fea12fc336f146da193aecb
+EBUILD selinux-gpg-2.20170204-r3.ebuild 276 SHA256 feeb1a78a9a438097e59b08dff92d43018922c940a654fbd75e4772aeac0704e SHA512 70eb06d51999bc1cbbe8c14df3bc5729eca2f0057b0e95564aeaa011b68c7bc9e8f1d2bba262a04b40bfb5511bc6d9d42b278280bcf2d04c3dcad3f44c2139c7 WHIRLPOOL 2aba57cdc2b2e51d1c9f434cbb3c58e7d760711a52ba369b8bbc31851d28b5cc89d9f1d1cd0c8f8fa5c3d080c8ffa283b22fdced7fea12fc336f146da193aecb
+EBUILD selinux-gpg-2.20170204-r4.ebuild 276 SHA256 feeb1a78a9a438097e59b08dff92d43018922c940a654fbd75e4772aeac0704e SHA512 70eb06d51999bc1cbbe8c14df3bc5729eca2f0057b0e95564aeaa011b68c7bc9e8f1d2bba262a04b40bfb5511bc6d9d42b278280bcf2d04c3dcad3f44c2139c7 WHIRLPOOL 2aba57cdc2b2e51d1c9f434cbb3c58e7d760711a52ba369b8bbc31851d28b5cc89d9f1d1cd0c8f8fa5c3d080c8ffa283b22fdced7fea12fc336f146da193aecb
+EBUILD selinux-gpg-2.20170805-r2.ebuild 276 SHA256 feeb1a78a9a438097e59b08dff92d43018922c940a654fbd75e4772aeac0704e SHA512 70eb06d51999bc1cbbe8c14df3bc5729eca2f0057b0e95564aeaa011b68c7bc9e8f1d2bba262a04b40bfb5511bc6d9d42b278280bcf2d04c3dcad3f44c2139c7 WHIRLPOOL 2aba57cdc2b2e51d1c9f434cbb3c58e7d760711a52ba369b8bbc31851d28b5cc89d9f1d1cd0c8f8fa5c3d080c8ffa283b22fdced7fea12fc336f146da193aecb
+EBUILD selinux-gpg-2.20170805-r3.ebuild 278 SHA256 2178743e661b67f0d2c0096ed13e7ce462893ba82eaa8564e148141896f5b7bf SHA512 65d4d8cb15d99c8fa0095c1bfdc88521cdb688f41e8f92ecb53da7aa07bbdd0deb6aec750a0c1704d29e04d380cd0989635b904ab1850ca9c338ee4622a36306 WHIRLPOOL 09f1188e99ed32d570e30834c266d1b320281b1e716e83900f267f17abb2a375d003cdd89acab0d4e33e8d166d53a4c8cfb99f9b1f69d134969b3961387252f8
+EBUILD selinux-gpg-9999.ebuild 278 SHA256 2178743e661b67f0d2c0096ed13e7ce462893ba82eaa8564e148141896f5b7bf SHA512 65d4d8cb15d99c8fa0095c1bfdc88521cdb688f41e8f92ecb53da7aa07bbdd0deb6aec750a0c1704d29e04d380cd0989635b904ab1850ca9c338ee4622a36306 WHIRLPOOL 09f1188e99ed32d570e30834c266d1b320281b1e716e83900f267f17abb2a375d003cdd89acab0d4e33e8d166d53a4c8cfb99f9b1f69d134969b3961387252f8
 MISC ChangeLog 10295 SHA256 1804edb55611ff2b1ad306fb5d097685a7ee832de30f727d19e33e1365861d7f SHA512 68c025d282cc3f36fa16e04ebc788daa4c3c2541cdf2129506d8d0742700004870c30297e3928b2b8bed087e1b0af5a0e22fc24f1588d63995e7fb72bc7b3249 WHIRLPOOL aab51f7e412995084dd002e76c1adecb02ac4a772ec954fe10b951d5882b0c6970946e7ea1658f8540ef8f2740558e5577d67bcf857d6eb4ca9143b901331cbe
 MISC ChangeLog-2015 11223 SHA256 42f759bec95281608daa3c7285f7ba9c838e49910161b0fd89985cf784ef54ed SHA512 087eea4783e54ea1e4b3f5b6289ad0fac6c888f2faede28aa355ef908b630a95a054f5d9d82aede32be437377a84910726f1094d0195d562d710d6e23d69e217 WHIRLPOOL ebb2a5e5d1bd05d3121a7eed2b21fd628eca2252293cb685db477983baa795c85d24908d7aa5ffeb744732f18d76f95a627b9db1c50bc0ca698e807e999fd370
 MISC metadata.xml 315 SHA256 735a7b4204c0736c18b36928ac47538610870c34022f21dcfc7462ad4cc56ff3 SHA512 5d35232f8849235b089f2f8b7e4eb1b1692e805a196605e51d78ac960613ba9116b25ddeb4bc3141a043af41454ad653bd4cd44ab8bf386c0d89075b75028f35 WHIRLPOOL 3f270b0164396d14bdc01b897b3be79e0c3249d3a5c3fe019539143abe463c07f57a83e3046a464853bda055495bfc2e52975522f9f0ee733d94a03789af7fc8
diff --git a/sec-policy/selinux-gpg/selinux-gpg-2.20170204-r1.ebuild b/sec-policy/selinux-gpg/selinux-gpg-2.20170204-r1.ebuild
index ff53224ddc24..14ec068cc0f4 100644
--- a/sec-policy/selinux-gpg/selinux-gpg-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-gpg/selinux-gpg-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-gpg/selinux-gpg-2.20170204-r2.ebuild b/sec-policy/selinux-gpg/selinux-gpg-2.20170204-r2.ebuild
index ee021578a094..9ee3d3257b12 100644
--- a/sec-policy/selinux-gpg/selinux-gpg-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-gpg/selinux-gpg-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-gpg/selinux-gpg-2.20170204-r3.ebuild b/sec-policy/selinux-gpg/selinux-gpg-2.20170204-r3.ebuild
index ee021578a094..9ee3d3257b12 100644
--- a/sec-policy/selinux-gpg/selinux-gpg-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-gpg/selinux-gpg-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-gpg/selinux-gpg-2.20170204-r4.ebuild b/sec-policy/selinux-gpg/selinux-gpg-2.20170204-r4.ebuild
index ee021578a094..9ee3d3257b12 100644
--- a/sec-policy/selinux-gpg/selinux-gpg-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-gpg/selinux-gpg-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-gpg/selinux-gpg-2.20170805-r2.ebuild b/sec-policy/selinux-gpg/selinux-gpg-2.20170805-r2.ebuild
index ee021578a094..9ee3d3257b12 100644
--- a/sec-policy/selinux-gpg/selinux-gpg-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-gpg/selinux-gpg-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-gpg/selinux-gpg-2.20170805-r3.ebuild b/sec-policy/selinux-gpg/selinux-gpg-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..14ec068cc0f4
--- /dev/null
+++ b/sec-policy/selinux-gpg/selinux-gpg-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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
diff --git a/sec-policy/selinux-gpg/selinux-gpg-9999.ebuild b/sec-policy/selinux-gpg/selinux-gpg-9999.ebuild
index ff53224ddc24..14ec068cc0f4 100644
--- a/sec-policy/selinux-gpg/selinux-gpg-9999.ebuild
+++ b/sec-policy/selinux-gpg/selinux-gpg-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-gpm/Manifest b/sec-policy/selinux-gpm/Manifest
index a58a8f018e94..aae8ff422508 100644
--- a/sec-policy/selinux-gpm/Manifest
+++ b/sec-policy/selinux-gpm/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-gpm-2.20170204-r1.ebuild 277 SHA256 923abbb30793ec3383087326eb15b0216b6fe7cfa1cee17956e080b0a928b692 SHA512 4034798c8429276b1c579f40c69782244282c1e1420686bae3c23de1b026704a9221ea2ba59d1675b4b37d9d4ff4fd3ad384a6fbf8369d59865c5daae7cc9e73 WHIRLPOOL 217bc87f99621e7fcbf8129ce39f22d2e4f844eb240988c181a20790b44324769fa999b2b91adbba0ce537ad4f49429e68cb09c09078a157d15e9d3cbc08c98d
-EBUILD selinux-gpm-2.20170204-r2.ebuild 275 SHA256 93bea4ef596d2481eeb2ab28a27ed52babd70c8a6b8d4f32fe15e343b074b3b0 SHA512 66422c5e89b29d26050af1f56e8f71a613c3b48bd8a5bae1a6641d6dc7890c2668724e90f881265e42e8416713fef3d9af7ec643d0bc33de9a8bc873606de65f WHIRLPOOL afb1544b994bc248069555439bb417ddf835649bb197fd17fd002974409e73c2348d3ef3c80db78805b0a40112fb91bfc1fb4ade97c090eb9ca952db9ebbe87c
-EBUILD selinux-gpm-2.20170204-r3.ebuild 275 SHA256 93bea4ef596d2481eeb2ab28a27ed52babd70c8a6b8d4f32fe15e343b074b3b0 SHA512 66422c5e89b29d26050af1f56e8f71a613c3b48bd8a5bae1a6641d6dc7890c2668724e90f881265e42e8416713fef3d9af7ec643d0bc33de9a8bc873606de65f WHIRLPOOL afb1544b994bc248069555439bb417ddf835649bb197fd17fd002974409e73c2348d3ef3c80db78805b0a40112fb91bfc1fb4ade97c090eb9ca952db9ebbe87c
-EBUILD selinux-gpm-2.20170204-r4.ebuild 275 SHA256 93bea4ef596d2481eeb2ab28a27ed52babd70c8a6b8d4f32fe15e343b074b3b0 SHA512 66422c5e89b29d26050af1f56e8f71a613c3b48bd8a5bae1a6641d6dc7890c2668724e90f881265e42e8416713fef3d9af7ec643d0bc33de9a8bc873606de65f WHIRLPOOL afb1544b994bc248069555439bb417ddf835649bb197fd17fd002974409e73c2348d3ef3c80db78805b0a40112fb91bfc1fb4ade97c090eb9ca952db9ebbe87c
-EBUILD selinux-gpm-2.20170805-r2.ebuild 275 SHA256 93bea4ef596d2481eeb2ab28a27ed52babd70c8a6b8d4f32fe15e343b074b3b0 SHA512 66422c5e89b29d26050af1f56e8f71a613c3b48bd8a5bae1a6641d6dc7890c2668724e90f881265e42e8416713fef3d9af7ec643d0bc33de9a8bc873606de65f WHIRLPOOL afb1544b994bc248069555439bb417ddf835649bb197fd17fd002974409e73c2348d3ef3c80db78805b0a40112fb91bfc1fb4ade97c090eb9ca952db9ebbe87c
-EBUILD selinux-gpm-9999.ebuild 277 SHA256 923abbb30793ec3383087326eb15b0216b6fe7cfa1cee17956e080b0a928b692 SHA512 4034798c8429276b1c579f40c69782244282c1e1420686bae3c23de1b026704a9221ea2ba59d1675b4b37d9d4ff4fd3ad384a6fbf8369d59865c5daae7cc9e73 WHIRLPOOL 217bc87f99621e7fcbf8129ce39f22d2e4f844eb240988c181a20790b44324769fa999b2b91adbba0ce537ad4f49429e68cb09c09078a157d15e9d3cbc08c98d
+EBUILD selinux-gpm-2.20170204-r1.ebuild 278 SHA256 8a9d077ae4a51971ce9226c56ee790c295161061bdea683a0ec06a24e55ae61e SHA512 021f77c663d5b10aeadf93be5ac914b92bb58593042725925960f3f23a443f1a198a257e28c5de13b5227b9a2c21716509dcb8ba86ee14c467fa7eb09e86b53c WHIRLPOOL b620ca53374327245346d9ae62a591eaaf77aa6e75abe6b34011ce0e2f9b95bf55f3dd6e4cdeffdba3d6906448c24cb9c1ac6f63ca39aef0f7b510357d15d17a
+EBUILD selinux-gpm-2.20170204-r2.ebuild 276 SHA256 1df98f8220ab6267362e121bf4ca9166eeac2ad657a554064289a3f30081d5b5 SHA512 2133eebcecc220920e6db0a6dea183a7885e3814edbcd0957771e616f51ea3a55110dc619669365ba2d8bcd4ef93fd60227a9cac18acf557d019a07ceb19881b WHIRLPOOL 67f740052eb186ed6d2929301a2d70fe1039a7e7f6aceb99456288f77961cbdcaf2b5e1f2f10675061fc2677383df2d7eb6945b2fae136e377ec56a810b48947
+EBUILD selinux-gpm-2.20170204-r3.ebuild 276 SHA256 1df98f8220ab6267362e121bf4ca9166eeac2ad657a554064289a3f30081d5b5 SHA512 2133eebcecc220920e6db0a6dea183a7885e3814edbcd0957771e616f51ea3a55110dc619669365ba2d8bcd4ef93fd60227a9cac18acf557d019a07ceb19881b WHIRLPOOL 67f740052eb186ed6d2929301a2d70fe1039a7e7f6aceb99456288f77961cbdcaf2b5e1f2f10675061fc2677383df2d7eb6945b2fae136e377ec56a810b48947
+EBUILD selinux-gpm-2.20170204-r4.ebuild 276 SHA256 1df98f8220ab6267362e121bf4ca9166eeac2ad657a554064289a3f30081d5b5 SHA512 2133eebcecc220920e6db0a6dea183a7885e3814edbcd0957771e616f51ea3a55110dc619669365ba2d8bcd4ef93fd60227a9cac18acf557d019a07ceb19881b WHIRLPOOL 67f740052eb186ed6d2929301a2d70fe1039a7e7f6aceb99456288f77961cbdcaf2b5e1f2f10675061fc2677383df2d7eb6945b2fae136e377ec56a810b48947
+EBUILD selinux-gpm-2.20170805-r2.ebuild 276 SHA256 1df98f8220ab6267362e121bf4ca9166eeac2ad657a554064289a3f30081d5b5 SHA512 2133eebcecc220920e6db0a6dea183a7885e3814edbcd0957771e616f51ea3a55110dc619669365ba2d8bcd4ef93fd60227a9cac18acf557d019a07ceb19881b WHIRLPOOL 67f740052eb186ed6d2929301a2d70fe1039a7e7f6aceb99456288f77961cbdcaf2b5e1f2f10675061fc2677383df2d7eb6945b2fae136e377ec56a810b48947
+EBUILD selinux-gpm-2.20170805-r3.ebuild 278 SHA256 8a9d077ae4a51971ce9226c56ee790c295161061bdea683a0ec06a24e55ae61e SHA512 021f77c663d5b10aeadf93be5ac914b92bb58593042725925960f3f23a443f1a198a257e28c5de13b5227b9a2c21716509dcb8ba86ee14c467fa7eb09e86b53c WHIRLPOOL b620ca53374327245346d9ae62a591eaaf77aa6e75abe6b34011ce0e2f9b95bf55f3dd6e4cdeffdba3d6906448c24cb9c1ac6f63ca39aef0f7b510357d15d17a
+EBUILD selinux-gpm-9999.ebuild 278 SHA256 8a9d077ae4a51971ce9226c56ee790c295161061bdea683a0ec06a24e55ae61e SHA512 021f77c663d5b10aeadf93be5ac914b92bb58593042725925960f3f23a443f1a198a257e28c5de13b5227b9a2c21716509dcb8ba86ee14c467fa7eb09e86b53c WHIRLPOOL b620ca53374327245346d9ae62a591eaaf77aa6e75abe6b34011ce0e2f9b95bf55f3dd6e4cdeffdba3d6906448c24cb9c1ac6f63ca39aef0f7b510357d15d17a
 MISC ChangeLog 10295 SHA256 f1b85e0f89b8dd1857c6aeeed70a03abe9da62401eb424109eed68f7f4360a29 SHA512 82fd87f6207efc36baf6f6bfdf046dccd7e0ac74dc4d519ef2d9187fe44a5130f82ce83f8ee1ad9dbb07203e15d518cece19487b6668767dfe7ad9e3d5625271 WHIRLPOOL b5ccd96d8fa397b23a0cbf31889c8d48f3a31297b289de41cf930a0329bb6838f588926daaf7053b257862198259b7c9f550bf8cc021f5a3562dcfd391fa081f
 MISC ChangeLog-2015 12380 SHA256 4cf882d8c5475f2a63b9dad6ca6fd4acaa068bc8ed737a2d01504a919d779628 SHA512 2a051db1668f0fbe708c01baa3d845c4f1185293800e2179fe5e1b2be69634a03e9b301128b1a94d038c7a49d397256bba0067888df1c566c650ab7f70e59d28 WHIRLPOOL 5adcc556626412678d8e59be443816c680d4dd8549d5b96c7d345a3901bdeaa058ba9b96774aa2d761c14a7088be6207fb83b0d8f591063b980df9ddce776c2e
 MISC metadata.xml 313 SHA256 f80dbd8a4f21c964c5f7aa8d1e4bde4cae46894861bbe8d5359d14fa77ca17b4 SHA512 c51b135cecad18c17f0597b098d2c0e0d60fcc4a51c70534bb7b4d39e85374cdfc6b793734f514c62194d603b6a0bde889c6772b2438e01bc3632842e1a3c1d7 WHIRLPOOL cb4cb8092947f825e2fdd9a7aa87d38d280c1cc1e83eaae9cff0d343cc5d50b6b27d71b79c89403ba585e5e8c6ec8ef8f5fc720015f42bc1f05e2c98f4c07a59
diff --git a/sec-policy/selinux-gpm/selinux-gpm-2.20170204-r1.ebuild b/sec-policy/selinux-gpm/selinux-gpm-2.20170204-r1.ebuild
index 926c42d463fc..32c356ae9091 100644
--- a/sec-policy/selinux-gpm/selinux-gpm-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-gpm/selinux-gpm-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-gpm/selinux-gpm-2.20170204-r2.ebuild b/sec-policy/selinux-gpm/selinux-gpm-2.20170204-r2.ebuild
index bc79a7446322..fd4ff754ca46 100644
--- a/sec-policy/selinux-gpm/selinux-gpm-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-gpm/selinux-gpm-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-gpm/selinux-gpm-2.20170204-r3.ebuild b/sec-policy/selinux-gpm/selinux-gpm-2.20170204-r3.ebuild
index bc79a7446322..fd4ff754ca46 100644
--- a/sec-policy/selinux-gpm/selinux-gpm-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-gpm/selinux-gpm-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-gpm/selinux-gpm-2.20170204-r4.ebuild b/sec-policy/selinux-gpm/selinux-gpm-2.20170204-r4.ebuild
index bc79a7446322..fd4ff754ca46 100644
--- a/sec-policy/selinux-gpm/selinux-gpm-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-gpm/selinux-gpm-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-gpm/selinux-gpm-2.20170805-r2.ebuild b/sec-policy/selinux-gpm/selinux-gpm-2.20170805-r2.ebuild
index bc79a7446322..fd4ff754ca46 100644
--- a/sec-policy/selinux-gpm/selinux-gpm-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-gpm/selinux-gpm-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-gpm/selinux-gpm-2.20170805-r3.ebuild b/sec-policy/selinux-gpm/selinux-gpm-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..32c356ae9091
--- /dev/null
+++ b/sec-policy/selinux-gpm/selinux-gpm-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-gpm/selinux-gpm-9999.ebuild b/sec-policy/selinux-gpm/selinux-gpm-9999.ebuild
index 926c42d463fc..32c356ae9091 100644
--- a/sec-policy/selinux-gpm/selinux-gpm-9999.ebuild
+++ b/sec-policy/selinux-gpm/selinux-gpm-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-gpsd/Manifest b/sec-policy/selinux-gpsd/Manifest
index 53ce4007f4bd..fb8df921f4a1 100644
--- a/sec-policy/selinux-gpsd/Manifest
+++ b/sec-policy/selinux-gpsd/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-gpsd-2.20170204-r1.ebuild 279 SHA256 38250bb751da854e333a2ac7755f8317f2fe3425807d012308c5bdfd0231f5ec SHA512 16362a49eb10068da0d71188239db9dd60ca96f9ae6bb6acf6e1e57eb511d78dee726f5461f050c148f0f59f05f41a7687cb93d32bac7468ee01e9cabaca3b51 WHIRLPOOL 4d680a8248232532ebc69176f0e9cffa62a01beea0e92531fb5b8072da1e32f96db2f4e5f90cf405c98918e7196cb2b0f9a19be06face060e90f492b431f11fb
-EBUILD selinux-gpsd-2.20170204-r2.ebuild 277 SHA256 da80b5decf817f57bee7c8eb008089e5b588d7e5c753be3f38bfd5c069d82ce4 SHA512 9a280474e101a6a12c9bb2fbd20d1075544b227be4bf77941c628ab415edc010e8d2c10360b0d9851713a17f416477237fb9c21067430f38e6cbe5c1b01457be WHIRLPOOL 4e609ee2d1d21fd45a228f49d7a0ca65042c6bc12078eb32457651bc78ec7bca1633adcbd219342494a7ffb27f09c894fc56755ef1450cd74add9a06e6bbaf80
-EBUILD selinux-gpsd-2.20170204-r3.ebuild 277 SHA256 da80b5decf817f57bee7c8eb008089e5b588d7e5c753be3f38bfd5c069d82ce4 SHA512 9a280474e101a6a12c9bb2fbd20d1075544b227be4bf77941c628ab415edc010e8d2c10360b0d9851713a17f416477237fb9c21067430f38e6cbe5c1b01457be WHIRLPOOL 4e609ee2d1d21fd45a228f49d7a0ca65042c6bc12078eb32457651bc78ec7bca1633adcbd219342494a7ffb27f09c894fc56755ef1450cd74add9a06e6bbaf80
-EBUILD selinux-gpsd-2.20170204-r4.ebuild 277 SHA256 da80b5decf817f57bee7c8eb008089e5b588d7e5c753be3f38bfd5c069d82ce4 SHA512 9a280474e101a6a12c9bb2fbd20d1075544b227be4bf77941c628ab415edc010e8d2c10360b0d9851713a17f416477237fb9c21067430f38e6cbe5c1b01457be WHIRLPOOL 4e609ee2d1d21fd45a228f49d7a0ca65042c6bc12078eb32457651bc78ec7bca1633adcbd219342494a7ffb27f09c894fc56755ef1450cd74add9a06e6bbaf80
-EBUILD selinux-gpsd-2.20170805-r2.ebuild 277 SHA256 da80b5decf817f57bee7c8eb008089e5b588d7e5c753be3f38bfd5c069d82ce4 SHA512 9a280474e101a6a12c9bb2fbd20d1075544b227be4bf77941c628ab415edc010e8d2c10360b0d9851713a17f416477237fb9c21067430f38e6cbe5c1b01457be WHIRLPOOL 4e609ee2d1d21fd45a228f49d7a0ca65042c6bc12078eb32457651bc78ec7bca1633adcbd219342494a7ffb27f09c894fc56755ef1450cd74add9a06e6bbaf80
-EBUILD selinux-gpsd-9999.ebuild 279 SHA256 38250bb751da854e333a2ac7755f8317f2fe3425807d012308c5bdfd0231f5ec SHA512 16362a49eb10068da0d71188239db9dd60ca96f9ae6bb6acf6e1e57eb511d78dee726f5461f050c148f0f59f05f41a7687cb93d32bac7468ee01e9cabaca3b51 WHIRLPOOL 4d680a8248232532ebc69176f0e9cffa62a01beea0e92531fb5b8072da1e32f96db2f4e5f90cf405c98918e7196cb2b0f9a19be06face060e90f492b431f11fb
+EBUILD selinux-gpsd-2.20170204-r1.ebuild 280 SHA256 13999c09b1894234166feaa0af413a5b976ab6626574c50a2eccabe43971b8dc SHA512 262719337e7626ff706b3318b3013cecfee751c9681710e1849b8f663e506064aada986041e006f7dc220c9a28db917da97702836565caa620c45de2b0218edf WHIRLPOOL 2795db032b9ed6842f38ff26d6c36db54a08051ce07db027a5e7e3ff5254ff81d8dc75bd78ad2b0d6fbfc8e6434c51aa290afed7444d82697ca785266bd9859e
+EBUILD selinux-gpsd-2.20170204-r2.ebuild 278 SHA256 745dcb903e9686edee74a0ddd69b28a01248b877026c69de118a20d8e395f2c2 SHA512 caaed11a93921d4cfc10b0eea0250bf0f74aadeb976e0a83c9e2a949e8299972e2075b007f00244d471a2d71effbbf2bbcfa8255525343d2ec23eb8b3f64736a WHIRLPOOL 4c1ec47b773b93e9e54e8eec24d1064e3068f75a09f74787966e7e6caf797f1d20f5e4bd97af2a09e48b9822ca0fd8a29bb6ef6354a09b40fba8a81025c9b11b
+EBUILD selinux-gpsd-2.20170204-r3.ebuild 278 SHA256 745dcb903e9686edee74a0ddd69b28a01248b877026c69de118a20d8e395f2c2 SHA512 caaed11a93921d4cfc10b0eea0250bf0f74aadeb976e0a83c9e2a949e8299972e2075b007f00244d471a2d71effbbf2bbcfa8255525343d2ec23eb8b3f64736a WHIRLPOOL 4c1ec47b773b93e9e54e8eec24d1064e3068f75a09f74787966e7e6caf797f1d20f5e4bd97af2a09e48b9822ca0fd8a29bb6ef6354a09b40fba8a81025c9b11b
+EBUILD selinux-gpsd-2.20170204-r4.ebuild 278 SHA256 745dcb903e9686edee74a0ddd69b28a01248b877026c69de118a20d8e395f2c2 SHA512 caaed11a93921d4cfc10b0eea0250bf0f74aadeb976e0a83c9e2a949e8299972e2075b007f00244d471a2d71effbbf2bbcfa8255525343d2ec23eb8b3f64736a WHIRLPOOL 4c1ec47b773b93e9e54e8eec24d1064e3068f75a09f74787966e7e6caf797f1d20f5e4bd97af2a09e48b9822ca0fd8a29bb6ef6354a09b40fba8a81025c9b11b
+EBUILD selinux-gpsd-2.20170805-r2.ebuild 278 SHA256 745dcb903e9686edee74a0ddd69b28a01248b877026c69de118a20d8e395f2c2 SHA512 caaed11a93921d4cfc10b0eea0250bf0f74aadeb976e0a83c9e2a949e8299972e2075b007f00244d471a2d71effbbf2bbcfa8255525343d2ec23eb8b3f64736a WHIRLPOOL 4c1ec47b773b93e9e54e8eec24d1064e3068f75a09f74787966e7e6caf797f1d20f5e4bd97af2a09e48b9822ca0fd8a29bb6ef6354a09b40fba8a81025c9b11b
+EBUILD selinux-gpsd-2.20170805-r3.ebuild 280 SHA256 13999c09b1894234166feaa0af413a5b976ab6626574c50a2eccabe43971b8dc SHA512 262719337e7626ff706b3318b3013cecfee751c9681710e1849b8f663e506064aada986041e006f7dc220c9a28db917da97702836565caa620c45de2b0218edf WHIRLPOOL 2795db032b9ed6842f38ff26d6c36db54a08051ce07db027a5e7e3ff5254ff81d8dc75bd78ad2b0d6fbfc8e6434c51aa290afed7444d82697ca785266bd9859e
+EBUILD selinux-gpsd-9999.ebuild 280 SHA256 13999c09b1894234166feaa0af413a5b976ab6626574c50a2eccabe43971b8dc SHA512 262719337e7626ff706b3318b3013cecfee751c9681710e1849b8f663e506064aada986041e006f7dc220c9a28db917da97702836565caa620c45de2b0218edf WHIRLPOOL 2795db032b9ed6842f38ff26d6c36db54a08051ce07db027a5e7e3ff5254ff81d8dc75bd78ad2b0d6fbfc8e6434c51aa290afed7444d82697ca785266bd9859e
 MISC ChangeLog 10387 SHA256 7e49bdc7bde00db54526b75525a3aa6751b8031ea9a9126bc9ab740d07173730 SHA512 9dcc30002fae3ac3c1e623fdc8b501bc927fb9279f5e6a9b5b74581cf8238a00c6956a7bfa66816c2aac5f3b1f53d5a4c2fe34562a7468c372bd544626ec6ca3 WHIRLPOOL af188e60687096e98ad6ed7c35ad12f5b85f5d8fc12f58db90a68f5483b8b18d206543b1c80244b284f824dbab3cd26b7ffb8d89ae3840f9c0851d295fd91024
 MISC ChangeLog-2015 9636 SHA256 08a5a855811d393a0f6ba73adf2bb6593863097072895184789a91fc191268a5 SHA512 ebfe2ee420f703d2ba948b5c3874b6dc75d55a880a180b229aa3fcc22f895d42f25c5467d5ac91775156a81473af5b23c105563457cb2f3e9df3dde235731994 WHIRLPOOL 9abc7c1d1f824806bcd47b168fa1f49dfaa6abea281a11867f705a8cb25103077bd91181626be3033584b7aa0cdbd49b13fea146ef66a98da3c2e4975f1487f9
 MISC metadata.xml 314 SHA256 feed5e6dbc8a79a5d974de7f8be84920a1d975cbb71f0c495c4894d874e8a9b8 SHA512 15038df07a6a26d2e27fcefb00f460d3dce414f5fa30ff7e40a818d27c25747afd61caa1888f3c7b7a4f4030aa0b6f34187e2b36d7ba549a65ad084378043027 WHIRLPOOL 912d8ce03492fdf26445d8f8b09838cc85875f86317c76f605fe5029aae38bd771fc3425d174e228835879903669f848b524df04c55245d298cc7eb8bb102332
diff --git a/sec-policy/selinux-gpsd/selinux-gpsd-2.20170204-r1.ebuild b/sec-policy/selinux-gpsd/selinux-gpsd-2.20170204-r1.ebuild
index 1cba1d326c24..f5f7d014b04e 100644
--- a/sec-policy/selinux-gpsd/selinux-gpsd-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-gpsd/selinux-gpsd-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-gpsd/selinux-gpsd-2.20170204-r2.ebuild b/sec-policy/selinux-gpsd/selinux-gpsd-2.20170204-r2.ebuild
index a775821ecbe7..f0ea0d9089e3 100644
--- a/sec-policy/selinux-gpsd/selinux-gpsd-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-gpsd/selinux-gpsd-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-gpsd/selinux-gpsd-2.20170204-r3.ebuild b/sec-policy/selinux-gpsd/selinux-gpsd-2.20170204-r3.ebuild
index a775821ecbe7..f0ea0d9089e3 100644
--- a/sec-policy/selinux-gpsd/selinux-gpsd-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-gpsd/selinux-gpsd-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-gpsd/selinux-gpsd-2.20170204-r4.ebuild b/sec-policy/selinux-gpsd/selinux-gpsd-2.20170204-r4.ebuild
index a775821ecbe7..f0ea0d9089e3 100644
--- a/sec-policy/selinux-gpsd/selinux-gpsd-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-gpsd/selinux-gpsd-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-gpsd/selinux-gpsd-2.20170805-r2.ebuild b/sec-policy/selinux-gpsd/selinux-gpsd-2.20170805-r2.ebuild
index a775821ecbe7..f0ea0d9089e3 100644
--- a/sec-policy/selinux-gpsd/selinux-gpsd-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-gpsd/selinux-gpsd-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-gpsd/selinux-gpsd-2.20170805-r3.ebuild b/sec-policy/selinux-gpsd/selinux-gpsd-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..f5f7d014b04e
--- /dev/null
+++ b/sec-policy/selinux-gpsd/selinux-gpsd-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-gpsd/selinux-gpsd-9999.ebuild b/sec-policy/selinux-gpsd/selinux-gpsd-9999.ebuild
index 1cba1d326c24..f5f7d014b04e 100644
--- a/sec-policy/selinux-gpsd/selinux-gpsd-9999.ebuild
+++ b/sec-policy/selinux-gpsd/selinux-gpsd-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-gssproxy/Manifest b/sec-policy/selinux-gssproxy/Manifest
new file mode 100644
index 000000000000..4f25e7a60de9
--- /dev/null
+++ b/sec-policy/selinux-gssproxy/Manifest
@@ -0,0 +1,5 @@
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
+DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
+EBUILD selinux-gssproxy-2.20170805-r3.ebuild 288 SHA256 decada4f28b3bb90c4e7d0fdd716268ea900b83591daad9de11654d64e6b2615 SHA512 7b633bfc8b0ba5a15801c4c9ef5beaf9ffd5f4636aa0c55b18a2aec45f5a9fa90f32a8ea356f66a937112c87c150bee65768a6dd3a2e7ea34660449432f64ce7 WHIRLPOOL 5b677af0ee27e62f10a9e06c5a88621bd352f140729d26e382532e72c998792e109fcc785f6f3894e794d807379a7cdb7638a0da13d4cc205e10ae1965218eb4
+EBUILD selinux-gssproxy-9999.ebuild 288 SHA256 decada4f28b3bb90c4e7d0fdd716268ea900b83591daad9de11654d64e6b2615 SHA512 7b633bfc8b0ba5a15801c4c9ef5beaf9ffd5f4636aa0c55b18a2aec45f5a9fa90f32a8ea356f66a937112c87c150bee65768a6dd3a2e7ea34660449432f64ce7 WHIRLPOOL 5b677af0ee27e62f10a9e06c5a88621bd352f140729d26e382532e72c998792e109fcc785f6f3894e794d807379a7cdb7638a0da13d4cc205e10ae1965218eb4
+MISC metadata.xml 318 SHA256 e370a38397c799513bb7cb9b7906abd3b96f81d1686b5722a3e35985890b364d SHA512 172d47914a3c198f958c1f796e949cf65948ecea9d3c5e1228ff10070bdbaddab3ec63ce9d1d47ea727f57d7574233f8149beec0f52a4de00f3027f97d9452d8 WHIRLPOOL afc0a775a9d49d46db5ad20e888a4c7037bf714a21f005910db3c4da3d63d56d7e8d2468db8c6f6fb358a2ca038d1082d6e1ee738d72874a54dfa3d49aacb075
diff --git a/sec-policy/selinux-gssproxy/metadata.xml b/sec-policy/selinux-gssproxy/metadata.xml
new file mode 100644
index 000000000000..a06bcc5d14ec
--- /dev/null
+++ b/sec-policy/selinux-gssproxy/metadata.xml
@@ -0,0 +1,9 @@
+<?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>
+	<longdescription>Gentoo SELinux policy for gssproxy</longdescription>
+</pkgmetadata>
diff --git a/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20170805-r3.ebuild b/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..c4d41d41b472
--- /dev/null
+++ b/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-gssproxy/selinux-gssproxy-9999.ebuild b/sec-policy/selinux-gssproxy/selinux-gssproxy-9999.ebuild
new file mode 100644
index 000000000000..c4d41d41b472
--- /dev/null
+++ b/sec-policy/selinux-gssproxy/selinux-gssproxy-9999.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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 fdf11aeb4118..be1239372431 100644
--- a/sec-policy/selinux-hddtemp/Manifest
+++ b/sec-policy/selinux-hddtemp/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-hddtemp-2.20170204-r1.ebuild 285 SHA256 03f1b66bb505fd354aa26ac211239bb07849ce0b156b91c8e4936fe1138995f2 SHA512 b7838472a0eaa13a3ab2fd082b922ba8552df124b3db679df06850449298edc146994dfb9857b2635375513841e9a973d32c4d63e7f7ace840b7e2b9dcb92e38 WHIRLPOOL 03afae6ef0b265186d85a9b85bcc04c26102f4df9ad78036946e4f9c4820f1c78abe61f66dd344f469afe761a638c42ee4a48e4d0627de9501d468462af04d23
-EBUILD selinux-hddtemp-2.20170204-r2.ebuild 283 SHA256 7891ca827b6701c0504fe78b43dfa14e7525b87a9a02885416a9951f5db930e1 SHA512 bc595301835d26098ea2e3c1fa92248e2cb4681f42b4f580cd0be12194bf49ff6e37069ba876fffb434872d850bffcec6d2284f22836d722d72074adeca320c3 WHIRLPOOL 47c21f3625780bd1376ff23ef075dbb0dc8410ea416e6745d762314f4233ce3406d2a9638e9c12fc724c7bba957b496588a8d1dee5e665c4ec38d6a25325406d
-EBUILD selinux-hddtemp-2.20170204-r3.ebuild 283 SHA256 7891ca827b6701c0504fe78b43dfa14e7525b87a9a02885416a9951f5db930e1 SHA512 bc595301835d26098ea2e3c1fa92248e2cb4681f42b4f580cd0be12194bf49ff6e37069ba876fffb434872d850bffcec6d2284f22836d722d72074adeca320c3 WHIRLPOOL 47c21f3625780bd1376ff23ef075dbb0dc8410ea416e6745d762314f4233ce3406d2a9638e9c12fc724c7bba957b496588a8d1dee5e665c4ec38d6a25325406d
-EBUILD selinux-hddtemp-2.20170204-r4.ebuild 283 SHA256 7891ca827b6701c0504fe78b43dfa14e7525b87a9a02885416a9951f5db930e1 SHA512 bc595301835d26098ea2e3c1fa92248e2cb4681f42b4f580cd0be12194bf49ff6e37069ba876fffb434872d850bffcec6d2284f22836d722d72074adeca320c3 WHIRLPOOL 47c21f3625780bd1376ff23ef075dbb0dc8410ea416e6745d762314f4233ce3406d2a9638e9c12fc724c7bba957b496588a8d1dee5e665c4ec38d6a25325406d
-EBUILD selinux-hddtemp-2.20170805-r2.ebuild 283 SHA256 7891ca827b6701c0504fe78b43dfa14e7525b87a9a02885416a9951f5db930e1 SHA512 bc595301835d26098ea2e3c1fa92248e2cb4681f42b4f580cd0be12194bf49ff6e37069ba876fffb434872d850bffcec6d2284f22836d722d72074adeca320c3 WHIRLPOOL 47c21f3625780bd1376ff23ef075dbb0dc8410ea416e6745d762314f4233ce3406d2a9638e9c12fc724c7bba957b496588a8d1dee5e665c4ec38d6a25325406d
-EBUILD selinux-hddtemp-9999.ebuild 285 SHA256 03f1b66bb505fd354aa26ac211239bb07849ce0b156b91c8e4936fe1138995f2 SHA512 b7838472a0eaa13a3ab2fd082b922ba8552df124b3db679df06850449298edc146994dfb9857b2635375513841e9a973d32c4d63e7f7ace840b7e2b9dcb92e38 WHIRLPOOL 03afae6ef0b265186d85a9b85bcc04c26102f4df9ad78036946e4f9c4820f1c78abe61f66dd344f469afe761a638c42ee4a48e4d0627de9501d468462af04d23
+EBUILD selinux-hddtemp-2.20170204-r1.ebuild 286 SHA256 d0e96e6fcf0d36508550fe3a1a67a04aebef973fb6185079d6bd03a19106eb7c SHA512 95714a293b9302903239f460666f8d35127af968b3a6774639a77ff2f9c0e87651496b78976496b89cb87a6bd7ad4728949b3a579b8d5c30146d1f4dee1ee31e WHIRLPOOL b1fa4c3e45c26d36b7e38a9a1b285346f4d272f76d18f5711bc04be4f6bbd8910965f2f13bd80fe7942fa70728787fc3400bead40f6282d6b3457cd75064a78e
+EBUILD selinux-hddtemp-2.20170204-r2.ebuild 284 SHA256 ef3ebd130421d27acd43a2cc5c74dfc5d33e74560b637dbbf782b113ee8418da SHA512 853296d0775ea8cfee74a42c86c1e20db9e58fa4b2c3b0162cd596cb3fc9283688424b55a40b0fffc864f52d5c1bde2748fa3aad2830f269462ecb1be0b6c0cb WHIRLPOOL a9ffcea869c68b42f415da3ac45f9e65eb135402d2a264a3b330ad93071a5795cbcdfd77c55ba99d80fce975c02a2bba969ae8f0763234b6277b1902e76f1f5e
+EBUILD selinux-hddtemp-2.20170204-r3.ebuild 284 SHA256 ef3ebd130421d27acd43a2cc5c74dfc5d33e74560b637dbbf782b113ee8418da SHA512 853296d0775ea8cfee74a42c86c1e20db9e58fa4b2c3b0162cd596cb3fc9283688424b55a40b0fffc864f52d5c1bde2748fa3aad2830f269462ecb1be0b6c0cb WHIRLPOOL a9ffcea869c68b42f415da3ac45f9e65eb135402d2a264a3b330ad93071a5795cbcdfd77c55ba99d80fce975c02a2bba969ae8f0763234b6277b1902e76f1f5e
+EBUILD selinux-hddtemp-2.20170204-r4.ebuild 284 SHA256 ef3ebd130421d27acd43a2cc5c74dfc5d33e74560b637dbbf782b113ee8418da SHA512 853296d0775ea8cfee74a42c86c1e20db9e58fa4b2c3b0162cd596cb3fc9283688424b55a40b0fffc864f52d5c1bde2748fa3aad2830f269462ecb1be0b6c0cb WHIRLPOOL a9ffcea869c68b42f415da3ac45f9e65eb135402d2a264a3b330ad93071a5795cbcdfd77c55ba99d80fce975c02a2bba969ae8f0763234b6277b1902e76f1f5e
+EBUILD selinux-hddtemp-2.20170805-r2.ebuild 284 SHA256 ef3ebd130421d27acd43a2cc5c74dfc5d33e74560b637dbbf782b113ee8418da SHA512 853296d0775ea8cfee74a42c86c1e20db9e58fa4b2c3b0162cd596cb3fc9283688424b55a40b0fffc864f52d5c1bde2748fa3aad2830f269462ecb1be0b6c0cb WHIRLPOOL a9ffcea869c68b42f415da3ac45f9e65eb135402d2a264a3b330ad93071a5795cbcdfd77c55ba99d80fce975c02a2bba969ae8f0763234b6277b1902e76f1f5e
+EBUILD selinux-hddtemp-2.20170805-r3.ebuild 286 SHA256 d0e96e6fcf0d36508550fe3a1a67a04aebef973fb6185079d6bd03a19106eb7c SHA512 95714a293b9302903239f460666f8d35127af968b3a6774639a77ff2f9c0e87651496b78976496b89cb87a6bd7ad4728949b3a579b8d5c30146d1f4dee1ee31e WHIRLPOOL b1fa4c3e45c26d36b7e38a9a1b285346f4d272f76d18f5711bc04be4f6bbd8910965f2f13bd80fe7942fa70728787fc3400bead40f6282d6b3457cd75064a78e
+EBUILD selinux-hddtemp-9999.ebuild 286 SHA256 d0e96e6fcf0d36508550fe3a1a67a04aebef973fb6185079d6bd03a19106eb7c SHA512 95714a293b9302903239f460666f8d35127af968b3a6774639a77ff2f9c0e87651496b78976496b89cb87a6bd7ad4728949b3a579b8d5c30146d1f4dee1ee31e WHIRLPOOL b1fa4c3e45c26d36b7e38a9a1b285346f4d272f76d18f5711bc04be4f6bbd8910965f2f13bd80fe7942fa70728787fc3400bead40f6282d6b3457cd75064a78e
 MISC ChangeLog 10687 SHA256 ed53f4bbbafb7641121c8d1758483eb8fd4438997767803b3ef72224943ee97a SHA512 7de9106d50ce4c67ed9b787e79e93263a0f137a3ec0c4ba1fb47a9d0fb511f4989f36b419192cf3fbe758e548cd799b09266ba7fc52ecc4af6bc06df8a63d76d WHIRLPOOL 50bf788f1ad98349c1333b4ba5b4e2fef38e97f6bc38c66e543dfdf10a4e775dd74c5ed59bcf44c3c3aa8489f70409b4b056545da975be32e358ec29974d1091
 MISC ChangeLog-2015 9977 SHA256 a6c856fcd56fb832e30977d1292e08e7573cd988ed41d7d2428d6fd0fd6f09eb SHA512 cf56e145ab556e40743e5b3c70fa4f81d607f111e588deab2e6bccaa30cae731c0e4ee2acc82ce6d699aea34d1e8a3cdd85487c0e1061fdfff0e247d609d1527 WHIRLPOOL f577e88c668ae55505881d7831b28065b25304d278c3336a1a594e36d4d19cebb395b8d9d7a0eff90d65dc6b2a71ed65ce20a4724aa09f7b6baa97b827901cd0
 MISC metadata.xml 317 SHA256 0029b6d52bcfa7ddfc58810c945c5e64d5113bec3156dafd7c45e4fdedfd9346 SHA512 2be1948142bfe89c0091371632d7a8bc662cc2f65e7e07bc2635602decc6bf3557191d3989d285a4428cc05d950a815a1b7a6938d1bfc86594e755a25fc3df71 WHIRLPOOL 61115b2e20c982a3a67ceae1bd4f9760f1b0ea27adace7809a7dcc2e802c656bd2e6e983d931110ba485dff4d97a2e8eff409accaefedee8cccf46a8243e2547
diff --git a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20170204-r1.ebuild b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20170204-r1.ebuild
index 1fb15079b6be..35d6f1c5297a 100644
--- a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20170204-r2.ebuild b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20170204-r2.ebuild
index f461c21bd3af..d987e86caa40 100644
--- a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20170204-r3.ebuild b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20170204-r3.ebuild
index f461c21bd3af..d987e86caa40 100644
--- a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20170204-r4.ebuild b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20170204-r4.ebuild
index f461c21bd3af..d987e86caa40 100644
--- a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20170805-r2.ebuild b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20170805-r2.ebuild
index f461c21bd3af..d987e86caa40 100644
--- a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20170805-r3.ebuild b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..35d6f1c5297a
--- /dev/null
+++ b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-hddtemp/selinux-hddtemp-9999.ebuild b/sec-policy/selinux-hddtemp/selinux-hddtemp-9999.ebuild
index 1fb15079b6be..35d6f1c5297a 100644
--- a/sec-policy/selinux-hddtemp/selinux-hddtemp-9999.ebuild
+++ b/sec-policy/selinux-hddtemp/selinux-hddtemp-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-howl/Manifest b/sec-policy/selinux-howl/Manifest
index be9cfe3afed8..c27154e97103 100644
--- a/sec-policy/selinux-howl/Manifest
+++ b/sec-policy/selinux-howl/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-howl-2.20170204-r1.ebuild 279 SHA256 961c1f692b71c1b88e0f8a4c9c278f4c26254e83abc0fe8602f061097864acda SHA512 ec3f0554c55680082acc5f0ce84238503aa5822197ed4d15b0604ec633b7fe5948f90886ce471823a52179e7473b2e1e3acf1c54462b8bb202e769ce57307172 WHIRLPOOL 68247cefdc005c30040318568b3ddd682d1661c4ac89a3908d48e5c6f69703688acf9d9c5db5da3d95928339189380b4c0ebac0eb4c5551bb65dc22b29c13ad8
-EBUILD selinux-howl-2.20170204-r2.ebuild 277 SHA256 6766c423806d939c65fedc5e967881a4489e457239e8ecb440b8781331d3db56 SHA512 1a8a994717d5c5ecf18e779fec778cb8d97787876977c4dececf4e706cec7aed92c53eca2ea474944480d42897842b072a527bf193dc6d80db682b2345f1ccd3 WHIRLPOOL fa02a9f93a70682f5ff6228652de9ced32d1c5a365fd4b2c4105077690506081eaae836b91d5773afbb6218a4d7d60758593ae8ac92115e94d60240a41582ae5
-EBUILD selinux-howl-2.20170204-r3.ebuild 277 SHA256 6766c423806d939c65fedc5e967881a4489e457239e8ecb440b8781331d3db56 SHA512 1a8a994717d5c5ecf18e779fec778cb8d97787876977c4dececf4e706cec7aed92c53eca2ea474944480d42897842b072a527bf193dc6d80db682b2345f1ccd3 WHIRLPOOL fa02a9f93a70682f5ff6228652de9ced32d1c5a365fd4b2c4105077690506081eaae836b91d5773afbb6218a4d7d60758593ae8ac92115e94d60240a41582ae5
-EBUILD selinux-howl-2.20170204-r4.ebuild 277 SHA256 6766c423806d939c65fedc5e967881a4489e457239e8ecb440b8781331d3db56 SHA512 1a8a994717d5c5ecf18e779fec778cb8d97787876977c4dececf4e706cec7aed92c53eca2ea474944480d42897842b072a527bf193dc6d80db682b2345f1ccd3 WHIRLPOOL fa02a9f93a70682f5ff6228652de9ced32d1c5a365fd4b2c4105077690506081eaae836b91d5773afbb6218a4d7d60758593ae8ac92115e94d60240a41582ae5
-EBUILD selinux-howl-2.20170805-r2.ebuild 277 SHA256 6766c423806d939c65fedc5e967881a4489e457239e8ecb440b8781331d3db56 SHA512 1a8a994717d5c5ecf18e779fec778cb8d97787876977c4dececf4e706cec7aed92c53eca2ea474944480d42897842b072a527bf193dc6d80db682b2345f1ccd3 WHIRLPOOL fa02a9f93a70682f5ff6228652de9ced32d1c5a365fd4b2c4105077690506081eaae836b91d5773afbb6218a4d7d60758593ae8ac92115e94d60240a41582ae5
-EBUILD selinux-howl-9999.ebuild 279 SHA256 961c1f692b71c1b88e0f8a4c9c278f4c26254e83abc0fe8602f061097864acda SHA512 ec3f0554c55680082acc5f0ce84238503aa5822197ed4d15b0604ec633b7fe5948f90886ce471823a52179e7473b2e1e3acf1c54462b8bb202e769ce57307172 WHIRLPOOL 68247cefdc005c30040318568b3ddd682d1661c4ac89a3908d48e5c6f69703688acf9d9c5db5da3d95928339189380b4c0ebac0eb4c5551bb65dc22b29c13ad8
+EBUILD selinux-howl-2.20170204-r1.ebuild 280 SHA256 5b323689967ad0d1e5c930bc10999c45bd01e9c49c18359263c835b228f8d943 SHA512 40222272b1337b6b395acd5bdb564aec33cec1f1abbc4e3bbe3a1b66773085070b4d1df658d4008b9db3349de42c2ec36104101dc4b1238a2a6837bd2330641a WHIRLPOOL 8330ad74dcd8af0afe1df4a9516d5cd79bb0a173cd13a5d713ccbcd2e8aa07db44e4b31219a8b4411a5a62e7ae1a46bf709e11f4415b990f25f51928498d22b6
+EBUILD selinux-howl-2.20170204-r2.ebuild 278 SHA256 41ba2ed2be08d660a6edc531bf40f950024083fba8583e95b0428f74ca75c32e SHA512 15cd7ae8b17e514504e32d64acd4b9785344a6a1b7341a4663b821b708e48f0ef8b729469bce895adc8a0db9c8dd74ef12cd2ac1acb67b984abc21a75162a0d8 WHIRLPOOL ad6fc78f0b81c930047461e1eee5d4ac14e3675a3fab3731c047271cf1ff664f7ab2e75fe696795fed3a84e8dfdc4a9130fba41c8d86fd772073b50af589bac2
+EBUILD selinux-howl-2.20170204-r3.ebuild 278 SHA256 41ba2ed2be08d660a6edc531bf40f950024083fba8583e95b0428f74ca75c32e SHA512 15cd7ae8b17e514504e32d64acd4b9785344a6a1b7341a4663b821b708e48f0ef8b729469bce895adc8a0db9c8dd74ef12cd2ac1acb67b984abc21a75162a0d8 WHIRLPOOL ad6fc78f0b81c930047461e1eee5d4ac14e3675a3fab3731c047271cf1ff664f7ab2e75fe696795fed3a84e8dfdc4a9130fba41c8d86fd772073b50af589bac2
+EBUILD selinux-howl-2.20170204-r4.ebuild 278 SHA256 41ba2ed2be08d660a6edc531bf40f950024083fba8583e95b0428f74ca75c32e SHA512 15cd7ae8b17e514504e32d64acd4b9785344a6a1b7341a4663b821b708e48f0ef8b729469bce895adc8a0db9c8dd74ef12cd2ac1acb67b984abc21a75162a0d8 WHIRLPOOL ad6fc78f0b81c930047461e1eee5d4ac14e3675a3fab3731c047271cf1ff664f7ab2e75fe696795fed3a84e8dfdc4a9130fba41c8d86fd772073b50af589bac2
+EBUILD selinux-howl-2.20170805-r2.ebuild 278 SHA256 41ba2ed2be08d660a6edc531bf40f950024083fba8583e95b0428f74ca75c32e SHA512 15cd7ae8b17e514504e32d64acd4b9785344a6a1b7341a4663b821b708e48f0ef8b729469bce895adc8a0db9c8dd74ef12cd2ac1acb67b984abc21a75162a0d8 WHIRLPOOL ad6fc78f0b81c930047461e1eee5d4ac14e3675a3fab3731c047271cf1ff664f7ab2e75fe696795fed3a84e8dfdc4a9130fba41c8d86fd772073b50af589bac2
+EBUILD selinux-howl-2.20170805-r3.ebuild 280 SHA256 5b323689967ad0d1e5c930bc10999c45bd01e9c49c18359263c835b228f8d943 SHA512 40222272b1337b6b395acd5bdb564aec33cec1f1abbc4e3bbe3a1b66773085070b4d1df658d4008b9db3349de42c2ec36104101dc4b1238a2a6837bd2330641a WHIRLPOOL 8330ad74dcd8af0afe1df4a9516d5cd79bb0a173cd13a5d713ccbcd2e8aa07db44e4b31219a8b4411a5a62e7ae1a46bf709e11f4415b990f25f51928498d22b6
+EBUILD selinux-howl-9999.ebuild 280 SHA256 5b323689967ad0d1e5c930bc10999c45bd01e9c49c18359263c835b228f8d943 SHA512 40222272b1337b6b395acd5bdb564aec33cec1f1abbc4e3bbe3a1b66773085070b4d1df658d4008b9db3349de42c2ec36104101dc4b1238a2a6837bd2330641a WHIRLPOOL 8330ad74dcd8af0afe1df4a9516d5cd79bb0a173cd13a5d713ccbcd2e8aa07db44e4b31219a8b4411a5a62e7ae1a46bf709e11f4415b990f25f51928498d22b6
 MISC ChangeLog 10387 SHA256 baa687a6b6795863fdd9afa13908646d6f35e20857dc52313ce9b508374ed644 SHA512 592d93249ea9cfa955424947e3851a935cc82b9c050e1092f5d7458f3ac82f2d23e94e3e19b48c04a2476f605144d65696caa8b77b12cff0a6238f53af2bc743 WHIRLPOOL 88cc5e309edc494019b25c3862710ccec4c73dbfcd41eea20babafedaad742124095fa03767eaa2f6159e2f28d33c2d61e2339cbf45fc2b954f640f519bf6e8e
 MISC ChangeLog-2015 9371 SHA256 29d0915628c615ee2f3a80c0b25784bce65a3744f71a595a6468dc3f3874f8b5 SHA512 099782ff4cdd6cccca021052c829e1a8b243e78718b2c72b0b8c363a107f29a4d61d82ed39e3376e3377228b2ac999254acf3c5a5a7add1e7d71d4a935e18094 WHIRLPOOL 81e8552771d17bbbbd7c6b468e47d69db2bf1a8dab8faa75a6b2b52487b6c07401cf324bab40a9ace37c2bb5a2576f4eb7242a5d3b79bc4b34e60b9e0aeb058b
 MISC metadata.xml 314 SHA256 542fbe2e34a5cbf7636a4b29f8a62784ee74c64de27ceeb4b7141c718c2a18af SHA512 f983d404a2995149e5399efa664d1f81398b2fa9bea2e071cb1a8b54e6efd0d43cd42ac4d2bd7ff9d0586158ead91b8bf67169cc7761815073469498396c4da9 WHIRLPOOL a017468e729bbff98ff5758a734c003625762f8eff54692faf84fc93c2098985fab66eadefc7a41c219be663d741a27301c9efb43ae680f21d238c107612d5f8
diff --git a/sec-policy/selinux-howl/selinux-howl-2.20170204-r1.ebuild b/sec-policy/selinux-howl/selinux-howl-2.20170204-r1.ebuild
index df449f854483..37f0c1f248a4 100644
--- a/sec-policy/selinux-howl/selinux-howl-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-howl/selinux-howl-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-howl/selinux-howl-2.20170204-r2.ebuild b/sec-policy/selinux-howl/selinux-howl-2.20170204-r2.ebuild
index 9a9d4493a97c..450b071d9cae 100644
--- a/sec-policy/selinux-howl/selinux-howl-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-howl/selinux-howl-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-howl/selinux-howl-2.20170204-r3.ebuild b/sec-policy/selinux-howl/selinux-howl-2.20170204-r3.ebuild
index 9a9d4493a97c..450b071d9cae 100644
--- a/sec-policy/selinux-howl/selinux-howl-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-howl/selinux-howl-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-howl/selinux-howl-2.20170204-r4.ebuild b/sec-policy/selinux-howl/selinux-howl-2.20170204-r4.ebuild
index 9a9d4493a97c..450b071d9cae 100644
--- a/sec-policy/selinux-howl/selinux-howl-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-howl/selinux-howl-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-howl/selinux-howl-2.20170805-r2.ebuild b/sec-policy/selinux-howl/selinux-howl-2.20170805-r2.ebuild
index 9a9d4493a97c..450b071d9cae 100644
--- a/sec-policy/selinux-howl/selinux-howl-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-howl/selinux-howl-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-howl/selinux-howl-2.20170805-r3.ebuild b/sec-policy/selinux-howl/selinux-howl-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..37f0c1f248a4
--- /dev/null
+++ b/sec-policy/selinux-howl/selinux-howl-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-howl/selinux-howl-9999.ebuild b/sec-policy/selinux-howl/selinux-howl-9999.ebuild
index df449f854483..37f0c1f248a4 100644
--- a/sec-policy/selinux-howl/selinux-howl-9999.ebuild
+++ b/sec-policy/selinux-howl/selinux-howl-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-icecast/Manifest b/sec-policy/selinux-icecast/Manifest
index 116a80e4f881..edaf82a1321e 100644
--- a/sec-policy/selinux-icecast/Manifest
+++ b/sec-policy/selinux-icecast/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-icecast-2.20170204-r1.ebuild 285 SHA256 1871d30b510b6d691d4f0cc864d56d748b5fe3d2216d31c9e3a0df1d4efb51d6 SHA512 8dc9531aae269f8740c84c5207cee7a50d193d3e56e6a8e40ed0c3e55ad28e1e7ec20ca7a5ea697f606608dab00325dc4247d82d946166030a9d83a955c70d59 WHIRLPOOL b36dd287c9c1bef83dbb11e8c9eb26296d630ac9d4365fdd6339d7c295a6ccfdd9d0d4885c113736a5ba577261af734f3e4d9932503d34d891b371a1b5ab8641
-EBUILD selinux-icecast-2.20170204-r2.ebuild 283 SHA256 d382f1baff8a896149b304310c5bb6f96ee817c003362f1f0fe22cd971851b06 SHA512 6dbda54420109a4dce094efabd83bcefc784f1b81936345809a9cb91afe3a3e9447c1922db1b79c699186ca0c2d58b27280fd27cd2562d50c1c55b24188a3c5e WHIRLPOOL ba134ec9428517510bfc64666594e4754098b661ec6f7cf22e10850a45435136e51dce09050bc0ac4a966a90015403a1b5dec48008ef181fdd00bcd63ea42eb5
-EBUILD selinux-icecast-2.20170204-r3.ebuild 283 SHA256 d382f1baff8a896149b304310c5bb6f96ee817c003362f1f0fe22cd971851b06 SHA512 6dbda54420109a4dce094efabd83bcefc784f1b81936345809a9cb91afe3a3e9447c1922db1b79c699186ca0c2d58b27280fd27cd2562d50c1c55b24188a3c5e WHIRLPOOL ba134ec9428517510bfc64666594e4754098b661ec6f7cf22e10850a45435136e51dce09050bc0ac4a966a90015403a1b5dec48008ef181fdd00bcd63ea42eb5
-EBUILD selinux-icecast-2.20170204-r4.ebuild 283 SHA256 d382f1baff8a896149b304310c5bb6f96ee817c003362f1f0fe22cd971851b06 SHA512 6dbda54420109a4dce094efabd83bcefc784f1b81936345809a9cb91afe3a3e9447c1922db1b79c699186ca0c2d58b27280fd27cd2562d50c1c55b24188a3c5e WHIRLPOOL ba134ec9428517510bfc64666594e4754098b661ec6f7cf22e10850a45435136e51dce09050bc0ac4a966a90015403a1b5dec48008ef181fdd00bcd63ea42eb5
-EBUILD selinux-icecast-2.20170805-r2.ebuild 283 SHA256 d382f1baff8a896149b304310c5bb6f96ee817c003362f1f0fe22cd971851b06 SHA512 6dbda54420109a4dce094efabd83bcefc784f1b81936345809a9cb91afe3a3e9447c1922db1b79c699186ca0c2d58b27280fd27cd2562d50c1c55b24188a3c5e WHIRLPOOL ba134ec9428517510bfc64666594e4754098b661ec6f7cf22e10850a45435136e51dce09050bc0ac4a966a90015403a1b5dec48008ef181fdd00bcd63ea42eb5
-EBUILD selinux-icecast-9999.ebuild 285 SHA256 1871d30b510b6d691d4f0cc864d56d748b5fe3d2216d31c9e3a0df1d4efb51d6 SHA512 8dc9531aae269f8740c84c5207cee7a50d193d3e56e6a8e40ed0c3e55ad28e1e7ec20ca7a5ea697f606608dab00325dc4247d82d946166030a9d83a955c70d59 WHIRLPOOL b36dd287c9c1bef83dbb11e8c9eb26296d630ac9d4365fdd6339d7c295a6ccfdd9d0d4885c113736a5ba577261af734f3e4d9932503d34d891b371a1b5ab8641
+EBUILD selinux-icecast-2.20170204-r1.ebuild 286 SHA256 b24c3e4875837654d842cea38647942c01703e26a5e9e827ccca2e163f17e7da SHA512 41fede15b84daa85c265d175b5e3d27775bf51ef66058b4ba2b2d88dd1ee82803cc3e31a0bc09ef525ff0f57adb9c21db576026214442d32751944008616d6a1 WHIRLPOOL 3aa3259e32cafaf1782cb6b82edf0cda68bd9c88016dadb415c02ac4ea02b36a5f90e82616b358e697ccd860fa6190ce23266e9f66b65bfef246527188de257d
+EBUILD selinux-icecast-2.20170204-r2.ebuild 284 SHA256 43465cf020324e9a5cb26b98d382049d398aad31d16488eb10370b5e602a0b32 SHA512 37bb515dd22a50e81d12e50537790f1d1048c2ce11130ae59e70f348c3e0daf924c4e9cef9d2d9068292b5a96cea5e931b5a141d3c76580d72e23a61e5b9da66 WHIRLPOOL 629571d9a0c5fcde16737d8c2562e66d2a0addc30d80f1420c203f43842d2a447e95afb7329e467520727e4336b4d2e9cba8ac9a0df617a3f60f9f92f05085c6
+EBUILD selinux-icecast-2.20170204-r3.ebuild 284 SHA256 43465cf020324e9a5cb26b98d382049d398aad31d16488eb10370b5e602a0b32 SHA512 37bb515dd22a50e81d12e50537790f1d1048c2ce11130ae59e70f348c3e0daf924c4e9cef9d2d9068292b5a96cea5e931b5a141d3c76580d72e23a61e5b9da66 WHIRLPOOL 629571d9a0c5fcde16737d8c2562e66d2a0addc30d80f1420c203f43842d2a447e95afb7329e467520727e4336b4d2e9cba8ac9a0df617a3f60f9f92f05085c6
+EBUILD selinux-icecast-2.20170204-r4.ebuild 284 SHA256 43465cf020324e9a5cb26b98d382049d398aad31d16488eb10370b5e602a0b32 SHA512 37bb515dd22a50e81d12e50537790f1d1048c2ce11130ae59e70f348c3e0daf924c4e9cef9d2d9068292b5a96cea5e931b5a141d3c76580d72e23a61e5b9da66 WHIRLPOOL 629571d9a0c5fcde16737d8c2562e66d2a0addc30d80f1420c203f43842d2a447e95afb7329e467520727e4336b4d2e9cba8ac9a0df617a3f60f9f92f05085c6
+EBUILD selinux-icecast-2.20170805-r2.ebuild 284 SHA256 43465cf020324e9a5cb26b98d382049d398aad31d16488eb10370b5e602a0b32 SHA512 37bb515dd22a50e81d12e50537790f1d1048c2ce11130ae59e70f348c3e0daf924c4e9cef9d2d9068292b5a96cea5e931b5a141d3c76580d72e23a61e5b9da66 WHIRLPOOL 629571d9a0c5fcde16737d8c2562e66d2a0addc30d80f1420c203f43842d2a447e95afb7329e467520727e4336b4d2e9cba8ac9a0df617a3f60f9f92f05085c6
+EBUILD selinux-icecast-2.20170805-r3.ebuild 286 SHA256 b24c3e4875837654d842cea38647942c01703e26a5e9e827ccca2e163f17e7da SHA512 41fede15b84daa85c265d175b5e3d27775bf51ef66058b4ba2b2d88dd1ee82803cc3e31a0bc09ef525ff0f57adb9c21db576026214442d32751944008616d6a1 WHIRLPOOL 3aa3259e32cafaf1782cb6b82edf0cda68bd9c88016dadb415c02ac4ea02b36a5f90e82616b358e697ccd860fa6190ce23266e9f66b65bfef246527188de257d
+EBUILD selinux-icecast-9999.ebuild 286 SHA256 b24c3e4875837654d842cea38647942c01703e26a5e9e827ccca2e163f17e7da SHA512 41fede15b84daa85c265d175b5e3d27775bf51ef66058b4ba2b2d88dd1ee82803cc3e31a0bc09ef525ff0f57adb9c21db576026214442d32751944008616d6a1 WHIRLPOOL 3aa3259e32cafaf1782cb6b82edf0cda68bd9c88016dadb415c02ac4ea02b36a5f90e82616b358e697ccd860fa6190ce23266e9f66b65bfef246527188de257d
 MISC ChangeLog 10687 SHA256 51aecd47f9ed89974354bc0b1ac154fee5c8bdfb7500255c89e78454f7e9e29c SHA512 78f6d08e23f09bac04330975faf60d23415af41dd899964ef0f2d8553fba2770cc81025596a42274e8323ef9734443342bb9d7978618a6592cb5e6a5345c9896 WHIRLPOOL 6b2c3bba4ca5673ba9c8c3d5672e7936709c1055f253f076fdc2cd357fcc0bc9b81b587f800e947a028ea226f2f106143abd2798bb893c3fae6255cc2477345c
 MISC ChangeLog-2015 9977 SHA256 4720f1b349a4527a5d6d2612204c63c8707a58439232bbbe02d82038e382ae80 SHA512 7d5f059bd358b1c2fd979a39140ef1bbde44d07bc1bb4644f65418b686b8df09236d226d8b2ac7c65128719c26fbb58284ac1e2ec222b201f4de7d870b686cfc WHIRLPOOL c5098ab70ca380d49cc85d1906e1f15c7924adec5a20e79d09e7a453e995e2ecdb5da7d8e590577ab9579dc4ba4c21283acbc5eff9b24668ca13ffba0c12fb10
 MISC metadata.xml 317 SHA256 0c826bc681b8a9309304f8a36d7464337b9625b9c3c478409b7926bbb3398668 SHA512 db55ad061f07883e2a62e74ebeabb5d05c9595fd74b0719068cb54da1ffea47738112c8287242c38b1499a1a9b7bddc1f71edfab4b4a4b1f1262c50791395f21 WHIRLPOOL a59f7d61f67ae0aea351f4b514aec5093b165f524052dc8ec96787d07d9594e8fe45438b2fb9dca62dbd979f9543bf9e6d0808cfe01328a1f361eb3094cd3b20
diff --git a/sec-policy/selinux-icecast/selinux-icecast-2.20170204-r1.ebuild b/sec-policy/selinux-icecast/selinux-icecast-2.20170204-r1.ebuild
index fb12a2a1873d..a00b3189d6e3 100644
--- a/sec-policy/selinux-icecast/selinux-icecast-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-icecast/selinux-icecast-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-icecast/selinux-icecast-2.20170204-r2.ebuild b/sec-policy/selinux-icecast/selinux-icecast-2.20170204-r2.ebuild
index c592bf5dea01..b94587eb4e73 100644
--- a/sec-policy/selinux-icecast/selinux-icecast-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-icecast/selinux-icecast-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-icecast/selinux-icecast-2.20170204-r3.ebuild b/sec-policy/selinux-icecast/selinux-icecast-2.20170204-r3.ebuild
index c592bf5dea01..b94587eb4e73 100644
--- a/sec-policy/selinux-icecast/selinux-icecast-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-icecast/selinux-icecast-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-icecast/selinux-icecast-2.20170204-r4.ebuild b/sec-policy/selinux-icecast/selinux-icecast-2.20170204-r4.ebuild
index c592bf5dea01..b94587eb4e73 100644
--- a/sec-policy/selinux-icecast/selinux-icecast-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-icecast/selinux-icecast-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-icecast/selinux-icecast-2.20170805-r2.ebuild b/sec-policy/selinux-icecast/selinux-icecast-2.20170805-r2.ebuild
index c592bf5dea01..b94587eb4e73 100644
--- a/sec-policy/selinux-icecast/selinux-icecast-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-icecast/selinux-icecast-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-icecast/selinux-icecast-2.20170805-r3.ebuild b/sec-policy/selinux-icecast/selinux-icecast-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..a00b3189d6e3
--- /dev/null
+++ b/sec-policy/selinux-icecast/selinux-icecast-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-icecast/selinux-icecast-9999.ebuild b/sec-policy/selinux-icecast/selinux-icecast-9999.ebuild
index fb12a2a1873d..a00b3189d6e3 100644
--- a/sec-policy/selinux-icecast/selinux-icecast-9999.ebuild
+++ b/sec-policy/selinux-icecast/selinux-icecast-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ifplugd/Manifest b/sec-policy/selinux-ifplugd/Manifest
index f018a63c71f1..71aedb7278c1 100644
--- a/sec-policy/selinux-ifplugd/Manifest
+++ b/sec-policy/selinux-ifplugd/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-ifplugd-2.20170204-r1.ebuild 285 SHA256 a8f304dc0b18520aa9dfffb555c3756973bce425f17bc54530eb2cb0ea16f099 SHA512 ee60276eb94d5f7750848782085d9d54ba49c330ff4198e75e19055f5aa5a5c868ccc10133f5f7e09cfd787311d3f0ba218eac9646be62373cfad89f7eebaf83 WHIRLPOOL dfb0206bd700239a5669b56fe23052b8d5ab2d47bcddeca9cb0dd5ed5237919a0acec594bf4a8c1fe1dd758a4a3af50f5510980a3ac53a4951e908064ca25d82
-EBUILD selinux-ifplugd-2.20170204-r2.ebuild 283 SHA256 5455725e5e250bd9613bc5e3f9a7725034b0a9d033e73f738ba625d9b5fc5f5f SHA512 337871f9ac95a8b7ea9de50465339bacf8b7d4b6443c9265d6f3f4edd2d01b989952604ef957c5a50d57b137b828126ce6f36b9f1394317cd7b20ceb6cf53a7c WHIRLPOOL b8e6e978d98023b51deb504065e3fc7e187739ffac098ec6508a231dd33eb668921fa690cad3ba88ff525e7c52d5774ce2b577804356b07d923b131863486b5a
-EBUILD selinux-ifplugd-2.20170204-r3.ebuild 283 SHA256 5455725e5e250bd9613bc5e3f9a7725034b0a9d033e73f738ba625d9b5fc5f5f SHA512 337871f9ac95a8b7ea9de50465339bacf8b7d4b6443c9265d6f3f4edd2d01b989952604ef957c5a50d57b137b828126ce6f36b9f1394317cd7b20ceb6cf53a7c WHIRLPOOL b8e6e978d98023b51deb504065e3fc7e187739ffac098ec6508a231dd33eb668921fa690cad3ba88ff525e7c52d5774ce2b577804356b07d923b131863486b5a
-EBUILD selinux-ifplugd-2.20170204-r4.ebuild 283 SHA256 5455725e5e250bd9613bc5e3f9a7725034b0a9d033e73f738ba625d9b5fc5f5f SHA512 337871f9ac95a8b7ea9de50465339bacf8b7d4b6443c9265d6f3f4edd2d01b989952604ef957c5a50d57b137b828126ce6f36b9f1394317cd7b20ceb6cf53a7c WHIRLPOOL b8e6e978d98023b51deb504065e3fc7e187739ffac098ec6508a231dd33eb668921fa690cad3ba88ff525e7c52d5774ce2b577804356b07d923b131863486b5a
-EBUILD selinux-ifplugd-2.20170805-r2.ebuild 283 SHA256 5455725e5e250bd9613bc5e3f9a7725034b0a9d033e73f738ba625d9b5fc5f5f SHA512 337871f9ac95a8b7ea9de50465339bacf8b7d4b6443c9265d6f3f4edd2d01b989952604ef957c5a50d57b137b828126ce6f36b9f1394317cd7b20ceb6cf53a7c WHIRLPOOL b8e6e978d98023b51deb504065e3fc7e187739ffac098ec6508a231dd33eb668921fa690cad3ba88ff525e7c52d5774ce2b577804356b07d923b131863486b5a
-EBUILD selinux-ifplugd-9999.ebuild 285 SHA256 a8f304dc0b18520aa9dfffb555c3756973bce425f17bc54530eb2cb0ea16f099 SHA512 ee60276eb94d5f7750848782085d9d54ba49c330ff4198e75e19055f5aa5a5c868ccc10133f5f7e09cfd787311d3f0ba218eac9646be62373cfad89f7eebaf83 WHIRLPOOL dfb0206bd700239a5669b56fe23052b8d5ab2d47bcddeca9cb0dd5ed5237919a0acec594bf4a8c1fe1dd758a4a3af50f5510980a3ac53a4951e908064ca25d82
+EBUILD selinux-ifplugd-2.20170204-r1.ebuild 286 SHA256 dab14002ef021b37884097b34fb7c3596b785cc4e8ca01e7d4eb5b20a0ca13ba SHA512 1bcc024bc2b7f7af2b4d866ef481c9181ebf5fb04e175b4718c26ae8722977049cfcfbef1923e0f753275ce9e82ad651bb4dc269b1697a72927558de6cb28127 WHIRLPOOL 128af310fdb800681fd408c68092e3ea8dbf63d7b2a938446df92ed0f06f0691f8064e73bd84034e69f034f58de96ca8aa64a613b8714f9a0744f09da1f27936
+EBUILD selinux-ifplugd-2.20170204-r2.ebuild 284 SHA256 bcc0b175702b75afe01f8c782c586f9d70d8ea9c1e3fa129b46ef938f71ac25f SHA512 c8fce41d350ff9bdbb39f93bc5a083a2f8c36647390aff2a580a63b61a492062b47134d1e15fc1e1f1f6973a9a1c186c65ac4cf7660955dfd2bdca56fab31b27 WHIRLPOOL bafed7fc9965809698a11672abb5689830e3d722d7b2d4337b41c1ec9f4338af0696d49409caaef5d58c4444bb7bfdae30017d8dfaa2defae820bf882149254b
+EBUILD selinux-ifplugd-2.20170204-r3.ebuild 284 SHA256 bcc0b175702b75afe01f8c782c586f9d70d8ea9c1e3fa129b46ef938f71ac25f SHA512 c8fce41d350ff9bdbb39f93bc5a083a2f8c36647390aff2a580a63b61a492062b47134d1e15fc1e1f1f6973a9a1c186c65ac4cf7660955dfd2bdca56fab31b27 WHIRLPOOL bafed7fc9965809698a11672abb5689830e3d722d7b2d4337b41c1ec9f4338af0696d49409caaef5d58c4444bb7bfdae30017d8dfaa2defae820bf882149254b
+EBUILD selinux-ifplugd-2.20170204-r4.ebuild 284 SHA256 bcc0b175702b75afe01f8c782c586f9d70d8ea9c1e3fa129b46ef938f71ac25f SHA512 c8fce41d350ff9bdbb39f93bc5a083a2f8c36647390aff2a580a63b61a492062b47134d1e15fc1e1f1f6973a9a1c186c65ac4cf7660955dfd2bdca56fab31b27 WHIRLPOOL bafed7fc9965809698a11672abb5689830e3d722d7b2d4337b41c1ec9f4338af0696d49409caaef5d58c4444bb7bfdae30017d8dfaa2defae820bf882149254b
+EBUILD selinux-ifplugd-2.20170805-r2.ebuild 284 SHA256 bcc0b175702b75afe01f8c782c586f9d70d8ea9c1e3fa129b46ef938f71ac25f SHA512 c8fce41d350ff9bdbb39f93bc5a083a2f8c36647390aff2a580a63b61a492062b47134d1e15fc1e1f1f6973a9a1c186c65ac4cf7660955dfd2bdca56fab31b27 WHIRLPOOL bafed7fc9965809698a11672abb5689830e3d722d7b2d4337b41c1ec9f4338af0696d49409caaef5d58c4444bb7bfdae30017d8dfaa2defae820bf882149254b
+EBUILD selinux-ifplugd-2.20170805-r3.ebuild 286 SHA256 dab14002ef021b37884097b34fb7c3596b785cc4e8ca01e7d4eb5b20a0ca13ba SHA512 1bcc024bc2b7f7af2b4d866ef481c9181ebf5fb04e175b4718c26ae8722977049cfcfbef1923e0f753275ce9e82ad651bb4dc269b1697a72927558de6cb28127 WHIRLPOOL 128af310fdb800681fd408c68092e3ea8dbf63d7b2a938446df92ed0f06f0691f8064e73bd84034e69f034f58de96ca8aa64a613b8714f9a0744f09da1f27936
+EBUILD selinux-ifplugd-9999.ebuild 286 SHA256 dab14002ef021b37884097b34fb7c3596b785cc4e8ca01e7d4eb5b20a0ca13ba SHA512 1bcc024bc2b7f7af2b4d866ef481c9181ebf5fb04e175b4718c26ae8722977049cfcfbef1923e0f753275ce9e82ad651bb4dc269b1697a72927558de6cb28127 WHIRLPOOL 128af310fdb800681fd408c68092e3ea8dbf63d7b2a938446df92ed0f06f0691f8064e73bd84034e69f034f58de96ca8aa64a613b8714f9a0744f09da1f27936
 MISC ChangeLog 10687 SHA256 cd7dd9d3455a67f90bd315f7b230fe8c7d66764006380fc04292a89d75725838 SHA512 5be45ad9e97c2a7662424bbf798db81c1e45533d9e93c1a07e6587469d6cc9d062ff10ea6dfceb1224752918b9550946e6f32372b619c9581af7c1ed0d74860b WHIRLPOOL e55f9512bbb98d5e54d3efd033fe5257e573c8940ee8a3e5870dce762ca316a2393c2dd72f68a0b30f085c66ad882208d0214b27699289ed2ca0e66743c9529c
 MISC ChangeLog-2015 9977 SHA256 59b88474c8579c2b4b4577f443443d6dd433d6f0b82e71470b240e45986e15fb SHA512 644dfbd5cc2c223473bbd3bffa764a468d7a1eaa8356aba2bef814ecded7bc599a0da24669496c82c86d665db229e4fe9c71233691222c1df4ee868a4451f71b WHIRLPOOL 96e615243ff249d6ef2a7113b5820fe846feb6320ba89d88f31c185c9a8e314dc1e056fbf970c6070670f6a866f72e95f31965a567a4391586cc97b53d4817d8
 MISC metadata.xml 317 SHA256 5d56e8eb6845feed63a08885d8f26fad39fc1b293f71b33dfcaf35c660299651 SHA512 8905d0861d320d44fff344d2208982c611ac72402a9355a23a8b2f43fdf4f13aef9f8b504c1bcb12357852ad51f4f74d1a11b3a71e53fb43ac2ac3d57e268f3a WHIRLPOOL 02af45c73f9d7d6b16d3ad184a4c0d008392d48a7df7109c68d326bb4e66ba1a40e9af519e96669b8f6cdca1edf4798cca9d6928e98b2b31f005cb8fd69a4cec
diff --git a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20170204-r1.ebuild b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20170204-r1.ebuild
index 14b43be53aa4..d329259c12b4 100644
--- a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20170204-r2.ebuild b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20170204-r2.ebuild
index af73580d18c0..b06316edc59a 100644
--- a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20170204-r3.ebuild b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20170204-r3.ebuild
index af73580d18c0..b06316edc59a 100644
--- a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20170204-r4.ebuild b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20170204-r4.ebuild
index af73580d18c0..b06316edc59a 100644
--- a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20170805-r2.ebuild b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20170805-r2.ebuild
index af73580d18c0..b06316edc59a 100644
--- a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20170805-r3.ebuild b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..d329259c12b4
--- /dev/null
+++ b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-ifplugd/selinux-ifplugd-9999.ebuild b/sec-policy/selinux-ifplugd/selinux-ifplugd-9999.ebuild
index 14b43be53aa4..d329259c12b4 100644
--- a/sec-policy/selinux-ifplugd/selinux-ifplugd-9999.ebuild
+++ b/sec-policy/selinux-ifplugd/selinux-ifplugd-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-imaze/Manifest b/sec-policy/selinux-imaze/Manifest
index 5ab2143c6134..a7bc55cdfab7 100644
--- a/sec-policy/selinux-imaze/Manifest
+++ b/sec-policy/selinux-imaze/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-imaze-2.20170204-r1.ebuild 281 SHA256 9b32af9e52e984ea5f66b35eaa6c87eb1b2a4147eea2ce7a9e13d68529e36aa8 SHA512 16295d752eeb38eefc27ce76d0bb036ca66c506a1cebd68e98e4cde743260e4116b2977abfa94cfc89636845358038f5be87719e0a7074aacefe766cc55a3d79 WHIRLPOOL 9c2b78505512fa2b3a0d3caa8e7b7f56d89cb74b574b803538e9a626f359f9d981951e9a194cbf2a9d7d99b34a4a9991473698e05dc6f44cc64025a8c0d0ad07
-EBUILD selinux-imaze-2.20170204-r2.ebuild 279 SHA256 735089660c06830e04db9bbdeb917b9e1eeab5acb7114bc6241374c7014c2203 SHA512 6e13ecb84e54e47bea4a6899b0072819987fc547d70130ddf3e8d96457f810d537f50a8ab06e4c494f5d9806fade49b743514edda802f36bc8472adbf21e1cd7 WHIRLPOOL d23706267ba2281bcdf7300f422213b53949320d1ece4dc587b0345ce3c8316bacd532d70db9a9f5766cf63b39d6030ea0458eb9b9d5ef7740a9011ddb77eab9
-EBUILD selinux-imaze-2.20170204-r3.ebuild 279 SHA256 735089660c06830e04db9bbdeb917b9e1eeab5acb7114bc6241374c7014c2203 SHA512 6e13ecb84e54e47bea4a6899b0072819987fc547d70130ddf3e8d96457f810d537f50a8ab06e4c494f5d9806fade49b743514edda802f36bc8472adbf21e1cd7 WHIRLPOOL d23706267ba2281bcdf7300f422213b53949320d1ece4dc587b0345ce3c8316bacd532d70db9a9f5766cf63b39d6030ea0458eb9b9d5ef7740a9011ddb77eab9
-EBUILD selinux-imaze-2.20170204-r4.ebuild 279 SHA256 735089660c06830e04db9bbdeb917b9e1eeab5acb7114bc6241374c7014c2203 SHA512 6e13ecb84e54e47bea4a6899b0072819987fc547d70130ddf3e8d96457f810d537f50a8ab06e4c494f5d9806fade49b743514edda802f36bc8472adbf21e1cd7 WHIRLPOOL d23706267ba2281bcdf7300f422213b53949320d1ece4dc587b0345ce3c8316bacd532d70db9a9f5766cf63b39d6030ea0458eb9b9d5ef7740a9011ddb77eab9
-EBUILD selinux-imaze-2.20170805-r2.ebuild 279 SHA256 735089660c06830e04db9bbdeb917b9e1eeab5acb7114bc6241374c7014c2203 SHA512 6e13ecb84e54e47bea4a6899b0072819987fc547d70130ddf3e8d96457f810d537f50a8ab06e4c494f5d9806fade49b743514edda802f36bc8472adbf21e1cd7 WHIRLPOOL d23706267ba2281bcdf7300f422213b53949320d1ece4dc587b0345ce3c8316bacd532d70db9a9f5766cf63b39d6030ea0458eb9b9d5ef7740a9011ddb77eab9
-EBUILD selinux-imaze-9999.ebuild 281 SHA256 9b32af9e52e984ea5f66b35eaa6c87eb1b2a4147eea2ce7a9e13d68529e36aa8 SHA512 16295d752eeb38eefc27ce76d0bb036ca66c506a1cebd68e98e4cde743260e4116b2977abfa94cfc89636845358038f5be87719e0a7074aacefe766cc55a3d79 WHIRLPOOL 9c2b78505512fa2b3a0d3caa8e7b7f56d89cb74b574b803538e9a626f359f9d981951e9a194cbf2a9d7d99b34a4a9991473698e05dc6f44cc64025a8c0d0ad07
+EBUILD selinux-imaze-2.20170204-r1.ebuild 282 SHA256 88b1bd3f1a382fcd22b4c14bb20860af090488fc4d0e3736cdf33f9e47422e4f SHA512 6f83f58a38fa35e29e1aee4522761498c57ec32c32865fda0269806aab937259349d31807f66e12735bf76894df2ab44c11a9aceb9ba563e9e5124f8e3f909bc WHIRLPOOL f47dd071b58fdb058e6b704242b11e54c7ea882c0e53dcd10756530f13b235a379b2ba9a1d9a46e5f59ecad35d35e14555b03bb09c4d797bfc739ebdaed90d53
+EBUILD selinux-imaze-2.20170204-r2.ebuild 280 SHA256 6a9a8d45da7903ccbc61e63bbea61e498e3fbb6d4875e3b0c90eebe4b8f7c1a7 SHA512 1fbed40d3337b5bdff349f564cd071f8001a3db35f61c47500d003cc14604c8bbcdadb365e9de21807d458631b1e6e2f4262da5269c9d9ddb8703a5e0bbc21db WHIRLPOOL 5773eb69bd27f5b08312a674ac6c46f4bc2fa43cce0bd6366671b7baa3e0d417f839795718c6666f12745e62b24018e3207c2b1b1195c6f8bd8dc8dcb5300ac8
+EBUILD selinux-imaze-2.20170204-r3.ebuild 280 SHA256 6a9a8d45da7903ccbc61e63bbea61e498e3fbb6d4875e3b0c90eebe4b8f7c1a7 SHA512 1fbed40d3337b5bdff349f564cd071f8001a3db35f61c47500d003cc14604c8bbcdadb365e9de21807d458631b1e6e2f4262da5269c9d9ddb8703a5e0bbc21db WHIRLPOOL 5773eb69bd27f5b08312a674ac6c46f4bc2fa43cce0bd6366671b7baa3e0d417f839795718c6666f12745e62b24018e3207c2b1b1195c6f8bd8dc8dcb5300ac8
+EBUILD selinux-imaze-2.20170204-r4.ebuild 280 SHA256 6a9a8d45da7903ccbc61e63bbea61e498e3fbb6d4875e3b0c90eebe4b8f7c1a7 SHA512 1fbed40d3337b5bdff349f564cd071f8001a3db35f61c47500d003cc14604c8bbcdadb365e9de21807d458631b1e6e2f4262da5269c9d9ddb8703a5e0bbc21db WHIRLPOOL 5773eb69bd27f5b08312a674ac6c46f4bc2fa43cce0bd6366671b7baa3e0d417f839795718c6666f12745e62b24018e3207c2b1b1195c6f8bd8dc8dcb5300ac8
+EBUILD selinux-imaze-2.20170805-r2.ebuild 280 SHA256 6a9a8d45da7903ccbc61e63bbea61e498e3fbb6d4875e3b0c90eebe4b8f7c1a7 SHA512 1fbed40d3337b5bdff349f564cd071f8001a3db35f61c47500d003cc14604c8bbcdadb365e9de21807d458631b1e6e2f4262da5269c9d9ddb8703a5e0bbc21db WHIRLPOOL 5773eb69bd27f5b08312a674ac6c46f4bc2fa43cce0bd6366671b7baa3e0d417f839795718c6666f12745e62b24018e3207c2b1b1195c6f8bd8dc8dcb5300ac8
+EBUILD selinux-imaze-2.20170805-r3.ebuild 282 SHA256 88b1bd3f1a382fcd22b4c14bb20860af090488fc4d0e3736cdf33f9e47422e4f SHA512 6f83f58a38fa35e29e1aee4522761498c57ec32c32865fda0269806aab937259349d31807f66e12735bf76894df2ab44c11a9aceb9ba563e9e5124f8e3f909bc WHIRLPOOL f47dd071b58fdb058e6b704242b11e54c7ea882c0e53dcd10756530f13b235a379b2ba9a1d9a46e5f59ecad35d35e14555b03bb09c4d797bfc739ebdaed90d53
+EBUILD selinux-imaze-9999.ebuild 282 SHA256 88b1bd3f1a382fcd22b4c14bb20860af090488fc4d0e3736cdf33f9e47422e4f SHA512 6f83f58a38fa35e29e1aee4522761498c57ec32c32865fda0269806aab937259349d31807f66e12735bf76894df2ab44c11a9aceb9ba563e9e5124f8e3f909bc WHIRLPOOL f47dd071b58fdb058e6b704242b11e54c7ea882c0e53dcd10756530f13b235a379b2ba9a1d9a46e5f59ecad35d35e14555b03bb09c4d797bfc739ebdaed90d53
 MISC ChangeLog 10479 SHA256 058d3cb7794a8761be07104eb2565708b833c758218d9b64de1fd5e8fa549c5c SHA512 281131c021b694a0ac4993d16c8ab0027ec5f8f031ff0d5549dba544a901508427050da61728e536c10284bad143df057aa798c5ca0c152aa6575b687107bb5f WHIRLPOOL c877dc79a9c1dc7a98a80b7f520c16aa9116f1541c636f4e4f52d73cf663a6c03d295b1cca8d5050ed791a1b39b4ebd2151d96419e40759423910f436cbf57a4
 MISC ChangeLog-2015 9749 SHA256 b3839bab8132b4919ae4395c906e6728f2e37c19b74603ef7ac787d08b26582c SHA512 a778f614b9789a6d0383e184dedc049c4cd4839f82fc2b13da015adc73b5630c2c3688fa0d468dcce0b9714268b70b664e76ef600b4114c1b69674fefcd069d5 WHIRLPOOL 8a0da3e4cb55ae96696d620523f1c0caae9d3ca005d86ea5783beb4a65433fde0320cc8f3c97c62775ed251d0c504fb8240fa782e80acc3cce8f2190941e358b
 MISC metadata.xml 315 SHA256 36e2f9c0dba58c36fe0af12bd611e1ee6dd33cbe463051add053724dfdd1ff39 SHA512 8c12773bd2c0c5009639149ff2c80024af96995b148e4e164ccf7ecc44e12333adeb109b245676703f6ff18f13b0b7caa7907b45fe06f688b7c56b71958696ea WHIRLPOOL 2969c7670d31b6f2638017241e50a3f139eaa5b9a4cb59f748004e8bf44de28a73a9ff668135fb43e8f3b4036974210ec6336f99b5abf4eeb15f939ae784f053
diff --git a/sec-policy/selinux-imaze/selinux-imaze-2.20170204-r1.ebuild b/sec-policy/selinux-imaze/selinux-imaze-2.20170204-r1.ebuild
index 8de9828483af..450c9c57c0a0 100644
--- a/sec-policy/selinux-imaze/selinux-imaze-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-imaze/selinux-imaze-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-imaze/selinux-imaze-2.20170204-r2.ebuild b/sec-policy/selinux-imaze/selinux-imaze-2.20170204-r2.ebuild
index 892bf9073425..c9149c10a566 100644
--- a/sec-policy/selinux-imaze/selinux-imaze-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-imaze/selinux-imaze-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-imaze/selinux-imaze-2.20170204-r3.ebuild b/sec-policy/selinux-imaze/selinux-imaze-2.20170204-r3.ebuild
index 892bf9073425..c9149c10a566 100644
--- a/sec-policy/selinux-imaze/selinux-imaze-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-imaze/selinux-imaze-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-imaze/selinux-imaze-2.20170204-r4.ebuild b/sec-policy/selinux-imaze/selinux-imaze-2.20170204-r4.ebuild
index 892bf9073425..c9149c10a566 100644
--- a/sec-policy/selinux-imaze/selinux-imaze-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-imaze/selinux-imaze-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-imaze/selinux-imaze-2.20170805-r2.ebuild b/sec-policy/selinux-imaze/selinux-imaze-2.20170805-r2.ebuild
index 892bf9073425..c9149c10a566 100644
--- a/sec-policy/selinux-imaze/selinux-imaze-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-imaze/selinux-imaze-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-imaze/selinux-imaze-2.20170805-r3.ebuild b/sec-policy/selinux-imaze/selinux-imaze-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..450c9c57c0a0
--- /dev/null
+++ b/sec-policy/selinux-imaze/selinux-imaze-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-imaze/selinux-imaze-9999.ebuild b/sec-policy/selinux-imaze/selinux-imaze-9999.ebuild
index 8de9828483af..450c9c57c0a0 100644
--- a/sec-policy/selinux-imaze/selinux-imaze-9999.ebuild
+++ b/sec-policy/selinux-imaze/selinux-imaze-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-inetd/Manifest b/sec-policy/selinux-inetd/Manifest
index 58f5b9d60d3a..7d5b7fc0ce40 100644
--- a/sec-policy/selinux-inetd/Manifest
+++ b/sec-policy/selinux-inetd/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-inetd-2.20170204-r1.ebuild 281 SHA256 3d8aa7544d69a15e3a95ed23ad018e9c888e2de626c17395c4828139e5ee4d79 SHA512 623445d05ecb5f235d803a26c348611499ed77c4afe44215232ef3a69d9cf30ea104a2ef4725430765367d146cce2ab1cf2efeb203060a32ee92c774e0999db9 WHIRLPOOL e4954de1107369bfbd17532db0040ab4028f636072ef13aeab2cd578d2447d60b888f9b64ea15d55194975951de5c9ff8865b201815731cbcf4671ca7206bd29
-EBUILD selinux-inetd-2.20170204-r2.ebuild 279 SHA256 0b5e4fee50ffcdea3596d81aa7f13f6f3a14a3787e3d2bce3fa7fe7d4940944c SHA512 23ee5d52cd20941d1626eacaf6866857132977125c2f497093e8c9082069e550aae32397d196fb95d2e26b0428ab5d1621d01879848e0a1ca945780c142b1839 WHIRLPOOL 24ccf8ec152a30bba852f7ea07261188290eda9e3652c0fa2b481af4dec9eb02318ef121dc8499d4ff72f889c6bbe7adb187ba266654072fb0a308670ffe567c
-EBUILD selinux-inetd-2.20170204-r3.ebuild 279 SHA256 0b5e4fee50ffcdea3596d81aa7f13f6f3a14a3787e3d2bce3fa7fe7d4940944c SHA512 23ee5d52cd20941d1626eacaf6866857132977125c2f497093e8c9082069e550aae32397d196fb95d2e26b0428ab5d1621d01879848e0a1ca945780c142b1839 WHIRLPOOL 24ccf8ec152a30bba852f7ea07261188290eda9e3652c0fa2b481af4dec9eb02318ef121dc8499d4ff72f889c6bbe7adb187ba266654072fb0a308670ffe567c
-EBUILD selinux-inetd-2.20170204-r4.ebuild 279 SHA256 0b5e4fee50ffcdea3596d81aa7f13f6f3a14a3787e3d2bce3fa7fe7d4940944c SHA512 23ee5d52cd20941d1626eacaf6866857132977125c2f497093e8c9082069e550aae32397d196fb95d2e26b0428ab5d1621d01879848e0a1ca945780c142b1839 WHIRLPOOL 24ccf8ec152a30bba852f7ea07261188290eda9e3652c0fa2b481af4dec9eb02318ef121dc8499d4ff72f889c6bbe7adb187ba266654072fb0a308670ffe567c
-EBUILD selinux-inetd-2.20170805-r2.ebuild 279 SHA256 0b5e4fee50ffcdea3596d81aa7f13f6f3a14a3787e3d2bce3fa7fe7d4940944c SHA512 23ee5d52cd20941d1626eacaf6866857132977125c2f497093e8c9082069e550aae32397d196fb95d2e26b0428ab5d1621d01879848e0a1ca945780c142b1839 WHIRLPOOL 24ccf8ec152a30bba852f7ea07261188290eda9e3652c0fa2b481af4dec9eb02318ef121dc8499d4ff72f889c6bbe7adb187ba266654072fb0a308670ffe567c
-EBUILD selinux-inetd-9999.ebuild 281 SHA256 3d8aa7544d69a15e3a95ed23ad018e9c888e2de626c17395c4828139e5ee4d79 SHA512 623445d05ecb5f235d803a26c348611499ed77c4afe44215232ef3a69d9cf30ea104a2ef4725430765367d146cce2ab1cf2efeb203060a32ee92c774e0999db9 WHIRLPOOL e4954de1107369bfbd17532db0040ab4028f636072ef13aeab2cd578d2447d60b888f9b64ea15d55194975951de5c9ff8865b201815731cbcf4671ca7206bd29
+EBUILD selinux-inetd-2.20170204-r1.ebuild 282 SHA256 c1f46be6f78fa4c1cf142b89cff0456111704dead5134ddb2c94d5e1ca5d181c SHA512 dfe9e114aa7ab2bacd01a6639be8c109c3ddf8c561577355cba90ca8798591ad97b3e32c4af97d490e3720514b553b92234fcbfa8d5946909c51e077f7842ce2 WHIRLPOOL b5e18b8bdc27145688649960060a9c8a5a3a3a751de8e1e6c9d52abe2e428c522c35fdf39d9ee1a39821bde01b1b7a2ce68939bbfae0b29d3b30a674b7e813fb
+EBUILD selinux-inetd-2.20170204-r2.ebuild 280 SHA256 2e3986180053ea33c787b055f60c43ca6c769f1d6c511365a8aa445ba963fb31 SHA512 5ce514775f9b01549841e8bd178974570953d5fb9590dafffaccbdfd41f9936f935ca5bc6be0ce2ddff9affd1382eb072c9297e08878e6a1db640efb87c373ac WHIRLPOOL 4033ce0a01c80a1c1e279880cd5186435d17eae0d7106a60b5ce7734b24049b8999bab3e78b765c56a4faee509878e9610dccbe61da7548f4e8449bb71ae6f05
+EBUILD selinux-inetd-2.20170204-r3.ebuild 280 SHA256 2e3986180053ea33c787b055f60c43ca6c769f1d6c511365a8aa445ba963fb31 SHA512 5ce514775f9b01549841e8bd178974570953d5fb9590dafffaccbdfd41f9936f935ca5bc6be0ce2ddff9affd1382eb072c9297e08878e6a1db640efb87c373ac WHIRLPOOL 4033ce0a01c80a1c1e279880cd5186435d17eae0d7106a60b5ce7734b24049b8999bab3e78b765c56a4faee509878e9610dccbe61da7548f4e8449bb71ae6f05
+EBUILD selinux-inetd-2.20170204-r4.ebuild 280 SHA256 2e3986180053ea33c787b055f60c43ca6c769f1d6c511365a8aa445ba963fb31 SHA512 5ce514775f9b01549841e8bd178974570953d5fb9590dafffaccbdfd41f9936f935ca5bc6be0ce2ddff9affd1382eb072c9297e08878e6a1db640efb87c373ac WHIRLPOOL 4033ce0a01c80a1c1e279880cd5186435d17eae0d7106a60b5ce7734b24049b8999bab3e78b765c56a4faee509878e9610dccbe61da7548f4e8449bb71ae6f05
+EBUILD selinux-inetd-2.20170805-r2.ebuild 280 SHA256 2e3986180053ea33c787b055f60c43ca6c769f1d6c511365a8aa445ba963fb31 SHA512 5ce514775f9b01549841e8bd178974570953d5fb9590dafffaccbdfd41f9936f935ca5bc6be0ce2ddff9affd1382eb072c9297e08878e6a1db640efb87c373ac WHIRLPOOL 4033ce0a01c80a1c1e279880cd5186435d17eae0d7106a60b5ce7734b24049b8999bab3e78b765c56a4faee509878e9610dccbe61da7548f4e8449bb71ae6f05
+EBUILD selinux-inetd-2.20170805-r3.ebuild 282 SHA256 c1f46be6f78fa4c1cf142b89cff0456111704dead5134ddb2c94d5e1ca5d181c SHA512 dfe9e114aa7ab2bacd01a6639be8c109c3ddf8c561577355cba90ca8798591ad97b3e32c4af97d490e3720514b553b92234fcbfa8d5946909c51e077f7842ce2 WHIRLPOOL b5e18b8bdc27145688649960060a9c8a5a3a3a751de8e1e6c9d52abe2e428c522c35fdf39d9ee1a39821bde01b1b7a2ce68939bbfae0b29d3b30a674b7e813fb
+EBUILD selinux-inetd-9999.ebuild 282 SHA256 c1f46be6f78fa4c1cf142b89cff0456111704dead5134ddb2c94d5e1ca5d181c SHA512 dfe9e114aa7ab2bacd01a6639be8c109c3ddf8c561577355cba90ca8798591ad97b3e32c4af97d490e3720514b553b92234fcbfa8d5946909c51e077f7842ce2 WHIRLPOOL b5e18b8bdc27145688649960060a9c8a5a3a3a751de8e1e6c9d52abe2e428c522c35fdf39d9ee1a39821bde01b1b7a2ce68939bbfae0b29d3b30a674b7e813fb
 MISC ChangeLog 10479 SHA256 fde82e433b6c02111ac8495a091cde5178e269e85cae79a3c0309d7483d4db41 SHA512 8416a41a444cd4723ed17cd8a63cbb658c973eef997dba604321dde7420eabb905eb0585bbaa383037e99c0fbe26a6c5d03f393650f0fc27c646bc1a3124bc04 WHIRLPOOL e0ad256b5d379abcb4dc4032b009577caa92640d14ab74a56f9ca5cc2e6f0356fa210dd502b88acd4296a4feff0e34fe0d2e85a9465a432b7aae78020eaa2a3a
 MISC ChangeLog-2015 11944 SHA256 58e2619a928d82bda568f1098393ff3cb285bced94974929fa188a1d2eb9369d SHA512 54eea9fb3ba5cb603935f61ef9f445459164d9e6123414af9debea0e2070d8164d06d8cfabd9730df22f063b39eeb6cd44b68fc0a2b1e33cc620663fcefc25d5 WHIRLPOOL 4f8048d11ee6958267d3e15d4834c268d0a15ede7c5a423a918246bb0312096a9630cc28bae867405d80875c2912574b4071b8d0ee975bf1357cccb8d5922528
 MISC metadata.xml 315 SHA256 6fd9ed09d3b5c66688d5ce4000a94dda750536e9ef2918dff29393acdf6e68b2 SHA512 438620bab81d97f74d43168aac08340ab265551b7865d8ce2613fe7ac0885903abaf0d43be01861fb2736cbe047e56c6ff89a8665aacdd05b48c1df86616a358 WHIRLPOOL ec9dd5673eccd65274ffc52d746ff83593337d84a7f12164cff59f90e93466a57a2d450ec0c3a4b691c8f13c3837f9b6277e435d438d355b718863e12201b392
diff --git a/sec-policy/selinux-inetd/selinux-inetd-2.20170204-r1.ebuild b/sec-policy/selinux-inetd/selinux-inetd-2.20170204-r1.ebuild
index dcdb161f7b40..5dfc645611fe 100644
--- a/sec-policy/selinux-inetd/selinux-inetd-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-inetd/selinux-inetd-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-inetd/selinux-inetd-2.20170204-r2.ebuild b/sec-policy/selinux-inetd/selinux-inetd-2.20170204-r2.ebuild
index c8b3f2129201..61e8f5d044fc 100644
--- a/sec-policy/selinux-inetd/selinux-inetd-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-inetd/selinux-inetd-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-inetd/selinux-inetd-2.20170204-r3.ebuild b/sec-policy/selinux-inetd/selinux-inetd-2.20170204-r3.ebuild
index c8b3f2129201..61e8f5d044fc 100644
--- a/sec-policy/selinux-inetd/selinux-inetd-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-inetd/selinux-inetd-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-inetd/selinux-inetd-2.20170204-r4.ebuild b/sec-policy/selinux-inetd/selinux-inetd-2.20170204-r4.ebuild
index c8b3f2129201..61e8f5d044fc 100644
--- a/sec-policy/selinux-inetd/selinux-inetd-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-inetd/selinux-inetd-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-inetd/selinux-inetd-2.20170805-r2.ebuild b/sec-policy/selinux-inetd/selinux-inetd-2.20170805-r2.ebuild
index c8b3f2129201..61e8f5d044fc 100644
--- a/sec-policy/selinux-inetd/selinux-inetd-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-inetd/selinux-inetd-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-inetd/selinux-inetd-2.20170805-r3.ebuild b/sec-policy/selinux-inetd/selinux-inetd-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..5dfc645611fe
--- /dev/null
+++ b/sec-policy/selinux-inetd/selinux-inetd-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-inetd/selinux-inetd-9999.ebuild b/sec-policy/selinux-inetd/selinux-inetd-9999.ebuild
index dcdb161f7b40..5dfc645611fe 100644
--- a/sec-policy/selinux-inetd/selinux-inetd-9999.ebuild
+++ b/sec-policy/selinux-inetd/selinux-inetd-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-inn/Manifest b/sec-policy/selinux-inn/Manifest
index 46ae10928f55..a22366dc9969 100644
--- a/sec-policy/selinux-inn/Manifest
+++ b/sec-policy/selinux-inn/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-inn-2.20170204-r1.ebuild 277 SHA256 12f92508a544a31833f3c97df741bc5660923fb0002556beeb591b77d938024b SHA512 bc3747269cbfd256168a5e886b6db2056bd61a0cb3ee658a5e0062dc1fa6052307ff31fddf3d6ff6350a8ed10006068bbbc6727b9a02f73974fb980f50b2d422 WHIRLPOOL f744358ed0e39f92c91f9b07dae78f3d0aa7e2687768b7b5be0a3a0dc60532306a52c3bcf4fe750987c68a084f110844e9d14faa4959c575b77d1bd86b95c8fb
-EBUILD selinux-inn-2.20170204-r2.ebuild 275 SHA256 e0ccf4a09e5387029c0e395f824340529b1aefac0610a7ba599870c17e86bf09 SHA512 65546d95138f94fa24052019785217a864f54ed55b47dfb4b60a6957c6d84454387187576012754d60a9a5699e871a5587593f00a68f1fb175c37831be02ebbc WHIRLPOOL 4f31a7518e901a612c833149400430df071177a6a67c5c35ed2fb8d1eedfed8e8e7e2f448b8674fee0b8d3f0bcd383fb66aa67100172bf6b110e29df747f33ce
-EBUILD selinux-inn-2.20170204-r3.ebuild 275 SHA256 e0ccf4a09e5387029c0e395f824340529b1aefac0610a7ba599870c17e86bf09 SHA512 65546d95138f94fa24052019785217a864f54ed55b47dfb4b60a6957c6d84454387187576012754d60a9a5699e871a5587593f00a68f1fb175c37831be02ebbc WHIRLPOOL 4f31a7518e901a612c833149400430df071177a6a67c5c35ed2fb8d1eedfed8e8e7e2f448b8674fee0b8d3f0bcd383fb66aa67100172bf6b110e29df747f33ce
-EBUILD selinux-inn-2.20170204-r4.ebuild 275 SHA256 e0ccf4a09e5387029c0e395f824340529b1aefac0610a7ba599870c17e86bf09 SHA512 65546d95138f94fa24052019785217a864f54ed55b47dfb4b60a6957c6d84454387187576012754d60a9a5699e871a5587593f00a68f1fb175c37831be02ebbc WHIRLPOOL 4f31a7518e901a612c833149400430df071177a6a67c5c35ed2fb8d1eedfed8e8e7e2f448b8674fee0b8d3f0bcd383fb66aa67100172bf6b110e29df747f33ce
-EBUILD selinux-inn-2.20170805-r2.ebuild 275 SHA256 e0ccf4a09e5387029c0e395f824340529b1aefac0610a7ba599870c17e86bf09 SHA512 65546d95138f94fa24052019785217a864f54ed55b47dfb4b60a6957c6d84454387187576012754d60a9a5699e871a5587593f00a68f1fb175c37831be02ebbc WHIRLPOOL 4f31a7518e901a612c833149400430df071177a6a67c5c35ed2fb8d1eedfed8e8e7e2f448b8674fee0b8d3f0bcd383fb66aa67100172bf6b110e29df747f33ce
-EBUILD selinux-inn-9999.ebuild 277 SHA256 12f92508a544a31833f3c97df741bc5660923fb0002556beeb591b77d938024b SHA512 bc3747269cbfd256168a5e886b6db2056bd61a0cb3ee658a5e0062dc1fa6052307ff31fddf3d6ff6350a8ed10006068bbbc6727b9a02f73974fb980f50b2d422 WHIRLPOOL f744358ed0e39f92c91f9b07dae78f3d0aa7e2687768b7b5be0a3a0dc60532306a52c3bcf4fe750987c68a084f110844e9d14faa4959c575b77d1bd86b95c8fb
+EBUILD selinux-inn-2.20170204-r1.ebuild 278 SHA256 fd4d5df820559d6819d7b756ccac8f2df198b231854ae07957835d5f31e3118a SHA512 652f786bbc3f78086bc4eb68db2e78f824f4fab0036b01d53bcac725c66fe0b7bf04e2157e7fe5f5f7e44b874eedc47cd1d212e05e381d8a3d4ab71b55c48ebe WHIRLPOOL 9b52aa0bf0aa27cad79253a33f99f645d08982df9d1e892d9a00b3e7e3cdb004c17df260a7bbdb4f8d1c56b9e9889e5e5bdaa0033641fe41f45fac8c4ac5fbea
+EBUILD selinux-inn-2.20170204-r2.ebuild 276 SHA256 3892ff5e9ac26f21c3d0e580cdb9b7d9baaaf035913d1e39f1990f6743390453 SHA512 5663a3665c8fa4a9fa5f8102f5e838e98ecadc8a1973ef3a249923847c1a3a22464779ae874490eedc911063900bc6214729e2da8585f578303a17f594e64511 WHIRLPOOL 20f58753db5aceac6bb1e3118d8ee8ee2ab3996e2ddb5da653862496612d9811e69d6dfb81f0aa70f94d8cc0027237454f19cb4a57f0f434297bcbfb5d5edbad
+EBUILD selinux-inn-2.20170204-r3.ebuild 276 SHA256 3892ff5e9ac26f21c3d0e580cdb9b7d9baaaf035913d1e39f1990f6743390453 SHA512 5663a3665c8fa4a9fa5f8102f5e838e98ecadc8a1973ef3a249923847c1a3a22464779ae874490eedc911063900bc6214729e2da8585f578303a17f594e64511 WHIRLPOOL 20f58753db5aceac6bb1e3118d8ee8ee2ab3996e2ddb5da653862496612d9811e69d6dfb81f0aa70f94d8cc0027237454f19cb4a57f0f434297bcbfb5d5edbad
+EBUILD selinux-inn-2.20170204-r4.ebuild 276 SHA256 3892ff5e9ac26f21c3d0e580cdb9b7d9baaaf035913d1e39f1990f6743390453 SHA512 5663a3665c8fa4a9fa5f8102f5e838e98ecadc8a1973ef3a249923847c1a3a22464779ae874490eedc911063900bc6214729e2da8585f578303a17f594e64511 WHIRLPOOL 20f58753db5aceac6bb1e3118d8ee8ee2ab3996e2ddb5da653862496612d9811e69d6dfb81f0aa70f94d8cc0027237454f19cb4a57f0f434297bcbfb5d5edbad
+EBUILD selinux-inn-2.20170805-r2.ebuild 276 SHA256 3892ff5e9ac26f21c3d0e580cdb9b7d9baaaf035913d1e39f1990f6743390453 SHA512 5663a3665c8fa4a9fa5f8102f5e838e98ecadc8a1973ef3a249923847c1a3a22464779ae874490eedc911063900bc6214729e2da8585f578303a17f594e64511 WHIRLPOOL 20f58753db5aceac6bb1e3118d8ee8ee2ab3996e2ddb5da653862496612d9811e69d6dfb81f0aa70f94d8cc0027237454f19cb4a57f0f434297bcbfb5d5edbad
+EBUILD selinux-inn-2.20170805-r3.ebuild 278 SHA256 fd4d5df820559d6819d7b756ccac8f2df198b231854ae07957835d5f31e3118a SHA512 652f786bbc3f78086bc4eb68db2e78f824f4fab0036b01d53bcac725c66fe0b7bf04e2157e7fe5f5f7e44b874eedc47cd1d212e05e381d8a3d4ab71b55c48ebe WHIRLPOOL 9b52aa0bf0aa27cad79253a33f99f645d08982df9d1e892d9a00b3e7e3cdb004c17df260a7bbdb4f8d1c56b9e9889e5e5bdaa0033641fe41f45fac8c4ac5fbea
+EBUILD selinux-inn-9999.ebuild 278 SHA256 fd4d5df820559d6819d7b756ccac8f2df198b231854ae07957835d5f31e3118a SHA512 652f786bbc3f78086bc4eb68db2e78f824f4fab0036b01d53bcac725c66fe0b7bf04e2157e7fe5f5f7e44b874eedc47cd1d212e05e381d8a3d4ab71b55c48ebe WHIRLPOOL 9b52aa0bf0aa27cad79253a33f99f645d08982df9d1e892d9a00b3e7e3cdb004c17df260a7bbdb4f8d1c56b9e9889e5e5bdaa0033641fe41f45fac8c4ac5fbea
 MISC ChangeLog 10295 SHA256 badaeeb5a68762e517e8e71677986f730b3e848d872898d1b7828f38f799497d SHA512 5644b44fdc572662f3913e4cc6b27d8b1d7e7fbfdc1c8b68b9c6191e0f4fab8d64ec57e9d623a78fcb1789d3d51c3ef984798cd162b0d0f784eefedb1b5e968c WHIRLPOOL ba4c9e6b4aca9c7c16818aa3c628b59f7a85da11987502684ae055b7195d0499ea22b8ebe910389961d4bdee654fa7dbeaa8ab2df8302e38e43d77073dd2f251
 MISC ChangeLog-2015 9704 SHA256 d1ff4c28a13e366ff2f9f974740e044efdbeb8eb43a5cdb4e8177913b7163da6 SHA512 7b8c33f511ac65c9180f0266b01a4f37f259eec3f3bebd2527eece88456a4d03cd7e5603885829239025b4cbe1707996dddbee8aff58477eac4272aef95d871c WHIRLPOOL 7ff92c467fd2b3817b4ea6ca1cbf1a94e696f7d7a93624a7d056ed64d527e270ab7ba11b2f3325a0007d0958f1c0ee49e88f3a7171e52734207ce10e84e74d2f
 MISC metadata.xml 313 SHA256 ed62ad4c55b9721b09bbe2bdecf544cd291ce55097fc3cd8701c02846ea84e5a SHA512 697ce85e544cbd0e530b6aa1408ec7cb391c832327ac4012f0bc7b844af03632c3593550bcbb6fc717821b29b68f42ce48d594274240de164ef490c95ed6b5f6 WHIRLPOOL 5092200f6ed147c62050f07471a41eecb2fdfe104529a5ff3b7d573962fa235d86a869ac15ac85f920b16731023f2d592a2c1c03cab82e1b82b844eed3d0388e
diff --git a/sec-policy/selinux-inn/selinux-inn-2.20170204-r1.ebuild b/sec-policy/selinux-inn/selinux-inn-2.20170204-r1.ebuild
index 71d661469dad..aa1cf8cf674f 100644
--- a/sec-policy/selinux-inn/selinux-inn-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-inn/selinux-inn-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-inn/selinux-inn-2.20170204-r2.ebuild b/sec-policy/selinux-inn/selinux-inn-2.20170204-r2.ebuild
index ff806d6c660d..e296b2b3892e 100644
--- a/sec-policy/selinux-inn/selinux-inn-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-inn/selinux-inn-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-inn/selinux-inn-2.20170204-r3.ebuild b/sec-policy/selinux-inn/selinux-inn-2.20170204-r3.ebuild
index ff806d6c660d..e296b2b3892e 100644
--- a/sec-policy/selinux-inn/selinux-inn-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-inn/selinux-inn-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-inn/selinux-inn-2.20170204-r4.ebuild b/sec-policy/selinux-inn/selinux-inn-2.20170204-r4.ebuild
index ff806d6c660d..e296b2b3892e 100644
--- a/sec-policy/selinux-inn/selinux-inn-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-inn/selinux-inn-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-inn/selinux-inn-2.20170805-r2.ebuild b/sec-policy/selinux-inn/selinux-inn-2.20170805-r2.ebuild
index ff806d6c660d..e296b2b3892e 100644
--- a/sec-policy/selinux-inn/selinux-inn-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-inn/selinux-inn-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-inn/selinux-inn-2.20170805-r3.ebuild b/sec-policy/selinux-inn/selinux-inn-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..aa1cf8cf674f
--- /dev/null
+++ b/sec-policy/selinux-inn/selinux-inn-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-inn/selinux-inn-9999.ebuild b/sec-policy/selinux-inn/selinux-inn-9999.ebuild
index 71d661469dad..aa1cf8cf674f 100644
--- a/sec-policy/selinux-inn/selinux-inn-9999.ebuild
+++ b/sec-policy/selinux-inn/selinux-inn-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ipsec/Manifest b/sec-policy/selinux-ipsec/Manifest
index 09bf63b2e392..1530f6d4828e 100644
--- a/sec-policy/selinux-ipsec/Manifest
+++ b/sec-policy/selinux-ipsec/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-ipsec-2.20170204-r1.ebuild 281 SHA256 4d9008e2e05c426de5626d6c51d712ce2436672984fa21330e3a17377464946f SHA512 f9384195e452d8a578800760c3a3a27998c8629746864e83ee556d74bf6acdab5a38dd6ac4bbfe2c8b2c339685177602c0f56288eb1abb95c7f39aa7ee6e0a69 WHIRLPOOL 6afa72c1ca20ceb5932f8d9e5343368d0325cea5585a0ca9c11947ba024e1461541f6e364d62a29bdadd07012f42f6711594b1fed640b543510403d24db82aee
-EBUILD selinux-ipsec-2.20170204-r2.ebuild 279 SHA256 bd99d43cc28f3937262ec261d67ec3f3d03dc7cde68db3d2ededd1c3cbde8267 SHA512 43c930bb84f8504099b441354c229e900194bd2d5cd9cf6181d0d26eb59d967fd3d7a9b3b9a2889c573ff9370ff5ba7a67ec612c70bf9b83b4108c31a1ec06f0 WHIRLPOOL 53f4585b2c273f8ff48bc2b8d0354771593a5debff1b9531c9dd91ad2bff086e9773bcc0525f346ce90a5d92cfcb05f8f1f50de182362fa4b71e1e1cb64f8cf3
-EBUILD selinux-ipsec-2.20170204-r3.ebuild 279 SHA256 bd99d43cc28f3937262ec261d67ec3f3d03dc7cde68db3d2ededd1c3cbde8267 SHA512 43c930bb84f8504099b441354c229e900194bd2d5cd9cf6181d0d26eb59d967fd3d7a9b3b9a2889c573ff9370ff5ba7a67ec612c70bf9b83b4108c31a1ec06f0 WHIRLPOOL 53f4585b2c273f8ff48bc2b8d0354771593a5debff1b9531c9dd91ad2bff086e9773bcc0525f346ce90a5d92cfcb05f8f1f50de182362fa4b71e1e1cb64f8cf3
-EBUILD selinux-ipsec-2.20170204-r4.ebuild 279 SHA256 bd99d43cc28f3937262ec261d67ec3f3d03dc7cde68db3d2ededd1c3cbde8267 SHA512 43c930bb84f8504099b441354c229e900194bd2d5cd9cf6181d0d26eb59d967fd3d7a9b3b9a2889c573ff9370ff5ba7a67ec612c70bf9b83b4108c31a1ec06f0 WHIRLPOOL 53f4585b2c273f8ff48bc2b8d0354771593a5debff1b9531c9dd91ad2bff086e9773bcc0525f346ce90a5d92cfcb05f8f1f50de182362fa4b71e1e1cb64f8cf3
-EBUILD selinux-ipsec-2.20170805-r2.ebuild 279 SHA256 bd99d43cc28f3937262ec261d67ec3f3d03dc7cde68db3d2ededd1c3cbde8267 SHA512 43c930bb84f8504099b441354c229e900194bd2d5cd9cf6181d0d26eb59d967fd3d7a9b3b9a2889c573ff9370ff5ba7a67ec612c70bf9b83b4108c31a1ec06f0 WHIRLPOOL 53f4585b2c273f8ff48bc2b8d0354771593a5debff1b9531c9dd91ad2bff086e9773bcc0525f346ce90a5d92cfcb05f8f1f50de182362fa4b71e1e1cb64f8cf3
-EBUILD selinux-ipsec-9999.ebuild 281 SHA256 4d9008e2e05c426de5626d6c51d712ce2436672984fa21330e3a17377464946f SHA512 f9384195e452d8a578800760c3a3a27998c8629746864e83ee556d74bf6acdab5a38dd6ac4bbfe2c8b2c339685177602c0f56288eb1abb95c7f39aa7ee6e0a69 WHIRLPOOL 6afa72c1ca20ceb5932f8d9e5343368d0325cea5585a0ca9c11947ba024e1461541f6e364d62a29bdadd07012f42f6711594b1fed640b543510403d24db82aee
+EBUILD selinux-ipsec-2.20170204-r1.ebuild 282 SHA256 c11add9ff186fe78eec43d8720b18e5d2a5d99e7df2bd43eacec60d8cb9315e4 SHA512 b0df3bf894a2e0a76a1c096fabe3e8c8ddee947ec8d4a1a02120a5459bc077b9dc0035d513af8ed2e8714dde9224cd182c94891bd0eee25a93e3b7b099bf546e WHIRLPOOL d6b1ab95fac3a54a9910f82455f95175ab809162930214b49e3f38d0859be01da0f292b9328c5a793db4152250afa22e75101e3909e35ea745ebe8112b8fa616
+EBUILD selinux-ipsec-2.20170204-r2.ebuild 280 SHA256 67c154b154f5340d17503c0442728052f55627babed394f6292a539aab0c3ed8 SHA512 9d4a8ede24d15681db02ad12b24c773a9763df2bc9697c6f96bd0f7e988101636261c64709a3edaa53a8cfe597bb49ce23882a098c44e32a2b2c10852a64530d WHIRLPOOL 25f1104bf130bd2634e65e3c580bac14d1eba66b9e4226ce261cad1962c3676c05c5c16929543b00dec2b43682ed23c070da4f9f1d894a58d8d75a44e7ea1d83
+EBUILD selinux-ipsec-2.20170204-r3.ebuild 280 SHA256 67c154b154f5340d17503c0442728052f55627babed394f6292a539aab0c3ed8 SHA512 9d4a8ede24d15681db02ad12b24c773a9763df2bc9697c6f96bd0f7e988101636261c64709a3edaa53a8cfe597bb49ce23882a098c44e32a2b2c10852a64530d WHIRLPOOL 25f1104bf130bd2634e65e3c580bac14d1eba66b9e4226ce261cad1962c3676c05c5c16929543b00dec2b43682ed23c070da4f9f1d894a58d8d75a44e7ea1d83
+EBUILD selinux-ipsec-2.20170204-r4.ebuild 280 SHA256 67c154b154f5340d17503c0442728052f55627babed394f6292a539aab0c3ed8 SHA512 9d4a8ede24d15681db02ad12b24c773a9763df2bc9697c6f96bd0f7e988101636261c64709a3edaa53a8cfe597bb49ce23882a098c44e32a2b2c10852a64530d WHIRLPOOL 25f1104bf130bd2634e65e3c580bac14d1eba66b9e4226ce261cad1962c3676c05c5c16929543b00dec2b43682ed23c070da4f9f1d894a58d8d75a44e7ea1d83
+EBUILD selinux-ipsec-2.20170805-r2.ebuild 280 SHA256 67c154b154f5340d17503c0442728052f55627babed394f6292a539aab0c3ed8 SHA512 9d4a8ede24d15681db02ad12b24c773a9763df2bc9697c6f96bd0f7e988101636261c64709a3edaa53a8cfe597bb49ce23882a098c44e32a2b2c10852a64530d WHIRLPOOL 25f1104bf130bd2634e65e3c580bac14d1eba66b9e4226ce261cad1962c3676c05c5c16929543b00dec2b43682ed23c070da4f9f1d894a58d8d75a44e7ea1d83
+EBUILD selinux-ipsec-2.20170805-r3.ebuild 282 SHA256 c11add9ff186fe78eec43d8720b18e5d2a5d99e7df2bd43eacec60d8cb9315e4 SHA512 b0df3bf894a2e0a76a1c096fabe3e8c8ddee947ec8d4a1a02120a5459bc077b9dc0035d513af8ed2e8714dde9224cd182c94891bd0eee25a93e3b7b099bf546e WHIRLPOOL d6b1ab95fac3a54a9910f82455f95175ab809162930214b49e3f38d0859be01da0f292b9328c5a793db4152250afa22e75101e3909e35ea745ebe8112b8fa616
+EBUILD selinux-ipsec-9999.ebuild 282 SHA256 c11add9ff186fe78eec43d8720b18e5d2a5d99e7df2bd43eacec60d8cb9315e4 SHA512 b0df3bf894a2e0a76a1c096fabe3e8c8ddee947ec8d4a1a02120a5459bc077b9dc0035d513af8ed2e8714dde9224cd182c94891bd0eee25a93e3b7b099bf546e WHIRLPOOL d6b1ab95fac3a54a9910f82455f95175ab809162930214b49e3f38d0859be01da0f292b9328c5a793db4152250afa22e75101e3909e35ea745ebe8112b8fa616
 MISC ChangeLog 10479 SHA256 67f3f41940445651a60f335a515dd94a188f960c1a62768a80f2c70f619d7df4 SHA512 95c466623f6ebc5a168e9a6f9fa8fd80bb58e4ea0f4184c352c802a1d3c663ede4920611139d17c9c9b96dbb8da11cf2f37c9dbadaeb30d9a27ab7d8c576bea2 WHIRLPOOL c2d66473ccd3883d1883b3fc0deb3c35b74407ce8c6a181e8e68b572e6b85abcd27c9caa5da715d38da7c19d8e0aebef86a84187d74642ae77fc812375ae606c
 MISC ChangeLog-2015 9791 SHA256 a0c14b7127b2403d2e24724e1109e0758c8f1139e37f2cc5c5dc0fde4018c778 SHA512 96b918d2ff1a50b8c808c98caf40f89326e3b07a14bb9b68f9641af21c130027c8bc3354563527feb7022afe5912b92d10ac281294ba61f722bb8c09357275d1 WHIRLPOOL 2dba0a96cb81d653b8e70b2811a1ac898994bce365e5a364de587cd82bd0fdcb791905d58a06dd40359b49c5aae584ff97287a6173355dfd80d5e99b616e1d15
 MISC metadata.xml 315 SHA256 ac390dad49c6b63176fa461bab46ca9479b17b9bb82a681b0fe73f6ee8527581 SHA512 602a740c62ae3a51f2d1d21912b9a1ec5a910a8062813ef0101f4ed0e80c54c78c8595dce19be2cff521a92b251702aa6768c05e4b6fe2301c8cd3e266bd8948 WHIRLPOOL d3ac5604458d5915a9f3959e5bcbb73c577433211c20c626df333e7ddd79528cc7803db5264a354c4a74eb0ebe4d9f15c850d3700b85a374e7c43273828b5ad4
diff --git a/sec-policy/selinux-ipsec/selinux-ipsec-2.20170204-r1.ebuild b/sec-policy/selinux-ipsec/selinux-ipsec-2.20170204-r1.ebuild
index 5db450d5db6b..c4ddfcfdab11 100644
--- a/sec-policy/selinux-ipsec/selinux-ipsec-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-ipsec/selinux-ipsec-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ipsec/selinux-ipsec-2.20170204-r2.ebuild b/sec-policy/selinux-ipsec/selinux-ipsec-2.20170204-r2.ebuild
index 8b49e20170d5..466fe9db0faf 100644
--- a/sec-policy/selinux-ipsec/selinux-ipsec-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-ipsec/selinux-ipsec-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ipsec/selinux-ipsec-2.20170204-r3.ebuild b/sec-policy/selinux-ipsec/selinux-ipsec-2.20170204-r3.ebuild
index 8b49e20170d5..466fe9db0faf 100644
--- a/sec-policy/selinux-ipsec/selinux-ipsec-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-ipsec/selinux-ipsec-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ipsec/selinux-ipsec-2.20170204-r4.ebuild b/sec-policy/selinux-ipsec/selinux-ipsec-2.20170204-r4.ebuild
index 8b49e20170d5..466fe9db0faf 100644
--- a/sec-policy/selinux-ipsec/selinux-ipsec-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-ipsec/selinux-ipsec-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ipsec/selinux-ipsec-2.20170805-r2.ebuild b/sec-policy/selinux-ipsec/selinux-ipsec-2.20170805-r2.ebuild
index 8b49e20170d5..466fe9db0faf 100644
--- a/sec-policy/selinux-ipsec/selinux-ipsec-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-ipsec/selinux-ipsec-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ipsec/selinux-ipsec-2.20170805-r3.ebuild b/sec-policy/selinux-ipsec/selinux-ipsec-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..c4ddfcfdab11
--- /dev/null
+++ b/sec-policy/selinux-ipsec/selinux-ipsec-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-ipsec/selinux-ipsec-9999.ebuild b/sec-policy/selinux-ipsec/selinux-ipsec-9999.ebuild
index 5db450d5db6b..c4ddfcfdab11 100644
--- a/sec-policy/selinux-ipsec/selinux-ipsec-9999.ebuild
+++ b/sec-policy/selinux-ipsec/selinux-ipsec-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-irc/Manifest b/sec-policy/selinux-irc/Manifest
index 24b49a1f297b..4307aade3148 100644
--- a/sec-policy/selinux-irc/Manifest
+++ b/sec-policy/selinux-irc/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-irc-2.20170204-r1.ebuild 277 SHA256 e557856c3561b2faa8c9ddf6494903268e68b1ca4e9ea2867df712673471ee66 SHA512 0bcbbb5e14651959ecbd183753b2b955d1717df3e8425b7d716a5c20bba696118ff13918084d4db93f041d67c895608a593c4bdeb645152f0c66f77726fde98d WHIRLPOOL 6b30fbafc85d6c97f95a2dcdf798ae33b53f92aa788d26ebf2d44dc249dfaf99cd2ff2ce6c556a6f6b3c866f265ad9452ee4037a06c9101924d1c4ab77191101
-EBUILD selinux-irc-2.20170204-r2.ebuild 275 SHA256 e690d968209714a0ed12dcec3f03e14da4a8dd331bc50897552881067b0c9334 SHA512 24418ae6c4c59511b20169055e15c3c592ec98bd291455fa0d4c377ad555eaa1bd0c73c7ead69322fa7e4c6b1f861a5dd0c2470140e74d00350daf88e8fe1e05 WHIRLPOOL 7990f324241dabb597abb4d81090fb8eed8d30f3f0e1aba90258be58b879d5ced5f2cc5fa40ab6343f74ddd1518730c0f034fcca6d00a983fd6ca0d600f2f8bf
-EBUILD selinux-irc-2.20170204-r3.ebuild 275 SHA256 e690d968209714a0ed12dcec3f03e14da4a8dd331bc50897552881067b0c9334 SHA512 24418ae6c4c59511b20169055e15c3c592ec98bd291455fa0d4c377ad555eaa1bd0c73c7ead69322fa7e4c6b1f861a5dd0c2470140e74d00350daf88e8fe1e05 WHIRLPOOL 7990f324241dabb597abb4d81090fb8eed8d30f3f0e1aba90258be58b879d5ced5f2cc5fa40ab6343f74ddd1518730c0f034fcca6d00a983fd6ca0d600f2f8bf
-EBUILD selinux-irc-2.20170204-r4.ebuild 275 SHA256 e690d968209714a0ed12dcec3f03e14da4a8dd331bc50897552881067b0c9334 SHA512 24418ae6c4c59511b20169055e15c3c592ec98bd291455fa0d4c377ad555eaa1bd0c73c7ead69322fa7e4c6b1f861a5dd0c2470140e74d00350daf88e8fe1e05 WHIRLPOOL 7990f324241dabb597abb4d81090fb8eed8d30f3f0e1aba90258be58b879d5ced5f2cc5fa40ab6343f74ddd1518730c0f034fcca6d00a983fd6ca0d600f2f8bf
-EBUILD selinux-irc-2.20170805-r2.ebuild 275 SHA256 e690d968209714a0ed12dcec3f03e14da4a8dd331bc50897552881067b0c9334 SHA512 24418ae6c4c59511b20169055e15c3c592ec98bd291455fa0d4c377ad555eaa1bd0c73c7ead69322fa7e4c6b1f861a5dd0c2470140e74d00350daf88e8fe1e05 WHIRLPOOL 7990f324241dabb597abb4d81090fb8eed8d30f3f0e1aba90258be58b879d5ced5f2cc5fa40ab6343f74ddd1518730c0f034fcca6d00a983fd6ca0d600f2f8bf
-EBUILD selinux-irc-9999.ebuild 277 SHA256 e557856c3561b2faa8c9ddf6494903268e68b1ca4e9ea2867df712673471ee66 SHA512 0bcbbb5e14651959ecbd183753b2b955d1717df3e8425b7d716a5c20bba696118ff13918084d4db93f041d67c895608a593c4bdeb645152f0c66f77726fde98d WHIRLPOOL 6b30fbafc85d6c97f95a2dcdf798ae33b53f92aa788d26ebf2d44dc249dfaf99cd2ff2ce6c556a6f6b3c866f265ad9452ee4037a06c9101924d1c4ab77191101
+EBUILD selinux-irc-2.20170204-r1.ebuild 278 SHA256 3a5d09e6c8e6091b891e25d4a942e99306733a48c33c17fbe993aa64cae9219c SHA512 c4cf0fcbdb1f4ece3b865e76617f7e9779f745d896328992591f36dcb91a4fb7f9b07314b2c1c0bcd72e53df5c965e01e68499356d518964c72c5fc69ccf521c WHIRLPOOL 776d1de6c4de6e16b5ce31ebfb73c88f673f0ebd9a23cba45073219c585bde4088ab8b03cfc2b507c547bdd4165baae5b66e36c365214a07401c0cc12694ae11
+EBUILD selinux-irc-2.20170204-r2.ebuild 276 SHA256 64eff6d617cb7f7d34dc4418a362334f4369e22ca9944e3e5dcc0070e4b209d2 SHA512 626da120eb698469aac706843368ad82ee340ad046003c8df99c6afdbea1adec033d5083870c7c53f981e01ce90beec9db78eee3aa2277da8041a89a1e3b306b WHIRLPOOL 3374d6676d34d1af9d1fc801005709125dc5895e04576cd3b7294d8219b09a84ce1d283364fd013bcd37d17c40f1950c07704202962c0e89851566f72474816a
+EBUILD selinux-irc-2.20170204-r3.ebuild 276 SHA256 64eff6d617cb7f7d34dc4418a362334f4369e22ca9944e3e5dcc0070e4b209d2 SHA512 626da120eb698469aac706843368ad82ee340ad046003c8df99c6afdbea1adec033d5083870c7c53f981e01ce90beec9db78eee3aa2277da8041a89a1e3b306b WHIRLPOOL 3374d6676d34d1af9d1fc801005709125dc5895e04576cd3b7294d8219b09a84ce1d283364fd013bcd37d17c40f1950c07704202962c0e89851566f72474816a
+EBUILD selinux-irc-2.20170204-r4.ebuild 276 SHA256 64eff6d617cb7f7d34dc4418a362334f4369e22ca9944e3e5dcc0070e4b209d2 SHA512 626da120eb698469aac706843368ad82ee340ad046003c8df99c6afdbea1adec033d5083870c7c53f981e01ce90beec9db78eee3aa2277da8041a89a1e3b306b WHIRLPOOL 3374d6676d34d1af9d1fc801005709125dc5895e04576cd3b7294d8219b09a84ce1d283364fd013bcd37d17c40f1950c07704202962c0e89851566f72474816a
+EBUILD selinux-irc-2.20170805-r2.ebuild 276 SHA256 64eff6d617cb7f7d34dc4418a362334f4369e22ca9944e3e5dcc0070e4b209d2 SHA512 626da120eb698469aac706843368ad82ee340ad046003c8df99c6afdbea1adec033d5083870c7c53f981e01ce90beec9db78eee3aa2277da8041a89a1e3b306b WHIRLPOOL 3374d6676d34d1af9d1fc801005709125dc5895e04576cd3b7294d8219b09a84ce1d283364fd013bcd37d17c40f1950c07704202962c0e89851566f72474816a
+EBUILD selinux-irc-2.20170805-r3.ebuild 278 SHA256 3a5d09e6c8e6091b891e25d4a942e99306733a48c33c17fbe993aa64cae9219c SHA512 c4cf0fcbdb1f4ece3b865e76617f7e9779f745d896328992591f36dcb91a4fb7f9b07314b2c1c0bcd72e53df5c965e01e68499356d518964c72c5fc69ccf521c WHIRLPOOL 776d1de6c4de6e16b5ce31ebfb73c88f673f0ebd9a23cba45073219c585bde4088ab8b03cfc2b507c547bdd4165baae5b66e36c365214a07401c0cc12694ae11
+EBUILD selinux-irc-9999.ebuild 278 SHA256 3a5d09e6c8e6091b891e25d4a942e99306733a48c33c17fbe993aa64cae9219c SHA512 c4cf0fcbdb1f4ece3b865e76617f7e9779f745d896328992591f36dcb91a4fb7f9b07314b2c1c0bcd72e53df5c965e01e68499356d518964c72c5fc69ccf521c WHIRLPOOL 776d1de6c4de6e16b5ce31ebfb73c88f673f0ebd9a23cba45073219c585bde4088ab8b03cfc2b507c547bdd4165baae5b66e36c365214a07401c0cc12694ae11
 MISC ChangeLog 10295 SHA256 25a656a5c9c4378f3e1e535a9619b410891ba84cd898a6db4a6009f45f55ef58 SHA512 9f3f659acbddaa71e35522afbdb219ba8fe8b923ef13ec0484739ad3738f7bd6736830b217b7455031dd209adbf284dabc98bbc4f4c5ac151cd3f1fd011050f5 WHIRLPOOL 514c6bf6f49a0f2c8c36f5ac5000e627e28a80f2f64967fd630bf9f8279651731ebc5ae459d464943e2790c1670d4a377a28f8c5cf649554839af9e6c765efe2
 MISC ChangeLog-2015 9107 SHA256 98be04d3230bfd0646368ad0572ec238fe6cc3d1ed74fcd6e793b6bd8ad32df6 SHA512 a6ceefa332aaea4abf58072ebe0b6d2e0062a82c74dd09244d762fb0f46347612788931711855621bdb51cd9f6e928858e2f9c3514ee1edd947f0ff4522e987a WHIRLPOOL 55ac833506be6fc9de7b4dfc7b2749e86640130e4efe3d08797bf32afdffb9def00eb0c6117524a1ca5ea4dd104bb089237654e1e5508feb5d2fa0c1a00229b8
 MISC metadata.xml 313 SHA256 ed81ab50b2b0c8c717c753a798c2325a46e5452c828ec134752729ea6743a488 SHA512 79d10315a82d308f9417e6d0b331363b33a8022f0e5366412c0452f614e98243e946cccc605b55cb71cb7f5361a2aa3ae45fd5cbad9d4664cac406930734ea58 WHIRLPOOL 978acc405216c5839cdf2aa530f605e3a21917d70b60414c07e76f04b0677813d0e3b3cea8a2522c634df0ac4d46b21fc0941eee6dac12bbe5616a9fb8f71648
diff --git a/sec-policy/selinux-irc/selinux-irc-2.20170204-r1.ebuild b/sec-policy/selinux-irc/selinux-irc-2.20170204-r1.ebuild
index 32e93a3aa845..3d43669f0515 100644
--- a/sec-policy/selinux-irc/selinux-irc-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-irc/selinux-irc-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-irc/selinux-irc-2.20170204-r2.ebuild b/sec-policy/selinux-irc/selinux-irc-2.20170204-r2.ebuild
index 2afb7b4f810e..6afd2f64a468 100644
--- a/sec-policy/selinux-irc/selinux-irc-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-irc/selinux-irc-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-irc/selinux-irc-2.20170204-r3.ebuild b/sec-policy/selinux-irc/selinux-irc-2.20170204-r3.ebuild
index 2afb7b4f810e..6afd2f64a468 100644
--- a/sec-policy/selinux-irc/selinux-irc-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-irc/selinux-irc-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-irc/selinux-irc-2.20170204-r4.ebuild b/sec-policy/selinux-irc/selinux-irc-2.20170204-r4.ebuild
index 2afb7b4f810e..6afd2f64a468 100644
--- a/sec-policy/selinux-irc/selinux-irc-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-irc/selinux-irc-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-irc/selinux-irc-2.20170805-r2.ebuild b/sec-policy/selinux-irc/selinux-irc-2.20170805-r2.ebuild
index 2afb7b4f810e..6afd2f64a468 100644
--- a/sec-policy/selinux-irc/selinux-irc-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-irc/selinux-irc-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-irc/selinux-irc-2.20170805-r3.ebuild b/sec-policy/selinux-irc/selinux-irc-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..3d43669f0515
--- /dev/null
+++ b/sec-policy/selinux-irc/selinux-irc-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-irc/selinux-irc-9999.ebuild b/sec-policy/selinux-irc/selinux-irc-9999.ebuild
index 32e93a3aa845..3d43669f0515 100644
--- a/sec-policy/selinux-irc/selinux-irc-9999.ebuild
+++ b/sec-policy/selinux-irc/selinux-irc-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ircd/Manifest b/sec-policy/selinux-ircd/Manifest
index 27640d10f864..71160d7bf98f 100644
--- a/sec-policy/selinux-ircd/Manifest
+++ b/sec-policy/selinux-ircd/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-ircd-2.20170204-r1.ebuild 279 SHA256 6f4c53c37435d351712a51f348fc65af826c0d9d13d5bc89eadda560a91631cb SHA512 433c6cdb142a9ed626a60a57b086728f609001db4181989e555f06afc95ce14e6825366e4c90e2307a7a62c1f1b3ddf866511b4d9aea01699adf9b9b6ddd0b9b WHIRLPOOL 0a7392c4b70a29735ea5acf1b4f1dd9ba7b65cd3658132a49ed89b5627a9a8f55cdb5ea75e31a1c96572d5fb144dc4633701a3837d2dd7bf113c7a6af81fb48e
-EBUILD selinux-ircd-2.20170204-r2.ebuild 277 SHA256 9c9af1f4bd459a96bb5c61086ca5861bbe038b9fc25517c12545d54851fc43d3 SHA512 8ae645565d802eefb00926901ec37895d6c33bc5cc31ae1492205a12d2f70ce03dffaccaeb686ba8bf45469a45a8edd94efa0e531ceb76722ee049544cfe8681 WHIRLPOOL c05aec31ca4a3c6f5fc053c937f410f3f72ba078173172b4a87d12f5ac410b3f6cec7e519fbd0bf3828ed5aae7e3fa8e5e516bd7b0cfb0f0bde91e6b6a04a0d0
-EBUILD selinux-ircd-2.20170204-r3.ebuild 277 SHA256 9c9af1f4bd459a96bb5c61086ca5861bbe038b9fc25517c12545d54851fc43d3 SHA512 8ae645565d802eefb00926901ec37895d6c33bc5cc31ae1492205a12d2f70ce03dffaccaeb686ba8bf45469a45a8edd94efa0e531ceb76722ee049544cfe8681 WHIRLPOOL c05aec31ca4a3c6f5fc053c937f410f3f72ba078173172b4a87d12f5ac410b3f6cec7e519fbd0bf3828ed5aae7e3fa8e5e516bd7b0cfb0f0bde91e6b6a04a0d0
-EBUILD selinux-ircd-2.20170204-r4.ebuild 277 SHA256 9c9af1f4bd459a96bb5c61086ca5861bbe038b9fc25517c12545d54851fc43d3 SHA512 8ae645565d802eefb00926901ec37895d6c33bc5cc31ae1492205a12d2f70ce03dffaccaeb686ba8bf45469a45a8edd94efa0e531ceb76722ee049544cfe8681 WHIRLPOOL c05aec31ca4a3c6f5fc053c937f410f3f72ba078173172b4a87d12f5ac410b3f6cec7e519fbd0bf3828ed5aae7e3fa8e5e516bd7b0cfb0f0bde91e6b6a04a0d0
-EBUILD selinux-ircd-2.20170805-r2.ebuild 277 SHA256 9c9af1f4bd459a96bb5c61086ca5861bbe038b9fc25517c12545d54851fc43d3 SHA512 8ae645565d802eefb00926901ec37895d6c33bc5cc31ae1492205a12d2f70ce03dffaccaeb686ba8bf45469a45a8edd94efa0e531ceb76722ee049544cfe8681 WHIRLPOOL c05aec31ca4a3c6f5fc053c937f410f3f72ba078173172b4a87d12f5ac410b3f6cec7e519fbd0bf3828ed5aae7e3fa8e5e516bd7b0cfb0f0bde91e6b6a04a0d0
-EBUILD selinux-ircd-9999.ebuild 279 SHA256 6f4c53c37435d351712a51f348fc65af826c0d9d13d5bc89eadda560a91631cb SHA512 433c6cdb142a9ed626a60a57b086728f609001db4181989e555f06afc95ce14e6825366e4c90e2307a7a62c1f1b3ddf866511b4d9aea01699adf9b9b6ddd0b9b WHIRLPOOL 0a7392c4b70a29735ea5acf1b4f1dd9ba7b65cd3658132a49ed89b5627a9a8f55cdb5ea75e31a1c96572d5fb144dc4633701a3837d2dd7bf113c7a6af81fb48e
+EBUILD selinux-ircd-2.20170204-r1.ebuild 280 SHA256 952b60ffc9128572cd7ac045294c712bb445f444f2ec000effb6d2d51fb4ba9e SHA512 30da19de0f102312ac1549d5b6ca438e2309c1dd6b33c4a5a3d7a7c44eb2d691a9597ec87f5faf2653f9492ec207f390579e348ab20e93b45f45b21d66503175 WHIRLPOOL cd8250296e259ce84bd45ef067f3fc6bcce37fb3cd780303ed51da32e909d2241182a38e698289181dda57800627bead4c3bf67b7ca8bb77a4b91f5154a9775e
+EBUILD selinux-ircd-2.20170204-r2.ebuild 278 SHA256 158cb2e35f7524bc7fea21899c07db1100b199fc557382219b90dae0747da68a SHA512 26fe99eb16ef290a685b27820291f1e84fe81284b4898861b0becbd31b14dbb8b7f7488a640baad81717408c4fd62aa9c894241fd257af63333f7393d1e155a8 WHIRLPOOL c264553db90ce28c2503c13fc3b2b4869d116cdba9b2f51c55fdca5500a1ee25d8e99ca7abf9b41b7484318566deb9757221615460040492d67a4fafa7751d25
+EBUILD selinux-ircd-2.20170204-r3.ebuild 278 SHA256 158cb2e35f7524bc7fea21899c07db1100b199fc557382219b90dae0747da68a SHA512 26fe99eb16ef290a685b27820291f1e84fe81284b4898861b0becbd31b14dbb8b7f7488a640baad81717408c4fd62aa9c894241fd257af63333f7393d1e155a8 WHIRLPOOL c264553db90ce28c2503c13fc3b2b4869d116cdba9b2f51c55fdca5500a1ee25d8e99ca7abf9b41b7484318566deb9757221615460040492d67a4fafa7751d25
+EBUILD selinux-ircd-2.20170204-r4.ebuild 278 SHA256 158cb2e35f7524bc7fea21899c07db1100b199fc557382219b90dae0747da68a SHA512 26fe99eb16ef290a685b27820291f1e84fe81284b4898861b0becbd31b14dbb8b7f7488a640baad81717408c4fd62aa9c894241fd257af63333f7393d1e155a8 WHIRLPOOL c264553db90ce28c2503c13fc3b2b4869d116cdba9b2f51c55fdca5500a1ee25d8e99ca7abf9b41b7484318566deb9757221615460040492d67a4fafa7751d25
+EBUILD selinux-ircd-2.20170805-r2.ebuild 278 SHA256 158cb2e35f7524bc7fea21899c07db1100b199fc557382219b90dae0747da68a SHA512 26fe99eb16ef290a685b27820291f1e84fe81284b4898861b0becbd31b14dbb8b7f7488a640baad81717408c4fd62aa9c894241fd257af63333f7393d1e155a8 WHIRLPOOL c264553db90ce28c2503c13fc3b2b4869d116cdba9b2f51c55fdca5500a1ee25d8e99ca7abf9b41b7484318566deb9757221615460040492d67a4fafa7751d25
+EBUILD selinux-ircd-2.20170805-r3.ebuild 280 SHA256 952b60ffc9128572cd7ac045294c712bb445f444f2ec000effb6d2d51fb4ba9e SHA512 30da19de0f102312ac1549d5b6ca438e2309c1dd6b33c4a5a3d7a7c44eb2d691a9597ec87f5faf2653f9492ec207f390579e348ab20e93b45f45b21d66503175 WHIRLPOOL cd8250296e259ce84bd45ef067f3fc6bcce37fb3cd780303ed51da32e909d2241182a38e698289181dda57800627bead4c3bf67b7ca8bb77a4b91f5154a9775e
+EBUILD selinux-ircd-9999.ebuild 280 SHA256 952b60ffc9128572cd7ac045294c712bb445f444f2ec000effb6d2d51fb4ba9e SHA512 30da19de0f102312ac1549d5b6ca438e2309c1dd6b33c4a5a3d7a7c44eb2d691a9597ec87f5faf2653f9492ec207f390579e348ab20e93b45f45b21d66503175 WHIRLPOOL cd8250296e259ce84bd45ef067f3fc6bcce37fb3cd780303ed51da32e909d2241182a38e698289181dda57800627bead4c3bf67b7ca8bb77a4b91f5154a9775e
 MISC ChangeLog 10387 SHA256 e64c7fd3830cdd8dc4ed689aead99cc2184f8cd9600db8837227b0a86bbf7889 SHA512 b21cf20c84f8472f00068b831baa06081a3dac7b18bb8645158c9b8df759c9a5997d04ff83c89a12923c49e757a53c9b95acf2fd22e3e382fd00696bf7607476 WHIRLPOOL 6a3bd3cf7b9774895ede46e42ade9220b4e40b98375a0def6ae5e2040b3a3088ef267b8feabc11b856f3cce1152057be792b35868edb58120674c9b582941fe1
 MISC ChangeLog-2015 9636 SHA256 9c2b53d653d516d7d191a1df430e32eac1bef97bd6b3d8412d2fa4823674c294 SHA512 09032802c12fcea31bfe3f9356f74cbd0f2e7e92410b87117bc2d954efa86cf80aee2e442947a975d412d5b8597f1bb84186df5ccc5f2bb0253f51727ae90359 WHIRLPOOL e4d108e50d3b39a7de03d4cd5256c8b7cd1772ba3466cc2aad9b1ef2025aa82987c0086b2154628bd0323fb5a86f3a81b792b8522cfc4fa6696653771a2ed184
 MISC metadata.xml 314 SHA256 c9706fe8834b6dc966e9f5d0f47f94c575fd1f4681983178da803eb76f5b2a00 SHA512 8832769974dbfe7244583d60b35e9fab3a73eac269a237895979ea704098a00d92089ad4efe9c1a110b71fd2da271518b5f80212815f9b2097f7c6438f607ce6 WHIRLPOOL e659a26a333d3de7c1df5de144cad88f6f9295de1cf2da7428406517d19089baf4055f97acaa2e031f4c6819716317e187fa387e0763587d718193b10005b3ae
diff --git a/sec-policy/selinux-ircd/selinux-ircd-2.20170204-r1.ebuild b/sec-policy/selinux-ircd/selinux-ircd-2.20170204-r1.ebuild
index 380d1d2c22a2..cdffe7a88d49 100644
--- a/sec-policy/selinux-ircd/selinux-ircd-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-ircd/selinux-ircd-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ircd/selinux-ircd-2.20170204-r2.ebuild b/sec-policy/selinux-ircd/selinux-ircd-2.20170204-r2.ebuild
index 2f9a771f584c..224993627a11 100644
--- a/sec-policy/selinux-ircd/selinux-ircd-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-ircd/selinux-ircd-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ircd/selinux-ircd-2.20170204-r3.ebuild b/sec-policy/selinux-ircd/selinux-ircd-2.20170204-r3.ebuild
index 2f9a771f584c..224993627a11 100644
--- a/sec-policy/selinux-ircd/selinux-ircd-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-ircd/selinux-ircd-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ircd/selinux-ircd-2.20170204-r4.ebuild b/sec-policy/selinux-ircd/selinux-ircd-2.20170204-r4.ebuild
index 2f9a771f584c..224993627a11 100644
--- a/sec-policy/selinux-ircd/selinux-ircd-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-ircd/selinux-ircd-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ircd/selinux-ircd-2.20170805-r2.ebuild b/sec-policy/selinux-ircd/selinux-ircd-2.20170805-r2.ebuild
index 2f9a771f584c..224993627a11 100644
--- a/sec-policy/selinux-ircd/selinux-ircd-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-ircd/selinux-ircd-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ircd/selinux-ircd-2.20170805-r3.ebuild b/sec-policy/selinux-ircd/selinux-ircd-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..cdffe7a88d49
--- /dev/null
+++ b/sec-policy/selinux-ircd/selinux-ircd-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-ircd/selinux-ircd-9999.ebuild b/sec-policy/selinux-ircd/selinux-ircd-9999.ebuild
index 380d1d2c22a2..cdffe7a88d49 100644
--- a/sec-policy/selinux-ircd/selinux-ircd-9999.ebuild
+++ b/sec-policy/selinux-ircd/selinux-ircd-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-irqbalance/Manifest b/sec-policy/selinux-irqbalance/Manifest
index 616a54b6ae80..ac9e5fa41504 100644
--- a/sec-policy/selinux-irqbalance/Manifest
+++ b/sec-policy/selinux-irqbalance/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-irqbalance-2.20170204-r1.ebuild 291 SHA256 b37c13254d0d0ca3e23785fafad8d47af241ffa76e457736c1807359bf56f49f SHA512 169407be38ca0d146888f275b54d60f1f4e6916df2878d5a05a9c6fbe0d340ae578cb47e530a236dcd2d08a954ca9c7f6637af6bc2fb7101a88d19d9fbd770c3 WHIRLPOOL 73c6f733090a3db1441b4b4f168a20add5c60a015a7b5490cdb495add16021382d63884b538272b7704f81e5be139c1f07c99ed0c8024bd3f5cd9c37efb6f69a
-EBUILD selinux-irqbalance-2.20170204-r2.ebuild 289 SHA256 35e6768992695bd993f3b80aacb39ad74a2186b5432f4cbc632c20cdaabceb22 SHA512 672b1ab797027fe04774ccae094b133eb6b7602a9252f3956b588baa1bf2cc66650394f5661e4505f1f072199d9b227fc86492ad97f5bcee6279ee094c95dc6b WHIRLPOOL b11d3912995bfaafbe1a72be340cd73896ca4741a6d039b652678a6ee82b72b8b1ff47ba43a0f2b1a2465a6908879ac07767e2cfde85729f712f36543a2237c1
-EBUILD selinux-irqbalance-2.20170204-r3.ebuild 289 SHA256 35e6768992695bd993f3b80aacb39ad74a2186b5432f4cbc632c20cdaabceb22 SHA512 672b1ab797027fe04774ccae094b133eb6b7602a9252f3956b588baa1bf2cc66650394f5661e4505f1f072199d9b227fc86492ad97f5bcee6279ee094c95dc6b WHIRLPOOL b11d3912995bfaafbe1a72be340cd73896ca4741a6d039b652678a6ee82b72b8b1ff47ba43a0f2b1a2465a6908879ac07767e2cfde85729f712f36543a2237c1
-EBUILD selinux-irqbalance-2.20170204-r4.ebuild 289 SHA256 35e6768992695bd993f3b80aacb39ad74a2186b5432f4cbc632c20cdaabceb22 SHA512 672b1ab797027fe04774ccae094b133eb6b7602a9252f3956b588baa1bf2cc66650394f5661e4505f1f072199d9b227fc86492ad97f5bcee6279ee094c95dc6b WHIRLPOOL b11d3912995bfaafbe1a72be340cd73896ca4741a6d039b652678a6ee82b72b8b1ff47ba43a0f2b1a2465a6908879ac07767e2cfde85729f712f36543a2237c1
-EBUILD selinux-irqbalance-2.20170805-r2.ebuild 289 SHA256 35e6768992695bd993f3b80aacb39ad74a2186b5432f4cbc632c20cdaabceb22 SHA512 672b1ab797027fe04774ccae094b133eb6b7602a9252f3956b588baa1bf2cc66650394f5661e4505f1f072199d9b227fc86492ad97f5bcee6279ee094c95dc6b WHIRLPOOL b11d3912995bfaafbe1a72be340cd73896ca4741a6d039b652678a6ee82b72b8b1ff47ba43a0f2b1a2465a6908879ac07767e2cfde85729f712f36543a2237c1
-EBUILD selinux-irqbalance-9999.ebuild 291 SHA256 b37c13254d0d0ca3e23785fafad8d47af241ffa76e457736c1807359bf56f49f SHA512 169407be38ca0d146888f275b54d60f1f4e6916df2878d5a05a9c6fbe0d340ae578cb47e530a236dcd2d08a954ca9c7f6637af6bc2fb7101a88d19d9fbd770c3 WHIRLPOOL 73c6f733090a3db1441b4b4f168a20add5c60a015a7b5490cdb495add16021382d63884b538272b7704f81e5be139c1f07c99ed0c8024bd3f5cd9c37efb6f69a
+EBUILD selinux-irqbalance-2.20170204-r1.ebuild 292 SHA256 5ef2de2f0b85a37e214c66b948b6d217cc52c5a9006c6e133cdde720b1a6e4ee SHA512 1d40a7d0948058341b2f2e6b018a146f89c5ed7e120b8aa9f72d8beac1a5c985948ee2d712b2577b4b799da65a2e784a2c9d10de3ebb11c9a9802d77ca8845b2 WHIRLPOOL 9299728936911cffd815aa5f7335b04303ef1c57dff59a0b13e7afca3ac6b3203134c3c8da81ac57979223bf3ad977e2b5c150fb0ce6f2ae31433a836a05d6d9
+EBUILD selinux-irqbalance-2.20170204-r2.ebuild 290 SHA256 044862a966e48f8a7e2256b619d2b3f5a82fbc3e59c7d5e134de3d1c5da91b60 SHA512 4b10d7e9c6c485661436dd6b00c23349f820bbfd0887e1b79951b3e5d97f71889942387b4dc7579a9ca88181a64d45ecf25a0bd99dbd2d9016a88f0b8df16113 WHIRLPOOL d311f091d2c4b9a4c411778fc4999d5b9c1a94b3d21fa7e22f2c3f1f2accfc8761680f38d62bac117b5cf4d0497d5ee85e4fcd5e8f7585cebcf86bf5b8c9e253
+EBUILD selinux-irqbalance-2.20170204-r3.ebuild 290 SHA256 044862a966e48f8a7e2256b619d2b3f5a82fbc3e59c7d5e134de3d1c5da91b60 SHA512 4b10d7e9c6c485661436dd6b00c23349f820bbfd0887e1b79951b3e5d97f71889942387b4dc7579a9ca88181a64d45ecf25a0bd99dbd2d9016a88f0b8df16113 WHIRLPOOL d311f091d2c4b9a4c411778fc4999d5b9c1a94b3d21fa7e22f2c3f1f2accfc8761680f38d62bac117b5cf4d0497d5ee85e4fcd5e8f7585cebcf86bf5b8c9e253
+EBUILD selinux-irqbalance-2.20170204-r4.ebuild 290 SHA256 044862a966e48f8a7e2256b619d2b3f5a82fbc3e59c7d5e134de3d1c5da91b60 SHA512 4b10d7e9c6c485661436dd6b00c23349f820bbfd0887e1b79951b3e5d97f71889942387b4dc7579a9ca88181a64d45ecf25a0bd99dbd2d9016a88f0b8df16113 WHIRLPOOL d311f091d2c4b9a4c411778fc4999d5b9c1a94b3d21fa7e22f2c3f1f2accfc8761680f38d62bac117b5cf4d0497d5ee85e4fcd5e8f7585cebcf86bf5b8c9e253
+EBUILD selinux-irqbalance-2.20170805-r2.ebuild 290 SHA256 044862a966e48f8a7e2256b619d2b3f5a82fbc3e59c7d5e134de3d1c5da91b60 SHA512 4b10d7e9c6c485661436dd6b00c23349f820bbfd0887e1b79951b3e5d97f71889942387b4dc7579a9ca88181a64d45ecf25a0bd99dbd2d9016a88f0b8df16113 WHIRLPOOL d311f091d2c4b9a4c411778fc4999d5b9c1a94b3d21fa7e22f2c3f1f2accfc8761680f38d62bac117b5cf4d0497d5ee85e4fcd5e8f7585cebcf86bf5b8c9e253
+EBUILD selinux-irqbalance-2.20170805-r3.ebuild 292 SHA256 5ef2de2f0b85a37e214c66b948b6d217cc52c5a9006c6e133cdde720b1a6e4ee SHA512 1d40a7d0948058341b2f2e6b018a146f89c5ed7e120b8aa9f72d8beac1a5c985948ee2d712b2577b4b799da65a2e784a2c9d10de3ebb11c9a9802d77ca8845b2 WHIRLPOOL 9299728936911cffd815aa5f7335b04303ef1c57dff59a0b13e7afca3ac6b3203134c3c8da81ac57979223bf3ad977e2b5c150fb0ce6f2ae31433a836a05d6d9
+EBUILD selinux-irqbalance-9999.ebuild 292 SHA256 5ef2de2f0b85a37e214c66b948b6d217cc52c5a9006c6e133cdde720b1a6e4ee SHA512 1d40a7d0948058341b2f2e6b018a146f89c5ed7e120b8aa9f72d8beac1a5c985948ee2d712b2577b4b799da65a2e784a2c9d10de3ebb11c9a9802d77ca8845b2 WHIRLPOOL 9299728936911cffd815aa5f7335b04303ef1c57dff59a0b13e7afca3ac6b3203134c3c8da81ac57979223bf3ad977e2b5c150fb0ce6f2ae31433a836a05d6d9
 MISC ChangeLog 10979 SHA256 88d0954bcdf21d9b0f0a7673258e44dc6e4f31ed57283b15c48c0a17bb2b302c SHA512 f5a56f229a7b928c26637720318ad9eacd4064b3d69b2bc68cc4ebdcd08df12247626883c1080fc4edc19fcd0150c5dcfc01abca4f5b4c47031f743f14f4109c WHIRLPOOL 68eb5a9938fe6700a1ab0825ce169029e0249f4c8530b0980eb0e94525a9b368b46589348a3ad4968a14a9c180f03bbf173609fb775bf24f426b48f806ff11f6
 MISC ChangeLog-2015 10335 SHA256 ff0a896152c4c9887805539e714e56f5fde0c60deb8a02498e421750a7864f19 SHA512 ebb57a5d145e369ca8b20c3227a87fd33fb5c60e9ba63c3c83945aef1b9a492ee8cb161e45c8645feca68a0c1986fd262076a65f7466dc76a7d55ed3f8896c47 WHIRLPOOL 2ef3afcbc151d59a314ffa9a04b3cda1a5b36320dbd50eeb2027c54d32bd580a91f23574866c85a0b3a5cc37b17e5d2bba774992d88ea2c5f5525c21fd2a8e32
 MISC metadata.xml 320 SHA256 763c4a82779a66b3710a8e016d927d05631780cf964ca9346442907174425a7d SHA512 e2e7fb33bdd96b5dfa7f0278225c5696da53693800ed86b6ea7e9a7f5685ce6dda87bb3775752068a20f9232fe1638d6b553859f8fa1707b0f36dcc493ef1bc9 WHIRLPOOL 7f5e9faf3ce73952d4671c5cf2021605cd02d515c4596ece53d9769b28265d397d7f2b1473938fd7f24cc4017fae8887bfe70ff129c5c28c16a7c82ff5b28ced
diff --git a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20170204-r1.ebuild b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20170204-r1.ebuild
index abcb101ff269..1f967d7f50c5 100644
--- a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20170204-r2.ebuild b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20170204-r2.ebuild
index 9e31b397d7de..d882023aed99 100644
--- a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20170204-r3.ebuild b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20170204-r3.ebuild
index 9e31b397d7de..d882023aed99 100644
--- a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20170204-r4.ebuild b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20170204-r4.ebuild
index 9e31b397d7de..d882023aed99 100644
--- a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20170805-r2.ebuild b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20170805-r2.ebuild
index 9e31b397d7de..d882023aed99 100644
--- a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20170805-r3.ebuild b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..1f967d7f50c5
--- /dev/null
+++ b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-irqbalance/selinux-irqbalance-9999.ebuild b/sec-policy/selinux-irqbalance/selinux-irqbalance-9999.ebuild
index abcb101ff269..1f967d7f50c5 100644
--- a/sec-policy/selinux-irqbalance/selinux-irqbalance-9999.ebuild
+++ b/sec-policy/selinux-irqbalance/selinux-irqbalance-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-jabber/Manifest b/sec-policy/selinux-jabber/Manifest
index cda8691d6887..1fff70431e87 100644
--- a/sec-policy/selinux-jabber/Manifest
+++ b/sec-policy/selinux-jabber/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-jabber-2.20170204-r1.ebuild 283 SHA256 59feb701c3daa2cc36687eb390afce6a5ad38d858b09611f671b1d8070c9b50b SHA512 e50638cf9bbeb319e246e2c96e47f14c936bd2acc2b7d78dd9499dfb72bffe245cb54aee842e3887a4851e84e74cbfe3a023bdc488ec8afcf3b6a62ecb130f59 WHIRLPOOL e813c8b3a13612a2f13044fcaee758760f47e724ee357b1f4c3cb809f08cadfb1fbf9c0824b9763ceb70f7c0438ddc85250f5d385809dd53ee08a7546842174b
-EBUILD selinux-jabber-2.20170204-r2.ebuild 281 SHA256 f0d647c87b62737101dcd2f96c8474e64da138de6707c67d4694daadae40fd8a SHA512 6cff12f0253911285f9c629c9e7f8a8e148772708fb1a987e4e6aafef7309c35fc3e86333014a9116735b1f776df9af8140fe025704737221ea56839734fbb01 WHIRLPOOL 6ea62d39a40fbb3e27f2966419c6866a8816178c36703a1fd69688fbf29add27eddc3a15f680e692a4f66c02b22521fedd4ce5b723d210145607d216a3e02c97
-EBUILD selinux-jabber-2.20170204-r3.ebuild 281 SHA256 f0d647c87b62737101dcd2f96c8474e64da138de6707c67d4694daadae40fd8a SHA512 6cff12f0253911285f9c629c9e7f8a8e148772708fb1a987e4e6aafef7309c35fc3e86333014a9116735b1f776df9af8140fe025704737221ea56839734fbb01 WHIRLPOOL 6ea62d39a40fbb3e27f2966419c6866a8816178c36703a1fd69688fbf29add27eddc3a15f680e692a4f66c02b22521fedd4ce5b723d210145607d216a3e02c97
-EBUILD selinux-jabber-2.20170204-r4.ebuild 281 SHA256 f0d647c87b62737101dcd2f96c8474e64da138de6707c67d4694daadae40fd8a SHA512 6cff12f0253911285f9c629c9e7f8a8e148772708fb1a987e4e6aafef7309c35fc3e86333014a9116735b1f776df9af8140fe025704737221ea56839734fbb01 WHIRLPOOL 6ea62d39a40fbb3e27f2966419c6866a8816178c36703a1fd69688fbf29add27eddc3a15f680e692a4f66c02b22521fedd4ce5b723d210145607d216a3e02c97
-EBUILD selinux-jabber-2.20170805-r2.ebuild 281 SHA256 f0d647c87b62737101dcd2f96c8474e64da138de6707c67d4694daadae40fd8a SHA512 6cff12f0253911285f9c629c9e7f8a8e148772708fb1a987e4e6aafef7309c35fc3e86333014a9116735b1f776df9af8140fe025704737221ea56839734fbb01 WHIRLPOOL 6ea62d39a40fbb3e27f2966419c6866a8816178c36703a1fd69688fbf29add27eddc3a15f680e692a4f66c02b22521fedd4ce5b723d210145607d216a3e02c97
-EBUILD selinux-jabber-9999.ebuild 283 SHA256 59feb701c3daa2cc36687eb390afce6a5ad38d858b09611f671b1d8070c9b50b SHA512 e50638cf9bbeb319e246e2c96e47f14c936bd2acc2b7d78dd9499dfb72bffe245cb54aee842e3887a4851e84e74cbfe3a023bdc488ec8afcf3b6a62ecb130f59 WHIRLPOOL e813c8b3a13612a2f13044fcaee758760f47e724ee357b1f4c3cb809f08cadfb1fbf9c0824b9763ceb70f7c0438ddc85250f5d385809dd53ee08a7546842174b
+EBUILD selinux-jabber-2.20170204-r1.ebuild 284 SHA256 68f99d911da5ea22939b366d0ad6c9685ab7ecd60c5332b29ddcfdede374a65f SHA512 1242f51907cd796deda6889897296a2c7cc07e09f604513d600307e84589ed38930942f3816b03b2598dd9483df0fd1acd9643f1699d02a4daecd6e9a7fd7e08 WHIRLPOOL 6507ce587efb33b9d5ae9557e7b82e38576903985598f05300d2f3ac970872c38fbf51e7043d5f853507ca216168d8ce319e7822f94124b0e4613473390d2d1a
+EBUILD selinux-jabber-2.20170204-r2.ebuild 282 SHA256 1a8373151044668e8f315c8ee6b5bb0af8ef9f588694803dc895a9ea7ff67a81 SHA512 aff08ea6d5748f085737191dc2057f2794c52c87514dfb2714ca0aa38074c7485e4a0f874e4175de55d1549d90cb3b3952f42c574221c3d6d9878b4b99826c6a WHIRLPOOL 323b56c5976b45da331f5fddce7218f72b6776f9963cd692a9be5b47c03c69e28c99d00cd8b1f614eae105a3fe6547daffd102e2420e1ec48cbdeb9015c0d7cc
+EBUILD selinux-jabber-2.20170204-r3.ebuild 282 SHA256 1a8373151044668e8f315c8ee6b5bb0af8ef9f588694803dc895a9ea7ff67a81 SHA512 aff08ea6d5748f085737191dc2057f2794c52c87514dfb2714ca0aa38074c7485e4a0f874e4175de55d1549d90cb3b3952f42c574221c3d6d9878b4b99826c6a WHIRLPOOL 323b56c5976b45da331f5fddce7218f72b6776f9963cd692a9be5b47c03c69e28c99d00cd8b1f614eae105a3fe6547daffd102e2420e1ec48cbdeb9015c0d7cc
+EBUILD selinux-jabber-2.20170204-r4.ebuild 282 SHA256 1a8373151044668e8f315c8ee6b5bb0af8ef9f588694803dc895a9ea7ff67a81 SHA512 aff08ea6d5748f085737191dc2057f2794c52c87514dfb2714ca0aa38074c7485e4a0f874e4175de55d1549d90cb3b3952f42c574221c3d6d9878b4b99826c6a WHIRLPOOL 323b56c5976b45da331f5fddce7218f72b6776f9963cd692a9be5b47c03c69e28c99d00cd8b1f614eae105a3fe6547daffd102e2420e1ec48cbdeb9015c0d7cc
+EBUILD selinux-jabber-2.20170805-r2.ebuild 282 SHA256 1a8373151044668e8f315c8ee6b5bb0af8ef9f588694803dc895a9ea7ff67a81 SHA512 aff08ea6d5748f085737191dc2057f2794c52c87514dfb2714ca0aa38074c7485e4a0f874e4175de55d1549d90cb3b3952f42c574221c3d6d9878b4b99826c6a WHIRLPOOL 323b56c5976b45da331f5fddce7218f72b6776f9963cd692a9be5b47c03c69e28c99d00cd8b1f614eae105a3fe6547daffd102e2420e1ec48cbdeb9015c0d7cc
+EBUILD selinux-jabber-2.20170805-r3.ebuild 284 SHA256 68f99d911da5ea22939b366d0ad6c9685ab7ecd60c5332b29ddcfdede374a65f SHA512 1242f51907cd796deda6889897296a2c7cc07e09f604513d600307e84589ed38930942f3816b03b2598dd9483df0fd1acd9643f1699d02a4daecd6e9a7fd7e08 WHIRLPOOL 6507ce587efb33b9d5ae9557e7b82e38576903985598f05300d2f3ac970872c38fbf51e7043d5f853507ca216168d8ce319e7822f94124b0e4613473390d2d1a
+EBUILD selinux-jabber-9999.ebuild 284 SHA256 68f99d911da5ea22939b366d0ad6c9685ab7ecd60c5332b29ddcfdede374a65f SHA512 1242f51907cd796deda6889897296a2c7cc07e09f604513d600307e84589ed38930942f3816b03b2598dd9483df0fd1acd9643f1699d02a4daecd6e9a7fd7e08 WHIRLPOOL 6507ce587efb33b9d5ae9557e7b82e38576903985598f05300d2f3ac970872c38fbf51e7043d5f853507ca216168d8ce319e7822f94124b0e4613473390d2d1a
 MISC ChangeLog 10571 SHA256 877456f96e208efa00e4a56e7c4d5e4541c25eb0341026b1f014aa677ff2f45f SHA512 aac3ffa91be74ef36bdea04729038c4d51e7b31e1ba97a1c9a1e2197dbd258c3c505389f4f10845dd9e04f050b94d0d9b6b78cc6580580392bdb2f1fe3540fb1 WHIRLPOOL 01a11c1e89e1898395c46dca4c4caa40e4b2106fa697b3fa912cb0182b36dbc918c7d4b26152f399e591304cc3912a2cfa85c7f17bbc2cbbbbf8e05d95426488
 MISC ChangeLog-2015 9718 SHA256 66f883aaca59c00bbd8e74f01e0cace8843207f321f3ffea33bcdde938f5bf45 SHA512 c9f407216fca2439cd7d1504fb3cd138c02469c6cb42eafcf8ecf13518e0be96355cacaca8445e2b10807ca8b3e29b729c69fedcff5f2b78d4779c1052eed476 WHIRLPOOL dc6491808fed33e05c71ec9bafd707f34eda3493fd67249a37ab20966f4cda6ff6b975ca357600422934336f75fc6f437de771046de3499e735ece00533f6e2f
 MISC metadata.xml 316 SHA256 c4577a6559d81d1b23c6a83fc4abb64c028afbfc3efb7a8029316ae59113ad13 SHA512 269cb023c313456e0ff91148007509ef5cdaea6c33ceb42ba3bf57674fc4c709d719824a3e95f3171773c4979d03be50873ac62fdb2f8bea86e5904703dd76bc WHIRLPOOL a188c71b68d973ef11bf12f56cd3ed92f6345d3bceac3b1c6c047dbfcf017e7bf9641a9844b86b77ff3888dcbb8bce9cae2c951942e8825b3bf60a08872eacdf
diff --git a/sec-policy/selinux-jabber/selinux-jabber-2.20170204-r1.ebuild b/sec-policy/selinux-jabber/selinux-jabber-2.20170204-r1.ebuild
index a3875cba3331..442bb867c229 100644
--- a/sec-policy/selinux-jabber/selinux-jabber-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-jabber/selinux-jabber-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-jabber/selinux-jabber-2.20170204-r2.ebuild b/sec-policy/selinux-jabber/selinux-jabber-2.20170204-r2.ebuild
index 0402906739a0..7839c32713ca 100644
--- a/sec-policy/selinux-jabber/selinux-jabber-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-jabber/selinux-jabber-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-jabber/selinux-jabber-2.20170204-r3.ebuild b/sec-policy/selinux-jabber/selinux-jabber-2.20170204-r3.ebuild
index 0402906739a0..7839c32713ca 100644
--- a/sec-policy/selinux-jabber/selinux-jabber-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-jabber/selinux-jabber-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-jabber/selinux-jabber-2.20170204-r4.ebuild b/sec-policy/selinux-jabber/selinux-jabber-2.20170204-r4.ebuild
index 0402906739a0..7839c32713ca 100644
--- a/sec-policy/selinux-jabber/selinux-jabber-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-jabber/selinux-jabber-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-jabber/selinux-jabber-2.20170805-r2.ebuild b/sec-policy/selinux-jabber/selinux-jabber-2.20170805-r2.ebuild
index 0402906739a0..7839c32713ca 100644
--- a/sec-policy/selinux-jabber/selinux-jabber-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-jabber/selinux-jabber-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-jabber/selinux-jabber-2.20170805-r3.ebuild b/sec-policy/selinux-jabber/selinux-jabber-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..442bb867c229
--- /dev/null
+++ b/sec-policy/selinux-jabber/selinux-jabber-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-jabber/selinux-jabber-9999.ebuild b/sec-policy/selinux-jabber/selinux-jabber-9999.ebuild
index a3875cba3331..442bb867c229 100644
--- a/sec-policy/selinux-jabber/selinux-jabber-9999.ebuild
+++ b/sec-policy/selinux-jabber/selinux-jabber-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-java/Manifest b/sec-policy/selinux-java/Manifest
index d300f48a04ad..d9bd80f5f045 100644
--- a/sec-policy/selinux-java/Manifest
+++ b/sec-policy/selinux-java/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-java-2.20170204-r1.ebuild 283 SHA256 4adec0af907035672eaa7031d47e86c37cd88c45dcf7779698492b3eccf74f05 SHA512 3a5c82774e53173bbb20f3fcfe758534ea1f6a99f227741aade255f1dcb94bf48b5945bbff9f8a82a04257a1e05a6401d1f76da39186301cc4fdb3778c61eb3e WHIRLPOOL 5239d17d42f173357e78396bf8532251f596a71b08198a56bf4524acf47e9c817e0fd2bbc632b68bb2fcd7efb320478cd5ab68a2eca61ec063c4ada35b993684
-EBUILD selinux-java-2.20170204-r2.ebuild 281 SHA256 9ab02fcc439c90ea7182d169358bb21c6d0de07e0680a8e5c95a83620d8042c8 SHA512 f35c44dc74876a7f7f6624e451682200160808ebbe48bbf8478e3dc779b774843ebae0ba23cc38acb46b96542577e97e4b041f70dc700bf7a256a42fd1dbbf22 WHIRLPOOL 65141758cbdfdfc96cf6af183e8d58fe97290271bedc224f4307fc463c4a8e73a060d258469153e86a84cd94c548ce3dffe8a3a0cfb7ae9ae827b46a090427fa
-EBUILD selinux-java-2.20170204-r3.ebuild 281 SHA256 9ab02fcc439c90ea7182d169358bb21c6d0de07e0680a8e5c95a83620d8042c8 SHA512 f35c44dc74876a7f7f6624e451682200160808ebbe48bbf8478e3dc779b774843ebae0ba23cc38acb46b96542577e97e4b041f70dc700bf7a256a42fd1dbbf22 WHIRLPOOL 65141758cbdfdfc96cf6af183e8d58fe97290271bedc224f4307fc463c4a8e73a060d258469153e86a84cd94c548ce3dffe8a3a0cfb7ae9ae827b46a090427fa
-EBUILD selinux-java-2.20170204-r4.ebuild 281 SHA256 9ab02fcc439c90ea7182d169358bb21c6d0de07e0680a8e5c95a83620d8042c8 SHA512 f35c44dc74876a7f7f6624e451682200160808ebbe48bbf8478e3dc779b774843ebae0ba23cc38acb46b96542577e97e4b041f70dc700bf7a256a42fd1dbbf22 WHIRLPOOL 65141758cbdfdfc96cf6af183e8d58fe97290271bedc224f4307fc463c4a8e73a060d258469153e86a84cd94c548ce3dffe8a3a0cfb7ae9ae827b46a090427fa
-EBUILD selinux-java-2.20170805-r2.ebuild 281 SHA256 9ab02fcc439c90ea7182d169358bb21c6d0de07e0680a8e5c95a83620d8042c8 SHA512 f35c44dc74876a7f7f6624e451682200160808ebbe48bbf8478e3dc779b774843ebae0ba23cc38acb46b96542577e97e4b041f70dc700bf7a256a42fd1dbbf22 WHIRLPOOL 65141758cbdfdfc96cf6af183e8d58fe97290271bedc224f4307fc463c4a8e73a060d258469153e86a84cd94c548ce3dffe8a3a0cfb7ae9ae827b46a090427fa
-EBUILD selinux-java-9999.ebuild 283 SHA256 4adec0af907035672eaa7031d47e86c37cd88c45dcf7779698492b3eccf74f05 SHA512 3a5c82774e53173bbb20f3fcfe758534ea1f6a99f227741aade255f1dcb94bf48b5945bbff9f8a82a04257a1e05a6401d1f76da39186301cc4fdb3778c61eb3e WHIRLPOOL 5239d17d42f173357e78396bf8532251f596a71b08198a56bf4524acf47e9c817e0fd2bbc632b68bb2fcd7efb320478cd5ab68a2eca61ec063c4ada35b993684
+EBUILD selinux-java-2.20170204-r1.ebuild 284 SHA256 de7e047eab1332e3fd73108251762c3ce8a6fc495e91cac71e65d06b753406f3 SHA512 3bb68c2e6129cc3f7cd97c5da2fbe14c24de7ecdac2656683a244c1f5b9159707df4a91740d05ccca6346b2382dea4ad25f013bd34e2d7edea7bdf23cb459593 WHIRLPOOL 69892eabe3ce072c646c6687ab64b0c4663e52b2922a3e92734f53d2c0777dccf4b003e9b9a63e45d0336283cceeef5fb9ea570db9272653bc289946ec7e6586
+EBUILD selinux-java-2.20170204-r2.ebuild 282 SHA256 a6e18be9d52ea17136e784e05f111a9c112f4fe7446ef6209c7d53dfd2f208ae SHA512 b5b83dfb8e254e4ab214400d0f31f7e3a337649d8da5b4321f27ae4ac6e79e7767333747f65deec014ee33a9ae62dac817a61577fbce30eea3c74e126ae595b4 WHIRLPOOL 3b8989ea2eda09265fc92f3fa1e553fe264c70f6c21e26ce29102647dabb42174c3f668a0c6efc83b06a200b9bd1cec20c9546040fdecd0a971013f1b3b0bbbc
+EBUILD selinux-java-2.20170204-r3.ebuild 282 SHA256 a6e18be9d52ea17136e784e05f111a9c112f4fe7446ef6209c7d53dfd2f208ae SHA512 b5b83dfb8e254e4ab214400d0f31f7e3a337649d8da5b4321f27ae4ac6e79e7767333747f65deec014ee33a9ae62dac817a61577fbce30eea3c74e126ae595b4 WHIRLPOOL 3b8989ea2eda09265fc92f3fa1e553fe264c70f6c21e26ce29102647dabb42174c3f668a0c6efc83b06a200b9bd1cec20c9546040fdecd0a971013f1b3b0bbbc
+EBUILD selinux-java-2.20170204-r4.ebuild 282 SHA256 a6e18be9d52ea17136e784e05f111a9c112f4fe7446ef6209c7d53dfd2f208ae SHA512 b5b83dfb8e254e4ab214400d0f31f7e3a337649d8da5b4321f27ae4ac6e79e7767333747f65deec014ee33a9ae62dac817a61577fbce30eea3c74e126ae595b4 WHIRLPOOL 3b8989ea2eda09265fc92f3fa1e553fe264c70f6c21e26ce29102647dabb42174c3f668a0c6efc83b06a200b9bd1cec20c9546040fdecd0a971013f1b3b0bbbc
+EBUILD selinux-java-2.20170805-r2.ebuild 282 SHA256 a6e18be9d52ea17136e784e05f111a9c112f4fe7446ef6209c7d53dfd2f208ae SHA512 b5b83dfb8e254e4ab214400d0f31f7e3a337649d8da5b4321f27ae4ac6e79e7767333747f65deec014ee33a9ae62dac817a61577fbce30eea3c74e126ae595b4 WHIRLPOOL 3b8989ea2eda09265fc92f3fa1e553fe264c70f6c21e26ce29102647dabb42174c3f668a0c6efc83b06a200b9bd1cec20c9546040fdecd0a971013f1b3b0bbbc
+EBUILD selinux-java-2.20170805-r3.ebuild 284 SHA256 de7e047eab1332e3fd73108251762c3ce8a6fc495e91cac71e65d06b753406f3 SHA512 3bb68c2e6129cc3f7cd97c5da2fbe14c24de7ecdac2656683a244c1f5b9159707df4a91740d05ccca6346b2382dea4ad25f013bd34e2d7edea7bdf23cb459593 WHIRLPOOL 69892eabe3ce072c646c6687ab64b0c4663e52b2922a3e92734f53d2c0777dccf4b003e9b9a63e45d0336283cceeef5fb9ea570db9272653bc289946ec7e6586
+EBUILD selinux-java-9999.ebuild 284 SHA256 de7e047eab1332e3fd73108251762c3ce8a6fc495e91cac71e65d06b753406f3 SHA512 3bb68c2e6129cc3f7cd97c5da2fbe14c24de7ecdac2656683a244c1f5b9159707df4a91740d05ccca6346b2382dea4ad25f013bd34e2d7edea7bdf23cb459593 WHIRLPOOL 69892eabe3ce072c646c6687ab64b0c4663e52b2922a3e92734f53d2c0777dccf4b003e9b9a63e45d0336283cceeef5fb9ea570db9272653bc289946ec7e6586
 MISC ChangeLog 10387 SHA256 fd042dff7256ae0d90bf2e8cdf630c0cb0cee6a6eb43580b512fb5f9ab6dbc6a SHA512 058087555731ed5a520de839db9608998e05ec5bfd331ee027f9fed207517574f46850aeb4b7b15ac86af19222ad4c5671b7beb2187f23f491e1655d92bef12d WHIRLPOOL e71dc851f113e0f8dc4d70465aea11b6f82422ac5831ae9c6b8afbcc6ba54991e0afd29362484cb4a1b0eb4729bd87d75514d4433ae0611241670bfe738d1caf
 MISC ChangeLog-2015 10042 SHA256 fe29347e9d14887db89aec76776facda6b7dbf66332132d86669d0ff24bb4c39 SHA512 81b86425ddd3c1bd20502fbc672b843c0f35472b46b93a4ef7df81d71fc7a112fa95ce165b1df8e775ec07defe7f1e4c758cc1c3512618d24034d6c9801bfb29 WHIRLPOOL 9123895a26dd194c2cee82baf6e89d32aabd80c3f3e96305fea265d3129283745ab11c732de6c1e5ab90c5caecd5f9ae98dc81c55bd48ef3f29869d3a429efa1
 MISC metadata.xml 314 SHA256 c38c70b4ca6fe37aee6720a3bdae6bd025028b42aa6edfbad90ff23f39406050 SHA512 6abe4c867275288d443678ad009b88232db9ae9a9565a0bf4bf5a07dd424d28ee1be71351e74f3aef0c7c4e236125089f10ca13f2799004c6eca3a7081326b57 WHIRLPOOL 04c01a39a105a2accd0adf048a6ddb138d18dbc5be77c00420d51a63d5bc971f03da78c95c34fd55a40e23304a251b96a1ad8a6f6ca1479cf5ac8f3a086fd6d9
diff --git a/sec-policy/selinux-java/selinux-java-2.20170204-r1.ebuild b/sec-policy/selinux-java/selinux-java-2.20170204-r1.ebuild
index 27b5f5bd8f4c..05561d39f0d7 100644
--- a/sec-policy/selinux-java/selinux-java-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-java/selinux-java-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE="alsa"
diff --git a/sec-policy/selinux-java/selinux-java-2.20170204-r2.ebuild b/sec-policy/selinux-java/selinux-java-2.20170204-r2.ebuild
index 86533fd87801..382b26fa4cac 100644
--- a/sec-policy/selinux-java/selinux-java-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-java/selinux-java-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE="alsa"
diff --git a/sec-policy/selinux-java/selinux-java-2.20170204-r3.ebuild b/sec-policy/selinux-java/selinux-java-2.20170204-r3.ebuild
index 86533fd87801..382b26fa4cac 100644
--- a/sec-policy/selinux-java/selinux-java-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-java/selinux-java-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE="alsa"
diff --git a/sec-policy/selinux-java/selinux-java-2.20170204-r4.ebuild b/sec-policy/selinux-java/selinux-java-2.20170204-r4.ebuild
index 86533fd87801..382b26fa4cac 100644
--- a/sec-policy/selinux-java/selinux-java-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-java/selinux-java-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE="alsa"
diff --git a/sec-policy/selinux-java/selinux-java-2.20170805-r2.ebuild b/sec-policy/selinux-java/selinux-java-2.20170805-r2.ebuild
index 86533fd87801..382b26fa4cac 100644
--- a/sec-policy/selinux-java/selinux-java-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-java/selinux-java-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE="alsa"
diff --git a/sec-policy/selinux-java/selinux-java-2.20170805-r3.ebuild b/sec-policy/selinux-java/selinux-java-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..05561d39f0d7
--- /dev/null
+++ b/sec-policy/selinux-java/selinux-java-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-java/selinux-java-9999.ebuild b/sec-policy/selinux-java/selinux-java-9999.ebuild
index 27b5f5bd8f4c..05561d39f0d7 100644
--- a/sec-policy/selinux-java/selinux-java-9999.ebuild
+++ b/sec-policy/selinux-java/selinux-java-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE="alsa"
diff --git a/sec-policy/selinux-kdeconnect/Manifest b/sec-policy/selinux-kdeconnect/Manifest
index 00af0437c451..17050d20c691 100644
--- a/sec-policy/selinux-kdeconnect/Manifest
+++ b/sec-policy/selinux-kdeconnect/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-kdeconnect-2.20170204-r1.ebuild 291 SHA256 9c5beb74f80d2dc59ad6ba7a433549bb327a1f57bee6093b4c468d19c2c2042d SHA512 dd115d5756fb9b0cab83710f9e5d1ab0d0e4f82b537779ee56dc24addd3ee26c3d6964dd5db88c69bed7b805e6bd069b277baab561bbceb53c2f5d4379e7b794 WHIRLPOOL 9cd92d864959d7c9de74c131a92b73da8aac0175d4c8eb96f78ac4b1e9d749d46de0794fc38fad8c30bed5283832db1f98bc15976815af51c2ac0cbc998ea804
-EBUILD selinux-kdeconnect-2.20170204-r2.ebuild 289 SHA256 4fb45b077555c10c5bec60ec559742130be02c33bed932ecc72e2fa0ccb13c51 SHA512 5b1ad2ef235c5c47d3600f64c583a1f7eaeff418da24d9ba5567885bbe5453055f22862aa9873abc0e05b98c5db492d3706c5d5b8e52a8c51399f6a1572b1e84 WHIRLPOOL 87c47f4cfdc0256f55decfb4ab9b19d68bbbb924f27dcc84753e9ca46fde2538a46ae4a06d96b683657eaa1334cb912711d25ff8aecca5448608011d7824d72d
-EBUILD selinux-kdeconnect-2.20170204-r3.ebuild 289 SHA256 4fb45b077555c10c5bec60ec559742130be02c33bed932ecc72e2fa0ccb13c51 SHA512 5b1ad2ef235c5c47d3600f64c583a1f7eaeff418da24d9ba5567885bbe5453055f22862aa9873abc0e05b98c5db492d3706c5d5b8e52a8c51399f6a1572b1e84 WHIRLPOOL 87c47f4cfdc0256f55decfb4ab9b19d68bbbb924f27dcc84753e9ca46fde2538a46ae4a06d96b683657eaa1334cb912711d25ff8aecca5448608011d7824d72d
-EBUILD selinux-kdeconnect-2.20170204-r4.ebuild 289 SHA256 4fb45b077555c10c5bec60ec559742130be02c33bed932ecc72e2fa0ccb13c51 SHA512 5b1ad2ef235c5c47d3600f64c583a1f7eaeff418da24d9ba5567885bbe5453055f22862aa9873abc0e05b98c5db492d3706c5d5b8e52a8c51399f6a1572b1e84 WHIRLPOOL 87c47f4cfdc0256f55decfb4ab9b19d68bbbb924f27dcc84753e9ca46fde2538a46ae4a06d96b683657eaa1334cb912711d25ff8aecca5448608011d7824d72d
-EBUILD selinux-kdeconnect-2.20170805-r2.ebuild 289 SHA256 4fb45b077555c10c5bec60ec559742130be02c33bed932ecc72e2fa0ccb13c51 SHA512 5b1ad2ef235c5c47d3600f64c583a1f7eaeff418da24d9ba5567885bbe5453055f22862aa9873abc0e05b98c5db492d3706c5d5b8e52a8c51399f6a1572b1e84 WHIRLPOOL 87c47f4cfdc0256f55decfb4ab9b19d68bbbb924f27dcc84753e9ca46fde2538a46ae4a06d96b683657eaa1334cb912711d25ff8aecca5448608011d7824d72d
-EBUILD selinux-kdeconnect-9999.ebuild 291 SHA256 9c5beb74f80d2dc59ad6ba7a433549bb327a1f57bee6093b4c468d19c2c2042d SHA512 dd115d5756fb9b0cab83710f9e5d1ab0d0e4f82b537779ee56dc24addd3ee26c3d6964dd5db88c69bed7b805e6bd069b277baab561bbceb53c2f5d4379e7b794 WHIRLPOOL 9cd92d864959d7c9de74c131a92b73da8aac0175d4c8eb96f78ac4b1e9d749d46de0794fc38fad8c30bed5283832db1f98bc15976815af51c2ac0cbc998ea804
+EBUILD selinux-kdeconnect-2.20170204-r1.ebuild 292 SHA256 f77f6d355fec781e682dd4dc12f8e4e9426ea2ab29a7956ee826eb2f8d613449 SHA512 1b81a19b393fb91d30856372be698ecbb782c5921dad4dd46ba3d3bf3e42690c77055ad306710c95c8bd1ac2f94acb4fe0948505c6e97a27329fc3a2500ce616 WHIRLPOOL 6768395e044ad12e2bc7936dc9344157128fa6c25acaf66eb1e4ea398b490e9e39af37907073c71cecfea252cc2b00db16ae21bca139924e477478dabb44e86e
+EBUILD selinux-kdeconnect-2.20170204-r2.ebuild 290 SHA256 955a3a5e99e49d2a6b5e46f75a6960ec36856bf3f97088aaa863a7bde63e93d9 SHA512 ce7706a51fd1ef7bcf562eddc2c6be948484dc90fa7bd3f3278ca33654c070b3e19a565b85931019ddd3c281c4416b6c3af81c43b2a33de3d2c6523da8f4fbb6 WHIRLPOOL e23d86f0433edc911ba018e19919c678fe77bfe18bb90ed75c35960ecaa6b1cb633be42b4b9a8020c1ee1c91ac71a9c8cc673c62f0b9293dec359d857e107d63
+EBUILD selinux-kdeconnect-2.20170204-r3.ebuild 290 SHA256 955a3a5e99e49d2a6b5e46f75a6960ec36856bf3f97088aaa863a7bde63e93d9 SHA512 ce7706a51fd1ef7bcf562eddc2c6be948484dc90fa7bd3f3278ca33654c070b3e19a565b85931019ddd3c281c4416b6c3af81c43b2a33de3d2c6523da8f4fbb6 WHIRLPOOL e23d86f0433edc911ba018e19919c678fe77bfe18bb90ed75c35960ecaa6b1cb633be42b4b9a8020c1ee1c91ac71a9c8cc673c62f0b9293dec359d857e107d63
+EBUILD selinux-kdeconnect-2.20170204-r4.ebuild 290 SHA256 955a3a5e99e49d2a6b5e46f75a6960ec36856bf3f97088aaa863a7bde63e93d9 SHA512 ce7706a51fd1ef7bcf562eddc2c6be948484dc90fa7bd3f3278ca33654c070b3e19a565b85931019ddd3c281c4416b6c3af81c43b2a33de3d2c6523da8f4fbb6 WHIRLPOOL e23d86f0433edc911ba018e19919c678fe77bfe18bb90ed75c35960ecaa6b1cb633be42b4b9a8020c1ee1c91ac71a9c8cc673c62f0b9293dec359d857e107d63
+EBUILD selinux-kdeconnect-2.20170805-r2.ebuild 290 SHA256 955a3a5e99e49d2a6b5e46f75a6960ec36856bf3f97088aaa863a7bde63e93d9 SHA512 ce7706a51fd1ef7bcf562eddc2c6be948484dc90fa7bd3f3278ca33654c070b3e19a565b85931019ddd3c281c4416b6c3af81c43b2a33de3d2c6523da8f4fbb6 WHIRLPOOL e23d86f0433edc911ba018e19919c678fe77bfe18bb90ed75c35960ecaa6b1cb633be42b4b9a8020c1ee1c91ac71a9c8cc673c62f0b9293dec359d857e107d63
+EBUILD selinux-kdeconnect-2.20170805-r3.ebuild 292 SHA256 f77f6d355fec781e682dd4dc12f8e4e9426ea2ab29a7956ee826eb2f8d613449 SHA512 1b81a19b393fb91d30856372be698ecbb782c5921dad4dd46ba3d3bf3e42690c77055ad306710c95c8bd1ac2f94acb4fe0948505c6e97a27329fc3a2500ce616 WHIRLPOOL 6768395e044ad12e2bc7936dc9344157128fa6c25acaf66eb1e4ea398b490e9e39af37907073c71cecfea252cc2b00db16ae21bca139924e477478dabb44e86e
+EBUILD selinux-kdeconnect-9999.ebuild 292 SHA256 f77f6d355fec781e682dd4dc12f8e4e9426ea2ab29a7956ee826eb2f8d613449 SHA512 1b81a19b393fb91d30856372be698ecbb782c5921dad4dd46ba3d3bf3e42690c77055ad306710c95c8bd1ac2f94acb4fe0948505c6e97a27329fc3a2500ce616 WHIRLPOOL 6768395e044ad12e2bc7936dc9344157128fa6c25acaf66eb1e4ea398b490e9e39af37907073c71cecfea252cc2b00db16ae21bca139924e477478dabb44e86e
 MISC ChangeLog 9569 SHA256 fa8f2cca0e10b0e7260612169db5c41519301dc5df4344aad8146206c3f96d2c SHA512 c4f82806684bb160a64a99d979b0d9b07dcc827431a1d72563a108c05e794e4c2c0413e08faa2b7b74afac47b94f2fb64cb72a174c07265748598475504ae076 WHIRLPOOL f2e343ee69669db407f711ac464bf8ac4c61978e88f1c752874b8d6df7ee5debad47edd63f8c8605b8c8e6bcbc6be6bfda4e01010498e09311a641b39291ba37
 MISC ChangeLog-2015 1173 SHA256 7d9f9424583beddef9f8f4dfc163d373e1fbbc425cb17feb05839e3a6e8dbdc6 SHA512 670523dfc03846a5a468c93d5d6f792d07b92c37de3a61347454161fb89aa06ca5d14ed46e5100e107c122bbfae5378d12cbbef0d1647807fddc08f6a0922a1f WHIRLPOOL 15a58a6dd02aff9169698dcd198690130249f2b6c4e96b5c0c5ce9914514c2a1a85b2a44f2bff2623dcb1c00dad1e06a4c165b906dfa529f79a8e7a7fc907317
 MISC metadata.xml 320 SHA256 3d0a5ce059259a65ccd35d53796c1fc4d2082f3654ad6d73915ddcfb2b7057a9 SHA512 ab0e14cd212f45bc18bd3fd8c63b5c1f28b71f9c8ffbbf7c3dc913b1c5dadd8a082d362e0cc9f5b16faf16f7eecff743f45186161cc002f9b4011b39866dc0a3 WHIRLPOOL 854c8481a7cb4d607e3cb17327bbe543a0e09a9abdc36860a0ccf2661de25fdd13ca09dcb135c326fc30314722361cb8ddc4ff8d558dc3999ef867cdb14dfd85
diff --git a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20170204-r1.ebuild b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20170204-r1.ebuild
index 203077848614..f60a7bd6e180 100644
--- a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20170204-r2.ebuild b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20170204-r2.ebuild
index 81e492f05e54..07464ddad1ed 100644
--- a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20170204-r3.ebuild b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20170204-r3.ebuild
index 81e492f05e54..07464ddad1ed 100644
--- a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20170204-r4.ebuild b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20170204-r4.ebuild
index 81e492f05e54..07464ddad1ed 100644
--- a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20170805-r2.ebuild b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20170805-r2.ebuild
index 81e492f05e54..07464ddad1ed 100644
--- a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20170805-r3.ebuild b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..f60a7bd6e180
--- /dev/null
+++ b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-kdeconnect/selinux-kdeconnect-9999.ebuild b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-9999.ebuild
index 203077848614..f60a7bd6e180 100644
--- a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-9999.ebuild
+++ b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-kdump/Manifest b/sec-policy/selinux-kdump/Manifest
index d0c2d3cc3203..9654a0694224 100644
--- a/sec-policy/selinux-kdump/Manifest
+++ b/sec-policy/selinux-kdump/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-kdump-2.20170204-r1.ebuild 281 SHA256 200879993a457fd750e6f762c04a612aa027f1d701e16e4f2832a8d311836ec8 SHA512 3dbfc1ac8fa817d1b01488de027f87b80f3b578baa494c3e1f1c90d7387d6349f4189a125674168629fde4ffca548db9a7221aa91295bfc10ef741c68da26f3b WHIRLPOOL 6819238191fe5ac0ceb0fc88983b30b123a571377fbe4727a77f7cde8ba9225e7c10bc0c796b9efef9b87d264730b0677a0428ef57f78ceab904594daf27e0f5
-EBUILD selinux-kdump-2.20170204-r2.ebuild 279 SHA256 86106e0657f3b1566898f5530c5e9715baeb2400e118768c5f0c5d7cc2b5e503 SHA512 3201a08e4113e4f14ce63ecf30cf9dc7145762e60018bc90e4494af2bbb446c2bd14809201fcecfcab1c9b1daf42426fbcb861008e3fcdc68fe376056b50da78 WHIRLPOOL f798e28139a671970d6f8d99f7a7c9f7afaeac21a439021d8f1c7bf78ca186746546841f11adc8faee9865b79c699edf55e53969e786b81ff84a81d5de90e0bb
-EBUILD selinux-kdump-2.20170204-r3.ebuild 279 SHA256 86106e0657f3b1566898f5530c5e9715baeb2400e118768c5f0c5d7cc2b5e503 SHA512 3201a08e4113e4f14ce63ecf30cf9dc7145762e60018bc90e4494af2bbb446c2bd14809201fcecfcab1c9b1daf42426fbcb861008e3fcdc68fe376056b50da78 WHIRLPOOL f798e28139a671970d6f8d99f7a7c9f7afaeac21a439021d8f1c7bf78ca186746546841f11adc8faee9865b79c699edf55e53969e786b81ff84a81d5de90e0bb
-EBUILD selinux-kdump-2.20170204-r4.ebuild 279 SHA256 86106e0657f3b1566898f5530c5e9715baeb2400e118768c5f0c5d7cc2b5e503 SHA512 3201a08e4113e4f14ce63ecf30cf9dc7145762e60018bc90e4494af2bbb446c2bd14809201fcecfcab1c9b1daf42426fbcb861008e3fcdc68fe376056b50da78 WHIRLPOOL f798e28139a671970d6f8d99f7a7c9f7afaeac21a439021d8f1c7bf78ca186746546841f11adc8faee9865b79c699edf55e53969e786b81ff84a81d5de90e0bb
-EBUILD selinux-kdump-2.20170805-r2.ebuild 279 SHA256 86106e0657f3b1566898f5530c5e9715baeb2400e118768c5f0c5d7cc2b5e503 SHA512 3201a08e4113e4f14ce63ecf30cf9dc7145762e60018bc90e4494af2bbb446c2bd14809201fcecfcab1c9b1daf42426fbcb861008e3fcdc68fe376056b50da78 WHIRLPOOL f798e28139a671970d6f8d99f7a7c9f7afaeac21a439021d8f1c7bf78ca186746546841f11adc8faee9865b79c699edf55e53969e786b81ff84a81d5de90e0bb
-EBUILD selinux-kdump-9999.ebuild 281 SHA256 200879993a457fd750e6f762c04a612aa027f1d701e16e4f2832a8d311836ec8 SHA512 3dbfc1ac8fa817d1b01488de027f87b80f3b578baa494c3e1f1c90d7387d6349f4189a125674168629fde4ffca548db9a7221aa91295bfc10ef741c68da26f3b WHIRLPOOL 6819238191fe5ac0ceb0fc88983b30b123a571377fbe4727a77f7cde8ba9225e7c10bc0c796b9efef9b87d264730b0677a0428ef57f78ceab904594daf27e0f5
+EBUILD selinux-kdump-2.20170204-r1.ebuild 282 SHA256 235133dc9702b990ac5c2ab59a47b2e52012ec8e460259a6a316d1d802691a57 SHA512 c146fb71939f8968eb435986a9ca1aca176cdf1a96308071e01de59552ee39d900f63574428611c460d846fadb412ce359f92c88e10879bd5ee4857de27c9c2f WHIRLPOOL 99487dd3b87074786f899556c3e41fae7556db5b3699c7099b2a7b6aa15d35f0f05ae38f6a162010848d6eca09b4d5b3bc9466accfb8222906c081e603c9d231
+EBUILD selinux-kdump-2.20170204-r2.ebuild 280 SHA256 51bf41fa7319c78d8bf849aaf8bd7b17ae6936b138c1d0373ffbebf1c268c564 SHA512 203dba46c2720fe3f733c4fea85b1cdf542b04e3eb57bbeb5ca25ab09122abe0e3426c9bb8160c13f6766c4b073854265868197fb21811c6fefbbbdb2b2003ae WHIRLPOOL 87c1bec923b4575448075e7639a74030e2bf7891bdd0a84d1757d874a48876d29bf5b2470fee784a561967597d82f88e61c66123a46bdbf581e1e0c8076b04bd
+EBUILD selinux-kdump-2.20170204-r3.ebuild 280 SHA256 51bf41fa7319c78d8bf849aaf8bd7b17ae6936b138c1d0373ffbebf1c268c564 SHA512 203dba46c2720fe3f733c4fea85b1cdf542b04e3eb57bbeb5ca25ab09122abe0e3426c9bb8160c13f6766c4b073854265868197fb21811c6fefbbbdb2b2003ae WHIRLPOOL 87c1bec923b4575448075e7639a74030e2bf7891bdd0a84d1757d874a48876d29bf5b2470fee784a561967597d82f88e61c66123a46bdbf581e1e0c8076b04bd
+EBUILD selinux-kdump-2.20170204-r4.ebuild 280 SHA256 51bf41fa7319c78d8bf849aaf8bd7b17ae6936b138c1d0373ffbebf1c268c564 SHA512 203dba46c2720fe3f733c4fea85b1cdf542b04e3eb57bbeb5ca25ab09122abe0e3426c9bb8160c13f6766c4b073854265868197fb21811c6fefbbbdb2b2003ae WHIRLPOOL 87c1bec923b4575448075e7639a74030e2bf7891bdd0a84d1757d874a48876d29bf5b2470fee784a561967597d82f88e61c66123a46bdbf581e1e0c8076b04bd
+EBUILD selinux-kdump-2.20170805-r2.ebuild 280 SHA256 51bf41fa7319c78d8bf849aaf8bd7b17ae6936b138c1d0373ffbebf1c268c564 SHA512 203dba46c2720fe3f733c4fea85b1cdf542b04e3eb57bbeb5ca25ab09122abe0e3426c9bb8160c13f6766c4b073854265868197fb21811c6fefbbbdb2b2003ae WHIRLPOOL 87c1bec923b4575448075e7639a74030e2bf7891bdd0a84d1757d874a48876d29bf5b2470fee784a561967597d82f88e61c66123a46bdbf581e1e0c8076b04bd
+EBUILD selinux-kdump-2.20170805-r3.ebuild 282 SHA256 235133dc9702b990ac5c2ab59a47b2e52012ec8e460259a6a316d1d802691a57 SHA512 c146fb71939f8968eb435986a9ca1aca176cdf1a96308071e01de59552ee39d900f63574428611c460d846fadb412ce359f92c88e10879bd5ee4857de27c9c2f WHIRLPOOL 99487dd3b87074786f899556c3e41fae7556db5b3699c7099b2a7b6aa15d35f0f05ae38f6a162010848d6eca09b4d5b3bc9466accfb8222906c081e603c9d231
+EBUILD selinux-kdump-9999.ebuild 282 SHA256 235133dc9702b990ac5c2ab59a47b2e52012ec8e460259a6a316d1d802691a57 SHA512 c146fb71939f8968eb435986a9ca1aca176cdf1a96308071e01de59552ee39d900f63574428611c460d846fadb412ce359f92c88e10879bd5ee4857de27c9c2f WHIRLPOOL 99487dd3b87074786f899556c3e41fae7556db5b3699c7099b2a7b6aa15d35f0f05ae38f6a162010848d6eca09b4d5b3bc9466accfb8222906c081e603c9d231
 MISC ChangeLog 10479 SHA256 c623c97982adb7eacbcb257086fc14992b4ae8574cde1eced4188b0408f25d6c SHA512 9445c4df3feabaea1cde9eee9b546e13102a2209c49372c29c5f8ce6a93df50d7b83584764a97b0072af850d54b44865dd1c01d206246ed745c154c44765273f WHIRLPOOL 2db9afc2fb7b68078ad258e78c7f7c8ee2ab3cedf460231816826c66fd8c2ba458be320df96c88854d3fbd78a1061c39c2f3d7d44d3084766905cb56df4332f5
 MISC ChangeLog-2015 9750 SHA256 b1637afb8670102551cc293505bc4e87cd3e841c3a042b346d4199a48ca6871f SHA512 7504b5cf163f0efef8d337baa0772db015d47dddf9abc43d356bb3c19180e4b9f42fbcd141a9be33e0d69c10f22f3d6ea7301d609a8766ee205963cdb519d0d5 WHIRLPOOL 6efca4a33b8eaf2d4ba53983fbdb029c5cb46035e06f18f20f0b192c5cb86b761278e376dda7b50860ad6a9c33858978c5ca52c41ea158ae17d3b7a18f50fae8
 MISC metadata.xml 315 SHA256 e7ae6f333cf7c78d14d3e6e9f301b3a841a03ad497efb20fd22731ae78d91479 SHA512 9676f97f6e2e5fd7d8578c1c11662630f5ddc156a3adca855ba145e146531ca54a8f969c689e0c5e233531b9b8ca05a94a03802ab8a3cc18015bce1a0d3b3980 WHIRLPOOL 7bffdf9cbe29b5a40a134f335639a5cb4d7e8382544ab15650a94bc416d3dac19ccc60750b24e888de12ea1b72087e42c2166dc951fe6594a536f086c4b1f536
diff --git a/sec-policy/selinux-kdump/selinux-kdump-2.20170204-r1.ebuild b/sec-policy/selinux-kdump/selinux-kdump-2.20170204-r1.ebuild
index d9d32f39ae2b..47b5a73190ad 100644
--- a/sec-policy/selinux-kdump/selinux-kdump-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-kdump/selinux-kdump-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-kdump/selinux-kdump-2.20170204-r2.ebuild b/sec-policy/selinux-kdump/selinux-kdump-2.20170204-r2.ebuild
index 36e57bb2c566..5529a3914ce1 100644
--- a/sec-policy/selinux-kdump/selinux-kdump-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-kdump/selinux-kdump-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-kdump/selinux-kdump-2.20170204-r3.ebuild b/sec-policy/selinux-kdump/selinux-kdump-2.20170204-r3.ebuild
index 36e57bb2c566..5529a3914ce1 100644
--- a/sec-policy/selinux-kdump/selinux-kdump-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-kdump/selinux-kdump-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-kdump/selinux-kdump-2.20170204-r4.ebuild b/sec-policy/selinux-kdump/selinux-kdump-2.20170204-r4.ebuild
index 36e57bb2c566..5529a3914ce1 100644
--- a/sec-policy/selinux-kdump/selinux-kdump-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-kdump/selinux-kdump-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-kdump/selinux-kdump-2.20170805-r2.ebuild b/sec-policy/selinux-kdump/selinux-kdump-2.20170805-r2.ebuild
index 36e57bb2c566..5529a3914ce1 100644
--- a/sec-policy/selinux-kdump/selinux-kdump-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-kdump/selinux-kdump-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-kdump/selinux-kdump-2.20170805-r3.ebuild b/sec-policy/selinux-kdump/selinux-kdump-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..47b5a73190ad
--- /dev/null
+++ b/sec-policy/selinux-kdump/selinux-kdump-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-kdump/selinux-kdump-9999.ebuild b/sec-policy/selinux-kdump/selinux-kdump-9999.ebuild
index d9d32f39ae2b..47b5a73190ad 100644
--- a/sec-policy/selinux-kdump/selinux-kdump-9999.ebuild
+++ b/sec-policy/selinux-kdump/selinux-kdump-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-kerberos/Manifest b/sec-policy/selinux-kerberos/Manifest
index 24c4a0c869c4..62bbd7f662a9 100644
--- a/sec-policy/selinux-kerberos/Manifest
+++ b/sec-policy/selinux-kerberos/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-kerberos-2.20170204-r1.ebuild 287 SHA256 1010230acb2c66b293c49d6aaa9c3329dd5bf0118947af51e66c2d6434160013 SHA512 82a7ef31418b87c7695c7f53697530d4503c7fdf2cb3fc9c22c316cc068b6dc1edfa1bb4d68b824cf2ae271f96ab977b7af4d46d2dc80f82776787ca695d8b02 WHIRLPOOL db83e3fad8a993a8d146e49b7e31dce4a4beede5e43a1f0926187d1aa27efe989b647604af1d78b00a468d487b846de7d4c0cdacbf9f5e1bef77138cab5b9c17
-EBUILD selinux-kerberos-2.20170204-r2.ebuild 285 SHA256 2a819df42b185ab20854123005e0d7dd132ac13a9a6bd93ce60ec0a686134952 SHA512 479097ab7aba1e05fcc6c17d3b4158a2172d2360acc1e34a6d5d462cf45b755aafac233695e8bd56aec0160826c3c7ee0436f0274181be998e2633a265b201e8 WHIRLPOOL 7816ec5d6962f2b239285346b24158a8ec47e72df63a5dc0f029b1b3832ad47e32dbcc916d0eaf2e9cc86472e918952f76899791fb00c791d48ec581bcffd23f
-EBUILD selinux-kerberos-2.20170204-r3.ebuild 285 SHA256 2a819df42b185ab20854123005e0d7dd132ac13a9a6bd93ce60ec0a686134952 SHA512 479097ab7aba1e05fcc6c17d3b4158a2172d2360acc1e34a6d5d462cf45b755aafac233695e8bd56aec0160826c3c7ee0436f0274181be998e2633a265b201e8 WHIRLPOOL 7816ec5d6962f2b239285346b24158a8ec47e72df63a5dc0f029b1b3832ad47e32dbcc916d0eaf2e9cc86472e918952f76899791fb00c791d48ec581bcffd23f
-EBUILD selinux-kerberos-2.20170204-r4.ebuild 285 SHA256 2a819df42b185ab20854123005e0d7dd132ac13a9a6bd93ce60ec0a686134952 SHA512 479097ab7aba1e05fcc6c17d3b4158a2172d2360acc1e34a6d5d462cf45b755aafac233695e8bd56aec0160826c3c7ee0436f0274181be998e2633a265b201e8 WHIRLPOOL 7816ec5d6962f2b239285346b24158a8ec47e72df63a5dc0f029b1b3832ad47e32dbcc916d0eaf2e9cc86472e918952f76899791fb00c791d48ec581bcffd23f
-EBUILD selinux-kerberos-2.20170805-r2.ebuild 285 SHA256 2a819df42b185ab20854123005e0d7dd132ac13a9a6bd93ce60ec0a686134952 SHA512 479097ab7aba1e05fcc6c17d3b4158a2172d2360acc1e34a6d5d462cf45b755aafac233695e8bd56aec0160826c3c7ee0436f0274181be998e2633a265b201e8 WHIRLPOOL 7816ec5d6962f2b239285346b24158a8ec47e72df63a5dc0f029b1b3832ad47e32dbcc916d0eaf2e9cc86472e918952f76899791fb00c791d48ec581bcffd23f
-EBUILD selinux-kerberos-9999.ebuild 287 SHA256 1010230acb2c66b293c49d6aaa9c3329dd5bf0118947af51e66c2d6434160013 SHA512 82a7ef31418b87c7695c7f53697530d4503c7fdf2cb3fc9c22c316cc068b6dc1edfa1bb4d68b824cf2ae271f96ab977b7af4d46d2dc80f82776787ca695d8b02 WHIRLPOOL db83e3fad8a993a8d146e49b7e31dce4a4beede5e43a1f0926187d1aa27efe989b647604af1d78b00a468d487b846de7d4c0cdacbf9f5e1bef77138cab5b9c17
+EBUILD selinux-kerberos-2.20170204-r1.ebuild 288 SHA256 f20936fdecc31c73fbe4eef8ba04fc20d5beea724a9b1c590c218207b9e54bd7 SHA512 220e38526134071d1ae14d338a9040acce5285641f5c2d53582d4b4de79bfe442d2b1d20cb756e30dcc133fe8453a7c34bb5c8aa3e16f5f2ebb812043a70e015 WHIRLPOOL 363484a0f6c0f648628538948cbc5f73debc0103177e0318d2e339505ccdad1bc7c6923ad7ab36a0205296872df303cb6d8017e80cce078af472981f713b561d
+EBUILD selinux-kerberos-2.20170204-r2.ebuild 286 SHA256 e1dafeba9973aecb454c323c868fa317a75767558d4ec8afdbe520a03187b1ad SHA512 7065f4a7c1e0b212cf3b702c1a2df72781443ddac17c2a14c93e2fcc4ac6646471e667b67c5de54d044eb5d35bb271a7e584f426ce229c5a8c0cd403419f9bf1 WHIRLPOOL 4b608605fb0646f52cf9f4ad9dc79fef6cdeea6f2d7c20f33c67100d62ab27f74e3ebd6b378a157ac0f6ed226496428216fc4679853620e5d23f9bf2fca160f0
+EBUILD selinux-kerberos-2.20170204-r3.ebuild 286 SHA256 e1dafeba9973aecb454c323c868fa317a75767558d4ec8afdbe520a03187b1ad SHA512 7065f4a7c1e0b212cf3b702c1a2df72781443ddac17c2a14c93e2fcc4ac6646471e667b67c5de54d044eb5d35bb271a7e584f426ce229c5a8c0cd403419f9bf1 WHIRLPOOL 4b608605fb0646f52cf9f4ad9dc79fef6cdeea6f2d7c20f33c67100d62ab27f74e3ebd6b378a157ac0f6ed226496428216fc4679853620e5d23f9bf2fca160f0
+EBUILD selinux-kerberos-2.20170204-r4.ebuild 286 SHA256 e1dafeba9973aecb454c323c868fa317a75767558d4ec8afdbe520a03187b1ad SHA512 7065f4a7c1e0b212cf3b702c1a2df72781443ddac17c2a14c93e2fcc4ac6646471e667b67c5de54d044eb5d35bb271a7e584f426ce229c5a8c0cd403419f9bf1 WHIRLPOOL 4b608605fb0646f52cf9f4ad9dc79fef6cdeea6f2d7c20f33c67100d62ab27f74e3ebd6b378a157ac0f6ed226496428216fc4679853620e5d23f9bf2fca160f0
+EBUILD selinux-kerberos-2.20170805-r2.ebuild 286 SHA256 e1dafeba9973aecb454c323c868fa317a75767558d4ec8afdbe520a03187b1ad SHA512 7065f4a7c1e0b212cf3b702c1a2df72781443ddac17c2a14c93e2fcc4ac6646471e667b67c5de54d044eb5d35bb271a7e584f426ce229c5a8c0cd403419f9bf1 WHIRLPOOL 4b608605fb0646f52cf9f4ad9dc79fef6cdeea6f2d7c20f33c67100d62ab27f74e3ebd6b378a157ac0f6ed226496428216fc4679853620e5d23f9bf2fca160f0
+EBUILD selinux-kerberos-2.20170805-r3.ebuild 288 SHA256 f20936fdecc31c73fbe4eef8ba04fc20d5beea724a9b1c590c218207b9e54bd7 SHA512 220e38526134071d1ae14d338a9040acce5285641f5c2d53582d4b4de79bfe442d2b1d20cb756e30dcc133fe8453a7c34bb5c8aa3e16f5f2ebb812043a70e015 WHIRLPOOL 363484a0f6c0f648628538948cbc5f73debc0103177e0318d2e339505ccdad1bc7c6923ad7ab36a0205296872df303cb6d8017e80cce078af472981f713b561d
+EBUILD selinux-kerberos-9999.ebuild 288 SHA256 f20936fdecc31c73fbe4eef8ba04fc20d5beea724a9b1c590c218207b9e54bd7 SHA512 220e38526134071d1ae14d338a9040acce5285641f5c2d53582d4b4de79bfe442d2b1d20cb756e30dcc133fe8453a7c34bb5c8aa3e16f5f2ebb812043a70e015 WHIRLPOOL 363484a0f6c0f648628538948cbc5f73debc0103177e0318d2e339505ccdad1bc7c6923ad7ab36a0205296872df303cb6d8017e80cce078af472981f713b561d
 MISC ChangeLog 10793 SHA256 33fdb252088a4e101747f6ee84ff5023186fffdff712d7c8760430ad95feb2f5 SHA512 b1d74eeb39b3637502c15792b291985a97b9978c70594852b9014a393ba0eceaa3bbc73fcf60161c682a660009b823b7eefd89eaf6bb9023242822a2fe0677ff WHIRLPOOL 306ca939ccc714e2091fd339efff08389183df884cf22d2b9b2f6713feb9747435894a65d6ff872357644aeebf1841da27ecd5806808f9703d238ac0d835bb06
 MISC ChangeLog-2015 12643 SHA256 74b8d5243da05e03054c126756de4b4fcf91906040341c23c65ae5f01411afe5 SHA512 9bc98b244d2d9cd4fd9b7f8f3438fdf406c5e61d7cdc2caef6075b6241d6fea595ff62112084812367897727dbfc6c06ae47a58d1554f077892861605db38ac3 WHIRLPOOL c53422ec03d378d22b656704e601aaa0adcdaddc0a8f9c9ef47f179fb9b64ec4a8717e0962988d5899a0484cef8dafd2e58cf983eb5168263338267c8cc94f85
 MISC metadata.xml 318 SHA256 c429eefbc36a9fc03408eade0495ef503b34c957af57d181db33c402225514d4 SHA512 7c5a7eeb9d6dbfd9ff85af7392e3b522d558726d72dada332dd3df088c5b8bb52cdc9cbd707ba1da49b6a36a0fce9bdbdbd58830bb411d99d0f75fe29adfa27c WHIRLPOOL b17fcda52f92f55327506819cb31be3038e92899b6dd0ed4c982be6c64ef90d344d50da4886873bda4096a78f784336dbb3f4e32c8322f7879bce92ba4b0fd44
diff --git a/sec-policy/selinux-kerberos/selinux-kerberos-2.20170204-r1.ebuild b/sec-policy/selinux-kerberos/selinux-kerberos-2.20170204-r1.ebuild
index cd2e04208fb4..8a747d140fef 100644
--- a/sec-policy/selinux-kerberos/selinux-kerberos-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-kerberos/selinux-kerberos-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-kerberos/selinux-kerberos-2.20170204-r2.ebuild b/sec-policy/selinux-kerberos/selinux-kerberos-2.20170204-r2.ebuild
index b4c770001973..e583ae84114b 100644
--- a/sec-policy/selinux-kerberos/selinux-kerberos-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-kerberos/selinux-kerberos-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-kerberos/selinux-kerberos-2.20170204-r3.ebuild b/sec-policy/selinux-kerberos/selinux-kerberos-2.20170204-r3.ebuild
index b4c770001973..e583ae84114b 100644
--- a/sec-policy/selinux-kerberos/selinux-kerberos-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-kerberos/selinux-kerberos-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-kerberos/selinux-kerberos-2.20170204-r4.ebuild b/sec-policy/selinux-kerberos/selinux-kerberos-2.20170204-r4.ebuild
index b4c770001973..e583ae84114b 100644
--- a/sec-policy/selinux-kerberos/selinux-kerberos-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-kerberos/selinux-kerberos-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-kerberos/selinux-kerberos-2.20170805-r2.ebuild b/sec-policy/selinux-kerberos/selinux-kerberos-2.20170805-r2.ebuild
index b4c770001973..e583ae84114b 100644
--- a/sec-policy/selinux-kerberos/selinux-kerberos-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-kerberos/selinux-kerberos-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-kerberos/selinux-kerberos-2.20170805-r3.ebuild b/sec-policy/selinux-kerberos/selinux-kerberos-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..8a747d140fef
--- /dev/null
+++ b/sec-policy/selinux-kerberos/selinux-kerberos-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-kerberos/selinux-kerberos-9999.ebuild b/sec-policy/selinux-kerberos/selinux-kerberos-9999.ebuild
index cd2e04208fb4..8a747d140fef 100644
--- a/sec-policy/selinux-kerberos/selinux-kerberos-9999.ebuild
+++ b/sec-policy/selinux-kerberos/selinux-kerberos-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-kerneloops/Manifest b/sec-policy/selinux-kerneloops/Manifest
index 094bbfa38a42..69829f9ed7ef 100644
--- a/sec-policy/selinux-kerneloops/Manifest
+++ b/sec-policy/selinux-kerneloops/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-kerneloops-2.20170204-r1.ebuild 291 SHA256 c2e1bfcab62cbe852fdb3d9cfb37f319887a82828f41b9350d9958f598ea659f SHA512 8225c7d2a4170da0ea599948e1ab14d546b51807811514b5a6bf48802dbc110b68fd82842674e7197447a7ad1b7ec885c4d22d9e8670e5ac034b1bf04365650a WHIRLPOOL adb43593c70ecbf06c7f34174bed4b8ae840e5c979718c227f3ce19fa71bfbeffb53b98e0346fa90977606d9cfc7055b65ef5bf9e8fe8937d462d08e8a1ffe1c
-EBUILD selinux-kerneloops-2.20170204-r2.ebuild 289 SHA256 4ccd581c3b7c40b86dcfdf480f3b230958730eef0f9c88942ae38808a7f0390c SHA512 3884652f28a6d80b07c47a31a9c8ff2abfb5748dab76e0825075d6edb9feca4c184d1d96889d2254885d1a45d3abc632639f8aaeed2553ce96a6ebd427280d01 WHIRLPOOL 6eff87c0862e3d7253f8b52b911d018e25adadf716f23e4fa9afd7749d943770570377e50112f963c6cbd53b877b005ec58f5ab672f0d41d6d79e5a57c4197c7
-EBUILD selinux-kerneloops-2.20170204-r3.ebuild 289 SHA256 4ccd581c3b7c40b86dcfdf480f3b230958730eef0f9c88942ae38808a7f0390c SHA512 3884652f28a6d80b07c47a31a9c8ff2abfb5748dab76e0825075d6edb9feca4c184d1d96889d2254885d1a45d3abc632639f8aaeed2553ce96a6ebd427280d01 WHIRLPOOL 6eff87c0862e3d7253f8b52b911d018e25adadf716f23e4fa9afd7749d943770570377e50112f963c6cbd53b877b005ec58f5ab672f0d41d6d79e5a57c4197c7
-EBUILD selinux-kerneloops-2.20170204-r4.ebuild 289 SHA256 4ccd581c3b7c40b86dcfdf480f3b230958730eef0f9c88942ae38808a7f0390c SHA512 3884652f28a6d80b07c47a31a9c8ff2abfb5748dab76e0825075d6edb9feca4c184d1d96889d2254885d1a45d3abc632639f8aaeed2553ce96a6ebd427280d01 WHIRLPOOL 6eff87c0862e3d7253f8b52b911d018e25adadf716f23e4fa9afd7749d943770570377e50112f963c6cbd53b877b005ec58f5ab672f0d41d6d79e5a57c4197c7
-EBUILD selinux-kerneloops-2.20170805-r2.ebuild 289 SHA256 4ccd581c3b7c40b86dcfdf480f3b230958730eef0f9c88942ae38808a7f0390c SHA512 3884652f28a6d80b07c47a31a9c8ff2abfb5748dab76e0825075d6edb9feca4c184d1d96889d2254885d1a45d3abc632639f8aaeed2553ce96a6ebd427280d01 WHIRLPOOL 6eff87c0862e3d7253f8b52b911d018e25adadf716f23e4fa9afd7749d943770570377e50112f963c6cbd53b877b005ec58f5ab672f0d41d6d79e5a57c4197c7
-EBUILD selinux-kerneloops-9999.ebuild 291 SHA256 c2e1bfcab62cbe852fdb3d9cfb37f319887a82828f41b9350d9958f598ea659f SHA512 8225c7d2a4170da0ea599948e1ab14d546b51807811514b5a6bf48802dbc110b68fd82842674e7197447a7ad1b7ec885c4d22d9e8670e5ac034b1bf04365650a WHIRLPOOL adb43593c70ecbf06c7f34174bed4b8ae840e5c979718c227f3ce19fa71bfbeffb53b98e0346fa90977606d9cfc7055b65ef5bf9e8fe8937d462d08e8a1ffe1c
+EBUILD selinux-kerneloops-2.20170204-r1.ebuild 292 SHA256 b59c1b513eb264ab0fd927c68db86c3666f3073f84ac53a840817931dd554266 SHA512 465c4b2e0e3de2ec2c1abeceab994cec808468e5c140468484bd425ef3cdaa7146aafbf75501eea7669c79e2316d1eec090cea1cfe6bc0ec7cfbd53ee98c3055 WHIRLPOOL fa19fdc3c327d01678689c82a634f9ed7b7b91d55f19c5d9deb0f34bba2ee23ca7ceacbaf356698d72edf5a8f91fffa817cdf1f223a37e664926689218c1135f
+EBUILD selinux-kerneloops-2.20170204-r2.ebuild 290 SHA256 34ab3e72d8a7fd3332251b9315e9740aa765e591abfd480e6503a36cb7131ce9 SHA512 213d4155310b54352f521f65b99f7db60a3a55269a6ddc87a5aa14a812975d54c662b8cc8578db51b8b2864568cd7aa6300e7374a87f7178f4971cbd56487d69 WHIRLPOOL 1ee604c2aecba215837e533ee1462a9731dda976c41a88e5495268ecd051eefa3095f27c0eda7b81068904c98acba0654ab8485c6f801c9c5ab008c711fb8c4e
+EBUILD selinux-kerneloops-2.20170204-r3.ebuild 290 SHA256 34ab3e72d8a7fd3332251b9315e9740aa765e591abfd480e6503a36cb7131ce9 SHA512 213d4155310b54352f521f65b99f7db60a3a55269a6ddc87a5aa14a812975d54c662b8cc8578db51b8b2864568cd7aa6300e7374a87f7178f4971cbd56487d69 WHIRLPOOL 1ee604c2aecba215837e533ee1462a9731dda976c41a88e5495268ecd051eefa3095f27c0eda7b81068904c98acba0654ab8485c6f801c9c5ab008c711fb8c4e
+EBUILD selinux-kerneloops-2.20170204-r4.ebuild 290 SHA256 34ab3e72d8a7fd3332251b9315e9740aa765e591abfd480e6503a36cb7131ce9 SHA512 213d4155310b54352f521f65b99f7db60a3a55269a6ddc87a5aa14a812975d54c662b8cc8578db51b8b2864568cd7aa6300e7374a87f7178f4971cbd56487d69 WHIRLPOOL 1ee604c2aecba215837e533ee1462a9731dda976c41a88e5495268ecd051eefa3095f27c0eda7b81068904c98acba0654ab8485c6f801c9c5ab008c711fb8c4e
+EBUILD selinux-kerneloops-2.20170805-r2.ebuild 290 SHA256 34ab3e72d8a7fd3332251b9315e9740aa765e591abfd480e6503a36cb7131ce9 SHA512 213d4155310b54352f521f65b99f7db60a3a55269a6ddc87a5aa14a812975d54c662b8cc8578db51b8b2864568cd7aa6300e7374a87f7178f4971cbd56487d69 WHIRLPOOL 1ee604c2aecba215837e533ee1462a9731dda976c41a88e5495268ecd051eefa3095f27c0eda7b81068904c98acba0654ab8485c6f801c9c5ab008c711fb8c4e
+EBUILD selinux-kerneloops-2.20170805-r3.ebuild 292 SHA256 b59c1b513eb264ab0fd927c68db86c3666f3073f84ac53a840817931dd554266 SHA512 465c4b2e0e3de2ec2c1abeceab994cec808468e5c140468484bd425ef3cdaa7146aafbf75501eea7669c79e2316d1eec090cea1cfe6bc0ec7cfbd53ee98c3055 WHIRLPOOL fa19fdc3c327d01678689c82a634f9ed7b7b91d55f19c5d9deb0f34bba2ee23ca7ceacbaf356698d72edf5a8f91fffa817cdf1f223a37e664926689218c1135f
+EBUILD selinux-kerneloops-9999.ebuild 292 SHA256 b59c1b513eb264ab0fd927c68db86c3666f3073f84ac53a840817931dd554266 SHA512 465c4b2e0e3de2ec2c1abeceab994cec808468e5c140468484bd425ef3cdaa7146aafbf75501eea7669c79e2316d1eec090cea1cfe6bc0ec7cfbd53ee98c3055 WHIRLPOOL fa19fdc3c327d01678689c82a634f9ed7b7b91d55f19c5d9deb0f34bba2ee23ca7ceacbaf356698d72edf5a8f91fffa817cdf1f223a37e664926689218c1135f
 MISC ChangeLog 10979 SHA256 effa01f4d7ddd95ba1c80f7f84d9d58060b6966840fb9ad6216b198c8fb72639 SHA512 582a95dc552c0c0d5a4abffc7aa28589c0bdac6c9d7c5daaa99a73d8f358f7e26489c3b9b04946c888941c8604f951f79eee33e499333d71cc1a9e4cfb5621cc WHIRLPOOL e8dc70628314f1c6f6291f42e37d977bfcdb0ee88fd7bc60fae9e8f7d5b639e834b03a261a288aae9900b8b9737ce35e974319f6b51622fa4af4d551dc928a65
 MISC ChangeLog-2015 10335 SHA256 098eafef332e81372ca4f1131b65de71fd4f1fb2c4dcb5cb1921f8e93061607e SHA512 891222359233c8b1ca26cb63274ce753c4915c73c02fcdc56ad7392bab93d2e9db7f24f7ae9a35c1edbe1f8d81608df887c845483bd790ab081b376bfff829e8 WHIRLPOOL ad7c3ca4ca76bfc9eae93194233f0ffc5bc130b281722350a0032bf1d0a8ded920cfbc5b75340ca20b3140e0ae5f206a8559ff4486ec297a2c5bf8b5dd32d935
 MISC metadata.xml 320 SHA256 c9807a5d188057c108da2eedec764683c23a35bf23131a3b33ee72d35d68e7bc SHA512 84353674a6bc581ee9d8e25410b630574201701a8ccf025f6789e488b045fae7ea6662ebd17aa92273d2ea5b61c0c0d7218919449ec60a4f69c88d12fd1e5c69 WHIRLPOOL 122698a0983fb76b6f361d41f80bfa7fb61411284fd627727c02f9417a9ac8d84faf24028e0a3f1ff5fabefa0f0c8d344f105f64b650bbb33249b13c75d8b79b
diff --git a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20170204-r1.ebuild b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20170204-r1.ebuild
index fc09a018fa5c..0779d104ce8d 100644
--- a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20170204-r2.ebuild b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20170204-r2.ebuild
index 7fe631337ab0..c4ad389d33db 100644
--- a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20170204-r3.ebuild b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20170204-r3.ebuild
index 7fe631337ab0..c4ad389d33db 100644
--- a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20170204-r4.ebuild b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20170204-r4.ebuild
index 7fe631337ab0..c4ad389d33db 100644
--- a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20170805-r2.ebuild b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20170805-r2.ebuild
index 7fe631337ab0..c4ad389d33db 100644
--- a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20170805-r3.ebuild b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..0779d104ce8d
--- /dev/null
+++ b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-kerneloops/selinux-kerneloops-9999.ebuild b/sec-policy/selinux-kerneloops/selinux-kerneloops-9999.ebuild
index fc09a018fa5c..0779d104ce8d 100644
--- a/sec-policy/selinux-kerneloops/selinux-kerneloops-9999.ebuild
+++ b/sec-policy/selinux-kerneloops/selinux-kerneloops-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-kismet/Manifest b/sec-policy/selinux-kismet/Manifest
index ac190a04af49..1400cf2dfdcd 100644
--- a/sec-policy/selinux-kismet/Manifest
+++ b/sec-policy/selinux-kismet/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-kismet-2.20170204-r1.ebuild 283 SHA256 187c80e286dba022ab88382cfec642d2949741c64993c962b608b8a0717282e1 SHA512 41760b642a0795c6c19ca1c303cead4e60f1ecfcb9bf36ae16ed12f0fdd722da51ebfbff9a39c0e4b6b855999698ee64c69d5caf6864bfa0dcb7a60cc3cd0eec WHIRLPOOL d82fa76cf27e8527f86fc1b7f9026ada06dc847e8b7e73cb57c56613504325c402e4d2c4de5795ad387e5df4af38c85ba7eece0a6e067e5f0aa3db0d94d2192a
-EBUILD selinux-kismet-2.20170204-r2.ebuild 281 SHA256 264e7d2921df457fa759db3d7447c0d5fd9995348372e6dc455cefcbf69027a8 SHA512 0f9c0ff25bf415b18f2a8a6305c43d0a63884b1404626d4635264346c788f7fe3f67d3a0cdcf193208b496187a3c96518582f0cc06df761909441ed9f25ea391 WHIRLPOOL d272d748c92b0b07efdd1388e93d95835a3bacf59bb76ac225a82f1195c8b7cb69e2520d32c946816b1fb2a5364d9816d41a622e97d06fa148bf3e3d654d1029
-EBUILD selinux-kismet-2.20170204-r3.ebuild 281 SHA256 264e7d2921df457fa759db3d7447c0d5fd9995348372e6dc455cefcbf69027a8 SHA512 0f9c0ff25bf415b18f2a8a6305c43d0a63884b1404626d4635264346c788f7fe3f67d3a0cdcf193208b496187a3c96518582f0cc06df761909441ed9f25ea391 WHIRLPOOL d272d748c92b0b07efdd1388e93d95835a3bacf59bb76ac225a82f1195c8b7cb69e2520d32c946816b1fb2a5364d9816d41a622e97d06fa148bf3e3d654d1029
-EBUILD selinux-kismet-2.20170204-r4.ebuild 281 SHA256 264e7d2921df457fa759db3d7447c0d5fd9995348372e6dc455cefcbf69027a8 SHA512 0f9c0ff25bf415b18f2a8a6305c43d0a63884b1404626d4635264346c788f7fe3f67d3a0cdcf193208b496187a3c96518582f0cc06df761909441ed9f25ea391 WHIRLPOOL d272d748c92b0b07efdd1388e93d95835a3bacf59bb76ac225a82f1195c8b7cb69e2520d32c946816b1fb2a5364d9816d41a622e97d06fa148bf3e3d654d1029
-EBUILD selinux-kismet-2.20170805-r2.ebuild 281 SHA256 264e7d2921df457fa759db3d7447c0d5fd9995348372e6dc455cefcbf69027a8 SHA512 0f9c0ff25bf415b18f2a8a6305c43d0a63884b1404626d4635264346c788f7fe3f67d3a0cdcf193208b496187a3c96518582f0cc06df761909441ed9f25ea391 WHIRLPOOL d272d748c92b0b07efdd1388e93d95835a3bacf59bb76ac225a82f1195c8b7cb69e2520d32c946816b1fb2a5364d9816d41a622e97d06fa148bf3e3d654d1029
-EBUILD selinux-kismet-9999.ebuild 283 SHA256 187c80e286dba022ab88382cfec642d2949741c64993c962b608b8a0717282e1 SHA512 41760b642a0795c6c19ca1c303cead4e60f1ecfcb9bf36ae16ed12f0fdd722da51ebfbff9a39c0e4b6b855999698ee64c69d5caf6864bfa0dcb7a60cc3cd0eec WHIRLPOOL d82fa76cf27e8527f86fc1b7f9026ada06dc847e8b7e73cb57c56613504325c402e4d2c4de5795ad387e5df4af38c85ba7eece0a6e067e5f0aa3db0d94d2192a
+EBUILD selinux-kismet-2.20170204-r1.ebuild 284 SHA256 9c84fb275a4af4bb344ef69da1329c831beb2045afc058358cffe9a79e37d199 SHA512 14d7d2e1cfaaab9e733ef2a470a2073756e71794f6cd814b22c486202fd072bffad0d8500b595d2d7c2815ca5ab5e85dd101ef7a57f8e1338efef7cc0054a581 WHIRLPOOL ec9ade5c49c309194965fd49929e91c977288bb6b2ddf62fc489eba2c65d3d82ee77b28a704cf6240acd0a2d37a02b56aee506efdcc6a1d917b63459b72194d5
+EBUILD selinux-kismet-2.20170204-r2.ebuild 282 SHA256 dcfd7a93383b2cf7e49a034345b8fda176ef254b98ff22cb2e383e839a7cb0c4 SHA512 3d51728ccaaaa00eb87b1481410dc973b638725cef4251574d561b053864005b05c9876647a673c74bae2f6bc7ef4f556753e83f7ff1b4a60cf16705bbe42773 WHIRLPOOL 4c7f4d961a66b2986a0a9cf34d0f204aa12cac985f581a6e0f82d26b5de4f1291fc1c92ce931dbccac496849256e75df652ee7968bb1d3f45d31d971cd562dea
+EBUILD selinux-kismet-2.20170204-r3.ebuild 282 SHA256 dcfd7a93383b2cf7e49a034345b8fda176ef254b98ff22cb2e383e839a7cb0c4 SHA512 3d51728ccaaaa00eb87b1481410dc973b638725cef4251574d561b053864005b05c9876647a673c74bae2f6bc7ef4f556753e83f7ff1b4a60cf16705bbe42773 WHIRLPOOL 4c7f4d961a66b2986a0a9cf34d0f204aa12cac985f581a6e0f82d26b5de4f1291fc1c92ce931dbccac496849256e75df652ee7968bb1d3f45d31d971cd562dea
+EBUILD selinux-kismet-2.20170204-r4.ebuild 282 SHA256 dcfd7a93383b2cf7e49a034345b8fda176ef254b98ff22cb2e383e839a7cb0c4 SHA512 3d51728ccaaaa00eb87b1481410dc973b638725cef4251574d561b053864005b05c9876647a673c74bae2f6bc7ef4f556753e83f7ff1b4a60cf16705bbe42773 WHIRLPOOL 4c7f4d961a66b2986a0a9cf34d0f204aa12cac985f581a6e0f82d26b5de4f1291fc1c92ce931dbccac496849256e75df652ee7968bb1d3f45d31d971cd562dea
+EBUILD selinux-kismet-2.20170805-r2.ebuild 282 SHA256 dcfd7a93383b2cf7e49a034345b8fda176ef254b98ff22cb2e383e839a7cb0c4 SHA512 3d51728ccaaaa00eb87b1481410dc973b638725cef4251574d561b053864005b05c9876647a673c74bae2f6bc7ef4f556753e83f7ff1b4a60cf16705bbe42773 WHIRLPOOL 4c7f4d961a66b2986a0a9cf34d0f204aa12cac985f581a6e0f82d26b5de4f1291fc1c92ce931dbccac496849256e75df652ee7968bb1d3f45d31d971cd562dea
+EBUILD selinux-kismet-2.20170805-r3.ebuild 284 SHA256 9c84fb275a4af4bb344ef69da1329c831beb2045afc058358cffe9a79e37d199 SHA512 14d7d2e1cfaaab9e733ef2a470a2073756e71794f6cd814b22c486202fd072bffad0d8500b595d2d7c2815ca5ab5e85dd101ef7a57f8e1338efef7cc0054a581 WHIRLPOOL ec9ade5c49c309194965fd49929e91c977288bb6b2ddf62fc489eba2c65d3d82ee77b28a704cf6240acd0a2d37a02b56aee506efdcc6a1d917b63459b72194d5
+EBUILD selinux-kismet-9999.ebuild 284 SHA256 9c84fb275a4af4bb344ef69da1329c831beb2045afc058358cffe9a79e37d199 SHA512 14d7d2e1cfaaab9e733ef2a470a2073756e71794f6cd814b22c486202fd072bffad0d8500b595d2d7c2815ca5ab5e85dd101ef7a57f8e1338efef7cc0054a581 WHIRLPOOL ec9ade5c49c309194965fd49929e91c977288bb6b2ddf62fc489eba2c65d3d82ee77b28a704cf6240acd0a2d37a02b56aee506efdcc6a1d917b63459b72194d5
 MISC ChangeLog 10571 SHA256 5b139ea699fe29dbefc73d3e36e3f6d5ca0a292bb55d02639a1da01bbae7be99 SHA512 21c0dcb67519ffd14a30489529d35379b1ef6df99f7a7b284372501f10c5c027cae5e85c5194a145812c6d4bb1452a1c3d62bf58c9db9d4e13f21d9e5b4bbcb2 WHIRLPOOL 4e6c84a4b2d3f97f35fb9fb686c8c6059a1f1bc50d27be36b5e5d87025c447543662dddcc3445b2f8fad7968c2442932e20bf7e8df4f8c8087567b32c93cf823
 MISC ChangeLog-2015 9863 SHA256 3da98b9158979c98f007fafd12b11828ae7887242b51e75fa0601942342cb195 SHA512 5884f43697b934c425a4c02e7c21cfc502126971e923c7ef85c26ecd5dd2b4ef75ba6946b9c5abbdf66bab1c64113428ff0f5a62dc7368cace790f781e5a2295 WHIRLPOOL 0487c614092cc0956945fe4b2db80d0ef7a106841767dfd25eeb16fba993f681e53745c606721fdd3cccf9411b739307500b8e42702ecce2c0b9dda00a5e1161
 MISC metadata.xml 316 SHA256 6d26004ed55a1a11a12d5c882d368b5bd9905b7d7a3dcdd4e29e06c70b7220bf SHA512 48f0a31367966ccbb1564017c9329ee4d4990333904312f9b2b59f1b8b213974c3861d59ba49ed2f94f6eea1948556bdfcad0d3308c5ca70341316220ec44fc7 WHIRLPOOL 056f13619b0cbe7573af29434381d766eb228c0ca03c5e2a409e90e3ac5cea7d7c0b531ff43005592dc6ebf692ad9dd6fd01b55be5da056903427a1029b2a7ad
diff --git a/sec-policy/selinux-kismet/selinux-kismet-2.20170204-r1.ebuild b/sec-policy/selinux-kismet/selinux-kismet-2.20170204-r1.ebuild
index e6a6ee80b4b9..dd31cb4033bc 100644
--- a/sec-policy/selinux-kismet/selinux-kismet-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-kismet/selinux-kismet-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-kismet/selinux-kismet-2.20170204-r2.ebuild b/sec-policy/selinux-kismet/selinux-kismet-2.20170204-r2.ebuild
index 77bdde8577d1..e541ecf0d9da 100644
--- a/sec-policy/selinux-kismet/selinux-kismet-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-kismet/selinux-kismet-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-kismet/selinux-kismet-2.20170204-r3.ebuild b/sec-policy/selinux-kismet/selinux-kismet-2.20170204-r3.ebuild
index 77bdde8577d1..e541ecf0d9da 100644
--- a/sec-policy/selinux-kismet/selinux-kismet-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-kismet/selinux-kismet-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-kismet/selinux-kismet-2.20170204-r4.ebuild b/sec-policy/selinux-kismet/selinux-kismet-2.20170204-r4.ebuild
index 77bdde8577d1..e541ecf0d9da 100644
--- a/sec-policy/selinux-kismet/selinux-kismet-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-kismet/selinux-kismet-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-kismet/selinux-kismet-2.20170805-r2.ebuild b/sec-policy/selinux-kismet/selinux-kismet-2.20170805-r2.ebuild
index 77bdde8577d1..e541ecf0d9da 100644
--- a/sec-policy/selinux-kismet/selinux-kismet-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-kismet/selinux-kismet-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-kismet/selinux-kismet-2.20170805-r3.ebuild b/sec-policy/selinux-kismet/selinux-kismet-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..dd31cb4033bc
--- /dev/null
+++ b/sec-policy/selinux-kismet/selinux-kismet-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-kismet/selinux-kismet-9999.ebuild b/sec-policy/selinux-kismet/selinux-kismet-9999.ebuild
index e6a6ee80b4b9..dd31cb4033bc 100644
--- a/sec-policy/selinux-kismet/selinux-kismet-9999.ebuild
+++ b/sec-policy/selinux-kismet/selinux-kismet-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ksmtuned/Manifest b/sec-policy/selinux-ksmtuned/Manifest
index a16fce82ae03..28e60ae48dba 100644
--- a/sec-policy/selinux-ksmtuned/Manifest
+++ b/sec-policy/selinux-ksmtuned/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-ksmtuned-2.20170204-r1.ebuild 287 SHA256 720aa661b1501d29e17bfd0f55398de77262d89d6309bb57290dc88eea2f2e67 SHA512 3526705b933ca1eb47c7d32f8992098f10c9a2ef4bc551872db4bb945eee130e5e6feac0a5545faba91d450a66e0dfbf5cc6987d29d1159340fe2e06a6f6b6fe WHIRLPOOL b4c0ba0b4c1b381cf3b0e56826dd60e1020ae8104f8e4fd41c5cb083b69ee63c115f3337533901bf36eed5c9950fe47a8b3f0345e321adf13b6e8eff3ebca00e
-EBUILD selinux-ksmtuned-2.20170204-r2.ebuild 285 SHA256 7410000bd55ee94c5431186f9f25fa5b125c10d22355d98a993ef04c6cb93e25 SHA512 a7303c4688b6b45bff719544ed02cb521d842571d68ba2c95bd37787fc34ce470152a08ef4202ca77e5f3c9e1f5d77c92a5ea6af31433ba073dc2e487ce2516f WHIRLPOOL 7502fa68d830b3ff00aafd9474aabf17db64b177545b8cd602a0fd4c4b4a1697cbd14c5d052fe16a44e1e3beddd6979610c625942a1c2e9e9c56d9336157bede
-EBUILD selinux-ksmtuned-2.20170204-r3.ebuild 285 SHA256 7410000bd55ee94c5431186f9f25fa5b125c10d22355d98a993ef04c6cb93e25 SHA512 a7303c4688b6b45bff719544ed02cb521d842571d68ba2c95bd37787fc34ce470152a08ef4202ca77e5f3c9e1f5d77c92a5ea6af31433ba073dc2e487ce2516f WHIRLPOOL 7502fa68d830b3ff00aafd9474aabf17db64b177545b8cd602a0fd4c4b4a1697cbd14c5d052fe16a44e1e3beddd6979610c625942a1c2e9e9c56d9336157bede
-EBUILD selinux-ksmtuned-2.20170204-r4.ebuild 285 SHA256 7410000bd55ee94c5431186f9f25fa5b125c10d22355d98a993ef04c6cb93e25 SHA512 a7303c4688b6b45bff719544ed02cb521d842571d68ba2c95bd37787fc34ce470152a08ef4202ca77e5f3c9e1f5d77c92a5ea6af31433ba073dc2e487ce2516f WHIRLPOOL 7502fa68d830b3ff00aafd9474aabf17db64b177545b8cd602a0fd4c4b4a1697cbd14c5d052fe16a44e1e3beddd6979610c625942a1c2e9e9c56d9336157bede
-EBUILD selinux-ksmtuned-2.20170805-r2.ebuild 285 SHA256 7410000bd55ee94c5431186f9f25fa5b125c10d22355d98a993ef04c6cb93e25 SHA512 a7303c4688b6b45bff719544ed02cb521d842571d68ba2c95bd37787fc34ce470152a08ef4202ca77e5f3c9e1f5d77c92a5ea6af31433ba073dc2e487ce2516f WHIRLPOOL 7502fa68d830b3ff00aafd9474aabf17db64b177545b8cd602a0fd4c4b4a1697cbd14c5d052fe16a44e1e3beddd6979610c625942a1c2e9e9c56d9336157bede
-EBUILD selinux-ksmtuned-9999.ebuild 287 SHA256 720aa661b1501d29e17bfd0f55398de77262d89d6309bb57290dc88eea2f2e67 SHA512 3526705b933ca1eb47c7d32f8992098f10c9a2ef4bc551872db4bb945eee130e5e6feac0a5545faba91d450a66e0dfbf5cc6987d29d1159340fe2e06a6f6b6fe WHIRLPOOL b4c0ba0b4c1b381cf3b0e56826dd60e1020ae8104f8e4fd41c5cb083b69ee63c115f3337533901bf36eed5c9950fe47a8b3f0345e321adf13b6e8eff3ebca00e
+EBUILD selinux-ksmtuned-2.20170204-r1.ebuild 288 SHA256 0e2f1861139276b9dff3e8e7b05b3a601ab96dc1814e6bbab02a937f1db0af6a SHA512 222f62f769ade1f9605fdc246dc541d9e5272b7892ad9da51fd963217d41489fc2a4b56e436f9f2792d14b08cf4b04f8db7cf7adaab55a6aab7f87cf74776cf3 WHIRLPOOL fb210e986c0b2142654f32ecf53ff5ef97b3314bfcc9d377bbf40950e960ec000939f5beeeede39b7030341efac1c18d2a107a664e7dbd2fab0fb9becf53b1c9
+EBUILD selinux-ksmtuned-2.20170204-r2.ebuild 286 SHA256 202b2a89813758e998bebd613a041a59f8657860d648af6011e9a7a201101a99 SHA512 15db5ee76ba57cf0f0597755751ca7ec935ca4c5426daf677af01a3db336848adc7c9d49db361394d51cb5b80d5cfac73b559de4c5318a52a13aeb764081e406 WHIRLPOOL a4f117986030f5c6dbe7f89e4f8a73ef05edfa6851496eb8a13ff9256f5ba63b60eab6e64660484a2acf359fc3d9efa1d63473b91f469c9a3cb275c835dec50b
+EBUILD selinux-ksmtuned-2.20170204-r3.ebuild 286 SHA256 202b2a89813758e998bebd613a041a59f8657860d648af6011e9a7a201101a99 SHA512 15db5ee76ba57cf0f0597755751ca7ec935ca4c5426daf677af01a3db336848adc7c9d49db361394d51cb5b80d5cfac73b559de4c5318a52a13aeb764081e406 WHIRLPOOL a4f117986030f5c6dbe7f89e4f8a73ef05edfa6851496eb8a13ff9256f5ba63b60eab6e64660484a2acf359fc3d9efa1d63473b91f469c9a3cb275c835dec50b
+EBUILD selinux-ksmtuned-2.20170204-r4.ebuild 286 SHA256 202b2a89813758e998bebd613a041a59f8657860d648af6011e9a7a201101a99 SHA512 15db5ee76ba57cf0f0597755751ca7ec935ca4c5426daf677af01a3db336848adc7c9d49db361394d51cb5b80d5cfac73b559de4c5318a52a13aeb764081e406 WHIRLPOOL a4f117986030f5c6dbe7f89e4f8a73ef05edfa6851496eb8a13ff9256f5ba63b60eab6e64660484a2acf359fc3d9efa1d63473b91f469c9a3cb275c835dec50b
+EBUILD selinux-ksmtuned-2.20170805-r2.ebuild 286 SHA256 202b2a89813758e998bebd613a041a59f8657860d648af6011e9a7a201101a99 SHA512 15db5ee76ba57cf0f0597755751ca7ec935ca4c5426daf677af01a3db336848adc7c9d49db361394d51cb5b80d5cfac73b559de4c5318a52a13aeb764081e406 WHIRLPOOL a4f117986030f5c6dbe7f89e4f8a73ef05edfa6851496eb8a13ff9256f5ba63b60eab6e64660484a2acf359fc3d9efa1d63473b91f469c9a3cb275c835dec50b
+EBUILD selinux-ksmtuned-2.20170805-r3.ebuild 288 SHA256 0e2f1861139276b9dff3e8e7b05b3a601ab96dc1814e6bbab02a937f1db0af6a SHA512 222f62f769ade1f9605fdc246dc541d9e5272b7892ad9da51fd963217d41489fc2a4b56e436f9f2792d14b08cf4b04f8db7cf7adaab55a6aab7f87cf74776cf3 WHIRLPOOL fb210e986c0b2142654f32ecf53ff5ef97b3314bfcc9d377bbf40950e960ec000939f5beeeede39b7030341efac1c18d2a107a664e7dbd2fab0fb9becf53b1c9
+EBUILD selinux-ksmtuned-9999.ebuild 288 SHA256 0e2f1861139276b9dff3e8e7b05b3a601ab96dc1814e6bbab02a937f1db0af6a SHA512 222f62f769ade1f9605fdc246dc541d9e5272b7892ad9da51fd963217d41489fc2a4b56e436f9f2792d14b08cf4b04f8db7cf7adaab55a6aab7f87cf74776cf3 WHIRLPOOL fb210e986c0b2142654f32ecf53ff5ef97b3314bfcc9d377bbf40950e960ec000939f5beeeede39b7030341efac1c18d2a107a664e7dbd2fab0fb9becf53b1c9
 MISC ChangeLog 10793 SHA256 0236246e460215ffb080adb3b78d7e4b8d57e223db2c4f6288ed0d8e2cdfd19e SHA512 d8b9785d902d082bf6f44a3f45a719db8dacfe52f7a457191e2d9862b5ebffd39d7a837ba3eee177570913ab38669d4010e2ff74d20e8e1db08d6a404ed1cd0e WHIRLPOOL 4c54037db77254057e2d72f36dcf4eb0d1eba09591864119fc5b5cee299327f27db81336a199cb15bf8b9ad99b54539fe8acc1298162fc580a3869a55f81c76a
 MISC ChangeLog-2015 10103 SHA256 ea90f605cf4e8305f4d74151f1510b4ee2cb632f48c3f974d764895285024a41 SHA512 591ebe9e7f97b1c6d52475d18589358aa51d67fb460054a5bb4935ce498ee7ca48d2952b7ebc571e404b7f1abbe87b1c665a93806e2516816722b50adcc7111e WHIRLPOOL 5c64192261db57d9fdf62ad49d6e276a8d5f225f8d03d916d224f3cef17dc20c64bbea8da210c1ea96433646bf8c963b54688e29d46f3d8550e1ecf01c22fa20
 MISC metadata.xml 318 SHA256 43eeaa22c057f7b1d98b2304b9011ca276f2a07515a976d5f97d16a51e1f0b94 SHA512 2c5d3c14cd6464c30370575797fa54c5b897dfa28b05198324d5b79eb65d9b75a23282469ebc112137274a5ffcd5340e7a688cd9cf1b1f9195d87d6e4e12ae9c WHIRLPOOL 5478fdf9600dae7c429c340e3fb8d8e41c70168af8dc206fbaf8487416da65fafbbaf6da30278dfa8d536557fe6383d56c49ca5ff6eca8a5260e38c975cd9223
diff --git a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20170204-r1.ebuild b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20170204-r1.ebuild
index a1a2e4ef89de..507d008d2d31 100644
--- a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20170204-r2.ebuild b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20170204-r2.ebuild
index 9db23cbf5267..f87f6d8a97db 100644
--- a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20170204-r3.ebuild b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20170204-r3.ebuild
index 9db23cbf5267..f87f6d8a97db 100644
--- a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20170204-r4.ebuild b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20170204-r4.ebuild
index 9db23cbf5267..f87f6d8a97db 100644
--- a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20170805-r2.ebuild b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20170805-r2.ebuild
index 9db23cbf5267..f87f6d8a97db 100644
--- a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20170805-r3.ebuild b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..507d008d2d31
--- /dev/null
+++ b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-ksmtuned/selinux-ksmtuned-9999.ebuild b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-9999.ebuild
index a1a2e4ef89de..507d008d2d31 100644
--- a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-9999.ebuild
+++ b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-kudzu/Manifest b/sec-policy/selinux-kudzu/Manifest
index dd1e63d1b407..3a4d5a31cd9c 100644
--- a/sec-policy/selinux-kudzu/Manifest
+++ b/sec-policy/selinux-kudzu/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-kudzu-2.20170204-r1.ebuild 281 SHA256 8412e68220bac0711abf30d8443fc8de49114ea624b852144fa384936f815fcc SHA512 72a9493b096931b3db463f46a3cbcd313b07b68532d3e07226e10b2077ff85e167ae03ef8595d0af7576eab0e9aee4f927f9fe2d5c237671f99a1b1816564557 WHIRLPOOL 06dc0ed1fe0844d165cc698f20214134075595e5369e38e523247fcb145765b5b3af362f00432537cc3967e3dde1d57d851c907189161f211d3723140f7a9b4a
-EBUILD selinux-kudzu-2.20170204-r2.ebuild 279 SHA256 ea91fd947b81a25ce766e05cb64b0cd52240997082f1e137cd334dadf75188a5 SHA512 cac109ad0e416e935108fcd71f1d6f571f949382ea4d4ef3402bead7bb4de6773f9c7ae285c37ba4c95c863af12790d6c0f78aa1cc96c7a437a68790513ce95a WHIRLPOOL 88aa9f997f9976db94e6fc83067bed777fbe7f310951ac8fe8c20de4d092a65e2a8f81c660e5419363a278cfd9e41ac8d588dd4673a5883eed8c1bfd1af30e30
-EBUILD selinux-kudzu-2.20170204-r3.ebuild 279 SHA256 ea91fd947b81a25ce766e05cb64b0cd52240997082f1e137cd334dadf75188a5 SHA512 cac109ad0e416e935108fcd71f1d6f571f949382ea4d4ef3402bead7bb4de6773f9c7ae285c37ba4c95c863af12790d6c0f78aa1cc96c7a437a68790513ce95a WHIRLPOOL 88aa9f997f9976db94e6fc83067bed777fbe7f310951ac8fe8c20de4d092a65e2a8f81c660e5419363a278cfd9e41ac8d588dd4673a5883eed8c1bfd1af30e30
-EBUILD selinux-kudzu-2.20170204-r4.ebuild 279 SHA256 ea91fd947b81a25ce766e05cb64b0cd52240997082f1e137cd334dadf75188a5 SHA512 cac109ad0e416e935108fcd71f1d6f571f949382ea4d4ef3402bead7bb4de6773f9c7ae285c37ba4c95c863af12790d6c0f78aa1cc96c7a437a68790513ce95a WHIRLPOOL 88aa9f997f9976db94e6fc83067bed777fbe7f310951ac8fe8c20de4d092a65e2a8f81c660e5419363a278cfd9e41ac8d588dd4673a5883eed8c1bfd1af30e30
-EBUILD selinux-kudzu-2.20170805-r2.ebuild 279 SHA256 ea91fd947b81a25ce766e05cb64b0cd52240997082f1e137cd334dadf75188a5 SHA512 cac109ad0e416e935108fcd71f1d6f571f949382ea4d4ef3402bead7bb4de6773f9c7ae285c37ba4c95c863af12790d6c0f78aa1cc96c7a437a68790513ce95a WHIRLPOOL 88aa9f997f9976db94e6fc83067bed777fbe7f310951ac8fe8c20de4d092a65e2a8f81c660e5419363a278cfd9e41ac8d588dd4673a5883eed8c1bfd1af30e30
-EBUILD selinux-kudzu-9999.ebuild 281 SHA256 8412e68220bac0711abf30d8443fc8de49114ea624b852144fa384936f815fcc SHA512 72a9493b096931b3db463f46a3cbcd313b07b68532d3e07226e10b2077ff85e167ae03ef8595d0af7576eab0e9aee4f927f9fe2d5c237671f99a1b1816564557 WHIRLPOOL 06dc0ed1fe0844d165cc698f20214134075595e5369e38e523247fcb145765b5b3af362f00432537cc3967e3dde1d57d851c907189161f211d3723140f7a9b4a
+EBUILD selinux-kudzu-2.20170204-r1.ebuild 282 SHA256 90b8d97491fe275fac9348beced6bc55382ed36e2d3e4027dd88e344a74eecdb SHA512 ee12fec88796a14721984a452b013c8e57812496317b1f66c86cfed89c66d500aa92a954b8d881a285d5e33c629020b3668eec63f0ec3fd83e7821afcd43cce0 WHIRLPOOL 36d3dd69f80ca5140e0c79911a5d9240c122a814e69e33788c09e4b998886970d53c93cedad5a98a130a074b9c9e430e2baec908445a5daaa6aa641d183b022b
+EBUILD selinux-kudzu-2.20170204-r2.ebuild 280 SHA256 0c2caabbb4bc3ba6a283d993fe17406eb949b964e9d655e9d62a5c76cc99c295 SHA512 759032334c68fb10f606457cd17e66f1639e830d0ed6f5def6ee5cb0deddf7e45310ac3e8d5ba00a04f30a7966ca2c1aced33845b09401b097fce37fd7720da9 WHIRLPOOL e9add8eb30dd0e15fe8617e28b024c06a75ba56d7256b20280d30147f2152a241e0ccff20a0494ab50030f508c6693b762f7c5a126cdf0552f08b08b8d43117b
+EBUILD selinux-kudzu-2.20170204-r3.ebuild 280 SHA256 0c2caabbb4bc3ba6a283d993fe17406eb949b964e9d655e9d62a5c76cc99c295 SHA512 759032334c68fb10f606457cd17e66f1639e830d0ed6f5def6ee5cb0deddf7e45310ac3e8d5ba00a04f30a7966ca2c1aced33845b09401b097fce37fd7720da9 WHIRLPOOL e9add8eb30dd0e15fe8617e28b024c06a75ba56d7256b20280d30147f2152a241e0ccff20a0494ab50030f508c6693b762f7c5a126cdf0552f08b08b8d43117b
+EBUILD selinux-kudzu-2.20170204-r4.ebuild 280 SHA256 0c2caabbb4bc3ba6a283d993fe17406eb949b964e9d655e9d62a5c76cc99c295 SHA512 759032334c68fb10f606457cd17e66f1639e830d0ed6f5def6ee5cb0deddf7e45310ac3e8d5ba00a04f30a7966ca2c1aced33845b09401b097fce37fd7720da9 WHIRLPOOL e9add8eb30dd0e15fe8617e28b024c06a75ba56d7256b20280d30147f2152a241e0ccff20a0494ab50030f508c6693b762f7c5a126cdf0552f08b08b8d43117b
+EBUILD selinux-kudzu-2.20170805-r2.ebuild 280 SHA256 0c2caabbb4bc3ba6a283d993fe17406eb949b964e9d655e9d62a5c76cc99c295 SHA512 759032334c68fb10f606457cd17e66f1639e830d0ed6f5def6ee5cb0deddf7e45310ac3e8d5ba00a04f30a7966ca2c1aced33845b09401b097fce37fd7720da9 WHIRLPOOL e9add8eb30dd0e15fe8617e28b024c06a75ba56d7256b20280d30147f2152a241e0ccff20a0494ab50030f508c6693b762f7c5a126cdf0552f08b08b8d43117b
+EBUILD selinux-kudzu-2.20170805-r3.ebuild 282 SHA256 90b8d97491fe275fac9348beced6bc55382ed36e2d3e4027dd88e344a74eecdb SHA512 ee12fec88796a14721984a452b013c8e57812496317b1f66c86cfed89c66d500aa92a954b8d881a285d5e33c629020b3668eec63f0ec3fd83e7821afcd43cce0 WHIRLPOOL 36d3dd69f80ca5140e0c79911a5d9240c122a814e69e33788c09e4b998886970d53c93cedad5a98a130a074b9c9e430e2baec908445a5daaa6aa641d183b022b
+EBUILD selinux-kudzu-9999.ebuild 282 SHA256 90b8d97491fe275fac9348beced6bc55382ed36e2d3e4027dd88e344a74eecdb SHA512 ee12fec88796a14721984a452b013c8e57812496317b1f66c86cfed89c66d500aa92a954b8d881a285d5e33c629020b3668eec63f0ec3fd83e7821afcd43cce0 WHIRLPOOL 36d3dd69f80ca5140e0c79911a5d9240c122a814e69e33788c09e4b998886970d53c93cedad5a98a130a074b9c9e430e2baec908445a5daaa6aa641d183b022b
 MISC ChangeLog 10479 SHA256 27a8faf6e01c8e944c3a8a84c57e338f5536ce193037b5506b86a951433a605c SHA512 18581cd378cbaa9cf00d8db1532382f908c433363eda8905f1de9590699008d725c21b999226895a7618896ce5de7ec41d016e9846964880d66333a8fa7bc90e WHIRLPOOL 83328f66ff8cee1487328500683caad3144206e532caacae50b0b2330967a58aceb22490d74aaece78820c6e5e16a178c91b532be8d071c83975c0bba421aca2
 MISC ChangeLog-2015 9750 SHA256 273f5a2a00563d4a4edc02842db5b66d6645ec852595fa995da7d04bd45a343f SHA512 8746f68f351b3c4beac41ed699b43e4a0c48165d81eb6339d811e061aee227f67d956f6abd67e59600bd4dcb0f0707981b03fc9490900ec075d2b2f217634c86 WHIRLPOOL d8f3ce156c32a88c5ad25ea7ac70d063f9793c2215fd1a9fe78ff07ed4c0f7b1dcb18891403cbf8ff3679fde4b3e50e0814c20f957d357053cea486df973f40d
 MISC metadata.xml 315 SHA256 f4a53953933e7a5e52beef47aa1e104ee7ffa48eea192ba8e819fcc1956d53a2 SHA512 bd0badbc4aa7c515fd361c07c690377e11b17befbc0062be81ea8208ae445ca7f716f2613227e9b16426d12ef6714cf26803dad9d9b524811c8425bfcaa10cc5 WHIRLPOOL 2c8f1e387ea96ebc4f0cbca295300f26bab98cb9eba361c670e7a410d1384262c021f9764af9ab84c13e435853509a5d18d79c49a05123c9fd6d26f0f315f7a3
diff --git a/sec-policy/selinux-kudzu/selinux-kudzu-2.20170204-r1.ebuild b/sec-policy/selinux-kudzu/selinux-kudzu-2.20170204-r1.ebuild
index c8abb9a10335..ac845a64b551 100644
--- a/sec-policy/selinux-kudzu/selinux-kudzu-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-kudzu/selinux-kudzu-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-kudzu/selinux-kudzu-2.20170204-r2.ebuild b/sec-policy/selinux-kudzu/selinux-kudzu-2.20170204-r2.ebuild
index eb54651854c6..2c68ff3064dc 100644
--- a/sec-policy/selinux-kudzu/selinux-kudzu-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-kudzu/selinux-kudzu-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-kudzu/selinux-kudzu-2.20170204-r3.ebuild b/sec-policy/selinux-kudzu/selinux-kudzu-2.20170204-r3.ebuild
index eb54651854c6..2c68ff3064dc 100644
--- a/sec-policy/selinux-kudzu/selinux-kudzu-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-kudzu/selinux-kudzu-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-kudzu/selinux-kudzu-2.20170204-r4.ebuild b/sec-policy/selinux-kudzu/selinux-kudzu-2.20170204-r4.ebuild
index eb54651854c6..2c68ff3064dc 100644
--- a/sec-policy/selinux-kudzu/selinux-kudzu-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-kudzu/selinux-kudzu-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-kudzu/selinux-kudzu-2.20170805-r2.ebuild b/sec-policy/selinux-kudzu/selinux-kudzu-2.20170805-r2.ebuild
index eb54651854c6..2c68ff3064dc 100644
--- a/sec-policy/selinux-kudzu/selinux-kudzu-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-kudzu/selinux-kudzu-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-kudzu/selinux-kudzu-2.20170805-r3.ebuild b/sec-policy/selinux-kudzu/selinux-kudzu-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..ac845a64b551
--- /dev/null
+++ b/sec-policy/selinux-kudzu/selinux-kudzu-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-kudzu/selinux-kudzu-9999.ebuild b/sec-policy/selinux-kudzu/selinux-kudzu-9999.ebuild
index c8abb9a10335..ac845a64b551 100644
--- a/sec-policy/selinux-kudzu/selinux-kudzu-9999.ebuild
+++ b/sec-policy/selinux-kudzu/selinux-kudzu-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ldap/Manifest b/sec-policy/selinux-ldap/Manifest
index 145dfe716825..5b9aa24dde2b 100644
--- a/sec-policy/selinux-ldap/Manifest
+++ b/sec-policy/selinux-ldap/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-ldap-2.20170204-r1.ebuild 279 SHA256 2b7abeb3874826dc23f210835adc882db1db18f781eceddf5b81cc6009a317d7 SHA512 ad21f40e443e4fa99fa9af79e920cabb623017ef8e0f6476a0c06a7ef5bb638fd0c258c70dfd8775570aead7ecd5242b238e86b63e80b2268678bdab6c50e8ba WHIRLPOOL 242a64a265375508dcdad59e42932ff020c121f8a769bfcf121d1539ba841446c6dc8d7669e0542ba91ebd202da10f799c61c4c4f0f73df9dc037548be5e0d4d
-EBUILD selinux-ldap-2.20170204-r2.ebuild 277 SHA256 714d06b9cc4dd67a2af790c9dbec6ba1aecc50b1d5e57cbb9ac374f279c37b2d SHA512 71e868a9858c78988c62e9d4042e389f8e944628cd8171c8e7bc01cab0c4b059b34add213175673cd9e22cc1ace620a814f86d1ba17b67473dec6233a5d03dbb WHIRLPOOL 279b67f9d55461ade236ffcebc2b5963cc070b0ff0eb51f92b3b910245ad9db56b0a438fc31b80083846169f9e3e9f1d847668abc5ce0f70999ff59f7c0c7271
-EBUILD selinux-ldap-2.20170204-r3.ebuild 277 SHA256 714d06b9cc4dd67a2af790c9dbec6ba1aecc50b1d5e57cbb9ac374f279c37b2d SHA512 71e868a9858c78988c62e9d4042e389f8e944628cd8171c8e7bc01cab0c4b059b34add213175673cd9e22cc1ace620a814f86d1ba17b67473dec6233a5d03dbb WHIRLPOOL 279b67f9d55461ade236ffcebc2b5963cc070b0ff0eb51f92b3b910245ad9db56b0a438fc31b80083846169f9e3e9f1d847668abc5ce0f70999ff59f7c0c7271
-EBUILD selinux-ldap-2.20170204-r4.ebuild 277 SHA256 714d06b9cc4dd67a2af790c9dbec6ba1aecc50b1d5e57cbb9ac374f279c37b2d SHA512 71e868a9858c78988c62e9d4042e389f8e944628cd8171c8e7bc01cab0c4b059b34add213175673cd9e22cc1ace620a814f86d1ba17b67473dec6233a5d03dbb WHIRLPOOL 279b67f9d55461ade236ffcebc2b5963cc070b0ff0eb51f92b3b910245ad9db56b0a438fc31b80083846169f9e3e9f1d847668abc5ce0f70999ff59f7c0c7271
-EBUILD selinux-ldap-2.20170805-r2.ebuild 277 SHA256 714d06b9cc4dd67a2af790c9dbec6ba1aecc50b1d5e57cbb9ac374f279c37b2d SHA512 71e868a9858c78988c62e9d4042e389f8e944628cd8171c8e7bc01cab0c4b059b34add213175673cd9e22cc1ace620a814f86d1ba17b67473dec6233a5d03dbb WHIRLPOOL 279b67f9d55461ade236ffcebc2b5963cc070b0ff0eb51f92b3b910245ad9db56b0a438fc31b80083846169f9e3e9f1d847668abc5ce0f70999ff59f7c0c7271
-EBUILD selinux-ldap-9999.ebuild 279 SHA256 2b7abeb3874826dc23f210835adc882db1db18f781eceddf5b81cc6009a317d7 SHA512 ad21f40e443e4fa99fa9af79e920cabb623017ef8e0f6476a0c06a7ef5bb638fd0c258c70dfd8775570aead7ecd5242b238e86b63e80b2268678bdab6c50e8ba WHIRLPOOL 242a64a265375508dcdad59e42932ff020c121f8a769bfcf121d1539ba841446c6dc8d7669e0542ba91ebd202da10f799c61c4c4f0f73df9dc037548be5e0d4d
+EBUILD selinux-ldap-2.20170204-r1.ebuild 280 SHA256 bbde06a98932ed0abc4f08c06a309867835cefe66e48cd7b8acced85193b4d51 SHA512 2f01ba21c0820092847f2b3f8422f0dd9e5882b6ba7d2bcf35b53e8ad600948a897cca20db2fb24b6b98f8fd9116988adcf37ee015cf0583dc9ba9f58b666875 WHIRLPOOL 539de1b3c8ce333ebefc5db7c86a0c285aec6fcc3d6faf88ffab80cbab62d8913abf244df830d37619fff6b7795d8a272df9f41af78b1d515a6388a6ff251512
+EBUILD selinux-ldap-2.20170204-r2.ebuild 278 SHA256 58d592994faad74162a541297926c4398da9e5652c5c2607362324cd10f558ca SHA512 f375443af23c2b3b81b442c86bc3db6514ed392081f8986f02eaa3ae6f848c759b27a50a2240a9664ba165cc83eff25fa044f6237d7ffad6415e88486289bd14 WHIRLPOOL 713729b341ec8bfc2edd3b353d7bef81f75d376b46233ac0ecf8266c62bc2dd0ba880f7ff1f77b62ec5d133a442a5c2bc84b4994dbdf2c3a2eb5ba657ab4978a
+EBUILD selinux-ldap-2.20170204-r3.ebuild 278 SHA256 58d592994faad74162a541297926c4398da9e5652c5c2607362324cd10f558ca SHA512 f375443af23c2b3b81b442c86bc3db6514ed392081f8986f02eaa3ae6f848c759b27a50a2240a9664ba165cc83eff25fa044f6237d7ffad6415e88486289bd14 WHIRLPOOL 713729b341ec8bfc2edd3b353d7bef81f75d376b46233ac0ecf8266c62bc2dd0ba880f7ff1f77b62ec5d133a442a5c2bc84b4994dbdf2c3a2eb5ba657ab4978a
+EBUILD selinux-ldap-2.20170204-r4.ebuild 278 SHA256 58d592994faad74162a541297926c4398da9e5652c5c2607362324cd10f558ca SHA512 f375443af23c2b3b81b442c86bc3db6514ed392081f8986f02eaa3ae6f848c759b27a50a2240a9664ba165cc83eff25fa044f6237d7ffad6415e88486289bd14 WHIRLPOOL 713729b341ec8bfc2edd3b353d7bef81f75d376b46233ac0ecf8266c62bc2dd0ba880f7ff1f77b62ec5d133a442a5c2bc84b4994dbdf2c3a2eb5ba657ab4978a
+EBUILD selinux-ldap-2.20170805-r2.ebuild 278 SHA256 58d592994faad74162a541297926c4398da9e5652c5c2607362324cd10f558ca SHA512 f375443af23c2b3b81b442c86bc3db6514ed392081f8986f02eaa3ae6f848c759b27a50a2240a9664ba165cc83eff25fa044f6237d7ffad6415e88486289bd14 WHIRLPOOL 713729b341ec8bfc2edd3b353d7bef81f75d376b46233ac0ecf8266c62bc2dd0ba880f7ff1f77b62ec5d133a442a5c2bc84b4994dbdf2c3a2eb5ba657ab4978a
+EBUILD selinux-ldap-2.20170805-r3.ebuild 280 SHA256 bbde06a98932ed0abc4f08c06a309867835cefe66e48cd7b8acced85193b4d51 SHA512 2f01ba21c0820092847f2b3f8422f0dd9e5882b6ba7d2bcf35b53e8ad600948a897cca20db2fb24b6b98f8fd9116988adcf37ee015cf0583dc9ba9f58b666875 WHIRLPOOL 539de1b3c8ce333ebefc5db7c86a0c285aec6fcc3d6faf88ffab80cbab62d8913abf244df830d37619fff6b7795d8a272df9f41af78b1d515a6388a6ff251512
+EBUILD selinux-ldap-9999.ebuild 280 SHA256 bbde06a98932ed0abc4f08c06a309867835cefe66e48cd7b8acced85193b4d51 SHA512 2f01ba21c0820092847f2b3f8422f0dd9e5882b6ba7d2bcf35b53e8ad600948a897cca20db2fb24b6b98f8fd9116988adcf37ee015cf0583dc9ba9f58b666875 WHIRLPOOL 539de1b3c8ce333ebefc5db7c86a0c285aec6fcc3d6faf88ffab80cbab62d8913abf244df830d37619fff6b7795d8a272df9f41af78b1d515a6388a6ff251512
 MISC ChangeLog 10387 SHA256 d8faa1c70fbc6c8c0dc4c21cd5d19ed99c56dd9433af8dee8aefbdbde2787695 SHA512 a4373bd433a3c41e6024c8116f113e2da9399fcebb075950abaa88c9f99b7cd28528ce59fceabca39e761c01efb8b9117d2d365293bb16372c7f05c85fb4ae33 WHIRLPOOL 468281601a57f8d64f5906accbfb834991c72e2a09faaded240a959290bf3dfdbbd9f6e9d609a9ea854f05a3bc79b1c16ec4f2202649a83450dd78d62e31a119
 MISC ChangeLog-2015 13034 SHA256 ae5b59afcb72f07180e16bbabf0f3a66e71ca23c4b984e47013280b2ec2f5071 SHA512 cef473794c13e734bcaceada7ee5a11f5f06357058dc8b1a6cfa832a8248b04c08bb4e41046bd7a80f4b7eadf299a838599526308d21fcd0789ecd2871c407b5 WHIRLPOOL 3cfa7355fe3d1580d45f5ec8e09fe7d637d4226caa3e9a6be35ec396c74ba5885b98713e8c3380e51f9adb69c21deba6ea6f09927a807129f314161f0fe891af
 MISC metadata.xml 318 SHA256 5a6f270062fa3cdf55499392f49feffe4fe1472ea5537e9201119a1048adcce7 SHA512 636c91232655cac886c240aa32b8280ea47601e5c55eeb7d7a202caad891e0d149e895406b414302d733868182896f9a7ff68a09a2a406689de7b8ad018771d0 WHIRLPOOL 77faaf4d585b805ee378a5d683691af5a9cce39c39b1a8f5a781d972f5069d2bf12aa594a55770b4a4412cfb5bf23006369c67e4b2dc2a3434bc8a9457dcb212
diff --git a/sec-policy/selinux-ldap/selinux-ldap-2.20170204-r1.ebuild b/sec-policy/selinux-ldap/selinux-ldap-2.20170204-r1.ebuild
index 015c33570e70..c6e413af1000 100644
--- a/sec-policy/selinux-ldap/selinux-ldap-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-ldap/selinux-ldap-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ldap/selinux-ldap-2.20170204-r2.ebuild b/sec-policy/selinux-ldap/selinux-ldap-2.20170204-r2.ebuild
index 8fd6b18b22e4..66544777383b 100644
--- a/sec-policy/selinux-ldap/selinux-ldap-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-ldap/selinux-ldap-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ldap/selinux-ldap-2.20170204-r3.ebuild b/sec-policy/selinux-ldap/selinux-ldap-2.20170204-r3.ebuild
index 8fd6b18b22e4..66544777383b 100644
--- a/sec-policy/selinux-ldap/selinux-ldap-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-ldap/selinux-ldap-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ldap/selinux-ldap-2.20170204-r4.ebuild b/sec-policy/selinux-ldap/selinux-ldap-2.20170204-r4.ebuild
index 8fd6b18b22e4..66544777383b 100644
--- a/sec-policy/selinux-ldap/selinux-ldap-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-ldap/selinux-ldap-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ldap/selinux-ldap-2.20170805-r2.ebuild b/sec-policy/selinux-ldap/selinux-ldap-2.20170805-r2.ebuild
index 8fd6b18b22e4..66544777383b 100644
--- a/sec-policy/selinux-ldap/selinux-ldap-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-ldap/selinux-ldap-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ldap/selinux-ldap-2.20170805-r3.ebuild b/sec-policy/selinux-ldap/selinux-ldap-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..c6e413af1000
--- /dev/null
+++ b/sec-policy/selinux-ldap/selinux-ldap-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-ldap/selinux-ldap-9999.ebuild b/sec-policy/selinux-ldap/selinux-ldap-9999.ebuild
index 015c33570e70..c6e413af1000 100644
--- a/sec-policy/selinux-ldap/selinux-ldap-9999.ebuild
+++ b/sec-policy/selinux-ldap/selinux-ldap-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-links/Manifest b/sec-policy/selinux-links/Manifest
index 1fa6ffcffb16..3eeec3d1eed2 100644
--- a/sec-policy/selinux-links/Manifest
+++ b/sec-policy/selinux-links/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-links-2.20170204-r1.ebuild 281 SHA256 6939d06d25b7291566c97d962710161f07177f17a7af044d289d1eac9b48275c SHA512 19a1705778d597bc0ed19b6ac3920fee7757c4fddc5919549ffbb48edc67aa311ef6472a35b0d38e1719c57c2b56010fc50d23fd85c70c783b95709cdf8f2743 WHIRLPOOL bb07ab24d8e2208239b2aee4a79b2284c5e4f9bee54d03662bfdeda274b71bb3f86a0514baee55adcb107cdd89697c5b818ccff587c952decb55d013f6d1b691
-EBUILD selinux-links-2.20170204-r2.ebuild 279 SHA256 0f8349c159deae698c47d220bb4088323b8827b821d339ea8d0c21b33b9c1e74 SHA512 8f4e91d04b5c92b973d10b33cc146bad17990021b36b92d64348f3daed286d9da3e1f33e83a0a713aa495a749b7a9874a20153d725aa3b36099beb8c52a1cc15 WHIRLPOOL 963618f589d57e37be6ed528818e51493cd1fba54fee070c34415df041d9783fd60e1a306931b6054183a22894f99b20b09070479c1b70f94272803356a10330
-EBUILD selinux-links-2.20170204-r3.ebuild 279 SHA256 0f8349c159deae698c47d220bb4088323b8827b821d339ea8d0c21b33b9c1e74 SHA512 8f4e91d04b5c92b973d10b33cc146bad17990021b36b92d64348f3daed286d9da3e1f33e83a0a713aa495a749b7a9874a20153d725aa3b36099beb8c52a1cc15 WHIRLPOOL 963618f589d57e37be6ed528818e51493cd1fba54fee070c34415df041d9783fd60e1a306931b6054183a22894f99b20b09070479c1b70f94272803356a10330
-EBUILD selinux-links-2.20170204-r4.ebuild 279 SHA256 0f8349c159deae698c47d220bb4088323b8827b821d339ea8d0c21b33b9c1e74 SHA512 8f4e91d04b5c92b973d10b33cc146bad17990021b36b92d64348f3daed286d9da3e1f33e83a0a713aa495a749b7a9874a20153d725aa3b36099beb8c52a1cc15 WHIRLPOOL 963618f589d57e37be6ed528818e51493cd1fba54fee070c34415df041d9783fd60e1a306931b6054183a22894f99b20b09070479c1b70f94272803356a10330
-EBUILD selinux-links-2.20170805-r2.ebuild 279 SHA256 0f8349c159deae698c47d220bb4088323b8827b821d339ea8d0c21b33b9c1e74 SHA512 8f4e91d04b5c92b973d10b33cc146bad17990021b36b92d64348f3daed286d9da3e1f33e83a0a713aa495a749b7a9874a20153d725aa3b36099beb8c52a1cc15 WHIRLPOOL 963618f589d57e37be6ed528818e51493cd1fba54fee070c34415df041d9783fd60e1a306931b6054183a22894f99b20b09070479c1b70f94272803356a10330
-EBUILD selinux-links-9999.ebuild 281 SHA256 6939d06d25b7291566c97d962710161f07177f17a7af044d289d1eac9b48275c SHA512 19a1705778d597bc0ed19b6ac3920fee7757c4fddc5919549ffbb48edc67aa311ef6472a35b0d38e1719c57c2b56010fc50d23fd85c70c783b95709cdf8f2743 WHIRLPOOL bb07ab24d8e2208239b2aee4a79b2284c5e4f9bee54d03662bfdeda274b71bb3f86a0514baee55adcb107cdd89697c5b818ccff587c952decb55d013f6d1b691
+EBUILD selinux-links-2.20170204-r1.ebuild 282 SHA256 fb9f99e07a14eb5e78362c32e3a7fa6a9bc7b97dea2e05ca9b5b74874c96407c SHA512 90f19f11e3c20c270fe050e1516d8cb153ce77a8f284e926cd82342e05d3b06623fac2c2bf96df63b10f9be6ace3fb0a4fe4348b4e8ac17eb1848a3d384f79d9 WHIRLPOOL 78cee83578c26eb41f9e7d2b73da617506dd5870a571aa3c2bf72ba8e6b75fd996c5c23d8301241fb0502f2c338cb55327ccc0aac95d6606dc2a51cefb39839b
+EBUILD selinux-links-2.20170204-r2.ebuild 280 SHA256 25c1087221abfdc030212858c3d35bcf5bda43644afb9d0605e145b81e74379b SHA512 81d7c9ea511c1e1c6aa964ed94966b35d1ab0d7b193697333a5898070941355ac562859443410488d53d0706e66400e886338dd5340e09b05d3daed1c0ce0f45 WHIRLPOOL d72f6af3f039cda5efe9e3484168a549a89ded2b240abef930169675df42774c1fd988c05d3763f769af827d426cdce88e4867265f7cf1506a56374fb803a71d
+EBUILD selinux-links-2.20170204-r3.ebuild 280 SHA256 25c1087221abfdc030212858c3d35bcf5bda43644afb9d0605e145b81e74379b SHA512 81d7c9ea511c1e1c6aa964ed94966b35d1ab0d7b193697333a5898070941355ac562859443410488d53d0706e66400e886338dd5340e09b05d3daed1c0ce0f45 WHIRLPOOL d72f6af3f039cda5efe9e3484168a549a89ded2b240abef930169675df42774c1fd988c05d3763f769af827d426cdce88e4867265f7cf1506a56374fb803a71d
+EBUILD selinux-links-2.20170204-r4.ebuild 280 SHA256 25c1087221abfdc030212858c3d35bcf5bda43644afb9d0605e145b81e74379b SHA512 81d7c9ea511c1e1c6aa964ed94966b35d1ab0d7b193697333a5898070941355ac562859443410488d53d0706e66400e886338dd5340e09b05d3daed1c0ce0f45 WHIRLPOOL d72f6af3f039cda5efe9e3484168a549a89ded2b240abef930169675df42774c1fd988c05d3763f769af827d426cdce88e4867265f7cf1506a56374fb803a71d
+EBUILD selinux-links-2.20170805-r2.ebuild 280 SHA256 25c1087221abfdc030212858c3d35bcf5bda43644afb9d0605e145b81e74379b SHA512 81d7c9ea511c1e1c6aa964ed94966b35d1ab0d7b193697333a5898070941355ac562859443410488d53d0706e66400e886338dd5340e09b05d3daed1c0ce0f45 WHIRLPOOL d72f6af3f039cda5efe9e3484168a549a89ded2b240abef930169675df42774c1fd988c05d3763f769af827d426cdce88e4867265f7cf1506a56374fb803a71d
+EBUILD selinux-links-2.20170805-r3.ebuild 282 SHA256 fb9f99e07a14eb5e78362c32e3a7fa6a9bc7b97dea2e05ca9b5b74874c96407c SHA512 90f19f11e3c20c270fe050e1516d8cb153ce77a8f284e926cd82342e05d3b06623fac2c2bf96df63b10f9be6ace3fb0a4fe4348b4e8ac17eb1848a3d384f79d9 WHIRLPOOL 78cee83578c26eb41f9e7d2b73da617506dd5870a571aa3c2bf72ba8e6b75fd996c5c23d8301241fb0502f2c338cb55327ccc0aac95d6606dc2a51cefb39839b
+EBUILD selinux-links-9999.ebuild 282 SHA256 fb9f99e07a14eb5e78362c32e3a7fa6a9bc7b97dea2e05ca9b5b74874c96407c SHA512 90f19f11e3c20c270fe050e1516d8cb153ce77a8f284e926cd82342e05d3b06623fac2c2bf96df63b10f9be6ace3fb0a4fe4348b4e8ac17eb1848a3d384f79d9 WHIRLPOOL 78cee83578c26eb41f9e7d2b73da617506dd5870a571aa3c2bf72ba8e6b75fd996c5c23d8301241fb0502f2c338cb55327ccc0aac95d6606dc2a51cefb39839b
 MISC ChangeLog 10479 SHA256 84e2d30354c1b8c388596168a1f5844f6dcec0ee41b6983c5b35a905480f0218 SHA512 901a4771f961b88ebfaf761ad976e9edc0dad0e6f28d7437ee463da8430e5165121efdcfe73ab3c306e67ea49eba9ca50d930d5023df52fc6c8f671aee4bdd77 WHIRLPOOL 43551efbc804d7f18d4cb6fcbcc4c4da32692384d6bdfa0bb796f4d7f020c8b68526e71b031945e0c508b9971e5554fa8ac0b48282824160da0922e2004cf6af
 MISC ChangeLog-2015 10009 SHA256 4e78dd5fda7f236431fa064fed5e0d54e92471dd674ef053a3e9d5917ecfbc10 SHA512 8ff457c9125960fd8c3b03ef8cbdec258648e8f8c5c1cb560b76ea8e4e6a7ab3eb933efc5878c6d612bc77a0655a53e8fc545ac1d23c6c02dca04a8a566ca259 WHIRLPOOL 1cf3ca7a07906a677b07a01171e830ef4ea44b9ce72a8b932627f81012f1f927340f9a19154a501a4f3d0d7a7e3cc29f32f0d53c8665e11cac59900de1449429
 MISC metadata.xml 315 SHA256 bcfbbf16a1984075b27148879c4646512bac4db45d033df8555cbc17cd9c33eb SHA512 7424e06fb28587f673f2e510b5b15f3d88bcfe6502870fb295219069950c4496254f40d8124f4e49029ea3a52c7864ec3c8623de21c6e845940f22cdf5f71e8a WHIRLPOOL 41753299ce05e5d7abe733aebd272bb32568c2763ec577198dce9aa6b1e58a7cca70ba22f25c2b56157763499e5700582ec8cb8a0cca81acc62f28113d8ccf76
diff --git a/sec-policy/selinux-links/selinux-links-2.20170204-r1.ebuild b/sec-policy/selinux-links/selinux-links-2.20170204-r1.ebuild
index 7e2f53b40a3c..0bcedfffe5dd 100644
--- a/sec-policy/selinux-links/selinux-links-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-links/selinux-links-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-links/selinux-links-2.20170204-r2.ebuild b/sec-policy/selinux-links/selinux-links-2.20170204-r2.ebuild
index bb4e460da50d..0ff1679a2579 100644
--- a/sec-policy/selinux-links/selinux-links-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-links/selinux-links-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-links/selinux-links-2.20170204-r3.ebuild b/sec-policy/selinux-links/selinux-links-2.20170204-r3.ebuild
index bb4e460da50d..0ff1679a2579 100644
--- a/sec-policy/selinux-links/selinux-links-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-links/selinux-links-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-links/selinux-links-2.20170204-r4.ebuild b/sec-policy/selinux-links/selinux-links-2.20170204-r4.ebuild
index bb4e460da50d..0ff1679a2579 100644
--- a/sec-policy/selinux-links/selinux-links-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-links/selinux-links-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-links/selinux-links-2.20170805-r2.ebuild b/sec-policy/selinux-links/selinux-links-2.20170805-r2.ebuild
index bb4e460da50d..0ff1679a2579 100644
--- a/sec-policy/selinux-links/selinux-links-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-links/selinux-links-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-links/selinux-links-2.20170805-r3.ebuild b/sec-policy/selinux-links/selinux-links-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..0bcedfffe5dd
--- /dev/null
+++ b/sec-policy/selinux-links/selinux-links-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-links/selinux-links-9999.ebuild b/sec-policy/selinux-links/selinux-links-9999.ebuild
index 7e2f53b40a3c..0bcedfffe5dd 100644
--- a/sec-policy/selinux-links/selinux-links-9999.ebuild
+++ b/sec-policy/selinux-links/selinux-links-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-lircd/Manifest b/sec-policy/selinux-lircd/Manifest
index affc148e4613..8452c66df9fd 100644
--- a/sec-policy/selinux-lircd/Manifest
+++ b/sec-policy/selinux-lircd/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-lircd-2.20170204-r1.ebuild 281 SHA256 aa17f30baacf2ba5d976446a77f1fc9d1deb971a033848be136b4b01f6934cbe SHA512 3ac1aa01251cc95d3eac86bb16e78dce0996251eb15e7a094224d2c0519f35636e93676897c5a701210982976182eb803ec64214c85aa0450fdd2b84e2a1835d WHIRLPOOL 433ed443ab5f982be2407f04a1b8df7962ce174354bb1ac76e65dd49a826054c22ac0b26552e15fdd5d1fb3e9c8c7132d5ea1269d2ef50b5b6258b868dae8e79
-EBUILD selinux-lircd-2.20170204-r2.ebuild 279 SHA256 0442be1c5d6171d3ab177485e9e950a9a247f114b0e6d56e2207b4626bf3965d SHA512 21ecd70432b85f694ec9d6ce4cbfe3c9321302f03d4701a9d5a561ec03d28416c57a208a3db241335f1bf14fe80b35b21360f2cab95798bb1704d629a5d7f5be WHIRLPOOL 8f3aa5ca0fa2ab9335eaa6467a2704d275f55a0f18038dd7b49074727a1ca7032b0e4ae228d991a714687c77518ef405d966730d1c08dfb774ed25543bf40893
-EBUILD selinux-lircd-2.20170204-r3.ebuild 279 SHA256 0442be1c5d6171d3ab177485e9e950a9a247f114b0e6d56e2207b4626bf3965d SHA512 21ecd70432b85f694ec9d6ce4cbfe3c9321302f03d4701a9d5a561ec03d28416c57a208a3db241335f1bf14fe80b35b21360f2cab95798bb1704d629a5d7f5be WHIRLPOOL 8f3aa5ca0fa2ab9335eaa6467a2704d275f55a0f18038dd7b49074727a1ca7032b0e4ae228d991a714687c77518ef405d966730d1c08dfb774ed25543bf40893
-EBUILD selinux-lircd-2.20170204-r4.ebuild 279 SHA256 0442be1c5d6171d3ab177485e9e950a9a247f114b0e6d56e2207b4626bf3965d SHA512 21ecd70432b85f694ec9d6ce4cbfe3c9321302f03d4701a9d5a561ec03d28416c57a208a3db241335f1bf14fe80b35b21360f2cab95798bb1704d629a5d7f5be WHIRLPOOL 8f3aa5ca0fa2ab9335eaa6467a2704d275f55a0f18038dd7b49074727a1ca7032b0e4ae228d991a714687c77518ef405d966730d1c08dfb774ed25543bf40893
-EBUILD selinux-lircd-2.20170805-r2.ebuild 279 SHA256 0442be1c5d6171d3ab177485e9e950a9a247f114b0e6d56e2207b4626bf3965d SHA512 21ecd70432b85f694ec9d6ce4cbfe3c9321302f03d4701a9d5a561ec03d28416c57a208a3db241335f1bf14fe80b35b21360f2cab95798bb1704d629a5d7f5be WHIRLPOOL 8f3aa5ca0fa2ab9335eaa6467a2704d275f55a0f18038dd7b49074727a1ca7032b0e4ae228d991a714687c77518ef405d966730d1c08dfb774ed25543bf40893
-EBUILD selinux-lircd-9999.ebuild 281 SHA256 aa17f30baacf2ba5d976446a77f1fc9d1deb971a033848be136b4b01f6934cbe SHA512 3ac1aa01251cc95d3eac86bb16e78dce0996251eb15e7a094224d2c0519f35636e93676897c5a701210982976182eb803ec64214c85aa0450fdd2b84e2a1835d WHIRLPOOL 433ed443ab5f982be2407f04a1b8df7962ce174354bb1ac76e65dd49a826054c22ac0b26552e15fdd5d1fb3e9c8c7132d5ea1269d2ef50b5b6258b868dae8e79
+EBUILD selinux-lircd-2.20170204-r1.ebuild 282 SHA256 defab764904ae67da816f0f2e38ce88ff2eb563722d2b2482815aa952a7bba22 SHA512 6f6c5fdd7aee5686c7e80b2b2da554f918240714924be114363a75da0ccb5e59cb762af10196ae0861ba79c1f5ef11e9833d7d0eee74be164b69ba3e3b581dde WHIRLPOOL 94ff16087c5acd5fce26e38d0e097e80b79f4a74f8459388735eac21d4f960ea64d880143987996196db773c48add5ab1e61a07341868a6de95fbe8c39edc121
+EBUILD selinux-lircd-2.20170204-r2.ebuild 280 SHA256 f8538c39ed44afa0b7fdf91199a210186efe47ec273b48b135e9e47bc0f2f8d1 SHA512 7d4ac7c6ff7a7d720a4e6c56785e729858a1260232d80198a3a13765f533808ec5e9287247b792b5417d19daca98294b03da2f1541c3591682ee0d40fb5c9dfd WHIRLPOOL c60b15a73727173170287adb45887776df14599a34165267da8ff43fabb0688c27f75638237109e61f6a3deebeac208014cde21e13a5b7876b53c2da2a62d913
+EBUILD selinux-lircd-2.20170204-r3.ebuild 280 SHA256 f8538c39ed44afa0b7fdf91199a210186efe47ec273b48b135e9e47bc0f2f8d1 SHA512 7d4ac7c6ff7a7d720a4e6c56785e729858a1260232d80198a3a13765f533808ec5e9287247b792b5417d19daca98294b03da2f1541c3591682ee0d40fb5c9dfd WHIRLPOOL c60b15a73727173170287adb45887776df14599a34165267da8ff43fabb0688c27f75638237109e61f6a3deebeac208014cde21e13a5b7876b53c2da2a62d913
+EBUILD selinux-lircd-2.20170204-r4.ebuild 280 SHA256 f8538c39ed44afa0b7fdf91199a210186efe47ec273b48b135e9e47bc0f2f8d1 SHA512 7d4ac7c6ff7a7d720a4e6c56785e729858a1260232d80198a3a13765f533808ec5e9287247b792b5417d19daca98294b03da2f1541c3591682ee0d40fb5c9dfd WHIRLPOOL c60b15a73727173170287adb45887776df14599a34165267da8ff43fabb0688c27f75638237109e61f6a3deebeac208014cde21e13a5b7876b53c2da2a62d913
+EBUILD selinux-lircd-2.20170805-r2.ebuild 280 SHA256 f8538c39ed44afa0b7fdf91199a210186efe47ec273b48b135e9e47bc0f2f8d1 SHA512 7d4ac7c6ff7a7d720a4e6c56785e729858a1260232d80198a3a13765f533808ec5e9287247b792b5417d19daca98294b03da2f1541c3591682ee0d40fb5c9dfd WHIRLPOOL c60b15a73727173170287adb45887776df14599a34165267da8ff43fabb0688c27f75638237109e61f6a3deebeac208014cde21e13a5b7876b53c2da2a62d913
+EBUILD selinux-lircd-2.20170805-r3.ebuild 282 SHA256 defab764904ae67da816f0f2e38ce88ff2eb563722d2b2482815aa952a7bba22 SHA512 6f6c5fdd7aee5686c7e80b2b2da554f918240714924be114363a75da0ccb5e59cb762af10196ae0861ba79c1f5ef11e9833d7d0eee74be164b69ba3e3b581dde WHIRLPOOL 94ff16087c5acd5fce26e38d0e097e80b79f4a74f8459388735eac21d4f960ea64d880143987996196db773c48add5ab1e61a07341868a6de95fbe8c39edc121
+EBUILD selinux-lircd-9999.ebuild 282 SHA256 defab764904ae67da816f0f2e38ce88ff2eb563722d2b2482815aa952a7bba22 SHA512 6f6c5fdd7aee5686c7e80b2b2da554f918240714924be114363a75da0ccb5e59cb762af10196ae0861ba79c1f5ef11e9833d7d0eee74be164b69ba3e3b581dde WHIRLPOOL 94ff16087c5acd5fce26e38d0e097e80b79f4a74f8459388735eac21d4f960ea64d880143987996196db773c48add5ab1e61a07341868a6de95fbe8c39edc121
 MISC ChangeLog 10479 SHA256 7ff67db0ad08ffd3671addc3fda2b8be44296d8f4b97fccfef69f010db8a175b SHA512 78e4e2cdefa831c3fe90677a1c90b7f01cca3a2dda372c627747b598c137afbd219ce5ec1e5665ffae6f195c1cc2711476126b3616bc63ae46e56b29b2e38bdc WHIRLPOOL bb026c777de6577e5db44f60965c7b89ce26e8ca692a662d0b33de8dba114fd8238369e3f000cdf3d2516b5364aa91acc3da8006aa9be467fb984b82f041084a
 MISC ChangeLog-2015 9750 SHA256 63408fa26fc99a53577a4415413205f13b47cefce13b9c856786b47a9e4dc8bc SHA512 a2a042a21402fcc964b42aa8193d5e4741dc16bc16940b75d2a851add9624b57286b3c7c84f5941a6fd8304439ee3cd89dfbcd3e4fadf05e5819610497f227bf WHIRLPOOL db2d48f8e4b422067b359bc8c3ae5c515962f632dfd7931ac985106bb2300f21998b6b73632e00e0da24c9a765e57296f30173cda30415f0857ce517e60290a0
 MISC metadata.xml 315 SHA256 d8899be6619a4d47a60166bc5441226d5f44a8a4ca515b4ef075869d27f6025d SHA512 9d04fdc81f5f216b29dd4b7c1a1a88f0b112bb1eb713b75b67b33db0ebfbc82c71572515347febcb2c71bf843e8422100c5f1da33b836b4612900231459719e7 WHIRLPOOL 37659786b6cb7a2ed6bf7fa42f85fde1dabd15e841a114820222ad501bff64bb71feca550281f806f564b279f770edd49a1316e0455e7394136a375b953c5120
diff --git a/sec-policy/selinux-lircd/selinux-lircd-2.20170204-r1.ebuild b/sec-policy/selinux-lircd/selinux-lircd-2.20170204-r1.ebuild
index 0863cb071790..523955cf2879 100644
--- a/sec-policy/selinux-lircd/selinux-lircd-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-lircd/selinux-lircd-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-lircd/selinux-lircd-2.20170204-r2.ebuild b/sec-policy/selinux-lircd/selinux-lircd-2.20170204-r2.ebuild
index 5d32d51ba74d..366e54bdc751 100644
--- a/sec-policy/selinux-lircd/selinux-lircd-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-lircd/selinux-lircd-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-lircd/selinux-lircd-2.20170204-r3.ebuild b/sec-policy/selinux-lircd/selinux-lircd-2.20170204-r3.ebuild
index 5d32d51ba74d..366e54bdc751 100644
--- a/sec-policy/selinux-lircd/selinux-lircd-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-lircd/selinux-lircd-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-lircd/selinux-lircd-2.20170204-r4.ebuild b/sec-policy/selinux-lircd/selinux-lircd-2.20170204-r4.ebuild
index 5d32d51ba74d..366e54bdc751 100644
--- a/sec-policy/selinux-lircd/selinux-lircd-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-lircd/selinux-lircd-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-lircd/selinux-lircd-2.20170805-r2.ebuild b/sec-policy/selinux-lircd/selinux-lircd-2.20170805-r2.ebuild
index 5d32d51ba74d..366e54bdc751 100644
--- a/sec-policy/selinux-lircd/selinux-lircd-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-lircd/selinux-lircd-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-lircd/selinux-lircd-2.20170805-r3.ebuild b/sec-policy/selinux-lircd/selinux-lircd-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..523955cf2879
--- /dev/null
+++ b/sec-policy/selinux-lircd/selinux-lircd-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-lircd/selinux-lircd-9999.ebuild b/sec-policy/selinux-lircd/selinux-lircd-9999.ebuild
index 0863cb071790..523955cf2879 100644
--- a/sec-policy/selinux-lircd/selinux-lircd-9999.ebuild
+++ b/sec-policy/selinux-lircd/selinux-lircd-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-loadkeys/Manifest b/sec-policy/selinux-loadkeys/Manifest
index 21c50d508af0..5f93cfd3c058 100644
--- a/sec-policy/selinux-loadkeys/Manifest
+++ b/sec-policy/selinux-loadkeys/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-loadkeys-2.20170204-r1.ebuild 287 SHA256 d8db9abf2923fea4a9cb42c75ec08d3b072b6cb0c09040c5b5a730b504ba9b77 SHA512 d9cf92e7c0458067a656febf8c87fe9a84fdec0775f0b82d8e7e567d623cf790992d743c11d27a0e235a2557e4cb9c930bf9b090ab3162565c8e5b320a30ba9f WHIRLPOOL f2bf6fed401798e9b3cc6eeab7f323bec1dcf7b3759def7b6227e23904ec51dff68976d026e6a3e490dac8c8f85b116f782a9fa89b0d5f265d1af0946f1b6b2f
-EBUILD selinux-loadkeys-2.20170204-r2.ebuild 285 SHA256 95ac4354662d98028b344c267b55a6f3a7ab0f4c2360fca2e51b1070fcb0eb44 SHA512 023b05a0c36c9965246b698c82c4260998163ab6a0d5567c9a0629f66a556f164553c23963977474b8ac50dd0f3843cd74aed328d7dfc12fc1e2f97df09fb45f WHIRLPOOL 5cf66c9b1987009d726fe949521e61bdba2af2e90648d667d09486fe805d8cac55d140bd63074d0159cacd8210d2c1bccaf4b7147323df23277531504afaf4eb
-EBUILD selinux-loadkeys-2.20170204-r3.ebuild 285 SHA256 95ac4354662d98028b344c267b55a6f3a7ab0f4c2360fca2e51b1070fcb0eb44 SHA512 023b05a0c36c9965246b698c82c4260998163ab6a0d5567c9a0629f66a556f164553c23963977474b8ac50dd0f3843cd74aed328d7dfc12fc1e2f97df09fb45f WHIRLPOOL 5cf66c9b1987009d726fe949521e61bdba2af2e90648d667d09486fe805d8cac55d140bd63074d0159cacd8210d2c1bccaf4b7147323df23277531504afaf4eb
-EBUILD selinux-loadkeys-2.20170204-r4.ebuild 285 SHA256 95ac4354662d98028b344c267b55a6f3a7ab0f4c2360fca2e51b1070fcb0eb44 SHA512 023b05a0c36c9965246b698c82c4260998163ab6a0d5567c9a0629f66a556f164553c23963977474b8ac50dd0f3843cd74aed328d7dfc12fc1e2f97df09fb45f WHIRLPOOL 5cf66c9b1987009d726fe949521e61bdba2af2e90648d667d09486fe805d8cac55d140bd63074d0159cacd8210d2c1bccaf4b7147323df23277531504afaf4eb
-EBUILD selinux-loadkeys-2.20170805-r2.ebuild 285 SHA256 95ac4354662d98028b344c267b55a6f3a7ab0f4c2360fca2e51b1070fcb0eb44 SHA512 023b05a0c36c9965246b698c82c4260998163ab6a0d5567c9a0629f66a556f164553c23963977474b8ac50dd0f3843cd74aed328d7dfc12fc1e2f97df09fb45f WHIRLPOOL 5cf66c9b1987009d726fe949521e61bdba2af2e90648d667d09486fe805d8cac55d140bd63074d0159cacd8210d2c1bccaf4b7147323df23277531504afaf4eb
-EBUILD selinux-loadkeys-9999.ebuild 287 SHA256 d8db9abf2923fea4a9cb42c75ec08d3b072b6cb0c09040c5b5a730b504ba9b77 SHA512 d9cf92e7c0458067a656febf8c87fe9a84fdec0775f0b82d8e7e567d623cf790992d743c11d27a0e235a2557e4cb9c930bf9b090ab3162565c8e5b320a30ba9f WHIRLPOOL f2bf6fed401798e9b3cc6eeab7f323bec1dcf7b3759def7b6227e23904ec51dff68976d026e6a3e490dac8c8f85b116f782a9fa89b0d5f265d1af0946f1b6b2f
+EBUILD selinux-loadkeys-2.20170204-r1.ebuild 288 SHA256 ea7afef6ea53dfcf07d6fb66779b8a56a47ee4fd3c5f7ce79e8cfd2b2e181a16 SHA512 cc217920009519a39dc64ef71640f6ffbf8d61c58182c5d81ae668a7575abc6060b2902a6c3c050d51d936eedf4eddbfb7567a0b3ddb9013b99acdfb73705093 WHIRLPOOL 7170b20a90d7cf2bd3f72d473350444d9d7c5a5a777b7c11a945fe86d53d1ebea8f22317a96826c4071f640e585cdf2cd34244ded447e7ed34a99721e2684451
+EBUILD selinux-loadkeys-2.20170204-r2.ebuild 286 SHA256 51d3b5aaf54c1d151eb7a21a5fe886874ba1d59cfcc50affe90b52797e9dbd51 SHA512 d23e7f69005505b870ccfa59fe8b14fd095aa14c264cd3b81008dea9cdccdabde90fd51ecb7217f3433f9c05eef8b6eb51023ea86c3e8722fbc3305bc19aa2e2 WHIRLPOOL 65121f641abbd2523bfe6f6a10002a8d83b495f188224c50ac08a5a5d54a247846ffb502ce5514a5f1dde095d74fd48f415bd075b94a1c8ccc596afb8db47a86
+EBUILD selinux-loadkeys-2.20170204-r3.ebuild 286 SHA256 51d3b5aaf54c1d151eb7a21a5fe886874ba1d59cfcc50affe90b52797e9dbd51 SHA512 d23e7f69005505b870ccfa59fe8b14fd095aa14c264cd3b81008dea9cdccdabde90fd51ecb7217f3433f9c05eef8b6eb51023ea86c3e8722fbc3305bc19aa2e2 WHIRLPOOL 65121f641abbd2523bfe6f6a10002a8d83b495f188224c50ac08a5a5d54a247846ffb502ce5514a5f1dde095d74fd48f415bd075b94a1c8ccc596afb8db47a86
+EBUILD selinux-loadkeys-2.20170204-r4.ebuild 286 SHA256 51d3b5aaf54c1d151eb7a21a5fe886874ba1d59cfcc50affe90b52797e9dbd51 SHA512 d23e7f69005505b870ccfa59fe8b14fd095aa14c264cd3b81008dea9cdccdabde90fd51ecb7217f3433f9c05eef8b6eb51023ea86c3e8722fbc3305bc19aa2e2 WHIRLPOOL 65121f641abbd2523bfe6f6a10002a8d83b495f188224c50ac08a5a5d54a247846ffb502ce5514a5f1dde095d74fd48f415bd075b94a1c8ccc596afb8db47a86
+EBUILD selinux-loadkeys-2.20170805-r2.ebuild 286 SHA256 51d3b5aaf54c1d151eb7a21a5fe886874ba1d59cfcc50affe90b52797e9dbd51 SHA512 d23e7f69005505b870ccfa59fe8b14fd095aa14c264cd3b81008dea9cdccdabde90fd51ecb7217f3433f9c05eef8b6eb51023ea86c3e8722fbc3305bc19aa2e2 WHIRLPOOL 65121f641abbd2523bfe6f6a10002a8d83b495f188224c50ac08a5a5d54a247846ffb502ce5514a5f1dde095d74fd48f415bd075b94a1c8ccc596afb8db47a86
+EBUILD selinux-loadkeys-2.20170805-r3.ebuild 288 SHA256 ea7afef6ea53dfcf07d6fb66779b8a56a47ee4fd3c5f7ce79e8cfd2b2e181a16 SHA512 cc217920009519a39dc64ef71640f6ffbf8d61c58182c5d81ae668a7575abc6060b2902a6c3c050d51d936eedf4eddbfb7567a0b3ddb9013b99acdfb73705093 WHIRLPOOL 7170b20a90d7cf2bd3f72d473350444d9d7c5a5a777b7c11a945fe86d53d1ebea8f22317a96826c4071f640e585cdf2cd34244ded447e7ed34a99721e2684451
+EBUILD selinux-loadkeys-9999.ebuild 288 SHA256 ea7afef6ea53dfcf07d6fb66779b8a56a47ee4fd3c5f7ce79e8cfd2b2e181a16 SHA512 cc217920009519a39dc64ef71640f6ffbf8d61c58182c5d81ae668a7575abc6060b2902a6c3c050d51d936eedf4eddbfb7567a0b3ddb9013b99acdfb73705093 WHIRLPOOL 7170b20a90d7cf2bd3f72d473350444d9d7c5a5a777b7c11a945fe86d53d1ebea8f22317a96826c4071f640e585cdf2cd34244ded447e7ed34a99721e2684451
 MISC ChangeLog 10793 SHA256 89467d39e0524b171917ce539b4c3c7aca8675a301c1cec4e9050404dcfea97e SHA512 243858552f0d6a40db8aa63fdd2a7ccb40f8c32b1ebc46c84b3ed2f2047aaeaa9193e9d56e94c13efb44f1b9a0906ee82b26ef85e139a237d531ad2feedb38ce WHIRLPOOL 170583a281b56141de3a830b1b431e6d9aaf5ab221b90c174fbc5593686a7e1ca5e4ac471b6682ad20b1725482bb7d3a54fd8363e04d99a5632cabd87192b90e
 MISC ChangeLog-2015 10103 SHA256 abff4282002ae169dad388a0650bfd6dc11ffcd8fba59064388c080905bc1192 SHA512 e23c367d3a76446d3dd42a9cbcfc32d9a76b5e8f3b99a1586a6ad9a0c7c5ed679f347bc89002c6e3eb3469d7f068394ddbb09296f232a25351502c92fa088415 WHIRLPOOL 5a7c768b3ac9ce928268cbc0046530b61050d945240fd85144dbe796b58b87561f9dbbb9a07102c769849f60c5c98cf49898a36a019e0f4f9092d6d37594c5aa
 MISC metadata.xml 318 SHA256 780d53b4b8161c1e7768523f258720117f0860d2efaea4707b0c7f7ce6db7d4f SHA512 439186e025dfd23a3d5d0906647428b694742a73493a57ec1d4b63e4c4f81e8cf0329336afb890f3089051a791296765ad9916af15bbea20215bb6698ea22f4d WHIRLPOOL d15bb55e3cfd643e9b74fd644e0dcc538d6d040846881d9f3b3356af65a9f8319d85aa0f8dafa597d8b7f53ca5d2423e4bb13d4b458ceccda74da3cd45a60b81
diff --git a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20170204-r1.ebuild b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20170204-r1.ebuild
index d2b7db1d6d71..ca13bafa86e9 100644
--- a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20170204-r2.ebuild b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20170204-r2.ebuild
index ef2bb6d1b841..025692b422ba 100644
--- a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20170204-r3.ebuild b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20170204-r3.ebuild
index ef2bb6d1b841..025692b422ba 100644
--- a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20170204-r4.ebuild b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20170204-r4.ebuild
index ef2bb6d1b841..025692b422ba 100644
--- a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20170805-r2.ebuild b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20170805-r2.ebuild
index ef2bb6d1b841..025692b422ba 100644
--- a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20170805-r3.ebuild b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..ca13bafa86e9
--- /dev/null
+++ b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-loadkeys/selinux-loadkeys-9999.ebuild b/sec-policy/selinux-loadkeys/selinux-loadkeys-9999.ebuild
index d2b7db1d6d71..ca13bafa86e9 100644
--- a/sec-policy/selinux-loadkeys/selinux-loadkeys-9999.ebuild
+++ b/sec-policy/selinux-loadkeys/selinux-loadkeys-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-lockdev/Manifest b/sec-policy/selinux-lockdev/Manifest
index 17183c91a933..adfab9ae134c 100644
--- a/sec-policy/selinux-lockdev/Manifest
+++ b/sec-policy/selinux-lockdev/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-lockdev-2.20170204-r1.ebuild 285 SHA256 ea6b7c2c24988b2b99218e0cdd304f2773ad47b9f462fedc84e59ec674214ae3 SHA512 391a16e3860312f59633ac11576bcce7fc38d423e0613c88ff674a3cd836eb28857a8b2c6ea6c57482fec773be300fe9cc31409985bce68f35a9824e0023e9cf WHIRLPOOL 5a211bbaa2a4e0fd969bf86be5214d5e253e7b1b15def5491c178571fe79a4f012885835add486d5b728bd94db777a0760f8b61f5ff7323c7616488005174fd1
-EBUILD selinux-lockdev-2.20170204-r2.ebuild 283 SHA256 1fa6d7ce1264c8cfd679a66b50f8bbcd733c2d71330a4da5792332c7157380be SHA512 0e7e2d1589263b5671c9f195c5aa3cb24b1a6e1deb1b32fb891aa6d81b1bbf12a769d1652c5897d1789ba1485c3d332469869285d9d17b21dbf86c06fc9ce317 WHIRLPOOL b830349a60f80364db36f18ad1e2b8c660fe09ee1c48e12149ea66e447a56d748ed8ff7057c745e0b9db8e550fbd375f0a8d4ad150f237103df638aec03065fd
-EBUILD selinux-lockdev-2.20170204-r3.ebuild 283 SHA256 1fa6d7ce1264c8cfd679a66b50f8bbcd733c2d71330a4da5792332c7157380be SHA512 0e7e2d1589263b5671c9f195c5aa3cb24b1a6e1deb1b32fb891aa6d81b1bbf12a769d1652c5897d1789ba1485c3d332469869285d9d17b21dbf86c06fc9ce317 WHIRLPOOL b830349a60f80364db36f18ad1e2b8c660fe09ee1c48e12149ea66e447a56d748ed8ff7057c745e0b9db8e550fbd375f0a8d4ad150f237103df638aec03065fd
-EBUILD selinux-lockdev-2.20170204-r4.ebuild 283 SHA256 1fa6d7ce1264c8cfd679a66b50f8bbcd733c2d71330a4da5792332c7157380be SHA512 0e7e2d1589263b5671c9f195c5aa3cb24b1a6e1deb1b32fb891aa6d81b1bbf12a769d1652c5897d1789ba1485c3d332469869285d9d17b21dbf86c06fc9ce317 WHIRLPOOL b830349a60f80364db36f18ad1e2b8c660fe09ee1c48e12149ea66e447a56d748ed8ff7057c745e0b9db8e550fbd375f0a8d4ad150f237103df638aec03065fd
-EBUILD selinux-lockdev-2.20170805-r2.ebuild 283 SHA256 1fa6d7ce1264c8cfd679a66b50f8bbcd733c2d71330a4da5792332c7157380be SHA512 0e7e2d1589263b5671c9f195c5aa3cb24b1a6e1deb1b32fb891aa6d81b1bbf12a769d1652c5897d1789ba1485c3d332469869285d9d17b21dbf86c06fc9ce317 WHIRLPOOL b830349a60f80364db36f18ad1e2b8c660fe09ee1c48e12149ea66e447a56d748ed8ff7057c745e0b9db8e550fbd375f0a8d4ad150f237103df638aec03065fd
-EBUILD selinux-lockdev-9999.ebuild 285 SHA256 ea6b7c2c24988b2b99218e0cdd304f2773ad47b9f462fedc84e59ec674214ae3 SHA512 391a16e3860312f59633ac11576bcce7fc38d423e0613c88ff674a3cd836eb28857a8b2c6ea6c57482fec773be300fe9cc31409985bce68f35a9824e0023e9cf WHIRLPOOL 5a211bbaa2a4e0fd969bf86be5214d5e253e7b1b15def5491c178571fe79a4f012885835add486d5b728bd94db777a0760f8b61f5ff7323c7616488005174fd1
+EBUILD selinux-lockdev-2.20170204-r1.ebuild 286 SHA256 78ad1d0bcbb2f32db2692875e847934c3278f422ff7a4bf0b97660214db40fa2 SHA512 d36d65c67eeac4b10dbf747f225e2d31b2485d4acdea54f551b30cc1d209586c684c80cc65241bee9a64a22c6a1beef6bc3f01f6e150c6581581cd3f120b6d4d WHIRLPOOL ca2b77722a459c3312b9fbc94b9081fb8bc84ab5b9ce15f2d8b6c473ac59b8a0da32cd0eb4a6c0f38068cef54f13b4fdf15e74ddd4f8b1dd39c9df81433ee5e5
+EBUILD selinux-lockdev-2.20170204-r2.ebuild 284 SHA256 b371868f73ffb0d96aa2d1a049ea671981d267b7b15f8bf044b647eaa2764846 SHA512 04c7b439600500d944ea233253f556df59e30e981ebf537accc22c17de6ca03ec1792ac047e7edbf76586dcb3ef132e85fd715e2d5d9062ded8d5277ad4b84b6 WHIRLPOOL 5403e19cdca77e5a0181a2318ea462953b686075af173dcc41ba40e0b305657f5622b675189b762abdfa657b46a778c11f50b4c8efd48a76d92a50183ed45c74
+EBUILD selinux-lockdev-2.20170204-r3.ebuild 284 SHA256 b371868f73ffb0d96aa2d1a049ea671981d267b7b15f8bf044b647eaa2764846 SHA512 04c7b439600500d944ea233253f556df59e30e981ebf537accc22c17de6ca03ec1792ac047e7edbf76586dcb3ef132e85fd715e2d5d9062ded8d5277ad4b84b6 WHIRLPOOL 5403e19cdca77e5a0181a2318ea462953b686075af173dcc41ba40e0b305657f5622b675189b762abdfa657b46a778c11f50b4c8efd48a76d92a50183ed45c74
+EBUILD selinux-lockdev-2.20170204-r4.ebuild 284 SHA256 b371868f73ffb0d96aa2d1a049ea671981d267b7b15f8bf044b647eaa2764846 SHA512 04c7b439600500d944ea233253f556df59e30e981ebf537accc22c17de6ca03ec1792ac047e7edbf76586dcb3ef132e85fd715e2d5d9062ded8d5277ad4b84b6 WHIRLPOOL 5403e19cdca77e5a0181a2318ea462953b686075af173dcc41ba40e0b305657f5622b675189b762abdfa657b46a778c11f50b4c8efd48a76d92a50183ed45c74
+EBUILD selinux-lockdev-2.20170805-r2.ebuild 284 SHA256 b371868f73ffb0d96aa2d1a049ea671981d267b7b15f8bf044b647eaa2764846 SHA512 04c7b439600500d944ea233253f556df59e30e981ebf537accc22c17de6ca03ec1792ac047e7edbf76586dcb3ef132e85fd715e2d5d9062ded8d5277ad4b84b6 WHIRLPOOL 5403e19cdca77e5a0181a2318ea462953b686075af173dcc41ba40e0b305657f5622b675189b762abdfa657b46a778c11f50b4c8efd48a76d92a50183ed45c74
+EBUILD selinux-lockdev-2.20170805-r3.ebuild 286 SHA256 78ad1d0bcbb2f32db2692875e847934c3278f422ff7a4bf0b97660214db40fa2 SHA512 d36d65c67eeac4b10dbf747f225e2d31b2485d4acdea54f551b30cc1d209586c684c80cc65241bee9a64a22c6a1beef6bc3f01f6e150c6581581cd3f120b6d4d WHIRLPOOL ca2b77722a459c3312b9fbc94b9081fb8bc84ab5b9ce15f2d8b6c473ac59b8a0da32cd0eb4a6c0f38068cef54f13b4fdf15e74ddd4f8b1dd39c9df81433ee5e5
+EBUILD selinux-lockdev-9999.ebuild 286 SHA256 78ad1d0bcbb2f32db2692875e847934c3278f422ff7a4bf0b97660214db40fa2 SHA512 d36d65c67eeac4b10dbf747f225e2d31b2485d4acdea54f551b30cc1d209586c684c80cc65241bee9a64a22c6a1beef6bc3f01f6e150c6581581cd3f120b6d4d WHIRLPOOL ca2b77722a459c3312b9fbc94b9081fb8bc84ab5b9ce15f2d8b6c473ac59b8a0da32cd0eb4a6c0f38068cef54f13b4fdf15e74ddd4f8b1dd39c9df81433ee5e5
 MISC ChangeLog 10687 SHA256 3b2eee488f13c5723e944baa092acd83c7dc170231371edf3bb4ac2c4d25e295 SHA512 43594daca39816a7ec522ab39edc5617141d3e2dcb92a25c4bb37f4b82920921b7e3c38b10c8931fd79c81a74d9418a0203961ed25f528d2783a4dec256a5f3f WHIRLPOOL b1d490254e043fc8e4f592b3d3ef385db6483b06ff201840da07e84b8b1f28fc5d2695a1c8b7b593fa430a0c57985a94c8ba05843ef0c35ced22fcc86b5db933
 MISC ChangeLog-2015 9978 SHA256 803ecc1729949737956f8e21c85187b74d904e00a9bacc16fbb3033896dec787 SHA512 ab281e4b9eb5793e618eeabe652e19a28effd3578fec51a2705a6a939d3f8a673caf2cc2f4588a9f9cf92ce80ebb780c3ee86a80ea0830b62b1d4a1fb35f8c12 WHIRLPOOL 822813f39482ee1239360189793e0d35b9abae246e65a47c453063409217f8efe251e0febec646d0e3858b379d13153a59fb43107b1e8c5ee39cf2cd65370f2b
 MISC metadata.xml 317 SHA256 59d01350d019278f868b53e81b4891770d1c00e2fe74fef1e44c33d880c226e4 SHA512 03fda7bf63650835f954517ae6277944215299e0d44567b59c7235a5790ff74391e021b86954e77f9af6fe3edf9552bf553b75e34b772c93d75f1f3a52d26d2d WHIRLPOOL d72a3aec6d451b93cd0aa97b6f5377b7c9bc8cb4bbe8e98c94d6d93f8eeb83a54fc975d046450e92139eb8e65982d50ff615d597fbc0b50827187a7e801b3570
diff --git a/sec-policy/selinux-lockdev/selinux-lockdev-2.20170204-r1.ebuild b/sec-policy/selinux-lockdev/selinux-lockdev-2.20170204-r1.ebuild
index 8dbeea965331..1d3c797a71da 100644
--- a/sec-policy/selinux-lockdev/selinux-lockdev-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-lockdev/selinux-lockdev-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-lockdev/selinux-lockdev-2.20170204-r2.ebuild b/sec-policy/selinux-lockdev/selinux-lockdev-2.20170204-r2.ebuild
index e6655e054165..9629e202505e 100644
--- a/sec-policy/selinux-lockdev/selinux-lockdev-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-lockdev/selinux-lockdev-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-lockdev/selinux-lockdev-2.20170204-r3.ebuild b/sec-policy/selinux-lockdev/selinux-lockdev-2.20170204-r3.ebuild
index e6655e054165..9629e202505e 100644
--- a/sec-policy/selinux-lockdev/selinux-lockdev-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-lockdev/selinux-lockdev-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-lockdev/selinux-lockdev-2.20170204-r4.ebuild b/sec-policy/selinux-lockdev/selinux-lockdev-2.20170204-r4.ebuild
index e6655e054165..9629e202505e 100644
--- a/sec-policy/selinux-lockdev/selinux-lockdev-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-lockdev/selinux-lockdev-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-lockdev/selinux-lockdev-2.20170805-r2.ebuild b/sec-policy/selinux-lockdev/selinux-lockdev-2.20170805-r2.ebuild
index e6655e054165..9629e202505e 100644
--- a/sec-policy/selinux-lockdev/selinux-lockdev-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-lockdev/selinux-lockdev-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-lockdev/selinux-lockdev-2.20170805-r3.ebuild b/sec-policy/selinux-lockdev/selinux-lockdev-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..1d3c797a71da
--- /dev/null
+++ b/sec-policy/selinux-lockdev/selinux-lockdev-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-lockdev/selinux-lockdev-9999.ebuild b/sec-policy/selinux-lockdev/selinux-lockdev-9999.ebuild
index 8dbeea965331..1d3c797a71da 100644
--- a/sec-policy/selinux-lockdev/selinux-lockdev-9999.ebuild
+++ b/sec-policy/selinux-lockdev/selinux-lockdev-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-logrotate/Manifest b/sec-policy/selinux-logrotate/Manifest
index a897882cb769..7caefd763d6a 100644
--- a/sec-policy/selinux-logrotate/Manifest
+++ b/sec-policy/selinux-logrotate/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-logrotate-2.20170204-r1.ebuild 289 SHA256 b03c3bee568da26cd09dd8f35cf8b787e344f72dd31130134997aae1a3f9daec SHA512 87b75c85697d3736812e6c2c33429c964a1472497d5f821550c10873a6f756ef0c729d92b0d100f0ba80d76a2032ef7dce39f8183e872dc08a2d538e3fcea86b WHIRLPOOL 1a2be15063cec45e6f5d5feda17f14533f1f9552992127aee7649f7d2fcf9cdac33ad21e26aa9e1e8127bd86009b477344b4473d5c1fe4ca558a3ad7800468e9
-EBUILD selinux-logrotate-2.20170204-r2.ebuild 287 SHA256 c0e3d92b481c8fd377824672cb030e07cb706939e7631bfc95bfb7fc4f47f608 SHA512 501886093a8268df7248e719bce24628c752284c853a8fcfa02cf69d11864832430f5131c51ea392b0c17eb69903c1d16ed72c65f10fadd6425a6ccd1268b8ad WHIRLPOOL 0c40ae5055c7f6598daf011bfae075a9dbd37eba4ff330dcd9b33baa0beea8c834e8438860cc6c389d5a4c61b738346e58da8092ce5a63e834d331554d11fd77
-EBUILD selinux-logrotate-2.20170204-r3.ebuild 287 SHA256 c0e3d92b481c8fd377824672cb030e07cb706939e7631bfc95bfb7fc4f47f608 SHA512 501886093a8268df7248e719bce24628c752284c853a8fcfa02cf69d11864832430f5131c51ea392b0c17eb69903c1d16ed72c65f10fadd6425a6ccd1268b8ad WHIRLPOOL 0c40ae5055c7f6598daf011bfae075a9dbd37eba4ff330dcd9b33baa0beea8c834e8438860cc6c389d5a4c61b738346e58da8092ce5a63e834d331554d11fd77
-EBUILD selinux-logrotate-2.20170204-r4.ebuild 287 SHA256 c0e3d92b481c8fd377824672cb030e07cb706939e7631bfc95bfb7fc4f47f608 SHA512 501886093a8268df7248e719bce24628c752284c853a8fcfa02cf69d11864832430f5131c51ea392b0c17eb69903c1d16ed72c65f10fadd6425a6ccd1268b8ad WHIRLPOOL 0c40ae5055c7f6598daf011bfae075a9dbd37eba4ff330dcd9b33baa0beea8c834e8438860cc6c389d5a4c61b738346e58da8092ce5a63e834d331554d11fd77
-EBUILD selinux-logrotate-2.20170805-r2.ebuild 287 SHA256 c0e3d92b481c8fd377824672cb030e07cb706939e7631bfc95bfb7fc4f47f608 SHA512 501886093a8268df7248e719bce24628c752284c853a8fcfa02cf69d11864832430f5131c51ea392b0c17eb69903c1d16ed72c65f10fadd6425a6ccd1268b8ad WHIRLPOOL 0c40ae5055c7f6598daf011bfae075a9dbd37eba4ff330dcd9b33baa0beea8c834e8438860cc6c389d5a4c61b738346e58da8092ce5a63e834d331554d11fd77
-EBUILD selinux-logrotate-9999.ebuild 289 SHA256 b03c3bee568da26cd09dd8f35cf8b787e344f72dd31130134997aae1a3f9daec SHA512 87b75c85697d3736812e6c2c33429c964a1472497d5f821550c10873a6f756ef0c729d92b0d100f0ba80d76a2032ef7dce39f8183e872dc08a2d538e3fcea86b WHIRLPOOL 1a2be15063cec45e6f5d5feda17f14533f1f9552992127aee7649f7d2fcf9cdac33ad21e26aa9e1e8127bd86009b477344b4473d5c1fe4ca558a3ad7800468e9
+EBUILD selinux-logrotate-2.20170204-r1.ebuild 290 SHA256 0ee39db8019408866895a15e8bb83f604aa662f2cb80e52a2adf064286b9102f SHA512 5624e9618cc8180315f82f1da8ce566ed5df9143dda38da29c7bfbc4b28ada600aff96e5a624281ad9cddd7c18f4b194340c8e7b5988eb426a74c61647ce24b3 WHIRLPOOL 4501a39e6005b71f904af54c8ab9f075b3af497996760b74feaeb7938a23363c3345b39682e1476aa614b858d88876f46ea6ae155cd26b28d4338fa8e4b902f0
+EBUILD selinux-logrotate-2.20170204-r2.ebuild 288 SHA256 4431a13df272dd515079be79c0143284aaeb48f0698ed2af7cce1da62126e544 SHA512 b7370a186feb501334aa392fb3b110cc1a7e3b17974bc3e554a6dbc011c0f576dc68840c832ec8af55e78e2d18dec3d0011205ffef9373750f1baf7555c5712f WHIRLPOOL cb39adeda919332c8e41026ffe74a70a0293cfc61e7f790dc9b22123195c9862ec58ea803b6a4a7c2d4dac21d92d50bb1fb3b03bc065925fe20847bf05cc026d
+EBUILD selinux-logrotate-2.20170204-r3.ebuild 288 SHA256 4431a13df272dd515079be79c0143284aaeb48f0698ed2af7cce1da62126e544 SHA512 b7370a186feb501334aa392fb3b110cc1a7e3b17974bc3e554a6dbc011c0f576dc68840c832ec8af55e78e2d18dec3d0011205ffef9373750f1baf7555c5712f WHIRLPOOL cb39adeda919332c8e41026ffe74a70a0293cfc61e7f790dc9b22123195c9862ec58ea803b6a4a7c2d4dac21d92d50bb1fb3b03bc065925fe20847bf05cc026d
+EBUILD selinux-logrotate-2.20170204-r4.ebuild 288 SHA256 4431a13df272dd515079be79c0143284aaeb48f0698ed2af7cce1da62126e544 SHA512 b7370a186feb501334aa392fb3b110cc1a7e3b17974bc3e554a6dbc011c0f576dc68840c832ec8af55e78e2d18dec3d0011205ffef9373750f1baf7555c5712f WHIRLPOOL cb39adeda919332c8e41026ffe74a70a0293cfc61e7f790dc9b22123195c9862ec58ea803b6a4a7c2d4dac21d92d50bb1fb3b03bc065925fe20847bf05cc026d
+EBUILD selinux-logrotate-2.20170805-r2.ebuild 288 SHA256 4431a13df272dd515079be79c0143284aaeb48f0698ed2af7cce1da62126e544 SHA512 b7370a186feb501334aa392fb3b110cc1a7e3b17974bc3e554a6dbc011c0f576dc68840c832ec8af55e78e2d18dec3d0011205ffef9373750f1baf7555c5712f WHIRLPOOL cb39adeda919332c8e41026ffe74a70a0293cfc61e7f790dc9b22123195c9862ec58ea803b6a4a7c2d4dac21d92d50bb1fb3b03bc065925fe20847bf05cc026d
+EBUILD selinux-logrotate-2.20170805-r3.ebuild 290 SHA256 0ee39db8019408866895a15e8bb83f604aa662f2cb80e52a2adf064286b9102f SHA512 5624e9618cc8180315f82f1da8ce566ed5df9143dda38da29c7bfbc4b28ada600aff96e5a624281ad9cddd7c18f4b194340c8e7b5988eb426a74c61647ce24b3 WHIRLPOOL 4501a39e6005b71f904af54c8ab9f075b3af497996760b74feaeb7938a23363c3345b39682e1476aa614b858d88876f46ea6ae155cd26b28d4338fa8e4b902f0
+EBUILD selinux-logrotate-9999.ebuild 290 SHA256 0ee39db8019408866895a15e8bb83f604aa662f2cb80e52a2adf064286b9102f SHA512 5624e9618cc8180315f82f1da8ce566ed5df9143dda38da29c7bfbc4b28ada600aff96e5a624281ad9cddd7c18f4b194340c8e7b5988eb426a74c61647ce24b3 WHIRLPOOL 4501a39e6005b71f904af54c8ab9f075b3af497996760b74feaeb7938a23363c3345b39682e1476aa614b858d88876f46ea6ae155cd26b28d4338fa8e4b902f0
 MISC ChangeLog 10887 SHA256 0d171c3003a4e759a8c2e114b720ad52e672322026b8433cb8ba242dbd8b07a8 SHA512 3d65461b85e6a3c3fcf124b9962a59708ca63163b397f0fd474f05765e67e64f84529922307e4f8f9106cabb088eb5e967f8bcd35c0efad276d7e99a2bae9ed5 WHIRLPOOL 455970baf0952b2dc625d7dfaca31fbf88663217b6168f4b0727c3f7728956466b9f634921e0d1a7435fcafbc8da89ee73a4fc967c81845299e68b0503366ba1
 MISC ChangeLog-2015 14012 SHA256 3820317e2de5943f810fcc288f0ca9823e611dfdd765741a6179c8b800ccdd14 SHA512 00aa2985593032425db38cf751c3c45295f6a8e74c256a63d7e0f398a7147cab6b465925eccee2c18c22286a54ca34debde288998ff46b6da85ab3a9b161dd52 WHIRLPOOL ef905264b2be7f12f60e06c71350c3d37a44abded6762bd9043694c4bd820d6d16f332d2b865a9e263ee478de7b1df50b1eddd2aace33f3877b87b3eac6043cb
 MISC metadata.xml 319 SHA256 97c7d2cff495e54ad5dd6c1af176206a5d8b8b50d4b2d9bdf1ccd3d8ea8a98f8 SHA512 cb02bc8a888c83776ca20c832c91c72ad8c72fae6e498d75442c516e71fd3a8c1620b885974e8d3a34815cb624bef74f357d90593d4d4dfc0a35113401e28048 WHIRLPOOL 22a187cedec46f79efc7d10e43760dc49157ab0ab3d7a6e153a08dc3b02500ecb1ca436efb8ffb9a2d1503ba1a8714190c2f982e9496636aac3404701c8f20d9
diff --git a/sec-policy/selinux-logrotate/selinux-logrotate-2.20170204-r1.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-2.20170204-r1.ebuild
index 52a227a6c524..b2095c2205e4 100644
--- a/sec-policy/selinux-logrotate/selinux-logrotate-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-logrotate/selinux-logrotate-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-logrotate/selinux-logrotate-2.20170204-r2.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-2.20170204-r2.ebuild
index 211ff7600377..8e78ab257d42 100644
--- a/sec-policy/selinux-logrotate/selinux-logrotate-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-logrotate/selinux-logrotate-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-logrotate/selinux-logrotate-2.20170204-r3.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-2.20170204-r3.ebuild
index 211ff7600377..8e78ab257d42 100644
--- a/sec-policy/selinux-logrotate/selinux-logrotate-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-logrotate/selinux-logrotate-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-logrotate/selinux-logrotate-2.20170204-r4.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-2.20170204-r4.ebuild
index 211ff7600377..8e78ab257d42 100644
--- a/sec-policy/selinux-logrotate/selinux-logrotate-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-logrotate/selinux-logrotate-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-logrotate/selinux-logrotate-2.20170805-r2.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-2.20170805-r2.ebuild
index 211ff7600377..8e78ab257d42 100644
--- a/sec-policy/selinux-logrotate/selinux-logrotate-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-logrotate/selinux-logrotate-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-logrotate/selinux-logrotate-2.20170805-r3.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..b2095c2205e4
--- /dev/null
+++ b/sec-policy/selinux-logrotate/selinux-logrotate-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-logrotate/selinux-logrotate-9999.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-9999.ebuild
index 52a227a6c524..b2095c2205e4 100644
--- a/sec-policy/selinux-logrotate/selinux-logrotate-9999.ebuild
+++ b/sec-policy/selinux-logrotate/selinux-logrotate-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-logsentry/Manifest b/sec-policy/selinux-logsentry/Manifest
index 6c652e536116..314ac39af85d 100644
--- a/sec-policy/selinux-logsentry/Manifest
+++ b/sec-policy/selinux-logsentry/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-logsentry-2.20170204-r1.ebuild 289 SHA256 563a561e6c327d1e0d3e08460e6247ce1df5dcfe40dd58a916ad11f150a91574 SHA512 edc55a58c4677cb6e3529ba56cf471010372dc74cf0ffd2818b56567e06aafecba2cb46ab9c0b15f194da511da529d1c035b7868218924d3d972c2fc38dff217 WHIRLPOOL 79b1d4942bb2e4a22a4a726bbcad6b591adf72c5e3135756725e54ce17b809816d952ab3593b11b8e1db8288c9004b6595f84012216ebc9c7e53e93b3c0b970f
-EBUILD selinux-logsentry-2.20170204-r2.ebuild 287 SHA256 437b4b7bbd9d36f2103935f0027292a41bc6dbadcb340a5d5cca7f057810f797 SHA512 26dd3430f298f0944e6d174201833e54414e47efdffd57fc0a17043a2ec11b5e96a279802e2814c95e374a73eb39a99cca30d87ed7acd9c4cde0359609feadd1 WHIRLPOOL 7115a1229021609bd0993f230611eb293c1fe77c29a2ab895c6fad18e3846fd37f497f0e21c0f1be79271d9d8963be4e104463fd13b05944ee34c58b6e574d04
-EBUILD selinux-logsentry-2.20170204-r3.ebuild 287 SHA256 437b4b7bbd9d36f2103935f0027292a41bc6dbadcb340a5d5cca7f057810f797 SHA512 26dd3430f298f0944e6d174201833e54414e47efdffd57fc0a17043a2ec11b5e96a279802e2814c95e374a73eb39a99cca30d87ed7acd9c4cde0359609feadd1 WHIRLPOOL 7115a1229021609bd0993f230611eb293c1fe77c29a2ab895c6fad18e3846fd37f497f0e21c0f1be79271d9d8963be4e104463fd13b05944ee34c58b6e574d04
-EBUILD selinux-logsentry-2.20170204-r4.ebuild 287 SHA256 437b4b7bbd9d36f2103935f0027292a41bc6dbadcb340a5d5cca7f057810f797 SHA512 26dd3430f298f0944e6d174201833e54414e47efdffd57fc0a17043a2ec11b5e96a279802e2814c95e374a73eb39a99cca30d87ed7acd9c4cde0359609feadd1 WHIRLPOOL 7115a1229021609bd0993f230611eb293c1fe77c29a2ab895c6fad18e3846fd37f497f0e21c0f1be79271d9d8963be4e104463fd13b05944ee34c58b6e574d04
-EBUILD selinux-logsentry-2.20170805-r2.ebuild 287 SHA256 437b4b7bbd9d36f2103935f0027292a41bc6dbadcb340a5d5cca7f057810f797 SHA512 26dd3430f298f0944e6d174201833e54414e47efdffd57fc0a17043a2ec11b5e96a279802e2814c95e374a73eb39a99cca30d87ed7acd9c4cde0359609feadd1 WHIRLPOOL 7115a1229021609bd0993f230611eb293c1fe77c29a2ab895c6fad18e3846fd37f497f0e21c0f1be79271d9d8963be4e104463fd13b05944ee34c58b6e574d04
-EBUILD selinux-logsentry-9999.ebuild 289 SHA256 563a561e6c327d1e0d3e08460e6247ce1df5dcfe40dd58a916ad11f150a91574 SHA512 edc55a58c4677cb6e3529ba56cf471010372dc74cf0ffd2818b56567e06aafecba2cb46ab9c0b15f194da511da529d1c035b7868218924d3d972c2fc38dff217 WHIRLPOOL 79b1d4942bb2e4a22a4a726bbcad6b591adf72c5e3135756725e54ce17b809816d952ab3593b11b8e1db8288c9004b6595f84012216ebc9c7e53e93b3c0b970f
+EBUILD selinux-logsentry-2.20170204-r1.ebuild 290 SHA256 7c377aae77b967017fff16e7b5d365876fa46f3024751cf741171393b32a2346 SHA512 d20869d54d19706f6b38bcb7a0161310f84869b5c73a0d379ee731e0bbf68babd74702038259e825ec27332e511f066b1bf3c52bcf738b7d5629becf040589a6 WHIRLPOOL fec7d39d924d67797b75c3c7012e3abbf639634724ad74bc101888f77ffcee53441422a92313c6eb4681dd39053d7b6bad20360218f2e861afec0d60e977f186
+EBUILD selinux-logsentry-2.20170204-r2.ebuild 288 SHA256 b635d6c2d98c282e48a600e13bd24101332d1a17d46248dc15ed60ca587f822f SHA512 45247ecf5a43ab6da751c029cf0b6a740cc3a1c726edb4fca69f3e2db2f5b5556fd5c7e43a82915249336f991ba2fe7e4802985c1e17b151fab11a1359b004f2 WHIRLPOOL 1cab55c0d6bec5d4c9cd2b8aa5cd34cf76c9fb2958348b07474b7da343e4eff78a6eee6a9d8d73fd872d64d2260ef3f668ea3209bc9cab6e6c4c363fc8951414
+EBUILD selinux-logsentry-2.20170204-r3.ebuild 288 SHA256 b635d6c2d98c282e48a600e13bd24101332d1a17d46248dc15ed60ca587f822f SHA512 45247ecf5a43ab6da751c029cf0b6a740cc3a1c726edb4fca69f3e2db2f5b5556fd5c7e43a82915249336f991ba2fe7e4802985c1e17b151fab11a1359b004f2 WHIRLPOOL 1cab55c0d6bec5d4c9cd2b8aa5cd34cf76c9fb2958348b07474b7da343e4eff78a6eee6a9d8d73fd872d64d2260ef3f668ea3209bc9cab6e6c4c363fc8951414
+EBUILD selinux-logsentry-2.20170204-r4.ebuild 288 SHA256 b635d6c2d98c282e48a600e13bd24101332d1a17d46248dc15ed60ca587f822f SHA512 45247ecf5a43ab6da751c029cf0b6a740cc3a1c726edb4fca69f3e2db2f5b5556fd5c7e43a82915249336f991ba2fe7e4802985c1e17b151fab11a1359b004f2 WHIRLPOOL 1cab55c0d6bec5d4c9cd2b8aa5cd34cf76c9fb2958348b07474b7da343e4eff78a6eee6a9d8d73fd872d64d2260ef3f668ea3209bc9cab6e6c4c363fc8951414
+EBUILD selinux-logsentry-2.20170805-r2.ebuild 288 SHA256 b635d6c2d98c282e48a600e13bd24101332d1a17d46248dc15ed60ca587f822f SHA512 45247ecf5a43ab6da751c029cf0b6a740cc3a1c726edb4fca69f3e2db2f5b5556fd5c7e43a82915249336f991ba2fe7e4802985c1e17b151fab11a1359b004f2 WHIRLPOOL 1cab55c0d6bec5d4c9cd2b8aa5cd34cf76c9fb2958348b07474b7da343e4eff78a6eee6a9d8d73fd872d64d2260ef3f668ea3209bc9cab6e6c4c363fc8951414
+EBUILD selinux-logsentry-2.20170805-r3.ebuild 290 SHA256 7c377aae77b967017fff16e7b5d365876fa46f3024751cf741171393b32a2346 SHA512 d20869d54d19706f6b38bcb7a0161310f84869b5c73a0d379ee731e0bbf68babd74702038259e825ec27332e511f066b1bf3c52bcf738b7d5629becf040589a6 WHIRLPOOL fec7d39d924d67797b75c3c7012e3abbf639634724ad74bc101888f77ffcee53441422a92313c6eb4681dd39053d7b6bad20360218f2e861afec0d60e977f186
+EBUILD selinux-logsentry-9999.ebuild 290 SHA256 7c377aae77b967017fff16e7b5d365876fa46f3024751cf741171393b32a2346 SHA512 d20869d54d19706f6b38bcb7a0161310f84869b5c73a0d379ee731e0bbf68babd74702038259e825ec27332e511f066b1bf3c52bcf738b7d5629becf040589a6 WHIRLPOOL fec7d39d924d67797b75c3c7012e3abbf639634724ad74bc101888f77ffcee53441422a92313c6eb4681dd39053d7b6bad20360218f2e861afec0d60e977f186
 MISC ChangeLog 10887 SHA256 77c7172183b821fad17d80bb0a66fea84109c77d6833ccaff8b6f4a00b1b80af SHA512 2892b02d6fea6ff72de449b4ef5bc0373c7f4b85c3dbfe4646d8101d6a68a5061e09a11e481e3f7c42c2ae2109543d842e79659fb83a2d752d7e757ce61091d5 WHIRLPOOL 9c470e19e7dd9a99a22211969967522b4197442baf68665780b1770c64cb2871f6c816c1b0e02fc1146242784ab5a4947a965760091eb6afa20f336df710536c
 MISC ChangeLog-2015 7825 SHA256 6fa6cceb91aef34def8d8b076f1d43a47b6922f763dc6053f126c59eb161c89b SHA512 ce2711b7fb9f342e2e86f494211a665cf8c1cb5f286338f4a724710643c80a1c83be47af8cb8636f808026f4ef008afcbfedb9f48c3d782282d87eb65b793613 WHIRLPOOL ae6ee09b436d16909bf57eb60b2985eb8dffe85d41d8e5a6f47e006acf1ebde66294f2c3021f04f5be4bf6dfde2b30a91715880b811727d92472e41a85211c53
 MISC metadata.xml 319 SHA256 b4fe01578d7193b8fe219cdebd29a095fc5d20011fe67b88174a2844a9c8adfc SHA512 8f566c30ab3450fd5f24a28bff2f948e13efb047005069b4954266a6442182332f74294edf4964064ed41ce973d58b63f6c0216c57380b47853321a2b797e1a2 WHIRLPOOL 0607c5dcac7616a4bd77b6e5e8077feeb685b97a85601534619bbb914fc9380aadfc8ebb1e1711f75bdb075420afb5c4bfe8350f9772d874bc6abf1926be8782
diff --git a/sec-policy/selinux-logsentry/selinux-logsentry-2.20170204-r1.ebuild b/sec-policy/selinux-logsentry/selinux-logsentry-2.20170204-r1.ebuild
index 22960a1f8922..b60407d2ed6a 100644
--- a/sec-policy/selinux-logsentry/selinux-logsentry-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-logsentry/selinux-logsentry-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-logsentry/selinux-logsentry-2.20170204-r2.ebuild b/sec-policy/selinux-logsentry/selinux-logsentry-2.20170204-r2.ebuild
index e08399fe1a9f..523ca2af3edd 100644
--- a/sec-policy/selinux-logsentry/selinux-logsentry-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-logsentry/selinux-logsentry-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-logsentry/selinux-logsentry-2.20170204-r3.ebuild b/sec-policy/selinux-logsentry/selinux-logsentry-2.20170204-r3.ebuild
index e08399fe1a9f..523ca2af3edd 100644
--- a/sec-policy/selinux-logsentry/selinux-logsentry-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-logsentry/selinux-logsentry-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-logsentry/selinux-logsentry-2.20170204-r4.ebuild b/sec-policy/selinux-logsentry/selinux-logsentry-2.20170204-r4.ebuild
index e08399fe1a9f..523ca2af3edd 100644
--- a/sec-policy/selinux-logsentry/selinux-logsentry-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-logsentry/selinux-logsentry-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-logsentry/selinux-logsentry-2.20170805-r2.ebuild b/sec-policy/selinux-logsentry/selinux-logsentry-2.20170805-r2.ebuild
index e08399fe1a9f..523ca2af3edd 100644
--- a/sec-policy/selinux-logsentry/selinux-logsentry-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-logsentry/selinux-logsentry-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-logsentry/selinux-logsentry-2.20170805-r3.ebuild b/sec-policy/selinux-logsentry/selinux-logsentry-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..b60407d2ed6a
--- /dev/null
+++ b/sec-policy/selinux-logsentry/selinux-logsentry-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-logsentry/selinux-logsentry-9999.ebuild b/sec-policy/selinux-logsentry/selinux-logsentry-9999.ebuild
index 22960a1f8922..b60407d2ed6a 100644
--- a/sec-policy/selinux-logsentry/selinux-logsentry-9999.ebuild
+++ b/sec-policy/selinux-logsentry/selinux-logsentry-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-logwatch/Manifest b/sec-policy/selinux-logwatch/Manifest
index eff341429cf6..741933505e07 100644
--- a/sec-policy/selinux-logwatch/Manifest
+++ b/sec-policy/selinux-logwatch/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-logwatch-2.20170204-r1.ebuild 287 SHA256 bf60392c1e4a056590eb15dd512d7f564aaa1f090ea98c654e6a9381f7e992e1 SHA512 e60ee0464739ba4aab060d0b26b167938d23916fff1acf2066fae19462ee564cf4d62cf53a8fdfac790fdae03a00c6e1c4c272063e9f8cf8064d163a03691b0d WHIRLPOOL c60693390b025e76d0712055238688955bbb092c289aac2b96edeec1de5f8650707d2c81d2c259846827e73f5b6200b823733d7da86b300c3267e142b19c9813
-EBUILD selinux-logwatch-2.20170204-r2.ebuild 285 SHA256 b7dead07bf38f01ea1b087b1dbccee458ba5a5c7a54285e08595ef6aad6c0a58 SHA512 b3aaae7648394911711540283016274dc29d38b9941bde26369a55f1e0346dea4ae9f5ae9dacdd82f7a509ec31d27eec905daa8c62d45c4cc43085e75afb53aa WHIRLPOOL 8f4240fb18ba7e5422ec77273593aac0c6c8942332383b1fac871b6bfdf65f179802de8751c3bbe1283529e2218eae57293ed0ac6706c2476f80d7b6a9bbc03d
-EBUILD selinux-logwatch-2.20170204-r3.ebuild 285 SHA256 b7dead07bf38f01ea1b087b1dbccee458ba5a5c7a54285e08595ef6aad6c0a58 SHA512 b3aaae7648394911711540283016274dc29d38b9941bde26369a55f1e0346dea4ae9f5ae9dacdd82f7a509ec31d27eec905daa8c62d45c4cc43085e75afb53aa WHIRLPOOL 8f4240fb18ba7e5422ec77273593aac0c6c8942332383b1fac871b6bfdf65f179802de8751c3bbe1283529e2218eae57293ed0ac6706c2476f80d7b6a9bbc03d
-EBUILD selinux-logwatch-2.20170204-r4.ebuild 285 SHA256 b7dead07bf38f01ea1b087b1dbccee458ba5a5c7a54285e08595ef6aad6c0a58 SHA512 b3aaae7648394911711540283016274dc29d38b9941bde26369a55f1e0346dea4ae9f5ae9dacdd82f7a509ec31d27eec905daa8c62d45c4cc43085e75afb53aa WHIRLPOOL 8f4240fb18ba7e5422ec77273593aac0c6c8942332383b1fac871b6bfdf65f179802de8751c3bbe1283529e2218eae57293ed0ac6706c2476f80d7b6a9bbc03d
-EBUILD selinux-logwatch-2.20170805-r2.ebuild 285 SHA256 b7dead07bf38f01ea1b087b1dbccee458ba5a5c7a54285e08595ef6aad6c0a58 SHA512 b3aaae7648394911711540283016274dc29d38b9941bde26369a55f1e0346dea4ae9f5ae9dacdd82f7a509ec31d27eec905daa8c62d45c4cc43085e75afb53aa WHIRLPOOL 8f4240fb18ba7e5422ec77273593aac0c6c8942332383b1fac871b6bfdf65f179802de8751c3bbe1283529e2218eae57293ed0ac6706c2476f80d7b6a9bbc03d
-EBUILD selinux-logwatch-9999.ebuild 287 SHA256 bf60392c1e4a056590eb15dd512d7f564aaa1f090ea98c654e6a9381f7e992e1 SHA512 e60ee0464739ba4aab060d0b26b167938d23916fff1acf2066fae19462ee564cf4d62cf53a8fdfac790fdae03a00c6e1c4c272063e9f8cf8064d163a03691b0d WHIRLPOOL c60693390b025e76d0712055238688955bbb092c289aac2b96edeec1de5f8650707d2c81d2c259846827e73f5b6200b823733d7da86b300c3267e142b19c9813
+EBUILD selinux-logwatch-2.20170204-r1.ebuild 288 SHA256 1aff59065bfac7f752aec6a83bfc8a37c2ea7f5f34424513c03ea6d581531adc SHA512 c913d9d3075fc324ff027ff6b52edbbcb79cbbded39e42afc96a0ba5bea7d2cc3dfa8dee6a7c1ef2897c227b1b685c3cd39b33a09efe0dc12082658f1b3ef47e WHIRLPOOL b4123ee0590bba926139678cb3973b69b453730b1822bc1210ae3e1fcc157e917ba70f305c4ec802e88a08d6252e85a3eee6d4015d1760fb45b9612db1f44b30
+EBUILD selinux-logwatch-2.20170204-r2.ebuild 286 SHA256 ccc1e05549a8648ee77496cfe4042c368141bfb7c219c1aa906016ae08f95ae7 SHA512 1916eec316392c31f04e74a6da4f038e92cb8889f6fee062a1088da0a32eca41baa041ee608b05d4810e4645fb200610ca6266c8743e8f7061733fc0275352f8 WHIRLPOOL 32b08c75ab99dfdc1b24d87183f454bf2e9bc3bc5317e309ca3ff40c4f39c826fc50b8d0de5d2395ba860c42b67931296d5ffd2292f81fc45d1ee98e39c67491
+EBUILD selinux-logwatch-2.20170204-r3.ebuild 286 SHA256 ccc1e05549a8648ee77496cfe4042c368141bfb7c219c1aa906016ae08f95ae7 SHA512 1916eec316392c31f04e74a6da4f038e92cb8889f6fee062a1088da0a32eca41baa041ee608b05d4810e4645fb200610ca6266c8743e8f7061733fc0275352f8 WHIRLPOOL 32b08c75ab99dfdc1b24d87183f454bf2e9bc3bc5317e309ca3ff40c4f39c826fc50b8d0de5d2395ba860c42b67931296d5ffd2292f81fc45d1ee98e39c67491
+EBUILD selinux-logwatch-2.20170204-r4.ebuild 286 SHA256 ccc1e05549a8648ee77496cfe4042c368141bfb7c219c1aa906016ae08f95ae7 SHA512 1916eec316392c31f04e74a6da4f038e92cb8889f6fee062a1088da0a32eca41baa041ee608b05d4810e4645fb200610ca6266c8743e8f7061733fc0275352f8 WHIRLPOOL 32b08c75ab99dfdc1b24d87183f454bf2e9bc3bc5317e309ca3ff40c4f39c826fc50b8d0de5d2395ba860c42b67931296d5ffd2292f81fc45d1ee98e39c67491
+EBUILD selinux-logwatch-2.20170805-r2.ebuild 286 SHA256 ccc1e05549a8648ee77496cfe4042c368141bfb7c219c1aa906016ae08f95ae7 SHA512 1916eec316392c31f04e74a6da4f038e92cb8889f6fee062a1088da0a32eca41baa041ee608b05d4810e4645fb200610ca6266c8743e8f7061733fc0275352f8 WHIRLPOOL 32b08c75ab99dfdc1b24d87183f454bf2e9bc3bc5317e309ca3ff40c4f39c826fc50b8d0de5d2395ba860c42b67931296d5ffd2292f81fc45d1ee98e39c67491
+EBUILD selinux-logwatch-2.20170805-r3.ebuild 288 SHA256 1aff59065bfac7f752aec6a83bfc8a37c2ea7f5f34424513c03ea6d581531adc SHA512 c913d9d3075fc324ff027ff6b52edbbcb79cbbded39e42afc96a0ba5bea7d2cc3dfa8dee6a7c1ef2897c227b1b685c3cd39b33a09efe0dc12082658f1b3ef47e WHIRLPOOL b4123ee0590bba926139678cb3973b69b453730b1822bc1210ae3e1fcc157e917ba70f305c4ec802e88a08d6252e85a3eee6d4015d1760fb45b9612db1f44b30
+EBUILD selinux-logwatch-9999.ebuild 288 SHA256 1aff59065bfac7f752aec6a83bfc8a37c2ea7f5f34424513c03ea6d581531adc SHA512 c913d9d3075fc324ff027ff6b52edbbcb79cbbded39e42afc96a0ba5bea7d2cc3dfa8dee6a7c1ef2897c227b1b685c3cd39b33a09efe0dc12082658f1b3ef47e WHIRLPOOL b4123ee0590bba926139678cb3973b69b453730b1822bc1210ae3e1fcc157e917ba70f305c4ec802e88a08d6252e85a3eee6d4015d1760fb45b9612db1f44b30
 MISC ChangeLog 10793 SHA256 756b4ff567d864221c528bdce54c90448f470037749e68ed9f80a6419cd96bac SHA512 cd3d433cb12f3814fb1dc4639b8b204de676770ac1532bbb0babd0855ba2eea1da67b216f4e10ad0e8a1d3247f8b58f1384139649b783ffff485e347326454ec WHIRLPOOL ff85b50d66220dac8b2ea71d847668bb56147b6250ca8690747edb7aacd723fb960594173a81961d29ebb3d3d34e4d66a4d6f716e7fa9cc91fcc3a3d0e5cda80
 MISC ChangeLog-2015 10103 SHA256 58a42acabbda8430f61ba736c5232886c3e1a196479495790b9c67732dc99cec SHA512 718a3b88c4454b87308271893ae59f70b98d87ff85cb7f5cac0fb63ac0ede0cb4e15027ec9bb77eefb9f45cbe786be9e001a0bd3be3a1f4c0deb23da6253b8bf WHIRLPOOL c915119d2eee582fd475ad6f2b41cd10e563c5863fc887c978275f06b39bdf3086ba048240405b7cba67d626e67730d2851050cc3b85435898cd2f7a0d476efe
 MISC metadata.xml 318 SHA256 b4923bcde3f219ef1b3d25a3a3febe496f23ed3ae43d35baefdfe25ff2404259 SHA512 4a7407a0137f66d16b507fc695b45b9e21f4ebfab64d4cb0a755a5c961e1cb2deb84807209b2039f1de6867319091236b4eaa37647c8107db2f9e04caf6383bd WHIRLPOOL 0810676327cc70c8c384b751ec7dedfa38834d43676255407ca695d947a7cba277b7bf10fc4dac23c865742b50adf83bcf007129896ce943ae556555f444f89c
diff --git a/sec-policy/selinux-logwatch/selinux-logwatch-2.20170204-r1.ebuild b/sec-policy/selinux-logwatch/selinux-logwatch-2.20170204-r1.ebuild
index c2d6da599a4b..402975aec14a 100644
--- a/sec-policy/selinux-logwatch/selinux-logwatch-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-logwatch/selinux-logwatch-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-logwatch/selinux-logwatch-2.20170204-r2.ebuild b/sec-policy/selinux-logwatch/selinux-logwatch-2.20170204-r2.ebuild
index 185ef5162c47..1b00546dc81d 100644
--- a/sec-policy/selinux-logwatch/selinux-logwatch-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-logwatch/selinux-logwatch-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-logwatch/selinux-logwatch-2.20170204-r3.ebuild b/sec-policy/selinux-logwatch/selinux-logwatch-2.20170204-r3.ebuild
index 185ef5162c47..1b00546dc81d 100644
--- a/sec-policy/selinux-logwatch/selinux-logwatch-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-logwatch/selinux-logwatch-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-logwatch/selinux-logwatch-2.20170204-r4.ebuild b/sec-policy/selinux-logwatch/selinux-logwatch-2.20170204-r4.ebuild
index 185ef5162c47..1b00546dc81d 100644
--- a/sec-policy/selinux-logwatch/selinux-logwatch-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-logwatch/selinux-logwatch-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-logwatch/selinux-logwatch-2.20170805-r2.ebuild b/sec-policy/selinux-logwatch/selinux-logwatch-2.20170805-r2.ebuild
index 185ef5162c47..1b00546dc81d 100644
--- a/sec-policy/selinux-logwatch/selinux-logwatch-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-logwatch/selinux-logwatch-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-logwatch/selinux-logwatch-2.20170805-r3.ebuild b/sec-policy/selinux-logwatch/selinux-logwatch-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..402975aec14a
--- /dev/null
+++ b/sec-policy/selinux-logwatch/selinux-logwatch-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-logwatch/selinux-logwatch-9999.ebuild b/sec-policy/selinux-logwatch/selinux-logwatch-9999.ebuild
index c2d6da599a4b..402975aec14a 100644
--- a/sec-policy/selinux-logwatch/selinux-logwatch-9999.ebuild
+++ b/sec-policy/selinux-logwatch/selinux-logwatch-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-lpd/Manifest b/sec-policy/selinux-lpd/Manifest
index 31aa490350d4..32795f1e1216 100644
--- a/sec-policy/selinux-lpd/Manifest
+++ b/sec-policy/selinux-lpd/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-lpd-2.20170204-r1.ebuild 277 SHA256 8bc8f685d1a7a1204f00f698cbf7368f482db8f18b015fdf38417edb2baabda8 SHA512 b650f057a4670141362377126b4ffe30d8bb0acdfabef3102ef1cc5d0da9c679a65b9cf9edbe1395cf40796d36ca876306173a61c82f295aa7c1690e107ab209 WHIRLPOOL e8b3618fc73cfafe8510fbe9e8f1adc9fe3ea85984b03205790af254ce50b957ef44d3fea5d8dbaf22974cd7b1c819f0a392c024b3710bbc511e7d685218b315
-EBUILD selinux-lpd-2.20170204-r2.ebuild 275 SHA256 4f3ff961afb17bbdadf71ea9f0c542e51c59cb1a168725ae1e15438605ecbfc1 SHA512 c9a48a71d52347af139025bf1c6a628ca6a66314bc7ad185097faee1628ef5f51c54b105492d21465508ae881b4816868632bee8a458c53e90c02303a5b14872 WHIRLPOOL 3086e28b167c3938ca3cfab19f29f11026812b53e797616b515446fd50b4c6901704c0b8ba67ef122d60e4512aab83839279b455481fe8b54243df63a5b939d7
-EBUILD selinux-lpd-2.20170204-r3.ebuild 275 SHA256 4f3ff961afb17bbdadf71ea9f0c542e51c59cb1a168725ae1e15438605ecbfc1 SHA512 c9a48a71d52347af139025bf1c6a628ca6a66314bc7ad185097faee1628ef5f51c54b105492d21465508ae881b4816868632bee8a458c53e90c02303a5b14872 WHIRLPOOL 3086e28b167c3938ca3cfab19f29f11026812b53e797616b515446fd50b4c6901704c0b8ba67ef122d60e4512aab83839279b455481fe8b54243df63a5b939d7
-EBUILD selinux-lpd-2.20170204-r4.ebuild 275 SHA256 4f3ff961afb17bbdadf71ea9f0c542e51c59cb1a168725ae1e15438605ecbfc1 SHA512 c9a48a71d52347af139025bf1c6a628ca6a66314bc7ad185097faee1628ef5f51c54b105492d21465508ae881b4816868632bee8a458c53e90c02303a5b14872 WHIRLPOOL 3086e28b167c3938ca3cfab19f29f11026812b53e797616b515446fd50b4c6901704c0b8ba67ef122d60e4512aab83839279b455481fe8b54243df63a5b939d7
-EBUILD selinux-lpd-2.20170805-r2.ebuild 275 SHA256 4f3ff961afb17bbdadf71ea9f0c542e51c59cb1a168725ae1e15438605ecbfc1 SHA512 c9a48a71d52347af139025bf1c6a628ca6a66314bc7ad185097faee1628ef5f51c54b105492d21465508ae881b4816868632bee8a458c53e90c02303a5b14872 WHIRLPOOL 3086e28b167c3938ca3cfab19f29f11026812b53e797616b515446fd50b4c6901704c0b8ba67ef122d60e4512aab83839279b455481fe8b54243df63a5b939d7
-EBUILD selinux-lpd-9999.ebuild 277 SHA256 8bc8f685d1a7a1204f00f698cbf7368f482db8f18b015fdf38417edb2baabda8 SHA512 b650f057a4670141362377126b4ffe30d8bb0acdfabef3102ef1cc5d0da9c679a65b9cf9edbe1395cf40796d36ca876306173a61c82f295aa7c1690e107ab209 WHIRLPOOL e8b3618fc73cfafe8510fbe9e8f1adc9fe3ea85984b03205790af254ce50b957ef44d3fea5d8dbaf22974cd7b1c819f0a392c024b3710bbc511e7d685218b315
+EBUILD selinux-lpd-2.20170204-r1.ebuild 278 SHA256 19e5b3ca5653beba81ded1a9c0cf3e3e68c9a0bbb55d1cfeb4c80224c8fad5ef SHA512 21fa11fc80bd790560e4c8c52c60e7a54439b20cbe95cc62829d3d94363fdfb79c0251a20f7fe2807bce699bb37936403d607cf48a91b6cd774dca10abf2708b WHIRLPOOL 9989b10498e032976b6bb9d5c39a83d95fc6249e49d8bfd2812a89199868e17bbf614709030594e500cd2e3db0df8705f356ce5b59c93b174c10c4fd9a84f945
+EBUILD selinux-lpd-2.20170204-r2.ebuild 276 SHA256 03cef38cafd91f1511d58348de46fc4f00b24331267ae7d8e6b45f9fc6d2b502 SHA512 1eac05feab99593f87574a0b904b05c6aca4df9edf00bb1743e14288f6abf0c91423f330e070198180d5239190868d7f8e72474ff218e222c8ca84f2da801784 WHIRLPOOL b6959d9b9bedbb69c736a14893830d200518c02a77b9aab6cc77afddffa7aa6b956fda4d2882da8ce8b2e24a743983b282ba1b86e52b7600d7f9f2eb0ab80bec
+EBUILD selinux-lpd-2.20170204-r3.ebuild 276 SHA256 03cef38cafd91f1511d58348de46fc4f00b24331267ae7d8e6b45f9fc6d2b502 SHA512 1eac05feab99593f87574a0b904b05c6aca4df9edf00bb1743e14288f6abf0c91423f330e070198180d5239190868d7f8e72474ff218e222c8ca84f2da801784 WHIRLPOOL b6959d9b9bedbb69c736a14893830d200518c02a77b9aab6cc77afddffa7aa6b956fda4d2882da8ce8b2e24a743983b282ba1b86e52b7600d7f9f2eb0ab80bec
+EBUILD selinux-lpd-2.20170204-r4.ebuild 276 SHA256 03cef38cafd91f1511d58348de46fc4f00b24331267ae7d8e6b45f9fc6d2b502 SHA512 1eac05feab99593f87574a0b904b05c6aca4df9edf00bb1743e14288f6abf0c91423f330e070198180d5239190868d7f8e72474ff218e222c8ca84f2da801784 WHIRLPOOL b6959d9b9bedbb69c736a14893830d200518c02a77b9aab6cc77afddffa7aa6b956fda4d2882da8ce8b2e24a743983b282ba1b86e52b7600d7f9f2eb0ab80bec
+EBUILD selinux-lpd-2.20170805-r2.ebuild 276 SHA256 03cef38cafd91f1511d58348de46fc4f00b24331267ae7d8e6b45f9fc6d2b502 SHA512 1eac05feab99593f87574a0b904b05c6aca4df9edf00bb1743e14288f6abf0c91423f330e070198180d5239190868d7f8e72474ff218e222c8ca84f2da801784 WHIRLPOOL b6959d9b9bedbb69c736a14893830d200518c02a77b9aab6cc77afddffa7aa6b956fda4d2882da8ce8b2e24a743983b282ba1b86e52b7600d7f9f2eb0ab80bec
+EBUILD selinux-lpd-2.20170805-r3.ebuild 278 SHA256 19e5b3ca5653beba81ded1a9c0cf3e3e68c9a0bbb55d1cfeb4c80224c8fad5ef SHA512 21fa11fc80bd790560e4c8c52c60e7a54439b20cbe95cc62829d3d94363fdfb79c0251a20f7fe2807bce699bb37936403d607cf48a91b6cd774dca10abf2708b WHIRLPOOL 9989b10498e032976b6bb9d5c39a83d95fc6249e49d8bfd2812a89199868e17bbf614709030594e500cd2e3db0df8705f356ce5b59c93b174c10c4fd9a84f945
+EBUILD selinux-lpd-9999.ebuild 278 SHA256 19e5b3ca5653beba81ded1a9c0cf3e3e68c9a0bbb55d1cfeb4c80224c8fad5ef SHA512 21fa11fc80bd790560e4c8c52c60e7a54439b20cbe95cc62829d3d94363fdfb79c0251a20f7fe2807bce699bb37936403d607cf48a91b6cd774dca10abf2708b WHIRLPOOL 9989b10498e032976b6bb9d5c39a83d95fc6249e49d8bfd2812a89199868e17bbf614709030594e500cd2e3db0df8705f356ce5b59c93b174c10c4fd9a84f945
 MISC ChangeLog 10295 SHA256 30a5bf3a81302b6fb78cc7f87423b7e89194af07d687a625627c9d35fd653693 SHA512 5157ca54253b54acf350d0be1f015c8ea78e464820c6e633c967223e8d10a2ad8611a19b76d3d894df2f0aeaf8cd7bd2949e6adbdd29fcca54194e6fe38e2d3f WHIRLPOOL 95f89bc1acf4e4e847945622f994cbc461aa046f2122dda4330730f1111cc2ac68ad48b89fa3f872e10504bdfdb4c394835572f01a7fad02edc1e7168207ac97
 MISC ChangeLog-2015 11006 SHA256 5cbaff6091a8be795a4b9f036152818aa91793427a477f955eb48a0d3892afac SHA512 560ea98cad6444fefe2a88b599193c7c23b336023cf390b5a25ff6903d435c9bda610d8bcd85f084e2e7be00a36abba5694f811dac88a7907244e9683c921497 WHIRLPOOL 00b120bc43c6afdc42f6cf7c29c13de77f5fb3be11e8c0d4a926a196b235594d63fbbea6db7480bcc06f5b9bbadd1c897ce9f3759109f40ba9708b42e67446ba
 MISC metadata.xml 313 SHA256 500578cec96d6c53f6839f62c82f30568772ed190c640df776668af775518e7b SHA512 03d93808ba7e8db5cc04b91fc47ec9975edc36e1586851e16bde078f0d37c7560a4c33ee00c865332ffca409c8cb07f9a9d3427e160528c111e64f51ad46ff77 WHIRLPOOL 3b481f48e0c750ec600242cbc2bba2faccc008456ed3662cd4c8cd68b31391bd20b40ac78de64db36689a4d0ddb8f07d88da2695cafc8e5d22a711627ae50fca
diff --git a/sec-policy/selinux-lpd/selinux-lpd-2.20170204-r1.ebuild b/sec-policy/selinux-lpd/selinux-lpd-2.20170204-r1.ebuild
index 5563769013de..839cb34d661a 100644
--- a/sec-policy/selinux-lpd/selinux-lpd-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-lpd/selinux-lpd-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-lpd/selinux-lpd-2.20170204-r2.ebuild b/sec-policy/selinux-lpd/selinux-lpd-2.20170204-r2.ebuild
index 2c1500e586e4..721d9802aa83 100644
--- a/sec-policy/selinux-lpd/selinux-lpd-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-lpd/selinux-lpd-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-lpd/selinux-lpd-2.20170204-r3.ebuild b/sec-policy/selinux-lpd/selinux-lpd-2.20170204-r3.ebuild
index 2c1500e586e4..721d9802aa83 100644
--- a/sec-policy/selinux-lpd/selinux-lpd-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-lpd/selinux-lpd-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-lpd/selinux-lpd-2.20170204-r4.ebuild b/sec-policy/selinux-lpd/selinux-lpd-2.20170204-r4.ebuild
index 2c1500e586e4..721d9802aa83 100644
--- a/sec-policy/selinux-lpd/selinux-lpd-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-lpd/selinux-lpd-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-lpd/selinux-lpd-2.20170805-r2.ebuild b/sec-policy/selinux-lpd/selinux-lpd-2.20170805-r2.ebuild
index 2c1500e586e4..721d9802aa83 100644
--- a/sec-policy/selinux-lpd/selinux-lpd-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-lpd/selinux-lpd-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-lpd/selinux-lpd-2.20170805-r3.ebuild b/sec-policy/selinux-lpd/selinux-lpd-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..839cb34d661a
--- /dev/null
+++ b/sec-policy/selinux-lpd/selinux-lpd-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-lpd/selinux-lpd-9999.ebuild b/sec-policy/selinux-lpd/selinux-lpd-9999.ebuild
index 5563769013de..839cb34d661a 100644
--- a/sec-policy/selinux-lpd/selinux-lpd-9999.ebuild
+++ b/sec-policy/selinux-lpd/selinux-lpd-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-mailman/Manifest b/sec-policy/selinux-mailman/Manifest
index 3d6b5d88a660..24b07d5d4fbe 100644
--- a/sec-policy/selinux-mailman/Manifest
+++ b/sec-policy/selinux-mailman/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-mailman-2.20170204-r1.ebuild 285 SHA256 3155201f16faf14a29cc91dfecea6e2c32d45e9664ffbd885064b962935a69e8 SHA512 aef06a19022d4d0f214d80f6ba3fda90ed6579672b75e1ad423a610066d03f0cf7916ff8260b11a90ee67f9bd8545929679cab627011c1fc514fd4141decc335 WHIRLPOOL f34eda91bb13fa7b9abbeb6403279f9a33796b996dac2c33ba659bddaa072754637f7a7a03186fc7abc35d67aa42bd24a98fb547beaaf5076ad46ecae5c54446
-EBUILD selinux-mailman-2.20170204-r2.ebuild 283 SHA256 d13a114aed5cc13656a866f443f65116304ebdedb683a5e538e412ec6ebd3453 SHA512 cb7b6b849ae94be85b53ca500e985fdce8278a820530121e9d7a9dd806ed993612608793149ba5673095b77707c962258fb3852182c74bc9cac4c6ab141b952c WHIRLPOOL dfdf8c6d1d6d602589577456bc691e2f58cb28e776a007cb288106db9f14a2405ce9e910069be4125d754b9b39637917edb61d5bfce7879d86c00e2ec4986f8b
-EBUILD selinux-mailman-2.20170204-r3.ebuild 283 SHA256 d13a114aed5cc13656a866f443f65116304ebdedb683a5e538e412ec6ebd3453 SHA512 cb7b6b849ae94be85b53ca500e985fdce8278a820530121e9d7a9dd806ed993612608793149ba5673095b77707c962258fb3852182c74bc9cac4c6ab141b952c WHIRLPOOL dfdf8c6d1d6d602589577456bc691e2f58cb28e776a007cb288106db9f14a2405ce9e910069be4125d754b9b39637917edb61d5bfce7879d86c00e2ec4986f8b
-EBUILD selinux-mailman-2.20170204-r4.ebuild 283 SHA256 d13a114aed5cc13656a866f443f65116304ebdedb683a5e538e412ec6ebd3453 SHA512 cb7b6b849ae94be85b53ca500e985fdce8278a820530121e9d7a9dd806ed993612608793149ba5673095b77707c962258fb3852182c74bc9cac4c6ab141b952c WHIRLPOOL dfdf8c6d1d6d602589577456bc691e2f58cb28e776a007cb288106db9f14a2405ce9e910069be4125d754b9b39637917edb61d5bfce7879d86c00e2ec4986f8b
-EBUILD selinux-mailman-2.20170805-r2.ebuild 283 SHA256 d13a114aed5cc13656a866f443f65116304ebdedb683a5e538e412ec6ebd3453 SHA512 cb7b6b849ae94be85b53ca500e985fdce8278a820530121e9d7a9dd806ed993612608793149ba5673095b77707c962258fb3852182c74bc9cac4c6ab141b952c WHIRLPOOL dfdf8c6d1d6d602589577456bc691e2f58cb28e776a007cb288106db9f14a2405ce9e910069be4125d754b9b39637917edb61d5bfce7879d86c00e2ec4986f8b
-EBUILD selinux-mailman-9999.ebuild 285 SHA256 3155201f16faf14a29cc91dfecea6e2c32d45e9664ffbd885064b962935a69e8 SHA512 aef06a19022d4d0f214d80f6ba3fda90ed6579672b75e1ad423a610066d03f0cf7916ff8260b11a90ee67f9bd8545929679cab627011c1fc514fd4141decc335 WHIRLPOOL f34eda91bb13fa7b9abbeb6403279f9a33796b996dac2c33ba659bddaa072754637f7a7a03186fc7abc35d67aa42bd24a98fb547beaaf5076ad46ecae5c54446
+EBUILD selinux-mailman-2.20170204-r1.ebuild 286 SHA256 d0a5f9981b1a1fd66147d56b4e0d09b2556865b816ce81f95012bd2a29cd5e2f SHA512 21ac5e5e0f708a7eb0b9c3c16bce2cdc36f8a170e19e457f02a67babb71e3f6f627a23b53f124056fc1c970c175279cad6f01ed1fa51c038657c04360b2bb8b1 WHIRLPOOL d9ec7250907c01729b7c3932699df9d1d9ad25ca2d4ccbc979393d4fb403e61edd13378720686ed90484ccaf4b53087c412b95b420373c0d7a489319b49da549
+EBUILD selinux-mailman-2.20170204-r2.ebuild 284 SHA256 409053b2efa158b9486286995ba4288853d53229aab098d30d00c213d96a771a SHA512 d81b2926589612a4a638693fb7ac5b1b1e97e3dc349e92a53822187b57a2ac146e1b227c37aed0cd4950bcb3c940a7fdb350c34c7cd2f289cb648e5c4cedddb0 WHIRLPOOL 0b551408d5148cdc59d1c16d5a9d3d35ea59058f4140286df51d5c5b7284c1f173084c98675926c8f3c992bc5b5d7142e831d67c8b8eceff1b57526fe148116b
+EBUILD selinux-mailman-2.20170204-r3.ebuild 284 SHA256 409053b2efa158b9486286995ba4288853d53229aab098d30d00c213d96a771a SHA512 d81b2926589612a4a638693fb7ac5b1b1e97e3dc349e92a53822187b57a2ac146e1b227c37aed0cd4950bcb3c940a7fdb350c34c7cd2f289cb648e5c4cedddb0 WHIRLPOOL 0b551408d5148cdc59d1c16d5a9d3d35ea59058f4140286df51d5c5b7284c1f173084c98675926c8f3c992bc5b5d7142e831d67c8b8eceff1b57526fe148116b
+EBUILD selinux-mailman-2.20170204-r4.ebuild 284 SHA256 409053b2efa158b9486286995ba4288853d53229aab098d30d00c213d96a771a SHA512 d81b2926589612a4a638693fb7ac5b1b1e97e3dc349e92a53822187b57a2ac146e1b227c37aed0cd4950bcb3c940a7fdb350c34c7cd2f289cb648e5c4cedddb0 WHIRLPOOL 0b551408d5148cdc59d1c16d5a9d3d35ea59058f4140286df51d5c5b7284c1f173084c98675926c8f3c992bc5b5d7142e831d67c8b8eceff1b57526fe148116b
+EBUILD selinux-mailman-2.20170805-r2.ebuild 284 SHA256 409053b2efa158b9486286995ba4288853d53229aab098d30d00c213d96a771a SHA512 d81b2926589612a4a638693fb7ac5b1b1e97e3dc349e92a53822187b57a2ac146e1b227c37aed0cd4950bcb3c940a7fdb350c34c7cd2f289cb648e5c4cedddb0 WHIRLPOOL 0b551408d5148cdc59d1c16d5a9d3d35ea59058f4140286df51d5c5b7284c1f173084c98675926c8f3c992bc5b5d7142e831d67c8b8eceff1b57526fe148116b
+EBUILD selinux-mailman-2.20170805-r3.ebuild 286 SHA256 d0a5f9981b1a1fd66147d56b4e0d09b2556865b816ce81f95012bd2a29cd5e2f SHA512 21ac5e5e0f708a7eb0b9c3c16bce2cdc36f8a170e19e457f02a67babb71e3f6f627a23b53f124056fc1c970c175279cad6f01ed1fa51c038657c04360b2bb8b1 WHIRLPOOL d9ec7250907c01729b7c3932699df9d1d9ad25ca2d4ccbc979393d4fb403e61edd13378720686ed90484ccaf4b53087c412b95b420373c0d7a489319b49da549
+EBUILD selinux-mailman-9999.ebuild 286 SHA256 d0a5f9981b1a1fd66147d56b4e0d09b2556865b816ce81f95012bd2a29cd5e2f SHA512 21ac5e5e0f708a7eb0b9c3c16bce2cdc36f8a170e19e457f02a67babb71e3f6f627a23b53f124056fc1c970c175279cad6f01ed1fa51c038657c04360b2bb8b1 WHIRLPOOL d9ec7250907c01729b7c3932699df9d1d9ad25ca2d4ccbc979393d4fb403e61edd13378720686ed90484ccaf4b53087c412b95b420373c0d7a489319b49da549
 MISC ChangeLog 10687 SHA256 6c16a2285332716547c8531c401be66f676f82f94759526289fae61041ef63c8 SHA512 8c1c467fac8ecc49c0faac9d86f4757307eabeb5ff583988e94d0035d902bd4a05a5e0b8e785ee9ac9f416af2b9ee11ca8afbdbbc42a2e184a45ca86f9db65ad WHIRLPOOL 9a6d9a03741e032ef126aee399ed9df9b128cf6bd10923ca4e69335be775f9802e67eda50762dad17468a7db667f46527eba8aaa63fee5b54ceb61fcbcc33805
 MISC ChangeLog-2015 10173 SHA256 46c37cc10e4dc9d7002fc495a66fc4ab8b4698923c5b0741c5a7eef1b0228bd8 SHA512 a0613769cde9e890638e5df9a49d1c22c372e29cc17e6bdac40d037b5b365dfaf06362538f58250c37dc97542961d14137cd9d94a0e89b31eb7056ffdc652c66 WHIRLPOOL 2492702c7fee1ff1219c55da4ba79501c51e9308b28d89936d9d3f398fc9dd16b55f0424b5209d378b66873cf60f04f605ce096039c7327100c38682da615294
 MISC metadata.xml 317 SHA256 7858a17ac1eeb03c9352f4e0203c8829f59dc5de509312eeef8f0efdf3722f63 SHA512 2c542b0d9cf5698b68e2fb6052480e3e3e0c28f2b06cca88016cb67cc8930ca81bf4c8958124bc447571a8527ece7834e47d7f8f8f1e49a52d308b04e9378b09 WHIRLPOOL 9f0216b1928a9c87102789d0528279600a20e23a43dad5d292294b48a3b5bd073c114f28fa44759cca1d0df9107c073d86fda700487f9b8f22f3fee7a26bc5db
diff --git a/sec-policy/selinux-mailman/selinux-mailman-2.20170204-r1.ebuild b/sec-policy/selinux-mailman/selinux-mailman-2.20170204-r1.ebuild
index 3f1d5fa0a7d5..94b0bef5e7d2 100644
--- a/sec-policy/selinux-mailman/selinux-mailman-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-mailman/selinux-mailman-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-mailman/selinux-mailman-2.20170204-r2.ebuild b/sec-policy/selinux-mailman/selinux-mailman-2.20170204-r2.ebuild
index a2564406ab6f..600e865a80db 100644
--- a/sec-policy/selinux-mailman/selinux-mailman-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-mailman/selinux-mailman-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-mailman/selinux-mailman-2.20170204-r3.ebuild b/sec-policy/selinux-mailman/selinux-mailman-2.20170204-r3.ebuild
index a2564406ab6f..600e865a80db 100644
--- a/sec-policy/selinux-mailman/selinux-mailman-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-mailman/selinux-mailman-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-mailman/selinux-mailman-2.20170204-r4.ebuild b/sec-policy/selinux-mailman/selinux-mailman-2.20170204-r4.ebuild
index a2564406ab6f..600e865a80db 100644
--- a/sec-policy/selinux-mailman/selinux-mailman-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-mailman/selinux-mailman-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-mailman/selinux-mailman-2.20170805-r2.ebuild b/sec-policy/selinux-mailman/selinux-mailman-2.20170805-r2.ebuild
index a2564406ab6f..600e865a80db 100644
--- a/sec-policy/selinux-mailman/selinux-mailman-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-mailman/selinux-mailman-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-mailman/selinux-mailman-2.20170805-r3.ebuild b/sec-policy/selinux-mailman/selinux-mailman-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..94b0bef5e7d2
--- /dev/null
+++ b/sec-policy/selinux-mailman/selinux-mailman-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-mailman/selinux-mailman-9999.ebuild b/sec-policy/selinux-mailman/selinux-mailman-9999.ebuild
index 3f1d5fa0a7d5..94b0bef5e7d2 100644
--- a/sec-policy/selinux-mailman/selinux-mailman-9999.ebuild
+++ b/sec-policy/selinux-mailman/selinux-mailman-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-makewhatis/Manifest b/sec-policy/selinux-makewhatis/Manifest
index 68fa165fb3d0..33f158bd3c30 100644
--- a/sec-policy/selinux-makewhatis/Manifest
+++ b/sec-policy/selinux-makewhatis/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-makewhatis-2.20170204-r1.ebuild 291 SHA256 3bffdb257f23a71944a633e624b1d4f3d13701008e325ce25494e0539238356b SHA512 96b34a5a4b8561d736a5b1019df02a985488d31c455fd454deb0678dab882150205c516439d5a4ab7fe4563e0ec572ae032a53101501bc1ea06156f9dd1010c8 WHIRLPOOL 04faa161b1d705f25fa56a21b7090ac002e265685c7509a78e24c6a204f596fa28667f399a2af499cbe3da400773a7049c019d014b3d7d44ca812227df1d71b3
-EBUILD selinux-makewhatis-2.20170204-r2.ebuild 289 SHA256 635dfda97be1ab987d2fdef102a272120b98bcc882355905ef93ca52267a72a9 SHA512 9e57555bf22a49953a84f4e7d7e2b1d3025f4e46e342193287303b82b5fbf18eedf908dac6617fc9b6ad6f0c0fdd7f14e25260c2baeac0bf688a4afb7cbf100c WHIRLPOOL 3a1139d6bf80147de3a0a9ebd782c5cc4e26e28a42d0029865818fa99e597ecf139cee6a855d6d93f9ef894d9306bfafea46fefc6ac61d26efac6ab7a796691c
-EBUILD selinux-makewhatis-2.20170204-r3.ebuild 289 SHA256 635dfda97be1ab987d2fdef102a272120b98bcc882355905ef93ca52267a72a9 SHA512 9e57555bf22a49953a84f4e7d7e2b1d3025f4e46e342193287303b82b5fbf18eedf908dac6617fc9b6ad6f0c0fdd7f14e25260c2baeac0bf688a4afb7cbf100c WHIRLPOOL 3a1139d6bf80147de3a0a9ebd782c5cc4e26e28a42d0029865818fa99e597ecf139cee6a855d6d93f9ef894d9306bfafea46fefc6ac61d26efac6ab7a796691c
-EBUILD selinux-makewhatis-2.20170204-r4.ebuild 289 SHA256 635dfda97be1ab987d2fdef102a272120b98bcc882355905ef93ca52267a72a9 SHA512 9e57555bf22a49953a84f4e7d7e2b1d3025f4e46e342193287303b82b5fbf18eedf908dac6617fc9b6ad6f0c0fdd7f14e25260c2baeac0bf688a4afb7cbf100c WHIRLPOOL 3a1139d6bf80147de3a0a9ebd782c5cc4e26e28a42d0029865818fa99e597ecf139cee6a855d6d93f9ef894d9306bfafea46fefc6ac61d26efac6ab7a796691c
-EBUILD selinux-makewhatis-2.20170805-r2.ebuild 289 SHA256 635dfda97be1ab987d2fdef102a272120b98bcc882355905ef93ca52267a72a9 SHA512 9e57555bf22a49953a84f4e7d7e2b1d3025f4e46e342193287303b82b5fbf18eedf908dac6617fc9b6ad6f0c0fdd7f14e25260c2baeac0bf688a4afb7cbf100c WHIRLPOOL 3a1139d6bf80147de3a0a9ebd782c5cc4e26e28a42d0029865818fa99e597ecf139cee6a855d6d93f9ef894d9306bfafea46fefc6ac61d26efac6ab7a796691c
-EBUILD selinux-makewhatis-9999.ebuild 291 SHA256 3bffdb257f23a71944a633e624b1d4f3d13701008e325ce25494e0539238356b SHA512 96b34a5a4b8561d736a5b1019df02a985488d31c455fd454deb0678dab882150205c516439d5a4ab7fe4563e0ec572ae032a53101501bc1ea06156f9dd1010c8 WHIRLPOOL 04faa161b1d705f25fa56a21b7090ac002e265685c7509a78e24c6a204f596fa28667f399a2af499cbe3da400773a7049c019d014b3d7d44ca812227df1d71b3
+EBUILD selinux-makewhatis-2.20170204-r1.ebuild 292 SHA256 7974b16b0bee0f45b74c32947fa26b5aaba3485816f5e3d7315eec36a5b05ce5 SHA512 0a0d25bf49d4d67effa5e64a3c7cd869ddf28480f065e703f5e9c784b350a0a6c625cdb13cdf37d26591c9cb7576097afdb77f8ea193a77556bc6895144d3594 WHIRLPOOL d9c2fc698b760b28c330611c49811e7b09e946e3d7ab67d30080088b2a213b2dc2664c7d2f0195564d1bc988747c7caf4ff414982bfa0e0400a801ab25164f00
+EBUILD selinux-makewhatis-2.20170204-r2.ebuild 290 SHA256 2a923db5d6f13d306b3c79f9ce496497947a3d7d7c49664e21ea9184c435ea06 SHA512 86eb82746cbf121836b7045e6edece5381ed0b86b198ae3bee0a92b212a2b1783f6afd11b9f4e11dc35ed75b0d392936a21df95f647124e23e4fe5dac7c8b130 WHIRLPOOL d2171dd3ae68a3c0e6a1745f05ba26b36c8332a6329223fc867e94145ecd517d1c30273939a18dabbe49d1c67ea2b957c1c516bdeb14ddef08da1b8947be7078
+EBUILD selinux-makewhatis-2.20170204-r3.ebuild 290 SHA256 2a923db5d6f13d306b3c79f9ce496497947a3d7d7c49664e21ea9184c435ea06 SHA512 86eb82746cbf121836b7045e6edece5381ed0b86b198ae3bee0a92b212a2b1783f6afd11b9f4e11dc35ed75b0d392936a21df95f647124e23e4fe5dac7c8b130 WHIRLPOOL d2171dd3ae68a3c0e6a1745f05ba26b36c8332a6329223fc867e94145ecd517d1c30273939a18dabbe49d1c67ea2b957c1c516bdeb14ddef08da1b8947be7078
+EBUILD selinux-makewhatis-2.20170204-r4.ebuild 290 SHA256 2a923db5d6f13d306b3c79f9ce496497947a3d7d7c49664e21ea9184c435ea06 SHA512 86eb82746cbf121836b7045e6edece5381ed0b86b198ae3bee0a92b212a2b1783f6afd11b9f4e11dc35ed75b0d392936a21df95f647124e23e4fe5dac7c8b130 WHIRLPOOL d2171dd3ae68a3c0e6a1745f05ba26b36c8332a6329223fc867e94145ecd517d1c30273939a18dabbe49d1c67ea2b957c1c516bdeb14ddef08da1b8947be7078
+EBUILD selinux-makewhatis-2.20170805-r2.ebuild 290 SHA256 2a923db5d6f13d306b3c79f9ce496497947a3d7d7c49664e21ea9184c435ea06 SHA512 86eb82746cbf121836b7045e6edece5381ed0b86b198ae3bee0a92b212a2b1783f6afd11b9f4e11dc35ed75b0d392936a21df95f647124e23e4fe5dac7c8b130 WHIRLPOOL d2171dd3ae68a3c0e6a1745f05ba26b36c8332a6329223fc867e94145ecd517d1c30273939a18dabbe49d1c67ea2b957c1c516bdeb14ddef08da1b8947be7078
+EBUILD selinux-makewhatis-2.20170805-r3.ebuild 292 SHA256 7974b16b0bee0f45b74c32947fa26b5aaba3485816f5e3d7315eec36a5b05ce5 SHA512 0a0d25bf49d4d67effa5e64a3c7cd869ddf28480f065e703f5e9c784b350a0a6c625cdb13cdf37d26591c9cb7576097afdb77f8ea193a77556bc6895144d3594 WHIRLPOOL d9c2fc698b760b28c330611c49811e7b09e946e3d7ab67d30080088b2a213b2dc2664c7d2f0195564d1bc988747c7caf4ff414982bfa0e0400a801ab25164f00
+EBUILD selinux-makewhatis-9999.ebuild 292 SHA256 7974b16b0bee0f45b74c32947fa26b5aaba3485816f5e3d7315eec36a5b05ce5 SHA512 0a0d25bf49d4d67effa5e64a3c7cd869ddf28480f065e703f5e9c784b350a0a6c625cdb13cdf37d26591c9cb7576097afdb77f8ea193a77556bc6895144d3594 WHIRLPOOL d9c2fc698b760b28c330611c49811e7b09e946e3d7ab67d30080088b2a213b2dc2664c7d2f0195564d1bc988747c7caf4ff414982bfa0e0400a801ab25164f00
 MISC ChangeLog 10979 SHA256 ef6eeb512d5695bbe2f20a160a5c78054f8f8a28d3662bccf146e046ea7fa164 SHA512 4bbb5bd537cd2198547018c29df5b67acc0c724e2c7702044c7092961843e90d41c5fe8d2b8dd8de474fe776b05ee9c5e403538588011f0a527f31f87203ca82 WHIRLPOOL e5e43b33111fbcdb30d01aaeeaa35b5d5ca4581e8818c8fc117641f44b981089dbda0a7d162ebea34312ffe806d92c6ddd7a48a6a7fd88c38e070233ec51bb24
 MISC ChangeLog-2015 7917 SHA256 bba7d05235eca1fa7ce6ab097e93a95b86be498320a5181b92e76b400ef99ef9 SHA512 c257c4d71dd4f89fa55d5c85764287ac9ff1543575d047421c9c40857d0c4c54c20f56a17e5cb169943dd69b9d4b354ccb072def167c4fe5ba7b1c25061eda0a WHIRLPOOL 5ef9ad7fe2285497c8022f1764532f3e7745a1376d5eafc2def29aaea050bcdd8792ab22a6b4495d39008e378975bb852c073c72fac0435224d3fd042a85a01b
 MISC metadata.xml 320 SHA256 cd0b53866ac5d9d3e6ee525da06c9af88892e4caabd1c9626c1e9668689d2b8e SHA512 bc95b01949705d19d1f46eb6d0281381fec137ca312fa6d1ee1ecdbd7cd4b79ec2cefa93032f8ac4e33039b299455f0dc0806b06754066f5134dd0d025beb417 WHIRLPOOL 85471f3f1f0daed1263ffa2677731ac10cef890a8e2936367e92baea101993f85ed31723a41d694ef6de3d0516470ce1da08d81ffccb3c6e92e8f81bbcfade74
diff --git a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20170204-r1.ebuild b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20170204-r1.ebuild
index a304ad08e772..d2ef7e421b30 100644
--- a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20170204-r2.ebuild b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20170204-r2.ebuild
index 3e6a7fb808a6..9d093cdcf13d 100644
--- a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20170204-r3.ebuild b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20170204-r3.ebuild
index 3e6a7fb808a6..9d093cdcf13d 100644
--- a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20170204-r4.ebuild b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20170204-r4.ebuild
index 3e6a7fb808a6..9d093cdcf13d 100644
--- a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20170805-r2.ebuild b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20170805-r2.ebuild
index 3e6a7fb808a6..9d093cdcf13d 100644
--- a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20170805-r3.ebuild b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..d2ef7e421b30
--- /dev/null
+++ b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-makewhatis/selinux-makewhatis-9999.ebuild b/sec-policy/selinux-makewhatis/selinux-makewhatis-9999.ebuild
index a304ad08e772..d2ef7e421b30 100644
--- a/sec-policy/selinux-makewhatis/selinux-makewhatis-9999.ebuild
+++ b/sec-policy/selinux-makewhatis/selinux-makewhatis-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-mandb/Manifest b/sec-policy/selinux-mandb/Manifest
index 833e8e30fb57..a2e1efa43142 100644
--- a/sec-policy/selinux-mandb/Manifest
+++ b/sec-policy/selinux-mandb/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-mandb-2.20170204-r1.ebuild 281 SHA256 8fd8449b5e1f28a97af9ee08a29ec0a9e24d550931ce62a56ecba42e2ad7f94c SHA512 31ce7b50e4e314682348dced1f5a1ff2e8fd8f3932d94bcd83748ab5a2f0b74dddde800a73b21cd230b2f2597e1dec8c0cf79054d0f4cca3918250b29b60dd01 WHIRLPOOL d329a42eddb0321ca144f05432ea6d4a5dedb1e22287e0532095f479103a1a4a541b0f051ffc53860f6e23fa57c65e7ec134d635bfcc7f9c6f689064784b660d
-EBUILD selinux-mandb-2.20170204-r2.ebuild 279 SHA256 3eb4d2dd117b53bf3b4f681c10d1a9d3bb8a5bb34103f166682313b4c8538744 SHA512 583d1d88e0c344a42bff270d26ead60222d749335ac5178ac09f78cf44b0f282bd240f6cac465002ab3530e589c2c2b393b644ea22ea720a1860b6f791271316 WHIRLPOOL 408ed429d0b0acdc41a2cbae70bb8d708e2876918a056ef4138e43f187431794187bcb81f1ff044796db864d8443d6595a7cb503d1426dfb3d48cf881803ec53
-EBUILD selinux-mandb-2.20170204-r3.ebuild 279 SHA256 3eb4d2dd117b53bf3b4f681c10d1a9d3bb8a5bb34103f166682313b4c8538744 SHA512 583d1d88e0c344a42bff270d26ead60222d749335ac5178ac09f78cf44b0f282bd240f6cac465002ab3530e589c2c2b393b644ea22ea720a1860b6f791271316 WHIRLPOOL 408ed429d0b0acdc41a2cbae70bb8d708e2876918a056ef4138e43f187431794187bcb81f1ff044796db864d8443d6595a7cb503d1426dfb3d48cf881803ec53
-EBUILD selinux-mandb-2.20170204-r4.ebuild 279 SHA256 3eb4d2dd117b53bf3b4f681c10d1a9d3bb8a5bb34103f166682313b4c8538744 SHA512 583d1d88e0c344a42bff270d26ead60222d749335ac5178ac09f78cf44b0f282bd240f6cac465002ab3530e589c2c2b393b644ea22ea720a1860b6f791271316 WHIRLPOOL 408ed429d0b0acdc41a2cbae70bb8d708e2876918a056ef4138e43f187431794187bcb81f1ff044796db864d8443d6595a7cb503d1426dfb3d48cf881803ec53
-EBUILD selinux-mandb-2.20170805-r2.ebuild 279 SHA256 3eb4d2dd117b53bf3b4f681c10d1a9d3bb8a5bb34103f166682313b4c8538744 SHA512 583d1d88e0c344a42bff270d26ead60222d749335ac5178ac09f78cf44b0f282bd240f6cac465002ab3530e589c2c2b393b644ea22ea720a1860b6f791271316 WHIRLPOOL 408ed429d0b0acdc41a2cbae70bb8d708e2876918a056ef4138e43f187431794187bcb81f1ff044796db864d8443d6595a7cb503d1426dfb3d48cf881803ec53
-EBUILD selinux-mandb-9999.ebuild 281 SHA256 8fd8449b5e1f28a97af9ee08a29ec0a9e24d550931ce62a56ecba42e2ad7f94c SHA512 31ce7b50e4e314682348dced1f5a1ff2e8fd8f3932d94bcd83748ab5a2f0b74dddde800a73b21cd230b2f2597e1dec8c0cf79054d0f4cca3918250b29b60dd01 WHIRLPOOL d329a42eddb0321ca144f05432ea6d4a5dedb1e22287e0532095f479103a1a4a541b0f051ffc53860f6e23fa57c65e7ec134d635bfcc7f9c6f689064784b660d
+EBUILD selinux-mandb-2.20170204-r1.ebuild 282 SHA256 917b9d6016ef466713e08eccba91ba32c05ba530a15dfcbb88ae49837870bf9f SHA512 93c95e217c30dfdd1da9c437116580516bdf44e9c5119b5c629fab3c295e060a51c7d37fb3ccfd55018af72e050265d6c749f61f78f1544a3c9bca393aa52c48 WHIRLPOOL eed496cdac45108837673c1a48492fa4e1ed6f78e6fadac104ff160a2e6aceb5c143d3855736796381e19fc2d209849861ade1330767df3b3455af2673a373a6
+EBUILD selinux-mandb-2.20170204-r2.ebuild 280 SHA256 2451388d9f517fb353051cc948bc5c04b757f47d3780963cebe42963b51104ed SHA512 2fee152252d3297ca3f777a043d1932497565f3aff7f25f4ded231f9a4116f068d46a09eeb1005252c22d87e2c5f0d824770ef7133c4f50965868279e3897d25 WHIRLPOOL 5922eedb42ed3118b62176b739cd088a2c116a0174d2a82581128c7fe526ea8a04387ae3ba28de13452a35287da92f044640a2e997b0808e37636cf3f9356d71
+EBUILD selinux-mandb-2.20170204-r3.ebuild 280 SHA256 2451388d9f517fb353051cc948bc5c04b757f47d3780963cebe42963b51104ed SHA512 2fee152252d3297ca3f777a043d1932497565f3aff7f25f4ded231f9a4116f068d46a09eeb1005252c22d87e2c5f0d824770ef7133c4f50965868279e3897d25 WHIRLPOOL 5922eedb42ed3118b62176b739cd088a2c116a0174d2a82581128c7fe526ea8a04387ae3ba28de13452a35287da92f044640a2e997b0808e37636cf3f9356d71
+EBUILD selinux-mandb-2.20170204-r4.ebuild 280 SHA256 2451388d9f517fb353051cc948bc5c04b757f47d3780963cebe42963b51104ed SHA512 2fee152252d3297ca3f777a043d1932497565f3aff7f25f4ded231f9a4116f068d46a09eeb1005252c22d87e2c5f0d824770ef7133c4f50965868279e3897d25 WHIRLPOOL 5922eedb42ed3118b62176b739cd088a2c116a0174d2a82581128c7fe526ea8a04387ae3ba28de13452a35287da92f044640a2e997b0808e37636cf3f9356d71
+EBUILD selinux-mandb-2.20170805-r2.ebuild 280 SHA256 2451388d9f517fb353051cc948bc5c04b757f47d3780963cebe42963b51104ed SHA512 2fee152252d3297ca3f777a043d1932497565f3aff7f25f4ded231f9a4116f068d46a09eeb1005252c22d87e2c5f0d824770ef7133c4f50965868279e3897d25 WHIRLPOOL 5922eedb42ed3118b62176b739cd088a2c116a0174d2a82581128c7fe526ea8a04387ae3ba28de13452a35287da92f044640a2e997b0808e37636cf3f9356d71
+EBUILD selinux-mandb-2.20170805-r3.ebuild 282 SHA256 917b9d6016ef466713e08eccba91ba32c05ba530a15dfcbb88ae49837870bf9f SHA512 93c95e217c30dfdd1da9c437116580516bdf44e9c5119b5c629fab3c295e060a51c7d37fb3ccfd55018af72e050265d6c749f61f78f1544a3c9bca393aa52c48 WHIRLPOOL eed496cdac45108837673c1a48492fa4e1ed6f78e6fadac104ff160a2e6aceb5c143d3855736796381e19fc2d209849861ade1330767df3b3455af2673a373a6
+EBUILD selinux-mandb-9999.ebuild 282 SHA256 917b9d6016ef466713e08eccba91ba32c05ba530a15dfcbb88ae49837870bf9f SHA512 93c95e217c30dfdd1da9c437116580516bdf44e9c5119b5c629fab3c295e060a51c7d37fb3ccfd55018af72e050265d6c749f61f78f1544a3c9bca393aa52c48 WHIRLPOOL eed496cdac45108837673c1a48492fa4e1ed6f78e6fadac104ff160a2e6aceb5c143d3855736796381e19fc2d209849861ade1330767df3b3455af2673a373a6
 MISC ChangeLog 10479 SHA256 3eaeeca57f6fc4028f539fd907fe49658679089b99d2a8a107626e41f585251a SHA512 a0d4cf7222caaa81b851afb6de426d048e72e82369e43f9566d611bda0f0aa90947d4dc1516f0e6f0f6b6db74aa13088462389a67b356489d24f0be612845b29 WHIRLPOOL c14f0d1d76a5a1e6b3cd5ac1fdaccba3159b58865e0ce1fe3ecb52dc0f98159a246eeeb4fb7e0546bbf70fd1d8769da1f31258739f0bfcc1f5660eec5ceed0a2
 MISC ChangeLog-2015 5436 SHA256 6feb5f155bf5f9360f1e9cd79c64707406f4410c875386233c4f66e71e922db0 SHA512 fefc498f537fa347c526da2fea5e3d1d653756fa4b93e3467127c936220ce78cc33ebe68fd894436da3dd6bdc27d6deeb089a3c1b87fa5ef78ca416cb3f55b6e WHIRLPOOL f51cfa438635bec9fb1cb933c84888bbace61a850299ec6ecdff1201656f5b8fe9676540cc491e0f20e18a672af2b05c1a0ef82e875390f4247a70c265af00bf
 MISC metadata.xml 315 SHA256 6b497d5576fe2d58cf937cace2297af1abc38853b45871a0239c2f549755fa82 SHA512 d7b487c06c8e54342d58e1905e552b7879b76963c9dfa6ff0203e1c29f2268604a9aef7f9d02992fda0f61b8315afab6709cd2708c99f4c00ce1ce3971bb536c WHIRLPOOL be81651a18fd208b91f1c25cc38b2a585d374a266edaf3d088d8723b951b73a8a4231d3838aea6ee2f2aef3344a2bb7253414a72d39260164962461a790c72dd
diff --git a/sec-policy/selinux-mandb/selinux-mandb-2.20170204-r1.ebuild b/sec-policy/selinux-mandb/selinux-mandb-2.20170204-r1.ebuild
index dd704f3eae38..87177e7f1e53 100644
--- a/sec-policy/selinux-mandb/selinux-mandb-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-mandb/selinux-mandb-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-mandb/selinux-mandb-2.20170204-r2.ebuild b/sec-policy/selinux-mandb/selinux-mandb-2.20170204-r2.ebuild
index d58996414d04..cb215b310388 100644
--- a/sec-policy/selinux-mandb/selinux-mandb-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-mandb/selinux-mandb-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-mandb/selinux-mandb-2.20170204-r3.ebuild b/sec-policy/selinux-mandb/selinux-mandb-2.20170204-r3.ebuild
index d58996414d04..cb215b310388 100644
--- a/sec-policy/selinux-mandb/selinux-mandb-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-mandb/selinux-mandb-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-mandb/selinux-mandb-2.20170204-r4.ebuild b/sec-policy/selinux-mandb/selinux-mandb-2.20170204-r4.ebuild
index d58996414d04..cb215b310388 100644
--- a/sec-policy/selinux-mandb/selinux-mandb-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-mandb/selinux-mandb-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-mandb/selinux-mandb-2.20170805-r2.ebuild b/sec-policy/selinux-mandb/selinux-mandb-2.20170805-r2.ebuild
index d58996414d04..cb215b310388 100644
--- a/sec-policy/selinux-mandb/selinux-mandb-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-mandb/selinux-mandb-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-mandb/selinux-mandb-2.20170805-r3.ebuild b/sec-policy/selinux-mandb/selinux-mandb-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..87177e7f1e53
--- /dev/null
+++ b/sec-policy/selinux-mandb/selinux-mandb-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-mandb/selinux-mandb-9999.ebuild b/sec-policy/selinux-mandb/selinux-mandb-9999.ebuild
index dd704f3eae38..87177e7f1e53 100644
--- a/sec-policy/selinux-mandb/selinux-mandb-9999.ebuild
+++ b/sec-policy/selinux-mandb/selinux-mandb-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-mcelog/Manifest b/sec-policy/selinux-mcelog/Manifest
index f143e7079d0d..e621f7903b85 100644
--- a/sec-policy/selinux-mcelog/Manifest
+++ b/sec-policy/selinux-mcelog/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-mcelog-2.20170204-r1.ebuild 283 SHA256 b229c8989220a8f1c3d6808195e0197dd56416c41b3d0e85605a2adcbb0e6142 SHA512 47bb53c6ab519ff4199fbda43d8bab0e0889fe5cfb0aba5982d65f7a55fd21f3c53a9090547b7db85cfd80ec9a7a3ebf24551061c801dbf51a18e69d3db81be8 WHIRLPOOL 61a202b0778aa247f3df7db6575a7674b9e8ca8c05d2e44407ecec4f51be7ae6188ae234535be89689696a7c0561a35e985b53ab33e0d5e28d6d3f8e0b7c0d04
-EBUILD selinux-mcelog-2.20170204-r2.ebuild 281 SHA256 e94bcb12604760dae546db417a695097009ce7fa0b95ebac58bceab7a5252e41 SHA512 3518a1e0c7910c807ae52d02d7ade5f3cc2487fe834a08e41ef5fb1a61c35bbb3c8ced3ee6b233d7e05f1a14ba90999aec26bae12a1aea5d78bd7412a68b82f6 WHIRLPOOL dc5b1c425ee27b9aa9d37bbb80a47af511d1692a56f62064dc679344e7f1135b6d9fe092f4a39bd6328006531bbb5e87f5f3321763150ab5c2cf91785db6826b
-EBUILD selinux-mcelog-2.20170204-r3.ebuild 281 SHA256 e94bcb12604760dae546db417a695097009ce7fa0b95ebac58bceab7a5252e41 SHA512 3518a1e0c7910c807ae52d02d7ade5f3cc2487fe834a08e41ef5fb1a61c35bbb3c8ced3ee6b233d7e05f1a14ba90999aec26bae12a1aea5d78bd7412a68b82f6 WHIRLPOOL dc5b1c425ee27b9aa9d37bbb80a47af511d1692a56f62064dc679344e7f1135b6d9fe092f4a39bd6328006531bbb5e87f5f3321763150ab5c2cf91785db6826b
-EBUILD selinux-mcelog-2.20170204-r4.ebuild 281 SHA256 e94bcb12604760dae546db417a695097009ce7fa0b95ebac58bceab7a5252e41 SHA512 3518a1e0c7910c807ae52d02d7ade5f3cc2487fe834a08e41ef5fb1a61c35bbb3c8ced3ee6b233d7e05f1a14ba90999aec26bae12a1aea5d78bd7412a68b82f6 WHIRLPOOL dc5b1c425ee27b9aa9d37bbb80a47af511d1692a56f62064dc679344e7f1135b6d9fe092f4a39bd6328006531bbb5e87f5f3321763150ab5c2cf91785db6826b
-EBUILD selinux-mcelog-2.20170805-r2.ebuild 281 SHA256 e94bcb12604760dae546db417a695097009ce7fa0b95ebac58bceab7a5252e41 SHA512 3518a1e0c7910c807ae52d02d7ade5f3cc2487fe834a08e41ef5fb1a61c35bbb3c8ced3ee6b233d7e05f1a14ba90999aec26bae12a1aea5d78bd7412a68b82f6 WHIRLPOOL dc5b1c425ee27b9aa9d37bbb80a47af511d1692a56f62064dc679344e7f1135b6d9fe092f4a39bd6328006531bbb5e87f5f3321763150ab5c2cf91785db6826b
-EBUILD selinux-mcelog-9999.ebuild 283 SHA256 b229c8989220a8f1c3d6808195e0197dd56416c41b3d0e85605a2adcbb0e6142 SHA512 47bb53c6ab519ff4199fbda43d8bab0e0889fe5cfb0aba5982d65f7a55fd21f3c53a9090547b7db85cfd80ec9a7a3ebf24551061c801dbf51a18e69d3db81be8 WHIRLPOOL 61a202b0778aa247f3df7db6575a7674b9e8ca8c05d2e44407ecec4f51be7ae6188ae234535be89689696a7c0561a35e985b53ab33e0d5e28d6d3f8e0b7c0d04
+EBUILD selinux-mcelog-2.20170204-r1.ebuild 284 SHA256 30296adecaa438fbc212d185d03bd4b8cba136fadac9af8ea733857f1a86eec4 SHA512 2e52bf3dd34547e1bc62a306c7eb23f2c9bfa978c7553f723141e212c392c1f7aa4a2a334362a3cd2b2ca1621b0e733fef1b48cae23f12898a733cf851f38424 WHIRLPOOL bfcc3347d7d40137a905e3ba43ff592a4b649ed8c8359f67f38f7ea02a953e6156ca66b4a6664a9006bf03678407ccec395b0d6982b89393b9027e0fd772b309
+EBUILD selinux-mcelog-2.20170204-r2.ebuild 282 SHA256 b2608009272ff516359f558bda6bf7784f1a93dc055b4400461c8b558d1060f0 SHA512 920e4644796b6628baea361157c2fa569692e6140ec6fac698bfcb735dd533f02aeee6718f9f80a0f0298805e7adc0f233a0db189b8b63c946b38048ea221e22 WHIRLPOOL 7970c4617e4b1be929ca9f9dde4af0f5d156ea8aee2fd1cf82782f96469f89be8f7e05ca94d461e4d66ddd94ca6a7787f413ed7a5ee00dd4c66e618089f80b71
+EBUILD selinux-mcelog-2.20170204-r3.ebuild 282 SHA256 b2608009272ff516359f558bda6bf7784f1a93dc055b4400461c8b558d1060f0 SHA512 920e4644796b6628baea361157c2fa569692e6140ec6fac698bfcb735dd533f02aeee6718f9f80a0f0298805e7adc0f233a0db189b8b63c946b38048ea221e22 WHIRLPOOL 7970c4617e4b1be929ca9f9dde4af0f5d156ea8aee2fd1cf82782f96469f89be8f7e05ca94d461e4d66ddd94ca6a7787f413ed7a5ee00dd4c66e618089f80b71
+EBUILD selinux-mcelog-2.20170204-r4.ebuild 282 SHA256 b2608009272ff516359f558bda6bf7784f1a93dc055b4400461c8b558d1060f0 SHA512 920e4644796b6628baea361157c2fa569692e6140ec6fac698bfcb735dd533f02aeee6718f9f80a0f0298805e7adc0f233a0db189b8b63c946b38048ea221e22 WHIRLPOOL 7970c4617e4b1be929ca9f9dde4af0f5d156ea8aee2fd1cf82782f96469f89be8f7e05ca94d461e4d66ddd94ca6a7787f413ed7a5ee00dd4c66e618089f80b71
+EBUILD selinux-mcelog-2.20170805-r2.ebuild 282 SHA256 b2608009272ff516359f558bda6bf7784f1a93dc055b4400461c8b558d1060f0 SHA512 920e4644796b6628baea361157c2fa569692e6140ec6fac698bfcb735dd533f02aeee6718f9f80a0f0298805e7adc0f233a0db189b8b63c946b38048ea221e22 WHIRLPOOL 7970c4617e4b1be929ca9f9dde4af0f5d156ea8aee2fd1cf82782f96469f89be8f7e05ca94d461e4d66ddd94ca6a7787f413ed7a5ee00dd4c66e618089f80b71
+EBUILD selinux-mcelog-2.20170805-r3.ebuild 284 SHA256 30296adecaa438fbc212d185d03bd4b8cba136fadac9af8ea733857f1a86eec4 SHA512 2e52bf3dd34547e1bc62a306c7eb23f2c9bfa978c7553f723141e212c392c1f7aa4a2a334362a3cd2b2ca1621b0e733fef1b48cae23f12898a733cf851f38424 WHIRLPOOL bfcc3347d7d40137a905e3ba43ff592a4b649ed8c8359f67f38f7ea02a953e6156ca66b4a6664a9006bf03678407ccec395b0d6982b89393b9027e0fd772b309
+EBUILD selinux-mcelog-9999.ebuild 284 SHA256 30296adecaa438fbc212d185d03bd4b8cba136fadac9af8ea733857f1a86eec4 SHA512 2e52bf3dd34547e1bc62a306c7eb23f2c9bfa978c7553f723141e212c392c1f7aa4a2a334362a3cd2b2ca1621b0e733fef1b48cae23f12898a733cf851f38424 WHIRLPOOL bfcc3347d7d40137a905e3ba43ff592a4b649ed8c8359f67f38f7ea02a953e6156ca66b4a6664a9006bf03678407ccec395b0d6982b89393b9027e0fd772b309
 MISC ChangeLog 10571 SHA256 544c91378802b53bbb610482c255639ce38f10b556cb1a4887296f608a6dd9d6 SHA512 22f03feb0c5257d22d965217dff79b118a6f3e379df04c311b4869c4aef67c096f5240236f917453cda5e5057cd08e097291f3f75b662afad1dbecc8f7000d2c WHIRLPOOL 9749fc104465a7efd2ce530913acb37b935dfdcf9bcf4941e97d14bdfef3fbd5ed0b07e094329afeafc491f856048da4879a329b76e0bea624c7d121a9d82622
 MISC ChangeLog-2015 9863 SHA256 99a7c86ea18e801b90e783b982f1c607a6667c6281ae6e272af1aa4ab278da63 SHA512 2d99563add74bd2bd512216727b718ff4714cf2ce5466d20488ab035137dbd20c6c26ed14c0b8a5373bc22e4d894793fd26b2cf1f557e987b1aee97e4bbf97a8 WHIRLPOOL e3de87c190afad58d7b789c868304960d91b3e6078d06daab4ee03bdaf082c0a3ff0344ab7e2519eb4dcb3424cd59cb4dc79b6d6699736f084fb07542348e7ae
 MISC metadata.xml 316 SHA256 7ac8e82f1e7bf2f0efe7312b32c5215ca493519e1dad63df69a23c9bb7d80a31 SHA512 8d61276e7343ddf65a6874ea736d342da652068bd08a0806888afb2adc9245490f4e1cff4f63788752f18ccc2e1afe3f4aad0db3932d3af76fe1e12f0ec48b35 WHIRLPOOL 3c377effb5dac3b25e1e01ff32b02b6db5fb9acce6236e6fdef43b8f610b4d4af5b28fafd5c4c835f4556a0800d983dc92c2657c85f5a78585efd5ee5e3e743e
diff --git a/sec-policy/selinux-mcelog/selinux-mcelog-2.20170204-r1.ebuild b/sec-policy/selinux-mcelog/selinux-mcelog-2.20170204-r1.ebuild
index 1676e7b94b4f..ae3b9155f4df 100644
--- a/sec-policy/selinux-mcelog/selinux-mcelog-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-mcelog/selinux-mcelog-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-mcelog/selinux-mcelog-2.20170204-r2.ebuild b/sec-policy/selinux-mcelog/selinux-mcelog-2.20170204-r2.ebuild
index 85d35a2e853b..971821bbbd04 100644
--- a/sec-policy/selinux-mcelog/selinux-mcelog-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-mcelog/selinux-mcelog-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-mcelog/selinux-mcelog-2.20170204-r3.ebuild b/sec-policy/selinux-mcelog/selinux-mcelog-2.20170204-r3.ebuild
index 85d35a2e853b..971821bbbd04 100644
--- a/sec-policy/selinux-mcelog/selinux-mcelog-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-mcelog/selinux-mcelog-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-mcelog/selinux-mcelog-2.20170204-r4.ebuild b/sec-policy/selinux-mcelog/selinux-mcelog-2.20170204-r4.ebuild
index 85d35a2e853b..971821bbbd04 100644
--- a/sec-policy/selinux-mcelog/selinux-mcelog-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-mcelog/selinux-mcelog-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-mcelog/selinux-mcelog-2.20170805-r2.ebuild b/sec-policy/selinux-mcelog/selinux-mcelog-2.20170805-r2.ebuild
index 85d35a2e853b..971821bbbd04 100644
--- a/sec-policy/selinux-mcelog/selinux-mcelog-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-mcelog/selinux-mcelog-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-mcelog/selinux-mcelog-2.20170805-r3.ebuild b/sec-policy/selinux-mcelog/selinux-mcelog-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..ae3b9155f4df
--- /dev/null
+++ b/sec-policy/selinux-mcelog/selinux-mcelog-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-mcelog/selinux-mcelog-9999.ebuild b/sec-policy/selinux-mcelog/selinux-mcelog-9999.ebuild
index 1676e7b94b4f..ae3b9155f4df 100644
--- a/sec-policy/selinux-mcelog/selinux-mcelog-9999.ebuild
+++ b/sec-policy/selinux-mcelog/selinux-mcelog-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-memcached/Manifest b/sec-policy/selinux-memcached/Manifest
index 46e473a188a7..84c70f939bb5 100644
--- a/sec-policy/selinux-memcached/Manifest
+++ b/sec-policy/selinux-memcached/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-memcached-2.20170204-r1.ebuild 289 SHA256 067c695148b13a2628aa267f34af6e414a4e02ab39391934753685477e9c09cd SHA512 78b3a04d6cecc388f934372712e783700ec5fe3d9517d28a9f8622d060c97813d3c3f0deca4841e7bea31c40177271115b69e586b7ec7693ebbd1d8fbf7782be WHIRLPOOL 69ed6dba5660772d1a84ca660879b0ad0bc6742f445670a53496382a5431e3c884c9fbabd4848ed73b5794cf4f6e5acd37a849466f1432b11be9addd34a43060
-EBUILD selinux-memcached-2.20170204-r2.ebuild 287 SHA256 b2a1ec613bac73739528643699abef2bdc0003e78bc268a86f8fde05b883119e SHA512 e0c6cd3d7cdd798e2989bd9d56ae13a2f2b5a613d313d937e40915b8a01e3ebe348be8b481d2833a3d7a7296ec22890ba5a57058fd73a00150004600f05c1e7b WHIRLPOOL e7fb0567131b627d9a6e36b153d478d9d8dc01c98e97c176ea0922b0dd35ba2060aa530dd9842b18b60ba578d10a9365e0f8cfb4b7a5d8f091ab79c1150c50fb
-EBUILD selinux-memcached-2.20170204-r3.ebuild 287 SHA256 b2a1ec613bac73739528643699abef2bdc0003e78bc268a86f8fde05b883119e SHA512 e0c6cd3d7cdd798e2989bd9d56ae13a2f2b5a613d313d937e40915b8a01e3ebe348be8b481d2833a3d7a7296ec22890ba5a57058fd73a00150004600f05c1e7b WHIRLPOOL e7fb0567131b627d9a6e36b153d478d9d8dc01c98e97c176ea0922b0dd35ba2060aa530dd9842b18b60ba578d10a9365e0f8cfb4b7a5d8f091ab79c1150c50fb
-EBUILD selinux-memcached-2.20170204-r4.ebuild 287 SHA256 b2a1ec613bac73739528643699abef2bdc0003e78bc268a86f8fde05b883119e SHA512 e0c6cd3d7cdd798e2989bd9d56ae13a2f2b5a613d313d937e40915b8a01e3ebe348be8b481d2833a3d7a7296ec22890ba5a57058fd73a00150004600f05c1e7b WHIRLPOOL e7fb0567131b627d9a6e36b153d478d9d8dc01c98e97c176ea0922b0dd35ba2060aa530dd9842b18b60ba578d10a9365e0f8cfb4b7a5d8f091ab79c1150c50fb
-EBUILD selinux-memcached-2.20170805-r2.ebuild 287 SHA256 b2a1ec613bac73739528643699abef2bdc0003e78bc268a86f8fde05b883119e SHA512 e0c6cd3d7cdd798e2989bd9d56ae13a2f2b5a613d313d937e40915b8a01e3ebe348be8b481d2833a3d7a7296ec22890ba5a57058fd73a00150004600f05c1e7b WHIRLPOOL e7fb0567131b627d9a6e36b153d478d9d8dc01c98e97c176ea0922b0dd35ba2060aa530dd9842b18b60ba578d10a9365e0f8cfb4b7a5d8f091ab79c1150c50fb
-EBUILD selinux-memcached-9999.ebuild 289 SHA256 067c695148b13a2628aa267f34af6e414a4e02ab39391934753685477e9c09cd SHA512 78b3a04d6cecc388f934372712e783700ec5fe3d9517d28a9f8622d060c97813d3c3f0deca4841e7bea31c40177271115b69e586b7ec7693ebbd1d8fbf7782be WHIRLPOOL 69ed6dba5660772d1a84ca660879b0ad0bc6742f445670a53496382a5431e3c884c9fbabd4848ed73b5794cf4f6e5acd37a849466f1432b11be9addd34a43060
+EBUILD selinux-memcached-2.20170204-r1.ebuild 290 SHA256 75fd2bcdebb371d3c52ccf5bf524b3f256d9e5a5944213a0866a41b6e4cded2c SHA512 b8886cd2885e2c05d54d67598220f2c491fc99af5f29951348c33324e55502f7eccc6094abd8603009a91b2b8b03bd0fa5b6fcaa17e757d29be4fa1a6d0c48c2 WHIRLPOOL 0b0264f7b30e9af09ccaefd6b79da69ee930f9f3906fb756bf6a5e929edc0f76b14848afb4baec25b83663984e9d3f35b8cd2b762647fe72f9f2d637e60055cc
+EBUILD selinux-memcached-2.20170204-r2.ebuild 288 SHA256 c11841f443a22b65aac237e2355c5cbbd9343e69033c59af88e5846287cd3042 SHA512 9f535f7dcb26223f738b8591cfa945bdd271eb82b1392d8ede01c16a88921bb4c4388ba2068358f7117481078d09c2adff9ed417909110e7da57b44dc953e3d6 WHIRLPOOL a7e23d981941937ea59f5df05be9c31781812349f4eb91670b75cd31ffb6cc0dd1a47a3b56a2223993cb7d272a262ff96b3b1633847c8aeb1a9806d5a7654824
+EBUILD selinux-memcached-2.20170204-r3.ebuild 288 SHA256 c11841f443a22b65aac237e2355c5cbbd9343e69033c59af88e5846287cd3042 SHA512 9f535f7dcb26223f738b8591cfa945bdd271eb82b1392d8ede01c16a88921bb4c4388ba2068358f7117481078d09c2adff9ed417909110e7da57b44dc953e3d6 WHIRLPOOL a7e23d981941937ea59f5df05be9c31781812349f4eb91670b75cd31ffb6cc0dd1a47a3b56a2223993cb7d272a262ff96b3b1633847c8aeb1a9806d5a7654824
+EBUILD selinux-memcached-2.20170204-r4.ebuild 288 SHA256 c11841f443a22b65aac237e2355c5cbbd9343e69033c59af88e5846287cd3042 SHA512 9f535f7dcb26223f738b8591cfa945bdd271eb82b1392d8ede01c16a88921bb4c4388ba2068358f7117481078d09c2adff9ed417909110e7da57b44dc953e3d6 WHIRLPOOL a7e23d981941937ea59f5df05be9c31781812349f4eb91670b75cd31ffb6cc0dd1a47a3b56a2223993cb7d272a262ff96b3b1633847c8aeb1a9806d5a7654824
+EBUILD selinux-memcached-2.20170805-r2.ebuild 288 SHA256 c11841f443a22b65aac237e2355c5cbbd9343e69033c59af88e5846287cd3042 SHA512 9f535f7dcb26223f738b8591cfa945bdd271eb82b1392d8ede01c16a88921bb4c4388ba2068358f7117481078d09c2adff9ed417909110e7da57b44dc953e3d6 WHIRLPOOL a7e23d981941937ea59f5df05be9c31781812349f4eb91670b75cd31ffb6cc0dd1a47a3b56a2223993cb7d272a262ff96b3b1633847c8aeb1a9806d5a7654824
+EBUILD selinux-memcached-2.20170805-r3.ebuild 290 SHA256 75fd2bcdebb371d3c52ccf5bf524b3f256d9e5a5944213a0866a41b6e4cded2c SHA512 b8886cd2885e2c05d54d67598220f2c491fc99af5f29951348c33324e55502f7eccc6094abd8603009a91b2b8b03bd0fa5b6fcaa17e757d29be4fa1a6d0c48c2 WHIRLPOOL 0b0264f7b30e9af09ccaefd6b79da69ee930f9f3906fb756bf6a5e929edc0f76b14848afb4baec25b83663984e9d3f35b8cd2b762647fe72f9f2d637e60055cc
+EBUILD selinux-memcached-9999.ebuild 290 SHA256 75fd2bcdebb371d3c52ccf5bf524b3f256d9e5a5944213a0866a41b6e4cded2c SHA512 b8886cd2885e2c05d54d67598220f2c491fc99af5f29951348c33324e55502f7eccc6094abd8603009a91b2b8b03bd0fa5b6fcaa17e757d29be4fa1a6d0c48c2 WHIRLPOOL 0b0264f7b30e9af09ccaefd6b79da69ee930f9f3906fb756bf6a5e929edc0f76b14848afb4baec25b83663984e9d3f35b8cd2b762647fe72f9f2d637e60055cc
 MISC ChangeLog 10887 SHA256 aea780485dcb02e23440a96e798dfa172bc75f512738eb6573520636a711b60b SHA512 fc6614cd9cddcf9b162562ccd8da2dd56e7dca6d3437cc04072d477edc2bd57e73de7887cbfe582efcb7b330ec093dc50bb72f2ec68e66fef8941fdd268cec49 WHIRLPOOL a8165ff287001c21ac0764d93632af1ad30b1368fa4ab6c73b7b5c3dc721d741318eeea40ba0e6ada0d61f7630c03ce8e44d87948d13079cfae8bc2e0a2677cb
 MISC ChangeLog-2015 10222 SHA256 d6dee7171ebc62a6aba10273f7606cc8f6edf37e739e6b0c432608d3df325a67 SHA512 930cd504a0f27a61f67576c8b39a851fc95adeaf5e73e85ccd1269746b79b82ea46cd48bcad54e2f3417df48836a1e91cf78d72b0a84082a1ce8cab4cb7ce224 WHIRLPOOL f03f3890b0631cc659e6b134fa10b3b1b1024050b47814b4359bd2a361273b1805cf9761672817532a830b6eabe8c447f89c4f05cb52518aec1e9aea4609cb93
 MISC metadata.xml 319 SHA256 e7e8f2f10046e23dae2dffe60fb26f7cd7a59ef336a0b1f581a68ae558083594 SHA512 7a186901e5cade308e538d8f4fbd4afa50af93c4d046978a385ca0c83f3e481da51c70586b8d803f690030d8ca6b9e6c9b73436c5eee63237de86c6c3edf78b0 WHIRLPOOL 52e3215e20bba8d9c85031fbc890d1dd9b9e04d1261b1f61c58ecbaf986d79dd6e1bdadde68fbca04dcac19fcd97fef3ad8082a91a60861654d102c5e0952b32
diff --git a/sec-policy/selinux-memcached/selinux-memcached-2.20170204-r1.ebuild b/sec-policy/selinux-memcached/selinux-memcached-2.20170204-r1.ebuild
index 615d32a8e3dd..40e9d79f726f 100644
--- a/sec-policy/selinux-memcached/selinux-memcached-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-memcached/selinux-memcached-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-memcached/selinux-memcached-2.20170204-r2.ebuild b/sec-policy/selinux-memcached/selinux-memcached-2.20170204-r2.ebuild
index 42076c28a7e7..7542a10c4315 100644
--- a/sec-policy/selinux-memcached/selinux-memcached-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-memcached/selinux-memcached-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-memcached/selinux-memcached-2.20170204-r3.ebuild b/sec-policy/selinux-memcached/selinux-memcached-2.20170204-r3.ebuild
index 42076c28a7e7..7542a10c4315 100644
--- a/sec-policy/selinux-memcached/selinux-memcached-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-memcached/selinux-memcached-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-memcached/selinux-memcached-2.20170204-r4.ebuild b/sec-policy/selinux-memcached/selinux-memcached-2.20170204-r4.ebuild
index 42076c28a7e7..7542a10c4315 100644
--- a/sec-policy/selinux-memcached/selinux-memcached-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-memcached/selinux-memcached-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-memcached/selinux-memcached-2.20170805-r2.ebuild b/sec-policy/selinux-memcached/selinux-memcached-2.20170805-r2.ebuild
index 42076c28a7e7..7542a10c4315 100644
--- a/sec-policy/selinux-memcached/selinux-memcached-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-memcached/selinux-memcached-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-memcached/selinux-memcached-2.20170805-r3.ebuild b/sec-policy/selinux-memcached/selinux-memcached-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..40e9d79f726f
--- /dev/null
+++ b/sec-policy/selinux-memcached/selinux-memcached-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-memcached/selinux-memcached-9999.ebuild b/sec-policy/selinux-memcached/selinux-memcached-9999.ebuild
index 615d32a8e3dd..40e9d79f726f 100644
--- a/sec-policy/selinux-memcached/selinux-memcached-9999.ebuild
+++ b/sec-policy/selinux-memcached/selinux-memcached-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-milter/Manifest b/sec-policy/selinux-milter/Manifest
index 27153a7f016c..a9ebf3d1436a 100644
--- a/sec-policy/selinux-milter/Manifest
+++ b/sec-policy/selinux-milter/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-milter-2.20170204-r1.ebuild 283 SHA256 4441319b0f2e2f917711975c0d59fa8baeb1d0595e85aa1a638532e2cee44dfe SHA512 d04cb053a44fea7aea026655248cdffa69c4b6d1abe78cd4b86dd66daa6e8d7949788245e1b8482998f17d8e9a2445a40bcbf7947cdd191171b0c3df22e80849 WHIRLPOOL d83b87e7b3001d34b158cdc4e53d28aa1648a8ef8f97d81aff19f8f449c1eb768a941c7a544db1fc1df20209292028d7bc57f1b0a0b423936dc9fec33e2f398a
-EBUILD selinux-milter-2.20170204-r2.ebuild 281 SHA256 95ef1b74fe2b6ef4460f8448166e48c34d1e3dec1206df0f3529a55c7441d942 SHA512 33af49cc46e3fdb6182a15951be59b02161d0fbf52b028bdb1daee1d27a9359c22ae824e0c39ba9d24e8a59cdb24b9fcb50267049c62ea03f6458036547691fd WHIRLPOOL 052bd027ec07ceab230f1880ecbf712693513b6fd80eec2988f34b93485c11b642de2d75124d64bc24e6a312747a0e5a9ade335cd4060f8f155d62e6fa5db273
-EBUILD selinux-milter-2.20170204-r3.ebuild 281 SHA256 95ef1b74fe2b6ef4460f8448166e48c34d1e3dec1206df0f3529a55c7441d942 SHA512 33af49cc46e3fdb6182a15951be59b02161d0fbf52b028bdb1daee1d27a9359c22ae824e0c39ba9d24e8a59cdb24b9fcb50267049c62ea03f6458036547691fd WHIRLPOOL 052bd027ec07ceab230f1880ecbf712693513b6fd80eec2988f34b93485c11b642de2d75124d64bc24e6a312747a0e5a9ade335cd4060f8f155d62e6fa5db273
-EBUILD selinux-milter-2.20170204-r4.ebuild 281 SHA256 95ef1b74fe2b6ef4460f8448166e48c34d1e3dec1206df0f3529a55c7441d942 SHA512 33af49cc46e3fdb6182a15951be59b02161d0fbf52b028bdb1daee1d27a9359c22ae824e0c39ba9d24e8a59cdb24b9fcb50267049c62ea03f6458036547691fd WHIRLPOOL 052bd027ec07ceab230f1880ecbf712693513b6fd80eec2988f34b93485c11b642de2d75124d64bc24e6a312747a0e5a9ade335cd4060f8f155d62e6fa5db273
-EBUILD selinux-milter-2.20170805-r2.ebuild 281 SHA256 95ef1b74fe2b6ef4460f8448166e48c34d1e3dec1206df0f3529a55c7441d942 SHA512 33af49cc46e3fdb6182a15951be59b02161d0fbf52b028bdb1daee1d27a9359c22ae824e0c39ba9d24e8a59cdb24b9fcb50267049c62ea03f6458036547691fd WHIRLPOOL 052bd027ec07ceab230f1880ecbf712693513b6fd80eec2988f34b93485c11b642de2d75124d64bc24e6a312747a0e5a9ade335cd4060f8f155d62e6fa5db273
-EBUILD selinux-milter-9999.ebuild 283 SHA256 4441319b0f2e2f917711975c0d59fa8baeb1d0595e85aa1a638532e2cee44dfe SHA512 d04cb053a44fea7aea026655248cdffa69c4b6d1abe78cd4b86dd66daa6e8d7949788245e1b8482998f17d8e9a2445a40bcbf7947cdd191171b0c3df22e80849 WHIRLPOOL d83b87e7b3001d34b158cdc4e53d28aa1648a8ef8f97d81aff19f8f449c1eb768a941c7a544db1fc1df20209292028d7bc57f1b0a0b423936dc9fec33e2f398a
+EBUILD selinux-milter-2.20170204-r1.ebuild 284 SHA256 aafa0cee85af8a257bd1faddbec827a78702b22b172f2579aa29ba1637f8b805 SHA512 7e517c42ee2fdbab7798567c70b1f08a50156fd60c513945a8bc5dd648c84a1beb7ffcbef64f042ca422892feaff564f7abaada6e1b11c32ff689c85693c99b8 WHIRLPOOL a26fe18c4747771855d101660a163f6d7ca8a0f3c016eeb8f39155641bc0e354c5c9d60c348d5b21ada8d3dedb5bcc580022acf6264458a677a11b3e6f5ea024
+EBUILD selinux-milter-2.20170204-r2.ebuild 282 SHA256 91b4fc482829d49ef291688c359851cd34c03f08c28e6fdb92191c225d1e0834 SHA512 008c01d327a44af40ebd13a83bec3b09c423de67975395b98217fc98e1bbf9840124d47ffea2cb22aa8641a698d5cb7d0fff7c4a89c0b750e29661e1e6241fdd WHIRLPOOL c19b98ce299bae1c09daeaf9d038968a34ed93189929355cb145c7d872008fc974c8bbf9e398ac4f42f5465c3c89ebb884c61fe48740354e173673a6c1b9088b
+EBUILD selinux-milter-2.20170204-r3.ebuild 282 SHA256 91b4fc482829d49ef291688c359851cd34c03f08c28e6fdb92191c225d1e0834 SHA512 008c01d327a44af40ebd13a83bec3b09c423de67975395b98217fc98e1bbf9840124d47ffea2cb22aa8641a698d5cb7d0fff7c4a89c0b750e29661e1e6241fdd WHIRLPOOL c19b98ce299bae1c09daeaf9d038968a34ed93189929355cb145c7d872008fc974c8bbf9e398ac4f42f5465c3c89ebb884c61fe48740354e173673a6c1b9088b
+EBUILD selinux-milter-2.20170204-r4.ebuild 282 SHA256 91b4fc482829d49ef291688c359851cd34c03f08c28e6fdb92191c225d1e0834 SHA512 008c01d327a44af40ebd13a83bec3b09c423de67975395b98217fc98e1bbf9840124d47ffea2cb22aa8641a698d5cb7d0fff7c4a89c0b750e29661e1e6241fdd WHIRLPOOL c19b98ce299bae1c09daeaf9d038968a34ed93189929355cb145c7d872008fc974c8bbf9e398ac4f42f5465c3c89ebb884c61fe48740354e173673a6c1b9088b
+EBUILD selinux-milter-2.20170805-r2.ebuild 282 SHA256 91b4fc482829d49ef291688c359851cd34c03f08c28e6fdb92191c225d1e0834 SHA512 008c01d327a44af40ebd13a83bec3b09c423de67975395b98217fc98e1bbf9840124d47ffea2cb22aa8641a698d5cb7d0fff7c4a89c0b750e29661e1e6241fdd WHIRLPOOL c19b98ce299bae1c09daeaf9d038968a34ed93189929355cb145c7d872008fc974c8bbf9e398ac4f42f5465c3c89ebb884c61fe48740354e173673a6c1b9088b
+EBUILD selinux-milter-2.20170805-r3.ebuild 284 SHA256 aafa0cee85af8a257bd1faddbec827a78702b22b172f2579aa29ba1637f8b805 SHA512 7e517c42ee2fdbab7798567c70b1f08a50156fd60c513945a8bc5dd648c84a1beb7ffcbef64f042ca422892feaff564f7abaada6e1b11c32ff689c85693c99b8 WHIRLPOOL a26fe18c4747771855d101660a163f6d7ca8a0f3c016eeb8f39155641bc0e354c5c9d60c348d5b21ada8d3dedb5bcc580022acf6264458a677a11b3e6f5ea024
+EBUILD selinux-milter-9999.ebuild 284 SHA256 aafa0cee85af8a257bd1faddbec827a78702b22b172f2579aa29ba1637f8b805 SHA512 7e517c42ee2fdbab7798567c70b1f08a50156fd60c513945a8bc5dd648c84a1beb7ffcbef64f042ca422892feaff564f7abaada6e1b11c32ff689c85693c99b8 WHIRLPOOL a26fe18c4747771855d101660a163f6d7ca8a0f3c016eeb8f39155641bc0e354c5c9d60c348d5b21ada8d3dedb5bcc580022acf6264458a677a11b3e6f5ea024
 MISC ChangeLog 10571 SHA256 1dacf232b9a885b0724ab62de816a218c05fda7a4e0d1e560aacda6a21f2c73a SHA512 618c2ed3c1ac93ef9ee89496f9ac04082887342444668d4c0430350e108e9caed5d5a6c3837ef4f1261981fb245100fea4ef02b283218f9298dc7e3c64f8de8e WHIRLPOOL dbb2575715a5b08ae4673bb106b4ceea5bdc65a7e553e74c8e238df0b627a527f1d481f078f4755636850142d72d575838d17b35cbc48e6eda7640b72b66908c
 MISC ChangeLog-2015 9863 SHA256 2e45a6d17b8484cd478cb6c8d4de175ea15ab317effe90fe1038dedd47b4c855 SHA512 fcfea7adf8a39f50f5c09c469bf17924df45fa57e8ff227195d257545a2cb114cd287e61045385a9274bfef85d34bc5cf9039654b8992fa64097f7add3092906 WHIRLPOOL 63858ca2cdab2901826fc68f761b3b9aba6407b17afc7590957c520c473b5032435c483fd9d16bd773b14ef50d0468bad0b8975e65b87f598fb17d7949df72cf
 MISC metadata.xml 316 SHA256 07413f91a2e135398303476d6f182de840c7b1816814ed804572f7b20c8d4dab SHA512 d3f36e28dd8e18aec87946218c34d88ed23720dab347f459ed95fa746b205432509c2e2c45497945d8d7e8683bee0d0b3bbfefe2d7e2ff6220a41815a2381e8e WHIRLPOOL c40ad2c81bee02181737dd2d44602ee7c917f1c8845d8f855704eed803c26d9cfbf4e4d2ae51cc8e944cc22c93a8869b861b2f260e969e59f77d9f8b7b0938b3
diff --git a/sec-policy/selinux-milter/selinux-milter-2.20170204-r1.ebuild b/sec-policy/selinux-milter/selinux-milter-2.20170204-r1.ebuild
index 5d70b92ceabe..78963a43df13 100644
--- a/sec-policy/selinux-milter/selinux-milter-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-milter/selinux-milter-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-milter/selinux-milter-2.20170204-r2.ebuild b/sec-policy/selinux-milter/selinux-milter-2.20170204-r2.ebuild
index d1751af7aac1..99b5939f93e5 100644
--- a/sec-policy/selinux-milter/selinux-milter-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-milter/selinux-milter-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-milter/selinux-milter-2.20170204-r3.ebuild b/sec-policy/selinux-milter/selinux-milter-2.20170204-r3.ebuild
index d1751af7aac1..99b5939f93e5 100644
--- a/sec-policy/selinux-milter/selinux-milter-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-milter/selinux-milter-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-milter/selinux-milter-2.20170204-r4.ebuild b/sec-policy/selinux-milter/selinux-milter-2.20170204-r4.ebuild
index d1751af7aac1..99b5939f93e5 100644
--- a/sec-policy/selinux-milter/selinux-milter-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-milter/selinux-milter-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-milter/selinux-milter-2.20170805-r2.ebuild b/sec-policy/selinux-milter/selinux-milter-2.20170805-r2.ebuild
index d1751af7aac1..99b5939f93e5 100644
--- a/sec-policy/selinux-milter/selinux-milter-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-milter/selinux-milter-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-milter/selinux-milter-2.20170805-r3.ebuild b/sec-policy/selinux-milter/selinux-milter-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..78963a43df13
--- /dev/null
+++ b/sec-policy/selinux-milter/selinux-milter-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-milter/selinux-milter-9999.ebuild b/sec-policy/selinux-milter/selinux-milter-9999.ebuild
index 5d70b92ceabe..78963a43df13 100644
--- a/sec-policy/selinux-milter/selinux-milter-9999.ebuild
+++ b/sec-policy/selinux-milter/selinux-milter-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-modemmanager/Manifest b/sec-policy/selinux-modemmanager/Manifest
index 48df4962f231..66695448bfb8 100644
--- a/sec-policy/selinux-modemmanager/Manifest
+++ b/sec-policy/selinux-modemmanager/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-modemmanager-2.20170204-r1.ebuild 387 SHA256 485498076611da33a3591af9bc0f299693e0c553a2bc599a56e80aa8ce9c8130 SHA512 a5fc17dd21b4d7130b8ca84758aa7baddd7da2ad5d21a66d0f0dba187d450183bfb94ebe511f53da153b466440aee0a71f9db73c666f005b4e855fcaa59a020a WHIRLPOOL 020acaa53cf2091f6fb56bcda6fcb0bc509ef976addc6d1c2c2b40422dac0f87ba1dca49e5f229e1c0c93b05d30fdec05bbd490fe85cb417b57e60d524bb1c13
-EBUILD selinux-modemmanager-2.20170204-r2.ebuild 385 SHA256 352e25048cbec643d9f59d49e28186f7a9b84f3480f8aa4a5df0e5f0974daf2e SHA512 37e68adf6f19f85f4ef07b4c91a551e3b9387842d24279b80eb6ac375f8c2ba22ffec8986647e321545c1af2ebca5b4724908b71f661a8d0a71308a61f674552 WHIRLPOOL fb76cfff683595ac716a650d16388557e27a0995d4db7bd8319e44a91c27d73ba76789b56d046941996c5ae2ec064dc303611c3a0f9ab07dc144c224441d9137
-EBUILD selinux-modemmanager-2.20170204-r3.ebuild 385 SHA256 352e25048cbec643d9f59d49e28186f7a9b84f3480f8aa4a5df0e5f0974daf2e SHA512 37e68adf6f19f85f4ef07b4c91a551e3b9387842d24279b80eb6ac375f8c2ba22ffec8986647e321545c1af2ebca5b4724908b71f661a8d0a71308a61f674552 WHIRLPOOL fb76cfff683595ac716a650d16388557e27a0995d4db7bd8319e44a91c27d73ba76789b56d046941996c5ae2ec064dc303611c3a0f9ab07dc144c224441d9137
-EBUILD selinux-modemmanager-2.20170204-r4.ebuild 385 SHA256 352e25048cbec643d9f59d49e28186f7a9b84f3480f8aa4a5df0e5f0974daf2e SHA512 37e68adf6f19f85f4ef07b4c91a551e3b9387842d24279b80eb6ac375f8c2ba22ffec8986647e321545c1af2ebca5b4724908b71f661a8d0a71308a61f674552 WHIRLPOOL fb76cfff683595ac716a650d16388557e27a0995d4db7bd8319e44a91c27d73ba76789b56d046941996c5ae2ec064dc303611c3a0f9ab07dc144c224441d9137
-EBUILD selinux-modemmanager-2.20170805-r2.ebuild 385 SHA256 352e25048cbec643d9f59d49e28186f7a9b84f3480f8aa4a5df0e5f0974daf2e SHA512 37e68adf6f19f85f4ef07b4c91a551e3b9387842d24279b80eb6ac375f8c2ba22ffec8986647e321545c1af2ebca5b4724908b71f661a8d0a71308a61f674552 WHIRLPOOL fb76cfff683595ac716a650d16388557e27a0995d4db7bd8319e44a91c27d73ba76789b56d046941996c5ae2ec064dc303611c3a0f9ab07dc144c224441d9137
-EBUILD selinux-modemmanager-9999.ebuild 387 SHA256 485498076611da33a3591af9bc0f299693e0c553a2bc599a56e80aa8ce9c8130 SHA512 a5fc17dd21b4d7130b8ca84758aa7baddd7da2ad5d21a66d0f0dba187d450183bfb94ebe511f53da153b466440aee0a71f9db73c666f005b4e855fcaa59a020a WHIRLPOOL 020acaa53cf2091f6fb56bcda6fcb0bc509ef976addc6d1c2c2b40422dac0f87ba1dca49e5f229e1c0c93b05d30fdec05bbd490fe85cb417b57e60d524bb1c13
+EBUILD selinux-modemmanager-2.20170204-r1.ebuild 388 SHA256 d11c0b9c907bb0357ee6991f35b496fdb5c92d95849a1624c86572a6b4791517 SHA512 b8e597a89aa4fd31358a6427010f29d683e58fae2687d9fe2b85d0bdb38ca28a7eef138969b2b5bbee598e697cf3e879dc3afb1d612d845527a97b4db8b15013 WHIRLPOOL 002d80551067e7c27defcc679e3b5283a86169614d38ab52761935f806ef625cc86e288eb7b77d393069a2e167bcdf44e72ea7e6b8aaa072e70c802b03651fe0
+EBUILD selinux-modemmanager-2.20170204-r2.ebuild 386 SHA256 bf73f3d6c489a5d2c855d81fe5381f3f19985b3806284673ec62bfe88ab5cfba SHA512 7bd30fb24b50d547ae36808c005de596dbc165764a4e92d482b0dc538dab9e03ddb61a91144d8b51e9a7522799bfe17b609a0401c73da91c333165c4499a1a7b WHIRLPOOL e3390422a959b77050d5d84791172a50a7a92524abf89011fcc277fa2c5fe2d6d5ffe47796205b9184661774f64c6365b057d456fb50f2d30938921743bf1940
+EBUILD selinux-modemmanager-2.20170204-r3.ebuild 386 SHA256 bf73f3d6c489a5d2c855d81fe5381f3f19985b3806284673ec62bfe88ab5cfba SHA512 7bd30fb24b50d547ae36808c005de596dbc165764a4e92d482b0dc538dab9e03ddb61a91144d8b51e9a7522799bfe17b609a0401c73da91c333165c4499a1a7b WHIRLPOOL e3390422a959b77050d5d84791172a50a7a92524abf89011fcc277fa2c5fe2d6d5ffe47796205b9184661774f64c6365b057d456fb50f2d30938921743bf1940
+EBUILD selinux-modemmanager-2.20170204-r4.ebuild 386 SHA256 bf73f3d6c489a5d2c855d81fe5381f3f19985b3806284673ec62bfe88ab5cfba SHA512 7bd30fb24b50d547ae36808c005de596dbc165764a4e92d482b0dc538dab9e03ddb61a91144d8b51e9a7522799bfe17b609a0401c73da91c333165c4499a1a7b WHIRLPOOL e3390422a959b77050d5d84791172a50a7a92524abf89011fcc277fa2c5fe2d6d5ffe47796205b9184661774f64c6365b057d456fb50f2d30938921743bf1940
+EBUILD selinux-modemmanager-2.20170805-r2.ebuild 386 SHA256 bf73f3d6c489a5d2c855d81fe5381f3f19985b3806284673ec62bfe88ab5cfba SHA512 7bd30fb24b50d547ae36808c005de596dbc165764a4e92d482b0dc538dab9e03ddb61a91144d8b51e9a7522799bfe17b609a0401c73da91c333165c4499a1a7b WHIRLPOOL e3390422a959b77050d5d84791172a50a7a92524abf89011fcc277fa2c5fe2d6d5ffe47796205b9184661774f64c6365b057d456fb50f2d30938921743bf1940
+EBUILD selinux-modemmanager-2.20170805-r3.ebuild 388 SHA256 d11c0b9c907bb0357ee6991f35b496fdb5c92d95849a1624c86572a6b4791517 SHA512 b8e597a89aa4fd31358a6427010f29d683e58fae2687d9fe2b85d0bdb38ca28a7eef138969b2b5bbee598e697cf3e879dc3afb1d612d845527a97b4db8b15013 WHIRLPOOL 002d80551067e7c27defcc679e3b5283a86169614d38ab52761935f806ef625cc86e288eb7b77d393069a2e167bcdf44e72ea7e6b8aaa072e70c802b03651fe0
+EBUILD selinux-modemmanager-9999.ebuild 388 SHA256 d11c0b9c907bb0357ee6991f35b496fdb5c92d95849a1624c86572a6b4791517 SHA512 b8e597a89aa4fd31358a6427010f29d683e58fae2687d9fe2b85d0bdb38ca28a7eef138969b2b5bbee598e697cf3e879dc3afb1d612d845527a97b4db8b15013 WHIRLPOOL 002d80551067e7c27defcc679e3b5283a86169614d38ab52761935f806ef625cc86e288eb7b77d393069a2e167bcdf44e72ea7e6b8aaa072e70c802b03651fe0
 MISC ChangeLog 11167 SHA256 af44166f94bbb903b9aad3f2e9a760af85a23933c6243fbaf6f5df09626958a1 SHA512 f35802b5cb03a13596721059b44df2bdd974ba30d4a907ac8375571e43f75754062016992e03c67d40a2b93e1f722f8655513a491338ffc263679d0117604882 WHIRLPOOL 8741e8bcb44ee109e2996342dd6af021c7863a5bef6ec218acf4aa75bd040d45631d2a90df9cfbbe9a1904c4d87989713c8346d5deaeb25d7c6aebceca062148
 MISC ChangeLog-2015 10698 SHA256 34cf61d0a44dda69949c4c91ca9dc8908ff9f91f757f1ac373bb53274f50df5c SHA512 24282bf15ac32014916db64ddbaae1794da9da0812be6edc913718639baf2734df7271d5530c0392247d3b488d4f29e8f18828b115ace721fdab8521bd317e44 WHIRLPOOL 8802d5a234b990c52bf65356b7b86e9b9a65b78076f22fa202c4679d667b28a70c36c863edb91b17eb600ad1f04a73d5046f4d7533fbe79287deedfd3a1c0fb9
 MISC metadata.xml 322 SHA256 4b55b4e1e026e161f7da56cdab9baa46c150354b9244f2d37bd1474d45f1168e SHA512 830ca621d92823ba149cdec9e44812c2f84ec451de1616c7147cd8640d4620ba9bc91dc95584ec081bb9b31de180f4b568d8cb8988077442c98259a2e9bbd399 WHIRLPOOL 50531eaf42049408f3e98bd82a1cdd5fea074ecfe7e5cf6b6a81f61e3cde2b787df1ab1a0c89099f61b307fadde91a85ef88b7ee48b2434b122b5c4ec93a417b
diff --git a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20170204-r1.ebuild b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20170204-r1.ebuild
index 643700700ea9..6c204aed8092 100644
--- a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20170204-r2.ebuild b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20170204-r2.ebuild
index dc3d20f0fda2..2f4d0eccee54 100644
--- a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20170204-r3.ebuild b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20170204-r3.ebuild
index dc3d20f0fda2..2f4d0eccee54 100644
--- a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20170204-r4.ebuild b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20170204-r4.ebuild
index dc3d20f0fda2..2f4d0eccee54 100644
--- a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20170805-r2.ebuild b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20170805-r2.ebuild
index dc3d20f0fda2..2f4d0eccee54 100644
--- a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20170805-r3.ebuild b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..6c204aed8092
--- /dev/null
+++ b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20170805-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-modemmanager/selinux-modemmanager-9999.ebuild b/sec-policy/selinux-modemmanager/selinux-modemmanager-9999.ebuild
index 643700700ea9..6c204aed8092 100644
--- a/sec-policy/selinux-modemmanager/selinux-modemmanager-9999.ebuild
+++ b/sec-policy/selinux-modemmanager/selinux-modemmanager-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-mono/Manifest b/sec-policy/selinux-mono/Manifest
index db6c8f82b52a..a581b28686f7 100644
--- a/sec-policy/selinux-mono/Manifest
+++ b/sec-policy/selinux-mono/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-mono-2.20170204-r1.ebuild 279 SHA256 8929d522e897507193d30602d26a7bcf4cadc9f8fcd4369b9338c2e278014139 SHA512 76a9d53eb17dd0c0e4b8586f67f46a58f78d04a0e0174465d8a7d0b094fe4efb31ba10cee009918c93cacb3b3e62c06a59d425b0bf4b3a810b552badc59edb50 WHIRLPOOL 21e984b1d341882f9b9f29eade49fa0916ebf5d7de89cef7182878562c8dbab5e25267ec3e8f6cdefe030608c4ca680bb195963527df4fb678072aa33126e7c3
-EBUILD selinux-mono-2.20170204-r2.ebuild 277 SHA256 d503ec50594cba8a951ccae7aff12884191f5fc17d2f19388b42e5d4d1f2f03e SHA512 91ee7c69a59f51e78fc6420c0214ce54fd926c9a40bea721570fb1714597658f0a74e1320f6e5448e94db83d529fb340add90c6bd100ddc3dfbd99969a70e264 WHIRLPOOL 76aeb763d6e46e1a248c33fefeb8110b6a7d3dc1dc05935bec76c9b38e48640e248fa978ddbb3d2a69de33619d7b27c8e06cdd6d7847a0f3b925a3636086afea
-EBUILD selinux-mono-2.20170204-r3.ebuild 277 SHA256 d503ec50594cba8a951ccae7aff12884191f5fc17d2f19388b42e5d4d1f2f03e SHA512 91ee7c69a59f51e78fc6420c0214ce54fd926c9a40bea721570fb1714597658f0a74e1320f6e5448e94db83d529fb340add90c6bd100ddc3dfbd99969a70e264 WHIRLPOOL 76aeb763d6e46e1a248c33fefeb8110b6a7d3dc1dc05935bec76c9b38e48640e248fa978ddbb3d2a69de33619d7b27c8e06cdd6d7847a0f3b925a3636086afea
-EBUILD selinux-mono-2.20170204-r4.ebuild 277 SHA256 d503ec50594cba8a951ccae7aff12884191f5fc17d2f19388b42e5d4d1f2f03e SHA512 91ee7c69a59f51e78fc6420c0214ce54fd926c9a40bea721570fb1714597658f0a74e1320f6e5448e94db83d529fb340add90c6bd100ddc3dfbd99969a70e264 WHIRLPOOL 76aeb763d6e46e1a248c33fefeb8110b6a7d3dc1dc05935bec76c9b38e48640e248fa978ddbb3d2a69de33619d7b27c8e06cdd6d7847a0f3b925a3636086afea
-EBUILD selinux-mono-2.20170805-r2.ebuild 277 SHA256 d503ec50594cba8a951ccae7aff12884191f5fc17d2f19388b42e5d4d1f2f03e SHA512 91ee7c69a59f51e78fc6420c0214ce54fd926c9a40bea721570fb1714597658f0a74e1320f6e5448e94db83d529fb340add90c6bd100ddc3dfbd99969a70e264 WHIRLPOOL 76aeb763d6e46e1a248c33fefeb8110b6a7d3dc1dc05935bec76c9b38e48640e248fa978ddbb3d2a69de33619d7b27c8e06cdd6d7847a0f3b925a3636086afea
-EBUILD selinux-mono-9999.ebuild 279 SHA256 8929d522e897507193d30602d26a7bcf4cadc9f8fcd4369b9338c2e278014139 SHA512 76a9d53eb17dd0c0e4b8586f67f46a58f78d04a0e0174465d8a7d0b094fe4efb31ba10cee009918c93cacb3b3e62c06a59d425b0bf4b3a810b552badc59edb50 WHIRLPOOL 21e984b1d341882f9b9f29eade49fa0916ebf5d7de89cef7182878562c8dbab5e25267ec3e8f6cdefe030608c4ca680bb195963527df4fb678072aa33126e7c3
+EBUILD selinux-mono-2.20170204-r1.ebuild 280 SHA256 012c81b3ad7277ab323a2e91389c69951816801274d9876016c60657306035c1 SHA512 6f6b1d46178b95928f949b548db96f669f24ba41b5388797dc6d5e7e3d45f0f2eb8f2fb4ffdb4608476c7b76950ff9b65d7a6224e895fe7904580c2215094507 WHIRLPOOL fb922005bbc80076640f3ca517cbf8ef4fcac10437b33507f15541bc0dec6c2b34bb832f89b70c15004bf61e1b53eda7ccb2fe3a391d80a02f22c9f7beadb374
+EBUILD selinux-mono-2.20170204-r2.ebuild 278 SHA256 aacab808b9e4e79bffbf6ab14a7dee07eef3659943dc84e83b9b40f78a2071ca SHA512 c9385d3bc60b5960619e64493d69f46cd05880cf3950f2b1d0256956700ba9431678aaefe4d74d2e7302a2909197597f6717b6df030de8563b48214b635f5ea3 WHIRLPOOL fcfdf025a5cfe684887ff2df2868660a8a92044b6dec8ef3347193d5a02b84d2b08e351d80a699f04de9f0103ca9b5c13013f137b4773a4c91f53f418a854e4b
+EBUILD selinux-mono-2.20170204-r3.ebuild 278 SHA256 aacab808b9e4e79bffbf6ab14a7dee07eef3659943dc84e83b9b40f78a2071ca SHA512 c9385d3bc60b5960619e64493d69f46cd05880cf3950f2b1d0256956700ba9431678aaefe4d74d2e7302a2909197597f6717b6df030de8563b48214b635f5ea3 WHIRLPOOL fcfdf025a5cfe684887ff2df2868660a8a92044b6dec8ef3347193d5a02b84d2b08e351d80a699f04de9f0103ca9b5c13013f137b4773a4c91f53f418a854e4b
+EBUILD selinux-mono-2.20170204-r4.ebuild 278 SHA256 aacab808b9e4e79bffbf6ab14a7dee07eef3659943dc84e83b9b40f78a2071ca SHA512 c9385d3bc60b5960619e64493d69f46cd05880cf3950f2b1d0256956700ba9431678aaefe4d74d2e7302a2909197597f6717b6df030de8563b48214b635f5ea3 WHIRLPOOL fcfdf025a5cfe684887ff2df2868660a8a92044b6dec8ef3347193d5a02b84d2b08e351d80a699f04de9f0103ca9b5c13013f137b4773a4c91f53f418a854e4b
+EBUILD selinux-mono-2.20170805-r2.ebuild 278 SHA256 aacab808b9e4e79bffbf6ab14a7dee07eef3659943dc84e83b9b40f78a2071ca SHA512 c9385d3bc60b5960619e64493d69f46cd05880cf3950f2b1d0256956700ba9431678aaefe4d74d2e7302a2909197597f6717b6df030de8563b48214b635f5ea3 WHIRLPOOL fcfdf025a5cfe684887ff2df2868660a8a92044b6dec8ef3347193d5a02b84d2b08e351d80a699f04de9f0103ca9b5c13013f137b4773a4c91f53f418a854e4b
+EBUILD selinux-mono-2.20170805-r3.ebuild 280 SHA256 012c81b3ad7277ab323a2e91389c69951816801274d9876016c60657306035c1 SHA512 6f6b1d46178b95928f949b548db96f669f24ba41b5388797dc6d5e7e3d45f0f2eb8f2fb4ffdb4608476c7b76950ff9b65d7a6224e895fe7904580c2215094507 WHIRLPOOL fb922005bbc80076640f3ca517cbf8ef4fcac10437b33507f15541bc0dec6c2b34bb832f89b70c15004bf61e1b53eda7ccb2fe3a391d80a02f22c9f7beadb374
+EBUILD selinux-mono-9999.ebuild 280 SHA256 012c81b3ad7277ab323a2e91389c69951816801274d9876016c60657306035c1 SHA512 6f6b1d46178b95928f949b548db96f669f24ba41b5388797dc6d5e7e3d45f0f2eb8f2fb4ffdb4608476c7b76950ff9b65d7a6224e895fe7904580c2215094507 WHIRLPOOL fb922005bbc80076640f3ca517cbf8ef4fcac10437b33507f15541bc0dec6c2b34bb832f89b70c15004bf61e1b53eda7ccb2fe3a391d80a02f22c9f7beadb374
 MISC ChangeLog 10387 SHA256 dac7a3328f4ac15a9e718b3082ef3e67d21a954263f4495a196bb30cdf223c49 SHA512 3f50728fe94a1c4a61b4678317b28eced14a19ae764f65aaa6cfb8157a45e48f0e1c38fbdce09760126f9469bef92b84790d95d3974428f7ad5f2c4386a3003c WHIRLPOOL d0c5fae25c1ad7e965b798b62fef9745d9ca9ceb4194ce0c53e97ab85befc58a34b0294660ed6900443ccab67612ab211567993c0e6c7b887128742d2b6a0c70
 MISC ChangeLog-2015 9637 SHA256 c6dc49fcc944091af038a84177a4d89c3b1380b823546444a3d65e9dc9de1481 SHA512 04406f3fd3fc147a580fb2e7b9e0470c16641aef4af069b3f97c931f8b155c3d6e8ff8996ee072bc9713d549c3829714e5474f97d8fb377f966e5cb0bf03d11a WHIRLPOOL 5174f9e9f084f4328810e96b53447fa831dd0117e9b5d8e7ddcaffae4edeb04f262de5f16774cf28cdb4c3f32e7a2a5b749b935b14a8b67c5ea575c532bd7b07
 MISC metadata.xml 314 SHA256 3d58bbfd40b76d7b1e9f4a064a98a07bb8a6a58f93437697c721cffab63939d1 SHA512 8c8beb605d3c5f0bc763dca943cc89871bd50eb086d2c18dac03402a13a0dd584073b8c2f4dbfa0bdeda14e4b795395a0806f3d622cce4108593860ce26d08a7 WHIRLPOOL 65dc9ad32c02ccc22ccc394e84bb3fed24317308766e185b5e4a342239181ea7b2ea9e5c105434469da637b6c43dc385ce4ed74f4686e344ddc85b25534bf888
diff --git a/sec-policy/selinux-mono/selinux-mono-2.20170204-r1.ebuild b/sec-policy/selinux-mono/selinux-mono-2.20170204-r1.ebuild
index 448fd55fd7b4..e77111606246 100644
--- a/sec-policy/selinux-mono/selinux-mono-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-mono/selinux-mono-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-mono/selinux-mono-2.20170204-r2.ebuild b/sec-policy/selinux-mono/selinux-mono-2.20170204-r2.ebuild
index 38eebe9f1621..4a1268d7ba59 100644
--- a/sec-policy/selinux-mono/selinux-mono-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-mono/selinux-mono-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-mono/selinux-mono-2.20170204-r3.ebuild b/sec-policy/selinux-mono/selinux-mono-2.20170204-r3.ebuild
index 38eebe9f1621..4a1268d7ba59 100644
--- a/sec-policy/selinux-mono/selinux-mono-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-mono/selinux-mono-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-mono/selinux-mono-2.20170204-r4.ebuild b/sec-policy/selinux-mono/selinux-mono-2.20170204-r4.ebuild
index 38eebe9f1621..4a1268d7ba59 100644
--- a/sec-policy/selinux-mono/selinux-mono-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-mono/selinux-mono-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-mono/selinux-mono-2.20170805-r2.ebuild b/sec-policy/selinux-mono/selinux-mono-2.20170805-r2.ebuild
index 38eebe9f1621..4a1268d7ba59 100644
--- a/sec-policy/selinux-mono/selinux-mono-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-mono/selinux-mono-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-mono/selinux-mono-2.20170805-r3.ebuild b/sec-policy/selinux-mono/selinux-mono-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..e77111606246
--- /dev/null
+++ b/sec-policy/selinux-mono/selinux-mono-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-mono/selinux-mono-9999.ebuild b/sec-policy/selinux-mono/selinux-mono-9999.ebuild
index 448fd55fd7b4..e77111606246 100644
--- a/sec-policy/selinux-mono/selinux-mono-9999.ebuild
+++ b/sec-policy/selinux-mono/selinux-mono-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-mozilla/Manifest b/sec-policy/selinux-mozilla/Manifest
index bf996888c938..aa1643a546fc 100644
--- a/sec-policy/selinux-mozilla/Manifest
+++ b/sec-policy/selinux-mozilla/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-mozilla-2.20170204-r1.ebuild 387 SHA256 3759e331c01a64239e46c1f4e7473faf9c8aea0d5cafae27ad5319cdd9358022 SHA512 50eeeb8ca8f96f04c11416d5520c08023d54cecaaeff630c6396808e7e87082f2aab3bd23853869b35c9211ac83eda9d28c8d0b04e932694efa930c582f8c902 WHIRLPOOL 0273de6496b290729272ae2e338fc3bc3196b508bfaad8065342d97625c9c75f403021b0e089849d58007a3b4141961ab581f6780d5f7f5e3e0b95cb565d5769
-EBUILD selinux-mozilla-2.20170204-r2.ebuild 385 SHA256 ea70e766cb8e00dc489c8378d51bec43e97e109f37f41049ee116c5f9d176ac5 SHA512 993b5341ba7644a324f1e88e163865f2567548ff9b89fe97dcacf92544563f476554daf973c09af4fc8d5cfe5e14ffa91e47639b2384f1705f84d73ef8636796 WHIRLPOOL 0a830c7314ef90c6386f878eb71b5e697a5c408825d5959280315e529fb82b0f359915378a1d09aad19de27ab0021362951b66a5f9aa65dc856838c00b83f1e9
-EBUILD selinux-mozilla-2.20170204-r3.ebuild 385 SHA256 ea70e766cb8e00dc489c8378d51bec43e97e109f37f41049ee116c5f9d176ac5 SHA512 993b5341ba7644a324f1e88e163865f2567548ff9b89fe97dcacf92544563f476554daf973c09af4fc8d5cfe5e14ffa91e47639b2384f1705f84d73ef8636796 WHIRLPOOL 0a830c7314ef90c6386f878eb71b5e697a5c408825d5959280315e529fb82b0f359915378a1d09aad19de27ab0021362951b66a5f9aa65dc856838c00b83f1e9
-EBUILD selinux-mozilla-2.20170204-r4.ebuild 385 SHA256 ea70e766cb8e00dc489c8378d51bec43e97e109f37f41049ee116c5f9d176ac5 SHA512 993b5341ba7644a324f1e88e163865f2567548ff9b89fe97dcacf92544563f476554daf973c09af4fc8d5cfe5e14ffa91e47639b2384f1705f84d73ef8636796 WHIRLPOOL 0a830c7314ef90c6386f878eb71b5e697a5c408825d5959280315e529fb82b0f359915378a1d09aad19de27ab0021362951b66a5f9aa65dc856838c00b83f1e9
-EBUILD selinux-mozilla-2.20170805-r2.ebuild 385 SHA256 ea70e766cb8e00dc489c8378d51bec43e97e109f37f41049ee116c5f9d176ac5 SHA512 993b5341ba7644a324f1e88e163865f2567548ff9b89fe97dcacf92544563f476554daf973c09af4fc8d5cfe5e14ffa91e47639b2384f1705f84d73ef8636796 WHIRLPOOL 0a830c7314ef90c6386f878eb71b5e697a5c408825d5959280315e529fb82b0f359915378a1d09aad19de27ab0021362951b66a5f9aa65dc856838c00b83f1e9
-EBUILD selinux-mozilla-9999.ebuild 387 SHA256 3759e331c01a64239e46c1f4e7473faf9c8aea0d5cafae27ad5319cdd9358022 SHA512 50eeeb8ca8f96f04c11416d5520c08023d54cecaaeff630c6396808e7e87082f2aab3bd23853869b35c9211ac83eda9d28c8d0b04e932694efa930c582f8c902 WHIRLPOOL 0273de6496b290729272ae2e338fc3bc3196b508bfaad8065342d97625c9c75f403021b0e089849d58007a3b4141961ab581f6780d5f7f5e3e0b95cb565d5769
+EBUILD selinux-mozilla-2.20170204-r1.ebuild 388 SHA256 026b1738e43cd5680a8fd0d678fbe4421a4cce506bd8e67cc8d70854961e306b SHA512 409155bbe533888b1358cfb9089e756e21255960a052488e9a09fbe206e063758d2a999d1f248a5dbff966a1747a009fa784a128714c3231d20006161d40562f WHIRLPOOL 678933ab8a05669aebe2ecb8e6ef25ddae838528e626a8bfc7048f301413eb4cb208f652ff62130413db4359306bf363b8885b1177e35d08856cbc098e784fed
+EBUILD selinux-mozilla-2.20170204-r2.ebuild 386 SHA256 733edfc5af24a7c55aaaa7f21cf5e31185f6a0ab1d80695f7c6944c47128c678 SHA512 270a7e9c32edb4234197ceda8d886966524fc7d6c6bba7990067bb468e8748f25be87f15d90dc3a7b300a8573c10c931b50759fe96d6b193492eb9d3bb52d105 WHIRLPOOL 6564f0e3bb3d84fbcccd7ba959dadb54d4cd3a2dd517d835a66699e7768262ec24ba4eb058f540a77f53e79ab9999fd2b35ca04552595ddae231c2b89bf4ca67
+EBUILD selinux-mozilla-2.20170204-r3.ebuild 386 SHA256 733edfc5af24a7c55aaaa7f21cf5e31185f6a0ab1d80695f7c6944c47128c678 SHA512 270a7e9c32edb4234197ceda8d886966524fc7d6c6bba7990067bb468e8748f25be87f15d90dc3a7b300a8573c10c931b50759fe96d6b193492eb9d3bb52d105 WHIRLPOOL 6564f0e3bb3d84fbcccd7ba959dadb54d4cd3a2dd517d835a66699e7768262ec24ba4eb058f540a77f53e79ab9999fd2b35ca04552595ddae231c2b89bf4ca67
+EBUILD selinux-mozilla-2.20170204-r4.ebuild 386 SHA256 733edfc5af24a7c55aaaa7f21cf5e31185f6a0ab1d80695f7c6944c47128c678 SHA512 270a7e9c32edb4234197ceda8d886966524fc7d6c6bba7990067bb468e8748f25be87f15d90dc3a7b300a8573c10c931b50759fe96d6b193492eb9d3bb52d105 WHIRLPOOL 6564f0e3bb3d84fbcccd7ba959dadb54d4cd3a2dd517d835a66699e7768262ec24ba4eb058f540a77f53e79ab9999fd2b35ca04552595ddae231c2b89bf4ca67
+EBUILD selinux-mozilla-2.20170805-r2.ebuild 386 SHA256 733edfc5af24a7c55aaaa7f21cf5e31185f6a0ab1d80695f7c6944c47128c678 SHA512 270a7e9c32edb4234197ceda8d886966524fc7d6c6bba7990067bb468e8748f25be87f15d90dc3a7b300a8573c10c931b50759fe96d6b193492eb9d3bb52d105 WHIRLPOOL 6564f0e3bb3d84fbcccd7ba959dadb54d4cd3a2dd517d835a66699e7768262ec24ba4eb058f540a77f53e79ab9999fd2b35ca04552595ddae231c2b89bf4ca67
+EBUILD selinux-mozilla-2.20170805-r3.ebuild 388 SHA256 026b1738e43cd5680a8fd0d678fbe4421a4cce506bd8e67cc8d70854961e306b SHA512 409155bbe533888b1358cfb9089e756e21255960a052488e9a09fbe206e063758d2a999d1f248a5dbff966a1747a009fa784a128714c3231d20006161d40562f WHIRLPOOL 678933ab8a05669aebe2ecb8e6ef25ddae838528e626a8bfc7048f301413eb4cb208f652ff62130413db4359306bf363b8885b1177e35d08856cbc098e784fed
+EBUILD selinux-mozilla-9999.ebuild 388 SHA256 026b1738e43cd5680a8fd0d678fbe4421a4cce506bd8e67cc8d70854961e306b SHA512 409155bbe533888b1358cfb9089e756e21255960a052488e9a09fbe206e063758d2a999d1f248a5dbff966a1747a009fa784a128714c3231d20006161d40562f WHIRLPOOL 678933ab8a05669aebe2ecb8e6ef25ddae838528e626a8bfc7048f301413eb4cb208f652ff62130413db4359306bf363b8885b1177e35d08856cbc098e784fed
 MISC ChangeLog 10687 SHA256 6b2a62703ebf843dd23da30d6a36a0ae3cfd8ca59e309cff94baddc1e3711613 SHA512 867e33b9f0d00a6bc0993ec23d6ac15e8158510275ad0e8574b67edff8224d4e5e752baf28e92428c19ecea4f4308903c96c22f7eb91a2702513c68c4526a21c WHIRLPOOL 8a952bdfdb969d2a8c907055ddc050d6a4a4c7401c4698e3dbb4bdbe22b037efdc22c6dde352dd8418b828cd948c5c790a15304de323ad624ea91b1ea80a963f
 MISC ChangeLog-2015 13495 SHA256 1e02002b4ba997a1f5291deb20d46f3302b0d8277b718b5467696e5094830f15 SHA512 7c786f561a9cdb8c5da15fd092c2e045a776e8a74b03f74a271758621ced558a6b9d0cb0c98bea2f893ea71053adc5881136221b9ab9e7b8ff75152a2cb1e59a WHIRLPOOL 8846e4ceeed414cb4ed19709a06c75cf621823e8de7ed7567f45aa1e3bb7fd7fc395d8ced19f97f7e9afe6b19985bb980222cae9af3bb09adb660586ec8526a7
 MISC metadata.xml 317 SHA256 d0e26d405c7b3958db5878a791bb924d2e29f2f5842fe6dbab9c478725e69652 SHA512 de84d7a15921be8c58ffe8bb4cbb4cb890853bf3450a7622bc86dc63d8937dac59a0c683616781ce084b59a2121e118ed0d7fcec73cb9b6a2ef57fea8aaa2167 WHIRLPOOL a4629e33f12b2c7c6aaf36223a82113602607798250f87ff1782c75342c5a00d0786ec4f58a034d8bbefd8c4f16f516c82a67895bfbf93589227f3ca3dfe6c45
diff --git a/sec-policy/selinux-mozilla/selinux-mozilla-2.20170204-r1.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-2.20170204-r1.ebuild
index 37f55fbe35c4..3649e88c3dd6 100644
--- a/sec-policy/selinux-mozilla/selinux-mozilla-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-mozilla/selinux-mozilla-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE="alsa"
diff --git a/sec-policy/selinux-mozilla/selinux-mozilla-2.20170204-r2.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-2.20170204-r2.ebuild
index 50af0e4bfc68..d8777f6fa2e5 100644
--- a/sec-policy/selinux-mozilla/selinux-mozilla-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-mozilla/selinux-mozilla-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE="alsa"
diff --git a/sec-policy/selinux-mozilla/selinux-mozilla-2.20170204-r3.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-2.20170204-r3.ebuild
index 50af0e4bfc68..d8777f6fa2e5 100644
--- a/sec-policy/selinux-mozilla/selinux-mozilla-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-mozilla/selinux-mozilla-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE="alsa"
diff --git a/sec-policy/selinux-mozilla/selinux-mozilla-2.20170204-r4.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-2.20170204-r4.ebuild
index 50af0e4bfc68..d8777f6fa2e5 100644
--- a/sec-policy/selinux-mozilla/selinux-mozilla-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-mozilla/selinux-mozilla-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE="alsa"
diff --git a/sec-policy/selinux-mozilla/selinux-mozilla-2.20170805-r2.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-2.20170805-r2.ebuild
index 50af0e4bfc68..d8777f6fa2e5 100644
--- a/sec-policy/selinux-mozilla/selinux-mozilla-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-mozilla/selinux-mozilla-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE="alsa"
diff --git a/sec-policy/selinux-mozilla/selinux-mozilla-2.20170805-r3.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..3649e88c3dd6
--- /dev/null
+++ b/sec-policy/selinux-mozilla/selinux-mozilla-2.20170805-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-mozilla/selinux-mozilla-9999.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-9999.ebuild
index 37f55fbe35c4..3649e88c3dd6 100644
--- a/sec-policy/selinux-mozilla/selinux-mozilla-9999.ebuild
+++ b/sec-policy/selinux-mozilla/selinux-mozilla-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE="alsa"
diff --git a/sec-policy/selinux-mpd/Manifest b/sec-policy/selinux-mpd/Manifest
index 9ea1ef5e039a..a3f70b7059fa 100644
--- a/sec-policy/selinux-mpd/Manifest
+++ b/sec-policy/selinux-mpd/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-mpd-2.20170204-r1.ebuild 277 SHA256 51de7bab54263e5f1fee8148a660fe42dd3c45c86cf1c4c7d50519d4bcf5dea1 SHA512 ff93b501cf9666623c14cbd8ba4635461afbd66a59142862b6312dedc80f957d3b2294174ada506c1b946bb4ed0982b4ac24a4ded1610f01ee9553ed4c686bd3 WHIRLPOOL 0e7b889f835c9628a6675674c8c96c0a5444ecafc07ff4f1f2641055f16eafdb37c11901ed52bf1f6a9ed1815370fe635489974e168301394f634d8cf3cfb855
-EBUILD selinux-mpd-2.20170204-r2.ebuild 275 SHA256 b22b0478135160963d347fc74ff829e4b4ee2eef7674d5c9cfbff0698c311af5 SHA512 23ad506558d4253c0f42bbcfa6c869478d7df7c9fd1f36d76ed2267e898cd3f74509b9cf75f730f0e0101a0f3b2e05f4be57bdacfac010dfd9ff974b4df8469e WHIRLPOOL 64b761e6a4b6c0971a154ac66e79664bcaece59f123255850ffe37ad83f8f27c64b8f98d8b725ed1863498e65328d08b5bf9d9906309dfb0a393be40a8e2096d
-EBUILD selinux-mpd-2.20170204-r3.ebuild 275 SHA256 b22b0478135160963d347fc74ff829e4b4ee2eef7674d5c9cfbff0698c311af5 SHA512 23ad506558d4253c0f42bbcfa6c869478d7df7c9fd1f36d76ed2267e898cd3f74509b9cf75f730f0e0101a0f3b2e05f4be57bdacfac010dfd9ff974b4df8469e WHIRLPOOL 64b761e6a4b6c0971a154ac66e79664bcaece59f123255850ffe37ad83f8f27c64b8f98d8b725ed1863498e65328d08b5bf9d9906309dfb0a393be40a8e2096d
-EBUILD selinux-mpd-2.20170204-r4.ebuild 275 SHA256 b22b0478135160963d347fc74ff829e4b4ee2eef7674d5c9cfbff0698c311af5 SHA512 23ad506558d4253c0f42bbcfa6c869478d7df7c9fd1f36d76ed2267e898cd3f74509b9cf75f730f0e0101a0f3b2e05f4be57bdacfac010dfd9ff974b4df8469e WHIRLPOOL 64b761e6a4b6c0971a154ac66e79664bcaece59f123255850ffe37ad83f8f27c64b8f98d8b725ed1863498e65328d08b5bf9d9906309dfb0a393be40a8e2096d
-EBUILD selinux-mpd-2.20170805-r2.ebuild 275 SHA256 b22b0478135160963d347fc74ff829e4b4ee2eef7674d5c9cfbff0698c311af5 SHA512 23ad506558d4253c0f42bbcfa6c869478d7df7c9fd1f36d76ed2267e898cd3f74509b9cf75f730f0e0101a0f3b2e05f4be57bdacfac010dfd9ff974b4df8469e WHIRLPOOL 64b761e6a4b6c0971a154ac66e79664bcaece59f123255850ffe37ad83f8f27c64b8f98d8b725ed1863498e65328d08b5bf9d9906309dfb0a393be40a8e2096d
-EBUILD selinux-mpd-9999.ebuild 277 SHA256 51de7bab54263e5f1fee8148a660fe42dd3c45c86cf1c4c7d50519d4bcf5dea1 SHA512 ff93b501cf9666623c14cbd8ba4635461afbd66a59142862b6312dedc80f957d3b2294174ada506c1b946bb4ed0982b4ac24a4ded1610f01ee9553ed4c686bd3 WHIRLPOOL 0e7b889f835c9628a6675674c8c96c0a5444ecafc07ff4f1f2641055f16eafdb37c11901ed52bf1f6a9ed1815370fe635489974e168301394f634d8cf3cfb855
+EBUILD selinux-mpd-2.20170204-r1.ebuild 278 SHA256 bc220b37a525397e0656d143dddb399d508a7dbc5689cc0eea44034f83ebf295 SHA512 42db79dd427c885124edca742497a8b1f6d86e5bacdbb8cde2ac85ce527cc3363fdbe963f8961c0166f53dab6f6d5d555b83d79eca9a22728bab886554021d02 WHIRLPOOL 00f7826eed28ebad9402c1a0b49924a5f39513f51dd723e0cf929eea3e2cebffff554bc1fdd012ba2e22ffe0619c41b761ecc0c0e5e515281a18610ba25ab5ee
+EBUILD selinux-mpd-2.20170204-r2.ebuild 276 SHA256 77093fb11ef4b17127358779e1442695ce361722cda67538a341d43b30bead77 SHA512 757843b5991cec659097d33b790c14e06f6563aa873b8c372a36a16a0027940550c7e9afcd44f06b5ebc12cd464251c4842d0e139125626ee0ace64aed162736 WHIRLPOOL 06465a2798d4af3854b21617718d5b4f65f6119ca1811f8aa523f9d64bcf918a72bc152c03145bb8c9e4c9786f25580a0b574e81caf1bbd9ca377e82fea26b06
+EBUILD selinux-mpd-2.20170204-r3.ebuild 276 SHA256 77093fb11ef4b17127358779e1442695ce361722cda67538a341d43b30bead77 SHA512 757843b5991cec659097d33b790c14e06f6563aa873b8c372a36a16a0027940550c7e9afcd44f06b5ebc12cd464251c4842d0e139125626ee0ace64aed162736 WHIRLPOOL 06465a2798d4af3854b21617718d5b4f65f6119ca1811f8aa523f9d64bcf918a72bc152c03145bb8c9e4c9786f25580a0b574e81caf1bbd9ca377e82fea26b06
+EBUILD selinux-mpd-2.20170204-r4.ebuild 276 SHA256 77093fb11ef4b17127358779e1442695ce361722cda67538a341d43b30bead77 SHA512 757843b5991cec659097d33b790c14e06f6563aa873b8c372a36a16a0027940550c7e9afcd44f06b5ebc12cd464251c4842d0e139125626ee0ace64aed162736 WHIRLPOOL 06465a2798d4af3854b21617718d5b4f65f6119ca1811f8aa523f9d64bcf918a72bc152c03145bb8c9e4c9786f25580a0b574e81caf1bbd9ca377e82fea26b06
+EBUILD selinux-mpd-2.20170805-r2.ebuild 276 SHA256 77093fb11ef4b17127358779e1442695ce361722cda67538a341d43b30bead77 SHA512 757843b5991cec659097d33b790c14e06f6563aa873b8c372a36a16a0027940550c7e9afcd44f06b5ebc12cd464251c4842d0e139125626ee0ace64aed162736 WHIRLPOOL 06465a2798d4af3854b21617718d5b4f65f6119ca1811f8aa523f9d64bcf918a72bc152c03145bb8c9e4c9786f25580a0b574e81caf1bbd9ca377e82fea26b06
+EBUILD selinux-mpd-2.20170805-r3.ebuild 278 SHA256 bc220b37a525397e0656d143dddb399d508a7dbc5689cc0eea44034f83ebf295 SHA512 42db79dd427c885124edca742497a8b1f6d86e5bacdbb8cde2ac85ce527cc3363fdbe963f8961c0166f53dab6f6d5d555b83d79eca9a22728bab886554021d02 WHIRLPOOL 00f7826eed28ebad9402c1a0b49924a5f39513f51dd723e0cf929eea3e2cebffff554bc1fdd012ba2e22ffe0619c41b761ecc0c0e5e515281a18610ba25ab5ee
+EBUILD selinux-mpd-9999.ebuild 278 SHA256 bc220b37a525397e0656d143dddb399d508a7dbc5689cc0eea44034f83ebf295 SHA512 42db79dd427c885124edca742497a8b1f6d86e5bacdbb8cde2ac85ce527cc3363fdbe963f8961c0166f53dab6f6d5d555b83d79eca9a22728bab886554021d02 WHIRLPOOL 00f7826eed28ebad9402c1a0b49924a5f39513f51dd723e0cf929eea3e2cebffff554bc1fdd012ba2e22ffe0619c41b761ecc0c0e5e515281a18610ba25ab5ee
 MISC ChangeLog 10295 SHA256 3ac0b7452a33f0b9fcac83834ba31cb5c4ae4fc461e848aa7ccaf94ff94b189c SHA512 2e41f0f8d2760e71b97b188b742dc1d675c308435cd592978e3d0ab6d25ad2809ff41bfa510489c3ea6bff40c98194240445c5d9b480b532639c76aad84446f1 WHIRLPOOL ad76e808cf7d7f5a8732391a5a08226c519c68c81132115cc1352dd57c672ab3c9b7b67219d3fed8a0ec749934f3c9b7c34f842bdd36056aadb09c8717ed1994
 MISC ChangeLog-2015 9260 SHA256 7ef3dc34dc3662f5c1014bff11a939166e7e965ff9aef131dc2cb1a4e344d6e8 SHA512 1146f1aded483c03b1ec91a5aaf060f1ed2c6308cd433ecbda3ba0c4332a6cbcf8964dfd366ece34d8b97c366ed5e4aba3fc70c73385c1524af8b47873990b31 WHIRLPOOL 35c65e7927c4dea1928759886dedc2d43c34af32435cca5eb0a2491902c999842f81e5387aa582813ef3ef6ee3bfb607a5efa734b9b623db91b56a3ae33c49ef
 MISC metadata.xml 313 SHA256 d09cf9acf2e7b5f2919395c80c849c98eabd30a6875fa659b3281c4379c1211a SHA512 6b549fa3968053908625a20d90fffebc16b8b3e4e9b35cf6fd5af36eedc7283512b43e7b40fd42791d41b4dff2c030313bea318bfcd513f7e9a447a2a58d4f43 WHIRLPOOL 194f31bdce395622fb35d3855a0d71d6c7cd66038c867eafb9a0ff48fb5a71b8fce9a9c838519b736a0cd277f252543073750c9238765861d6bf7b3f54a65b90
diff --git a/sec-policy/selinux-mpd/selinux-mpd-2.20170204-r1.ebuild b/sec-policy/selinux-mpd/selinux-mpd-2.20170204-r1.ebuild
index 696910999bc6..0a1db71ae8b4 100644
--- a/sec-policy/selinux-mpd/selinux-mpd-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-mpd/selinux-mpd-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-mpd/selinux-mpd-2.20170204-r2.ebuild b/sec-policy/selinux-mpd/selinux-mpd-2.20170204-r2.ebuild
index c501ad37f985..7ec661829684 100644
--- a/sec-policy/selinux-mpd/selinux-mpd-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-mpd/selinux-mpd-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-mpd/selinux-mpd-2.20170204-r3.ebuild b/sec-policy/selinux-mpd/selinux-mpd-2.20170204-r3.ebuild
index c501ad37f985..7ec661829684 100644
--- a/sec-policy/selinux-mpd/selinux-mpd-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-mpd/selinux-mpd-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-mpd/selinux-mpd-2.20170204-r4.ebuild b/sec-policy/selinux-mpd/selinux-mpd-2.20170204-r4.ebuild
index c501ad37f985..7ec661829684 100644
--- a/sec-policy/selinux-mpd/selinux-mpd-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-mpd/selinux-mpd-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-mpd/selinux-mpd-2.20170805-r2.ebuild b/sec-policy/selinux-mpd/selinux-mpd-2.20170805-r2.ebuild
index c501ad37f985..7ec661829684 100644
--- a/sec-policy/selinux-mpd/selinux-mpd-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-mpd/selinux-mpd-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-mpd/selinux-mpd-2.20170805-r3.ebuild b/sec-policy/selinux-mpd/selinux-mpd-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..0a1db71ae8b4
--- /dev/null
+++ b/sec-policy/selinux-mpd/selinux-mpd-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-mpd/selinux-mpd-9999.ebuild b/sec-policy/selinux-mpd/selinux-mpd-9999.ebuild
index 696910999bc6..0a1db71ae8b4 100644
--- a/sec-policy/selinux-mpd/selinux-mpd-9999.ebuild
+++ b/sec-policy/selinux-mpd/selinux-mpd-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-mplayer/Manifest b/sec-policy/selinux-mplayer/Manifest
index b5304fb8fddc..c79fe88f5287 100644
--- a/sec-policy/selinux-mplayer/Manifest
+++ b/sec-policy/selinux-mplayer/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-mplayer-2.20170204-r1.ebuild 289 SHA256 b977b6c6080bcb557025c7c7f279c62a58be2065c5f47b8a3ccfe2e48355c3d3 SHA512 2e974261bf319d63c998faacba4dead91da9df7b0fe81121c5c592c077b6b73b36b1c3ac7f0b7deccbeea78a0b58d164153feb603d8e7179c0d8c2bcd31257dc WHIRLPOOL 99a364b3821b8a574c2587d3f7d74b41b150e6d6aec9c53c29a7ad9b155d8b8ddacab17c0ee9e9d594212424a1e1c79ef1e32bb52f3dd8c7f94210a645ed31c7
-EBUILD selinux-mplayer-2.20170204-r2.ebuild 287 SHA256 cbb12529572cb074bff60678ea143f3c342d79a0391f69f6eff07725a56c2fdb SHA512 0d2f1cb4736045ed5d5d241902cb35bdbb1df1dbeb47c627d8291ebeaba1ac6a185350b3893e8ae6ac71b0cae23099086ee386d3c6b1c5b8f37f5c1c3aa8bc0e WHIRLPOOL 528bd8b5c9902ef770fddb456063e5d4c18cdee0710c30b979848c965f5b1fba8b88239fae2505293478d00f2a77f9d8e23d29b64afe4c088302edcc2dad371f
-EBUILD selinux-mplayer-2.20170204-r3.ebuild 287 SHA256 cbb12529572cb074bff60678ea143f3c342d79a0391f69f6eff07725a56c2fdb SHA512 0d2f1cb4736045ed5d5d241902cb35bdbb1df1dbeb47c627d8291ebeaba1ac6a185350b3893e8ae6ac71b0cae23099086ee386d3c6b1c5b8f37f5c1c3aa8bc0e WHIRLPOOL 528bd8b5c9902ef770fddb456063e5d4c18cdee0710c30b979848c965f5b1fba8b88239fae2505293478d00f2a77f9d8e23d29b64afe4c088302edcc2dad371f
-EBUILD selinux-mplayer-2.20170204-r4.ebuild 287 SHA256 cbb12529572cb074bff60678ea143f3c342d79a0391f69f6eff07725a56c2fdb SHA512 0d2f1cb4736045ed5d5d241902cb35bdbb1df1dbeb47c627d8291ebeaba1ac6a185350b3893e8ae6ac71b0cae23099086ee386d3c6b1c5b8f37f5c1c3aa8bc0e WHIRLPOOL 528bd8b5c9902ef770fddb456063e5d4c18cdee0710c30b979848c965f5b1fba8b88239fae2505293478d00f2a77f9d8e23d29b64afe4c088302edcc2dad371f
-EBUILD selinux-mplayer-2.20170805-r2.ebuild 287 SHA256 cbb12529572cb074bff60678ea143f3c342d79a0391f69f6eff07725a56c2fdb SHA512 0d2f1cb4736045ed5d5d241902cb35bdbb1df1dbeb47c627d8291ebeaba1ac6a185350b3893e8ae6ac71b0cae23099086ee386d3c6b1c5b8f37f5c1c3aa8bc0e WHIRLPOOL 528bd8b5c9902ef770fddb456063e5d4c18cdee0710c30b979848c965f5b1fba8b88239fae2505293478d00f2a77f9d8e23d29b64afe4c088302edcc2dad371f
-EBUILD selinux-mplayer-9999.ebuild 289 SHA256 b977b6c6080bcb557025c7c7f279c62a58be2065c5f47b8a3ccfe2e48355c3d3 SHA512 2e974261bf319d63c998faacba4dead91da9df7b0fe81121c5c592c077b6b73b36b1c3ac7f0b7deccbeea78a0b58d164153feb603d8e7179c0d8c2bcd31257dc WHIRLPOOL 99a364b3821b8a574c2587d3f7d74b41b150e6d6aec9c53c29a7ad9b155d8b8ddacab17c0ee9e9d594212424a1e1c79ef1e32bb52f3dd8c7f94210a645ed31c7
+EBUILD selinux-mplayer-2.20170204-r1.ebuild 290 SHA256 b0c9a834314ba062cedc46a3d9afd19220737494cfa42e6029076b89824e8ad0 SHA512 4aff9e610af74f87984b5b14c3055a5e136172ebbe96e0b58c7859cc075513a8d1ab4405622b2e552f5b1fff391326765f1444993ca04b80005c3d6b2e98a79e WHIRLPOOL bac08c00886a7bad7f59ed8e88b56dd013d00c002ccb453fc74f40e750a3070ff67018c3addfcbfd5758fa10f7b29c87930123a7e76aec43dc36294183690ae3
+EBUILD selinux-mplayer-2.20170204-r2.ebuild 288 SHA256 9a48de7e8f9e9034e4ccbc21fad8c0bfbfccdc3a4cdba0ec96c3b8bc1267f721 SHA512 9450e162c0a0d1285b8d2cee0960040205d46a548ecd871fa9fc8df1c022270e04591d6efd90afaa75872b59685c25f9edd85fe06745ba24c94ffffc817f9028 WHIRLPOOL 407dd344e242b0da933d73a454aa18f2bcf0e30b334a8721467fe2fa5a5cb17c7e37d89df3b4c75d4aebb37959a30375dbbce04aaf52aafe4dfc002120ba1e16
+EBUILD selinux-mplayer-2.20170204-r3.ebuild 288 SHA256 9a48de7e8f9e9034e4ccbc21fad8c0bfbfccdc3a4cdba0ec96c3b8bc1267f721 SHA512 9450e162c0a0d1285b8d2cee0960040205d46a548ecd871fa9fc8df1c022270e04591d6efd90afaa75872b59685c25f9edd85fe06745ba24c94ffffc817f9028 WHIRLPOOL 407dd344e242b0da933d73a454aa18f2bcf0e30b334a8721467fe2fa5a5cb17c7e37d89df3b4c75d4aebb37959a30375dbbce04aaf52aafe4dfc002120ba1e16
+EBUILD selinux-mplayer-2.20170204-r4.ebuild 288 SHA256 9a48de7e8f9e9034e4ccbc21fad8c0bfbfccdc3a4cdba0ec96c3b8bc1267f721 SHA512 9450e162c0a0d1285b8d2cee0960040205d46a548ecd871fa9fc8df1c022270e04591d6efd90afaa75872b59685c25f9edd85fe06745ba24c94ffffc817f9028 WHIRLPOOL 407dd344e242b0da933d73a454aa18f2bcf0e30b334a8721467fe2fa5a5cb17c7e37d89df3b4c75d4aebb37959a30375dbbce04aaf52aafe4dfc002120ba1e16
+EBUILD selinux-mplayer-2.20170805-r2.ebuild 288 SHA256 9a48de7e8f9e9034e4ccbc21fad8c0bfbfccdc3a4cdba0ec96c3b8bc1267f721 SHA512 9450e162c0a0d1285b8d2cee0960040205d46a548ecd871fa9fc8df1c022270e04591d6efd90afaa75872b59685c25f9edd85fe06745ba24c94ffffc817f9028 WHIRLPOOL 407dd344e242b0da933d73a454aa18f2bcf0e30b334a8721467fe2fa5a5cb17c7e37d89df3b4c75d4aebb37959a30375dbbce04aaf52aafe4dfc002120ba1e16
+EBUILD selinux-mplayer-2.20170805-r3.ebuild 290 SHA256 b0c9a834314ba062cedc46a3d9afd19220737494cfa42e6029076b89824e8ad0 SHA512 4aff9e610af74f87984b5b14c3055a5e136172ebbe96e0b58c7859cc075513a8d1ab4405622b2e552f5b1fff391326765f1444993ca04b80005c3d6b2e98a79e WHIRLPOOL bac08c00886a7bad7f59ed8e88b56dd013d00c002ccb453fc74f40e750a3070ff67018c3addfcbfd5758fa10f7b29c87930123a7e76aec43dc36294183690ae3
+EBUILD selinux-mplayer-9999.ebuild 290 SHA256 b0c9a834314ba062cedc46a3d9afd19220737494cfa42e6029076b89824e8ad0 SHA512 4aff9e610af74f87984b5b14c3055a5e136172ebbe96e0b58c7859cc075513a8d1ab4405622b2e552f5b1fff391326765f1444993ca04b80005c3d6b2e98a79e WHIRLPOOL bac08c00886a7bad7f59ed8e88b56dd013d00c002ccb453fc74f40e750a3070ff67018c3addfcbfd5758fa10f7b29c87930123a7e76aec43dc36294183690ae3
 MISC ChangeLog 10767 SHA256 fbe487f1651be07991ee4d61efbd0f7690ef92ac70c774e8089787a1cc80c122 SHA512 8f6b862657d9fe6e9ea11492a43c67c21cb6e253d501ff24819f8bdf1a5bb305e10e81dff6ebdea542424d11c0c6fe88c61db7256f1799f60c708963b4a0a10e WHIRLPOOL fbd5103b6d0b8fbaacfc73636f1b98cd7b7f3c99353dd3bf587e469fff6e80028578d1ee9cf0b8abc2b41f28006b2d636000ba1068f6f17749cf2a5184fc9e16
 MISC ChangeLog-2015 10435 SHA256 524b2d7b8ebdde82695c7b1e9539f235af99cd328d42ee79bb076f85dc660082 SHA512 9ee1cae1a56b4c35a7eddcb4c3c7736a4faca63d63195736b87719945efcd2a4a20e45d66080a868da555504af2b39a62e69570810b84e3ea6831914b9294cb5 WHIRLPOOL 5fd316a6491a7d3d27928a269eb7c84fc83b2ad15dde05c4540f59116878ed20c40b58158d80f94b0c7d6fe5353729a5d386004255b9dbdbbc92d64ce5ef5082
 MISC metadata.xml 317 SHA256 398264cd7c9d2a9867417f3864b07442754d9c32d47cd1515e78490d469b4590 SHA512 57f431a7e6dbf14548477b092ae19d706f17aa579ff51c6fafc87ce00690a365027449aff1e6eadfbdd6e071421c4e8173a912feb6670947551a30354f76c764 WHIRLPOOL ad1de5a94d61785546b661764b53de53756c0ad8a112e82f1a8360ebf12ca03b6972bc713e748c87d04d5a74e8e8a7a007ff6c93bdce58c78889733b6a601c58
diff --git a/sec-policy/selinux-mplayer/selinux-mplayer-2.20170204-r1.ebuild b/sec-policy/selinux-mplayer/selinux-mplayer-2.20170204-r1.ebuild
index 0b572436a2e8..72bbe9045800 100644
--- a/sec-policy/selinux-mplayer/selinux-mplayer-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-mplayer/selinux-mplayer-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE="alsa"
diff --git a/sec-policy/selinux-mplayer/selinux-mplayer-2.20170204-r2.ebuild b/sec-policy/selinux-mplayer/selinux-mplayer-2.20170204-r2.ebuild
index 5b0654356827..2b3ae984c26c 100644
--- a/sec-policy/selinux-mplayer/selinux-mplayer-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-mplayer/selinux-mplayer-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE="alsa"
diff --git a/sec-policy/selinux-mplayer/selinux-mplayer-2.20170204-r3.ebuild b/sec-policy/selinux-mplayer/selinux-mplayer-2.20170204-r3.ebuild
index 5b0654356827..2b3ae984c26c 100644
--- a/sec-policy/selinux-mplayer/selinux-mplayer-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-mplayer/selinux-mplayer-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE="alsa"
diff --git a/sec-policy/selinux-mplayer/selinux-mplayer-2.20170204-r4.ebuild b/sec-policy/selinux-mplayer/selinux-mplayer-2.20170204-r4.ebuild
index 5b0654356827..2b3ae984c26c 100644
--- a/sec-policy/selinux-mplayer/selinux-mplayer-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-mplayer/selinux-mplayer-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE="alsa"
diff --git a/sec-policy/selinux-mplayer/selinux-mplayer-2.20170805-r2.ebuild b/sec-policy/selinux-mplayer/selinux-mplayer-2.20170805-r2.ebuild
index 5b0654356827..2b3ae984c26c 100644
--- a/sec-policy/selinux-mplayer/selinux-mplayer-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-mplayer/selinux-mplayer-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE="alsa"
diff --git a/sec-policy/selinux-mplayer/selinux-mplayer-2.20170805-r3.ebuild b/sec-policy/selinux-mplayer/selinux-mplayer-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..72bbe9045800
--- /dev/null
+++ b/sec-policy/selinux-mplayer/selinux-mplayer-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-mplayer/selinux-mplayer-9999.ebuild b/sec-policy/selinux-mplayer/selinux-mplayer-9999.ebuild
index 0b572436a2e8..72bbe9045800 100644
--- a/sec-policy/selinux-mplayer/selinux-mplayer-9999.ebuild
+++ b/sec-policy/selinux-mplayer/selinux-mplayer-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE="alsa"
diff --git a/sec-policy/selinux-mrtg/Manifest b/sec-policy/selinux-mrtg/Manifest
index 79f324498450..7fb4d176dec5 100644
--- a/sec-policy/selinux-mrtg/Manifest
+++ b/sec-policy/selinux-mrtg/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-mrtg-2.20170204-r1.ebuild 279 SHA256 99e495bf28a0a95b7339adc67e4a8f998be9eb1b18e7c1d413e27455e55fc523 SHA512 3bfda26d47e63b53307d433ef86e2425ef90f140468a31048f685cd50e4b3c24777723128e4b76524f80551d4cc1a41e6d976597258bde7cbb5259459564bd66 WHIRLPOOL 739c9b52b70ceb6f2c76ca3aad63bae6b67256fc657ec54758998fd153c0117fc4fcd3ae912607c75915b3d1db5dfde1fa737ac712a5ecfe660cc8b6b8810e37
-EBUILD selinux-mrtg-2.20170204-r2.ebuild 277 SHA256 a2a30a80a1a2af0645f603529faab88c2d6e484962f695bafc71056a6f760f31 SHA512 40e901f3b0dfeec787b3dfa631761f329016fde71c4944b56be0247285f614a7065c16af5b08cdd004b57cfb74f10490a5a6fb74257cb8948b98cea23ceb546f WHIRLPOOL 1a5e8fc09358d8599054f41f1d30430dadfcab7601018489b2a26a7d7ed1e1925f3bd77a45f763f656f1683ee721c26b2b3002edb86f27ac8f150105a69a4a54
-EBUILD selinux-mrtg-2.20170204-r3.ebuild 277 SHA256 a2a30a80a1a2af0645f603529faab88c2d6e484962f695bafc71056a6f760f31 SHA512 40e901f3b0dfeec787b3dfa631761f329016fde71c4944b56be0247285f614a7065c16af5b08cdd004b57cfb74f10490a5a6fb74257cb8948b98cea23ceb546f WHIRLPOOL 1a5e8fc09358d8599054f41f1d30430dadfcab7601018489b2a26a7d7ed1e1925f3bd77a45f763f656f1683ee721c26b2b3002edb86f27ac8f150105a69a4a54
-EBUILD selinux-mrtg-2.20170204-r4.ebuild 277 SHA256 a2a30a80a1a2af0645f603529faab88c2d6e484962f695bafc71056a6f760f31 SHA512 40e901f3b0dfeec787b3dfa631761f329016fde71c4944b56be0247285f614a7065c16af5b08cdd004b57cfb74f10490a5a6fb74257cb8948b98cea23ceb546f WHIRLPOOL 1a5e8fc09358d8599054f41f1d30430dadfcab7601018489b2a26a7d7ed1e1925f3bd77a45f763f656f1683ee721c26b2b3002edb86f27ac8f150105a69a4a54
-EBUILD selinux-mrtg-2.20170805-r2.ebuild 277 SHA256 a2a30a80a1a2af0645f603529faab88c2d6e484962f695bafc71056a6f760f31 SHA512 40e901f3b0dfeec787b3dfa631761f329016fde71c4944b56be0247285f614a7065c16af5b08cdd004b57cfb74f10490a5a6fb74257cb8948b98cea23ceb546f WHIRLPOOL 1a5e8fc09358d8599054f41f1d30430dadfcab7601018489b2a26a7d7ed1e1925f3bd77a45f763f656f1683ee721c26b2b3002edb86f27ac8f150105a69a4a54
-EBUILD selinux-mrtg-9999.ebuild 279 SHA256 99e495bf28a0a95b7339adc67e4a8f998be9eb1b18e7c1d413e27455e55fc523 SHA512 3bfda26d47e63b53307d433ef86e2425ef90f140468a31048f685cd50e4b3c24777723128e4b76524f80551d4cc1a41e6d976597258bde7cbb5259459564bd66 WHIRLPOOL 739c9b52b70ceb6f2c76ca3aad63bae6b67256fc657ec54758998fd153c0117fc4fcd3ae912607c75915b3d1db5dfde1fa737ac712a5ecfe660cc8b6b8810e37
+EBUILD selinux-mrtg-2.20170204-r1.ebuild 280 SHA256 107317af23cc8e118c04563f6e7e4f897896e0b8a7ba6992a3784e1a461e5c22 SHA512 5d5f200e06f66d5ed63206d79ea234d6d8039bb55463848fd8b06f3459d998bc4b81d7fc39a595cfab11f2dc2ec6dfeb576d3fb44d65d0ab0fc510f9290d79ea WHIRLPOOL 1f2a808ebaa3f6b1b3c6b2b54960a42a5b73b38d662d84f6530112796ec28501fa06598f481d9c28e2efd7b85d7020cbee8bccbbb0a403ed34e7636b3265df4c
+EBUILD selinux-mrtg-2.20170204-r2.ebuild 278 SHA256 8bc0d3548ce315b22e057f6cbffac1f5bc01e5958e745473d43b9e9cf1d2766e SHA512 1043cc043022201617c95cf2d542b27342b899abf35496d947a58e8127cf0219b742aedaa2bdd9c3d57447d8b43ee02477bb0d70e19fd04fecf35b0c6014dff1 WHIRLPOOL e1c53d7db64bf94fa9616fce78d9981611eeea51065cd81322bfc2715f0906b24c1344845fda35293dd0924e3f06adca1bad947bd2d7d969cc4486d205e67277
+EBUILD selinux-mrtg-2.20170204-r3.ebuild 278 SHA256 8bc0d3548ce315b22e057f6cbffac1f5bc01e5958e745473d43b9e9cf1d2766e SHA512 1043cc043022201617c95cf2d542b27342b899abf35496d947a58e8127cf0219b742aedaa2bdd9c3d57447d8b43ee02477bb0d70e19fd04fecf35b0c6014dff1 WHIRLPOOL e1c53d7db64bf94fa9616fce78d9981611eeea51065cd81322bfc2715f0906b24c1344845fda35293dd0924e3f06adca1bad947bd2d7d969cc4486d205e67277
+EBUILD selinux-mrtg-2.20170204-r4.ebuild 278 SHA256 8bc0d3548ce315b22e057f6cbffac1f5bc01e5958e745473d43b9e9cf1d2766e SHA512 1043cc043022201617c95cf2d542b27342b899abf35496d947a58e8127cf0219b742aedaa2bdd9c3d57447d8b43ee02477bb0d70e19fd04fecf35b0c6014dff1 WHIRLPOOL e1c53d7db64bf94fa9616fce78d9981611eeea51065cd81322bfc2715f0906b24c1344845fda35293dd0924e3f06adca1bad947bd2d7d969cc4486d205e67277
+EBUILD selinux-mrtg-2.20170805-r2.ebuild 278 SHA256 8bc0d3548ce315b22e057f6cbffac1f5bc01e5958e745473d43b9e9cf1d2766e SHA512 1043cc043022201617c95cf2d542b27342b899abf35496d947a58e8127cf0219b742aedaa2bdd9c3d57447d8b43ee02477bb0d70e19fd04fecf35b0c6014dff1 WHIRLPOOL e1c53d7db64bf94fa9616fce78d9981611eeea51065cd81322bfc2715f0906b24c1344845fda35293dd0924e3f06adca1bad947bd2d7d969cc4486d205e67277
+EBUILD selinux-mrtg-2.20170805-r3.ebuild 280 SHA256 107317af23cc8e118c04563f6e7e4f897896e0b8a7ba6992a3784e1a461e5c22 SHA512 5d5f200e06f66d5ed63206d79ea234d6d8039bb55463848fd8b06f3459d998bc4b81d7fc39a595cfab11f2dc2ec6dfeb576d3fb44d65d0ab0fc510f9290d79ea WHIRLPOOL 1f2a808ebaa3f6b1b3c6b2b54960a42a5b73b38d662d84f6530112796ec28501fa06598f481d9c28e2efd7b85d7020cbee8bccbbb0a403ed34e7636b3265df4c
+EBUILD selinux-mrtg-9999.ebuild 280 SHA256 107317af23cc8e118c04563f6e7e4f897896e0b8a7ba6992a3784e1a461e5c22 SHA512 5d5f200e06f66d5ed63206d79ea234d6d8039bb55463848fd8b06f3459d998bc4b81d7fc39a595cfab11f2dc2ec6dfeb576d3fb44d65d0ab0fc510f9290d79ea WHIRLPOOL 1f2a808ebaa3f6b1b3c6b2b54960a42a5b73b38d662d84f6530112796ec28501fa06598f481d9c28e2efd7b85d7020cbee8bccbbb0a403ed34e7636b3265df4c
 MISC ChangeLog 10387 SHA256 c713c3b53d259a168a6c7a778a8575012c8689a2ee7225177fd17a9b88f908b2 SHA512 afb78411e42f047a01935b3983e1081df419411abee294b30b9da2d56ef153e57cf96e150daf79f0ce4b665be5a7d2f9f7be423b183a7886c7a23091d9e8409a WHIRLPOOL 78964eff56d8fe58e3e42756c04900676af6feea4d3ac9b739f9db5ebfc9b03f92a576d139b0addfad27c457d849045a6c9383a7dace88c0d0cee0b4530ec8b1
 MISC ChangeLog-2015 9637 SHA256 8a70834f45dd9f1d93a1d8bdd96c3e6cea55718626101ae80245cfcbff1aa7ba SHA512 ad9a8c3add9761dfe5fd31e397279e80ee60c6045dd729d9bce06783f04301501ba6e6df2b7386d31371a022715b8bd250b0c5f1830e1422af307c00df80d18b WHIRLPOOL ca794efccd220bce5da26d3b98e56755b70842f0d3eae940571eb41646f00612a5791a086050eb85849feade49dd4328150202ae203cd0274592c8e3d65e7cce
 MISC metadata.xml 314 SHA256 aef62c53a26912778740b3df293f277084af12c0e36a6e9fe07656346b668d92 SHA512 5e0e1440238a7083dbb60b7174c389296846c3a4a96e2f0136e197ecc47cd7c03ff6a59b9b30c92c5ec78ca046c021eb6af38575a8360a619e1ccb95fc85bed3 WHIRLPOOL 1e1f57322cb25de10fc459b5a8d7456dd92648516e57ec6f8a36225e472a592936a2a228555f220700d19237d8fa9f30de598f4ee6c4b3e2f52c8a3e43ae5615
diff --git a/sec-policy/selinux-mrtg/selinux-mrtg-2.20170204-r1.ebuild b/sec-policy/selinux-mrtg/selinux-mrtg-2.20170204-r1.ebuild
index 1f8d9cc4b6e0..c968719ab67f 100644
--- a/sec-policy/selinux-mrtg/selinux-mrtg-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-mrtg/selinux-mrtg-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-mrtg/selinux-mrtg-2.20170204-r2.ebuild b/sec-policy/selinux-mrtg/selinux-mrtg-2.20170204-r2.ebuild
index cf73b2146673..703cc95773bd 100644
--- a/sec-policy/selinux-mrtg/selinux-mrtg-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-mrtg/selinux-mrtg-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-mrtg/selinux-mrtg-2.20170204-r3.ebuild b/sec-policy/selinux-mrtg/selinux-mrtg-2.20170204-r3.ebuild
index cf73b2146673..703cc95773bd 100644
--- a/sec-policy/selinux-mrtg/selinux-mrtg-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-mrtg/selinux-mrtg-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-mrtg/selinux-mrtg-2.20170204-r4.ebuild b/sec-policy/selinux-mrtg/selinux-mrtg-2.20170204-r4.ebuild
index cf73b2146673..703cc95773bd 100644
--- a/sec-policy/selinux-mrtg/selinux-mrtg-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-mrtg/selinux-mrtg-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-mrtg/selinux-mrtg-2.20170805-r2.ebuild b/sec-policy/selinux-mrtg/selinux-mrtg-2.20170805-r2.ebuild
index cf73b2146673..703cc95773bd 100644
--- a/sec-policy/selinux-mrtg/selinux-mrtg-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-mrtg/selinux-mrtg-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-mrtg/selinux-mrtg-2.20170805-r3.ebuild b/sec-policy/selinux-mrtg/selinux-mrtg-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..c968719ab67f
--- /dev/null
+++ b/sec-policy/selinux-mrtg/selinux-mrtg-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-mrtg/selinux-mrtg-9999.ebuild b/sec-policy/selinux-mrtg/selinux-mrtg-9999.ebuild
index 1f8d9cc4b6e0..c968719ab67f 100644
--- a/sec-policy/selinux-mrtg/selinux-mrtg-9999.ebuild
+++ b/sec-policy/selinux-mrtg/selinux-mrtg-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-munin/Manifest b/sec-policy/selinux-munin/Manifest
index 9056159c25cd..62d717261182 100644
--- a/sec-policy/selinux-munin/Manifest
+++ b/sec-policy/selinux-munin/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-munin-2.20170204-r1.ebuild 377 SHA256 3d8b6bc9b1c2d3cb39e0eb1ce14779fad50254921ffd7713d5133a8b75273139 SHA512 94e5803b2bfbef44815e39571f3d37b8926ec3958a573af186e915664dddf44e49cbfe43687af58e3eb5c2004bf4f59c1aaf0dd76ebf64dfbd0fe79bc28e78fc WHIRLPOOL 1dfaae01c4c545f993fe8e5002add1aab612249f57b7e7c567fdda68cac133d1413ac14b1094c1c9c3a8aec5f9d299a390dfd6f6ebeec484ad79af65e4b1fc59
-EBUILD selinux-munin-2.20170204-r2.ebuild 375 SHA256 eff45c3f7e971715990951957a3dffbc198c8424e36896674c0a9d5990cb598a SHA512 0e3cac42ed0f6356dd4ba387392f4d5257e3f27e574b4d47cf0d658dbe18baae605eff9f4ae2e8839b2d4a87cce47e33333e4749b92ab3e2b930af44a89f809c WHIRLPOOL e16f8905b220e8c9f6a3b3f93ecd5ad1a63b5b8b0d5f460f06672510255cc20674dea06831acd86ce50ffa87260c34922dd86e12e33ebc1dc2e8d582a96269f1
-EBUILD selinux-munin-2.20170204-r3.ebuild 375 SHA256 eff45c3f7e971715990951957a3dffbc198c8424e36896674c0a9d5990cb598a SHA512 0e3cac42ed0f6356dd4ba387392f4d5257e3f27e574b4d47cf0d658dbe18baae605eff9f4ae2e8839b2d4a87cce47e33333e4749b92ab3e2b930af44a89f809c WHIRLPOOL e16f8905b220e8c9f6a3b3f93ecd5ad1a63b5b8b0d5f460f06672510255cc20674dea06831acd86ce50ffa87260c34922dd86e12e33ebc1dc2e8d582a96269f1
-EBUILD selinux-munin-2.20170204-r4.ebuild 375 SHA256 eff45c3f7e971715990951957a3dffbc198c8424e36896674c0a9d5990cb598a SHA512 0e3cac42ed0f6356dd4ba387392f4d5257e3f27e574b4d47cf0d658dbe18baae605eff9f4ae2e8839b2d4a87cce47e33333e4749b92ab3e2b930af44a89f809c WHIRLPOOL e16f8905b220e8c9f6a3b3f93ecd5ad1a63b5b8b0d5f460f06672510255cc20674dea06831acd86ce50ffa87260c34922dd86e12e33ebc1dc2e8d582a96269f1
-EBUILD selinux-munin-2.20170805-r2.ebuild 375 SHA256 eff45c3f7e971715990951957a3dffbc198c8424e36896674c0a9d5990cb598a SHA512 0e3cac42ed0f6356dd4ba387392f4d5257e3f27e574b4d47cf0d658dbe18baae605eff9f4ae2e8839b2d4a87cce47e33333e4749b92ab3e2b930af44a89f809c WHIRLPOOL e16f8905b220e8c9f6a3b3f93ecd5ad1a63b5b8b0d5f460f06672510255cc20674dea06831acd86ce50ffa87260c34922dd86e12e33ebc1dc2e8d582a96269f1
-EBUILD selinux-munin-9999.ebuild 377 SHA256 3d8b6bc9b1c2d3cb39e0eb1ce14779fad50254921ffd7713d5133a8b75273139 SHA512 94e5803b2bfbef44815e39571f3d37b8926ec3958a573af186e915664dddf44e49cbfe43687af58e3eb5c2004bf4f59c1aaf0dd76ebf64dfbd0fe79bc28e78fc WHIRLPOOL 1dfaae01c4c545f993fe8e5002add1aab612249f57b7e7c567fdda68cac133d1413ac14b1094c1c9c3a8aec5f9d299a390dfd6f6ebeec484ad79af65e4b1fc59
+EBUILD selinux-munin-2.20170204-r1.ebuild 378 SHA256 93fc6f2d9ddef62bf40b54b134b4046173cb3a726e3280d67a784140d5bbe863 SHA512 2ef5a45586a0358d10ec726f6c05059064b0f2955f5d537760c3f6369837e0b4522b4766054c7a641ca036015a05ab0b6cde589e6ce6c3b60eb35e504414e6ca WHIRLPOOL b6f85fadc1f7110fdfe785c3e1f29b7bc0742ad88bf5462a6b5d877099780782bff9494c90297d99cdfefad8ea706f9d113b9a1ad08dc48ab865e41a30638cc2
+EBUILD selinux-munin-2.20170204-r2.ebuild 376 SHA256 7008be204da23c557c8fbda37136e638969d8898a4e44aa06ffc265b0d48a3f6 SHA512 d885e60ed3647382bf8f51231da453b039b9a49eefc8920433a06bf9b5720e6417b9ecaa1efac92290fe5c0f6359e2d33ff5194a89d25cfe24ec4f10e6931941 WHIRLPOOL 1d221d5524b8050439859721c96a752489483567c20c2fcacbff328455b4d75db7bceebacf32d0ae25fb720adec2a375bb64768c96ef5ed150c43d6184e29328
+EBUILD selinux-munin-2.20170204-r3.ebuild 376 SHA256 7008be204da23c557c8fbda37136e638969d8898a4e44aa06ffc265b0d48a3f6 SHA512 d885e60ed3647382bf8f51231da453b039b9a49eefc8920433a06bf9b5720e6417b9ecaa1efac92290fe5c0f6359e2d33ff5194a89d25cfe24ec4f10e6931941 WHIRLPOOL 1d221d5524b8050439859721c96a752489483567c20c2fcacbff328455b4d75db7bceebacf32d0ae25fb720adec2a375bb64768c96ef5ed150c43d6184e29328
+EBUILD selinux-munin-2.20170204-r4.ebuild 376 SHA256 7008be204da23c557c8fbda37136e638969d8898a4e44aa06ffc265b0d48a3f6 SHA512 d885e60ed3647382bf8f51231da453b039b9a49eefc8920433a06bf9b5720e6417b9ecaa1efac92290fe5c0f6359e2d33ff5194a89d25cfe24ec4f10e6931941 WHIRLPOOL 1d221d5524b8050439859721c96a752489483567c20c2fcacbff328455b4d75db7bceebacf32d0ae25fb720adec2a375bb64768c96ef5ed150c43d6184e29328
+EBUILD selinux-munin-2.20170805-r2.ebuild 376 SHA256 7008be204da23c557c8fbda37136e638969d8898a4e44aa06ffc265b0d48a3f6 SHA512 d885e60ed3647382bf8f51231da453b039b9a49eefc8920433a06bf9b5720e6417b9ecaa1efac92290fe5c0f6359e2d33ff5194a89d25cfe24ec4f10e6931941 WHIRLPOOL 1d221d5524b8050439859721c96a752489483567c20c2fcacbff328455b4d75db7bceebacf32d0ae25fb720adec2a375bb64768c96ef5ed150c43d6184e29328
+EBUILD selinux-munin-2.20170805-r3.ebuild 378 SHA256 93fc6f2d9ddef62bf40b54b134b4046173cb3a726e3280d67a784140d5bbe863 SHA512 2ef5a45586a0358d10ec726f6c05059064b0f2955f5d537760c3f6369837e0b4522b4766054c7a641ca036015a05ab0b6cde589e6ce6c3b60eb35e504414e6ca WHIRLPOOL b6f85fadc1f7110fdfe785c3e1f29b7bc0742ad88bf5462a6b5d877099780782bff9494c90297d99cdfefad8ea706f9d113b9a1ad08dc48ab865e41a30638cc2
+EBUILD selinux-munin-9999.ebuild 378 SHA256 93fc6f2d9ddef62bf40b54b134b4046173cb3a726e3280d67a784140d5bbe863 SHA512 2ef5a45586a0358d10ec726f6c05059064b0f2955f5d537760c3f6369837e0b4522b4766054c7a641ca036015a05ab0b6cde589e6ce6c3b60eb35e504414e6ca WHIRLPOOL b6f85fadc1f7110fdfe785c3e1f29b7bc0742ad88bf5462a6b5d877099780782bff9494c90297d99cdfefad8ea706f9d113b9a1ad08dc48ab865e41a30638cc2
 MISC ChangeLog 10479 SHA256 74d68f47a42510b329e96d2109acbf021bf6187b2e13009a0be41b8488b0365c SHA512 a483a28b5f960450979baaf0c57ca01b4f9b1b4729dc4bcb91ec61c88c73cb367c0e9c9781d83214c909f2cbe4b3b9b02753bf6d511a63bfec2b2b3c2801c645 WHIRLPOOL fe094515611684144c2e226395110c5a7041c8e425f51ecf802ca3a3fdee12654578e7c22ef1d412624f7b6d54454136c8bde91ae7c239cceb3ea70dd966619c
 MISC ChangeLog-2015 11731 SHA256 2514ac815e4ec9c24b0d357a74baac55d8fe66d122bb6dd7cf55afa52290bbf3 SHA512 88b68047157dfae3ca518643bd6310afe8d229fb92422ca23b147080ddab4c8d38955e8332555ecb07b7ffdd9a6c11d18559e4fa6a8af322682f4e0e6d693f6f WHIRLPOOL c44f12e92ab5420de2bcea9a994443bb4d126b3f50841990b669e9d8d893a837b6ee23e2fe84198a8a8432602e477cf41e3b5fa392c2262f5928c22f76dc3320
 MISC metadata.xml 315 SHA256 ebf1e53f74c8b5b245a0d790889a33e515c17eeca5f077d58b9c416f31055f9c SHA512 e8b021d51d8fe289205ff90c3b3a955bb6445d492aae83b48d269e0b5773b813f9ef4a54776588f4c0135dde15d59560f558cc1d11a4d0d62f4720d656557c55 WHIRLPOOL 1d4e5328ad1acd70a97a7a774afef8fa4ea7c4d4ed87bf943b0b21bf33a25b6a5428511fa66275df630adb7bed8de4dc0d8bac2bbe582c8fa69c411490fb8f4d
diff --git a/sec-policy/selinux-munin/selinux-munin-2.20170204-r1.ebuild b/sec-policy/selinux-munin/selinux-munin-2.20170204-r1.ebuild
index d847fae7ca26..13ac5a6041ff 100644
--- a/sec-policy/selinux-munin/selinux-munin-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-munin/selinux-munin-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-munin/selinux-munin-2.20170204-r2.ebuild b/sec-policy/selinux-munin/selinux-munin-2.20170204-r2.ebuild
index 6e45651c25c3..a2537fc5f74b 100644
--- a/sec-policy/selinux-munin/selinux-munin-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-munin/selinux-munin-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-munin/selinux-munin-2.20170204-r3.ebuild b/sec-policy/selinux-munin/selinux-munin-2.20170204-r3.ebuild
index 6e45651c25c3..a2537fc5f74b 100644
--- a/sec-policy/selinux-munin/selinux-munin-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-munin/selinux-munin-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-munin/selinux-munin-2.20170204-r4.ebuild b/sec-policy/selinux-munin/selinux-munin-2.20170204-r4.ebuild
index 6e45651c25c3..a2537fc5f74b 100644
--- a/sec-policy/selinux-munin/selinux-munin-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-munin/selinux-munin-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-munin/selinux-munin-2.20170805-r2.ebuild b/sec-policy/selinux-munin/selinux-munin-2.20170805-r2.ebuild
index 6e45651c25c3..a2537fc5f74b 100644
--- a/sec-policy/selinux-munin/selinux-munin-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-munin/selinux-munin-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-munin/selinux-munin-2.20170805-r3.ebuild b/sec-policy/selinux-munin/selinux-munin-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..13ac5a6041ff
--- /dev/null
+++ b/sec-policy/selinux-munin/selinux-munin-2.20170805-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-munin/selinux-munin-9999.ebuild b/sec-policy/selinux-munin/selinux-munin-9999.ebuild
index d847fae7ca26..13ac5a6041ff 100644
--- a/sec-policy/selinux-munin/selinux-munin-9999.ebuild
+++ b/sec-policy/selinux-munin/selinux-munin-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-mutt/Manifest b/sec-policy/selinux-mutt/Manifest
index 44e8758e064b..d1b8b92333a7 100644
--- a/sec-policy/selinux-mutt/Manifest
+++ b/sec-policy/selinux-mutt/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-mutt-2.20170204-r1.ebuild 279 SHA256 01fd03308f574fcd86c8eec151729080518d85f1cf234785093975ccc84c6858 SHA512 30ec6c65813bc961a245d78b7f19befbfeb4c660025cc5426508175819e00228498837ee325239e33fc4891088e865802a9f94b9b24f4978811f17cc892a321c WHIRLPOOL 2c6ae7f600c4a573c4ba137a64236c713c848bf61e953ad07559b9daedeaec427a29abf536258a6c74ffa6e0c2d65b39743155882c244933090b83b87c59fb65
-EBUILD selinux-mutt-2.20170204-r2.ebuild 277 SHA256 0e6fa0d5aa5b4cc371f9e38644ad94000c847461ca7bbe1ac00d0e64bc2842bf SHA512 7dec951cf3fd83e77f1fbb8935d3d3ed6858db5f88c5292f4ffe18e89f00ee91441f899a466f8a4d965e2e72f749a21941bf068d55ff4eab9703ff9271d28b63 WHIRLPOOL 1b67399a4d1d884f638833f766c864c9b141c2da498f1680713ce84a7418d3658602e71ac413cd8396a427909e66d7605a2f3c83a245e5174ed40899ec2ba4c3
-EBUILD selinux-mutt-2.20170204-r3.ebuild 277 SHA256 0e6fa0d5aa5b4cc371f9e38644ad94000c847461ca7bbe1ac00d0e64bc2842bf SHA512 7dec951cf3fd83e77f1fbb8935d3d3ed6858db5f88c5292f4ffe18e89f00ee91441f899a466f8a4d965e2e72f749a21941bf068d55ff4eab9703ff9271d28b63 WHIRLPOOL 1b67399a4d1d884f638833f766c864c9b141c2da498f1680713ce84a7418d3658602e71ac413cd8396a427909e66d7605a2f3c83a245e5174ed40899ec2ba4c3
-EBUILD selinux-mutt-2.20170204-r4.ebuild 277 SHA256 0e6fa0d5aa5b4cc371f9e38644ad94000c847461ca7bbe1ac00d0e64bc2842bf SHA512 7dec951cf3fd83e77f1fbb8935d3d3ed6858db5f88c5292f4ffe18e89f00ee91441f899a466f8a4d965e2e72f749a21941bf068d55ff4eab9703ff9271d28b63 WHIRLPOOL 1b67399a4d1d884f638833f766c864c9b141c2da498f1680713ce84a7418d3658602e71ac413cd8396a427909e66d7605a2f3c83a245e5174ed40899ec2ba4c3
-EBUILD selinux-mutt-2.20170805-r2.ebuild 277 SHA256 0e6fa0d5aa5b4cc371f9e38644ad94000c847461ca7bbe1ac00d0e64bc2842bf SHA512 7dec951cf3fd83e77f1fbb8935d3d3ed6858db5f88c5292f4ffe18e89f00ee91441f899a466f8a4d965e2e72f749a21941bf068d55ff4eab9703ff9271d28b63 WHIRLPOOL 1b67399a4d1d884f638833f766c864c9b141c2da498f1680713ce84a7418d3658602e71ac413cd8396a427909e66d7605a2f3c83a245e5174ed40899ec2ba4c3
-EBUILD selinux-mutt-9999.ebuild 279 SHA256 01fd03308f574fcd86c8eec151729080518d85f1cf234785093975ccc84c6858 SHA512 30ec6c65813bc961a245d78b7f19befbfeb4c660025cc5426508175819e00228498837ee325239e33fc4891088e865802a9f94b9b24f4978811f17cc892a321c WHIRLPOOL 2c6ae7f600c4a573c4ba137a64236c713c848bf61e953ad07559b9daedeaec427a29abf536258a6c74ffa6e0c2d65b39743155882c244933090b83b87c59fb65
+EBUILD selinux-mutt-2.20170204-r1.ebuild 280 SHA256 5ef66ca4e6a670d03f776dfbfd08c61511aae4a0b92df33ab8891b841e9c5da5 SHA512 8fb2f9396012948682414c8b1a2ee4a36599e024cd0cd25848c4e7d5f5fcf5a9453319c989e06d26b3f1f539bdf377da8efe0b5384d39ae4080ea60907fbb98e WHIRLPOOL d88c82da4bc15a16f4c049dc8487e952d4c7f59414ba8e8c1307ee0dcaad06267dd93eef1e9c4462ec4b97c0c309ab5b0c6fd266a21f00f15c37b29047339db7
+EBUILD selinux-mutt-2.20170204-r2.ebuild 278 SHA256 3b367e380e90375f28c3c7ad924c546dd14a7e31666eff8328b42e7df70a925d SHA512 e0e48f228c67d8ea7d68af7b01e43e2b15be848c24afcf8144efce3ab442b5f6748e558cb0f20a05c8cc03e15bb5408f8ade9bb6e082f3aefa3782f9066282b4 WHIRLPOOL aed33c1e7781ede5136757fb9690e2f09a09e09ea2367fd482921a6822d5f57cf9b83066093661779040b8f9886a49490f5db2dcf9d0ea255ac8f26e57d5a044
+EBUILD selinux-mutt-2.20170204-r3.ebuild 278 SHA256 3b367e380e90375f28c3c7ad924c546dd14a7e31666eff8328b42e7df70a925d SHA512 e0e48f228c67d8ea7d68af7b01e43e2b15be848c24afcf8144efce3ab442b5f6748e558cb0f20a05c8cc03e15bb5408f8ade9bb6e082f3aefa3782f9066282b4 WHIRLPOOL aed33c1e7781ede5136757fb9690e2f09a09e09ea2367fd482921a6822d5f57cf9b83066093661779040b8f9886a49490f5db2dcf9d0ea255ac8f26e57d5a044
+EBUILD selinux-mutt-2.20170204-r4.ebuild 278 SHA256 3b367e380e90375f28c3c7ad924c546dd14a7e31666eff8328b42e7df70a925d SHA512 e0e48f228c67d8ea7d68af7b01e43e2b15be848c24afcf8144efce3ab442b5f6748e558cb0f20a05c8cc03e15bb5408f8ade9bb6e082f3aefa3782f9066282b4 WHIRLPOOL aed33c1e7781ede5136757fb9690e2f09a09e09ea2367fd482921a6822d5f57cf9b83066093661779040b8f9886a49490f5db2dcf9d0ea255ac8f26e57d5a044
+EBUILD selinux-mutt-2.20170805-r2.ebuild 278 SHA256 3b367e380e90375f28c3c7ad924c546dd14a7e31666eff8328b42e7df70a925d SHA512 e0e48f228c67d8ea7d68af7b01e43e2b15be848c24afcf8144efce3ab442b5f6748e558cb0f20a05c8cc03e15bb5408f8ade9bb6e082f3aefa3782f9066282b4 WHIRLPOOL aed33c1e7781ede5136757fb9690e2f09a09e09ea2367fd482921a6822d5f57cf9b83066093661779040b8f9886a49490f5db2dcf9d0ea255ac8f26e57d5a044
+EBUILD selinux-mutt-2.20170805-r3.ebuild 280 SHA256 5ef66ca4e6a670d03f776dfbfd08c61511aae4a0b92df33ab8891b841e9c5da5 SHA512 8fb2f9396012948682414c8b1a2ee4a36599e024cd0cd25848c4e7d5f5fcf5a9453319c989e06d26b3f1f539bdf377da8efe0b5384d39ae4080ea60907fbb98e WHIRLPOOL d88c82da4bc15a16f4c049dc8487e952d4c7f59414ba8e8c1307ee0dcaad06267dd93eef1e9c4462ec4b97c0c309ab5b0c6fd266a21f00f15c37b29047339db7
+EBUILD selinux-mutt-9999.ebuild 280 SHA256 5ef66ca4e6a670d03f776dfbfd08c61511aae4a0b92df33ab8891b841e9c5da5 SHA512 8fb2f9396012948682414c8b1a2ee4a36599e024cd0cd25848c4e7d5f5fcf5a9453319c989e06d26b3f1f539bdf377da8efe0b5384d39ae4080ea60907fbb98e WHIRLPOOL d88c82da4bc15a16f4c049dc8487e952d4c7f59414ba8e8c1307ee0dcaad06267dd93eef1e9c4462ec4b97c0c309ab5b0c6fd266a21f00f15c37b29047339db7
 MISC ChangeLog 10387 SHA256 82a28a9445437fdeb941fc0edec6f01f49948a755dfc23f2e40c72b633621d61 SHA512 ce9d72acf0b4181e0ab10e7c4482970b348f4eb8a9ceaa55f53efc015a6a70aa79227a3b582bd0b5d8360477180b440e5fac1e2a0eb1ec63e7d530445d15b433 WHIRLPOOL f8f22910e6a4fc9fc0279247025c5cb3a381a5fa3d7fcfee58938095c4b37b28619eedbe343449b2000aa5018a45be8963dcfcb1e2c92845e4a03c2cb3e9cd41
 MISC ChangeLog-2015 11080 SHA256 3f655cf6f32aa4ef992a94c7215a43de4e0b1daaad62cc51685cd6a6e6b20c86 SHA512 e7b33b9df3dd2d49e5b457c61a8ea0c1f6644919d6e58190799d6f96551f0c58843a5cfb7b43cab6248864e1fbff2aa9c7f04abcbcf1c7262db5c52467c98148 WHIRLPOOL 25a7ec749e3b34f0cb73d9087cd90ff206cb108f143f5fe8532926db9ec6a9df0612072b09a8c09e67d446b77539c90fb2409e9483750b40b645fc2644167824
 MISC metadata.xml 314 SHA256 e9db8acbcdd521c6a4dedc8e71193efc928cc69f9b40405d0674bf765a05b5ae SHA512 87a3948b2f9708c5516bb4141e5673d45390ed2b0bc3e49ebc8298c7177abb1c3a99442d60d22d99fcc13d08251fef29efd9bda3ea14eb588164209eab2c4c4c WHIRLPOOL 51e5cda0ec147be1d738951d5e64f5944dc828ddf3b30d767c3b3ddd747abc278d4b9604ab50b063147cd82f35dec82cccfafd14b34ff381be5e4db6c85ae0f6
diff --git a/sec-policy/selinux-mutt/selinux-mutt-2.20170204-r1.ebuild b/sec-policy/selinux-mutt/selinux-mutt-2.20170204-r1.ebuild
index 93be3c09ce66..f7c456f1ff19 100644
--- a/sec-policy/selinux-mutt/selinux-mutt-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-mutt/selinux-mutt-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-mutt/selinux-mutt-2.20170204-r2.ebuild b/sec-policy/selinux-mutt/selinux-mutt-2.20170204-r2.ebuild
index d26d570fbbab..af31a44a05b3 100644
--- a/sec-policy/selinux-mutt/selinux-mutt-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-mutt/selinux-mutt-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-mutt/selinux-mutt-2.20170204-r3.ebuild b/sec-policy/selinux-mutt/selinux-mutt-2.20170204-r3.ebuild
index d26d570fbbab..af31a44a05b3 100644
--- a/sec-policy/selinux-mutt/selinux-mutt-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-mutt/selinux-mutt-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-mutt/selinux-mutt-2.20170204-r4.ebuild b/sec-policy/selinux-mutt/selinux-mutt-2.20170204-r4.ebuild
index d26d570fbbab..af31a44a05b3 100644
--- a/sec-policy/selinux-mutt/selinux-mutt-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-mutt/selinux-mutt-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-mutt/selinux-mutt-2.20170805-r2.ebuild b/sec-policy/selinux-mutt/selinux-mutt-2.20170805-r2.ebuild
index d26d570fbbab..af31a44a05b3 100644
--- a/sec-policy/selinux-mutt/selinux-mutt-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-mutt/selinux-mutt-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-mutt/selinux-mutt-2.20170805-r3.ebuild b/sec-policy/selinux-mutt/selinux-mutt-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..f7c456f1ff19
--- /dev/null
+++ b/sec-policy/selinux-mutt/selinux-mutt-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-mutt/selinux-mutt-9999.ebuild b/sec-policy/selinux-mutt/selinux-mutt-9999.ebuild
index 93be3c09ce66..f7c456f1ff19 100644
--- a/sec-policy/selinux-mutt/selinux-mutt-9999.ebuild
+++ b/sec-policy/selinux-mutt/selinux-mutt-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-mysql/Manifest b/sec-policy/selinux-mysql/Manifest
index d3bf50159978..20674fc8e4b4 100644
--- a/sec-policy/selinux-mysql/Manifest
+++ b/sec-policy/selinux-mysql/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-mysql-2.20170204-r1.ebuild 281 SHA256 62b82c0b189d6c1b3ef1ba875f3225da774798a6a799c0c486f6c418b41819f9 SHA512 ac67763d624e34ec0e17096960d71de1a18914bda176901a512e10bab84a4b7fe7415cf56a2bd7e32f94bb614540a03382f5533865ad1a90b7469165d8548a43 WHIRLPOOL d2d0549f677fde51a16d56d6e98c18fe8cecd4fb3d84978c4018216cfa715ceecaba3f6be48f1d09d2803fc088e008e264bf8e7a8c1963bef32483bc752772f9
-EBUILD selinux-mysql-2.20170204-r2.ebuild 279 SHA256 d97486b6239294331ec52065b8c7c6476709ead5e3ca29f1cf2f622d49ef3b55 SHA512 42294db424fd0b8ff197adb99fb6bc160fc09eca0c237e44bb9e499de66131949bc9e8a3d1d91e6727eda8fd305e032fe7a4d77d0c8953c136880cc282bca594 WHIRLPOOL 75d07d6fa922256f06d3c8b53a0fe681caf1f3bb7cfed610c1d425ba8242169c8421bda15997c378d5726d654c05360656cc5979c48b4b872399e0a772ec46fd
-EBUILD selinux-mysql-2.20170204-r3.ebuild 279 SHA256 d97486b6239294331ec52065b8c7c6476709ead5e3ca29f1cf2f622d49ef3b55 SHA512 42294db424fd0b8ff197adb99fb6bc160fc09eca0c237e44bb9e499de66131949bc9e8a3d1d91e6727eda8fd305e032fe7a4d77d0c8953c136880cc282bca594 WHIRLPOOL 75d07d6fa922256f06d3c8b53a0fe681caf1f3bb7cfed610c1d425ba8242169c8421bda15997c378d5726d654c05360656cc5979c48b4b872399e0a772ec46fd
-EBUILD selinux-mysql-2.20170204-r4.ebuild 279 SHA256 d97486b6239294331ec52065b8c7c6476709ead5e3ca29f1cf2f622d49ef3b55 SHA512 42294db424fd0b8ff197adb99fb6bc160fc09eca0c237e44bb9e499de66131949bc9e8a3d1d91e6727eda8fd305e032fe7a4d77d0c8953c136880cc282bca594 WHIRLPOOL 75d07d6fa922256f06d3c8b53a0fe681caf1f3bb7cfed610c1d425ba8242169c8421bda15997c378d5726d654c05360656cc5979c48b4b872399e0a772ec46fd
-EBUILD selinux-mysql-2.20170805-r2.ebuild 279 SHA256 d97486b6239294331ec52065b8c7c6476709ead5e3ca29f1cf2f622d49ef3b55 SHA512 42294db424fd0b8ff197adb99fb6bc160fc09eca0c237e44bb9e499de66131949bc9e8a3d1d91e6727eda8fd305e032fe7a4d77d0c8953c136880cc282bca594 WHIRLPOOL 75d07d6fa922256f06d3c8b53a0fe681caf1f3bb7cfed610c1d425ba8242169c8421bda15997c378d5726d654c05360656cc5979c48b4b872399e0a772ec46fd
-EBUILD selinux-mysql-9999.ebuild 281 SHA256 62b82c0b189d6c1b3ef1ba875f3225da774798a6a799c0c486f6c418b41819f9 SHA512 ac67763d624e34ec0e17096960d71de1a18914bda176901a512e10bab84a4b7fe7415cf56a2bd7e32f94bb614540a03382f5533865ad1a90b7469165d8548a43 WHIRLPOOL d2d0549f677fde51a16d56d6e98c18fe8cecd4fb3d84978c4018216cfa715ceecaba3f6be48f1d09d2803fc088e008e264bf8e7a8c1963bef32483bc752772f9
+EBUILD selinux-mysql-2.20170204-r1.ebuild 282 SHA256 082695e83deb86b04ca150011071bc373a1475360a9e6e785f855cab2629f41b SHA512 e85312159a9f05c78f9e65525e245f818aab9542fad5d492cb803ee6dcc97dea037dbeed32413774e5b3ba40ccc4d58f764afa533fe833349da26ae6c0c3b6b3 WHIRLPOOL fb2359467864e2d3122dd6aaa84a4e1ded4d8c53e5daafb7e92b6daac05cbe7e1fea8e699e8a0a06739d361be37238d81bfd4a4d107a08237a441e066e43b275
+EBUILD selinux-mysql-2.20170204-r2.ebuild 280 SHA256 53cbd49e1baad30a232d03c8521b3bed579b63013bb549fe285e86cf87992321 SHA512 0228577662f0b5abcceaa6e626e1787c1a31f0953857b7573e78f503db5b966e3f44f17711b648f0a7cfebd8c454b31659fe94336696383f45d8db0f8a5d98dd WHIRLPOOL 80b5c5900f624f397d5ff63e5a243b840ae44760f657352e5e13e33c20b5fc3e3dc87ef7576eeb9dba50e2c2504e381dd26f53e07df8f11a4193cc3899c65061
+EBUILD selinux-mysql-2.20170204-r3.ebuild 280 SHA256 53cbd49e1baad30a232d03c8521b3bed579b63013bb549fe285e86cf87992321 SHA512 0228577662f0b5abcceaa6e626e1787c1a31f0953857b7573e78f503db5b966e3f44f17711b648f0a7cfebd8c454b31659fe94336696383f45d8db0f8a5d98dd WHIRLPOOL 80b5c5900f624f397d5ff63e5a243b840ae44760f657352e5e13e33c20b5fc3e3dc87ef7576eeb9dba50e2c2504e381dd26f53e07df8f11a4193cc3899c65061
+EBUILD selinux-mysql-2.20170204-r4.ebuild 280 SHA256 53cbd49e1baad30a232d03c8521b3bed579b63013bb549fe285e86cf87992321 SHA512 0228577662f0b5abcceaa6e626e1787c1a31f0953857b7573e78f503db5b966e3f44f17711b648f0a7cfebd8c454b31659fe94336696383f45d8db0f8a5d98dd WHIRLPOOL 80b5c5900f624f397d5ff63e5a243b840ae44760f657352e5e13e33c20b5fc3e3dc87ef7576eeb9dba50e2c2504e381dd26f53e07df8f11a4193cc3899c65061
+EBUILD selinux-mysql-2.20170805-r2.ebuild 280 SHA256 53cbd49e1baad30a232d03c8521b3bed579b63013bb549fe285e86cf87992321 SHA512 0228577662f0b5abcceaa6e626e1787c1a31f0953857b7573e78f503db5b966e3f44f17711b648f0a7cfebd8c454b31659fe94336696383f45d8db0f8a5d98dd WHIRLPOOL 80b5c5900f624f397d5ff63e5a243b840ae44760f657352e5e13e33c20b5fc3e3dc87ef7576eeb9dba50e2c2504e381dd26f53e07df8f11a4193cc3899c65061
+EBUILD selinux-mysql-2.20170805-r3.ebuild 282 SHA256 082695e83deb86b04ca150011071bc373a1475360a9e6e785f855cab2629f41b SHA512 e85312159a9f05c78f9e65525e245f818aab9542fad5d492cb803ee6dcc97dea037dbeed32413774e5b3ba40ccc4d58f764afa533fe833349da26ae6c0c3b6b3 WHIRLPOOL fb2359467864e2d3122dd6aaa84a4e1ded4d8c53e5daafb7e92b6daac05cbe7e1fea8e699e8a0a06739d361be37238d81bfd4a4d107a08237a441e066e43b275
+EBUILD selinux-mysql-9999.ebuild 282 SHA256 082695e83deb86b04ca150011071bc373a1475360a9e6e785f855cab2629f41b SHA512 e85312159a9f05c78f9e65525e245f818aab9542fad5d492cb803ee6dcc97dea037dbeed32413774e5b3ba40ccc4d58f764afa533fe833349da26ae6c0c3b6b3 WHIRLPOOL fb2359467864e2d3122dd6aaa84a4e1ded4d8c53e5daafb7e92b6daac05cbe7e1fea8e699e8a0a06739d361be37238d81bfd4a4d107a08237a441e066e43b275
 MISC ChangeLog 10479 SHA256 e45c011e9e928d0831edbd613ade7b073ad8baf21f1ce536376218fb078ff84b SHA512 f13ee23be6c80b1dac23f19a38c7818c5b544e8ddc23912e6219fb9fdce218a26596ca39644eb3c3f1eb86b5c11e1acfc14e359c8e33f550feebf0b20695cdec WHIRLPOOL ab0b8f9f8b9d6389dbd1a5b6e3182386d9dd3f37c8b2455605e6111314c6419e52a8de43aaf008baaf1861bd4cebb927b53504080c9e8a93258c48e7f7b0815c
 MISC ChangeLog-2015 14780 SHA256 505bbdabb212a0c9682f53fc417a3cc68fd73a6fd59a24d584bf215db8f2e6f2 SHA512 3f19200c4f2c187a0d12c611e33087219ad8a6e29a6d59424f823d9126c8440845f50eb5fd97f747c4382988e2895607baac0f0b69a80e21e8001ff83fcf1ecd WHIRLPOOL fff25e83d5b87899bdab81374ffb0ce3510250ae0a85d31fcb3f85f40df834e70af1050a2ace02c0a5c44c2f8c09d5b46e66f0d5934915e8e6831ad6b5bffc56
 MISC metadata.xml 315 SHA256 45dd6003537c41a13007790fefb3518813e754c74a8714eb692468cf49589f71 SHA512 aafeb5465f6e05bf143959c7964e5539bea915238572612d6b6cd118a30ea57fca14735e70d4a39fee37a5203cd160988c830653fb2cd751cf4e14acc6f78508 WHIRLPOOL 0677c05637e4246d7ee0e3a4536771581c21e927e2e2585899dcc4a473e85a984b68ac8d76c12750bcb0c441269751b67432c4e56d5ef0c8bfe8ebbfc8acf83e
diff --git a/sec-policy/selinux-mysql/selinux-mysql-2.20170204-r1.ebuild b/sec-policy/selinux-mysql/selinux-mysql-2.20170204-r1.ebuild
index 46ca6c7cfd4c..dfc625b9d286 100644
--- a/sec-policy/selinux-mysql/selinux-mysql-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-mysql/selinux-mysql-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-mysql/selinux-mysql-2.20170204-r2.ebuild b/sec-policy/selinux-mysql/selinux-mysql-2.20170204-r2.ebuild
index 6b73d92d31a9..8f8b693543ed 100644
--- a/sec-policy/selinux-mysql/selinux-mysql-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-mysql/selinux-mysql-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-mysql/selinux-mysql-2.20170204-r3.ebuild b/sec-policy/selinux-mysql/selinux-mysql-2.20170204-r3.ebuild
index 6b73d92d31a9..8f8b693543ed 100644
--- a/sec-policy/selinux-mysql/selinux-mysql-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-mysql/selinux-mysql-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-mysql/selinux-mysql-2.20170204-r4.ebuild b/sec-policy/selinux-mysql/selinux-mysql-2.20170204-r4.ebuild
index 6b73d92d31a9..8f8b693543ed 100644
--- a/sec-policy/selinux-mysql/selinux-mysql-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-mysql/selinux-mysql-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-mysql/selinux-mysql-2.20170805-r2.ebuild b/sec-policy/selinux-mysql/selinux-mysql-2.20170805-r2.ebuild
index 6b73d92d31a9..8f8b693543ed 100644
--- a/sec-policy/selinux-mysql/selinux-mysql-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-mysql/selinux-mysql-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-mysql/selinux-mysql-2.20170805-r3.ebuild b/sec-policy/selinux-mysql/selinux-mysql-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..dfc625b9d286
--- /dev/null
+++ b/sec-policy/selinux-mysql/selinux-mysql-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-mysql/selinux-mysql-9999.ebuild b/sec-policy/selinux-mysql/selinux-mysql-9999.ebuild
index 46ca6c7cfd4c..dfc625b9d286 100644
--- a/sec-policy/selinux-mysql/selinux-mysql-9999.ebuild
+++ b/sec-policy/selinux-mysql/selinux-mysql-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-nagios/Manifest b/sec-policy/selinux-nagios/Manifest
index 5ac1e83c65bd..b36b90e192ea 100644
--- a/sec-policy/selinux-nagios/Manifest
+++ b/sec-policy/selinux-nagios/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-nagios-2.20170204-r1.ebuild 379 SHA256 a17631af9d470b83fde0085a352b2ec91c296a12e07eb3a70f3567d293cc5728 SHA512 c455b29697c45d6c6f64d2213f2b3a0f03a195e8c8ede2ab486476926b865a75836587daa679582792e03b974761424065ee33365a2cacdb41060a8c51ba3431 WHIRLPOOL a760f9b8416dc23794d51ce1b4f0d5b3fd696a966992a8c0e6998e30555c0b88beb7ba59d9f53ed2825fa88421bf131a7449d6989596c6a02a5defcf3f062777
-EBUILD selinux-nagios-2.20170204-r2.ebuild 377 SHA256 b8ddadb37149c714f660ff771fcead08c43f408774c6140aba6ff5b51fc7eb1c SHA512 73d0838fdff50a409c84db310d9aa1cb7e4b7de961960b15b5ad3ce7ed1c0f872b608c4a958d03e7a9c707d6b25d584078b35c39a3d08a2029d8b5f3e283d390 WHIRLPOOL 7ecb7c7aadc0b82379494c63f0f9efcb778d4c83eb48be03f3c7e1b4a2aad418d9973b99706d8afa81b6683e98f2e89c8af29eec58ee9eed5df0be20aeadabed
-EBUILD selinux-nagios-2.20170204-r3.ebuild 377 SHA256 b8ddadb37149c714f660ff771fcead08c43f408774c6140aba6ff5b51fc7eb1c SHA512 73d0838fdff50a409c84db310d9aa1cb7e4b7de961960b15b5ad3ce7ed1c0f872b608c4a958d03e7a9c707d6b25d584078b35c39a3d08a2029d8b5f3e283d390 WHIRLPOOL 7ecb7c7aadc0b82379494c63f0f9efcb778d4c83eb48be03f3c7e1b4a2aad418d9973b99706d8afa81b6683e98f2e89c8af29eec58ee9eed5df0be20aeadabed
-EBUILD selinux-nagios-2.20170204-r4.ebuild 377 SHA256 b8ddadb37149c714f660ff771fcead08c43f408774c6140aba6ff5b51fc7eb1c SHA512 73d0838fdff50a409c84db310d9aa1cb7e4b7de961960b15b5ad3ce7ed1c0f872b608c4a958d03e7a9c707d6b25d584078b35c39a3d08a2029d8b5f3e283d390 WHIRLPOOL 7ecb7c7aadc0b82379494c63f0f9efcb778d4c83eb48be03f3c7e1b4a2aad418d9973b99706d8afa81b6683e98f2e89c8af29eec58ee9eed5df0be20aeadabed
-EBUILD selinux-nagios-2.20170805-r2.ebuild 377 SHA256 b8ddadb37149c714f660ff771fcead08c43f408774c6140aba6ff5b51fc7eb1c SHA512 73d0838fdff50a409c84db310d9aa1cb7e4b7de961960b15b5ad3ce7ed1c0f872b608c4a958d03e7a9c707d6b25d584078b35c39a3d08a2029d8b5f3e283d390 WHIRLPOOL 7ecb7c7aadc0b82379494c63f0f9efcb778d4c83eb48be03f3c7e1b4a2aad418d9973b99706d8afa81b6683e98f2e89c8af29eec58ee9eed5df0be20aeadabed
-EBUILD selinux-nagios-9999.ebuild 379 SHA256 a17631af9d470b83fde0085a352b2ec91c296a12e07eb3a70f3567d293cc5728 SHA512 c455b29697c45d6c6f64d2213f2b3a0f03a195e8c8ede2ab486476926b865a75836587daa679582792e03b974761424065ee33365a2cacdb41060a8c51ba3431 WHIRLPOOL a760f9b8416dc23794d51ce1b4f0d5b3fd696a966992a8c0e6998e30555c0b88beb7ba59d9f53ed2825fa88421bf131a7449d6989596c6a02a5defcf3f062777
+EBUILD selinux-nagios-2.20170204-r1.ebuild 380 SHA256 eb8801496a5613f6af70efbcfbd01c0d6546a13db89478c156b16adca5ac0bef SHA512 38f297aee1e79711a0fc7443ced989e0f44a89f1be14ad206db920a2469cca4dc96051befa3a52b4bf988e8580975573b52d9a8539543033becd2adec8894ed9 WHIRLPOOL a8eafd69adf8045b686ba38edf1336f2e665e4c37d498dd203272b3168d94fce26028f57c57e30d30ba6945eb70856dcec690027489f9cebfd0180d94ee8dd8b
+EBUILD selinux-nagios-2.20170204-r2.ebuild 378 SHA256 65b19cdfd7097c86cc93ea90172d179c73afa0169d9930319e81a70df56b26f5 SHA512 585b34ef2cb0cb77a2a2840b6c0ae944e27bf70d725e81fffc833b1e8a2976fbba853dc0a783d7f987c1fae144f7b5ade908223e50c07cd1e3da35751c2ccab8 WHIRLPOOL 545e6d6c8ebdaa9e08c42368ce303aaf1b823d52c19e538eb0bdfd99adf954c60ba20213cd8fda937614e2c907353baddfa8f91760d57d6cd9774ea3b4702e5b
+EBUILD selinux-nagios-2.20170204-r3.ebuild 378 SHA256 65b19cdfd7097c86cc93ea90172d179c73afa0169d9930319e81a70df56b26f5 SHA512 585b34ef2cb0cb77a2a2840b6c0ae944e27bf70d725e81fffc833b1e8a2976fbba853dc0a783d7f987c1fae144f7b5ade908223e50c07cd1e3da35751c2ccab8 WHIRLPOOL 545e6d6c8ebdaa9e08c42368ce303aaf1b823d52c19e538eb0bdfd99adf954c60ba20213cd8fda937614e2c907353baddfa8f91760d57d6cd9774ea3b4702e5b
+EBUILD selinux-nagios-2.20170204-r4.ebuild 378 SHA256 65b19cdfd7097c86cc93ea90172d179c73afa0169d9930319e81a70df56b26f5 SHA512 585b34ef2cb0cb77a2a2840b6c0ae944e27bf70d725e81fffc833b1e8a2976fbba853dc0a783d7f987c1fae144f7b5ade908223e50c07cd1e3da35751c2ccab8 WHIRLPOOL 545e6d6c8ebdaa9e08c42368ce303aaf1b823d52c19e538eb0bdfd99adf954c60ba20213cd8fda937614e2c907353baddfa8f91760d57d6cd9774ea3b4702e5b
+EBUILD selinux-nagios-2.20170805-r2.ebuild 378 SHA256 65b19cdfd7097c86cc93ea90172d179c73afa0169d9930319e81a70df56b26f5 SHA512 585b34ef2cb0cb77a2a2840b6c0ae944e27bf70d725e81fffc833b1e8a2976fbba853dc0a783d7f987c1fae144f7b5ade908223e50c07cd1e3da35751c2ccab8 WHIRLPOOL 545e6d6c8ebdaa9e08c42368ce303aaf1b823d52c19e538eb0bdfd99adf954c60ba20213cd8fda937614e2c907353baddfa8f91760d57d6cd9774ea3b4702e5b
+EBUILD selinux-nagios-2.20170805-r3.ebuild 380 SHA256 eb8801496a5613f6af70efbcfbd01c0d6546a13db89478c156b16adca5ac0bef SHA512 38f297aee1e79711a0fc7443ced989e0f44a89f1be14ad206db920a2469cca4dc96051befa3a52b4bf988e8580975573b52d9a8539543033becd2adec8894ed9 WHIRLPOOL a8eafd69adf8045b686ba38edf1336f2e665e4c37d498dd203272b3168d94fce26028f57c57e30d30ba6945eb70856dcec690027489f9cebfd0180d94ee8dd8b
+EBUILD selinux-nagios-9999.ebuild 380 SHA256 eb8801496a5613f6af70efbcfbd01c0d6546a13db89478c156b16adca5ac0bef SHA512 38f297aee1e79711a0fc7443ced989e0f44a89f1be14ad206db920a2469cca4dc96051befa3a52b4bf988e8580975573b52d9a8539543033becd2adec8894ed9 WHIRLPOOL a8eafd69adf8045b686ba38edf1336f2e665e4c37d498dd203272b3168d94fce26028f57c57e30d30ba6945eb70856dcec690027489f9cebfd0180d94ee8dd8b
 MISC ChangeLog 10571 SHA256 799c927d41db6f0db8306822c521f9a2d1cb8bea08055112a1823497bb8bfd6c SHA512 9dd676b8bbac15d7612c6264468a59ea5b555cb6bcd7af7daa55bbe38bbf9a555fa8428efd045d00d85429b4d9b96a2ad9844f2586b6b716ca5c39f5392cd749 WHIRLPOOL df9f1549e8f7564b7a3df90f713b3f4e0875e4d8249555215e79a358c552b5f575ae5842ff3a2e3ee11033955bdd12a578751d9705e38483af837fc2ce2b0ce4
 MISC ChangeLog-2015 10627 SHA256 e36ad37f78e0443081d7270a0bd3725925d19341d1b542e3585f31e179a60e04 SHA512 5a2b00407c451a7c4a95aef28c95948725dffc54989a4335de3d1f56c7e11fca07e958ba291f4b1113343bb5480fa1af39cd231bb5b0332e0e1058a766ed0cbc WHIRLPOOL a97f1ad4c09a7cb585bc4921e8a0ece5a35967001a2a61b1ceee8987c65b7be9779ed84a35320115b05fa6d9ee2e8a5edf7b06bc3d7e505bc103afcbd541790c
 MISC metadata.xml 316 SHA256 a18049e3f123635303c1d0f6e33a75155768c38224e65ca6a87253a289936421 SHA512 d41b531c5f7456da060d2d335d0f9e8ac94c307127b3124e9ce6e1c92a9ce6fa5cbfcc7fc2e62ec51d15e966b43f50b8006ee95422cc790a4c17a1a9000dc9f5 WHIRLPOOL f818be5521a192e0b8b3dc14a78c2a73e2507891c427ff62a0a432796ecb385054d06be01f9507126cb21600d696d31037d2d1c483e28e77c15b4c2b0e2aa33b
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20170204-r1.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20170204-r1.ebuild
index 7d3e8af7dfd5..6390a69a57ce 100644
--- a/sec-policy/selinux-nagios/selinux-nagios-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-nagios/selinux-nagios-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20170204-r2.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20170204-r2.ebuild
index 8f4a008020ad..5cc4a9ef62eb 100644
--- a/sec-policy/selinux-nagios/selinux-nagios-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-nagios/selinux-nagios-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20170204-r3.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20170204-r3.ebuild
index 8f4a008020ad..5cc4a9ef62eb 100644
--- a/sec-policy/selinux-nagios/selinux-nagios-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-nagios/selinux-nagios-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20170204-r4.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20170204-r4.ebuild
index 8f4a008020ad..5cc4a9ef62eb 100644
--- a/sec-policy/selinux-nagios/selinux-nagios-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-nagios/selinux-nagios-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20170805-r2.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20170805-r2.ebuild
index 8f4a008020ad..5cc4a9ef62eb 100644
--- a/sec-policy/selinux-nagios/selinux-nagios-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-nagios/selinux-nagios-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20170805-r3.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..6390a69a57ce
--- /dev/null
+++ b/sec-policy/selinux-nagios/selinux-nagios-2.20170805-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-nagios/selinux-nagios-9999.ebuild b/sec-policy/selinux-nagios/selinux-nagios-9999.ebuild
index 7d3e8af7dfd5..6390a69a57ce 100644
--- a/sec-policy/selinux-nagios/selinux-nagios-9999.ebuild
+++ b/sec-policy/selinux-nagios/selinux-nagios-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ncftool/Manifest b/sec-policy/selinux-ncftool/Manifest
index 379d7a626cc0..fab2efd67191 100644
--- a/sec-policy/selinux-ncftool/Manifest
+++ b/sec-policy/selinux-ncftool/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-ncftool-2.20170204-r1.ebuild 285 SHA256 0560571800bf48bff69efc363f2fba978d29b74b2c2f578d05780df3ff8dacf3 SHA512 5dd610dae70dcc48584e219de86a952c5ca53914832ba32b172376b55121b08f2a8a63f52c5a337b09f8d5931ca5ca948a9ddc619805a018865d66ee4fa5451b WHIRLPOOL 527e42471275230d4130609dcdf7426e8f4c8ff856e8f80376c8e7a41272f660b9e99a2dc7926cb2b1a651542c1b1ca8de2710e60155382e2530ccd7c66eb44c
-EBUILD selinux-ncftool-2.20170204-r2.ebuild 283 SHA256 3dbc303d86c02857ef421799af5a56258cfcd5efcf6bd267ec61b156612574d9 SHA512 13d82ff174f7fc05565588bde5da6b847af6abd64679754134d344fba67d81f807fef0d8cf6d1da8b308f00b3ab979e0cc6cbc517464f25190c98470a41760d9 WHIRLPOOL b1052fb31b09e63bb6d12917d5ecf44f5e08ce0f1c9f0c3c260ee731c152a6d67f22094a508cf185be0fd3e12712b633864828fa0a3fb172e9345c42aa840c93
-EBUILD selinux-ncftool-2.20170204-r3.ebuild 283 SHA256 3dbc303d86c02857ef421799af5a56258cfcd5efcf6bd267ec61b156612574d9 SHA512 13d82ff174f7fc05565588bde5da6b847af6abd64679754134d344fba67d81f807fef0d8cf6d1da8b308f00b3ab979e0cc6cbc517464f25190c98470a41760d9 WHIRLPOOL b1052fb31b09e63bb6d12917d5ecf44f5e08ce0f1c9f0c3c260ee731c152a6d67f22094a508cf185be0fd3e12712b633864828fa0a3fb172e9345c42aa840c93
-EBUILD selinux-ncftool-2.20170204-r4.ebuild 283 SHA256 3dbc303d86c02857ef421799af5a56258cfcd5efcf6bd267ec61b156612574d9 SHA512 13d82ff174f7fc05565588bde5da6b847af6abd64679754134d344fba67d81f807fef0d8cf6d1da8b308f00b3ab979e0cc6cbc517464f25190c98470a41760d9 WHIRLPOOL b1052fb31b09e63bb6d12917d5ecf44f5e08ce0f1c9f0c3c260ee731c152a6d67f22094a508cf185be0fd3e12712b633864828fa0a3fb172e9345c42aa840c93
-EBUILD selinux-ncftool-2.20170805-r2.ebuild 283 SHA256 3dbc303d86c02857ef421799af5a56258cfcd5efcf6bd267ec61b156612574d9 SHA512 13d82ff174f7fc05565588bde5da6b847af6abd64679754134d344fba67d81f807fef0d8cf6d1da8b308f00b3ab979e0cc6cbc517464f25190c98470a41760d9 WHIRLPOOL b1052fb31b09e63bb6d12917d5ecf44f5e08ce0f1c9f0c3c260ee731c152a6d67f22094a508cf185be0fd3e12712b633864828fa0a3fb172e9345c42aa840c93
-EBUILD selinux-ncftool-9999.ebuild 285 SHA256 0560571800bf48bff69efc363f2fba978d29b74b2c2f578d05780df3ff8dacf3 SHA512 5dd610dae70dcc48584e219de86a952c5ca53914832ba32b172376b55121b08f2a8a63f52c5a337b09f8d5931ca5ca948a9ddc619805a018865d66ee4fa5451b WHIRLPOOL 527e42471275230d4130609dcdf7426e8f4c8ff856e8f80376c8e7a41272f660b9e99a2dc7926cb2b1a651542c1b1ca8de2710e60155382e2530ccd7c66eb44c
+EBUILD selinux-ncftool-2.20170204-r1.ebuild 286 SHA256 494ab549dccc1ff758bb89314b4a955e8c6144ee96c8a2e26f1870a27292d788 SHA512 538ce4a1822228fb5bffa8e73569d7fbc9e1d5c9fb7c8dc164a10c7f748bad4c8d9a25171ff03a964b76616e62ea2fb4c388ec1c588058d795f640077610797c WHIRLPOOL 90b737efeec2b59beb28a62040254042035cbdd0516b7782bd90db6735ad4a8a421e20c4aefd54700c761c8bfdf6527dfabbfde461df7fb67521a35e78acac54
+EBUILD selinux-ncftool-2.20170204-r2.ebuild 284 SHA256 0c1c5bf7804184400513d11e506d7bbeb96c0fdb6dffd1c7c2945dee49cb1bc4 SHA512 8c945683087679f651ad7e478a502f478dac525571466eb37a242a92f1564d0fe0d0fe71041e8d13867f8b7d7d560beb9c5c0962448a15c184314633dca587e0 WHIRLPOOL cfb6619ad23eacb71a31acdcba2b972262f2971eefcc8974d9df7c320f336ac79fdbf3e0f2c0b42a1c45193509e981f4cb54d5ab66a33fbd8c373663a9887515
+EBUILD selinux-ncftool-2.20170204-r3.ebuild 284 SHA256 0c1c5bf7804184400513d11e506d7bbeb96c0fdb6dffd1c7c2945dee49cb1bc4 SHA512 8c945683087679f651ad7e478a502f478dac525571466eb37a242a92f1564d0fe0d0fe71041e8d13867f8b7d7d560beb9c5c0962448a15c184314633dca587e0 WHIRLPOOL cfb6619ad23eacb71a31acdcba2b972262f2971eefcc8974d9df7c320f336ac79fdbf3e0f2c0b42a1c45193509e981f4cb54d5ab66a33fbd8c373663a9887515
+EBUILD selinux-ncftool-2.20170204-r4.ebuild 284 SHA256 0c1c5bf7804184400513d11e506d7bbeb96c0fdb6dffd1c7c2945dee49cb1bc4 SHA512 8c945683087679f651ad7e478a502f478dac525571466eb37a242a92f1564d0fe0d0fe71041e8d13867f8b7d7d560beb9c5c0962448a15c184314633dca587e0 WHIRLPOOL cfb6619ad23eacb71a31acdcba2b972262f2971eefcc8974d9df7c320f336ac79fdbf3e0f2c0b42a1c45193509e981f4cb54d5ab66a33fbd8c373663a9887515
+EBUILD selinux-ncftool-2.20170805-r2.ebuild 284 SHA256 0c1c5bf7804184400513d11e506d7bbeb96c0fdb6dffd1c7c2945dee49cb1bc4 SHA512 8c945683087679f651ad7e478a502f478dac525571466eb37a242a92f1564d0fe0d0fe71041e8d13867f8b7d7d560beb9c5c0962448a15c184314633dca587e0 WHIRLPOOL cfb6619ad23eacb71a31acdcba2b972262f2971eefcc8974d9df7c320f336ac79fdbf3e0f2c0b42a1c45193509e981f4cb54d5ab66a33fbd8c373663a9887515
+EBUILD selinux-ncftool-2.20170805-r3.ebuild 286 SHA256 494ab549dccc1ff758bb89314b4a955e8c6144ee96c8a2e26f1870a27292d788 SHA512 538ce4a1822228fb5bffa8e73569d7fbc9e1d5c9fb7c8dc164a10c7f748bad4c8d9a25171ff03a964b76616e62ea2fb4c388ec1c588058d795f640077610797c WHIRLPOOL 90b737efeec2b59beb28a62040254042035cbdd0516b7782bd90db6735ad4a8a421e20c4aefd54700c761c8bfdf6527dfabbfde461df7fb67521a35e78acac54
+EBUILD selinux-ncftool-9999.ebuild 286 SHA256 494ab549dccc1ff758bb89314b4a955e8c6144ee96c8a2e26f1870a27292d788 SHA512 538ce4a1822228fb5bffa8e73569d7fbc9e1d5c9fb7c8dc164a10c7f748bad4c8d9a25171ff03a964b76616e62ea2fb4c388ec1c588058d795f640077610797c WHIRLPOOL 90b737efeec2b59beb28a62040254042035cbdd0516b7782bd90db6735ad4a8a421e20c4aefd54700c761c8bfdf6527dfabbfde461df7fb67521a35e78acac54
 MISC ChangeLog 10687 SHA256 dd5ef3e9987b30725016d894e47bb4606b0b019e42016073685a02b4d9079ecb SHA512 a40cb7d4f3c9dfeed76d4404659cae296476e2bb814105a308d2c97b0cd014e99a7be119d82b7d2d55d01a84b14d151ac027bf5983c86b3d8472779393d6353b WHIRLPOOL 3b53c18e14cfda979c57dbcb290dfc90440bf4da92c28f662b2a1faf70bb808c32ac0d979286cce54c091b0aa6f32d7e4c095a1e9fa650d6624be8e0b13c0f52
 MISC ChangeLog-2015 9710 SHA256 f122116be8e4104fe33368af1f50fac20dd8d34df0fa0655d70107859fd6fd4e SHA512 5fec71bd952e6fa9ae8b5507f5a01e68c4cc96a94f02c52a4bd56757066d6352cccd13044b76408926a03a6dc15c44d8ee2f69fb7b5bc637e7018dc71e44c111 WHIRLPOOL 35fe7a6836aedffd9696699b95a75de02c24140bfbc600b2a8d027caaef8961294182476e67863ff35472cb13f1b87a1d9d831afaafb7c9c4a8522cf1a3509a1
 MISC metadata.xml 317 SHA256 de88a52c3241a38af089a989d5585f296f78a11262c5ad534b4a4d4860babbf4 SHA512 672a4431cf13c8b31c165ef0a1cb0020b1e5ce4106169661f9f55374178fa961c960096d4d4f4a628d8c15789ea1f0b693ac5872f46765e2f7526dc11f8ad30c WHIRLPOOL 06a704775b0a62caf6da50f28566783cc8e0c8855b8b69f876be32f87611f331280abaa0dbd7474fc7b4a32676d35f8ae9269d87409109addc50dd060db59294
diff --git a/sec-policy/selinux-ncftool/selinux-ncftool-2.20170204-r1.ebuild b/sec-policy/selinux-ncftool/selinux-ncftool-2.20170204-r1.ebuild
index 5c2af353ec37..ce074baad76b 100644
--- a/sec-policy/selinux-ncftool/selinux-ncftool-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-ncftool/selinux-ncftool-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ncftool/selinux-ncftool-2.20170204-r2.ebuild b/sec-policy/selinux-ncftool/selinux-ncftool-2.20170204-r2.ebuild
index 24566a4e104e..cce911b31108 100644
--- a/sec-policy/selinux-ncftool/selinux-ncftool-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-ncftool/selinux-ncftool-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ncftool/selinux-ncftool-2.20170204-r3.ebuild b/sec-policy/selinux-ncftool/selinux-ncftool-2.20170204-r3.ebuild
index 24566a4e104e..cce911b31108 100644
--- a/sec-policy/selinux-ncftool/selinux-ncftool-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-ncftool/selinux-ncftool-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ncftool/selinux-ncftool-2.20170204-r4.ebuild b/sec-policy/selinux-ncftool/selinux-ncftool-2.20170204-r4.ebuild
index 24566a4e104e..cce911b31108 100644
--- a/sec-policy/selinux-ncftool/selinux-ncftool-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-ncftool/selinux-ncftool-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ncftool/selinux-ncftool-2.20170805-r2.ebuild b/sec-policy/selinux-ncftool/selinux-ncftool-2.20170805-r2.ebuild
index 24566a4e104e..cce911b31108 100644
--- a/sec-policy/selinux-ncftool/selinux-ncftool-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-ncftool/selinux-ncftool-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ncftool/selinux-ncftool-2.20170805-r3.ebuild b/sec-policy/selinux-ncftool/selinux-ncftool-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..ce074baad76b
--- /dev/null
+++ b/sec-policy/selinux-ncftool/selinux-ncftool-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-ncftool/selinux-ncftool-9999.ebuild b/sec-policy/selinux-ncftool/selinux-ncftool-9999.ebuild
index 5c2af353ec37..ce074baad76b 100644
--- a/sec-policy/selinux-ncftool/selinux-ncftool-9999.ebuild
+++ b/sec-policy/selinux-ncftool/selinux-ncftool-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-nessus/Manifest b/sec-policy/selinux-nessus/Manifest
index c4b7083a3459..465685d0d6a6 100644
--- a/sec-policy/selinux-nessus/Manifest
+++ b/sec-policy/selinux-nessus/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-nessus-2.20170204-r1.ebuild 283 SHA256 ab0e96e42248bdca8883e555883757ee98f76811e07346ec3443e0f0cdb976ef SHA512 bc35aed0d9b89dfacb979522354acfb7e024598db60694579d5e8d1db3405565fc33cc72e36b20e000e74607fcfb988548901019bb74f10b9fd445e6abb2387c WHIRLPOOL ec508558ad8aa8d74b70c40ac8c51abebdfe4ca38034e2324b53276102f9764cb54e80c6db35b87e72bf31fa7acf7dc7327b5caeec842aca8bfcb7883b0b20e0
-EBUILD selinux-nessus-2.20170204-r2.ebuild 281 SHA256 d4a95a7f023e84f9d7eff7fccad023a78a18323df254ec5dad57ad7bb0f9be8c SHA512 91dc61cf1c3de0c65a2b2ec2cd82f99000ce4a220e13704a251091c941bae4968a18e80ae701e285a1dc3587cf9c584074c627e4608513d616cdd8ac7f225ac5 WHIRLPOOL 5b75d93c726f2c06772defd6d9ddee8b0f5e2849bedd110b80c8705e89ed4f0471151572d9efc63a3d40b518a6f767c8ccf67e5402aeeee2da0e41a270d31099
-EBUILD selinux-nessus-2.20170204-r3.ebuild 281 SHA256 d4a95a7f023e84f9d7eff7fccad023a78a18323df254ec5dad57ad7bb0f9be8c SHA512 91dc61cf1c3de0c65a2b2ec2cd82f99000ce4a220e13704a251091c941bae4968a18e80ae701e285a1dc3587cf9c584074c627e4608513d616cdd8ac7f225ac5 WHIRLPOOL 5b75d93c726f2c06772defd6d9ddee8b0f5e2849bedd110b80c8705e89ed4f0471151572d9efc63a3d40b518a6f767c8ccf67e5402aeeee2da0e41a270d31099
-EBUILD selinux-nessus-2.20170204-r4.ebuild 281 SHA256 d4a95a7f023e84f9d7eff7fccad023a78a18323df254ec5dad57ad7bb0f9be8c SHA512 91dc61cf1c3de0c65a2b2ec2cd82f99000ce4a220e13704a251091c941bae4968a18e80ae701e285a1dc3587cf9c584074c627e4608513d616cdd8ac7f225ac5 WHIRLPOOL 5b75d93c726f2c06772defd6d9ddee8b0f5e2849bedd110b80c8705e89ed4f0471151572d9efc63a3d40b518a6f767c8ccf67e5402aeeee2da0e41a270d31099
-EBUILD selinux-nessus-2.20170805-r2.ebuild 281 SHA256 d4a95a7f023e84f9d7eff7fccad023a78a18323df254ec5dad57ad7bb0f9be8c SHA512 91dc61cf1c3de0c65a2b2ec2cd82f99000ce4a220e13704a251091c941bae4968a18e80ae701e285a1dc3587cf9c584074c627e4608513d616cdd8ac7f225ac5 WHIRLPOOL 5b75d93c726f2c06772defd6d9ddee8b0f5e2849bedd110b80c8705e89ed4f0471151572d9efc63a3d40b518a6f767c8ccf67e5402aeeee2da0e41a270d31099
-EBUILD selinux-nessus-9999.ebuild 283 SHA256 ab0e96e42248bdca8883e555883757ee98f76811e07346ec3443e0f0cdb976ef SHA512 bc35aed0d9b89dfacb979522354acfb7e024598db60694579d5e8d1db3405565fc33cc72e36b20e000e74607fcfb988548901019bb74f10b9fd445e6abb2387c WHIRLPOOL ec508558ad8aa8d74b70c40ac8c51abebdfe4ca38034e2324b53276102f9764cb54e80c6db35b87e72bf31fa7acf7dc7327b5caeec842aca8bfcb7883b0b20e0
+EBUILD selinux-nessus-2.20170204-r1.ebuild 284 SHA256 f237a856211ad5760fc8b486758be28939fe1f4319d48fba798951ff20a03bde SHA512 6e4ba774c8d084c07665c45883c36838c079053764b494d2981f7ff80dad1e61ba2dcb81fbdfb2ab7a4d868d0a1c00ec820cf3221a5bcbabeb1a7654104b0627 WHIRLPOOL bc1977e5aea42101e95f53843011a2c77a6a45ace247d9d1919a5f5a25af8f14d86cea04bfe8588372a1821212406196ee0595c729b9fdf89d557528ad5c5a55
+EBUILD selinux-nessus-2.20170204-r2.ebuild 282 SHA256 5dc0de9d18e34bd398ace7a2d558e9764284260f03b091c0c814a6acb27168f2 SHA512 12186be6580a7cb9bf5b2c31eb04ddd3313ff917bef69b48ed741594c1419f12a53c2363d01338d72ee9357055b84060f2a793e5c4422980e7f036c5c933b97b WHIRLPOOL 9a65fafd4182c65b1fd5371258be4d5d3a4dbf76d49ccb81275be7e23fbd1022a20d6dded4c16249ce7cb393996b892a1097e6e16955e918dcba1cd5aab496c6
+EBUILD selinux-nessus-2.20170204-r3.ebuild 282 SHA256 5dc0de9d18e34bd398ace7a2d558e9764284260f03b091c0c814a6acb27168f2 SHA512 12186be6580a7cb9bf5b2c31eb04ddd3313ff917bef69b48ed741594c1419f12a53c2363d01338d72ee9357055b84060f2a793e5c4422980e7f036c5c933b97b WHIRLPOOL 9a65fafd4182c65b1fd5371258be4d5d3a4dbf76d49ccb81275be7e23fbd1022a20d6dded4c16249ce7cb393996b892a1097e6e16955e918dcba1cd5aab496c6
+EBUILD selinux-nessus-2.20170204-r4.ebuild 282 SHA256 5dc0de9d18e34bd398ace7a2d558e9764284260f03b091c0c814a6acb27168f2 SHA512 12186be6580a7cb9bf5b2c31eb04ddd3313ff917bef69b48ed741594c1419f12a53c2363d01338d72ee9357055b84060f2a793e5c4422980e7f036c5c933b97b WHIRLPOOL 9a65fafd4182c65b1fd5371258be4d5d3a4dbf76d49ccb81275be7e23fbd1022a20d6dded4c16249ce7cb393996b892a1097e6e16955e918dcba1cd5aab496c6
+EBUILD selinux-nessus-2.20170805-r2.ebuild 282 SHA256 5dc0de9d18e34bd398ace7a2d558e9764284260f03b091c0c814a6acb27168f2 SHA512 12186be6580a7cb9bf5b2c31eb04ddd3313ff917bef69b48ed741594c1419f12a53c2363d01338d72ee9357055b84060f2a793e5c4422980e7f036c5c933b97b WHIRLPOOL 9a65fafd4182c65b1fd5371258be4d5d3a4dbf76d49ccb81275be7e23fbd1022a20d6dded4c16249ce7cb393996b892a1097e6e16955e918dcba1cd5aab496c6
+EBUILD selinux-nessus-2.20170805-r3.ebuild 284 SHA256 f237a856211ad5760fc8b486758be28939fe1f4319d48fba798951ff20a03bde SHA512 6e4ba774c8d084c07665c45883c36838c079053764b494d2981f7ff80dad1e61ba2dcb81fbdfb2ab7a4d868d0a1c00ec820cf3221a5bcbabeb1a7654104b0627 WHIRLPOOL bc1977e5aea42101e95f53843011a2c77a6a45ace247d9d1919a5f5a25af8f14d86cea04bfe8588372a1821212406196ee0595c729b9fdf89d557528ad5c5a55
+EBUILD selinux-nessus-9999.ebuild 284 SHA256 f237a856211ad5760fc8b486758be28939fe1f4319d48fba798951ff20a03bde SHA512 6e4ba774c8d084c07665c45883c36838c079053764b494d2981f7ff80dad1e61ba2dcb81fbdfb2ab7a4d868d0a1c00ec820cf3221a5bcbabeb1a7654104b0627 WHIRLPOOL bc1977e5aea42101e95f53843011a2c77a6a45ace247d9d1919a5f5a25af8f14d86cea04bfe8588372a1821212406196ee0595c729b9fdf89d557528ad5c5a55
 MISC ChangeLog 10571 SHA256 aea1ec961d58c3205b5a3f9ac848fe9e7435ccf147726c38b6dce5443f84a837 SHA512 f4084732e1652e88de28c9912bcc90158e9dc83a3da4bb6374e4268ea5faef43f4645d57fd4d699d98e7116d9fade14affcea08ef384c2c601104f523b55ed31 WHIRLPOOL 229eee5935fc1006b6a9c7f738dd91b77c3a34476b2a6428b7cd78cfb5169138c8f4c6740183b2eb6744d0e05bb2f7a21273fa18769ad4fc1448eac5881efdde
 MISC ChangeLog-2015 10053 SHA256 9e51132b3877c1cd3d8701ded7bc26e12ae044f92b1348a9efc917b042200f98 SHA512 211e11c2faf007555b5fa80a88e81031f836c2775bbc03b34c13f507794c8ece7c7646275f96cc2a50f177cb9632bcbe221cfcb1ffe84a7d9be2fee60abe4390 WHIRLPOOL 09b3ddfbe5b6d9725467776c18527441ca5b90e2cbd3751df45ea917885c365f61d9fd31496b3fd55baf0ed2fcf37d4a56ad0474c9dfbd6ac025e2a36c5a3013
 MISC metadata.xml 316 SHA256 504fc099a998a1bb1e2ce5e45eee81a8baf3fa49e866f5a2288eed8835463a66 SHA512 b7f0c0e49c6a43610f87535899fb40b6b9fc73b3f4e4aaaa405764ee2268a3fad518d4fd696b57b505c3729460298eed3a9eb454dbeb8d4f9814ee2ff53438b4 WHIRLPOOL 60ff060e38a07004eb70672f23122daa0696448537a185608e812ff3108fbfe030f8d2e835781f17dda30daf1916812cfe69d2666d627741119c037dee46f4ae
diff --git a/sec-policy/selinux-nessus/selinux-nessus-2.20170204-r1.ebuild b/sec-policy/selinux-nessus/selinux-nessus-2.20170204-r1.ebuild
index 6c4c0b853879..c1601de1831a 100644
--- a/sec-policy/selinux-nessus/selinux-nessus-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-nessus/selinux-nessus-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-nessus/selinux-nessus-2.20170204-r2.ebuild b/sec-policy/selinux-nessus/selinux-nessus-2.20170204-r2.ebuild
index be130d3f426e..e11434f3dbe6 100644
--- a/sec-policy/selinux-nessus/selinux-nessus-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-nessus/selinux-nessus-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-nessus/selinux-nessus-2.20170204-r3.ebuild b/sec-policy/selinux-nessus/selinux-nessus-2.20170204-r3.ebuild
index be130d3f426e..e11434f3dbe6 100644
--- a/sec-policy/selinux-nessus/selinux-nessus-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-nessus/selinux-nessus-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-nessus/selinux-nessus-2.20170204-r4.ebuild b/sec-policy/selinux-nessus/selinux-nessus-2.20170204-r4.ebuild
index be130d3f426e..e11434f3dbe6 100644
--- a/sec-policy/selinux-nessus/selinux-nessus-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-nessus/selinux-nessus-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-nessus/selinux-nessus-2.20170805-r2.ebuild b/sec-policy/selinux-nessus/selinux-nessus-2.20170805-r2.ebuild
index be130d3f426e..e11434f3dbe6 100644
--- a/sec-policy/selinux-nessus/selinux-nessus-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-nessus/selinux-nessus-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-nessus/selinux-nessus-2.20170805-r3.ebuild b/sec-policy/selinux-nessus/selinux-nessus-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..c1601de1831a
--- /dev/null
+++ b/sec-policy/selinux-nessus/selinux-nessus-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="nessus"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for nessus"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-nessus/selinux-nessus-9999.ebuild b/sec-policy/selinux-nessus/selinux-nessus-9999.ebuild
index 6c4c0b853879..c1601de1831a 100644
--- a/sec-policy/selinux-nessus/selinux-nessus-9999.ebuild
+++ b/sec-policy/selinux-nessus/selinux-nessus-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-networkmanager/Manifest b/sec-policy/selinux-networkmanager/Manifest
index 8d5b1dc96dd1..f185c42c3d5b 100644
--- a/sec-policy/selinux-networkmanager/Manifest
+++ b/sec-policy/selinux-networkmanager/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-networkmanager-2.20170204-r1.ebuild 299 SHA256 00dfa86d4d3829241e7ff9b23ceac61d4796672ddcaed2e1cb774bc24b534ee5 SHA512 6ec35197da00f8bead66b8af023617182271d328ccd76cab4f285475a9d6988c8949e13a1dac906847442166e438fcbbf70a8b4d3638dd0b2be266c7f25ab831 WHIRLPOOL 51476a99b2070438c781209a9864b447c0378fd5e40509250fcb833b103e23be961e178ecd4ef6f4792d80fcc303a517f1bbe8253d8576e0b4040f0187c97a6a
-EBUILD selinux-networkmanager-2.20170204-r2.ebuild 297 SHA256 5af024f62f4e52e51615ba64ce9520b52803c3864ac9c2044650797ba0b66386 SHA512 f4f643f6f963b1e8fdd97dd9a5d7632f2cc5591eb9200903666cc7c881e474b1e1aadded6c9bcbbbff3cdaa9fbd3043027d0b271d6bb2f4460132de050f54981 WHIRLPOOL ec96ca923aded458356c79c9aec319bf108c11e78445f0e23d57f5bb0890246b5c439cc3d76c11361c079d0ea2f38cdea28cdf5ea87732c280a86f196fb368fa
-EBUILD selinux-networkmanager-2.20170204-r3.ebuild 297 SHA256 5af024f62f4e52e51615ba64ce9520b52803c3864ac9c2044650797ba0b66386 SHA512 f4f643f6f963b1e8fdd97dd9a5d7632f2cc5591eb9200903666cc7c881e474b1e1aadded6c9bcbbbff3cdaa9fbd3043027d0b271d6bb2f4460132de050f54981 WHIRLPOOL ec96ca923aded458356c79c9aec319bf108c11e78445f0e23d57f5bb0890246b5c439cc3d76c11361c079d0ea2f38cdea28cdf5ea87732c280a86f196fb368fa
-EBUILD selinux-networkmanager-2.20170204-r4.ebuild 297 SHA256 5af024f62f4e52e51615ba64ce9520b52803c3864ac9c2044650797ba0b66386 SHA512 f4f643f6f963b1e8fdd97dd9a5d7632f2cc5591eb9200903666cc7c881e474b1e1aadded6c9bcbbbff3cdaa9fbd3043027d0b271d6bb2f4460132de050f54981 WHIRLPOOL ec96ca923aded458356c79c9aec319bf108c11e78445f0e23d57f5bb0890246b5c439cc3d76c11361c079d0ea2f38cdea28cdf5ea87732c280a86f196fb368fa
-EBUILD selinux-networkmanager-2.20170805-r2.ebuild 297 SHA256 5af024f62f4e52e51615ba64ce9520b52803c3864ac9c2044650797ba0b66386 SHA512 f4f643f6f963b1e8fdd97dd9a5d7632f2cc5591eb9200903666cc7c881e474b1e1aadded6c9bcbbbff3cdaa9fbd3043027d0b271d6bb2f4460132de050f54981 WHIRLPOOL ec96ca923aded458356c79c9aec319bf108c11e78445f0e23d57f5bb0890246b5c439cc3d76c11361c079d0ea2f38cdea28cdf5ea87732c280a86f196fb368fa
-EBUILD selinux-networkmanager-9999.ebuild 299 SHA256 00dfa86d4d3829241e7ff9b23ceac61d4796672ddcaed2e1cb774bc24b534ee5 SHA512 6ec35197da00f8bead66b8af023617182271d328ccd76cab4f285475a9d6988c8949e13a1dac906847442166e438fcbbf70a8b4d3638dd0b2be266c7f25ab831 WHIRLPOOL 51476a99b2070438c781209a9864b447c0378fd5e40509250fcb833b103e23be961e178ecd4ef6f4792d80fcc303a517f1bbe8253d8576e0b4040f0187c97a6a
+EBUILD selinux-networkmanager-2.20170204-r1.ebuild 300 SHA256 fedbda692e89e3c8ac6a7f2fa9bda42e86bc5ed740c43663ff357c264fd7ebc0 SHA512 1be3601ab5eb808ca587356a3084ca5bb8b2896b84663f673742d92ac537479715520e326f1066e26134170c451055648cd6d36487cb4f7ccfbdf42d6b620115 WHIRLPOOL db5a32a7054deecb03ea4e8fbdc50addb3e1604e7bb3a7b729499ebe6109faa635b181a28d3514eeba57774e1ac3db3009d97c67df66564df267dabb1735d4ff
+EBUILD selinux-networkmanager-2.20170204-r2.ebuild 298 SHA256 3cae853b21e0aad45e755f7dd10c394cc70a66976096e2ac4fb5450f7ea5063b SHA512 584115fe63798d8a87ab46738f5adadfa16f343dc6c8c493e782ff6ce5a46708433925632e9227c924be6e5aa6194950a8ec06cbdbe1afe570f3b370833bbf5f WHIRLPOOL 7e1e56d464207e430b47b2864830b16ffd847a218bbbc18d3df66352594ed052578624b8fdaeb59d26a7c91d0bb594d105d6c729cdb00b4b1ceb7a73cbec1399
+EBUILD selinux-networkmanager-2.20170204-r3.ebuild 298 SHA256 3cae853b21e0aad45e755f7dd10c394cc70a66976096e2ac4fb5450f7ea5063b SHA512 584115fe63798d8a87ab46738f5adadfa16f343dc6c8c493e782ff6ce5a46708433925632e9227c924be6e5aa6194950a8ec06cbdbe1afe570f3b370833bbf5f WHIRLPOOL 7e1e56d464207e430b47b2864830b16ffd847a218bbbc18d3df66352594ed052578624b8fdaeb59d26a7c91d0bb594d105d6c729cdb00b4b1ceb7a73cbec1399
+EBUILD selinux-networkmanager-2.20170204-r4.ebuild 298 SHA256 3cae853b21e0aad45e755f7dd10c394cc70a66976096e2ac4fb5450f7ea5063b SHA512 584115fe63798d8a87ab46738f5adadfa16f343dc6c8c493e782ff6ce5a46708433925632e9227c924be6e5aa6194950a8ec06cbdbe1afe570f3b370833bbf5f WHIRLPOOL 7e1e56d464207e430b47b2864830b16ffd847a218bbbc18d3df66352594ed052578624b8fdaeb59d26a7c91d0bb594d105d6c729cdb00b4b1ceb7a73cbec1399
+EBUILD selinux-networkmanager-2.20170805-r2.ebuild 298 SHA256 3cae853b21e0aad45e755f7dd10c394cc70a66976096e2ac4fb5450f7ea5063b SHA512 584115fe63798d8a87ab46738f5adadfa16f343dc6c8c493e782ff6ce5a46708433925632e9227c924be6e5aa6194950a8ec06cbdbe1afe570f3b370833bbf5f WHIRLPOOL 7e1e56d464207e430b47b2864830b16ffd847a218bbbc18d3df66352594ed052578624b8fdaeb59d26a7c91d0bb594d105d6c729cdb00b4b1ceb7a73cbec1399
+EBUILD selinux-networkmanager-2.20170805-r3.ebuild 300 SHA256 fedbda692e89e3c8ac6a7f2fa9bda42e86bc5ed740c43663ff357c264fd7ebc0 SHA512 1be3601ab5eb808ca587356a3084ca5bb8b2896b84663f673742d92ac537479715520e326f1066e26134170c451055648cd6d36487cb4f7ccfbdf42d6b620115 WHIRLPOOL db5a32a7054deecb03ea4e8fbdc50addb3e1604e7bb3a7b729499ebe6109faa635b181a28d3514eeba57774e1ac3db3009d97c67df66564df267dabb1735d4ff
+EBUILD selinux-networkmanager-9999.ebuild 300 SHA256 fedbda692e89e3c8ac6a7f2fa9bda42e86bc5ed740c43663ff357c264fd7ebc0 SHA512 1be3601ab5eb808ca587356a3084ca5bb8b2896b84663f673742d92ac537479715520e326f1066e26134170c451055648cd6d36487cb4f7ccfbdf42d6b620115 WHIRLPOOL db5a32a7054deecb03ea4e8fbdc50addb3e1604e7bb3a7b729499ebe6109faa635b181a28d3514eeba57774e1ac3db3009d97c67df66564df267dabb1735d4ff
 MISC ChangeLog 11353 SHA256 3475f8c72d22012156374423ace10644479e7f4af9a204af7fa2d2a91142d99a SHA512 9ae2d1bdfc82592e6ff197c8637e02110d78fce7178afccbf04f2dc1cfd229e8370742e7deaea4de26b03a206f515d1864dde9c5a97125f52fffb2bc7d6fe801 WHIRLPOOL 9ac801afe7a023873ba526485dc3a764cfd457fe9752f2c91981d90f5cb9d6682e339ea90c4b76af7bfd4a69b1db66629d1f96ed751ebfd7cc05015a9dfdc639
 MISC ChangeLog-2015 11583 SHA256 87c206a8032d0d7ae522a82a86225a5b24bba0d77c18572be7d6c24afea96a5f SHA512 00e4977a0106374ec6eafd7200ac6ca9d05bc6fac8ecb8470463b63d9ce2f4d10f9a2279f067802aa52b32ade182dde1bdbb0232d1651e5a6e4a07d609ae6dde WHIRLPOOL e990e924a955f202e88ddd43580957d4bdf0704ce8a6c05ea276df63de1bef70c0bb962d442a8d5ce084f48dd0bfe0615e1d3381034a655a14c34ba22f751927
 MISC metadata.xml 324 SHA256 b57da044a3c7ebeeda7e4685cfc196fb37713cf9c7dfe23ecc495fae1eefce3d SHA512 310ecd0be68aece22be60ec8d52fcf6fab187d9bb70300e9e7ebab713a0191f770b1fabd836d4f7af6ce351d7a8e6d03ef9cf8dde07afcbfbe86d1dae1fdcd5a WHIRLPOOL cb4817689944e99cc5f22771004ace99343b23f12ea3d89ae53ef5421a38341e93b7191f47012f85963eba938e825814955226fe30e8147dc28254ef42ba5fb1
diff --git a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20170204-r1.ebuild b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20170204-r1.ebuild
index 9d0b069dceda..684e79d51dd7 100644
--- a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20170204-r2.ebuild b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20170204-r2.ebuild
index 68f9c9020fad..ff6dfece34ea 100644
--- a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20170204-r3.ebuild b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20170204-r3.ebuild
index 68f9c9020fad..ff6dfece34ea 100644
--- a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20170204-r4.ebuild b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20170204-r4.ebuild
index 68f9c9020fad..ff6dfece34ea 100644
--- a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20170805-r2.ebuild b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20170805-r2.ebuild
index 68f9c9020fad..ff6dfece34ea 100644
--- a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20170805-r3.ebuild b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..684e79d51dd7
--- /dev/null
+++ b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-networkmanager/selinux-networkmanager-9999.ebuild b/sec-policy/selinux-networkmanager/selinux-networkmanager-9999.ebuild
index 9d0b069dceda..684e79d51dd7 100644
--- a/sec-policy/selinux-networkmanager/selinux-networkmanager-9999.ebuild
+++ b/sec-policy/selinux-networkmanager/selinux-networkmanager-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-nginx/Manifest b/sec-policy/selinux-nginx/Manifest
index 82b6c038b4aa..1783fd0d27d4 100644
--- a/sec-policy/selinux-nginx/Manifest
+++ b/sec-policy/selinux-nginx/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-nginx-2.20170204-r1.ebuild 376 SHA256 d2f2458c4d3ac7d2b076c2cd7dae5a398c5e5e14e38910d821618c9a123da7a2 SHA512 0eb73f6c670a8d38d754a768b5d8acc229bf60d5f66f9068948ccab9a78b3aa1cc1220f1fe61005891e406ce316ae7d8f0b8f43104d6d1ebebb6a6af82d1266c WHIRLPOOL 0f134013c4c120cd7cfa20d9695cac543fc379eee7aa42e0536df00857dd922a54ea1f6acd690ff157cf73f60aaa5c039d2c49ed208c4b9fbdca987fff3ebe61
-EBUILD selinux-nginx-2.20170204-r2.ebuild 374 SHA256 1f3f607fb06dfec6c27611cc717696ec3c0811b1f03c7f1cde092b4b91cf2431 SHA512 13ca4e31e6e3a7e4a6f53552b5f7d31075a134d3885b03419420ffe8cd02c79609d2c1689e09f1555a3f34e03fde0c2bcb57200f5b3a2e3c3069f55d874571e1 WHIRLPOOL bdd4c8be51f37a25268f2c8c7f80e2591070bc08a0e2b6ed365bd4b8a22f218c300632b7de699425060f8a9522a721b31d01ce32ab783c1a0454a54a581e4da2
-EBUILD selinux-nginx-2.20170204-r3.ebuild 374 SHA256 1f3f607fb06dfec6c27611cc717696ec3c0811b1f03c7f1cde092b4b91cf2431 SHA512 13ca4e31e6e3a7e4a6f53552b5f7d31075a134d3885b03419420ffe8cd02c79609d2c1689e09f1555a3f34e03fde0c2bcb57200f5b3a2e3c3069f55d874571e1 WHIRLPOOL bdd4c8be51f37a25268f2c8c7f80e2591070bc08a0e2b6ed365bd4b8a22f218c300632b7de699425060f8a9522a721b31d01ce32ab783c1a0454a54a581e4da2
-EBUILD selinux-nginx-2.20170204-r4.ebuild 374 SHA256 1f3f607fb06dfec6c27611cc717696ec3c0811b1f03c7f1cde092b4b91cf2431 SHA512 13ca4e31e6e3a7e4a6f53552b5f7d31075a134d3885b03419420ffe8cd02c79609d2c1689e09f1555a3f34e03fde0c2bcb57200f5b3a2e3c3069f55d874571e1 WHIRLPOOL bdd4c8be51f37a25268f2c8c7f80e2591070bc08a0e2b6ed365bd4b8a22f218c300632b7de699425060f8a9522a721b31d01ce32ab783c1a0454a54a581e4da2
-EBUILD selinux-nginx-2.20170805-r2.ebuild 374 SHA256 1f3f607fb06dfec6c27611cc717696ec3c0811b1f03c7f1cde092b4b91cf2431 SHA512 13ca4e31e6e3a7e4a6f53552b5f7d31075a134d3885b03419420ffe8cd02c79609d2c1689e09f1555a3f34e03fde0c2bcb57200f5b3a2e3c3069f55d874571e1 WHIRLPOOL bdd4c8be51f37a25268f2c8c7f80e2591070bc08a0e2b6ed365bd4b8a22f218c300632b7de699425060f8a9522a721b31d01ce32ab783c1a0454a54a581e4da2
-EBUILD selinux-nginx-9999.ebuild 376 SHA256 d2f2458c4d3ac7d2b076c2cd7dae5a398c5e5e14e38910d821618c9a123da7a2 SHA512 0eb73f6c670a8d38d754a768b5d8acc229bf60d5f66f9068948ccab9a78b3aa1cc1220f1fe61005891e406ce316ae7d8f0b8f43104d6d1ebebb6a6af82d1266c WHIRLPOOL 0f134013c4c120cd7cfa20d9695cac543fc379eee7aa42e0536df00857dd922a54ea1f6acd690ff157cf73f60aaa5c039d2c49ed208c4b9fbdca987fff3ebe61
+EBUILD selinux-nginx-2.20170204-r1.ebuild 377 SHA256 6c29334851e8dc9552eb2d800a24ad5544be76582da500cc890dbe4f70728575 SHA512 7d5b7465ac1eb32622eaaa4810a22af37f01d3b0bf04d506db3418677f802934928299467f20a8832b706a1e976930e7d8e4a2d6c00e0f579c7c1ce4646d534a WHIRLPOOL 23c451ad7d1588a75936f862030359d7814e6b576de5112b6953f932ff3d0878a6cd4601b81e8c7e0a274e38108e3ec2541205ab71f9f1ce5605c4c2e17b33d4
+EBUILD selinux-nginx-2.20170204-r2.ebuild 375 SHA256 66da3c60919baaf90e796ad042e058bf0cead916406a338ab35ffecbcab49d3f SHA512 f1e634f29eb323a8f9826eef0bd666dc53ad6b26a2cf5d9fa99b5f92e2a41a0834600ae4b93523d5c8ede69e6e177f16ad275a17c5577516bfe0cc692c268d76 WHIRLPOOL 0c629a09414cf309ec310cc3a3308c5c9dd79ca827315e8c49a7e3eca21869f1994a49c93464e175d434f1775355e2d51f572bfc4ca7841fdeb3585f5e714c9d
+EBUILD selinux-nginx-2.20170204-r3.ebuild 375 SHA256 66da3c60919baaf90e796ad042e058bf0cead916406a338ab35ffecbcab49d3f SHA512 f1e634f29eb323a8f9826eef0bd666dc53ad6b26a2cf5d9fa99b5f92e2a41a0834600ae4b93523d5c8ede69e6e177f16ad275a17c5577516bfe0cc692c268d76 WHIRLPOOL 0c629a09414cf309ec310cc3a3308c5c9dd79ca827315e8c49a7e3eca21869f1994a49c93464e175d434f1775355e2d51f572bfc4ca7841fdeb3585f5e714c9d
+EBUILD selinux-nginx-2.20170204-r4.ebuild 375 SHA256 66da3c60919baaf90e796ad042e058bf0cead916406a338ab35ffecbcab49d3f SHA512 f1e634f29eb323a8f9826eef0bd666dc53ad6b26a2cf5d9fa99b5f92e2a41a0834600ae4b93523d5c8ede69e6e177f16ad275a17c5577516bfe0cc692c268d76 WHIRLPOOL 0c629a09414cf309ec310cc3a3308c5c9dd79ca827315e8c49a7e3eca21869f1994a49c93464e175d434f1775355e2d51f572bfc4ca7841fdeb3585f5e714c9d
+EBUILD selinux-nginx-2.20170805-r2.ebuild 375 SHA256 66da3c60919baaf90e796ad042e058bf0cead916406a338ab35ffecbcab49d3f SHA512 f1e634f29eb323a8f9826eef0bd666dc53ad6b26a2cf5d9fa99b5f92e2a41a0834600ae4b93523d5c8ede69e6e177f16ad275a17c5577516bfe0cc692c268d76 WHIRLPOOL 0c629a09414cf309ec310cc3a3308c5c9dd79ca827315e8c49a7e3eca21869f1994a49c93464e175d434f1775355e2d51f572bfc4ca7841fdeb3585f5e714c9d
+EBUILD selinux-nginx-2.20170805-r3.ebuild 377 SHA256 6c29334851e8dc9552eb2d800a24ad5544be76582da500cc890dbe4f70728575 SHA512 7d5b7465ac1eb32622eaaa4810a22af37f01d3b0bf04d506db3418677f802934928299467f20a8832b706a1e976930e7d8e4a2d6c00e0f579c7c1ce4646d534a WHIRLPOOL 23c451ad7d1588a75936f862030359d7814e6b576de5112b6953f932ff3d0878a6cd4601b81e8c7e0a274e38108e3ec2541205ab71f9f1ce5605c4c2e17b33d4
+EBUILD selinux-nginx-9999.ebuild 377 SHA256 6c29334851e8dc9552eb2d800a24ad5544be76582da500cc890dbe4f70728575 SHA512 7d5b7465ac1eb32622eaaa4810a22af37f01d3b0bf04d506db3418677f802934928299467f20a8832b706a1e976930e7d8e4a2d6c00e0f579c7c1ce4646d534a WHIRLPOOL 23c451ad7d1588a75936f862030359d7814e6b576de5112b6953f932ff3d0878a6cd4601b81e8c7e0a274e38108e3ec2541205ab71f9f1ce5605c4c2e17b33d4
 MISC ChangeLog 10551 SHA256 77950897ddc9a125c41a4f28fb41555ed646bd107def73a8841fe6075691946d SHA512 487c55ebdb2d423a3b0580053c2009654f53bc3bfdd28d9eeeb36d866dec66c040be40eb8fd4c054919faa7af885b2867a774c5e187080c42257b3884dbbbc12 WHIRLPOOL 6b8715e35dcada58da0ff31cb6e8f268e9d70946fb67ec73bc273aeb92db48630da5f4e966a9fe6369d14649ad529ab81e967e077e532a00c2c7a161ce87bbab
 MISC ChangeLog-2015 10676 SHA256 7ea9c6c8ded38d19a12a516c349721763d57d824ba017687df5e4464b0727fbf SHA512 94e3339c83bf4a6a56a239aae9d2761a3a30aa8e77749ad786012f4f8ec4c7f50b7272ab25e594f4f81cc46b55f529b253aab06f49170e1846df250ce3129100 WHIRLPOOL a374eb99b0aa4c5838925b7e2002dd9c11034ea9dada91ab1afca3567cd38536ce6745882206096ae253bce5928f2bc98a4666b24be183881c47595778a19de5
 MISC metadata.xml 315 SHA256 22e340c449530fb77248edde9714a13493099c1b27631baedc483a7cc858749a SHA512 3728836b5b16fc9d04bb74db4e7f0f9ab5418e3831c54ff56af4c65b7d3cfda5c1e710b5ed79766e08e0a978b744b0fe658644fb66e88776886a44296ea70f02 WHIRLPOOL f4d02d5a398118522b309c0e0bd393fb7836c3d8b385371b3c06691b70df9c0ed55117c550401e4f32d0c6240b0af6fa78441e8d30d5362db5eacd895b793c96
diff --git a/sec-policy/selinux-nginx/selinux-nginx-2.20170204-r1.ebuild b/sec-policy/selinux-nginx/selinux-nginx-2.20170204-r1.ebuild
index 04c98fb95c93..926ca451833e 100644
--- a/sec-policy/selinux-nginx/selinux-nginx-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-nginx/selinux-nginx-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-nginx/selinux-nginx-2.20170204-r2.ebuild b/sec-policy/selinux-nginx/selinux-nginx-2.20170204-r2.ebuild
index c62f7c75f008..41b11469d6c8 100644
--- a/sec-policy/selinux-nginx/selinux-nginx-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-nginx/selinux-nginx-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-nginx/selinux-nginx-2.20170204-r3.ebuild b/sec-policy/selinux-nginx/selinux-nginx-2.20170204-r3.ebuild
index c62f7c75f008..41b11469d6c8 100644
--- a/sec-policy/selinux-nginx/selinux-nginx-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-nginx/selinux-nginx-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-nginx/selinux-nginx-2.20170204-r4.ebuild b/sec-policy/selinux-nginx/selinux-nginx-2.20170204-r4.ebuild
index c62f7c75f008..41b11469d6c8 100644
--- a/sec-policy/selinux-nginx/selinux-nginx-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-nginx/selinux-nginx-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-nginx/selinux-nginx-2.20170805-r2.ebuild b/sec-policy/selinux-nginx/selinux-nginx-2.20170805-r2.ebuild
index c62f7c75f008..41b11469d6c8 100644
--- a/sec-policy/selinux-nginx/selinux-nginx-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-nginx/selinux-nginx-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-nginx/selinux-nginx-2.20170805-r3.ebuild b/sec-policy/selinux-nginx/selinux-nginx-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..926ca451833e
--- /dev/null
+++ b/sec-policy/selinux-nginx/selinux-nginx-2.20170805-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-nginx/selinux-nginx-9999.ebuild b/sec-policy/selinux-nginx/selinux-nginx-9999.ebuild
index 04c98fb95c93..926ca451833e 100644
--- a/sec-policy/selinux-nginx/selinux-nginx-9999.ebuild
+++ b/sec-policy/selinux-nginx/selinux-nginx-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-nslcd/Manifest b/sec-policy/selinux-nslcd/Manifest
index 850e47543f76..bdffa56a2032 100644
--- a/sec-policy/selinux-nslcd/Manifest
+++ b/sec-policy/selinux-nslcd/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-nslcd-2.20170204-r1.ebuild 281 SHA256 b2cbe1a62d685dd5865ec145e5cc88906910d687b87704e9f14b73eaadc6341e SHA512 d179f330e123595c9380c3a739ee3d422401f31fd673f5ccb53718d0a08aeea8e171f77d9842a49073180e05e8206f53db8dc2ed457e97bf0802b0909aca4dd6 WHIRLPOOL 1325271e4f2f85bcf75f6bf679dd5bd03e5ad9008b6a64a7e55313df8390fbc86d3a0fb5c21aa761f736b875504736d02187495d0103b9776ef118151ae90f22
-EBUILD selinux-nslcd-2.20170204-r2.ebuild 279 SHA256 767a158ca45732ae896a37ad95a5d91768f26de3af4972c6773eaced92ffa05d SHA512 e94e9dec47a69222fdbf35d69bd0d5de4e2db3d84a1c43bbe8ad2cecc974a64b286286b384f9d3071efa89741bc371a05dc9e732d78b868f99e3b4f081cfeae1 WHIRLPOOL 3f7e6e432e8e8d598d5e4c5e87fd89200a3635006506ad02c65ac01b99e095bda90eff5d37c58eeb84c4aafccf7d79a600c853d39a1672e6cf88b7a076fb85f0
-EBUILD selinux-nslcd-2.20170204-r3.ebuild 279 SHA256 767a158ca45732ae896a37ad95a5d91768f26de3af4972c6773eaced92ffa05d SHA512 e94e9dec47a69222fdbf35d69bd0d5de4e2db3d84a1c43bbe8ad2cecc974a64b286286b384f9d3071efa89741bc371a05dc9e732d78b868f99e3b4f081cfeae1 WHIRLPOOL 3f7e6e432e8e8d598d5e4c5e87fd89200a3635006506ad02c65ac01b99e095bda90eff5d37c58eeb84c4aafccf7d79a600c853d39a1672e6cf88b7a076fb85f0
-EBUILD selinux-nslcd-2.20170204-r4.ebuild 279 SHA256 767a158ca45732ae896a37ad95a5d91768f26de3af4972c6773eaced92ffa05d SHA512 e94e9dec47a69222fdbf35d69bd0d5de4e2db3d84a1c43bbe8ad2cecc974a64b286286b384f9d3071efa89741bc371a05dc9e732d78b868f99e3b4f081cfeae1 WHIRLPOOL 3f7e6e432e8e8d598d5e4c5e87fd89200a3635006506ad02c65ac01b99e095bda90eff5d37c58eeb84c4aafccf7d79a600c853d39a1672e6cf88b7a076fb85f0
-EBUILD selinux-nslcd-2.20170805-r2.ebuild 279 SHA256 767a158ca45732ae896a37ad95a5d91768f26de3af4972c6773eaced92ffa05d SHA512 e94e9dec47a69222fdbf35d69bd0d5de4e2db3d84a1c43bbe8ad2cecc974a64b286286b384f9d3071efa89741bc371a05dc9e732d78b868f99e3b4f081cfeae1 WHIRLPOOL 3f7e6e432e8e8d598d5e4c5e87fd89200a3635006506ad02c65ac01b99e095bda90eff5d37c58eeb84c4aafccf7d79a600c853d39a1672e6cf88b7a076fb85f0
-EBUILD selinux-nslcd-9999.ebuild 281 SHA256 b2cbe1a62d685dd5865ec145e5cc88906910d687b87704e9f14b73eaadc6341e SHA512 d179f330e123595c9380c3a739ee3d422401f31fd673f5ccb53718d0a08aeea8e171f77d9842a49073180e05e8206f53db8dc2ed457e97bf0802b0909aca4dd6 WHIRLPOOL 1325271e4f2f85bcf75f6bf679dd5bd03e5ad9008b6a64a7e55313df8390fbc86d3a0fb5c21aa761f736b875504736d02187495d0103b9776ef118151ae90f22
+EBUILD selinux-nslcd-2.20170204-r1.ebuild 282 SHA256 81cd23cd0c9f3760ebf1979d465a92a4d27eed0bd688ce754183f205d2b09b5f SHA512 62b491afab24fd6d650482d99c3e5f8ed1a12fd9d0a8e720ac8344db02b954571c017748a29a6c6a4407272bd5e75ad5d658359bad3907fb25cb98667b9186d7 WHIRLPOOL 56e8a173687aa5937883b60939231c063442945fb0ffd8daee19ec4aa6b14971fbe37b91bed3b81c1d5bd5189ec6aaad1ae250ac08983d16adb58f53973cc362
+EBUILD selinux-nslcd-2.20170204-r2.ebuild 280 SHA256 ba4ff42c0b692527380226ae53c31c6ac1bb297d7f108dc98345c1fb8b2ed190 SHA512 5692c7420601ef83861b6b59b5ad5c7775e88c236d1ae27b2f3ca704ef44fc3e5d3146dbd1b2e49efc66292422a7e147c4937f6feb59eab78a732f689c551585 WHIRLPOOL 2074fad1b7dacddf46576bdf4bebb62a364daee4de97bdf28551b53fcdb965703d3032cdfd9a3ab8ca6e7bb01de1730f685ad8087e59ee2f41d013756368b1ca
+EBUILD selinux-nslcd-2.20170204-r3.ebuild 280 SHA256 ba4ff42c0b692527380226ae53c31c6ac1bb297d7f108dc98345c1fb8b2ed190 SHA512 5692c7420601ef83861b6b59b5ad5c7775e88c236d1ae27b2f3ca704ef44fc3e5d3146dbd1b2e49efc66292422a7e147c4937f6feb59eab78a732f689c551585 WHIRLPOOL 2074fad1b7dacddf46576bdf4bebb62a364daee4de97bdf28551b53fcdb965703d3032cdfd9a3ab8ca6e7bb01de1730f685ad8087e59ee2f41d013756368b1ca
+EBUILD selinux-nslcd-2.20170204-r4.ebuild 280 SHA256 ba4ff42c0b692527380226ae53c31c6ac1bb297d7f108dc98345c1fb8b2ed190 SHA512 5692c7420601ef83861b6b59b5ad5c7775e88c236d1ae27b2f3ca704ef44fc3e5d3146dbd1b2e49efc66292422a7e147c4937f6feb59eab78a732f689c551585 WHIRLPOOL 2074fad1b7dacddf46576bdf4bebb62a364daee4de97bdf28551b53fcdb965703d3032cdfd9a3ab8ca6e7bb01de1730f685ad8087e59ee2f41d013756368b1ca
+EBUILD selinux-nslcd-2.20170805-r2.ebuild 280 SHA256 ba4ff42c0b692527380226ae53c31c6ac1bb297d7f108dc98345c1fb8b2ed190 SHA512 5692c7420601ef83861b6b59b5ad5c7775e88c236d1ae27b2f3ca704ef44fc3e5d3146dbd1b2e49efc66292422a7e147c4937f6feb59eab78a732f689c551585 WHIRLPOOL 2074fad1b7dacddf46576bdf4bebb62a364daee4de97bdf28551b53fcdb965703d3032cdfd9a3ab8ca6e7bb01de1730f685ad8087e59ee2f41d013756368b1ca
+EBUILD selinux-nslcd-2.20170805-r3.ebuild 282 SHA256 81cd23cd0c9f3760ebf1979d465a92a4d27eed0bd688ce754183f205d2b09b5f SHA512 62b491afab24fd6d650482d99c3e5f8ed1a12fd9d0a8e720ac8344db02b954571c017748a29a6c6a4407272bd5e75ad5d658359bad3907fb25cb98667b9186d7 WHIRLPOOL 56e8a173687aa5937883b60939231c063442945fb0ffd8daee19ec4aa6b14971fbe37b91bed3b81c1d5bd5189ec6aaad1ae250ac08983d16adb58f53973cc362
+EBUILD selinux-nslcd-9999.ebuild 282 SHA256 81cd23cd0c9f3760ebf1979d465a92a4d27eed0bd688ce754183f205d2b09b5f SHA512 62b491afab24fd6d650482d99c3e5f8ed1a12fd9d0a8e720ac8344db02b954571c017748a29a6c6a4407272bd5e75ad5d658359bad3907fb25cb98667b9186d7 WHIRLPOOL 56e8a173687aa5937883b60939231c063442945fb0ffd8daee19ec4aa6b14971fbe37b91bed3b81c1d5bd5189ec6aaad1ae250ac08983d16adb58f53973cc362
 MISC ChangeLog 10479 SHA256 905c2ed874dd8b247cae91a3f98e316ebdb09243ac2ae0fc345f6318c67a588d SHA512 a7ef7cc746f4b1115a81777cbcb928f9af7430dcba9df2d35a3a8879bbadf755d02f0cfb9e62c3cf20499ed25f2e16c9daa16d38da161b4db7941b7a93e019f0 WHIRLPOOL 26b480fb7922acf4932a7a5c2880e3bd9bfaca2ce3ab36a6ea59fe0c455cd582ed82aad6bedc2c75028a5cf425e16ad17a527ef3612ff31f4b54dcd50997c08b
 MISC ChangeLog-2015 8232 SHA256 3bd12bd8c374506f1f71402ebb273462f1b3232a23650b6fb6df6dccb27e59ab SHA512 89c478b7a3c5d3a52bb646a0ef0c2d2dc061b2062ae86b4fa89b8dfe7daf46387992f654420cef5a17ea832fb54492deffac40477aa34cfb6315a446a5624300 WHIRLPOOL f8c38580d32964eddaddc59511916a10569b5344e72a82d3a928145322892176460fc5bb93c64cdaf7c26b009796c6c9d7f627b1ccdda923c5a28bf8264294e0
 MISC metadata.xml 315 SHA256 2f79f82999a12159b0e70f583bc27d35399a72153be26f0992a010d416e82413 SHA512 c347218b8973a5e113fd27cbfdbc3f7b0f19938714ea7ac0896f1d3755aebee20409a94ecd8ada8131e7e4bee1e3286f81bd1129bdb4d27cbf10cd88fbefba78 WHIRLPOOL 976f0c64c8806b130a244c4c11897c1895365cd76bca1c9ea9534e022fcea9bec7fe4f7e824d30c8ee19a31f1e53588a56ca367dee159188e84879653980b7de
diff --git a/sec-policy/selinux-nslcd/selinux-nslcd-2.20170204-r1.ebuild b/sec-policy/selinux-nslcd/selinux-nslcd-2.20170204-r1.ebuild
index 658b8d2518b2..1911d5845dd7 100644
--- a/sec-policy/selinux-nslcd/selinux-nslcd-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-nslcd/selinux-nslcd-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-nslcd/selinux-nslcd-2.20170204-r2.ebuild b/sec-policy/selinux-nslcd/selinux-nslcd-2.20170204-r2.ebuild
index 2295c56455f3..042b51887a29 100644
--- a/sec-policy/selinux-nslcd/selinux-nslcd-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-nslcd/selinux-nslcd-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-nslcd/selinux-nslcd-2.20170204-r3.ebuild b/sec-policy/selinux-nslcd/selinux-nslcd-2.20170204-r3.ebuild
index 2295c56455f3..042b51887a29 100644
--- a/sec-policy/selinux-nslcd/selinux-nslcd-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-nslcd/selinux-nslcd-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-nslcd/selinux-nslcd-2.20170204-r4.ebuild b/sec-policy/selinux-nslcd/selinux-nslcd-2.20170204-r4.ebuild
index 2295c56455f3..042b51887a29 100644
--- a/sec-policy/selinux-nslcd/selinux-nslcd-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-nslcd/selinux-nslcd-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-nslcd/selinux-nslcd-2.20170805-r2.ebuild b/sec-policy/selinux-nslcd/selinux-nslcd-2.20170805-r2.ebuild
index 2295c56455f3..042b51887a29 100644
--- a/sec-policy/selinux-nslcd/selinux-nslcd-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-nslcd/selinux-nslcd-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-nslcd/selinux-nslcd-2.20170805-r3.ebuild b/sec-policy/selinux-nslcd/selinux-nslcd-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..1911d5845dd7
--- /dev/null
+++ b/sec-policy/selinux-nslcd/selinux-nslcd-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-nslcd/selinux-nslcd-9999.ebuild b/sec-policy/selinux-nslcd/selinux-nslcd-9999.ebuild
index 658b8d2518b2..1911d5845dd7 100644
--- a/sec-policy/selinux-nslcd/selinux-nslcd-9999.ebuild
+++ b/sec-policy/selinux-nslcd/selinux-nslcd-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ntop/Manifest b/sec-policy/selinux-ntop/Manifest
index 6e0f10906453..a22d16036b28 100644
--- a/sec-policy/selinux-ntop/Manifest
+++ b/sec-policy/selinux-ntop/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-ntop-2.20170204-r1.ebuild 279 SHA256 5cb642109a7656e6d9e28e12a6fe4861753f929744511039a0dbfb999f0a1324 SHA512 64e8eb2efaaead8a9362345ea833c4496d81cfda386d21e3851c4bf54d6595bcdee6368c0ac8d566bd29c274386bdcdf3ac5ec46e83a739e0d2cc7e5fe8922b9 WHIRLPOOL 8758394fe679743aea81437b287230d2164bbb1cb39608470befeb310d2eec66e9ed93ea6fbb14734c7f71b6cc22a684939543e5c131f00115f50beae784ef7b
-EBUILD selinux-ntop-2.20170204-r2.ebuild 277 SHA256 25d5adbc4ccf51e86960ff24cc70b0fb45f424216ed26d00eb17084acaa1ce26 SHA512 89cfddb9e7bc6994bc9040d1f0babc7346cdf8a5014e105be0575f1af93ced76048d8540ee6b247c800ced61d960721608efc5582eeb40fa4ca6e381c3decbd2 WHIRLPOOL c12e716a95b6bb5a2402cda686357dd5abaff42f81f3b8ef713068c17228651374a5f26087b64807dc674b96ae5910d84db7eacf7a9db94c0fbd2f911c05d666
-EBUILD selinux-ntop-2.20170204-r3.ebuild 277 SHA256 25d5adbc4ccf51e86960ff24cc70b0fb45f424216ed26d00eb17084acaa1ce26 SHA512 89cfddb9e7bc6994bc9040d1f0babc7346cdf8a5014e105be0575f1af93ced76048d8540ee6b247c800ced61d960721608efc5582eeb40fa4ca6e381c3decbd2 WHIRLPOOL c12e716a95b6bb5a2402cda686357dd5abaff42f81f3b8ef713068c17228651374a5f26087b64807dc674b96ae5910d84db7eacf7a9db94c0fbd2f911c05d666
-EBUILD selinux-ntop-2.20170204-r4.ebuild 277 SHA256 25d5adbc4ccf51e86960ff24cc70b0fb45f424216ed26d00eb17084acaa1ce26 SHA512 89cfddb9e7bc6994bc9040d1f0babc7346cdf8a5014e105be0575f1af93ced76048d8540ee6b247c800ced61d960721608efc5582eeb40fa4ca6e381c3decbd2 WHIRLPOOL c12e716a95b6bb5a2402cda686357dd5abaff42f81f3b8ef713068c17228651374a5f26087b64807dc674b96ae5910d84db7eacf7a9db94c0fbd2f911c05d666
-EBUILD selinux-ntop-2.20170805-r2.ebuild 277 SHA256 25d5adbc4ccf51e86960ff24cc70b0fb45f424216ed26d00eb17084acaa1ce26 SHA512 89cfddb9e7bc6994bc9040d1f0babc7346cdf8a5014e105be0575f1af93ced76048d8540ee6b247c800ced61d960721608efc5582eeb40fa4ca6e381c3decbd2 WHIRLPOOL c12e716a95b6bb5a2402cda686357dd5abaff42f81f3b8ef713068c17228651374a5f26087b64807dc674b96ae5910d84db7eacf7a9db94c0fbd2f911c05d666
-EBUILD selinux-ntop-9999.ebuild 279 SHA256 5cb642109a7656e6d9e28e12a6fe4861753f929744511039a0dbfb999f0a1324 SHA512 64e8eb2efaaead8a9362345ea833c4496d81cfda386d21e3851c4bf54d6595bcdee6368c0ac8d566bd29c274386bdcdf3ac5ec46e83a739e0d2cc7e5fe8922b9 WHIRLPOOL 8758394fe679743aea81437b287230d2164bbb1cb39608470befeb310d2eec66e9ed93ea6fbb14734c7f71b6cc22a684939543e5c131f00115f50beae784ef7b
+EBUILD selinux-ntop-2.20170204-r1.ebuild 280 SHA256 a0c6600e06807d97d08152f68da16a7b910c48dcf08414b620846a4c720c1390 SHA512 01c602a12217535d87d254634f1ab5e8616027b696b06333ed7a2b3b251e8584bbca57067dce866af16a8f4ec3e550f7470f245e3a51c23dbcda08d6ea45555e WHIRLPOOL 74eab88156a071fd6c8b5f4171cedd34acffbd55ab77eabf2d58d27a6cdf51f3ed78c2420d5913f013e715eff050e3dc3a4d124165830fa8d049e9333a204539
+EBUILD selinux-ntop-2.20170204-r2.ebuild 278 SHA256 9186ad5026fee7ece8f62144d4d25b15fde5474bb985f9b388ed706b122a7fdf SHA512 f835ddfc67c38bec8dceba95ba11039eb4b6608e02ba2f0a8ec4bbf77091c43bbf89b7d7c06ec3c444933cd25b0a0df9276844cc183f164a00d5b73338b145f1 WHIRLPOOL ea828ee10ec455b48c66c893ca48ba75ac5fb070f9b0a93f3e826024e205c1e8c6fcb1478d896e04e29bd191f633f2a7d5eb93decc995714c5657f6b37897f44
+EBUILD selinux-ntop-2.20170204-r3.ebuild 278 SHA256 9186ad5026fee7ece8f62144d4d25b15fde5474bb985f9b388ed706b122a7fdf SHA512 f835ddfc67c38bec8dceba95ba11039eb4b6608e02ba2f0a8ec4bbf77091c43bbf89b7d7c06ec3c444933cd25b0a0df9276844cc183f164a00d5b73338b145f1 WHIRLPOOL ea828ee10ec455b48c66c893ca48ba75ac5fb070f9b0a93f3e826024e205c1e8c6fcb1478d896e04e29bd191f633f2a7d5eb93decc995714c5657f6b37897f44
+EBUILD selinux-ntop-2.20170204-r4.ebuild 278 SHA256 9186ad5026fee7ece8f62144d4d25b15fde5474bb985f9b388ed706b122a7fdf SHA512 f835ddfc67c38bec8dceba95ba11039eb4b6608e02ba2f0a8ec4bbf77091c43bbf89b7d7c06ec3c444933cd25b0a0df9276844cc183f164a00d5b73338b145f1 WHIRLPOOL ea828ee10ec455b48c66c893ca48ba75ac5fb070f9b0a93f3e826024e205c1e8c6fcb1478d896e04e29bd191f633f2a7d5eb93decc995714c5657f6b37897f44
+EBUILD selinux-ntop-2.20170805-r2.ebuild 278 SHA256 9186ad5026fee7ece8f62144d4d25b15fde5474bb985f9b388ed706b122a7fdf SHA512 f835ddfc67c38bec8dceba95ba11039eb4b6608e02ba2f0a8ec4bbf77091c43bbf89b7d7c06ec3c444933cd25b0a0df9276844cc183f164a00d5b73338b145f1 WHIRLPOOL ea828ee10ec455b48c66c893ca48ba75ac5fb070f9b0a93f3e826024e205c1e8c6fcb1478d896e04e29bd191f633f2a7d5eb93decc995714c5657f6b37897f44
+EBUILD selinux-ntop-2.20170805-r3.ebuild 280 SHA256 a0c6600e06807d97d08152f68da16a7b910c48dcf08414b620846a4c720c1390 SHA512 01c602a12217535d87d254634f1ab5e8616027b696b06333ed7a2b3b251e8584bbca57067dce866af16a8f4ec3e550f7470f245e3a51c23dbcda08d6ea45555e WHIRLPOOL 74eab88156a071fd6c8b5f4171cedd34acffbd55ab77eabf2d58d27a6cdf51f3ed78c2420d5913f013e715eff050e3dc3a4d124165830fa8d049e9333a204539
+EBUILD selinux-ntop-9999.ebuild 280 SHA256 a0c6600e06807d97d08152f68da16a7b910c48dcf08414b620846a4c720c1390 SHA512 01c602a12217535d87d254634f1ab5e8616027b696b06333ed7a2b3b251e8584bbca57067dce866af16a8f4ec3e550f7470f245e3a51c23dbcda08d6ea45555e WHIRLPOOL 74eab88156a071fd6c8b5f4171cedd34acffbd55ab77eabf2d58d27a6cdf51f3ed78c2420d5913f013e715eff050e3dc3a4d124165830fa8d049e9333a204539
 MISC ChangeLog 10387 SHA256 273a9d6ec68686f2ec1e8c1293e8a5a12ed14ee7396a7034439a34e740761ccc SHA512 af3e1bf00fe790646a500711f471a6572fac0023fcf374924b60bf4c23aba23d56d7d022ef716d1b9e79e180228047dcc72d44547f9435b9a0ab18728bbdb646 WHIRLPOOL 9bf846ae73a93160870193baf4e85a25a193addda74fda4bcc74989937cac2a50bd8c16507fff6eaf500c0f4e0ec27cadac3999b1ef39716a21372a733186dc7
 MISC ChangeLog-2015 12211 SHA256 5bc94793583c05334bf61d6d1a3474e5211bde382ac81c0540b8a8d4b0b6f313 SHA512 cb3e90b232617e88fdb46b35a697c6beb1891a19b45821103cd8c187f5718ccfc5a1932c8d09c2614b551dda6e560ef964ca56c9fda3447b96007a2d684b2752 WHIRLPOOL 8683d882749e51ed75a3de779c8b00baa1bde9d7ee4facd57372c2bcfaf946cc2b6a27f5b973beba2a294419b30cfcbdba71bc56b234ee8e446c6cb6b9f7f3ae
 MISC metadata.xml 314 SHA256 86407fd2a93cd902f700bcdfb35b318072d3d63fc4341b1beb1c7e31eb171910 SHA512 c8b7f3a30b340a90da32b188b2ea37ea243e11843aa69310c49e2b2f7e69556c77f96e5f2f9355dca5d46d3c3fa6899f1732e14ff43e6173413aa06fe974333f WHIRLPOOL d0a89216903b1ec7504c48af46d742ea690d3c2f7bc84081d55d28a99d66450e6ca3200a367ced4fc91d80ff5d78529c8b7d01fdab97a6f30777c44928611ad6
diff --git a/sec-policy/selinux-ntop/selinux-ntop-2.20170204-r1.ebuild b/sec-policy/selinux-ntop/selinux-ntop-2.20170204-r1.ebuild
index 33a9ecef10de..b234f2c1347f 100644
--- a/sec-policy/selinux-ntop/selinux-ntop-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-ntop/selinux-ntop-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ntop/selinux-ntop-2.20170204-r2.ebuild b/sec-policy/selinux-ntop/selinux-ntop-2.20170204-r2.ebuild
index 8745968240c6..fef41238e825 100644
--- a/sec-policy/selinux-ntop/selinux-ntop-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-ntop/selinux-ntop-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ntop/selinux-ntop-2.20170204-r3.ebuild b/sec-policy/selinux-ntop/selinux-ntop-2.20170204-r3.ebuild
index 8745968240c6..fef41238e825 100644
--- a/sec-policy/selinux-ntop/selinux-ntop-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-ntop/selinux-ntop-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ntop/selinux-ntop-2.20170204-r4.ebuild b/sec-policy/selinux-ntop/selinux-ntop-2.20170204-r4.ebuild
index 8745968240c6..fef41238e825 100644
--- a/sec-policy/selinux-ntop/selinux-ntop-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-ntop/selinux-ntop-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ntop/selinux-ntop-2.20170805-r2.ebuild b/sec-policy/selinux-ntop/selinux-ntop-2.20170805-r2.ebuild
index 8745968240c6..fef41238e825 100644
--- a/sec-policy/selinux-ntop/selinux-ntop-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-ntop/selinux-ntop-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ntop/selinux-ntop-2.20170805-r3.ebuild b/sec-policy/selinux-ntop/selinux-ntop-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..b234f2c1347f
--- /dev/null
+++ b/sec-policy/selinux-ntop/selinux-ntop-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-ntop/selinux-ntop-9999.ebuild b/sec-policy/selinux-ntop/selinux-ntop-9999.ebuild
index 33a9ecef10de..b234f2c1347f 100644
--- a/sec-policy/selinux-ntop/selinux-ntop-9999.ebuild
+++ b/sec-policy/selinux-ntop/selinux-ntop-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ntp/Manifest b/sec-policy/selinux-ntp/Manifest
index c859ff90d5a6..2e1ec9d52c6b 100644
--- a/sec-policy/selinux-ntp/Manifest
+++ b/sec-policy/selinux-ntp/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-ntp-2.20170204-r1.ebuild 277 SHA256 0a2b26f7a1bbfa3297c3d6d3b8103bea8afc340f2bfd5655c159a68fa2474aae SHA512 2feca259928644c9271d1e37aa6f0e74a3486d25d147f95d8501ec19ef370ba2bd382048206de8e372817711a054c07a98dbc4ce4a59dda25d98b3917ea28016 WHIRLPOOL 5276c4498f1918e495904ed6c8e7fa15afad6724ad832c36ef16f94e0bb8433e8c03e1b821553faa10ac3ddf0b88fbfc12e9f8a29c948445815c8ec046de6964
-EBUILD selinux-ntp-2.20170204-r2.ebuild 275 SHA256 a569a0fb1ad6c6ec9b51955a2896ff3c951594647d565d8156b06700c521f90c SHA512 36accc2c6f921260d793a5f335fb309383453cf14b2d28aac610604908b6df207854b524c5f562b06952905d5896466abb2f521ab35c1480ccab4bf44fd1df6e WHIRLPOOL 63d578a7b0fc5c6e7a528d65d6095ebc0fee0b5a5b100d5735eb30f1cde4158053bc78d83e07d9c2d3ab68b2e40118bd32e9d1d5993262e4741a53a275a11d7c
-EBUILD selinux-ntp-2.20170204-r3.ebuild 275 SHA256 a569a0fb1ad6c6ec9b51955a2896ff3c951594647d565d8156b06700c521f90c SHA512 36accc2c6f921260d793a5f335fb309383453cf14b2d28aac610604908b6df207854b524c5f562b06952905d5896466abb2f521ab35c1480ccab4bf44fd1df6e WHIRLPOOL 63d578a7b0fc5c6e7a528d65d6095ebc0fee0b5a5b100d5735eb30f1cde4158053bc78d83e07d9c2d3ab68b2e40118bd32e9d1d5993262e4741a53a275a11d7c
-EBUILD selinux-ntp-2.20170204-r4.ebuild 275 SHA256 a569a0fb1ad6c6ec9b51955a2896ff3c951594647d565d8156b06700c521f90c SHA512 36accc2c6f921260d793a5f335fb309383453cf14b2d28aac610604908b6df207854b524c5f562b06952905d5896466abb2f521ab35c1480ccab4bf44fd1df6e WHIRLPOOL 63d578a7b0fc5c6e7a528d65d6095ebc0fee0b5a5b100d5735eb30f1cde4158053bc78d83e07d9c2d3ab68b2e40118bd32e9d1d5993262e4741a53a275a11d7c
-EBUILD selinux-ntp-2.20170805-r2.ebuild 275 SHA256 a569a0fb1ad6c6ec9b51955a2896ff3c951594647d565d8156b06700c521f90c SHA512 36accc2c6f921260d793a5f335fb309383453cf14b2d28aac610604908b6df207854b524c5f562b06952905d5896466abb2f521ab35c1480ccab4bf44fd1df6e WHIRLPOOL 63d578a7b0fc5c6e7a528d65d6095ebc0fee0b5a5b100d5735eb30f1cde4158053bc78d83e07d9c2d3ab68b2e40118bd32e9d1d5993262e4741a53a275a11d7c
-EBUILD selinux-ntp-9999.ebuild 277 SHA256 0a2b26f7a1bbfa3297c3d6d3b8103bea8afc340f2bfd5655c159a68fa2474aae SHA512 2feca259928644c9271d1e37aa6f0e74a3486d25d147f95d8501ec19ef370ba2bd382048206de8e372817711a054c07a98dbc4ce4a59dda25d98b3917ea28016 WHIRLPOOL 5276c4498f1918e495904ed6c8e7fa15afad6724ad832c36ef16f94e0bb8433e8c03e1b821553faa10ac3ddf0b88fbfc12e9f8a29c948445815c8ec046de6964
+EBUILD selinux-ntp-2.20170204-r1.ebuild 278 SHA256 039fd852a88e87efee91735357d81e903a57020752608f28ff419290109c0dcd SHA512 84260058e67bf10eca361682ae219ab25708fd1377e654d0b7f3290977690ccfcc89194b62bfec3edb80c487985fe31995f4dc576d66ff7c9784e9bd638625b1 WHIRLPOOL 23e835216d33c80f35f563bc97e5f30cb2279b2bb9befd4e9b9c8c82524c932e236173ad92e76cd0edb805856b6dea5f69d1339323e7cbc2239d5478ba5ed156
+EBUILD selinux-ntp-2.20170204-r2.ebuild 276 SHA256 d39b935c02c5f1d39422a004a05b64ebeea35d116feb356d2ee17c04ff00872d SHA512 1fa0c446d5e3ce7b128b4d4f6a652ce7afc047ebdcb8d92357eeeb33b989ac81c1461bc295bb18d61904a5e891fec3c9d6d3880671c7952b2ffe8d0056c63bed WHIRLPOOL 379aa63afade952a272fe8d95d29b4d3a697376ec431f43d66b2e65b3d8add8f25d1a3939ff9c55ffe750eceb3d02328d05e7d2639ab9268bff08952bcd2e463
+EBUILD selinux-ntp-2.20170204-r3.ebuild 276 SHA256 d39b935c02c5f1d39422a004a05b64ebeea35d116feb356d2ee17c04ff00872d SHA512 1fa0c446d5e3ce7b128b4d4f6a652ce7afc047ebdcb8d92357eeeb33b989ac81c1461bc295bb18d61904a5e891fec3c9d6d3880671c7952b2ffe8d0056c63bed WHIRLPOOL 379aa63afade952a272fe8d95d29b4d3a697376ec431f43d66b2e65b3d8add8f25d1a3939ff9c55ffe750eceb3d02328d05e7d2639ab9268bff08952bcd2e463
+EBUILD selinux-ntp-2.20170204-r4.ebuild 276 SHA256 d39b935c02c5f1d39422a004a05b64ebeea35d116feb356d2ee17c04ff00872d SHA512 1fa0c446d5e3ce7b128b4d4f6a652ce7afc047ebdcb8d92357eeeb33b989ac81c1461bc295bb18d61904a5e891fec3c9d6d3880671c7952b2ffe8d0056c63bed WHIRLPOOL 379aa63afade952a272fe8d95d29b4d3a697376ec431f43d66b2e65b3d8add8f25d1a3939ff9c55ffe750eceb3d02328d05e7d2639ab9268bff08952bcd2e463
+EBUILD selinux-ntp-2.20170805-r2.ebuild 276 SHA256 d39b935c02c5f1d39422a004a05b64ebeea35d116feb356d2ee17c04ff00872d SHA512 1fa0c446d5e3ce7b128b4d4f6a652ce7afc047ebdcb8d92357eeeb33b989ac81c1461bc295bb18d61904a5e891fec3c9d6d3880671c7952b2ffe8d0056c63bed WHIRLPOOL 379aa63afade952a272fe8d95d29b4d3a697376ec431f43d66b2e65b3d8add8f25d1a3939ff9c55ffe750eceb3d02328d05e7d2639ab9268bff08952bcd2e463
+EBUILD selinux-ntp-2.20170805-r3.ebuild 278 SHA256 039fd852a88e87efee91735357d81e903a57020752608f28ff419290109c0dcd SHA512 84260058e67bf10eca361682ae219ab25708fd1377e654d0b7f3290977690ccfcc89194b62bfec3edb80c487985fe31995f4dc576d66ff7c9784e9bd638625b1 WHIRLPOOL 23e835216d33c80f35f563bc97e5f30cb2279b2bb9befd4e9b9c8c82524c932e236173ad92e76cd0edb805856b6dea5f69d1339323e7cbc2239d5478ba5ed156
+EBUILD selinux-ntp-9999.ebuild 278 SHA256 039fd852a88e87efee91735357d81e903a57020752608f28ff419290109c0dcd SHA512 84260058e67bf10eca361682ae219ab25708fd1377e654d0b7f3290977690ccfcc89194b62bfec3edb80c487985fe31995f4dc576d66ff7c9784e9bd638625b1 WHIRLPOOL 23e835216d33c80f35f563bc97e5f30cb2279b2bb9befd4e9b9c8c82524c932e236173ad92e76cd0edb805856b6dea5f69d1339323e7cbc2239d5478ba5ed156
 MISC ChangeLog 10295 SHA256 cec6f9f293ab82443bd372c59c7f2947bb902fe66cf81c694291d1fb95d31ce2 SHA512 ed38a014e5193c1003a9736040ddc7fd888d657ea7ebb548c02f2b7cfa19acfde1913ca5a30d0b9342343ed5cdecba517c5aa6237430bdea08a2d3d403821fd7 WHIRLPOOL b2870ff74f8f03849bc9f0557a1f5a1183cca79f10e62a626858c983b05cae47afa8abdc9e8e3340df4976cae0bc23c9c91bc4181343f83a78f124869ae1682c
 MISC ChangeLog-2015 14226 SHA256 78e44dcc52543297bec4c7554f13b9347fa50371cfd637ee4eb75a83a3f47d75 SHA512 6479d3fe8fc6586e07d0d87e0e20776e65752cf72bf4183462500048de643785ad7028d3871c16f7e91cef8b65f580655e83bf0c8bf791e31d9db68f935a1636 WHIRLPOOL ba5bdd338b9fa21be6681196a97fbaaafb3446e53dd0d553bd539103def5d8c55158bb60946f2244493e0a200a8207a405d8817f0f175e91dcc17bdb745e480f
 MISC metadata.xml 313 SHA256 26e274a77b6657624a766063623048717398cdac98dd2db36ed374dc98f01cb2 SHA512 a8e07dfa0336b16ca67328dc4a299930348e725477f9cb37026e8d73a50635294ea9f1ab9174e3de396211596adfdc156e71e897cd177c7d590da460d6e19b41 WHIRLPOOL 70c095195f2c0d09d1385116893beacd3420da34582b85f88bb3d911ff3735a3b61da48d63d1524acea3d611a81408f98e83bf2c082760f2d03c61eacde03845
diff --git a/sec-policy/selinux-ntp/selinux-ntp-2.20170204-r1.ebuild b/sec-policy/selinux-ntp/selinux-ntp-2.20170204-r1.ebuild
index fd93465ccdb9..0370a473c119 100644
--- a/sec-policy/selinux-ntp/selinux-ntp-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-ntp/selinux-ntp-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ntp/selinux-ntp-2.20170204-r2.ebuild b/sec-policy/selinux-ntp/selinux-ntp-2.20170204-r2.ebuild
index 1e7cc184fd83..f3c6f0b241b9 100644
--- a/sec-policy/selinux-ntp/selinux-ntp-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-ntp/selinux-ntp-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ntp/selinux-ntp-2.20170204-r3.ebuild b/sec-policy/selinux-ntp/selinux-ntp-2.20170204-r3.ebuild
index 1e7cc184fd83..f3c6f0b241b9 100644
--- a/sec-policy/selinux-ntp/selinux-ntp-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-ntp/selinux-ntp-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ntp/selinux-ntp-2.20170204-r4.ebuild b/sec-policy/selinux-ntp/selinux-ntp-2.20170204-r4.ebuild
index 1e7cc184fd83..f3c6f0b241b9 100644
--- a/sec-policy/selinux-ntp/selinux-ntp-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-ntp/selinux-ntp-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ntp/selinux-ntp-2.20170805-r2.ebuild b/sec-policy/selinux-ntp/selinux-ntp-2.20170805-r2.ebuild
index 1e7cc184fd83..f3c6f0b241b9 100644
--- a/sec-policy/selinux-ntp/selinux-ntp-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-ntp/selinux-ntp-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ntp/selinux-ntp-2.20170805-r3.ebuild b/sec-policy/selinux-ntp/selinux-ntp-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..0370a473c119
--- /dev/null
+++ b/sec-policy/selinux-ntp/selinux-ntp-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-ntp/selinux-ntp-9999.ebuild b/sec-policy/selinux-ntp/selinux-ntp-9999.ebuild
index fd93465ccdb9..0370a473c119 100644
--- a/sec-policy/selinux-ntp/selinux-ntp-9999.ebuild
+++ b/sec-policy/selinux-ntp/selinux-ntp-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-nut/Manifest b/sec-policy/selinux-nut/Manifest
index afe3c674e67e..494c00efbda2 100644
--- a/sec-policy/selinux-nut/Manifest
+++ b/sec-policy/selinux-nut/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-nut-2.20170204-r1.ebuild 373 SHA256 af7259c953d02d52626b7cfec1e22054d01d49e5704e52c4b1b1c453a6897af0 SHA512 3f4d4e946ba5e1a9516598595a404cf6aa251689c563132f77851cfcf347e4453555216b170fddbdb864f90edc16569f11979af2537c49373b8c0b758093695b WHIRLPOOL bc154739f19532fd42eb5fdb0f83e24a0c45b63d4ba7bef201fbc097718345f3979cae141321a33652608f3c04891e57c2b967fe4fb1bb3861f2aad22ece20c5
-EBUILD selinux-nut-2.20170204-r2.ebuild 371 SHA256 bf96df65fbff351faaed57ff6d90e633002c227ba66ea99fccc1cec0c2cba449 SHA512 77418566113d09e9eee7db7a143f595a450594f3d159ec876f855cc6020e634908023c66ff2c6dcd29edbe5250dbb6362812902ecc3691782edd293217e2a1a7 WHIRLPOOL 03c44ba9c197a75c67c59ca54c4d4dc2d034bf9743b232048e8b971980c57407f669f88216242cab96614b1fcbff6cbeecfd84e2e023c301f5d55ef487fd8b85
-EBUILD selinux-nut-2.20170204-r3.ebuild 371 SHA256 bf96df65fbff351faaed57ff6d90e633002c227ba66ea99fccc1cec0c2cba449 SHA512 77418566113d09e9eee7db7a143f595a450594f3d159ec876f855cc6020e634908023c66ff2c6dcd29edbe5250dbb6362812902ecc3691782edd293217e2a1a7 WHIRLPOOL 03c44ba9c197a75c67c59ca54c4d4dc2d034bf9743b232048e8b971980c57407f669f88216242cab96614b1fcbff6cbeecfd84e2e023c301f5d55ef487fd8b85
-EBUILD selinux-nut-2.20170204-r4.ebuild 371 SHA256 bf96df65fbff351faaed57ff6d90e633002c227ba66ea99fccc1cec0c2cba449 SHA512 77418566113d09e9eee7db7a143f595a450594f3d159ec876f855cc6020e634908023c66ff2c6dcd29edbe5250dbb6362812902ecc3691782edd293217e2a1a7 WHIRLPOOL 03c44ba9c197a75c67c59ca54c4d4dc2d034bf9743b232048e8b971980c57407f669f88216242cab96614b1fcbff6cbeecfd84e2e023c301f5d55ef487fd8b85
-EBUILD selinux-nut-2.20170805-r2.ebuild 371 SHA256 bf96df65fbff351faaed57ff6d90e633002c227ba66ea99fccc1cec0c2cba449 SHA512 77418566113d09e9eee7db7a143f595a450594f3d159ec876f855cc6020e634908023c66ff2c6dcd29edbe5250dbb6362812902ecc3691782edd293217e2a1a7 WHIRLPOOL 03c44ba9c197a75c67c59ca54c4d4dc2d034bf9743b232048e8b971980c57407f669f88216242cab96614b1fcbff6cbeecfd84e2e023c301f5d55ef487fd8b85
-EBUILD selinux-nut-9999.ebuild 373 SHA256 af7259c953d02d52626b7cfec1e22054d01d49e5704e52c4b1b1c453a6897af0 SHA512 3f4d4e946ba5e1a9516598595a404cf6aa251689c563132f77851cfcf347e4453555216b170fddbdb864f90edc16569f11979af2537c49373b8c0b758093695b WHIRLPOOL bc154739f19532fd42eb5fdb0f83e24a0c45b63d4ba7bef201fbc097718345f3979cae141321a33652608f3c04891e57c2b967fe4fb1bb3861f2aad22ece20c5
+EBUILD selinux-nut-2.20170204-r1.ebuild 374 SHA256 2802e382d72349c46364774bd4b56ca66bc3be576db970d5df5d0acde3ac1b29 SHA512 a53e567ee0aac9a11c24c08e0317ad250c7df8362693177fb2ba0a4fe3a692e01c4ee5f822db56ba92940d85fafbf61b1d317a4147fd471e379f21eeb12d2c5e WHIRLPOOL 8a6be5b48324966242ad45715de0b2a850487319ca1b0d4d64354abdec289ab9e60ba4f4c94bc41f922676844a087a87a9a2a6fd43007f818712f903e1b10d06
+EBUILD selinux-nut-2.20170204-r2.ebuild 372 SHA256 93ae2f6dffebb98fc07c9f01e30fb9553b267c565ded1703634df1ea08d34c67 SHA512 2762121b4a52d87711f1dee91c9d0f46f7548ce8db5ad55420f0bc1671eeb55be48f12e5a5ce535b3122faf6f6c7903f7bfc1874687defb1ec1605d73eeb44d8 WHIRLPOOL e8293938eebbcb5e39ded61fa608c1ff9c807868b6ec55f0b78d46c7aad6076e630a5f20116f22a14b9d5abc24d453c2ea071103ee186a27dacb85b1106e25cf
+EBUILD selinux-nut-2.20170204-r3.ebuild 372 SHA256 93ae2f6dffebb98fc07c9f01e30fb9553b267c565ded1703634df1ea08d34c67 SHA512 2762121b4a52d87711f1dee91c9d0f46f7548ce8db5ad55420f0bc1671eeb55be48f12e5a5ce535b3122faf6f6c7903f7bfc1874687defb1ec1605d73eeb44d8 WHIRLPOOL e8293938eebbcb5e39ded61fa608c1ff9c807868b6ec55f0b78d46c7aad6076e630a5f20116f22a14b9d5abc24d453c2ea071103ee186a27dacb85b1106e25cf
+EBUILD selinux-nut-2.20170204-r4.ebuild 372 SHA256 93ae2f6dffebb98fc07c9f01e30fb9553b267c565ded1703634df1ea08d34c67 SHA512 2762121b4a52d87711f1dee91c9d0f46f7548ce8db5ad55420f0bc1671eeb55be48f12e5a5ce535b3122faf6f6c7903f7bfc1874687defb1ec1605d73eeb44d8 WHIRLPOOL e8293938eebbcb5e39ded61fa608c1ff9c807868b6ec55f0b78d46c7aad6076e630a5f20116f22a14b9d5abc24d453c2ea071103ee186a27dacb85b1106e25cf
+EBUILD selinux-nut-2.20170805-r2.ebuild 372 SHA256 93ae2f6dffebb98fc07c9f01e30fb9553b267c565ded1703634df1ea08d34c67 SHA512 2762121b4a52d87711f1dee91c9d0f46f7548ce8db5ad55420f0bc1671eeb55be48f12e5a5ce535b3122faf6f6c7903f7bfc1874687defb1ec1605d73eeb44d8 WHIRLPOOL e8293938eebbcb5e39ded61fa608c1ff9c807868b6ec55f0b78d46c7aad6076e630a5f20116f22a14b9d5abc24d453c2ea071103ee186a27dacb85b1106e25cf
+EBUILD selinux-nut-2.20170805-r3.ebuild 374 SHA256 2802e382d72349c46364774bd4b56ca66bc3be576db970d5df5d0acde3ac1b29 SHA512 a53e567ee0aac9a11c24c08e0317ad250c7df8362693177fb2ba0a4fe3a692e01c4ee5f822db56ba92940d85fafbf61b1d317a4147fd471e379f21eeb12d2c5e WHIRLPOOL 8a6be5b48324966242ad45715de0b2a850487319ca1b0d4d64354abdec289ab9e60ba4f4c94bc41f922676844a087a87a9a2a6fd43007f818712f903e1b10d06
+EBUILD selinux-nut-9999.ebuild 374 SHA256 2802e382d72349c46364774bd4b56ca66bc3be576db970d5df5d0acde3ac1b29 SHA512 a53e567ee0aac9a11c24c08e0317ad250c7df8362693177fb2ba0a4fe3a692e01c4ee5f822db56ba92940d85fafbf61b1d317a4147fd471e379f21eeb12d2c5e WHIRLPOOL 8a6be5b48324966242ad45715de0b2a850487319ca1b0d4d64354abdec289ab9e60ba4f4c94bc41f922676844a087a87a9a2a6fd43007f818712f903e1b10d06
 MISC ChangeLog 10295 SHA256 f8b9ef6c09b87a8ce08cf30f986015509066ed6da3661a5f680def1714ae9fb1 SHA512 71946552e51fe39fe7690d3b66043ceec0db084116fce266d0d5945bcd04b3b5e4bc3f23ec40c4c8dd12dbcecaa0c0d2d1a28b74441e559689852f18b8d592f0 WHIRLPOOL b8ba59aaa97f90ca72f8609bcff3dded0eff78a303f5c6f43ccc62ecbe979fd59b242f7414a8e3db2cf9817a7464e796bcc259d18db1481914d8e030490d7d0f
 MISC ChangeLog-2015 9786 SHA256 71b5ff46239faf851a6904466c70d67f871bbfce7d9af8051ae67ef8e4c3f14e SHA512 4bb2598935d5dc1b33661477791e2dc97dc0877da47af4e65926829fb811d42e34ab550c98e0e5ff7ef730a1eeceb9417da3474c709088caa000036a3522d97a WHIRLPOOL 2cb0c98b4a95c7ac795520b74cb7873ad0e738b30282e8f3c4b447c5f2281e6892f2f3c4fba390e5194d6b53bb7114bf21d03585e6694f54028cfc9f5bb638a6
 MISC metadata.xml 313 SHA256 41c44166a367ad0454b2e1c78e9eb2e34fe364cbd928683761154960d286c08f SHA512 27ce423f0771c0420170fe4a345d4c16186376a787202bdb57dc770889295602d15574c95e916c6e50edb4877ff6216d7032893c601dc9f5f4c614452b5b6b1f WHIRLPOOL 3d62a0094f34fac79c516f65c83a90a56841bfc92cc5001427e45b787722157c12e0f610e3af52571bd7bc47ae63efea95358b2ca8b1f8ca45b2671a006abffb
diff --git a/sec-policy/selinux-nut/selinux-nut-2.20170204-r1.ebuild b/sec-policy/selinux-nut/selinux-nut-2.20170204-r1.ebuild
index 76e2dc31c812..1d268740c79e 100644
--- a/sec-policy/selinux-nut/selinux-nut-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-nut/selinux-nut-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-nut/selinux-nut-2.20170204-r2.ebuild b/sec-policy/selinux-nut/selinux-nut-2.20170204-r2.ebuild
index 0c6fb5f5b6ec..52278013312d 100644
--- a/sec-policy/selinux-nut/selinux-nut-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-nut/selinux-nut-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-nut/selinux-nut-2.20170204-r3.ebuild b/sec-policy/selinux-nut/selinux-nut-2.20170204-r3.ebuild
index 0c6fb5f5b6ec..52278013312d 100644
--- a/sec-policy/selinux-nut/selinux-nut-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-nut/selinux-nut-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-nut/selinux-nut-2.20170204-r4.ebuild b/sec-policy/selinux-nut/selinux-nut-2.20170204-r4.ebuild
index 0c6fb5f5b6ec..52278013312d 100644
--- a/sec-policy/selinux-nut/selinux-nut-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-nut/selinux-nut-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-nut/selinux-nut-2.20170805-r2.ebuild b/sec-policy/selinux-nut/selinux-nut-2.20170805-r2.ebuild
index 0c6fb5f5b6ec..52278013312d 100644
--- a/sec-policy/selinux-nut/selinux-nut-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-nut/selinux-nut-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-nut/selinux-nut-2.20170805-r3.ebuild b/sec-policy/selinux-nut/selinux-nut-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..1d268740c79e
--- /dev/null
+++ b/sec-policy/selinux-nut/selinux-nut-2.20170805-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-nut/selinux-nut-9999.ebuild b/sec-policy/selinux-nut/selinux-nut-9999.ebuild
index 76e2dc31c812..1d268740c79e 100644
--- a/sec-policy/selinux-nut/selinux-nut-9999.ebuild
+++ b/sec-policy/selinux-nut/selinux-nut-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-nx/Manifest b/sec-policy/selinux-nx/Manifest
index 36b421c4206f..7d0107014e33 100644
--- a/sec-policy/selinux-nx/Manifest
+++ b/sec-policy/selinux-nx/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-nx-2.20170204-r1.ebuild 275 SHA256 84e7f5f7a61f04edb7f52c16e0006aebd75c7835052cfdc16ebc48eaa66f1264 SHA512 f25fd3fe1db9a6bf6a2117ee90f7f3a13aa41d0feea60274fadd755e5c5d04485906fa158b04fa3b9153d2f6e17bfa79d888b702320c1305f671e231a7897504 WHIRLPOOL 4d7df17b3b877c22a2a14e88001d897919ef812bb43540fb0c8bae9524a667514d4d8e964a7dc36987723f107bb4ffa6b2e26005db884c73e1fbc265cc8246ce
-EBUILD selinux-nx-2.20170204-r2.ebuild 273 SHA256 fce413c7bd532d0bd23371fcf829f9f9d52bc484e79993a578226a5ec4bb5fba SHA512 c22689aa0555975a4ecc97b6c8d16272ab62b76258d91e236f1b48a399dc4cc9920c640b8af918df4e14eea396e32b8a6643d0f7ad2ddef319241aede8c60dc7 WHIRLPOOL d9db06ce55a839ce53d15b17ecf6a138b0727e3e3491a379ac109d3c52f476f8ca25cf11020240ec93b5caa60f7be941392d9f81d2177d36a91cd46ed3e3f458
-EBUILD selinux-nx-2.20170204-r3.ebuild 273 SHA256 fce413c7bd532d0bd23371fcf829f9f9d52bc484e79993a578226a5ec4bb5fba SHA512 c22689aa0555975a4ecc97b6c8d16272ab62b76258d91e236f1b48a399dc4cc9920c640b8af918df4e14eea396e32b8a6643d0f7ad2ddef319241aede8c60dc7 WHIRLPOOL d9db06ce55a839ce53d15b17ecf6a138b0727e3e3491a379ac109d3c52f476f8ca25cf11020240ec93b5caa60f7be941392d9f81d2177d36a91cd46ed3e3f458
-EBUILD selinux-nx-2.20170204-r4.ebuild 273 SHA256 fce413c7bd532d0bd23371fcf829f9f9d52bc484e79993a578226a5ec4bb5fba SHA512 c22689aa0555975a4ecc97b6c8d16272ab62b76258d91e236f1b48a399dc4cc9920c640b8af918df4e14eea396e32b8a6643d0f7ad2ddef319241aede8c60dc7 WHIRLPOOL d9db06ce55a839ce53d15b17ecf6a138b0727e3e3491a379ac109d3c52f476f8ca25cf11020240ec93b5caa60f7be941392d9f81d2177d36a91cd46ed3e3f458
-EBUILD selinux-nx-2.20170805-r2.ebuild 273 SHA256 fce413c7bd532d0bd23371fcf829f9f9d52bc484e79993a578226a5ec4bb5fba SHA512 c22689aa0555975a4ecc97b6c8d16272ab62b76258d91e236f1b48a399dc4cc9920c640b8af918df4e14eea396e32b8a6643d0f7ad2ddef319241aede8c60dc7 WHIRLPOOL d9db06ce55a839ce53d15b17ecf6a138b0727e3e3491a379ac109d3c52f476f8ca25cf11020240ec93b5caa60f7be941392d9f81d2177d36a91cd46ed3e3f458
-EBUILD selinux-nx-9999.ebuild 275 SHA256 84e7f5f7a61f04edb7f52c16e0006aebd75c7835052cfdc16ebc48eaa66f1264 SHA512 f25fd3fe1db9a6bf6a2117ee90f7f3a13aa41d0feea60274fadd755e5c5d04485906fa158b04fa3b9153d2f6e17bfa79d888b702320c1305f671e231a7897504 WHIRLPOOL 4d7df17b3b877c22a2a14e88001d897919ef812bb43540fb0c8bae9524a667514d4d8e964a7dc36987723f107bb4ffa6b2e26005db884c73e1fbc265cc8246ce
+EBUILD selinux-nx-2.20170204-r1.ebuild 276 SHA256 8682bcbdd014306f881ea7ef74badb18f86a0796e5d129099205534b37d0d8a1 SHA512 adc9190ac7444c198cb9793ba333ad07529b14a4aed2eabcc7cc0d681a4a7ea8a4e618303f9dbd50b1e7d5bc407cb15bad52d4495bfddc1edc085f9aa5eae254 WHIRLPOOL 5b2f21c72f471cd8fd968dba35df5b1ad5c619fed9c9a6a8d1e68f4c85ed90af66749c9ddddef4d71619cb61c01c68547d55c4b7b44e0fd0b723d3e18b4e35e2
+EBUILD selinux-nx-2.20170204-r2.ebuild 274 SHA256 2d6bb062a4c96ff6250a368674672dfded2b729674c4e63062edf3fa1e91fb28 SHA512 f7c29dedbb7b37b2e0d46e0815612319b2a263f9f7f53fca1afe38e894cda0ab4cd9c7db68f8e58de1bc28882d323eb28fac9d359bf236c96ef624d550e2fb50 WHIRLPOOL d1869870440453bc69148d4780cb01cea2b9114d379f108e0097236d4a5959700fe9a5e4d0427bdea1531da21856281a203613746f42b6d345946bccde23b443
+EBUILD selinux-nx-2.20170204-r3.ebuild 274 SHA256 2d6bb062a4c96ff6250a368674672dfded2b729674c4e63062edf3fa1e91fb28 SHA512 f7c29dedbb7b37b2e0d46e0815612319b2a263f9f7f53fca1afe38e894cda0ab4cd9c7db68f8e58de1bc28882d323eb28fac9d359bf236c96ef624d550e2fb50 WHIRLPOOL d1869870440453bc69148d4780cb01cea2b9114d379f108e0097236d4a5959700fe9a5e4d0427bdea1531da21856281a203613746f42b6d345946bccde23b443
+EBUILD selinux-nx-2.20170204-r4.ebuild 274 SHA256 2d6bb062a4c96ff6250a368674672dfded2b729674c4e63062edf3fa1e91fb28 SHA512 f7c29dedbb7b37b2e0d46e0815612319b2a263f9f7f53fca1afe38e894cda0ab4cd9c7db68f8e58de1bc28882d323eb28fac9d359bf236c96ef624d550e2fb50 WHIRLPOOL d1869870440453bc69148d4780cb01cea2b9114d379f108e0097236d4a5959700fe9a5e4d0427bdea1531da21856281a203613746f42b6d345946bccde23b443
+EBUILD selinux-nx-2.20170805-r2.ebuild 274 SHA256 2d6bb062a4c96ff6250a368674672dfded2b729674c4e63062edf3fa1e91fb28 SHA512 f7c29dedbb7b37b2e0d46e0815612319b2a263f9f7f53fca1afe38e894cda0ab4cd9c7db68f8e58de1bc28882d323eb28fac9d359bf236c96ef624d550e2fb50 WHIRLPOOL d1869870440453bc69148d4780cb01cea2b9114d379f108e0097236d4a5959700fe9a5e4d0427bdea1531da21856281a203613746f42b6d345946bccde23b443
+EBUILD selinux-nx-2.20170805-r3.ebuild 276 SHA256 8682bcbdd014306f881ea7ef74badb18f86a0796e5d129099205534b37d0d8a1 SHA512 adc9190ac7444c198cb9793ba333ad07529b14a4aed2eabcc7cc0d681a4a7ea8a4e618303f9dbd50b1e7d5bc407cb15bad52d4495bfddc1edc085f9aa5eae254 WHIRLPOOL 5b2f21c72f471cd8fd968dba35df5b1ad5c619fed9c9a6a8d1e68f4c85ed90af66749c9ddddef4d71619cb61c01c68547d55c4b7b44e0fd0b723d3e18b4e35e2
+EBUILD selinux-nx-9999.ebuild 276 SHA256 8682bcbdd014306f881ea7ef74badb18f86a0796e5d129099205534b37d0d8a1 SHA512 adc9190ac7444c198cb9793ba333ad07529b14a4aed2eabcc7cc0d681a4a7ea8a4e618303f9dbd50b1e7d5bc407cb15bad52d4495bfddc1edc085f9aa5eae254 WHIRLPOOL 5b2f21c72f471cd8fd968dba35df5b1ad5c619fed9c9a6a8d1e68f4c85ed90af66749c9ddddef4d71619cb61c01c68547d55c4b7b44e0fd0b723d3e18b4e35e2
 MISC ChangeLog 10203 SHA256 59d03df713c42e8db0460ae9de185255b71fa8ccd5cda859674c57b2b10c8ae5 SHA512 ef692a65638c7eb498cdfee593fcd524890f505af23428848f0eb2c7190f47f49b6c5e20d57e2f841ae22fd0de0d278b00f41cead834a4628b2b85edd8c37437 WHIRLPOOL ad898f259f35e24995edaafce198566bcaa9973419bc51011045f40bed596c0fcca437c4afd94b4b8b2e9bc4ac6295d55dea88d52bb115bf19a6b0e92024b21e
 MISC ChangeLog-2015 9411 SHA256 feb9c9e76333085ed5c2b4199bd2b94faebc1949c39e4c3c356420a28cf1b964 SHA512 d14c791015f8ee26440130402a9d3b9c8590d37a436d17dbfe5d42d97f567e618f315af7d7eaeef026de6c10a6ce3b7b8a6a96405ea3fee8be1bd9b3f266391a WHIRLPOOL 69fbcd75b749ecd579158751e4fce92a7a81562970014af98478ea5dd86c3448fe848a8c9e20576fea9e88b9dc275a2ae2581a274d6c26761053d43bce22a97b
 MISC metadata.xml 312 SHA256 65810d2a5af3cf4a79cc6c895fbbf7639520af7635edf6bb380fa9673373f137 SHA512 2974c5cf4c601110b07cdb7dbc5a246002de84c2c3f440b4b7ba80e1f325c34449d39ea026d63fa2a8a347d6025c5c487ce80429f8889b0b89f11c8cc2a5ab15 WHIRLPOOL ecaa0255ee35872f4d3b1e4d0a3127394266ef82a72771b50f829e46d8c49e9e379bbdfc664d83b8115284919bd810c3116cf8269ffff4e0df5edd4ed5ca9afa
diff --git a/sec-policy/selinux-nx/selinux-nx-2.20170204-r1.ebuild b/sec-policy/selinux-nx/selinux-nx-2.20170204-r1.ebuild
index b66cf0e4ea2f..32b6df252108 100644
--- a/sec-policy/selinux-nx/selinux-nx-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-nx/selinux-nx-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-nx/selinux-nx-2.20170204-r2.ebuild b/sec-policy/selinux-nx/selinux-nx-2.20170204-r2.ebuild
index 33b1d5d013d6..c69d81570ac5 100644
--- a/sec-policy/selinux-nx/selinux-nx-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-nx/selinux-nx-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-nx/selinux-nx-2.20170204-r3.ebuild b/sec-policy/selinux-nx/selinux-nx-2.20170204-r3.ebuild
index 33b1d5d013d6..c69d81570ac5 100644
--- a/sec-policy/selinux-nx/selinux-nx-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-nx/selinux-nx-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-nx/selinux-nx-2.20170204-r4.ebuild b/sec-policy/selinux-nx/selinux-nx-2.20170204-r4.ebuild
index 33b1d5d013d6..c69d81570ac5 100644
--- a/sec-policy/selinux-nx/selinux-nx-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-nx/selinux-nx-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-nx/selinux-nx-2.20170805-r2.ebuild b/sec-policy/selinux-nx/selinux-nx-2.20170805-r2.ebuild
index 33b1d5d013d6..c69d81570ac5 100644
--- a/sec-policy/selinux-nx/selinux-nx-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-nx/selinux-nx-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-nx/selinux-nx-2.20170805-r3.ebuild b/sec-policy/selinux-nx/selinux-nx-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..32b6df252108
--- /dev/null
+++ b/sec-policy/selinux-nx/selinux-nx-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-nx/selinux-nx-9999.ebuild b/sec-policy/selinux-nx/selinux-nx-9999.ebuild
index b66cf0e4ea2f..32b6df252108 100644
--- a/sec-policy/selinux-nx/selinux-nx-9999.ebuild
+++ b/sec-policy/selinux-nx/selinux-nx-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-oddjob/Manifest b/sec-policy/selinux-oddjob/Manifest
index c44e628f1495..fe7f4cae05ab 100644
--- a/sec-policy/selinux-oddjob/Manifest
+++ b/sec-policy/selinux-oddjob/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-oddjob-2.20170204-r1.ebuild 283 SHA256 e6c90a92a417e58b0ada80e4169a84ae64e0025f953affd946e4b4a2714160ea SHA512 d0a52798e6345c7a217a2d6bb50712687cd2ba735d2ad6b653585e1fadaa55546bf5649fb4acad064e67f764ec2e788322b5f283a306731e7eeaac8c03d42165 WHIRLPOOL 758f16c0c0c373b0b5608a6a8fce6211b0c2cab39681aad5f6861bad5f1ac8d48bf7860fa3ef3cdddb04681fe3ef30a6a1fd3029585c7fa804a4b850a540847b
-EBUILD selinux-oddjob-2.20170204-r2.ebuild 281 SHA256 32d257b92fe7f150bd23deba1ceb992b82202967b36cf8040bb8036139d92bb6 SHA512 61322e764994d7ba4b3916f299bf18dc2d220bc4517c717b7bc3e1d98d29aeb7ccbba501b2a4142ea2ee8b8370155aae90e88d1aeb38824e1c8d08f40d374d5c WHIRLPOOL dddc67b45c23f893024ac290ab3cf3f326b606e7ae468c56604113a781f48c8d5789936dcae56ad953afcac6b2be7129c0aa005b37b78a7ea78835273189840b
-EBUILD selinux-oddjob-2.20170204-r3.ebuild 281 SHA256 32d257b92fe7f150bd23deba1ceb992b82202967b36cf8040bb8036139d92bb6 SHA512 61322e764994d7ba4b3916f299bf18dc2d220bc4517c717b7bc3e1d98d29aeb7ccbba501b2a4142ea2ee8b8370155aae90e88d1aeb38824e1c8d08f40d374d5c WHIRLPOOL dddc67b45c23f893024ac290ab3cf3f326b606e7ae468c56604113a781f48c8d5789936dcae56ad953afcac6b2be7129c0aa005b37b78a7ea78835273189840b
-EBUILD selinux-oddjob-2.20170204-r4.ebuild 281 SHA256 32d257b92fe7f150bd23deba1ceb992b82202967b36cf8040bb8036139d92bb6 SHA512 61322e764994d7ba4b3916f299bf18dc2d220bc4517c717b7bc3e1d98d29aeb7ccbba501b2a4142ea2ee8b8370155aae90e88d1aeb38824e1c8d08f40d374d5c WHIRLPOOL dddc67b45c23f893024ac290ab3cf3f326b606e7ae468c56604113a781f48c8d5789936dcae56ad953afcac6b2be7129c0aa005b37b78a7ea78835273189840b
-EBUILD selinux-oddjob-2.20170805-r2.ebuild 281 SHA256 32d257b92fe7f150bd23deba1ceb992b82202967b36cf8040bb8036139d92bb6 SHA512 61322e764994d7ba4b3916f299bf18dc2d220bc4517c717b7bc3e1d98d29aeb7ccbba501b2a4142ea2ee8b8370155aae90e88d1aeb38824e1c8d08f40d374d5c WHIRLPOOL dddc67b45c23f893024ac290ab3cf3f326b606e7ae468c56604113a781f48c8d5789936dcae56ad953afcac6b2be7129c0aa005b37b78a7ea78835273189840b
-EBUILD selinux-oddjob-9999.ebuild 283 SHA256 e6c90a92a417e58b0ada80e4169a84ae64e0025f953affd946e4b4a2714160ea SHA512 d0a52798e6345c7a217a2d6bb50712687cd2ba735d2ad6b653585e1fadaa55546bf5649fb4acad064e67f764ec2e788322b5f283a306731e7eeaac8c03d42165 WHIRLPOOL 758f16c0c0c373b0b5608a6a8fce6211b0c2cab39681aad5f6861bad5f1ac8d48bf7860fa3ef3cdddb04681fe3ef30a6a1fd3029585c7fa804a4b850a540847b
+EBUILD selinux-oddjob-2.20170204-r1.ebuild 284 SHA256 e57cca8d7a608095cfba5d84939a63df2a4c4a00a12fa2b6ae141bcc95735cd9 SHA512 6a93548be71481d5bbd98115a309f52733798394c2a0394684fb5ee608f22b77ea1af504296b45967ad36c95eaa808ae1c9c4a13a05388b7f622e80a106cf2a3 WHIRLPOOL 1dff4363e249f9126c23c8675c1c5aeae32dd9573bd0c2ee54b8dfc6a8d2e3344fbf685ee4f9718db0f3dba7ccff011b548127c11ca7fa9a675cef17a1e6896d
+EBUILD selinux-oddjob-2.20170204-r2.ebuild 282 SHA256 f962e2e751f92afbc682008be456cb039426962f3f9163f603a087fea7052b81 SHA512 f56dde3c7082e107e3ff190ea059f40c64e9473902b4ef58b505537423c50836ceffe0fdc947cf5ef32e64a7afe7b749d34870b9b86510d093128c75e65ef446 WHIRLPOOL 4b5254db65a8ac5ce010253efe0f2d6616a3bb5a1dcd8a98d86cd78a7c1f5af1d58966d47a34dac5ace90b73e916f51870009823ddcd65688e4482320ca55393
+EBUILD selinux-oddjob-2.20170204-r3.ebuild 282 SHA256 f962e2e751f92afbc682008be456cb039426962f3f9163f603a087fea7052b81 SHA512 f56dde3c7082e107e3ff190ea059f40c64e9473902b4ef58b505537423c50836ceffe0fdc947cf5ef32e64a7afe7b749d34870b9b86510d093128c75e65ef446 WHIRLPOOL 4b5254db65a8ac5ce010253efe0f2d6616a3bb5a1dcd8a98d86cd78a7c1f5af1d58966d47a34dac5ace90b73e916f51870009823ddcd65688e4482320ca55393
+EBUILD selinux-oddjob-2.20170204-r4.ebuild 282 SHA256 f962e2e751f92afbc682008be456cb039426962f3f9163f603a087fea7052b81 SHA512 f56dde3c7082e107e3ff190ea059f40c64e9473902b4ef58b505537423c50836ceffe0fdc947cf5ef32e64a7afe7b749d34870b9b86510d093128c75e65ef446 WHIRLPOOL 4b5254db65a8ac5ce010253efe0f2d6616a3bb5a1dcd8a98d86cd78a7c1f5af1d58966d47a34dac5ace90b73e916f51870009823ddcd65688e4482320ca55393
+EBUILD selinux-oddjob-2.20170805-r2.ebuild 282 SHA256 f962e2e751f92afbc682008be456cb039426962f3f9163f603a087fea7052b81 SHA512 f56dde3c7082e107e3ff190ea059f40c64e9473902b4ef58b505537423c50836ceffe0fdc947cf5ef32e64a7afe7b749d34870b9b86510d093128c75e65ef446 WHIRLPOOL 4b5254db65a8ac5ce010253efe0f2d6616a3bb5a1dcd8a98d86cd78a7c1f5af1d58966d47a34dac5ace90b73e916f51870009823ddcd65688e4482320ca55393
+EBUILD selinux-oddjob-2.20170805-r3.ebuild 284 SHA256 e57cca8d7a608095cfba5d84939a63df2a4c4a00a12fa2b6ae141bcc95735cd9 SHA512 6a93548be71481d5bbd98115a309f52733798394c2a0394684fb5ee608f22b77ea1af504296b45967ad36c95eaa808ae1c9c4a13a05388b7f622e80a106cf2a3 WHIRLPOOL 1dff4363e249f9126c23c8675c1c5aeae32dd9573bd0c2ee54b8dfc6a8d2e3344fbf685ee4f9718db0f3dba7ccff011b548127c11ca7fa9a675cef17a1e6896d
+EBUILD selinux-oddjob-9999.ebuild 284 SHA256 e57cca8d7a608095cfba5d84939a63df2a4c4a00a12fa2b6ae141bcc95735cd9 SHA512 6a93548be71481d5bbd98115a309f52733798394c2a0394684fb5ee608f22b77ea1af504296b45967ad36c95eaa808ae1c9c4a13a05388b7f622e80a106cf2a3 WHIRLPOOL 1dff4363e249f9126c23c8675c1c5aeae32dd9573bd0c2ee54b8dfc6a8d2e3344fbf685ee4f9718db0f3dba7ccff011b548127c11ca7fa9a675cef17a1e6896d
 MISC ChangeLog 10571 SHA256 5934f2b8b8f74ef66b8ac47a6a20e7b2dcf71a67ffa1c71a1974d2c624d6c384 SHA512 d25f70ef56f302b7a59daa5421a975308ab928a8709a46a2df9c920023b2ca7cc34103958ea83f78be0902c4331fb71e6c2317328c51ea23a48d0af6a97dd065 WHIRLPOOL 41c54a39a8838f1cc69dcb71c7252851eb346888a4730151d415c50208a451f73e5091444cc241c7458c6a0a67c0a69756f71010eee8fdafbc27b2a6650f3151
 MISC ChangeLog-2015 9729 SHA256 5e08fb0aea6c8ac3795083963a8a3c0623bf8f3025259f9ad37815dc75b421ac SHA512 0ca6964b80bf2b15b537326b8160d61674e00ff3287e98eebb62914afa7f53c8c49b3f0718adb865fd3c21c8474fb1f396599c0dfce4bcc64b961ea608d6c751 WHIRLPOOL 775514586f18326b3a154a216ce8d438473876ab3ffa8f7973bfad7cbbc15d5e9d14f143c1d4dd090613c4eb65c8429ddf1b89eab6567c51c7376ed9a8e99f2f
 MISC metadata.xml 334 SHA256 994b7d23b3141a23afab6e2f930d140ee23dc5214f0d66b319a1df5c5c6d4efa SHA512 488d945f4cfc2c9a101c66ededd0280dc4fc9a83d3a0aa2496de1c5fbc756092cd1540526d499729432e325c03f1cb5a893773df3162b3d80dfcda2a07eabe93 WHIRLPOOL 32d1d81fe9881ef483260dbfdbfe994843b770a17ca0cb6d5f284e2235d3fe46b6a321123bb78c522afd6d9daceeb51e30ae2607686b03b1df807552751cc5e5
diff --git a/sec-policy/selinux-oddjob/selinux-oddjob-2.20170204-r1.ebuild b/sec-policy/selinux-oddjob/selinux-oddjob-2.20170204-r1.ebuild
index 982dc569b4bf..3ce719e3c642 100644
--- a/sec-policy/selinux-oddjob/selinux-oddjob-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-oddjob/selinux-oddjob-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-oddjob/selinux-oddjob-2.20170204-r2.ebuild b/sec-policy/selinux-oddjob/selinux-oddjob-2.20170204-r2.ebuild
index 419bee51fa62..05d81dbf6e35 100644
--- a/sec-policy/selinux-oddjob/selinux-oddjob-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-oddjob/selinux-oddjob-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-oddjob/selinux-oddjob-2.20170204-r3.ebuild b/sec-policy/selinux-oddjob/selinux-oddjob-2.20170204-r3.ebuild
index 419bee51fa62..05d81dbf6e35 100644
--- a/sec-policy/selinux-oddjob/selinux-oddjob-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-oddjob/selinux-oddjob-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-oddjob/selinux-oddjob-2.20170204-r4.ebuild b/sec-policy/selinux-oddjob/selinux-oddjob-2.20170204-r4.ebuild
index 419bee51fa62..05d81dbf6e35 100644
--- a/sec-policy/selinux-oddjob/selinux-oddjob-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-oddjob/selinux-oddjob-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-oddjob/selinux-oddjob-2.20170805-r2.ebuild b/sec-policy/selinux-oddjob/selinux-oddjob-2.20170805-r2.ebuild
index 419bee51fa62..05d81dbf6e35 100644
--- a/sec-policy/selinux-oddjob/selinux-oddjob-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-oddjob/selinux-oddjob-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-oddjob/selinux-oddjob-2.20170805-r3.ebuild b/sec-policy/selinux-oddjob/selinux-oddjob-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..3ce719e3c642
--- /dev/null
+++ b/sec-policy/selinux-oddjob/selinux-oddjob-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-oddjob/selinux-oddjob-9999.ebuild b/sec-policy/selinux-oddjob/selinux-oddjob-9999.ebuild
index 982dc569b4bf..3ce719e3c642 100644
--- a/sec-policy/selinux-oddjob/selinux-oddjob-9999.ebuild
+++ b/sec-policy/selinux-oddjob/selinux-oddjob-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-oident/Manifest b/sec-policy/selinux-oident/Manifest
index 3c4d73c04492..0aafdb4c515c 100644
--- a/sec-policy/selinux-oident/Manifest
+++ b/sec-policy/selinux-oident/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-oident-2.20170204-r1.ebuild 283 SHA256 0668d964b2f2611829afbef820c9ef3fdf0cee3016bf06a18c6bc4ef3d02eec1 SHA512 53b993cd6f073309b01123fa8d10025d045a37b5de6baf3e90dd1c8019c2342c2d1fd8e2b2bee27805aa7dbb2f855072255e47b21761d8caf8452aa450618ed4 WHIRLPOOL 5a26e2954ae8c1e1c9b8509cafb56a40f9ae578a4cb7f5558c5c9ab89fd31f0e9308ea6ca01d22afd6611a5b0bebd058006f7a8080136d16b248042c2c5d31b2
-EBUILD selinux-oident-2.20170204-r2.ebuild 281 SHA256 a2380da489aa082450d1780dc39d4793d321dd0bc1e34d0bbee609629daef382 SHA512 29e77f47b0175b0d6cf25a4571918869c9668d22d029815ca0e025ac74ca22f8a2d912c9a60e939a7d5cede330f7cd8d95e9ee4815aa7278c932cd7d8d7ddc3e WHIRLPOOL afdddf0221536575602be0a6a27205d3106d4cfde2e71ea91e4652be5a828ee6f2fe1315088543cc9d9f2e14d282b80ffccdd35533f0fc0c58651a396f5ba78c
-EBUILD selinux-oident-2.20170204-r3.ebuild 281 SHA256 a2380da489aa082450d1780dc39d4793d321dd0bc1e34d0bbee609629daef382 SHA512 29e77f47b0175b0d6cf25a4571918869c9668d22d029815ca0e025ac74ca22f8a2d912c9a60e939a7d5cede330f7cd8d95e9ee4815aa7278c932cd7d8d7ddc3e WHIRLPOOL afdddf0221536575602be0a6a27205d3106d4cfde2e71ea91e4652be5a828ee6f2fe1315088543cc9d9f2e14d282b80ffccdd35533f0fc0c58651a396f5ba78c
-EBUILD selinux-oident-2.20170204-r4.ebuild 281 SHA256 a2380da489aa082450d1780dc39d4793d321dd0bc1e34d0bbee609629daef382 SHA512 29e77f47b0175b0d6cf25a4571918869c9668d22d029815ca0e025ac74ca22f8a2d912c9a60e939a7d5cede330f7cd8d95e9ee4815aa7278c932cd7d8d7ddc3e WHIRLPOOL afdddf0221536575602be0a6a27205d3106d4cfde2e71ea91e4652be5a828ee6f2fe1315088543cc9d9f2e14d282b80ffccdd35533f0fc0c58651a396f5ba78c
-EBUILD selinux-oident-2.20170805-r2.ebuild 281 SHA256 a2380da489aa082450d1780dc39d4793d321dd0bc1e34d0bbee609629daef382 SHA512 29e77f47b0175b0d6cf25a4571918869c9668d22d029815ca0e025ac74ca22f8a2d912c9a60e939a7d5cede330f7cd8d95e9ee4815aa7278c932cd7d8d7ddc3e WHIRLPOOL afdddf0221536575602be0a6a27205d3106d4cfde2e71ea91e4652be5a828ee6f2fe1315088543cc9d9f2e14d282b80ffccdd35533f0fc0c58651a396f5ba78c
-EBUILD selinux-oident-9999.ebuild 283 SHA256 0668d964b2f2611829afbef820c9ef3fdf0cee3016bf06a18c6bc4ef3d02eec1 SHA512 53b993cd6f073309b01123fa8d10025d045a37b5de6baf3e90dd1c8019c2342c2d1fd8e2b2bee27805aa7dbb2f855072255e47b21761d8caf8452aa450618ed4 WHIRLPOOL 5a26e2954ae8c1e1c9b8509cafb56a40f9ae578a4cb7f5558c5c9ab89fd31f0e9308ea6ca01d22afd6611a5b0bebd058006f7a8080136d16b248042c2c5d31b2
+EBUILD selinux-oident-2.20170204-r1.ebuild 284 SHA256 24f8043670333b3b615d92d056248e27f25bd0b31da27830f95191eb28002c66 SHA512 5a2f2125aa69e8423877c55d18467822b41b4854b40052907d2b0741dd2b518d9a53fc1cc288d00273d59bdce3533c3d68daf7d66182fd4e657b53cc83b7f33c WHIRLPOOL f443bc4f3a05b8df2db648d663f21059c358a9465f782443704ec0516e10af1310a5eb0b7254add174f0603588815b6ea1b9f16935245230da5849a657df5efd
+EBUILD selinux-oident-2.20170204-r2.ebuild 282 SHA256 1203834df26716dfa3192de592f7767021274001f6192b71a70837b7863602b7 SHA512 0a5458c6c655ba69f1939e222f3ec69c89ab9913396f6da5ac8c4743550c1c9ce27dd13f2345e986129c3e1a2b7f8bb78fd89bde3362c799591f09c35bbba7bc WHIRLPOOL 209425fe977a9e7fda00f944fdf7e6c77ccf5784917f545d4411426d0a66e60c9abd9baeef10cc8dbd2e5b28cf923440f35220bc4782e322e862b03d22092934
+EBUILD selinux-oident-2.20170204-r3.ebuild 282 SHA256 1203834df26716dfa3192de592f7767021274001f6192b71a70837b7863602b7 SHA512 0a5458c6c655ba69f1939e222f3ec69c89ab9913396f6da5ac8c4743550c1c9ce27dd13f2345e986129c3e1a2b7f8bb78fd89bde3362c799591f09c35bbba7bc WHIRLPOOL 209425fe977a9e7fda00f944fdf7e6c77ccf5784917f545d4411426d0a66e60c9abd9baeef10cc8dbd2e5b28cf923440f35220bc4782e322e862b03d22092934
+EBUILD selinux-oident-2.20170204-r4.ebuild 282 SHA256 1203834df26716dfa3192de592f7767021274001f6192b71a70837b7863602b7 SHA512 0a5458c6c655ba69f1939e222f3ec69c89ab9913396f6da5ac8c4743550c1c9ce27dd13f2345e986129c3e1a2b7f8bb78fd89bde3362c799591f09c35bbba7bc WHIRLPOOL 209425fe977a9e7fda00f944fdf7e6c77ccf5784917f545d4411426d0a66e60c9abd9baeef10cc8dbd2e5b28cf923440f35220bc4782e322e862b03d22092934
+EBUILD selinux-oident-2.20170805-r2.ebuild 282 SHA256 1203834df26716dfa3192de592f7767021274001f6192b71a70837b7863602b7 SHA512 0a5458c6c655ba69f1939e222f3ec69c89ab9913396f6da5ac8c4743550c1c9ce27dd13f2345e986129c3e1a2b7f8bb78fd89bde3362c799591f09c35bbba7bc WHIRLPOOL 209425fe977a9e7fda00f944fdf7e6c77ccf5784917f545d4411426d0a66e60c9abd9baeef10cc8dbd2e5b28cf923440f35220bc4782e322e862b03d22092934
+EBUILD selinux-oident-2.20170805-r3.ebuild 284 SHA256 24f8043670333b3b615d92d056248e27f25bd0b31da27830f95191eb28002c66 SHA512 5a2f2125aa69e8423877c55d18467822b41b4854b40052907d2b0741dd2b518d9a53fc1cc288d00273d59bdce3533c3d68daf7d66182fd4e657b53cc83b7f33c WHIRLPOOL f443bc4f3a05b8df2db648d663f21059c358a9465f782443704ec0516e10af1310a5eb0b7254add174f0603588815b6ea1b9f16935245230da5849a657df5efd
+EBUILD selinux-oident-9999.ebuild 284 SHA256 24f8043670333b3b615d92d056248e27f25bd0b31da27830f95191eb28002c66 SHA512 5a2f2125aa69e8423877c55d18467822b41b4854b40052907d2b0741dd2b518d9a53fc1cc288d00273d59bdce3533c3d68daf7d66182fd4e657b53cc83b7f33c WHIRLPOOL f443bc4f3a05b8df2db648d663f21059c358a9465f782443704ec0516e10af1310a5eb0b7254add174f0603588815b6ea1b9f16935245230da5849a657df5efd
 MISC ChangeLog 10571 SHA256 e11ab0d86657202f726530ebb607bc3ed936b06781dbbf3059282a81fc041734 SHA512 0338048019c7b63b294a8e2f1113f68c1c650b3218994528d0c2620e4df344cc9d7dc5d9343a86491f62f2ada9e074f697a4ca75796bf4ed9d8cdf50ab736e2f WHIRLPOOL 144c5da810d20ceb0e707de050ef1d9dbafa2c5d65f35613c4b9baff1bad5be2a93ac8119000d6d2bbbcb7ad754817f74e3ac07188badfef7910fd49efce6972
 MISC ChangeLog-2015 9589 SHA256 02490c4921e9110c2fc47788b03a78d87473315fefcbd58f483a28c52452f08e SHA512 96eff1777e0aa035bb21a0a2900523365d432616e76c7ce811196ae7bcfc94b5f9f0214deada6d3dd23857813531e8c3f9bcb3254ef93c8a9e94b09e761480ed WHIRLPOOL af74889569e613ead8e73630ad4966b0ae1e0f643c67b855ac735d44db05409210a160d78ed9dfb699c248a5498e2fa9b071bd245001db018107c34c8312c6f2
 MISC metadata.xml 316 SHA256 033926e32d30d9e82e241b7d61e6fd162cf30c0954278d5eaab5cee3ed783b91 SHA512 bf1249529ca86fa8714111c62b51db48ba0239663e4192968a7717958d67c3c36f9ad03d0bc43a7baf04d2026bafeb409bcb9b7dffad2711c2a2349204041ed2 WHIRLPOOL 87f570d6c3bf3e409633139cdc433a2e0bceed58f7104aa37a3f51ac288339fc9a07634e936fe7dee9e6a3255b92bdba2526311d97b7ddc3412ab904f16858b8
diff --git a/sec-policy/selinux-oident/selinux-oident-2.20170204-r1.ebuild b/sec-policy/selinux-oident/selinux-oident-2.20170204-r1.ebuild
index 63af09d117d1..fd3eb560f53e 100644
--- a/sec-policy/selinux-oident/selinux-oident-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-oident/selinux-oident-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-oident/selinux-oident-2.20170204-r2.ebuild b/sec-policy/selinux-oident/selinux-oident-2.20170204-r2.ebuild
index 0cafe1c079de..11bf08ade1c1 100644
--- a/sec-policy/selinux-oident/selinux-oident-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-oident/selinux-oident-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-oident/selinux-oident-2.20170204-r3.ebuild b/sec-policy/selinux-oident/selinux-oident-2.20170204-r3.ebuild
index 0cafe1c079de..11bf08ade1c1 100644
--- a/sec-policy/selinux-oident/selinux-oident-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-oident/selinux-oident-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-oident/selinux-oident-2.20170204-r4.ebuild b/sec-policy/selinux-oident/selinux-oident-2.20170204-r4.ebuild
index 0cafe1c079de..11bf08ade1c1 100644
--- a/sec-policy/selinux-oident/selinux-oident-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-oident/selinux-oident-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-oident/selinux-oident-2.20170805-r2.ebuild b/sec-policy/selinux-oident/selinux-oident-2.20170805-r2.ebuild
index 0cafe1c079de..11bf08ade1c1 100644
--- a/sec-policy/selinux-oident/selinux-oident-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-oident/selinux-oident-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-oident/selinux-oident-2.20170805-r3.ebuild b/sec-policy/selinux-oident/selinux-oident-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..fd3eb560f53e
--- /dev/null
+++ b/sec-policy/selinux-oident/selinux-oident-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-oident/selinux-oident-9999.ebuild b/sec-policy/selinux-oident/selinux-oident-9999.ebuild
index 63af09d117d1..fd3eb560f53e 100644
--- a/sec-policy/selinux-oident/selinux-oident-9999.ebuild
+++ b/sec-policy/selinux-oident/selinux-oident-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-openct/Manifest b/sec-policy/selinux-openct/Manifest
index e236357957d5..65b94d6b0874 100644
--- a/sec-policy/selinux-openct/Manifest
+++ b/sec-policy/selinux-openct/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-openct-2.20170204-r1.ebuild 283 SHA256 625ccd26ee722cdbc678303a843cd1a29b51fd80b9ce82fb24c172236a4e2d55 SHA512 7c793775586ff11bd9da4b073902410bf44c44aa1a1b7cb15ea959a1a36ff641c55222c1eb3a48962f99ebb8eb1953ff8673838e7e94898a0c4d7aa41cde6773 WHIRLPOOL c2fa93e78f60448f0a052c5abf850aaee5a37cd42741739216da6030d5e18ded7ca5be4acc0fb3c52cb489c79a391710a1b18b98d2d8e2e9a8566f5b735ad641
-EBUILD selinux-openct-2.20170204-r2.ebuild 281 SHA256 6c13c7da78a2c8c784a4bd42e8ff220caec9b2ca2a65be4482a3b95e11e25f8c SHA512 0730aa30a0bee2f0c2bd9ce4bffced9dd70e7093f01db784308bea844da44088a7a4700c42efe07c0a130a6aebfbe5a316b03022757dcb56aeff1abc63f60aae WHIRLPOOL 40a57cc18354735088b04500c8b0d40f3285bca12fcbbd66a3744787dcc5841ccb524b99d94345a1a25aff2e72afea0f081e6cf7afad15ff18069d8d12e83bea
-EBUILD selinux-openct-2.20170204-r3.ebuild 281 SHA256 6c13c7da78a2c8c784a4bd42e8ff220caec9b2ca2a65be4482a3b95e11e25f8c SHA512 0730aa30a0bee2f0c2bd9ce4bffced9dd70e7093f01db784308bea844da44088a7a4700c42efe07c0a130a6aebfbe5a316b03022757dcb56aeff1abc63f60aae WHIRLPOOL 40a57cc18354735088b04500c8b0d40f3285bca12fcbbd66a3744787dcc5841ccb524b99d94345a1a25aff2e72afea0f081e6cf7afad15ff18069d8d12e83bea
-EBUILD selinux-openct-2.20170204-r4.ebuild 281 SHA256 6c13c7da78a2c8c784a4bd42e8ff220caec9b2ca2a65be4482a3b95e11e25f8c SHA512 0730aa30a0bee2f0c2bd9ce4bffced9dd70e7093f01db784308bea844da44088a7a4700c42efe07c0a130a6aebfbe5a316b03022757dcb56aeff1abc63f60aae WHIRLPOOL 40a57cc18354735088b04500c8b0d40f3285bca12fcbbd66a3744787dcc5841ccb524b99d94345a1a25aff2e72afea0f081e6cf7afad15ff18069d8d12e83bea
-EBUILD selinux-openct-2.20170805-r2.ebuild 281 SHA256 6c13c7da78a2c8c784a4bd42e8ff220caec9b2ca2a65be4482a3b95e11e25f8c SHA512 0730aa30a0bee2f0c2bd9ce4bffced9dd70e7093f01db784308bea844da44088a7a4700c42efe07c0a130a6aebfbe5a316b03022757dcb56aeff1abc63f60aae WHIRLPOOL 40a57cc18354735088b04500c8b0d40f3285bca12fcbbd66a3744787dcc5841ccb524b99d94345a1a25aff2e72afea0f081e6cf7afad15ff18069d8d12e83bea
-EBUILD selinux-openct-9999.ebuild 283 SHA256 625ccd26ee722cdbc678303a843cd1a29b51fd80b9ce82fb24c172236a4e2d55 SHA512 7c793775586ff11bd9da4b073902410bf44c44aa1a1b7cb15ea959a1a36ff641c55222c1eb3a48962f99ebb8eb1953ff8673838e7e94898a0c4d7aa41cde6773 WHIRLPOOL c2fa93e78f60448f0a052c5abf850aaee5a37cd42741739216da6030d5e18ded7ca5be4acc0fb3c52cb489c79a391710a1b18b98d2d8e2e9a8566f5b735ad641
+EBUILD selinux-openct-2.20170204-r1.ebuild 284 SHA256 287b27ce0326db57d7635e26e076417bcf2bdf5024cbac219eb08f500adf2213 SHA512 4a0783698255db839ca415ac48c4d4438bf0bb3efa47b774a9ad3040c1c370ccc88cc8227702fd4ee8995f1c05041a4602c167a69b1560892df6a0c79ab41927 WHIRLPOOL 2f5e29438fedd0c88a7d8ab9873732190f095481c21c134c4596eb59a673103847d9f3a186e77c168cf5b41b81b21e3be3035d517f4f6ad6d531ffab5a437fd5
+EBUILD selinux-openct-2.20170204-r2.ebuild 282 SHA256 000d3ffbad897f7bbc631455296350cd8fec9fca1cd5f98b3129b25b242acd25 SHA512 d3a4ad721feea16ac0b2330bb6136da01ee324a21b2221c06f4fb1b37915e2612180980467f3a6b723288066bcfaa7973f6f0a359feb63e50e9e4734ef606170 WHIRLPOOL 6463c41d40f415519d2a6b982afc8017a603025f7467dfcc45a5d9e512ab98dcadfaae12ace977d0df7624a0e24019c95bb964e0127797337a610add91a03f6c
+EBUILD selinux-openct-2.20170204-r3.ebuild 282 SHA256 000d3ffbad897f7bbc631455296350cd8fec9fca1cd5f98b3129b25b242acd25 SHA512 d3a4ad721feea16ac0b2330bb6136da01ee324a21b2221c06f4fb1b37915e2612180980467f3a6b723288066bcfaa7973f6f0a359feb63e50e9e4734ef606170 WHIRLPOOL 6463c41d40f415519d2a6b982afc8017a603025f7467dfcc45a5d9e512ab98dcadfaae12ace977d0df7624a0e24019c95bb964e0127797337a610add91a03f6c
+EBUILD selinux-openct-2.20170204-r4.ebuild 282 SHA256 000d3ffbad897f7bbc631455296350cd8fec9fca1cd5f98b3129b25b242acd25 SHA512 d3a4ad721feea16ac0b2330bb6136da01ee324a21b2221c06f4fb1b37915e2612180980467f3a6b723288066bcfaa7973f6f0a359feb63e50e9e4734ef606170 WHIRLPOOL 6463c41d40f415519d2a6b982afc8017a603025f7467dfcc45a5d9e512ab98dcadfaae12ace977d0df7624a0e24019c95bb964e0127797337a610add91a03f6c
+EBUILD selinux-openct-2.20170805-r2.ebuild 282 SHA256 000d3ffbad897f7bbc631455296350cd8fec9fca1cd5f98b3129b25b242acd25 SHA512 d3a4ad721feea16ac0b2330bb6136da01ee324a21b2221c06f4fb1b37915e2612180980467f3a6b723288066bcfaa7973f6f0a359feb63e50e9e4734ef606170 WHIRLPOOL 6463c41d40f415519d2a6b982afc8017a603025f7467dfcc45a5d9e512ab98dcadfaae12ace977d0df7624a0e24019c95bb964e0127797337a610add91a03f6c
+EBUILD selinux-openct-2.20170805-r3.ebuild 284 SHA256 287b27ce0326db57d7635e26e076417bcf2bdf5024cbac219eb08f500adf2213 SHA512 4a0783698255db839ca415ac48c4d4438bf0bb3efa47b774a9ad3040c1c370ccc88cc8227702fd4ee8995f1c05041a4602c167a69b1560892df6a0c79ab41927 WHIRLPOOL 2f5e29438fedd0c88a7d8ab9873732190f095481c21c134c4596eb59a673103847d9f3a186e77c168cf5b41b81b21e3be3035d517f4f6ad6d531ffab5a437fd5
+EBUILD selinux-openct-9999.ebuild 284 SHA256 287b27ce0326db57d7635e26e076417bcf2bdf5024cbac219eb08f500adf2213 SHA512 4a0783698255db839ca415ac48c4d4438bf0bb3efa47b774a9ad3040c1c370ccc88cc8227702fd4ee8995f1c05041a4602c167a69b1560892df6a0c79ab41927 WHIRLPOOL 2f5e29438fedd0c88a7d8ab9873732190f095481c21c134c4596eb59a673103847d9f3a186e77c168cf5b41b81b21e3be3035d517f4f6ad6d531ffab5a437fd5
 MISC ChangeLog 10571 SHA256 2add76141f715f157f139cd4bb208c6bc700a997253ff94b2c893ddd103bcac9 SHA512 2e582c6bb41db0cfef71df6d34287540fdeabac13ba4fcbe5da0945609b5401131f1bcd33c26cb4b2841ca39880d956e544ee0e82f1bd161d9e8d2560a9719d2 WHIRLPOOL 061473a9d602662dfa82a076959fae5170c641afaaa61b222859e13c8ad1b3557d2a942bf12c2264af80c11f22a51058ac982d3482d9fa187681e4ca24d21c8b
 MISC ChangeLog-2015 9863 SHA256 decc6b5ab4de143c6fd2bbaf59518a401353b00e9df627c0be5c7c86f4947ed6 SHA512 1c1ff1ca25f98c1c57bc8658c274ceb0f310397f3a7a9360a482b7bee79f6f8ddaed31390087d358abee6c217fa7504065097283a6239fdef2f4b958d058d2ac WHIRLPOOL c8523bdaa9844abb24ae5fb7372465b9f1ddb32d2469da3b907037abe73c63f37f17f459e18b59e47c0e7d27a355b594edf9363a26d4780cac66785ea2bb3238
 MISC metadata.xml 316 SHA256 2f30e1a98ce241e069790ca6d870b87cbf37f0409a65d86f75a889864db2cf5c SHA512 2f34a907f602c48245d3b5bce00bc178b2c8d58d28ee6992438179375e116ec2beb5d9422cf7897af985910402fce75c9d9b50a2d372e59bcbaa59dedb7490bc WHIRLPOOL 5169003b561a867a308063dc3eafdb231cf99bd8c2eb34f84019eb1dfa1e22db3f1c91644c5bdc5a840556ac4a5e0ef349eabfaa40662bb6fdef561f745f592f
diff --git a/sec-policy/selinux-openct/selinux-openct-2.20170204-r1.ebuild b/sec-policy/selinux-openct/selinux-openct-2.20170204-r1.ebuild
index d15c81ae35ff..fe1edaa9eafd 100644
--- a/sec-policy/selinux-openct/selinux-openct-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-openct/selinux-openct-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-openct/selinux-openct-2.20170204-r2.ebuild b/sec-policy/selinux-openct/selinux-openct-2.20170204-r2.ebuild
index e73f03c95569..9ee9b2f682a0 100644
--- a/sec-policy/selinux-openct/selinux-openct-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-openct/selinux-openct-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-openct/selinux-openct-2.20170204-r3.ebuild b/sec-policy/selinux-openct/selinux-openct-2.20170204-r3.ebuild
index e73f03c95569..9ee9b2f682a0 100644
--- a/sec-policy/selinux-openct/selinux-openct-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-openct/selinux-openct-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-openct/selinux-openct-2.20170204-r4.ebuild b/sec-policy/selinux-openct/selinux-openct-2.20170204-r4.ebuild
index e73f03c95569..9ee9b2f682a0 100644
--- a/sec-policy/selinux-openct/selinux-openct-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-openct/selinux-openct-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-openct/selinux-openct-2.20170805-r2.ebuild b/sec-policy/selinux-openct/selinux-openct-2.20170805-r2.ebuild
index e73f03c95569..9ee9b2f682a0 100644
--- a/sec-policy/selinux-openct/selinux-openct-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-openct/selinux-openct-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-openct/selinux-openct-2.20170805-r3.ebuild b/sec-policy/selinux-openct/selinux-openct-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..fe1edaa9eafd
--- /dev/null
+++ b/sec-policy/selinux-openct/selinux-openct-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-openct/selinux-openct-9999.ebuild b/sec-policy/selinux-openct/selinux-openct-9999.ebuild
index d15c81ae35ff..fe1edaa9eafd 100644
--- a/sec-policy/selinux-openct/selinux-openct-9999.ebuild
+++ b/sec-policy/selinux-openct/selinux-openct-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-openrc/Manifest b/sec-policy/selinux-openrc/Manifest
index adbd8ca8179d..9c0a29f3995c 100644
--- a/sec-policy/selinux-openrc/Manifest
+++ b/sec-policy/selinux-openrc/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-openrc-2.20170204-r1.ebuild 283 SHA256 07420a7997195575ffad60ac6cc0157371132646e6b8eeebdf53bef4828b48aa SHA512 1d999e8eb2d0bfef3db80c6e36665ff831432444aaf764cb0c89c64e2c07b940c288ac4d6bd9228ae5defa7d34978c336d0e8964eae6649e85cdf01ab4ff02d2 WHIRLPOOL 198ff3334aa8e9200638669d4697794552617b7529d72ed34d9e7b38dd0a25911c0b518082770c041e79ab52dabdbc21e96060cfbe3967a4f85eb301a5091390
-EBUILD selinux-openrc-2.20170204-r2.ebuild 281 SHA256 582cfcdcc68944f5f904ac7c18b0d4a7186b2c8f6abddae58511dc33eec693d1 SHA512 2a9b17d3fff4f0d9800846e94efa25ea586fdd411cb662c99eef2462665ce4293f7577a577b769b5573e2136ae32c001db1e4b8f21516af7be7b1aa97d139dbd WHIRLPOOL 7fc634eb153e9ab04fb038e293df345f00413912927e9e49640ad23a9896d339ce76e5637df96e0c55c7c30ee4e6d3340f94474d8e0cd4f4ea632e938e4a837c
-EBUILD selinux-openrc-2.20170204-r3.ebuild 281 SHA256 582cfcdcc68944f5f904ac7c18b0d4a7186b2c8f6abddae58511dc33eec693d1 SHA512 2a9b17d3fff4f0d9800846e94efa25ea586fdd411cb662c99eef2462665ce4293f7577a577b769b5573e2136ae32c001db1e4b8f21516af7be7b1aa97d139dbd WHIRLPOOL 7fc634eb153e9ab04fb038e293df345f00413912927e9e49640ad23a9896d339ce76e5637df96e0c55c7c30ee4e6d3340f94474d8e0cd4f4ea632e938e4a837c
-EBUILD selinux-openrc-2.20170204-r4.ebuild 281 SHA256 582cfcdcc68944f5f904ac7c18b0d4a7186b2c8f6abddae58511dc33eec693d1 SHA512 2a9b17d3fff4f0d9800846e94efa25ea586fdd411cb662c99eef2462665ce4293f7577a577b769b5573e2136ae32c001db1e4b8f21516af7be7b1aa97d139dbd WHIRLPOOL 7fc634eb153e9ab04fb038e293df345f00413912927e9e49640ad23a9896d339ce76e5637df96e0c55c7c30ee4e6d3340f94474d8e0cd4f4ea632e938e4a837c
-EBUILD selinux-openrc-2.20170805-r2.ebuild 281 SHA256 582cfcdcc68944f5f904ac7c18b0d4a7186b2c8f6abddae58511dc33eec693d1 SHA512 2a9b17d3fff4f0d9800846e94efa25ea586fdd411cb662c99eef2462665ce4293f7577a577b769b5573e2136ae32c001db1e4b8f21516af7be7b1aa97d139dbd WHIRLPOOL 7fc634eb153e9ab04fb038e293df345f00413912927e9e49640ad23a9896d339ce76e5637df96e0c55c7c30ee4e6d3340f94474d8e0cd4f4ea632e938e4a837c
-EBUILD selinux-openrc-9999.ebuild 283 SHA256 07420a7997195575ffad60ac6cc0157371132646e6b8eeebdf53bef4828b48aa SHA512 1d999e8eb2d0bfef3db80c6e36665ff831432444aaf764cb0c89c64e2c07b940c288ac4d6bd9228ae5defa7d34978c336d0e8964eae6649e85cdf01ab4ff02d2 WHIRLPOOL 198ff3334aa8e9200638669d4697794552617b7529d72ed34d9e7b38dd0a25911c0b518082770c041e79ab52dabdbc21e96060cfbe3967a4f85eb301a5091390
+EBUILD selinux-openrc-2.20170204-r1.ebuild 284 SHA256 dbed251137e9ba6035fa27e7c97d67e54017e4f6ff3ddcc187382bed2b76c789 SHA512 647bd90e04ef02b80ccb042e6053771a1bf5edc1477cc42c6b96f88e12e8b33afb4df3b3e623423dcc74b314077586d8f14e8473d3ba8221acbfa66ee0a2a1a1 WHIRLPOOL 4f5533eff87c4176044d67c651af1ecac84ce12b2395ac564f59cebe46feee6e73e48236c7ee70c98b70d86535c93041d4d4283360ff872885aef1297762cbb0
+EBUILD selinux-openrc-2.20170204-r2.ebuild 282 SHA256 f457c25bc0a761f635b5f48edcfe9d5a80bd956f7e448f275ffb49f24524df95 SHA512 5cb94b69e6266c2183e1fae5286b6b9091f832ee2448074bf1fbc72fb677238991ed4b75c0dd6516d212660147010dc0dc2e625c7dcd1ca80b9b81e0617f1f14 WHIRLPOOL 6344bde9275754aadb738e5a2c3a3d7dba2312e0fb43733147841c7e1651188d9aa7cbfda5f7e61ca83039a3fd80f2bd84bcc81039112aceeb320bcfeb667e26
+EBUILD selinux-openrc-2.20170204-r3.ebuild 282 SHA256 f457c25bc0a761f635b5f48edcfe9d5a80bd956f7e448f275ffb49f24524df95 SHA512 5cb94b69e6266c2183e1fae5286b6b9091f832ee2448074bf1fbc72fb677238991ed4b75c0dd6516d212660147010dc0dc2e625c7dcd1ca80b9b81e0617f1f14 WHIRLPOOL 6344bde9275754aadb738e5a2c3a3d7dba2312e0fb43733147841c7e1651188d9aa7cbfda5f7e61ca83039a3fd80f2bd84bcc81039112aceeb320bcfeb667e26
+EBUILD selinux-openrc-2.20170204-r4.ebuild 282 SHA256 f457c25bc0a761f635b5f48edcfe9d5a80bd956f7e448f275ffb49f24524df95 SHA512 5cb94b69e6266c2183e1fae5286b6b9091f832ee2448074bf1fbc72fb677238991ed4b75c0dd6516d212660147010dc0dc2e625c7dcd1ca80b9b81e0617f1f14 WHIRLPOOL 6344bde9275754aadb738e5a2c3a3d7dba2312e0fb43733147841c7e1651188d9aa7cbfda5f7e61ca83039a3fd80f2bd84bcc81039112aceeb320bcfeb667e26
+EBUILD selinux-openrc-2.20170805-r2.ebuild 282 SHA256 f457c25bc0a761f635b5f48edcfe9d5a80bd956f7e448f275ffb49f24524df95 SHA512 5cb94b69e6266c2183e1fae5286b6b9091f832ee2448074bf1fbc72fb677238991ed4b75c0dd6516d212660147010dc0dc2e625c7dcd1ca80b9b81e0617f1f14 WHIRLPOOL 6344bde9275754aadb738e5a2c3a3d7dba2312e0fb43733147841c7e1651188d9aa7cbfda5f7e61ca83039a3fd80f2bd84bcc81039112aceeb320bcfeb667e26
+EBUILD selinux-openrc-2.20170805-r3.ebuild 284 SHA256 dbed251137e9ba6035fa27e7c97d67e54017e4f6ff3ddcc187382bed2b76c789 SHA512 647bd90e04ef02b80ccb042e6053771a1bf5edc1477cc42c6b96f88e12e8b33afb4df3b3e623423dcc74b314077586d8f14e8473d3ba8221acbfa66ee0a2a1a1 WHIRLPOOL 4f5533eff87c4176044d67c651af1ecac84ce12b2395ac564f59cebe46feee6e73e48236c7ee70c98b70d86535c93041d4d4283360ff872885aef1297762cbb0
+EBUILD selinux-openrc-9999.ebuild 284 SHA256 dbed251137e9ba6035fa27e7c97d67e54017e4f6ff3ddcc187382bed2b76c789 SHA512 647bd90e04ef02b80ccb042e6053771a1bf5edc1477cc42c6b96f88e12e8b33afb4df3b3e623423dcc74b314077586d8f14e8473d3ba8221acbfa66ee0a2a1a1 WHIRLPOOL 4f5533eff87c4176044d67c651af1ecac84ce12b2395ac564f59cebe46feee6e73e48236c7ee70c98b70d86535c93041d4d4283360ff872885aef1297762cbb0
 MISC ChangeLog 10571 SHA256 0b38f80cda51f678b03ed3b0f1fe4066ded8efc55bc4d544fa4d62d0a0e82361 SHA512 f483eaaaad18468df231468b46601b84370399a77fa291d4f6f9908524cf61f4b51648c96b4443171be8f9b31b498bdc1bd0d34cf1edf5fd51180ecc0dfe5da8 WHIRLPOOL 8cd50cbad8dff6ebf9f788a7468171ee7083ed3cf7aa0160d2cb41b492ab019aa7e781e127eb5213fb485ff21681d896c5a0f473ccd11f53d7a897ccfd6f5bba
 MISC ChangeLog-2015 7261 SHA256 11c395631ab527423b6cacd308870e58942b241bb1a2c5e70fe5378635e506cf SHA512 e707ae2c5eeb71db92375845b13aec4aee322d7c16932c266a0cf45278f57d93b8f693114c5f25a107688df47e0bb47c39f4a0d9941f7fa6e9061185ef63797d WHIRLPOOL 3767022730b9bdb4de3e577c391433a0152ce362e347e194ee077743a4608ee45d4b8aa911b6fca241138c5d28ba64b0fcded7d3709a3669cafb49ad4cdd0f21
 MISC metadata.xml 316 SHA256 b579024b45405f24ef081965e043908d1545b786f34b6f14a75729237c84d553 SHA512 0cf24e90730fd2dbe20f789319b4a5f5e8a0f17613a0ae5bd75fecf9b9f4575c3980fc51680b279b82e91fbdb0f2ba01009f025afd6c5216d538a7c37a6b91d7 WHIRLPOOL c9ccaad9d8bcee20632d464928d8e7c06427f42ac616ac3ae5e3d1025b499b3c9df801631e715462ba3893362477150d9078183ea471542b864f36f599bf0332
diff --git a/sec-policy/selinux-openrc/selinux-openrc-2.20170204-r1.ebuild b/sec-policy/selinux-openrc/selinux-openrc-2.20170204-r1.ebuild
index 3506944479da..3809ff69dbd0 100644
--- a/sec-policy/selinux-openrc/selinux-openrc-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-openrc/selinux-openrc-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-openrc/selinux-openrc-2.20170204-r2.ebuild b/sec-policy/selinux-openrc/selinux-openrc-2.20170204-r2.ebuild
index 61a7bb550fd1..fa3eb713c887 100644
--- a/sec-policy/selinux-openrc/selinux-openrc-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-openrc/selinux-openrc-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-openrc/selinux-openrc-2.20170204-r3.ebuild b/sec-policy/selinux-openrc/selinux-openrc-2.20170204-r3.ebuild
index 61a7bb550fd1..fa3eb713c887 100644
--- a/sec-policy/selinux-openrc/selinux-openrc-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-openrc/selinux-openrc-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-openrc/selinux-openrc-2.20170204-r4.ebuild b/sec-policy/selinux-openrc/selinux-openrc-2.20170204-r4.ebuild
index 61a7bb550fd1..fa3eb713c887 100644
--- a/sec-policy/selinux-openrc/selinux-openrc-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-openrc/selinux-openrc-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-openrc/selinux-openrc-2.20170805-r2.ebuild b/sec-policy/selinux-openrc/selinux-openrc-2.20170805-r2.ebuild
index 61a7bb550fd1..fa3eb713c887 100644
--- a/sec-policy/selinux-openrc/selinux-openrc-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-openrc/selinux-openrc-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-openrc/selinux-openrc-2.20170805-r3.ebuild b/sec-policy/selinux-openrc/selinux-openrc-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..3809ff69dbd0
--- /dev/null
+++ b/sec-policy/selinux-openrc/selinux-openrc-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-openrc/selinux-openrc-9999.ebuild b/sec-policy/selinux-openrc/selinux-openrc-9999.ebuild
index 3506944479da..3809ff69dbd0 100644
--- a/sec-policy/selinux-openrc/selinux-openrc-9999.ebuild
+++ b/sec-policy/selinux-openrc/selinux-openrc-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-openvpn/Manifest b/sec-policy/selinux-openvpn/Manifest
index 85be403adb6c..3fd648ecb441 100644
--- a/sec-policy/selinux-openvpn/Manifest
+++ b/sec-policy/selinux-openvpn/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-openvpn-2.20170204-r1.ebuild 285 SHA256 390a973b0f195df414d1b32fe8054668a0c7f67ef094a22f93bd390b33489023 SHA512 cc0c5edb850f6adf34515a38848b1d755d449f2a456a2723614366c54dfa14e700e472898f79dfb57ada915343a95b15e481b2d61c83e9b8c1b0d8bfaaa1ec22 WHIRLPOOL ec1fada63004427548b65aa136b473054090bf217c125dada8d5b874950951492bebb5ac8669a587cb540860c3e49833cb66d507420d7bb89ac3031d0b0956f9
-EBUILD selinux-openvpn-2.20170204-r2.ebuild 283 SHA256 4874fac14ab797d0bf50332dbba53f98217744264391da908e731e17ff59eabf SHA512 47230b3389380560263048fd667fe375c728c9442feed04ddc9acbab2976e2017e5b4378a2dfde2f6ca2dc259b097f54f0047bbe2de5d6568aa3ad0639264112 WHIRLPOOL 2875e3ef69b8cc8abb13b3d274eb59cd67b4fde65b4f1eb82fb1c59caf23b5dc6c5122c62643b6bc04c608f7494c2108c7c4c8d52365327284bbede3fb9ab87f
-EBUILD selinux-openvpn-2.20170204-r3.ebuild 283 SHA256 4874fac14ab797d0bf50332dbba53f98217744264391da908e731e17ff59eabf SHA512 47230b3389380560263048fd667fe375c728c9442feed04ddc9acbab2976e2017e5b4378a2dfde2f6ca2dc259b097f54f0047bbe2de5d6568aa3ad0639264112 WHIRLPOOL 2875e3ef69b8cc8abb13b3d274eb59cd67b4fde65b4f1eb82fb1c59caf23b5dc6c5122c62643b6bc04c608f7494c2108c7c4c8d52365327284bbede3fb9ab87f
-EBUILD selinux-openvpn-2.20170204-r4.ebuild 283 SHA256 4874fac14ab797d0bf50332dbba53f98217744264391da908e731e17ff59eabf SHA512 47230b3389380560263048fd667fe375c728c9442feed04ddc9acbab2976e2017e5b4378a2dfde2f6ca2dc259b097f54f0047bbe2de5d6568aa3ad0639264112 WHIRLPOOL 2875e3ef69b8cc8abb13b3d274eb59cd67b4fde65b4f1eb82fb1c59caf23b5dc6c5122c62643b6bc04c608f7494c2108c7c4c8d52365327284bbede3fb9ab87f
-EBUILD selinux-openvpn-2.20170805-r2.ebuild 283 SHA256 4874fac14ab797d0bf50332dbba53f98217744264391da908e731e17ff59eabf SHA512 47230b3389380560263048fd667fe375c728c9442feed04ddc9acbab2976e2017e5b4378a2dfde2f6ca2dc259b097f54f0047bbe2de5d6568aa3ad0639264112 WHIRLPOOL 2875e3ef69b8cc8abb13b3d274eb59cd67b4fde65b4f1eb82fb1c59caf23b5dc6c5122c62643b6bc04c608f7494c2108c7c4c8d52365327284bbede3fb9ab87f
-EBUILD selinux-openvpn-9999.ebuild 285 SHA256 390a973b0f195df414d1b32fe8054668a0c7f67ef094a22f93bd390b33489023 SHA512 cc0c5edb850f6adf34515a38848b1d755d449f2a456a2723614366c54dfa14e700e472898f79dfb57ada915343a95b15e481b2d61c83e9b8c1b0d8bfaaa1ec22 WHIRLPOOL ec1fada63004427548b65aa136b473054090bf217c125dada8d5b874950951492bebb5ac8669a587cb540860c3e49833cb66d507420d7bb89ac3031d0b0956f9
+EBUILD selinux-openvpn-2.20170204-r1.ebuild 286 SHA256 165b1ec067a10922d0aa459fab48eb0f70007f7b45fb786632beb38ff5089fe1 SHA512 d50afb395a5ab1c8c210211bfcc4c45d504dff138a55203e3526fe04d45f32cdea03fb0c61eb1dab56ca2a067c6189e5986ad78e95b6c8abe9bb92395c51c35f WHIRLPOOL 2ec13e63d90da9f37f4608699ecaeceab76f680955a9898600aff2cbf3dbf3192186a49c4182a66540e3705452bf8a97409c3a4980edce2f026282572bbafd09
+EBUILD selinux-openvpn-2.20170204-r2.ebuild 284 SHA256 83fcdd9db62ef5d77f27a9c3f896330435ed42de9d10068552bfb4ad771093f5 SHA512 f5788c5c43434414db670a112d5072b45998d763db795398d2f712b3609e4dcd5a1add524d5aae13c79a7c9cc38b528422d06d7e059192c5a2a9e556cb2133d5 WHIRLPOOL cda866e00a9063d83112afd40dcc9aeb63bc4106af3e5c43fcfc4028ca75134e0fea3ecaeda0783868acd8858c56b0e5f8c78ce715951b42ee5c62e2bdfb19d7
+EBUILD selinux-openvpn-2.20170204-r3.ebuild 284 SHA256 83fcdd9db62ef5d77f27a9c3f896330435ed42de9d10068552bfb4ad771093f5 SHA512 f5788c5c43434414db670a112d5072b45998d763db795398d2f712b3609e4dcd5a1add524d5aae13c79a7c9cc38b528422d06d7e059192c5a2a9e556cb2133d5 WHIRLPOOL cda866e00a9063d83112afd40dcc9aeb63bc4106af3e5c43fcfc4028ca75134e0fea3ecaeda0783868acd8858c56b0e5f8c78ce715951b42ee5c62e2bdfb19d7
+EBUILD selinux-openvpn-2.20170204-r4.ebuild 284 SHA256 83fcdd9db62ef5d77f27a9c3f896330435ed42de9d10068552bfb4ad771093f5 SHA512 f5788c5c43434414db670a112d5072b45998d763db795398d2f712b3609e4dcd5a1add524d5aae13c79a7c9cc38b528422d06d7e059192c5a2a9e556cb2133d5 WHIRLPOOL cda866e00a9063d83112afd40dcc9aeb63bc4106af3e5c43fcfc4028ca75134e0fea3ecaeda0783868acd8858c56b0e5f8c78ce715951b42ee5c62e2bdfb19d7
+EBUILD selinux-openvpn-2.20170805-r2.ebuild 284 SHA256 83fcdd9db62ef5d77f27a9c3f896330435ed42de9d10068552bfb4ad771093f5 SHA512 f5788c5c43434414db670a112d5072b45998d763db795398d2f712b3609e4dcd5a1add524d5aae13c79a7c9cc38b528422d06d7e059192c5a2a9e556cb2133d5 WHIRLPOOL cda866e00a9063d83112afd40dcc9aeb63bc4106af3e5c43fcfc4028ca75134e0fea3ecaeda0783868acd8858c56b0e5f8c78ce715951b42ee5c62e2bdfb19d7
+EBUILD selinux-openvpn-2.20170805-r3.ebuild 286 SHA256 165b1ec067a10922d0aa459fab48eb0f70007f7b45fb786632beb38ff5089fe1 SHA512 d50afb395a5ab1c8c210211bfcc4c45d504dff138a55203e3526fe04d45f32cdea03fb0c61eb1dab56ca2a067c6189e5986ad78e95b6c8abe9bb92395c51c35f WHIRLPOOL 2ec13e63d90da9f37f4608699ecaeceab76f680955a9898600aff2cbf3dbf3192186a49c4182a66540e3705452bf8a97409c3a4980edce2f026282572bbafd09
+EBUILD selinux-openvpn-9999.ebuild 286 SHA256 165b1ec067a10922d0aa459fab48eb0f70007f7b45fb786632beb38ff5089fe1 SHA512 d50afb395a5ab1c8c210211bfcc4c45d504dff138a55203e3526fe04d45f32cdea03fb0c61eb1dab56ca2a067c6189e5986ad78e95b6c8abe9bb92395c51c35f WHIRLPOOL 2ec13e63d90da9f37f4608699ecaeceab76f680955a9898600aff2cbf3dbf3192186a49c4182a66540e3705452bf8a97409c3a4980edce2f026282572bbafd09
 MISC ChangeLog 10687 SHA256 bde75c156838f779b7e646dae2a3c18bfd1aefcf25a9e6cd9d998fc42fbddec4 SHA512 b80330a6b55de104fd4f425c23fd74da3cf2b30517092e5b9074980abba10bdb334987990c9d291e402a7547ceee1af2e272a6882544707f4f36bf1d81ddf385 WHIRLPOOL 458b1757b88a2d13f258fc4d90ec3e3e5683f91a20409dd119fdb861a35688f44296231afca62a3d6dca7b35da20945d64db92bae360fb0606ff2aeabbca4a88
 MISC ChangeLog-2015 12585 SHA256 4b07490b65d5f5c6cc3ee2b5dd34d6799247631ac3ec6e774f8b158408371868 SHA512 f2ce415fbd1ba96e3930116c9f8dadb88bf4ce66639430e26911c60c515c61fb13a18ae94b6d4325670e0ddfadd155a8112031f9927807699c46ebed9a26973c WHIRLPOOL 8e2ece7d5cc104a4f3a9575b8ce5e864ecd7a3582aa8b8326f35cc03e35bbc74e8116c8c6600d0ac253fecb14ba57ef49bf0fae414fe4b0475f9b9abc036c31b
 MISC metadata.xml 317 SHA256 5b9a3bd947d92bdd81f1aa151138bdfe1f437948da0e0848c2ffcb01fec406cd SHA512 404052219f5f8e5b95dc2e34baef116609b40581aa99d5e93861807d28fbc1eb23a4368e2e01ee6dd6c4cec76294fe567bf860bb4c0db36bf34b1972d3ca1dab WHIRLPOOL 5f01ca67376f43db06071a917cd92b7b55e902b2b3922c9a438859bc6f9b6fc55e41d991793f30b6b107bc161d5281afba6672d35693a3e0a72506b2228a37ad
diff --git a/sec-policy/selinux-openvpn/selinux-openvpn-2.20170204-r1.ebuild b/sec-policy/selinux-openvpn/selinux-openvpn-2.20170204-r1.ebuild
index 01697cc30081..7536af68e6ee 100644
--- a/sec-policy/selinux-openvpn/selinux-openvpn-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-openvpn/selinux-openvpn-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-openvpn/selinux-openvpn-2.20170204-r2.ebuild b/sec-policy/selinux-openvpn/selinux-openvpn-2.20170204-r2.ebuild
index 8eac869689df..ba6de62cc44f 100644
--- a/sec-policy/selinux-openvpn/selinux-openvpn-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-openvpn/selinux-openvpn-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-openvpn/selinux-openvpn-2.20170204-r3.ebuild b/sec-policy/selinux-openvpn/selinux-openvpn-2.20170204-r3.ebuild
index 8eac869689df..ba6de62cc44f 100644
--- a/sec-policy/selinux-openvpn/selinux-openvpn-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-openvpn/selinux-openvpn-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-openvpn/selinux-openvpn-2.20170204-r4.ebuild b/sec-policy/selinux-openvpn/selinux-openvpn-2.20170204-r4.ebuild
index 8eac869689df..ba6de62cc44f 100644
--- a/sec-policy/selinux-openvpn/selinux-openvpn-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-openvpn/selinux-openvpn-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-openvpn/selinux-openvpn-2.20170805-r2.ebuild b/sec-policy/selinux-openvpn/selinux-openvpn-2.20170805-r2.ebuild
index 8eac869689df..ba6de62cc44f 100644
--- a/sec-policy/selinux-openvpn/selinux-openvpn-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-openvpn/selinux-openvpn-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-openvpn/selinux-openvpn-2.20170805-r3.ebuild b/sec-policy/selinux-openvpn/selinux-openvpn-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..7536af68e6ee
--- /dev/null
+++ b/sec-policy/selinux-openvpn/selinux-openvpn-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-openvpn/selinux-openvpn-9999.ebuild b/sec-policy/selinux-openvpn/selinux-openvpn-9999.ebuild
index 01697cc30081..7536af68e6ee 100644
--- a/sec-policy/selinux-openvpn/selinux-openvpn-9999.ebuild
+++ b/sec-policy/selinux-openvpn/selinux-openvpn-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-pan/Manifest b/sec-policy/selinux-pan/Manifest
index 7bea4eaab386..a85e452780d8 100644
--- a/sec-policy/selinux-pan/Manifest
+++ b/sec-policy/selinux-pan/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-pan-2.20170204-r1.ebuild 375 SHA256 b2b70ac2165e08581cf0ca5adecc4a8131179524fbf25b92c74f64b6909a631c SHA512 8fe5f4d1395e0de8a353389277e6859b7234e9e6b688dca1f59003bb0fc805c5ebd7b49dcbd32f794d9841f0407bbe81432ae61899607fedec52ae9a788ee0d7 WHIRLPOOL ef2a90c7eb4d49a39b35278296d2ee2345a0a8e50d7cf4aa39b5cb8db053d763fbe615c8c65a3b458fbed57078f6505a9cce6eba6f484c3bf1a4ce516bb1c4d7
-EBUILD selinux-pan-2.20170204-r2.ebuild 373 SHA256 45f016ed343c21e4014f8fd16b0af4ed6f6a959c722ff18ef0f65d420ae93003 SHA512 cb57ae695c5a3bf4f6a283e8f1fa995e0b61c32d209bd56da858783aee97a40c47f72fd5ea9cb5f69bf709f2928605daed48b62c9ab7ae54da2515d95b0ef59d WHIRLPOOL 1cc0de38d185b3eb75e0858b1a5c736acdff51836a5fa9b1416f870e1e637fae62da0f4c4a8e7f99e40906d1c97fd76aa5cb4e44775b1b6f39ff1274cff2e8b8
-EBUILD selinux-pan-2.20170204-r3.ebuild 373 SHA256 45f016ed343c21e4014f8fd16b0af4ed6f6a959c722ff18ef0f65d420ae93003 SHA512 cb57ae695c5a3bf4f6a283e8f1fa995e0b61c32d209bd56da858783aee97a40c47f72fd5ea9cb5f69bf709f2928605daed48b62c9ab7ae54da2515d95b0ef59d WHIRLPOOL 1cc0de38d185b3eb75e0858b1a5c736acdff51836a5fa9b1416f870e1e637fae62da0f4c4a8e7f99e40906d1c97fd76aa5cb4e44775b1b6f39ff1274cff2e8b8
-EBUILD selinux-pan-2.20170204-r4.ebuild 373 SHA256 45f016ed343c21e4014f8fd16b0af4ed6f6a959c722ff18ef0f65d420ae93003 SHA512 cb57ae695c5a3bf4f6a283e8f1fa995e0b61c32d209bd56da858783aee97a40c47f72fd5ea9cb5f69bf709f2928605daed48b62c9ab7ae54da2515d95b0ef59d WHIRLPOOL 1cc0de38d185b3eb75e0858b1a5c736acdff51836a5fa9b1416f870e1e637fae62da0f4c4a8e7f99e40906d1c97fd76aa5cb4e44775b1b6f39ff1274cff2e8b8
-EBUILD selinux-pan-2.20170805-r2.ebuild 373 SHA256 45f016ed343c21e4014f8fd16b0af4ed6f6a959c722ff18ef0f65d420ae93003 SHA512 cb57ae695c5a3bf4f6a283e8f1fa995e0b61c32d209bd56da858783aee97a40c47f72fd5ea9cb5f69bf709f2928605daed48b62c9ab7ae54da2515d95b0ef59d WHIRLPOOL 1cc0de38d185b3eb75e0858b1a5c736acdff51836a5fa9b1416f870e1e637fae62da0f4c4a8e7f99e40906d1c97fd76aa5cb4e44775b1b6f39ff1274cff2e8b8
-EBUILD selinux-pan-9999.ebuild 375 SHA256 b2b70ac2165e08581cf0ca5adecc4a8131179524fbf25b92c74f64b6909a631c SHA512 8fe5f4d1395e0de8a353389277e6859b7234e9e6b688dca1f59003bb0fc805c5ebd7b49dcbd32f794d9841f0407bbe81432ae61899607fedec52ae9a788ee0d7 WHIRLPOOL ef2a90c7eb4d49a39b35278296d2ee2345a0a8e50d7cf4aa39b5cb8db053d763fbe615c8c65a3b458fbed57078f6505a9cce6eba6f484c3bf1a4ce516bb1c4d7
+EBUILD selinux-pan-2.20170204-r1.ebuild 376 SHA256 de9c1b80cbe527d422155879160f62a1c4dabe72ce944356d726c579b8feb729 SHA512 271e5246d3a246cca2744e390870c8fac026ee8ae6befa609b42d244d5c5de76e251e7ae0a7f2e3e62b0ef25d59168c868ca10afc58a1e326aa93b654347c473 WHIRLPOOL 3d48269bfa54aeca19964e81ea6ef65dd71014b844a19b6460d63046dce655f83b75c7a0c1531e72eec355aa26a524b2b775d95015ceae88efdd65c613aca3a5
+EBUILD selinux-pan-2.20170204-r2.ebuild 374 SHA256 28e567b842e133bbca52ea4c547e97afe86957a9c5da309ea30e1556b2508651 SHA512 673dc43e2673aeac2e70f7cccc8eefda4a6b843f5bdef929afd05655cfe4ccd532c5f41e923680dc4767637b108c7180de1040e6c1a21ecd1c7319f21ca809dd WHIRLPOOL 8c30172b2b031fa020eab1cf5dc999c2ff7bad8906d4abfab28997727ca5511010dd3e33b6c300e022e38bfabd03784015fae773487ee697a0bd8e85291dfc73
+EBUILD selinux-pan-2.20170204-r3.ebuild 374 SHA256 28e567b842e133bbca52ea4c547e97afe86957a9c5da309ea30e1556b2508651 SHA512 673dc43e2673aeac2e70f7cccc8eefda4a6b843f5bdef929afd05655cfe4ccd532c5f41e923680dc4767637b108c7180de1040e6c1a21ecd1c7319f21ca809dd WHIRLPOOL 8c30172b2b031fa020eab1cf5dc999c2ff7bad8906d4abfab28997727ca5511010dd3e33b6c300e022e38bfabd03784015fae773487ee697a0bd8e85291dfc73
+EBUILD selinux-pan-2.20170204-r4.ebuild 374 SHA256 28e567b842e133bbca52ea4c547e97afe86957a9c5da309ea30e1556b2508651 SHA512 673dc43e2673aeac2e70f7cccc8eefda4a6b843f5bdef929afd05655cfe4ccd532c5f41e923680dc4767637b108c7180de1040e6c1a21ecd1c7319f21ca809dd WHIRLPOOL 8c30172b2b031fa020eab1cf5dc999c2ff7bad8906d4abfab28997727ca5511010dd3e33b6c300e022e38bfabd03784015fae773487ee697a0bd8e85291dfc73
+EBUILD selinux-pan-2.20170805-r2.ebuild 374 SHA256 28e567b842e133bbca52ea4c547e97afe86957a9c5da309ea30e1556b2508651 SHA512 673dc43e2673aeac2e70f7cccc8eefda4a6b843f5bdef929afd05655cfe4ccd532c5f41e923680dc4767637b108c7180de1040e6c1a21ecd1c7319f21ca809dd WHIRLPOOL 8c30172b2b031fa020eab1cf5dc999c2ff7bad8906d4abfab28997727ca5511010dd3e33b6c300e022e38bfabd03784015fae773487ee697a0bd8e85291dfc73
+EBUILD selinux-pan-2.20170805-r3.ebuild 376 SHA256 de9c1b80cbe527d422155879160f62a1c4dabe72ce944356d726c579b8feb729 SHA512 271e5246d3a246cca2744e390870c8fac026ee8ae6befa609b42d244d5c5de76e251e7ae0a7f2e3e62b0ef25d59168c868ca10afc58a1e326aa93b654347c473 WHIRLPOOL 3d48269bfa54aeca19964e81ea6ef65dd71014b844a19b6460d63046dce655f83b75c7a0c1531e72eec355aa26a524b2b775d95015ceae88efdd65c613aca3a5
+EBUILD selinux-pan-9999.ebuild 376 SHA256 de9c1b80cbe527d422155879160f62a1c4dabe72ce944356d726c579b8feb729 SHA512 271e5246d3a246cca2744e390870c8fac026ee8ae6befa609b42d244d5c5de76e251e7ae0a7f2e3e62b0ef25d59168c868ca10afc58a1e326aa93b654347c473 WHIRLPOOL 3d48269bfa54aeca19964e81ea6ef65dd71014b844a19b6460d63046dce655f83b75c7a0c1531e72eec355aa26a524b2b775d95015ceae88efdd65c613aca3a5
 MISC ChangeLog 10295 SHA256 d48e5d503c429919a42f5d986cacc1c9ccf2d7e57fd3fa06a5b114da610cfc22 SHA512 289e14a1918ad3a434da4ad5ec31f16e0f19293039418d3e086413ba811e47ef61ce27f403752e8b5eacfb7af6eef3f8ed9b098a7edb4436ae96e2335f7d6547 WHIRLPOOL bf4b41de042362071da206ba21eb3e8439c13a1e7d6fee2d3f46adff5cd53b58a72e97dc04c42b08b0518e2453f449f476267ab007d8b17352e66dff21d29609
 MISC ChangeLog-2015 10133 SHA256 2b6b52aebfe4e0d117d3deccff0182fc3168a650d13dbb17e71beb0cfd2a5e54 SHA512 49b12f65c4a1cfe147aebe5f42471ed1da29b7af88837f9c96afee3e157b683220f81fdd4886b1cbbff40a35490cfc4c33c066d8b3ba8f8a1a94fd1729e7aff3 WHIRLPOOL c9ce693c2f1470c57f7d52f5fae52eaf2ea7b0593492d9466915d40f0e6a627b537d15f26deb5cf641369757d2ee50ba6c9f52aa36fa6a964143efce51142f66
 MISC metadata.xml 313 SHA256 b1cbbaaad70cc459144231163c6cf8f4479d68d985d1b39073ff771ec646ced0 SHA512 c7b7a83c7cbe58b4294977429326fd22b59391fd3c670e4a4083687c4eff871665af17d9ee4cdd14efac69f630d97d38eaf1e5bc37a7ff538cd847c993408a1a WHIRLPOOL 3de2f1def222b821e77c290c78a5862acbb2666add1b839cc66dcf35fad4fec637147dce98d62caa49dfe75031c779d9058f4800766fdcc08268cd149340f5d3
diff --git a/sec-policy/selinux-pan/selinux-pan-2.20170204-r1.ebuild b/sec-policy/selinux-pan/selinux-pan-2.20170204-r1.ebuild
index 094a1db4e250..741fbe8a33e2 100644
--- a/sec-policy/selinux-pan/selinux-pan-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-pan/selinux-pan-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-pan/selinux-pan-2.20170204-r2.ebuild b/sec-policy/selinux-pan/selinux-pan-2.20170204-r2.ebuild
index 38b71d55d1d0..d460c840cdc3 100644
--- a/sec-policy/selinux-pan/selinux-pan-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-pan/selinux-pan-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-pan/selinux-pan-2.20170204-r3.ebuild b/sec-policy/selinux-pan/selinux-pan-2.20170204-r3.ebuild
index 38b71d55d1d0..d460c840cdc3 100644
--- a/sec-policy/selinux-pan/selinux-pan-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-pan/selinux-pan-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-pan/selinux-pan-2.20170204-r4.ebuild b/sec-policy/selinux-pan/selinux-pan-2.20170204-r4.ebuild
index 38b71d55d1d0..d460c840cdc3 100644
--- a/sec-policy/selinux-pan/selinux-pan-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-pan/selinux-pan-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-pan/selinux-pan-2.20170805-r2.ebuild b/sec-policy/selinux-pan/selinux-pan-2.20170805-r2.ebuild
index 38b71d55d1d0..d460c840cdc3 100644
--- a/sec-policy/selinux-pan/selinux-pan-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-pan/selinux-pan-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-pan/selinux-pan-2.20170805-r3.ebuild b/sec-policy/selinux-pan/selinux-pan-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..741fbe8a33e2
--- /dev/null
+++ b/sec-policy/selinux-pan/selinux-pan-2.20170805-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-pan/selinux-pan-9999.ebuild b/sec-policy/selinux-pan/selinux-pan-9999.ebuild
index 094a1db4e250..741fbe8a33e2 100644
--- a/sec-policy/selinux-pan/selinux-pan-9999.ebuild
+++ b/sec-policy/selinux-pan/selinux-pan-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-pcmcia/Manifest b/sec-policy/selinux-pcmcia/Manifest
index 0b6fbb2e7048..6260cc77be38 100644
--- a/sec-policy/selinux-pcmcia/Manifest
+++ b/sec-policy/selinux-pcmcia/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-pcmcia-2.20170204-r1.ebuild 283 SHA256 a7266ae924a2b13529378d536c1d2aa898334d6c783d12b9222feadfd6c491f9 SHA512 eea77494599a535803d361c6a354947a4e4ce907f6622b764866c8ca4babcda6f3d847ea41f33957f9149f961a89b1da7702ed8c59c668d323478d885b50cc13 WHIRLPOOL 55d0bc4fcca99b1626cc9f5855e9aad84ae97fc7f7f3e6098ec522a87066e0262103b33567244cb71d27b2559925a9ffa4d6317238b9f4ef2e2edf201bd429fa
-EBUILD selinux-pcmcia-2.20170204-r2.ebuild 281 SHA256 a0d26416ba1068ae8e9c2c6d4d27213207dcaf9c290d227d0cda7ece6ea2b835 SHA512 385179594dc9cc16f28b38366f22ced197ef19622e1b83763e811a46b16e2eee32e953e92a7e9e83df9c02da334214649a25e1f4c5df09144d34e5cd3bc3cce7 WHIRLPOOL 4c046bfd81e0128235b169cc0a537a49a7ff2b5bf2cc2298ddc5cc1701804faa6cbf3f57c4f123988330a8428cf3999f51665649b022c55058976ac37ce9132a
-EBUILD selinux-pcmcia-2.20170204-r3.ebuild 281 SHA256 a0d26416ba1068ae8e9c2c6d4d27213207dcaf9c290d227d0cda7ece6ea2b835 SHA512 385179594dc9cc16f28b38366f22ced197ef19622e1b83763e811a46b16e2eee32e953e92a7e9e83df9c02da334214649a25e1f4c5df09144d34e5cd3bc3cce7 WHIRLPOOL 4c046bfd81e0128235b169cc0a537a49a7ff2b5bf2cc2298ddc5cc1701804faa6cbf3f57c4f123988330a8428cf3999f51665649b022c55058976ac37ce9132a
-EBUILD selinux-pcmcia-2.20170204-r4.ebuild 281 SHA256 a0d26416ba1068ae8e9c2c6d4d27213207dcaf9c290d227d0cda7ece6ea2b835 SHA512 385179594dc9cc16f28b38366f22ced197ef19622e1b83763e811a46b16e2eee32e953e92a7e9e83df9c02da334214649a25e1f4c5df09144d34e5cd3bc3cce7 WHIRLPOOL 4c046bfd81e0128235b169cc0a537a49a7ff2b5bf2cc2298ddc5cc1701804faa6cbf3f57c4f123988330a8428cf3999f51665649b022c55058976ac37ce9132a
-EBUILD selinux-pcmcia-2.20170805-r2.ebuild 281 SHA256 a0d26416ba1068ae8e9c2c6d4d27213207dcaf9c290d227d0cda7ece6ea2b835 SHA512 385179594dc9cc16f28b38366f22ced197ef19622e1b83763e811a46b16e2eee32e953e92a7e9e83df9c02da334214649a25e1f4c5df09144d34e5cd3bc3cce7 WHIRLPOOL 4c046bfd81e0128235b169cc0a537a49a7ff2b5bf2cc2298ddc5cc1701804faa6cbf3f57c4f123988330a8428cf3999f51665649b022c55058976ac37ce9132a
-EBUILD selinux-pcmcia-9999.ebuild 283 SHA256 a7266ae924a2b13529378d536c1d2aa898334d6c783d12b9222feadfd6c491f9 SHA512 eea77494599a535803d361c6a354947a4e4ce907f6622b764866c8ca4babcda6f3d847ea41f33957f9149f961a89b1da7702ed8c59c668d323478d885b50cc13 WHIRLPOOL 55d0bc4fcca99b1626cc9f5855e9aad84ae97fc7f7f3e6098ec522a87066e0262103b33567244cb71d27b2559925a9ffa4d6317238b9f4ef2e2edf201bd429fa
+EBUILD selinux-pcmcia-2.20170204-r1.ebuild 284 SHA256 17b09383cc6b44d239074703aa6a40e1ff061dadee90991d435c94c09deec820 SHA512 36d3a13f6e0835f236f61229eaaa46563d5ad0ef56b8d8c303156c420ef25a47df5a5e89ac7d36a8a3c02079eb9bc6d5ab7c452b54f887dc2527568dfd9c2d33 WHIRLPOOL 89ecd622c611585de7db63c1997aa033fdad3f09e157fedf8bc4d4478cd52031c940959539c76889c378245b4fe65ede2d45825b24d43c49cf72f0d1f46d44e1
+EBUILD selinux-pcmcia-2.20170204-r2.ebuild 282 SHA256 fee4311cf5e9974d4a57b47fd762ff148f026f85f8b6cf14777dd4456bb9d384 SHA512 264b8f02668863e8cc048896a63cafaf507223e6a2bcf33cc40fa76e2a2b74a6641098bf10727bcbfcc8af924ec8132c556d5e6e3c84e900dd82f68ff992520d WHIRLPOOL 8334a4f8033098dbaf9b3c7e78f7e8df32b2266031bba3dae73c459bd7fd67786077f308d3126810dd915f5f9948f82969a8197e70d5e329b01c1540b6eb680b
+EBUILD selinux-pcmcia-2.20170204-r3.ebuild 282 SHA256 fee4311cf5e9974d4a57b47fd762ff148f026f85f8b6cf14777dd4456bb9d384 SHA512 264b8f02668863e8cc048896a63cafaf507223e6a2bcf33cc40fa76e2a2b74a6641098bf10727bcbfcc8af924ec8132c556d5e6e3c84e900dd82f68ff992520d WHIRLPOOL 8334a4f8033098dbaf9b3c7e78f7e8df32b2266031bba3dae73c459bd7fd67786077f308d3126810dd915f5f9948f82969a8197e70d5e329b01c1540b6eb680b
+EBUILD selinux-pcmcia-2.20170204-r4.ebuild 282 SHA256 fee4311cf5e9974d4a57b47fd762ff148f026f85f8b6cf14777dd4456bb9d384 SHA512 264b8f02668863e8cc048896a63cafaf507223e6a2bcf33cc40fa76e2a2b74a6641098bf10727bcbfcc8af924ec8132c556d5e6e3c84e900dd82f68ff992520d WHIRLPOOL 8334a4f8033098dbaf9b3c7e78f7e8df32b2266031bba3dae73c459bd7fd67786077f308d3126810dd915f5f9948f82969a8197e70d5e329b01c1540b6eb680b
+EBUILD selinux-pcmcia-2.20170805-r2.ebuild 282 SHA256 fee4311cf5e9974d4a57b47fd762ff148f026f85f8b6cf14777dd4456bb9d384 SHA512 264b8f02668863e8cc048896a63cafaf507223e6a2bcf33cc40fa76e2a2b74a6641098bf10727bcbfcc8af924ec8132c556d5e6e3c84e900dd82f68ff992520d WHIRLPOOL 8334a4f8033098dbaf9b3c7e78f7e8df32b2266031bba3dae73c459bd7fd67786077f308d3126810dd915f5f9948f82969a8197e70d5e329b01c1540b6eb680b
+EBUILD selinux-pcmcia-2.20170805-r3.ebuild 284 SHA256 17b09383cc6b44d239074703aa6a40e1ff061dadee90991d435c94c09deec820 SHA512 36d3a13f6e0835f236f61229eaaa46563d5ad0ef56b8d8c303156c420ef25a47df5a5e89ac7d36a8a3c02079eb9bc6d5ab7c452b54f887dc2527568dfd9c2d33 WHIRLPOOL 89ecd622c611585de7db63c1997aa033fdad3f09e157fedf8bc4d4478cd52031c940959539c76889c378245b4fe65ede2d45825b24d43c49cf72f0d1f46d44e1
+EBUILD selinux-pcmcia-9999.ebuild 284 SHA256 17b09383cc6b44d239074703aa6a40e1ff061dadee90991d435c94c09deec820 SHA512 36d3a13f6e0835f236f61229eaaa46563d5ad0ef56b8d8c303156c420ef25a47df5a5e89ac7d36a8a3c02079eb9bc6d5ab7c452b54f887dc2527568dfd9c2d33 WHIRLPOOL 89ecd622c611585de7db63c1997aa033fdad3f09e157fedf8bc4d4478cd52031c940959539c76889c378245b4fe65ede2d45825b24d43c49cf72f0d1f46d44e1
 MISC ChangeLog 10571 SHA256 f33277e366f8024a7b0798a62793e781a2f6bcedacdf3a89cbbf16472b7be2f0 SHA512 15b0263991c7e89f144a1f6e9d3b6cc975113c2c3d6cc6c9175decfbdc58a4760c7c158893e902adff9989b758569280cc8bba2f6edf89289464563c284f062e WHIRLPOOL b02100f1a2d1cbc60c78a4b23367e90bcb7cc1a78677bdd82946dab6c0202479442f293bcda48439c5ec38b5fe051509e515c89998950611483a77efdbd13dca
 MISC ChangeLog-2015 11748 SHA256 3c8683cffefd3cf50de9b6c704a5abff380ab06f28682f39b741a7c00861c10b SHA512 590b639246fd06bff50420bef9c2e1b57dc9a471a77b1557af68437f36f025778337b6235ccd77843939d15116a38bc2aa7c016e2807a5e8a2f45a3e22b5d733 WHIRLPOOL f4b18d45b7e5ccccab4d11a80d4bc68d9edaabb91341e79f594a7de38708bdc9b53cf11d78d6df17d29a3b039305960eaa4242df33d80bbe08c3919339973efd
 MISC metadata.xml 316 SHA256 27d5f24e3faf95e1405d346c03a679a2aa243331a491ccf518cc0aece7bb7bd1 SHA512 644a200cefcb82931e5c53f504228299b407d25c41b933af09a705755fe7c6c017da62e70162fe83221d534d33be77c82235c39bade584af62249e97a963abd3 WHIRLPOOL 0a5bcd752beab96800c946db9c9ede4df3db55fb0c732ce6f855f6a0a85607f70bfcb37cf557527f803f579ae09c6a77f972472070e08aeb9118b9903a7b2867
diff --git a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20170204-r1.ebuild b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20170204-r1.ebuild
index 8ee60a628a3a..6b569dce36a2 100644
--- a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20170204-r2.ebuild b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20170204-r2.ebuild
index f570e45c137f..29b5f976a9b6 100644
--- a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20170204-r3.ebuild b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20170204-r3.ebuild
index f570e45c137f..29b5f976a9b6 100644
--- a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20170204-r4.ebuild b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20170204-r4.ebuild
index f570e45c137f..29b5f976a9b6 100644
--- a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20170805-r2.ebuild b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20170805-r2.ebuild
index f570e45c137f..29b5f976a9b6 100644
--- a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20170805-r3.ebuild b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..6b569dce36a2
--- /dev/null
+++ b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-pcmcia/selinux-pcmcia-9999.ebuild b/sec-policy/selinux-pcmcia/selinux-pcmcia-9999.ebuild
index 8ee60a628a3a..6b569dce36a2 100644
--- a/sec-policy/selinux-pcmcia/selinux-pcmcia-9999.ebuild
+++ b/sec-policy/selinux-pcmcia/selinux-pcmcia-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-pcscd/Manifest b/sec-policy/selinux-pcscd/Manifest
index a145bc46d4b4..f0d3b25685e8 100644
--- a/sec-policy/selinux-pcscd/Manifest
+++ b/sec-policy/selinux-pcscd/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-pcscd-2.20170204-r1.ebuild 281 SHA256 636a553e238962da88d4afd2232945ef93846e3cf8778cd153c383b72a1105cc SHA512 7d89f6e26366ee3b78e8273ace76ac630f11b3dea96b88f88cb9cfc27f3fdac415d2554092b90860e43500ab057e87f3e376c173f6116f3e661adefe13c60423 WHIRLPOOL d6142067426e35455c093a0e504d9ea08f79aefea64f6d41d45422b20100e23b1d2987ac16933496711ea3edfd43bcc6702110b2501c3e8ccd88676f1b459882
-EBUILD selinux-pcscd-2.20170204-r2.ebuild 279 SHA256 840e1e7f0a5f7fb70c1b366add691c3d84317a6a3d5da7329184a40f2a107f89 SHA512 b8c90bcbe4da1bbdf40b57f54d5a34bcb649b8d4822b396f87f9a6fba2aab836f4c5c53752f903024d14567ced9ec5034382860267513fc569c8870494efff26 WHIRLPOOL 9f12a1136bbbe1156bb18e1b3f07fe7f16e8eeaa8407d94f4f1e09b2dc49a5bbacbc6d645cee64e51eab38828ded0cca62fbfc9ef8bf396cc0e56f58f25cf991
-EBUILD selinux-pcscd-2.20170204-r3.ebuild 279 SHA256 840e1e7f0a5f7fb70c1b366add691c3d84317a6a3d5da7329184a40f2a107f89 SHA512 b8c90bcbe4da1bbdf40b57f54d5a34bcb649b8d4822b396f87f9a6fba2aab836f4c5c53752f903024d14567ced9ec5034382860267513fc569c8870494efff26 WHIRLPOOL 9f12a1136bbbe1156bb18e1b3f07fe7f16e8eeaa8407d94f4f1e09b2dc49a5bbacbc6d645cee64e51eab38828ded0cca62fbfc9ef8bf396cc0e56f58f25cf991
-EBUILD selinux-pcscd-2.20170204-r4.ebuild 279 SHA256 840e1e7f0a5f7fb70c1b366add691c3d84317a6a3d5da7329184a40f2a107f89 SHA512 b8c90bcbe4da1bbdf40b57f54d5a34bcb649b8d4822b396f87f9a6fba2aab836f4c5c53752f903024d14567ced9ec5034382860267513fc569c8870494efff26 WHIRLPOOL 9f12a1136bbbe1156bb18e1b3f07fe7f16e8eeaa8407d94f4f1e09b2dc49a5bbacbc6d645cee64e51eab38828ded0cca62fbfc9ef8bf396cc0e56f58f25cf991
-EBUILD selinux-pcscd-2.20170805-r2.ebuild 279 SHA256 840e1e7f0a5f7fb70c1b366add691c3d84317a6a3d5da7329184a40f2a107f89 SHA512 b8c90bcbe4da1bbdf40b57f54d5a34bcb649b8d4822b396f87f9a6fba2aab836f4c5c53752f903024d14567ced9ec5034382860267513fc569c8870494efff26 WHIRLPOOL 9f12a1136bbbe1156bb18e1b3f07fe7f16e8eeaa8407d94f4f1e09b2dc49a5bbacbc6d645cee64e51eab38828ded0cca62fbfc9ef8bf396cc0e56f58f25cf991
-EBUILD selinux-pcscd-9999.ebuild 281 SHA256 636a553e238962da88d4afd2232945ef93846e3cf8778cd153c383b72a1105cc SHA512 7d89f6e26366ee3b78e8273ace76ac630f11b3dea96b88f88cb9cfc27f3fdac415d2554092b90860e43500ab057e87f3e376c173f6116f3e661adefe13c60423 WHIRLPOOL d6142067426e35455c093a0e504d9ea08f79aefea64f6d41d45422b20100e23b1d2987ac16933496711ea3edfd43bcc6702110b2501c3e8ccd88676f1b459882
+EBUILD selinux-pcscd-2.20170204-r1.ebuild 282 SHA256 c1784354b50b2df00ae69447af49d29c8172f322a69d9c263bf7ea0d2846d349 SHA512 2023a44c06bb74372315b55bb48e3cc4630542cc2721d5c0e7ba8392a3d99a07f58c689776c342e100c4f2f108dc4dc5e72cc15176187fbb52bc35972065a1b2 WHIRLPOOL 47b9229fb65840db34868af95c9fa458eea9aa9a47ac5e124c1e2aa5c324b33f04004104f935c78019508fd73e395697b2047ab8fa72766ba08c8cef60b142b6
+EBUILD selinux-pcscd-2.20170204-r2.ebuild 280 SHA256 a70161f0ec608eee77fa948efe631fd958aff32d99cc0cc299e0d10236e46191 SHA512 95ad2f1e5d7113ee3f2886769aab2bb7341ae72cb5fba682a3f0305f7bfa89bfe7f55eb570b1de5c59aabc0bd27146f300a9368c629971793a2ecd2308f33253 WHIRLPOOL b2c5c086e225ba447f3f92a267d02164197d94316f95c7750dfbf2e088b5852a0ee03e9762190adfb27985f7207bac5b8e84ab4c1fddad2511f4a7960637cebb
+EBUILD selinux-pcscd-2.20170204-r3.ebuild 280 SHA256 a70161f0ec608eee77fa948efe631fd958aff32d99cc0cc299e0d10236e46191 SHA512 95ad2f1e5d7113ee3f2886769aab2bb7341ae72cb5fba682a3f0305f7bfa89bfe7f55eb570b1de5c59aabc0bd27146f300a9368c629971793a2ecd2308f33253 WHIRLPOOL b2c5c086e225ba447f3f92a267d02164197d94316f95c7750dfbf2e088b5852a0ee03e9762190adfb27985f7207bac5b8e84ab4c1fddad2511f4a7960637cebb
+EBUILD selinux-pcscd-2.20170204-r4.ebuild 280 SHA256 a70161f0ec608eee77fa948efe631fd958aff32d99cc0cc299e0d10236e46191 SHA512 95ad2f1e5d7113ee3f2886769aab2bb7341ae72cb5fba682a3f0305f7bfa89bfe7f55eb570b1de5c59aabc0bd27146f300a9368c629971793a2ecd2308f33253 WHIRLPOOL b2c5c086e225ba447f3f92a267d02164197d94316f95c7750dfbf2e088b5852a0ee03e9762190adfb27985f7207bac5b8e84ab4c1fddad2511f4a7960637cebb
+EBUILD selinux-pcscd-2.20170805-r2.ebuild 280 SHA256 a70161f0ec608eee77fa948efe631fd958aff32d99cc0cc299e0d10236e46191 SHA512 95ad2f1e5d7113ee3f2886769aab2bb7341ae72cb5fba682a3f0305f7bfa89bfe7f55eb570b1de5c59aabc0bd27146f300a9368c629971793a2ecd2308f33253 WHIRLPOOL b2c5c086e225ba447f3f92a267d02164197d94316f95c7750dfbf2e088b5852a0ee03e9762190adfb27985f7207bac5b8e84ab4c1fddad2511f4a7960637cebb
+EBUILD selinux-pcscd-2.20170805-r3.ebuild 282 SHA256 c1784354b50b2df00ae69447af49d29c8172f322a69d9c263bf7ea0d2846d349 SHA512 2023a44c06bb74372315b55bb48e3cc4630542cc2721d5c0e7ba8392a3d99a07f58c689776c342e100c4f2f108dc4dc5e72cc15176187fbb52bc35972065a1b2 WHIRLPOOL 47b9229fb65840db34868af95c9fa458eea9aa9a47ac5e124c1e2aa5c324b33f04004104f935c78019508fd73e395697b2047ab8fa72766ba08c8cef60b142b6
+EBUILD selinux-pcscd-9999.ebuild 282 SHA256 c1784354b50b2df00ae69447af49d29c8172f322a69d9c263bf7ea0d2846d349 SHA512 2023a44c06bb74372315b55bb48e3cc4630542cc2721d5c0e7ba8392a3d99a07f58c689776c342e100c4f2f108dc4dc5e72cc15176187fbb52bc35972065a1b2 WHIRLPOOL 47b9229fb65840db34868af95c9fa458eea9aa9a47ac5e124c1e2aa5c324b33f04004104f935c78019508fd73e395697b2047ab8fa72766ba08c8cef60b142b6
 MISC ChangeLog 10479 SHA256 b1df5b8de9cbd907cb6c710e1ab83ecba001e9342b1db177531c6bbbfca9da30 SHA512 40e30d686b1a1ee4d4b4b77e56bdc33539e7b35ecf33dac57e29e1cd07df8e05b6387f680f360dcbd7f97399a8aefdad95b23964ad354050af638c65436cbe94 WHIRLPOOL f4f0440a9bc0578f7852f679d1b80786f5bf15c33fa41ef582582bacb56aa78032989f22e880066def0ec30b3de542fd09ba349698e66f0b03bc4ccad1d5522f
 MISC ChangeLog-2015 5083 SHA256 5deacc4497fc3d96c36dd17860c7561b403cfe5f04d0e494f340e7f4d7f5e80f SHA512 77035a46234e0bb0c8d62eee7053aae0cb9cf81054b57ce0b681d306c85d8696c93a526e467e9e0c9359306e523966df697b377df320f81822a8212f81b0da64 WHIRLPOOL 42b66933c36d6724b40990f1def52ecad3616774dd27d672a728b606ab9ce090dcf9b5b48a4f46381d22bda31803812bf690c9ecc54f52c03c1cf5baf7255a62
 MISC metadata.xml 315 SHA256 a657d7accd678fd0c9d204019e0652c80d9351e261f4ceffec6156f993d46dea SHA512 07d74c79dedc7fa7d45e23d019551a2358b69c08b1ff86a22bd8b41068c33a951520e21563844bf75f9fa0b9e966c41d91ad834a6ecbdc2293f210fc45091566 WHIRLPOOL d4d76bc0b0e120efb514a999303e3c7033d862cf6694493958a611c74c5d80a69b1053248867dabd99f49216159447a425f0bd8c409e94afb1f5601fc1d14cb9
diff --git a/sec-policy/selinux-pcscd/selinux-pcscd-2.20170204-r1.ebuild b/sec-policy/selinux-pcscd/selinux-pcscd-2.20170204-r1.ebuild
index 07edc51da7b0..494fe7d84678 100644
--- a/sec-policy/selinux-pcscd/selinux-pcscd-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-pcscd/selinux-pcscd-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-pcscd/selinux-pcscd-2.20170204-r2.ebuild b/sec-policy/selinux-pcscd/selinux-pcscd-2.20170204-r2.ebuild
index 3c080cf0b93f..d7bd020019d8 100644
--- a/sec-policy/selinux-pcscd/selinux-pcscd-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-pcscd/selinux-pcscd-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-pcscd/selinux-pcscd-2.20170204-r3.ebuild b/sec-policy/selinux-pcscd/selinux-pcscd-2.20170204-r3.ebuild
index 3c080cf0b93f..d7bd020019d8 100644
--- a/sec-policy/selinux-pcscd/selinux-pcscd-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-pcscd/selinux-pcscd-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-pcscd/selinux-pcscd-2.20170204-r4.ebuild b/sec-policy/selinux-pcscd/selinux-pcscd-2.20170204-r4.ebuild
index 3c080cf0b93f..d7bd020019d8 100644
--- a/sec-policy/selinux-pcscd/selinux-pcscd-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-pcscd/selinux-pcscd-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-pcscd/selinux-pcscd-2.20170805-r2.ebuild b/sec-policy/selinux-pcscd/selinux-pcscd-2.20170805-r2.ebuild
index 3c080cf0b93f..d7bd020019d8 100644
--- a/sec-policy/selinux-pcscd/selinux-pcscd-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-pcscd/selinux-pcscd-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-pcscd/selinux-pcscd-2.20170805-r3.ebuild b/sec-policy/selinux-pcscd/selinux-pcscd-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..494fe7d84678
--- /dev/null
+++ b/sec-policy/selinux-pcscd/selinux-pcscd-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-pcscd/selinux-pcscd-9999.ebuild b/sec-policy/selinux-pcscd/selinux-pcscd-9999.ebuild
index 07edc51da7b0..494fe7d84678 100644
--- a/sec-policy/selinux-pcscd/selinux-pcscd-9999.ebuild
+++ b/sec-policy/selinux-pcscd/selinux-pcscd-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-perdition/Manifest b/sec-policy/selinux-perdition/Manifest
index ce5f22cf9589..c347dfe3e938 100644
--- a/sec-policy/selinux-perdition/Manifest
+++ b/sec-policy/selinux-perdition/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-perdition-2.20170204-r1.ebuild 289 SHA256 e7a9d8b7e7d5a82614ec2d6630d083d3604b1a0867424c29151b233c74604020 SHA512 782fb3552ffd908a19e78f8adbcb18186dd1c0768f387cf01069ae012f468d0e6a61ffd66be569096594c2e486dd5d07561935cf5254fdd7d40c478ef2df7981 WHIRLPOOL 40e93659e11c06b7b692615e4d2ead752e295e2d09bf630f653e54b08722f213e811168d389335967f2ae34ccc82aca48cfad17fe20d88c103605a6a7969c108
-EBUILD selinux-perdition-2.20170204-r2.ebuild 287 SHA256 f4a9a7f1a853cf0e3449720157560196fe94d670385aa0bb884d95740f39bd8f SHA512 14a1521507783d7f095a2ac87cd0ce860fb91b854c7834d2fa61c988dfedd11e8ba5681775ac931399d1608950a565c498b123a41479adf2161ca1c26da8cbdf WHIRLPOOL f5385da1dc186269966fafb879ab28681e6d7fabb90989a07b6dff2990be6ae31b52d0fb2e7522f89dcd68c43d155d0485cdc92d9e18d1ec8c176e5976cb8a43
-EBUILD selinux-perdition-2.20170204-r3.ebuild 287 SHA256 f4a9a7f1a853cf0e3449720157560196fe94d670385aa0bb884d95740f39bd8f SHA512 14a1521507783d7f095a2ac87cd0ce860fb91b854c7834d2fa61c988dfedd11e8ba5681775ac931399d1608950a565c498b123a41479adf2161ca1c26da8cbdf WHIRLPOOL f5385da1dc186269966fafb879ab28681e6d7fabb90989a07b6dff2990be6ae31b52d0fb2e7522f89dcd68c43d155d0485cdc92d9e18d1ec8c176e5976cb8a43
-EBUILD selinux-perdition-2.20170204-r4.ebuild 287 SHA256 f4a9a7f1a853cf0e3449720157560196fe94d670385aa0bb884d95740f39bd8f SHA512 14a1521507783d7f095a2ac87cd0ce860fb91b854c7834d2fa61c988dfedd11e8ba5681775ac931399d1608950a565c498b123a41479adf2161ca1c26da8cbdf WHIRLPOOL f5385da1dc186269966fafb879ab28681e6d7fabb90989a07b6dff2990be6ae31b52d0fb2e7522f89dcd68c43d155d0485cdc92d9e18d1ec8c176e5976cb8a43
-EBUILD selinux-perdition-2.20170805-r2.ebuild 287 SHA256 f4a9a7f1a853cf0e3449720157560196fe94d670385aa0bb884d95740f39bd8f SHA512 14a1521507783d7f095a2ac87cd0ce860fb91b854c7834d2fa61c988dfedd11e8ba5681775ac931399d1608950a565c498b123a41479adf2161ca1c26da8cbdf WHIRLPOOL f5385da1dc186269966fafb879ab28681e6d7fabb90989a07b6dff2990be6ae31b52d0fb2e7522f89dcd68c43d155d0485cdc92d9e18d1ec8c176e5976cb8a43
-EBUILD selinux-perdition-9999.ebuild 289 SHA256 e7a9d8b7e7d5a82614ec2d6630d083d3604b1a0867424c29151b233c74604020 SHA512 782fb3552ffd908a19e78f8adbcb18186dd1c0768f387cf01069ae012f468d0e6a61ffd66be569096594c2e486dd5d07561935cf5254fdd7d40c478ef2df7981 WHIRLPOOL 40e93659e11c06b7b692615e4d2ead752e295e2d09bf630f653e54b08722f213e811168d389335967f2ae34ccc82aca48cfad17fe20d88c103605a6a7969c108
+EBUILD selinux-perdition-2.20170204-r1.ebuild 290 SHA256 480d3b6d839befcb001a382febaeba0c7b35440fe59e9640423f00ebb9ceb840 SHA512 b36946cce789a242068b4181059ab1ad0c95575f34dee5f6373f65c0efbcd6f962fe53ab0b3e8f793d01564e20fee856c39354e6f947c9bc77a526a1808ed32b WHIRLPOOL 2f49283789c21182557e286c31e7c4714e2efee7d263dd1ceaaa51d7ba0b739b4165ee3f55f8a63373c491a8b04b267c5abc3aca43d67f379c243e64618f6edc
+EBUILD selinux-perdition-2.20170204-r2.ebuild 288 SHA256 45df4a41cac4848c0ca55737d5830290239d7cea1aac9be98e0f00063cbda88b SHA512 910acdf0ce0ab350ac82618588bcee42ce5f9d8fbe633829a1cbd72d77b99f637b58cee3a2565471737aec36c8f9d9698e179899f756835757741f3413b9fd85 WHIRLPOOL 186ea6d89dc768687a4af0600c69248dab8ed970b165d6354e7e6a58ae747f5b7240cef742b9c96c19895b2e2ffe2012cc60ea2b062f8afcea8cc72df2a61655
+EBUILD selinux-perdition-2.20170204-r3.ebuild 288 SHA256 45df4a41cac4848c0ca55737d5830290239d7cea1aac9be98e0f00063cbda88b SHA512 910acdf0ce0ab350ac82618588bcee42ce5f9d8fbe633829a1cbd72d77b99f637b58cee3a2565471737aec36c8f9d9698e179899f756835757741f3413b9fd85 WHIRLPOOL 186ea6d89dc768687a4af0600c69248dab8ed970b165d6354e7e6a58ae747f5b7240cef742b9c96c19895b2e2ffe2012cc60ea2b062f8afcea8cc72df2a61655
+EBUILD selinux-perdition-2.20170204-r4.ebuild 288 SHA256 45df4a41cac4848c0ca55737d5830290239d7cea1aac9be98e0f00063cbda88b SHA512 910acdf0ce0ab350ac82618588bcee42ce5f9d8fbe633829a1cbd72d77b99f637b58cee3a2565471737aec36c8f9d9698e179899f756835757741f3413b9fd85 WHIRLPOOL 186ea6d89dc768687a4af0600c69248dab8ed970b165d6354e7e6a58ae747f5b7240cef742b9c96c19895b2e2ffe2012cc60ea2b062f8afcea8cc72df2a61655
+EBUILD selinux-perdition-2.20170805-r2.ebuild 288 SHA256 45df4a41cac4848c0ca55737d5830290239d7cea1aac9be98e0f00063cbda88b SHA512 910acdf0ce0ab350ac82618588bcee42ce5f9d8fbe633829a1cbd72d77b99f637b58cee3a2565471737aec36c8f9d9698e179899f756835757741f3413b9fd85 WHIRLPOOL 186ea6d89dc768687a4af0600c69248dab8ed970b165d6354e7e6a58ae747f5b7240cef742b9c96c19895b2e2ffe2012cc60ea2b062f8afcea8cc72df2a61655
+EBUILD selinux-perdition-2.20170805-r3.ebuild 290 SHA256 480d3b6d839befcb001a382febaeba0c7b35440fe59e9640423f00ebb9ceb840 SHA512 b36946cce789a242068b4181059ab1ad0c95575f34dee5f6373f65c0efbcd6f962fe53ab0b3e8f793d01564e20fee856c39354e6f947c9bc77a526a1808ed32b WHIRLPOOL 2f49283789c21182557e286c31e7c4714e2efee7d263dd1ceaaa51d7ba0b739b4165ee3f55f8a63373c491a8b04b267c5abc3aca43d67f379c243e64618f6edc
+EBUILD selinux-perdition-9999.ebuild 290 SHA256 480d3b6d839befcb001a382febaeba0c7b35440fe59e9640423f00ebb9ceb840 SHA512 b36946cce789a242068b4181059ab1ad0c95575f34dee5f6373f65c0efbcd6f962fe53ab0b3e8f793d01564e20fee856c39354e6f947c9bc77a526a1808ed32b WHIRLPOOL 2f49283789c21182557e286c31e7c4714e2efee7d263dd1ceaaa51d7ba0b739b4165ee3f55f8a63373c491a8b04b267c5abc3aca43d67f379c243e64618f6edc
 MISC ChangeLog 10887 SHA256 2ef1dd4b70d0f4045b2f733c1da50acc1f111fa025a3c25fb3f674a9ba65bbcb SHA512 cb924d5f9323411565ae85be8b2825fd522047bce9a227a3debaa1c075186f34ef966b26df264e889d6bcf19425574ae276b6a3f6112fced39ebd45f36db96f3 WHIRLPOOL 2b0684708c7647f8355147b98cd30487396ff02b939140361ab185225d1009aa2c86ad0671025b394ed0929c726ffcf8db4fa705536141238e476a20e956c35a
 MISC ChangeLog-2015 10222 SHA256 ad37d8efa64a74692202beed748d7bd4477c46000883bac574af3daa709b9141 SHA512 26d0c2c185f5df5ca299b6d499928c89ed6f93e10d724c47d2a859a8f35c34c0f1cca6f2022f1108991d450826116331020d0d28e611a31055aa09612f20efda WHIRLPOOL 4a17041869444a3c4af3bd6e9589bfec9ccee576b8a854ab3dd1eb4ab2340f19765a3357cd651f743af4763c20839d5f1cf4e4881629a1544c6f15efb11db292
 MISC metadata.xml 319 SHA256 5177c3594b74e9f25ef455c65e706101fecab61ba1c6c6e60170cdf6e9da1a08 SHA512 7857badc182ef47415327b8560a32dcf20284532b2c1123cf4b0ce6d4cc3f2d2dfda7b03f6125694d709160ff4a7e54398c381fb49e2215340e419ee360ae605 WHIRLPOOL 7bac08030985b8b6193c2daad789f1c4b43ded9b45f9bb74eac163eb2d08e2c88852af4e96a04538433eb0636d70c1000f3858efef8f3b27bf11c0c81fd744c7
diff --git a/sec-policy/selinux-perdition/selinux-perdition-2.20170204-r1.ebuild b/sec-policy/selinux-perdition/selinux-perdition-2.20170204-r1.ebuild
index 739a0aa291e4..5e3f0a2e7714 100644
--- a/sec-policy/selinux-perdition/selinux-perdition-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-perdition/selinux-perdition-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-perdition/selinux-perdition-2.20170204-r2.ebuild b/sec-policy/selinux-perdition/selinux-perdition-2.20170204-r2.ebuild
index e2125f12d33f..e66923075b91 100644
--- a/sec-policy/selinux-perdition/selinux-perdition-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-perdition/selinux-perdition-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-perdition/selinux-perdition-2.20170204-r3.ebuild b/sec-policy/selinux-perdition/selinux-perdition-2.20170204-r3.ebuild
index e2125f12d33f..e66923075b91 100644
--- a/sec-policy/selinux-perdition/selinux-perdition-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-perdition/selinux-perdition-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-perdition/selinux-perdition-2.20170204-r4.ebuild b/sec-policy/selinux-perdition/selinux-perdition-2.20170204-r4.ebuild
index e2125f12d33f..e66923075b91 100644
--- a/sec-policy/selinux-perdition/selinux-perdition-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-perdition/selinux-perdition-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-perdition/selinux-perdition-2.20170805-r2.ebuild b/sec-policy/selinux-perdition/selinux-perdition-2.20170805-r2.ebuild
index e2125f12d33f..e66923075b91 100644
--- a/sec-policy/selinux-perdition/selinux-perdition-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-perdition/selinux-perdition-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-perdition/selinux-perdition-2.20170805-r3.ebuild b/sec-policy/selinux-perdition/selinux-perdition-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..5e3f0a2e7714
--- /dev/null
+++ b/sec-policy/selinux-perdition/selinux-perdition-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="perdition"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for perdition"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-perdition/selinux-perdition-9999.ebuild b/sec-policy/selinux-perdition/selinux-perdition-9999.ebuild
index 739a0aa291e4..5e3f0a2e7714 100644
--- a/sec-policy/selinux-perdition/selinux-perdition-9999.ebuild
+++ b/sec-policy/selinux-perdition/selinux-perdition-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-phpfpm/Manifest b/sec-policy/selinux-phpfpm/Manifest
index 792a64ed53b0..f71b4ffcbf09 100644
--- a/sec-policy/selinux-phpfpm/Manifest
+++ b/sec-policy/selinux-phpfpm/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-phpfpm-2.20170204-r1.ebuild 379 SHA256 7318ebbb0f837085f1ac76d3f6ad80d48c12f510873eb094073d12ed5ca3a035 SHA512 770cf09d19760f507f0cd227921d49510143e16746e75a80965d0e812b8a62a81e5611dec0821772c2f2ffff7fc12859e27c9a519ef808bfad814dfc64e90fad WHIRLPOOL f307c031b14c85bda55544a36f9a1c1f6903fd7d1ce4c7d793dce97933b3a105f059ac1e520674a8bed493f4ea700afa907044821522a071f71be3dec2a8e94c
-EBUILD selinux-phpfpm-2.20170204-r2.ebuild 377 SHA256 5d41e25db5672492e3105fbeff71694367af315b71b009ae9b1e49ce337fffb8 SHA512 5039343a02fc8a47b6ce290da2b322d108aaacd7a2b199d35c9881e1b18322e36d3225e548263c07f821caebae006043eb8f1c4b0da586c7eeae7684d277f9b2 WHIRLPOOL 60f0c18592ecc1f636aff76bfb2743106edeb6f7640713ab8b53360a1e3a12aa4eff6d9ef876dca5a2b632df31cd18aff22ac2549682e668a4646eb6a7c66f61
-EBUILD selinux-phpfpm-2.20170204-r3.ebuild 377 SHA256 5d41e25db5672492e3105fbeff71694367af315b71b009ae9b1e49ce337fffb8 SHA512 5039343a02fc8a47b6ce290da2b322d108aaacd7a2b199d35c9881e1b18322e36d3225e548263c07f821caebae006043eb8f1c4b0da586c7eeae7684d277f9b2 WHIRLPOOL 60f0c18592ecc1f636aff76bfb2743106edeb6f7640713ab8b53360a1e3a12aa4eff6d9ef876dca5a2b632df31cd18aff22ac2549682e668a4646eb6a7c66f61
-EBUILD selinux-phpfpm-2.20170204-r4.ebuild 377 SHA256 5d41e25db5672492e3105fbeff71694367af315b71b009ae9b1e49ce337fffb8 SHA512 5039343a02fc8a47b6ce290da2b322d108aaacd7a2b199d35c9881e1b18322e36d3225e548263c07f821caebae006043eb8f1c4b0da586c7eeae7684d277f9b2 WHIRLPOOL 60f0c18592ecc1f636aff76bfb2743106edeb6f7640713ab8b53360a1e3a12aa4eff6d9ef876dca5a2b632df31cd18aff22ac2549682e668a4646eb6a7c66f61
-EBUILD selinux-phpfpm-2.20170805-r2.ebuild 377 SHA256 5d41e25db5672492e3105fbeff71694367af315b71b009ae9b1e49ce337fffb8 SHA512 5039343a02fc8a47b6ce290da2b322d108aaacd7a2b199d35c9881e1b18322e36d3225e548263c07f821caebae006043eb8f1c4b0da586c7eeae7684d277f9b2 WHIRLPOOL 60f0c18592ecc1f636aff76bfb2743106edeb6f7640713ab8b53360a1e3a12aa4eff6d9ef876dca5a2b632df31cd18aff22ac2549682e668a4646eb6a7c66f61
-EBUILD selinux-phpfpm-9999.ebuild 379 SHA256 7318ebbb0f837085f1ac76d3f6ad80d48c12f510873eb094073d12ed5ca3a035 SHA512 770cf09d19760f507f0cd227921d49510143e16746e75a80965d0e812b8a62a81e5611dec0821772c2f2ffff7fc12859e27c9a519ef808bfad814dfc64e90fad WHIRLPOOL f307c031b14c85bda55544a36f9a1c1f6903fd7d1ce4c7d793dce97933b3a105f059ac1e520674a8bed493f4ea700afa907044821522a071f71be3dec2a8e94c
+EBUILD selinux-phpfpm-2.20170204-r1.ebuild 380 SHA256 85a83ca943dbab8a49d61cd1b26f117453c51ea3bebddb92673dc56d8689c773 SHA512 4a97b337e4cab7acc28b9825bb3ea956823b8acd69c3c9178c65d18c325c801c31e59bae97ff487fc322645288a8b8b2decad58a483ef6fd38d1e8f8cd9d075e WHIRLPOOL 0a5b98f3411fd704f5580c9d07f1cb8804e8ae29590a9d20f4c8e1fb7b4c04f64d1ca0dc42b2fd272585032b7596ad6283bc86ee5819d7fd42c40c527736b3ff
+EBUILD selinux-phpfpm-2.20170204-r2.ebuild 378 SHA256 82296dce2d9799b98057372f45961b3d83f21ae89c20ff9b4349676d5ce8611e SHA512 91ec36db97104e83d1e1188f69333da7479d2fa09689f1675e34b4063db905fac6ecf92300dba98f8f5425af7abbb94f5fc9fef320161cac9ff30699878446ac WHIRLPOOL a4f8789bee6ee5b83c1348ebee4c39d1e8e2c38fa308c24fbd7ad5d8eac8229893895439d2eabb08735d7bd987d8a99a86d9be1e2bc499bb4982d9aac54950de
+EBUILD selinux-phpfpm-2.20170204-r3.ebuild 378 SHA256 82296dce2d9799b98057372f45961b3d83f21ae89c20ff9b4349676d5ce8611e SHA512 91ec36db97104e83d1e1188f69333da7479d2fa09689f1675e34b4063db905fac6ecf92300dba98f8f5425af7abbb94f5fc9fef320161cac9ff30699878446ac WHIRLPOOL a4f8789bee6ee5b83c1348ebee4c39d1e8e2c38fa308c24fbd7ad5d8eac8229893895439d2eabb08735d7bd987d8a99a86d9be1e2bc499bb4982d9aac54950de
+EBUILD selinux-phpfpm-2.20170204-r4.ebuild 378 SHA256 82296dce2d9799b98057372f45961b3d83f21ae89c20ff9b4349676d5ce8611e SHA512 91ec36db97104e83d1e1188f69333da7479d2fa09689f1675e34b4063db905fac6ecf92300dba98f8f5425af7abbb94f5fc9fef320161cac9ff30699878446ac WHIRLPOOL a4f8789bee6ee5b83c1348ebee4c39d1e8e2c38fa308c24fbd7ad5d8eac8229893895439d2eabb08735d7bd987d8a99a86d9be1e2bc499bb4982d9aac54950de
+EBUILD selinux-phpfpm-2.20170805-r2.ebuild 378 SHA256 82296dce2d9799b98057372f45961b3d83f21ae89c20ff9b4349676d5ce8611e SHA512 91ec36db97104e83d1e1188f69333da7479d2fa09689f1675e34b4063db905fac6ecf92300dba98f8f5425af7abbb94f5fc9fef320161cac9ff30699878446ac WHIRLPOOL a4f8789bee6ee5b83c1348ebee4c39d1e8e2c38fa308c24fbd7ad5d8eac8229893895439d2eabb08735d7bd987d8a99a86d9be1e2bc499bb4982d9aac54950de
+EBUILD selinux-phpfpm-2.20170805-r3.ebuild 380 SHA256 85a83ca943dbab8a49d61cd1b26f117453c51ea3bebddb92673dc56d8689c773 SHA512 4a97b337e4cab7acc28b9825bb3ea956823b8acd69c3c9178c65d18c325c801c31e59bae97ff487fc322645288a8b8b2decad58a483ef6fd38d1e8f8cd9d075e WHIRLPOOL 0a5b98f3411fd704f5580c9d07f1cb8804e8ae29590a9d20f4c8e1fb7b4c04f64d1ca0dc42b2fd272585032b7596ad6283bc86ee5819d7fd42c40c527736b3ff
+EBUILD selinux-phpfpm-9999.ebuild 380 SHA256 85a83ca943dbab8a49d61cd1b26f117453c51ea3bebddb92673dc56d8689c773 SHA512 4a97b337e4cab7acc28b9825bb3ea956823b8acd69c3c9178c65d18c325c801c31e59bae97ff487fc322645288a8b8b2decad58a483ef6fd38d1e8f8cd9d075e WHIRLPOOL 0a5b98f3411fd704f5580c9d07f1cb8804e8ae29590a9d20f4c8e1fb7b4c04f64d1ca0dc42b2fd272585032b7596ad6283bc86ee5819d7fd42c40c527736b3ff
 MISC ChangeLog 10571 SHA256 496de7242d1ba4ecb332ef5bd69de523bdfc0a5418608aa4bcc88f45760127c6 SHA512 3d62d95ba55996365254aade830cc24c512816b4cce8682d4b9a4aca0c9e08e84d5420a5092552927711361c8ce3bb9efe41529137850ad6e588a59dcbff0d1b WHIRLPOOL 289d9e3799cf54a8c8f51ec80c0dc20275c9e555465e9a10788ac94045af60406868bfe8a194100c1523900abfe9e1a8f4a942272afeb4679d8f83a5878db6a4
 MISC ChangeLog-2015 8961 SHA256 c93ddfbdf01649daeb60f1944136c8f095dd58d55091a800cedcfd090a07bed6 SHA512 8d7cde359d526c227993ce9db999229ed8a332b9fef493fe76ab9956868bf7d0f665d7118d5f65ad95d13111498103c65d21737bd1bf2b6b548f1943b4b73819 WHIRLPOOL 427c211cbd6993465bbb69eededb753574c310dd62bd4b4caa8652162c200fa03178cb119ca656ef76f0b4d8850d0995049c10f1a4aad645fc81b4cb1395b1e3
 MISC metadata.xml 316 SHA256 d9ee04bcb42223bfcf7791ddea79b1ada0b7e0bd96b0f06fdb77217462aaa3d9 SHA512 9e18c465be0429fc172b0f8636488175749a69d8066deca7c00bd7d456b12ba9beb1c115fc1468add61c4d34863aa617d1710372a4c75f0f3ba66e3e9265e242 WHIRLPOOL aec4518ac61e9825f6dd3036c136c9bd58f163b5bc2362b3976011a521b70eeac89025291d0864c419cf01629344896743066f4a2ff929aa12132045766f3442
diff --git a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20170204-r1.ebuild b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20170204-r1.ebuild
index 0615babc24b7..8e7706cdf177 100644
--- a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20170204-r2.ebuild b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20170204-r2.ebuild
index 67c42a0dddbe..fc156736d5cf 100644
--- a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20170204-r3.ebuild b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20170204-r3.ebuild
index 67c42a0dddbe..fc156736d5cf 100644
--- a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20170204-r4.ebuild b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20170204-r4.ebuild
index 67c42a0dddbe..fc156736d5cf 100644
--- a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20170805-r2.ebuild b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20170805-r2.ebuild
index 67c42a0dddbe..fc156736d5cf 100644
--- a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20170805-r3.ebuild b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..8e7706cdf177
--- /dev/null
+++ b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20170805-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-phpfpm/selinux-phpfpm-9999.ebuild b/sec-policy/selinux-phpfpm/selinux-phpfpm-9999.ebuild
index 0615babc24b7..8e7706cdf177 100644
--- a/sec-policy/selinux-phpfpm/selinux-phpfpm-9999.ebuild
+++ b/sec-policy/selinux-phpfpm/selinux-phpfpm-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-plymouthd/Manifest b/sec-policy/selinux-plymouthd/Manifest
index 7a4db7f81cfd..c3f2ac46f2e4 100644
--- a/sec-policy/selinux-plymouthd/Manifest
+++ b/sec-policy/selinux-plymouthd/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-plymouthd-2.20170204-r1.ebuild 289 SHA256 ce53ff436cdf69068c9693279bce161855a3ca1b017fef96eedf3f09ca6520ba SHA512 2a80cca1ba25a960eb78a871e242fe26ef0ea1a200a16c53983a08aa3631f66fa953113aef8d7790e88abb69776d57bc420ced63cc128c7662ac1b5181e191cd WHIRLPOOL 24ba789e1538a4f962625d8e3efd8cd8928bf77dcfc8c009d6c5b653264ee713c9aceef3a7d71d965231b532fb693078b7c8598eef05331dfe02a077746e2e37
-EBUILD selinux-plymouthd-2.20170204-r2.ebuild 287 SHA256 bbdeff76b0bb2cdc6a44e48aa1c27597ae5a06b1599338628f7e1eefe4fc2ca7 SHA512 df86c039d775c84d49077afbc5c9f7b8d66f66707362842a23a5b21b2f4649ff6232d3d0b5f2ed6ccedbc00aa32ffe057fba3fb60e4d79f1a10a91a0c53d3cf2 WHIRLPOOL 58c718b1c24ddb69ca39b79f5e1ea3ef2d212b04e1d4095eabb8e43c70ed54165c3fc373f619464d024107669fc7c8886fa9f3c8e0eac2a3110f9175d4f22273
-EBUILD selinux-plymouthd-2.20170204-r3.ebuild 287 SHA256 bbdeff76b0bb2cdc6a44e48aa1c27597ae5a06b1599338628f7e1eefe4fc2ca7 SHA512 df86c039d775c84d49077afbc5c9f7b8d66f66707362842a23a5b21b2f4649ff6232d3d0b5f2ed6ccedbc00aa32ffe057fba3fb60e4d79f1a10a91a0c53d3cf2 WHIRLPOOL 58c718b1c24ddb69ca39b79f5e1ea3ef2d212b04e1d4095eabb8e43c70ed54165c3fc373f619464d024107669fc7c8886fa9f3c8e0eac2a3110f9175d4f22273
-EBUILD selinux-plymouthd-2.20170204-r4.ebuild 287 SHA256 bbdeff76b0bb2cdc6a44e48aa1c27597ae5a06b1599338628f7e1eefe4fc2ca7 SHA512 df86c039d775c84d49077afbc5c9f7b8d66f66707362842a23a5b21b2f4649ff6232d3d0b5f2ed6ccedbc00aa32ffe057fba3fb60e4d79f1a10a91a0c53d3cf2 WHIRLPOOL 58c718b1c24ddb69ca39b79f5e1ea3ef2d212b04e1d4095eabb8e43c70ed54165c3fc373f619464d024107669fc7c8886fa9f3c8e0eac2a3110f9175d4f22273
-EBUILD selinux-plymouthd-2.20170805-r2.ebuild 287 SHA256 bbdeff76b0bb2cdc6a44e48aa1c27597ae5a06b1599338628f7e1eefe4fc2ca7 SHA512 df86c039d775c84d49077afbc5c9f7b8d66f66707362842a23a5b21b2f4649ff6232d3d0b5f2ed6ccedbc00aa32ffe057fba3fb60e4d79f1a10a91a0c53d3cf2 WHIRLPOOL 58c718b1c24ddb69ca39b79f5e1ea3ef2d212b04e1d4095eabb8e43c70ed54165c3fc373f619464d024107669fc7c8886fa9f3c8e0eac2a3110f9175d4f22273
-EBUILD selinux-plymouthd-9999.ebuild 289 SHA256 ce53ff436cdf69068c9693279bce161855a3ca1b017fef96eedf3f09ca6520ba SHA512 2a80cca1ba25a960eb78a871e242fe26ef0ea1a200a16c53983a08aa3631f66fa953113aef8d7790e88abb69776d57bc420ced63cc128c7662ac1b5181e191cd WHIRLPOOL 24ba789e1538a4f962625d8e3efd8cd8928bf77dcfc8c009d6c5b653264ee713c9aceef3a7d71d965231b532fb693078b7c8598eef05331dfe02a077746e2e37
+EBUILD selinux-plymouthd-2.20170204-r1.ebuild 290 SHA256 8caf0711ac1366c696ec06da1ee2f6c81d6267ba672502fcb7ef804816c2e2d1 SHA512 9bc1a5a50f57360af52f83fe8ebb8bffa2e0b94b88ef54992324211693207a9849755f7202dce5a0b50e309868870a6fc25f04a409e4895b23d71f864b154a36 WHIRLPOOL 74a5d37692dfd2d8eae268e1f9ce941b536170010816c1ac44389464e5a4089059d907a4f9b0ba23bd46c2f7f84463e57c41587ce45957b053759ea230e2e175
+EBUILD selinux-plymouthd-2.20170204-r2.ebuild 288 SHA256 b87014d31c07066a6aad2a3296c4ce6b0ad04091d2c47820cbb2db189c223d31 SHA512 63a532c80b10aa6a4ac9ac772226b1492f6f78258446d24d6465cdab5a2979de203f9368cad410e2f416c5b28a471ee143b724569febeec766868d435bac5edf WHIRLPOOL 17b6ec9c3ed8524ff321253d45e9544d54f29888a031bee2b4c5bb508801c8880ee7af23cd0da0a62a64b7fa1b1fc4a36746cb463a5c59bdb5ffb2d89311a21b
+EBUILD selinux-plymouthd-2.20170204-r3.ebuild 288 SHA256 b87014d31c07066a6aad2a3296c4ce6b0ad04091d2c47820cbb2db189c223d31 SHA512 63a532c80b10aa6a4ac9ac772226b1492f6f78258446d24d6465cdab5a2979de203f9368cad410e2f416c5b28a471ee143b724569febeec766868d435bac5edf WHIRLPOOL 17b6ec9c3ed8524ff321253d45e9544d54f29888a031bee2b4c5bb508801c8880ee7af23cd0da0a62a64b7fa1b1fc4a36746cb463a5c59bdb5ffb2d89311a21b
+EBUILD selinux-plymouthd-2.20170204-r4.ebuild 288 SHA256 b87014d31c07066a6aad2a3296c4ce6b0ad04091d2c47820cbb2db189c223d31 SHA512 63a532c80b10aa6a4ac9ac772226b1492f6f78258446d24d6465cdab5a2979de203f9368cad410e2f416c5b28a471ee143b724569febeec766868d435bac5edf WHIRLPOOL 17b6ec9c3ed8524ff321253d45e9544d54f29888a031bee2b4c5bb508801c8880ee7af23cd0da0a62a64b7fa1b1fc4a36746cb463a5c59bdb5ffb2d89311a21b
+EBUILD selinux-plymouthd-2.20170805-r2.ebuild 288 SHA256 b87014d31c07066a6aad2a3296c4ce6b0ad04091d2c47820cbb2db189c223d31 SHA512 63a532c80b10aa6a4ac9ac772226b1492f6f78258446d24d6465cdab5a2979de203f9368cad410e2f416c5b28a471ee143b724569febeec766868d435bac5edf WHIRLPOOL 17b6ec9c3ed8524ff321253d45e9544d54f29888a031bee2b4c5bb508801c8880ee7af23cd0da0a62a64b7fa1b1fc4a36746cb463a5c59bdb5ffb2d89311a21b
+EBUILD selinux-plymouthd-2.20170805-r3.ebuild 290 SHA256 8caf0711ac1366c696ec06da1ee2f6c81d6267ba672502fcb7ef804816c2e2d1 SHA512 9bc1a5a50f57360af52f83fe8ebb8bffa2e0b94b88ef54992324211693207a9849755f7202dce5a0b50e309868870a6fc25f04a409e4895b23d71f864b154a36 WHIRLPOOL 74a5d37692dfd2d8eae268e1f9ce941b536170010816c1ac44389464e5a4089059d907a4f9b0ba23bd46c2f7f84463e57c41587ce45957b053759ea230e2e175
+EBUILD selinux-plymouthd-9999.ebuild 290 SHA256 8caf0711ac1366c696ec06da1ee2f6c81d6267ba672502fcb7ef804816c2e2d1 SHA512 9bc1a5a50f57360af52f83fe8ebb8bffa2e0b94b88ef54992324211693207a9849755f7202dce5a0b50e309868870a6fc25f04a409e4895b23d71f864b154a36 WHIRLPOOL 74a5d37692dfd2d8eae268e1f9ce941b536170010816c1ac44389464e5a4089059d907a4f9b0ba23bd46c2f7f84463e57c41587ce45957b053759ea230e2e175
 MISC ChangeLog 10887 SHA256 2431941115ffbe481b0a835b83431a0a1bc4b836cf115c101af603c7c2b227ed SHA512 407b667d1dbc6188d249af8ba8fca1bec0518e263406d6165cdcc6023ba2b8ecc33f966011165e9ec46b7fa191d576e78a214a5261c8677d90d15ac0712d5307 WHIRLPOOL d75fb25ea303eb1e3d518d05c27e5846f575ea2b43928a9c76bef2ddb6422ac400c0fb454110bfa5512d37d3b59c0919ca34d1e78a918b6fe9ac63ef866a738d
 MISC ChangeLog-2015 9952 SHA256 a1df35bb9e83ab0645f52eaf6a727e8086209051f23cd21adc895181c9d55bef SHA512 0318cefeb9aa1629320dc0616c90fe6b3e5395b524b1286ab69381ad713c80af694b35dca3fda3bdcc9830ffd4bba8954ec92a8307fa07a1bdd9cbf5993f1bc6 WHIRLPOOL 6e3f8927e948e5fc751db22383bcc654927a8d0ff5f1e665b3b0bd0d14642f043ef6d69a41499c3d273d940d799156d5324fd6fda863045e65d97112ab5a2fe9
 MISC metadata.xml 319 SHA256 443d8a5b484cd7391560814e3a3ba435a2b3e42bde607777d4952de6c6ce58b3 SHA512 ec3d23e23f563f0ed5979e38b0809c54b5ac69e831934a5078cf9c8ca6dd4fd88570f53be750f1e0330d917129dce6b636dd6d3f17c23daa42e08b4a1e1979a0 WHIRLPOOL 8628bbf90bd2d08654e55458d8d7b1e74b9239e26e8897bb64d6d9b8d66c952ac92200b1203df6578c691d4392b2dfaa8fbb0ec656b60fc68d5f826d930dedca
diff --git a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20170204-r1.ebuild b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20170204-r1.ebuild
index 80a19ffc5aa2..f9b5a3ae0830 100644
--- a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20170204-r2.ebuild b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20170204-r2.ebuild
index 0fd44b36e9eb..4e3c8f552158 100644
--- a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20170204-r3.ebuild b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20170204-r3.ebuild
index 0fd44b36e9eb..4e3c8f552158 100644
--- a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20170204-r4.ebuild b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20170204-r4.ebuild
index 0fd44b36e9eb..4e3c8f552158 100644
--- a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20170805-r2.ebuild b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20170805-r2.ebuild
index 0fd44b36e9eb..4e3c8f552158 100644
--- a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20170805-r3.ebuild b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..f9b5a3ae0830
--- /dev/null
+++ b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-plymouthd/selinux-plymouthd-9999.ebuild b/sec-policy/selinux-plymouthd/selinux-plymouthd-9999.ebuild
index 80a19ffc5aa2..f9b5a3ae0830 100644
--- a/sec-policy/selinux-plymouthd/selinux-plymouthd-9999.ebuild
+++ b/sec-policy/selinux-plymouthd/selinux-plymouthd-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-podsleuth/Manifest b/sec-policy/selinux-podsleuth/Manifest
index 301be1898e67..e5a97a85d7b1 100644
--- a/sec-policy/selinux-podsleuth/Manifest
+++ b/sec-policy/selinux-podsleuth/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-podsleuth-2.20170204-r1.ebuild 289 SHA256 3d5199e54f13004d106c47f8f0214abedce39382926b291674d2ab25c1fb42c6 SHA512 a7e89f33e55e030b8bd67bea79ac34e7d8a2f2ccec3a336447358b29069bbb0f4cac2f80de3c4ede44be814462fbc5eea886203b6d66023bf33da54e863732b4 WHIRLPOOL 3e8728d81dd453f670e9389c6b85511f8142c5ac71c94afe3bd371dbd79a0db9433d36fff37187fc08315761e218e36abcb1454decd424af7ef112ce24a2db48
-EBUILD selinux-podsleuth-2.20170204-r2.ebuild 287 SHA256 3e58d1bb37db9b12a09f99026beed710a218874c6b96602bdeac20e82cc26356 SHA512 cca12fce357a557c18e11aeb4b862979b2f46eaafda3237f100320d405720ac2b37b5f97d99a88fb97f589929992950f87bc8c2b7020709462a7ab0ae890977c WHIRLPOOL c59ae8a54a779ed2c567da4ad419c767328257f84f6d560c818d2fb612706be54f0408c66a0869638dcdb3c1644f50fbca7661cf224c8b325abdcadeeeb716df
-EBUILD selinux-podsleuth-2.20170204-r3.ebuild 287 SHA256 3e58d1bb37db9b12a09f99026beed710a218874c6b96602bdeac20e82cc26356 SHA512 cca12fce357a557c18e11aeb4b862979b2f46eaafda3237f100320d405720ac2b37b5f97d99a88fb97f589929992950f87bc8c2b7020709462a7ab0ae890977c WHIRLPOOL c59ae8a54a779ed2c567da4ad419c767328257f84f6d560c818d2fb612706be54f0408c66a0869638dcdb3c1644f50fbca7661cf224c8b325abdcadeeeb716df
-EBUILD selinux-podsleuth-2.20170204-r4.ebuild 287 SHA256 3e58d1bb37db9b12a09f99026beed710a218874c6b96602bdeac20e82cc26356 SHA512 cca12fce357a557c18e11aeb4b862979b2f46eaafda3237f100320d405720ac2b37b5f97d99a88fb97f589929992950f87bc8c2b7020709462a7ab0ae890977c WHIRLPOOL c59ae8a54a779ed2c567da4ad419c767328257f84f6d560c818d2fb612706be54f0408c66a0869638dcdb3c1644f50fbca7661cf224c8b325abdcadeeeb716df
-EBUILD selinux-podsleuth-2.20170805-r2.ebuild 287 SHA256 3e58d1bb37db9b12a09f99026beed710a218874c6b96602bdeac20e82cc26356 SHA512 cca12fce357a557c18e11aeb4b862979b2f46eaafda3237f100320d405720ac2b37b5f97d99a88fb97f589929992950f87bc8c2b7020709462a7ab0ae890977c WHIRLPOOL c59ae8a54a779ed2c567da4ad419c767328257f84f6d560c818d2fb612706be54f0408c66a0869638dcdb3c1644f50fbca7661cf224c8b325abdcadeeeb716df
-EBUILD selinux-podsleuth-9999.ebuild 289 SHA256 3d5199e54f13004d106c47f8f0214abedce39382926b291674d2ab25c1fb42c6 SHA512 a7e89f33e55e030b8bd67bea79ac34e7d8a2f2ccec3a336447358b29069bbb0f4cac2f80de3c4ede44be814462fbc5eea886203b6d66023bf33da54e863732b4 WHIRLPOOL 3e8728d81dd453f670e9389c6b85511f8142c5ac71c94afe3bd371dbd79a0db9433d36fff37187fc08315761e218e36abcb1454decd424af7ef112ce24a2db48
+EBUILD selinux-podsleuth-2.20170204-r1.ebuild 290 SHA256 7d9c6d0b642a847717885f177400aa95b269289a1450c763f41ab4b3fb572384 SHA512 d071cba7b2d5f03188e1adee57f4e10bbf684d480fb1bb5e91a751427ef63ced0d1a38e5379c1c761e43da870be2c1455f8d97d731e8a8f9b784e822342b9046 WHIRLPOOL 88fe1cfa478935c387aa530c05c2ff441372fe6314f5c725bf2b2f496693b9e4cf2b4cda39a7e7ad129cac55bfaefdc24bf237cdb5eda5334c828d2e9d564f97
+EBUILD selinux-podsleuth-2.20170204-r2.ebuild 288 SHA256 e744cdb05e6d822a215b093bbc9d6e820fd837632201fe27a90a8ad628198814 SHA512 24f25eaeb5328d363294af62799fd45b0e0ee4755fdcc035e6a3d2da3df7142d6926fd3937ffedd6e75fccb1b489f319b52f7b56e78778751c06ea546f5e6ebf WHIRLPOOL 8c757ae9189c6158ee97b08d6e70857f6eaadb5d0fe97e689ed6ce3651449c513c5eb5e9e6efe6b493ea4bc4aca4467e365a3f6c415eadaeebc5be2a559277c2
+EBUILD selinux-podsleuth-2.20170204-r3.ebuild 288 SHA256 e744cdb05e6d822a215b093bbc9d6e820fd837632201fe27a90a8ad628198814 SHA512 24f25eaeb5328d363294af62799fd45b0e0ee4755fdcc035e6a3d2da3df7142d6926fd3937ffedd6e75fccb1b489f319b52f7b56e78778751c06ea546f5e6ebf WHIRLPOOL 8c757ae9189c6158ee97b08d6e70857f6eaadb5d0fe97e689ed6ce3651449c513c5eb5e9e6efe6b493ea4bc4aca4467e365a3f6c415eadaeebc5be2a559277c2
+EBUILD selinux-podsleuth-2.20170204-r4.ebuild 288 SHA256 e744cdb05e6d822a215b093bbc9d6e820fd837632201fe27a90a8ad628198814 SHA512 24f25eaeb5328d363294af62799fd45b0e0ee4755fdcc035e6a3d2da3df7142d6926fd3937ffedd6e75fccb1b489f319b52f7b56e78778751c06ea546f5e6ebf WHIRLPOOL 8c757ae9189c6158ee97b08d6e70857f6eaadb5d0fe97e689ed6ce3651449c513c5eb5e9e6efe6b493ea4bc4aca4467e365a3f6c415eadaeebc5be2a559277c2
+EBUILD selinux-podsleuth-2.20170805-r2.ebuild 288 SHA256 e744cdb05e6d822a215b093bbc9d6e820fd837632201fe27a90a8ad628198814 SHA512 24f25eaeb5328d363294af62799fd45b0e0ee4755fdcc035e6a3d2da3df7142d6926fd3937ffedd6e75fccb1b489f319b52f7b56e78778751c06ea546f5e6ebf WHIRLPOOL 8c757ae9189c6158ee97b08d6e70857f6eaadb5d0fe97e689ed6ce3651449c513c5eb5e9e6efe6b493ea4bc4aca4467e365a3f6c415eadaeebc5be2a559277c2
+EBUILD selinux-podsleuth-2.20170805-r3.ebuild 290 SHA256 7d9c6d0b642a847717885f177400aa95b269289a1450c763f41ab4b3fb572384 SHA512 d071cba7b2d5f03188e1adee57f4e10bbf684d480fb1bb5e91a751427ef63ced0d1a38e5379c1c761e43da870be2c1455f8d97d731e8a8f9b784e822342b9046 WHIRLPOOL 88fe1cfa478935c387aa530c05c2ff441372fe6314f5c725bf2b2f496693b9e4cf2b4cda39a7e7ad129cac55bfaefdc24bf237cdb5eda5334c828d2e9d564f97
+EBUILD selinux-podsleuth-9999.ebuild 290 SHA256 7d9c6d0b642a847717885f177400aa95b269289a1450c763f41ab4b3fb572384 SHA512 d071cba7b2d5f03188e1adee57f4e10bbf684d480fb1bb5e91a751427ef63ced0d1a38e5379c1c761e43da870be2c1455f8d97d731e8a8f9b784e822342b9046 WHIRLPOOL 88fe1cfa478935c387aa530c05c2ff441372fe6314f5c725bf2b2f496693b9e4cf2b4cda39a7e7ad129cac55bfaefdc24bf237cdb5eda5334c828d2e9d564f97
 MISC ChangeLog 10887 SHA256 bb316a84817aa4def83542c0aae44c9edb92b5691a064b7e422a8bc0363a67f3 SHA512 0e537f51b66eda93a71c3e4065c451dc494c204e5ea5655a4409f6d316f8843f7b70574480891276ef29f276f9b77a92ca3b265668d0a5e0485157bd640305e0 WHIRLPOOL 7f195fcc4cc83bc52768d7b186c14b489e28c464edb71b6a915609b8b29ac6577eee059b0e78f6d1b84c325620054b1caed04e889e4fe4fdc375db04ea8704a4
 MISC ChangeLog-2015 10222 SHA256 b9422fc5ad189daca7449a9dbcbf60799a0cdc991a613e972495953fed189f23 SHA512 5c0e1cc4d86eae615d67d05801b75e2d1ab3c99d11c6b543aff45a6fcdfa587ca023c5ccfc0a2571a1ab743e947860aaca752d1e22daf7030500a94421cfb30d WHIRLPOOL 7d89bb483c940600d4eea55d1ddd7052df5ab6a04dbb736fd61f84122c1dd372b7bb426ad24086c5c293a52220d6d546d7aca8862294dc1bf23f2f89aa6917b1
 MISC metadata.xml 319 SHA256 ddb09059dc32b5896beda40a8e8eb899d66dbe8779bedd1dab3859e2ebbb224f SHA512 1f97d533c42cf5a869d2ab25691faee9f3b08b2eccedaf36b14e1e3097dee240dc689bacc980f3d6dec3366041bbb83aa0a23c9c33be132334b8f3262868e7db WHIRLPOOL e659641e0a00d43d9b3e76da3a41fdd7546dc3af33d9ae9e1abb3ba2edb86ad41369193055f0e298ece7c028f658ca1ce1e07c7eaa8f8b2462320dddfb634b91
diff --git a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20170204-r1.ebuild b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20170204-r1.ebuild
index 903a1512b457..302379b6be20 100644
--- a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20170204-r2.ebuild b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20170204-r2.ebuild
index c7817bff25ee..baa6c77f1dee 100644
--- a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20170204-r3.ebuild b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20170204-r3.ebuild
index c7817bff25ee..baa6c77f1dee 100644
--- a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20170204-r4.ebuild b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20170204-r4.ebuild
index c7817bff25ee..baa6c77f1dee 100644
--- a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20170805-r2.ebuild b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20170805-r2.ebuild
index c7817bff25ee..baa6c77f1dee 100644
--- a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20170805-r3.ebuild b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..302379b6be20
--- /dev/null
+++ b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-podsleuth/selinux-podsleuth-9999.ebuild b/sec-policy/selinux-podsleuth/selinux-podsleuth-9999.ebuild
index 903a1512b457..302379b6be20 100644
--- a/sec-policy/selinux-podsleuth/selinux-podsleuth-9999.ebuild
+++ b/sec-policy/selinux-podsleuth/selinux-podsleuth-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-policykit/Manifest b/sec-policy/selinux-policykit/Manifest
index 021e6bdb37e2..0cde76f77dcd 100644
--- a/sec-policy/selinux-policykit/Manifest
+++ b/sec-policy/selinux-policykit/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-policykit-2.20170204-r1.ebuild 289 SHA256 8359b15fc069facd7954a3217d3dd207395393c005a789b3cc20654355f4a0b3 SHA512 175809af411ee2e657fd933a102bde3573886500f549819b410419314e93ac7863accbd25b672e903d1d19cd37aa29f1f7b0f707b3df71d9d8278668d72dc3af WHIRLPOOL 979a148a74d34664aa660e2899197f4dabb0941bfc9be090178684eaaa6bd5af5253101a756d6109d1938d20efc4e3ee6f34966be1343d99eafed246a2432338
-EBUILD selinux-policykit-2.20170204-r2.ebuild 287 SHA256 09b517c0313c08814ecd6f3581bfc7c634f302bb913fb11dedc8c7d57ab1308a SHA512 91060b516a9cf7e7a9c1a5496ee4345d768c3d6d05b1bbfaaf86c7cc2d712db2f3f6f980e645d5fee06b3797d8a81d06ec6d8a1fa98c64280f494011fdfb74d2 WHIRLPOOL c82ef0c292d39ba865621faf23c2e14b2868059bbf818bb3e17f89d42f6b3b4cd97391f486c8b4d37c9ab9e98f0ec06e8cc7358e32b237edf831a821466227aa
-EBUILD selinux-policykit-2.20170204-r3.ebuild 287 SHA256 09b517c0313c08814ecd6f3581bfc7c634f302bb913fb11dedc8c7d57ab1308a SHA512 91060b516a9cf7e7a9c1a5496ee4345d768c3d6d05b1bbfaaf86c7cc2d712db2f3f6f980e645d5fee06b3797d8a81d06ec6d8a1fa98c64280f494011fdfb74d2 WHIRLPOOL c82ef0c292d39ba865621faf23c2e14b2868059bbf818bb3e17f89d42f6b3b4cd97391f486c8b4d37c9ab9e98f0ec06e8cc7358e32b237edf831a821466227aa
-EBUILD selinux-policykit-2.20170204-r4.ebuild 287 SHA256 09b517c0313c08814ecd6f3581bfc7c634f302bb913fb11dedc8c7d57ab1308a SHA512 91060b516a9cf7e7a9c1a5496ee4345d768c3d6d05b1bbfaaf86c7cc2d712db2f3f6f980e645d5fee06b3797d8a81d06ec6d8a1fa98c64280f494011fdfb74d2 WHIRLPOOL c82ef0c292d39ba865621faf23c2e14b2868059bbf818bb3e17f89d42f6b3b4cd97391f486c8b4d37c9ab9e98f0ec06e8cc7358e32b237edf831a821466227aa
-EBUILD selinux-policykit-2.20170805-r2.ebuild 287 SHA256 09b517c0313c08814ecd6f3581bfc7c634f302bb913fb11dedc8c7d57ab1308a SHA512 91060b516a9cf7e7a9c1a5496ee4345d768c3d6d05b1bbfaaf86c7cc2d712db2f3f6f980e645d5fee06b3797d8a81d06ec6d8a1fa98c64280f494011fdfb74d2 WHIRLPOOL c82ef0c292d39ba865621faf23c2e14b2868059bbf818bb3e17f89d42f6b3b4cd97391f486c8b4d37c9ab9e98f0ec06e8cc7358e32b237edf831a821466227aa
-EBUILD selinux-policykit-9999.ebuild 289 SHA256 8359b15fc069facd7954a3217d3dd207395393c005a789b3cc20654355f4a0b3 SHA512 175809af411ee2e657fd933a102bde3573886500f549819b410419314e93ac7863accbd25b672e903d1d19cd37aa29f1f7b0f707b3df71d9d8278668d72dc3af WHIRLPOOL 979a148a74d34664aa660e2899197f4dabb0941bfc9be090178684eaaa6bd5af5253101a756d6109d1938d20efc4e3ee6f34966be1343d99eafed246a2432338
+EBUILD selinux-policykit-2.20170204-r1.ebuild 290 SHA256 e916723cd081c264f99f0dcf6eb5919eee9c2fbce1adb919f541dbf23df2280a SHA512 51197b2d15bb950585c2a5acce28a762bcc31af2f909c2865236fadffd22d7aa66b57a2c351bc6f49e065e2c4c7a673ecb17b32a1e9c541e04f005f4005b05ff WHIRLPOOL 895386c0de84acc7e4889b29ed8e1c0ab6bcc90895d40b3f68e72dc9aa982a05a7664b833a5d384855342bbf46ce42c200818f83eb4038b7e353575843707e8d
+EBUILD selinux-policykit-2.20170204-r2.ebuild 288 SHA256 d319f222cd6ea307ad720f5c594261060539c0dcb862342ce4ae23e8250fe8b8 SHA512 0c8e9591b3f8322c89ddcdcd86fc03f689e29ebf177d8832c98c115e8ddc569c0b61dc7f85f876b5b8ca9f258cc179eb1bc4e1368e8a1dc4b313c301da1e2f21 WHIRLPOOL bf187bf86ce492dc1f1ce297b259e961acf360a0e35dd12a7dc8fd477837e09f57e5156247974e72a4302b948086e257b5858e589f64c502484e261953b40c89
+EBUILD selinux-policykit-2.20170204-r3.ebuild 288 SHA256 d319f222cd6ea307ad720f5c594261060539c0dcb862342ce4ae23e8250fe8b8 SHA512 0c8e9591b3f8322c89ddcdcd86fc03f689e29ebf177d8832c98c115e8ddc569c0b61dc7f85f876b5b8ca9f258cc179eb1bc4e1368e8a1dc4b313c301da1e2f21 WHIRLPOOL bf187bf86ce492dc1f1ce297b259e961acf360a0e35dd12a7dc8fd477837e09f57e5156247974e72a4302b948086e257b5858e589f64c502484e261953b40c89
+EBUILD selinux-policykit-2.20170204-r4.ebuild 288 SHA256 d319f222cd6ea307ad720f5c594261060539c0dcb862342ce4ae23e8250fe8b8 SHA512 0c8e9591b3f8322c89ddcdcd86fc03f689e29ebf177d8832c98c115e8ddc569c0b61dc7f85f876b5b8ca9f258cc179eb1bc4e1368e8a1dc4b313c301da1e2f21 WHIRLPOOL bf187bf86ce492dc1f1ce297b259e961acf360a0e35dd12a7dc8fd477837e09f57e5156247974e72a4302b948086e257b5858e589f64c502484e261953b40c89
+EBUILD selinux-policykit-2.20170805-r2.ebuild 288 SHA256 d319f222cd6ea307ad720f5c594261060539c0dcb862342ce4ae23e8250fe8b8 SHA512 0c8e9591b3f8322c89ddcdcd86fc03f689e29ebf177d8832c98c115e8ddc569c0b61dc7f85f876b5b8ca9f258cc179eb1bc4e1368e8a1dc4b313c301da1e2f21 WHIRLPOOL bf187bf86ce492dc1f1ce297b259e961acf360a0e35dd12a7dc8fd477837e09f57e5156247974e72a4302b948086e257b5858e589f64c502484e261953b40c89
+EBUILD selinux-policykit-2.20170805-r3.ebuild 290 SHA256 e916723cd081c264f99f0dcf6eb5919eee9c2fbce1adb919f541dbf23df2280a SHA512 51197b2d15bb950585c2a5acce28a762bcc31af2f909c2865236fadffd22d7aa66b57a2c351bc6f49e065e2c4c7a673ecb17b32a1e9c541e04f005f4005b05ff WHIRLPOOL 895386c0de84acc7e4889b29ed8e1c0ab6bcc90895d40b3f68e72dc9aa982a05a7664b833a5d384855342bbf46ce42c200818f83eb4038b7e353575843707e8d
+EBUILD selinux-policykit-9999.ebuild 290 SHA256 e916723cd081c264f99f0dcf6eb5919eee9c2fbce1adb919f541dbf23df2280a SHA512 51197b2d15bb950585c2a5acce28a762bcc31af2f909c2865236fadffd22d7aa66b57a2c351bc6f49e065e2c4c7a673ecb17b32a1e9c541e04f005f4005b05ff WHIRLPOOL 895386c0de84acc7e4889b29ed8e1c0ab6bcc90895d40b3f68e72dc9aa982a05a7664b833a5d384855342bbf46ce42c200818f83eb4038b7e353575843707e8d
 MISC ChangeLog 10887 SHA256 330f5f65633cb46cbfc28ac7c0aac5c9d473bc4a902575e6455bf2cd56c681df SHA512 62a14d157897d7f994d10322febf288a5867e92aabfa11ab99f03bef6fa2641f9fd7735ee3b0e63c95e258358cdb8d35211264373877f66465f90015a86bc266 WHIRLPOOL be767b415393797156e1dfc6c1359d07f5396a7316b4a977f208f3a59851f4189f1d5a390ac05916df333886bb7758c7774f57f2382a7caa3adfc5c81500b027
 MISC ChangeLog-2015 10222 SHA256 8f5e2df3347ddb3c6ebd97e571c660f90b67863bc61f02c8827797554c5945d6 SHA512 c8b35dc78ec1f85ce0840198bf3e721dbf71954357595b52a630547e6756294fbdad649d9ab1b5ea75a6e642cb8a7c29607d48975a5fc7d7f7d7059df09c9eff WHIRLPOOL 849652f446f91432d2f5a89a9eeacc3337774b1aa6fefc71b98f3872891b5f9f92a0e824bc5cc0d6eef3f5852cfc0f9a5c764053177db382fd544fa1c006248e
 MISC metadata.xml 319 SHA256 747b497d8db18d5289d78e25e81cb997b8b3fb8d7f8ee34dde8d313626b83f92 SHA512 f12d584c6a1bb11eac0e6e282989f90b0ce0e660afa5097cc667f7a3686378a16030f1dc1adb62ff3035df60f53e3c8c49167ada253688c5d7198a3cddb9ae55 WHIRLPOOL fadb5f0278a2123a9bdd116355e4e978bc91652484e35856b0e64eb6ce04da24da712a1c7411c026abc812404a4cf00edd03b452b3f86d482b698e048df3b780
diff --git a/sec-policy/selinux-policykit/selinux-policykit-2.20170204-r1.ebuild b/sec-policy/selinux-policykit/selinux-policykit-2.20170204-r1.ebuild
index e16721b8aaba..0d7dc409996d 100644
--- a/sec-policy/selinux-policykit/selinux-policykit-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-policykit/selinux-policykit-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-policykit/selinux-policykit-2.20170204-r2.ebuild b/sec-policy/selinux-policykit/selinux-policykit-2.20170204-r2.ebuild
index 3ad51a344ad2..89e77cc4f8e7 100644
--- a/sec-policy/selinux-policykit/selinux-policykit-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-policykit/selinux-policykit-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-policykit/selinux-policykit-2.20170204-r3.ebuild b/sec-policy/selinux-policykit/selinux-policykit-2.20170204-r3.ebuild
index 3ad51a344ad2..89e77cc4f8e7 100644
--- a/sec-policy/selinux-policykit/selinux-policykit-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-policykit/selinux-policykit-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-policykit/selinux-policykit-2.20170204-r4.ebuild b/sec-policy/selinux-policykit/selinux-policykit-2.20170204-r4.ebuild
index 3ad51a344ad2..89e77cc4f8e7 100644
--- a/sec-policy/selinux-policykit/selinux-policykit-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-policykit/selinux-policykit-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-policykit/selinux-policykit-2.20170805-r2.ebuild b/sec-policy/selinux-policykit/selinux-policykit-2.20170805-r2.ebuild
index 3ad51a344ad2..89e77cc4f8e7 100644
--- a/sec-policy/selinux-policykit/selinux-policykit-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-policykit/selinux-policykit-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-policykit/selinux-policykit-2.20170805-r3.ebuild b/sec-policy/selinux-policykit/selinux-policykit-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..0d7dc409996d
--- /dev/null
+++ b/sec-policy/selinux-policykit/selinux-policykit-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-policykit/selinux-policykit-9999.ebuild b/sec-policy/selinux-policykit/selinux-policykit-9999.ebuild
index e16721b8aaba..0d7dc409996d 100644
--- a/sec-policy/selinux-policykit/selinux-policykit-9999.ebuild
+++ b/sec-policy/selinux-policykit/selinux-policykit-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-portmap/Manifest b/sec-policy/selinux-portmap/Manifest
index 460083e94d0d..cba4761326af 100644
--- a/sec-policy/selinux-portmap/Manifest
+++ b/sec-policy/selinux-portmap/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-portmap-2.20170204-r1.ebuild 285 SHA256 ee18aac2bdd063d0d30118c9fd1fb4d58c150ed396f59142751fcd57102683f5 SHA512 db22b3bf3084802437674fe5e80a00355052065319be931aa4bd36235a518265ed95c6d04f3fb952f824bc61e7b7cc464cc7bf39079989bf6dcc97d869cfe8d8 WHIRLPOOL b385c10ba8d82fad0b23c6168affbe9b7816935010fdd8a0e3f559a8bf3a8e3723120b0f8ba6b85d68b402c3f8c1063ff06438225499934a239c397bd5ec4a09
-EBUILD selinux-portmap-2.20170204-r2.ebuild 283 SHA256 61e521fb2c369e438792e07c3b10ec9fae328eaee8cc32fa43dc39c9fb5e5f03 SHA512 ee6b615f711e71fad3696e8b79d27de9be5cb0b8372a3184280c6818a6a190a578515ab5bac92d0c5f7cc97a3f8f647db563f03611b04b19e732d77f5d9cfb82 WHIRLPOOL 7ae1b285b133fb6954fb8db07bbb3b0e32df39ddec9e1ffb27927fe04edb9218f7a368858b3edf0490053a08f91cc047944ede651c1dc036934d8ae716e98bb1
-EBUILD selinux-portmap-2.20170204-r3.ebuild 283 SHA256 61e521fb2c369e438792e07c3b10ec9fae328eaee8cc32fa43dc39c9fb5e5f03 SHA512 ee6b615f711e71fad3696e8b79d27de9be5cb0b8372a3184280c6818a6a190a578515ab5bac92d0c5f7cc97a3f8f647db563f03611b04b19e732d77f5d9cfb82 WHIRLPOOL 7ae1b285b133fb6954fb8db07bbb3b0e32df39ddec9e1ffb27927fe04edb9218f7a368858b3edf0490053a08f91cc047944ede651c1dc036934d8ae716e98bb1
-EBUILD selinux-portmap-2.20170204-r4.ebuild 283 SHA256 61e521fb2c369e438792e07c3b10ec9fae328eaee8cc32fa43dc39c9fb5e5f03 SHA512 ee6b615f711e71fad3696e8b79d27de9be5cb0b8372a3184280c6818a6a190a578515ab5bac92d0c5f7cc97a3f8f647db563f03611b04b19e732d77f5d9cfb82 WHIRLPOOL 7ae1b285b133fb6954fb8db07bbb3b0e32df39ddec9e1ffb27927fe04edb9218f7a368858b3edf0490053a08f91cc047944ede651c1dc036934d8ae716e98bb1
-EBUILD selinux-portmap-2.20170805-r2.ebuild 283 SHA256 61e521fb2c369e438792e07c3b10ec9fae328eaee8cc32fa43dc39c9fb5e5f03 SHA512 ee6b615f711e71fad3696e8b79d27de9be5cb0b8372a3184280c6818a6a190a578515ab5bac92d0c5f7cc97a3f8f647db563f03611b04b19e732d77f5d9cfb82 WHIRLPOOL 7ae1b285b133fb6954fb8db07bbb3b0e32df39ddec9e1ffb27927fe04edb9218f7a368858b3edf0490053a08f91cc047944ede651c1dc036934d8ae716e98bb1
-EBUILD selinux-portmap-9999.ebuild 285 SHA256 ee18aac2bdd063d0d30118c9fd1fb4d58c150ed396f59142751fcd57102683f5 SHA512 db22b3bf3084802437674fe5e80a00355052065319be931aa4bd36235a518265ed95c6d04f3fb952f824bc61e7b7cc464cc7bf39079989bf6dcc97d869cfe8d8 WHIRLPOOL b385c10ba8d82fad0b23c6168affbe9b7816935010fdd8a0e3f559a8bf3a8e3723120b0f8ba6b85d68b402c3f8c1063ff06438225499934a239c397bd5ec4a09
+EBUILD selinux-portmap-2.20170204-r1.ebuild 286 SHA256 355cc6737cbc61112bc6c0a0fec240cc99ae8560daa7ebed79d2f14ebb717989 SHA512 77d108dc130386a7f611bfe06eeeb2a2bc1fb6d056caef65a73be982b9585eeab29b1efbb91de817472ad86d777fe52ace08b528eed3c3427f3082a5bef70a30 WHIRLPOOL 253fa5e83b5ac548c4a22a6e0dd4b70d9c6ba07de50075c97c708462ef4ac84239751f45758a5fe366d7bcedad319c38308d5898ab68d440afb8714ab1cf0131
+EBUILD selinux-portmap-2.20170204-r2.ebuild 284 SHA256 22e947adb3c341fc37c0de804acba6503004dfc38f3f97dd4a7df594f8b25db2 SHA512 e40a199d033ade6e9ca9f4ceb74e4be7fd681b2e062bd8749fb0b991d0ce1aff19296cad3d48ba390a94b6f56e7586cd55aa852aabd13436e3ad3f8911dd8615 WHIRLPOOL 900b2c906c7853ec4890d2fdfda6e79ca7f98a1667e4f3547d956783b66ded9646b730755a25b74b62d44d056de645b8d4baa14d908606d42e8a3e06b75629c7
+EBUILD selinux-portmap-2.20170204-r3.ebuild 284 SHA256 22e947adb3c341fc37c0de804acba6503004dfc38f3f97dd4a7df594f8b25db2 SHA512 e40a199d033ade6e9ca9f4ceb74e4be7fd681b2e062bd8749fb0b991d0ce1aff19296cad3d48ba390a94b6f56e7586cd55aa852aabd13436e3ad3f8911dd8615 WHIRLPOOL 900b2c906c7853ec4890d2fdfda6e79ca7f98a1667e4f3547d956783b66ded9646b730755a25b74b62d44d056de645b8d4baa14d908606d42e8a3e06b75629c7
+EBUILD selinux-portmap-2.20170204-r4.ebuild 284 SHA256 22e947adb3c341fc37c0de804acba6503004dfc38f3f97dd4a7df594f8b25db2 SHA512 e40a199d033ade6e9ca9f4ceb74e4be7fd681b2e062bd8749fb0b991d0ce1aff19296cad3d48ba390a94b6f56e7586cd55aa852aabd13436e3ad3f8911dd8615 WHIRLPOOL 900b2c906c7853ec4890d2fdfda6e79ca7f98a1667e4f3547d956783b66ded9646b730755a25b74b62d44d056de645b8d4baa14d908606d42e8a3e06b75629c7
+EBUILD selinux-portmap-2.20170805-r2.ebuild 284 SHA256 22e947adb3c341fc37c0de804acba6503004dfc38f3f97dd4a7df594f8b25db2 SHA512 e40a199d033ade6e9ca9f4ceb74e4be7fd681b2e062bd8749fb0b991d0ce1aff19296cad3d48ba390a94b6f56e7586cd55aa852aabd13436e3ad3f8911dd8615 WHIRLPOOL 900b2c906c7853ec4890d2fdfda6e79ca7f98a1667e4f3547d956783b66ded9646b730755a25b74b62d44d056de645b8d4baa14d908606d42e8a3e06b75629c7
+EBUILD selinux-portmap-2.20170805-r3.ebuild 286 SHA256 355cc6737cbc61112bc6c0a0fec240cc99ae8560daa7ebed79d2f14ebb717989 SHA512 77d108dc130386a7f611bfe06eeeb2a2bc1fb6d056caef65a73be982b9585eeab29b1efbb91de817472ad86d777fe52ace08b528eed3c3427f3082a5bef70a30 WHIRLPOOL 253fa5e83b5ac548c4a22a6e0dd4b70d9c6ba07de50075c97c708462ef4ac84239751f45758a5fe366d7bcedad319c38308d5898ab68d440afb8714ab1cf0131
+EBUILD selinux-portmap-9999.ebuild 286 SHA256 355cc6737cbc61112bc6c0a0fec240cc99ae8560daa7ebed79d2f14ebb717989 SHA512 77d108dc130386a7f611bfe06eeeb2a2bc1fb6d056caef65a73be982b9585eeab29b1efbb91de817472ad86d777fe52ace08b528eed3c3427f3082a5bef70a30 WHIRLPOOL 253fa5e83b5ac548c4a22a6e0dd4b70d9c6ba07de50075c97c708462ef4ac84239751f45758a5fe366d7bcedad319c38308d5898ab68d440afb8714ab1cf0131
 MISC ChangeLog 10687 SHA256 1d4fbb57ceb6409536e03d9a10f1db1c72cab64a01a57d6268ecf3dd6b29ef94 SHA512 866a2057d807b8648624a5d10e4f02903eb8f7ab7869700bd8685243eb6d1568783a7bd3e6d2c1be19b8c6dd5930383d6ce65ccc17c9e40e80c91a4e71aadb9c WHIRLPOOL b2ca64b1105b1b0637495add8b76d442ea94b1eebb9e21b84e9473793c5ade63c8d225a8f1422c3c906e5eb4445043c2e521f0bc5b8ca9e60be5e03cfe3d75b8
 MISC ChangeLog-2015 12875 SHA256 0486ad90305dd16a44bf6b9b18a0ce260db5e9b2630c83f65ea7cb23bc04c82a SHA512 7b4a06e2b3a226da9018cbe0f9a9fa38156f5ae03d1cc3bbadc58a0042d4cb48cb9bb014b9e3d2e935d77b8da7a58df3431698213c2a32b4fc5a6bc61226bc25 WHIRLPOOL 47588e1749f206cda35ae967c32b461d0ba1ccd33554cd9c761a4475f52a3f42c2a307220623a1942c39c3acbd79060cdb314dc038edab3ae849aaea1e7e2d66
 MISC metadata.xml 317 SHA256 26d19367195ddce49ea495710a35c19a2f8caa77de505b17b72f245c8806df37 SHA512 6d0fb959a90af947b760a5e5ab8895ba2e19538e516bff45e9f83625a405b442c04773c1c8e738b0af9f7c7dab257627bae490426861a70170fbaf47c1761526 WHIRLPOOL ee417a3509c68fcbbb99fda1b9edde38573c87390908780bc19ae13157578df2b9a137bb59b5277f544f6c81db3b050f1f196c48036c624329e7619f8015d10a
diff --git a/sec-policy/selinux-portmap/selinux-portmap-2.20170204-r1.ebuild b/sec-policy/selinux-portmap/selinux-portmap-2.20170204-r1.ebuild
index cb39bfc2b5ee..488ef18d25d7 100644
--- a/sec-policy/selinux-portmap/selinux-portmap-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-portmap/selinux-portmap-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-portmap/selinux-portmap-2.20170204-r2.ebuild b/sec-policy/selinux-portmap/selinux-portmap-2.20170204-r2.ebuild
index 38f717980e82..82ee01f0fd00 100644
--- a/sec-policy/selinux-portmap/selinux-portmap-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-portmap/selinux-portmap-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-portmap/selinux-portmap-2.20170204-r3.ebuild b/sec-policy/selinux-portmap/selinux-portmap-2.20170204-r3.ebuild
index 38f717980e82..82ee01f0fd00 100644
--- a/sec-policy/selinux-portmap/selinux-portmap-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-portmap/selinux-portmap-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-portmap/selinux-portmap-2.20170204-r4.ebuild b/sec-policy/selinux-portmap/selinux-portmap-2.20170204-r4.ebuild
index 38f717980e82..82ee01f0fd00 100644
--- a/sec-policy/selinux-portmap/selinux-portmap-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-portmap/selinux-portmap-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-portmap/selinux-portmap-2.20170805-r2.ebuild b/sec-policy/selinux-portmap/selinux-portmap-2.20170805-r2.ebuild
index 38f717980e82..82ee01f0fd00 100644
--- a/sec-policy/selinux-portmap/selinux-portmap-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-portmap/selinux-portmap-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-portmap/selinux-portmap-2.20170805-r3.ebuild b/sec-policy/selinux-portmap/selinux-portmap-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..488ef18d25d7
--- /dev/null
+++ b/sec-policy/selinux-portmap/selinux-portmap-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-portmap/selinux-portmap-9999.ebuild b/sec-policy/selinux-portmap/selinux-portmap-9999.ebuild
index cb39bfc2b5ee..488ef18d25d7 100644
--- a/sec-policy/selinux-portmap/selinux-portmap-9999.ebuild
+++ b/sec-policy/selinux-portmap/selinux-portmap-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-postfix/Manifest b/sec-policy/selinux-postfix/Manifest
index adac2c1d3ada..da3258abe2f5 100644
--- a/sec-policy/selinux-postfix/Manifest
+++ b/sec-policy/selinux-postfix/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-postfix-2.20170204-r1.ebuild 285 SHA256 bb0917f15021785bba8ee404b502dc9f81e077f0a9409b0d1bba5f30e4983b73 SHA512 6532c33efffb8a5602c4de33be1ea8d2cc98ae653572e65b8d55fe510f8d54160ae1d1c23ab3747ef2ee056552dd67c5b1fc8be6e956d3676b7147b230a7d2bf WHIRLPOOL 927aea954600143bff2cf5915de7de79751437595d91038e151aff587b9072df4ba2e48e681e43b908c85a024106532543d77be03d700e38aec322831540880a
-EBUILD selinux-postfix-2.20170204-r2.ebuild 283 SHA256 a3c912083360a819a76419effdb3667af10eae60660149e02fdc8d22d0ee1f00 SHA512 4963a54946145468035d6ccf39f333231b06b54b9ba324620a599f07065580929e8162ca0153c8308fd8f8e5c1cc55f4c3ee9138a3486ff487b03ebbda232a3e WHIRLPOOL 691589a0576c0dbb6c2d161361b5048832ef3f8899de736781866c4d0f8b3e1e2d49d7abb8c550ef66bd3e5a2d5d6baebc371855390d48170e13b3a99458f5a8
-EBUILD selinux-postfix-2.20170204-r3.ebuild 283 SHA256 a3c912083360a819a76419effdb3667af10eae60660149e02fdc8d22d0ee1f00 SHA512 4963a54946145468035d6ccf39f333231b06b54b9ba324620a599f07065580929e8162ca0153c8308fd8f8e5c1cc55f4c3ee9138a3486ff487b03ebbda232a3e WHIRLPOOL 691589a0576c0dbb6c2d161361b5048832ef3f8899de736781866c4d0f8b3e1e2d49d7abb8c550ef66bd3e5a2d5d6baebc371855390d48170e13b3a99458f5a8
-EBUILD selinux-postfix-2.20170204-r4.ebuild 283 SHA256 a3c912083360a819a76419effdb3667af10eae60660149e02fdc8d22d0ee1f00 SHA512 4963a54946145468035d6ccf39f333231b06b54b9ba324620a599f07065580929e8162ca0153c8308fd8f8e5c1cc55f4c3ee9138a3486ff487b03ebbda232a3e WHIRLPOOL 691589a0576c0dbb6c2d161361b5048832ef3f8899de736781866c4d0f8b3e1e2d49d7abb8c550ef66bd3e5a2d5d6baebc371855390d48170e13b3a99458f5a8
-EBUILD selinux-postfix-2.20170805-r2.ebuild 283 SHA256 a3c912083360a819a76419effdb3667af10eae60660149e02fdc8d22d0ee1f00 SHA512 4963a54946145468035d6ccf39f333231b06b54b9ba324620a599f07065580929e8162ca0153c8308fd8f8e5c1cc55f4c3ee9138a3486ff487b03ebbda232a3e WHIRLPOOL 691589a0576c0dbb6c2d161361b5048832ef3f8899de736781866c4d0f8b3e1e2d49d7abb8c550ef66bd3e5a2d5d6baebc371855390d48170e13b3a99458f5a8
-EBUILD selinux-postfix-9999.ebuild 285 SHA256 bb0917f15021785bba8ee404b502dc9f81e077f0a9409b0d1bba5f30e4983b73 SHA512 6532c33efffb8a5602c4de33be1ea8d2cc98ae653572e65b8d55fe510f8d54160ae1d1c23ab3747ef2ee056552dd67c5b1fc8be6e956d3676b7147b230a7d2bf WHIRLPOOL 927aea954600143bff2cf5915de7de79751437595d91038e151aff587b9072df4ba2e48e681e43b908c85a024106532543d77be03d700e38aec322831540880a
+EBUILD selinux-postfix-2.20170204-r1.ebuild 286 SHA256 abc20f7715af8af6d3ddd4bbd04deb8ff39b17a5096c5a026f2b5f9fd8b7f12b SHA512 46bfe088df5279da8e97ff22d9a4607f5a607e8fac1b1db483ca40d6d0686d768210d117335e16b2ac0a7a4d7fdb2158bc0180f49f59fe3b4ed7def85ac7da31 WHIRLPOOL d23359d03aa4e3b4bc0fd82fb66be5da2df65cef0c7bf199431b02e2d16b1090f4c8e07651cf3791235b7f720cd0e86b9fa42ddb595afc03e42451a091709f20
+EBUILD selinux-postfix-2.20170204-r2.ebuild 284 SHA256 ff3eac2f1ade33a84a274bd8d85f4e784804ad830d43f643b90fcda3454e76e8 SHA512 656c6acb7f5fde0044b0f955ce111d52f3981a3bee1e3da0f66753727bd10e3132cb103ebfbe8a9af50098d80bdf446fdc995bb642f8046158aacd1cc28d81a6 WHIRLPOOL acdc7f5d2736a1b693a98ca74cbdf3c0da9deafbd7ca0d4821ce87485fe9cfe337e4a0c91f31c081a5d75b50cdcfe18b7da5b74d0b4f0deac8bf3b8475085dba
+EBUILD selinux-postfix-2.20170204-r3.ebuild 284 SHA256 ff3eac2f1ade33a84a274bd8d85f4e784804ad830d43f643b90fcda3454e76e8 SHA512 656c6acb7f5fde0044b0f955ce111d52f3981a3bee1e3da0f66753727bd10e3132cb103ebfbe8a9af50098d80bdf446fdc995bb642f8046158aacd1cc28d81a6 WHIRLPOOL acdc7f5d2736a1b693a98ca74cbdf3c0da9deafbd7ca0d4821ce87485fe9cfe337e4a0c91f31c081a5d75b50cdcfe18b7da5b74d0b4f0deac8bf3b8475085dba
+EBUILD selinux-postfix-2.20170204-r4.ebuild 284 SHA256 ff3eac2f1ade33a84a274bd8d85f4e784804ad830d43f643b90fcda3454e76e8 SHA512 656c6acb7f5fde0044b0f955ce111d52f3981a3bee1e3da0f66753727bd10e3132cb103ebfbe8a9af50098d80bdf446fdc995bb642f8046158aacd1cc28d81a6 WHIRLPOOL acdc7f5d2736a1b693a98ca74cbdf3c0da9deafbd7ca0d4821ce87485fe9cfe337e4a0c91f31c081a5d75b50cdcfe18b7da5b74d0b4f0deac8bf3b8475085dba
+EBUILD selinux-postfix-2.20170805-r2.ebuild 284 SHA256 ff3eac2f1ade33a84a274bd8d85f4e784804ad830d43f643b90fcda3454e76e8 SHA512 656c6acb7f5fde0044b0f955ce111d52f3981a3bee1e3da0f66753727bd10e3132cb103ebfbe8a9af50098d80bdf446fdc995bb642f8046158aacd1cc28d81a6 WHIRLPOOL acdc7f5d2736a1b693a98ca74cbdf3c0da9deafbd7ca0d4821ce87485fe9cfe337e4a0c91f31c081a5d75b50cdcfe18b7da5b74d0b4f0deac8bf3b8475085dba
+EBUILD selinux-postfix-2.20170805-r3.ebuild 286 SHA256 abc20f7715af8af6d3ddd4bbd04deb8ff39b17a5096c5a026f2b5f9fd8b7f12b SHA512 46bfe088df5279da8e97ff22d9a4607f5a607e8fac1b1db483ca40d6d0686d768210d117335e16b2ac0a7a4d7fdb2158bc0180f49f59fe3b4ed7def85ac7da31 WHIRLPOOL d23359d03aa4e3b4bc0fd82fb66be5da2df65cef0c7bf199431b02e2d16b1090f4c8e07651cf3791235b7f720cd0e86b9fa42ddb595afc03e42451a091709f20
+EBUILD selinux-postfix-9999.ebuild 286 SHA256 abc20f7715af8af6d3ddd4bbd04deb8ff39b17a5096c5a026f2b5f9fd8b7f12b SHA512 46bfe088df5279da8e97ff22d9a4607f5a607e8fac1b1db483ca40d6d0686d768210d117335e16b2ac0a7a4d7fdb2158bc0180f49f59fe3b4ed7def85ac7da31 WHIRLPOOL d23359d03aa4e3b4bc0fd82fb66be5da2df65cef0c7bf199431b02e2d16b1090f4c8e07651cf3791235b7f720cd0e86b9fa42ddb595afc03e42451a091709f20
 MISC ChangeLog 10687 SHA256 514e5dc22bb1c3065f230bdaa2860a5fc9f9a80f1d4f00dbf4c7576e83cffbf0 SHA512 aca4833d35f0844b46e2700c082b56c884a4c1dd3f977341ea20f4cedd251c067ea68556974ecb3c79453eb6a94fc00222c28995b762cd7848b5af0f0783c039 WHIRLPOOL 52bc8df1cf83574c424ebf9744e1d70410d2bf9a32dcab32c015c35236801f059171de3423e9f47d4c72b061013ccf4356913e44793470a64bff156249ee8cc6
 MISC ChangeLog-2015 16181 SHA256 379bc54e0d0fcf82aad964a4b430001f01c264ea71e101a9844477f5f105b279 SHA512 0ddaf0f89f347639adc87dbba7cadb4b15739a4710477f429f834d7d168e8deefe2491edb450643854b04e53b96c7a2188c35e21b86425b8e7d244c3129998a3 WHIRLPOOL 1d693539be98090fad970f5bf2b48276790bdc211664049c44e4a671d99dd1ef09c69e0703906592ffa57d33d733219779a88c4be039a56654fa4c4738ebab6c
 MISC metadata.xml 317 SHA256 bd85fd7961673850d90cb9c1d6d92c56a462541dcf0791e090dc87585ea9608f SHA512 7109989e6380231647aaf248be3bf2fd619859ae42bf0e271ef1de45b9b663e804988c03993b18502110d86d58d35bc265c3a59e03bd3484cffe6d8f29a3e9c1 WHIRLPOOL af79b8c47836edb2961c95d206f2839683137c062c081d5561076cf33c0acad1483abe66b0ca4cb29a82268cfee75f1790cb153c554ca8d44b2345b4260a0094
diff --git a/sec-policy/selinux-postfix/selinux-postfix-2.20170204-r1.ebuild b/sec-policy/selinux-postfix/selinux-postfix-2.20170204-r1.ebuild
index 7cd3be94e40c..00c6d47db3c2 100644
--- a/sec-policy/selinux-postfix/selinux-postfix-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-postfix/selinux-postfix-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-postfix/selinux-postfix-2.20170204-r2.ebuild b/sec-policy/selinux-postfix/selinux-postfix-2.20170204-r2.ebuild
index 307e1900046b..d80d82971876 100644
--- a/sec-policy/selinux-postfix/selinux-postfix-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-postfix/selinux-postfix-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-postfix/selinux-postfix-2.20170204-r3.ebuild b/sec-policy/selinux-postfix/selinux-postfix-2.20170204-r3.ebuild
index 307e1900046b..d80d82971876 100644
--- a/sec-policy/selinux-postfix/selinux-postfix-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-postfix/selinux-postfix-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-postfix/selinux-postfix-2.20170204-r4.ebuild b/sec-policy/selinux-postfix/selinux-postfix-2.20170204-r4.ebuild
index 307e1900046b..d80d82971876 100644
--- a/sec-policy/selinux-postfix/selinux-postfix-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-postfix/selinux-postfix-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-postfix/selinux-postfix-2.20170805-r2.ebuild b/sec-policy/selinux-postfix/selinux-postfix-2.20170805-r2.ebuild
index 307e1900046b..d80d82971876 100644
--- a/sec-policy/selinux-postfix/selinux-postfix-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-postfix/selinux-postfix-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-postfix/selinux-postfix-2.20170805-r3.ebuild b/sec-policy/selinux-postfix/selinux-postfix-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..00c6d47db3c2
--- /dev/null
+++ b/sec-policy/selinux-postfix/selinux-postfix-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-postfix/selinux-postfix-9999.ebuild b/sec-policy/selinux-postfix/selinux-postfix-9999.ebuild
index 7cd3be94e40c..00c6d47db3c2 100644
--- a/sec-policy/selinux-postfix/selinux-postfix-9999.ebuild
+++ b/sec-policy/selinux-postfix/selinux-postfix-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-postgresql/Manifest b/sec-policy/selinux-postgresql/Manifest
index b96de6802dbd..d39084b93461 100644
--- a/sec-policy/selinux-postgresql/Manifest
+++ b/sec-policy/selinux-postgresql/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-postgresql-2.20170204-r1.ebuild 291 SHA256 59a598a4301024a384ea13e597ec507a0992c778f883c6a50a5c49d592b9f317 SHA512 855ff35279a1d5c2ddb102ea4bca41eada696fd115a85fe15ed66e0aac6a2bf60215eba7effaeb871d2a37b774eccec29be3b76ce6054ce737f921a20a3783a6 WHIRLPOOL 356588dcc64f2786f53fe117f9d06a8547c1b7e5dc1ba1e93f70f8dcd0e3ed55c393eaf04adf482b880881d51f55845a1954dbc54b7d4c257e56e25ea0e35771
-EBUILD selinux-postgresql-2.20170204-r2.ebuild 289 SHA256 b4177262f3900e0ce3ca2a79d7d10363f979bac10fe3aafb16550dde7db042de SHA512 b64e0cf4e051e7db077d33ae360f2307da388cdd20e8b8a9aa910378ab7d509346b93db0dccf588d39c87a6928f07d537a847ba1485dbd493be1d709190b58a7 WHIRLPOOL eb2871c27c4c2d4c5e76a25bdd80e3176a2b5df9a017290c0914ccc63f7ddb7a46fe4e84e1665296b178472730db50ebe25f2d3ffd12465c2688a173577b14f6
-EBUILD selinux-postgresql-2.20170204-r3.ebuild 289 SHA256 b4177262f3900e0ce3ca2a79d7d10363f979bac10fe3aafb16550dde7db042de SHA512 b64e0cf4e051e7db077d33ae360f2307da388cdd20e8b8a9aa910378ab7d509346b93db0dccf588d39c87a6928f07d537a847ba1485dbd493be1d709190b58a7 WHIRLPOOL eb2871c27c4c2d4c5e76a25bdd80e3176a2b5df9a017290c0914ccc63f7ddb7a46fe4e84e1665296b178472730db50ebe25f2d3ffd12465c2688a173577b14f6
-EBUILD selinux-postgresql-2.20170204-r4.ebuild 289 SHA256 b4177262f3900e0ce3ca2a79d7d10363f979bac10fe3aafb16550dde7db042de SHA512 b64e0cf4e051e7db077d33ae360f2307da388cdd20e8b8a9aa910378ab7d509346b93db0dccf588d39c87a6928f07d537a847ba1485dbd493be1d709190b58a7 WHIRLPOOL eb2871c27c4c2d4c5e76a25bdd80e3176a2b5df9a017290c0914ccc63f7ddb7a46fe4e84e1665296b178472730db50ebe25f2d3ffd12465c2688a173577b14f6
-EBUILD selinux-postgresql-2.20170805-r2.ebuild 289 SHA256 b4177262f3900e0ce3ca2a79d7d10363f979bac10fe3aafb16550dde7db042de SHA512 b64e0cf4e051e7db077d33ae360f2307da388cdd20e8b8a9aa910378ab7d509346b93db0dccf588d39c87a6928f07d537a847ba1485dbd493be1d709190b58a7 WHIRLPOOL eb2871c27c4c2d4c5e76a25bdd80e3176a2b5df9a017290c0914ccc63f7ddb7a46fe4e84e1665296b178472730db50ebe25f2d3ffd12465c2688a173577b14f6
-EBUILD selinux-postgresql-9999.ebuild 291 SHA256 59a598a4301024a384ea13e597ec507a0992c778f883c6a50a5c49d592b9f317 SHA512 855ff35279a1d5c2ddb102ea4bca41eada696fd115a85fe15ed66e0aac6a2bf60215eba7effaeb871d2a37b774eccec29be3b76ce6054ce737f921a20a3783a6 WHIRLPOOL 356588dcc64f2786f53fe117f9d06a8547c1b7e5dc1ba1e93f70f8dcd0e3ed55c393eaf04adf482b880881d51f55845a1954dbc54b7d4c257e56e25ea0e35771
+EBUILD selinux-postgresql-2.20170204-r1.ebuild 292 SHA256 13e1103e893b5e1d1a9bd8386038d156369d987599e90134c9c9222706bc0ebd SHA512 9821c318ac8386b57223a015dacce399ce4e71feb807574cfa6038a9effb1ffdc4e36a8bbe0c87059e2b85b4f00623ce9a8ccf137036c917c63339e7d95be058 WHIRLPOOL a3f78978d08273f96272c3771fe4b01f69ecf90645843398fa5dbaae756dc0dd22bfcea1edadc10e921f5aa561f2f7f35ed809ee471cdf1b7e5ea288ce542bb6
+EBUILD selinux-postgresql-2.20170204-r2.ebuild 290 SHA256 b38b732e84f7b3bf4e75180c7820df5f10888c82fc5f2be02fbe2705987b0221 SHA512 840c381df469e41c7f471f4701dbb860d2d47febc0bb238e454d66480b05f4ac6b04e310e78a47028a851d394af9ae96bae537c7cb09925cb14b18027b918c35 WHIRLPOOL c991562fa99bce82526ed1fed43045bc2b57aff451ddd5452f7032fcd2d12d6242eb79c69ef9a1b74816eb3ce89e542b5e81f9f637c2d5d5a8e100d7855ef0f3
+EBUILD selinux-postgresql-2.20170204-r3.ebuild 290 SHA256 b38b732e84f7b3bf4e75180c7820df5f10888c82fc5f2be02fbe2705987b0221 SHA512 840c381df469e41c7f471f4701dbb860d2d47febc0bb238e454d66480b05f4ac6b04e310e78a47028a851d394af9ae96bae537c7cb09925cb14b18027b918c35 WHIRLPOOL c991562fa99bce82526ed1fed43045bc2b57aff451ddd5452f7032fcd2d12d6242eb79c69ef9a1b74816eb3ce89e542b5e81f9f637c2d5d5a8e100d7855ef0f3
+EBUILD selinux-postgresql-2.20170204-r4.ebuild 290 SHA256 b38b732e84f7b3bf4e75180c7820df5f10888c82fc5f2be02fbe2705987b0221 SHA512 840c381df469e41c7f471f4701dbb860d2d47febc0bb238e454d66480b05f4ac6b04e310e78a47028a851d394af9ae96bae537c7cb09925cb14b18027b918c35 WHIRLPOOL c991562fa99bce82526ed1fed43045bc2b57aff451ddd5452f7032fcd2d12d6242eb79c69ef9a1b74816eb3ce89e542b5e81f9f637c2d5d5a8e100d7855ef0f3
+EBUILD selinux-postgresql-2.20170805-r2.ebuild 290 SHA256 b38b732e84f7b3bf4e75180c7820df5f10888c82fc5f2be02fbe2705987b0221 SHA512 840c381df469e41c7f471f4701dbb860d2d47febc0bb238e454d66480b05f4ac6b04e310e78a47028a851d394af9ae96bae537c7cb09925cb14b18027b918c35 WHIRLPOOL c991562fa99bce82526ed1fed43045bc2b57aff451ddd5452f7032fcd2d12d6242eb79c69ef9a1b74816eb3ce89e542b5e81f9f637c2d5d5a8e100d7855ef0f3
+EBUILD selinux-postgresql-2.20170805-r3.ebuild 292 SHA256 13e1103e893b5e1d1a9bd8386038d156369d987599e90134c9c9222706bc0ebd SHA512 9821c318ac8386b57223a015dacce399ce4e71feb807574cfa6038a9effb1ffdc4e36a8bbe0c87059e2b85b4f00623ce9a8ccf137036c917c63339e7d95be058 WHIRLPOOL a3f78978d08273f96272c3771fe4b01f69ecf90645843398fa5dbaae756dc0dd22bfcea1edadc10e921f5aa561f2f7f35ed809ee471cdf1b7e5ea288ce542bb6
+EBUILD selinux-postgresql-9999.ebuild 292 SHA256 13e1103e893b5e1d1a9bd8386038d156369d987599e90134c9c9222706bc0ebd SHA512 9821c318ac8386b57223a015dacce399ce4e71feb807574cfa6038a9effb1ffdc4e36a8bbe0c87059e2b85b4f00623ce9a8ccf137036c917c63339e7d95be058 WHIRLPOOL a3f78978d08273f96272c3771fe4b01f69ecf90645843398fa5dbaae756dc0dd22bfcea1edadc10e921f5aa561f2f7f35ed809ee471cdf1b7e5ea288ce542bb6
 MISC ChangeLog 10979 SHA256 1999eca78fe25394accc9f0a8d4e5fe1f54cac4d85398378d4a82c93d9baa475 SHA512 e14bc9d315f36363051cdb79b79d430a664189d514c6dc96676bfce4d7207bab042b5fde352844d8680e76739d8d3ab3dd93c979acdf493dbd71218450ae71ca WHIRLPOOL e6def2379b9b93936bb74d28cee75c61f012653c6de03d8a0afaf195f34bf94c9f1abda025234ae1fe475bbebe2094850487510716fe5bbf37b38c810d1efe1c
 MISC ChangeLog-2015 15303 SHA256 b4d35b09965aafdffa9257c0a6c4db73ac65ae3986d2c83811ef32672d468b3b SHA512 e2f73c060e27f099d45542ea2d6126a9b374d30b2dcf7388511b704e474f1b02d65f30add44506e6242ecd4fea8256d3e4894e35aab07f8ad1cb037f6b1c66ce WHIRLPOOL d8ac21dce3b435ea234403c44d7acd4789a28d4bfee6be15bf9b2bd79649b225a3105e9e24175fa5190058e1801c04492d309929b909d15d62885bce411874fc
 MISC metadata.xml 320 SHA256 368f8b60ea1a877491ecd544ab452a0bb964cadf0f40925b23638dd2c513d8ab SHA512 00365c82e7ac0b2cc9cfeeb766acd22e5000f1146cee207bd7df897b560590c9a7ddfde7f4ce0d4f5f535125a29137355cdd2415ad6fd4def67535e112990853 WHIRLPOOL 9d6d3afd33234adc8feda78439d1fca6626202514c8d5ae740232530b97ea24d11f285736fbb15785dc01f52ff4caf76f332f52d6ada04e604a5532a78741c09
diff --git a/sec-policy/selinux-postgresql/selinux-postgresql-2.20170204-r1.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-2.20170204-r1.ebuild
index 32d66d94cfb4..6c31791b6846 100644
--- a/sec-policy/selinux-postgresql/selinux-postgresql-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-postgresql/selinux-postgresql-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-postgresql/selinux-postgresql-2.20170204-r2.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-2.20170204-r2.ebuild
index ec587a3f25a8..a1f50973b366 100644
--- a/sec-policy/selinux-postgresql/selinux-postgresql-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-postgresql/selinux-postgresql-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-postgresql/selinux-postgresql-2.20170204-r3.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-2.20170204-r3.ebuild
index ec587a3f25a8..a1f50973b366 100644
--- a/sec-policy/selinux-postgresql/selinux-postgresql-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-postgresql/selinux-postgresql-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-postgresql/selinux-postgresql-2.20170204-r4.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-2.20170204-r4.ebuild
index ec587a3f25a8..a1f50973b366 100644
--- a/sec-policy/selinux-postgresql/selinux-postgresql-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-postgresql/selinux-postgresql-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-postgresql/selinux-postgresql-2.20170805-r2.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-2.20170805-r2.ebuild
index ec587a3f25a8..a1f50973b366 100644
--- a/sec-policy/selinux-postgresql/selinux-postgresql-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-postgresql/selinux-postgresql-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-postgresql/selinux-postgresql-2.20170805-r3.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..6c31791b6846
--- /dev/null
+++ b/sec-policy/selinux-postgresql/selinux-postgresql-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-postgresql/selinux-postgresql-9999.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-9999.ebuild
index 32d66d94cfb4..6c31791b6846 100644
--- a/sec-policy/selinux-postgresql/selinux-postgresql-9999.ebuild
+++ b/sec-policy/selinux-postgresql/selinux-postgresql-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-postgrey/Manifest b/sec-policy/selinux-postgrey/Manifest
index b396b58e33d3..7658b3255f24 100644
--- a/sec-policy/selinux-postgrey/Manifest
+++ b/sec-policy/selinux-postgrey/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-postgrey-2.20170204-r1.ebuild 287 SHA256 8aa4fb43467f3004cdd635fe54c6ce3cd642d537d457ed07dfc4d3140f9417f3 SHA512 b7cef8b429c155c96c329e7a3644cdf04c8152055832238e8e2ed2823a57884d1e0075bf697fe0b41dd0ffa66090f8bfbaa75897a982c9126f4261e1ff876915 WHIRLPOOL b5c732346eca45a4bb262297b62c2695ecb6b9d6cdf33718527affaf0ffa323b1404665a26037c8276ba2c22a2f2e6eb1d59ee447ea16d6f054430d3fae94a04
-EBUILD selinux-postgrey-2.20170204-r2.ebuild 285 SHA256 60395f0f8bda12513c777848baf957afaf25227052281d6ba7663336ed082b8a SHA512 cf1b5475f00858ed626017b006abd2822bb8609f535c194e8bb558af9e0f6f34d64461b72ce4df9c0edcf81cb70fba30bca365af9bc527a6476fa91bdfb0cb36 WHIRLPOOL 3edf956e3b59409eaa1d96def9031e6d7786e9a87366fdfe020689832bd03f75ce4c8475a5be6ee1bc5164290ef8819b256a11f57a618a1e3fd63f44ed4b0939
-EBUILD selinux-postgrey-2.20170204-r3.ebuild 285 SHA256 60395f0f8bda12513c777848baf957afaf25227052281d6ba7663336ed082b8a SHA512 cf1b5475f00858ed626017b006abd2822bb8609f535c194e8bb558af9e0f6f34d64461b72ce4df9c0edcf81cb70fba30bca365af9bc527a6476fa91bdfb0cb36 WHIRLPOOL 3edf956e3b59409eaa1d96def9031e6d7786e9a87366fdfe020689832bd03f75ce4c8475a5be6ee1bc5164290ef8819b256a11f57a618a1e3fd63f44ed4b0939
-EBUILD selinux-postgrey-2.20170204-r4.ebuild 285 SHA256 60395f0f8bda12513c777848baf957afaf25227052281d6ba7663336ed082b8a SHA512 cf1b5475f00858ed626017b006abd2822bb8609f535c194e8bb558af9e0f6f34d64461b72ce4df9c0edcf81cb70fba30bca365af9bc527a6476fa91bdfb0cb36 WHIRLPOOL 3edf956e3b59409eaa1d96def9031e6d7786e9a87366fdfe020689832bd03f75ce4c8475a5be6ee1bc5164290ef8819b256a11f57a618a1e3fd63f44ed4b0939
-EBUILD selinux-postgrey-2.20170805-r2.ebuild 285 SHA256 60395f0f8bda12513c777848baf957afaf25227052281d6ba7663336ed082b8a SHA512 cf1b5475f00858ed626017b006abd2822bb8609f535c194e8bb558af9e0f6f34d64461b72ce4df9c0edcf81cb70fba30bca365af9bc527a6476fa91bdfb0cb36 WHIRLPOOL 3edf956e3b59409eaa1d96def9031e6d7786e9a87366fdfe020689832bd03f75ce4c8475a5be6ee1bc5164290ef8819b256a11f57a618a1e3fd63f44ed4b0939
-EBUILD selinux-postgrey-9999.ebuild 287 SHA256 8aa4fb43467f3004cdd635fe54c6ce3cd642d537d457ed07dfc4d3140f9417f3 SHA512 b7cef8b429c155c96c329e7a3644cdf04c8152055832238e8e2ed2823a57884d1e0075bf697fe0b41dd0ffa66090f8bfbaa75897a982c9126f4261e1ff876915 WHIRLPOOL b5c732346eca45a4bb262297b62c2695ecb6b9d6cdf33718527affaf0ffa323b1404665a26037c8276ba2c22a2f2e6eb1d59ee447ea16d6f054430d3fae94a04
+EBUILD selinux-postgrey-2.20170204-r1.ebuild 288 SHA256 7dab0c07b34d8e0f45a4712142d55907425ca1704371ef255f6fb3ba1bda53c4 SHA512 06bde822722d217eab7d77cf09c78961a185ba9c7e012c5115f8b221b3c18eafe8816396e5fdcabc1dfcf4411a2ffe0a42ddafc6ad67a9b1884d42d489c794b0 WHIRLPOOL 36632a123247a9375e7c589bea4a0c62f124a92a1bcf3611e1f1427273a689c7a15f8ac3bcdd6c2d7c22d98bed0160a6ed78f5b87f229abb5eb08205da57a5b7
+EBUILD selinux-postgrey-2.20170204-r2.ebuild 286 SHA256 42731b86877a4a0636a60eb838c93427169d1102316c266ae8df0c1146e6d599 SHA512 3938f45a89e53304e71c900ae01f8a5f947aa2cecabf324011d1415fc11189dccc833f4f4a1a6fe079555c10c404b3c88af0a528c3d0fbf8abe0aab04530a178 WHIRLPOOL 94a7746cd0943e5e263c39e69e0183638a0cf850312bf8b8685e447e3bbdb5b054f89fd240198965ad79de3d30952efe1486131186a8f1814b97f60372562e51
+EBUILD selinux-postgrey-2.20170204-r3.ebuild 286 SHA256 42731b86877a4a0636a60eb838c93427169d1102316c266ae8df0c1146e6d599 SHA512 3938f45a89e53304e71c900ae01f8a5f947aa2cecabf324011d1415fc11189dccc833f4f4a1a6fe079555c10c404b3c88af0a528c3d0fbf8abe0aab04530a178 WHIRLPOOL 94a7746cd0943e5e263c39e69e0183638a0cf850312bf8b8685e447e3bbdb5b054f89fd240198965ad79de3d30952efe1486131186a8f1814b97f60372562e51
+EBUILD selinux-postgrey-2.20170204-r4.ebuild 286 SHA256 42731b86877a4a0636a60eb838c93427169d1102316c266ae8df0c1146e6d599 SHA512 3938f45a89e53304e71c900ae01f8a5f947aa2cecabf324011d1415fc11189dccc833f4f4a1a6fe079555c10c404b3c88af0a528c3d0fbf8abe0aab04530a178 WHIRLPOOL 94a7746cd0943e5e263c39e69e0183638a0cf850312bf8b8685e447e3bbdb5b054f89fd240198965ad79de3d30952efe1486131186a8f1814b97f60372562e51
+EBUILD selinux-postgrey-2.20170805-r2.ebuild 286 SHA256 42731b86877a4a0636a60eb838c93427169d1102316c266ae8df0c1146e6d599 SHA512 3938f45a89e53304e71c900ae01f8a5f947aa2cecabf324011d1415fc11189dccc833f4f4a1a6fe079555c10c404b3c88af0a528c3d0fbf8abe0aab04530a178 WHIRLPOOL 94a7746cd0943e5e263c39e69e0183638a0cf850312bf8b8685e447e3bbdb5b054f89fd240198965ad79de3d30952efe1486131186a8f1814b97f60372562e51
+EBUILD selinux-postgrey-2.20170805-r3.ebuild 288 SHA256 7dab0c07b34d8e0f45a4712142d55907425ca1704371ef255f6fb3ba1bda53c4 SHA512 06bde822722d217eab7d77cf09c78961a185ba9c7e012c5115f8b221b3c18eafe8816396e5fdcabc1dfcf4411a2ffe0a42ddafc6ad67a9b1884d42d489c794b0 WHIRLPOOL 36632a123247a9375e7c589bea4a0c62f124a92a1bcf3611e1f1427273a689c7a15f8ac3bcdd6c2d7c22d98bed0160a6ed78f5b87f229abb5eb08205da57a5b7
+EBUILD selinux-postgrey-9999.ebuild 288 SHA256 7dab0c07b34d8e0f45a4712142d55907425ca1704371ef255f6fb3ba1bda53c4 SHA512 06bde822722d217eab7d77cf09c78961a185ba9c7e012c5115f8b221b3c18eafe8816396e5fdcabc1dfcf4411a2ffe0a42ddafc6ad67a9b1884d42d489c794b0 WHIRLPOOL 36632a123247a9375e7c589bea4a0c62f124a92a1bcf3611e1f1427273a689c7a15f8ac3bcdd6c2d7c22d98bed0160a6ed78f5b87f229abb5eb08205da57a5b7
 MISC ChangeLog 10793 SHA256 149fcbcb581073b801fc29a95b3d4532cd73fb3876a2e5072af8cca42a91b431 SHA512 afa79428b10a93960b26ff5e5f491ec4b8f9f03b48b615d0b0c61bbd0958d666f54a83191256753fb32615b430199023f6dca9aaf5657c43403849a4aecdf43b WHIRLPOOL 37d68ceada59e9b9d28059fc26968aae7ee16e65b00044960ba8363a1b80a0ffce2b00cc9021bfdc4ccd105bc6ef49e48e14101ff65e789034aa38736d6db235
 MISC ChangeLog-2015 10103 SHA256 6c0603605864be852d0d35ae70b6156df7c2974de643b553140ca30f1db5320e SHA512 65a67796ae2dd2f37537381dfe05b0eb32076dec88afefc2f1e90003ca1f6b79ff76fbca799f850429e5e009cb85eeb72b2d34c2b40d8287d5bb476aaafbc022 WHIRLPOOL 17dcfa50d776413a886957dc992bef0895febb0e42d9e092eeacb0b92a74dd911e04d3ffd894cc1d2f41391ae27a318e4f7981a9f2f47af357ad1c940be50bf3
 MISC metadata.xml 318 SHA256 fcdde59fcf58b210302814512ae5bd18858f61b5a13687d2631a092ae3c40b4a SHA512 03a6f16ebf3c2f2cfe4c417434cc56007ca5df669d76ca93aacfe30a74b6bb8e6d269ef0b9eb4e96b85d638b266b5839c8713ef1be4e8925417a5004ed0d7c19 WHIRLPOOL 68baf4fd52702d132d6816c43c03c4cbfc44a8743b24443bae10c6b80bdf382503a9d818f957ef7cee5c97092a9d76adb75ce3b0a81c74277a5ac66c3576b4ee
diff --git a/sec-policy/selinux-postgrey/selinux-postgrey-2.20170204-r1.ebuild b/sec-policy/selinux-postgrey/selinux-postgrey-2.20170204-r1.ebuild
index 8136c33d73d9..4f70a25a4dd2 100644
--- a/sec-policy/selinux-postgrey/selinux-postgrey-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-postgrey/selinux-postgrey-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-postgrey/selinux-postgrey-2.20170204-r2.ebuild b/sec-policy/selinux-postgrey/selinux-postgrey-2.20170204-r2.ebuild
index dda72548a188..db1666610044 100644
--- a/sec-policy/selinux-postgrey/selinux-postgrey-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-postgrey/selinux-postgrey-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-postgrey/selinux-postgrey-2.20170204-r3.ebuild b/sec-policy/selinux-postgrey/selinux-postgrey-2.20170204-r3.ebuild
index dda72548a188..db1666610044 100644
--- a/sec-policy/selinux-postgrey/selinux-postgrey-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-postgrey/selinux-postgrey-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-postgrey/selinux-postgrey-2.20170204-r4.ebuild b/sec-policy/selinux-postgrey/selinux-postgrey-2.20170204-r4.ebuild
index dda72548a188..db1666610044 100644
--- a/sec-policy/selinux-postgrey/selinux-postgrey-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-postgrey/selinux-postgrey-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-postgrey/selinux-postgrey-2.20170805-r2.ebuild b/sec-policy/selinux-postgrey/selinux-postgrey-2.20170805-r2.ebuild
index dda72548a188..db1666610044 100644
--- a/sec-policy/selinux-postgrey/selinux-postgrey-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-postgrey/selinux-postgrey-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-postgrey/selinux-postgrey-2.20170805-r3.ebuild b/sec-policy/selinux-postgrey/selinux-postgrey-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..4f70a25a4dd2
--- /dev/null
+++ b/sec-policy/selinux-postgrey/selinux-postgrey-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-postgrey/selinux-postgrey-9999.ebuild b/sec-policy/selinux-postgrey/selinux-postgrey-9999.ebuild
index 8136c33d73d9..4f70a25a4dd2 100644
--- a/sec-policy/selinux-postgrey/selinux-postgrey-9999.ebuild
+++ b/sec-policy/selinux-postgrey/selinux-postgrey-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ppp/Manifest b/sec-policy/selinux-ppp/Manifest
index 002f64852dcb..2fcb0ac38a21 100644
--- a/sec-policy/selinux-ppp/Manifest
+++ b/sec-policy/selinux-ppp/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-ppp-2.20170204-r1.ebuild 277 SHA256 342d1acd96425773bed94db7f5cd5a3e43aaef172e86c90e91abe079aa2c70af SHA512 15133274a591de15bbb6b2dda6edd45247abc36a846ed73aaf67162ca55db86be4c85ed77e7a665f773350eab9a743ce3994c8b72891a3de334bfe60b83df37d WHIRLPOOL 2c41e849036b36bbe7343741261fdc90565d3e7ca739bd3e435cf8c39f8d2c7e9de629a54930e72986c7549ac5549c138373ce71bf7568054eb0ce45a32c903f
-EBUILD selinux-ppp-2.20170204-r2.ebuild 275 SHA256 9c6a3a38a8b69b041f7c5830f383df9e01c4d472adbc9a82494844c86aa821a2 SHA512 a410738dd830c7983c32ba15b6193774987eb8db70dd5240cebb9090697ca8fd44de081f4666040629345f198b788ac319ec5fd23f9f933df225b24823c5c2ff WHIRLPOOL dd4e82f908b394122304d6fce7b80d5f773c41a3d90c704518acc133f026526358daccc64ae328984bcde1a9dc8b4cdd6a24f726c895cd50afea2428385b462b
-EBUILD selinux-ppp-2.20170204-r3.ebuild 275 SHA256 9c6a3a38a8b69b041f7c5830f383df9e01c4d472adbc9a82494844c86aa821a2 SHA512 a410738dd830c7983c32ba15b6193774987eb8db70dd5240cebb9090697ca8fd44de081f4666040629345f198b788ac319ec5fd23f9f933df225b24823c5c2ff WHIRLPOOL dd4e82f908b394122304d6fce7b80d5f773c41a3d90c704518acc133f026526358daccc64ae328984bcde1a9dc8b4cdd6a24f726c895cd50afea2428385b462b
-EBUILD selinux-ppp-2.20170204-r4.ebuild 275 SHA256 9c6a3a38a8b69b041f7c5830f383df9e01c4d472adbc9a82494844c86aa821a2 SHA512 a410738dd830c7983c32ba15b6193774987eb8db70dd5240cebb9090697ca8fd44de081f4666040629345f198b788ac319ec5fd23f9f933df225b24823c5c2ff WHIRLPOOL dd4e82f908b394122304d6fce7b80d5f773c41a3d90c704518acc133f026526358daccc64ae328984bcde1a9dc8b4cdd6a24f726c895cd50afea2428385b462b
-EBUILD selinux-ppp-2.20170805-r2.ebuild 275 SHA256 9c6a3a38a8b69b041f7c5830f383df9e01c4d472adbc9a82494844c86aa821a2 SHA512 a410738dd830c7983c32ba15b6193774987eb8db70dd5240cebb9090697ca8fd44de081f4666040629345f198b788ac319ec5fd23f9f933df225b24823c5c2ff WHIRLPOOL dd4e82f908b394122304d6fce7b80d5f773c41a3d90c704518acc133f026526358daccc64ae328984bcde1a9dc8b4cdd6a24f726c895cd50afea2428385b462b
-EBUILD selinux-ppp-9999.ebuild 277 SHA256 342d1acd96425773bed94db7f5cd5a3e43aaef172e86c90e91abe079aa2c70af SHA512 15133274a591de15bbb6b2dda6edd45247abc36a846ed73aaf67162ca55db86be4c85ed77e7a665f773350eab9a743ce3994c8b72891a3de334bfe60b83df37d WHIRLPOOL 2c41e849036b36bbe7343741261fdc90565d3e7ca739bd3e435cf8c39f8d2c7e9de629a54930e72986c7549ac5549c138373ce71bf7568054eb0ce45a32c903f
+EBUILD selinux-ppp-2.20170204-r1.ebuild 278 SHA256 65fa82c19dcee65d1e65c375a0a7726645044ca4457468aa970e99a81dfa932c SHA512 9f8bdd984b1b1b4531c70ca1aea89fa811635f13f1bcde0aeae17446bce75dfd4e9bee05267a927cc39fa94df05570fc22779c1ba032b8bb5d8c82f2b08645fc WHIRLPOOL c6efda950fa48dc5c7ad48f59d0ad3554b14e371dcac9ccd4e32d73bae6cd1dabd82d1032c7f65bc57167749295b51b9d77ecda2eaae1e040169b1fbb24050ef
+EBUILD selinux-ppp-2.20170204-r2.ebuild 276 SHA256 f7c257ca9d8a1868f62d68d2f7c052c61f031567066b382fe01caaa5a27fabaa SHA512 a6797cbb831ab5aa31226afe6f5221fd3f17ac4c14f384ca87070f79c183d189d02ff0805a146a0a955239112ca5e31b18b90b3607fce5b51c18d01f2c8c90aa WHIRLPOOL 74a5bc9c5071b3ba7e347a02c38ed31c6580c61902141ef51a302c06085a0495e72bed6eb717dadaf065f13fd39cb41a976bef9e6cf29ec335a44e3715db8701
+EBUILD selinux-ppp-2.20170204-r3.ebuild 276 SHA256 f7c257ca9d8a1868f62d68d2f7c052c61f031567066b382fe01caaa5a27fabaa SHA512 a6797cbb831ab5aa31226afe6f5221fd3f17ac4c14f384ca87070f79c183d189d02ff0805a146a0a955239112ca5e31b18b90b3607fce5b51c18d01f2c8c90aa WHIRLPOOL 74a5bc9c5071b3ba7e347a02c38ed31c6580c61902141ef51a302c06085a0495e72bed6eb717dadaf065f13fd39cb41a976bef9e6cf29ec335a44e3715db8701
+EBUILD selinux-ppp-2.20170204-r4.ebuild 276 SHA256 f7c257ca9d8a1868f62d68d2f7c052c61f031567066b382fe01caaa5a27fabaa SHA512 a6797cbb831ab5aa31226afe6f5221fd3f17ac4c14f384ca87070f79c183d189d02ff0805a146a0a955239112ca5e31b18b90b3607fce5b51c18d01f2c8c90aa WHIRLPOOL 74a5bc9c5071b3ba7e347a02c38ed31c6580c61902141ef51a302c06085a0495e72bed6eb717dadaf065f13fd39cb41a976bef9e6cf29ec335a44e3715db8701
+EBUILD selinux-ppp-2.20170805-r2.ebuild 276 SHA256 f7c257ca9d8a1868f62d68d2f7c052c61f031567066b382fe01caaa5a27fabaa SHA512 a6797cbb831ab5aa31226afe6f5221fd3f17ac4c14f384ca87070f79c183d189d02ff0805a146a0a955239112ca5e31b18b90b3607fce5b51c18d01f2c8c90aa WHIRLPOOL 74a5bc9c5071b3ba7e347a02c38ed31c6580c61902141ef51a302c06085a0495e72bed6eb717dadaf065f13fd39cb41a976bef9e6cf29ec335a44e3715db8701
+EBUILD selinux-ppp-2.20170805-r3.ebuild 278 SHA256 65fa82c19dcee65d1e65c375a0a7726645044ca4457468aa970e99a81dfa932c SHA512 9f8bdd984b1b1b4531c70ca1aea89fa811635f13f1bcde0aeae17446bce75dfd4e9bee05267a927cc39fa94df05570fc22779c1ba032b8bb5d8c82f2b08645fc WHIRLPOOL c6efda950fa48dc5c7ad48f59d0ad3554b14e371dcac9ccd4e32d73bae6cd1dabd82d1032c7f65bc57167749295b51b9d77ecda2eaae1e040169b1fbb24050ef
+EBUILD selinux-ppp-9999.ebuild 278 SHA256 65fa82c19dcee65d1e65c375a0a7726645044ca4457468aa970e99a81dfa932c SHA512 9f8bdd984b1b1b4531c70ca1aea89fa811635f13f1bcde0aeae17446bce75dfd4e9bee05267a927cc39fa94df05570fc22779c1ba032b8bb5d8c82f2b08645fc WHIRLPOOL c6efda950fa48dc5c7ad48f59d0ad3554b14e371dcac9ccd4e32d73bae6cd1dabd82d1032c7f65bc57167749295b51b9d77ecda2eaae1e040169b1fbb24050ef
 MISC ChangeLog 10295 SHA256 a1f2201f8a90627415a3f1e0318c8e0a701d9cabb0c578cb1c4e0039e830f336 SHA512 673fd3f3c02ba7e65d5d9ea57af9726cbef571b852d9e5145c6ff930148a3537b9df0ac51a0a000fdf685783a454f62eb4540c75b977ce2d221a3ca932c1f170 WHIRLPOOL 7e68485857ac5e251f93b9ee113048f1cb2d13b5fc8ee7027982dc0b7402ba9b4055eb56658442f86e705e978b5a62505bf0cba4d35d966be087194d3bf6bea8
 MISC ChangeLog-2015 11070 SHA256 4ea09e9758a3cbe50a6111b8c214d3150f0c995edbed5f1981efc55e1e5d1664 SHA512 ad1a6decbb97c10d15f55406bc76e755202f1d00f20b28a816acecc55d96050317d48af017b64f14e07d2b615ca3107fee8dca4134f8e210628d631ae55d09fc WHIRLPOOL da5dd3745cbe4f02eb7cc3e4e74c216af04f8d2c341e03e6a31df0092d0b20cb165304bb9f4b2b0842969034d29fffa2002850d223c7ded122591c48749c5125
 MISC metadata.xml 313 SHA256 aca4fb022789c2a43d0aea6940af93bbf48c8991f7597c78d5e66dcce5e11f84 SHA512 f7b9c2a6b0c8aca070e0dbdd25fc506aa957b0a033f9cf3bef165f0c51a8d03c2c05e98a7c0712f27671c688b0e95aea4360e7313b4f9379852483d0afcbc3aa WHIRLPOOL 4a84beabca777fcde46420d8408f59c95eda898f2a8e867fab5eec9e4e6d921fecce5b6aef02088d2c2df9e3a26b1a47736108a3fe420e212c9c33dec9f78d37
diff --git a/sec-policy/selinux-ppp/selinux-ppp-2.20170204-r1.ebuild b/sec-policy/selinux-ppp/selinux-ppp-2.20170204-r1.ebuild
index d0756ea112f0..87dd919d6022 100644
--- a/sec-policy/selinux-ppp/selinux-ppp-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-ppp/selinux-ppp-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ppp/selinux-ppp-2.20170204-r2.ebuild b/sec-policy/selinux-ppp/selinux-ppp-2.20170204-r2.ebuild
index 4bf3e50944f8..6f9d3d996de4 100644
--- a/sec-policy/selinux-ppp/selinux-ppp-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-ppp/selinux-ppp-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ppp/selinux-ppp-2.20170204-r3.ebuild b/sec-policy/selinux-ppp/selinux-ppp-2.20170204-r3.ebuild
index 4bf3e50944f8..6f9d3d996de4 100644
--- a/sec-policy/selinux-ppp/selinux-ppp-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-ppp/selinux-ppp-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ppp/selinux-ppp-2.20170204-r4.ebuild b/sec-policy/selinux-ppp/selinux-ppp-2.20170204-r4.ebuild
index 4bf3e50944f8..6f9d3d996de4 100644
--- a/sec-policy/selinux-ppp/selinux-ppp-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-ppp/selinux-ppp-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ppp/selinux-ppp-2.20170805-r2.ebuild b/sec-policy/selinux-ppp/selinux-ppp-2.20170805-r2.ebuild
index 4bf3e50944f8..6f9d3d996de4 100644
--- a/sec-policy/selinux-ppp/selinux-ppp-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-ppp/selinux-ppp-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ppp/selinux-ppp-2.20170805-r3.ebuild b/sec-policy/selinux-ppp/selinux-ppp-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..87dd919d6022
--- /dev/null
+++ b/sec-policy/selinux-ppp/selinux-ppp-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-ppp/selinux-ppp-9999.ebuild b/sec-policy/selinux-ppp/selinux-ppp-9999.ebuild
index d0756ea112f0..87dd919d6022 100644
--- a/sec-policy/selinux-ppp/selinux-ppp-9999.ebuild
+++ b/sec-policy/selinux-ppp/selinux-ppp-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-prelink/Manifest b/sec-policy/selinux-prelink/Manifest
index c1272d17c6a9..56e415f0b5b4 100644
--- a/sec-policy/selinux-prelink/Manifest
+++ b/sec-policy/selinux-prelink/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-prelink-2.20170204-r1.ebuild 285 SHA256 0047175d36834bc9bf18d7759e4bb70a28fd35b040296643c13ad888dd5a1dbc SHA512 c3ac6e7aaf548bbfa5700e97954ac4cc4e2fca8411a3784e7cade1db539003583ab49272d062934d1615929d891fc017608b5340952d658cba53c28dd6ebd3d3 WHIRLPOOL 2d6c4dda7d044f5b130528fac9a1096ffb48add733a01ceb880806200d12c0c4b96c7bfc1784fcd0f5da3af87a68dd50e118b063c42eede432ee29296042dbcc
-EBUILD selinux-prelink-2.20170204-r2.ebuild 283 SHA256 cc0c877aa9c25b9eb3199628c14502e7b0b035213262cf4742db37bc78758645 SHA512 674676313dbb13cc9b296eeb74a063b1d81189f77bc0ca8dfcbed41f82e01bf4645bf5ed7327405f64b1df93ae57fd16fd9ff821a249a7c03e6f80aeeacf6127 WHIRLPOOL d9cf389dc1c97b542273f6e2e86adc0928c1cb18aaa6de4684d02539c77bb63a0b269097a57d93151f2ee142804cea76a1cfe859b54426d683ceee2a50754b85
-EBUILD selinux-prelink-2.20170204-r3.ebuild 283 SHA256 cc0c877aa9c25b9eb3199628c14502e7b0b035213262cf4742db37bc78758645 SHA512 674676313dbb13cc9b296eeb74a063b1d81189f77bc0ca8dfcbed41f82e01bf4645bf5ed7327405f64b1df93ae57fd16fd9ff821a249a7c03e6f80aeeacf6127 WHIRLPOOL d9cf389dc1c97b542273f6e2e86adc0928c1cb18aaa6de4684d02539c77bb63a0b269097a57d93151f2ee142804cea76a1cfe859b54426d683ceee2a50754b85
-EBUILD selinux-prelink-2.20170204-r4.ebuild 283 SHA256 cc0c877aa9c25b9eb3199628c14502e7b0b035213262cf4742db37bc78758645 SHA512 674676313dbb13cc9b296eeb74a063b1d81189f77bc0ca8dfcbed41f82e01bf4645bf5ed7327405f64b1df93ae57fd16fd9ff821a249a7c03e6f80aeeacf6127 WHIRLPOOL d9cf389dc1c97b542273f6e2e86adc0928c1cb18aaa6de4684d02539c77bb63a0b269097a57d93151f2ee142804cea76a1cfe859b54426d683ceee2a50754b85
-EBUILD selinux-prelink-2.20170805-r2.ebuild 283 SHA256 cc0c877aa9c25b9eb3199628c14502e7b0b035213262cf4742db37bc78758645 SHA512 674676313dbb13cc9b296eeb74a063b1d81189f77bc0ca8dfcbed41f82e01bf4645bf5ed7327405f64b1df93ae57fd16fd9ff821a249a7c03e6f80aeeacf6127 WHIRLPOOL d9cf389dc1c97b542273f6e2e86adc0928c1cb18aaa6de4684d02539c77bb63a0b269097a57d93151f2ee142804cea76a1cfe859b54426d683ceee2a50754b85
-EBUILD selinux-prelink-9999.ebuild 285 SHA256 0047175d36834bc9bf18d7759e4bb70a28fd35b040296643c13ad888dd5a1dbc SHA512 c3ac6e7aaf548bbfa5700e97954ac4cc4e2fca8411a3784e7cade1db539003583ab49272d062934d1615929d891fc017608b5340952d658cba53c28dd6ebd3d3 WHIRLPOOL 2d6c4dda7d044f5b130528fac9a1096ffb48add733a01ceb880806200d12c0c4b96c7bfc1784fcd0f5da3af87a68dd50e118b063c42eede432ee29296042dbcc
+EBUILD selinux-prelink-2.20170204-r1.ebuild 286 SHA256 029a9b1964f82d45c5ab36f6b080d1dd58f065ccc010c973be8abdf4868c0620 SHA512 a3e006f1f1451a0d1a4604821bbfe36cba6815da539dd468c0f6db5b89aeb22ac6b1bba379f5b9262b6c51dead5aac96d0445514ad12a037924e15da4abedad6 WHIRLPOOL 815bdcf71d59f089e61f12f34a63bbc24360e26c8d6a3ffa5f12ed239628569fcd19b41eeaf33e2ada070cd51f10eb9de9e5c908080e2735c1398d1715f44756
+EBUILD selinux-prelink-2.20170204-r2.ebuild 284 SHA256 1c698315c83f5ba799c316c1b1c67af588f038d70dfe34210d5d3c6eebce2108 SHA512 f1f96a000d7bcadb3dd82671515869257b3a665c596af4e4b77cd66b861f21dc7167a61b3acd036a6221add588cff235d32023a965d2d008fdb96a54e3fbca79 WHIRLPOOL 06622cfb85ca21bf266786adae9801bff32e6fe05f1bc64052f43c40c137c176e5618410b0cd0180423c56c94b2e2892ce9d13e27e466ac7a4a51ef03af5ba0b
+EBUILD selinux-prelink-2.20170204-r3.ebuild 284 SHA256 1c698315c83f5ba799c316c1b1c67af588f038d70dfe34210d5d3c6eebce2108 SHA512 f1f96a000d7bcadb3dd82671515869257b3a665c596af4e4b77cd66b861f21dc7167a61b3acd036a6221add588cff235d32023a965d2d008fdb96a54e3fbca79 WHIRLPOOL 06622cfb85ca21bf266786adae9801bff32e6fe05f1bc64052f43c40c137c176e5618410b0cd0180423c56c94b2e2892ce9d13e27e466ac7a4a51ef03af5ba0b
+EBUILD selinux-prelink-2.20170204-r4.ebuild 284 SHA256 1c698315c83f5ba799c316c1b1c67af588f038d70dfe34210d5d3c6eebce2108 SHA512 f1f96a000d7bcadb3dd82671515869257b3a665c596af4e4b77cd66b861f21dc7167a61b3acd036a6221add588cff235d32023a965d2d008fdb96a54e3fbca79 WHIRLPOOL 06622cfb85ca21bf266786adae9801bff32e6fe05f1bc64052f43c40c137c176e5618410b0cd0180423c56c94b2e2892ce9d13e27e466ac7a4a51ef03af5ba0b
+EBUILD selinux-prelink-2.20170805-r2.ebuild 284 SHA256 1c698315c83f5ba799c316c1b1c67af588f038d70dfe34210d5d3c6eebce2108 SHA512 f1f96a000d7bcadb3dd82671515869257b3a665c596af4e4b77cd66b861f21dc7167a61b3acd036a6221add588cff235d32023a965d2d008fdb96a54e3fbca79 WHIRLPOOL 06622cfb85ca21bf266786adae9801bff32e6fe05f1bc64052f43c40c137c176e5618410b0cd0180423c56c94b2e2892ce9d13e27e466ac7a4a51ef03af5ba0b
+EBUILD selinux-prelink-2.20170805-r3.ebuild 286 SHA256 029a9b1964f82d45c5ab36f6b080d1dd58f065ccc010c973be8abdf4868c0620 SHA512 a3e006f1f1451a0d1a4604821bbfe36cba6815da539dd468c0f6db5b89aeb22ac6b1bba379f5b9262b6c51dead5aac96d0445514ad12a037924e15da4abedad6 WHIRLPOOL 815bdcf71d59f089e61f12f34a63bbc24360e26c8d6a3ffa5f12ed239628569fcd19b41eeaf33e2ada070cd51f10eb9de9e5c908080e2735c1398d1715f44756
+EBUILD selinux-prelink-9999.ebuild 286 SHA256 029a9b1964f82d45c5ab36f6b080d1dd58f065ccc010c973be8abdf4868c0620 SHA512 a3e006f1f1451a0d1a4604821bbfe36cba6815da539dd468c0f6db5b89aeb22ac6b1bba379f5b9262b6c51dead5aac96d0445514ad12a037924e15da4abedad6 WHIRLPOOL 815bdcf71d59f089e61f12f34a63bbc24360e26c8d6a3ffa5f12ed239628569fcd19b41eeaf33e2ada070cd51f10eb9de9e5c908080e2735c1398d1715f44756
 MISC ChangeLog 10687 SHA256 5504c7fe63e8c8984e08bf4118dfe935cbf93cfef38732ae36441d4e94035fbe SHA512 0ce64d2eb2b7df4aedc67b13b91f682f38f4704474589e9e3aa57e465952da301368de8e2994b45161435e9310bdb6aef1f6ad96bf8eabd12fc1f29612fde3d1 WHIRLPOOL ea99c461cd05a3fc843642d19d78495221b3b7db90fe8d940d992b23f801f7e98e0e8eea3aa160f3c65d0b80d83762585b298baf9b315cc9a97cc0c64efa9051
 MISC ChangeLog-2015 9978 SHA256 a007d81ef7cc8a25d953164bf9f722169088df705a28f61bc30772825ad2a7f2 SHA512 b074946e19c058183cc99abbe76919184f6b8bf75cfd59324161f6d3ebfe80054f84d2d9eb8b9894d16a51b0da52ec8b49e5628f728c1626e465b37f0952271f WHIRLPOOL 1d7c39d3291fe884a6645370bc07ab4ab509cd25c0579c0658675134b11975622d26b77d61960b9398df24aeeaf6ca5d8f776086f6e7d56e9ac94e1eaa50ab47
 MISC metadata.xml 317 SHA256 7e14a4882fd4b6528242984962631f232503549c80df883d1bb8bb09e51fd9b4 SHA512 858d2c01c7dfe3f73a2293cb15ff34bcaeb3f92c5736a09da4eaaedb341a52e32289525a07cbac480add98386016d07b1b705aead1b9992a7541d5bdd3126c42 WHIRLPOOL 9d933828ff16cc1bbdeb40029d84e9f18dc44f0a4ed51203c439f02b4fa95be0b878e086419fbbbe0cd77c6f97aface583a8289c7a46e40de01fbcca0168eb46
diff --git a/sec-policy/selinux-prelink/selinux-prelink-2.20170204-r1.ebuild b/sec-policy/selinux-prelink/selinux-prelink-2.20170204-r1.ebuild
index b553f967845d..57e11bb1b330 100644
--- a/sec-policy/selinux-prelink/selinux-prelink-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-prelink/selinux-prelink-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-prelink/selinux-prelink-2.20170204-r2.ebuild b/sec-policy/selinux-prelink/selinux-prelink-2.20170204-r2.ebuild
index 448040138064..adc387dd5666 100644
--- a/sec-policy/selinux-prelink/selinux-prelink-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-prelink/selinux-prelink-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-prelink/selinux-prelink-2.20170204-r3.ebuild b/sec-policy/selinux-prelink/selinux-prelink-2.20170204-r3.ebuild
index 448040138064..adc387dd5666 100644
--- a/sec-policy/selinux-prelink/selinux-prelink-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-prelink/selinux-prelink-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-prelink/selinux-prelink-2.20170204-r4.ebuild b/sec-policy/selinux-prelink/selinux-prelink-2.20170204-r4.ebuild
index 448040138064..adc387dd5666 100644
--- a/sec-policy/selinux-prelink/selinux-prelink-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-prelink/selinux-prelink-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-prelink/selinux-prelink-2.20170805-r2.ebuild b/sec-policy/selinux-prelink/selinux-prelink-2.20170805-r2.ebuild
index 448040138064..adc387dd5666 100644
--- a/sec-policy/selinux-prelink/selinux-prelink-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-prelink/selinux-prelink-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-prelink/selinux-prelink-2.20170805-r3.ebuild b/sec-policy/selinux-prelink/selinux-prelink-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..57e11bb1b330
--- /dev/null
+++ b/sec-policy/selinux-prelink/selinux-prelink-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-prelink/selinux-prelink-9999.ebuild b/sec-policy/selinux-prelink/selinux-prelink-9999.ebuild
index b553f967845d..57e11bb1b330 100644
--- a/sec-policy/selinux-prelink/selinux-prelink-9999.ebuild
+++ b/sec-policy/selinux-prelink/selinux-prelink-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-prelude/Manifest b/sec-policy/selinux-prelude/Manifest
index 18f307ad630c..67521dbc686c 100644
--- a/sec-policy/selinux-prelude/Manifest
+++ b/sec-policy/selinux-prelude/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-prelude-2.20170204-r1.ebuild 381 SHA256 61a1329ab797af0489104e8610606a46b5aebe9140a73aa4789a0f0578b622c0 SHA512 6886b01991f50bc0bbae176a8e68aea11bd8382fc11f0932323f689c0146fc7e4ec454d1bc89b311ea66046e4ff9295ff9345e58c93a60d934a68d81ae006c20 WHIRLPOOL 4401cb592a001deb12f00ae4c5d71676a8e7eda0324fca4e81f2ef93e29d397ea3c168966e33ce7b7d2be992a471428971eff9336198c409e0cf1a6e9ac840cd
-EBUILD selinux-prelude-2.20170204-r2.ebuild 379 SHA256 0e6525bd8fa2dbba765ee53e885cbeab6a34c06e529e2fe755965172784715b4 SHA512 213c0364be90ac74299dc89cc0036a9bda2c0d3bd8695b178f4059a66f96c36a1db79f9cd1f96aa4ae39955387c46ee1bbca711d3231e5d4b6d97e5bb657484b WHIRLPOOL 76ad1b8eb6873994766ec49f6ab9722ff6789df3f28e8b4854c32d6349e97809fcea2e3260243a5a2645a54e2ddd58e8068efb4c1d7cda8e18c7a70d3a707b47
-EBUILD selinux-prelude-2.20170204-r3.ebuild 379 SHA256 0e6525bd8fa2dbba765ee53e885cbeab6a34c06e529e2fe755965172784715b4 SHA512 213c0364be90ac74299dc89cc0036a9bda2c0d3bd8695b178f4059a66f96c36a1db79f9cd1f96aa4ae39955387c46ee1bbca711d3231e5d4b6d97e5bb657484b WHIRLPOOL 76ad1b8eb6873994766ec49f6ab9722ff6789df3f28e8b4854c32d6349e97809fcea2e3260243a5a2645a54e2ddd58e8068efb4c1d7cda8e18c7a70d3a707b47
-EBUILD selinux-prelude-2.20170204-r4.ebuild 379 SHA256 0e6525bd8fa2dbba765ee53e885cbeab6a34c06e529e2fe755965172784715b4 SHA512 213c0364be90ac74299dc89cc0036a9bda2c0d3bd8695b178f4059a66f96c36a1db79f9cd1f96aa4ae39955387c46ee1bbca711d3231e5d4b6d97e5bb657484b WHIRLPOOL 76ad1b8eb6873994766ec49f6ab9722ff6789df3f28e8b4854c32d6349e97809fcea2e3260243a5a2645a54e2ddd58e8068efb4c1d7cda8e18c7a70d3a707b47
-EBUILD selinux-prelude-2.20170805-r2.ebuild 379 SHA256 0e6525bd8fa2dbba765ee53e885cbeab6a34c06e529e2fe755965172784715b4 SHA512 213c0364be90ac74299dc89cc0036a9bda2c0d3bd8695b178f4059a66f96c36a1db79f9cd1f96aa4ae39955387c46ee1bbca711d3231e5d4b6d97e5bb657484b WHIRLPOOL 76ad1b8eb6873994766ec49f6ab9722ff6789df3f28e8b4854c32d6349e97809fcea2e3260243a5a2645a54e2ddd58e8068efb4c1d7cda8e18c7a70d3a707b47
-EBUILD selinux-prelude-9999.ebuild 381 SHA256 61a1329ab797af0489104e8610606a46b5aebe9140a73aa4789a0f0578b622c0 SHA512 6886b01991f50bc0bbae176a8e68aea11bd8382fc11f0932323f689c0146fc7e4ec454d1bc89b311ea66046e4ff9295ff9345e58c93a60d934a68d81ae006c20 WHIRLPOOL 4401cb592a001deb12f00ae4c5d71676a8e7eda0324fca4e81f2ef93e29d397ea3c168966e33ce7b7d2be992a471428971eff9336198c409e0cf1a6e9ac840cd
+EBUILD selinux-prelude-2.20170204-r1.ebuild 382 SHA256 0f10b2f34ff755eae0c9b1554dc4fd91cd3077aec9cacfe38533a3714c1f2963 SHA512 7c0f08079abf1dec06241c2be6f1e6f528ab81c627256eab53f0430542456bd22dbc0af963a718144efb4b68d2f1e497ab6d360b8d29c39b5f282cc58d0a2c10 WHIRLPOOL f6295401106d6ac4d5e5316faa4e8b76a9d0339f588b3a955739d03b893bd138bbf35cf1d792d03c593576ec5e6ed339f158d93a7407bb305683b1c1191fba65
+EBUILD selinux-prelude-2.20170204-r2.ebuild 380 SHA256 dcc8326e1e5b02fbee8cca1c09ae1c090183a1a2de198ffd13ca941f10844ce6 SHA512 0edc9ac4dbe3f56359765fa6fb4267cb6bda34ee172bb805be4ac3a9bc7888b45a5c3b06b15347c1fc64d15d2d3a7bad4c2504e130bb053975e39bffb6825fb3 WHIRLPOOL 89c35d5fb88fcf7ad0b489da8cfd6cbbb3edef536dea68163b05643e5cee4443cf23bd1d382f435e0f231078a0697b8e3d231611a79bd9edf0f2e0535a30e9a6
+EBUILD selinux-prelude-2.20170204-r3.ebuild 380 SHA256 dcc8326e1e5b02fbee8cca1c09ae1c090183a1a2de198ffd13ca941f10844ce6 SHA512 0edc9ac4dbe3f56359765fa6fb4267cb6bda34ee172bb805be4ac3a9bc7888b45a5c3b06b15347c1fc64d15d2d3a7bad4c2504e130bb053975e39bffb6825fb3 WHIRLPOOL 89c35d5fb88fcf7ad0b489da8cfd6cbbb3edef536dea68163b05643e5cee4443cf23bd1d382f435e0f231078a0697b8e3d231611a79bd9edf0f2e0535a30e9a6
+EBUILD selinux-prelude-2.20170204-r4.ebuild 380 SHA256 dcc8326e1e5b02fbee8cca1c09ae1c090183a1a2de198ffd13ca941f10844ce6 SHA512 0edc9ac4dbe3f56359765fa6fb4267cb6bda34ee172bb805be4ac3a9bc7888b45a5c3b06b15347c1fc64d15d2d3a7bad4c2504e130bb053975e39bffb6825fb3 WHIRLPOOL 89c35d5fb88fcf7ad0b489da8cfd6cbbb3edef536dea68163b05643e5cee4443cf23bd1d382f435e0f231078a0697b8e3d231611a79bd9edf0f2e0535a30e9a6
+EBUILD selinux-prelude-2.20170805-r2.ebuild 380 SHA256 dcc8326e1e5b02fbee8cca1c09ae1c090183a1a2de198ffd13ca941f10844ce6 SHA512 0edc9ac4dbe3f56359765fa6fb4267cb6bda34ee172bb805be4ac3a9bc7888b45a5c3b06b15347c1fc64d15d2d3a7bad4c2504e130bb053975e39bffb6825fb3 WHIRLPOOL 89c35d5fb88fcf7ad0b489da8cfd6cbbb3edef536dea68163b05643e5cee4443cf23bd1d382f435e0f231078a0697b8e3d231611a79bd9edf0f2e0535a30e9a6
+EBUILD selinux-prelude-2.20170805-r3.ebuild 382 SHA256 0f10b2f34ff755eae0c9b1554dc4fd91cd3077aec9cacfe38533a3714c1f2963 SHA512 7c0f08079abf1dec06241c2be6f1e6f528ab81c627256eab53f0430542456bd22dbc0af963a718144efb4b68d2f1e497ab6d360b8d29c39b5f282cc58d0a2c10 WHIRLPOOL f6295401106d6ac4d5e5316faa4e8b76a9d0339f588b3a955739d03b893bd138bbf35cf1d792d03c593576ec5e6ed339f158d93a7407bb305683b1c1191fba65
+EBUILD selinux-prelude-9999.ebuild 382 SHA256 0f10b2f34ff755eae0c9b1554dc4fd91cd3077aec9cacfe38533a3714c1f2963 SHA512 7c0f08079abf1dec06241c2be6f1e6f528ab81c627256eab53f0430542456bd22dbc0af963a718144efb4b68d2f1e497ab6d360b8d29c39b5f282cc58d0a2c10 WHIRLPOOL f6295401106d6ac4d5e5316faa4e8b76a9d0339f588b3a955739d03b893bd138bbf35cf1d792d03c593576ec5e6ed339f158d93a7407bb305683b1c1191fba65
 MISC ChangeLog 10687 SHA256 dae2cd5a6319d6a2d3bfaa72b26d84a91b37cfe2ab79312142b6b70ef8544b4a SHA512 9dc3e72bab5b19de84ce7adf00cd527a5d7170bc7b241b5915d953c38a2fe7e8ba542cff7796f5494755f093ed41439d32e211210f7c43ce154244e93b4393f0 WHIRLPOOL cb5cc30f2b083179eb5ca0303534af483a6f80b667d513097c4d88b14680acb9da612f3c0906ef133767fe880b6b56fe2856a05a21b461a257773df9f451d8e6
 MISC ChangeLog-2015 10248 SHA256 44c1f082a42cc2365f62c942060c0189f3221a915f3e2c3ad9f49206034efef7 SHA512 d2ed959942b14e5d0720ef0784c2c33dbb0bac7093d7370d05a909bc742b03ccdb3b7e1d8367f85892a51cdc5c13abb5443c57cf6660f3f8772f45b68c1ae5ce WHIRLPOOL 106e9670432a12735dd51c899c1c71cbf42029e44ee2818d1617a9c0b7be8443e6600d9e33ccacecee093de13c691e1dca9db2784e822be6d90f1435fc0710be
 MISC metadata.xml 317 SHA256 f74ecbe783e5c82d9f361692ea6fc91884c66c3c399a310e3abb44574467b5e9 SHA512 08ccae1fc36026c405d62f24cf756d27253247e7a29cc0fc8bbb09c9a44c071875caf81bf5fe428da00bc7d876ce69bbcee65ea8289efee6ab14a6ad797ec198 WHIRLPOOL bf2b14fad994473bb2ec87c79beb0beebae27d5c34cf108a8b93e04fb1f1c29a1be19c85af2b75016937acb649fb71251a77d89962956aca5b66354208d5f340
diff --git a/sec-policy/selinux-prelude/selinux-prelude-2.20170204-r1.ebuild b/sec-policy/selinux-prelude/selinux-prelude-2.20170204-r1.ebuild
index 450c9bf14688..01b1601cb16f 100644
--- a/sec-policy/selinux-prelude/selinux-prelude-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-prelude/selinux-prelude-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-prelude/selinux-prelude-2.20170204-r2.ebuild b/sec-policy/selinux-prelude/selinux-prelude-2.20170204-r2.ebuild
index 747231475965..70194da11ac5 100644
--- a/sec-policy/selinux-prelude/selinux-prelude-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-prelude/selinux-prelude-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-prelude/selinux-prelude-2.20170204-r3.ebuild b/sec-policy/selinux-prelude/selinux-prelude-2.20170204-r3.ebuild
index 747231475965..70194da11ac5 100644
--- a/sec-policy/selinux-prelude/selinux-prelude-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-prelude/selinux-prelude-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-prelude/selinux-prelude-2.20170204-r4.ebuild b/sec-policy/selinux-prelude/selinux-prelude-2.20170204-r4.ebuild
index 747231475965..70194da11ac5 100644
--- a/sec-policy/selinux-prelude/selinux-prelude-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-prelude/selinux-prelude-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-prelude/selinux-prelude-2.20170805-r2.ebuild b/sec-policy/selinux-prelude/selinux-prelude-2.20170805-r2.ebuild
index 747231475965..70194da11ac5 100644
--- a/sec-policy/selinux-prelude/selinux-prelude-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-prelude/selinux-prelude-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-prelude/selinux-prelude-2.20170805-r3.ebuild b/sec-policy/selinux-prelude/selinux-prelude-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..01b1601cb16f
--- /dev/null
+++ b/sec-policy/selinux-prelude/selinux-prelude-2.20170805-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-prelude/selinux-prelude-9999.ebuild b/sec-policy/selinux-prelude/selinux-prelude-9999.ebuild
index 450c9bf14688..01b1601cb16f 100644
--- a/sec-policy/selinux-prelude/selinux-prelude-9999.ebuild
+++ b/sec-policy/selinux-prelude/selinux-prelude-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-privoxy/Manifest b/sec-policy/selinux-privoxy/Manifest
index b6c4185b0316..f650a11dbb29 100644
--- a/sec-policy/selinux-privoxy/Manifest
+++ b/sec-policy/selinux-privoxy/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-privoxy-2.20170204-r1.ebuild 285 SHA256 aca10a444a352b1a109dc2767a2597356b817d19a33c6f489b9274c5a807409f SHA512 0a60df1f7e2a4d1942255f4b460e40c2d027c89f848bf6323e985bfdf61ae1b7cc878ee00c52b109522b5786ca181949a55750971d2a899870e8c29f49b5a890 WHIRLPOOL 46a20b6efac26b0cf3efa9c1f4229d4f0c683f5e881edd388ec1dd31f332de6c89c72bb05281581c846b5f7f5b550bc4a8d54ed0634cfe109c2ef8e1175ddc1a
-EBUILD selinux-privoxy-2.20170204-r2.ebuild 283 SHA256 4d23ebd6dab0b32951420d3b29d40ed77c8a0b01cfea77a82c4fe45a3416ae8e SHA512 c456a331d4c5e62c4238402af93ab2f5f45ac02c445dbea3cf9a8aea717ca1ab6ea4c8cf102a0b32e29cf7ddf94e38d3b2d24f1326be42379b0a9ac4484f7602 WHIRLPOOL 73bbb5e655c7dd17e52dd712fdd39c846537fa9d08f063fcee1565b48d6cb0a7650ad8c334352a4e0e6875fee162d160c3d35dc1e7f5a2522834154b29d96ab0
-EBUILD selinux-privoxy-2.20170204-r3.ebuild 283 SHA256 4d23ebd6dab0b32951420d3b29d40ed77c8a0b01cfea77a82c4fe45a3416ae8e SHA512 c456a331d4c5e62c4238402af93ab2f5f45ac02c445dbea3cf9a8aea717ca1ab6ea4c8cf102a0b32e29cf7ddf94e38d3b2d24f1326be42379b0a9ac4484f7602 WHIRLPOOL 73bbb5e655c7dd17e52dd712fdd39c846537fa9d08f063fcee1565b48d6cb0a7650ad8c334352a4e0e6875fee162d160c3d35dc1e7f5a2522834154b29d96ab0
-EBUILD selinux-privoxy-2.20170204-r4.ebuild 283 SHA256 4d23ebd6dab0b32951420d3b29d40ed77c8a0b01cfea77a82c4fe45a3416ae8e SHA512 c456a331d4c5e62c4238402af93ab2f5f45ac02c445dbea3cf9a8aea717ca1ab6ea4c8cf102a0b32e29cf7ddf94e38d3b2d24f1326be42379b0a9ac4484f7602 WHIRLPOOL 73bbb5e655c7dd17e52dd712fdd39c846537fa9d08f063fcee1565b48d6cb0a7650ad8c334352a4e0e6875fee162d160c3d35dc1e7f5a2522834154b29d96ab0
-EBUILD selinux-privoxy-2.20170805-r2.ebuild 283 SHA256 4d23ebd6dab0b32951420d3b29d40ed77c8a0b01cfea77a82c4fe45a3416ae8e SHA512 c456a331d4c5e62c4238402af93ab2f5f45ac02c445dbea3cf9a8aea717ca1ab6ea4c8cf102a0b32e29cf7ddf94e38d3b2d24f1326be42379b0a9ac4484f7602 WHIRLPOOL 73bbb5e655c7dd17e52dd712fdd39c846537fa9d08f063fcee1565b48d6cb0a7650ad8c334352a4e0e6875fee162d160c3d35dc1e7f5a2522834154b29d96ab0
-EBUILD selinux-privoxy-9999.ebuild 285 SHA256 aca10a444a352b1a109dc2767a2597356b817d19a33c6f489b9274c5a807409f SHA512 0a60df1f7e2a4d1942255f4b460e40c2d027c89f848bf6323e985bfdf61ae1b7cc878ee00c52b109522b5786ca181949a55750971d2a899870e8c29f49b5a890 WHIRLPOOL 46a20b6efac26b0cf3efa9c1f4229d4f0c683f5e881edd388ec1dd31f332de6c89c72bb05281581c846b5f7f5b550bc4a8d54ed0634cfe109c2ef8e1175ddc1a
+EBUILD selinux-privoxy-2.20170204-r1.ebuild 286 SHA256 d85d66f3f2321bb811a73d3a41ad361cc2f17989e30e5964142dd47877104a1e SHA512 ab9d314ffecf0a0dd99e286093908b4435fa9fb392b4eef377e06fa3b21897cb0232e810c2622b4ff160a0944733e463658792f84f8c9565b5e6d4a61d163737 WHIRLPOOL 342f44f5dd043558ca101f9cf4f6582394f530367cf68f89ac12c8c69f3ad0cb0acaa69004da00489798117bc7bdf228c4a13e0f7d478847e0f420d4cbbea8e8
+EBUILD selinux-privoxy-2.20170204-r2.ebuild 284 SHA256 b81eb418024969c489dd8c716574f20871189f0fd8c37357c220a1b97d228e65 SHA512 b0e44c66ef400935dcd8768196097c333ee42d0cb433aac25e8efc3ec128fd7139167acc91049cce38e110c069e0206a5f8b901075e6e6fb834056ef1b2cb9f7 WHIRLPOOL 1284a7b0d91bbdddd6bc7cf759ac74b2f02bf1634ff60bbb2c353f0ffb4576e89e2fed37fa9b0e9b023e99705d482314c53d1270974edb9bfc2e90f3d0748ba2
+EBUILD selinux-privoxy-2.20170204-r3.ebuild 284 SHA256 b81eb418024969c489dd8c716574f20871189f0fd8c37357c220a1b97d228e65 SHA512 b0e44c66ef400935dcd8768196097c333ee42d0cb433aac25e8efc3ec128fd7139167acc91049cce38e110c069e0206a5f8b901075e6e6fb834056ef1b2cb9f7 WHIRLPOOL 1284a7b0d91bbdddd6bc7cf759ac74b2f02bf1634ff60bbb2c353f0ffb4576e89e2fed37fa9b0e9b023e99705d482314c53d1270974edb9bfc2e90f3d0748ba2
+EBUILD selinux-privoxy-2.20170204-r4.ebuild 284 SHA256 b81eb418024969c489dd8c716574f20871189f0fd8c37357c220a1b97d228e65 SHA512 b0e44c66ef400935dcd8768196097c333ee42d0cb433aac25e8efc3ec128fd7139167acc91049cce38e110c069e0206a5f8b901075e6e6fb834056ef1b2cb9f7 WHIRLPOOL 1284a7b0d91bbdddd6bc7cf759ac74b2f02bf1634ff60bbb2c353f0ffb4576e89e2fed37fa9b0e9b023e99705d482314c53d1270974edb9bfc2e90f3d0748ba2
+EBUILD selinux-privoxy-2.20170805-r2.ebuild 284 SHA256 b81eb418024969c489dd8c716574f20871189f0fd8c37357c220a1b97d228e65 SHA512 b0e44c66ef400935dcd8768196097c333ee42d0cb433aac25e8efc3ec128fd7139167acc91049cce38e110c069e0206a5f8b901075e6e6fb834056ef1b2cb9f7 WHIRLPOOL 1284a7b0d91bbdddd6bc7cf759ac74b2f02bf1634ff60bbb2c353f0ffb4576e89e2fed37fa9b0e9b023e99705d482314c53d1270974edb9bfc2e90f3d0748ba2
+EBUILD selinux-privoxy-2.20170805-r3.ebuild 286 SHA256 d85d66f3f2321bb811a73d3a41ad361cc2f17989e30e5964142dd47877104a1e SHA512 ab9d314ffecf0a0dd99e286093908b4435fa9fb392b4eef377e06fa3b21897cb0232e810c2622b4ff160a0944733e463658792f84f8c9565b5e6d4a61d163737 WHIRLPOOL 342f44f5dd043558ca101f9cf4f6582394f530367cf68f89ac12c8c69f3ad0cb0acaa69004da00489798117bc7bdf228c4a13e0f7d478847e0f420d4cbbea8e8
+EBUILD selinux-privoxy-9999.ebuild 286 SHA256 d85d66f3f2321bb811a73d3a41ad361cc2f17989e30e5964142dd47877104a1e SHA512 ab9d314ffecf0a0dd99e286093908b4435fa9fb392b4eef377e06fa3b21897cb0232e810c2622b4ff160a0944733e463658792f84f8c9565b5e6d4a61d163737 WHIRLPOOL 342f44f5dd043558ca101f9cf4f6582394f530367cf68f89ac12c8c69f3ad0cb0acaa69004da00489798117bc7bdf228c4a13e0f7d478847e0f420d4cbbea8e8
 MISC ChangeLog 10687 SHA256 561a70ad7c88ae7f6cf3c349c2f096a8212f82f55797ec8d37de3a1adce3c717 SHA512 1a40b79624879014cd8a946a3e03fef00d25cba9c6aeca86bf622dbe82ddcf3699ff6c4d89fae88975a639f7877071952e0722c6dd6bed4b74ab3b0269bb48d4 WHIRLPOOL 68a96d4b9b6543bc82aafb27c3c8fb2923bcba3d34dbae876f872d3672d98a85c063c4087a126bce4f9e3b6aa13a93e7ad339ed70e67dda911a821baee6c00e9
 MISC ChangeLog-2015 12339 SHA256 b6b5e4fcdb6bc5be9e853ac95ee0ac8642a39254429148062a14d5639182357c SHA512 85bbf9fedbd8a6c43c3dfdfba18625a9f7819e9549f6c0f7cf38687e4e3c7fb1d3e56a2db303f6fa7b98d0ab5abef76e7af7e9fd7d13749c6f783224a3cec53c WHIRLPOOL 7d8c948fe062ac0fb9a052676f215b2b36bde626acf7bf1e7641d4c256eae7832802b417ab78fd58b6c3315933fb3026e7fbcf70812c52976e9c6f11fc7f0478
 MISC metadata.xml 317 SHA256 f9eeff8c4ba00d7a0df1ba372ca3545d7047f91d946afacf289dd101fe4246db SHA512 3c9b547563afda91854884e1933b0957390dcbdd3259ee8944a20af10f12dc987f24428de06250172299fa92d274680f86bfdbd2c2c95d8aa675bf519238470b WHIRLPOOL 01f7ed149fa7f8e5e52ad426c7740c2b75919edfc3d25e38181da149a304a132229b4cd8266b361283e17a792cd1f55c0ffc9760ed7305eada403174ef7acbcd
diff --git a/sec-policy/selinux-privoxy/selinux-privoxy-2.20170204-r1.ebuild b/sec-policy/selinux-privoxy/selinux-privoxy-2.20170204-r1.ebuild
index 475a113b937a..e3cf3ac3b34d 100644
--- a/sec-policy/selinux-privoxy/selinux-privoxy-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-privoxy/selinux-privoxy-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-privoxy/selinux-privoxy-2.20170204-r2.ebuild b/sec-policy/selinux-privoxy/selinux-privoxy-2.20170204-r2.ebuild
index 477030aafeee..91deb19563de 100644
--- a/sec-policy/selinux-privoxy/selinux-privoxy-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-privoxy/selinux-privoxy-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-privoxy/selinux-privoxy-2.20170204-r3.ebuild b/sec-policy/selinux-privoxy/selinux-privoxy-2.20170204-r3.ebuild
index 477030aafeee..91deb19563de 100644
--- a/sec-policy/selinux-privoxy/selinux-privoxy-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-privoxy/selinux-privoxy-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-privoxy/selinux-privoxy-2.20170204-r4.ebuild b/sec-policy/selinux-privoxy/selinux-privoxy-2.20170204-r4.ebuild
index 477030aafeee..91deb19563de 100644
--- a/sec-policy/selinux-privoxy/selinux-privoxy-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-privoxy/selinux-privoxy-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-privoxy/selinux-privoxy-2.20170805-r2.ebuild b/sec-policy/selinux-privoxy/selinux-privoxy-2.20170805-r2.ebuild
index 477030aafeee..91deb19563de 100644
--- a/sec-policy/selinux-privoxy/selinux-privoxy-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-privoxy/selinux-privoxy-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-privoxy/selinux-privoxy-2.20170805-r3.ebuild b/sec-policy/selinux-privoxy/selinux-privoxy-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..e3cf3ac3b34d
--- /dev/null
+++ b/sec-policy/selinux-privoxy/selinux-privoxy-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-privoxy/selinux-privoxy-9999.ebuild b/sec-policy/selinux-privoxy/selinux-privoxy-9999.ebuild
index 475a113b937a..e3cf3ac3b34d 100644
--- a/sec-policy/selinux-privoxy/selinux-privoxy-9999.ebuild
+++ b/sec-policy/selinux-privoxy/selinux-privoxy-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-procmail/Manifest b/sec-policy/selinux-procmail/Manifest
index 71f79d32fb3d..931e5c5ee26f 100644
--- a/sec-policy/selinux-procmail/Manifest
+++ b/sec-policy/selinux-procmail/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-procmail-2.20170204-r1.ebuild 287 SHA256 7f0182e96b70c41e673e72896e48eb482656234a3eae86b6785edb2d8a590909 SHA512 f00e816ef234a12092a1e365696bdfbc5673dcfaa4431fb558e0cf52013e13fea0258fd2fee3d679bed5f9a4756af8ed8901f85867c5da4983e37254517fc79e WHIRLPOOL ba7aba2adcb972f1b919b88f379dff8c9a047c79425ffd47c2d1fb2d6c9174f17fb8f5316b185c15ea35bdaec1e5b6fb93f650273266095d4303d35bcd173cda
-EBUILD selinux-procmail-2.20170204-r2.ebuild 285 SHA256 828a3775c504c67ced4374ab7f497e8e28acd4d434f091c98abec5e9b2ca08f9 SHA512 221425c396a4def5b3c870e9774dd3ce59dbf469f75a0af98c0599fe15c22549837bc8e5018037c50af3c0ea91ba1e3d8ab5eef9d6d5654c3baca5640416f104 WHIRLPOOL daecb51e526b6d9cc1fc490c1dad9c05592edb02aa7aca4e6cd671723cd9427949754b425e8d052f197008ad93a180128914c3ca0710ae00fab3770e77125adb
-EBUILD selinux-procmail-2.20170204-r3.ebuild 285 SHA256 828a3775c504c67ced4374ab7f497e8e28acd4d434f091c98abec5e9b2ca08f9 SHA512 221425c396a4def5b3c870e9774dd3ce59dbf469f75a0af98c0599fe15c22549837bc8e5018037c50af3c0ea91ba1e3d8ab5eef9d6d5654c3baca5640416f104 WHIRLPOOL daecb51e526b6d9cc1fc490c1dad9c05592edb02aa7aca4e6cd671723cd9427949754b425e8d052f197008ad93a180128914c3ca0710ae00fab3770e77125adb
-EBUILD selinux-procmail-2.20170204-r4.ebuild 285 SHA256 828a3775c504c67ced4374ab7f497e8e28acd4d434f091c98abec5e9b2ca08f9 SHA512 221425c396a4def5b3c870e9774dd3ce59dbf469f75a0af98c0599fe15c22549837bc8e5018037c50af3c0ea91ba1e3d8ab5eef9d6d5654c3baca5640416f104 WHIRLPOOL daecb51e526b6d9cc1fc490c1dad9c05592edb02aa7aca4e6cd671723cd9427949754b425e8d052f197008ad93a180128914c3ca0710ae00fab3770e77125adb
-EBUILD selinux-procmail-2.20170805-r2.ebuild 285 SHA256 828a3775c504c67ced4374ab7f497e8e28acd4d434f091c98abec5e9b2ca08f9 SHA512 221425c396a4def5b3c870e9774dd3ce59dbf469f75a0af98c0599fe15c22549837bc8e5018037c50af3c0ea91ba1e3d8ab5eef9d6d5654c3baca5640416f104 WHIRLPOOL daecb51e526b6d9cc1fc490c1dad9c05592edb02aa7aca4e6cd671723cd9427949754b425e8d052f197008ad93a180128914c3ca0710ae00fab3770e77125adb
-EBUILD selinux-procmail-9999.ebuild 287 SHA256 7f0182e96b70c41e673e72896e48eb482656234a3eae86b6785edb2d8a590909 SHA512 f00e816ef234a12092a1e365696bdfbc5673dcfaa4431fb558e0cf52013e13fea0258fd2fee3d679bed5f9a4756af8ed8901f85867c5da4983e37254517fc79e WHIRLPOOL ba7aba2adcb972f1b919b88f379dff8c9a047c79425ffd47c2d1fb2d6c9174f17fb8f5316b185c15ea35bdaec1e5b6fb93f650273266095d4303d35bcd173cda
+EBUILD selinux-procmail-2.20170204-r1.ebuild 288 SHA256 71254f1439b6543259db0f1de726647319a626baddf7baed414ed8a003860c16 SHA512 66a278af92f496982effe8ea4bae07704ae31d1ab6780360c13ac760f73b69b876f27e178c7ffd9869dcc9a151cf47ec2cc645c7862285385066e5733cd761e7 WHIRLPOOL d84879977b4cdea11dac5ca87fd510dc5cf4de838bbda68f6ede2c23de446a47eb7b990bfda825e865b3e748382ae3eed8aff54014ae3cb03437a341d6653261
+EBUILD selinux-procmail-2.20170204-r2.ebuild 286 SHA256 533a6ca5a269b12630b85ae7a8e6679f22d27149311ec2d6c53efd0670c5d3a2 SHA512 5cfc076f61fa70c0fe3a1a60dd5ef22404a94e51dc4bf914417442e3dfaf74c64e92efb23cae2c990b24559e15545cdc78006422b5e4dbe96a2f1932607bcafc WHIRLPOOL 2f518f2d11885f0baf58a3f8e44f6bb211abff5634483e4370f9e2cc2e4e7b6eb5b18e09ef9a160ec981e2cc01360e4a3ea4065ca65bed5a3e02a3dce811d2a5
+EBUILD selinux-procmail-2.20170204-r3.ebuild 286 SHA256 533a6ca5a269b12630b85ae7a8e6679f22d27149311ec2d6c53efd0670c5d3a2 SHA512 5cfc076f61fa70c0fe3a1a60dd5ef22404a94e51dc4bf914417442e3dfaf74c64e92efb23cae2c990b24559e15545cdc78006422b5e4dbe96a2f1932607bcafc WHIRLPOOL 2f518f2d11885f0baf58a3f8e44f6bb211abff5634483e4370f9e2cc2e4e7b6eb5b18e09ef9a160ec981e2cc01360e4a3ea4065ca65bed5a3e02a3dce811d2a5
+EBUILD selinux-procmail-2.20170204-r4.ebuild 286 SHA256 533a6ca5a269b12630b85ae7a8e6679f22d27149311ec2d6c53efd0670c5d3a2 SHA512 5cfc076f61fa70c0fe3a1a60dd5ef22404a94e51dc4bf914417442e3dfaf74c64e92efb23cae2c990b24559e15545cdc78006422b5e4dbe96a2f1932607bcafc WHIRLPOOL 2f518f2d11885f0baf58a3f8e44f6bb211abff5634483e4370f9e2cc2e4e7b6eb5b18e09ef9a160ec981e2cc01360e4a3ea4065ca65bed5a3e02a3dce811d2a5
+EBUILD selinux-procmail-2.20170805-r2.ebuild 286 SHA256 533a6ca5a269b12630b85ae7a8e6679f22d27149311ec2d6c53efd0670c5d3a2 SHA512 5cfc076f61fa70c0fe3a1a60dd5ef22404a94e51dc4bf914417442e3dfaf74c64e92efb23cae2c990b24559e15545cdc78006422b5e4dbe96a2f1932607bcafc WHIRLPOOL 2f518f2d11885f0baf58a3f8e44f6bb211abff5634483e4370f9e2cc2e4e7b6eb5b18e09ef9a160ec981e2cc01360e4a3ea4065ca65bed5a3e02a3dce811d2a5
+EBUILD selinux-procmail-2.20170805-r3.ebuild 288 SHA256 71254f1439b6543259db0f1de726647319a626baddf7baed414ed8a003860c16 SHA512 66a278af92f496982effe8ea4bae07704ae31d1ab6780360c13ac760f73b69b876f27e178c7ffd9869dcc9a151cf47ec2cc645c7862285385066e5733cd761e7 WHIRLPOOL d84879977b4cdea11dac5ca87fd510dc5cf4de838bbda68f6ede2c23de446a47eb7b990bfda825e865b3e748382ae3eed8aff54014ae3cb03437a341d6653261
+EBUILD selinux-procmail-9999.ebuild 288 SHA256 71254f1439b6543259db0f1de726647319a626baddf7baed414ed8a003860c16 SHA512 66a278af92f496982effe8ea4bae07704ae31d1ab6780360c13ac760f73b69b876f27e178c7ffd9869dcc9a151cf47ec2cc645c7862285385066e5733cd761e7 WHIRLPOOL d84879977b4cdea11dac5ca87fd510dc5cf4de838bbda68f6ede2c23de446a47eb7b990bfda825e865b3e748382ae3eed8aff54014ae3cb03437a341d6653261
 MISC ChangeLog 10793 SHA256 47a5a55fae3c984270f33a9f288306e60cb24926c84377d6e394e32d493acca9 SHA512 be302193c3b828c669f460a8c1368f79cd14f317ea0a87023cc5ae992d8aaeb71dfc7009ca1919b81137f59ff93c5d9c5c516b939432ec5f9f9442cfe1bb9fb7 WHIRLPOOL 8a2c27052eae9182c45e55dad92df783ef008f2248e223c5d126a2e05611569391853570ff5165fc6065d337623545f2961cd9b4e9111d90d8e712cd63451ba6
 MISC ChangeLog-2015 13997 SHA256 f7baa4cfb5e8399e32adde47c338019afd588dd778fe929dff8c85c9051a7077 SHA512 517949d4d4059c6e49ff50f3e94b5cb1f6645fa65605dfbef7e5880e03e2538cf4627aa7c32002a52eb273fb4b2fffbe1657d6df9b1b98e609f88c6f0f450933 WHIRLPOOL 62d0787626d2ba8a9272236cf17d0c01b8c7ac34b5e654b91a220bed7cf53828281ddbaa5a54d37caf5e1a1d0f75eca539e4553666ac12314a0b7e57b4666ec7
 MISC metadata.xml 318 SHA256 95e79c39f41d2fd29aadf38e03572fbbad7a35ed35fcc5a31a5d25845599483f SHA512 9d12c3604c6dbf96afab2541fbce6d92206273a42f21a3c3643a15fb3569faf2d7f7818eb69078ff8ec4431b744dac805d378c2816064128709f392bc59ba3ac WHIRLPOOL ca8bff7e768631a94895b15ea81abaf3126957e1ff8b872249fdc3475ae16a194da82019292046e95a0cc05e82fd53d6c671e3216899c2aed0c533110a5168d8
diff --git a/sec-policy/selinux-procmail/selinux-procmail-2.20170204-r1.ebuild b/sec-policy/selinux-procmail/selinux-procmail-2.20170204-r1.ebuild
index aef08aaf3c14..e0d25df17277 100644
--- a/sec-policy/selinux-procmail/selinux-procmail-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-procmail/selinux-procmail-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-procmail/selinux-procmail-2.20170204-r2.ebuild b/sec-policy/selinux-procmail/selinux-procmail-2.20170204-r2.ebuild
index c15963f76a82..3f1f915432ff 100644
--- a/sec-policy/selinux-procmail/selinux-procmail-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-procmail/selinux-procmail-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-procmail/selinux-procmail-2.20170204-r3.ebuild b/sec-policy/selinux-procmail/selinux-procmail-2.20170204-r3.ebuild
index c15963f76a82..3f1f915432ff 100644
--- a/sec-policy/selinux-procmail/selinux-procmail-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-procmail/selinux-procmail-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-procmail/selinux-procmail-2.20170204-r4.ebuild b/sec-policy/selinux-procmail/selinux-procmail-2.20170204-r4.ebuild
index c15963f76a82..3f1f915432ff 100644
--- a/sec-policy/selinux-procmail/selinux-procmail-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-procmail/selinux-procmail-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-procmail/selinux-procmail-2.20170805-r2.ebuild b/sec-policy/selinux-procmail/selinux-procmail-2.20170805-r2.ebuild
index c15963f76a82..3f1f915432ff 100644
--- a/sec-policy/selinux-procmail/selinux-procmail-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-procmail/selinux-procmail-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-procmail/selinux-procmail-2.20170805-r3.ebuild b/sec-policy/selinux-procmail/selinux-procmail-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..e0d25df17277
--- /dev/null
+++ b/sec-policy/selinux-procmail/selinux-procmail-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-procmail/selinux-procmail-9999.ebuild b/sec-policy/selinux-procmail/selinux-procmail-9999.ebuild
index aef08aaf3c14..e0d25df17277 100644
--- a/sec-policy/selinux-procmail/selinux-procmail-9999.ebuild
+++ b/sec-policy/selinux-procmail/selinux-procmail-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-psad/Manifest b/sec-policy/selinux-psad/Manifest
index eb4cb7c6d490..afe05f56984c 100644
--- a/sec-policy/selinux-psad/Manifest
+++ b/sec-policy/selinux-psad/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-psad-2.20170204-r1.ebuild 279 SHA256 f6028f137146e081df3c41514e15c200e7ac0781a0b2da1ff5eace0edadb9999 SHA512 eea3e065b61d3960bcf81c2d2635e2434dc630a251b9ded8292c5c43d0c900436e3bef4cc8fb53e62df9838d630358c3eb2676704a5fbb6ade7d67352ecbab80 WHIRLPOOL 4aa4a3d17f8fa1754a4d7b18691d87bc6e55facc10ef50a53f44400c847a6ca98dca0922316ba5cb79a0de150f448ef27ed58a0fab52af056b71d00f1d54c209
-EBUILD selinux-psad-2.20170204-r2.ebuild 277 SHA256 cf432a8db939ec06b6a7ed6426fc08b4f69bfbae68681e8b07359d44d717a9fa SHA512 eccafd85c3f7382fe379c06ba1c4dd912bfd9b15dee9ed6e7369c55b549d0f1e27adcdd218b8959b2ae3c7dd30d3860e5098226ede521d2433b7e06f396e62a3 WHIRLPOOL 2b96789cee14b0210a5ac528ef885bbc687e4315149d6cb88ff27f137b9dbd17a03aaccd110dd3130bb7229d7285eda3c5524d2b5c315cee5492c2986209fc7b
-EBUILD selinux-psad-2.20170204-r3.ebuild 277 SHA256 cf432a8db939ec06b6a7ed6426fc08b4f69bfbae68681e8b07359d44d717a9fa SHA512 eccafd85c3f7382fe379c06ba1c4dd912bfd9b15dee9ed6e7369c55b549d0f1e27adcdd218b8959b2ae3c7dd30d3860e5098226ede521d2433b7e06f396e62a3 WHIRLPOOL 2b96789cee14b0210a5ac528ef885bbc687e4315149d6cb88ff27f137b9dbd17a03aaccd110dd3130bb7229d7285eda3c5524d2b5c315cee5492c2986209fc7b
-EBUILD selinux-psad-2.20170204-r4.ebuild 277 SHA256 cf432a8db939ec06b6a7ed6426fc08b4f69bfbae68681e8b07359d44d717a9fa SHA512 eccafd85c3f7382fe379c06ba1c4dd912bfd9b15dee9ed6e7369c55b549d0f1e27adcdd218b8959b2ae3c7dd30d3860e5098226ede521d2433b7e06f396e62a3 WHIRLPOOL 2b96789cee14b0210a5ac528ef885bbc687e4315149d6cb88ff27f137b9dbd17a03aaccd110dd3130bb7229d7285eda3c5524d2b5c315cee5492c2986209fc7b
-EBUILD selinux-psad-2.20170805-r2.ebuild 277 SHA256 cf432a8db939ec06b6a7ed6426fc08b4f69bfbae68681e8b07359d44d717a9fa SHA512 eccafd85c3f7382fe379c06ba1c4dd912bfd9b15dee9ed6e7369c55b549d0f1e27adcdd218b8959b2ae3c7dd30d3860e5098226ede521d2433b7e06f396e62a3 WHIRLPOOL 2b96789cee14b0210a5ac528ef885bbc687e4315149d6cb88ff27f137b9dbd17a03aaccd110dd3130bb7229d7285eda3c5524d2b5c315cee5492c2986209fc7b
-EBUILD selinux-psad-9999.ebuild 279 SHA256 f6028f137146e081df3c41514e15c200e7ac0781a0b2da1ff5eace0edadb9999 SHA512 eea3e065b61d3960bcf81c2d2635e2434dc630a251b9ded8292c5c43d0c900436e3bef4cc8fb53e62df9838d630358c3eb2676704a5fbb6ade7d67352ecbab80 WHIRLPOOL 4aa4a3d17f8fa1754a4d7b18691d87bc6e55facc10ef50a53f44400c847a6ca98dca0922316ba5cb79a0de150f448ef27ed58a0fab52af056b71d00f1d54c209
+EBUILD selinux-psad-2.20170204-r1.ebuild 280 SHA256 21d33bfe27170446cb521a5d722fd63384cd3a4f76854982f5de2cbd273b1ff1 SHA512 93db3fae6a0be18987bafe2ed5cc8ff1f7f94f0dcc68bdb37de542d37b01be4e44397c1d478aa75f9c459685f764cbef5a3a5750d65ca44b3b6d36b03751efaf WHIRLPOOL e3bf0a9aa3bcfca4f658277bfff4d90515b05baf04dd06d9effd7d094da8091eebf68df56b823d1c3dd308e9a2c4ae0dae408593c98343c0585ee4511b0b5497
+EBUILD selinux-psad-2.20170204-r2.ebuild 278 SHA256 aee4ba8bdbe2acfcc1b9d9866570d96d2f36beddbcf3890a3fc32c7785bbb933 SHA512 f3eca9272e378ae3a798d271eeb67fb6370034f7a3b9bcff7015bbfe58b0947cf3b9e2b3c9353a0eceba516b5c7fb66cd9767974a7e5b08a363b67b9e3ee404b WHIRLPOOL 34fe52b578650b553feff956390679033cf3bbf44b5dfdbc10ff0c79db37cbdf1c65ea9a38331b26f47d0f20c593b02497b76ed14d5893e88f134e1141b65a04
+EBUILD selinux-psad-2.20170204-r3.ebuild 278 SHA256 aee4ba8bdbe2acfcc1b9d9866570d96d2f36beddbcf3890a3fc32c7785bbb933 SHA512 f3eca9272e378ae3a798d271eeb67fb6370034f7a3b9bcff7015bbfe58b0947cf3b9e2b3c9353a0eceba516b5c7fb66cd9767974a7e5b08a363b67b9e3ee404b WHIRLPOOL 34fe52b578650b553feff956390679033cf3bbf44b5dfdbc10ff0c79db37cbdf1c65ea9a38331b26f47d0f20c593b02497b76ed14d5893e88f134e1141b65a04
+EBUILD selinux-psad-2.20170204-r4.ebuild 278 SHA256 aee4ba8bdbe2acfcc1b9d9866570d96d2f36beddbcf3890a3fc32c7785bbb933 SHA512 f3eca9272e378ae3a798d271eeb67fb6370034f7a3b9bcff7015bbfe58b0947cf3b9e2b3c9353a0eceba516b5c7fb66cd9767974a7e5b08a363b67b9e3ee404b WHIRLPOOL 34fe52b578650b553feff956390679033cf3bbf44b5dfdbc10ff0c79db37cbdf1c65ea9a38331b26f47d0f20c593b02497b76ed14d5893e88f134e1141b65a04
+EBUILD selinux-psad-2.20170805-r2.ebuild 278 SHA256 aee4ba8bdbe2acfcc1b9d9866570d96d2f36beddbcf3890a3fc32c7785bbb933 SHA512 f3eca9272e378ae3a798d271eeb67fb6370034f7a3b9bcff7015bbfe58b0947cf3b9e2b3c9353a0eceba516b5c7fb66cd9767974a7e5b08a363b67b9e3ee404b WHIRLPOOL 34fe52b578650b553feff956390679033cf3bbf44b5dfdbc10ff0c79db37cbdf1c65ea9a38331b26f47d0f20c593b02497b76ed14d5893e88f134e1141b65a04
+EBUILD selinux-psad-2.20170805-r3.ebuild 280 SHA256 21d33bfe27170446cb521a5d722fd63384cd3a4f76854982f5de2cbd273b1ff1 SHA512 93db3fae6a0be18987bafe2ed5cc8ff1f7f94f0dcc68bdb37de542d37b01be4e44397c1d478aa75f9c459685f764cbef5a3a5750d65ca44b3b6d36b03751efaf WHIRLPOOL e3bf0a9aa3bcfca4f658277bfff4d90515b05baf04dd06d9effd7d094da8091eebf68df56b823d1c3dd308e9a2c4ae0dae408593c98343c0585ee4511b0b5497
+EBUILD selinux-psad-9999.ebuild 280 SHA256 21d33bfe27170446cb521a5d722fd63384cd3a4f76854982f5de2cbd273b1ff1 SHA512 93db3fae6a0be18987bafe2ed5cc8ff1f7f94f0dcc68bdb37de542d37b01be4e44397c1d478aa75f9c459685f764cbef5a3a5750d65ca44b3b6d36b03751efaf WHIRLPOOL e3bf0a9aa3bcfca4f658277bfff4d90515b05baf04dd06d9effd7d094da8091eebf68df56b823d1c3dd308e9a2c4ae0dae408593c98343c0585ee4511b0b5497
 MISC ChangeLog 10387 SHA256 76536372281cc8d852c6ec7a5292ab3f9f347cd570330f83d77b968379405a46 SHA512 1c888c6c3377b06847de39a78769743713d596d6a4146e6f1188dbd487827e8de62fabf4f677acfd415ce532bc62246bf71360074d0573562c6333e3eab2d15c WHIRLPOOL 393f90a58911c327188af789acaf64bb48f4ee2c578d4adae01428d1b6f1c394dd5a04792a39ad93178720e0feaa6c6b9ee72ce400c68b891735429881079333
 MISC ChangeLog-2015 9637 SHA256 448d1be93359b7aba1c7bb3853d0b7db2b208f7a95f09fe9669c2962b791d0fb SHA512 52ce07f5919ad2c0f406ca00b11004fcfbacae02b6a907b08a0fa8d91f8450c896cea9be1abd4178602b0bfbd4042121816691f423f78e7fa75e631b48ee26c3 WHIRLPOOL 3a0fa7d3c0d34a3caeae8ba1b708a9375807bf1c55e48b49e35754eeccf045ed7a0de33a3c6c73f2bf8c5c064354b23cf7025d634e57a78c73fa79422f7bb366
 MISC metadata.xml 314 SHA256 83dc2fdf4f7c3d41b0b5ecaf28bbe479c7d210d675fe3d639a769e002d01274f SHA512 bee35dcd491d4c557ffbc36f6940fa5e903fa41e373553964f995fc7c14609e50b013fb4aa78193f33a9fb39c0c7c8fbf26d1da17c8c4e648bce921296496a05 WHIRLPOOL 2871408b26edc5954c507f6c64646103ad3aa0754605b0b9c1527731635ee1cca8240ca2fa447b3ef68a0168d1007f719968908c88a504943d8842c5a8f40418
diff --git a/sec-policy/selinux-psad/selinux-psad-2.20170204-r1.ebuild b/sec-policy/selinux-psad/selinux-psad-2.20170204-r1.ebuild
index fba3ceb5fe1f..2369b22a4299 100644
--- a/sec-policy/selinux-psad/selinux-psad-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-psad/selinux-psad-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-psad/selinux-psad-2.20170204-r2.ebuild b/sec-policy/selinux-psad/selinux-psad-2.20170204-r2.ebuild
index 0c5081d765b9..094912a02bad 100644
--- a/sec-policy/selinux-psad/selinux-psad-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-psad/selinux-psad-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-psad/selinux-psad-2.20170204-r3.ebuild b/sec-policy/selinux-psad/selinux-psad-2.20170204-r3.ebuild
index 0c5081d765b9..094912a02bad 100644
--- a/sec-policy/selinux-psad/selinux-psad-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-psad/selinux-psad-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-psad/selinux-psad-2.20170204-r4.ebuild b/sec-policy/selinux-psad/selinux-psad-2.20170204-r4.ebuild
index 0c5081d765b9..094912a02bad 100644
--- a/sec-policy/selinux-psad/selinux-psad-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-psad/selinux-psad-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-psad/selinux-psad-2.20170805-r2.ebuild b/sec-policy/selinux-psad/selinux-psad-2.20170805-r2.ebuild
index 0c5081d765b9..094912a02bad 100644
--- a/sec-policy/selinux-psad/selinux-psad-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-psad/selinux-psad-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-psad/selinux-psad-2.20170805-r3.ebuild b/sec-policy/selinux-psad/selinux-psad-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..2369b22a4299
--- /dev/null
+++ b/sec-policy/selinux-psad/selinux-psad-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-psad/selinux-psad-9999.ebuild b/sec-policy/selinux-psad/selinux-psad-9999.ebuild
index fba3ceb5fe1f..2369b22a4299 100644
--- a/sec-policy/selinux-psad/selinux-psad-9999.ebuild
+++ b/sec-policy/selinux-psad/selinux-psad-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-publicfile/Manifest b/sec-policy/selinux-publicfile/Manifest
index 3422d0ed92ac..bf8bd0f23d80 100644
--- a/sec-policy/selinux-publicfile/Manifest
+++ b/sec-policy/selinux-publicfile/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-publicfile-2.20170204-r1.ebuild 291 SHA256 d3171524d5a9b63c2476ba0dc8c5b0a30be0f1b7691051d85ebf66343a37257e SHA512 4b3ad724ffbf65a12617890a0f0a135e986c4793d7b936a0d9afc6376c4fa5291bbe3761846443eb46a659edb5e1b6490cf35fa8c8053ab940114f72143747d2 WHIRLPOOL ae6a921e70e6c83879e0d4c1508d4d136549af71bd2bff9721f80d2d081bd29c51df3438330e94650848b100a942d0bc9808993913b5c3553c207f684dcb957f
-EBUILD selinux-publicfile-2.20170204-r2.ebuild 289 SHA256 f7c16c1520be89f97729f8c7cb7e4ef5d6141cb750c71c8cfd8cd65d388bc571 SHA512 3b6d434d0889c2498e4655d189ab8f0325f1b20fd3acae95a8471eca365878dd7ed38febf869a1680f8a1b4054955ce60d29ac7b358c65fe0217be619402200a WHIRLPOOL 9ca87aae51dc3ee67ffb1f127f08bc20a7b13f32c9727ceccabd832fdd9c188de2f60835948c5ee853ca0f4ff4a5419b3cc0138c30b7d860bc1a6ed710b543b6
-EBUILD selinux-publicfile-2.20170204-r3.ebuild 289 SHA256 f7c16c1520be89f97729f8c7cb7e4ef5d6141cb750c71c8cfd8cd65d388bc571 SHA512 3b6d434d0889c2498e4655d189ab8f0325f1b20fd3acae95a8471eca365878dd7ed38febf869a1680f8a1b4054955ce60d29ac7b358c65fe0217be619402200a WHIRLPOOL 9ca87aae51dc3ee67ffb1f127f08bc20a7b13f32c9727ceccabd832fdd9c188de2f60835948c5ee853ca0f4ff4a5419b3cc0138c30b7d860bc1a6ed710b543b6
-EBUILD selinux-publicfile-2.20170204-r4.ebuild 289 SHA256 f7c16c1520be89f97729f8c7cb7e4ef5d6141cb750c71c8cfd8cd65d388bc571 SHA512 3b6d434d0889c2498e4655d189ab8f0325f1b20fd3acae95a8471eca365878dd7ed38febf869a1680f8a1b4054955ce60d29ac7b358c65fe0217be619402200a WHIRLPOOL 9ca87aae51dc3ee67ffb1f127f08bc20a7b13f32c9727ceccabd832fdd9c188de2f60835948c5ee853ca0f4ff4a5419b3cc0138c30b7d860bc1a6ed710b543b6
-EBUILD selinux-publicfile-2.20170805-r2.ebuild 289 SHA256 f7c16c1520be89f97729f8c7cb7e4ef5d6141cb750c71c8cfd8cd65d388bc571 SHA512 3b6d434d0889c2498e4655d189ab8f0325f1b20fd3acae95a8471eca365878dd7ed38febf869a1680f8a1b4054955ce60d29ac7b358c65fe0217be619402200a WHIRLPOOL 9ca87aae51dc3ee67ffb1f127f08bc20a7b13f32c9727ceccabd832fdd9c188de2f60835948c5ee853ca0f4ff4a5419b3cc0138c30b7d860bc1a6ed710b543b6
-EBUILD selinux-publicfile-9999.ebuild 291 SHA256 d3171524d5a9b63c2476ba0dc8c5b0a30be0f1b7691051d85ebf66343a37257e SHA512 4b3ad724ffbf65a12617890a0f0a135e986c4793d7b936a0d9afc6376c4fa5291bbe3761846443eb46a659edb5e1b6490cf35fa8c8053ab940114f72143747d2 WHIRLPOOL ae6a921e70e6c83879e0d4c1508d4d136549af71bd2bff9721f80d2d081bd29c51df3438330e94650848b100a942d0bc9808993913b5c3553c207f684dcb957f
+EBUILD selinux-publicfile-2.20170204-r1.ebuild 292 SHA256 9239b86f6f07c9990dd390b4e9a5b99709d3efcfd16b87ea9312297fff1bfa7a SHA512 02eaa7acd1ac0ec46f30c5ee9b4c64d3954012c0fe0cd981dcdf4d4beb45fabe84a6b222630d43e8cc8be04a7cbb531cc2bbeac4ab076c0523eac11888e59258 WHIRLPOOL f53722c5420db71c35585d47cbacc8dfb2a8c81baeec86e5da8ed6399867121be22c206f1848b133ce530969f22e9ac8d989c4d4b8dc0d17538b42007c69f61c
+EBUILD selinux-publicfile-2.20170204-r2.ebuild 290 SHA256 419e8bf796fcc5c241293dd67056a9781add16399b0591818a3120a46448c594 SHA512 65fe98bd452ceba930a1844ba427d1ef5be036e173141f7411c7be583e4b26b6ddca4e791e2238cfeb7279e76bf1083dbffbc297af5b9352789eb518a0b979e4 WHIRLPOOL 6038dd09e8565618e20cd740d05c9327b1455929fbe9a58abbacceb2110be57c2fb2f5761bb8173a2905e88b1dc9f135ea18622ea07d1eb9f1a25f2919921993
+EBUILD selinux-publicfile-2.20170204-r3.ebuild 290 SHA256 419e8bf796fcc5c241293dd67056a9781add16399b0591818a3120a46448c594 SHA512 65fe98bd452ceba930a1844ba427d1ef5be036e173141f7411c7be583e4b26b6ddca4e791e2238cfeb7279e76bf1083dbffbc297af5b9352789eb518a0b979e4 WHIRLPOOL 6038dd09e8565618e20cd740d05c9327b1455929fbe9a58abbacceb2110be57c2fb2f5761bb8173a2905e88b1dc9f135ea18622ea07d1eb9f1a25f2919921993
+EBUILD selinux-publicfile-2.20170204-r4.ebuild 290 SHA256 419e8bf796fcc5c241293dd67056a9781add16399b0591818a3120a46448c594 SHA512 65fe98bd452ceba930a1844ba427d1ef5be036e173141f7411c7be583e4b26b6ddca4e791e2238cfeb7279e76bf1083dbffbc297af5b9352789eb518a0b979e4 WHIRLPOOL 6038dd09e8565618e20cd740d05c9327b1455929fbe9a58abbacceb2110be57c2fb2f5761bb8173a2905e88b1dc9f135ea18622ea07d1eb9f1a25f2919921993
+EBUILD selinux-publicfile-2.20170805-r2.ebuild 290 SHA256 419e8bf796fcc5c241293dd67056a9781add16399b0591818a3120a46448c594 SHA512 65fe98bd452ceba930a1844ba427d1ef5be036e173141f7411c7be583e4b26b6ddca4e791e2238cfeb7279e76bf1083dbffbc297af5b9352789eb518a0b979e4 WHIRLPOOL 6038dd09e8565618e20cd740d05c9327b1455929fbe9a58abbacceb2110be57c2fb2f5761bb8173a2905e88b1dc9f135ea18622ea07d1eb9f1a25f2919921993
+EBUILD selinux-publicfile-2.20170805-r3.ebuild 292 SHA256 9239b86f6f07c9990dd390b4e9a5b99709d3efcfd16b87ea9312297fff1bfa7a SHA512 02eaa7acd1ac0ec46f30c5ee9b4c64d3954012c0fe0cd981dcdf4d4beb45fabe84a6b222630d43e8cc8be04a7cbb531cc2bbeac4ab076c0523eac11888e59258 WHIRLPOOL f53722c5420db71c35585d47cbacc8dfb2a8c81baeec86e5da8ed6399867121be22c206f1848b133ce530969f22e9ac8d989c4d4b8dc0d17538b42007c69f61c
+EBUILD selinux-publicfile-9999.ebuild 292 SHA256 9239b86f6f07c9990dd390b4e9a5b99709d3efcfd16b87ea9312297fff1bfa7a SHA512 02eaa7acd1ac0ec46f30c5ee9b4c64d3954012c0fe0cd981dcdf4d4beb45fabe84a6b222630d43e8cc8be04a7cbb531cc2bbeac4ab076c0523eac11888e59258 WHIRLPOOL f53722c5420db71c35585d47cbacc8dfb2a8c81baeec86e5da8ed6399867121be22c206f1848b133ce530969f22e9ac8d989c4d4b8dc0d17538b42007c69f61c
 MISC ChangeLog 10979 SHA256 720f3e06a8887b3c72049a0af3736829e17ab1a66618a7f2190803707f10139f SHA512 9c14d2dad84dcb186b550619f3ea8a9e76d6f657f89ec0aca22639e2bbbc9503d014ea4017ea511f245fe6a0542c74c222a5084a1f1b9ca37fb915c33a861672 WHIRLPOOL 00ed6c2bcb3d9eba617bdcd2a7b8f43a7cad43e25ec7219ea2b0b24e560a62877d9cc2cd847673ae3dbcb0a8257b2f16a890c18823cc06b11436c6972d772a00
 MISC ChangeLog-2015 13775 SHA256 4af90d79cff56627a4d36f9778aa2d69f535b35cfdeb560de5e4c8e0ec21d62e SHA512 b6edc708fe4c484327ebbc4acbd14f04775329736d7ed52566bcd4a76a0bcd3d72f7a6851c17a6aa7bd5980a06b833155fdb5b380186aedec3a88deefd2e85df WHIRLPOOL f1921c802a05e166e8dc0dc3ec3223ee976d4631d11b1c994601bd118aacf6fa70ecf8840e33007ae19edb0d0138b9cda82d42e49cf74f864e9e5015017d95f2
 MISC metadata.xml 320 SHA256 ad544c0dfad3d08da3027625c11cb35146ea1902c660444551f74d5173ed3bd3 SHA512 44842cde8be2b2955172671bc0fb969c2eea4382d286d3833cef9099708f67a9c878c33245ccf85b781864921283490c821444cc6a4cdcbf477f00ab5a272420 WHIRLPOOL 0defba6b57a5bdd79859a04a6702372fe8c4eece735f415f8ac805f0d1b3813b789086bc6a5a2ddaa67e52de61c5d6fd52c3d3ce5353b8c3e72b20dfab931f9a
diff --git a/sec-policy/selinux-publicfile/selinux-publicfile-2.20170204-r1.ebuild b/sec-policy/selinux-publicfile/selinux-publicfile-2.20170204-r1.ebuild
index 101f401e5c9c..3edd8cd37a4b 100644
--- a/sec-policy/selinux-publicfile/selinux-publicfile-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-publicfile/selinux-publicfile-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-publicfile/selinux-publicfile-2.20170204-r2.ebuild b/sec-policy/selinux-publicfile/selinux-publicfile-2.20170204-r2.ebuild
index 940725ea2955..e08956bbce63 100644
--- a/sec-policy/selinux-publicfile/selinux-publicfile-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-publicfile/selinux-publicfile-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-publicfile/selinux-publicfile-2.20170204-r3.ebuild b/sec-policy/selinux-publicfile/selinux-publicfile-2.20170204-r3.ebuild
index 940725ea2955..e08956bbce63 100644
--- a/sec-policy/selinux-publicfile/selinux-publicfile-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-publicfile/selinux-publicfile-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-publicfile/selinux-publicfile-2.20170204-r4.ebuild b/sec-policy/selinux-publicfile/selinux-publicfile-2.20170204-r4.ebuild
index 940725ea2955..e08956bbce63 100644
--- a/sec-policy/selinux-publicfile/selinux-publicfile-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-publicfile/selinux-publicfile-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-publicfile/selinux-publicfile-2.20170805-r2.ebuild b/sec-policy/selinux-publicfile/selinux-publicfile-2.20170805-r2.ebuild
index 940725ea2955..e08956bbce63 100644
--- a/sec-policy/selinux-publicfile/selinux-publicfile-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-publicfile/selinux-publicfile-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-publicfile/selinux-publicfile-2.20170805-r3.ebuild b/sec-policy/selinux-publicfile/selinux-publicfile-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..3edd8cd37a4b
--- /dev/null
+++ b/sec-policy/selinux-publicfile/selinux-publicfile-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-publicfile/selinux-publicfile-9999.ebuild b/sec-policy/selinux-publicfile/selinux-publicfile-9999.ebuild
index 101f401e5c9c..3edd8cd37a4b 100644
--- a/sec-policy/selinux-publicfile/selinux-publicfile-9999.ebuild
+++ b/sec-policy/selinux-publicfile/selinux-publicfile-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-pulseaudio/Manifest b/sec-policy/selinux-pulseaudio/Manifest
index 8aa6c23f5c10..5f7f3af6516f 100644
--- a/sec-policy/selinux-pulseaudio/Manifest
+++ b/sec-policy/selinux-pulseaudio/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-pulseaudio-2.20170204-r1.ebuild 291 SHA256 897ca33bb0e30d1f93662d8be1a287543eca1d4b5dd8b1e11785b56d304c779c SHA512 4c104689cf06e8e31c2d55424ab0e26efaaebf5caa54f769d91f9a2c16b40722ff889a4ac77165d368c6408b2f32ca8418c23e0a037837358a8e47eea2e74909 WHIRLPOOL af35b7f8fc8f7a05485fd161eab868a2cca0bec2c1eb3595223694ec8c3cbd1a3b98ca914729c60e7355a4ec839bfba2411e44edcb9097d6b0634cf03f0fa12c
-EBUILD selinux-pulseaudio-2.20170204-r2.ebuild 289 SHA256 fc773dcc1bfbd3f1cde9b0a358e94065338f807290f1782655262fb1eb89b9bb SHA512 dc83b6d130ccad3c5ccc7aedab439faf86c430dc30da55fda8d0a9add7d7c2288e7d7f911df9ed885f992ccc69184dee3fa50c4dbf0afcf75c13507f3dd97804 WHIRLPOOL ff292a92fc9622f22ab9ac32bbb9b51a0620058243ab6d74de70cf8bc9e23e56da2543a78c6888c4dde1ba94e930e341c496bed1f99e2adf6a6ad7b4b657ab9f
-EBUILD selinux-pulseaudio-2.20170204-r3.ebuild 289 SHA256 fc773dcc1bfbd3f1cde9b0a358e94065338f807290f1782655262fb1eb89b9bb SHA512 dc83b6d130ccad3c5ccc7aedab439faf86c430dc30da55fda8d0a9add7d7c2288e7d7f911df9ed885f992ccc69184dee3fa50c4dbf0afcf75c13507f3dd97804 WHIRLPOOL ff292a92fc9622f22ab9ac32bbb9b51a0620058243ab6d74de70cf8bc9e23e56da2543a78c6888c4dde1ba94e930e341c496bed1f99e2adf6a6ad7b4b657ab9f
-EBUILD selinux-pulseaudio-2.20170204-r4.ebuild 289 SHA256 fc773dcc1bfbd3f1cde9b0a358e94065338f807290f1782655262fb1eb89b9bb SHA512 dc83b6d130ccad3c5ccc7aedab439faf86c430dc30da55fda8d0a9add7d7c2288e7d7f911df9ed885f992ccc69184dee3fa50c4dbf0afcf75c13507f3dd97804 WHIRLPOOL ff292a92fc9622f22ab9ac32bbb9b51a0620058243ab6d74de70cf8bc9e23e56da2543a78c6888c4dde1ba94e930e341c496bed1f99e2adf6a6ad7b4b657ab9f
-EBUILD selinux-pulseaudio-2.20170805-r2.ebuild 289 SHA256 fc773dcc1bfbd3f1cde9b0a358e94065338f807290f1782655262fb1eb89b9bb SHA512 dc83b6d130ccad3c5ccc7aedab439faf86c430dc30da55fda8d0a9add7d7c2288e7d7f911df9ed885f992ccc69184dee3fa50c4dbf0afcf75c13507f3dd97804 WHIRLPOOL ff292a92fc9622f22ab9ac32bbb9b51a0620058243ab6d74de70cf8bc9e23e56da2543a78c6888c4dde1ba94e930e341c496bed1f99e2adf6a6ad7b4b657ab9f
-EBUILD selinux-pulseaudio-9999.ebuild 291 SHA256 897ca33bb0e30d1f93662d8be1a287543eca1d4b5dd8b1e11785b56d304c779c SHA512 4c104689cf06e8e31c2d55424ab0e26efaaebf5caa54f769d91f9a2c16b40722ff889a4ac77165d368c6408b2f32ca8418c23e0a037837358a8e47eea2e74909 WHIRLPOOL af35b7f8fc8f7a05485fd161eab868a2cca0bec2c1eb3595223694ec8c3cbd1a3b98ca914729c60e7355a4ec839bfba2411e44edcb9097d6b0634cf03f0fa12c
+EBUILD selinux-pulseaudio-2.20170204-r1.ebuild 292 SHA256 e874c8f77eb456d3908452cbf9956f9b06faff3cf91d3378dcde565737b2be33 SHA512 cf18fce2ed9b17058345fcae8db5fae84d4c7dea33b85c6c36fea5c1a0ed44baae7391c46126c0195eb43445dca4071346dc47a9519b6d4965dbdc18c13fc77e WHIRLPOOL 0839a1b8005a44ea9a3aa7443bfd573e721ea4e3da0104e8d6879f364135e310d6bf99663c13e4535f73a90ae1578cc9ddb0e9cafa643d80c4dad3a2b2603399
+EBUILD selinux-pulseaudio-2.20170204-r2.ebuild 290 SHA256 1df67d7d31fd9e2f9e94aa9d5317d13ab852f784c8cfb38855de4ba56f44884b SHA512 8571e91e31de2fb88e7fd379dde176750d50a5833067e3a2d8623ce76cb4c2573a8b97b45cb408a1497a600a4038c90842a2114a072d5e4bfd78a3ddc6baf29a WHIRLPOOL 78228567f839318ebc08f2ad83d3deea9bb879c95502b378b7870c64f63cbc5c99a16a645871c6583996ce7fc27ffa05095da4cb4c941ce7aef61b0fbb26aa41
+EBUILD selinux-pulseaudio-2.20170204-r3.ebuild 290 SHA256 1df67d7d31fd9e2f9e94aa9d5317d13ab852f784c8cfb38855de4ba56f44884b SHA512 8571e91e31de2fb88e7fd379dde176750d50a5833067e3a2d8623ce76cb4c2573a8b97b45cb408a1497a600a4038c90842a2114a072d5e4bfd78a3ddc6baf29a WHIRLPOOL 78228567f839318ebc08f2ad83d3deea9bb879c95502b378b7870c64f63cbc5c99a16a645871c6583996ce7fc27ffa05095da4cb4c941ce7aef61b0fbb26aa41
+EBUILD selinux-pulseaudio-2.20170204-r4.ebuild 290 SHA256 1df67d7d31fd9e2f9e94aa9d5317d13ab852f784c8cfb38855de4ba56f44884b SHA512 8571e91e31de2fb88e7fd379dde176750d50a5833067e3a2d8623ce76cb4c2573a8b97b45cb408a1497a600a4038c90842a2114a072d5e4bfd78a3ddc6baf29a WHIRLPOOL 78228567f839318ebc08f2ad83d3deea9bb879c95502b378b7870c64f63cbc5c99a16a645871c6583996ce7fc27ffa05095da4cb4c941ce7aef61b0fbb26aa41
+EBUILD selinux-pulseaudio-2.20170805-r2.ebuild 290 SHA256 1df67d7d31fd9e2f9e94aa9d5317d13ab852f784c8cfb38855de4ba56f44884b SHA512 8571e91e31de2fb88e7fd379dde176750d50a5833067e3a2d8623ce76cb4c2573a8b97b45cb408a1497a600a4038c90842a2114a072d5e4bfd78a3ddc6baf29a WHIRLPOOL 78228567f839318ebc08f2ad83d3deea9bb879c95502b378b7870c64f63cbc5c99a16a645871c6583996ce7fc27ffa05095da4cb4c941ce7aef61b0fbb26aa41
+EBUILD selinux-pulseaudio-2.20170805-r3.ebuild 292 SHA256 e874c8f77eb456d3908452cbf9956f9b06faff3cf91d3378dcde565737b2be33 SHA512 cf18fce2ed9b17058345fcae8db5fae84d4c7dea33b85c6c36fea5c1a0ed44baae7391c46126c0195eb43445dca4071346dc47a9519b6d4965dbdc18c13fc77e WHIRLPOOL 0839a1b8005a44ea9a3aa7443bfd573e721ea4e3da0104e8d6879f364135e310d6bf99663c13e4535f73a90ae1578cc9ddb0e9cafa643d80c4dad3a2b2603399
+EBUILD selinux-pulseaudio-9999.ebuild 292 SHA256 e874c8f77eb456d3908452cbf9956f9b06faff3cf91d3378dcde565737b2be33 SHA512 cf18fce2ed9b17058345fcae8db5fae84d4c7dea33b85c6c36fea5c1a0ed44baae7391c46126c0195eb43445dca4071346dc47a9519b6d4965dbdc18c13fc77e WHIRLPOOL 0839a1b8005a44ea9a3aa7443bfd573e721ea4e3da0104e8d6879f364135e310d6bf99663c13e4535f73a90ae1578cc9ddb0e9cafa643d80c4dad3a2b2603399
 MISC ChangeLog 10979 SHA256 7aee2a0501963a2a2f284346563fca565a2e4f2e3e98a5a6cbc6cef9c9383ba2 SHA512 b9aa8346e54bd13ed4be22489f97b6148d03a5d80a614eb4a6606912052b573e04da2c293d15a4eef052342f67a8b836be94818e358b5f5e52fd8e3a8b3393d6 WHIRLPOOL 223b18a5d64ac990f1313d6fb0adab96e2a00dfa08b08af01a00c23008c218c03416714bfb71d687f175b49d8f66639541873ffbd23915353bbf9c727488823d
 MISC ChangeLog-2015 10335 SHA256 b4fa0b30351da138d5ce74a4c6b9006f82901700dc12a42b5cefcf26b26a7373 SHA512 9b45b75a0a8519942903e8d043912c44413e0df7d7e7fa648ec13bb0487f3d127592c8f9a58fe96857f8f91788ff375a4908ec692ce228747a6180fd4d9523d9 WHIRLPOOL 9f1995ad8973a29c69d63470300ca990a71085f752bb203c064de00f16be345e3738bd592390a7e0c5beee5fa97692f436b3a3ce19622cf6fde9e864edee1c2a
 MISC metadata.xml 320 SHA256 54f06c2f5e1cc7b53d16d93db2d3ab4e85b7e0f9557865510537009a08ea8fce SHA512 49ed7fee8050b230c333264e6289d297cf3b4106b773446231dfcec9ce84121b39668e15304edb422ebb9477a3c03695cf8b35744f60fd81de5ac269b45a30ac WHIRLPOOL a6143155a9312dbdaaf3932270e5afb0c42afc10524a8f7162e0e2ce35d27ed5802b93eb91b7d69ed25b89d197f06f6b4252cad16b36314d5bc8d599ff384c90
diff --git a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20170204-r1.ebuild b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20170204-r1.ebuild
index bec5db795b6e..32081f566756 100644
--- a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20170204-r2.ebuild b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20170204-r2.ebuild
index 57ab42546a83..b9bc2de57be1 100644
--- a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20170204-r3.ebuild b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20170204-r3.ebuild
index 57ab42546a83..b9bc2de57be1 100644
--- a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20170204-r4.ebuild b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20170204-r4.ebuild
index 57ab42546a83..b9bc2de57be1 100644
--- a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20170805-r2.ebuild b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20170805-r2.ebuild
index 57ab42546a83..b9bc2de57be1 100644
--- a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20170805-r3.ebuild b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..32081f566756
--- /dev/null
+++ b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-pulseaudio/selinux-pulseaudio-9999.ebuild b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-9999.ebuild
index bec5db795b6e..32081f566756 100644
--- a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-9999.ebuild
+++ b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-puppet/Manifest b/sec-policy/selinux-puppet/Manifest
index 5acc9a5cf341..f3859c264624 100644
--- a/sec-policy/selinux-puppet/Manifest
+++ b/sec-policy/selinux-puppet/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-puppet-2.20170204-r1.ebuild 283 SHA256 a3c0d8b8e78b4224d55be9dd2aabce5a85044aefed148f5a260e637e903a61e4 SHA512 467fc06e6f2d99d29b36b7a49d719684007648c29598fd635422bfb89f28dbb6a0288f4c81d919ec5715aac609286ba69726bdd6c0ed1699093d21b7f97cbb11 WHIRLPOOL 152585393af6a495b9d19dd812882801c2b82a38ac9baebb340efae111bf763f77a9db33aefd5310cb25e4146d81db69ac25d608812bfb5bd861f99ddc960555
-EBUILD selinux-puppet-2.20170204-r2.ebuild 281 SHA256 27556aa1b5a7abcc68dba9cc8ae83d2569d9c4022326c18aec41f4dbbbadaba6 SHA512 25ff8afbd51db96ff3e49db68e7cb5eb224a959af1cbdd9fdbefde2cf062b1351251de5837cb58cc0b3deabea5cdde77266d7fbefa19329711e19a8c410f1808 WHIRLPOOL 9d538bc70526597ced30f915d42aa54da8be87e58ead909e4e92181858bd5dc5d87f9c6a2597f604c061f6ff16dec6d250f0fcf9138247c61607d998ec702190
-EBUILD selinux-puppet-2.20170204-r3.ebuild 281 SHA256 27556aa1b5a7abcc68dba9cc8ae83d2569d9c4022326c18aec41f4dbbbadaba6 SHA512 25ff8afbd51db96ff3e49db68e7cb5eb224a959af1cbdd9fdbefde2cf062b1351251de5837cb58cc0b3deabea5cdde77266d7fbefa19329711e19a8c410f1808 WHIRLPOOL 9d538bc70526597ced30f915d42aa54da8be87e58ead909e4e92181858bd5dc5d87f9c6a2597f604c061f6ff16dec6d250f0fcf9138247c61607d998ec702190
-EBUILD selinux-puppet-2.20170204-r4.ebuild 281 SHA256 27556aa1b5a7abcc68dba9cc8ae83d2569d9c4022326c18aec41f4dbbbadaba6 SHA512 25ff8afbd51db96ff3e49db68e7cb5eb224a959af1cbdd9fdbefde2cf062b1351251de5837cb58cc0b3deabea5cdde77266d7fbefa19329711e19a8c410f1808 WHIRLPOOL 9d538bc70526597ced30f915d42aa54da8be87e58ead909e4e92181858bd5dc5d87f9c6a2597f604c061f6ff16dec6d250f0fcf9138247c61607d998ec702190
-EBUILD selinux-puppet-2.20170805-r2.ebuild 281 SHA256 27556aa1b5a7abcc68dba9cc8ae83d2569d9c4022326c18aec41f4dbbbadaba6 SHA512 25ff8afbd51db96ff3e49db68e7cb5eb224a959af1cbdd9fdbefde2cf062b1351251de5837cb58cc0b3deabea5cdde77266d7fbefa19329711e19a8c410f1808 WHIRLPOOL 9d538bc70526597ced30f915d42aa54da8be87e58ead909e4e92181858bd5dc5d87f9c6a2597f604c061f6ff16dec6d250f0fcf9138247c61607d998ec702190
-EBUILD selinux-puppet-9999.ebuild 283 SHA256 a3c0d8b8e78b4224d55be9dd2aabce5a85044aefed148f5a260e637e903a61e4 SHA512 467fc06e6f2d99d29b36b7a49d719684007648c29598fd635422bfb89f28dbb6a0288f4c81d919ec5715aac609286ba69726bdd6c0ed1699093d21b7f97cbb11 WHIRLPOOL 152585393af6a495b9d19dd812882801c2b82a38ac9baebb340efae111bf763f77a9db33aefd5310cb25e4146d81db69ac25d608812bfb5bd861f99ddc960555
+EBUILD selinux-puppet-2.20170204-r1.ebuild 284 SHA256 ebef832ee7bb45d79f640d6b6e16865c245ab67e953f124ffabeacf9b5a7140a SHA512 7a8c427f54afc34bb685fd353aab1edd18da78b697fa1b4816d72db2d523c34b51914133efc20eb9e05ef05028985203618a6f6660486e2e048a083c3bc47cee WHIRLPOOL 58e1ca3551feccc4073ab5500433501eeebac6f047567bf0c20e979c2a0bba8b167aa064daf1b8f5f0caa5c517071d3b922a2307204cf891686063f59c9f12f4
+EBUILD selinux-puppet-2.20170204-r2.ebuild 282 SHA256 8c3638a54eef870c12c37c812203cce5ffbdccf6456924f131bf4f69c180b5fe SHA512 f2a85c8fecbfec02e5befd0c372b749b1b12b1cefbd3343cb73d5c74122ba566fcc14bd8e96296e70e98190f9dd248e9957bc729426a528fd185923f8bae7628 WHIRLPOOL 1cd804d06d801418da712c687751f5a1bb7af7397b85381e67c818cbfb2b3d6f0751ed0252aa4096b0021ea0929e133bb557a5c735e5bac9a5087d09b7c1b78d
+EBUILD selinux-puppet-2.20170204-r3.ebuild 282 SHA256 8c3638a54eef870c12c37c812203cce5ffbdccf6456924f131bf4f69c180b5fe SHA512 f2a85c8fecbfec02e5befd0c372b749b1b12b1cefbd3343cb73d5c74122ba566fcc14bd8e96296e70e98190f9dd248e9957bc729426a528fd185923f8bae7628 WHIRLPOOL 1cd804d06d801418da712c687751f5a1bb7af7397b85381e67c818cbfb2b3d6f0751ed0252aa4096b0021ea0929e133bb557a5c735e5bac9a5087d09b7c1b78d
+EBUILD selinux-puppet-2.20170204-r4.ebuild 282 SHA256 8c3638a54eef870c12c37c812203cce5ffbdccf6456924f131bf4f69c180b5fe SHA512 f2a85c8fecbfec02e5befd0c372b749b1b12b1cefbd3343cb73d5c74122ba566fcc14bd8e96296e70e98190f9dd248e9957bc729426a528fd185923f8bae7628 WHIRLPOOL 1cd804d06d801418da712c687751f5a1bb7af7397b85381e67c818cbfb2b3d6f0751ed0252aa4096b0021ea0929e133bb557a5c735e5bac9a5087d09b7c1b78d
+EBUILD selinux-puppet-2.20170805-r2.ebuild 282 SHA256 8c3638a54eef870c12c37c812203cce5ffbdccf6456924f131bf4f69c180b5fe SHA512 f2a85c8fecbfec02e5befd0c372b749b1b12b1cefbd3343cb73d5c74122ba566fcc14bd8e96296e70e98190f9dd248e9957bc729426a528fd185923f8bae7628 WHIRLPOOL 1cd804d06d801418da712c687751f5a1bb7af7397b85381e67c818cbfb2b3d6f0751ed0252aa4096b0021ea0929e133bb557a5c735e5bac9a5087d09b7c1b78d
+EBUILD selinux-puppet-2.20170805-r3.ebuild 284 SHA256 ebef832ee7bb45d79f640d6b6e16865c245ab67e953f124ffabeacf9b5a7140a SHA512 7a8c427f54afc34bb685fd353aab1edd18da78b697fa1b4816d72db2d523c34b51914133efc20eb9e05ef05028985203618a6f6660486e2e048a083c3bc47cee WHIRLPOOL 58e1ca3551feccc4073ab5500433501eeebac6f047567bf0c20e979c2a0bba8b167aa064daf1b8f5f0caa5c517071d3b922a2307204cf891686063f59c9f12f4
+EBUILD selinux-puppet-9999.ebuild 284 SHA256 ebef832ee7bb45d79f640d6b6e16865c245ab67e953f124ffabeacf9b5a7140a SHA512 7a8c427f54afc34bb685fd353aab1edd18da78b697fa1b4816d72db2d523c34b51914133efc20eb9e05ef05028985203618a6f6660486e2e048a083c3bc47cee WHIRLPOOL 58e1ca3551feccc4073ab5500433501eeebac6f047567bf0c20e979c2a0bba8b167aa064daf1b8f5f0caa5c517071d3b922a2307204cf891686063f59c9f12f4
 MISC ChangeLog 10571 SHA256 276d134685ebfca421058696ed9213b1d0ea48f0a81aa5f46ced11f2b72ed08d SHA512 dd34e1a658baa491d2921b0f652fa8f2740224f76240d0c0f9275eeb497e8fc78d4194d3d8ffedc631651c2e7b7394dabd339752ef1e16c3585cfaf83178d4a3 WHIRLPOOL 76861450858975ce011433f4ef73dfcf4c16a64f512ab3bf7426f7f20aa50e2b8dba10788f85aa296f88770f0a414480f3b8e68c119a9028231b2719e1f11fe8
 MISC ChangeLog-2015 11162 SHA256 c031e9c04000ee3a2a519084fb1d42d6da84d8a3473acfd3a5ac2104bba2d6af SHA512 f76fa7b44137b816ec289e9bf007fca04df5750d714717b8b2b11db446a24703ce59025887a5a3bbc90d06d46e7e1bc0d66ab10506e72983b35343c68c1661dd WHIRLPOOL 27bd734a86feb1a36dc0043eb5127cfc5746d07ff4d8c8425cb152d1ce09cee9613c888dc1993e63ac975b6f9de4075cd4809b543b5715b16a7554505ffade0d
 MISC metadata.xml 316 SHA256 4cd275f1ebf8202c1c09a7e8466fe8bca7b6db5b71cffa0483475c68cf6f6f93 SHA512 075a815fc9424250d8d6a37af0aac045f22851a10053e21da5e507989bd5e98a708c3969301b3f935eb8b6b16e6823eeed9a72003e924de052289d8400518a31 WHIRLPOOL 03a7f8cd8c1714f005ba8bb37f054ebac0cf0621d66b6527274a6565b4e48a49f1c2d8df428c58f72bf35165bfe799047ec220b0a0f0d66490bb11afbc3c3203
diff --git a/sec-policy/selinux-puppet/selinux-puppet-2.20170204-r1.ebuild b/sec-policy/selinux-puppet/selinux-puppet-2.20170204-r1.ebuild
index 23bccdcac174..fe530c6f9110 100644
--- a/sec-policy/selinux-puppet/selinux-puppet-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-puppet/selinux-puppet-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-puppet/selinux-puppet-2.20170204-r2.ebuild b/sec-policy/selinux-puppet/selinux-puppet-2.20170204-r2.ebuild
index b25f0e1033cc..1e54cd59cf9e 100644
--- a/sec-policy/selinux-puppet/selinux-puppet-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-puppet/selinux-puppet-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-puppet/selinux-puppet-2.20170204-r3.ebuild b/sec-policy/selinux-puppet/selinux-puppet-2.20170204-r3.ebuild
index b25f0e1033cc..1e54cd59cf9e 100644
--- a/sec-policy/selinux-puppet/selinux-puppet-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-puppet/selinux-puppet-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-puppet/selinux-puppet-2.20170204-r4.ebuild b/sec-policy/selinux-puppet/selinux-puppet-2.20170204-r4.ebuild
index b25f0e1033cc..1e54cd59cf9e 100644
--- a/sec-policy/selinux-puppet/selinux-puppet-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-puppet/selinux-puppet-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-puppet/selinux-puppet-2.20170805-r2.ebuild b/sec-policy/selinux-puppet/selinux-puppet-2.20170805-r2.ebuild
index b25f0e1033cc..1e54cd59cf9e 100644
--- a/sec-policy/selinux-puppet/selinux-puppet-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-puppet/selinux-puppet-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-puppet/selinux-puppet-2.20170805-r3.ebuild b/sec-policy/selinux-puppet/selinux-puppet-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..fe530c6f9110
--- /dev/null
+++ b/sec-policy/selinux-puppet/selinux-puppet-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-puppet/selinux-puppet-9999.ebuild b/sec-policy/selinux-puppet/selinux-puppet-9999.ebuild
index 23bccdcac174..fe530c6f9110 100644
--- a/sec-policy/selinux-puppet/selinux-puppet-9999.ebuild
+++ b/sec-policy/selinux-puppet/selinux-puppet-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-pyicqt/Manifest b/sec-policy/selinux-pyicqt/Manifest
index 29d600b897ca..3350e747ff2a 100644
--- a/sec-policy/selinux-pyicqt/Manifest
+++ b/sec-policy/selinux-pyicqt/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-pyicqt-2.20170204-r1.ebuild 283 SHA256 6db7130ef83ab1974a697a8ec4aa968edaad1860f07c608c99c9a567133cec01 SHA512 a1c31cf98d517bbc50d2422283f3e35de2feebc680884202810ad4e6a4a19812aff638ccc675e66054a18ad3d78cf718d03097dd9bd334e1062494402681e6fd WHIRLPOOL 8a04ec504090c6abf773fcfa9a821b02ef79e27a287f4aad163b6eafe8781b2d2402529081c6859b491156b3ebe9669c77f2317d04fe94d702be9794a1b35da1
-EBUILD selinux-pyicqt-2.20170204-r2.ebuild 281 SHA256 7cbdb378bbc73bc4bf04858ec304af2e9a63867a212cb5edf5cf97a9309ccb72 SHA512 12f56b6af948612875360c6c533af3efecf1e870161674fe392e8633a46b0fd74e13e7e04de799bbabc749e55d68d58a9e509492fbf59606eae69b2c07995991 WHIRLPOOL f48430f9c3f1a0e18158e0cc9b8a5454f9c434b11090291b0b287fa5c51a4d5873ce76e02dd9de8c140fd52dbf81fc886e0d075a63fd1c71f956062044b64deb
-EBUILD selinux-pyicqt-2.20170204-r3.ebuild 281 SHA256 7cbdb378bbc73bc4bf04858ec304af2e9a63867a212cb5edf5cf97a9309ccb72 SHA512 12f56b6af948612875360c6c533af3efecf1e870161674fe392e8633a46b0fd74e13e7e04de799bbabc749e55d68d58a9e509492fbf59606eae69b2c07995991 WHIRLPOOL f48430f9c3f1a0e18158e0cc9b8a5454f9c434b11090291b0b287fa5c51a4d5873ce76e02dd9de8c140fd52dbf81fc886e0d075a63fd1c71f956062044b64deb
-EBUILD selinux-pyicqt-2.20170204-r4.ebuild 281 SHA256 7cbdb378bbc73bc4bf04858ec304af2e9a63867a212cb5edf5cf97a9309ccb72 SHA512 12f56b6af948612875360c6c533af3efecf1e870161674fe392e8633a46b0fd74e13e7e04de799bbabc749e55d68d58a9e509492fbf59606eae69b2c07995991 WHIRLPOOL f48430f9c3f1a0e18158e0cc9b8a5454f9c434b11090291b0b287fa5c51a4d5873ce76e02dd9de8c140fd52dbf81fc886e0d075a63fd1c71f956062044b64deb
-EBUILD selinux-pyicqt-2.20170805-r2.ebuild 281 SHA256 7cbdb378bbc73bc4bf04858ec304af2e9a63867a212cb5edf5cf97a9309ccb72 SHA512 12f56b6af948612875360c6c533af3efecf1e870161674fe392e8633a46b0fd74e13e7e04de799bbabc749e55d68d58a9e509492fbf59606eae69b2c07995991 WHIRLPOOL f48430f9c3f1a0e18158e0cc9b8a5454f9c434b11090291b0b287fa5c51a4d5873ce76e02dd9de8c140fd52dbf81fc886e0d075a63fd1c71f956062044b64deb
-EBUILD selinux-pyicqt-9999.ebuild 283 SHA256 6db7130ef83ab1974a697a8ec4aa968edaad1860f07c608c99c9a567133cec01 SHA512 a1c31cf98d517bbc50d2422283f3e35de2feebc680884202810ad4e6a4a19812aff638ccc675e66054a18ad3d78cf718d03097dd9bd334e1062494402681e6fd WHIRLPOOL 8a04ec504090c6abf773fcfa9a821b02ef79e27a287f4aad163b6eafe8781b2d2402529081c6859b491156b3ebe9669c77f2317d04fe94d702be9794a1b35da1
+EBUILD selinux-pyicqt-2.20170204-r1.ebuild 284 SHA256 ac59290c864aeeb525e21d6ac67fb33006c7ff57459cf6f3256c745a3102647e SHA512 0f275aefcc63b6bb614333d9d63b9373b8227b1659bde89adbdd0dd774402644fec7bf479d97d1ddc2a145b245d54ab0b76836efe5fada9ffddbae9bd373036e WHIRLPOOL 78de8d264cbea188678461ddde0cde5f9be06264b90b2ff544dfc40d51d97676f40fa2a15eafa82044f923033e1cad48124a363eacb82c532ea92991e535f4e1
+EBUILD selinux-pyicqt-2.20170204-r2.ebuild 282 SHA256 0aa046059de190a8993f66f6b0202147f8be9d1930df690ce1896c7721f95fd3 SHA512 023da4f6e79a529f96a9861b547fdaa02713d893c92a4b82183b07f0f19e922b16566f4e5362f37d6938ee918be89bffa1e2cb57a67649359769c8f73d241504 WHIRLPOOL 729246bb7e324efd97a40f92c471fb307054cf3700b441108dac75892b58ef7021f30dace0e6e4a49811508d73ff14deda46678dc1287deafac27642239041cf
+EBUILD selinux-pyicqt-2.20170204-r3.ebuild 282 SHA256 0aa046059de190a8993f66f6b0202147f8be9d1930df690ce1896c7721f95fd3 SHA512 023da4f6e79a529f96a9861b547fdaa02713d893c92a4b82183b07f0f19e922b16566f4e5362f37d6938ee918be89bffa1e2cb57a67649359769c8f73d241504 WHIRLPOOL 729246bb7e324efd97a40f92c471fb307054cf3700b441108dac75892b58ef7021f30dace0e6e4a49811508d73ff14deda46678dc1287deafac27642239041cf
+EBUILD selinux-pyicqt-2.20170204-r4.ebuild 282 SHA256 0aa046059de190a8993f66f6b0202147f8be9d1930df690ce1896c7721f95fd3 SHA512 023da4f6e79a529f96a9861b547fdaa02713d893c92a4b82183b07f0f19e922b16566f4e5362f37d6938ee918be89bffa1e2cb57a67649359769c8f73d241504 WHIRLPOOL 729246bb7e324efd97a40f92c471fb307054cf3700b441108dac75892b58ef7021f30dace0e6e4a49811508d73ff14deda46678dc1287deafac27642239041cf
+EBUILD selinux-pyicqt-2.20170805-r2.ebuild 282 SHA256 0aa046059de190a8993f66f6b0202147f8be9d1930df690ce1896c7721f95fd3 SHA512 023da4f6e79a529f96a9861b547fdaa02713d893c92a4b82183b07f0f19e922b16566f4e5362f37d6938ee918be89bffa1e2cb57a67649359769c8f73d241504 WHIRLPOOL 729246bb7e324efd97a40f92c471fb307054cf3700b441108dac75892b58ef7021f30dace0e6e4a49811508d73ff14deda46678dc1287deafac27642239041cf
+EBUILD selinux-pyicqt-2.20170805-r3.ebuild 284 SHA256 ac59290c864aeeb525e21d6ac67fb33006c7ff57459cf6f3256c745a3102647e SHA512 0f275aefcc63b6bb614333d9d63b9373b8227b1659bde89adbdd0dd774402644fec7bf479d97d1ddc2a145b245d54ab0b76836efe5fada9ffddbae9bd373036e WHIRLPOOL 78de8d264cbea188678461ddde0cde5f9be06264b90b2ff544dfc40d51d97676f40fa2a15eafa82044f923033e1cad48124a363eacb82c532ea92991e535f4e1
+EBUILD selinux-pyicqt-9999.ebuild 284 SHA256 ac59290c864aeeb525e21d6ac67fb33006c7ff57459cf6f3256c745a3102647e SHA512 0f275aefcc63b6bb614333d9d63b9373b8227b1659bde89adbdd0dd774402644fec7bf479d97d1ddc2a145b245d54ab0b76836efe5fada9ffddbae9bd373036e WHIRLPOOL 78de8d264cbea188678461ddde0cde5f9be06264b90b2ff544dfc40d51d97676f40fa2a15eafa82044f923033e1cad48124a363eacb82c532ea92991e535f4e1
 MISC ChangeLog 10571 SHA256 504810ee087bc906dae2d2a3d1de31e4deb24af5077b0350a01c4002535d848a SHA512 397cdc3293a8fe0aefe11d276abb422550f62f3717e6aa275415aff6bf6d12d6a40e581a6b99738703fe6363e8e4f2e56b164cfb9f700f24c652d8ff66023e80 WHIRLPOOL 0041d09d67e76e63bd162385cdf4784f73e5b7d87ce914bff4b6a971803e1b5080b43d579385626bab588a1a81a00584062c499eb170204f36e6408c11c28e4e
 MISC ChangeLog-2015 9862 SHA256 6bc31be2040f7dd65a3a6bc1d564e4964bff60c12e4dc43325974fcee797de5e SHA512 8ead5c7f199145cb32eea68365a45e04dfb18731d65dd4f474d1de95179a6d5c80c0b6cef8655cd31c215cf873a1ae90db5b049d1fc94399863beb67419f2dc7 WHIRLPOOL 4ac72fbe0782a82d4affb5ef58c69b3791a9cfe8f858d918ca830212b04f30aa399984c8d9d8c0ee70ad0cdd34dae94e85b06c4bb1295ac57df8e37826c211ad
 MISC metadata.xml 316 SHA256 cf0331747107616ae52945734110414f6f924a5bebc46364d536e618048ae68e SHA512 639389768b8e94cabcef99bf8f0362d37f0711a2c9280e5b29cc5e39fa5ebc088f8048065109eba81387301cd4a4f878f2115a71ecf110bb56d3ae7483548dea WHIRLPOOL 826afea0d65a303a4ad2a55c34470481a3cc0e17997af584be209d42327133344ea0dbe729a52fa9e8c35b88c6920d0f060193011b942f162cbf1f53bdce554b
diff --git a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20170204-r1.ebuild b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20170204-r1.ebuild
index d03f62066ce3..03d0ddd72959 100644
--- a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20170204-r2.ebuild b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20170204-r2.ebuild
index c6ec2ec10c19..09982db295aa 100644
--- a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20170204-r3.ebuild b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20170204-r3.ebuild
index c6ec2ec10c19..09982db295aa 100644
--- a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20170204-r4.ebuild b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20170204-r4.ebuild
index c6ec2ec10c19..09982db295aa 100644
--- a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20170805-r2.ebuild b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20170805-r2.ebuild
index c6ec2ec10c19..09982db295aa 100644
--- a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20170805-r3.ebuild b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..03d0ddd72959
--- /dev/null
+++ b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-pyicqt/selinux-pyicqt-9999.ebuild b/sec-policy/selinux-pyicqt/selinux-pyicqt-9999.ebuild
index d03f62066ce3..03d0ddd72959 100644
--- a/sec-policy/selinux-pyicqt/selinux-pyicqt-9999.ebuild
+++ b/sec-policy/selinux-pyicqt/selinux-pyicqt-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-pyzor/Manifest b/sec-policy/selinux-pyzor/Manifest
index 3a8e27691809..d1c014cf4837 100644
--- a/sec-policy/selinux-pyzor/Manifest
+++ b/sec-policy/selinux-pyzor/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-pyzor-2.20170204-r1.ebuild 281 SHA256 9edeedd5eaa42ee902d8b361c6979af64a8361c192f1ffe9767fe71f7c433195 SHA512 112ab1d9aad979790f4f5786112226f918cfb3540df935b51cfd3cb898e10f2890b749235dc3f80e31acb1233968f78529434012662fad34dec0c22a16dd677e WHIRLPOOL b78491a3bd19bed1b8d0c9df36c6c312b8e4ebd2693c94976fafcbdc2c0190f06214dfcbe30228c6fb6ea9938c79c59e29e88e032349981ec70c30c2a5edaadd
-EBUILD selinux-pyzor-2.20170204-r2.ebuild 279 SHA256 31d9644ab9265d6bce96c1359a48ea2331b642fb486de74a034fe9acceea281c SHA512 db98ec7adde90a695aa2e2e0900a94fb000591a751fd53f83b4582762568ea9f0c7509026473040422efb382011b588a3321d4f4170a3fc931fc027864ca388c WHIRLPOOL ab4ec0d465356c33dc4b81581005639857577ccb2bda9e6fd8b9f0be9562452b5931b49f431de3a411b16436efe433a8d8ee9eae9c715d0eb38231783a7e1bc6
-EBUILD selinux-pyzor-2.20170204-r3.ebuild 279 SHA256 31d9644ab9265d6bce96c1359a48ea2331b642fb486de74a034fe9acceea281c SHA512 db98ec7adde90a695aa2e2e0900a94fb000591a751fd53f83b4582762568ea9f0c7509026473040422efb382011b588a3321d4f4170a3fc931fc027864ca388c WHIRLPOOL ab4ec0d465356c33dc4b81581005639857577ccb2bda9e6fd8b9f0be9562452b5931b49f431de3a411b16436efe433a8d8ee9eae9c715d0eb38231783a7e1bc6
-EBUILD selinux-pyzor-2.20170204-r4.ebuild 279 SHA256 31d9644ab9265d6bce96c1359a48ea2331b642fb486de74a034fe9acceea281c SHA512 db98ec7adde90a695aa2e2e0900a94fb000591a751fd53f83b4582762568ea9f0c7509026473040422efb382011b588a3321d4f4170a3fc931fc027864ca388c WHIRLPOOL ab4ec0d465356c33dc4b81581005639857577ccb2bda9e6fd8b9f0be9562452b5931b49f431de3a411b16436efe433a8d8ee9eae9c715d0eb38231783a7e1bc6
-EBUILD selinux-pyzor-2.20170805-r2.ebuild 279 SHA256 31d9644ab9265d6bce96c1359a48ea2331b642fb486de74a034fe9acceea281c SHA512 db98ec7adde90a695aa2e2e0900a94fb000591a751fd53f83b4582762568ea9f0c7509026473040422efb382011b588a3321d4f4170a3fc931fc027864ca388c WHIRLPOOL ab4ec0d465356c33dc4b81581005639857577ccb2bda9e6fd8b9f0be9562452b5931b49f431de3a411b16436efe433a8d8ee9eae9c715d0eb38231783a7e1bc6
-EBUILD selinux-pyzor-9999.ebuild 281 SHA256 9edeedd5eaa42ee902d8b361c6979af64a8361c192f1ffe9767fe71f7c433195 SHA512 112ab1d9aad979790f4f5786112226f918cfb3540df935b51cfd3cb898e10f2890b749235dc3f80e31acb1233968f78529434012662fad34dec0c22a16dd677e WHIRLPOOL b78491a3bd19bed1b8d0c9df36c6c312b8e4ebd2693c94976fafcbdc2c0190f06214dfcbe30228c6fb6ea9938c79c59e29e88e032349981ec70c30c2a5edaadd
+EBUILD selinux-pyzor-2.20170204-r1.ebuild 282 SHA256 a5276723da08a5b333d72eede7a62db774bfe6aca767a08eb50bf70e5f549079 SHA512 dfa691cd0e5b07200beb5aec555eceaa8b4234a5415ce6211d16abbcc597a3039f8ee3b045f1bdd633f5eed70d6848f515c9919dcbfe080c352b92662fc3a43e WHIRLPOOL cfe130032877a6d59c34c1c45f22a38273ea1633d1b494e02c199f2775ad994a7fa78cc7e94733b40d7b4f6bb48930b5f1bfb4eaa4fc6993465e5083e38bf47e
+EBUILD selinux-pyzor-2.20170204-r2.ebuild 280 SHA256 c55e0c9c9b699b4e225d231cce2ab647aa3a9e3e2ef76837d1a7efdbf7efefca SHA512 cabfc1603fcdacd54aa61e483e76fa5ca9afff8bcc612161f1d8596e6353ebf22a521abf475a22a4ab88a0e811a4a4df0dfcfa23f1a847f75f7c085c909ec93b WHIRLPOOL 6ab4056f497f89a5f9e208ba5bd3f2e5107478e4bde6ad77cbdab7f64817574efe392e0b344c9c3f5300ab3886659fb735824e98c84b1dd48b9a6d7df60ef18b
+EBUILD selinux-pyzor-2.20170204-r3.ebuild 280 SHA256 c55e0c9c9b699b4e225d231cce2ab647aa3a9e3e2ef76837d1a7efdbf7efefca SHA512 cabfc1603fcdacd54aa61e483e76fa5ca9afff8bcc612161f1d8596e6353ebf22a521abf475a22a4ab88a0e811a4a4df0dfcfa23f1a847f75f7c085c909ec93b WHIRLPOOL 6ab4056f497f89a5f9e208ba5bd3f2e5107478e4bde6ad77cbdab7f64817574efe392e0b344c9c3f5300ab3886659fb735824e98c84b1dd48b9a6d7df60ef18b
+EBUILD selinux-pyzor-2.20170204-r4.ebuild 280 SHA256 c55e0c9c9b699b4e225d231cce2ab647aa3a9e3e2ef76837d1a7efdbf7efefca SHA512 cabfc1603fcdacd54aa61e483e76fa5ca9afff8bcc612161f1d8596e6353ebf22a521abf475a22a4ab88a0e811a4a4df0dfcfa23f1a847f75f7c085c909ec93b WHIRLPOOL 6ab4056f497f89a5f9e208ba5bd3f2e5107478e4bde6ad77cbdab7f64817574efe392e0b344c9c3f5300ab3886659fb735824e98c84b1dd48b9a6d7df60ef18b
+EBUILD selinux-pyzor-2.20170805-r2.ebuild 280 SHA256 c55e0c9c9b699b4e225d231cce2ab647aa3a9e3e2ef76837d1a7efdbf7efefca SHA512 cabfc1603fcdacd54aa61e483e76fa5ca9afff8bcc612161f1d8596e6353ebf22a521abf475a22a4ab88a0e811a4a4df0dfcfa23f1a847f75f7c085c909ec93b WHIRLPOOL 6ab4056f497f89a5f9e208ba5bd3f2e5107478e4bde6ad77cbdab7f64817574efe392e0b344c9c3f5300ab3886659fb735824e98c84b1dd48b9a6d7df60ef18b
+EBUILD selinux-pyzor-2.20170805-r3.ebuild 282 SHA256 a5276723da08a5b333d72eede7a62db774bfe6aca767a08eb50bf70e5f549079 SHA512 dfa691cd0e5b07200beb5aec555eceaa8b4234a5415ce6211d16abbcc597a3039f8ee3b045f1bdd633f5eed70d6848f515c9919dcbfe080c352b92662fc3a43e WHIRLPOOL cfe130032877a6d59c34c1c45f22a38273ea1633d1b494e02c199f2775ad994a7fa78cc7e94733b40d7b4f6bb48930b5f1bfb4eaa4fc6993465e5083e38bf47e
+EBUILD selinux-pyzor-9999.ebuild 282 SHA256 a5276723da08a5b333d72eede7a62db774bfe6aca767a08eb50bf70e5f549079 SHA512 dfa691cd0e5b07200beb5aec555eceaa8b4234a5415ce6211d16abbcc597a3039f8ee3b045f1bdd633f5eed70d6848f515c9919dcbfe080c352b92662fc3a43e WHIRLPOOL cfe130032877a6d59c34c1c45f22a38273ea1633d1b494e02c199f2775ad994a7fa78cc7e94733b40d7b4f6bb48930b5f1bfb4eaa4fc6993465e5083e38bf47e
 MISC ChangeLog 10479 SHA256 f98c9c4196f8b9e8978cb285db915d7dbdd34d73ad0a7edadc380b4240f4e069 SHA512 45642e3d811a1a0f4bc5803a2817627b2a56b5571531374cff7aa10f9f3be074e8907804a468495acd686146027fdc515b7cce0ebbe8d4ead7703b2e7972348a WHIRLPOOL 6b7d347d2d9ebc5573819ab87a7e938e5426b30c3c6426b293c59d11305c216b134c26c5976100c04ffcb6036eae1be9890176ff54a9a442901e32b4cfa204f5
 MISC ChangeLog-2015 11247 SHA256 52582a6240d1ea0d58c1cf51fc38d4d621bcee97e2b923cbd157317ba47035bc SHA512 19e53c789c33b7304f16dea9385e982c4061a2d0f10f18606564974c867441d7b8b5528b07a03d3c31295f54cb5317a9fbd9c336c81ff78bd3d476df037f20a8 WHIRLPOOL dc948bac4c63ae01e013783f4ade4e5e2b2692a6ea1642e9da05ff7f07652be6f54961c5deece68faeb87805be092e432b40f82ada77b06910b66b3f6e440c35
 MISC metadata.xml 315 SHA256 d0505879da4655c9989ba866c3939888fa784077d1cd51423c928ed879d5c033 SHA512 6a068357d8420fe2434228757a54cbd193f5a0ad645902603261d512f78853a45573143d522cee139d97e9ccbed8af8562325442aa0c89f6feb9760cb2924029 WHIRLPOOL 33ad4d3fa0888f74449fb37851e6f12cc20adae179166f0dd0c6d186d7357a20cc780506af91ee5ddace13103fbfe6105278a358f7c667872312a50e32490b99
diff --git a/sec-policy/selinux-pyzor/selinux-pyzor-2.20170204-r1.ebuild b/sec-policy/selinux-pyzor/selinux-pyzor-2.20170204-r1.ebuild
index 0e638ec6600e..f8260fdc84ba 100644
--- a/sec-policy/selinux-pyzor/selinux-pyzor-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-pyzor/selinux-pyzor-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-pyzor/selinux-pyzor-2.20170204-r2.ebuild b/sec-policy/selinux-pyzor/selinux-pyzor-2.20170204-r2.ebuild
index 60ae764d8d2a..0ad570dad2d9 100644
--- a/sec-policy/selinux-pyzor/selinux-pyzor-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-pyzor/selinux-pyzor-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-pyzor/selinux-pyzor-2.20170204-r3.ebuild b/sec-policy/selinux-pyzor/selinux-pyzor-2.20170204-r3.ebuild
index 60ae764d8d2a..0ad570dad2d9 100644
--- a/sec-policy/selinux-pyzor/selinux-pyzor-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-pyzor/selinux-pyzor-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-pyzor/selinux-pyzor-2.20170204-r4.ebuild b/sec-policy/selinux-pyzor/selinux-pyzor-2.20170204-r4.ebuild
index 60ae764d8d2a..0ad570dad2d9 100644
--- a/sec-policy/selinux-pyzor/selinux-pyzor-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-pyzor/selinux-pyzor-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-pyzor/selinux-pyzor-2.20170805-r2.ebuild b/sec-policy/selinux-pyzor/selinux-pyzor-2.20170805-r2.ebuild
index 60ae764d8d2a..0ad570dad2d9 100644
--- a/sec-policy/selinux-pyzor/selinux-pyzor-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-pyzor/selinux-pyzor-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-pyzor/selinux-pyzor-2.20170805-r3.ebuild b/sec-policy/selinux-pyzor/selinux-pyzor-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..f8260fdc84ba
--- /dev/null
+++ b/sec-policy/selinux-pyzor/selinux-pyzor-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-pyzor/selinux-pyzor-9999.ebuild b/sec-policy/selinux-pyzor/selinux-pyzor-9999.ebuild
index 0e638ec6600e..f8260fdc84ba 100644
--- a/sec-policy/selinux-pyzor/selinux-pyzor-9999.ebuild
+++ b/sec-policy/selinux-pyzor/selinux-pyzor-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-qemu/Manifest b/sec-policy/selinux-qemu/Manifest
index 9c61d530d84a..53800d2b22fd 100644
--- a/sec-policy/selinux-qemu/Manifest
+++ b/sec-policy/selinux-qemu/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-qemu-2.20170204-r1.ebuild 371 SHA256 f04d40ece15e60240eabdaebbce26250beb85bc5397e059884b8604d1d561f03 SHA512 8e7c704a6f78094eedd3aea04454fb3ae246e2dd3c8734dcc32ed800b5f7e2eee095f6e3d0769a0720f4f614b68d40c7c360d5ecbc4cd66f7c331d4f1b3a06b4 WHIRLPOOL d7322344f3f856d8dcfd442d6228043d08163fe17d22e158b059b915580d9bcb803e35706e968b9ac620bc2e122fdb4f46afabe48bf0bdf77ae0b7d824769d5f
-EBUILD selinux-qemu-2.20170204-r2.ebuild 369 SHA256 692f60d018b4fe81fd108601ba25d462988bce6d788c21eafcbecebcfbbad86b SHA512 ebb7c51620c5f301f012162258d77e037ffa8b4c6123cee94afc04ff03366300aba33b7ed9d0577f144372f06fc342f48e737e76b6be7fbbd42f145ca91c093e WHIRLPOOL 5f48767dd4453f05af9230dc5cdc52448c53cfcdf6b44b2aad8875490af6d1ffd896a62eb225daf20c79e45a917778a37e0b6a27784f23ad5c8ca4ee95d8c58e
-EBUILD selinux-qemu-2.20170204-r3.ebuild 369 SHA256 692f60d018b4fe81fd108601ba25d462988bce6d788c21eafcbecebcfbbad86b SHA512 ebb7c51620c5f301f012162258d77e037ffa8b4c6123cee94afc04ff03366300aba33b7ed9d0577f144372f06fc342f48e737e76b6be7fbbd42f145ca91c093e WHIRLPOOL 5f48767dd4453f05af9230dc5cdc52448c53cfcdf6b44b2aad8875490af6d1ffd896a62eb225daf20c79e45a917778a37e0b6a27784f23ad5c8ca4ee95d8c58e
-EBUILD selinux-qemu-2.20170204-r4.ebuild 369 SHA256 692f60d018b4fe81fd108601ba25d462988bce6d788c21eafcbecebcfbbad86b SHA512 ebb7c51620c5f301f012162258d77e037ffa8b4c6123cee94afc04ff03366300aba33b7ed9d0577f144372f06fc342f48e737e76b6be7fbbd42f145ca91c093e WHIRLPOOL 5f48767dd4453f05af9230dc5cdc52448c53cfcdf6b44b2aad8875490af6d1ffd896a62eb225daf20c79e45a917778a37e0b6a27784f23ad5c8ca4ee95d8c58e
-EBUILD selinux-qemu-2.20170805-r2.ebuild 369 SHA256 692f60d018b4fe81fd108601ba25d462988bce6d788c21eafcbecebcfbbad86b SHA512 ebb7c51620c5f301f012162258d77e037ffa8b4c6123cee94afc04ff03366300aba33b7ed9d0577f144372f06fc342f48e737e76b6be7fbbd42f145ca91c093e WHIRLPOOL 5f48767dd4453f05af9230dc5cdc52448c53cfcdf6b44b2aad8875490af6d1ffd896a62eb225daf20c79e45a917778a37e0b6a27784f23ad5c8ca4ee95d8c58e
-EBUILD selinux-qemu-9999.ebuild 371 SHA256 f04d40ece15e60240eabdaebbce26250beb85bc5397e059884b8604d1d561f03 SHA512 8e7c704a6f78094eedd3aea04454fb3ae246e2dd3c8734dcc32ed800b5f7e2eee095f6e3d0769a0720f4f614b68d40c7c360d5ecbc4cd66f7c331d4f1b3a06b4 WHIRLPOOL d7322344f3f856d8dcfd442d6228043d08163fe17d22e158b059b915580d9bcb803e35706e968b9ac620bc2e122fdb4f46afabe48bf0bdf77ae0b7d824769d5f
+EBUILD selinux-qemu-2.20170204-r1.ebuild 372 SHA256 82a1435792c03daec8eef93eab5122fd4b1d4b0560e15e9205d2e1e43b863a01 SHA512 83ebd75cda1a8559094890e30defe3947ff2a764eafbe15f663a3ed0553bfeb0cc42402bdee0edccd966dd468d18db3ad2fee2d5b1fe2d1560fb1321256a8db7 WHIRLPOOL 5bf7f782d0d19d06409de633db2f3ef79d94bda9e2e3aec59833f4c8e9c31ced3e05a12e894658f36d35499d93842d4b1ce0cf7c35bc411f941967f7b0422c48
+EBUILD selinux-qemu-2.20170204-r2.ebuild 370 SHA256 7af65a91d95b247e2d346438a30f49110ccfc78af982ee05952cfc8041e60143 SHA512 e587c59bc049fe4d6af8819b5fa16d67f445afa1bc63e7ea33e381d8cf9f4b2412c17678e9ae11344c4ca37ce73e2527a10e562457cca4f4476edeadac6362fd WHIRLPOOL a466851e8262cf3e3000c3ebcca3288cbb9becd6cef189c4651e455adaf45454495e5fa785b47400b4f3151590948007bc05091e61fdcf214b5a38ecc99e0ecc
+EBUILD selinux-qemu-2.20170204-r3.ebuild 370 SHA256 7af65a91d95b247e2d346438a30f49110ccfc78af982ee05952cfc8041e60143 SHA512 e587c59bc049fe4d6af8819b5fa16d67f445afa1bc63e7ea33e381d8cf9f4b2412c17678e9ae11344c4ca37ce73e2527a10e562457cca4f4476edeadac6362fd WHIRLPOOL a466851e8262cf3e3000c3ebcca3288cbb9becd6cef189c4651e455adaf45454495e5fa785b47400b4f3151590948007bc05091e61fdcf214b5a38ecc99e0ecc
+EBUILD selinux-qemu-2.20170204-r4.ebuild 370 SHA256 7af65a91d95b247e2d346438a30f49110ccfc78af982ee05952cfc8041e60143 SHA512 e587c59bc049fe4d6af8819b5fa16d67f445afa1bc63e7ea33e381d8cf9f4b2412c17678e9ae11344c4ca37ce73e2527a10e562457cca4f4476edeadac6362fd WHIRLPOOL a466851e8262cf3e3000c3ebcca3288cbb9becd6cef189c4651e455adaf45454495e5fa785b47400b4f3151590948007bc05091e61fdcf214b5a38ecc99e0ecc
+EBUILD selinux-qemu-2.20170805-r2.ebuild 370 SHA256 7af65a91d95b247e2d346438a30f49110ccfc78af982ee05952cfc8041e60143 SHA512 e587c59bc049fe4d6af8819b5fa16d67f445afa1bc63e7ea33e381d8cf9f4b2412c17678e9ae11344c4ca37ce73e2527a10e562457cca4f4476edeadac6362fd WHIRLPOOL a466851e8262cf3e3000c3ebcca3288cbb9becd6cef189c4651e455adaf45454495e5fa785b47400b4f3151590948007bc05091e61fdcf214b5a38ecc99e0ecc
+EBUILD selinux-qemu-2.20170805-r3.ebuild 372 SHA256 82a1435792c03daec8eef93eab5122fd4b1d4b0560e15e9205d2e1e43b863a01 SHA512 83ebd75cda1a8559094890e30defe3947ff2a764eafbe15f663a3ed0553bfeb0cc42402bdee0edccd966dd468d18db3ad2fee2d5b1fe2d1560fb1321256a8db7 WHIRLPOOL 5bf7f782d0d19d06409de633db2f3ef79d94bda9e2e3aec59833f4c8e9c31ced3e05a12e894658f36d35499d93842d4b1ce0cf7c35bc411f941967f7b0422c48
+EBUILD selinux-qemu-9999.ebuild 372 SHA256 82a1435792c03daec8eef93eab5122fd4b1d4b0560e15e9205d2e1e43b863a01 SHA512 83ebd75cda1a8559094890e30defe3947ff2a764eafbe15f663a3ed0553bfeb0cc42402bdee0edccd966dd468d18db3ad2fee2d5b1fe2d1560fb1321256a8db7 WHIRLPOOL 5bf7f782d0d19d06409de633db2f3ef79d94bda9e2e3aec59833f4c8e9c31ced3e05a12e894658f36d35499d93842d4b1ce0cf7c35bc411f941967f7b0422c48
 MISC ChangeLog 10387 SHA256 c39eda0b590ce2670a54d8ff218d21bf13dcb1edf9d6064196f25a5ff9214c75 SHA512 20cbda5db88b9b03d578614ad623e4239436a5112d17657d46a1ae353ce052d75ee9fdfcdbcdd03ea6cc64ed173c802e6a1702744ee204fc694a0d2d7fb32969 WHIRLPOOL 6ab7a1fe46ffe0496e24dff7d4d914900b662e12b87bc8d5191d0945053da1c2d10892f8b05c2ecb11566870f4c23ed9d03489f4906a89f96f6057a4a914cae4
 MISC ChangeLog-2015 10845 SHA256 d450e4e540bd5c699574c894111b0c9567e03e11c4dbb35f43ee2fd756b38c66 SHA512 bf6978a901f8fcb872f455161056ede9780e4b4d854819690ceff5a0d9658ac0b978d7ba5a240429ba376fbb092dc5fb6f43f017168e8c724b2a91c9958d9e3c WHIRLPOOL ced16f8cbcf1924a62e0ec9f1052d17fcd195452cb3fed4089f265b303dcbc760ef876e9651930fed8d23c81655eeb7b75674df22b7820078457e2939e6d3de4
 MISC metadata.xml 314 SHA256 0bcf48b63f9b56c2e7c76a8cfdc0ca741a6cf3973c256182b175b464cb47b9f7 SHA512 ce815f5d3ee896942198504d8b1156c2508978f6de36773b816b2d132a045889caa740a033a517b5447bd24414a97bad2950a4b43b8a4c762facffe983ff020a WHIRLPOOL a0681e4a0b5a09f4af2271f7f0cafd97aed11705532f7652377671c55810ce20a649a12b2821637b31f047b3f92cee4b3f5c169cebc69700e4badc63b7ac1aa5
diff --git a/sec-policy/selinux-qemu/selinux-qemu-2.20170204-r1.ebuild b/sec-policy/selinux-qemu/selinux-qemu-2.20170204-r1.ebuild
index 3886030fe9e6..55511c28b3cd 100644
--- a/sec-policy/selinux-qemu/selinux-qemu-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-qemu/selinux-qemu-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-qemu/selinux-qemu-2.20170204-r2.ebuild b/sec-policy/selinux-qemu/selinux-qemu-2.20170204-r2.ebuild
index 57068c685dce..011cb0278ab4 100644
--- a/sec-policy/selinux-qemu/selinux-qemu-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-qemu/selinux-qemu-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-qemu/selinux-qemu-2.20170204-r3.ebuild b/sec-policy/selinux-qemu/selinux-qemu-2.20170204-r3.ebuild
index 57068c685dce..011cb0278ab4 100644
--- a/sec-policy/selinux-qemu/selinux-qemu-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-qemu/selinux-qemu-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-qemu/selinux-qemu-2.20170204-r4.ebuild b/sec-policy/selinux-qemu/selinux-qemu-2.20170204-r4.ebuild
index 57068c685dce..011cb0278ab4 100644
--- a/sec-policy/selinux-qemu/selinux-qemu-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-qemu/selinux-qemu-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-qemu/selinux-qemu-2.20170805-r2.ebuild b/sec-policy/selinux-qemu/selinux-qemu-2.20170805-r2.ebuild
index 57068c685dce..011cb0278ab4 100644
--- a/sec-policy/selinux-qemu/selinux-qemu-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-qemu/selinux-qemu-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-qemu/selinux-qemu-2.20170805-r3.ebuild b/sec-policy/selinux-qemu/selinux-qemu-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..55511c28b3cd
--- /dev/null
+++ b/sec-policy/selinux-qemu/selinux-qemu-2.20170805-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-qemu/selinux-qemu-9999.ebuild b/sec-policy/selinux-qemu/selinux-qemu-9999.ebuild
index 3886030fe9e6..55511c28b3cd 100644
--- a/sec-policy/selinux-qemu/selinux-qemu-9999.ebuild
+++ b/sec-policy/selinux-qemu/selinux-qemu-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-qmail/Manifest b/sec-policy/selinux-qmail/Manifest
index c215a2e0ce1e..24991ec09412 100644
--- a/sec-policy/selinux-qmail/Manifest
+++ b/sec-policy/selinux-qmail/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-qmail-2.20170204-r1.ebuild 281 SHA256 88baa8dd5d99951ba5a6221088d95269d0c2bead337d82853965f343502b9908 SHA512 8a547a197e4344d1c49b1d6f85d7b7542f3b0cf8e772b9e37ce211a66d66407e0a4bc0036a0b6fec569d2a495bfa8f9071d904850cb89b9d276ab3407c18996a WHIRLPOOL 9c380558505e65991ac7e299a2c0cd131a1ddca321e206553681b49e988f6d704ba4cae92132370cf32de8fcda10bb633f0829cbf90eda2e60e59ba50ddd9ffa
-EBUILD selinux-qmail-2.20170204-r2.ebuild 279 SHA256 12565e9df174e21f5bd751cde0edb4619c347539cb4cc9af5b1a58d39c17ac63 SHA512 6a6c7a382188960550c2d5cb90bcb2ee96010caa73599c4d03e4ada6d36c72c1d2c6107d9ed1f6067f7a2b76a9b21595f745b6de1a4f4988239b84e9dbc14e96 WHIRLPOOL 44479a72b510fdfed23a15fb018c3277eb1a937a613761739e0817e9663ed0a10659b13857eb5b01a52f100c3ca9561603b6cb68165464cbdfb4fee592985f10
-EBUILD selinux-qmail-2.20170204-r3.ebuild 279 SHA256 12565e9df174e21f5bd751cde0edb4619c347539cb4cc9af5b1a58d39c17ac63 SHA512 6a6c7a382188960550c2d5cb90bcb2ee96010caa73599c4d03e4ada6d36c72c1d2c6107d9ed1f6067f7a2b76a9b21595f745b6de1a4f4988239b84e9dbc14e96 WHIRLPOOL 44479a72b510fdfed23a15fb018c3277eb1a937a613761739e0817e9663ed0a10659b13857eb5b01a52f100c3ca9561603b6cb68165464cbdfb4fee592985f10
-EBUILD selinux-qmail-2.20170204-r4.ebuild 279 SHA256 12565e9df174e21f5bd751cde0edb4619c347539cb4cc9af5b1a58d39c17ac63 SHA512 6a6c7a382188960550c2d5cb90bcb2ee96010caa73599c4d03e4ada6d36c72c1d2c6107d9ed1f6067f7a2b76a9b21595f745b6de1a4f4988239b84e9dbc14e96 WHIRLPOOL 44479a72b510fdfed23a15fb018c3277eb1a937a613761739e0817e9663ed0a10659b13857eb5b01a52f100c3ca9561603b6cb68165464cbdfb4fee592985f10
-EBUILD selinux-qmail-2.20170805-r2.ebuild 279 SHA256 12565e9df174e21f5bd751cde0edb4619c347539cb4cc9af5b1a58d39c17ac63 SHA512 6a6c7a382188960550c2d5cb90bcb2ee96010caa73599c4d03e4ada6d36c72c1d2c6107d9ed1f6067f7a2b76a9b21595f745b6de1a4f4988239b84e9dbc14e96 WHIRLPOOL 44479a72b510fdfed23a15fb018c3277eb1a937a613761739e0817e9663ed0a10659b13857eb5b01a52f100c3ca9561603b6cb68165464cbdfb4fee592985f10
-EBUILD selinux-qmail-9999.ebuild 281 SHA256 88baa8dd5d99951ba5a6221088d95269d0c2bead337d82853965f343502b9908 SHA512 8a547a197e4344d1c49b1d6f85d7b7542f3b0cf8e772b9e37ce211a66d66407e0a4bc0036a0b6fec569d2a495bfa8f9071d904850cb89b9d276ab3407c18996a WHIRLPOOL 9c380558505e65991ac7e299a2c0cd131a1ddca321e206553681b49e988f6d704ba4cae92132370cf32de8fcda10bb633f0829cbf90eda2e60e59ba50ddd9ffa
+EBUILD selinux-qmail-2.20170204-r1.ebuild 282 SHA256 3eb2297768be51081fbdfa8dd57228c8ff6940f11142cf7ab8ee4fd7fa97475b SHA512 3805bd59040ef634d8fa4b6322aa1e85202fe19c1c5301724423d05c142d34c1c618f4aa0350a80aa549a639b6f1354997d6d541fc1ca536752004d651901e27 WHIRLPOOL 52e71910197e8f04eebb77be2e4894c9036ffb188cc3d75a43771853f4a818f11da8ab6e0c25b1dcc1408c64cfbff39a273ef26c3bfa2b3ec5afc6007a17cc99
+EBUILD selinux-qmail-2.20170204-r2.ebuild 280 SHA256 be31ccccfe312f9892f74be6279b8f11fbe1a0faca0adbe50b61928c0a9124f2 SHA512 565fb76759b07593c5acb7ba321c0c1b78daefcbfcdab67f6a38176899780a06b108710e23ac482fe8e0fb692a917790b170ce4b2921221214b50b161e12eb5f WHIRLPOOL 77c1de3a920462a3f4a58d8ab1f25d5112ec6bb4b5c60096bb4df3f86c85381f7006e271e58c9eace3a0eedf8cede5f8fc25e115bb35243ad993feb0bf9d2412
+EBUILD selinux-qmail-2.20170204-r3.ebuild 280 SHA256 be31ccccfe312f9892f74be6279b8f11fbe1a0faca0adbe50b61928c0a9124f2 SHA512 565fb76759b07593c5acb7ba321c0c1b78daefcbfcdab67f6a38176899780a06b108710e23ac482fe8e0fb692a917790b170ce4b2921221214b50b161e12eb5f WHIRLPOOL 77c1de3a920462a3f4a58d8ab1f25d5112ec6bb4b5c60096bb4df3f86c85381f7006e271e58c9eace3a0eedf8cede5f8fc25e115bb35243ad993feb0bf9d2412
+EBUILD selinux-qmail-2.20170204-r4.ebuild 280 SHA256 be31ccccfe312f9892f74be6279b8f11fbe1a0faca0adbe50b61928c0a9124f2 SHA512 565fb76759b07593c5acb7ba321c0c1b78daefcbfcdab67f6a38176899780a06b108710e23ac482fe8e0fb692a917790b170ce4b2921221214b50b161e12eb5f WHIRLPOOL 77c1de3a920462a3f4a58d8ab1f25d5112ec6bb4b5c60096bb4df3f86c85381f7006e271e58c9eace3a0eedf8cede5f8fc25e115bb35243ad993feb0bf9d2412
+EBUILD selinux-qmail-2.20170805-r2.ebuild 280 SHA256 be31ccccfe312f9892f74be6279b8f11fbe1a0faca0adbe50b61928c0a9124f2 SHA512 565fb76759b07593c5acb7ba321c0c1b78daefcbfcdab67f6a38176899780a06b108710e23ac482fe8e0fb692a917790b170ce4b2921221214b50b161e12eb5f WHIRLPOOL 77c1de3a920462a3f4a58d8ab1f25d5112ec6bb4b5c60096bb4df3f86c85381f7006e271e58c9eace3a0eedf8cede5f8fc25e115bb35243ad993feb0bf9d2412
+EBUILD selinux-qmail-2.20170805-r3.ebuild 282 SHA256 3eb2297768be51081fbdfa8dd57228c8ff6940f11142cf7ab8ee4fd7fa97475b SHA512 3805bd59040ef634d8fa4b6322aa1e85202fe19c1c5301724423d05c142d34c1c618f4aa0350a80aa549a639b6f1354997d6d541fc1ca536752004d651901e27 WHIRLPOOL 52e71910197e8f04eebb77be2e4894c9036ffb188cc3d75a43771853f4a818f11da8ab6e0c25b1dcc1408c64cfbff39a273ef26c3bfa2b3ec5afc6007a17cc99
+EBUILD selinux-qmail-9999.ebuild 282 SHA256 3eb2297768be51081fbdfa8dd57228c8ff6940f11142cf7ab8ee4fd7fa97475b SHA512 3805bd59040ef634d8fa4b6322aa1e85202fe19c1c5301724423d05c142d34c1c618f4aa0350a80aa549a639b6f1354997d6d541fc1ca536752004d651901e27 WHIRLPOOL 52e71910197e8f04eebb77be2e4894c9036ffb188cc3d75a43771853f4a818f11da8ab6e0c25b1dcc1408c64cfbff39a273ef26c3bfa2b3ec5afc6007a17cc99
 MISC ChangeLog 10479 SHA256 ff36bea04ea22353d1c31c54a803b633f1898ee60006edde6675b0beab9f0053 SHA512 f617e7ebd3fb2fafad91db3dac5732d84d5e4966f09b4ac09eed54d70459baa1cdd1a598be1212491c2f339ed4025a94c7818afec0f8121d3435624316287064 WHIRLPOOL d059d2f00684bb2df01b180abf4d896cae8774f6e0027083c2ab2c95647246d065ad7ff3ec9aef235fc5de82783a93b2543a8210cd621bffa78ac27e1589ecc9
 MISC ChangeLog-2015 13491 SHA256 8bd5035cbfd644e478aee9d7307abc2b8664859884683ee1b3ae9e93e399aa80 SHA512 57d298ea355f7f9bff182015bedad9cf93b23589f224262dfeb70c1075faabaf8baff8832db359e7d31db3de695f5695a7ee102c2607a8dc04577830378dd48d WHIRLPOOL 59c0a51d172e65e3fd51548d789cf9d9a468f69d4eea377238e4b7fab0c194f6d01086b95c0f23af48b08f35e68654f715f8e15b7efcb58fa69bde2ea3e19fb9
 MISC metadata.xml 315 SHA256 891b1fbd4dd2bf96f71dd8ada84c2875e08764a3a3441ad4e6479b6966f562c4 SHA512 b37ef0a329dedd9fb843e7d8f10d3153afab24b82336fdfd2dc03c713ce36cbf90a1506837ffefaed140d839af1a0f38e479a3f1ee6829c4d33cfef3cc8f5f95 WHIRLPOOL 7ab349f29dae80fc16352fa5e3135ed4a9139934855eb8091b586fc27d26080220d77df0a9f51ecd45b6d12cb2c51640d9bfd260c688ce3f83225de2d140c135
diff --git a/sec-policy/selinux-qmail/selinux-qmail-2.20170204-r1.ebuild b/sec-policy/selinux-qmail/selinux-qmail-2.20170204-r1.ebuild
index 2152b844051e..184de3cb7caa 100644
--- a/sec-policy/selinux-qmail/selinux-qmail-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-qmail/selinux-qmail-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-qmail/selinux-qmail-2.20170204-r2.ebuild b/sec-policy/selinux-qmail/selinux-qmail-2.20170204-r2.ebuild
index 36d15010b1b1..e9b5c9724763 100644
--- a/sec-policy/selinux-qmail/selinux-qmail-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-qmail/selinux-qmail-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-qmail/selinux-qmail-2.20170204-r3.ebuild b/sec-policy/selinux-qmail/selinux-qmail-2.20170204-r3.ebuild
index 36d15010b1b1..e9b5c9724763 100644
--- a/sec-policy/selinux-qmail/selinux-qmail-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-qmail/selinux-qmail-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-qmail/selinux-qmail-2.20170204-r4.ebuild b/sec-policy/selinux-qmail/selinux-qmail-2.20170204-r4.ebuild
index 36d15010b1b1..e9b5c9724763 100644
--- a/sec-policy/selinux-qmail/selinux-qmail-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-qmail/selinux-qmail-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-qmail/selinux-qmail-2.20170805-r2.ebuild b/sec-policy/selinux-qmail/selinux-qmail-2.20170805-r2.ebuild
index 36d15010b1b1..e9b5c9724763 100644
--- a/sec-policy/selinux-qmail/selinux-qmail-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-qmail/selinux-qmail-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-qmail/selinux-qmail-2.20170805-r3.ebuild b/sec-policy/selinux-qmail/selinux-qmail-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..184de3cb7caa
--- /dev/null
+++ b/sec-policy/selinux-qmail/selinux-qmail-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-qmail/selinux-qmail-9999.ebuild b/sec-policy/selinux-qmail/selinux-qmail-9999.ebuild
index 2152b844051e..184de3cb7caa 100644
--- a/sec-policy/selinux-qmail/selinux-qmail-9999.ebuild
+++ b/sec-policy/selinux-qmail/selinux-qmail-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-quota/Manifest b/sec-policy/selinux-quota/Manifest
index 2e7b2c622e37..8a61a52ce8af 100644
--- a/sec-policy/selinux-quota/Manifest
+++ b/sec-policy/selinux-quota/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-quota-2.20170204-r1.ebuild 281 SHA256 4728de918266a4139b8dd49249e812c265290f700c805e5ee9da976db88f5438 SHA512 d6699dfc1cdf681aea11af759ea59d85d37be461339c42753cae7d8959d479f17e04ca2ba2e1589d325d8384c6a86575d15141e903704c3680aba10ccbd9d5f3 WHIRLPOOL 7b873ae0d64a6f30b0775568bd28544f32b74e64575aa05a3c6d093620148c0bee6aa6904e6f8d36f11065ae319a4ce284f99481c3aed0a5d2c87a39625ce0fe
-EBUILD selinux-quota-2.20170204-r2.ebuild 279 SHA256 d1a903023dac827af3a67292e253ad00c2288e4731d6adcbdd05cfed035ce20a SHA512 0ead8786466a9d99a8acfdea99abf44dd9cf2fbc3c00986389b277017dee257d4a0e1454de49b76e17549244576ed0be921735213da620b4f2124e747500c5b9 WHIRLPOOL 16b0c122b0ed52752d850ba1e9917ca38a53efb606a3e4e86960ac8e8a4ff2c3e45fa539ba9147ae63446ffed3d09a665c77dbb34c24274e1628818a887eeac6
-EBUILD selinux-quota-2.20170204-r3.ebuild 279 SHA256 d1a903023dac827af3a67292e253ad00c2288e4731d6adcbdd05cfed035ce20a SHA512 0ead8786466a9d99a8acfdea99abf44dd9cf2fbc3c00986389b277017dee257d4a0e1454de49b76e17549244576ed0be921735213da620b4f2124e747500c5b9 WHIRLPOOL 16b0c122b0ed52752d850ba1e9917ca38a53efb606a3e4e86960ac8e8a4ff2c3e45fa539ba9147ae63446ffed3d09a665c77dbb34c24274e1628818a887eeac6
-EBUILD selinux-quota-2.20170204-r4.ebuild 279 SHA256 d1a903023dac827af3a67292e253ad00c2288e4731d6adcbdd05cfed035ce20a SHA512 0ead8786466a9d99a8acfdea99abf44dd9cf2fbc3c00986389b277017dee257d4a0e1454de49b76e17549244576ed0be921735213da620b4f2124e747500c5b9 WHIRLPOOL 16b0c122b0ed52752d850ba1e9917ca38a53efb606a3e4e86960ac8e8a4ff2c3e45fa539ba9147ae63446ffed3d09a665c77dbb34c24274e1628818a887eeac6
-EBUILD selinux-quota-2.20170805-r2.ebuild 279 SHA256 d1a903023dac827af3a67292e253ad00c2288e4731d6adcbdd05cfed035ce20a SHA512 0ead8786466a9d99a8acfdea99abf44dd9cf2fbc3c00986389b277017dee257d4a0e1454de49b76e17549244576ed0be921735213da620b4f2124e747500c5b9 WHIRLPOOL 16b0c122b0ed52752d850ba1e9917ca38a53efb606a3e4e86960ac8e8a4ff2c3e45fa539ba9147ae63446ffed3d09a665c77dbb34c24274e1628818a887eeac6
-EBUILD selinux-quota-9999.ebuild 281 SHA256 4728de918266a4139b8dd49249e812c265290f700c805e5ee9da976db88f5438 SHA512 d6699dfc1cdf681aea11af759ea59d85d37be461339c42753cae7d8959d479f17e04ca2ba2e1589d325d8384c6a86575d15141e903704c3680aba10ccbd9d5f3 WHIRLPOOL 7b873ae0d64a6f30b0775568bd28544f32b74e64575aa05a3c6d093620148c0bee6aa6904e6f8d36f11065ae319a4ce284f99481c3aed0a5d2c87a39625ce0fe
+EBUILD selinux-quota-2.20170204-r1.ebuild 282 SHA256 84c622a701525970fc405024d3f1b6e2af30c3bdb6eadac8cac20862f62cbd7c SHA512 5aa3da065f7b334317b1abaf8b6265ef4501ad19b6fee265a9f8736f7f15a39cb35024b2886a32b49e688ec40a46419cdbd0106a72d69235ab5b2bfed5a628e0 WHIRLPOOL 955559567ae9d9b5b11ce6fecc5294ae5164ca9a8a8807e59ecba994cd2712b232866d339248dac18d9653c98824618c4f080a1c760b3a9689c9c9e0a0007676
+EBUILD selinux-quota-2.20170204-r2.ebuild 280 SHA256 e3696086e13436ca14c2db1cdd715dbcf128c08ba609017e05ee9676b298d3a7 SHA512 3a92767983a4be99aa857eaef3be1ca53559fe8f08f4a4352dc5e6dc107fe2c0d2fa2f4321052634d8995cb80664842067ea94e048652a487a988df708c92452 WHIRLPOOL f25a18d2d45e4bcc3d65cc9a4de3715e4dca553e734e5f98a48ab653bbdca5ae2628003f90bff213669a2f1889f71e35560246b7baa7b05e2e4d7ba760605dc9
+EBUILD selinux-quota-2.20170204-r3.ebuild 280 SHA256 e3696086e13436ca14c2db1cdd715dbcf128c08ba609017e05ee9676b298d3a7 SHA512 3a92767983a4be99aa857eaef3be1ca53559fe8f08f4a4352dc5e6dc107fe2c0d2fa2f4321052634d8995cb80664842067ea94e048652a487a988df708c92452 WHIRLPOOL f25a18d2d45e4bcc3d65cc9a4de3715e4dca553e734e5f98a48ab653bbdca5ae2628003f90bff213669a2f1889f71e35560246b7baa7b05e2e4d7ba760605dc9
+EBUILD selinux-quota-2.20170204-r4.ebuild 280 SHA256 e3696086e13436ca14c2db1cdd715dbcf128c08ba609017e05ee9676b298d3a7 SHA512 3a92767983a4be99aa857eaef3be1ca53559fe8f08f4a4352dc5e6dc107fe2c0d2fa2f4321052634d8995cb80664842067ea94e048652a487a988df708c92452 WHIRLPOOL f25a18d2d45e4bcc3d65cc9a4de3715e4dca553e734e5f98a48ab653bbdca5ae2628003f90bff213669a2f1889f71e35560246b7baa7b05e2e4d7ba760605dc9
+EBUILD selinux-quota-2.20170805-r2.ebuild 280 SHA256 e3696086e13436ca14c2db1cdd715dbcf128c08ba609017e05ee9676b298d3a7 SHA512 3a92767983a4be99aa857eaef3be1ca53559fe8f08f4a4352dc5e6dc107fe2c0d2fa2f4321052634d8995cb80664842067ea94e048652a487a988df708c92452 WHIRLPOOL f25a18d2d45e4bcc3d65cc9a4de3715e4dca553e734e5f98a48ab653bbdca5ae2628003f90bff213669a2f1889f71e35560246b7baa7b05e2e4d7ba760605dc9
+EBUILD selinux-quota-2.20170805-r3.ebuild 282 SHA256 84c622a701525970fc405024d3f1b6e2af30c3bdb6eadac8cac20862f62cbd7c SHA512 5aa3da065f7b334317b1abaf8b6265ef4501ad19b6fee265a9f8736f7f15a39cb35024b2886a32b49e688ec40a46419cdbd0106a72d69235ab5b2bfed5a628e0 WHIRLPOOL 955559567ae9d9b5b11ce6fecc5294ae5164ca9a8a8807e59ecba994cd2712b232866d339248dac18d9653c98824618c4f080a1c760b3a9689c9c9e0a0007676
+EBUILD selinux-quota-9999.ebuild 282 SHA256 84c622a701525970fc405024d3f1b6e2af30c3bdb6eadac8cac20862f62cbd7c SHA512 5aa3da065f7b334317b1abaf8b6265ef4501ad19b6fee265a9f8736f7f15a39cb35024b2886a32b49e688ec40a46419cdbd0106a72d69235ab5b2bfed5a628e0 WHIRLPOOL 955559567ae9d9b5b11ce6fecc5294ae5164ca9a8a8807e59ecba994cd2712b232866d339248dac18d9653c98824618c4f080a1c760b3a9689c9c9e0a0007676
 MISC ChangeLog 10479 SHA256 cda89847c38f27b5cc28ae31f5214f82f944db2f35c67a0a95ce52ae90513963 SHA512 b1129164545fe8f62bbd0bd998c001df8517d761f1c9c5ec7c0185faf6727641b5db1fa33b4794e15f4fcd08327dbf0d7f3ddadca038a72d177b1c7757fabb33 WHIRLPOOL 0d9a7f369226fd5b6d349d6b48a6f45957e8a06c66bc4032f846170bce5fb541805f4c1beba4b7f99875750712ff491da3f4236f914e6f16694da8c4fb792837
 MISC ChangeLog-2015 9749 SHA256 e9226522ec29fb1e56cf1e0fb690d8a1b6efe4fceaea1797d6c635843c061ecc SHA512 7428d95dc10673aaadc54e2076cf96902ce3616eb1c60eaddf06326ffaf0d04991ebaf6553ec77bcc3fc5be5a07ee30f1ee3e115319b86ea3a7908bce071fa4e WHIRLPOOL 4b7cb60dc0d0c63b4d2a588a1b4eeeb100935445e737b936c82ff52e4e6a549e94818fc92f733d4382d01f26b89543ab9f0d25445cbb8470d68be0e2fbc5c178
 MISC metadata.xml 315 SHA256 460373439ac9e6e4c92dc197f5a08dd2f136497545a74ee13ff2102bdb94abcb SHA512 af9939539d2e2846f01e42e77ca895260ac530e9071407dcef52b80069bd4bed814d0405bcc8dd41715ef0528c222d1dd96a138633efec2173e98ad44c0790af WHIRLPOOL d03b382198489025477dbf2af0d2432fb08a619e86da301a04f227cff6d5d3567dd88e217f08f814a519196f399eb7d2bff989bbd04c3db72876e882b0158f31
diff --git a/sec-policy/selinux-quota/selinux-quota-2.20170204-r1.ebuild b/sec-policy/selinux-quota/selinux-quota-2.20170204-r1.ebuild
index 9620e12063f2..221b97456a3d 100644
--- a/sec-policy/selinux-quota/selinux-quota-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-quota/selinux-quota-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-quota/selinux-quota-2.20170204-r2.ebuild b/sec-policy/selinux-quota/selinux-quota-2.20170204-r2.ebuild
index 441c38ae9f57..0af9af0d6630 100644
--- a/sec-policy/selinux-quota/selinux-quota-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-quota/selinux-quota-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-quota/selinux-quota-2.20170204-r3.ebuild b/sec-policy/selinux-quota/selinux-quota-2.20170204-r3.ebuild
index 441c38ae9f57..0af9af0d6630 100644
--- a/sec-policy/selinux-quota/selinux-quota-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-quota/selinux-quota-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-quota/selinux-quota-2.20170204-r4.ebuild b/sec-policy/selinux-quota/selinux-quota-2.20170204-r4.ebuild
index 441c38ae9f57..0af9af0d6630 100644
--- a/sec-policy/selinux-quota/selinux-quota-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-quota/selinux-quota-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-quota/selinux-quota-2.20170805-r2.ebuild b/sec-policy/selinux-quota/selinux-quota-2.20170805-r2.ebuild
index 441c38ae9f57..0af9af0d6630 100644
--- a/sec-policy/selinux-quota/selinux-quota-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-quota/selinux-quota-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-quota/selinux-quota-2.20170805-r3.ebuild b/sec-policy/selinux-quota/selinux-quota-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..221b97456a3d
--- /dev/null
+++ b/sec-policy/selinux-quota/selinux-quota-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-quota/selinux-quota-9999.ebuild b/sec-policy/selinux-quota/selinux-quota-9999.ebuild
index 9620e12063f2..221b97456a3d 100644
--- a/sec-policy/selinux-quota/selinux-quota-9999.ebuild
+++ b/sec-policy/selinux-quota/selinux-quota-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-radius/Manifest b/sec-policy/selinux-radius/Manifest
index 176bc4fa3452..dee18f7e8860 100644
--- a/sec-policy/selinux-radius/Manifest
+++ b/sec-policy/selinux-radius/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-radius-2.20170204-r1.ebuild 283 SHA256 e144b248c8d1078fccd44f4ac96e6aca3043fecbc47f8645271b7de0ccd9341c SHA512 49877930752635180c50aa1791d01958e0b03073819ff0f7dc511124aab6d3c6d9bc7dd913466eb2267641779d41142cd21dc2bcfcb5be5637b1fac6f1ef0d68 WHIRLPOOL c05dc45355c046f492fb7bfe9400fb7997c08662d1e3ecd318fce12c22f6e246c82bace7d9375bc0f64ab27430a86b358a3a4f4d18bfe9ba667acd368d79c171
-EBUILD selinux-radius-2.20170204-r2.ebuild 281 SHA256 db13213239c7ac7e17b470bc4f1c85b4f8ec5cb5d51723d856bb429ac4d7e5a0 SHA512 26c970414e17173d18ef4635b618c8a74f5a985e65ffbd029f683898121408c518a66cbcc741ab4990cb75301dd63d10472aa69ad4f35412ea8fdfbb4fdf5f58 WHIRLPOOL 662fc1bf81331feaecf679a06560e923ba1a8b407d591d04accd3b7e575a1a844a61fcb9382c6b4d18acb4b85cc471aa3259cca14e6a7b0c3fc39f2e1e029ae8
-EBUILD selinux-radius-2.20170204-r3.ebuild 281 SHA256 db13213239c7ac7e17b470bc4f1c85b4f8ec5cb5d51723d856bb429ac4d7e5a0 SHA512 26c970414e17173d18ef4635b618c8a74f5a985e65ffbd029f683898121408c518a66cbcc741ab4990cb75301dd63d10472aa69ad4f35412ea8fdfbb4fdf5f58 WHIRLPOOL 662fc1bf81331feaecf679a06560e923ba1a8b407d591d04accd3b7e575a1a844a61fcb9382c6b4d18acb4b85cc471aa3259cca14e6a7b0c3fc39f2e1e029ae8
-EBUILD selinux-radius-2.20170204-r4.ebuild 281 SHA256 db13213239c7ac7e17b470bc4f1c85b4f8ec5cb5d51723d856bb429ac4d7e5a0 SHA512 26c970414e17173d18ef4635b618c8a74f5a985e65ffbd029f683898121408c518a66cbcc741ab4990cb75301dd63d10472aa69ad4f35412ea8fdfbb4fdf5f58 WHIRLPOOL 662fc1bf81331feaecf679a06560e923ba1a8b407d591d04accd3b7e575a1a844a61fcb9382c6b4d18acb4b85cc471aa3259cca14e6a7b0c3fc39f2e1e029ae8
-EBUILD selinux-radius-2.20170805-r2.ebuild 281 SHA256 db13213239c7ac7e17b470bc4f1c85b4f8ec5cb5d51723d856bb429ac4d7e5a0 SHA512 26c970414e17173d18ef4635b618c8a74f5a985e65ffbd029f683898121408c518a66cbcc741ab4990cb75301dd63d10472aa69ad4f35412ea8fdfbb4fdf5f58 WHIRLPOOL 662fc1bf81331feaecf679a06560e923ba1a8b407d591d04accd3b7e575a1a844a61fcb9382c6b4d18acb4b85cc471aa3259cca14e6a7b0c3fc39f2e1e029ae8
-EBUILD selinux-radius-9999.ebuild 283 SHA256 e144b248c8d1078fccd44f4ac96e6aca3043fecbc47f8645271b7de0ccd9341c SHA512 49877930752635180c50aa1791d01958e0b03073819ff0f7dc511124aab6d3c6d9bc7dd913466eb2267641779d41142cd21dc2bcfcb5be5637b1fac6f1ef0d68 WHIRLPOOL c05dc45355c046f492fb7bfe9400fb7997c08662d1e3ecd318fce12c22f6e246c82bace7d9375bc0f64ab27430a86b358a3a4f4d18bfe9ba667acd368d79c171
+EBUILD selinux-radius-2.20170204-r1.ebuild 284 SHA256 31817ca0ef7413bebf662e8006f3375f01c1f0de81aa62806bd4503174db3cf4 SHA512 402a35906308ed60424cc963f3b1fa97b80397d96b1f36377dfaa8be0b2a73daeee67c0852f5f57b9c0fd6e5776443fc793eece731f1f6619146a29cd05a2d11 WHIRLPOOL 77bbdbb566c1083dbe16d5a3beeca6a8acf38d1009d4d87f69ed2e8a5e4ae902dc4856e565173f75dee2ea4ffd929ec7fd83d578fd892248752b02bf6e09f4b3
+EBUILD selinux-radius-2.20170204-r2.ebuild 282 SHA256 6574d756c250ca9d74f0d7634d1785eba2b1de6dd9254a480164688ca319db35 SHA512 3ea34014909dab29ce0c5ad43cb4673299ad1c89a18a2ee945b8908e7beb176065cd4c8e29bc1cc03ffa6ad46e1a851f5cf12563954f7aeaa83c9f9317e38594 WHIRLPOOL a1edb9f06a870a8b8e1e8df5ecc5a1847a3c991a6f7ecdbf2f70c4d646f62f9f9b78956cd79e66120cb32b3170f6089d6c288f8e55edffc2ae4dd12d6cb4ada2
+EBUILD selinux-radius-2.20170204-r3.ebuild 282 SHA256 6574d756c250ca9d74f0d7634d1785eba2b1de6dd9254a480164688ca319db35 SHA512 3ea34014909dab29ce0c5ad43cb4673299ad1c89a18a2ee945b8908e7beb176065cd4c8e29bc1cc03ffa6ad46e1a851f5cf12563954f7aeaa83c9f9317e38594 WHIRLPOOL a1edb9f06a870a8b8e1e8df5ecc5a1847a3c991a6f7ecdbf2f70c4d646f62f9f9b78956cd79e66120cb32b3170f6089d6c288f8e55edffc2ae4dd12d6cb4ada2
+EBUILD selinux-radius-2.20170204-r4.ebuild 282 SHA256 6574d756c250ca9d74f0d7634d1785eba2b1de6dd9254a480164688ca319db35 SHA512 3ea34014909dab29ce0c5ad43cb4673299ad1c89a18a2ee945b8908e7beb176065cd4c8e29bc1cc03ffa6ad46e1a851f5cf12563954f7aeaa83c9f9317e38594 WHIRLPOOL a1edb9f06a870a8b8e1e8df5ecc5a1847a3c991a6f7ecdbf2f70c4d646f62f9f9b78956cd79e66120cb32b3170f6089d6c288f8e55edffc2ae4dd12d6cb4ada2
+EBUILD selinux-radius-2.20170805-r2.ebuild 282 SHA256 6574d756c250ca9d74f0d7634d1785eba2b1de6dd9254a480164688ca319db35 SHA512 3ea34014909dab29ce0c5ad43cb4673299ad1c89a18a2ee945b8908e7beb176065cd4c8e29bc1cc03ffa6ad46e1a851f5cf12563954f7aeaa83c9f9317e38594 WHIRLPOOL a1edb9f06a870a8b8e1e8df5ecc5a1847a3c991a6f7ecdbf2f70c4d646f62f9f9b78956cd79e66120cb32b3170f6089d6c288f8e55edffc2ae4dd12d6cb4ada2
+EBUILD selinux-radius-2.20170805-r3.ebuild 284 SHA256 31817ca0ef7413bebf662e8006f3375f01c1f0de81aa62806bd4503174db3cf4 SHA512 402a35906308ed60424cc963f3b1fa97b80397d96b1f36377dfaa8be0b2a73daeee67c0852f5f57b9c0fd6e5776443fc793eece731f1f6619146a29cd05a2d11 WHIRLPOOL 77bbdbb566c1083dbe16d5a3beeca6a8acf38d1009d4d87f69ed2e8a5e4ae902dc4856e565173f75dee2ea4ffd929ec7fd83d578fd892248752b02bf6e09f4b3
+EBUILD selinux-radius-9999.ebuild 284 SHA256 31817ca0ef7413bebf662e8006f3375f01c1f0de81aa62806bd4503174db3cf4 SHA512 402a35906308ed60424cc963f3b1fa97b80397d96b1f36377dfaa8be0b2a73daeee67c0852f5f57b9c0fd6e5776443fc793eece731f1f6619146a29cd05a2d11 WHIRLPOOL 77bbdbb566c1083dbe16d5a3beeca6a8acf38d1009d4d87f69ed2e8a5e4ae902dc4856e565173f75dee2ea4ffd929ec7fd83d578fd892248752b02bf6e09f4b3
 MISC ChangeLog 10571 SHA256 0ffcaada10c6d9fd2394f3d14b2b7ae852ae0b96ddc5d17d4ff94e9007e23476 SHA512 b2ad9a586eb692f6f453851b147c77fab96765196b8d3d6c47d55c74e9691ec902d3febeff5ac84cd50c7fa82cb1df042a6503a0bae4fb4c5ef097537eec5e1b WHIRLPOOL 90f9850ec1767be7afe931b1b9787f383d32676be851aea9fc3f2c0aad5b78d1a47b857f2fb185780216ac5dd019deb17f185df8764c3767352e7ea345235ecf
 MISC ChangeLog-2015 9862 SHA256 08250b7982eaf319bee0cae1996a2adf509c174c7c4ed11316ea054b8cdc8760 SHA512 4fc502b90bdeff5455b103d6f11a7b6ca73d97ccb628c7e087c12456646a29bf1d109456f0a59443d02266588e07c558216f64e4b9dbeed93b0b05dbd55171ad WHIRLPOOL 31f49cb82714bdabe3e0c3baac89e90e0eaec15c5007c8e8fc828f95ef3826ac5da7538dc19c1511f330943255472ce22e0ed67b6e7b2a66c4b9afefb6e46743
 MISC metadata.xml 316 SHA256 5175579437b9e63c5e7144b91bfafd3ad739e95b4b1a2800c9ff95036d6487db SHA512 0500b19ec7cff97e422e1a5e89bfd8c6574ab2c4fc03fada1abbbb1ab62bed170be38b5c70b6a515d57cfc65dbaf0d0c365e859b8533c9afa92f78d7df9c5731 WHIRLPOOL d9ad7851e5c24de3e2f30eaded63957245aad956ed81a74af62a9df0db8553a473334e9e665a1382b59d04d0053de4af32fd36c4ce65080fe2b5914a26fbf8f7
diff --git a/sec-policy/selinux-radius/selinux-radius-2.20170204-r1.ebuild b/sec-policy/selinux-radius/selinux-radius-2.20170204-r1.ebuild
index 19956d68ce06..0bc1d7c29795 100644
--- a/sec-policy/selinux-radius/selinux-radius-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-radius/selinux-radius-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-radius/selinux-radius-2.20170204-r2.ebuild b/sec-policy/selinux-radius/selinux-radius-2.20170204-r2.ebuild
index b7dd8d9f91ca..5b124668c37b 100644
--- a/sec-policy/selinux-radius/selinux-radius-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-radius/selinux-radius-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-radius/selinux-radius-2.20170204-r3.ebuild b/sec-policy/selinux-radius/selinux-radius-2.20170204-r3.ebuild
index b7dd8d9f91ca..5b124668c37b 100644
--- a/sec-policy/selinux-radius/selinux-radius-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-radius/selinux-radius-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-radius/selinux-radius-2.20170204-r4.ebuild b/sec-policy/selinux-radius/selinux-radius-2.20170204-r4.ebuild
index b7dd8d9f91ca..5b124668c37b 100644
--- a/sec-policy/selinux-radius/selinux-radius-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-radius/selinux-radius-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-radius/selinux-radius-2.20170805-r2.ebuild b/sec-policy/selinux-radius/selinux-radius-2.20170805-r2.ebuild
index b7dd8d9f91ca..5b124668c37b 100644
--- a/sec-policy/selinux-radius/selinux-radius-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-radius/selinux-radius-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-radius/selinux-radius-2.20170805-r3.ebuild b/sec-policy/selinux-radius/selinux-radius-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..0bc1d7c29795
--- /dev/null
+++ b/sec-policy/selinux-radius/selinux-radius-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-radius/selinux-radius-9999.ebuild b/sec-policy/selinux-radius/selinux-radius-9999.ebuild
index 19956d68ce06..0bc1d7c29795 100644
--- a/sec-policy/selinux-radius/selinux-radius-9999.ebuild
+++ b/sec-policy/selinux-radius/selinux-radius-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-radvd/Manifest b/sec-policy/selinux-radvd/Manifest
index 565f777d2785..efe589b30b9a 100644
--- a/sec-policy/selinux-radvd/Manifest
+++ b/sec-policy/selinux-radvd/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-radvd-2.20170204-r1.ebuild 281 SHA256 d0f66740897a02cc994d62ccd06940d4a2f30b6b33dc0c8d46eb45f4e079d40c SHA512 502b2185cb6d5c2266d49dfcd34f4eba168057335fd7addec045a6f87e8323e0b323389a93830a2b5ea21fa0f20e01aa5509482b45bccb58af751897b786e8ad WHIRLPOOL 5088c6e15700da33223419e51ecfb8f6dd1b43a4809baa183e4cf091e04735b4db2758e3df0e6780e64a2099419a7971a563366d6b31f2e896f8ee77e052b1f2
-EBUILD selinux-radvd-2.20170204-r2.ebuild 279 SHA256 f1f5ed5ba1fcd933d07600a38d4d144a82bfe44f2b3710965a742ca2101ad6af SHA512 43fc2f8587567ee9040d8bab4471dba25a545e61c4b4bbfe6ccfd14028352548becf6966661e1c399b21bcd53d773acf2822fa8e241a962ccbcd805f64fc9a8d WHIRLPOOL 2f123e81d65b8c9f7ba8b8ca4be3f700f6fb878e526d6a7f294d89cee129c4b35471909643162261bf2649283ae0baf78b272a800431b3e7fd4e6a952a3974f6
-EBUILD selinux-radvd-2.20170204-r3.ebuild 279 SHA256 f1f5ed5ba1fcd933d07600a38d4d144a82bfe44f2b3710965a742ca2101ad6af SHA512 43fc2f8587567ee9040d8bab4471dba25a545e61c4b4bbfe6ccfd14028352548becf6966661e1c399b21bcd53d773acf2822fa8e241a962ccbcd805f64fc9a8d WHIRLPOOL 2f123e81d65b8c9f7ba8b8ca4be3f700f6fb878e526d6a7f294d89cee129c4b35471909643162261bf2649283ae0baf78b272a800431b3e7fd4e6a952a3974f6
-EBUILD selinux-radvd-2.20170204-r4.ebuild 279 SHA256 f1f5ed5ba1fcd933d07600a38d4d144a82bfe44f2b3710965a742ca2101ad6af SHA512 43fc2f8587567ee9040d8bab4471dba25a545e61c4b4bbfe6ccfd14028352548becf6966661e1c399b21bcd53d773acf2822fa8e241a962ccbcd805f64fc9a8d WHIRLPOOL 2f123e81d65b8c9f7ba8b8ca4be3f700f6fb878e526d6a7f294d89cee129c4b35471909643162261bf2649283ae0baf78b272a800431b3e7fd4e6a952a3974f6
-EBUILD selinux-radvd-2.20170805-r2.ebuild 279 SHA256 f1f5ed5ba1fcd933d07600a38d4d144a82bfe44f2b3710965a742ca2101ad6af SHA512 43fc2f8587567ee9040d8bab4471dba25a545e61c4b4bbfe6ccfd14028352548becf6966661e1c399b21bcd53d773acf2822fa8e241a962ccbcd805f64fc9a8d WHIRLPOOL 2f123e81d65b8c9f7ba8b8ca4be3f700f6fb878e526d6a7f294d89cee129c4b35471909643162261bf2649283ae0baf78b272a800431b3e7fd4e6a952a3974f6
-EBUILD selinux-radvd-9999.ebuild 281 SHA256 d0f66740897a02cc994d62ccd06940d4a2f30b6b33dc0c8d46eb45f4e079d40c SHA512 502b2185cb6d5c2266d49dfcd34f4eba168057335fd7addec045a6f87e8323e0b323389a93830a2b5ea21fa0f20e01aa5509482b45bccb58af751897b786e8ad WHIRLPOOL 5088c6e15700da33223419e51ecfb8f6dd1b43a4809baa183e4cf091e04735b4db2758e3df0e6780e64a2099419a7971a563366d6b31f2e896f8ee77e052b1f2
+EBUILD selinux-radvd-2.20170204-r1.ebuild 282 SHA256 a42b259577f4626190d37d8947992e5ec0d800375702ab833b1d89ef5906be75 SHA512 5b01aa9bc75ff4ef94c02b9b620ef13c66c0d335284ff1d06aec1e3684a7d51cfb2a2b4053ab9861fd7430961432c06e53cadd778edd5f1d5761471b8b6f25c5 WHIRLPOOL 4b0a6604c1a51fbf9e72d443fd9e3fb12ef23ab996c87d3bd48cc740f165ba5bfd7ff1ef1491a00639d12f8022ff92bc023716a2123343b82a203c1fb4c89320
+EBUILD selinux-radvd-2.20170204-r2.ebuild 280 SHA256 cdf9fb5ea2e241da1ceeaae37fb7dac51862ad3251daae36918bc633807f6687 SHA512 d2a9f62bcdf94b923c323b27038d314baa88433f6d4200a00e2fb6b04ac8caabd25e561e94ac98744ef24f0dc6ac22b99df939e69f681146a2ff0e98c1535322 WHIRLPOOL 193e92245bbda48591a234c7e7cd3ecc0d4e841d11996625ef756f14968270601dcfe0c9c4f38e00e8b5695a9ed9c1dd716141e5ad417d8aaf443a910f42c7a0
+EBUILD selinux-radvd-2.20170204-r3.ebuild 280 SHA256 cdf9fb5ea2e241da1ceeaae37fb7dac51862ad3251daae36918bc633807f6687 SHA512 d2a9f62bcdf94b923c323b27038d314baa88433f6d4200a00e2fb6b04ac8caabd25e561e94ac98744ef24f0dc6ac22b99df939e69f681146a2ff0e98c1535322 WHIRLPOOL 193e92245bbda48591a234c7e7cd3ecc0d4e841d11996625ef756f14968270601dcfe0c9c4f38e00e8b5695a9ed9c1dd716141e5ad417d8aaf443a910f42c7a0
+EBUILD selinux-radvd-2.20170204-r4.ebuild 280 SHA256 cdf9fb5ea2e241da1ceeaae37fb7dac51862ad3251daae36918bc633807f6687 SHA512 d2a9f62bcdf94b923c323b27038d314baa88433f6d4200a00e2fb6b04ac8caabd25e561e94ac98744ef24f0dc6ac22b99df939e69f681146a2ff0e98c1535322 WHIRLPOOL 193e92245bbda48591a234c7e7cd3ecc0d4e841d11996625ef756f14968270601dcfe0c9c4f38e00e8b5695a9ed9c1dd716141e5ad417d8aaf443a910f42c7a0
+EBUILD selinux-radvd-2.20170805-r2.ebuild 280 SHA256 cdf9fb5ea2e241da1ceeaae37fb7dac51862ad3251daae36918bc633807f6687 SHA512 d2a9f62bcdf94b923c323b27038d314baa88433f6d4200a00e2fb6b04ac8caabd25e561e94ac98744ef24f0dc6ac22b99df939e69f681146a2ff0e98c1535322 WHIRLPOOL 193e92245bbda48591a234c7e7cd3ecc0d4e841d11996625ef756f14968270601dcfe0c9c4f38e00e8b5695a9ed9c1dd716141e5ad417d8aaf443a910f42c7a0
+EBUILD selinux-radvd-2.20170805-r3.ebuild 282 SHA256 a42b259577f4626190d37d8947992e5ec0d800375702ab833b1d89ef5906be75 SHA512 5b01aa9bc75ff4ef94c02b9b620ef13c66c0d335284ff1d06aec1e3684a7d51cfb2a2b4053ab9861fd7430961432c06e53cadd778edd5f1d5761471b8b6f25c5 WHIRLPOOL 4b0a6604c1a51fbf9e72d443fd9e3fb12ef23ab996c87d3bd48cc740f165ba5bfd7ff1ef1491a00639d12f8022ff92bc023716a2123343b82a203c1fb4c89320
+EBUILD selinux-radvd-9999.ebuild 282 SHA256 a42b259577f4626190d37d8947992e5ec0d800375702ab833b1d89ef5906be75 SHA512 5b01aa9bc75ff4ef94c02b9b620ef13c66c0d335284ff1d06aec1e3684a7d51cfb2a2b4053ab9861fd7430961432c06e53cadd778edd5f1d5761471b8b6f25c5 WHIRLPOOL 4b0a6604c1a51fbf9e72d443fd9e3fb12ef23ab996c87d3bd48cc740f165ba5bfd7ff1ef1491a00639d12f8022ff92bc023716a2123343b82a203c1fb4c89320
 MISC ChangeLog 10479 SHA256 eb14525e7c955673175e195b68c3fa7d426b460c595e496ae522cbf8a9a1a2cd SHA512 7f87f57bd0eab9c06dd814523f1248a7c452d0ba1c61221cc073866a3d785d7b797319eb0aa8da5f757e8cf0b7feea9d96a324a830454e4216689fd4b73431f7 WHIRLPOOL 04ca1e82ab5e0a44ed16a54539579098353f880467694ae1f1d5a20a75cc50e91a09c6af560824a281354dbf92d2df817a6992ddafafe7a517a317c0b1e2e800
 MISC ChangeLog-2015 9749 SHA256 f9b054dbff89ebdebc4da4d0134cb437fb560109abbd352c9b2cc98f7649c8aa SHA512 789cba2f774f5ebcc3bc22b7f1e3277e15984b3594b10c4115bc8c5b21b9f6092dc5f5496b4515e5bc6b83c760d76bf8b1f5950bbfac0a3014ad060730dd15d4 WHIRLPOOL bf8efc9c538b0dbc16bf72c02584467e18c4495d97a1b00dc16efea30f15c3338d0278e381f12df21b003a42e6a45a69e6c5138c2f83c4fce1da1e27a25e43f1
 MISC metadata.xml 315 SHA256 705565f7a60bc821a63cb4bd17067230a60226d80f5fefbeb4e0270d0c46bcc8 SHA512 be9c80d6e07a38b69d9f9c50cc93bbdc8851ec45b578f22cc4335960ca0f55a2835987e304cb9d40fc01eaa473cc9c7c6136c6b051ca92fa42e38543cacddf92 WHIRLPOOL 7ff530cdae14bd56acb102b5690817aeaf4df2604e2084cd99ffdf7f50a30f142f16a490f0e0e5e25e42d9d6fd1c41a6db3f9347f0de1793c3e7ca4de5cc2bb3
diff --git a/sec-policy/selinux-radvd/selinux-radvd-2.20170204-r1.ebuild b/sec-policy/selinux-radvd/selinux-radvd-2.20170204-r1.ebuild
index 322245e7f69c..a3e239253a9a 100644
--- a/sec-policy/selinux-radvd/selinux-radvd-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-radvd/selinux-radvd-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-radvd/selinux-radvd-2.20170204-r2.ebuild b/sec-policy/selinux-radvd/selinux-radvd-2.20170204-r2.ebuild
index c43befc5bc0a..bef7d9af97e3 100644
--- a/sec-policy/selinux-radvd/selinux-radvd-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-radvd/selinux-radvd-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-radvd/selinux-radvd-2.20170204-r3.ebuild b/sec-policy/selinux-radvd/selinux-radvd-2.20170204-r3.ebuild
index c43befc5bc0a..bef7d9af97e3 100644
--- a/sec-policy/selinux-radvd/selinux-radvd-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-radvd/selinux-radvd-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-radvd/selinux-radvd-2.20170204-r4.ebuild b/sec-policy/selinux-radvd/selinux-radvd-2.20170204-r4.ebuild
index c43befc5bc0a..bef7d9af97e3 100644
--- a/sec-policy/selinux-radvd/selinux-radvd-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-radvd/selinux-radvd-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-radvd/selinux-radvd-2.20170805-r2.ebuild b/sec-policy/selinux-radvd/selinux-radvd-2.20170805-r2.ebuild
index c43befc5bc0a..bef7d9af97e3 100644
--- a/sec-policy/selinux-radvd/selinux-radvd-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-radvd/selinux-radvd-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-radvd/selinux-radvd-2.20170805-r3.ebuild b/sec-policy/selinux-radvd/selinux-radvd-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..a3e239253a9a
--- /dev/null
+++ b/sec-policy/selinux-radvd/selinux-radvd-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-radvd/selinux-radvd-9999.ebuild b/sec-policy/selinux-radvd/selinux-radvd-9999.ebuild
index 322245e7f69c..a3e239253a9a 100644
--- a/sec-policy/selinux-radvd/selinux-radvd-9999.ebuild
+++ b/sec-policy/selinux-radvd/selinux-radvd-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-razor/Manifest b/sec-policy/selinux-razor/Manifest
index d01f3063e8bf..89bd5d8d9cee 100644
--- a/sec-policy/selinux-razor/Manifest
+++ b/sec-policy/selinux-razor/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-razor-2.20170204-r1.ebuild 281 SHA256 93fe434e0cc24a63afd48855478770738e7ddab1bf0aa4a5ce5b5d387eb45673 SHA512 376fd57c135b695854ca0dd831c90495cc8f26ba0eaf05106a6da2fb259593aca416373a319c78b2ef882dcff15e57eb2816c5fab58f59aac1951efb91a558d5 WHIRLPOOL 0ec8613fda69bb508f30e57dbe03b479833deba39559c8591d2056c0a927ca34ea5e3bc78efa3fb1aeed5199af0f047688cc659d7566d095f9acedd68f224d96
-EBUILD selinux-razor-2.20170204-r2.ebuild 279 SHA256 a7fe398b6c92989f22c00fae0d4f702404a0a1e8c972f6fac7973d424374aefe SHA512 166819f7ec26107fc83920b9415cbd297760e7b85232ff3efb60d5cae286d51e69c975b356c1d133ea00e621a48685737dd8e77027a9a1e6e690aa2da06da6a6 WHIRLPOOL a72bf48ce05e1d82f36361cd27295e031dea4f9a6e75f202aaa76051c90beb6316573970a6bcbd140d38c4411e54ce9e633719690d5507c3c47cc4fbf850669a
-EBUILD selinux-razor-2.20170204-r3.ebuild 279 SHA256 a7fe398b6c92989f22c00fae0d4f702404a0a1e8c972f6fac7973d424374aefe SHA512 166819f7ec26107fc83920b9415cbd297760e7b85232ff3efb60d5cae286d51e69c975b356c1d133ea00e621a48685737dd8e77027a9a1e6e690aa2da06da6a6 WHIRLPOOL a72bf48ce05e1d82f36361cd27295e031dea4f9a6e75f202aaa76051c90beb6316573970a6bcbd140d38c4411e54ce9e633719690d5507c3c47cc4fbf850669a
-EBUILD selinux-razor-2.20170204-r4.ebuild 279 SHA256 a7fe398b6c92989f22c00fae0d4f702404a0a1e8c972f6fac7973d424374aefe SHA512 166819f7ec26107fc83920b9415cbd297760e7b85232ff3efb60d5cae286d51e69c975b356c1d133ea00e621a48685737dd8e77027a9a1e6e690aa2da06da6a6 WHIRLPOOL a72bf48ce05e1d82f36361cd27295e031dea4f9a6e75f202aaa76051c90beb6316573970a6bcbd140d38c4411e54ce9e633719690d5507c3c47cc4fbf850669a
-EBUILD selinux-razor-2.20170805-r2.ebuild 279 SHA256 a7fe398b6c92989f22c00fae0d4f702404a0a1e8c972f6fac7973d424374aefe SHA512 166819f7ec26107fc83920b9415cbd297760e7b85232ff3efb60d5cae286d51e69c975b356c1d133ea00e621a48685737dd8e77027a9a1e6e690aa2da06da6a6 WHIRLPOOL a72bf48ce05e1d82f36361cd27295e031dea4f9a6e75f202aaa76051c90beb6316573970a6bcbd140d38c4411e54ce9e633719690d5507c3c47cc4fbf850669a
-EBUILD selinux-razor-9999.ebuild 281 SHA256 93fe434e0cc24a63afd48855478770738e7ddab1bf0aa4a5ce5b5d387eb45673 SHA512 376fd57c135b695854ca0dd831c90495cc8f26ba0eaf05106a6da2fb259593aca416373a319c78b2ef882dcff15e57eb2816c5fab58f59aac1951efb91a558d5 WHIRLPOOL 0ec8613fda69bb508f30e57dbe03b479833deba39559c8591d2056c0a927ca34ea5e3bc78efa3fb1aeed5199af0f047688cc659d7566d095f9acedd68f224d96
+EBUILD selinux-razor-2.20170204-r1.ebuild 282 SHA256 11ae06c3c447c230802c575f2a165c2a9e6a48bcc1ce2c25ee7562e7a06607a0 SHA512 061395a8e514b4791d9c407867560a90e542c7a0ec37bfaa94cc5b6d5fce9ace35372ac6f0dbf70df73ff6fa53ec5070d3e6f4560cbded01240f20329272349f WHIRLPOOL 07e94e66707076c1738bf89f7159dfb4b45af356324ec81569c1dca5c8b42291b6f40fc9640908e726d8a039654780155aab231145a082fbfc8d6d39b52a61df
+EBUILD selinux-razor-2.20170204-r2.ebuild 280 SHA256 6601912fbadfa60c5a29ee4d29501612acbaf968a39414ff0707d8065a50c490 SHA512 6eacbbcf27fecb82f4f740f05566ba93270a09b2c951051a03bd8731835cb4f1d56ebe8ea37e9e288114c1b5dbce4daf8d843cf96163704bbb5b2ffede4f34f0 WHIRLPOOL 5bcb0e0cf299bbd84b6111e48b0b37b08b91b136f9f9ebe866cddf8d6d536cb22fabc691cf3224ae454b3dc9ba5370d03048d87c2e166fd99af77b5b2449deb0
+EBUILD selinux-razor-2.20170204-r3.ebuild 280 SHA256 6601912fbadfa60c5a29ee4d29501612acbaf968a39414ff0707d8065a50c490 SHA512 6eacbbcf27fecb82f4f740f05566ba93270a09b2c951051a03bd8731835cb4f1d56ebe8ea37e9e288114c1b5dbce4daf8d843cf96163704bbb5b2ffede4f34f0 WHIRLPOOL 5bcb0e0cf299bbd84b6111e48b0b37b08b91b136f9f9ebe866cddf8d6d536cb22fabc691cf3224ae454b3dc9ba5370d03048d87c2e166fd99af77b5b2449deb0
+EBUILD selinux-razor-2.20170204-r4.ebuild 280 SHA256 6601912fbadfa60c5a29ee4d29501612acbaf968a39414ff0707d8065a50c490 SHA512 6eacbbcf27fecb82f4f740f05566ba93270a09b2c951051a03bd8731835cb4f1d56ebe8ea37e9e288114c1b5dbce4daf8d843cf96163704bbb5b2ffede4f34f0 WHIRLPOOL 5bcb0e0cf299bbd84b6111e48b0b37b08b91b136f9f9ebe866cddf8d6d536cb22fabc691cf3224ae454b3dc9ba5370d03048d87c2e166fd99af77b5b2449deb0
+EBUILD selinux-razor-2.20170805-r2.ebuild 280 SHA256 6601912fbadfa60c5a29ee4d29501612acbaf968a39414ff0707d8065a50c490 SHA512 6eacbbcf27fecb82f4f740f05566ba93270a09b2c951051a03bd8731835cb4f1d56ebe8ea37e9e288114c1b5dbce4daf8d843cf96163704bbb5b2ffede4f34f0 WHIRLPOOL 5bcb0e0cf299bbd84b6111e48b0b37b08b91b136f9f9ebe866cddf8d6d536cb22fabc691cf3224ae454b3dc9ba5370d03048d87c2e166fd99af77b5b2449deb0
+EBUILD selinux-razor-2.20170805-r3.ebuild 282 SHA256 11ae06c3c447c230802c575f2a165c2a9e6a48bcc1ce2c25ee7562e7a06607a0 SHA512 061395a8e514b4791d9c407867560a90e542c7a0ec37bfaa94cc5b6d5fce9ace35372ac6f0dbf70df73ff6fa53ec5070d3e6f4560cbded01240f20329272349f WHIRLPOOL 07e94e66707076c1738bf89f7159dfb4b45af356324ec81569c1dca5c8b42291b6f40fc9640908e726d8a039654780155aab231145a082fbfc8d6d39b52a61df
+EBUILD selinux-razor-9999.ebuild 282 SHA256 11ae06c3c447c230802c575f2a165c2a9e6a48bcc1ce2c25ee7562e7a06607a0 SHA512 061395a8e514b4791d9c407867560a90e542c7a0ec37bfaa94cc5b6d5fce9ace35372ac6f0dbf70df73ff6fa53ec5070d3e6f4560cbded01240f20329272349f WHIRLPOOL 07e94e66707076c1738bf89f7159dfb4b45af356324ec81569c1dca5c8b42291b6f40fc9640908e726d8a039654780155aab231145a082fbfc8d6d39b52a61df
 MISC ChangeLog 10479 SHA256 db00c56a74d68c63aada64cc2cd7d6a605c4f1640f2f87db9c26e491d70b4932 SHA512 c933be04600657010def0c0449e12c7b71a6fc6c393578d0f73c25a011889e71d550960c7bd1efcbcf8c6c03b9ec299087a658db6b2b7811a7abd5d5a45acab9 WHIRLPOOL 2def45b50535ef13dd9ae7122d80767e484ca05374bbbb14a04bdf2555f0069cd0d29a5ea41eb8a8ca76403646654e4bec6d720f0975e03c30adfef59e2ab23a
 MISC ChangeLog-2015 11247 SHA256 774a0db5e584efd0cb618cf232a897c4ffe48084fc1825a1c038137bd8278f1f SHA512 0bc34300ea6351a1afac8877a50d418bc20f19e806d7f5a62f5b637208cfa99dbfa71a2e971061e10c459e9590cdba950afae4c0e3d2d15a86b571e1241174a1 WHIRLPOOL e825365e6428cf0baf7d3ce38580a5630c2a76aae9a52808c02cb5f4632571ce276b80f3706e137effadc49c0951a69cee8bf1384b0ad5807b750e1a86cc582b
 MISC metadata.xml 315 SHA256 3b91cbb1c5755498f47b63f92b8c7fa8c2ae21d4094c9dcb89c2c1df9206622b SHA512 fb1fbe7d5d8a99d86dce5d79e90fa849a94cbccc66a972e92084f1dbd4c459c42920f6591918151b22cb16e0db43ffd3dd738cc8dd4cc020db25286009d82d56 WHIRLPOOL e4668e76f04bb96b937327ca2af476ecb732edd2055166749c70b5a783dde8ac0273272bb6966b5d1b3359af596c00835ea58102ce688cd202a4a55358eceab3
diff --git a/sec-policy/selinux-razor/selinux-razor-2.20170204-r1.ebuild b/sec-policy/selinux-razor/selinux-razor-2.20170204-r1.ebuild
index d6591216406e..625cdd8e9593 100644
--- a/sec-policy/selinux-razor/selinux-razor-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-razor/selinux-razor-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-razor/selinux-razor-2.20170204-r2.ebuild b/sec-policy/selinux-razor/selinux-razor-2.20170204-r2.ebuild
index 8b3bfa028d24..6baab7d2f481 100644
--- a/sec-policy/selinux-razor/selinux-razor-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-razor/selinux-razor-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-razor/selinux-razor-2.20170204-r3.ebuild b/sec-policy/selinux-razor/selinux-razor-2.20170204-r3.ebuild
index 8b3bfa028d24..6baab7d2f481 100644
--- a/sec-policy/selinux-razor/selinux-razor-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-razor/selinux-razor-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-razor/selinux-razor-2.20170204-r4.ebuild b/sec-policy/selinux-razor/selinux-razor-2.20170204-r4.ebuild
index 8b3bfa028d24..6baab7d2f481 100644
--- a/sec-policy/selinux-razor/selinux-razor-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-razor/selinux-razor-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-razor/selinux-razor-2.20170805-r2.ebuild b/sec-policy/selinux-razor/selinux-razor-2.20170805-r2.ebuild
index 8b3bfa028d24..6baab7d2f481 100644
--- a/sec-policy/selinux-razor/selinux-razor-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-razor/selinux-razor-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-razor/selinux-razor-2.20170805-r3.ebuild b/sec-policy/selinux-razor/selinux-razor-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..625cdd8e9593
--- /dev/null
+++ b/sec-policy/selinux-razor/selinux-razor-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-razor/selinux-razor-9999.ebuild b/sec-policy/selinux-razor/selinux-razor-9999.ebuild
index d6591216406e..625cdd8e9593 100644
--- a/sec-policy/selinux-razor/selinux-razor-9999.ebuild
+++ b/sec-policy/selinux-razor/selinux-razor-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-remotelogin/Manifest b/sec-policy/selinux-remotelogin/Manifest
index 85312443bc9d..5aaacbe34619 100644
--- a/sec-policy/selinux-remotelogin/Manifest
+++ b/sec-policy/selinux-remotelogin/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-remotelogin-2.20170204-r1.ebuild 293 SHA256 d6e5d2fd39240fcba692663eca2d39c1f834564b7988bba17b581135b508834f SHA512 6896a75e1a810b26a2ca72b7673ecaf3354b9c4ba23d0b68a377c1d29794fb040df07e61a606b7b3e43b2f663cef99870ad39776af7e9ae6ce7a0f761910c36a WHIRLPOOL 017e19998b4f3de8be4123ed86c231fb41f91fb912f482f23eac46690569601a1e706678eb66aa7e8397d92c74cb6f12976beb058093d989a7faf5ae61539cb0
-EBUILD selinux-remotelogin-2.20170204-r2.ebuild 291 SHA256 8cabde5ffc906a55c7ac5c109d469105aa348892cc5dc9c50d2ceb1665abf0ad SHA512 9afcd0ee155aaa49f96bba657c9ffe1976bdc08c165f190d3229fecf14cf357180d655f6e5bcf5230f96ac7d7ab7fa658dbd99ba45f5dcc005767f132f041318 WHIRLPOOL ad9a327f8dfd9bc9743be3dad33d6225effc062ee9fd05663ea822724515ba75572371865bfeee2fb3221ac3442f511ab09d2a55f794450f063b7232f07d6cf7
-EBUILD selinux-remotelogin-2.20170204-r3.ebuild 291 SHA256 8cabde5ffc906a55c7ac5c109d469105aa348892cc5dc9c50d2ceb1665abf0ad SHA512 9afcd0ee155aaa49f96bba657c9ffe1976bdc08c165f190d3229fecf14cf357180d655f6e5bcf5230f96ac7d7ab7fa658dbd99ba45f5dcc005767f132f041318 WHIRLPOOL ad9a327f8dfd9bc9743be3dad33d6225effc062ee9fd05663ea822724515ba75572371865bfeee2fb3221ac3442f511ab09d2a55f794450f063b7232f07d6cf7
-EBUILD selinux-remotelogin-2.20170204-r4.ebuild 291 SHA256 8cabde5ffc906a55c7ac5c109d469105aa348892cc5dc9c50d2ceb1665abf0ad SHA512 9afcd0ee155aaa49f96bba657c9ffe1976bdc08c165f190d3229fecf14cf357180d655f6e5bcf5230f96ac7d7ab7fa658dbd99ba45f5dcc005767f132f041318 WHIRLPOOL ad9a327f8dfd9bc9743be3dad33d6225effc062ee9fd05663ea822724515ba75572371865bfeee2fb3221ac3442f511ab09d2a55f794450f063b7232f07d6cf7
-EBUILD selinux-remotelogin-2.20170805-r2.ebuild 291 SHA256 8cabde5ffc906a55c7ac5c109d469105aa348892cc5dc9c50d2ceb1665abf0ad SHA512 9afcd0ee155aaa49f96bba657c9ffe1976bdc08c165f190d3229fecf14cf357180d655f6e5bcf5230f96ac7d7ab7fa658dbd99ba45f5dcc005767f132f041318 WHIRLPOOL ad9a327f8dfd9bc9743be3dad33d6225effc062ee9fd05663ea822724515ba75572371865bfeee2fb3221ac3442f511ab09d2a55f794450f063b7232f07d6cf7
-EBUILD selinux-remotelogin-9999.ebuild 293 SHA256 d6e5d2fd39240fcba692663eca2d39c1f834564b7988bba17b581135b508834f SHA512 6896a75e1a810b26a2ca72b7673ecaf3354b9c4ba23d0b68a377c1d29794fb040df07e61a606b7b3e43b2f663cef99870ad39776af7e9ae6ce7a0f761910c36a WHIRLPOOL 017e19998b4f3de8be4123ed86c231fb41f91fb912f482f23eac46690569601a1e706678eb66aa7e8397d92c74cb6f12976beb058093d989a7faf5ae61539cb0
+EBUILD selinux-remotelogin-2.20170204-r1.ebuild 294 SHA256 5432067927f7bf3bf17f7b171b8f4d0087a1c4e6b1b2b5558a42faa54256fae8 SHA512 aa13bf014e5601d9e271b6cb1eb965dd3039b668de18991dd88b8eeb2c536991b42c0624cc50d35e16991ce4424dba89b1e776f044b5c01ce24fa92955a3df4a WHIRLPOOL b9a6930ad6f4accb4b91631523835f216e76b424947067ecf2c2627596dd22454aa08170fac0d963b86537abc2ea574be159ecc3d47c4020cb386ee7d4d5e58c
+EBUILD selinux-remotelogin-2.20170204-r2.ebuild 292 SHA256 fc28f46ab0721c1d801a1451337296dc7d6d4f82e608470293f2483b77375775 SHA512 65f5d997a1a4ec39bfb0fa271a9fa4d1140f4edb2dbf4c2b5b4be9d30da9397bce6b89d787786dd4281a8704980c1db840636c87ce8c8c4bc0ec25e6fb657d1d WHIRLPOOL 041081c8a38e03f0e0406d29e27ebbccee0ead1cbc393f075d844ebca5e85eb5cf51bd170ce2325e5fb983835dc3fbd5e08cf164d82ba90680aa9e436fd24ccb
+EBUILD selinux-remotelogin-2.20170204-r3.ebuild 292 SHA256 fc28f46ab0721c1d801a1451337296dc7d6d4f82e608470293f2483b77375775 SHA512 65f5d997a1a4ec39bfb0fa271a9fa4d1140f4edb2dbf4c2b5b4be9d30da9397bce6b89d787786dd4281a8704980c1db840636c87ce8c8c4bc0ec25e6fb657d1d WHIRLPOOL 041081c8a38e03f0e0406d29e27ebbccee0ead1cbc393f075d844ebca5e85eb5cf51bd170ce2325e5fb983835dc3fbd5e08cf164d82ba90680aa9e436fd24ccb
+EBUILD selinux-remotelogin-2.20170204-r4.ebuild 292 SHA256 fc28f46ab0721c1d801a1451337296dc7d6d4f82e608470293f2483b77375775 SHA512 65f5d997a1a4ec39bfb0fa271a9fa4d1140f4edb2dbf4c2b5b4be9d30da9397bce6b89d787786dd4281a8704980c1db840636c87ce8c8c4bc0ec25e6fb657d1d WHIRLPOOL 041081c8a38e03f0e0406d29e27ebbccee0ead1cbc393f075d844ebca5e85eb5cf51bd170ce2325e5fb983835dc3fbd5e08cf164d82ba90680aa9e436fd24ccb
+EBUILD selinux-remotelogin-2.20170805-r2.ebuild 292 SHA256 fc28f46ab0721c1d801a1451337296dc7d6d4f82e608470293f2483b77375775 SHA512 65f5d997a1a4ec39bfb0fa271a9fa4d1140f4edb2dbf4c2b5b4be9d30da9397bce6b89d787786dd4281a8704980c1db840636c87ce8c8c4bc0ec25e6fb657d1d WHIRLPOOL 041081c8a38e03f0e0406d29e27ebbccee0ead1cbc393f075d844ebca5e85eb5cf51bd170ce2325e5fb983835dc3fbd5e08cf164d82ba90680aa9e436fd24ccb
+EBUILD selinux-remotelogin-2.20170805-r3.ebuild 294 SHA256 5432067927f7bf3bf17f7b171b8f4d0087a1c4e6b1b2b5558a42faa54256fae8 SHA512 aa13bf014e5601d9e271b6cb1eb965dd3039b668de18991dd88b8eeb2c536991b42c0624cc50d35e16991ce4424dba89b1e776f044b5c01ce24fa92955a3df4a WHIRLPOOL b9a6930ad6f4accb4b91631523835f216e76b424947067ecf2c2627596dd22454aa08170fac0d963b86537abc2ea574be159ecc3d47c4020cb386ee7d4d5e58c
+EBUILD selinux-remotelogin-9999.ebuild 294 SHA256 5432067927f7bf3bf17f7b171b8f4d0087a1c4e6b1b2b5558a42faa54256fae8 SHA512 aa13bf014e5601d9e271b6cb1eb965dd3039b668de18991dd88b8eeb2c536991b42c0624cc50d35e16991ce4424dba89b1e776f044b5c01ce24fa92955a3df4a WHIRLPOOL b9a6930ad6f4accb4b91631523835f216e76b424947067ecf2c2627596dd22454aa08170fac0d963b86537abc2ea574be159ecc3d47c4020cb386ee7d4d5e58c
 MISC ChangeLog 11071 SHA256 918797d24ab612a901b8886891e62a9ef52315c10ae617d7e6288aa145541424 SHA512 830bafb916be4c409d531fb3fed298abf0abac01008cd00064896ce663c22fc0c6a763aed172de4c0a90deead36cdcfa114c39ebc7a12936a7cb3b62f7807adc WHIRLPOOL b80a4331b2b7258bc6d0d09cf9e86c98d4e9385f1a278f8a1609bbb712817cbf002e61b490fec4b8c9c0365ebe988f565268650f523776e3fe0a2ab2ee9fff76
 MISC ChangeLog-2015 10190 SHA256 77ddf2b76208f685539fe1caae716d6634b12052c485270af5b311183a5fe00e SHA512 4c9fc60988edb698861ac44002263b2d7bdc0f76651bd380f5a0915574aa1915b18de5f5f0ef52c774d790f279a8bb4af000a4325f4a0073a197297b9c069813 WHIRLPOOL 85a043a843c57f6c32800592c71a9f75101fa41146dcb303fb6705914ee9eb08004c3e62e30e528cac8f5747e120730d5b830e3da11f57da0c3e89c1140e7fe4
 MISC metadata.xml 321 SHA256 7f540d737206ac540bb8fc9970cfed4211d3ab293f46ad9902887c911f442a1a SHA512 de35cd8293d68562e772d0163377341a118b1d25957533ade5621dd4d1c5d34ab0269ddc27aaef0bce6826393ad12da5e185aa9761cccaecd7668b03078a5a0b WHIRLPOOL 2583410f2e4f4e0d40244b0622fb786339a52506de1c606ea835acbd6d6bdba106b6fabb5a6764739d57efd752a269cfcabadd9e050bb9b661440f607b6b7fc5
diff --git a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20170204-r1.ebuild b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20170204-r1.ebuild
index e3131cd55f4e..cc9a91d67a4c 100644
--- a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20170204-r2.ebuild b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20170204-r2.ebuild
index 89c3b1a2861d..71d819dc07d1 100644
--- a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20170204-r3.ebuild b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20170204-r3.ebuild
index 89c3b1a2861d..71d819dc07d1 100644
--- a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20170204-r4.ebuild b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20170204-r4.ebuild
index 89c3b1a2861d..71d819dc07d1 100644
--- a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20170805-r2.ebuild b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20170805-r2.ebuild
index 89c3b1a2861d..71d819dc07d1 100644
--- a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20170805-r3.ebuild b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..cc9a91d67a4c
--- /dev/null
+++ b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-remotelogin/selinux-remotelogin-9999.ebuild b/sec-policy/selinux-remotelogin/selinux-remotelogin-9999.ebuild
index e3131cd55f4e..cc9a91d67a4c 100644
--- a/sec-policy/selinux-remotelogin/selinux-remotelogin-9999.ebuild
+++ b/sec-policy/selinux-remotelogin/selinux-remotelogin-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-resolvconf/Manifest b/sec-policy/selinux-resolvconf/Manifest
index dacf124a5cd9..6b9d0d4e7684 100644
--- a/sec-policy/selinux-resolvconf/Manifest
+++ b/sec-policy/selinux-resolvconf/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-resolvconf-2.20170204-r1.ebuild 291 SHA256 6a40e747efda8a05676169a69b2717811bd5055f292acea6c56adb21b574ea7d SHA512 67dbbb889ffb6bc907c15e8a0ae1787c068d8e6334d53a8c932be3de5a7b8162aa746a2c3ef5a7042ba14e76da0a2bff063c24404e4621a2348a7e97afb5f3bd WHIRLPOOL 5398ea784778f0f8ec9b23998a5b1a362f24974dc8f4e26e28547c76db64016f6c3ab6ea5acd94c33ed082c729388219a7fd5622fe21503e153dfabf65b4a168
-EBUILD selinux-resolvconf-2.20170204-r2.ebuild 289 SHA256 0f3b8608aae758af234dad51ead5e2bacf8f7ed0ab74ac21fd26946a808f6a2b SHA512 52adbdb92114cd1ae5d6f5721b8d1debfe6c2384bde661c03a8a5b4eb6fe6122ed451c4bedfe1fff2674d4ed90ea9f3ae7870d44faf49b36bd885c9b0ae0c5db WHIRLPOOL 4857be8bcd90c53040950aacada596fc135d58bb07f7fc0132bc2b6bf2f316ed383293e672afcc6b715b930386c659b56d6bbde5a8dc7b2035c818fdcc3e9db7
-EBUILD selinux-resolvconf-2.20170204-r3.ebuild 289 SHA256 0f3b8608aae758af234dad51ead5e2bacf8f7ed0ab74ac21fd26946a808f6a2b SHA512 52adbdb92114cd1ae5d6f5721b8d1debfe6c2384bde661c03a8a5b4eb6fe6122ed451c4bedfe1fff2674d4ed90ea9f3ae7870d44faf49b36bd885c9b0ae0c5db WHIRLPOOL 4857be8bcd90c53040950aacada596fc135d58bb07f7fc0132bc2b6bf2f316ed383293e672afcc6b715b930386c659b56d6bbde5a8dc7b2035c818fdcc3e9db7
-EBUILD selinux-resolvconf-2.20170204-r4.ebuild 289 SHA256 0f3b8608aae758af234dad51ead5e2bacf8f7ed0ab74ac21fd26946a808f6a2b SHA512 52adbdb92114cd1ae5d6f5721b8d1debfe6c2384bde661c03a8a5b4eb6fe6122ed451c4bedfe1fff2674d4ed90ea9f3ae7870d44faf49b36bd885c9b0ae0c5db WHIRLPOOL 4857be8bcd90c53040950aacada596fc135d58bb07f7fc0132bc2b6bf2f316ed383293e672afcc6b715b930386c659b56d6bbde5a8dc7b2035c818fdcc3e9db7
-EBUILD selinux-resolvconf-2.20170805-r2.ebuild 289 SHA256 0f3b8608aae758af234dad51ead5e2bacf8f7ed0ab74ac21fd26946a808f6a2b SHA512 52adbdb92114cd1ae5d6f5721b8d1debfe6c2384bde661c03a8a5b4eb6fe6122ed451c4bedfe1fff2674d4ed90ea9f3ae7870d44faf49b36bd885c9b0ae0c5db WHIRLPOOL 4857be8bcd90c53040950aacada596fc135d58bb07f7fc0132bc2b6bf2f316ed383293e672afcc6b715b930386c659b56d6bbde5a8dc7b2035c818fdcc3e9db7
-EBUILD selinux-resolvconf-9999.ebuild 291 SHA256 6a40e747efda8a05676169a69b2717811bd5055f292acea6c56adb21b574ea7d SHA512 67dbbb889ffb6bc907c15e8a0ae1787c068d8e6334d53a8c932be3de5a7b8162aa746a2c3ef5a7042ba14e76da0a2bff063c24404e4621a2348a7e97afb5f3bd WHIRLPOOL 5398ea784778f0f8ec9b23998a5b1a362f24974dc8f4e26e28547c76db64016f6c3ab6ea5acd94c33ed082c729388219a7fd5622fe21503e153dfabf65b4a168
+EBUILD selinux-resolvconf-2.20170204-r1.ebuild 292 SHA256 f4dfebbe778ff091735337059c9f89913dea4f74346f6dc0d0fa64208ada9bf3 SHA512 03541e8acfc57674b1502027e06bab6fae1a85af0a71e6ab61765adf7c50a76b9b38b8fad1cd5683d2526391d1c3f67e41de3208be09e49d8b7db3a063fac3ad WHIRLPOOL feb06ea410a74bdbbc9b205dd5366d6e96a8b1bac5848e9cc2c90c8bacb076148929b1f886b083a34b693a82c6b511200828960b368ac83c9db81607b02a52a2
+EBUILD selinux-resolvconf-2.20170204-r2.ebuild 290 SHA256 9f7d882ae1117f62faba3d2d9fbf5407674c3b37948e27ff919f31061a00590f SHA512 2c19bb9a6b3081025c6c4838f658bbde2c501a96dea085c7de1f693b8649f00f88220b0d1d82c47184339ee0e72b744b75eab30fbe776e034c4128f1629f7a63 WHIRLPOOL 1306a388fccd420872dc297bf259537b054050e17f1f9bdca1e78e800d6906015524b82d6fd5e1805bd9aac4cec3dbfec5272d5ad6be0b818e1122bcfb820770
+EBUILD selinux-resolvconf-2.20170204-r3.ebuild 290 SHA256 9f7d882ae1117f62faba3d2d9fbf5407674c3b37948e27ff919f31061a00590f SHA512 2c19bb9a6b3081025c6c4838f658bbde2c501a96dea085c7de1f693b8649f00f88220b0d1d82c47184339ee0e72b744b75eab30fbe776e034c4128f1629f7a63 WHIRLPOOL 1306a388fccd420872dc297bf259537b054050e17f1f9bdca1e78e800d6906015524b82d6fd5e1805bd9aac4cec3dbfec5272d5ad6be0b818e1122bcfb820770
+EBUILD selinux-resolvconf-2.20170204-r4.ebuild 290 SHA256 9f7d882ae1117f62faba3d2d9fbf5407674c3b37948e27ff919f31061a00590f SHA512 2c19bb9a6b3081025c6c4838f658bbde2c501a96dea085c7de1f693b8649f00f88220b0d1d82c47184339ee0e72b744b75eab30fbe776e034c4128f1629f7a63 WHIRLPOOL 1306a388fccd420872dc297bf259537b054050e17f1f9bdca1e78e800d6906015524b82d6fd5e1805bd9aac4cec3dbfec5272d5ad6be0b818e1122bcfb820770
+EBUILD selinux-resolvconf-2.20170805-r2.ebuild 290 SHA256 9f7d882ae1117f62faba3d2d9fbf5407674c3b37948e27ff919f31061a00590f SHA512 2c19bb9a6b3081025c6c4838f658bbde2c501a96dea085c7de1f693b8649f00f88220b0d1d82c47184339ee0e72b744b75eab30fbe776e034c4128f1629f7a63 WHIRLPOOL 1306a388fccd420872dc297bf259537b054050e17f1f9bdca1e78e800d6906015524b82d6fd5e1805bd9aac4cec3dbfec5272d5ad6be0b818e1122bcfb820770
+EBUILD selinux-resolvconf-2.20170805-r3.ebuild 292 SHA256 f4dfebbe778ff091735337059c9f89913dea4f74346f6dc0d0fa64208ada9bf3 SHA512 03541e8acfc57674b1502027e06bab6fae1a85af0a71e6ab61765adf7c50a76b9b38b8fad1cd5683d2526391d1c3f67e41de3208be09e49d8b7db3a063fac3ad WHIRLPOOL feb06ea410a74bdbbc9b205dd5366d6e96a8b1bac5848e9cc2c90c8bacb076148929b1f886b083a34b693a82c6b511200828960b368ac83c9db81607b02a52a2
+EBUILD selinux-resolvconf-9999.ebuild 292 SHA256 f4dfebbe778ff091735337059c9f89913dea4f74346f6dc0d0fa64208ada9bf3 SHA512 03541e8acfc57674b1502027e06bab6fae1a85af0a71e6ab61765adf7c50a76b9b38b8fad1cd5683d2526391d1c3f67e41de3208be09e49d8b7db3a063fac3ad WHIRLPOOL feb06ea410a74bdbbc9b205dd5366d6e96a8b1bac5848e9cc2c90c8bacb076148929b1f886b083a34b693a82c6b511200828960b368ac83c9db81607b02a52a2
 MISC ChangeLog 10979 SHA256 ef325029eb236ea1845bf36f276b52a9a807bddf2a9cec832444882bd26a0d4d SHA512 ca908b9e007353f122352bdd73f61b0e42ee5ec3871e8a84307f547ed38772d9c3a5de14041f627a4ffdc513a6034c336b3ada2089eb1da68acd8953d2044948 WHIRLPOOL 35e5c069f7a666bffc01e1afc103de9c35a9874bc5401273a1c4070f5e45e1a3b559b259cad873844981e1f5ef8fdb519d5267fec9ab34da223602a611ba058c
 MISC ChangeLog-2015 4171 SHA256 3d07b0dbb6b64f8ce40af27dea730d998f79f990c88a0857a45515dac85648ce SHA512 d54eeec7528a26d2c4de3dfb69f4a05588052f72f7aca81a0685241eb8392e3fc33f69af365a312e625bc2dbbf15167e179c3c7db4a8c46fe11ead39369fedf0 WHIRLPOOL a3c5619415e6a662f34e32e3b3043e2bf5d81004cdb116686d24e3b2c5a8838ac6412f60883c672487739bb1476a13c1a53a65102380c1d782fa21d998e8a467
 MISC metadata.xml 320 SHA256 ba0fe3a31e37526826f3020aa2f5ae59d64e7f147e958882377de1704999470e SHA512 a0886fd0602510911aa320748175141f3c30f31361994fd86a8a3923962252dfda9ec6d08a07502b514d8366fc4b7ecc0311fad268620b8eddd1be6af4f86183 WHIRLPOOL ab4cf4a33c07aa5c968ca1b89dd741faa35519f7d1c56128ca9249dfa9868788dfaa5a2201c4f7771377b6cdd061ea4d8fd3049989ed6db94f00dc9d438bca7f
diff --git a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20170204-r1.ebuild b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20170204-r1.ebuild
index cfa6fe3e8122..e8cbc1daf54e 100644
--- a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20170204-r2.ebuild b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20170204-r2.ebuild
index e412941e2ced..42f62e6a45d7 100644
--- a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20170204-r3.ebuild b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20170204-r3.ebuild
index e412941e2ced..42f62e6a45d7 100644
--- a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20170204-r4.ebuild b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20170204-r4.ebuild
index e412941e2ced..42f62e6a45d7 100644
--- a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20170805-r2.ebuild b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20170805-r2.ebuild
index e412941e2ced..42f62e6a45d7 100644
--- a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20170805-r3.ebuild b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..e8cbc1daf54e
--- /dev/null
+++ b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-resolvconf/selinux-resolvconf-9999.ebuild b/sec-policy/selinux-resolvconf/selinux-resolvconf-9999.ebuild
index cfa6fe3e8122..e8cbc1daf54e 100644
--- a/sec-policy/selinux-resolvconf/selinux-resolvconf-9999.ebuild
+++ b/sec-policy/selinux-resolvconf/selinux-resolvconf-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-rgmanager/Manifest b/sec-policy/selinux-rgmanager/Manifest
index 7c9ad3cbb7ca..22b1dd7a928a 100644
--- a/sec-policy/selinux-rgmanager/Manifest
+++ b/sec-policy/selinux-rgmanager/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-rgmanager-2.20170204-r1.ebuild 289 SHA256 b74e50140f68bf50e5b7e14aae6fa03ebdafc6b5d362c4439991ff79e5947959 SHA512 4c80a2b0a8945f93623b9458078fea047b87e3485e5c8036c2f1dd318bf8c5d9a4a5e8cc95c287e74b1a250a83b299897e7f31ee3d55da32d78cf3bec24f5486 WHIRLPOOL 1d6beb9c7f0b542a28dbc2302bd2d698f2ff31ae4f56653f2628b57f2901f0fe838cd5628609f624a95ab1d5bc10b163b0cd41863558f7e37d83fcb0a8aba4b5
-EBUILD selinux-rgmanager-2.20170204-r2.ebuild 287 SHA256 247e0db91349a33abc9bbb42bfb36609f2a554bfb79d19d9f5d8df3ab00957af SHA512 3475352b58fbf90c880fc2cc11ed539546b468acc929cbe0fbab9444d97e97c1c8393fb92167151f2d242a9a59361c470531fe27c864dd4e0be61ee91e34ef3f WHIRLPOOL 59382210fe46baf025c91cb2507a1310dd2352a075d1343cd62092732de5d824ce54db12cd3c42c34b75f4ad912e7c464093137fee555d4019f1d9b21081a06b
-EBUILD selinux-rgmanager-2.20170204-r3.ebuild 287 SHA256 247e0db91349a33abc9bbb42bfb36609f2a554bfb79d19d9f5d8df3ab00957af SHA512 3475352b58fbf90c880fc2cc11ed539546b468acc929cbe0fbab9444d97e97c1c8393fb92167151f2d242a9a59361c470531fe27c864dd4e0be61ee91e34ef3f WHIRLPOOL 59382210fe46baf025c91cb2507a1310dd2352a075d1343cd62092732de5d824ce54db12cd3c42c34b75f4ad912e7c464093137fee555d4019f1d9b21081a06b
-EBUILD selinux-rgmanager-2.20170204-r4.ebuild 287 SHA256 247e0db91349a33abc9bbb42bfb36609f2a554bfb79d19d9f5d8df3ab00957af SHA512 3475352b58fbf90c880fc2cc11ed539546b468acc929cbe0fbab9444d97e97c1c8393fb92167151f2d242a9a59361c470531fe27c864dd4e0be61ee91e34ef3f WHIRLPOOL 59382210fe46baf025c91cb2507a1310dd2352a075d1343cd62092732de5d824ce54db12cd3c42c34b75f4ad912e7c464093137fee555d4019f1d9b21081a06b
-EBUILD selinux-rgmanager-2.20170805-r2.ebuild 287 SHA256 247e0db91349a33abc9bbb42bfb36609f2a554bfb79d19d9f5d8df3ab00957af SHA512 3475352b58fbf90c880fc2cc11ed539546b468acc929cbe0fbab9444d97e97c1c8393fb92167151f2d242a9a59361c470531fe27c864dd4e0be61ee91e34ef3f WHIRLPOOL 59382210fe46baf025c91cb2507a1310dd2352a075d1343cd62092732de5d824ce54db12cd3c42c34b75f4ad912e7c464093137fee555d4019f1d9b21081a06b
-EBUILD selinux-rgmanager-9999.ebuild 289 SHA256 b74e50140f68bf50e5b7e14aae6fa03ebdafc6b5d362c4439991ff79e5947959 SHA512 4c80a2b0a8945f93623b9458078fea047b87e3485e5c8036c2f1dd318bf8c5d9a4a5e8cc95c287e74b1a250a83b299897e7f31ee3d55da32d78cf3bec24f5486 WHIRLPOOL 1d6beb9c7f0b542a28dbc2302bd2d698f2ff31ae4f56653f2628b57f2901f0fe838cd5628609f624a95ab1d5bc10b163b0cd41863558f7e37d83fcb0a8aba4b5
+EBUILD selinux-rgmanager-2.20170204-r1.ebuild 290 SHA256 c328373798ab17e3c4c8504d619ba6517869273d7863f5f4d6368d49bbdca9b8 SHA512 699bdd339d310b6da3846309c3c6a0657ca71c42e942e1f2ca2a71fa8a36b482a52e580624a2e60771931d4dd74d1d54ff48ce62273263a2f2a1bd631144f413 WHIRLPOOL a9a9ca31e3a83d1ed1c837d261f1855edf269b4a329bbfa92503734f9658b1f40b63d3274c3d9f096c48c4521460584589eb1127bede4a7b782c1adb93a83f74
+EBUILD selinux-rgmanager-2.20170204-r2.ebuild 288 SHA256 ed8f039e06fcade9410af19d95f745aea11cd2dfe0cd1376a97037effb503a40 SHA512 a2318f6992b270bfa14103e5d51f3c8038881bd9cec5f2405faca44093e7dba82966d57423091589b69bc6a0b2d09bd6842c92a6b9bed1f5ba867f1ae4f66458 WHIRLPOOL f4b0b14de280b5d69e2314206acfcb7c96d8221d98004fd4c1dd7a690eba64567259f3bc468979d34beacf0e5c74df03efc85ba6a3c4dac8982f682230db58f9
+EBUILD selinux-rgmanager-2.20170204-r3.ebuild 288 SHA256 ed8f039e06fcade9410af19d95f745aea11cd2dfe0cd1376a97037effb503a40 SHA512 a2318f6992b270bfa14103e5d51f3c8038881bd9cec5f2405faca44093e7dba82966d57423091589b69bc6a0b2d09bd6842c92a6b9bed1f5ba867f1ae4f66458 WHIRLPOOL f4b0b14de280b5d69e2314206acfcb7c96d8221d98004fd4c1dd7a690eba64567259f3bc468979d34beacf0e5c74df03efc85ba6a3c4dac8982f682230db58f9
+EBUILD selinux-rgmanager-2.20170204-r4.ebuild 288 SHA256 ed8f039e06fcade9410af19d95f745aea11cd2dfe0cd1376a97037effb503a40 SHA512 a2318f6992b270bfa14103e5d51f3c8038881bd9cec5f2405faca44093e7dba82966d57423091589b69bc6a0b2d09bd6842c92a6b9bed1f5ba867f1ae4f66458 WHIRLPOOL f4b0b14de280b5d69e2314206acfcb7c96d8221d98004fd4c1dd7a690eba64567259f3bc468979d34beacf0e5c74df03efc85ba6a3c4dac8982f682230db58f9
+EBUILD selinux-rgmanager-2.20170805-r2.ebuild 288 SHA256 ed8f039e06fcade9410af19d95f745aea11cd2dfe0cd1376a97037effb503a40 SHA512 a2318f6992b270bfa14103e5d51f3c8038881bd9cec5f2405faca44093e7dba82966d57423091589b69bc6a0b2d09bd6842c92a6b9bed1f5ba867f1ae4f66458 WHIRLPOOL f4b0b14de280b5d69e2314206acfcb7c96d8221d98004fd4c1dd7a690eba64567259f3bc468979d34beacf0e5c74df03efc85ba6a3c4dac8982f682230db58f9
+EBUILD selinux-rgmanager-2.20170805-r3.ebuild 290 SHA256 c328373798ab17e3c4c8504d619ba6517869273d7863f5f4d6368d49bbdca9b8 SHA512 699bdd339d310b6da3846309c3c6a0657ca71c42e942e1f2ca2a71fa8a36b482a52e580624a2e60771931d4dd74d1d54ff48ce62273263a2f2a1bd631144f413 WHIRLPOOL a9a9ca31e3a83d1ed1c837d261f1855edf269b4a329bbfa92503734f9658b1f40b63d3274c3d9f096c48c4521460584589eb1127bede4a7b782c1adb93a83f74
+EBUILD selinux-rgmanager-9999.ebuild 290 SHA256 c328373798ab17e3c4c8504d619ba6517869273d7863f5f4d6368d49bbdca9b8 SHA512 699bdd339d310b6da3846309c3c6a0657ca71c42e942e1f2ca2a71fa8a36b482a52e580624a2e60771931d4dd74d1d54ff48ce62273263a2f2a1bd631144f413 WHIRLPOOL a9a9ca31e3a83d1ed1c837d261f1855edf269b4a329bbfa92503734f9658b1f40b63d3274c3d9f096c48c4521460584589eb1127bede4a7b782c1adb93a83f74
 MISC ChangeLog 10887 SHA256 3371667aeb55f3783450399d535f8796d94a140ac7ed9c9f4409421e868913e3 SHA512 17b7f9ae59183bcaed3047f32f5f4a59ff818e95059a7c2fa0355fe5df507cb0050f6cfd4a0e44bdfe3192d56b31316ea51c56c1b16b14f8ffa129fa85531431 WHIRLPOOL d86336729950e7400482aa6bd31584f91c87da05fd39bc2ebcaf62e9ce1c906a77e1f2cb559fcf4771443478f77cb8b10c2b7a42099693e90cda15d61760c2a7
 MISC ChangeLog-2015 10420 SHA256 e00a9b994754c1392b71025e1a48324d62f2e14313b77c2ce3c896878395ba2b SHA512 b2ccaa661411269257c568d8a20be92167f27e5151ae27f5a5f11809769b8ba7990d5af7e09dbf798d543661c6c09f6949608060a6d24d691b240f3e006591d0 WHIRLPOOL ad2dae1921c4df370322dbd5dce39d3f5209271079abb07eeb7d3e77af5815000c7d4b8f43fb0713ffd42d589b2dd10e29a83e96e30184dc98dea86fd14f459b
 MISC metadata.xml 319 SHA256 1bf6d9a73e2e6af456516c96bc4dd1890d1cf031c5e5e57014f217d4b3e6d459 SHA512 3fe6e00bc4ff66fa281731582d5713081be180c8340ecd2c28501629018dac75c731d6a154cb84dc587af87e85bd787937ff64a16f9180400d0ed4894871df61 WHIRLPOOL 55fe5c4816c3493934ba2f847655ec9438e36915833536bd26283ca4d4453a0c572677899398195dafba38263b83da373806191413a6459d27703f4c491c02b6
diff --git a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20170204-r1.ebuild b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20170204-r1.ebuild
index 130fb57b7183..a4634675fedf 100644
--- a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20170204-r2.ebuild b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20170204-r2.ebuild
index c18894de0792..512e893e0173 100644
--- a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20170204-r3.ebuild b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20170204-r3.ebuild
index c18894de0792..512e893e0173 100644
--- a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20170204-r4.ebuild b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20170204-r4.ebuild
index c18894de0792..512e893e0173 100644
--- a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20170805-r2.ebuild b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20170805-r2.ebuild
index c18894de0792..512e893e0173 100644
--- a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20170805-r3.ebuild b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..a4634675fedf
--- /dev/null
+++ b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-rgmanager/selinux-rgmanager-9999.ebuild b/sec-policy/selinux-rgmanager/selinux-rgmanager-9999.ebuild
index 130fb57b7183..a4634675fedf 100644
--- a/sec-policy/selinux-rgmanager/selinux-rgmanager-9999.ebuild
+++ b/sec-policy/selinux-rgmanager/selinux-rgmanager-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-rngd/Manifest b/sec-policy/selinux-rngd/Manifest
index 915f1cbb9b1d..e9584606fac9 100644
--- a/sec-policy/selinux-rngd/Manifest
+++ b/sec-policy/selinux-rngd/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-rngd-2.20170204-r1.ebuild 279 SHA256 cd0d6292e618b07f018fee1e129dc928e419219b9d5d2a279ea66d92d127de3f SHA512 6e7b93886133fe9364c8f8da697147206ce0ccf7ae61c16edaf95d249bb638068b181fe0fad986541c8545318d0ad2129420a94388ce6265ded2c7b41385582f WHIRLPOOL 1f91e3af740f17120d19cd7856c7f0c7290104ba8b5d82a1d5e741ded0ac5ac4d59c7d96c7d4c25279477ad0ec2fdee2cbfc721f5a92c436591869f778b5fd23
-EBUILD selinux-rngd-2.20170204-r2.ebuild 277 SHA256 817e4101a27a989d9fd50ec3ff06acea2a946a9208b4cb605270a88556188331 SHA512 17cf122ff8b2a6ed387f8d82ae5c2c5384f2d7937fa6ce27579ecab71d0d756ee9bad0202b1dba4a3eeda83cae21b4d27fc5528d764b8f977456da2f4c66d471 WHIRLPOOL 59882dde263acff2a84f5c973d43eda59b9ccd004349d8ef8b29dec69618374d6e68536a2b4f3c2c60dd2317417738d3a4c04a8e5d05f43330ee1ee78706d803
-EBUILD selinux-rngd-2.20170204-r3.ebuild 277 SHA256 817e4101a27a989d9fd50ec3ff06acea2a946a9208b4cb605270a88556188331 SHA512 17cf122ff8b2a6ed387f8d82ae5c2c5384f2d7937fa6ce27579ecab71d0d756ee9bad0202b1dba4a3eeda83cae21b4d27fc5528d764b8f977456da2f4c66d471 WHIRLPOOL 59882dde263acff2a84f5c973d43eda59b9ccd004349d8ef8b29dec69618374d6e68536a2b4f3c2c60dd2317417738d3a4c04a8e5d05f43330ee1ee78706d803
-EBUILD selinux-rngd-2.20170204-r4.ebuild 277 SHA256 817e4101a27a989d9fd50ec3ff06acea2a946a9208b4cb605270a88556188331 SHA512 17cf122ff8b2a6ed387f8d82ae5c2c5384f2d7937fa6ce27579ecab71d0d756ee9bad0202b1dba4a3eeda83cae21b4d27fc5528d764b8f977456da2f4c66d471 WHIRLPOOL 59882dde263acff2a84f5c973d43eda59b9ccd004349d8ef8b29dec69618374d6e68536a2b4f3c2c60dd2317417738d3a4c04a8e5d05f43330ee1ee78706d803
-EBUILD selinux-rngd-2.20170805-r2.ebuild 277 SHA256 817e4101a27a989d9fd50ec3ff06acea2a946a9208b4cb605270a88556188331 SHA512 17cf122ff8b2a6ed387f8d82ae5c2c5384f2d7937fa6ce27579ecab71d0d756ee9bad0202b1dba4a3eeda83cae21b4d27fc5528d764b8f977456da2f4c66d471 WHIRLPOOL 59882dde263acff2a84f5c973d43eda59b9ccd004349d8ef8b29dec69618374d6e68536a2b4f3c2c60dd2317417738d3a4c04a8e5d05f43330ee1ee78706d803
-EBUILD selinux-rngd-9999.ebuild 279 SHA256 cd0d6292e618b07f018fee1e129dc928e419219b9d5d2a279ea66d92d127de3f SHA512 6e7b93886133fe9364c8f8da697147206ce0ccf7ae61c16edaf95d249bb638068b181fe0fad986541c8545318d0ad2129420a94388ce6265ded2c7b41385582f WHIRLPOOL 1f91e3af740f17120d19cd7856c7f0c7290104ba8b5d82a1d5e741ded0ac5ac4d59c7d96c7d4c25279477ad0ec2fdee2cbfc721f5a92c436591869f778b5fd23
+EBUILD selinux-rngd-2.20170204-r1.ebuild 280 SHA256 43a71d6d18911341b43efd31daddc97f8e6f9855acad31acfd754628339fccb7 SHA512 81730c9374298549144660e309c23450121df6e33635302ff51c7222b92e963365358de3382136f3575989a534611bd26481a52453f7165e8395ccd62a63c462 WHIRLPOOL d5e505f618f96fbd6199de1ed239fc9d8aed3ad354f8f09794df0903b12583fafeb20b25f209f52f1d6a6c6a365af4f16fb1e7ca4d9d07018a0343f2058f98d1
+EBUILD selinux-rngd-2.20170204-r2.ebuild 278 SHA256 10bcf721ef91c1dbda63c08c809475677f9907e6b01c29158197d434c0dce77f SHA512 78df554ed8a5ec584cfde349209334fc128328280d38105412e5644f2690c7801b95a85088310b4dd64078298c77da8d0f7e9c5a4d1aa44f6eaac294cf91c53b WHIRLPOOL 033b68d8a9f1886eea6e6e23afe2bcc158749a49bf04a8818dc67c22bc32ad7cab22d73175da9fad4cc5b6e68b275422c69a07b6823a8375da40247d168ade1b
+EBUILD selinux-rngd-2.20170204-r3.ebuild 278 SHA256 10bcf721ef91c1dbda63c08c809475677f9907e6b01c29158197d434c0dce77f SHA512 78df554ed8a5ec584cfde349209334fc128328280d38105412e5644f2690c7801b95a85088310b4dd64078298c77da8d0f7e9c5a4d1aa44f6eaac294cf91c53b WHIRLPOOL 033b68d8a9f1886eea6e6e23afe2bcc158749a49bf04a8818dc67c22bc32ad7cab22d73175da9fad4cc5b6e68b275422c69a07b6823a8375da40247d168ade1b
+EBUILD selinux-rngd-2.20170204-r4.ebuild 278 SHA256 10bcf721ef91c1dbda63c08c809475677f9907e6b01c29158197d434c0dce77f SHA512 78df554ed8a5ec584cfde349209334fc128328280d38105412e5644f2690c7801b95a85088310b4dd64078298c77da8d0f7e9c5a4d1aa44f6eaac294cf91c53b WHIRLPOOL 033b68d8a9f1886eea6e6e23afe2bcc158749a49bf04a8818dc67c22bc32ad7cab22d73175da9fad4cc5b6e68b275422c69a07b6823a8375da40247d168ade1b
+EBUILD selinux-rngd-2.20170805-r2.ebuild 278 SHA256 10bcf721ef91c1dbda63c08c809475677f9907e6b01c29158197d434c0dce77f SHA512 78df554ed8a5ec584cfde349209334fc128328280d38105412e5644f2690c7801b95a85088310b4dd64078298c77da8d0f7e9c5a4d1aa44f6eaac294cf91c53b WHIRLPOOL 033b68d8a9f1886eea6e6e23afe2bcc158749a49bf04a8818dc67c22bc32ad7cab22d73175da9fad4cc5b6e68b275422c69a07b6823a8375da40247d168ade1b
+EBUILD selinux-rngd-2.20170805-r3.ebuild 280 SHA256 43a71d6d18911341b43efd31daddc97f8e6f9855acad31acfd754628339fccb7 SHA512 81730c9374298549144660e309c23450121df6e33635302ff51c7222b92e963365358de3382136f3575989a534611bd26481a52453f7165e8395ccd62a63c462 WHIRLPOOL d5e505f618f96fbd6199de1ed239fc9d8aed3ad354f8f09794df0903b12583fafeb20b25f209f52f1d6a6c6a365af4f16fb1e7ca4d9d07018a0343f2058f98d1
+EBUILD selinux-rngd-9999.ebuild 280 SHA256 43a71d6d18911341b43efd31daddc97f8e6f9855acad31acfd754628339fccb7 SHA512 81730c9374298549144660e309c23450121df6e33635302ff51c7222b92e963365358de3382136f3575989a534611bd26481a52453f7165e8395ccd62a63c462 WHIRLPOOL d5e505f618f96fbd6199de1ed239fc9d8aed3ad354f8f09794df0903b12583fafeb20b25f209f52f1d6a6c6a365af4f16fb1e7ca4d9d07018a0343f2058f98d1
 MISC ChangeLog 10387 SHA256 ec7b9a7ca0e2b45e93a84ac7017949ff43ea0c699c23e2a8212290592377f686 SHA512 fb6cff95bb0274e47e671f92802b09b56251a69ab46de3e856355e168b4070aebdd100ffb5aeaff4ae38f1392d0cd374982aa019b5032da71b4f0ca5ea735ff5 WHIRLPOOL 9980a8741a63a38a2707a6af4f577b552f7634a97631a0d85bcc628319de2f657e949171a2a0e40f5f1943b713bdda60e057b27ba8a02b8fc4554a657ac39645
 MISC ChangeLog-2015 5153 SHA256 20f468a3a6509e20d42bb527bd2bd79b7ba16f1528186d9624557e4817a28c64 SHA512 f107b3a49df06eda9d421a1f1953cdcca99d6a59987d5b437a4fb476d3f11d6ff765e2727a5a4569449c832246dbc69f7f356f7507addac6d2b3d652ce72d006 WHIRLPOOL 012f56c286ec3c03b240598d3443cb31f82821de6a72160fb86d5ecff594e55363a22165e0ff155d80d4ef0d04f26f6e99d9e467934ce4973c7860421333c7b0
 MISC metadata.xml 314 SHA256 19592a28d54268230ea7183887fc3bbb77c828da5a854185ba14051ad1a7cfe8 SHA512 fd3229d5a3c38e74a5ac713c58882697f0effec4f4c64a0fa6649f6b068934a9669a56c05eceff23970d884094b3336532ef36c48acbf27904a8628bdce677fc WHIRLPOOL dd87597079276cea97e74ce22b2a1d3d4e08ae33cc7e5ac06e5be0fc00a58455407976c64ce89a0f1da117c1d33e8eb847655ca124c2fae134df49cdbc58055c
diff --git a/sec-policy/selinux-rngd/selinux-rngd-2.20170204-r1.ebuild b/sec-policy/selinux-rngd/selinux-rngd-2.20170204-r1.ebuild
index 578562040703..fab98c37fb75 100644
--- a/sec-policy/selinux-rngd/selinux-rngd-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-rngd/selinux-rngd-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-rngd/selinux-rngd-2.20170204-r2.ebuild b/sec-policy/selinux-rngd/selinux-rngd-2.20170204-r2.ebuild
index c12acc4f5053..94b1d6c82413 100644
--- a/sec-policy/selinux-rngd/selinux-rngd-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-rngd/selinux-rngd-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-rngd/selinux-rngd-2.20170204-r3.ebuild b/sec-policy/selinux-rngd/selinux-rngd-2.20170204-r3.ebuild
index c12acc4f5053..94b1d6c82413 100644
--- a/sec-policy/selinux-rngd/selinux-rngd-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-rngd/selinux-rngd-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-rngd/selinux-rngd-2.20170204-r4.ebuild b/sec-policy/selinux-rngd/selinux-rngd-2.20170204-r4.ebuild
index c12acc4f5053..94b1d6c82413 100644
--- a/sec-policy/selinux-rngd/selinux-rngd-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-rngd/selinux-rngd-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-rngd/selinux-rngd-2.20170805-r2.ebuild b/sec-policy/selinux-rngd/selinux-rngd-2.20170805-r2.ebuild
index c12acc4f5053..94b1d6c82413 100644
--- a/sec-policy/selinux-rngd/selinux-rngd-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-rngd/selinux-rngd-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-rngd/selinux-rngd-2.20170805-r3.ebuild b/sec-policy/selinux-rngd/selinux-rngd-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..fab98c37fb75
--- /dev/null
+++ b/sec-policy/selinux-rngd/selinux-rngd-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-rngd/selinux-rngd-9999.ebuild b/sec-policy/selinux-rngd/selinux-rngd-9999.ebuild
index 578562040703..fab98c37fb75 100644
--- a/sec-policy/selinux-rngd/selinux-rngd-9999.ebuild
+++ b/sec-policy/selinux-rngd/selinux-rngd-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-roundup/Manifest b/sec-policy/selinux-roundup/Manifest
index 414e83e386a9..7026332b2d05 100644
--- a/sec-policy/selinux-roundup/Manifest
+++ b/sec-policy/selinux-roundup/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-roundup-2.20170204-r1.ebuild 285 SHA256 0120675b2a386fd0637a71d1d8e5372847727542e419487cf8f6fe7465f10546 SHA512 db9c56752757fd99db0053ac8277b6402eb895a6d84641473af8167f0dc10fea33e6f399291f7b67ad85d66fc5b8b40ccdadeb30b2c4131f711bc6f46c0829f3 WHIRLPOOL 6862fb2a8aeedaab5481a0d158f1a893323665fbcb0ae96503a5ba506cee76ec0e130f340c6c51e4d958d1526a9befbab4acec0916cae965b0aaec29e59d9719
-EBUILD selinux-roundup-2.20170204-r2.ebuild 283 SHA256 39d29e1824e280137d0c901dfb95d5d384ee5232da0248e1775022585d38456d SHA512 ded9982dd8606cee25d89841fc6390ad30ccad208b1182f813d0650b545347d3d877ae485e7d79e616c111db06857218389cbbca5ea0c1b655084279a753a88a WHIRLPOOL 19a1c8fd7d69f1f8b618399805af801449771261ec153d7d14e6088b81b0c1196dedf849ce2212f889618c9b5c39c1bf0bfdc50f0cb6e6855f8fb07567d60b70
-EBUILD selinux-roundup-2.20170204-r3.ebuild 283 SHA256 39d29e1824e280137d0c901dfb95d5d384ee5232da0248e1775022585d38456d SHA512 ded9982dd8606cee25d89841fc6390ad30ccad208b1182f813d0650b545347d3d877ae485e7d79e616c111db06857218389cbbca5ea0c1b655084279a753a88a WHIRLPOOL 19a1c8fd7d69f1f8b618399805af801449771261ec153d7d14e6088b81b0c1196dedf849ce2212f889618c9b5c39c1bf0bfdc50f0cb6e6855f8fb07567d60b70
-EBUILD selinux-roundup-2.20170204-r4.ebuild 283 SHA256 39d29e1824e280137d0c901dfb95d5d384ee5232da0248e1775022585d38456d SHA512 ded9982dd8606cee25d89841fc6390ad30ccad208b1182f813d0650b545347d3d877ae485e7d79e616c111db06857218389cbbca5ea0c1b655084279a753a88a WHIRLPOOL 19a1c8fd7d69f1f8b618399805af801449771261ec153d7d14e6088b81b0c1196dedf849ce2212f889618c9b5c39c1bf0bfdc50f0cb6e6855f8fb07567d60b70
-EBUILD selinux-roundup-2.20170805-r2.ebuild 283 SHA256 39d29e1824e280137d0c901dfb95d5d384ee5232da0248e1775022585d38456d SHA512 ded9982dd8606cee25d89841fc6390ad30ccad208b1182f813d0650b545347d3d877ae485e7d79e616c111db06857218389cbbca5ea0c1b655084279a753a88a WHIRLPOOL 19a1c8fd7d69f1f8b618399805af801449771261ec153d7d14e6088b81b0c1196dedf849ce2212f889618c9b5c39c1bf0bfdc50f0cb6e6855f8fb07567d60b70
-EBUILD selinux-roundup-9999.ebuild 285 SHA256 0120675b2a386fd0637a71d1d8e5372847727542e419487cf8f6fe7465f10546 SHA512 db9c56752757fd99db0053ac8277b6402eb895a6d84641473af8167f0dc10fea33e6f399291f7b67ad85d66fc5b8b40ccdadeb30b2c4131f711bc6f46c0829f3 WHIRLPOOL 6862fb2a8aeedaab5481a0d158f1a893323665fbcb0ae96503a5ba506cee76ec0e130f340c6c51e4d958d1526a9befbab4acec0916cae965b0aaec29e59d9719
+EBUILD selinux-roundup-2.20170204-r1.ebuild 286 SHA256 e69ed3cc9cc27240f03260ca768c37483979b15491e3b9c3fcd1c33fedca5b10 SHA512 a8c9f440658db9d1889b3751c2291dd3bea564b05f356b410283f7f7299307682667df22ed36bd1e999b43cc884763b6b2e9674a0fc76a43c7e91e5644b7bd2e WHIRLPOOL 41c0817ca491c431a5a8c1df409c2dc1140fe4c88fb5ace64a5c1cb0c53aaf96a7bea3a280d11530819ac5e8f2469d79dcec31e4256b138e41605f7c1ced9ec0
+EBUILD selinux-roundup-2.20170204-r2.ebuild 284 SHA256 4dc3d1dcdb322108cf1b842e7726131a339b29300a47f63ec4536bd08d2ba47b SHA512 777d9e2800ae9fa47bc36dabce655dc5b51000263e43ea02feb4cde62bfb6bc59f324492484e6030bbf74c6f487f8c5cd8fcfdd7763cc922fe4d04d17fc821fb WHIRLPOOL 4c47aae2bda2c41056eddcd96b7229947bb7a21d04599229dba62d84ae46772efe4bbc195f32e5cf6f04d3d722d13c5cd842226d6de4834e27587e6a0fecc622
+EBUILD selinux-roundup-2.20170204-r3.ebuild 284 SHA256 4dc3d1dcdb322108cf1b842e7726131a339b29300a47f63ec4536bd08d2ba47b SHA512 777d9e2800ae9fa47bc36dabce655dc5b51000263e43ea02feb4cde62bfb6bc59f324492484e6030bbf74c6f487f8c5cd8fcfdd7763cc922fe4d04d17fc821fb WHIRLPOOL 4c47aae2bda2c41056eddcd96b7229947bb7a21d04599229dba62d84ae46772efe4bbc195f32e5cf6f04d3d722d13c5cd842226d6de4834e27587e6a0fecc622
+EBUILD selinux-roundup-2.20170204-r4.ebuild 284 SHA256 4dc3d1dcdb322108cf1b842e7726131a339b29300a47f63ec4536bd08d2ba47b SHA512 777d9e2800ae9fa47bc36dabce655dc5b51000263e43ea02feb4cde62bfb6bc59f324492484e6030bbf74c6f487f8c5cd8fcfdd7763cc922fe4d04d17fc821fb WHIRLPOOL 4c47aae2bda2c41056eddcd96b7229947bb7a21d04599229dba62d84ae46772efe4bbc195f32e5cf6f04d3d722d13c5cd842226d6de4834e27587e6a0fecc622
+EBUILD selinux-roundup-2.20170805-r2.ebuild 284 SHA256 4dc3d1dcdb322108cf1b842e7726131a339b29300a47f63ec4536bd08d2ba47b SHA512 777d9e2800ae9fa47bc36dabce655dc5b51000263e43ea02feb4cde62bfb6bc59f324492484e6030bbf74c6f487f8c5cd8fcfdd7763cc922fe4d04d17fc821fb WHIRLPOOL 4c47aae2bda2c41056eddcd96b7229947bb7a21d04599229dba62d84ae46772efe4bbc195f32e5cf6f04d3d722d13c5cd842226d6de4834e27587e6a0fecc622
+EBUILD selinux-roundup-2.20170805-r3.ebuild 286 SHA256 e69ed3cc9cc27240f03260ca768c37483979b15491e3b9c3fcd1c33fedca5b10 SHA512 a8c9f440658db9d1889b3751c2291dd3bea564b05f356b410283f7f7299307682667df22ed36bd1e999b43cc884763b6b2e9674a0fc76a43c7e91e5644b7bd2e WHIRLPOOL 41c0817ca491c431a5a8c1df409c2dc1140fe4c88fb5ace64a5c1cb0c53aaf96a7bea3a280d11530819ac5e8f2469d79dcec31e4256b138e41605f7c1ced9ec0
+EBUILD selinux-roundup-9999.ebuild 286 SHA256 e69ed3cc9cc27240f03260ca768c37483979b15491e3b9c3fcd1c33fedca5b10 SHA512 a8c9f440658db9d1889b3751c2291dd3bea564b05f356b410283f7f7299307682667df22ed36bd1e999b43cc884763b6b2e9674a0fc76a43c7e91e5644b7bd2e WHIRLPOOL 41c0817ca491c431a5a8c1df409c2dc1140fe4c88fb5ace64a5c1cb0c53aaf96a7bea3a280d11530819ac5e8f2469d79dcec31e4256b138e41605f7c1ced9ec0
 MISC ChangeLog 10687 SHA256 75d27b125c145448a0ae5fa6b6b862d32c4454bb87fa4eef895a2bd57c442859 SHA512 8427ceecec50b356b111774a158b187f0575e6d004f5bf6a8dfc7017db10429ad9235ea61ff36e44ddcee9496df647fd10d668ff98ca3290c602fd2405ca4d6d WHIRLPOOL edd1afdcb9116c644ec119a32c8079134d45526e590cf394c1f39e6f0ee1538bd7a52c1edb67d460ca3448a4012c6269cf2f621f57e0b31043c11b78d8847c99
 MISC ChangeLog-2015 9977 SHA256 1658207f6aac4b664ed1c38dae8f59b28e19e95b7a8c2f9621b8f78ad2d505b6 SHA512 9cd338addd44a7d9c5a154fa943187b25894c3289d8831ecc9dff2aefe62cea5202bac815d0e51d2426892e40266c61870277104f00eb9dd272f94ebaf5b93ef WHIRLPOOL 774d420d6e00a55e13165dfdbe583c55ee7ffbee92dddf5a7bd6185f0cb0ae6e3d59225e0b402ae52ba7ad8e473ea8b47760693e355133645619cc1017911138
 MISC metadata.xml 317 SHA256 97032548e05e67ffa1b73adce767f4c6b5c5bca3852bbc2081c0dd1cb91bdd74 SHA512 d52f384e061b6b658c8b1e0a692c37698e8054e4e3dcd48de402a15b76551befaedee464bd8fca9afddc11550ad735ee5f5857801eaf79579939000e4d4f5f22 WHIRLPOOL 78b9fdec64488a8a300fc8763ccef95c377fd53c1943c2ff29fa3d194d29b02a9706be7992839ba54bab4d4a1c29c917d12728c7e31c3248ebeabcaba745e825
diff --git a/sec-policy/selinux-roundup/selinux-roundup-2.20170204-r1.ebuild b/sec-policy/selinux-roundup/selinux-roundup-2.20170204-r1.ebuild
index 4abedc20433e..f6155ea5c0e6 100644
--- a/sec-policy/selinux-roundup/selinux-roundup-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-roundup/selinux-roundup-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-roundup/selinux-roundup-2.20170204-r2.ebuild b/sec-policy/selinux-roundup/selinux-roundup-2.20170204-r2.ebuild
index 7e5a08710606..3f643b0125a9 100644
--- a/sec-policy/selinux-roundup/selinux-roundup-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-roundup/selinux-roundup-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-roundup/selinux-roundup-2.20170204-r3.ebuild b/sec-policy/selinux-roundup/selinux-roundup-2.20170204-r3.ebuild
index 7e5a08710606..3f643b0125a9 100644
--- a/sec-policy/selinux-roundup/selinux-roundup-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-roundup/selinux-roundup-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-roundup/selinux-roundup-2.20170204-r4.ebuild b/sec-policy/selinux-roundup/selinux-roundup-2.20170204-r4.ebuild
index 7e5a08710606..3f643b0125a9 100644
--- a/sec-policy/selinux-roundup/selinux-roundup-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-roundup/selinux-roundup-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-roundup/selinux-roundup-2.20170805-r2.ebuild b/sec-policy/selinux-roundup/selinux-roundup-2.20170805-r2.ebuild
index 7e5a08710606..3f643b0125a9 100644
--- a/sec-policy/selinux-roundup/selinux-roundup-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-roundup/selinux-roundup-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-roundup/selinux-roundup-2.20170805-r3.ebuild b/sec-policy/selinux-roundup/selinux-roundup-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..f6155ea5c0e6
--- /dev/null
+++ b/sec-policy/selinux-roundup/selinux-roundup-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-roundup/selinux-roundup-9999.ebuild b/sec-policy/selinux-roundup/selinux-roundup-9999.ebuild
index 4abedc20433e..f6155ea5c0e6 100644
--- a/sec-policy/selinux-roundup/selinux-roundup-9999.ebuild
+++ b/sec-policy/selinux-roundup/selinux-roundup-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-rpc/Manifest b/sec-policy/selinux-rpc/Manifest
index 6445414af59b..8f1d5b35dcad 100644
--- a/sec-policy/selinux-rpc/Manifest
+++ b/sec-policy/selinux-rpc/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-rpc-2.20170204-r1.ebuild 277 SHA256 e50daad9ac0ab433ae19966b5f7e2a6a1aeb10b069421130c5b3e2f1d19ab9e7 SHA512 525b64be196fafe5c6a65f3ae4a8682e5cf92a7ca4d51c789982082acbae561ea5e1a4f12ca1962a95ac105c98f28ff9542914e66f0ab28a823dc03038932908 WHIRLPOOL 9f5ce49bac3cf57bef9b6c41da1bad02c42534ecdc26839f9f448e838fb08ff71b224232602543a065f5dd7f082fa8feccd60a98f6f0d0e5135b166c1e0ba0fa
-EBUILD selinux-rpc-2.20170204-r2.ebuild 275 SHA256 d602c5121f3b15d84603c1edbdcdd77dde1c6d09add418fa430d1d5e4ff04dfb SHA512 0bb4bcf822d7e7aaf704c92dac5737d32ec84b17c50a9d889f97336fe1d0fb4d0c0e610bf31a4d94531bb7d2ef50445c2e01746c8f98f3b7d2cb2e0836c89b4a WHIRLPOOL 7fe3d75e32c0b4700610d766610ebeabbcb732ba302cb56c9e8d94c8d4fa283d95bb7f2272989102c66dc398f087d1b14e95ef30fd016f258cc1363f64247519
-EBUILD selinux-rpc-2.20170204-r3.ebuild 275 SHA256 d602c5121f3b15d84603c1edbdcdd77dde1c6d09add418fa430d1d5e4ff04dfb SHA512 0bb4bcf822d7e7aaf704c92dac5737d32ec84b17c50a9d889f97336fe1d0fb4d0c0e610bf31a4d94531bb7d2ef50445c2e01746c8f98f3b7d2cb2e0836c89b4a WHIRLPOOL 7fe3d75e32c0b4700610d766610ebeabbcb732ba302cb56c9e8d94c8d4fa283d95bb7f2272989102c66dc398f087d1b14e95ef30fd016f258cc1363f64247519
-EBUILD selinux-rpc-2.20170204-r4.ebuild 275 SHA256 d602c5121f3b15d84603c1edbdcdd77dde1c6d09add418fa430d1d5e4ff04dfb SHA512 0bb4bcf822d7e7aaf704c92dac5737d32ec84b17c50a9d889f97336fe1d0fb4d0c0e610bf31a4d94531bb7d2ef50445c2e01746c8f98f3b7d2cb2e0836c89b4a WHIRLPOOL 7fe3d75e32c0b4700610d766610ebeabbcb732ba302cb56c9e8d94c8d4fa283d95bb7f2272989102c66dc398f087d1b14e95ef30fd016f258cc1363f64247519
-EBUILD selinux-rpc-2.20170805-r2.ebuild 275 SHA256 d602c5121f3b15d84603c1edbdcdd77dde1c6d09add418fa430d1d5e4ff04dfb SHA512 0bb4bcf822d7e7aaf704c92dac5737d32ec84b17c50a9d889f97336fe1d0fb4d0c0e610bf31a4d94531bb7d2ef50445c2e01746c8f98f3b7d2cb2e0836c89b4a WHIRLPOOL 7fe3d75e32c0b4700610d766610ebeabbcb732ba302cb56c9e8d94c8d4fa283d95bb7f2272989102c66dc398f087d1b14e95ef30fd016f258cc1363f64247519
-EBUILD selinux-rpc-9999.ebuild 277 SHA256 e50daad9ac0ab433ae19966b5f7e2a6a1aeb10b069421130c5b3e2f1d19ab9e7 SHA512 525b64be196fafe5c6a65f3ae4a8682e5cf92a7ca4d51c789982082acbae561ea5e1a4f12ca1962a95ac105c98f28ff9542914e66f0ab28a823dc03038932908 WHIRLPOOL 9f5ce49bac3cf57bef9b6c41da1bad02c42534ecdc26839f9f448e838fb08ff71b224232602543a065f5dd7f082fa8feccd60a98f6f0d0e5135b166c1e0ba0fa
+EBUILD selinux-rpc-2.20170204-r1.ebuild 278 SHA256 f8e6ef29f916dc44e0e30a624303fe872554636facbcaed63383c5ee0f4a75e8 SHA512 21a385ef523487562cbe8bc4174d1d0d84b6e96f32bd72bb5f064eb4a4afe46197e9ef9800afe0a922985a565d0d21c6a151e464411414d4a740864eb726e605 WHIRLPOOL 7be70227b1fc2c4f04fa0293637d2c484feb64ba59b5e62c2f386cb9d296aaf0e9a1b78a837b63d04875c4043a1a4e36f72110d96df37ea5994abfcda11d32f3
+EBUILD selinux-rpc-2.20170204-r2.ebuild 276 SHA256 dd9815d98728a4a321bce5768690b9e21f88a6c64e2d6e43fa561cc8e5f78751 SHA512 0b9a2530962a9f105ef29d68fef368b4ba87008b6c13b7a8b6da8871d424847598dbb7374098668df59bac48bfc57483c1c52cdf7d671799e04fb551ab585b76 WHIRLPOOL 4b10e63887c178a756fdd125f192159ba5a8f93ec393bc8b3d63ddff82c96372296f9d53476f25f55e782443857155ad3190a5d8b0734781dc0c253adab32b1e
+EBUILD selinux-rpc-2.20170204-r3.ebuild 276 SHA256 dd9815d98728a4a321bce5768690b9e21f88a6c64e2d6e43fa561cc8e5f78751 SHA512 0b9a2530962a9f105ef29d68fef368b4ba87008b6c13b7a8b6da8871d424847598dbb7374098668df59bac48bfc57483c1c52cdf7d671799e04fb551ab585b76 WHIRLPOOL 4b10e63887c178a756fdd125f192159ba5a8f93ec393bc8b3d63ddff82c96372296f9d53476f25f55e782443857155ad3190a5d8b0734781dc0c253adab32b1e
+EBUILD selinux-rpc-2.20170204-r4.ebuild 276 SHA256 dd9815d98728a4a321bce5768690b9e21f88a6c64e2d6e43fa561cc8e5f78751 SHA512 0b9a2530962a9f105ef29d68fef368b4ba87008b6c13b7a8b6da8871d424847598dbb7374098668df59bac48bfc57483c1c52cdf7d671799e04fb551ab585b76 WHIRLPOOL 4b10e63887c178a756fdd125f192159ba5a8f93ec393bc8b3d63ddff82c96372296f9d53476f25f55e782443857155ad3190a5d8b0734781dc0c253adab32b1e
+EBUILD selinux-rpc-2.20170805-r2.ebuild 276 SHA256 dd9815d98728a4a321bce5768690b9e21f88a6c64e2d6e43fa561cc8e5f78751 SHA512 0b9a2530962a9f105ef29d68fef368b4ba87008b6c13b7a8b6da8871d424847598dbb7374098668df59bac48bfc57483c1c52cdf7d671799e04fb551ab585b76 WHIRLPOOL 4b10e63887c178a756fdd125f192159ba5a8f93ec393bc8b3d63ddff82c96372296f9d53476f25f55e782443857155ad3190a5d8b0734781dc0c253adab32b1e
+EBUILD selinux-rpc-2.20170805-r3.ebuild 278 SHA256 f8e6ef29f916dc44e0e30a624303fe872554636facbcaed63383c5ee0f4a75e8 SHA512 21a385ef523487562cbe8bc4174d1d0d84b6e96f32bd72bb5f064eb4a4afe46197e9ef9800afe0a922985a565d0d21c6a151e464411414d4a740864eb726e605 WHIRLPOOL 7be70227b1fc2c4f04fa0293637d2c484feb64ba59b5e62c2f386cb9d296aaf0e9a1b78a837b63d04875c4043a1a4e36f72110d96df37ea5994abfcda11d32f3
+EBUILD selinux-rpc-9999.ebuild 278 SHA256 f8e6ef29f916dc44e0e30a624303fe872554636facbcaed63383c5ee0f4a75e8 SHA512 21a385ef523487562cbe8bc4174d1d0d84b6e96f32bd72bb5f064eb4a4afe46197e9ef9800afe0a922985a565d0d21c6a151e464411414d4a740864eb726e605 WHIRLPOOL 7be70227b1fc2c4f04fa0293637d2c484feb64ba59b5e62c2f386cb9d296aaf0e9a1b78a837b63d04875c4043a1a4e36f72110d96df37ea5994abfcda11d32f3
 MISC ChangeLog 10295 SHA256 bbbcb69deae192405a594e629772059eac3f5b39e06d30b3e80b1fb511d68567 SHA512 f695a249d6fe41c3eacbaf40dfd5640db24eac79db7aeb3c7da7d5c4df5b2bf43b0386954d88e5f3e59d7fff4b823ddb5fa2431728bfaf8fd459b8ab519f1a46 WHIRLPOOL 00bd4a896daecea8e96243f8dfccd93d3734fbf695bc74e10cb3c1b5d2e2c4f2b4c1ad71b035a37236cbdbcedbca5ea641cb5891cc4d9a7156e737bd44846135
 MISC ChangeLog-2015 10522 SHA256 6cf969b94d9612647104573ef13d89f981469c21825e5a249ae8c623994251e6 SHA512 6cc20b726ab078a7c441e42d3d047a7a2df95faede8ee98b2f771b92afa7889196529edc28fb97631aec7aa9f08af345d9acf34104181451e20667496f85bda6 WHIRLPOOL 7ff5725f8eb917a65a2365c5988753fc16868cc89c98d25a3709fd2a89bf69e41a439707cb72a95e5741f259824bb869855b7ba5afbc51e034c84e30a33d8a00
 MISC metadata.xml 313 SHA256 20c567c8ed4ee268620d02577ba5f6a8c164dad954ad371af84b737be1707354 SHA512 ddb7d0ea7dabca0eae92354cf6f8b6a8d488a7b483fe87bcbf8ad17e6d9641531e93ab999f8e4f5b7257eee469adc400dbf00a7854538e44a58b5a718586d937 WHIRLPOOL a3128e70ab55e7c695eb65686b9986d4cd3bff19a7f4325f01f8063cfed0e02f642a10388cd18ba9121cc9ebc18f726519aca196b5d782e8abd8aea2abcaea05
diff --git a/sec-policy/selinux-rpc/selinux-rpc-2.20170204-r1.ebuild b/sec-policy/selinux-rpc/selinux-rpc-2.20170204-r1.ebuild
index 68a14fa19aa3..d49e871c3dc0 100644
--- a/sec-policy/selinux-rpc/selinux-rpc-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-rpc/selinux-rpc-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-rpc/selinux-rpc-2.20170204-r2.ebuild b/sec-policy/selinux-rpc/selinux-rpc-2.20170204-r2.ebuild
index 87c0597e42bc..f2a514e5612c 100644
--- a/sec-policy/selinux-rpc/selinux-rpc-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-rpc/selinux-rpc-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-rpc/selinux-rpc-2.20170204-r3.ebuild b/sec-policy/selinux-rpc/selinux-rpc-2.20170204-r3.ebuild
index 87c0597e42bc..f2a514e5612c 100644
--- a/sec-policy/selinux-rpc/selinux-rpc-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-rpc/selinux-rpc-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-rpc/selinux-rpc-2.20170204-r4.ebuild b/sec-policy/selinux-rpc/selinux-rpc-2.20170204-r4.ebuild
index 87c0597e42bc..f2a514e5612c 100644
--- a/sec-policy/selinux-rpc/selinux-rpc-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-rpc/selinux-rpc-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-rpc/selinux-rpc-2.20170805-r2.ebuild b/sec-policy/selinux-rpc/selinux-rpc-2.20170805-r2.ebuild
index 87c0597e42bc..f2a514e5612c 100644
--- a/sec-policy/selinux-rpc/selinux-rpc-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-rpc/selinux-rpc-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-rpc/selinux-rpc-2.20170805-r3.ebuild b/sec-policy/selinux-rpc/selinux-rpc-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..d49e871c3dc0
--- /dev/null
+++ b/sec-policy/selinux-rpc/selinux-rpc-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-rpc/selinux-rpc-9999.ebuild b/sec-policy/selinux-rpc/selinux-rpc-9999.ebuild
index 68a14fa19aa3..d49e871c3dc0 100644
--- a/sec-policy/selinux-rpc/selinux-rpc-9999.ebuild
+++ b/sec-policy/selinux-rpc/selinux-rpc-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-rpcbind/Manifest b/sec-policy/selinux-rpcbind/Manifest
index f669df8c255c..6007f6c8349f 100644
--- a/sec-policy/selinux-rpcbind/Manifest
+++ b/sec-policy/selinux-rpcbind/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-rpcbind-2.20170204-r1.ebuild 285 SHA256 9c3228577fb54012dc9b2e24d30162413f51734690ed324c5240e7eac9730198 SHA512 b2ba5c473cd9e910937d5515c3af91e87237f2589e73303698ef1f918797d3034056be235f2d41ffca08cd2e202c361cc4aca4725921a5f5ffa12eaf6b21caa8 WHIRLPOOL 205888b967efaef71bb3ee1c83b84cdbc14ca4be752814552a00713499045587a599bb1ab3e7b689253b716e0d77b8297cbceffadb61a938bb80078b37687371
-EBUILD selinux-rpcbind-2.20170204-r2.ebuild 283 SHA256 56badb70af313457b6a184a666e2d8203d44cc68b4d671ab6fa749024863df8a SHA512 0bda8cfcd1ad02fbbdf8908f4f8697fc91833a14433fdfc592b99358a6eef8de56ec8bc5b03e1aa2894406bb2816c4980ae1e966ed52ec55428d45f5e845764b WHIRLPOOL c1252b633dab0d03d4e89cf6afff38f269df0b096d4dbd031c738e88e6073e530891a54271684caf7c29607640914a12a9ed606dcdd9a435fb15bbccef228357
-EBUILD selinux-rpcbind-2.20170204-r3.ebuild 283 SHA256 56badb70af313457b6a184a666e2d8203d44cc68b4d671ab6fa749024863df8a SHA512 0bda8cfcd1ad02fbbdf8908f4f8697fc91833a14433fdfc592b99358a6eef8de56ec8bc5b03e1aa2894406bb2816c4980ae1e966ed52ec55428d45f5e845764b WHIRLPOOL c1252b633dab0d03d4e89cf6afff38f269df0b096d4dbd031c738e88e6073e530891a54271684caf7c29607640914a12a9ed606dcdd9a435fb15bbccef228357
-EBUILD selinux-rpcbind-2.20170204-r4.ebuild 283 SHA256 56badb70af313457b6a184a666e2d8203d44cc68b4d671ab6fa749024863df8a SHA512 0bda8cfcd1ad02fbbdf8908f4f8697fc91833a14433fdfc592b99358a6eef8de56ec8bc5b03e1aa2894406bb2816c4980ae1e966ed52ec55428d45f5e845764b WHIRLPOOL c1252b633dab0d03d4e89cf6afff38f269df0b096d4dbd031c738e88e6073e530891a54271684caf7c29607640914a12a9ed606dcdd9a435fb15bbccef228357
-EBUILD selinux-rpcbind-2.20170805-r2.ebuild 283 SHA256 56badb70af313457b6a184a666e2d8203d44cc68b4d671ab6fa749024863df8a SHA512 0bda8cfcd1ad02fbbdf8908f4f8697fc91833a14433fdfc592b99358a6eef8de56ec8bc5b03e1aa2894406bb2816c4980ae1e966ed52ec55428d45f5e845764b WHIRLPOOL c1252b633dab0d03d4e89cf6afff38f269df0b096d4dbd031c738e88e6073e530891a54271684caf7c29607640914a12a9ed606dcdd9a435fb15bbccef228357
-EBUILD selinux-rpcbind-9999.ebuild 285 SHA256 9c3228577fb54012dc9b2e24d30162413f51734690ed324c5240e7eac9730198 SHA512 b2ba5c473cd9e910937d5515c3af91e87237f2589e73303698ef1f918797d3034056be235f2d41ffca08cd2e202c361cc4aca4725921a5f5ffa12eaf6b21caa8 WHIRLPOOL 205888b967efaef71bb3ee1c83b84cdbc14ca4be752814552a00713499045587a599bb1ab3e7b689253b716e0d77b8297cbceffadb61a938bb80078b37687371
+EBUILD selinux-rpcbind-2.20170204-r1.ebuild 286 SHA256 f2170be329286be27e83734321deaf6cd2463b28cc291617940ec243639ab625 SHA512 58d8de2acb54ceea44e21b26b84a77a976448d39b740a2f42e10aa68b0ea114e5e98a54614f2efd179b8d1ca55c3bb03bb87e85aab7f39716340af636ac94023 WHIRLPOOL 3d97cb67d17d81672d343cda644643585a78350474b8772c7a4161e970dc8d2b8741e3e18dc9eff39ae6ef7cecefe8950679c5d2379069c760152b403619b86b
+EBUILD selinux-rpcbind-2.20170204-r2.ebuild 284 SHA256 0d2bb34963c408784cd88e33355f7cb9d0d6149f27a53a5c3b00d81d7dfcd042 SHA512 71ea7fd67e41963ab0195f13a48863ec661e64e6f46e8bdd9ba5c33c33b8236f5ef0a7af1474a2629b41962fff0504b24e5b8af3147595eb73211ee134e7740a WHIRLPOOL a3238a5517559e76d31d3839ba1a54fee268e98655238f12978809570b4b2aa5027ce5aa67dd44d3a0e3dd16feef6e6a7f1a0e4b5c912e2b047c4b46e63af77f
+EBUILD selinux-rpcbind-2.20170204-r3.ebuild 284 SHA256 0d2bb34963c408784cd88e33355f7cb9d0d6149f27a53a5c3b00d81d7dfcd042 SHA512 71ea7fd67e41963ab0195f13a48863ec661e64e6f46e8bdd9ba5c33c33b8236f5ef0a7af1474a2629b41962fff0504b24e5b8af3147595eb73211ee134e7740a WHIRLPOOL a3238a5517559e76d31d3839ba1a54fee268e98655238f12978809570b4b2aa5027ce5aa67dd44d3a0e3dd16feef6e6a7f1a0e4b5c912e2b047c4b46e63af77f
+EBUILD selinux-rpcbind-2.20170204-r4.ebuild 284 SHA256 0d2bb34963c408784cd88e33355f7cb9d0d6149f27a53a5c3b00d81d7dfcd042 SHA512 71ea7fd67e41963ab0195f13a48863ec661e64e6f46e8bdd9ba5c33c33b8236f5ef0a7af1474a2629b41962fff0504b24e5b8af3147595eb73211ee134e7740a WHIRLPOOL a3238a5517559e76d31d3839ba1a54fee268e98655238f12978809570b4b2aa5027ce5aa67dd44d3a0e3dd16feef6e6a7f1a0e4b5c912e2b047c4b46e63af77f
+EBUILD selinux-rpcbind-2.20170805-r2.ebuild 284 SHA256 0d2bb34963c408784cd88e33355f7cb9d0d6149f27a53a5c3b00d81d7dfcd042 SHA512 71ea7fd67e41963ab0195f13a48863ec661e64e6f46e8bdd9ba5c33c33b8236f5ef0a7af1474a2629b41962fff0504b24e5b8af3147595eb73211ee134e7740a WHIRLPOOL a3238a5517559e76d31d3839ba1a54fee268e98655238f12978809570b4b2aa5027ce5aa67dd44d3a0e3dd16feef6e6a7f1a0e4b5c912e2b047c4b46e63af77f
+EBUILD selinux-rpcbind-2.20170805-r3.ebuild 286 SHA256 f2170be329286be27e83734321deaf6cd2463b28cc291617940ec243639ab625 SHA512 58d8de2acb54ceea44e21b26b84a77a976448d39b740a2f42e10aa68b0ea114e5e98a54614f2efd179b8d1ca55c3bb03bb87e85aab7f39716340af636ac94023 WHIRLPOOL 3d97cb67d17d81672d343cda644643585a78350474b8772c7a4161e970dc8d2b8741e3e18dc9eff39ae6ef7cecefe8950679c5d2379069c760152b403619b86b
+EBUILD selinux-rpcbind-9999.ebuild 286 SHA256 f2170be329286be27e83734321deaf6cd2463b28cc291617940ec243639ab625 SHA512 58d8de2acb54ceea44e21b26b84a77a976448d39b740a2f42e10aa68b0ea114e5e98a54614f2efd179b8d1ca55c3bb03bb87e85aab7f39716340af636ac94023 WHIRLPOOL 3d97cb67d17d81672d343cda644643585a78350474b8772c7a4161e970dc8d2b8741e3e18dc9eff39ae6ef7cecefe8950679c5d2379069c760152b403619b86b
 MISC ChangeLog 10687 SHA256 ce4a07af2456492bffac6880a2d39bd4248653d440081d2ef0baf35fa484c55f SHA512 c5702f644747400a87b7fb441195927bef6954e1c8bcfe3dab5fd0ae98729bf6e0900c41b911205f4d9efe57d52d57fda6e36ed72b31b23fc563b536b99c8022 WHIRLPOOL 27c705a40287fc9173f73565dbe86b12c8d1c28034c6255aa20aa4ccd002bcb75cc1bce693f204bd3433f4985ca0257a87e2bcd32845af0e62f3e1ce32dd6244
 MISC ChangeLog-2015 9977 SHA256 073c36e819258f0922baedae95774b022a158b2798f517f4529583399f9cd7e4 SHA512 53b0caf4c3927db6aa029b20e8cc278f09aa1d34bfd80aef527818d57bfd254a38957d30b08ab8ff4068ad66fd353ee9de264fd2379bd247c96519ac7ad2eac3 WHIRLPOOL 10b49513367c713e4aad3f85efb4f77e082777b2fd8be5fcc965cd26313f1f20253e1ae38545326f53bb2bfc97d7f99b9ebf59e9d5b64750ee360ae2b5db8a36
 MISC metadata.xml 317 SHA256 9c46176b1198354ff410248649b1032ddc9fd062149cc0d3e63b74ff7c9379d5 SHA512 903ca4b03b1d626137474588ce532951d7ce861ccd800b63e65bb662b79e61faf5439e323a329f0870c8718ca4f38e466979f6bd78b0a4564c342e6ced8734a3 WHIRLPOOL 1d4c1131ef833f2bb0f2473740d3a72f6907d31514a9c384160489db97a8b3bbf5a3d11a92b3aaa505f774e3e8b5bcf538273c493238ec998a7f762875dbe812
diff --git a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20170204-r1.ebuild b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20170204-r1.ebuild
index 20e457c74db6..c2f8f06fca17 100644
--- a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20170204-r2.ebuild b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20170204-r2.ebuild
index fce53a1fb073..9719bf26dcb3 100644
--- a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20170204-r3.ebuild b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20170204-r3.ebuild
index fce53a1fb073..9719bf26dcb3 100644
--- a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20170204-r4.ebuild b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20170204-r4.ebuild
index fce53a1fb073..9719bf26dcb3 100644
--- a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20170805-r2.ebuild b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20170805-r2.ebuild
index fce53a1fb073..9719bf26dcb3 100644
--- a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20170805-r3.ebuild b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..c2f8f06fca17
--- /dev/null
+++ b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-rpcbind/selinux-rpcbind-9999.ebuild b/sec-policy/selinux-rpcbind/selinux-rpcbind-9999.ebuild
index 20e457c74db6..c2f8f06fca17 100644
--- a/sec-policy/selinux-rpcbind/selinux-rpcbind-9999.ebuild
+++ b/sec-policy/selinux-rpcbind/selinux-rpcbind-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-rpm/Manifest b/sec-policy/selinux-rpm/Manifest
index 3adcd3f22ad5..237bd35e9532 100644
--- a/sec-policy/selinux-rpm/Manifest
+++ b/sec-policy/selinux-rpm/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-rpm-2.20170204-r1.ebuild 277 SHA256 0018e795167eaf7333c1c7cb751093f1cd5bb4cd14ef7eddc4b829dbd2c69394 SHA512 e09f4c212056553967740552540865668c202d404a785427fa4697c2f097fcc0eb5c0e601196f745e911cac103bc663e0fd6efe507081de54e86dceafa2707e0 WHIRLPOOL 61cb856550b708990a01f468256d0e9badcec41db153de19007da4a46c978c294a2bfe8ec97e917fe7f084625d8572265c2b13e95fccb8629f3e6930e70d7510
-EBUILD selinux-rpm-2.20170204-r2.ebuild 275 SHA256 b0242bc818877822d59b0b7c17853aaab86b8f711678dda964015968905e39bc SHA512 44d3ca5dd00b032537d8a9c398639cbf399ef7eeae44009bcd778b4dcc6b01dea6cd6584fe842f70da238f2892fd78e64a61c190c2b5d9424d65d095cc31a71e WHIRLPOOL 86ddf9e2dce4e8250266a7fdd9eede7a067a8e38de050071bb6f7be957e18264c112331f4d0c6a7c56c80593b39bfea79b589005cc395de51f7ac98745f21032
-EBUILD selinux-rpm-2.20170204-r3.ebuild 275 SHA256 b0242bc818877822d59b0b7c17853aaab86b8f711678dda964015968905e39bc SHA512 44d3ca5dd00b032537d8a9c398639cbf399ef7eeae44009bcd778b4dcc6b01dea6cd6584fe842f70da238f2892fd78e64a61c190c2b5d9424d65d095cc31a71e WHIRLPOOL 86ddf9e2dce4e8250266a7fdd9eede7a067a8e38de050071bb6f7be957e18264c112331f4d0c6a7c56c80593b39bfea79b589005cc395de51f7ac98745f21032
-EBUILD selinux-rpm-2.20170204-r4.ebuild 275 SHA256 b0242bc818877822d59b0b7c17853aaab86b8f711678dda964015968905e39bc SHA512 44d3ca5dd00b032537d8a9c398639cbf399ef7eeae44009bcd778b4dcc6b01dea6cd6584fe842f70da238f2892fd78e64a61c190c2b5d9424d65d095cc31a71e WHIRLPOOL 86ddf9e2dce4e8250266a7fdd9eede7a067a8e38de050071bb6f7be957e18264c112331f4d0c6a7c56c80593b39bfea79b589005cc395de51f7ac98745f21032
-EBUILD selinux-rpm-2.20170805-r2.ebuild 275 SHA256 b0242bc818877822d59b0b7c17853aaab86b8f711678dda964015968905e39bc SHA512 44d3ca5dd00b032537d8a9c398639cbf399ef7eeae44009bcd778b4dcc6b01dea6cd6584fe842f70da238f2892fd78e64a61c190c2b5d9424d65d095cc31a71e WHIRLPOOL 86ddf9e2dce4e8250266a7fdd9eede7a067a8e38de050071bb6f7be957e18264c112331f4d0c6a7c56c80593b39bfea79b589005cc395de51f7ac98745f21032
-EBUILD selinux-rpm-9999.ebuild 277 SHA256 0018e795167eaf7333c1c7cb751093f1cd5bb4cd14ef7eddc4b829dbd2c69394 SHA512 e09f4c212056553967740552540865668c202d404a785427fa4697c2f097fcc0eb5c0e601196f745e911cac103bc663e0fd6efe507081de54e86dceafa2707e0 WHIRLPOOL 61cb856550b708990a01f468256d0e9badcec41db153de19007da4a46c978c294a2bfe8ec97e917fe7f084625d8572265c2b13e95fccb8629f3e6930e70d7510
+EBUILD selinux-rpm-2.20170204-r1.ebuild 278 SHA256 a9fb824358e1c677323f21431d73c67e21ca8de78006ce680e6a1b0d56feb5cb SHA512 b56b74aaa78c0a795b765955950c3d8923b07ff8459a3ff2d11738e9000d87b4db0b0500ba7023e12fa63f422c9eaef2b81ab07d1075a482fc4a6d06113bdf24 WHIRLPOOL 5444fc78161d95569aabfd8455a8948b35ab6be1b2b98814356252b760eb9e4f8132852cb36437753f0f4cd3a0899eefba8efc21cf5cf0320499f4dd32f19198
+EBUILD selinux-rpm-2.20170204-r2.ebuild 276 SHA256 2e1865dcf127d097c98f6b430618a7b2683bf5a95708408dd689afb16655fb69 SHA512 9e0cd0813b92d40e04228096858f094e82e643e251edf3cdc6d022b9a01b99b3fc9640dbbc60e1665e99d00061059ea38c095157b7e1d4e87beae804fa73ef5b WHIRLPOOL fab006cf60a83f15385d7fa79b7ec140d8d4c46ca17f0367ac2aea023512db8ae6272b34bd3e50bd14816fcd969cb2dedf40e8ccf874e6f1277ab6a58fc2cd26
+EBUILD selinux-rpm-2.20170204-r3.ebuild 276 SHA256 2e1865dcf127d097c98f6b430618a7b2683bf5a95708408dd689afb16655fb69 SHA512 9e0cd0813b92d40e04228096858f094e82e643e251edf3cdc6d022b9a01b99b3fc9640dbbc60e1665e99d00061059ea38c095157b7e1d4e87beae804fa73ef5b WHIRLPOOL fab006cf60a83f15385d7fa79b7ec140d8d4c46ca17f0367ac2aea023512db8ae6272b34bd3e50bd14816fcd969cb2dedf40e8ccf874e6f1277ab6a58fc2cd26
+EBUILD selinux-rpm-2.20170204-r4.ebuild 276 SHA256 2e1865dcf127d097c98f6b430618a7b2683bf5a95708408dd689afb16655fb69 SHA512 9e0cd0813b92d40e04228096858f094e82e643e251edf3cdc6d022b9a01b99b3fc9640dbbc60e1665e99d00061059ea38c095157b7e1d4e87beae804fa73ef5b WHIRLPOOL fab006cf60a83f15385d7fa79b7ec140d8d4c46ca17f0367ac2aea023512db8ae6272b34bd3e50bd14816fcd969cb2dedf40e8ccf874e6f1277ab6a58fc2cd26
+EBUILD selinux-rpm-2.20170805-r2.ebuild 276 SHA256 2e1865dcf127d097c98f6b430618a7b2683bf5a95708408dd689afb16655fb69 SHA512 9e0cd0813b92d40e04228096858f094e82e643e251edf3cdc6d022b9a01b99b3fc9640dbbc60e1665e99d00061059ea38c095157b7e1d4e87beae804fa73ef5b WHIRLPOOL fab006cf60a83f15385d7fa79b7ec140d8d4c46ca17f0367ac2aea023512db8ae6272b34bd3e50bd14816fcd969cb2dedf40e8ccf874e6f1277ab6a58fc2cd26
+EBUILD selinux-rpm-2.20170805-r3.ebuild 278 SHA256 a9fb824358e1c677323f21431d73c67e21ca8de78006ce680e6a1b0d56feb5cb SHA512 b56b74aaa78c0a795b765955950c3d8923b07ff8459a3ff2d11738e9000d87b4db0b0500ba7023e12fa63f422c9eaef2b81ab07d1075a482fc4a6d06113bdf24 WHIRLPOOL 5444fc78161d95569aabfd8455a8948b35ab6be1b2b98814356252b760eb9e4f8132852cb36437753f0f4cd3a0899eefba8efc21cf5cf0320499f4dd32f19198
+EBUILD selinux-rpm-9999.ebuild 278 SHA256 a9fb824358e1c677323f21431d73c67e21ca8de78006ce680e6a1b0d56feb5cb SHA512 b56b74aaa78c0a795b765955950c3d8923b07ff8459a3ff2d11738e9000d87b4db0b0500ba7023e12fa63f422c9eaef2b81ab07d1075a482fc4a6d06113bdf24 WHIRLPOOL 5444fc78161d95569aabfd8455a8948b35ab6be1b2b98814356252b760eb9e4f8132852cb36437753f0f4cd3a0899eefba8efc21cf5cf0320499f4dd32f19198
 MISC ChangeLog 10295 SHA256 ab9404c6f3a6354f7ad4cdb8ba05266227059842227f9269b76be215b2e70cd8 SHA512 c96d1a5427ec99e6018b784cb30efc81ebf19e401f0ad8588181c0f891e0c122d4ec0c92084eab4cf96a725e0dfc48cc22bd74251f1270cb031a9fa770aebb42 WHIRLPOOL f19fa77ab41ccca704bd3dbd200337575cd7747726b3b32535531cbdad86f98c218be1014ac332f1c4e009073a8c86b177de64e967489b69cda447084fac77ae
 MISC ChangeLog-2015 9440 SHA256 4cdc0facc4cc53417b147571022c85dd87e4cf1e99d1c46ed7dba8927772732c SHA512 daf5f70cfa706347605ced1a3ba811e1a24d0109a51f7b087f6d110dab8a2eab2d3dc16afc661502c4c96b45c84ea1b4f64795d41ffc3866e6f84d45fe60d20b WHIRLPOOL d5a6a6a30d0df3c84c602c84339d1a13e23d003ed3a5b25cff1b85a49b800f47f7cab8391c847950b05932d74b15cd5bfd042e526e77a4e850ba8d482f3f26a1
 MISC metadata.xml 313 SHA256 9fffb43cb084e5c53a50ef9b5c3fb8e3a6471a58c4bb61563b429cf934020fe3 SHA512 d242612261b4697fef46c087a118c428fcbb6e3a462a9dd1ed7ec95edc4405fe35ce6ab9fe05fd74d68ca0922dfb2749fd77677a123c6e452505679c8e3eec38 WHIRLPOOL 961c5eb379499d1d04ba86110efae7c0bd8975fb2bc1a7b82014b53aa7b503cc9287716ee96ba363065a3af666d945384c5df7445a7af6a6f6924f2c1cb6197a
diff --git a/sec-policy/selinux-rpm/selinux-rpm-2.20170204-r1.ebuild b/sec-policy/selinux-rpm/selinux-rpm-2.20170204-r1.ebuild
index 15809b1f0f99..45076e967f27 100644
--- a/sec-policy/selinux-rpm/selinux-rpm-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-rpm/selinux-rpm-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-rpm/selinux-rpm-2.20170204-r2.ebuild b/sec-policy/selinux-rpm/selinux-rpm-2.20170204-r2.ebuild
index d9a071f8234a..59bb7c84fd76 100644
--- a/sec-policy/selinux-rpm/selinux-rpm-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-rpm/selinux-rpm-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-rpm/selinux-rpm-2.20170204-r3.ebuild b/sec-policy/selinux-rpm/selinux-rpm-2.20170204-r3.ebuild
index d9a071f8234a..59bb7c84fd76 100644
--- a/sec-policy/selinux-rpm/selinux-rpm-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-rpm/selinux-rpm-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-rpm/selinux-rpm-2.20170204-r4.ebuild b/sec-policy/selinux-rpm/selinux-rpm-2.20170204-r4.ebuild
index d9a071f8234a..59bb7c84fd76 100644
--- a/sec-policy/selinux-rpm/selinux-rpm-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-rpm/selinux-rpm-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-rpm/selinux-rpm-2.20170805-r2.ebuild b/sec-policy/selinux-rpm/selinux-rpm-2.20170805-r2.ebuild
index d9a071f8234a..59bb7c84fd76 100644
--- a/sec-policy/selinux-rpm/selinux-rpm-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-rpm/selinux-rpm-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-rpm/selinux-rpm-2.20170805-r3.ebuild b/sec-policy/selinux-rpm/selinux-rpm-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..45076e967f27
--- /dev/null
+++ b/sec-policy/selinux-rpm/selinux-rpm-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-rpm/selinux-rpm-9999.ebuild b/sec-policy/selinux-rpm/selinux-rpm-9999.ebuild
index 15809b1f0f99..45076e967f27 100644
--- a/sec-policy/selinux-rpm/selinux-rpm-9999.ebuild
+++ b/sec-policy/selinux-rpm/selinux-rpm-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-rssh/Manifest b/sec-policy/selinux-rssh/Manifest
index 5f77ecf53720..e48a123fccb6 100644
--- a/sec-policy/selinux-rssh/Manifest
+++ b/sec-policy/selinux-rssh/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-rssh-2.20170204-r1.ebuild 279 SHA256 c290cf71f331e9698fba9bd5f6814c1ff97785bfadba5ab9e640e13fc38e898d SHA512 6e5aeaf0c1d1cc76ad1195badbc954c83c8a793cee23b921d9528bcd5425063030082c7f206e0bfc77ec92ddcdde0dcb29cb5adfb0606d8338ac651fe3158205 WHIRLPOOL 7e737ab49a1f2ed2c71eb543b9ddc1a4f283d2f4c27ec30c647a9b3a3b963e4d7f3a4ee796b1b600f2c665766497ae1b08ef9b811a26dc1953e543e8df2d1ec7
-EBUILD selinux-rssh-2.20170204-r2.ebuild 277 SHA256 6b9ce3ebc1ff172711c0f94f9a33f14466dd38ab20ab29674300eed92345f735 SHA512 f3efa5e628f37539d04506ddc7434bb849493f38871d20ca9ed0e1035b10552f9869fa1cc5b44701aeac6ef7abd10200ea1ace17692d374679a9037dc10a696b WHIRLPOOL 616b6be8d314274255ce69c9b6a6cb01d7a1c11b8e43e4b32f88de6f16dac4a5707d329f673c492902039c6f202602c55ecfcec7ea77eceb4ea2fc823c57e1a5
-EBUILD selinux-rssh-2.20170204-r3.ebuild 277 SHA256 6b9ce3ebc1ff172711c0f94f9a33f14466dd38ab20ab29674300eed92345f735 SHA512 f3efa5e628f37539d04506ddc7434bb849493f38871d20ca9ed0e1035b10552f9869fa1cc5b44701aeac6ef7abd10200ea1ace17692d374679a9037dc10a696b WHIRLPOOL 616b6be8d314274255ce69c9b6a6cb01d7a1c11b8e43e4b32f88de6f16dac4a5707d329f673c492902039c6f202602c55ecfcec7ea77eceb4ea2fc823c57e1a5
-EBUILD selinux-rssh-2.20170204-r4.ebuild 277 SHA256 6b9ce3ebc1ff172711c0f94f9a33f14466dd38ab20ab29674300eed92345f735 SHA512 f3efa5e628f37539d04506ddc7434bb849493f38871d20ca9ed0e1035b10552f9869fa1cc5b44701aeac6ef7abd10200ea1ace17692d374679a9037dc10a696b WHIRLPOOL 616b6be8d314274255ce69c9b6a6cb01d7a1c11b8e43e4b32f88de6f16dac4a5707d329f673c492902039c6f202602c55ecfcec7ea77eceb4ea2fc823c57e1a5
-EBUILD selinux-rssh-2.20170805-r2.ebuild 277 SHA256 6b9ce3ebc1ff172711c0f94f9a33f14466dd38ab20ab29674300eed92345f735 SHA512 f3efa5e628f37539d04506ddc7434bb849493f38871d20ca9ed0e1035b10552f9869fa1cc5b44701aeac6ef7abd10200ea1ace17692d374679a9037dc10a696b WHIRLPOOL 616b6be8d314274255ce69c9b6a6cb01d7a1c11b8e43e4b32f88de6f16dac4a5707d329f673c492902039c6f202602c55ecfcec7ea77eceb4ea2fc823c57e1a5
-EBUILD selinux-rssh-9999.ebuild 279 SHA256 c290cf71f331e9698fba9bd5f6814c1ff97785bfadba5ab9e640e13fc38e898d SHA512 6e5aeaf0c1d1cc76ad1195badbc954c83c8a793cee23b921d9528bcd5425063030082c7f206e0bfc77ec92ddcdde0dcb29cb5adfb0606d8338ac651fe3158205 WHIRLPOOL 7e737ab49a1f2ed2c71eb543b9ddc1a4f283d2f4c27ec30c647a9b3a3b963e4d7f3a4ee796b1b600f2c665766497ae1b08ef9b811a26dc1953e543e8df2d1ec7
+EBUILD selinux-rssh-2.20170204-r1.ebuild 280 SHA256 bcf470d6ae6c6f630dbb750e9b822e58d40149f6c9352b7bff47d33bebaaadd6 SHA512 b7163f307201217150d4f897801c8c7cf968e1a8819e299bba5026c2975dd02da595ea36a4117eb17f061fde436e1eb632869e601dfad87cd4e80c6bbf5af045 WHIRLPOOL d9f4635b4c7174cb0f0d1780a5c86244fec8e01c061279d43c67153846856f23d67c0ff5caae5b3ff2bfdd463d85e155ddc263a72249d1eb7eda7934c35cde05
+EBUILD selinux-rssh-2.20170204-r2.ebuild 278 SHA256 756907586c5f744da4df1512252c021c4b907cde66651fcc9eedc6f3d208e6ec SHA512 d620a9cd11861b8a8db7874bcf977c2a47836633955839ea3654ed9163b8c8cee865b4eb167221501d2d215ddccf2f37f7d9428a84cd39df5a7a892d1a8c40ba WHIRLPOOL 9984226982cc44428d75ba3a1fd505e1bf7679a8da742677f10c1ecd859ba976ace1d28670468ca0c4eabace2bd955775a2f3f1cc58f6c2b76d8ccf51051255a
+EBUILD selinux-rssh-2.20170204-r3.ebuild 278 SHA256 756907586c5f744da4df1512252c021c4b907cde66651fcc9eedc6f3d208e6ec SHA512 d620a9cd11861b8a8db7874bcf977c2a47836633955839ea3654ed9163b8c8cee865b4eb167221501d2d215ddccf2f37f7d9428a84cd39df5a7a892d1a8c40ba WHIRLPOOL 9984226982cc44428d75ba3a1fd505e1bf7679a8da742677f10c1ecd859ba976ace1d28670468ca0c4eabace2bd955775a2f3f1cc58f6c2b76d8ccf51051255a
+EBUILD selinux-rssh-2.20170204-r4.ebuild 278 SHA256 756907586c5f744da4df1512252c021c4b907cde66651fcc9eedc6f3d208e6ec SHA512 d620a9cd11861b8a8db7874bcf977c2a47836633955839ea3654ed9163b8c8cee865b4eb167221501d2d215ddccf2f37f7d9428a84cd39df5a7a892d1a8c40ba WHIRLPOOL 9984226982cc44428d75ba3a1fd505e1bf7679a8da742677f10c1ecd859ba976ace1d28670468ca0c4eabace2bd955775a2f3f1cc58f6c2b76d8ccf51051255a
+EBUILD selinux-rssh-2.20170805-r2.ebuild 278 SHA256 756907586c5f744da4df1512252c021c4b907cde66651fcc9eedc6f3d208e6ec SHA512 d620a9cd11861b8a8db7874bcf977c2a47836633955839ea3654ed9163b8c8cee865b4eb167221501d2d215ddccf2f37f7d9428a84cd39df5a7a892d1a8c40ba WHIRLPOOL 9984226982cc44428d75ba3a1fd505e1bf7679a8da742677f10c1ecd859ba976ace1d28670468ca0c4eabace2bd955775a2f3f1cc58f6c2b76d8ccf51051255a
+EBUILD selinux-rssh-2.20170805-r3.ebuild 280 SHA256 bcf470d6ae6c6f630dbb750e9b822e58d40149f6c9352b7bff47d33bebaaadd6 SHA512 b7163f307201217150d4f897801c8c7cf968e1a8819e299bba5026c2975dd02da595ea36a4117eb17f061fde436e1eb632869e601dfad87cd4e80c6bbf5af045 WHIRLPOOL d9f4635b4c7174cb0f0d1780a5c86244fec8e01c061279d43c67153846856f23d67c0ff5caae5b3ff2bfdd463d85e155ddc263a72249d1eb7eda7934c35cde05
+EBUILD selinux-rssh-9999.ebuild 280 SHA256 bcf470d6ae6c6f630dbb750e9b822e58d40149f6c9352b7bff47d33bebaaadd6 SHA512 b7163f307201217150d4f897801c8c7cf968e1a8819e299bba5026c2975dd02da595ea36a4117eb17f061fde436e1eb632869e601dfad87cd4e80c6bbf5af045 WHIRLPOOL d9f4635b4c7174cb0f0d1780a5c86244fec8e01c061279d43c67153846856f23d67c0ff5caae5b3ff2bfdd463d85e155ddc263a72249d1eb7eda7934c35cde05
 MISC ChangeLog 10387 SHA256 c2ea46b0ebc05cf6c8f1c0982b27fa3dd02e812b7a9e9b377548442509db8968 SHA512 c2ab7635ecf2255aa82965042f31ce331417e4b843ba7fce0514a0df66a468a048ec68a9f1f50bfc28ca3642e835f072fb94fdf2060cbfd23ced2cd64facf455 WHIRLPOOL f2d2daa4ea6e2e6213499a3ada0c2d95e8dc3b5757a3cda3e65b621c3afb4b22e9595804b43ab0ff08b066e9adaa41c584fe19a45fd2f0536179262b3e3b1c42
 MISC ChangeLog-2015 9636 SHA256 1e180345da3ebbc7c08ec94611d9e9221bb4e6da9f25798755e5b4ea688ea45b SHA512 8b6fab3c2289352671abd4b00db7a8f22a9f23e39e295fdb57920a0faa98924149f301eed4c9b52ad847fe910c56c40e193931c684a853c9084809bb83e261c9 WHIRLPOOL 7d5eaf7795a31cbc86a0e968d7e4cd43b7f5be18b31807f41ebcd9429b08000b6e5a093e06d96a8ed38862174ac1faa35eeaa09340cd1baed140350fc1d40132
 MISC metadata.xml 314 SHA256 dd7b158d1a485c9427ef2227f2590437602914264ea67d84e0f81294d285b672 SHA512 ace4b64738699a4322654bba904e10a682ffbbff7b2e7e1f28551aae8bf81188ecfe12a3400b8adbc110f6559d5b4d5820f49910a85dc0bd791cb3a73e07234d WHIRLPOOL 59efb6023d8e2f1348b6f44d6a16170b2488a48a2d9e4dfb886959d25fb443af056736eb56b8741e602f3f54b833b58783d8d6ce6aa0eb9e5d3de09184296c2f
diff --git a/sec-policy/selinux-rssh/selinux-rssh-2.20170204-r1.ebuild b/sec-policy/selinux-rssh/selinux-rssh-2.20170204-r1.ebuild
index 067bf600987b..f962319827c1 100644
--- a/sec-policy/selinux-rssh/selinux-rssh-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-rssh/selinux-rssh-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-rssh/selinux-rssh-2.20170204-r2.ebuild b/sec-policy/selinux-rssh/selinux-rssh-2.20170204-r2.ebuild
index 8ced9f7ed7d0..21d4a46f4368 100644
--- a/sec-policy/selinux-rssh/selinux-rssh-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-rssh/selinux-rssh-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-rssh/selinux-rssh-2.20170204-r3.ebuild b/sec-policy/selinux-rssh/selinux-rssh-2.20170204-r3.ebuild
index 8ced9f7ed7d0..21d4a46f4368 100644
--- a/sec-policy/selinux-rssh/selinux-rssh-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-rssh/selinux-rssh-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-rssh/selinux-rssh-2.20170204-r4.ebuild b/sec-policy/selinux-rssh/selinux-rssh-2.20170204-r4.ebuild
index 8ced9f7ed7d0..21d4a46f4368 100644
--- a/sec-policy/selinux-rssh/selinux-rssh-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-rssh/selinux-rssh-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-rssh/selinux-rssh-2.20170805-r2.ebuild b/sec-policy/selinux-rssh/selinux-rssh-2.20170805-r2.ebuild
index 8ced9f7ed7d0..21d4a46f4368 100644
--- a/sec-policy/selinux-rssh/selinux-rssh-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-rssh/selinux-rssh-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-rssh/selinux-rssh-2.20170805-r3.ebuild b/sec-policy/selinux-rssh/selinux-rssh-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..f962319827c1
--- /dev/null
+++ b/sec-policy/selinux-rssh/selinux-rssh-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-rssh/selinux-rssh-9999.ebuild b/sec-policy/selinux-rssh/selinux-rssh-9999.ebuild
index 067bf600987b..f962319827c1 100644
--- a/sec-policy/selinux-rssh/selinux-rssh-9999.ebuild
+++ b/sec-policy/selinux-rssh/selinux-rssh-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-rtkit/Manifest b/sec-policy/selinux-rtkit/Manifest
index dcafc3783529..4b6126a0bd16 100644
--- a/sec-policy/selinux-rtkit/Manifest
+++ b/sec-policy/selinux-rtkit/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-rtkit-2.20170204-r1.ebuild 373 SHA256 24536557d2ad1aef83a51cd22130995f1c789ac269bb7d96faa660222997a310 SHA512 230717babcd7a93e6bcffd8b2f75283b3e1546af235792ddbdf2ba8b64a4d7cd9cbc4413be3109cbc21a598b460a0885c6b9f7a8f6e2ed2320dbdb12ffa14807 WHIRLPOOL b47f0a1fc692ba41be5ad8a1e7a76d6ca4948154b90827ec0b7c2da7b5e20af0b2ec58ba92b25fab0b4498aec28ce6e95e11ef95856a2782d3144601b04a5c23
-EBUILD selinux-rtkit-2.20170204-r2.ebuild 371 SHA256 283897576ed268c5d71189184cb622ca06916e333da9bd2b3be1e107ff07cdb1 SHA512 498599d122e0b0637288f7d5509da4ae543c8d69dee157e1e9adf2dcabd931a810e75a210e16c79bfe4b8cc3231ebf406b71a99f6b110a296a499535629422b4 WHIRLPOOL 9bc9dbd4d98eaef8a51788d01d84745f8af3fdde717fdb3e8045625148719ac2872dcc3bb9108cfc1216fc71f0a75d9499f3863ec83371078a0806d2d7ca48da
-EBUILD selinux-rtkit-2.20170204-r3.ebuild 371 SHA256 283897576ed268c5d71189184cb622ca06916e333da9bd2b3be1e107ff07cdb1 SHA512 498599d122e0b0637288f7d5509da4ae543c8d69dee157e1e9adf2dcabd931a810e75a210e16c79bfe4b8cc3231ebf406b71a99f6b110a296a499535629422b4 WHIRLPOOL 9bc9dbd4d98eaef8a51788d01d84745f8af3fdde717fdb3e8045625148719ac2872dcc3bb9108cfc1216fc71f0a75d9499f3863ec83371078a0806d2d7ca48da
-EBUILD selinux-rtkit-2.20170204-r4.ebuild 371 SHA256 283897576ed268c5d71189184cb622ca06916e333da9bd2b3be1e107ff07cdb1 SHA512 498599d122e0b0637288f7d5509da4ae543c8d69dee157e1e9adf2dcabd931a810e75a210e16c79bfe4b8cc3231ebf406b71a99f6b110a296a499535629422b4 WHIRLPOOL 9bc9dbd4d98eaef8a51788d01d84745f8af3fdde717fdb3e8045625148719ac2872dcc3bb9108cfc1216fc71f0a75d9499f3863ec83371078a0806d2d7ca48da
-EBUILD selinux-rtkit-2.20170805-r2.ebuild 371 SHA256 283897576ed268c5d71189184cb622ca06916e333da9bd2b3be1e107ff07cdb1 SHA512 498599d122e0b0637288f7d5509da4ae543c8d69dee157e1e9adf2dcabd931a810e75a210e16c79bfe4b8cc3231ebf406b71a99f6b110a296a499535629422b4 WHIRLPOOL 9bc9dbd4d98eaef8a51788d01d84745f8af3fdde717fdb3e8045625148719ac2872dcc3bb9108cfc1216fc71f0a75d9499f3863ec83371078a0806d2d7ca48da
-EBUILD selinux-rtkit-9999.ebuild 373 SHA256 24536557d2ad1aef83a51cd22130995f1c789ac269bb7d96faa660222997a310 SHA512 230717babcd7a93e6bcffd8b2f75283b3e1546af235792ddbdf2ba8b64a4d7cd9cbc4413be3109cbc21a598b460a0885c6b9f7a8f6e2ed2320dbdb12ffa14807 WHIRLPOOL b47f0a1fc692ba41be5ad8a1e7a76d6ca4948154b90827ec0b7c2da7b5e20af0b2ec58ba92b25fab0b4498aec28ce6e95e11ef95856a2782d3144601b04a5c23
+EBUILD selinux-rtkit-2.20170204-r1.ebuild 374 SHA256 3924da2b424a5ed2a0be895bb29e21bf02ea6d02b436a9ced5ca275980891dcf SHA512 899903c2c2ca652a7653ff26064c4374c70425116cae7f45505bdd1d1f0c4c93d04fbe3cb07eb27fb42082144c0e6ddba53da91a9023130ff01a33c5a8cb6d7b WHIRLPOOL cc87c8f21d8c671ebe3c90069ed845278494f6960dddc10c691789989fc14ffe54e4b0a7c16d67b0bf798d0d4af3a92bad32adf5a6c2a3069d352d1a3dc86899
+EBUILD selinux-rtkit-2.20170204-r2.ebuild 372 SHA256 13d2a8ed7fd781b191e7605e5bde22c471013fda0907a2926cdcf974c0be9f47 SHA512 604b0f4723ba346de19c2f9d7a7ba5e9b1362380ca4aced60915dc0ad992a60915c0e33b17ae788456e2e32aa7baa61a611b7590c687fc5d82d273ce12a0d058 WHIRLPOOL 0b45c3c94aee32a374984226d1b1930a9278f6044e74dd85ccc06a9b8f134b3593086b710b9ac3eced7c2278fd281027cdd264b542c7035233272b274b330979
+EBUILD selinux-rtkit-2.20170204-r3.ebuild 372 SHA256 13d2a8ed7fd781b191e7605e5bde22c471013fda0907a2926cdcf974c0be9f47 SHA512 604b0f4723ba346de19c2f9d7a7ba5e9b1362380ca4aced60915dc0ad992a60915c0e33b17ae788456e2e32aa7baa61a611b7590c687fc5d82d273ce12a0d058 WHIRLPOOL 0b45c3c94aee32a374984226d1b1930a9278f6044e74dd85ccc06a9b8f134b3593086b710b9ac3eced7c2278fd281027cdd264b542c7035233272b274b330979
+EBUILD selinux-rtkit-2.20170204-r4.ebuild 372 SHA256 13d2a8ed7fd781b191e7605e5bde22c471013fda0907a2926cdcf974c0be9f47 SHA512 604b0f4723ba346de19c2f9d7a7ba5e9b1362380ca4aced60915dc0ad992a60915c0e33b17ae788456e2e32aa7baa61a611b7590c687fc5d82d273ce12a0d058 WHIRLPOOL 0b45c3c94aee32a374984226d1b1930a9278f6044e74dd85ccc06a9b8f134b3593086b710b9ac3eced7c2278fd281027cdd264b542c7035233272b274b330979
+EBUILD selinux-rtkit-2.20170805-r2.ebuild 372 SHA256 13d2a8ed7fd781b191e7605e5bde22c471013fda0907a2926cdcf974c0be9f47 SHA512 604b0f4723ba346de19c2f9d7a7ba5e9b1362380ca4aced60915dc0ad992a60915c0e33b17ae788456e2e32aa7baa61a611b7590c687fc5d82d273ce12a0d058 WHIRLPOOL 0b45c3c94aee32a374984226d1b1930a9278f6044e74dd85ccc06a9b8f134b3593086b710b9ac3eced7c2278fd281027cdd264b542c7035233272b274b330979
+EBUILD selinux-rtkit-2.20170805-r3.ebuild 374 SHA256 3924da2b424a5ed2a0be895bb29e21bf02ea6d02b436a9ced5ca275980891dcf SHA512 899903c2c2ca652a7653ff26064c4374c70425116cae7f45505bdd1d1f0c4c93d04fbe3cb07eb27fb42082144c0e6ddba53da91a9023130ff01a33c5a8cb6d7b WHIRLPOOL cc87c8f21d8c671ebe3c90069ed845278494f6960dddc10c691789989fc14ffe54e4b0a7c16d67b0bf798d0d4af3a92bad32adf5a6c2a3069d352d1a3dc86899
+EBUILD selinux-rtkit-9999.ebuild 374 SHA256 3924da2b424a5ed2a0be895bb29e21bf02ea6d02b436a9ced5ca275980891dcf SHA512 899903c2c2ca652a7653ff26064c4374c70425116cae7f45505bdd1d1f0c4c93d04fbe3cb07eb27fb42082144c0e6ddba53da91a9023130ff01a33c5a8cb6d7b WHIRLPOOL cc87c8f21d8c671ebe3c90069ed845278494f6960dddc10c691789989fc14ffe54e4b0a7c16d67b0bf798d0d4af3a92bad32adf5a6c2a3069d352d1a3dc86899
 MISC ChangeLog 10479 SHA256 1a50ed3c340eaa1ea2cd4c0a9ff67c64fcd3be765c1c5c95d11aa8ec9779cad8 SHA512 c0acd54b46330fb99b690e11bdaccf12940b156d16c134254cb653169565f8ed28598f8510e3c57a87195c5bfb4dce5d8ee1c329d1c11165e66b9bf633731ba0 WHIRLPOOL d9521f846a849f03a759b67d549f9eb48d2ce2e01fa9f15b221df98ef1d64e6dd736da933dc7900a944098f559a9fe17727349ba2fef006077b8536238139e5e
 MISC ChangeLog-2015 10011 SHA256 664f25c856956190accf7213abf78511ddc6a727daa7c46e739a197362f57a15 SHA512 eafdf03be01ac3c51ae37b5ddc326b6bdd8fac7dd6a1ad0b5df39df0fcf95642bc864a70c99ed647219aa5ecd72b40daf6e41ae9ce3d6d9dd0d326ee4313386b WHIRLPOOL e627e6b4d300241cd9019aa3f8c477033c168b39ae23b655adead1cc4e05a483a639b3ec0ee42ec8e3954a9c80b69880b0e3086886efe0f12fafbc5c24a3d998
 MISC metadata.xml 315 SHA256 0a90f7f457a2b083536103ff7e2462e1bf224fde9d10a3a58aee44fe0ccb9c71 SHA512 d3c120cce40e5aa7af88aa6603cf1389c5691023d21b0f9ead865c1cd1305008c286d7433f1364387360bbf0820ee32be67d820fc070c32ac89a6919382261a2 WHIRLPOOL 149d6d90d060ad66b978157134dcac6f61979b5437273f0711fb9db5a563a9a0b8ec654a85a6f9d299788404984fe337389d06f710b1f9597239168d2019f405
diff --git a/sec-policy/selinux-rtkit/selinux-rtkit-2.20170204-r1.ebuild b/sec-policy/selinux-rtkit/selinux-rtkit-2.20170204-r1.ebuild
index d922d0a626e6..7c7434d72bea 100644
--- a/sec-policy/selinux-rtkit/selinux-rtkit-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-rtkit/selinux-rtkit-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-rtkit/selinux-rtkit-2.20170204-r2.ebuild b/sec-policy/selinux-rtkit/selinux-rtkit-2.20170204-r2.ebuild
index fe67e0b2bf82..d112318cb27c 100644
--- a/sec-policy/selinux-rtkit/selinux-rtkit-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-rtkit/selinux-rtkit-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-rtkit/selinux-rtkit-2.20170204-r3.ebuild b/sec-policy/selinux-rtkit/selinux-rtkit-2.20170204-r3.ebuild
index fe67e0b2bf82..d112318cb27c 100644
--- a/sec-policy/selinux-rtkit/selinux-rtkit-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-rtkit/selinux-rtkit-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-rtkit/selinux-rtkit-2.20170204-r4.ebuild b/sec-policy/selinux-rtkit/selinux-rtkit-2.20170204-r4.ebuild
index fe67e0b2bf82..d112318cb27c 100644
--- a/sec-policy/selinux-rtkit/selinux-rtkit-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-rtkit/selinux-rtkit-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-rtkit/selinux-rtkit-2.20170805-r2.ebuild b/sec-policy/selinux-rtkit/selinux-rtkit-2.20170805-r2.ebuild
index fe67e0b2bf82..d112318cb27c 100644
--- a/sec-policy/selinux-rtkit/selinux-rtkit-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-rtkit/selinux-rtkit-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-rtkit/selinux-rtkit-2.20170805-r3.ebuild b/sec-policy/selinux-rtkit/selinux-rtkit-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..7c7434d72bea
--- /dev/null
+++ b/sec-policy/selinux-rtkit/selinux-rtkit-2.20170805-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-rtkit/selinux-rtkit-9999.ebuild b/sec-policy/selinux-rtkit/selinux-rtkit-9999.ebuild
index d922d0a626e6..7c7434d72bea 100644
--- a/sec-policy/selinux-rtkit/selinux-rtkit-9999.ebuild
+++ b/sec-policy/selinux-rtkit/selinux-rtkit-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-rtorrent/Manifest b/sec-policy/selinux-rtorrent/Manifest
index f94e3498ea06..e272bd7b4f41 100644
--- a/sec-policy/selinux-rtorrent/Manifest
+++ b/sec-policy/selinux-rtorrent/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-rtorrent-2.20170204-r1.ebuild 287 SHA256 99563268d86a7a448c06d48e21507564afcecedf7fad3d2c59f8b391e96b86f1 SHA512 ffbd44fd6b60587dc8ef0532a3a0eb64bb60e0dbcebcd6ad2b2ff112c7e8ff6fa884cde36ff7b4fba6f06d326fc274f48f08f2beda199597b84eecbabb964c11 WHIRLPOOL a90e03fa2021f5db4f0f36d8bfb04eac5dcb7eff4a35e39a44d12f1ef84537e688bebc33ae8cea01ac7f24f775430365cfb0428a8b2170c13a4f18ebdf56f536
-EBUILD selinux-rtorrent-2.20170204-r2.ebuild 285 SHA256 dfc17d2828c134fe1e62a69a3ec9b4bdbc9a2eb5802f218cd4850e0d000890b2 SHA512 56b29a4f686f73227d07bc5c6548476345c36d16b1933446ba1c957013ae5185b52a51176cf3995b3d12f199c0b2a86546474469d1618cf597d8a63b2911a58c WHIRLPOOL 5e276ddd3ec6cc0d31ce5668041e35e96c2c33f5bfc57e941c1d0d792129ff9539a8ab0cd48c0f0dec0d513f24567be98885768c89bf10095817c301c7956117
-EBUILD selinux-rtorrent-2.20170204-r3.ebuild 285 SHA256 dfc17d2828c134fe1e62a69a3ec9b4bdbc9a2eb5802f218cd4850e0d000890b2 SHA512 56b29a4f686f73227d07bc5c6548476345c36d16b1933446ba1c957013ae5185b52a51176cf3995b3d12f199c0b2a86546474469d1618cf597d8a63b2911a58c WHIRLPOOL 5e276ddd3ec6cc0d31ce5668041e35e96c2c33f5bfc57e941c1d0d792129ff9539a8ab0cd48c0f0dec0d513f24567be98885768c89bf10095817c301c7956117
-EBUILD selinux-rtorrent-2.20170204-r4.ebuild 285 SHA256 dfc17d2828c134fe1e62a69a3ec9b4bdbc9a2eb5802f218cd4850e0d000890b2 SHA512 56b29a4f686f73227d07bc5c6548476345c36d16b1933446ba1c957013ae5185b52a51176cf3995b3d12f199c0b2a86546474469d1618cf597d8a63b2911a58c WHIRLPOOL 5e276ddd3ec6cc0d31ce5668041e35e96c2c33f5bfc57e941c1d0d792129ff9539a8ab0cd48c0f0dec0d513f24567be98885768c89bf10095817c301c7956117
-EBUILD selinux-rtorrent-2.20170805-r2.ebuild 285 SHA256 dfc17d2828c134fe1e62a69a3ec9b4bdbc9a2eb5802f218cd4850e0d000890b2 SHA512 56b29a4f686f73227d07bc5c6548476345c36d16b1933446ba1c957013ae5185b52a51176cf3995b3d12f199c0b2a86546474469d1618cf597d8a63b2911a58c WHIRLPOOL 5e276ddd3ec6cc0d31ce5668041e35e96c2c33f5bfc57e941c1d0d792129ff9539a8ab0cd48c0f0dec0d513f24567be98885768c89bf10095817c301c7956117
-EBUILD selinux-rtorrent-9999.ebuild 287 SHA256 99563268d86a7a448c06d48e21507564afcecedf7fad3d2c59f8b391e96b86f1 SHA512 ffbd44fd6b60587dc8ef0532a3a0eb64bb60e0dbcebcd6ad2b2ff112c7e8ff6fa884cde36ff7b4fba6f06d326fc274f48f08f2beda199597b84eecbabb964c11 WHIRLPOOL a90e03fa2021f5db4f0f36d8bfb04eac5dcb7eff4a35e39a44d12f1ef84537e688bebc33ae8cea01ac7f24f775430365cfb0428a8b2170c13a4f18ebdf56f536
+EBUILD selinux-rtorrent-2.20170204-r1.ebuild 288 SHA256 9c6d51bc532ee6e2d457daabc416439577d788a89f2f65fce03462b3f9f98d41 SHA512 ec0430392715f3fea025141fee031164d597fa6d702902294bf51df86ab06132d4945454b9747e316cc97d6606ebcffafd71f54612c0f98c0b9df76837fc7c8d WHIRLPOOL e48f70ec4121571032ecdd58524f6ac42228287ed8dbd0d1267e44037d5d10eb4aaa96e3446ae6c047f67acf93369c5ab194e9678629f6d714c1d1538f335b6d
+EBUILD selinux-rtorrent-2.20170204-r2.ebuild 286 SHA256 84a86c0386096ae452b0709ca06fbc2f510d89b72522ca910d56eaaf9b5a5eb3 SHA512 40d54108313ad5bc8f160e3cdba598fa5a5d407aa7f4c6c00b40e935f7a75e92e226667abe79ca232affeb92a285e8b4d323c310e396bcf0a95b08f1eb7d4bb2 WHIRLPOOL 948a00063731e2d75230aa70b8215c6f648e624a69d7b986990e4ffe3a44903321d786077c4cdc5596d17c55572e4b9b24395cad67027fe760f49b7126286372
+EBUILD selinux-rtorrent-2.20170204-r3.ebuild 286 SHA256 84a86c0386096ae452b0709ca06fbc2f510d89b72522ca910d56eaaf9b5a5eb3 SHA512 40d54108313ad5bc8f160e3cdba598fa5a5d407aa7f4c6c00b40e935f7a75e92e226667abe79ca232affeb92a285e8b4d323c310e396bcf0a95b08f1eb7d4bb2 WHIRLPOOL 948a00063731e2d75230aa70b8215c6f648e624a69d7b986990e4ffe3a44903321d786077c4cdc5596d17c55572e4b9b24395cad67027fe760f49b7126286372
+EBUILD selinux-rtorrent-2.20170204-r4.ebuild 286 SHA256 84a86c0386096ae452b0709ca06fbc2f510d89b72522ca910d56eaaf9b5a5eb3 SHA512 40d54108313ad5bc8f160e3cdba598fa5a5d407aa7f4c6c00b40e935f7a75e92e226667abe79ca232affeb92a285e8b4d323c310e396bcf0a95b08f1eb7d4bb2 WHIRLPOOL 948a00063731e2d75230aa70b8215c6f648e624a69d7b986990e4ffe3a44903321d786077c4cdc5596d17c55572e4b9b24395cad67027fe760f49b7126286372
+EBUILD selinux-rtorrent-2.20170805-r2.ebuild 286 SHA256 84a86c0386096ae452b0709ca06fbc2f510d89b72522ca910d56eaaf9b5a5eb3 SHA512 40d54108313ad5bc8f160e3cdba598fa5a5d407aa7f4c6c00b40e935f7a75e92e226667abe79ca232affeb92a285e8b4d323c310e396bcf0a95b08f1eb7d4bb2 WHIRLPOOL 948a00063731e2d75230aa70b8215c6f648e624a69d7b986990e4ffe3a44903321d786077c4cdc5596d17c55572e4b9b24395cad67027fe760f49b7126286372
+EBUILD selinux-rtorrent-2.20170805-r3.ebuild 288 SHA256 9c6d51bc532ee6e2d457daabc416439577d788a89f2f65fce03462b3f9f98d41 SHA512 ec0430392715f3fea025141fee031164d597fa6d702902294bf51df86ab06132d4945454b9747e316cc97d6606ebcffafd71f54612c0f98c0b9df76837fc7c8d WHIRLPOOL e48f70ec4121571032ecdd58524f6ac42228287ed8dbd0d1267e44037d5d10eb4aaa96e3446ae6c047f67acf93369c5ab194e9678629f6d714c1d1538f335b6d
+EBUILD selinux-rtorrent-9999.ebuild 288 SHA256 9c6d51bc532ee6e2d457daabc416439577d788a89f2f65fce03462b3f9f98d41 SHA512 ec0430392715f3fea025141fee031164d597fa6d702902294bf51df86ab06132d4945454b9747e316cc97d6606ebcffafd71f54612c0f98c0b9df76837fc7c8d WHIRLPOOL e48f70ec4121571032ecdd58524f6ac42228287ed8dbd0d1267e44037d5d10eb4aaa96e3446ae6c047f67acf93369c5ab194e9678629f6d714c1d1538f335b6d
 MISC ChangeLog 10793 SHA256 f7f9b399d1c6ad077cd94e621e553c014d49cefddb6d71dafb1feb4d03a430a7 SHA512 6b735003cf61cef8d8fc1c51a35f094f325b69e98283e9e34958113b2535d14e9e165ad1dae9102b3f191e053f368d93140fa79d2c654ede354726706cfd99a3 WHIRLPOOL 6b37194512068b5c72d27e0265ba84162f69118935fe19a56b8897d4a2b004cffbf6b76c1014d877f69226ab0e135a4f7c71e9aaa5d50456591e7c434945c831
 MISC ChangeLog-2015 7929 SHA256 cbba4c1f7bf231f5149d9b2ec9d7a937e4a44860c8022e327293cfb044ad7f32 SHA512 606065ab772d6b73b1f9b0a1e48851fe1898e2628972df81af8be56e1ee679bcd24a556800d180e9ec12ddb36a1fe56adf796b66cbc5a635b4d72f802d69dbf8 WHIRLPOOL 99bef669568a6b833e3d1c35648c1b3fa9328f4841ddc540e57a8d645f0cae6bc9037d2781e52222502ec5ff91ec2737e55754206230c00508340a763cd2db81
 MISC metadata.xml 318 SHA256 20e85f30f9266a18415e080e805a87ddb41970d505f9561ed54cec94e4dc1503 SHA512 a16d37c7a1c742c24f0b87f126157efaf9a62929d891cb93a3abfe0937f71b56eaec201f9f648f20697347c5628f330114a6e1c2132f5364d828c1c68936c3bb WHIRLPOOL 731150881d963249a93e5c3ef8cd9751e712626800a358de30f4610691171cfd605e2567a28fa16be19100a352278b225f30e4b0674989cba5c6edc930b870fc
diff --git a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20170204-r1.ebuild b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20170204-r1.ebuild
index 01ee8ade8d93..3c24e1312d0f 100644
--- a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20170204-r2.ebuild b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20170204-r2.ebuild
index 99239325cabd..dd1f6c8ef94b 100644
--- a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20170204-r3.ebuild b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20170204-r3.ebuild
index 99239325cabd..dd1f6c8ef94b 100644
--- a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20170204-r4.ebuild b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20170204-r4.ebuild
index 99239325cabd..dd1f6c8ef94b 100644
--- a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20170805-r2.ebuild b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20170805-r2.ebuild
index 99239325cabd..dd1f6c8ef94b 100644
--- a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20170805-r3.ebuild b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..3c24e1312d0f
--- /dev/null
+++ b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-rtorrent/selinux-rtorrent-9999.ebuild b/sec-policy/selinux-rtorrent/selinux-rtorrent-9999.ebuild
index 01ee8ade8d93..3c24e1312d0f 100644
--- a/sec-policy/selinux-rtorrent/selinux-rtorrent-9999.ebuild
+++ b/sec-policy/selinux-rtorrent/selinux-rtorrent-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-salt/Manifest b/sec-policy/selinux-salt/Manifest
index 964fe52dc1bf..da1a22ecc0ab 100644
--- a/sec-policy/selinux-salt/Manifest
+++ b/sec-policy/selinux-salt/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-salt-2.20170204-r1.ebuild 279 SHA256 92826f2fee6287491538c8f9d1bc149513f4aa0fd3e6a4026824f6e76f119d43 SHA512 ae28db5ca3d37a885054a7f6a105e61baced9cb21a9776af357773e7d948713e75498d1a2edd83fcd9ce599af24edde5c11f2cd3b2187f662ab25ee2fbcbb02c WHIRLPOOL efeb91f84bc2680db9cbe494a0b54ba8fde5484906f7a92922d8d3ef2258c25a09f357ab06c61a64fe040c6e44b60a75c947b0d013cf994d31ed99586ddac652
-EBUILD selinux-salt-2.20170204-r2.ebuild 277 SHA256 a8d034dc010571b4a2b51b009a4221a20427ad28e5d9105736a4968a8099e2bd SHA512 10f509601e1902560d405296c97d0d4e627271b0174ad17edda63405347739a4a64677d9a293326401f9a353ae5e000603197485fe071bce457548eab972b357 WHIRLPOOL 777a0c7b0b6c96692cbdcb6eb5116e0654cf67cd985c25224771bd2c56f136d550d8db5696ee4f9d597e645ab1cee8b034314172e14fdfcad529c2bcb1afc184
-EBUILD selinux-salt-2.20170204-r3.ebuild 277 SHA256 a8d034dc010571b4a2b51b009a4221a20427ad28e5d9105736a4968a8099e2bd SHA512 10f509601e1902560d405296c97d0d4e627271b0174ad17edda63405347739a4a64677d9a293326401f9a353ae5e000603197485fe071bce457548eab972b357 WHIRLPOOL 777a0c7b0b6c96692cbdcb6eb5116e0654cf67cd985c25224771bd2c56f136d550d8db5696ee4f9d597e645ab1cee8b034314172e14fdfcad529c2bcb1afc184
-EBUILD selinux-salt-2.20170204-r4.ebuild 277 SHA256 a8d034dc010571b4a2b51b009a4221a20427ad28e5d9105736a4968a8099e2bd SHA512 10f509601e1902560d405296c97d0d4e627271b0174ad17edda63405347739a4a64677d9a293326401f9a353ae5e000603197485fe071bce457548eab972b357 WHIRLPOOL 777a0c7b0b6c96692cbdcb6eb5116e0654cf67cd985c25224771bd2c56f136d550d8db5696ee4f9d597e645ab1cee8b034314172e14fdfcad529c2bcb1afc184
-EBUILD selinux-salt-2.20170805-r2.ebuild 277 SHA256 a8d034dc010571b4a2b51b009a4221a20427ad28e5d9105736a4968a8099e2bd SHA512 10f509601e1902560d405296c97d0d4e627271b0174ad17edda63405347739a4a64677d9a293326401f9a353ae5e000603197485fe071bce457548eab972b357 WHIRLPOOL 777a0c7b0b6c96692cbdcb6eb5116e0654cf67cd985c25224771bd2c56f136d550d8db5696ee4f9d597e645ab1cee8b034314172e14fdfcad529c2bcb1afc184
-EBUILD selinux-salt-9999.ebuild 279 SHA256 92826f2fee6287491538c8f9d1bc149513f4aa0fd3e6a4026824f6e76f119d43 SHA512 ae28db5ca3d37a885054a7f6a105e61baced9cb21a9776af357773e7d948713e75498d1a2edd83fcd9ce599af24edde5c11f2cd3b2187f662ab25ee2fbcbb02c WHIRLPOOL efeb91f84bc2680db9cbe494a0b54ba8fde5484906f7a92922d8d3ef2258c25a09f357ab06c61a64fe040c6e44b60a75c947b0d013cf994d31ed99586ddac652
+EBUILD selinux-salt-2.20170204-r1.ebuild 280 SHA256 e8008866e423328a5f25574fd2cb1f684dfc1757c014885a3e07c7a171b03b5a SHA512 561a38ade7c43d7bf06ee8269016b645175b886ec16ed506390212acc0b96597315ee321a039e666d228cfac83f1e27238634a6ca8a4e7ad4573ab2580ff35b4 WHIRLPOOL dab652ec87218b275ecb496497aea2f219d08fda00efb563c2b4ccf953299050cb213ea75c80124c2e5700d79804b53e1abca3643e10a78d3f1620101e7e3a6f
+EBUILD selinux-salt-2.20170204-r2.ebuild 278 SHA256 53ef71d5c79a125dcb181fdee3bf564245635083d483712af120a7331666b84d SHA512 ab14217f85808cb88b1752b7131f64ef3439f9a56acf644b0693e037ceebd86ee5fbf746539f0cf3268276226874feb3946a02bc27bea2e0e4e1395954e50c60 WHIRLPOOL ebddb6eeb177c52bf250867fd82ca801c3b690ded2a7f0dbaccf8b947eca00142e469c523b61e57eb2a7cc6a649835356957d8e558a1e937e6e9f346e2c007d6
+EBUILD selinux-salt-2.20170204-r3.ebuild 278 SHA256 53ef71d5c79a125dcb181fdee3bf564245635083d483712af120a7331666b84d SHA512 ab14217f85808cb88b1752b7131f64ef3439f9a56acf644b0693e037ceebd86ee5fbf746539f0cf3268276226874feb3946a02bc27bea2e0e4e1395954e50c60 WHIRLPOOL ebddb6eeb177c52bf250867fd82ca801c3b690ded2a7f0dbaccf8b947eca00142e469c523b61e57eb2a7cc6a649835356957d8e558a1e937e6e9f346e2c007d6
+EBUILD selinux-salt-2.20170204-r4.ebuild 278 SHA256 53ef71d5c79a125dcb181fdee3bf564245635083d483712af120a7331666b84d SHA512 ab14217f85808cb88b1752b7131f64ef3439f9a56acf644b0693e037ceebd86ee5fbf746539f0cf3268276226874feb3946a02bc27bea2e0e4e1395954e50c60 WHIRLPOOL ebddb6eeb177c52bf250867fd82ca801c3b690ded2a7f0dbaccf8b947eca00142e469c523b61e57eb2a7cc6a649835356957d8e558a1e937e6e9f346e2c007d6
+EBUILD selinux-salt-2.20170805-r2.ebuild 278 SHA256 53ef71d5c79a125dcb181fdee3bf564245635083d483712af120a7331666b84d SHA512 ab14217f85808cb88b1752b7131f64ef3439f9a56acf644b0693e037ceebd86ee5fbf746539f0cf3268276226874feb3946a02bc27bea2e0e4e1395954e50c60 WHIRLPOOL ebddb6eeb177c52bf250867fd82ca801c3b690ded2a7f0dbaccf8b947eca00142e469c523b61e57eb2a7cc6a649835356957d8e558a1e937e6e9f346e2c007d6
+EBUILD selinux-salt-2.20170805-r3.ebuild 280 SHA256 e8008866e423328a5f25574fd2cb1f684dfc1757c014885a3e07c7a171b03b5a SHA512 561a38ade7c43d7bf06ee8269016b645175b886ec16ed506390212acc0b96597315ee321a039e666d228cfac83f1e27238634a6ca8a4e7ad4573ab2580ff35b4 WHIRLPOOL dab652ec87218b275ecb496497aea2f219d08fda00efb563c2b4ccf953299050cb213ea75c80124c2e5700d79804b53e1abca3643e10a78d3f1620101e7e3a6f
+EBUILD selinux-salt-9999.ebuild 280 SHA256 e8008866e423328a5f25574fd2cb1f684dfc1757c014885a3e07c7a171b03b5a SHA512 561a38ade7c43d7bf06ee8269016b645175b886ec16ed506390212acc0b96597315ee321a039e666d228cfac83f1e27238634a6ca8a4e7ad4573ab2580ff35b4 WHIRLPOOL dab652ec87218b275ecb496497aea2f219d08fda00efb563c2b4ccf953299050cb213ea75c80124c2e5700d79804b53e1abca3643e10a78d3f1620101e7e3a6f
 MISC ChangeLog 10271 SHA256 3f5eaa951c0297dee23d46c91088878ea49ca7318ab38357e36bdf995ba365de SHA512 e673d94b8e31dfe5fdfbb2de043ab2b4fa2b0986c159003e157c563e0dabafd3ec531aafb122ab9aa698cbec9754f5f324e02ff8ba075309526bff2917864b17 WHIRLPOOL edb10b62d07c210ee54741a35278747af3de95e52cbef9e3a3eeee864907402f72d717476f3846987da5aa218d638ca6f3487add2cee4e8bc59d8f3a2fbcb9f6
 MISC ChangeLog-2015 3150 SHA256 450845524a37b752507eb7dd6dcbe66253d51218a9f87be90dfb1bb07ab5178d SHA512 46641745d9dccafbd008245f97a713d3b0585ae8a19708ad4c408c043f85b88d02bd8a3a2d5e1078bf0eb392c084fd998121a186e4777f555084217668e68f9f WHIRLPOOL a2197f03aa78beb90b368c5c1d1e997174b1445ceb6ea3f033394d9dfbfc41a749fc4fe9044d6e7fc9bf524f22d04ab5309148e3c1979a7535d43a61d46c4649
 MISC metadata.xml 314 SHA256 3944dff2a040b21169d2e54504e0463db292246477776bc6dc10ce0880f34590 SHA512 634ec5b038d166c8b654784e899ef50e4ffb87a855cc5fc54230276b89a84a1d879e84b52af6165edd1c4533eb37085443073d56d9f8f95e29b52945c0b6767a WHIRLPOOL db00279283dbfbfa39b4e4cafe75dcdaae07cb4d73fa8feff4b8498fb6c6a5df2527695aaf61779096f089a1196bb7e29b9b371eb8839b97f823849f7775eecd
diff --git a/sec-policy/selinux-salt/selinux-salt-2.20170204-r1.ebuild b/sec-policy/selinux-salt/selinux-salt-2.20170204-r1.ebuild
index f6849395412d..b6d17ac4b6d5 100644
--- a/sec-policy/selinux-salt/selinux-salt-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-salt/selinux-salt-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-salt/selinux-salt-2.20170204-r2.ebuild b/sec-policy/selinux-salt/selinux-salt-2.20170204-r2.ebuild
index 4637d3fec9a0..85eed76b3642 100644
--- a/sec-policy/selinux-salt/selinux-salt-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-salt/selinux-salt-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-salt/selinux-salt-2.20170204-r3.ebuild b/sec-policy/selinux-salt/selinux-salt-2.20170204-r3.ebuild
index 4637d3fec9a0..85eed76b3642 100644
--- a/sec-policy/selinux-salt/selinux-salt-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-salt/selinux-salt-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-salt/selinux-salt-2.20170204-r4.ebuild b/sec-policy/selinux-salt/selinux-salt-2.20170204-r4.ebuild
index 4637d3fec9a0..85eed76b3642 100644
--- a/sec-policy/selinux-salt/selinux-salt-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-salt/selinux-salt-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-salt/selinux-salt-2.20170805-r2.ebuild b/sec-policy/selinux-salt/selinux-salt-2.20170805-r2.ebuild
index 4637d3fec9a0..85eed76b3642 100644
--- a/sec-policy/selinux-salt/selinux-salt-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-salt/selinux-salt-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-salt/selinux-salt-2.20170805-r3.ebuild b/sec-policy/selinux-salt/selinux-salt-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..b6d17ac4b6d5
--- /dev/null
+++ b/sec-policy/selinux-salt/selinux-salt-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-salt/selinux-salt-9999.ebuild b/sec-policy/selinux-salt/selinux-salt-9999.ebuild
index f6849395412d..b6d17ac4b6d5 100644
--- a/sec-policy/selinux-salt/selinux-salt-9999.ebuild
+++ b/sec-policy/selinux-salt/selinux-salt-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-samba/Manifest b/sec-policy/selinux-samba/Manifest
index 52428da64f36..aee2a7f98ed5 100644
--- a/sec-policy/selinux-samba/Manifest
+++ b/sec-policy/selinux-samba/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-samba-2.20170204-r1.ebuild 281 SHA256 de98489c1f9a250fb653af415e054162e2c67cee81d563d1d15bf45677bdc07a SHA512 51ccdde196b220d92e410ec06c99a7cbd6aa3eebe55bb42831f9dbec058875a0896dc2dff6d769534222f093ed8d6acafe4ae7f6df3a0d0a48f39a6deaa233c9 WHIRLPOOL 3a0217a83e791d9a8b81887de28f9f373f0c39226187d218288aaa1dfb07099a20473a2886b522a3c318ed9c56ab3bbf45b1206b39952faa88fbfc97b39b98f8
-EBUILD selinux-samba-2.20170204-r2.ebuild 279 SHA256 22876279fba03ed24c34d27adc19043d07976e3c596cdcae46517efad27d9d0d SHA512 402fcc07e7fbacf07517d5665e43a43d43ed2b6651df703beeb9bb47ecb28ae2b43bc11826430ced2c50d88732da035b398b0aa3f053dc7b0bd7ed5663b51bbe WHIRLPOOL 841ea8f612e4a733046e3f26776dd846388a778de5a6bda912f7f11de002f0393c4ff3281090e40b8f5f10430bc2c2359258deec6846a4c756d12772e39d132b
-EBUILD selinux-samba-2.20170204-r3.ebuild 279 SHA256 22876279fba03ed24c34d27adc19043d07976e3c596cdcae46517efad27d9d0d SHA512 402fcc07e7fbacf07517d5665e43a43d43ed2b6651df703beeb9bb47ecb28ae2b43bc11826430ced2c50d88732da035b398b0aa3f053dc7b0bd7ed5663b51bbe WHIRLPOOL 841ea8f612e4a733046e3f26776dd846388a778de5a6bda912f7f11de002f0393c4ff3281090e40b8f5f10430bc2c2359258deec6846a4c756d12772e39d132b
-EBUILD selinux-samba-2.20170204-r4.ebuild 279 SHA256 22876279fba03ed24c34d27adc19043d07976e3c596cdcae46517efad27d9d0d SHA512 402fcc07e7fbacf07517d5665e43a43d43ed2b6651df703beeb9bb47ecb28ae2b43bc11826430ced2c50d88732da035b398b0aa3f053dc7b0bd7ed5663b51bbe WHIRLPOOL 841ea8f612e4a733046e3f26776dd846388a778de5a6bda912f7f11de002f0393c4ff3281090e40b8f5f10430bc2c2359258deec6846a4c756d12772e39d132b
-EBUILD selinux-samba-2.20170805-r2.ebuild 279 SHA256 22876279fba03ed24c34d27adc19043d07976e3c596cdcae46517efad27d9d0d SHA512 402fcc07e7fbacf07517d5665e43a43d43ed2b6651df703beeb9bb47ecb28ae2b43bc11826430ced2c50d88732da035b398b0aa3f053dc7b0bd7ed5663b51bbe WHIRLPOOL 841ea8f612e4a733046e3f26776dd846388a778de5a6bda912f7f11de002f0393c4ff3281090e40b8f5f10430bc2c2359258deec6846a4c756d12772e39d132b
-EBUILD selinux-samba-9999.ebuild 281 SHA256 de98489c1f9a250fb653af415e054162e2c67cee81d563d1d15bf45677bdc07a SHA512 51ccdde196b220d92e410ec06c99a7cbd6aa3eebe55bb42831f9dbec058875a0896dc2dff6d769534222f093ed8d6acafe4ae7f6df3a0d0a48f39a6deaa233c9 WHIRLPOOL 3a0217a83e791d9a8b81887de28f9f373f0c39226187d218288aaa1dfb07099a20473a2886b522a3c318ed9c56ab3bbf45b1206b39952faa88fbfc97b39b98f8
+EBUILD selinux-samba-2.20170204-r1.ebuild 282 SHA256 d887466c991c7a5ecd7a64d97ebd2bf39587fc077714d81b45e32865f6c2d970 SHA512 a6ce43835a90ec9137827413cb7e0d15225ca9615a617218fc0a5a3a181294fc4cf1fe88bb397b5591caff6f5198a89e919b744c2d4fde13ea34ffdf7118a8b7 WHIRLPOOL 0feab3e693289b9f325f1ba91e16a89d982a593a9bda34f3b0b1d68d92a3da21613ca0b47d401bb0446fd65e25a6d871198a10f6d3aba7d4488c2eaba904a73f
+EBUILD selinux-samba-2.20170204-r2.ebuild 280 SHA256 96a37e6691eb16c0614e956b900b83e0451df629308fc1ba987ed2ddc19a9d45 SHA512 d7a4e2e623fd437d01296f8c072b787b057e35ab39e4bf301562a1f3946272b5cd1deb60fead1d85c7f644fe80cb6f8accd5cf7e97aec13f1b70079bedf0822e WHIRLPOOL e089ac1d99038c3989b43b43043a01c45751505f391777ccb9e2db38d3a9c6d160dc9d797fdd0e98c991d96f3e777379359e1b2cf6b77305f15decaf3a956857
+EBUILD selinux-samba-2.20170204-r3.ebuild 280 SHA256 96a37e6691eb16c0614e956b900b83e0451df629308fc1ba987ed2ddc19a9d45 SHA512 d7a4e2e623fd437d01296f8c072b787b057e35ab39e4bf301562a1f3946272b5cd1deb60fead1d85c7f644fe80cb6f8accd5cf7e97aec13f1b70079bedf0822e WHIRLPOOL e089ac1d99038c3989b43b43043a01c45751505f391777ccb9e2db38d3a9c6d160dc9d797fdd0e98c991d96f3e777379359e1b2cf6b77305f15decaf3a956857
+EBUILD selinux-samba-2.20170204-r4.ebuild 280 SHA256 96a37e6691eb16c0614e956b900b83e0451df629308fc1ba987ed2ddc19a9d45 SHA512 d7a4e2e623fd437d01296f8c072b787b057e35ab39e4bf301562a1f3946272b5cd1deb60fead1d85c7f644fe80cb6f8accd5cf7e97aec13f1b70079bedf0822e WHIRLPOOL e089ac1d99038c3989b43b43043a01c45751505f391777ccb9e2db38d3a9c6d160dc9d797fdd0e98c991d96f3e777379359e1b2cf6b77305f15decaf3a956857
+EBUILD selinux-samba-2.20170805-r2.ebuild 280 SHA256 96a37e6691eb16c0614e956b900b83e0451df629308fc1ba987ed2ddc19a9d45 SHA512 d7a4e2e623fd437d01296f8c072b787b057e35ab39e4bf301562a1f3946272b5cd1deb60fead1d85c7f644fe80cb6f8accd5cf7e97aec13f1b70079bedf0822e WHIRLPOOL e089ac1d99038c3989b43b43043a01c45751505f391777ccb9e2db38d3a9c6d160dc9d797fdd0e98c991d96f3e777379359e1b2cf6b77305f15decaf3a956857
+EBUILD selinux-samba-2.20170805-r3.ebuild 282 SHA256 d887466c991c7a5ecd7a64d97ebd2bf39587fc077714d81b45e32865f6c2d970 SHA512 a6ce43835a90ec9137827413cb7e0d15225ca9615a617218fc0a5a3a181294fc4cf1fe88bb397b5591caff6f5198a89e919b744c2d4fde13ea34ffdf7118a8b7 WHIRLPOOL 0feab3e693289b9f325f1ba91e16a89d982a593a9bda34f3b0b1d68d92a3da21613ca0b47d401bb0446fd65e25a6d871198a10f6d3aba7d4488c2eaba904a73f
+EBUILD selinux-samba-9999.ebuild 282 SHA256 d887466c991c7a5ecd7a64d97ebd2bf39587fc077714d81b45e32865f6c2d970 SHA512 a6ce43835a90ec9137827413cb7e0d15225ca9615a617218fc0a5a3a181294fc4cf1fe88bb397b5591caff6f5198a89e919b744c2d4fde13ea34ffdf7118a8b7 WHIRLPOOL 0feab3e693289b9f325f1ba91e16a89d982a593a9bda34f3b0b1d68d92a3da21613ca0b47d401bb0446fd65e25a6d871198a10f6d3aba7d4488c2eaba904a73f
 MISC ChangeLog 10479 SHA256 8f52a5228c70018b073dda7bc3b806810cac804462eb77ea6729a2f8b6aad2f9 SHA512 17eaacc870b17f210b1fd533c1f9fb33006ccc923d485a84ff4430cb6b1e6f0af2d6b8a12ecaceb029e195d5f47f86ebca921b763095d34c5b7f6953e3087890 WHIRLPOOL 5676f8747ccb88c5fb2bb0f0b26d602f90eb67f4d6efd9c65915f968458250a24d705eeffc08ba9f9b68f1a74b26770b1a4b8ce8ed287bec35f837ef574ae79e
 MISC ChangeLog-2015 13515 SHA256 36f2604f0ee1bd7d59bbda3ef8d6ee877c3b1f48cbfd5a6e0147521ea8f4acdc SHA512 c6f2d6e08374ad0947db01c34d5bb0e282809d6f58e9972c4a2c9532c530a0088fa35a2b2a4067ddc60cadf08dbe8cf822e55fb656a1ea00cc439ef7ab81445a WHIRLPOOL 1929a17b1516d9454cf58b437eff1040a143e0e877d5943c07a9bda0d21d7f61dbf43524cd9241a053d8e1aa77ac72a0eb24fc8ab7a58b3f637a314d6b074113
 MISC metadata.xml 315 SHA256 fe63d9d455a0d23be2439f8fe029716bf2cd585fa08631a4966bcb3e4a7b1fc5 SHA512 be5d21037154c9faad9ee42bb7337dde65086d188d3703a85e0557003efa33456dc3229ec6c3f36520ba5601d6af2c33825c0fdfa9b6611e4ba67aefe58e2224 WHIRLPOOL f34f71709dcd75433ae39bf0227ce5bff4500c68e486247cb6fe79d8fbda52dfd482ef7da21403bc2c9b95dbf72daf159dfd49e6191be95afd2272b426654043
diff --git a/sec-policy/selinux-samba/selinux-samba-2.20170204-r1.ebuild b/sec-policy/selinux-samba/selinux-samba-2.20170204-r1.ebuild
index 2abecaf47ff8..285da42679a2 100644
--- a/sec-policy/selinux-samba/selinux-samba-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-samba/selinux-samba-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-samba/selinux-samba-2.20170204-r2.ebuild b/sec-policy/selinux-samba/selinux-samba-2.20170204-r2.ebuild
index 5f070ee1aa0d..78c653fcbb84 100644
--- a/sec-policy/selinux-samba/selinux-samba-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-samba/selinux-samba-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-samba/selinux-samba-2.20170204-r3.ebuild b/sec-policy/selinux-samba/selinux-samba-2.20170204-r3.ebuild
index 5f070ee1aa0d..78c653fcbb84 100644
--- a/sec-policy/selinux-samba/selinux-samba-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-samba/selinux-samba-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-samba/selinux-samba-2.20170204-r4.ebuild b/sec-policy/selinux-samba/selinux-samba-2.20170204-r4.ebuild
index 5f070ee1aa0d..78c653fcbb84 100644
--- a/sec-policy/selinux-samba/selinux-samba-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-samba/selinux-samba-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-samba/selinux-samba-2.20170805-r2.ebuild b/sec-policy/selinux-samba/selinux-samba-2.20170805-r2.ebuild
index 5f070ee1aa0d..78c653fcbb84 100644
--- a/sec-policy/selinux-samba/selinux-samba-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-samba/selinux-samba-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-samba/selinux-samba-2.20170805-r3.ebuild b/sec-policy/selinux-samba/selinux-samba-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..285da42679a2
--- /dev/null
+++ b/sec-policy/selinux-samba/selinux-samba-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-samba/selinux-samba-9999.ebuild b/sec-policy/selinux-samba/selinux-samba-9999.ebuild
index 2abecaf47ff8..285da42679a2 100644
--- a/sec-policy/selinux-samba/selinux-samba-9999.ebuild
+++ b/sec-policy/selinux-samba/selinux-samba-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-sasl/Manifest b/sec-policy/selinux-sasl/Manifest
index 7e031e898894..a0e646f1e66f 100644
--- a/sec-policy/selinux-sasl/Manifest
+++ b/sec-policy/selinux-sasl/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-sasl-2.20170204-r1.ebuild 279 SHA256 7db316da7c5c56fcef27bd27933af310a73e529c961ddd2bdd4afc623bbd4185 SHA512 a9d36f7729122f31502395d1f67f239ddbdd7c77a37b9445a6937908aeb4ca60757616146c88cca5b0f220b864f4173a75e6eafdc8fe85ccb925c1b5dd8d220c WHIRLPOOL 3e86f0ee8a109c4426de942daebe399dbcfc0445b865d4e745ebf807aa9becda37a04ab4c7593dac172b29e65f3901d89272761cbdf14b36b02a04523ff5fdea
-EBUILD selinux-sasl-2.20170204-r2.ebuild 277 SHA256 8e21c03cd1e3d02e0e348aa44ece369cdb933840b2e27318dbcc60ef68e76c54 SHA512 50c7ed4f85785c0d397e5322d5cde2c03bb99306017e3587d897d6f3868a5be0dfbda4034a61a676f11ddd610b7c1c576790e7867282a39526430f3a90ee1d3d WHIRLPOOL 59f60c042f200fa855038a4730c0fd6c5bb1ce2bcf0a60928cb2fa3fc111eaad936f119c5886b9407b82f67dadc8f2e5ba8073353598d2ce6d56107a84ef1c5e
-EBUILD selinux-sasl-2.20170204-r3.ebuild 277 SHA256 8e21c03cd1e3d02e0e348aa44ece369cdb933840b2e27318dbcc60ef68e76c54 SHA512 50c7ed4f85785c0d397e5322d5cde2c03bb99306017e3587d897d6f3868a5be0dfbda4034a61a676f11ddd610b7c1c576790e7867282a39526430f3a90ee1d3d WHIRLPOOL 59f60c042f200fa855038a4730c0fd6c5bb1ce2bcf0a60928cb2fa3fc111eaad936f119c5886b9407b82f67dadc8f2e5ba8073353598d2ce6d56107a84ef1c5e
-EBUILD selinux-sasl-2.20170204-r4.ebuild 277 SHA256 8e21c03cd1e3d02e0e348aa44ece369cdb933840b2e27318dbcc60ef68e76c54 SHA512 50c7ed4f85785c0d397e5322d5cde2c03bb99306017e3587d897d6f3868a5be0dfbda4034a61a676f11ddd610b7c1c576790e7867282a39526430f3a90ee1d3d WHIRLPOOL 59f60c042f200fa855038a4730c0fd6c5bb1ce2bcf0a60928cb2fa3fc111eaad936f119c5886b9407b82f67dadc8f2e5ba8073353598d2ce6d56107a84ef1c5e
-EBUILD selinux-sasl-2.20170805-r2.ebuild 277 SHA256 8e21c03cd1e3d02e0e348aa44ece369cdb933840b2e27318dbcc60ef68e76c54 SHA512 50c7ed4f85785c0d397e5322d5cde2c03bb99306017e3587d897d6f3868a5be0dfbda4034a61a676f11ddd610b7c1c576790e7867282a39526430f3a90ee1d3d WHIRLPOOL 59f60c042f200fa855038a4730c0fd6c5bb1ce2bcf0a60928cb2fa3fc111eaad936f119c5886b9407b82f67dadc8f2e5ba8073353598d2ce6d56107a84ef1c5e
-EBUILD selinux-sasl-9999.ebuild 279 SHA256 7db316da7c5c56fcef27bd27933af310a73e529c961ddd2bdd4afc623bbd4185 SHA512 a9d36f7729122f31502395d1f67f239ddbdd7c77a37b9445a6937908aeb4ca60757616146c88cca5b0f220b864f4173a75e6eafdc8fe85ccb925c1b5dd8d220c WHIRLPOOL 3e86f0ee8a109c4426de942daebe399dbcfc0445b865d4e745ebf807aa9becda37a04ab4c7593dac172b29e65f3901d89272761cbdf14b36b02a04523ff5fdea
+EBUILD selinux-sasl-2.20170204-r1.ebuild 280 SHA256 aa00e548c896ccb51d00c679c99f5fb4bed3b3bd4ac5916d3d61cca751fa1f89 SHA512 ac3921327660254c03f18c073dae9f082c38fad82e5fcdfff7673c05a9bad12906030c8489cc2c25e0778ef3fa158668b99608e8fdda221971d625b593300143 WHIRLPOOL b4bce6749d6f98be5085de4232705b3fe37bf1344971d792400f8d39200edc114b8432fbcf6415da7baf84476e55c1b78c4459f562132e383c3e268c5b00187d
+EBUILD selinux-sasl-2.20170204-r2.ebuild 278 SHA256 f77190553f5fa8745360ce994188a0c0e4011fc8d57ea078796a009ec71b6544 SHA512 f73630c414f6d6c364d10f86d5445e19fe4a845f8ad46485a5f9eb298548799409c7af382adcd199dfdda757a5f489563c0f4995fd1580e3637628772ae36ec4 WHIRLPOOL 618da44986742e77562f88d00f0ffb7724f883f169c05f91a4c9ad326f10583f14447ab0ffa8edc65925bcdadebf0f0498c24a9504e89470a7173177b9ba4f10
+EBUILD selinux-sasl-2.20170204-r3.ebuild 278 SHA256 f77190553f5fa8745360ce994188a0c0e4011fc8d57ea078796a009ec71b6544 SHA512 f73630c414f6d6c364d10f86d5445e19fe4a845f8ad46485a5f9eb298548799409c7af382adcd199dfdda757a5f489563c0f4995fd1580e3637628772ae36ec4 WHIRLPOOL 618da44986742e77562f88d00f0ffb7724f883f169c05f91a4c9ad326f10583f14447ab0ffa8edc65925bcdadebf0f0498c24a9504e89470a7173177b9ba4f10
+EBUILD selinux-sasl-2.20170204-r4.ebuild 278 SHA256 f77190553f5fa8745360ce994188a0c0e4011fc8d57ea078796a009ec71b6544 SHA512 f73630c414f6d6c364d10f86d5445e19fe4a845f8ad46485a5f9eb298548799409c7af382adcd199dfdda757a5f489563c0f4995fd1580e3637628772ae36ec4 WHIRLPOOL 618da44986742e77562f88d00f0ffb7724f883f169c05f91a4c9ad326f10583f14447ab0ffa8edc65925bcdadebf0f0498c24a9504e89470a7173177b9ba4f10
+EBUILD selinux-sasl-2.20170805-r2.ebuild 278 SHA256 f77190553f5fa8745360ce994188a0c0e4011fc8d57ea078796a009ec71b6544 SHA512 f73630c414f6d6c364d10f86d5445e19fe4a845f8ad46485a5f9eb298548799409c7af382adcd199dfdda757a5f489563c0f4995fd1580e3637628772ae36ec4 WHIRLPOOL 618da44986742e77562f88d00f0ffb7724f883f169c05f91a4c9ad326f10583f14447ab0ffa8edc65925bcdadebf0f0498c24a9504e89470a7173177b9ba4f10
+EBUILD selinux-sasl-2.20170805-r3.ebuild 280 SHA256 aa00e548c896ccb51d00c679c99f5fb4bed3b3bd4ac5916d3d61cca751fa1f89 SHA512 ac3921327660254c03f18c073dae9f082c38fad82e5fcdfff7673c05a9bad12906030c8489cc2c25e0778ef3fa158668b99608e8fdda221971d625b593300143 WHIRLPOOL b4bce6749d6f98be5085de4232705b3fe37bf1344971d792400f8d39200edc114b8432fbcf6415da7baf84476e55c1b78c4459f562132e383c3e268c5b00187d
+EBUILD selinux-sasl-9999.ebuild 280 SHA256 aa00e548c896ccb51d00c679c99f5fb4bed3b3bd4ac5916d3d61cca751fa1f89 SHA512 ac3921327660254c03f18c073dae9f082c38fad82e5fcdfff7673c05a9bad12906030c8489cc2c25e0778ef3fa158668b99608e8fdda221971d625b593300143 WHIRLPOOL b4bce6749d6f98be5085de4232705b3fe37bf1344971d792400f8d39200edc114b8432fbcf6415da7baf84476e55c1b78c4459f562132e383c3e268c5b00187d
 MISC ChangeLog 10387 SHA256 27c5f34c4cbfc806ea309ca69f3174219f0d54792a88572b1c8cbfba6288a784 SHA512 73aa0e2b4b22a850cb7ab72cf992fe1a4c78e4c1b24775e9ade3909bf1e9794655cf4bb99616230fa0a47e8040cca9ba98bcf5ec6fde9376deefecb1f18686ac WHIRLPOOL 92dd6e511a97dbeeb8f0090c694be25083cba9924267bb9e25f074a35f49baef7a16947ab1cfd2eeab98b8d675ae8311267e0c4c74c08aff60f2a74f6c26a250
 MISC ChangeLog-2015 10265 SHA256 3661b0d64ab558f9b187c3c054196c30285d3c5f78a83bb72c2af6e736db3eec SHA512 6db2f8e480a78a5559797d521d5f14a333307214b12c0eb07ae476017232e20946d78385f37bce5b0ac05d679c6be7a25e1c2d4d98f68c56ef1c6d68090665fd WHIRLPOOL d459eff421cad511084ca3dee763a8af523c320d000b142a5084826e501ff1dcda002371ee3193f0db1e76a675bbf597231ed775cb45aec7f2333062c72cf146
 MISC metadata.xml 314 SHA256 97df2ee4fa6a4e44c743e08501f07b842500cd778e9d89c2335217485887f830 SHA512 45edaf69b73c11c1ed1b7f7fc2b97aadeb3d11b51e2b4c8e388c556efc79441bf70d1f0c835980626e3bdb8cc8bb315204f680a6dd64402035220606449e1960 WHIRLPOOL dddd42e6ae563c853e7eb2ad822db2809a81b31197f6bba47e397b70481c7e1c31aa2f42ef8b460f1d6af1eb3c78c04ed07d7955f8650cacf8540d806408f5bf
diff --git a/sec-policy/selinux-sasl/selinux-sasl-2.20170204-r1.ebuild b/sec-policy/selinux-sasl/selinux-sasl-2.20170204-r1.ebuild
index 2ca06d231b1b..2dcdf2d01349 100644
--- a/sec-policy/selinux-sasl/selinux-sasl-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-sasl/selinux-sasl-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-sasl/selinux-sasl-2.20170204-r2.ebuild b/sec-policy/selinux-sasl/selinux-sasl-2.20170204-r2.ebuild
index 4551d1877bbb..577d5c116604 100644
--- a/sec-policy/selinux-sasl/selinux-sasl-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-sasl/selinux-sasl-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-sasl/selinux-sasl-2.20170204-r3.ebuild b/sec-policy/selinux-sasl/selinux-sasl-2.20170204-r3.ebuild
index 4551d1877bbb..577d5c116604 100644
--- a/sec-policy/selinux-sasl/selinux-sasl-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-sasl/selinux-sasl-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-sasl/selinux-sasl-2.20170204-r4.ebuild b/sec-policy/selinux-sasl/selinux-sasl-2.20170204-r4.ebuild
index 4551d1877bbb..577d5c116604 100644
--- a/sec-policy/selinux-sasl/selinux-sasl-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-sasl/selinux-sasl-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-sasl/selinux-sasl-2.20170805-r2.ebuild b/sec-policy/selinux-sasl/selinux-sasl-2.20170805-r2.ebuild
index 4551d1877bbb..577d5c116604 100644
--- a/sec-policy/selinux-sasl/selinux-sasl-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-sasl/selinux-sasl-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-sasl/selinux-sasl-2.20170805-r3.ebuild b/sec-policy/selinux-sasl/selinux-sasl-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..2dcdf2d01349
--- /dev/null
+++ b/sec-policy/selinux-sasl/selinux-sasl-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-sasl/selinux-sasl-9999.ebuild b/sec-policy/selinux-sasl/selinux-sasl-9999.ebuild
index 2ca06d231b1b..2dcdf2d01349 100644
--- a/sec-policy/selinux-sasl/selinux-sasl-9999.ebuild
+++ b/sec-policy/selinux-sasl/selinux-sasl-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-screen/Manifest b/sec-policy/selinux-screen/Manifest
index 0dd218358d2b..67122a980606 100644
--- a/sec-policy/selinux-screen/Manifest
+++ b/sec-policy/selinux-screen/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-screen-2.20170204-r1.ebuild 283 SHA256 a2081c89ed092321d5233750f054b317092db0e147fd4d5a311b0c93de170f76 SHA512 e28c2a85daa10b8fb81cad06caf276ef0d729e27f97c26a1fbc5e1d343ce2f3ace0e54bf99ea3e86b1dbc340e7eb50cc31ee46c5ee60f293a92da5235e717e01 WHIRLPOOL 2eaa225ba3a3c086c31f2484ce2a655984b896d7e84efb2ba2c92e110d33266356840c29965cf72c8889767470473e0401d74e6615cbdf0e0f23bcf63df83200
-EBUILD selinux-screen-2.20170204-r2.ebuild 281 SHA256 487fdae655bd35e413f5f408a5c57932017f3c073149e426ce6f15b1544feb5c SHA512 719c7c425d9ee072d3d03452646ac1648cf1edd35ab43f3166c818923b6efdfc6b293a7454c978990b450dde0eb3f408588d63a420ea4118c0ae9b09693fa2d6 WHIRLPOOL 99d850f8ff5a3eca73250b5e98500912b42d9557e163f935e4266b626058f47ae532c1e554c803078a86a196acab0dc9bd6d3b60546fa7ed9039266bbb20ccf2
-EBUILD selinux-screen-2.20170204-r3.ebuild 281 SHA256 487fdae655bd35e413f5f408a5c57932017f3c073149e426ce6f15b1544feb5c SHA512 719c7c425d9ee072d3d03452646ac1648cf1edd35ab43f3166c818923b6efdfc6b293a7454c978990b450dde0eb3f408588d63a420ea4118c0ae9b09693fa2d6 WHIRLPOOL 99d850f8ff5a3eca73250b5e98500912b42d9557e163f935e4266b626058f47ae532c1e554c803078a86a196acab0dc9bd6d3b60546fa7ed9039266bbb20ccf2
-EBUILD selinux-screen-2.20170204-r4.ebuild 281 SHA256 487fdae655bd35e413f5f408a5c57932017f3c073149e426ce6f15b1544feb5c SHA512 719c7c425d9ee072d3d03452646ac1648cf1edd35ab43f3166c818923b6efdfc6b293a7454c978990b450dde0eb3f408588d63a420ea4118c0ae9b09693fa2d6 WHIRLPOOL 99d850f8ff5a3eca73250b5e98500912b42d9557e163f935e4266b626058f47ae532c1e554c803078a86a196acab0dc9bd6d3b60546fa7ed9039266bbb20ccf2
-EBUILD selinux-screen-2.20170805-r2.ebuild 281 SHA256 487fdae655bd35e413f5f408a5c57932017f3c073149e426ce6f15b1544feb5c SHA512 719c7c425d9ee072d3d03452646ac1648cf1edd35ab43f3166c818923b6efdfc6b293a7454c978990b450dde0eb3f408588d63a420ea4118c0ae9b09693fa2d6 WHIRLPOOL 99d850f8ff5a3eca73250b5e98500912b42d9557e163f935e4266b626058f47ae532c1e554c803078a86a196acab0dc9bd6d3b60546fa7ed9039266bbb20ccf2
-EBUILD selinux-screen-9999.ebuild 283 SHA256 a2081c89ed092321d5233750f054b317092db0e147fd4d5a311b0c93de170f76 SHA512 e28c2a85daa10b8fb81cad06caf276ef0d729e27f97c26a1fbc5e1d343ce2f3ace0e54bf99ea3e86b1dbc340e7eb50cc31ee46c5ee60f293a92da5235e717e01 WHIRLPOOL 2eaa225ba3a3c086c31f2484ce2a655984b896d7e84efb2ba2c92e110d33266356840c29965cf72c8889767470473e0401d74e6615cbdf0e0f23bcf63df83200
+EBUILD selinux-screen-2.20170204-r1.ebuild 284 SHA256 5717791e3ca272af93e9bfee64f3fd3dc7984f055bc52baa619b2bacde44e82a SHA512 943f6b8dc5ca666b46121532a3115019cef0220653950edefbce326fb8d54ac566793f5726c4e276f90b1eceb87ca50f2f0f33b3bd3e04b866cfff4e62e166dc WHIRLPOOL a372b81e91b9894327ec605380a0a13c60dd51d4dc84d49921631adfccc2eb182918584b44ba9dc06de5689ecefc41039cdaf3c66f3c482719844cbef878c301
+EBUILD selinux-screen-2.20170204-r2.ebuild 282 SHA256 dd95c50ed7821745b2db4e29d1bfb296280ebf5562030b8e59e12d8380016240 SHA512 51db16d1e3370ea88b1f2c9ea2fd35233d4157aa29b8d6d7bf94cd81cded26e6a9ade624aa1df454a21d54a4f927cefc506dfb9d679f9dd17cc5063ad7f78212 WHIRLPOOL 800e6ca6971655d52a5db493ed2ec23075831274621f5f8accb1628e26fcaf9a0e0cc2d68b9bd04c8d68fc1f15e7b2683c46ecb6fcc73798f1d5837b9af8ba44
+EBUILD selinux-screen-2.20170204-r3.ebuild 282 SHA256 dd95c50ed7821745b2db4e29d1bfb296280ebf5562030b8e59e12d8380016240 SHA512 51db16d1e3370ea88b1f2c9ea2fd35233d4157aa29b8d6d7bf94cd81cded26e6a9ade624aa1df454a21d54a4f927cefc506dfb9d679f9dd17cc5063ad7f78212 WHIRLPOOL 800e6ca6971655d52a5db493ed2ec23075831274621f5f8accb1628e26fcaf9a0e0cc2d68b9bd04c8d68fc1f15e7b2683c46ecb6fcc73798f1d5837b9af8ba44
+EBUILD selinux-screen-2.20170204-r4.ebuild 282 SHA256 dd95c50ed7821745b2db4e29d1bfb296280ebf5562030b8e59e12d8380016240 SHA512 51db16d1e3370ea88b1f2c9ea2fd35233d4157aa29b8d6d7bf94cd81cded26e6a9ade624aa1df454a21d54a4f927cefc506dfb9d679f9dd17cc5063ad7f78212 WHIRLPOOL 800e6ca6971655d52a5db493ed2ec23075831274621f5f8accb1628e26fcaf9a0e0cc2d68b9bd04c8d68fc1f15e7b2683c46ecb6fcc73798f1d5837b9af8ba44
+EBUILD selinux-screen-2.20170805-r2.ebuild 282 SHA256 dd95c50ed7821745b2db4e29d1bfb296280ebf5562030b8e59e12d8380016240 SHA512 51db16d1e3370ea88b1f2c9ea2fd35233d4157aa29b8d6d7bf94cd81cded26e6a9ade624aa1df454a21d54a4f927cefc506dfb9d679f9dd17cc5063ad7f78212 WHIRLPOOL 800e6ca6971655d52a5db493ed2ec23075831274621f5f8accb1628e26fcaf9a0e0cc2d68b9bd04c8d68fc1f15e7b2683c46ecb6fcc73798f1d5837b9af8ba44
+EBUILD selinux-screen-2.20170805-r3.ebuild 284 SHA256 5717791e3ca272af93e9bfee64f3fd3dc7984f055bc52baa619b2bacde44e82a SHA512 943f6b8dc5ca666b46121532a3115019cef0220653950edefbce326fb8d54ac566793f5726c4e276f90b1eceb87ca50f2f0f33b3bd3e04b866cfff4e62e166dc WHIRLPOOL a372b81e91b9894327ec605380a0a13c60dd51d4dc84d49921631adfccc2eb182918584b44ba9dc06de5689ecefc41039cdaf3c66f3c482719844cbef878c301
+EBUILD selinux-screen-9999.ebuild 284 SHA256 5717791e3ca272af93e9bfee64f3fd3dc7984f055bc52baa619b2bacde44e82a SHA512 943f6b8dc5ca666b46121532a3115019cef0220653950edefbce326fb8d54ac566793f5726c4e276f90b1eceb87ca50f2f0f33b3bd3e04b866cfff4e62e166dc WHIRLPOOL a372b81e91b9894327ec605380a0a13c60dd51d4dc84d49921631adfccc2eb182918584b44ba9dc06de5689ecefc41039cdaf3c66f3c482719844cbef878c301
 MISC ChangeLog 10571 SHA256 5bc7da76869b8375f54ac9b7cb9f2cf7d08174558d924c5dd3c7f919101a1415 SHA512 17e22b85838e1172571f7b66b1e4ff77f3f7ca2a2a694af10f78449d88fcfdff8cd0a43fdad33e4796192b0c595f4ae0121077d4bd4c6b265581aba8594d9d58 WHIRLPOOL d34ae42f44bdf55aa7de931bb783ee3ad3bdb39e7d57d11b85cedb24356078975de082bd802a36bc312dc0f191815f09a074212c2b941740021af09938e0f242
 MISC ChangeLog-2015 12519 SHA256 3ee71e6792c473c260ee24acb9e757f0bd66df3dcc7b5ce9030cf81a8328a99b SHA512 2c4205767f135ebcbd65e237ae0a440acf2711e105682c7472f476e6bf86d39b7af493ff657880aaa5487221514d3ba5a18475bfae96988cb2bedb71fb75bb06 WHIRLPOOL 5c7e017db1c1cf3c5b173a6a8bdb27c41e06cec57679bca9bab18b34e0976edc477c9fce851861af2f53a3216ee47df72dd1a2e7fdb5e63733f2b269fac836cd
 MISC metadata.xml 316 SHA256 8c13467338743e512a30f32ea20a7059e4d85a79d8cecb5c107b40153421f936 SHA512 4fe7d61f85ea2a1a24235cb5d571e9c0ff213b44d985f33d2d72858e7e429992ad6e779cc641eb2712f4abc089dab74203ed2b5111c627efce0a45c0da25bd5a WHIRLPOOL a9c62e9bfcf101f4e8b42232c9edec456901d67c4f2fc923b7bd10bc8e1ab7c9b45ac96933c3ae6072a251ef4177e2f542765ffc67092ff60a6be40daf2ba24c
diff --git a/sec-policy/selinux-screen/selinux-screen-2.20170204-r1.ebuild b/sec-policy/selinux-screen/selinux-screen-2.20170204-r1.ebuild
index 229600cc6cb7..eecd441a1825 100644
--- a/sec-policy/selinux-screen/selinux-screen-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-screen/selinux-screen-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-screen/selinux-screen-2.20170204-r2.ebuild b/sec-policy/selinux-screen/selinux-screen-2.20170204-r2.ebuild
index 1add0def9432..a82707f09fb1 100644
--- a/sec-policy/selinux-screen/selinux-screen-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-screen/selinux-screen-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-screen/selinux-screen-2.20170204-r3.ebuild b/sec-policy/selinux-screen/selinux-screen-2.20170204-r3.ebuild
index 1add0def9432..a82707f09fb1 100644
--- a/sec-policy/selinux-screen/selinux-screen-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-screen/selinux-screen-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-screen/selinux-screen-2.20170204-r4.ebuild b/sec-policy/selinux-screen/selinux-screen-2.20170204-r4.ebuild
index 1add0def9432..a82707f09fb1 100644
--- a/sec-policy/selinux-screen/selinux-screen-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-screen/selinux-screen-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-screen/selinux-screen-2.20170805-r2.ebuild b/sec-policy/selinux-screen/selinux-screen-2.20170805-r2.ebuild
index 1add0def9432..a82707f09fb1 100644
--- a/sec-policy/selinux-screen/selinux-screen-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-screen/selinux-screen-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-screen/selinux-screen-2.20170805-r3.ebuild b/sec-policy/selinux-screen/selinux-screen-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..eecd441a1825
--- /dev/null
+++ b/sec-policy/selinux-screen/selinux-screen-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-screen/selinux-screen-9999.ebuild b/sec-policy/selinux-screen/selinux-screen-9999.ebuild
index 229600cc6cb7..eecd441a1825 100644
--- a/sec-policy/selinux-screen/selinux-screen-9999.ebuild
+++ b/sec-policy/selinux-screen/selinux-screen-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-sendmail/Manifest b/sec-policy/selinux-sendmail/Manifest
index 59fab4d9ffd2..36b7ba8f1fcc 100644
--- a/sec-policy/selinux-sendmail/Manifest
+++ b/sec-policy/selinux-sendmail/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-sendmail-2.20170204-r1.ebuild 287 SHA256 b8a3a4840037a9d6f8bb4cc8395ab3d1251713a5170fb62bace19df66098a427 SHA512 a789b7cfe32f425f61992f952da5f32a88f5f3b9799ca0bf64600fe4b9e6f82cb5f4726dc4f899c0bad7179483080804117a6ccb25fb6306bf27e419e572981c WHIRLPOOL d121cd7a1a5aa1c53790a9485067145bcc57636339ff0d32f016495baa82e56a7c2854df6814dc401c464c84a7ddcb819f8110a88572ab7207453764251c6d92
-EBUILD selinux-sendmail-2.20170204-r2.ebuild 285 SHA256 16e34e7b63d4dfc7524b5df1eeff08856fc9358d8a46db30dfb3f562a208eb86 SHA512 09048b7817484a1957d2d1e0e0f63d9d9acca956c5c2bc428e31dd4e0ede5fc7314d01d1527086e3494a6fb138f7d6d2b76e08005a9b83b8fba79a07e93d5506 WHIRLPOOL 591127966054475c2138d90e93ca463ff0fbd72d23e6779dcf0d4b134261ad02d1a2a74b736bad5313c3790963ae4007359310eeab42b9b63c95e8bfb671e3c3
-EBUILD selinux-sendmail-2.20170204-r3.ebuild 285 SHA256 16e34e7b63d4dfc7524b5df1eeff08856fc9358d8a46db30dfb3f562a208eb86 SHA512 09048b7817484a1957d2d1e0e0f63d9d9acca956c5c2bc428e31dd4e0ede5fc7314d01d1527086e3494a6fb138f7d6d2b76e08005a9b83b8fba79a07e93d5506 WHIRLPOOL 591127966054475c2138d90e93ca463ff0fbd72d23e6779dcf0d4b134261ad02d1a2a74b736bad5313c3790963ae4007359310eeab42b9b63c95e8bfb671e3c3
-EBUILD selinux-sendmail-2.20170204-r4.ebuild 285 SHA256 16e34e7b63d4dfc7524b5df1eeff08856fc9358d8a46db30dfb3f562a208eb86 SHA512 09048b7817484a1957d2d1e0e0f63d9d9acca956c5c2bc428e31dd4e0ede5fc7314d01d1527086e3494a6fb138f7d6d2b76e08005a9b83b8fba79a07e93d5506 WHIRLPOOL 591127966054475c2138d90e93ca463ff0fbd72d23e6779dcf0d4b134261ad02d1a2a74b736bad5313c3790963ae4007359310eeab42b9b63c95e8bfb671e3c3
-EBUILD selinux-sendmail-2.20170805-r2.ebuild 285 SHA256 16e34e7b63d4dfc7524b5df1eeff08856fc9358d8a46db30dfb3f562a208eb86 SHA512 09048b7817484a1957d2d1e0e0f63d9d9acca956c5c2bc428e31dd4e0ede5fc7314d01d1527086e3494a6fb138f7d6d2b76e08005a9b83b8fba79a07e93d5506 WHIRLPOOL 591127966054475c2138d90e93ca463ff0fbd72d23e6779dcf0d4b134261ad02d1a2a74b736bad5313c3790963ae4007359310eeab42b9b63c95e8bfb671e3c3
-EBUILD selinux-sendmail-9999.ebuild 287 SHA256 b8a3a4840037a9d6f8bb4cc8395ab3d1251713a5170fb62bace19df66098a427 SHA512 a789b7cfe32f425f61992f952da5f32a88f5f3b9799ca0bf64600fe4b9e6f82cb5f4726dc4f899c0bad7179483080804117a6ccb25fb6306bf27e419e572981c WHIRLPOOL d121cd7a1a5aa1c53790a9485067145bcc57636339ff0d32f016495baa82e56a7c2854df6814dc401c464c84a7ddcb819f8110a88572ab7207453764251c6d92
+EBUILD selinux-sendmail-2.20170204-r1.ebuild 288 SHA256 5ffb47ea6fbb227d4c17207ad3066c9054d8093b09c6c1ab5aec7913b2e99147 SHA512 2e5a94c30bcbd1498ce5dae67b6cdc0b18219e24be4e33bb55a913fbc21d6bed9e7439ebaf01e7f80324fe5420dcf0c3c70ce78ff616c377ed4e89d20488e5e7 WHIRLPOOL fa11094f6ccb751d33cc7efee170e9dba0d2e5b56812dbe6ad2ebf8da5f6732b2e13acab3b7d98854abb7448a5c6f72cc8e88a38c5db5f773e250a05b2fd546b
+EBUILD selinux-sendmail-2.20170204-r2.ebuild 286 SHA256 fe437117c16d187c9d17d8c0e6b2b7296015c0593a97f1b43f57f23283ebecb6 SHA512 655c9f4ec9b19dc3732f808f6df1e0546f97a9004ab1f6aa4f0edebd454e58582dcfd4a332f69ce95c2ff8d624c42fc868d87954b1a33c3b71406d12b62f6e26 WHIRLPOOL 03f3c405af2dded22ed4e80119ea3b0b73a621b83efb9992b37ca45e6758e47b46320043ef68b2cdfe35976565bb71e78e388499b0d22a5ae715c6a656795e6e
+EBUILD selinux-sendmail-2.20170204-r3.ebuild 286 SHA256 fe437117c16d187c9d17d8c0e6b2b7296015c0593a97f1b43f57f23283ebecb6 SHA512 655c9f4ec9b19dc3732f808f6df1e0546f97a9004ab1f6aa4f0edebd454e58582dcfd4a332f69ce95c2ff8d624c42fc868d87954b1a33c3b71406d12b62f6e26 WHIRLPOOL 03f3c405af2dded22ed4e80119ea3b0b73a621b83efb9992b37ca45e6758e47b46320043ef68b2cdfe35976565bb71e78e388499b0d22a5ae715c6a656795e6e
+EBUILD selinux-sendmail-2.20170204-r4.ebuild 286 SHA256 fe437117c16d187c9d17d8c0e6b2b7296015c0593a97f1b43f57f23283ebecb6 SHA512 655c9f4ec9b19dc3732f808f6df1e0546f97a9004ab1f6aa4f0edebd454e58582dcfd4a332f69ce95c2ff8d624c42fc868d87954b1a33c3b71406d12b62f6e26 WHIRLPOOL 03f3c405af2dded22ed4e80119ea3b0b73a621b83efb9992b37ca45e6758e47b46320043ef68b2cdfe35976565bb71e78e388499b0d22a5ae715c6a656795e6e
+EBUILD selinux-sendmail-2.20170805-r2.ebuild 286 SHA256 fe437117c16d187c9d17d8c0e6b2b7296015c0593a97f1b43f57f23283ebecb6 SHA512 655c9f4ec9b19dc3732f808f6df1e0546f97a9004ab1f6aa4f0edebd454e58582dcfd4a332f69ce95c2ff8d624c42fc868d87954b1a33c3b71406d12b62f6e26 WHIRLPOOL 03f3c405af2dded22ed4e80119ea3b0b73a621b83efb9992b37ca45e6758e47b46320043ef68b2cdfe35976565bb71e78e388499b0d22a5ae715c6a656795e6e
+EBUILD selinux-sendmail-2.20170805-r3.ebuild 288 SHA256 5ffb47ea6fbb227d4c17207ad3066c9054d8093b09c6c1ab5aec7913b2e99147 SHA512 2e5a94c30bcbd1498ce5dae67b6cdc0b18219e24be4e33bb55a913fbc21d6bed9e7439ebaf01e7f80324fe5420dcf0c3c70ce78ff616c377ed4e89d20488e5e7 WHIRLPOOL fa11094f6ccb751d33cc7efee170e9dba0d2e5b56812dbe6ad2ebf8da5f6732b2e13acab3b7d98854abb7448a5c6f72cc8e88a38c5db5f773e250a05b2fd546b
+EBUILD selinux-sendmail-9999.ebuild 288 SHA256 5ffb47ea6fbb227d4c17207ad3066c9054d8093b09c6c1ab5aec7913b2e99147 SHA512 2e5a94c30bcbd1498ce5dae67b6cdc0b18219e24be4e33bb55a913fbc21d6bed9e7439ebaf01e7f80324fe5420dcf0c3c70ce78ff616c377ed4e89d20488e5e7 WHIRLPOOL fa11094f6ccb751d33cc7efee170e9dba0d2e5b56812dbe6ad2ebf8da5f6732b2e13acab3b7d98854abb7448a5c6f72cc8e88a38c5db5f773e250a05b2fd546b
 MISC ChangeLog 10793 SHA256 12b1f6b1818d128207c30dc032c8d667551ee587a7c9f6770b96f5990a78b6f6 SHA512 88a0e8a352790aa22750b8e0c0e3cb74dc9562530cd7fcf179eea9321367085ffeb152fb426894f1cd93241cc85de047c7007bc670c04a0c953f3cf2342b72e3 WHIRLPOOL ba6623a4b7f227d453517ff0420f77e231ed10a99d6825b917da52d9bb1f63160f38ef99721444106387c51bbca21071a11bf98aef743b668ea0686db5c5804e
 MISC ChangeLog-2015 10102 SHA256 dd52008c3732390dd2210957780e3b190149df82f4b0fb7a0d9ac74708ce2ad2 SHA512 ab165535548822e2e5ed1f0b59206800b480bf4ad2a2bf10de0bd6ccf0ce151f2a8cbea7eee46e6f4135baea14b0a4af5ab5758d5a19b819c3178478ee0b4766 WHIRLPOOL 1b3793fca899fc49f92dc8d83d8a266ce48b43830e504ced1d58858f9efdd951b379b01d3c1b29a64b6f612a939f4b6275f33f23fa1dc1072112693fe1d34982
 MISC metadata.xml 318 SHA256 45dc049733caea0be65304041bc03cc028301f3cd8baf4745d9052a09faa83cd SHA512 32cedde0f34cdc0e2dce0599332364e3a2b7feafaec1dab8e96c34b4ebd1274c53ea4051d555ff3fc48cf86df7c45ce929c938c3f7e914e47012a8ba8b6fbcaf WHIRLPOOL 0868ab65431b9e4327389526ae5135179599541962e0c8c709d1ed52370b414d71678a3d7a2c7d3f07953de75097271d96110cfc4853193347e858b33a87ee60
diff --git a/sec-policy/selinux-sendmail/selinux-sendmail-2.20170204-r1.ebuild b/sec-policy/selinux-sendmail/selinux-sendmail-2.20170204-r1.ebuild
index 083f3537f8f0..ea30505244e3 100644
--- a/sec-policy/selinux-sendmail/selinux-sendmail-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-sendmail/selinux-sendmail-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-sendmail/selinux-sendmail-2.20170204-r2.ebuild b/sec-policy/selinux-sendmail/selinux-sendmail-2.20170204-r2.ebuild
index de94c2401f69..2731066a0876 100644
--- a/sec-policy/selinux-sendmail/selinux-sendmail-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-sendmail/selinux-sendmail-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-sendmail/selinux-sendmail-2.20170204-r3.ebuild b/sec-policy/selinux-sendmail/selinux-sendmail-2.20170204-r3.ebuild
index de94c2401f69..2731066a0876 100644
--- a/sec-policy/selinux-sendmail/selinux-sendmail-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-sendmail/selinux-sendmail-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-sendmail/selinux-sendmail-2.20170204-r4.ebuild b/sec-policy/selinux-sendmail/selinux-sendmail-2.20170204-r4.ebuild
index de94c2401f69..2731066a0876 100644
--- a/sec-policy/selinux-sendmail/selinux-sendmail-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-sendmail/selinux-sendmail-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-sendmail/selinux-sendmail-2.20170805-r2.ebuild b/sec-policy/selinux-sendmail/selinux-sendmail-2.20170805-r2.ebuild
index de94c2401f69..2731066a0876 100644
--- a/sec-policy/selinux-sendmail/selinux-sendmail-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-sendmail/selinux-sendmail-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-sendmail/selinux-sendmail-2.20170805-r3.ebuild b/sec-policy/selinux-sendmail/selinux-sendmail-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..ea30505244e3
--- /dev/null
+++ b/sec-policy/selinux-sendmail/selinux-sendmail-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-sendmail/selinux-sendmail-9999.ebuild b/sec-policy/selinux-sendmail/selinux-sendmail-9999.ebuild
index 083f3537f8f0..ea30505244e3 100644
--- a/sec-policy/selinux-sendmail/selinux-sendmail-9999.ebuild
+++ b/sec-policy/selinux-sendmail/selinux-sendmail-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-sensord/Manifest b/sec-policy/selinux-sensord/Manifest
index 8cbf0fa258a0..c76f5a221153 100644
--- a/sec-policy/selinux-sensord/Manifest
+++ b/sec-policy/selinux-sensord/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-sensord-2.20170204-r1.ebuild 285 SHA256 4500829b25d47816a6cba6627086819624f38de72c84b73f60f25f0c5ed2434a SHA512 fb945daa05142d9c6bfc2aec0038c28d561e910f875860f51294f2d07885d544937d5472c03a39e3199095d0dbf7d1cae27dd6990e26b8837d8a0566c98b7aea WHIRLPOOL 4bd8b00e2bc53f1bcb520254a99237802e1b58e5503a8991d99d4eafa1a3ef0f810a2b6aa866139324c5900272f727e27c5af83862381fd5b8aa2c82cc567c39
-EBUILD selinux-sensord-2.20170204-r2.ebuild 283 SHA256 00a8e2512a2e3cec3fa12d66fefbdaefd7fa8148d93184cccf488085b8fff8ad SHA512 27e98fcc98472e68fec719fcc95ab6927fed6e56180c3d92f1f1d4989076375126c1abedfcd43520170cf1f7e39f59e498558f94577b7e709bbbd6056e441b93 WHIRLPOOL 0196c1013be2e1f0ea8d8132573e180e313e2ac272c5ed4ba2ef2685bacca52b4c3c6f397688a3f626e12fdfc44ad557a2428380431107dd5d71e625bf9f5681
-EBUILD selinux-sensord-2.20170204-r3.ebuild 283 SHA256 00a8e2512a2e3cec3fa12d66fefbdaefd7fa8148d93184cccf488085b8fff8ad SHA512 27e98fcc98472e68fec719fcc95ab6927fed6e56180c3d92f1f1d4989076375126c1abedfcd43520170cf1f7e39f59e498558f94577b7e709bbbd6056e441b93 WHIRLPOOL 0196c1013be2e1f0ea8d8132573e180e313e2ac272c5ed4ba2ef2685bacca52b4c3c6f397688a3f626e12fdfc44ad557a2428380431107dd5d71e625bf9f5681
-EBUILD selinux-sensord-2.20170204-r4.ebuild 283 SHA256 00a8e2512a2e3cec3fa12d66fefbdaefd7fa8148d93184cccf488085b8fff8ad SHA512 27e98fcc98472e68fec719fcc95ab6927fed6e56180c3d92f1f1d4989076375126c1abedfcd43520170cf1f7e39f59e498558f94577b7e709bbbd6056e441b93 WHIRLPOOL 0196c1013be2e1f0ea8d8132573e180e313e2ac272c5ed4ba2ef2685bacca52b4c3c6f397688a3f626e12fdfc44ad557a2428380431107dd5d71e625bf9f5681
-EBUILD selinux-sensord-2.20170805-r2.ebuild 283 SHA256 00a8e2512a2e3cec3fa12d66fefbdaefd7fa8148d93184cccf488085b8fff8ad SHA512 27e98fcc98472e68fec719fcc95ab6927fed6e56180c3d92f1f1d4989076375126c1abedfcd43520170cf1f7e39f59e498558f94577b7e709bbbd6056e441b93 WHIRLPOOL 0196c1013be2e1f0ea8d8132573e180e313e2ac272c5ed4ba2ef2685bacca52b4c3c6f397688a3f626e12fdfc44ad557a2428380431107dd5d71e625bf9f5681
-EBUILD selinux-sensord-9999.ebuild 285 SHA256 4500829b25d47816a6cba6627086819624f38de72c84b73f60f25f0c5ed2434a SHA512 fb945daa05142d9c6bfc2aec0038c28d561e910f875860f51294f2d07885d544937d5472c03a39e3199095d0dbf7d1cae27dd6990e26b8837d8a0566c98b7aea WHIRLPOOL 4bd8b00e2bc53f1bcb520254a99237802e1b58e5503a8991d99d4eafa1a3ef0f810a2b6aa866139324c5900272f727e27c5af83862381fd5b8aa2c82cc567c39
+EBUILD selinux-sensord-2.20170204-r1.ebuild 286 SHA256 87bfed703076f78c064d0869e35550c7fab78685002456ffe8271ac74f00e5fa SHA512 53b6df1e5b5a6906d58eb1edf49526e2577ccac46505e2a6cb819a3fbbe0ed483e2924ff29611641392e353b99366e800c357c0094af2bfa1b4b39403888185f WHIRLPOOL c4c50098252293dd3bf47ec0d63f717010fa65e47095cba9ec8020f14b76e433cd33e707625953bcd5fc9f1a50692daa7c070885444eaade1e72963fb2aaaaa0
+EBUILD selinux-sensord-2.20170204-r2.ebuild 284 SHA256 168d26bc2feac437c2ddd460961f7b374b46b56e5365d7f035c1fbe08762a5a0 SHA512 ab86e7a2300622a9d28d9c685277e2b2de2b75a6772a07644096d7798ede0c6454b61801e5b298addbfc722a33406d6dabeaad2c466830980f865ee36d34cd75 WHIRLPOOL 1af3274a9648eed8ef68338f6078b4c6daee49dbe3688c9174834d479d3af0dbdba5f81af67b854e436e28e2d1bd8505b43a755db5c6380d5ae780a84f9facb8
+EBUILD selinux-sensord-2.20170204-r3.ebuild 284 SHA256 168d26bc2feac437c2ddd460961f7b374b46b56e5365d7f035c1fbe08762a5a0 SHA512 ab86e7a2300622a9d28d9c685277e2b2de2b75a6772a07644096d7798ede0c6454b61801e5b298addbfc722a33406d6dabeaad2c466830980f865ee36d34cd75 WHIRLPOOL 1af3274a9648eed8ef68338f6078b4c6daee49dbe3688c9174834d479d3af0dbdba5f81af67b854e436e28e2d1bd8505b43a755db5c6380d5ae780a84f9facb8
+EBUILD selinux-sensord-2.20170204-r4.ebuild 284 SHA256 168d26bc2feac437c2ddd460961f7b374b46b56e5365d7f035c1fbe08762a5a0 SHA512 ab86e7a2300622a9d28d9c685277e2b2de2b75a6772a07644096d7798ede0c6454b61801e5b298addbfc722a33406d6dabeaad2c466830980f865ee36d34cd75 WHIRLPOOL 1af3274a9648eed8ef68338f6078b4c6daee49dbe3688c9174834d479d3af0dbdba5f81af67b854e436e28e2d1bd8505b43a755db5c6380d5ae780a84f9facb8
+EBUILD selinux-sensord-2.20170805-r2.ebuild 284 SHA256 168d26bc2feac437c2ddd460961f7b374b46b56e5365d7f035c1fbe08762a5a0 SHA512 ab86e7a2300622a9d28d9c685277e2b2de2b75a6772a07644096d7798ede0c6454b61801e5b298addbfc722a33406d6dabeaad2c466830980f865ee36d34cd75 WHIRLPOOL 1af3274a9648eed8ef68338f6078b4c6daee49dbe3688c9174834d479d3af0dbdba5f81af67b854e436e28e2d1bd8505b43a755db5c6380d5ae780a84f9facb8
+EBUILD selinux-sensord-2.20170805-r3.ebuild 286 SHA256 87bfed703076f78c064d0869e35550c7fab78685002456ffe8271ac74f00e5fa SHA512 53b6df1e5b5a6906d58eb1edf49526e2577ccac46505e2a6cb819a3fbbe0ed483e2924ff29611641392e353b99366e800c357c0094af2bfa1b4b39403888185f WHIRLPOOL c4c50098252293dd3bf47ec0d63f717010fa65e47095cba9ec8020f14b76e433cd33e707625953bcd5fc9f1a50692daa7c070885444eaade1e72963fb2aaaaa0
+EBUILD selinux-sensord-9999.ebuild 286 SHA256 87bfed703076f78c064d0869e35550c7fab78685002456ffe8271ac74f00e5fa SHA512 53b6df1e5b5a6906d58eb1edf49526e2577ccac46505e2a6cb819a3fbbe0ed483e2924ff29611641392e353b99366e800c357c0094af2bfa1b4b39403888185f WHIRLPOOL c4c50098252293dd3bf47ec0d63f717010fa65e47095cba9ec8020f14b76e433cd33e707625953bcd5fc9f1a50692daa7c070885444eaade1e72963fb2aaaaa0
 MISC ChangeLog 10687 SHA256 5a7abd97294882c6e16ba331b8ba1d2f94b1cae04a1efd1c051bea9cf09f8e37 SHA512 14510fcbe68f91e675f3b5c643f45c3d80c53cd988c7eb9717a5a614e61abd150f795db93b602aefb8ae83a0208a7134cd3a2a292d5ace20299ddc8d1ccb603f WHIRLPOOL 19130999eb25a91295a2738f8ebb520c8e26285398df36ddb4de618239ce5a18da80fb80f4c4aa39a967e7e73abe8282951700cd2d17d5e242bd9a9feed468ee
 MISC ChangeLog-2015 6078 SHA256 a535be82e5708c1bda777ed11497c72d379b207357eaa0a76dd3b75d49b10b07 SHA512 f4c698ff24a4ea54842a4478bd415a8626c1ccdf1c1547a6a6afb5c8f98029b39acb6d768bbd1af10e8cb4ecb270c22b970d2d061af231be2fbda7af25c009d6 WHIRLPOOL 750ca52a546211f9ce006d6af647b0118037ffb19cac732f8b25e921acb887a7e9bc9441971f8355465251302375bd41e768bd315010be6239a475271b6babf6
 MISC metadata.xml 317 SHA256 f64f315c9bd1ed4cb516adc4f554bab8e2d5f2fa469c2b28125a56b0eb6c445a SHA512 efb7c659fad7bca559bbac9b5abe6fff6b82c69a6557a167327d569be61c75a51deb7a3f2785bac38a2b000cf1bec227423906a1ea678229aba158a8227dd6d3 WHIRLPOOL bb96c52524b6569236fee8c9adb3d2e5a4e6f6fa7c1fbf4eb975bff4839b4a414240e290730fb614ff35c9a513cc08c0499e1df8d42b2170fc0a3d3370b1ca96
diff --git a/sec-policy/selinux-sensord/selinux-sensord-2.20170204-r1.ebuild b/sec-policy/selinux-sensord/selinux-sensord-2.20170204-r1.ebuild
index 8e0a1c5f1835..236c00e8a136 100644
--- a/sec-policy/selinux-sensord/selinux-sensord-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-sensord/selinux-sensord-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-sensord/selinux-sensord-2.20170204-r2.ebuild b/sec-policy/selinux-sensord/selinux-sensord-2.20170204-r2.ebuild
index cb8dfeb81bce..dec54296bc72 100644
--- a/sec-policy/selinux-sensord/selinux-sensord-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-sensord/selinux-sensord-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-sensord/selinux-sensord-2.20170204-r3.ebuild b/sec-policy/selinux-sensord/selinux-sensord-2.20170204-r3.ebuild
index cb8dfeb81bce..dec54296bc72 100644
--- a/sec-policy/selinux-sensord/selinux-sensord-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-sensord/selinux-sensord-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-sensord/selinux-sensord-2.20170204-r4.ebuild b/sec-policy/selinux-sensord/selinux-sensord-2.20170204-r4.ebuild
index cb8dfeb81bce..dec54296bc72 100644
--- a/sec-policy/selinux-sensord/selinux-sensord-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-sensord/selinux-sensord-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-sensord/selinux-sensord-2.20170805-r2.ebuild b/sec-policy/selinux-sensord/selinux-sensord-2.20170805-r2.ebuild
index cb8dfeb81bce..dec54296bc72 100644
--- a/sec-policy/selinux-sensord/selinux-sensord-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-sensord/selinux-sensord-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-sensord/selinux-sensord-2.20170805-r3.ebuild b/sec-policy/selinux-sensord/selinux-sensord-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..236c00e8a136
--- /dev/null
+++ b/sec-policy/selinux-sensord/selinux-sensord-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-sensord/selinux-sensord-9999.ebuild b/sec-policy/selinux-sensord/selinux-sensord-9999.ebuild
index 8e0a1c5f1835..236c00e8a136 100644
--- a/sec-policy/selinux-sensord/selinux-sensord-9999.ebuild
+++ b/sec-policy/selinux-sensord/selinux-sensord-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-shorewall/Manifest b/sec-policy/selinux-shorewall/Manifest
index dc974f300a22..230a763d0648 100644
--- a/sec-policy/selinux-shorewall/Manifest
+++ b/sec-policy/selinux-shorewall/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-shorewall-2.20170204-r1.ebuild 289 SHA256 7db66e2a714e99786bb88e8b690c6c202015cb756d5680306a5cb6b2a2a2564e SHA512 21f24a9149e1c4862880a1e8a8eebf6c52cb1206a6bf241cd5ff2929f92b4a7dff048307e49c35aadda9f03e3355df817cda6de1dcda85b0cdfe74cd98ea0da6 WHIRLPOOL 4af6cdc0154344b9d38104870b6ded393947d622052c21333e43837e8d0825fdccb65cb389c33c940d12aa8c33bab482c3af671473336369a14f1106d48545fc
-EBUILD selinux-shorewall-2.20170204-r2.ebuild 287 SHA256 5a56b6e8e3a447246a00050f298fb8e04ac125af8028ea8642180030c80ac9c0 SHA512 c7af4d891cfc58b4bf9c2a52852dd0a0264d1fab583f20172ffdf658305b0cd538b08be2d36dcee218b694a497ab709dc91eaacf8fffe4aba0ed0ea04b024445 WHIRLPOOL 3f6277e6c35344f1ebeaa5a06ea77000f2978915336b11cf14597428b2abb986fe20763131c0f4201fa858196330d6d239292dc1bd028a6b8c78a47ec0ed4f29
-EBUILD selinux-shorewall-2.20170204-r3.ebuild 287 SHA256 5a56b6e8e3a447246a00050f298fb8e04ac125af8028ea8642180030c80ac9c0 SHA512 c7af4d891cfc58b4bf9c2a52852dd0a0264d1fab583f20172ffdf658305b0cd538b08be2d36dcee218b694a497ab709dc91eaacf8fffe4aba0ed0ea04b024445 WHIRLPOOL 3f6277e6c35344f1ebeaa5a06ea77000f2978915336b11cf14597428b2abb986fe20763131c0f4201fa858196330d6d239292dc1bd028a6b8c78a47ec0ed4f29
-EBUILD selinux-shorewall-2.20170204-r4.ebuild 287 SHA256 5a56b6e8e3a447246a00050f298fb8e04ac125af8028ea8642180030c80ac9c0 SHA512 c7af4d891cfc58b4bf9c2a52852dd0a0264d1fab583f20172ffdf658305b0cd538b08be2d36dcee218b694a497ab709dc91eaacf8fffe4aba0ed0ea04b024445 WHIRLPOOL 3f6277e6c35344f1ebeaa5a06ea77000f2978915336b11cf14597428b2abb986fe20763131c0f4201fa858196330d6d239292dc1bd028a6b8c78a47ec0ed4f29
-EBUILD selinux-shorewall-2.20170805-r2.ebuild 287 SHA256 5a56b6e8e3a447246a00050f298fb8e04ac125af8028ea8642180030c80ac9c0 SHA512 c7af4d891cfc58b4bf9c2a52852dd0a0264d1fab583f20172ffdf658305b0cd538b08be2d36dcee218b694a497ab709dc91eaacf8fffe4aba0ed0ea04b024445 WHIRLPOOL 3f6277e6c35344f1ebeaa5a06ea77000f2978915336b11cf14597428b2abb986fe20763131c0f4201fa858196330d6d239292dc1bd028a6b8c78a47ec0ed4f29
-EBUILD selinux-shorewall-9999.ebuild 289 SHA256 7db66e2a714e99786bb88e8b690c6c202015cb756d5680306a5cb6b2a2a2564e SHA512 21f24a9149e1c4862880a1e8a8eebf6c52cb1206a6bf241cd5ff2929f92b4a7dff048307e49c35aadda9f03e3355df817cda6de1dcda85b0cdfe74cd98ea0da6 WHIRLPOOL 4af6cdc0154344b9d38104870b6ded393947d622052c21333e43837e8d0825fdccb65cb389c33c940d12aa8c33bab482c3af671473336369a14f1106d48545fc
+EBUILD selinux-shorewall-2.20170204-r1.ebuild 290 SHA256 8f346301e2478475f692cbff60d845aa281c1cee4f7673bacd4be336be3f9028 SHA512 b388d77a4ed849213df8ef02ab1da73f204fab753796e1b4d43b3df6d9ac7323dccff47b0492edee280aa810e5c919fc6ebdde2f1dfd50cdb755cebbe1d86bf0 WHIRLPOOL 1925f1994ed39851bbe6a7ccfe74153d7062b224ef33cbf76f09810319501d687c0088ab3913e606664ee7341997dec9cab895e5be5565591e012a3d40c2bfad
+EBUILD selinux-shorewall-2.20170204-r2.ebuild 288 SHA256 28c427e17796c828176fec60614981f32d30e7e30c14fae813d85b9330273fc6 SHA512 9a7c28c4578a4ac5daad8546c77fbd90c009a82ed4642f861342310f90148a6eb53587df9ff4d1bac820410c41bb922da56adb03fc33b64c9c0318c2fbc1df17 WHIRLPOOL bd44dc43c42f96e43256e4975f90e5bb9b2d1204224240317d06e83814bc6a0158f3562a16f25a35333108c74da10a8e0c1ee76a2b99c6cccc70abc39da9f479
+EBUILD selinux-shorewall-2.20170204-r3.ebuild 288 SHA256 28c427e17796c828176fec60614981f32d30e7e30c14fae813d85b9330273fc6 SHA512 9a7c28c4578a4ac5daad8546c77fbd90c009a82ed4642f861342310f90148a6eb53587df9ff4d1bac820410c41bb922da56adb03fc33b64c9c0318c2fbc1df17 WHIRLPOOL bd44dc43c42f96e43256e4975f90e5bb9b2d1204224240317d06e83814bc6a0158f3562a16f25a35333108c74da10a8e0c1ee76a2b99c6cccc70abc39da9f479
+EBUILD selinux-shorewall-2.20170204-r4.ebuild 288 SHA256 28c427e17796c828176fec60614981f32d30e7e30c14fae813d85b9330273fc6 SHA512 9a7c28c4578a4ac5daad8546c77fbd90c009a82ed4642f861342310f90148a6eb53587df9ff4d1bac820410c41bb922da56adb03fc33b64c9c0318c2fbc1df17 WHIRLPOOL bd44dc43c42f96e43256e4975f90e5bb9b2d1204224240317d06e83814bc6a0158f3562a16f25a35333108c74da10a8e0c1ee76a2b99c6cccc70abc39da9f479
+EBUILD selinux-shorewall-2.20170805-r2.ebuild 288 SHA256 28c427e17796c828176fec60614981f32d30e7e30c14fae813d85b9330273fc6 SHA512 9a7c28c4578a4ac5daad8546c77fbd90c009a82ed4642f861342310f90148a6eb53587df9ff4d1bac820410c41bb922da56adb03fc33b64c9c0318c2fbc1df17 WHIRLPOOL bd44dc43c42f96e43256e4975f90e5bb9b2d1204224240317d06e83814bc6a0158f3562a16f25a35333108c74da10a8e0c1ee76a2b99c6cccc70abc39da9f479
+EBUILD selinux-shorewall-2.20170805-r3.ebuild 290 SHA256 8f346301e2478475f692cbff60d845aa281c1cee4f7673bacd4be336be3f9028 SHA512 b388d77a4ed849213df8ef02ab1da73f204fab753796e1b4d43b3df6d9ac7323dccff47b0492edee280aa810e5c919fc6ebdde2f1dfd50cdb755cebbe1d86bf0 WHIRLPOOL 1925f1994ed39851bbe6a7ccfe74153d7062b224ef33cbf76f09810319501d687c0088ab3913e606664ee7341997dec9cab895e5be5565591e012a3d40c2bfad
+EBUILD selinux-shorewall-9999.ebuild 290 SHA256 8f346301e2478475f692cbff60d845aa281c1cee4f7673bacd4be336be3f9028 SHA512 b388d77a4ed849213df8ef02ab1da73f204fab753796e1b4d43b3df6d9ac7323dccff47b0492edee280aa810e5c919fc6ebdde2f1dfd50cdb755cebbe1d86bf0 WHIRLPOOL 1925f1994ed39851bbe6a7ccfe74153d7062b224ef33cbf76f09810319501d687c0088ab3913e606664ee7341997dec9cab895e5be5565591e012a3d40c2bfad
 MISC ChangeLog 10887 SHA256 283a77d9042b874cce452f595ba0584a13734c3d5c0bfd122c036978ef08fae9 SHA512 8512bc9eaaa4f29b43a70418f6a14a8699f8de6e07dd8c15874a5beb99970ea4d508f9dc01022017a6fcdb16e3ba81b59bf7ab9c8940cb4cffb8089598d4ff22 WHIRLPOOL a58b01c5b3bf33468bcbfc4bac95007d2675175a4a395e5205d9a10deeb37481877f1063a88406cdcf43c1da504d06f4b44132479ea64647f0253d3888e5ca41
 MISC ChangeLog-2015 10221 SHA256 2823f6b8327e8fb0c2a2f20469ee9ccafdb9ae9bc18b347790b3f4e1a70f8b96 SHA512 a891314397d24d2010ee4b028b57763805b20e731c110f71bc31af6061de4259e33c5fc3557e885553cf5b882cd5aeab4bdf71a9b34cf123dbd129a8b19b6047 WHIRLPOOL ff9714596bbd2ec93f890d5f4895744e78e575171cc89c8e8a6cbfe537f829899f83254e6a03383bde3cd4932b06854afaf87c12b77a54ce9752b50b0e9ec4c2
 MISC metadata.xml 319 SHA256 87f20827ee213cbe0b3f7c487e2d1aa03bb4653c9b141320efe4976202a8554d SHA512 fdad724a2c1f0baf476b7a23debedd76f6966f06ed68f1f8a09d4f3fc6288879ba290ba82f625e98542799b54f82cf348f6d99b9e8b4389cffc861f50c55d4b1 WHIRLPOOL 324eb4b1fbc4cb53e35ad0f73691098b26d30a0c700ddd7307207924bbde7628ed50052e42c097adc9c3c2250f54284de601cb8e89e98e53a2ab653a25860d8b
diff --git a/sec-policy/selinux-shorewall/selinux-shorewall-2.20170204-r1.ebuild b/sec-policy/selinux-shorewall/selinux-shorewall-2.20170204-r1.ebuild
index 5ecff56d0dee..f2350f1e5510 100644
--- a/sec-policy/selinux-shorewall/selinux-shorewall-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-shorewall/selinux-shorewall-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-shorewall/selinux-shorewall-2.20170204-r2.ebuild b/sec-policy/selinux-shorewall/selinux-shorewall-2.20170204-r2.ebuild
index 91fd2457a07e..dbaa7c21f7c9 100644
--- a/sec-policy/selinux-shorewall/selinux-shorewall-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-shorewall/selinux-shorewall-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-shorewall/selinux-shorewall-2.20170204-r3.ebuild b/sec-policy/selinux-shorewall/selinux-shorewall-2.20170204-r3.ebuild
index 91fd2457a07e..dbaa7c21f7c9 100644
--- a/sec-policy/selinux-shorewall/selinux-shorewall-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-shorewall/selinux-shorewall-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-shorewall/selinux-shorewall-2.20170204-r4.ebuild b/sec-policy/selinux-shorewall/selinux-shorewall-2.20170204-r4.ebuild
index 91fd2457a07e..dbaa7c21f7c9 100644
--- a/sec-policy/selinux-shorewall/selinux-shorewall-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-shorewall/selinux-shorewall-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-shorewall/selinux-shorewall-2.20170805-r2.ebuild b/sec-policy/selinux-shorewall/selinux-shorewall-2.20170805-r2.ebuild
index 91fd2457a07e..dbaa7c21f7c9 100644
--- a/sec-policy/selinux-shorewall/selinux-shorewall-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-shorewall/selinux-shorewall-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-shorewall/selinux-shorewall-2.20170805-r3.ebuild b/sec-policy/selinux-shorewall/selinux-shorewall-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..f2350f1e5510
--- /dev/null
+++ b/sec-policy/selinux-shorewall/selinux-shorewall-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-shorewall/selinux-shorewall-9999.ebuild b/sec-policy/selinux-shorewall/selinux-shorewall-9999.ebuild
index 5ecff56d0dee..f2350f1e5510 100644
--- a/sec-policy/selinux-shorewall/selinux-shorewall-9999.ebuild
+++ b/sec-policy/selinux-shorewall/selinux-shorewall-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-shutdown/Manifest b/sec-policy/selinux-shutdown/Manifest
index ae762f3db6f0..3250f0bf3500 100644
--- a/sec-policy/selinux-shutdown/Manifest
+++ b/sec-policy/selinux-shutdown/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-shutdown-2.20170204-r1.ebuild 287 SHA256 5537f7f383bb540d74dd2ba98f27d7af588c1667fe802eb1657e81bd1cc3a8ea SHA512 0d0bfaef91ee294dc9333d8f526d5fce045e034929c786d6a0ec12f98740e6ba707be2495e42878c91a705aa9cc45adb336c24d59b87d8a2f6b479a7c1c60eae WHIRLPOOL d3ab732b45c56bbe54045a4cc5b8cdb406889755a78e8e706976edc0ba6756280305b9dca74dccb02965809689c231bafb7997e2b060356a9fe990b66cce6539
-EBUILD selinux-shutdown-2.20170204-r2.ebuild 285 SHA256 b3786ce531409186ecbd396caa3ac1f85a17087b15ee6cfa64a57182d48f8ee0 SHA512 32da0877687f8836df02692c996da95e960ad76946533fc10648646667273d6def57d3c2c0a3395cc9ba2bb03ac7a1b435163e73128d06072e3d08e52f2109d9 WHIRLPOOL 687c1605820555606f3ea67979ad63ca3cc28129ac065ea97d498a061c38d42558d92504f25d14337dadffa97fda1f7bf4c4b66c825054fcaa63cda25f52afa5
-EBUILD selinux-shutdown-2.20170204-r3.ebuild 285 SHA256 b3786ce531409186ecbd396caa3ac1f85a17087b15ee6cfa64a57182d48f8ee0 SHA512 32da0877687f8836df02692c996da95e960ad76946533fc10648646667273d6def57d3c2c0a3395cc9ba2bb03ac7a1b435163e73128d06072e3d08e52f2109d9 WHIRLPOOL 687c1605820555606f3ea67979ad63ca3cc28129ac065ea97d498a061c38d42558d92504f25d14337dadffa97fda1f7bf4c4b66c825054fcaa63cda25f52afa5
-EBUILD selinux-shutdown-2.20170204-r4.ebuild 285 SHA256 b3786ce531409186ecbd396caa3ac1f85a17087b15ee6cfa64a57182d48f8ee0 SHA512 32da0877687f8836df02692c996da95e960ad76946533fc10648646667273d6def57d3c2c0a3395cc9ba2bb03ac7a1b435163e73128d06072e3d08e52f2109d9 WHIRLPOOL 687c1605820555606f3ea67979ad63ca3cc28129ac065ea97d498a061c38d42558d92504f25d14337dadffa97fda1f7bf4c4b66c825054fcaa63cda25f52afa5
-EBUILD selinux-shutdown-2.20170805-r2.ebuild 285 SHA256 b3786ce531409186ecbd396caa3ac1f85a17087b15ee6cfa64a57182d48f8ee0 SHA512 32da0877687f8836df02692c996da95e960ad76946533fc10648646667273d6def57d3c2c0a3395cc9ba2bb03ac7a1b435163e73128d06072e3d08e52f2109d9 WHIRLPOOL 687c1605820555606f3ea67979ad63ca3cc28129ac065ea97d498a061c38d42558d92504f25d14337dadffa97fda1f7bf4c4b66c825054fcaa63cda25f52afa5
-EBUILD selinux-shutdown-9999.ebuild 287 SHA256 5537f7f383bb540d74dd2ba98f27d7af588c1667fe802eb1657e81bd1cc3a8ea SHA512 0d0bfaef91ee294dc9333d8f526d5fce045e034929c786d6a0ec12f98740e6ba707be2495e42878c91a705aa9cc45adb336c24d59b87d8a2f6b479a7c1c60eae WHIRLPOOL d3ab732b45c56bbe54045a4cc5b8cdb406889755a78e8e706976edc0ba6756280305b9dca74dccb02965809689c231bafb7997e2b060356a9fe990b66cce6539
+EBUILD selinux-shutdown-2.20170204-r1.ebuild 288 SHA256 d92ca347d713ceca7e97dde001512f981100043cb4c3e53a0bb51f86a58a1a9d SHA512 7a662ae671884585b48ee39f1a172f5b02e8149993cde0d5dcaaba9c18e12a4e664dec4c1a9e251c35c90999d4d7eb0065d64506599c6633da35981adb82036c WHIRLPOOL dce3c7e517cd89ac340c7a53327623f6b28171776e37d4397ba01cc0a04e9bca9b98e1c0f8bfed57cef2e957ebbb3405848fcc7a37d279563ddbbaebc03a62d9
+EBUILD selinux-shutdown-2.20170204-r2.ebuild 286 SHA256 18020dcc4478dc296ddbdf19e6f630efb8679fef218e3c4c2f11eb1037e61096 SHA512 36db4eee9602f2d0d064c7c6c8e5441d121366cff5286883af69449bb5dceb6ad96cbeec1a27414025a6bf95faf7a0391a46d700e2a591f4bc0688e848a2fa8c WHIRLPOOL e1e226c748e30eb06e9af5f037a502703209b51011670405ddd11ab519903abad6565ab03a39e20704be60df4236fd7b4f5a39b1fdc6b6223df311f17270ec30
+EBUILD selinux-shutdown-2.20170204-r3.ebuild 286 SHA256 18020dcc4478dc296ddbdf19e6f630efb8679fef218e3c4c2f11eb1037e61096 SHA512 36db4eee9602f2d0d064c7c6c8e5441d121366cff5286883af69449bb5dceb6ad96cbeec1a27414025a6bf95faf7a0391a46d700e2a591f4bc0688e848a2fa8c WHIRLPOOL e1e226c748e30eb06e9af5f037a502703209b51011670405ddd11ab519903abad6565ab03a39e20704be60df4236fd7b4f5a39b1fdc6b6223df311f17270ec30
+EBUILD selinux-shutdown-2.20170204-r4.ebuild 286 SHA256 18020dcc4478dc296ddbdf19e6f630efb8679fef218e3c4c2f11eb1037e61096 SHA512 36db4eee9602f2d0d064c7c6c8e5441d121366cff5286883af69449bb5dceb6ad96cbeec1a27414025a6bf95faf7a0391a46d700e2a591f4bc0688e848a2fa8c WHIRLPOOL e1e226c748e30eb06e9af5f037a502703209b51011670405ddd11ab519903abad6565ab03a39e20704be60df4236fd7b4f5a39b1fdc6b6223df311f17270ec30
+EBUILD selinux-shutdown-2.20170805-r2.ebuild 286 SHA256 18020dcc4478dc296ddbdf19e6f630efb8679fef218e3c4c2f11eb1037e61096 SHA512 36db4eee9602f2d0d064c7c6c8e5441d121366cff5286883af69449bb5dceb6ad96cbeec1a27414025a6bf95faf7a0391a46d700e2a591f4bc0688e848a2fa8c WHIRLPOOL e1e226c748e30eb06e9af5f037a502703209b51011670405ddd11ab519903abad6565ab03a39e20704be60df4236fd7b4f5a39b1fdc6b6223df311f17270ec30
+EBUILD selinux-shutdown-2.20170805-r3.ebuild 288 SHA256 d92ca347d713ceca7e97dde001512f981100043cb4c3e53a0bb51f86a58a1a9d SHA512 7a662ae671884585b48ee39f1a172f5b02e8149993cde0d5dcaaba9c18e12a4e664dec4c1a9e251c35c90999d4d7eb0065d64506599c6633da35981adb82036c WHIRLPOOL dce3c7e517cd89ac340c7a53327623f6b28171776e37d4397ba01cc0a04e9bca9b98e1c0f8bfed57cef2e957ebbb3405848fcc7a37d279563ddbbaebc03a62d9
+EBUILD selinux-shutdown-9999.ebuild 288 SHA256 d92ca347d713ceca7e97dde001512f981100043cb4c3e53a0bb51f86a58a1a9d SHA512 7a662ae671884585b48ee39f1a172f5b02e8149993cde0d5dcaaba9c18e12a4e664dec4c1a9e251c35c90999d4d7eb0065d64506599c6633da35981adb82036c WHIRLPOOL dce3c7e517cd89ac340c7a53327623f6b28171776e37d4397ba01cc0a04e9bca9b98e1c0f8bfed57cef2e957ebbb3405848fcc7a37d279563ddbbaebc03a62d9
 MISC ChangeLog 10793 SHA256 f684bb4321fa8c5381580e164cb214535a19f1697ba0ab380ff5cd3ac1229977 SHA512 e61a8b628c71c8a360cf467942f6ea2fcd478aff697ec1e98839b8c31697cf6117f501465e64f1214c9a25556a9ea144f46801c49cc93a4ca9cb79eb9fd995c6 WHIRLPOOL 4a83ed0e75d4b0bc8541d166263666291c374f436d358583cbe9549e6879d379bea905d2478410c4c31b63865c1aa5f1230813991bba93f7ab898dadeff589c5
 MISC ChangeLog-2015 10102 SHA256 b419de3f90a99b9eba11a2b8a2367040c849c167dc8a44ad8ec0fb4fd796f689 SHA512 3ffc8a61bc87a0a797b36058510be1c8994d1ca4ad5f719e148b236796cd3a9b77029ff476103bb4dc9805e832b5cb2a6b2fc2702e7ee036738a607218bb06ee WHIRLPOOL 301daa63172e48bb644ee180fbca67685037565806bd02c225d0701564d4cf9fa6276875ba9e2f36205d31d669f101afcdf114e11fd07b8e70cff7a7422d5075
 MISC metadata.xml 318 SHA256 3c558489d2397d5ae422f73fdcbbddf895d673025f440f4a7173550388500c6e SHA512 4fa45f9cb30c10064cb7c91c5331d4ca91a05cb1f74403feb9dbeadd943a0741c1849371bd444432c3ed7c0ae84e09e4742cb9e12ba9c8b8f40413a56f002767 WHIRLPOOL 0a2ececcc36e01cd147a7841923532f8a1ab36f823ead118dccff3e855ac1218c7b1691339acdc9a1f3250a2d829b543b020740adf7b6c919b403e5a1b9f3e46
diff --git a/sec-policy/selinux-shutdown/selinux-shutdown-2.20170204-r1.ebuild b/sec-policy/selinux-shutdown/selinux-shutdown-2.20170204-r1.ebuild
index ba7514548b99..9c13a5d94f6e 100644
--- a/sec-policy/selinux-shutdown/selinux-shutdown-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-shutdown/selinux-shutdown-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-shutdown/selinux-shutdown-2.20170204-r2.ebuild b/sec-policy/selinux-shutdown/selinux-shutdown-2.20170204-r2.ebuild
index b87538c213e4..c046de54cbb4 100644
--- a/sec-policy/selinux-shutdown/selinux-shutdown-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-shutdown/selinux-shutdown-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-shutdown/selinux-shutdown-2.20170204-r3.ebuild b/sec-policy/selinux-shutdown/selinux-shutdown-2.20170204-r3.ebuild
index b87538c213e4..c046de54cbb4 100644
--- a/sec-policy/selinux-shutdown/selinux-shutdown-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-shutdown/selinux-shutdown-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-shutdown/selinux-shutdown-2.20170204-r4.ebuild b/sec-policy/selinux-shutdown/selinux-shutdown-2.20170204-r4.ebuild
index b87538c213e4..c046de54cbb4 100644
--- a/sec-policy/selinux-shutdown/selinux-shutdown-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-shutdown/selinux-shutdown-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-shutdown/selinux-shutdown-2.20170805-r2.ebuild b/sec-policy/selinux-shutdown/selinux-shutdown-2.20170805-r2.ebuild
index b87538c213e4..c046de54cbb4 100644
--- a/sec-policy/selinux-shutdown/selinux-shutdown-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-shutdown/selinux-shutdown-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-shutdown/selinux-shutdown-2.20170805-r3.ebuild b/sec-policy/selinux-shutdown/selinux-shutdown-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..9c13a5d94f6e
--- /dev/null
+++ b/sec-policy/selinux-shutdown/selinux-shutdown-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-shutdown/selinux-shutdown-9999.ebuild b/sec-policy/selinux-shutdown/selinux-shutdown-9999.ebuild
index ba7514548b99..9c13a5d94f6e 100644
--- a/sec-policy/selinux-shutdown/selinux-shutdown-9999.ebuild
+++ b/sec-policy/selinux-shutdown/selinux-shutdown-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-skype/Manifest b/sec-policy/selinux-skype/Manifest
index 4acf467af958..271878ed71be 100644
--- a/sec-policy/selinux-skype/Manifest
+++ b/sec-policy/selinux-skype/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-skype-2.20170204-r1.ebuild 383 SHA256 239ffc7812b9459005daee6cb3ddd979e46a8decb89ec386d170ec9272a6cebd SHA512 85f102d06e8ec688173280bea1590d6bb458b76d1277dfa96f3855674e2eeb177c472de373cbba64b71cc068460c6709361d7cdd6a5e1ec07cdbb78c4dc510e6 WHIRLPOOL f1d0c052c96f744d3343ab70ff862704f6cc06807747c6e02e3446cb49d34b74dc259f2d9efaeac1d128bd092089266512c4d62e2c70f7970e7ae7515b86998c
-EBUILD selinux-skype-2.20170204-r2.ebuild 381 SHA256 b0dd2c1a40bbdfa4fec6878ba045746b3bcca19f522222d267df5ba4bcf1748b SHA512 f4196c33fe54e2e6dce1a1c5f816d274a287c6049cd9938717dd29cac9129553879e7e1c8869fb155148bbb13159c74e9f88abd0981cef205a460c4d5eb6c055 WHIRLPOOL 047565ecc016a3b4cd602482c56be2db6d89fe2b55e42c9c343cac4ea926911ebb80d9ff4165de84a56134e857d2c00f0ebf435930b7c647ab652cebcce7c6b5
-EBUILD selinux-skype-2.20170204-r3.ebuild 381 SHA256 b0dd2c1a40bbdfa4fec6878ba045746b3bcca19f522222d267df5ba4bcf1748b SHA512 f4196c33fe54e2e6dce1a1c5f816d274a287c6049cd9938717dd29cac9129553879e7e1c8869fb155148bbb13159c74e9f88abd0981cef205a460c4d5eb6c055 WHIRLPOOL 047565ecc016a3b4cd602482c56be2db6d89fe2b55e42c9c343cac4ea926911ebb80d9ff4165de84a56134e857d2c00f0ebf435930b7c647ab652cebcce7c6b5
-EBUILD selinux-skype-2.20170204-r4.ebuild 381 SHA256 b0dd2c1a40bbdfa4fec6878ba045746b3bcca19f522222d267df5ba4bcf1748b SHA512 f4196c33fe54e2e6dce1a1c5f816d274a287c6049cd9938717dd29cac9129553879e7e1c8869fb155148bbb13159c74e9f88abd0981cef205a460c4d5eb6c055 WHIRLPOOL 047565ecc016a3b4cd602482c56be2db6d89fe2b55e42c9c343cac4ea926911ebb80d9ff4165de84a56134e857d2c00f0ebf435930b7c647ab652cebcce7c6b5
-EBUILD selinux-skype-2.20170805-r2.ebuild 381 SHA256 b0dd2c1a40bbdfa4fec6878ba045746b3bcca19f522222d267df5ba4bcf1748b SHA512 f4196c33fe54e2e6dce1a1c5f816d274a287c6049cd9938717dd29cac9129553879e7e1c8869fb155148bbb13159c74e9f88abd0981cef205a460c4d5eb6c055 WHIRLPOOL 047565ecc016a3b4cd602482c56be2db6d89fe2b55e42c9c343cac4ea926911ebb80d9ff4165de84a56134e857d2c00f0ebf435930b7c647ab652cebcce7c6b5
-EBUILD selinux-skype-9999.ebuild 383 SHA256 239ffc7812b9459005daee6cb3ddd979e46a8decb89ec386d170ec9272a6cebd SHA512 85f102d06e8ec688173280bea1590d6bb458b76d1277dfa96f3855674e2eeb177c472de373cbba64b71cc068460c6709361d7cdd6a5e1ec07cdbb78c4dc510e6 WHIRLPOOL f1d0c052c96f744d3343ab70ff862704f6cc06807747c6e02e3446cb49d34b74dc259f2d9efaeac1d128bd092089266512c4d62e2c70f7970e7ae7515b86998c
+EBUILD selinux-skype-2.20170204-r1.ebuild 384 SHA256 6c0735bffe3e71cad18dd2da4032799b076625e8043c2a4c50463f141c7ce77e SHA512 959b3803b8ed7e538b49c529564efec93b0f9a92f29a73afb42f357e70babbe2685bc853b95246f62f688af3195b03e5b413430a7441dc34057f59f73c5dbeca WHIRLPOOL 1b622f875265b0c05c8a340f4ecfacf3199ca3efb6631a21263e5e54e0542b33a08cc857b1b62bfa5ec5bcc8a82cc75d542df98bdb728a706e0b62f6209fb2e1
+EBUILD selinux-skype-2.20170204-r2.ebuild 382 SHA256 5a8c85f80e23a557338ba68691ad872ecefb10fc6a10743d804e3de9200159e6 SHA512 3a8c67a865b15f12b3f889d03aa8dfd517e3ea8df597a5fbff149e206d31ddf2cc6695e94a48831e0341d59d89b05d6883253790ed054e1363fdbf888b9ae124 WHIRLPOOL d5ada25e24e0c3b4c8f050f7f7eb16d591da938bb6a2872bf847d55de104664ccd8282953f79a6b5196e4bfa7fd97edd4a963e643e5e4b5f6cf972f846d123ce
+EBUILD selinux-skype-2.20170204-r3.ebuild 382 SHA256 5a8c85f80e23a557338ba68691ad872ecefb10fc6a10743d804e3de9200159e6 SHA512 3a8c67a865b15f12b3f889d03aa8dfd517e3ea8df597a5fbff149e206d31ddf2cc6695e94a48831e0341d59d89b05d6883253790ed054e1363fdbf888b9ae124 WHIRLPOOL d5ada25e24e0c3b4c8f050f7f7eb16d591da938bb6a2872bf847d55de104664ccd8282953f79a6b5196e4bfa7fd97edd4a963e643e5e4b5f6cf972f846d123ce
+EBUILD selinux-skype-2.20170204-r4.ebuild 382 SHA256 5a8c85f80e23a557338ba68691ad872ecefb10fc6a10743d804e3de9200159e6 SHA512 3a8c67a865b15f12b3f889d03aa8dfd517e3ea8df597a5fbff149e206d31ddf2cc6695e94a48831e0341d59d89b05d6883253790ed054e1363fdbf888b9ae124 WHIRLPOOL d5ada25e24e0c3b4c8f050f7f7eb16d591da938bb6a2872bf847d55de104664ccd8282953f79a6b5196e4bfa7fd97edd4a963e643e5e4b5f6cf972f846d123ce
+EBUILD selinux-skype-2.20170805-r2.ebuild 382 SHA256 5a8c85f80e23a557338ba68691ad872ecefb10fc6a10743d804e3de9200159e6 SHA512 3a8c67a865b15f12b3f889d03aa8dfd517e3ea8df597a5fbff149e206d31ddf2cc6695e94a48831e0341d59d89b05d6883253790ed054e1363fdbf888b9ae124 WHIRLPOOL d5ada25e24e0c3b4c8f050f7f7eb16d591da938bb6a2872bf847d55de104664ccd8282953f79a6b5196e4bfa7fd97edd4a963e643e5e4b5f6cf972f846d123ce
+EBUILD selinux-skype-2.20170805-r3.ebuild 384 SHA256 6c0735bffe3e71cad18dd2da4032799b076625e8043c2a4c50463f141c7ce77e SHA512 959b3803b8ed7e538b49c529564efec93b0f9a92f29a73afb42f357e70babbe2685bc853b95246f62f688af3195b03e5b413430a7441dc34057f59f73c5dbeca WHIRLPOOL 1b622f875265b0c05c8a340f4ecfacf3199ca3efb6631a21263e5e54e0542b33a08cc857b1b62bfa5ec5bcc8a82cc75d542df98bdb728a706e0b62f6209fb2e1
+EBUILD selinux-skype-9999.ebuild 384 SHA256 6c0735bffe3e71cad18dd2da4032799b076625e8043c2a4c50463f141c7ce77e SHA512 959b3803b8ed7e538b49c529564efec93b0f9a92f29a73afb42f357e70babbe2685bc853b95246f62f688af3195b03e5b413430a7441dc34057f59f73c5dbeca WHIRLPOOL 1b622f875265b0c05c8a340f4ecfacf3199ca3efb6631a21263e5e54e0542b33a08cc857b1b62bfa5ec5bcc8a82cc75d542df98bdb728a706e0b62f6209fb2e1
 MISC ChangeLog 10479 SHA256 5737f9951d1d1b50fab527f63f42485bf31f1ffc824230a4bc8879843b388bad SHA512 93791b1fb0b2b79d34cc2f85e51e237016cf5df66ed7bbb3c6a40beb2413824fa3b403544076180a25db0fcaf4389b4f6150aa4f07983579c1ef5f0fd3d50eb5 WHIRLPOOL 81307b88f11cb51ea879018d580e5e0f6d288cbd1aed9bf5e93ff345df57593a451e036325c512f27d5f9ecc517a8a3928f047e34a28aa4c27b1fff65f728cb1
 MISC ChangeLog-2015 11889 SHA256 5f66dc590a51b63f51e9752a140c9c1694595478770691a43c9921d7da085c82 SHA512 0ae4776fa2fcd5cf19da3f4ba8385b5491baff81bae25b964353b8323700bcf0051eb6802516fe891de52ab41bd6026fe729d766bd169dc2821c3407fb00514a WHIRLPOOL 609535de6f409d466a85bd5bea7c1a5f3145cef90f9f45ffad91eae8e0cd813a337904961ac88eaa44b783ef1a109fe85fd39fcca072f105f035aebadcbb2883
 MISC metadata.xml 315 SHA256 898d7407b3cb9895fc8f21147c1d1462887216db126602e7d8ac61b5f5407664 SHA512 1a924ae849c1f4c698f1e30e99a612fd88ef66371170814f4e51a3940fbd463345b80156f2ed35b5aab70e808f42cd2c1a100b018659a182f96660b501fd85ba WHIRLPOOL eeb77b34f27f5c9ce17abf81b5566c568c1fb579827eccc028a3d7ca3e3a6dd1c65650794d16f9a9f48bc77896f1c857b6665abfaa19b56c9006a390c5897818
diff --git a/sec-policy/selinux-skype/selinux-skype-2.20170204-r1.ebuild b/sec-policy/selinux-skype/selinux-skype-2.20170204-r1.ebuild
index c73b1424f52c..6c095687d264 100644
--- a/sec-policy/selinux-skype/selinux-skype-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-skype/selinux-skype-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE="alsa"
diff --git a/sec-policy/selinux-skype/selinux-skype-2.20170204-r2.ebuild b/sec-policy/selinux-skype/selinux-skype-2.20170204-r2.ebuild
index 630a9f07488a..5bc6c4afe878 100644
--- a/sec-policy/selinux-skype/selinux-skype-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-skype/selinux-skype-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE="alsa"
diff --git a/sec-policy/selinux-skype/selinux-skype-2.20170204-r3.ebuild b/sec-policy/selinux-skype/selinux-skype-2.20170204-r3.ebuild
index 630a9f07488a..5bc6c4afe878 100644
--- a/sec-policy/selinux-skype/selinux-skype-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-skype/selinux-skype-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE="alsa"
diff --git a/sec-policy/selinux-skype/selinux-skype-2.20170204-r4.ebuild b/sec-policy/selinux-skype/selinux-skype-2.20170204-r4.ebuild
index 630a9f07488a..5bc6c4afe878 100644
--- a/sec-policy/selinux-skype/selinux-skype-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-skype/selinux-skype-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE="alsa"
diff --git a/sec-policy/selinux-skype/selinux-skype-2.20170805-r2.ebuild b/sec-policy/selinux-skype/selinux-skype-2.20170805-r2.ebuild
index 630a9f07488a..5bc6c4afe878 100644
--- a/sec-policy/selinux-skype/selinux-skype-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-skype/selinux-skype-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE="alsa"
diff --git a/sec-policy/selinux-skype/selinux-skype-2.20170805-r3.ebuild b/sec-policy/selinux-skype/selinux-skype-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..6c095687d264
--- /dev/null
+++ b/sec-policy/selinux-skype/selinux-skype-2.20170805-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-skype/selinux-skype-9999.ebuild b/sec-policy/selinux-skype/selinux-skype-9999.ebuild
index c73b1424f52c..6c095687d264 100644
--- a/sec-policy/selinux-skype/selinux-skype-9999.ebuild
+++ b/sec-policy/selinux-skype/selinux-skype-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE="alsa"
diff --git a/sec-policy/selinux-slocate/Manifest b/sec-policy/selinux-slocate/Manifest
index a89f028a2df5..ade99a6dac6b 100644
--- a/sec-policy/selinux-slocate/Manifest
+++ b/sec-policy/selinux-slocate/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-slocate-2.20170204-r1.ebuild 285 SHA256 96f27ba845d18a868713e43eb9fb583b0a3c391f85848293aa912bc1e55975b9 SHA512 80ae80d4383f2789eeea0003bfca83d76094b23a854dbd689c96dafed09065ed589d61d9f49ff42203393e77ae9e4292c8391419fa5d6ab8e913464f8e1aed33 WHIRLPOOL 05cdacf5b3bef0f9f7cff0d08d623242b7eec51c2ef9bf15e66ef3d701a2a0d139c5448776fd0b67b54ae564df02f81567c078a70d7aee2da5116bc9df8e983e
-EBUILD selinux-slocate-2.20170204-r2.ebuild 283 SHA256 2ce66b3b328ff72314adbe092127e07c9dc0489b74cac14ca41d422ab2e2f1ce SHA512 def38c2493c62781b1e43f9afe27016fbba49bf87aa4fa14ba21706a0ae8ababbb636aa81f5d1e97db1565d127ffab7cb78e2d288982ad9909f06d0900fff009 WHIRLPOOL 69eed86157f2bf0832414532deb40e4ac1579d196c522493de1439f5481a50e06008a6c2006a5284cc5bb5303fef403a6c978167961dd5e7e87826ee80225f78
-EBUILD selinux-slocate-2.20170204-r3.ebuild 283 SHA256 2ce66b3b328ff72314adbe092127e07c9dc0489b74cac14ca41d422ab2e2f1ce SHA512 def38c2493c62781b1e43f9afe27016fbba49bf87aa4fa14ba21706a0ae8ababbb636aa81f5d1e97db1565d127ffab7cb78e2d288982ad9909f06d0900fff009 WHIRLPOOL 69eed86157f2bf0832414532deb40e4ac1579d196c522493de1439f5481a50e06008a6c2006a5284cc5bb5303fef403a6c978167961dd5e7e87826ee80225f78
-EBUILD selinux-slocate-2.20170204-r4.ebuild 283 SHA256 2ce66b3b328ff72314adbe092127e07c9dc0489b74cac14ca41d422ab2e2f1ce SHA512 def38c2493c62781b1e43f9afe27016fbba49bf87aa4fa14ba21706a0ae8ababbb636aa81f5d1e97db1565d127ffab7cb78e2d288982ad9909f06d0900fff009 WHIRLPOOL 69eed86157f2bf0832414532deb40e4ac1579d196c522493de1439f5481a50e06008a6c2006a5284cc5bb5303fef403a6c978167961dd5e7e87826ee80225f78
-EBUILD selinux-slocate-2.20170805-r2.ebuild 283 SHA256 2ce66b3b328ff72314adbe092127e07c9dc0489b74cac14ca41d422ab2e2f1ce SHA512 def38c2493c62781b1e43f9afe27016fbba49bf87aa4fa14ba21706a0ae8ababbb636aa81f5d1e97db1565d127ffab7cb78e2d288982ad9909f06d0900fff009 WHIRLPOOL 69eed86157f2bf0832414532deb40e4ac1579d196c522493de1439f5481a50e06008a6c2006a5284cc5bb5303fef403a6c978167961dd5e7e87826ee80225f78
-EBUILD selinux-slocate-9999.ebuild 285 SHA256 96f27ba845d18a868713e43eb9fb583b0a3c391f85848293aa912bc1e55975b9 SHA512 80ae80d4383f2789eeea0003bfca83d76094b23a854dbd689c96dafed09065ed589d61d9f49ff42203393e77ae9e4292c8391419fa5d6ab8e913464f8e1aed33 WHIRLPOOL 05cdacf5b3bef0f9f7cff0d08d623242b7eec51c2ef9bf15e66ef3d701a2a0d139c5448776fd0b67b54ae564df02f81567c078a70d7aee2da5116bc9df8e983e
+EBUILD selinux-slocate-2.20170204-r1.ebuild 286 SHA256 84a05e8df2239ac9c0552a395f6770601815b3780dcbcf044412e2cf3af667fb SHA512 d43d8f090028a9aa6d37ac7e36350c83e720893c8be577cb9dfadeb88b46a4d0f3bb91381b12abd876bb447edd5c64e6f6edec4f5596c5c75a4364efc75d403d WHIRLPOOL 5e1cabd5f87fed7c7dcfd4c1de3620d0f60d63921786e6791d477932d01fcda91e1b2494c85e473d5d8cd6951ed2ddc2392e4474f9a511397fb919538a9c1feb
+EBUILD selinux-slocate-2.20170204-r2.ebuild 284 SHA256 f90ce66af1e1a3b71da8aaa7ca956b362075800ab77e89bbc72b491b0f215a57 SHA512 c80b9b12216f76366c35745c97eb587072c0b2ed2e28ce0339115085f69e302b34e9068d0d7a372966a35fd9690c14cba21b9c5ab41e50e6fc7b4abe169d0971 WHIRLPOOL d6a5e97d49c5fd6ea2eca6b5957334a38cd8d69780722ee5a895a29d2a1dc311762ddf16133defb8183835c1df0ab2345479f2dfa62ca82a516fbe17e95fa7bd
+EBUILD selinux-slocate-2.20170204-r3.ebuild 284 SHA256 f90ce66af1e1a3b71da8aaa7ca956b362075800ab77e89bbc72b491b0f215a57 SHA512 c80b9b12216f76366c35745c97eb587072c0b2ed2e28ce0339115085f69e302b34e9068d0d7a372966a35fd9690c14cba21b9c5ab41e50e6fc7b4abe169d0971 WHIRLPOOL d6a5e97d49c5fd6ea2eca6b5957334a38cd8d69780722ee5a895a29d2a1dc311762ddf16133defb8183835c1df0ab2345479f2dfa62ca82a516fbe17e95fa7bd
+EBUILD selinux-slocate-2.20170204-r4.ebuild 284 SHA256 f90ce66af1e1a3b71da8aaa7ca956b362075800ab77e89bbc72b491b0f215a57 SHA512 c80b9b12216f76366c35745c97eb587072c0b2ed2e28ce0339115085f69e302b34e9068d0d7a372966a35fd9690c14cba21b9c5ab41e50e6fc7b4abe169d0971 WHIRLPOOL d6a5e97d49c5fd6ea2eca6b5957334a38cd8d69780722ee5a895a29d2a1dc311762ddf16133defb8183835c1df0ab2345479f2dfa62ca82a516fbe17e95fa7bd
+EBUILD selinux-slocate-2.20170805-r2.ebuild 284 SHA256 f90ce66af1e1a3b71da8aaa7ca956b362075800ab77e89bbc72b491b0f215a57 SHA512 c80b9b12216f76366c35745c97eb587072c0b2ed2e28ce0339115085f69e302b34e9068d0d7a372966a35fd9690c14cba21b9c5ab41e50e6fc7b4abe169d0971 WHIRLPOOL d6a5e97d49c5fd6ea2eca6b5957334a38cd8d69780722ee5a895a29d2a1dc311762ddf16133defb8183835c1df0ab2345479f2dfa62ca82a516fbe17e95fa7bd
+EBUILD selinux-slocate-2.20170805-r3.ebuild 286 SHA256 84a05e8df2239ac9c0552a395f6770601815b3780dcbcf044412e2cf3af667fb SHA512 d43d8f090028a9aa6d37ac7e36350c83e720893c8be577cb9dfadeb88b46a4d0f3bb91381b12abd876bb447edd5c64e6f6edec4f5596c5c75a4364efc75d403d WHIRLPOOL 5e1cabd5f87fed7c7dcfd4c1de3620d0f60d63921786e6791d477932d01fcda91e1b2494c85e473d5d8cd6951ed2ddc2392e4474f9a511397fb919538a9c1feb
+EBUILD selinux-slocate-9999.ebuild 286 SHA256 84a05e8df2239ac9c0552a395f6770601815b3780dcbcf044412e2cf3af667fb SHA512 d43d8f090028a9aa6d37ac7e36350c83e720893c8be577cb9dfadeb88b46a4d0f3bb91381b12abd876bb447edd5c64e6f6edec4f5596c5c75a4364efc75d403d WHIRLPOOL 5e1cabd5f87fed7c7dcfd4c1de3620d0f60d63921786e6791d477932d01fcda91e1b2494c85e473d5d8cd6951ed2ddc2392e4474f9a511397fb919538a9c1feb
 MISC ChangeLog 10687 SHA256 71405dd60942644097c1d1b1994c892f0bd8aa7572e95b7a9c113fe7ca7d2460 SHA512 d080e4c46c9ac10076fa9806bb9874c98a6c089996fa0ae7ff32149c2d41f54526a52a03751516ea9336b6cb3ccf789ee5588f278355eb3e06f6f7d27414869c WHIRLPOOL b531f3bc4c7431d6963acb16a9b92298026b85032e9b989c4f3caeec00bdd2a9066a81173aa515744bdc14dd5211b38cbda3a9f308f9c8bf728957997ef4c33e
 MISC ChangeLog-2015 9977 SHA256 f327fa25500180b77141577e77d3841074bd3d9e9557ec61ebb81893380788fe SHA512 2f3634effcbfef96227a94535f9008c93f0b46def3635e128973a78dce8172dc0018c5c08019d7568497febd789906ceec60827e3d208f3f36e766cdebea531c WHIRLPOOL 13fd228ccaa4acadd9361a117f15002403cd9786610ca9766b1f7fbc14ef421149d359f2de48304b29895791bdcb5f0c15d233ef6ef734b2e2ef1a71669c2b4a
 MISC metadata.xml 317 SHA256 068933cccab367caf7b97eed00167afe8d303e55addc2c2cbf8a14f3ef77f43f SHA512 644efe6833d658d1f9e1181652ef2d10b13a45e8c5896235efe04a4f7f1dc9676145f501f2682a5763836038d16e3f9f0e9aad3138880b0ee77d4b3b22de66fe WHIRLPOOL b7c85fcf3e6976507ca27b7c4e61ee4736bc88a892467a972ffc7769bbc2fc1a8cbc607553254c051c722c699281c6708df2e5556d0d487d89e500dd78cb0897
diff --git a/sec-policy/selinux-slocate/selinux-slocate-2.20170204-r1.ebuild b/sec-policy/selinux-slocate/selinux-slocate-2.20170204-r1.ebuild
index 39e8a114839e..77c44ff84c62 100644
--- a/sec-policy/selinux-slocate/selinux-slocate-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-slocate/selinux-slocate-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-slocate/selinux-slocate-2.20170204-r2.ebuild b/sec-policy/selinux-slocate/selinux-slocate-2.20170204-r2.ebuild
index 7ce2e93728f5..9fa5b68e5434 100644
--- a/sec-policy/selinux-slocate/selinux-slocate-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-slocate/selinux-slocate-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-slocate/selinux-slocate-2.20170204-r3.ebuild b/sec-policy/selinux-slocate/selinux-slocate-2.20170204-r3.ebuild
index 7ce2e93728f5..9fa5b68e5434 100644
--- a/sec-policy/selinux-slocate/selinux-slocate-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-slocate/selinux-slocate-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-slocate/selinux-slocate-2.20170204-r4.ebuild b/sec-policy/selinux-slocate/selinux-slocate-2.20170204-r4.ebuild
index 7ce2e93728f5..9fa5b68e5434 100644
--- a/sec-policy/selinux-slocate/selinux-slocate-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-slocate/selinux-slocate-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-slocate/selinux-slocate-2.20170805-r2.ebuild b/sec-policy/selinux-slocate/selinux-slocate-2.20170805-r2.ebuild
index 7ce2e93728f5..9fa5b68e5434 100644
--- a/sec-policy/selinux-slocate/selinux-slocate-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-slocate/selinux-slocate-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-slocate/selinux-slocate-2.20170805-r3.ebuild b/sec-policy/selinux-slocate/selinux-slocate-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..77c44ff84c62
--- /dev/null
+++ b/sec-policy/selinux-slocate/selinux-slocate-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-slocate/selinux-slocate-9999.ebuild b/sec-policy/selinux-slocate/selinux-slocate-9999.ebuild
index 39e8a114839e..77c44ff84c62 100644
--- a/sec-policy/selinux-slocate/selinux-slocate-9999.ebuild
+++ b/sec-policy/selinux-slocate/selinux-slocate-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-slrnpull/Manifest b/sec-policy/selinux-slrnpull/Manifest
index 95e94673d8bc..5c3a475fff76 100644
--- a/sec-policy/selinux-slrnpull/Manifest
+++ b/sec-policy/selinux-slrnpull/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-slrnpull-2.20170204-r1.ebuild 287 SHA256 b3f198a034a4b1bb87f04747828fe8fc2b8bdbb44cbfe9ee861e41739dd53626 SHA512 9188d33bce3d8b3c7118ab10455469bee93f9a788dd66a63d48ea814cda26642886ac07f54d6e50502c69486566fa20065511574d6efcf715f91388a83975ae2 WHIRLPOOL bc5a3f24434aa49337086dae34d6df79e8460183cae50d31066890a512dcc6aa4bdb52c94ec0d41ef7a6eb89a014f1366746e8c74c590872f1b1633085c09a39
-EBUILD selinux-slrnpull-2.20170204-r2.ebuild 285 SHA256 998d265a2bcfb95702d2bedb4d8c2b606cfda2ab705fae7c83aaec7f466ed049 SHA512 69615f13163585215334f9b6db1e2a0623bfa058513bd46947882c37cbf5329f4f11bd5f36a55d1e35ec9c01988925945fe3671f19b6953caefddec2c0bac3b6 WHIRLPOOL 7ad4af40b60275e6559d7a0cee4073e4bb43d8a175fd91284a266a0a088ecced6b9945347dcb62eb4354e27f1c630d9b950a2a2ebce595a6518db20f1a6328cb
-EBUILD selinux-slrnpull-2.20170204-r3.ebuild 285 SHA256 998d265a2bcfb95702d2bedb4d8c2b606cfda2ab705fae7c83aaec7f466ed049 SHA512 69615f13163585215334f9b6db1e2a0623bfa058513bd46947882c37cbf5329f4f11bd5f36a55d1e35ec9c01988925945fe3671f19b6953caefddec2c0bac3b6 WHIRLPOOL 7ad4af40b60275e6559d7a0cee4073e4bb43d8a175fd91284a266a0a088ecced6b9945347dcb62eb4354e27f1c630d9b950a2a2ebce595a6518db20f1a6328cb
-EBUILD selinux-slrnpull-2.20170204-r4.ebuild 285 SHA256 998d265a2bcfb95702d2bedb4d8c2b606cfda2ab705fae7c83aaec7f466ed049 SHA512 69615f13163585215334f9b6db1e2a0623bfa058513bd46947882c37cbf5329f4f11bd5f36a55d1e35ec9c01988925945fe3671f19b6953caefddec2c0bac3b6 WHIRLPOOL 7ad4af40b60275e6559d7a0cee4073e4bb43d8a175fd91284a266a0a088ecced6b9945347dcb62eb4354e27f1c630d9b950a2a2ebce595a6518db20f1a6328cb
-EBUILD selinux-slrnpull-2.20170805-r2.ebuild 285 SHA256 998d265a2bcfb95702d2bedb4d8c2b606cfda2ab705fae7c83aaec7f466ed049 SHA512 69615f13163585215334f9b6db1e2a0623bfa058513bd46947882c37cbf5329f4f11bd5f36a55d1e35ec9c01988925945fe3671f19b6953caefddec2c0bac3b6 WHIRLPOOL 7ad4af40b60275e6559d7a0cee4073e4bb43d8a175fd91284a266a0a088ecced6b9945347dcb62eb4354e27f1c630d9b950a2a2ebce595a6518db20f1a6328cb
-EBUILD selinux-slrnpull-9999.ebuild 287 SHA256 b3f198a034a4b1bb87f04747828fe8fc2b8bdbb44cbfe9ee861e41739dd53626 SHA512 9188d33bce3d8b3c7118ab10455469bee93f9a788dd66a63d48ea814cda26642886ac07f54d6e50502c69486566fa20065511574d6efcf715f91388a83975ae2 WHIRLPOOL bc5a3f24434aa49337086dae34d6df79e8460183cae50d31066890a512dcc6aa4bdb52c94ec0d41ef7a6eb89a014f1366746e8c74c590872f1b1633085c09a39
+EBUILD selinux-slrnpull-2.20170204-r1.ebuild 288 SHA256 c748b930d1a9d6e5efd4cf79927ebd9e73788d0d6e76e95f7443dd959b5b6270 SHA512 430bd0cefcc22ff1fc4458e0ca5d9d64bce56849d90bf95406865a06741990f71f07a5d3db6e9b74f47afd58e624215f232f87d4af9a4b12b8e1bb1784d4e2e7 WHIRLPOOL 5966b5ba300e8b90e7d15a575867e4c47f8eee82ae76c5ff6ed24d4705bdeafa883ac86fe394eef5dee6ea5f550f0d200f683bdd85938d393af07fc3e8282ad1
+EBUILD selinux-slrnpull-2.20170204-r2.ebuild 286 SHA256 89e0f63a155b0c95e52b0d07714177560a5b7a6307513214364ba3369738963d SHA512 7c760072f3b6133ca1a3ce932f60bdf793bc3a85988eb1d4cca05f86bc313059b05670f6e7c5321870475276a2e0b0841fe2ec0af0fd1af1e487a46009849f21 WHIRLPOOL 9bdc0b739cf99919d2e9c585d7b58288a67c23638ed543ebf16ef877cd2ef1a0810b05fbf061b81802e51ae71da97b1cdaf8ac9d2b3cee76545e2fa2922846a7
+EBUILD selinux-slrnpull-2.20170204-r3.ebuild 286 SHA256 89e0f63a155b0c95e52b0d07714177560a5b7a6307513214364ba3369738963d SHA512 7c760072f3b6133ca1a3ce932f60bdf793bc3a85988eb1d4cca05f86bc313059b05670f6e7c5321870475276a2e0b0841fe2ec0af0fd1af1e487a46009849f21 WHIRLPOOL 9bdc0b739cf99919d2e9c585d7b58288a67c23638ed543ebf16ef877cd2ef1a0810b05fbf061b81802e51ae71da97b1cdaf8ac9d2b3cee76545e2fa2922846a7
+EBUILD selinux-slrnpull-2.20170204-r4.ebuild 286 SHA256 89e0f63a155b0c95e52b0d07714177560a5b7a6307513214364ba3369738963d SHA512 7c760072f3b6133ca1a3ce932f60bdf793bc3a85988eb1d4cca05f86bc313059b05670f6e7c5321870475276a2e0b0841fe2ec0af0fd1af1e487a46009849f21 WHIRLPOOL 9bdc0b739cf99919d2e9c585d7b58288a67c23638ed543ebf16ef877cd2ef1a0810b05fbf061b81802e51ae71da97b1cdaf8ac9d2b3cee76545e2fa2922846a7
+EBUILD selinux-slrnpull-2.20170805-r2.ebuild 286 SHA256 89e0f63a155b0c95e52b0d07714177560a5b7a6307513214364ba3369738963d SHA512 7c760072f3b6133ca1a3ce932f60bdf793bc3a85988eb1d4cca05f86bc313059b05670f6e7c5321870475276a2e0b0841fe2ec0af0fd1af1e487a46009849f21 WHIRLPOOL 9bdc0b739cf99919d2e9c585d7b58288a67c23638ed543ebf16ef877cd2ef1a0810b05fbf061b81802e51ae71da97b1cdaf8ac9d2b3cee76545e2fa2922846a7
+EBUILD selinux-slrnpull-2.20170805-r3.ebuild 288 SHA256 c748b930d1a9d6e5efd4cf79927ebd9e73788d0d6e76e95f7443dd959b5b6270 SHA512 430bd0cefcc22ff1fc4458e0ca5d9d64bce56849d90bf95406865a06741990f71f07a5d3db6e9b74f47afd58e624215f232f87d4af9a4b12b8e1bb1784d4e2e7 WHIRLPOOL 5966b5ba300e8b90e7d15a575867e4c47f8eee82ae76c5ff6ed24d4705bdeafa883ac86fe394eef5dee6ea5f550f0d200f683bdd85938d393af07fc3e8282ad1
+EBUILD selinux-slrnpull-9999.ebuild 288 SHA256 c748b930d1a9d6e5efd4cf79927ebd9e73788d0d6e76e95f7443dd959b5b6270 SHA512 430bd0cefcc22ff1fc4458e0ca5d9d64bce56849d90bf95406865a06741990f71f07a5d3db6e9b74f47afd58e624215f232f87d4af9a4b12b8e1bb1784d4e2e7 WHIRLPOOL 5966b5ba300e8b90e7d15a575867e4c47f8eee82ae76c5ff6ed24d4705bdeafa883ac86fe394eef5dee6ea5f550f0d200f683bdd85938d393af07fc3e8282ad1
 MISC ChangeLog 10793 SHA256 8d5bc91f16738bbad0af29cfc6d7bb861bb59e3f9b4eb4e5ad7a99818000a1ff SHA512 e823b828032ce46af54f5ae020bed7275555f791aa06eb2ec8ca3e84a2ddcd45a1bae5b8bf97fdb5eaa973a06c28446ece598cb88a2b6d9de34dbb928a2e6753 WHIRLPOOL aaa05ec867f2a6b25f1a51044ec138999bf3b78e19fab27207f8ce5990a6f43c509e1386a756926d8fde8244915ac5e9892dbf9192cc4dab438c1c2b029f7cba
 MISC ChangeLog-2015 10102 SHA256 7d56de602099afd9b646130f545b9b934d5d157eba1a9d18c80e9e49cee73d04 SHA512 47cb237d59508665bc7d01b42d2b75d544219511afbf1d9189ea32c0219cc4ae662911448570a7564961d53af43eac2b378d429aaf7493069d2b4a3d3d63c50a WHIRLPOOL 2f4fb3c496fe06723cd05432adbbb8455684f3b01654609b61d0a4c19878e65a075378d486437402b3124466644c1ffc0b6cebe2019600f582bab7b66a35dd8a
 MISC metadata.xml 318 SHA256 28ddae3864f4039c9aecc73c8ecdb91bd9393437175821ce87dfbeb7a009a7dd SHA512 d44cf9551886870def9addeb8e1cccfb4d79dae34507f43d45539e331e8120c6e2d49692e2aa6c3eacc86b3a57d83956298da1c4e7b12da2718fb15d812cced1 WHIRLPOOL 004a320d474deaf8a687e0d207f9f7695be0f223b40d8e645e07a38de67d640dd75258426ec22fda84bc167d784f0e988e62501dc4514fc5216fbe0df9d0ef44
diff --git a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20170204-r1.ebuild b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20170204-r1.ebuild
index 858fa382642d..aa2c2be7cf12 100644
--- a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20170204-r2.ebuild b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20170204-r2.ebuild
index 5e1f2d0add5a..69221061cb64 100644
--- a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20170204-r3.ebuild b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20170204-r3.ebuild
index 5e1f2d0add5a..69221061cb64 100644
--- a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20170204-r4.ebuild b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20170204-r4.ebuild
index 5e1f2d0add5a..69221061cb64 100644
--- a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20170805-r2.ebuild b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20170805-r2.ebuild
index 5e1f2d0add5a..69221061cb64 100644
--- a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20170805-r3.ebuild b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..aa2c2be7cf12
--- /dev/null
+++ b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-slrnpull/selinux-slrnpull-9999.ebuild b/sec-policy/selinux-slrnpull/selinux-slrnpull-9999.ebuild
index 858fa382642d..aa2c2be7cf12 100644
--- a/sec-policy/selinux-slrnpull/selinux-slrnpull-9999.ebuild
+++ b/sec-policy/selinux-slrnpull/selinux-slrnpull-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-smartmon/Manifest b/sec-policy/selinux-smartmon/Manifest
index 48af982efc59..c472237b7d23 100644
--- a/sec-policy/selinux-smartmon/Manifest
+++ b/sec-policy/selinux-smartmon/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-smartmon-2.20170204-r1.ebuild 287 SHA256 93578d589e4da61a5c80baa3dd6310af88fb141fde0223a87841ce20b6ac639f SHA512 56eadad70ab5089bea8f4e7bdcbbbe74d1450dda09533d2ca96ceb8df5191253edda7dd5b89a680ee391799cba5d10c896d31a70c2767ce0f736a9008d9c1c0e WHIRLPOOL 47dc2a8c0060628b57046130006ccd5a8e91a22a45decde8ce45d282ed3e7a2b53f9412b07f5f53aca3147199c0e01495b1355ba132c5ea20e24b9e43ae05bd2
-EBUILD selinux-smartmon-2.20170204-r2.ebuild 285 SHA256 d101c0bd16251439f69a73e0ef5faa288dd79ee1f772de79cf0ef9963f27102c SHA512 31d152caa03fd56f8f4831f818c5f17705e16ddb476229f0dae1a1dbdeeeb50e7c31341eb01c287333921bc1d5f75667c10fbc3fa511cb72b7467f876bb34fd9 WHIRLPOOL f511bed1ed1dc07494994c1f3ea03b62e8fd8a5e7da10632ec8749980bdbae66ff313feff6b12792aa89a739a32871f8b3e6768e4f1bc8aa7324a08422115301
-EBUILD selinux-smartmon-2.20170204-r3.ebuild 285 SHA256 d101c0bd16251439f69a73e0ef5faa288dd79ee1f772de79cf0ef9963f27102c SHA512 31d152caa03fd56f8f4831f818c5f17705e16ddb476229f0dae1a1dbdeeeb50e7c31341eb01c287333921bc1d5f75667c10fbc3fa511cb72b7467f876bb34fd9 WHIRLPOOL f511bed1ed1dc07494994c1f3ea03b62e8fd8a5e7da10632ec8749980bdbae66ff313feff6b12792aa89a739a32871f8b3e6768e4f1bc8aa7324a08422115301
-EBUILD selinux-smartmon-2.20170204-r4.ebuild 285 SHA256 d101c0bd16251439f69a73e0ef5faa288dd79ee1f772de79cf0ef9963f27102c SHA512 31d152caa03fd56f8f4831f818c5f17705e16ddb476229f0dae1a1dbdeeeb50e7c31341eb01c287333921bc1d5f75667c10fbc3fa511cb72b7467f876bb34fd9 WHIRLPOOL f511bed1ed1dc07494994c1f3ea03b62e8fd8a5e7da10632ec8749980bdbae66ff313feff6b12792aa89a739a32871f8b3e6768e4f1bc8aa7324a08422115301
-EBUILD selinux-smartmon-2.20170805-r2.ebuild 285 SHA256 d101c0bd16251439f69a73e0ef5faa288dd79ee1f772de79cf0ef9963f27102c SHA512 31d152caa03fd56f8f4831f818c5f17705e16ddb476229f0dae1a1dbdeeeb50e7c31341eb01c287333921bc1d5f75667c10fbc3fa511cb72b7467f876bb34fd9 WHIRLPOOL f511bed1ed1dc07494994c1f3ea03b62e8fd8a5e7da10632ec8749980bdbae66ff313feff6b12792aa89a739a32871f8b3e6768e4f1bc8aa7324a08422115301
-EBUILD selinux-smartmon-9999.ebuild 287 SHA256 93578d589e4da61a5c80baa3dd6310af88fb141fde0223a87841ce20b6ac639f SHA512 56eadad70ab5089bea8f4e7bdcbbbe74d1450dda09533d2ca96ceb8df5191253edda7dd5b89a680ee391799cba5d10c896d31a70c2767ce0f736a9008d9c1c0e WHIRLPOOL 47dc2a8c0060628b57046130006ccd5a8e91a22a45decde8ce45d282ed3e7a2b53f9412b07f5f53aca3147199c0e01495b1355ba132c5ea20e24b9e43ae05bd2
+EBUILD selinux-smartmon-2.20170204-r1.ebuild 288 SHA256 9b20ae9a02c66396f39fe6282d2dfbe711c95d8c86928f063008950604659516 SHA512 8c7e17d1ccbbf020605b0a367c85eb6e9dac95c90786ff646dcd9687aaf14f1d4de3a1dc7b739057e5a92dfff9846c4daefd79b1c1de99cd46469cb6cc33b2bc WHIRLPOOL bbaa67457a649aaba527052d83e432947f265ebf5a56774e5bb740ce3e5cea6e690ace3ee4acc5230c8d3dc16490802984312a37425a5a2229bdf7b61a72468d
+EBUILD selinux-smartmon-2.20170204-r2.ebuild 286 SHA256 3ab41a56014aaf249b1688e04e79baa227ca4c9870667407446f2097bbc902e3 SHA512 135d0637121d5f4969a8ab8bcde16df552620bf964c2029214204f942c93f77592ca0da31018e91eb2ad0e57d649738beb821ed6e6a1b482251c732bfbc81778 WHIRLPOOL 25d8cf724b1290e59944a333944243e2cf92d1dd356ee2c060f062d7a308724c1800a05a591b9e33ce0ded6879b4928acc707c2809644883760ff6c5fe32202d
+EBUILD selinux-smartmon-2.20170204-r3.ebuild 286 SHA256 3ab41a56014aaf249b1688e04e79baa227ca4c9870667407446f2097bbc902e3 SHA512 135d0637121d5f4969a8ab8bcde16df552620bf964c2029214204f942c93f77592ca0da31018e91eb2ad0e57d649738beb821ed6e6a1b482251c732bfbc81778 WHIRLPOOL 25d8cf724b1290e59944a333944243e2cf92d1dd356ee2c060f062d7a308724c1800a05a591b9e33ce0ded6879b4928acc707c2809644883760ff6c5fe32202d
+EBUILD selinux-smartmon-2.20170204-r4.ebuild 286 SHA256 3ab41a56014aaf249b1688e04e79baa227ca4c9870667407446f2097bbc902e3 SHA512 135d0637121d5f4969a8ab8bcde16df552620bf964c2029214204f942c93f77592ca0da31018e91eb2ad0e57d649738beb821ed6e6a1b482251c732bfbc81778 WHIRLPOOL 25d8cf724b1290e59944a333944243e2cf92d1dd356ee2c060f062d7a308724c1800a05a591b9e33ce0ded6879b4928acc707c2809644883760ff6c5fe32202d
+EBUILD selinux-smartmon-2.20170805-r2.ebuild 286 SHA256 3ab41a56014aaf249b1688e04e79baa227ca4c9870667407446f2097bbc902e3 SHA512 135d0637121d5f4969a8ab8bcde16df552620bf964c2029214204f942c93f77592ca0da31018e91eb2ad0e57d649738beb821ed6e6a1b482251c732bfbc81778 WHIRLPOOL 25d8cf724b1290e59944a333944243e2cf92d1dd356ee2c060f062d7a308724c1800a05a591b9e33ce0ded6879b4928acc707c2809644883760ff6c5fe32202d
+EBUILD selinux-smartmon-2.20170805-r3.ebuild 288 SHA256 9b20ae9a02c66396f39fe6282d2dfbe711c95d8c86928f063008950604659516 SHA512 8c7e17d1ccbbf020605b0a367c85eb6e9dac95c90786ff646dcd9687aaf14f1d4de3a1dc7b739057e5a92dfff9846c4daefd79b1c1de99cd46469cb6cc33b2bc WHIRLPOOL bbaa67457a649aaba527052d83e432947f265ebf5a56774e5bb740ce3e5cea6e690ace3ee4acc5230c8d3dc16490802984312a37425a5a2229bdf7b61a72468d
+EBUILD selinux-smartmon-9999.ebuild 288 SHA256 9b20ae9a02c66396f39fe6282d2dfbe711c95d8c86928f063008950604659516 SHA512 8c7e17d1ccbbf020605b0a367c85eb6e9dac95c90786ff646dcd9687aaf14f1d4de3a1dc7b739057e5a92dfff9846c4daefd79b1c1de99cd46469cb6cc33b2bc WHIRLPOOL bbaa67457a649aaba527052d83e432947f265ebf5a56774e5bb740ce3e5cea6e690ace3ee4acc5230c8d3dc16490802984312a37425a5a2229bdf7b61a72468d
 MISC ChangeLog 10793 SHA256 a37e4d8d76b2b10bdfa6794dfe1ec20100e8d6bcad468a5125cfed5cb4953aec SHA512 4349544e4e1ca85e0fdc1ab0a3d3db50be259dfc4b48cc8b90586a378469308d206b01363dd0a822c0c5ea8ccade22d13745e3071de02fbd0f9bab36fa592d81 WHIRLPOOL 06c4dcc52da44e55d54c4e1b19ede0d9d794947ddf9223d4f203304b33d2c9ac687ade5c3f717f7fd832f73e05fdbf860a3b2e6b2c6fa22872e2c040e77d924d
 MISC ChangeLog-2015 10102 SHA256 3ea4391125629837495dd43332abbebd2a505cbdd70d61f4006d40a1b6003eb2 SHA512 78c3628a7c30ac5b916dd58345b9b171d0be8b29a4a1f163c93ded358c6448580ebf11a2b2b7bb17513827a1c932f6ab203cb6cd09df98dc32f309bfe2f904cb WHIRLPOOL 17435a2b1bdf384639889df6ff9aff489f505d7312f75d618701fdcaad1b7e63fae2967ab7608bb5f8d6aa343f571606923980a01dd0e0c7041468fd476f2147
 MISC metadata.xml 318 SHA256 373c5799a1a4146fd5abf007668b878c47d2c1094016acb6f0d6b7abcd92cbe2 SHA512 918ce5bfdccbef2cdb0580bd1e60fa164dfe2b64d08ae080b48b311f777d2b4c14c6a5b19e826789a07febd52820bb4cfc42927317770b766908ae347e6ed71f WHIRLPOOL eb4326b1cd26c76db9be84a045d41521d6ecc6906a1532e67a99607b6659d19a4ee900f9add829079039606406a89bacc5668f12900eaec494d14512ad905987
diff --git a/sec-policy/selinux-smartmon/selinux-smartmon-2.20170204-r1.ebuild b/sec-policy/selinux-smartmon/selinux-smartmon-2.20170204-r1.ebuild
index c52180daa047..af2f50224de2 100644
--- a/sec-policy/selinux-smartmon/selinux-smartmon-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-smartmon/selinux-smartmon-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-smartmon/selinux-smartmon-2.20170204-r2.ebuild b/sec-policy/selinux-smartmon/selinux-smartmon-2.20170204-r2.ebuild
index d309855e0473..36aaabb2cebf 100644
--- a/sec-policy/selinux-smartmon/selinux-smartmon-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-smartmon/selinux-smartmon-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-smartmon/selinux-smartmon-2.20170204-r3.ebuild b/sec-policy/selinux-smartmon/selinux-smartmon-2.20170204-r3.ebuild
index d309855e0473..36aaabb2cebf 100644
--- a/sec-policy/selinux-smartmon/selinux-smartmon-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-smartmon/selinux-smartmon-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-smartmon/selinux-smartmon-2.20170204-r4.ebuild b/sec-policy/selinux-smartmon/selinux-smartmon-2.20170204-r4.ebuild
index d309855e0473..36aaabb2cebf 100644
--- a/sec-policy/selinux-smartmon/selinux-smartmon-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-smartmon/selinux-smartmon-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-smartmon/selinux-smartmon-2.20170805-r2.ebuild b/sec-policy/selinux-smartmon/selinux-smartmon-2.20170805-r2.ebuild
index d309855e0473..36aaabb2cebf 100644
--- a/sec-policy/selinux-smartmon/selinux-smartmon-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-smartmon/selinux-smartmon-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-smartmon/selinux-smartmon-2.20170805-r3.ebuild b/sec-policy/selinux-smartmon/selinux-smartmon-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..af2f50224de2
--- /dev/null
+++ b/sec-policy/selinux-smartmon/selinux-smartmon-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-smartmon/selinux-smartmon-9999.ebuild b/sec-policy/selinux-smartmon/selinux-smartmon-9999.ebuild
index c52180daa047..af2f50224de2 100644
--- a/sec-policy/selinux-smartmon/selinux-smartmon-9999.ebuild
+++ b/sec-policy/selinux-smartmon/selinux-smartmon-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-smokeping/Manifest b/sec-policy/selinux-smokeping/Manifest
index 7d861ed1f62b..b4c5e188bebd 100644
--- a/sec-policy/selinux-smokeping/Manifest
+++ b/sec-policy/selinux-smokeping/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-smokeping-2.20170204-r1.ebuild 385 SHA256 f17984124c3c43f31e63c002dcd9349e0b67c385d5d525c837ecba0dc518619a SHA512 408429420a726c0a065459781f3b91f64bb88674f1931861986165e5f27f19de65000d5944ef74fe6b1879b9a3902c12e5efd5fbdfd0e3769831da7eabec60af WHIRLPOOL baa81f4c0bfd18605a69bfb8661ef33f6af288b9901571ed036d446940698b52d97b1803021bfc0af21928228c60ca611687b53d6ea3ff563d6496142267c20a
-EBUILD selinux-smokeping-2.20170204-r2.ebuild 383 SHA256 f2eb2828b803f8abd67bc025ffcfd99f96f92dd956f1feb48715c27667d67669 SHA512 0a4d429945ab9c774e04faa96dec654cf8aa7e95c4ba1ae353fa1972427bb934696e99ba89e872968aadb0d246327f293c8eba6ba14ec80fcf2f76906018109e WHIRLPOOL db7911c031358dabb24a6fe32c79bf0e59b754eb1c0960e34bd7763612ae9618e0c6e946f985342856d5812272fb8892efbe3bf9905723ead10a69e8d8159823
-EBUILD selinux-smokeping-2.20170204-r3.ebuild 383 SHA256 f2eb2828b803f8abd67bc025ffcfd99f96f92dd956f1feb48715c27667d67669 SHA512 0a4d429945ab9c774e04faa96dec654cf8aa7e95c4ba1ae353fa1972427bb934696e99ba89e872968aadb0d246327f293c8eba6ba14ec80fcf2f76906018109e WHIRLPOOL db7911c031358dabb24a6fe32c79bf0e59b754eb1c0960e34bd7763612ae9618e0c6e946f985342856d5812272fb8892efbe3bf9905723ead10a69e8d8159823
-EBUILD selinux-smokeping-2.20170204-r4.ebuild 383 SHA256 f2eb2828b803f8abd67bc025ffcfd99f96f92dd956f1feb48715c27667d67669 SHA512 0a4d429945ab9c774e04faa96dec654cf8aa7e95c4ba1ae353fa1972427bb934696e99ba89e872968aadb0d246327f293c8eba6ba14ec80fcf2f76906018109e WHIRLPOOL db7911c031358dabb24a6fe32c79bf0e59b754eb1c0960e34bd7763612ae9618e0c6e946f985342856d5812272fb8892efbe3bf9905723ead10a69e8d8159823
-EBUILD selinux-smokeping-2.20170805-r2.ebuild 383 SHA256 f2eb2828b803f8abd67bc025ffcfd99f96f92dd956f1feb48715c27667d67669 SHA512 0a4d429945ab9c774e04faa96dec654cf8aa7e95c4ba1ae353fa1972427bb934696e99ba89e872968aadb0d246327f293c8eba6ba14ec80fcf2f76906018109e WHIRLPOOL db7911c031358dabb24a6fe32c79bf0e59b754eb1c0960e34bd7763612ae9618e0c6e946f985342856d5812272fb8892efbe3bf9905723ead10a69e8d8159823
-EBUILD selinux-smokeping-9999.ebuild 385 SHA256 f17984124c3c43f31e63c002dcd9349e0b67c385d5d525c837ecba0dc518619a SHA512 408429420a726c0a065459781f3b91f64bb88674f1931861986165e5f27f19de65000d5944ef74fe6b1879b9a3902c12e5efd5fbdfd0e3769831da7eabec60af WHIRLPOOL baa81f4c0bfd18605a69bfb8661ef33f6af288b9901571ed036d446940698b52d97b1803021bfc0af21928228c60ca611687b53d6ea3ff563d6496142267c20a
+EBUILD selinux-smokeping-2.20170204-r1.ebuild 386 SHA256 4c5368e2a64e2393f595f913e3e588688c1ff240326294536c4526acf6469c9e SHA512 abc32b15254f34582a33f221d2e0a348dbbea0272a4a7bb222bd6ffcc2e8f660b9c0c05b084899e989546183e64629c5d4eb29ba83ba1bf4cd049275ded886d5 WHIRLPOOL 0dffd47edb967655d2cd2a4e4d81da0ad35920f1dd8068f1e9539ca33543c94269cebc7911ee55ed9f3c3a001cb07b013ee2bf0dc8f99cd9dfce665169a06de7
+EBUILD selinux-smokeping-2.20170204-r2.ebuild 384 SHA256 39b633032cc7d486f7b7a94213404e820a2b50e2353e40b9f1d67020b059adec SHA512 ca622eda29aa909de146d6b769d33ee24f47d2882aa3fad05f80e0f1c0bbc4073afa8be229b85ded73e2990ae70285db5a86ff4d4ab3edfc84409f03093d73f3 WHIRLPOOL 6e57a643a2ad127cb0f94d695ee9656f7563880fbe8429db55ba8c4b5f07317d689bfaaafcd41b6e80fa4aeb67ab72ac4c6c73b381060e769a7159cdd25bf53a
+EBUILD selinux-smokeping-2.20170204-r3.ebuild 384 SHA256 39b633032cc7d486f7b7a94213404e820a2b50e2353e40b9f1d67020b059adec SHA512 ca622eda29aa909de146d6b769d33ee24f47d2882aa3fad05f80e0f1c0bbc4073afa8be229b85ded73e2990ae70285db5a86ff4d4ab3edfc84409f03093d73f3 WHIRLPOOL 6e57a643a2ad127cb0f94d695ee9656f7563880fbe8429db55ba8c4b5f07317d689bfaaafcd41b6e80fa4aeb67ab72ac4c6c73b381060e769a7159cdd25bf53a
+EBUILD selinux-smokeping-2.20170204-r4.ebuild 384 SHA256 39b633032cc7d486f7b7a94213404e820a2b50e2353e40b9f1d67020b059adec SHA512 ca622eda29aa909de146d6b769d33ee24f47d2882aa3fad05f80e0f1c0bbc4073afa8be229b85ded73e2990ae70285db5a86ff4d4ab3edfc84409f03093d73f3 WHIRLPOOL 6e57a643a2ad127cb0f94d695ee9656f7563880fbe8429db55ba8c4b5f07317d689bfaaafcd41b6e80fa4aeb67ab72ac4c6c73b381060e769a7159cdd25bf53a
+EBUILD selinux-smokeping-2.20170805-r2.ebuild 384 SHA256 39b633032cc7d486f7b7a94213404e820a2b50e2353e40b9f1d67020b059adec SHA512 ca622eda29aa909de146d6b769d33ee24f47d2882aa3fad05f80e0f1c0bbc4073afa8be229b85ded73e2990ae70285db5a86ff4d4ab3edfc84409f03093d73f3 WHIRLPOOL 6e57a643a2ad127cb0f94d695ee9656f7563880fbe8429db55ba8c4b5f07317d689bfaaafcd41b6e80fa4aeb67ab72ac4c6c73b381060e769a7159cdd25bf53a
+EBUILD selinux-smokeping-2.20170805-r3.ebuild 386 SHA256 4c5368e2a64e2393f595f913e3e588688c1ff240326294536c4526acf6469c9e SHA512 abc32b15254f34582a33f221d2e0a348dbbea0272a4a7bb222bd6ffcc2e8f660b9c0c05b084899e989546183e64629c5d4eb29ba83ba1bf4cd049275ded886d5 WHIRLPOOL 0dffd47edb967655d2cd2a4e4d81da0ad35920f1dd8068f1e9539ca33543c94269cebc7911ee55ed9f3c3a001cb07b013ee2bf0dc8f99cd9dfce665169a06de7
+EBUILD selinux-smokeping-9999.ebuild 386 SHA256 4c5368e2a64e2393f595f913e3e588688c1ff240326294536c4526acf6469c9e SHA512 abc32b15254f34582a33f221d2e0a348dbbea0272a4a7bb222bd6ffcc2e8f660b9c0c05b084899e989546183e64629c5d4eb29ba83ba1bf4cd049275ded886d5 WHIRLPOOL 0dffd47edb967655d2cd2a4e4d81da0ad35920f1dd8068f1e9539ca33543c94269cebc7911ee55ed9f3c3a001cb07b013ee2bf0dc8f99cd9dfce665169a06de7
 MISC ChangeLog 10887 SHA256 619c21dd501c4675f2b0b89ea6e88fcd939c48560ca412135ca606786356784b SHA512 7c486503a329c08af880d26a74095aef06fca1800b2fd586988850039cb89074865b934d07b4139f904de78a15ecb36c14205d5f52a213c68501d70db3b783ac WHIRLPOOL 970e85bd1af724af11d51c03d5090c724f652cadb06eea5f84804e49f1bf19c0a55c25533bc28f32c791adb990e0235060082b7001464f0a20cb871fd231b356
 MISC ChangeLog-2015 10495 SHA256 6af7096ff81f88e4680ef2f2c82fec4a346be37cc66bd9f4b438d418a155c375 SHA512 8ff7bfc63eee26bd7705766caef4a5c6159e7b7c6acb72048964e07b0a1b58852fb10cb4f5045bbc6ce417d29bd5139196a018c636c6f2e3d735e51854343324 WHIRLPOOL 5f42d5967ad8d162f2198469405efbb01ca9e9e28e9e02a49f0559c9b6c027ef51c1cf393f58e3c35f52162b5d46d7c82b58d7dd4047d5106ac725b3a50bf77f
 MISC metadata.xml 319 SHA256 e35d44fbdc3f1f488328e1b2a27cafa086230cefb019191a8e55a534ab7b3f53 SHA512 d4db53e2c965a838139c9aafbc227a9b9378c674d074392ff08e2dea5247e7bb7fa912312f12a14cf534faf48e27b182f477694a5ad2d96f5322f2ed2404e83f WHIRLPOOL 4b528fed67fd5388868390bd7820f32a993c0c4df901ef57f01c74cd50f9bcecdb5157f91afa37e71d40b6701d5a28599539e69d7a31970043c96c3c010f4233
diff --git a/sec-policy/selinux-smokeping/selinux-smokeping-2.20170204-r1.ebuild b/sec-policy/selinux-smokeping/selinux-smokeping-2.20170204-r1.ebuild
index 4aedf1913543..e8933368429b 100644
--- a/sec-policy/selinux-smokeping/selinux-smokeping-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-smokeping/selinux-smokeping-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-smokeping/selinux-smokeping-2.20170204-r2.ebuild b/sec-policy/selinux-smokeping/selinux-smokeping-2.20170204-r2.ebuild
index 46252f3ba28c..9f12ac25cb12 100644
--- a/sec-policy/selinux-smokeping/selinux-smokeping-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-smokeping/selinux-smokeping-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-smokeping/selinux-smokeping-2.20170204-r3.ebuild b/sec-policy/selinux-smokeping/selinux-smokeping-2.20170204-r3.ebuild
index 46252f3ba28c..9f12ac25cb12 100644
--- a/sec-policy/selinux-smokeping/selinux-smokeping-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-smokeping/selinux-smokeping-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-smokeping/selinux-smokeping-2.20170204-r4.ebuild b/sec-policy/selinux-smokeping/selinux-smokeping-2.20170204-r4.ebuild
index 46252f3ba28c..9f12ac25cb12 100644
--- a/sec-policy/selinux-smokeping/selinux-smokeping-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-smokeping/selinux-smokeping-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-smokeping/selinux-smokeping-2.20170805-r2.ebuild b/sec-policy/selinux-smokeping/selinux-smokeping-2.20170805-r2.ebuild
index 46252f3ba28c..9f12ac25cb12 100644
--- a/sec-policy/selinux-smokeping/selinux-smokeping-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-smokeping/selinux-smokeping-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-smokeping/selinux-smokeping-2.20170805-r3.ebuild b/sec-policy/selinux-smokeping/selinux-smokeping-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..e8933368429b
--- /dev/null
+++ b/sec-policy/selinux-smokeping/selinux-smokeping-2.20170805-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-smokeping/selinux-smokeping-9999.ebuild b/sec-policy/selinux-smokeping/selinux-smokeping-9999.ebuild
index 4aedf1913543..e8933368429b 100644
--- a/sec-policy/selinux-smokeping/selinux-smokeping-9999.ebuild
+++ b/sec-policy/selinux-smokeping/selinux-smokeping-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-snmp/Manifest b/sec-policy/selinux-snmp/Manifest
index 34f0ef484160..6c47253cec3f 100644
--- a/sec-policy/selinux-snmp/Manifest
+++ b/sec-policy/selinux-snmp/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-snmp-2.20170204-r1.ebuild 279 SHA256 78317d064377797aef42eaf04b102e7ce83e5d55c87a66467964abbe6dae1954 SHA512 2bdfa456f7cf3100417d8c9e26f1286c5b27090925bdb3357731f94d5eee6c97be15b3e47f517b48a28a94dd3179e7cc80aeec17825736cc24e494de462aa546 WHIRLPOOL d443910d2cebf983da3869e2c99e62e5b3c4bb39fc988ad88dd3b0a8b66639b075d8118d6b33cf60b883cef690d95962b93574c16638be2ed757e625f0ee3939
-EBUILD selinux-snmp-2.20170204-r2.ebuild 277 SHA256 0f53f236d4df12878dba60a1e9e391fcf22d77cfc28b26e5cfe91b223a48b946 SHA512 2d9d3e7177451777b202ee1b016d3e71cb6ade7c57dd6b41585be6b0219224575b38bc48a7a905821778944e66ce2ccca74dcba0cebe65a344a50362583164c3 WHIRLPOOL 7671006fc93c3ac274d3731333256186c6a38907ff1dfab359fa25db8b0f4139a3be3cb38dc3f8f71ac765c62898458cecc540cebc2357f1fd098714690f9860
-EBUILD selinux-snmp-2.20170204-r3.ebuild 277 SHA256 0f53f236d4df12878dba60a1e9e391fcf22d77cfc28b26e5cfe91b223a48b946 SHA512 2d9d3e7177451777b202ee1b016d3e71cb6ade7c57dd6b41585be6b0219224575b38bc48a7a905821778944e66ce2ccca74dcba0cebe65a344a50362583164c3 WHIRLPOOL 7671006fc93c3ac274d3731333256186c6a38907ff1dfab359fa25db8b0f4139a3be3cb38dc3f8f71ac765c62898458cecc540cebc2357f1fd098714690f9860
-EBUILD selinux-snmp-2.20170204-r4.ebuild 277 SHA256 0f53f236d4df12878dba60a1e9e391fcf22d77cfc28b26e5cfe91b223a48b946 SHA512 2d9d3e7177451777b202ee1b016d3e71cb6ade7c57dd6b41585be6b0219224575b38bc48a7a905821778944e66ce2ccca74dcba0cebe65a344a50362583164c3 WHIRLPOOL 7671006fc93c3ac274d3731333256186c6a38907ff1dfab359fa25db8b0f4139a3be3cb38dc3f8f71ac765c62898458cecc540cebc2357f1fd098714690f9860
-EBUILD selinux-snmp-2.20170805-r2.ebuild 277 SHA256 0f53f236d4df12878dba60a1e9e391fcf22d77cfc28b26e5cfe91b223a48b946 SHA512 2d9d3e7177451777b202ee1b016d3e71cb6ade7c57dd6b41585be6b0219224575b38bc48a7a905821778944e66ce2ccca74dcba0cebe65a344a50362583164c3 WHIRLPOOL 7671006fc93c3ac274d3731333256186c6a38907ff1dfab359fa25db8b0f4139a3be3cb38dc3f8f71ac765c62898458cecc540cebc2357f1fd098714690f9860
-EBUILD selinux-snmp-9999.ebuild 279 SHA256 78317d064377797aef42eaf04b102e7ce83e5d55c87a66467964abbe6dae1954 SHA512 2bdfa456f7cf3100417d8c9e26f1286c5b27090925bdb3357731f94d5eee6c97be15b3e47f517b48a28a94dd3179e7cc80aeec17825736cc24e494de462aa546 WHIRLPOOL d443910d2cebf983da3869e2c99e62e5b3c4bb39fc988ad88dd3b0a8b66639b075d8118d6b33cf60b883cef690d95962b93574c16638be2ed757e625f0ee3939
+EBUILD selinux-snmp-2.20170204-r1.ebuild 280 SHA256 b3d94b41200bffabd58369f91d7984c817606af79f16fbcf2e7e94fb96895b8d SHA512 5d3731f8aa4c75c7e515e09a384aa66a37290c16b9ccf1f6476eac6368b058d3f1562a32cc5f8770e88a07035ea72976cf676d09fed54ca8a91ce29fc15d919d WHIRLPOOL 88cdf1b0c3a19c2cd1663d62a3bbe3a95fd15ed29125776b41a20cdc0c12f39aa71d56bdc451b56e22880436b1ac74bf939165c690b3511f8989033f0bd98da4
+EBUILD selinux-snmp-2.20170204-r2.ebuild 278 SHA256 44c4629d4a66aaac13ba7aa9de2296c3f9b8d517dde1b22c3fefe4e08973dab5 SHA512 a0b8a7cab13372b9c62f5453bb7ebf580d0439a27743a89dbfde54f3420746628132a02fc91be93d2f0135c816a1d503809af5eb53259544861be671cb7c694a WHIRLPOOL da5a17361f65eed24cb1a84b9bad88dd2b2e487f6917eb8c9a95d943edab3844655c5e8a8d9a201308a79ee298fd8c46ae719775744dc778098ba81056f64b77
+EBUILD selinux-snmp-2.20170204-r3.ebuild 278 SHA256 44c4629d4a66aaac13ba7aa9de2296c3f9b8d517dde1b22c3fefe4e08973dab5 SHA512 a0b8a7cab13372b9c62f5453bb7ebf580d0439a27743a89dbfde54f3420746628132a02fc91be93d2f0135c816a1d503809af5eb53259544861be671cb7c694a WHIRLPOOL da5a17361f65eed24cb1a84b9bad88dd2b2e487f6917eb8c9a95d943edab3844655c5e8a8d9a201308a79ee298fd8c46ae719775744dc778098ba81056f64b77
+EBUILD selinux-snmp-2.20170204-r4.ebuild 278 SHA256 44c4629d4a66aaac13ba7aa9de2296c3f9b8d517dde1b22c3fefe4e08973dab5 SHA512 a0b8a7cab13372b9c62f5453bb7ebf580d0439a27743a89dbfde54f3420746628132a02fc91be93d2f0135c816a1d503809af5eb53259544861be671cb7c694a WHIRLPOOL da5a17361f65eed24cb1a84b9bad88dd2b2e487f6917eb8c9a95d943edab3844655c5e8a8d9a201308a79ee298fd8c46ae719775744dc778098ba81056f64b77
+EBUILD selinux-snmp-2.20170805-r2.ebuild 278 SHA256 44c4629d4a66aaac13ba7aa9de2296c3f9b8d517dde1b22c3fefe4e08973dab5 SHA512 a0b8a7cab13372b9c62f5453bb7ebf580d0439a27743a89dbfde54f3420746628132a02fc91be93d2f0135c816a1d503809af5eb53259544861be671cb7c694a WHIRLPOOL da5a17361f65eed24cb1a84b9bad88dd2b2e487f6917eb8c9a95d943edab3844655c5e8a8d9a201308a79ee298fd8c46ae719775744dc778098ba81056f64b77
+EBUILD selinux-snmp-2.20170805-r3.ebuild 280 SHA256 b3d94b41200bffabd58369f91d7984c817606af79f16fbcf2e7e94fb96895b8d SHA512 5d3731f8aa4c75c7e515e09a384aa66a37290c16b9ccf1f6476eac6368b058d3f1562a32cc5f8770e88a07035ea72976cf676d09fed54ca8a91ce29fc15d919d WHIRLPOOL 88cdf1b0c3a19c2cd1663d62a3bbe3a95fd15ed29125776b41a20cdc0c12f39aa71d56bdc451b56e22880436b1ac74bf939165c690b3511f8989033f0bd98da4
+EBUILD selinux-snmp-9999.ebuild 280 SHA256 b3d94b41200bffabd58369f91d7984c817606af79f16fbcf2e7e94fb96895b8d SHA512 5d3731f8aa4c75c7e515e09a384aa66a37290c16b9ccf1f6476eac6368b058d3f1562a32cc5f8770e88a07035ea72976cf676d09fed54ca8a91ce29fc15d919d WHIRLPOOL 88cdf1b0c3a19c2cd1663d62a3bbe3a95fd15ed29125776b41a20cdc0c12f39aa71d56bdc451b56e22880436b1ac74bf939165c690b3511f8989033f0bd98da4
 MISC ChangeLog 10387 SHA256 9b8c5529cd09e310a0478e0ad3c6b0d46c96d0853576c381d1ff7230301dfbf9 SHA512 7438043e562c67d28dda55d64af10891ef6c05172dd741dd27584e06851aa490bd03eda0ef4a120c8b9eea739adc30557cf30b6267ba7f9efca15be4f0dbb49b WHIRLPOOL 87ebcfe6291f358b9b16076fb8cad050657879582569eecb7a8abfe6b86597c28d50f22d9f71fd2e2ddb968569d28d68d7862fb52931e9ffd190a006a019e800
 MISC ChangeLog-2015 9675 SHA256 ba5d43426dc7d7df12c1ef49d5644c1d899846e154e232bb925ecae94905ec81 SHA512 b893236f75f4856da9ca898c06152ca201401569f35733fb47f15b617f0b765d0825956a6ec718a31df19e4b9acf0058fe2996de7e7711b1f8cd44f3e7b3ab94 WHIRLPOOL 4de2e3204f06bcac2d4d5b7e34dbb06fec015658b1ba9a7903d9d99cf11ed2b084e9dd7a4f95b1ea764e6356ea87fdd533fc23b18bcbd7bde0e573d144869305
 MISC metadata.xml 314 SHA256 de14c7b30cae21a9ec4093218f28172190e5426dc7057bfc97640421a477a865 SHA512 59b89808ea75eb3191a556a44d3be23f5d2f884cb0a195e3626bd11d03f0972d7a53bd15a509c8fb426f89a09e72a5485c6c12938dfe173a1f2e05dc999baee2 WHIRLPOOL a23f422b270544788030842af493f6ab6b46423218a37bdd14999f52f8ee241e5aad0ce634705f450bce34f5ddc0cc15451987656651e85d1fb8bd6eaf26e062
diff --git a/sec-policy/selinux-snmp/selinux-snmp-2.20170204-r1.ebuild b/sec-policy/selinux-snmp/selinux-snmp-2.20170204-r1.ebuild
index a74b9e35dbe2..b53a3244ca41 100644
--- a/sec-policy/selinux-snmp/selinux-snmp-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-snmp/selinux-snmp-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-snmp/selinux-snmp-2.20170204-r2.ebuild b/sec-policy/selinux-snmp/selinux-snmp-2.20170204-r2.ebuild
index 4c124978f900..01575533a1eb 100644
--- a/sec-policy/selinux-snmp/selinux-snmp-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-snmp/selinux-snmp-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-snmp/selinux-snmp-2.20170204-r3.ebuild b/sec-policy/selinux-snmp/selinux-snmp-2.20170204-r3.ebuild
index 4c124978f900..01575533a1eb 100644
--- a/sec-policy/selinux-snmp/selinux-snmp-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-snmp/selinux-snmp-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-snmp/selinux-snmp-2.20170204-r4.ebuild b/sec-policy/selinux-snmp/selinux-snmp-2.20170204-r4.ebuild
index 4c124978f900..01575533a1eb 100644
--- a/sec-policy/selinux-snmp/selinux-snmp-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-snmp/selinux-snmp-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-snmp/selinux-snmp-2.20170805-r2.ebuild b/sec-policy/selinux-snmp/selinux-snmp-2.20170805-r2.ebuild
index 4c124978f900..01575533a1eb 100644
--- a/sec-policy/selinux-snmp/selinux-snmp-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-snmp/selinux-snmp-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-snmp/selinux-snmp-2.20170805-r3.ebuild b/sec-policy/selinux-snmp/selinux-snmp-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..b53a3244ca41
--- /dev/null
+++ b/sec-policy/selinux-snmp/selinux-snmp-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-snmp/selinux-snmp-9999.ebuild b/sec-policy/selinux-snmp/selinux-snmp-9999.ebuild
index a74b9e35dbe2..b53a3244ca41 100644
--- a/sec-policy/selinux-snmp/selinux-snmp-9999.ebuild
+++ b/sec-policy/selinux-snmp/selinux-snmp-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-snort/Manifest b/sec-policy/selinux-snort/Manifest
index 45b8f62a17a1..e3d5d95feec2 100644
--- a/sec-policy/selinux-snort/Manifest
+++ b/sec-policy/selinux-snort/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-snort-2.20170204-r1.ebuild 281 SHA256 b8c2ac091a7d0f2cdbbe49107e59b2a941ca2f12433afe9daac97950c385b420 SHA512 2212cc24b1ceb73e4ae2431e9a057b17d0592cdedbe9f46ad2f7de21fe87e80e0bba0ad14b7932d7eb872da330b173a438a2235877bd596299a2ce261df5ce72 WHIRLPOOL 183e9de4c50f5ed2bace65fbd51ea30f41ef3b2bbb2d43b9e780c0458bf7d6b83d146ac946248b16e2aedb27106b157e627c9243ba42c84ff801baaf5757e6c0
-EBUILD selinux-snort-2.20170204-r2.ebuild 279 SHA256 4ec9d82c7991cb56b8842aa07ccd0e4b848f54394e1567dcbb951ccc9ae57f2e SHA512 e7081abbd59901c1a3906360783a216369af029cef22a8ddc179b57dc86414e576e900bbe1488627013f8eee9075d2e2ab03ed629dd233338d360a2178c12341 WHIRLPOOL 23a6709982e182ac8e839c2731e38b54ec5ddde59ddf157fac8e7a8b73eb0ccab57927f6cea870a2b43cb56207e15b8613d616d8684d14b64ed6f276f7962ea7
-EBUILD selinux-snort-2.20170204-r3.ebuild 279 SHA256 4ec9d82c7991cb56b8842aa07ccd0e4b848f54394e1567dcbb951ccc9ae57f2e SHA512 e7081abbd59901c1a3906360783a216369af029cef22a8ddc179b57dc86414e576e900bbe1488627013f8eee9075d2e2ab03ed629dd233338d360a2178c12341 WHIRLPOOL 23a6709982e182ac8e839c2731e38b54ec5ddde59ddf157fac8e7a8b73eb0ccab57927f6cea870a2b43cb56207e15b8613d616d8684d14b64ed6f276f7962ea7
-EBUILD selinux-snort-2.20170204-r4.ebuild 279 SHA256 4ec9d82c7991cb56b8842aa07ccd0e4b848f54394e1567dcbb951ccc9ae57f2e SHA512 e7081abbd59901c1a3906360783a216369af029cef22a8ddc179b57dc86414e576e900bbe1488627013f8eee9075d2e2ab03ed629dd233338d360a2178c12341 WHIRLPOOL 23a6709982e182ac8e839c2731e38b54ec5ddde59ddf157fac8e7a8b73eb0ccab57927f6cea870a2b43cb56207e15b8613d616d8684d14b64ed6f276f7962ea7
-EBUILD selinux-snort-2.20170805-r2.ebuild 279 SHA256 4ec9d82c7991cb56b8842aa07ccd0e4b848f54394e1567dcbb951ccc9ae57f2e SHA512 e7081abbd59901c1a3906360783a216369af029cef22a8ddc179b57dc86414e576e900bbe1488627013f8eee9075d2e2ab03ed629dd233338d360a2178c12341 WHIRLPOOL 23a6709982e182ac8e839c2731e38b54ec5ddde59ddf157fac8e7a8b73eb0ccab57927f6cea870a2b43cb56207e15b8613d616d8684d14b64ed6f276f7962ea7
-EBUILD selinux-snort-9999.ebuild 281 SHA256 b8c2ac091a7d0f2cdbbe49107e59b2a941ca2f12433afe9daac97950c385b420 SHA512 2212cc24b1ceb73e4ae2431e9a057b17d0592cdedbe9f46ad2f7de21fe87e80e0bba0ad14b7932d7eb872da330b173a438a2235877bd596299a2ce261df5ce72 WHIRLPOOL 183e9de4c50f5ed2bace65fbd51ea30f41ef3b2bbb2d43b9e780c0458bf7d6b83d146ac946248b16e2aedb27106b157e627c9243ba42c84ff801baaf5757e6c0
+EBUILD selinux-snort-2.20170204-r1.ebuild 282 SHA256 0d76646332fdde805da1dac311b0fa43cff508eaf0fd7c9262168ad3c0f599af SHA512 afc26103653cc637cd2274e11f75c6c18b3f4b9f8486783dd570d7833a1ca50095ed25538311e78f6945c5dd7b49601e205004dd888b49859d56cd022495d8bb WHIRLPOOL cb3862a12938e694c82681e82a6141dc2d43b1fb361e00dbabc0e99b6fc27918a7777b35dcc09389ae3e3784709da710ae3089847ce061d5917f1ea476bc758a
+EBUILD selinux-snort-2.20170204-r2.ebuild 280 SHA256 661e726c51330bd03328e5bcdcf90c709b23f5ca7a981ce1527f33f1c51c20e3 SHA512 f75d8e6fcaaef22865bd3ae19316c3f6afee07939d7e7f732879a946aecf6cc1ad016d0f40077c936d19ed26b0d4969443206537cffaa1cdc129c96771baa84f WHIRLPOOL 59eea070c58a51289772822e0464f8c0f32b6761dedee9ea3e226323faf14e27edfd0c0486290b6fcc55293b639638d81cf9c8761435f220085a07d7cca475d7
+EBUILD selinux-snort-2.20170204-r3.ebuild 280 SHA256 661e726c51330bd03328e5bcdcf90c709b23f5ca7a981ce1527f33f1c51c20e3 SHA512 f75d8e6fcaaef22865bd3ae19316c3f6afee07939d7e7f732879a946aecf6cc1ad016d0f40077c936d19ed26b0d4969443206537cffaa1cdc129c96771baa84f WHIRLPOOL 59eea070c58a51289772822e0464f8c0f32b6761dedee9ea3e226323faf14e27edfd0c0486290b6fcc55293b639638d81cf9c8761435f220085a07d7cca475d7
+EBUILD selinux-snort-2.20170204-r4.ebuild 280 SHA256 661e726c51330bd03328e5bcdcf90c709b23f5ca7a981ce1527f33f1c51c20e3 SHA512 f75d8e6fcaaef22865bd3ae19316c3f6afee07939d7e7f732879a946aecf6cc1ad016d0f40077c936d19ed26b0d4969443206537cffaa1cdc129c96771baa84f WHIRLPOOL 59eea070c58a51289772822e0464f8c0f32b6761dedee9ea3e226323faf14e27edfd0c0486290b6fcc55293b639638d81cf9c8761435f220085a07d7cca475d7
+EBUILD selinux-snort-2.20170805-r2.ebuild 280 SHA256 661e726c51330bd03328e5bcdcf90c709b23f5ca7a981ce1527f33f1c51c20e3 SHA512 f75d8e6fcaaef22865bd3ae19316c3f6afee07939d7e7f732879a946aecf6cc1ad016d0f40077c936d19ed26b0d4969443206537cffaa1cdc129c96771baa84f WHIRLPOOL 59eea070c58a51289772822e0464f8c0f32b6761dedee9ea3e226323faf14e27edfd0c0486290b6fcc55293b639638d81cf9c8761435f220085a07d7cca475d7
+EBUILD selinux-snort-2.20170805-r3.ebuild 282 SHA256 0d76646332fdde805da1dac311b0fa43cff508eaf0fd7c9262168ad3c0f599af SHA512 afc26103653cc637cd2274e11f75c6c18b3f4b9f8486783dd570d7833a1ca50095ed25538311e78f6945c5dd7b49601e205004dd888b49859d56cd022495d8bb WHIRLPOOL cb3862a12938e694c82681e82a6141dc2d43b1fb361e00dbabc0e99b6fc27918a7777b35dcc09389ae3e3784709da710ae3089847ce061d5917f1ea476bc758a
+EBUILD selinux-snort-9999.ebuild 282 SHA256 0d76646332fdde805da1dac311b0fa43cff508eaf0fd7c9262168ad3c0f599af SHA512 afc26103653cc637cd2274e11f75c6c18b3f4b9f8486783dd570d7833a1ca50095ed25538311e78f6945c5dd7b49601e205004dd888b49859d56cd022495d8bb WHIRLPOOL cb3862a12938e694c82681e82a6141dc2d43b1fb361e00dbabc0e99b6fc27918a7777b35dcc09389ae3e3784709da710ae3089847ce061d5917f1ea476bc758a
 MISC ChangeLog 10479 SHA256 6c31d6cddf01411acc3b0433a7aafddc4214d68d9f3ede1fdedba1f85246010f SHA512 b0c1491b16aae2c24e3ce6b4a280bfccce67d1ee3b8911c09658dc99f370c339ec32f5da84067b652bdcc74134965252f9e55eb53e6fecd57357f358185bab45 WHIRLPOOL 7b5fb366aa52bb63aedd67eb72dab71b541e1af19225e5278d296ecccdbe1d28195bb1b88aefae06a1ba6570b8feb0807be299dbe94438df6ae2fc4998b60738
 MISC ChangeLog-2015 12730 SHA256 83548d1f239ba6bd23b17d964ebb49d62d84e9e9a80d8560aedec9ae9741f49c SHA512 76f7affe866a95d8c0ce4abb3622cc8ea2d6d521c6383a85a081b15bfb0ae8c79302186a3f934c73412740f3fbf361147e114d96f6fbab24986c2743acd3df91 WHIRLPOOL 248ff81aa513511c2fe473e538961afe4198e7678bc20cef204870debee8a3dcafd876300ba6e71c155bcac9547bd993eda8883aefcd044e26529bf460311456
 MISC metadata.xml 315 SHA256 901efbd94fd1f7e296823abaff35e9295b3561d5eec7d8d49dc335694b396bac SHA512 84eaf9d6b3a721099ebb825ffb0efb1d5bb4b17b5e8181cdd6bd59028047f6458b3444c5fd2ec970f848de4b6c5d03b8242cadf3d7c99918bb1f09babbdfcdc8 WHIRLPOOL f8593419dae2eda550fcacf1457840acdf1676ce56808aac8332bfe29cb8c71b348f396d12833d8ab3ea7b0096ab013c839140df94355e546f53226b446d5516
diff --git a/sec-policy/selinux-snort/selinux-snort-2.20170204-r1.ebuild b/sec-policy/selinux-snort/selinux-snort-2.20170204-r1.ebuild
index f19b8bb44af9..d0581e4cfde6 100644
--- a/sec-policy/selinux-snort/selinux-snort-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-snort/selinux-snort-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-snort/selinux-snort-2.20170204-r2.ebuild b/sec-policy/selinux-snort/selinux-snort-2.20170204-r2.ebuild
index cd90e4bd19a6..08d277ba8239 100644
--- a/sec-policy/selinux-snort/selinux-snort-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-snort/selinux-snort-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-snort/selinux-snort-2.20170204-r3.ebuild b/sec-policy/selinux-snort/selinux-snort-2.20170204-r3.ebuild
index cd90e4bd19a6..08d277ba8239 100644
--- a/sec-policy/selinux-snort/selinux-snort-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-snort/selinux-snort-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-snort/selinux-snort-2.20170204-r4.ebuild b/sec-policy/selinux-snort/selinux-snort-2.20170204-r4.ebuild
index cd90e4bd19a6..08d277ba8239 100644
--- a/sec-policy/selinux-snort/selinux-snort-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-snort/selinux-snort-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-snort/selinux-snort-2.20170805-r2.ebuild b/sec-policy/selinux-snort/selinux-snort-2.20170805-r2.ebuild
index cd90e4bd19a6..08d277ba8239 100644
--- a/sec-policy/selinux-snort/selinux-snort-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-snort/selinux-snort-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-snort/selinux-snort-2.20170805-r3.ebuild b/sec-policy/selinux-snort/selinux-snort-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..d0581e4cfde6
--- /dev/null
+++ b/sec-policy/selinux-snort/selinux-snort-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-snort/selinux-snort-9999.ebuild b/sec-policy/selinux-snort/selinux-snort-9999.ebuild
index f19b8bb44af9..d0581e4cfde6 100644
--- a/sec-policy/selinux-snort/selinux-snort-9999.ebuild
+++ b/sec-policy/selinux-snort/selinux-snort-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-soundserver/Manifest b/sec-policy/selinux-soundserver/Manifest
index a4dad0725828..e8aa98617e16 100644
--- a/sec-policy/selinux-soundserver/Manifest
+++ b/sec-policy/selinux-soundserver/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-soundserver-2.20170204-r1.ebuild 293 SHA256 d7d59955ea10a69d94f7b0d5afe3c63bcbcc189054f4528a2feee411465d6ce2 SHA512 9c6273ebdccf791f971ba4bcae7ffe791551752ca95e6da2decde1fef1f51bc94d7c4e684434fb450a229fab3968f115837a958033e6a06d2097435ffdbcfb25 WHIRLPOOL 477f3ef66a5bd56c1c3a44f643d9153273f427bca8741dd465bd40c9342c8bc8d475b93a81980864e3bd600efadec05a05e9fd379f21b330736cb425afdeb90d
-EBUILD selinux-soundserver-2.20170204-r2.ebuild 291 SHA256 8ed7940873bba8450559ae941be5ce06dd27169412f57f108117bef5b04ed2b9 SHA512 8f539e0d156cc4e30e36018a180723fe61a6aadb15052dc392b4965e30cab2fdaf818499439a8eaf632e6f98ed5c072588bff3a8fb0414c0a127317c3d65b78c WHIRLPOOL 77d7b5ec23a80cfcbc0824cf38bf5b384f6f3a900071f7c7916129bfa5a8804b3b683b97534c5e2349d04a3e6fec2b11f9cd6abe6ea800f7e442098063afe221
-EBUILD selinux-soundserver-2.20170204-r3.ebuild 291 SHA256 8ed7940873bba8450559ae941be5ce06dd27169412f57f108117bef5b04ed2b9 SHA512 8f539e0d156cc4e30e36018a180723fe61a6aadb15052dc392b4965e30cab2fdaf818499439a8eaf632e6f98ed5c072588bff3a8fb0414c0a127317c3d65b78c WHIRLPOOL 77d7b5ec23a80cfcbc0824cf38bf5b384f6f3a900071f7c7916129bfa5a8804b3b683b97534c5e2349d04a3e6fec2b11f9cd6abe6ea800f7e442098063afe221
-EBUILD selinux-soundserver-2.20170204-r4.ebuild 291 SHA256 8ed7940873bba8450559ae941be5ce06dd27169412f57f108117bef5b04ed2b9 SHA512 8f539e0d156cc4e30e36018a180723fe61a6aadb15052dc392b4965e30cab2fdaf818499439a8eaf632e6f98ed5c072588bff3a8fb0414c0a127317c3d65b78c WHIRLPOOL 77d7b5ec23a80cfcbc0824cf38bf5b384f6f3a900071f7c7916129bfa5a8804b3b683b97534c5e2349d04a3e6fec2b11f9cd6abe6ea800f7e442098063afe221
-EBUILD selinux-soundserver-2.20170805-r2.ebuild 291 SHA256 8ed7940873bba8450559ae941be5ce06dd27169412f57f108117bef5b04ed2b9 SHA512 8f539e0d156cc4e30e36018a180723fe61a6aadb15052dc392b4965e30cab2fdaf818499439a8eaf632e6f98ed5c072588bff3a8fb0414c0a127317c3d65b78c WHIRLPOOL 77d7b5ec23a80cfcbc0824cf38bf5b384f6f3a900071f7c7916129bfa5a8804b3b683b97534c5e2349d04a3e6fec2b11f9cd6abe6ea800f7e442098063afe221
-EBUILD selinux-soundserver-9999.ebuild 293 SHA256 d7d59955ea10a69d94f7b0d5afe3c63bcbcc189054f4528a2feee411465d6ce2 SHA512 9c6273ebdccf791f971ba4bcae7ffe791551752ca95e6da2decde1fef1f51bc94d7c4e684434fb450a229fab3968f115837a958033e6a06d2097435ffdbcfb25 WHIRLPOOL 477f3ef66a5bd56c1c3a44f643d9153273f427bca8741dd465bd40c9342c8bc8d475b93a81980864e3bd600efadec05a05e9fd379f21b330736cb425afdeb90d
+EBUILD selinux-soundserver-2.20170204-r1.ebuild 294 SHA256 8054152aceea9d7f5e917678bc4649165deb9f742c1ad9004bec92ed5b2e9c27 SHA512 8e5e82c447ac33e73257a73640e2d7ce4f267b105bc80027ae711eebe97c3c1610d0fe706e0a994001ce97dd15d1eeca537e2f24e32e312d261de18f02e0e66b WHIRLPOOL bc8b28658538bee4c8e9d0ee00505aa7c87d522fd05caef6501db8eb559fd270d53b6f40566a298c14c1d97ae0bd68dc05e483b99b641cf9b16d6d412faa55c7
+EBUILD selinux-soundserver-2.20170204-r2.ebuild 292 SHA256 8448de637adf6470ec843cc6a45352605cfb5ccacae213ca9180026bee8cdcea SHA512 00f90a83f857c29cbf0a2d56b84edc4390a0576a7ddeb9e4b8c3775e2a2be076cbeb113cfedafc7d840866ae691248759b7ae91fbabb6091e1bf6b5e8197d5a1 WHIRLPOOL 15e06af2b3f45a804706335f38a73b65a236c1e86c040d8c6b7b0df0278cd8b261bd5b01c7822eb668111dd9827b81db26eb7523e27f1e2ec6e5229b90900ec9
+EBUILD selinux-soundserver-2.20170204-r3.ebuild 292 SHA256 8448de637adf6470ec843cc6a45352605cfb5ccacae213ca9180026bee8cdcea SHA512 00f90a83f857c29cbf0a2d56b84edc4390a0576a7ddeb9e4b8c3775e2a2be076cbeb113cfedafc7d840866ae691248759b7ae91fbabb6091e1bf6b5e8197d5a1 WHIRLPOOL 15e06af2b3f45a804706335f38a73b65a236c1e86c040d8c6b7b0df0278cd8b261bd5b01c7822eb668111dd9827b81db26eb7523e27f1e2ec6e5229b90900ec9
+EBUILD selinux-soundserver-2.20170204-r4.ebuild 292 SHA256 8448de637adf6470ec843cc6a45352605cfb5ccacae213ca9180026bee8cdcea SHA512 00f90a83f857c29cbf0a2d56b84edc4390a0576a7ddeb9e4b8c3775e2a2be076cbeb113cfedafc7d840866ae691248759b7ae91fbabb6091e1bf6b5e8197d5a1 WHIRLPOOL 15e06af2b3f45a804706335f38a73b65a236c1e86c040d8c6b7b0df0278cd8b261bd5b01c7822eb668111dd9827b81db26eb7523e27f1e2ec6e5229b90900ec9
+EBUILD selinux-soundserver-2.20170805-r2.ebuild 292 SHA256 8448de637adf6470ec843cc6a45352605cfb5ccacae213ca9180026bee8cdcea SHA512 00f90a83f857c29cbf0a2d56b84edc4390a0576a7ddeb9e4b8c3775e2a2be076cbeb113cfedafc7d840866ae691248759b7ae91fbabb6091e1bf6b5e8197d5a1 WHIRLPOOL 15e06af2b3f45a804706335f38a73b65a236c1e86c040d8c6b7b0df0278cd8b261bd5b01c7822eb668111dd9827b81db26eb7523e27f1e2ec6e5229b90900ec9
+EBUILD selinux-soundserver-2.20170805-r3.ebuild 294 SHA256 8054152aceea9d7f5e917678bc4649165deb9f742c1ad9004bec92ed5b2e9c27 SHA512 8e5e82c447ac33e73257a73640e2d7ce4f267b105bc80027ae711eebe97c3c1610d0fe706e0a994001ce97dd15d1eeca537e2f24e32e312d261de18f02e0e66b WHIRLPOOL bc8b28658538bee4c8e9d0ee00505aa7c87d522fd05caef6501db8eb559fd270d53b6f40566a298c14c1d97ae0bd68dc05e483b99b641cf9b16d6d412faa55c7
+EBUILD selinux-soundserver-9999.ebuild 294 SHA256 8054152aceea9d7f5e917678bc4649165deb9f742c1ad9004bec92ed5b2e9c27 SHA512 8e5e82c447ac33e73257a73640e2d7ce4f267b105bc80027ae711eebe97c3c1610d0fe706e0a994001ce97dd15d1eeca537e2f24e32e312d261de18f02e0e66b WHIRLPOOL bc8b28658538bee4c8e9d0ee00505aa7c87d522fd05caef6501db8eb559fd270d53b6f40566a298c14c1d97ae0bd68dc05e483b99b641cf9b16d6d412faa55c7
 MISC ChangeLog 11071 SHA256 611961d9cd0661486cd3edd9f8b4e9d182d80ee667b809a858303e31965e23dd SHA512 772f7b006c610f2b47bc7898d860fbc3ed17607dd7b647163a83d072f22701fd3767ca025f16495cdb57c5e8ec2bd0330f61a08c8e696abe071c26fdfe2369b4 WHIRLPOOL db76dad8519ef706cc4dbd1c1711c44b26480448cd7ee309e6170341f4115123b58be69353081668958a769b3dfafc3b64491d137494d6051030d3409ae7b658
 MISC ChangeLog-2015 10451 SHA256 84d547d0fb868df3503f5ab45ce68b1b47d5fe98a1730af9b8016472ecdfa191 SHA512 d57fe46b03c43daeebf3d919aa690078aef21381316e255d82501c4e2b8551801e61d8c3c7bc0b6d86d93a0a61d165a99dc576bc8e22b2a3294061e9f284039a WHIRLPOOL 04b906c5b7a3f1198a15ad22359748df77df847e449141099b98ab69cf795cb574541c967957c6feb8d03590708521b76ce2cb2a6ffcba1d2ec002424ccb3253
 MISC metadata.xml 321 SHA256 17ebfdf2cad986c6fe1890a58fe559eb750319f543ebf5e9e0bc3fbaec5a152e SHA512 b9da9a501ff24e1b78750de04a1611143d7ef73e228018cd676cbc2d92624191acbe8b97fe640111184dd5460b7944f4f690994b8aceb64cb6ded5e418d87da7 WHIRLPOOL 7050eb8204f9dffecdd9786530f3c3d9eb8b4e7ff1ab57baed1c6d6275048714bff44ac5bfa38604af155405d3ab86be846473485b5991116f5fd38f4f5d46aa
diff --git a/sec-policy/selinux-soundserver/selinux-soundserver-2.20170204-r1.ebuild b/sec-policy/selinux-soundserver/selinux-soundserver-2.20170204-r1.ebuild
index b4d1899af0b5..b71c67387f96 100644
--- a/sec-policy/selinux-soundserver/selinux-soundserver-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-soundserver/selinux-soundserver-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-soundserver/selinux-soundserver-2.20170204-r2.ebuild b/sec-policy/selinux-soundserver/selinux-soundserver-2.20170204-r2.ebuild
index 1974e1e8a299..7834a39e4c90 100644
--- a/sec-policy/selinux-soundserver/selinux-soundserver-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-soundserver/selinux-soundserver-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-soundserver/selinux-soundserver-2.20170204-r3.ebuild b/sec-policy/selinux-soundserver/selinux-soundserver-2.20170204-r3.ebuild
index 1974e1e8a299..7834a39e4c90 100644
--- a/sec-policy/selinux-soundserver/selinux-soundserver-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-soundserver/selinux-soundserver-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-soundserver/selinux-soundserver-2.20170204-r4.ebuild b/sec-policy/selinux-soundserver/selinux-soundserver-2.20170204-r4.ebuild
index 1974e1e8a299..7834a39e4c90 100644
--- a/sec-policy/selinux-soundserver/selinux-soundserver-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-soundserver/selinux-soundserver-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-soundserver/selinux-soundserver-2.20170805-r2.ebuild b/sec-policy/selinux-soundserver/selinux-soundserver-2.20170805-r2.ebuild
index 1974e1e8a299..7834a39e4c90 100644
--- a/sec-policy/selinux-soundserver/selinux-soundserver-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-soundserver/selinux-soundserver-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-soundserver/selinux-soundserver-2.20170805-r3.ebuild b/sec-policy/selinux-soundserver/selinux-soundserver-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..b71c67387f96
--- /dev/null
+++ b/sec-policy/selinux-soundserver/selinux-soundserver-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-soundserver/selinux-soundserver-9999.ebuild b/sec-policy/selinux-soundserver/selinux-soundserver-9999.ebuild
index b4d1899af0b5..b71c67387f96 100644
--- a/sec-policy/selinux-soundserver/selinux-soundserver-9999.ebuild
+++ b/sec-policy/selinux-soundserver/selinux-soundserver-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-spamassassin/Manifest b/sec-policy/selinux-spamassassin/Manifest
index 85cb0fe87434..7c6077d52e46 100644
--- a/sec-policy/selinux-spamassassin/Manifest
+++ b/sec-policy/selinux-spamassassin/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-spamassassin-2.20170204-r1.ebuild 295 SHA256 5700fc9a2616cfce7489ce44f6241c60a9ae3dc9febe653b6d5fac9846b71a32 SHA512 be682c19c5d4858b333aa867b771694d914b3a6034c6f6a2e56ec023a6e30c4388821753b632c2fbeb383e6939d5fa49f6978bab6d5446e51b8404238ee2d4d0 WHIRLPOOL 66314719b9159d0272538f519bb1b555c05d7f686330cb3279e8156256f37a894c3b6cbd50bfe067d5100d320d7a8617e158803cfd146cc81e420b567a1cff0e
-EBUILD selinux-spamassassin-2.20170204-r2.ebuild 293 SHA256 d479d66a2a78b613c97ac94712222f24ad567d4e5171b73d99ccfed829750dc6 SHA512 d64b3189b59714f431bd8e6a40928bdad8330c40803b5a2439ab821882b0bd87662974b04ca833da3344277944d28792d115d4dbd57954c5bdf04559fdc622c9 WHIRLPOOL 0af0617e2d698c1ae60936ea7f4cfd657f89aaf3e13e928f89afccacfd2970915d7b7ef094d5dc336400dd919ad8706d9aaf958bfef600034cf83a7982253d71
-EBUILD selinux-spamassassin-2.20170204-r3.ebuild 293 SHA256 d479d66a2a78b613c97ac94712222f24ad567d4e5171b73d99ccfed829750dc6 SHA512 d64b3189b59714f431bd8e6a40928bdad8330c40803b5a2439ab821882b0bd87662974b04ca833da3344277944d28792d115d4dbd57954c5bdf04559fdc622c9 WHIRLPOOL 0af0617e2d698c1ae60936ea7f4cfd657f89aaf3e13e928f89afccacfd2970915d7b7ef094d5dc336400dd919ad8706d9aaf958bfef600034cf83a7982253d71
-EBUILD selinux-spamassassin-2.20170204-r4.ebuild 293 SHA256 d479d66a2a78b613c97ac94712222f24ad567d4e5171b73d99ccfed829750dc6 SHA512 d64b3189b59714f431bd8e6a40928bdad8330c40803b5a2439ab821882b0bd87662974b04ca833da3344277944d28792d115d4dbd57954c5bdf04559fdc622c9 WHIRLPOOL 0af0617e2d698c1ae60936ea7f4cfd657f89aaf3e13e928f89afccacfd2970915d7b7ef094d5dc336400dd919ad8706d9aaf958bfef600034cf83a7982253d71
-EBUILD selinux-spamassassin-2.20170805-r2.ebuild 293 SHA256 d479d66a2a78b613c97ac94712222f24ad567d4e5171b73d99ccfed829750dc6 SHA512 d64b3189b59714f431bd8e6a40928bdad8330c40803b5a2439ab821882b0bd87662974b04ca833da3344277944d28792d115d4dbd57954c5bdf04559fdc622c9 WHIRLPOOL 0af0617e2d698c1ae60936ea7f4cfd657f89aaf3e13e928f89afccacfd2970915d7b7ef094d5dc336400dd919ad8706d9aaf958bfef600034cf83a7982253d71
-EBUILD selinux-spamassassin-9999.ebuild 295 SHA256 5700fc9a2616cfce7489ce44f6241c60a9ae3dc9febe653b6d5fac9846b71a32 SHA512 be682c19c5d4858b333aa867b771694d914b3a6034c6f6a2e56ec023a6e30c4388821753b632c2fbeb383e6939d5fa49f6978bab6d5446e51b8404238ee2d4d0 WHIRLPOOL 66314719b9159d0272538f519bb1b555c05d7f686330cb3279e8156256f37a894c3b6cbd50bfe067d5100d320d7a8617e158803cfd146cc81e420b567a1cff0e
+EBUILD selinux-spamassassin-2.20170204-r1.ebuild 296 SHA256 d27e893255505565184b046af0d0b8958524ccb309e278204d99720b34698c4d SHA512 511f8d4899c73226f32b049581e42a953628ca71e57f4c36c63d6fcfbfc87d2216c77d77430db6992cdafac84b2c0701fe1f9091d803004c7ea1fc3c179983c1 WHIRLPOOL b2086b69509fcae9761eae74544806843e84d6a4843bfbeb3c0ba96b0cfca583fa916a6f5d67368ada1a6145dc7fc4ee692ba6b4c92dd8a6344eb7eaef7df911
+EBUILD selinux-spamassassin-2.20170204-r2.ebuild 294 SHA256 0c9f9b229262fba27c9fcadf46393e5fa852f1096587451436a06d792d675dda SHA512 3f8ee61539a1c9cd22e2a41f2185c53b0243f118697ab22a56857af22035ea925810e04eb4557724181a490bec7e1c0b00824eb48259fdc4289ada7e168ef5ad WHIRLPOOL ddf395a6d980330a1e9448f3b2463d90de6688c98757611c187cccdfcae93233a455ef566184fb6675e8a41c5b261e4c0e36bf047a772b87ff580ce82a69f8f2
+EBUILD selinux-spamassassin-2.20170204-r3.ebuild 294 SHA256 0c9f9b229262fba27c9fcadf46393e5fa852f1096587451436a06d792d675dda SHA512 3f8ee61539a1c9cd22e2a41f2185c53b0243f118697ab22a56857af22035ea925810e04eb4557724181a490bec7e1c0b00824eb48259fdc4289ada7e168ef5ad WHIRLPOOL ddf395a6d980330a1e9448f3b2463d90de6688c98757611c187cccdfcae93233a455ef566184fb6675e8a41c5b261e4c0e36bf047a772b87ff580ce82a69f8f2
+EBUILD selinux-spamassassin-2.20170204-r4.ebuild 294 SHA256 0c9f9b229262fba27c9fcadf46393e5fa852f1096587451436a06d792d675dda SHA512 3f8ee61539a1c9cd22e2a41f2185c53b0243f118697ab22a56857af22035ea925810e04eb4557724181a490bec7e1c0b00824eb48259fdc4289ada7e168ef5ad WHIRLPOOL ddf395a6d980330a1e9448f3b2463d90de6688c98757611c187cccdfcae93233a455ef566184fb6675e8a41c5b261e4c0e36bf047a772b87ff580ce82a69f8f2
+EBUILD selinux-spamassassin-2.20170805-r2.ebuild 294 SHA256 0c9f9b229262fba27c9fcadf46393e5fa852f1096587451436a06d792d675dda SHA512 3f8ee61539a1c9cd22e2a41f2185c53b0243f118697ab22a56857af22035ea925810e04eb4557724181a490bec7e1c0b00824eb48259fdc4289ada7e168ef5ad WHIRLPOOL ddf395a6d980330a1e9448f3b2463d90de6688c98757611c187cccdfcae93233a455ef566184fb6675e8a41c5b261e4c0e36bf047a772b87ff580ce82a69f8f2
+EBUILD selinux-spamassassin-2.20170805-r3.ebuild 296 SHA256 d27e893255505565184b046af0d0b8958524ccb309e278204d99720b34698c4d SHA512 511f8d4899c73226f32b049581e42a953628ca71e57f4c36c63d6fcfbfc87d2216c77d77430db6992cdafac84b2c0701fe1f9091d803004c7ea1fc3c179983c1 WHIRLPOOL b2086b69509fcae9761eae74544806843e84d6a4843bfbeb3c0ba96b0cfca583fa916a6f5d67368ada1a6145dc7fc4ee692ba6b4c92dd8a6344eb7eaef7df911
+EBUILD selinux-spamassassin-9999.ebuild 296 SHA256 d27e893255505565184b046af0d0b8958524ccb309e278204d99720b34698c4d SHA512 511f8d4899c73226f32b049581e42a953628ca71e57f4c36c63d6fcfbfc87d2216c77d77430db6992cdafac84b2c0701fe1f9091d803004c7ea1fc3c179983c1 WHIRLPOOL b2086b69509fcae9761eae74544806843e84d6a4843bfbeb3c0ba96b0cfca583fa916a6f5d67368ada1a6145dc7fc4ee692ba6b4c92dd8a6344eb7eaef7df911
 MISC ChangeLog 11167 SHA256 7b2e33c0ce1924d0c74ada7d16eb666f627cf64200f8c3f8637d53dd66a9e0b9 SHA512 3ba8ec0ce1ec6e84ddeec14423c0712dd226354a7a7c4a58d9d47173943dbd7f73dc9bdd7c3ad6df918f38bbda9dcc18042867b191834c10153eff102c0fe4f3 WHIRLPOOL 34970a348b014f16893ea78688c969c9b22c8af18b265d830ab1125b66edab2441458994ecb2aead3bebc3b1dd22078b213ec790ec92f8512655f70922e6561c
 MISC ChangeLog-2015 15345 SHA256 3a898d9349ef8cf0f2925e38bf7ca8ec33786596ebd55fddce59cd32dcb5f4c0 SHA512 f9b6b82b0743bbb254ed0b028fed2f8fde8c215a693f6ca1edbdfa518c41db664482d2d48e2bf417eaf0cf12d909b6498ab3c4937594e4996dfb1cb1ee138aad WHIRLPOOL a5b6e58328d472d3a9eccd683e1dfe6a47862907b3c1463fa422ad1167fed4e022cff053fb279cc7b8c0236e0410dec7be3c68e1812a04977b967096c01b09d8
 MISC metadata.xml 322 SHA256 67deeb7107aeed7ff19cd2d939043a74057940e716fc27ac1bbf828b1622636c SHA512 345132094265e24dad21ecc976e75750a363d6773ef83fd63c53ea744b8d3afcd9504d1e63f6758ed54e85cb8e3461e65dfb72bc67f5a63c21c50d9e71dc90ef WHIRLPOOL 1edea02883394a012d9940ee4491ea43bcbcbcceb932ad56e1bad4cf7c4ae271e013e0dbf8788fdc4cd6d741716512e42b548c0277add86bf75ed158475311af
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20170204-r1.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20170204-r1.ebuild
index 8be55a89b3f0..bcd8854a85b4 100644
--- a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20170204-r2.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20170204-r2.ebuild
index fe1b9f705bd1..97b3d713e960 100644
--- a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20170204-r3.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20170204-r3.ebuild
index fe1b9f705bd1..97b3d713e960 100644
--- a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20170204-r4.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20170204-r4.ebuild
index fe1b9f705bd1..97b3d713e960 100644
--- a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20170805-r2.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20170805-r2.ebuild
index fe1b9f705bd1..97b3d713e960 100644
--- a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20170805-r3.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..bcd8854a85b4
--- /dev/null
+++ b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-spamassassin/selinux-spamassassin-9999.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-9999.ebuild
index 8be55a89b3f0..bcd8854a85b4 100644
--- a/sec-policy/selinux-spamassassin/selinux-spamassassin-9999.ebuild
+++ b/sec-policy/selinux-spamassassin/selinux-spamassassin-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-speedtouch/Manifest b/sec-policy/selinux-speedtouch/Manifest
index c926c04ac48a..b053c627aec1 100644
--- a/sec-policy/selinux-speedtouch/Manifest
+++ b/sec-policy/selinux-speedtouch/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-speedtouch-2.20170204-r1.ebuild 291 SHA256 51bfcd387ab32d4e4585720ff81c7e679dae39538ea95785b1774276b7b752e9 SHA512 3c295ad4137f5b142e13a860999789089813de83a4baaa65ee06625f0ddd19da6b2b5ca1231ac59e1c4f9c1a452aa651a0f00bc6613f5c48afbacee427233f5c WHIRLPOOL bdc5cdee09a48c8c67f7b1726dc479a8822fe4ec31be1e1abf23c871eccc034b2b285a2252e9e8b25c8238fea1c70ade6916af06ac940def20897aa641502c50
-EBUILD selinux-speedtouch-2.20170204-r2.ebuild 289 SHA256 aeec40da54380c007f6e4164fe650100678abcd632a16f8ba14a49637425ac21 SHA512 22b60b09398d06f5f7ad2fb68189f89dea92f0d2427c1ffdb76cf3f8207ea9ca0c438a47b579bd069e64aeebd9edb963fea2c8a97e092a7fa666ec40c7957938 WHIRLPOOL 247689520517f55afce9fb74f5cc188f115520ba03c6356180907038d27584a53246c1e764d951e42cd4d017ec541c5fadb32526b91804d64d5e1c2eb78bc514
-EBUILD selinux-speedtouch-2.20170204-r3.ebuild 289 SHA256 aeec40da54380c007f6e4164fe650100678abcd632a16f8ba14a49637425ac21 SHA512 22b60b09398d06f5f7ad2fb68189f89dea92f0d2427c1ffdb76cf3f8207ea9ca0c438a47b579bd069e64aeebd9edb963fea2c8a97e092a7fa666ec40c7957938 WHIRLPOOL 247689520517f55afce9fb74f5cc188f115520ba03c6356180907038d27584a53246c1e764d951e42cd4d017ec541c5fadb32526b91804d64d5e1c2eb78bc514
-EBUILD selinux-speedtouch-2.20170204-r4.ebuild 289 SHA256 aeec40da54380c007f6e4164fe650100678abcd632a16f8ba14a49637425ac21 SHA512 22b60b09398d06f5f7ad2fb68189f89dea92f0d2427c1ffdb76cf3f8207ea9ca0c438a47b579bd069e64aeebd9edb963fea2c8a97e092a7fa666ec40c7957938 WHIRLPOOL 247689520517f55afce9fb74f5cc188f115520ba03c6356180907038d27584a53246c1e764d951e42cd4d017ec541c5fadb32526b91804d64d5e1c2eb78bc514
-EBUILD selinux-speedtouch-2.20170805-r2.ebuild 289 SHA256 aeec40da54380c007f6e4164fe650100678abcd632a16f8ba14a49637425ac21 SHA512 22b60b09398d06f5f7ad2fb68189f89dea92f0d2427c1ffdb76cf3f8207ea9ca0c438a47b579bd069e64aeebd9edb963fea2c8a97e092a7fa666ec40c7957938 WHIRLPOOL 247689520517f55afce9fb74f5cc188f115520ba03c6356180907038d27584a53246c1e764d951e42cd4d017ec541c5fadb32526b91804d64d5e1c2eb78bc514
-EBUILD selinux-speedtouch-9999.ebuild 291 SHA256 51bfcd387ab32d4e4585720ff81c7e679dae39538ea95785b1774276b7b752e9 SHA512 3c295ad4137f5b142e13a860999789089813de83a4baaa65ee06625f0ddd19da6b2b5ca1231ac59e1c4f9c1a452aa651a0f00bc6613f5c48afbacee427233f5c WHIRLPOOL bdc5cdee09a48c8c67f7b1726dc479a8822fe4ec31be1e1abf23c871eccc034b2b285a2252e9e8b25c8238fea1c70ade6916af06ac940def20897aa641502c50
+EBUILD selinux-speedtouch-2.20170204-r1.ebuild 292 SHA256 fd50f31a3dcd18f03fd19d9390e437e4d73c317103e2adb75a92c39cecd80866 SHA512 6137f4e95ed00fc55f45982fc921a847020e022f48340a42438e04e1a5c1705de4755ca290247083ea7e5e365e5ca42eb43a2b2bcb22dc3b4471d38fbd5f8baa WHIRLPOOL dc3430eaef35545fe0583d3695b15705d885d61e7a70445ea94876aa19fa61f88859814876fac128af9739083bf15f8a5c7301fc8d953e9d8bb465a276aae550
+EBUILD selinux-speedtouch-2.20170204-r2.ebuild 290 SHA256 87a1677dde2c8b2e7a40294c7fcbf7497fd9727848144efbb825c6a2b635360d SHA512 60fe13ba6eb98bd179e301fde358c0207a8a4c21bf12f5458ba77bb2b059fe25ecc7de27ee18f2140a5b12aa6977ac1706768a6c0fb6dad04027bc3904a09d4a WHIRLPOOL e4e545e75c3cc1a775e565eb78fb394c49a162c5003bdbdc3fa0c89f04bfcb8fb268fa7bb0e3b919b7c145e9a9d009f5c1918dd10c2e590c1f6e0763475c1d73
+EBUILD selinux-speedtouch-2.20170204-r3.ebuild 290 SHA256 87a1677dde2c8b2e7a40294c7fcbf7497fd9727848144efbb825c6a2b635360d SHA512 60fe13ba6eb98bd179e301fde358c0207a8a4c21bf12f5458ba77bb2b059fe25ecc7de27ee18f2140a5b12aa6977ac1706768a6c0fb6dad04027bc3904a09d4a WHIRLPOOL e4e545e75c3cc1a775e565eb78fb394c49a162c5003bdbdc3fa0c89f04bfcb8fb268fa7bb0e3b919b7c145e9a9d009f5c1918dd10c2e590c1f6e0763475c1d73
+EBUILD selinux-speedtouch-2.20170204-r4.ebuild 290 SHA256 87a1677dde2c8b2e7a40294c7fcbf7497fd9727848144efbb825c6a2b635360d SHA512 60fe13ba6eb98bd179e301fde358c0207a8a4c21bf12f5458ba77bb2b059fe25ecc7de27ee18f2140a5b12aa6977ac1706768a6c0fb6dad04027bc3904a09d4a WHIRLPOOL e4e545e75c3cc1a775e565eb78fb394c49a162c5003bdbdc3fa0c89f04bfcb8fb268fa7bb0e3b919b7c145e9a9d009f5c1918dd10c2e590c1f6e0763475c1d73
+EBUILD selinux-speedtouch-2.20170805-r2.ebuild 290 SHA256 87a1677dde2c8b2e7a40294c7fcbf7497fd9727848144efbb825c6a2b635360d SHA512 60fe13ba6eb98bd179e301fde358c0207a8a4c21bf12f5458ba77bb2b059fe25ecc7de27ee18f2140a5b12aa6977ac1706768a6c0fb6dad04027bc3904a09d4a WHIRLPOOL e4e545e75c3cc1a775e565eb78fb394c49a162c5003bdbdc3fa0c89f04bfcb8fb268fa7bb0e3b919b7c145e9a9d009f5c1918dd10c2e590c1f6e0763475c1d73
+EBUILD selinux-speedtouch-2.20170805-r3.ebuild 292 SHA256 fd50f31a3dcd18f03fd19d9390e437e4d73c317103e2adb75a92c39cecd80866 SHA512 6137f4e95ed00fc55f45982fc921a847020e022f48340a42438e04e1a5c1705de4755ca290247083ea7e5e365e5ca42eb43a2b2bcb22dc3b4471d38fbd5f8baa WHIRLPOOL dc3430eaef35545fe0583d3695b15705d885d61e7a70445ea94876aa19fa61f88859814876fac128af9739083bf15f8a5c7301fc8d953e9d8bb465a276aae550
+EBUILD selinux-speedtouch-9999.ebuild 292 SHA256 fd50f31a3dcd18f03fd19d9390e437e4d73c317103e2adb75a92c39cecd80866 SHA512 6137f4e95ed00fc55f45982fc921a847020e022f48340a42438e04e1a5c1705de4755ca290247083ea7e5e365e5ca42eb43a2b2bcb22dc3b4471d38fbd5f8baa WHIRLPOOL dc3430eaef35545fe0583d3695b15705d885d61e7a70445ea94876aa19fa61f88859814876fac128af9739083bf15f8a5c7301fc8d953e9d8bb465a276aae550
 MISC ChangeLog 10979 SHA256 860800a75015a776f22b6928a69440572dd06e8c13ba14885b18ed5737b748fc SHA512 753f9cb0d051cec99f19bafba7207b5fd0420ab6993fa82159d13890350af7acb121e5a14a14b920709b259eeff4bb6832620d249011c48926cd611bfbfa90c1 WHIRLPOOL 110a7acb27dde20090ee200e6a773c370900de3b4b8be490e1e344e68009d0710ad4dd98b27ff11037a2bdcdf01013af952127617d6c3be928f99bb3e8503b64
 MISC ChangeLog-2015 10334 SHA256 17ef353a5d03f2a61c43f16335d05a66847be70f494569b93339f0573e022a0f SHA512 9adf108d6059bae5fe440410126b3194747a486e1c3a9bc92312426ad6af30b1a95cc2d323ffb8c33a382775baa64163caa15ab74278c6279294ce8d14f7ca8d WHIRLPOOL 738a29bfef1465154fb4b80dbaeb394073bed43b849f004f3c56f58eef95c4a0b254eb71f7e4293cbdf001f3745189b6ac04ee7438692cb9637f5df8c24a8e9d
 MISC metadata.xml 320 SHA256 5166144bf2fbb6b63b556c7a0a616e657cf0120fa531c505647817b29a7a47cc SHA512 ef55a786bf5aa65e1bba7df8f14e019fb4f18ae58eddc64b46bdf9b0cf39ba4fde9171ee436fb5264556038d3ae464df4adbd65ca3c3213fb3925dd8e5635c96 WHIRLPOOL 63d16ee82d4d72eb0720f85788bb4c97b403a381833278183b91bb381627c7c12b2c9a509930277365872bf2401ddbe9a7d825f29c546c47e4ec6103e15ee2c8
diff --git a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20170204-r1.ebuild b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20170204-r1.ebuild
index 600603ca9d50..09634f1a006f 100644
--- a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20170204-r2.ebuild b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20170204-r2.ebuild
index 6f0b0ff03b5e..77e844e3803e 100644
--- a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20170204-r3.ebuild b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20170204-r3.ebuild
index 6f0b0ff03b5e..77e844e3803e 100644
--- a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20170204-r4.ebuild b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20170204-r4.ebuild
index 6f0b0ff03b5e..77e844e3803e 100644
--- a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20170805-r2.ebuild b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20170805-r2.ebuild
index 6f0b0ff03b5e..77e844e3803e 100644
--- a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20170805-r3.ebuild b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..09634f1a006f
--- /dev/null
+++ b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-speedtouch/selinux-speedtouch-9999.ebuild b/sec-policy/selinux-speedtouch/selinux-speedtouch-9999.ebuild
index 600603ca9d50..09634f1a006f 100644
--- a/sec-policy/selinux-speedtouch/selinux-speedtouch-9999.ebuild
+++ b/sec-policy/selinux-speedtouch/selinux-speedtouch-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-squid/Manifest b/sec-policy/selinux-squid/Manifest
index 02fcd9d0740d..66eab0d47197 100644
--- a/sec-policy/selinux-squid/Manifest
+++ b/sec-policy/selinux-squid/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-squid-2.20170204-r1.ebuild 377 SHA256 742c25cedc1d2866a6777cb69f17384ea653ce9448e28e3105096474fa7e839c SHA512 de2efe7a664ced69cb184592bbae7186bed949fda1e4eff96bf7e28e71a5c4b6d2781dff6207f35a376597dff41025aba63d43b4c921b4c91e093e27e5f0d35c WHIRLPOOL 55c6cce1b9dcd37cf0c43afc9a1fb6c414101d8a4299024ccf582932b8a401a7cedb9681a15fb341db28c527f5b12e93187bd87c373c846ae02e0211bff77ea4
-EBUILD selinux-squid-2.20170204-r2.ebuild 375 SHA256 b9c494d3d24cfcda273f8f35f7968a37870c1ca3eaef03739af6733fa40a3a5d SHA512 e4997ee20837d4a67c7bdba13f0e28c798de918941b419ab83b4061b52fcba54370eca32985e81c59cbd0fe2d84c17eb363c162f15f6b59884bf9ceed5c71f49 WHIRLPOOL 1924d72ccd07d3297de0612aeb9f8cff2ee59fc87974ebe5de174062d77d368f0adcde12c4da46936e8e00fa971d7e2c6f467d4ad160ef19c20c76ad809850c8
-EBUILD selinux-squid-2.20170204-r3.ebuild 375 SHA256 b9c494d3d24cfcda273f8f35f7968a37870c1ca3eaef03739af6733fa40a3a5d SHA512 e4997ee20837d4a67c7bdba13f0e28c798de918941b419ab83b4061b52fcba54370eca32985e81c59cbd0fe2d84c17eb363c162f15f6b59884bf9ceed5c71f49 WHIRLPOOL 1924d72ccd07d3297de0612aeb9f8cff2ee59fc87974ebe5de174062d77d368f0adcde12c4da46936e8e00fa971d7e2c6f467d4ad160ef19c20c76ad809850c8
-EBUILD selinux-squid-2.20170204-r4.ebuild 375 SHA256 b9c494d3d24cfcda273f8f35f7968a37870c1ca3eaef03739af6733fa40a3a5d SHA512 e4997ee20837d4a67c7bdba13f0e28c798de918941b419ab83b4061b52fcba54370eca32985e81c59cbd0fe2d84c17eb363c162f15f6b59884bf9ceed5c71f49 WHIRLPOOL 1924d72ccd07d3297de0612aeb9f8cff2ee59fc87974ebe5de174062d77d368f0adcde12c4da46936e8e00fa971d7e2c6f467d4ad160ef19c20c76ad809850c8
-EBUILD selinux-squid-2.20170805-r2.ebuild 375 SHA256 b9c494d3d24cfcda273f8f35f7968a37870c1ca3eaef03739af6733fa40a3a5d SHA512 e4997ee20837d4a67c7bdba13f0e28c798de918941b419ab83b4061b52fcba54370eca32985e81c59cbd0fe2d84c17eb363c162f15f6b59884bf9ceed5c71f49 WHIRLPOOL 1924d72ccd07d3297de0612aeb9f8cff2ee59fc87974ebe5de174062d77d368f0adcde12c4da46936e8e00fa971d7e2c6f467d4ad160ef19c20c76ad809850c8
-EBUILD selinux-squid-9999.ebuild 377 SHA256 742c25cedc1d2866a6777cb69f17384ea653ce9448e28e3105096474fa7e839c SHA512 de2efe7a664ced69cb184592bbae7186bed949fda1e4eff96bf7e28e71a5c4b6d2781dff6207f35a376597dff41025aba63d43b4c921b4c91e093e27e5f0d35c WHIRLPOOL 55c6cce1b9dcd37cf0c43afc9a1fb6c414101d8a4299024ccf582932b8a401a7cedb9681a15fb341db28c527f5b12e93187bd87c373c846ae02e0211bff77ea4
+EBUILD selinux-squid-2.20170204-r1.ebuild 378 SHA256 47ab29433f822f64bb70e7e6a4f5efbbd588dd7be8d4b381effa86fad3ff3c89 SHA512 256465bd4c929af1d39de325c8be1ad2940ce99020e9b4270aca4308715773ddd3b2ea9c0d348bf5eec60e18ef3b3613bc790335135127fbea2d33bc8c99dcd4 WHIRLPOOL 3e17fdf69d03f60afc7dd8991942a9e0286b2be5929603d2fb1af159bf8bfd3b91caa62f80de4e0a3a518e6358b7ce419a492c16a1965a7d68df627b97063c1d
+EBUILD selinux-squid-2.20170204-r2.ebuild 376 SHA256 b20ea028920666a9e9c5a9abbbfc6b3212bc0e15574c0b97c4b8a9b600bbe0a9 SHA512 5ea60594ace42fbf8d489adc05d35078a2b7d7c49c59e0372fdf2a2337c6adf813f968b8fe098f99af43aee7b5d80708859b8e735fec52b4b57b60e3ca5d1064 WHIRLPOOL cf63579629f216636f3a1aee198c80e1766d80fc4c0852823280260b215f4d5ce32a596c2e664ea9b678bae660674ae1a3ada22f913b28716180c53a119d604c
+EBUILD selinux-squid-2.20170204-r3.ebuild 376 SHA256 b20ea028920666a9e9c5a9abbbfc6b3212bc0e15574c0b97c4b8a9b600bbe0a9 SHA512 5ea60594ace42fbf8d489adc05d35078a2b7d7c49c59e0372fdf2a2337c6adf813f968b8fe098f99af43aee7b5d80708859b8e735fec52b4b57b60e3ca5d1064 WHIRLPOOL cf63579629f216636f3a1aee198c80e1766d80fc4c0852823280260b215f4d5ce32a596c2e664ea9b678bae660674ae1a3ada22f913b28716180c53a119d604c
+EBUILD selinux-squid-2.20170204-r4.ebuild 376 SHA256 b20ea028920666a9e9c5a9abbbfc6b3212bc0e15574c0b97c4b8a9b600bbe0a9 SHA512 5ea60594ace42fbf8d489adc05d35078a2b7d7c49c59e0372fdf2a2337c6adf813f968b8fe098f99af43aee7b5d80708859b8e735fec52b4b57b60e3ca5d1064 WHIRLPOOL cf63579629f216636f3a1aee198c80e1766d80fc4c0852823280260b215f4d5ce32a596c2e664ea9b678bae660674ae1a3ada22f913b28716180c53a119d604c
+EBUILD selinux-squid-2.20170805-r2.ebuild 376 SHA256 b20ea028920666a9e9c5a9abbbfc6b3212bc0e15574c0b97c4b8a9b600bbe0a9 SHA512 5ea60594ace42fbf8d489adc05d35078a2b7d7c49c59e0372fdf2a2337c6adf813f968b8fe098f99af43aee7b5d80708859b8e735fec52b4b57b60e3ca5d1064 WHIRLPOOL cf63579629f216636f3a1aee198c80e1766d80fc4c0852823280260b215f4d5ce32a596c2e664ea9b678bae660674ae1a3ada22f913b28716180c53a119d604c
+EBUILD selinux-squid-2.20170805-r3.ebuild 378 SHA256 47ab29433f822f64bb70e7e6a4f5efbbd588dd7be8d4b381effa86fad3ff3c89 SHA512 256465bd4c929af1d39de325c8be1ad2940ce99020e9b4270aca4308715773ddd3b2ea9c0d348bf5eec60e18ef3b3613bc790335135127fbea2d33bc8c99dcd4 WHIRLPOOL 3e17fdf69d03f60afc7dd8991942a9e0286b2be5929603d2fb1af159bf8bfd3b91caa62f80de4e0a3a518e6358b7ce419a492c16a1965a7d68df627b97063c1d
+EBUILD selinux-squid-9999.ebuild 378 SHA256 47ab29433f822f64bb70e7e6a4f5efbbd588dd7be8d4b381effa86fad3ff3c89 SHA512 256465bd4c929af1d39de325c8be1ad2940ce99020e9b4270aca4308715773ddd3b2ea9c0d348bf5eec60e18ef3b3613bc790335135127fbea2d33bc8c99dcd4 WHIRLPOOL 3e17fdf69d03f60afc7dd8991942a9e0286b2be5929603d2fb1af159bf8bfd3b91caa62f80de4e0a3a518e6358b7ce419a492c16a1965a7d68df627b97063c1d
 MISC ChangeLog 10479 SHA256 bfe2275e903687bdffcd3a718e303b365044332517788bd7d0b784e07faca7c7 SHA512 54819a9d6d128275ac57f0578996fba6cd94fabb63d4c0f5b27e727a3d5e69bf4105f9c2ce4f343a87560c7121c1ef06ee940dbe46de732d7d49ff33e0c4ca97 WHIRLPOOL 6bb95a5a8ec2215992cfe479622e8b76b925d06cfa6283efea7f8ac52e82063e09f2bf17ed607d84d3d4bcba95419b8810b011f77d48744512c62b2432380a90
 MISC ChangeLog-2015 15076 SHA256 0300f4d756af29c19af89126314b2e438e77b0ee3da23fa2245df9b084e276a1 SHA512 c1aa5de302e582a49a64f865ee18f952ecfb3789930c546e43f63f5b6dd0ebeeedc0a55977bf7bb82c7d4ad3dd1492f916fbf0ba410a9168532deb071026e77a WHIRLPOOL ef6015bcb60f8922cecf15ac5f7cbfbec69b65a922d44da7556c415f52d598fe800c970be17fe159f8877cccf42ab33210e6f10e7d2cc43e006b241f78979a52
 MISC metadata.xml 315 SHA256 b6c13105f73f8d9f90aa4def205fb0633e3005f0890dfb3598dc129ecbe3a671 SHA512 0742eacb66c8dcaa556ca6bdc0d55789c28d5f776b065340d6f72eea41ddbd1ac34fa4d5257a11cd970e23c42b4ed36b556838d619b70b8fa78d854bfc82396d WHIRLPOOL 322f77bda353ff0e45a35c5f648e1dfe1c8efdfa45c09afcbacef2d15153a67cd5a3726bcf669da8ff13967455572a2205155dce1fadda9f56340ce3ac080e5e
diff --git a/sec-policy/selinux-squid/selinux-squid-2.20170204-r1.ebuild b/sec-policy/selinux-squid/selinux-squid-2.20170204-r1.ebuild
index b182071fbbf6..d1355ec6f9bc 100644
--- a/sec-policy/selinux-squid/selinux-squid-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-squid/selinux-squid-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-squid/selinux-squid-2.20170204-r2.ebuild b/sec-policy/selinux-squid/selinux-squid-2.20170204-r2.ebuild
index 05f8b2c83b2f..473a40019dda 100644
--- a/sec-policy/selinux-squid/selinux-squid-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-squid/selinux-squid-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-squid/selinux-squid-2.20170204-r3.ebuild b/sec-policy/selinux-squid/selinux-squid-2.20170204-r3.ebuild
index 05f8b2c83b2f..473a40019dda 100644
--- a/sec-policy/selinux-squid/selinux-squid-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-squid/selinux-squid-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-squid/selinux-squid-2.20170204-r4.ebuild b/sec-policy/selinux-squid/selinux-squid-2.20170204-r4.ebuild
index 05f8b2c83b2f..473a40019dda 100644
--- a/sec-policy/selinux-squid/selinux-squid-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-squid/selinux-squid-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-squid/selinux-squid-2.20170805-r2.ebuild b/sec-policy/selinux-squid/selinux-squid-2.20170805-r2.ebuild
index 05f8b2c83b2f..473a40019dda 100644
--- a/sec-policy/selinux-squid/selinux-squid-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-squid/selinux-squid-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-squid/selinux-squid-2.20170805-r3.ebuild b/sec-policy/selinux-squid/selinux-squid-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..d1355ec6f9bc
--- /dev/null
+++ b/sec-policy/selinux-squid/selinux-squid-2.20170805-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-squid/selinux-squid-9999.ebuild b/sec-policy/selinux-squid/selinux-squid-9999.ebuild
index b182071fbbf6..d1355ec6f9bc 100644
--- a/sec-policy/selinux-squid/selinux-squid-9999.ebuild
+++ b/sec-policy/selinux-squid/selinux-squid-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-sssd/Manifest b/sec-policy/selinux-sssd/Manifest
index bd3899832113..619d79e64137 100644
--- a/sec-policy/selinux-sssd/Manifest
+++ b/sec-policy/selinux-sssd/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-sssd-2.20170204-r1.ebuild 279 SHA256 f0bc4a0751943e6cfa97c138deca79311eec24b9a78245a27c29876a1ef97ac3 SHA512 2c76babf854f7748eca6ca236a7f634ec2d3c6e13d6d940d3c01d2c1b4809fd83de874f2b57bd5154e4bae5f38a55ff0593f076334dd09574377e37fa7bec9c4 WHIRLPOOL 5fb9756f4e9e27df41418e10c00d456b14191d3fcfdfd0315ce200f0b6c40369bf7d85f420b8a22ff0f59344422e26a3cdea543c74686812e7f6d65aac25e192
-EBUILD selinux-sssd-2.20170204-r2.ebuild 277 SHA256 355217571f41a8a29c286f6e8ca6ca6863fa1fa964e2e7a583b93493def38248 SHA512 1ddc78bac1f9e4afea847f9afd7e0a84999331811bcaf766b7aa2bc17301364ad79f19d46780c6bcd2452d571691f8faca6a502ed18a9a74de0c647b625a6892 WHIRLPOOL 5abd4b76f1716ff6ed7d726020190a21f40b57973b3991f24d890dce6ceb8c9b5fb3d85b3e3311bb9906660b06992a4e1a75c85d1e9674b5958b40854975f8f4
-EBUILD selinux-sssd-2.20170204-r3.ebuild 277 SHA256 355217571f41a8a29c286f6e8ca6ca6863fa1fa964e2e7a583b93493def38248 SHA512 1ddc78bac1f9e4afea847f9afd7e0a84999331811bcaf766b7aa2bc17301364ad79f19d46780c6bcd2452d571691f8faca6a502ed18a9a74de0c647b625a6892 WHIRLPOOL 5abd4b76f1716ff6ed7d726020190a21f40b57973b3991f24d890dce6ceb8c9b5fb3d85b3e3311bb9906660b06992a4e1a75c85d1e9674b5958b40854975f8f4
-EBUILD selinux-sssd-2.20170204-r4.ebuild 277 SHA256 355217571f41a8a29c286f6e8ca6ca6863fa1fa964e2e7a583b93493def38248 SHA512 1ddc78bac1f9e4afea847f9afd7e0a84999331811bcaf766b7aa2bc17301364ad79f19d46780c6bcd2452d571691f8faca6a502ed18a9a74de0c647b625a6892 WHIRLPOOL 5abd4b76f1716ff6ed7d726020190a21f40b57973b3991f24d890dce6ceb8c9b5fb3d85b3e3311bb9906660b06992a4e1a75c85d1e9674b5958b40854975f8f4
-EBUILD selinux-sssd-2.20170805-r2.ebuild 277 SHA256 355217571f41a8a29c286f6e8ca6ca6863fa1fa964e2e7a583b93493def38248 SHA512 1ddc78bac1f9e4afea847f9afd7e0a84999331811bcaf766b7aa2bc17301364ad79f19d46780c6bcd2452d571691f8faca6a502ed18a9a74de0c647b625a6892 WHIRLPOOL 5abd4b76f1716ff6ed7d726020190a21f40b57973b3991f24d890dce6ceb8c9b5fb3d85b3e3311bb9906660b06992a4e1a75c85d1e9674b5958b40854975f8f4
-EBUILD selinux-sssd-9999.ebuild 279 SHA256 f0bc4a0751943e6cfa97c138deca79311eec24b9a78245a27c29876a1ef97ac3 SHA512 2c76babf854f7748eca6ca236a7f634ec2d3c6e13d6d940d3c01d2c1b4809fd83de874f2b57bd5154e4bae5f38a55ff0593f076334dd09574377e37fa7bec9c4 WHIRLPOOL 5fb9756f4e9e27df41418e10c00d456b14191d3fcfdfd0315ce200f0b6c40369bf7d85f420b8a22ff0f59344422e26a3cdea543c74686812e7f6d65aac25e192
+EBUILD selinux-sssd-2.20170204-r1.ebuild 280 SHA256 b02101183bf29a48fc9030aa82bd859814803a59cfe50c1f6f24733c54e6ca3c SHA512 c93d51c97b4a02188736100bf2e7a84b113ee8f50a62fb915c5c81a4b34a7d00e37c9cae7f9c3e7b056492184595c8d4c4ab942df32c9f990a0f848035128799 WHIRLPOOL 2dba0e31cb3b5799e98e37eba56d9e05eb3284f3b435e27dd28dd5e47cd49d9e751db9b0a97f4f2d6fe7d95726ee8097d09370b61c5252a74e894872d125672c
+EBUILD selinux-sssd-2.20170204-r2.ebuild 278 SHA256 d2d0e9350063e11d36be59a31542b99ffc75f5a2cb61227a665c67c106227f8f SHA512 4c97e4fc94cd8be73332ab0e91777f906fc076a3ba6c800f6d35261e38cb656987e806dfb91832eaf7dbadec066bec238236757eb2553e8726423267a81b1f0f WHIRLPOOL 466145b13c802207a45062234c429c576b129470098f21e22a19d15f0c73a6e1b7a8d066ce7913c817a074bb711b4a6705726c3b3943bcab40b2ba7d3687e9d1
+EBUILD selinux-sssd-2.20170204-r3.ebuild 278 SHA256 d2d0e9350063e11d36be59a31542b99ffc75f5a2cb61227a665c67c106227f8f SHA512 4c97e4fc94cd8be73332ab0e91777f906fc076a3ba6c800f6d35261e38cb656987e806dfb91832eaf7dbadec066bec238236757eb2553e8726423267a81b1f0f WHIRLPOOL 466145b13c802207a45062234c429c576b129470098f21e22a19d15f0c73a6e1b7a8d066ce7913c817a074bb711b4a6705726c3b3943bcab40b2ba7d3687e9d1
+EBUILD selinux-sssd-2.20170204-r4.ebuild 278 SHA256 d2d0e9350063e11d36be59a31542b99ffc75f5a2cb61227a665c67c106227f8f SHA512 4c97e4fc94cd8be73332ab0e91777f906fc076a3ba6c800f6d35261e38cb656987e806dfb91832eaf7dbadec066bec238236757eb2553e8726423267a81b1f0f WHIRLPOOL 466145b13c802207a45062234c429c576b129470098f21e22a19d15f0c73a6e1b7a8d066ce7913c817a074bb711b4a6705726c3b3943bcab40b2ba7d3687e9d1
+EBUILD selinux-sssd-2.20170805-r2.ebuild 278 SHA256 d2d0e9350063e11d36be59a31542b99ffc75f5a2cb61227a665c67c106227f8f SHA512 4c97e4fc94cd8be73332ab0e91777f906fc076a3ba6c800f6d35261e38cb656987e806dfb91832eaf7dbadec066bec238236757eb2553e8726423267a81b1f0f WHIRLPOOL 466145b13c802207a45062234c429c576b129470098f21e22a19d15f0c73a6e1b7a8d066ce7913c817a074bb711b4a6705726c3b3943bcab40b2ba7d3687e9d1
+EBUILD selinux-sssd-2.20170805-r3.ebuild 280 SHA256 b02101183bf29a48fc9030aa82bd859814803a59cfe50c1f6f24733c54e6ca3c SHA512 c93d51c97b4a02188736100bf2e7a84b113ee8f50a62fb915c5c81a4b34a7d00e37c9cae7f9c3e7b056492184595c8d4c4ab942df32c9f990a0f848035128799 WHIRLPOOL 2dba0e31cb3b5799e98e37eba56d9e05eb3284f3b435e27dd28dd5e47cd49d9e751db9b0a97f4f2d6fe7d95726ee8097d09370b61c5252a74e894872d125672c
+EBUILD selinux-sssd-9999.ebuild 280 SHA256 b02101183bf29a48fc9030aa82bd859814803a59cfe50c1f6f24733c54e6ca3c SHA512 c93d51c97b4a02188736100bf2e7a84b113ee8f50a62fb915c5c81a4b34a7d00e37c9cae7f9c3e7b056492184595c8d4c4ab942df32c9f990a0f848035128799 WHIRLPOOL 2dba0e31cb3b5799e98e37eba56d9e05eb3284f3b435e27dd28dd5e47cd49d9e751db9b0a97f4f2d6fe7d95726ee8097d09370b61c5252a74e894872d125672c
 MISC ChangeLog 10387 SHA256 d0260d9ac665d366ee03275485f093e13ce036ee3c8af8450bfa0e4e3e1bfd96 SHA512 51a8dcad4198a158ddb5dbfcbd1832da7764d1c23cfe44549c3cc3ca5d4f7df37f779e2c441674101caa8ab923b428dff0e7f33b180b533f3fdf339c8893d4e2 WHIRLPOOL 5547029bc61adf92524ff7e11d378052098de4d3e6a5782a2bdc399f365cd1b33bdb932e56c43304660860dc93a3fa3df3bc1ae3f8f577a11140a57ca7c931da
 MISC ChangeLog-2015 9058 SHA256 5cebfbeec4b979711796e67257116729b322dab12cf62866cf9289b8508a492b SHA512 0f59798d0fcc325a9a3eda3bd8be0cc3c05fc433f5cbd4507539280a219a0b60d909e59d0817d38030834fd4cb92decbc28a027b06119c788243d3ae4d256f0d WHIRLPOOL 1572f7d3c7d5892efb0cdfe8d70a5b2fcb2302e4212def946ee51087cd16e53be8565f1e2b833db8d0848ee5af463c2bfbedda7febf328c22b3586505f3078f2
 MISC metadata.xml 314 SHA256 cf98461725b7e194d7d629ae65ef2336eaf28aa372dcea6c5c25462b6242c968 SHA512 850856c4a38b6056377fffad65b5987f74586928976b767366f7fa8380ee67eb24c176defc0b4936b7a346256fc2575e938a689f972a6adbcad85be2900ff6d4 WHIRLPOOL 3f4b944cd331cc62247b3391caf2b9d30208d4eb2e17f62b5f5fddf95a121975dfeaf834835a21d1fe9fd0f269429e480e097a784ab049d09bc25f23e22ef5dd
diff --git a/sec-policy/selinux-sssd/selinux-sssd-2.20170204-r1.ebuild b/sec-policy/selinux-sssd/selinux-sssd-2.20170204-r1.ebuild
index 964a64e2a495..682823541841 100644
--- a/sec-policy/selinux-sssd/selinux-sssd-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-sssd/selinux-sssd-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-sssd/selinux-sssd-2.20170204-r2.ebuild b/sec-policy/selinux-sssd/selinux-sssd-2.20170204-r2.ebuild
index 75ff2a62a9d5..079338b4f98e 100644
--- a/sec-policy/selinux-sssd/selinux-sssd-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-sssd/selinux-sssd-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-sssd/selinux-sssd-2.20170204-r3.ebuild b/sec-policy/selinux-sssd/selinux-sssd-2.20170204-r3.ebuild
index 75ff2a62a9d5..079338b4f98e 100644
--- a/sec-policy/selinux-sssd/selinux-sssd-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-sssd/selinux-sssd-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-sssd/selinux-sssd-2.20170204-r4.ebuild b/sec-policy/selinux-sssd/selinux-sssd-2.20170204-r4.ebuild
index 75ff2a62a9d5..079338b4f98e 100644
--- a/sec-policy/selinux-sssd/selinux-sssd-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-sssd/selinux-sssd-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-sssd/selinux-sssd-2.20170805-r2.ebuild b/sec-policy/selinux-sssd/selinux-sssd-2.20170805-r2.ebuild
index 75ff2a62a9d5..079338b4f98e 100644
--- a/sec-policy/selinux-sssd/selinux-sssd-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-sssd/selinux-sssd-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-sssd/selinux-sssd-2.20170805-r3.ebuild b/sec-policy/selinux-sssd/selinux-sssd-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..682823541841
--- /dev/null
+++ b/sec-policy/selinux-sssd/selinux-sssd-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-sssd/selinux-sssd-9999.ebuild b/sec-policy/selinux-sssd/selinux-sssd-9999.ebuild
index 964a64e2a495..682823541841 100644
--- a/sec-policy/selinux-sssd/selinux-sssd-9999.ebuild
+++ b/sec-policy/selinux-sssd/selinux-sssd-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-stunnel/Manifest b/sec-policy/selinux-stunnel/Manifest
index 9ce78c50c375..cd7e3c760c32 100644
--- a/sec-policy/selinux-stunnel/Manifest
+++ b/sec-policy/selinux-stunnel/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-stunnel-2.20170204-r1.ebuild 285 SHA256 937f3f8016fc71a22ac3c51cb3603007bf5fec952871895daaa52dc42face280 SHA512 dcfd32077157a6bd8718c2fd6965de5560e01609783678565d6c84314e791f9525a00edaa7a3ed72fca6914da02b966c2510be16edccb3759b72d58205f34acd WHIRLPOOL 5d14253aa3999a352cd6a45201f9f90095763730a418fbc9f7f4f803a85215c6a89ebf67952d39ea97687b4041f63bdbe78a9ee7ee60d0ec098dca3bedc3fc35
-EBUILD selinux-stunnel-2.20170204-r2.ebuild 283 SHA256 1909e3ec18c5fd142f108e5bbb87c22e59177c918f8faf6497c6569124799ab8 SHA512 c8762c00ae9919850d55b8c0b60fdbb19ac89f5b9f744991715e4e622183c0ffd2b86b53f6fd2b458f1ac1474242266678b21aca4af14c26e3bdd36e56843b2f WHIRLPOOL ef8a0868260148105a606381dcc2b9dc6a41ad5b7a0766b1c1f1a69c7ea04ce0856220a3077defe386ecd630c893c2bef5516822870aa7caaca1bc3a1551d9d5
-EBUILD selinux-stunnel-2.20170204-r3.ebuild 283 SHA256 1909e3ec18c5fd142f108e5bbb87c22e59177c918f8faf6497c6569124799ab8 SHA512 c8762c00ae9919850d55b8c0b60fdbb19ac89f5b9f744991715e4e622183c0ffd2b86b53f6fd2b458f1ac1474242266678b21aca4af14c26e3bdd36e56843b2f WHIRLPOOL ef8a0868260148105a606381dcc2b9dc6a41ad5b7a0766b1c1f1a69c7ea04ce0856220a3077defe386ecd630c893c2bef5516822870aa7caaca1bc3a1551d9d5
-EBUILD selinux-stunnel-2.20170204-r4.ebuild 283 SHA256 1909e3ec18c5fd142f108e5bbb87c22e59177c918f8faf6497c6569124799ab8 SHA512 c8762c00ae9919850d55b8c0b60fdbb19ac89f5b9f744991715e4e622183c0ffd2b86b53f6fd2b458f1ac1474242266678b21aca4af14c26e3bdd36e56843b2f WHIRLPOOL ef8a0868260148105a606381dcc2b9dc6a41ad5b7a0766b1c1f1a69c7ea04ce0856220a3077defe386ecd630c893c2bef5516822870aa7caaca1bc3a1551d9d5
-EBUILD selinux-stunnel-2.20170805-r2.ebuild 283 SHA256 1909e3ec18c5fd142f108e5bbb87c22e59177c918f8faf6497c6569124799ab8 SHA512 c8762c00ae9919850d55b8c0b60fdbb19ac89f5b9f744991715e4e622183c0ffd2b86b53f6fd2b458f1ac1474242266678b21aca4af14c26e3bdd36e56843b2f WHIRLPOOL ef8a0868260148105a606381dcc2b9dc6a41ad5b7a0766b1c1f1a69c7ea04ce0856220a3077defe386ecd630c893c2bef5516822870aa7caaca1bc3a1551d9d5
-EBUILD selinux-stunnel-9999.ebuild 285 SHA256 937f3f8016fc71a22ac3c51cb3603007bf5fec952871895daaa52dc42face280 SHA512 dcfd32077157a6bd8718c2fd6965de5560e01609783678565d6c84314e791f9525a00edaa7a3ed72fca6914da02b966c2510be16edccb3759b72d58205f34acd WHIRLPOOL 5d14253aa3999a352cd6a45201f9f90095763730a418fbc9f7f4f803a85215c6a89ebf67952d39ea97687b4041f63bdbe78a9ee7ee60d0ec098dca3bedc3fc35
+EBUILD selinux-stunnel-2.20170204-r1.ebuild 286 SHA256 a2df41251199473054f6db3bbfba717b0cfe7c43ec5177e28e2ea17647d8ab42 SHA512 55926f8e6420d0df17ddc27474def1adb95a9b09e4b1499c9bd0c16f96232cc3cb904df579c458a2599fb161fd9ae3d9fedcc7d40bb8ea580d22e6ff7646a2c1 WHIRLPOOL 5fe4a71fe3e6590dbf7b4f8036a7513d502dfee7a4abf447cb728457d6736bed00d33903ab564362701a6c22f86ba109ad70aab1097aa8efe4d967100b2e58cb
+EBUILD selinux-stunnel-2.20170204-r2.ebuild 284 SHA256 6131be482696607d445f954bb7158dd46a99fea9df3c18422a149aaa2e10a44d SHA512 2950c1064ed62e34b7800a6ab13df0dcc08613e1de0005daeaf57fe227ed20043bf182d19e30745a7fc448fcfbb93c2c31fcce967f72a8673575edb692828be5 WHIRLPOOL a302834f409ab4e27f56dd7cbb699bb8424dea94edc05167389fc2a70c2df08430e1e7350c1deeabcff548bf6b5567b8fba62678ed0cdc1b8a9014255a4628d5
+EBUILD selinux-stunnel-2.20170204-r3.ebuild 284 SHA256 6131be482696607d445f954bb7158dd46a99fea9df3c18422a149aaa2e10a44d SHA512 2950c1064ed62e34b7800a6ab13df0dcc08613e1de0005daeaf57fe227ed20043bf182d19e30745a7fc448fcfbb93c2c31fcce967f72a8673575edb692828be5 WHIRLPOOL a302834f409ab4e27f56dd7cbb699bb8424dea94edc05167389fc2a70c2df08430e1e7350c1deeabcff548bf6b5567b8fba62678ed0cdc1b8a9014255a4628d5
+EBUILD selinux-stunnel-2.20170204-r4.ebuild 284 SHA256 6131be482696607d445f954bb7158dd46a99fea9df3c18422a149aaa2e10a44d SHA512 2950c1064ed62e34b7800a6ab13df0dcc08613e1de0005daeaf57fe227ed20043bf182d19e30745a7fc448fcfbb93c2c31fcce967f72a8673575edb692828be5 WHIRLPOOL a302834f409ab4e27f56dd7cbb699bb8424dea94edc05167389fc2a70c2df08430e1e7350c1deeabcff548bf6b5567b8fba62678ed0cdc1b8a9014255a4628d5
+EBUILD selinux-stunnel-2.20170805-r2.ebuild 284 SHA256 6131be482696607d445f954bb7158dd46a99fea9df3c18422a149aaa2e10a44d SHA512 2950c1064ed62e34b7800a6ab13df0dcc08613e1de0005daeaf57fe227ed20043bf182d19e30745a7fc448fcfbb93c2c31fcce967f72a8673575edb692828be5 WHIRLPOOL a302834f409ab4e27f56dd7cbb699bb8424dea94edc05167389fc2a70c2df08430e1e7350c1deeabcff548bf6b5567b8fba62678ed0cdc1b8a9014255a4628d5
+EBUILD selinux-stunnel-2.20170805-r3.ebuild 286 SHA256 a2df41251199473054f6db3bbfba717b0cfe7c43ec5177e28e2ea17647d8ab42 SHA512 55926f8e6420d0df17ddc27474def1adb95a9b09e4b1499c9bd0c16f96232cc3cb904df579c458a2599fb161fd9ae3d9fedcc7d40bb8ea580d22e6ff7646a2c1 WHIRLPOOL 5fe4a71fe3e6590dbf7b4f8036a7513d502dfee7a4abf447cb728457d6736bed00d33903ab564362701a6c22f86ba109ad70aab1097aa8efe4d967100b2e58cb
+EBUILD selinux-stunnel-9999.ebuild 286 SHA256 a2df41251199473054f6db3bbfba717b0cfe7c43ec5177e28e2ea17647d8ab42 SHA512 55926f8e6420d0df17ddc27474def1adb95a9b09e4b1499c9bd0c16f96232cc3cb904df579c458a2599fb161fd9ae3d9fedcc7d40bb8ea580d22e6ff7646a2c1 WHIRLPOOL 5fe4a71fe3e6590dbf7b4f8036a7513d502dfee7a4abf447cb728457d6736bed00d33903ab564362701a6c22f86ba109ad70aab1097aa8efe4d967100b2e58cb
 MISC ChangeLog 10687 SHA256 028e2613206ed116aeba68db132273f1229969f7c2094ced85c9cb6a5d98dff8 SHA512 689ea3fad4baecc3f9591337e4563771a618edfbd24720c24a22f3a49a74fe36bbf81e2437a9336bc25d935a5e105cc04a00cff177ccb5d2f9858bec44409b90 WHIRLPOOL ffc62e270b038ae7a24097ef33cdf029c9f8aed064f7d82c09160956f56adeebe196ccc213b95cbd5f68be560a6ded6f926e756202bafc766c8bcd9ffaaef552
 MISC ChangeLog-2015 13336 SHA256 348a5bf382279b73d8f2780a174d72e4f998f26e0c62d01328ff2e6815ffe597 SHA512 3860e8488ae2fd3781989e8af96663846679ff0609758c493a669de3734c52766335a1bbacf7b86526c389daf9f6327eeda227c79b62be56a9d80b317598cd5f WHIRLPOOL 26d2b955fdb6d591f50f17f47eda5296982cde7c122caede7fbba5cd4f87c1c38e381048e53e1bce6e57a3bbc7cb2aae6a8424bb3f44efc57f67aee82d163a91
 MISC metadata.xml 317 SHA256 3abd116bfcafe4f8239a6eedb9f970f94bf306e17d850ce5b664aadb6afec239 SHA512 d9d1705ea1176d67de1ab424d18da867f135c5c385baea034322103ec6590bf34d38fc248205bde9aed697e367e2b4d529c039ca967663ddd0f30a3ed603a00e WHIRLPOOL dd35867831c2de2cee5a535b3c837cfbda1d3853e692fb27a92844db96db1f9de450b445b27b31cd847af4ad04393fbc71a59230f80a37bbc25c8d62f45c4d95
diff --git a/sec-policy/selinux-stunnel/selinux-stunnel-2.20170204-r1.ebuild b/sec-policy/selinux-stunnel/selinux-stunnel-2.20170204-r1.ebuild
index d7ea07702ac2..7547c9eb6f3e 100644
--- a/sec-policy/selinux-stunnel/selinux-stunnel-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-stunnel/selinux-stunnel-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-stunnel/selinux-stunnel-2.20170204-r2.ebuild b/sec-policy/selinux-stunnel/selinux-stunnel-2.20170204-r2.ebuild
index a384567fa302..def3fd49aa87 100644
--- a/sec-policy/selinux-stunnel/selinux-stunnel-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-stunnel/selinux-stunnel-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-stunnel/selinux-stunnel-2.20170204-r3.ebuild b/sec-policy/selinux-stunnel/selinux-stunnel-2.20170204-r3.ebuild
index a384567fa302..def3fd49aa87 100644
--- a/sec-policy/selinux-stunnel/selinux-stunnel-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-stunnel/selinux-stunnel-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-stunnel/selinux-stunnel-2.20170204-r4.ebuild b/sec-policy/selinux-stunnel/selinux-stunnel-2.20170204-r4.ebuild
index a384567fa302..def3fd49aa87 100644
--- a/sec-policy/selinux-stunnel/selinux-stunnel-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-stunnel/selinux-stunnel-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-stunnel/selinux-stunnel-2.20170805-r2.ebuild b/sec-policy/selinux-stunnel/selinux-stunnel-2.20170805-r2.ebuild
index a384567fa302..def3fd49aa87 100644
--- a/sec-policy/selinux-stunnel/selinux-stunnel-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-stunnel/selinux-stunnel-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-stunnel/selinux-stunnel-2.20170805-r3.ebuild b/sec-policy/selinux-stunnel/selinux-stunnel-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..7547c9eb6f3e
--- /dev/null
+++ b/sec-policy/selinux-stunnel/selinux-stunnel-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-stunnel/selinux-stunnel-9999.ebuild b/sec-policy/selinux-stunnel/selinux-stunnel-9999.ebuild
index d7ea07702ac2..7547c9eb6f3e 100644
--- a/sec-policy/selinux-stunnel/selinux-stunnel-9999.ebuild
+++ b/sec-policy/selinux-stunnel/selinux-stunnel-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-subsonic/Manifest b/sec-policy/selinux-subsonic/Manifest
index 80a0d57962ce..0dc577f2a035 100644
--- a/sec-policy/selinux-subsonic/Manifest
+++ b/sec-policy/selinux-subsonic/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-subsonic-2.20170204-r1.ebuild 287 SHA256 7c05cb58f02651273679a9a60413d3350dcfce589f4fd77f92fc644e235f06ef SHA512 9a9173d533a0482a48a7a5641fdc485e2b40f42abb51d01ac37a9e1f2d1e130841c4a1637c3a0243766cf4ddf014f3174c6283bf2b1f53845441f55e1bf17d83 WHIRLPOOL aad7c11201fd19a0398209646e5f72cf7910f898a65dce4fef81bd7c23384c373b5707ba3c4e7c78d466c239c481ba209f6d86abbbe33e4c08e2c033d1d41462
-EBUILD selinux-subsonic-2.20170204-r2.ebuild 285 SHA256 6139c710e48e8efc7ccbf1f89c087b6d9f222ec41a20adb80b09a4ddc568a0c9 SHA512 99d0d346114d19d626de505b5d0b168565db9aa6efd2c6408274caaa8306f374187b94d477bcfe6165d5231b8320732060c8604ac40efe43eb9b725d4bf41040 WHIRLPOOL 9127e91bad4c32470b7dfc11c3fe71c995b1920b44643a5d79b4ee2b124f729159a95784c7579b68e6d64003ea707af49e440090d2da74deea8f021046a1f706
-EBUILD selinux-subsonic-2.20170204-r3.ebuild 285 SHA256 6139c710e48e8efc7ccbf1f89c087b6d9f222ec41a20adb80b09a4ddc568a0c9 SHA512 99d0d346114d19d626de505b5d0b168565db9aa6efd2c6408274caaa8306f374187b94d477bcfe6165d5231b8320732060c8604ac40efe43eb9b725d4bf41040 WHIRLPOOL 9127e91bad4c32470b7dfc11c3fe71c995b1920b44643a5d79b4ee2b124f729159a95784c7579b68e6d64003ea707af49e440090d2da74deea8f021046a1f706
-EBUILD selinux-subsonic-2.20170204-r4.ebuild 285 SHA256 6139c710e48e8efc7ccbf1f89c087b6d9f222ec41a20adb80b09a4ddc568a0c9 SHA512 99d0d346114d19d626de505b5d0b168565db9aa6efd2c6408274caaa8306f374187b94d477bcfe6165d5231b8320732060c8604ac40efe43eb9b725d4bf41040 WHIRLPOOL 9127e91bad4c32470b7dfc11c3fe71c995b1920b44643a5d79b4ee2b124f729159a95784c7579b68e6d64003ea707af49e440090d2da74deea8f021046a1f706
-EBUILD selinux-subsonic-2.20170805-r2.ebuild 285 SHA256 6139c710e48e8efc7ccbf1f89c087b6d9f222ec41a20adb80b09a4ddc568a0c9 SHA512 99d0d346114d19d626de505b5d0b168565db9aa6efd2c6408274caaa8306f374187b94d477bcfe6165d5231b8320732060c8604ac40efe43eb9b725d4bf41040 WHIRLPOOL 9127e91bad4c32470b7dfc11c3fe71c995b1920b44643a5d79b4ee2b124f729159a95784c7579b68e6d64003ea707af49e440090d2da74deea8f021046a1f706
-EBUILD selinux-subsonic-9999.ebuild 287 SHA256 7c05cb58f02651273679a9a60413d3350dcfce589f4fd77f92fc644e235f06ef SHA512 9a9173d533a0482a48a7a5641fdc485e2b40f42abb51d01ac37a9e1f2d1e130841c4a1637c3a0243766cf4ddf014f3174c6283bf2b1f53845441f55e1bf17d83 WHIRLPOOL aad7c11201fd19a0398209646e5f72cf7910f898a65dce4fef81bd7c23384c373b5707ba3c4e7c78d466c239c481ba209f6d86abbbe33e4c08e2c033d1d41462
+EBUILD selinux-subsonic-2.20170204-r1.ebuild 288 SHA256 d35279f53184d6e0f704da4fceee7da2971f585d75733cd9f4904748a1c76580 SHA512 a7e7982f371398ce8450a8be9cec93d36dc263320d852ab37d01d0db8c5e4787c7d6d27caf62b9b19a06859f47e3b8b255bbec4a16d641203994aac4660fa3c8 WHIRLPOOL 3dce95edd945cb210383797a02a227d058e216fdee2675af7f972c815114addeb1802225f3a1e7eb666d4c6bad3c3e1a4464cda6a5ae5c0170e1ddb6ac9587c6
+EBUILD selinux-subsonic-2.20170204-r2.ebuild 286 SHA256 ad1b9a10e933e380cb8fc84297da40ce08f9708a2b414d73592b3316fe6c9749 SHA512 76fa5d6934bc904ef2abaa91e3b1b72b4736aadc62a22a3152817f727e67676cb5932c53a11878bb06ec2fa2d076369029a9add1280ac31184766c68d5e09434 WHIRLPOOL fe133bf7743b875dcfa04bdcacd2abe3feda00c450a49a31b1e513727e6afa9db14bf44eb66b6040c1cef5dd68bd92d7d9218e577950d53c7893dbdb28eb92b6
+EBUILD selinux-subsonic-2.20170204-r3.ebuild 286 SHA256 ad1b9a10e933e380cb8fc84297da40ce08f9708a2b414d73592b3316fe6c9749 SHA512 76fa5d6934bc904ef2abaa91e3b1b72b4736aadc62a22a3152817f727e67676cb5932c53a11878bb06ec2fa2d076369029a9add1280ac31184766c68d5e09434 WHIRLPOOL fe133bf7743b875dcfa04bdcacd2abe3feda00c450a49a31b1e513727e6afa9db14bf44eb66b6040c1cef5dd68bd92d7d9218e577950d53c7893dbdb28eb92b6
+EBUILD selinux-subsonic-2.20170204-r4.ebuild 286 SHA256 ad1b9a10e933e380cb8fc84297da40ce08f9708a2b414d73592b3316fe6c9749 SHA512 76fa5d6934bc904ef2abaa91e3b1b72b4736aadc62a22a3152817f727e67676cb5932c53a11878bb06ec2fa2d076369029a9add1280ac31184766c68d5e09434 WHIRLPOOL fe133bf7743b875dcfa04bdcacd2abe3feda00c450a49a31b1e513727e6afa9db14bf44eb66b6040c1cef5dd68bd92d7d9218e577950d53c7893dbdb28eb92b6
+EBUILD selinux-subsonic-2.20170805-r2.ebuild 286 SHA256 ad1b9a10e933e380cb8fc84297da40ce08f9708a2b414d73592b3316fe6c9749 SHA512 76fa5d6934bc904ef2abaa91e3b1b72b4736aadc62a22a3152817f727e67676cb5932c53a11878bb06ec2fa2d076369029a9add1280ac31184766c68d5e09434 WHIRLPOOL fe133bf7743b875dcfa04bdcacd2abe3feda00c450a49a31b1e513727e6afa9db14bf44eb66b6040c1cef5dd68bd92d7d9218e577950d53c7893dbdb28eb92b6
+EBUILD selinux-subsonic-2.20170805-r3.ebuild 288 SHA256 d35279f53184d6e0f704da4fceee7da2971f585d75733cd9f4904748a1c76580 SHA512 a7e7982f371398ce8450a8be9cec93d36dc263320d852ab37d01d0db8c5e4787c7d6d27caf62b9b19a06859f47e3b8b255bbec4a16d641203994aac4660fa3c8 WHIRLPOOL 3dce95edd945cb210383797a02a227d058e216fdee2675af7f972c815114addeb1802225f3a1e7eb666d4c6bad3c3e1a4464cda6a5ae5c0170e1ddb6ac9587c6
+EBUILD selinux-subsonic-9999.ebuild 288 SHA256 d35279f53184d6e0f704da4fceee7da2971f585d75733cd9f4904748a1c76580 SHA512 a7e7982f371398ce8450a8be9cec93d36dc263320d852ab37d01d0db8c5e4787c7d6d27caf62b9b19a06859f47e3b8b255bbec4a16d641203994aac4660fa3c8 WHIRLPOOL 3dce95edd945cb210383797a02a227d058e216fdee2675af7f972c815114addeb1802225f3a1e7eb666d4c6bad3c3e1a4464cda6a5ae5c0170e1ddb6ac9587c6
 MISC ChangeLog 9099 SHA256 b6b48b6b510c6e0fa74875f3510df3c448374859fd035f39a4e7a21de12fb9ce SHA512 87d73d8dd642a00a440c6df6b12fefec55dfa6c9edb51b50b5f33e9eaa8f8f8c4b3bed5736193d3512d4f8b51833986298f8c3e536cd6f22f79928b37e9a0c1a WHIRLPOOL c672e21528bcde475e850cbd6ddb979f26748cdfd8efbb19e12e659687c1007cb8cb2342bfd5c299cd0bdaf7fc93d274c65be5fc2f6a70ae92147b1d94629104
 MISC ChangeLog-2015 586 SHA256 cdb5a2ab6780cb42de2ed5510761b47c8b628eff125bf9e51f4acacca2825a86 SHA512 71516161d8463b0fd29d408657d3547279975674126bdcacb85c961d2e716cbbd026c67e1ef8630e8085f0de4f7291ed782d82ca5f80a2e121173c6cf556144e WHIRLPOOL 1b99ce7ef26b4d8645138fa5dd280be30f8ba74e3bbeeebd04b691e0fcdf07192f8491ae845e43a3b7fc58f54abb1aecfc9e72d3316c201a4c74042a2ba5da44
 MISC metadata.xml 341 SHA256 253245605ebae500e52872fcdaff21c65c671a46a867afa38439ac173dd24f73 SHA512 aea1601d2968cd582294b37bebb44b891131f4d4834a67c0f3adc8706a5fb4df4ba8d287db981896a1a0602c92ddfea4e76c001b2604f462de98433921dd4f09 WHIRLPOOL 753dd5dd3ca2e122ddd9e4aa1028ca2baafd8491a326871f397d96f57ef35aa959f4d61a397172e44b5635d6882e5f944bf3fd856bc27d4a2519ec851f5e5220
diff --git a/sec-policy/selinux-subsonic/selinux-subsonic-2.20170204-r1.ebuild b/sec-policy/selinux-subsonic/selinux-subsonic-2.20170204-r1.ebuild
index 95102af321f7..63b61085e5e5 100644
--- a/sec-policy/selinux-subsonic/selinux-subsonic-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-subsonic/selinux-subsonic-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-subsonic/selinux-subsonic-2.20170204-r2.ebuild b/sec-policy/selinux-subsonic/selinux-subsonic-2.20170204-r2.ebuild
index dd39ca8d8b40..03d0da972a08 100644
--- a/sec-policy/selinux-subsonic/selinux-subsonic-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-subsonic/selinux-subsonic-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-subsonic/selinux-subsonic-2.20170204-r3.ebuild b/sec-policy/selinux-subsonic/selinux-subsonic-2.20170204-r3.ebuild
index dd39ca8d8b40..03d0da972a08 100644
--- a/sec-policy/selinux-subsonic/selinux-subsonic-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-subsonic/selinux-subsonic-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-subsonic/selinux-subsonic-2.20170204-r4.ebuild b/sec-policy/selinux-subsonic/selinux-subsonic-2.20170204-r4.ebuild
index dd39ca8d8b40..03d0da972a08 100644
--- a/sec-policy/selinux-subsonic/selinux-subsonic-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-subsonic/selinux-subsonic-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-subsonic/selinux-subsonic-2.20170805-r2.ebuild b/sec-policy/selinux-subsonic/selinux-subsonic-2.20170805-r2.ebuild
index dd39ca8d8b40..03d0da972a08 100644
--- a/sec-policy/selinux-subsonic/selinux-subsonic-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-subsonic/selinux-subsonic-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-subsonic/selinux-subsonic-2.20170805-r3.ebuild b/sec-policy/selinux-subsonic/selinux-subsonic-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..63b61085e5e5
--- /dev/null
+++ b/sec-policy/selinux-subsonic/selinux-subsonic-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-subsonic/selinux-subsonic-9999.ebuild b/sec-policy/selinux-subsonic/selinux-subsonic-9999.ebuild
index 95102af321f7..63b61085e5e5 100644
--- a/sec-policy/selinux-subsonic/selinux-subsonic-9999.ebuild
+++ b/sec-policy/selinux-subsonic/selinux-subsonic-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-sudo/Manifest b/sec-policy/selinux-sudo/Manifest
index 5c90b27aea00..7a2e2c463732 100644
--- a/sec-policy/selinux-sudo/Manifest
+++ b/sec-policy/selinux-sudo/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-sudo-2.20170204-r1.ebuild 279 SHA256 b72bb0ee6b3ba3a770364b8139e3a7bf68fd4cbd1bde2660dccf1e14ff444d1b SHA512 f369151171681f6a8b905863f7718e61a11c7fbb8145a8e1b43fe0844f9da4814d640f849fae22c7b62d27a284ccc9716ea6835ef9d453acf08623a5e401fcd9 WHIRLPOOL 3f1d70b9e2aad596050150f5f9ad929d8000fde5e6b3c8fc05435c08e979e90aa735ceb7ba034e8524cbdb71670491fb6ed3bbc796fbc09f3c40f8ed6d0f1699
-EBUILD selinux-sudo-2.20170204-r2.ebuild 277 SHA256 efe47f612a596787922c2a1d63eddcc3b550de676bd3677cf555d7046231abcb SHA512 914af61651ffb0a7a92eea29b95c5ee118b4cdd55456ca64920925884e93fd0af0fdc2140fe83f7bc1d61efdbcdea0c1451a462a88baeccfbe4dcbb751ef5722 WHIRLPOOL 432da32835a20f31c2901a368e8767fb25bf7ce37c8694c514691b8ab8d5affe77ce47579e0fec43e8da17dbc97b695fd7ba3c7f11ededf5236d6119decf258e
-EBUILD selinux-sudo-2.20170204-r3.ebuild 277 SHA256 efe47f612a596787922c2a1d63eddcc3b550de676bd3677cf555d7046231abcb SHA512 914af61651ffb0a7a92eea29b95c5ee118b4cdd55456ca64920925884e93fd0af0fdc2140fe83f7bc1d61efdbcdea0c1451a462a88baeccfbe4dcbb751ef5722 WHIRLPOOL 432da32835a20f31c2901a368e8767fb25bf7ce37c8694c514691b8ab8d5affe77ce47579e0fec43e8da17dbc97b695fd7ba3c7f11ededf5236d6119decf258e
-EBUILD selinux-sudo-2.20170204-r4.ebuild 277 SHA256 efe47f612a596787922c2a1d63eddcc3b550de676bd3677cf555d7046231abcb SHA512 914af61651ffb0a7a92eea29b95c5ee118b4cdd55456ca64920925884e93fd0af0fdc2140fe83f7bc1d61efdbcdea0c1451a462a88baeccfbe4dcbb751ef5722 WHIRLPOOL 432da32835a20f31c2901a368e8767fb25bf7ce37c8694c514691b8ab8d5affe77ce47579e0fec43e8da17dbc97b695fd7ba3c7f11ededf5236d6119decf258e
-EBUILD selinux-sudo-2.20170805-r2.ebuild 277 SHA256 efe47f612a596787922c2a1d63eddcc3b550de676bd3677cf555d7046231abcb SHA512 914af61651ffb0a7a92eea29b95c5ee118b4cdd55456ca64920925884e93fd0af0fdc2140fe83f7bc1d61efdbcdea0c1451a462a88baeccfbe4dcbb751ef5722 WHIRLPOOL 432da32835a20f31c2901a368e8767fb25bf7ce37c8694c514691b8ab8d5affe77ce47579e0fec43e8da17dbc97b695fd7ba3c7f11ededf5236d6119decf258e
-EBUILD selinux-sudo-9999.ebuild 279 SHA256 b72bb0ee6b3ba3a770364b8139e3a7bf68fd4cbd1bde2660dccf1e14ff444d1b SHA512 f369151171681f6a8b905863f7718e61a11c7fbb8145a8e1b43fe0844f9da4814d640f849fae22c7b62d27a284ccc9716ea6835ef9d453acf08623a5e401fcd9 WHIRLPOOL 3f1d70b9e2aad596050150f5f9ad929d8000fde5e6b3c8fc05435c08e979e90aa735ceb7ba034e8524cbdb71670491fb6ed3bbc796fbc09f3c40f8ed6d0f1699
+EBUILD selinux-sudo-2.20170204-r1.ebuild 280 SHA256 cf88615dc1a77d99ac15cb5a66dfe3a6a919760a12385a2e8d6becb47a3e74cf SHA512 ea01fe9c8543d80ab8b153d1f1fc9e196e09483b2a7aed58edc84d559b6d41b737fee2bd9e652496dc119e87d8399a3deaae9f57e40b8eef4dbfd5700b111274 WHIRLPOOL b120929174a311391ce9feef44fbf03cd61fca5b1f82761ec2b0d2e01f93bd91215e56f906bc5fba1a8ea6dad780dae96c75959d4809563d0d1dc4ae6a5c1836
+EBUILD selinux-sudo-2.20170204-r2.ebuild 278 SHA256 9a4817e159d119023973b3550659ddd68d9ff581d0574adad5321fd775c23b49 SHA512 5d05c1526e64158c9944d8a4c40355307267960d9a55a634f2a14caa539b7d1befd39448c9a547ebf3b404e16a7e5a0236b6b12e2238ba5e229786bdcec3cb12 WHIRLPOOL 1ead93b4ebabfc08bb71cfe9f2524aaf6e94c49e5199a5993f6bab0e984d9aa153dc57097f8ebb5745114ec86423649ae7afc311932421c4f6e3e797a56d521a
+EBUILD selinux-sudo-2.20170204-r3.ebuild 278 SHA256 9a4817e159d119023973b3550659ddd68d9ff581d0574adad5321fd775c23b49 SHA512 5d05c1526e64158c9944d8a4c40355307267960d9a55a634f2a14caa539b7d1befd39448c9a547ebf3b404e16a7e5a0236b6b12e2238ba5e229786bdcec3cb12 WHIRLPOOL 1ead93b4ebabfc08bb71cfe9f2524aaf6e94c49e5199a5993f6bab0e984d9aa153dc57097f8ebb5745114ec86423649ae7afc311932421c4f6e3e797a56d521a
+EBUILD selinux-sudo-2.20170204-r4.ebuild 278 SHA256 9a4817e159d119023973b3550659ddd68d9ff581d0574adad5321fd775c23b49 SHA512 5d05c1526e64158c9944d8a4c40355307267960d9a55a634f2a14caa539b7d1befd39448c9a547ebf3b404e16a7e5a0236b6b12e2238ba5e229786bdcec3cb12 WHIRLPOOL 1ead93b4ebabfc08bb71cfe9f2524aaf6e94c49e5199a5993f6bab0e984d9aa153dc57097f8ebb5745114ec86423649ae7afc311932421c4f6e3e797a56d521a
+EBUILD selinux-sudo-2.20170805-r2.ebuild 278 SHA256 9a4817e159d119023973b3550659ddd68d9ff581d0574adad5321fd775c23b49 SHA512 5d05c1526e64158c9944d8a4c40355307267960d9a55a634f2a14caa539b7d1befd39448c9a547ebf3b404e16a7e5a0236b6b12e2238ba5e229786bdcec3cb12 WHIRLPOOL 1ead93b4ebabfc08bb71cfe9f2524aaf6e94c49e5199a5993f6bab0e984d9aa153dc57097f8ebb5745114ec86423649ae7afc311932421c4f6e3e797a56d521a
+EBUILD selinux-sudo-2.20170805-r3.ebuild 280 SHA256 cf88615dc1a77d99ac15cb5a66dfe3a6a919760a12385a2e8d6becb47a3e74cf SHA512 ea01fe9c8543d80ab8b153d1f1fc9e196e09483b2a7aed58edc84d559b6d41b737fee2bd9e652496dc119e87d8399a3deaae9f57e40b8eef4dbfd5700b111274 WHIRLPOOL b120929174a311391ce9feef44fbf03cd61fca5b1f82761ec2b0d2e01f93bd91215e56f906bc5fba1a8ea6dad780dae96c75959d4809563d0d1dc4ae6a5c1836
+EBUILD selinux-sudo-9999.ebuild 280 SHA256 cf88615dc1a77d99ac15cb5a66dfe3a6a919760a12385a2e8d6becb47a3e74cf SHA512 ea01fe9c8543d80ab8b153d1f1fc9e196e09483b2a7aed58edc84d559b6d41b737fee2bd9e652496dc119e87d8399a3deaae9f57e40b8eef4dbfd5700b111274 WHIRLPOOL b120929174a311391ce9feef44fbf03cd61fca5b1f82761ec2b0d2e01f93bd91215e56f906bc5fba1a8ea6dad780dae96c75959d4809563d0d1dc4ae6a5c1836
 MISC ChangeLog 10387 SHA256 53f7a42435c47f3842351b6e73e6fa4ab67312a4e834bf6dd15d7f3737bf60c7 SHA512 0afec88cd09d6abd600bc67a6710d541c8fb1fb347007a57f14e56cefd9c61193e1ba2013c54fddb1dc172df9b9a0eda8a99fa967d6c96b986caef08fd9a7b34 WHIRLPOOL c15a5e923ad79d4bde1fae41cfff3fad8e29d204f527b7c09c6fa3443a6832101596b0026868552e4fb4d23ed370e87ba8c7d8026ad9f1143fad341ed61b57ff
 MISC ChangeLog-2015 13440 SHA256 c252a8b4c4032d0fd9fda1c609af504ca848b6ec03375321a6534a6dce8cd2d0 SHA512 025cec283c4fb35f888cb59130868b750c5cdde2716ae948e79d6e4450687d5c9ea7b549eb18e8ef95940e2cb2836db89af484342995a22f9c77006ed091da1b WHIRLPOOL 1185c9dba97578a9aa2da80103386db22e937a613cb699cd5c675593ae5c034c79f19615dc461a7d02948ebc461023b45b0f85c3f73ea99dadf2d27352d9ddc4
 MISC metadata.xml 314 SHA256 e316e009481a04eff4c5ea8cb2664af4ce2a384e586e26e5fecc4f70a6df4748 SHA512 444deb961f20c878bf6c95a7bcdb8195b05616a6387d817f627920eeea4a982eb671990e9acf7fe8c4b2bb2d7f36a6d46ea5fde70a78fd5fcd9efe47d23f33a0 WHIRLPOOL 3ca410d63373339a83b7ebc8993a02dc59a21623781755f5402983a76bcc6a59d5a2c3854f08c88a6edfa77ba8361e0a076380c7fe19992d17e2d87bc3016205
diff --git a/sec-policy/selinux-sudo/selinux-sudo-2.20170204-r1.ebuild b/sec-policy/selinux-sudo/selinux-sudo-2.20170204-r1.ebuild
index ea590b4bff3c..6cd25b8657a4 100644
--- a/sec-policy/selinux-sudo/selinux-sudo-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-sudo/selinux-sudo-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-sudo/selinux-sudo-2.20170204-r2.ebuild b/sec-policy/selinux-sudo/selinux-sudo-2.20170204-r2.ebuild
index 1cb1f4b9636a..805037ec8a00 100644
--- a/sec-policy/selinux-sudo/selinux-sudo-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-sudo/selinux-sudo-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-sudo/selinux-sudo-2.20170204-r3.ebuild b/sec-policy/selinux-sudo/selinux-sudo-2.20170204-r3.ebuild
index 1cb1f4b9636a..805037ec8a00 100644
--- a/sec-policy/selinux-sudo/selinux-sudo-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-sudo/selinux-sudo-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-sudo/selinux-sudo-2.20170204-r4.ebuild b/sec-policy/selinux-sudo/selinux-sudo-2.20170204-r4.ebuild
index 1cb1f4b9636a..805037ec8a00 100644
--- a/sec-policy/selinux-sudo/selinux-sudo-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-sudo/selinux-sudo-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-sudo/selinux-sudo-2.20170805-r2.ebuild b/sec-policy/selinux-sudo/selinux-sudo-2.20170805-r2.ebuild
index 1cb1f4b9636a..805037ec8a00 100644
--- a/sec-policy/selinux-sudo/selinux-sudo-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-sudo/selinux-sudo-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-sudo/selinux-sudo-2.20170805-r3.ebuild b/sec-policy/selinux-sudo/selinux-sudo-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..6cd25b8657a4
--- /dev/null
+++ b/sec-policy/selinux-sudo/selinux-sudo-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-sudo/selinux-sudo-9999.ebuild b/sec-policy/selinux-sudo/selinux-sudo-9999.ebuild
index ea590b4bff3c..6cd25b8657a4 100644
--- a/sec-policy/selinux-sudo/selinux-sudo-9999.ebuild
+++ b/sec-policy/selinux-sudo/selinux-sudo-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-sxid/Manifest b/sec-policy/selinux-sxid/Manifest
index 62a71fb86ede..c59fbb2855bb 100644
--- a/sec-policy/selinux-sxid/Manifest
+++ b/sec-policy/selinux-sxid/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-sxid-2.20170204-r1.ebuild 279 SHA256 8e412b5a224bfb74ba6908c021db691bacad7fb6b8ebef543bf71ef77c1096ac SHA512 bb935fb1700efc624b6d64302cb166767ba6c807086144236eea889bb0aa28d9e3f85a07fe5a6e269952c8f7027aba26a04983f9d82227e58a92a2f62753e41c WHIRLPOOL 6170c012e03ebdb4555d93e2c14c8a2704fa4603642967500a274303615d992fd9f7be0d209edcb669b7c23af23fe44e0433a9dab1dbb196254d6831d19980de
-EBUILD selinux-sxid-2.20170204-r2.ebuild 277 SHA256 69de8ae197ed4c625af7fe9e4e3a994bfd4a6315e3d3daa047ef7abf9e6428c3 SHA512 be7f081c687801be942a84f360f3aa10bd3242defb8aee69405861a2eaadca0c338f644d66d07ff55232a35cea7e7677bbc830ecc0bae0c12ecaf5b0b672d7b7 WHIRLPOOL a2f23786f4063e108c8e9d17b4eb6b7046fb1bfef896d036b63abccbf0bc7b0c5cba4ce17eca400097326b2fdb7ba7a912e142c4c805cef04db8de62aafb908d
-EBUILD selinux-sxid-2.20170204-r3.ebuild 277 SHA256 69de8ae197ed4c625af7fe9e4e3a994bfd4a6315e3d3daa047ef7abf9e6428c3 SHA512 be7f081c687801be942a84f360f3aa10bd3242defb8aee69405861a2eaadca0c338f644d66d07ff55232a35cea7e7677bbc830ecc0bae0c12ecaf5b0b672d7b7 WHIRLPOOL a2f23786f4063e108c8e9d17b4eb6b7046fb1bfef896d036b63abccbf0bc7b0c5cba4ce17eca400097326b2fdb7ba7a912e142c4c805cef04db8de62aafb908d
-EBUILD selinux-sxid-2.20170204-r4.ebuild 277 SHA256 69de8ae197ed4c625af7fe9e4e3a994bfd4a6315e3d3daa047ef7abf9e6428c3 SHA512 be7f081c687801be942a84f360f3aa10bd3242defb8aee69405861a2eaadca0c338f644d66d07ff55232a35cea7e7677bbc830ecc0bae0c12ecaf5b0b672d7b7 WHIRLPOOL a2f23786f4063e108c8e9d17b4eb6b7046fb1bfef896d036b63abccbf0bc7b0c5cba4ce17eca400097326b2fdb7ba7a912e142c4c805cef04db8de62aafb908d
-EBUILD selinux-sxid-2.20170805-r2.ebuild 277 SHA256 69de8ae197ed4c625af7fe9e4e3a994bfd4a6315e3d3daa047ef7abf9e6428c3 SHA512 be7f081c687801be942a84f360f3aa10bd3242defb8aee69405861a2eaadca0c338f644d66d07ff55232a35cea7e7677bbc830ecc0bae0c12ecaf5b0b672d7b7 WHIRLPOOL a2f23786f4063e108c8e9d17b4eb6b7046fb1bfef896d036b63abccbf0bc7b0c5cba4ce17eca400097326b2fdb7ba7a912e142c4c805cef04db8de62aafb908d
-EBUILD selinux-sxid-9999.ebuild 279 SHA256 8e412b5a224bfb74ba6908c021db691bacad7fb6b8ebef543bf71ef77c1096ac SHA512 bb935fb1700efc624b6d64302cb166767ba6c807086144236eea889bb0aa28d9e3f85a07fe5a6e269952c8f7027aba26a04983f9d82227e58a92a2f62753e41c WHIRLPOOL 6170c012e03ebdb4555d93e2c14c8a2704fa4603642967500a274303615d992fd9f7be0d209edcb669b7c23af23fe44e0433a9dab1dbb196254d6831d19980de
+EBUILD selinux-sxid-2.20170204-r1.ebuild 280 SHA256 cbba58e7dd0dbadc65d921f1c4e31b3af8df1275808dacce68d622a31ce6ad25 SHA512 3263fdc3a536e2b8b64909b7262b3979dc43d592e2e1aca190a6dec54d9a2f4ae14dabf207e99ab0d09618667a3054a62ce85d0d45cec1d94c7d2edfb1a251b9 WHIRLPOOL 9bf8349b68a6a6840c29d1d3609292143bd1f81defc6dfec3e50d49ad3da1cf7ae0309565a298496d5950d6f02b5883079ca56cccd009b3a5c03fd70040cbfae
+EBUILD selinux-sxid-2.20170204-r2.ebuild 278 SHA256 100f7b385d2ca4f472df8664c5152be5aa38101c4ba4b78d4ff02ea52c6d98dc SHA512 88081e487c2bb06613fbe7dccbf229999132ff3ec3811ab17f1525e7ac6e39cea9de2f29b3c96da09322f2e0e2c57d70efa23f67c0f2bf33aee1d3bff71f88dd WHIRLPOOL 75d5c44df10f862160d9ba992b2bc6f5038d17f631386f4d65624f4a1d8ca8237efd5591ff3423a5ce64684ed36530915aa8e47eeb0d706a9a48ba0277134c15
+EBUILD selinux-sxid-2.20170204-r3.ebuild 278 SHA256 100f7b385d2ca4f472df8664c5152be5aa38101c4ba4b78d4ff02ea52c6d98dc SHA512 88081e487c2bb06613fbe7dccbf229999132ff3ec3811ab17f1525e7ac6e39cea9de2f29b3c96da09322f2e0e2c57d70efa23f67c0f2bf33aee1d3bff71f88dd WHIRLPOOL 75d5c44df10f862160d9ba992b2bc6f5038d17f631386f4d65624f4a1d8ca8237efd5591ff3423a5ce64684ed36530915aa8e47eeb0d706a9a48ba0277134c15
+EBUILD selinux-sxid-2.20170204-r4.ebuild 278 SHA256 100f7b385d2ca4f472df8664c5152be5aa38101c4ba4b78d4ff02ea52c6d98dc SHA512 88081e487c2bb06613fbe7dccbf229999132ff3ec3811ab17f1525e7ac6e39cea9de2f29b3c96da09322f2e0e2c57d70efa23f67c0f2bf33aee1d3bff71f88dd WHIRLPOOL 75d5c44df10f862160d9ba992b2bc6f5038d17f631386f4d65624f4a1d8ca8237efd5591ff3423a5ce64684ed36530915aa8e47eeb0d706a9a48ba0277134c15
+EBUILD selinux-sxid-2.20170805-r2.ebuild 278 SHA256 100f7b385d2ca4f472df8664c5152be5aa38101c4ba4b78d4ff02ea52c6d98dc SHA512 88081e487c2bb06613fbe7dccbf229999132ff3ec3811ab17f1525e7ac6e39cea9de2f29b3c96da09322f2e0e2c57d70efa23f67c0f2bf33aee1d3bff71f88dd WHIRLPOOL 75d5c44df10f862160d9ba992b2bc6f5038d17f631386f4d65624f4a1d8ca8237efd5591ff3423a5ce64684ed36530915aa8e47eeb0d706a9a48ba0277134c15
+EBUILD selinux-sxid-2.20170805-r3.ebuild 280 SHA256 cbba58e7dd0dbadc65d921f1c4e31b3af8df1275808dacce68d622a31ce6ad25 SHA512 3263fdc3a536e2b8b64909b7262b3979dc43d592e2e1aca190a6dec54d9a2f4ae14dabf207e99ab0d09618667a3054a62ce85d0d45cec1d94c7d2edfb1a251b9 WHIRLPOOL 9bf8349b68a6a6840c29d1d3609292143bd1f81defc6dfec3e50d49ad3da1cf7ae0309565a298496d5950d6f02b5883079ca56cccd009b3a5c03fd70040cbfae
+EBUILD selinux-sxid-9999.ebuild 280 SHA256 cbba58e7dd0dbadc65d921f1c4e31b3af8df1275808dacce68d622a31ce6ad25 SHA512 3263fdc3a536e2b8b64909b7262b3979dc43d592e2e1aca190a6dec54d9a2f4ae14dabf207e99ab0d09618667a3054a62ce85d0d45cec1d94c7d2edfb1a251b9 WHIRLPOOL 9bf8349b68a6a6840c29d1d3609292143bd1f81defc6dfec3e50d49ad3da1cf7ae0309565a298496d5950d6f02b5883079ca56cccd009b3a5c03fd70040cbfae
 MISC ChangeLog 10387 SHA256 83626c54a97e8ce43b2aa6092c7a35e3e0f3cfafe108fd35ae3ca980180e1081 SHA512 43e2ac27d6d537e09e301f2b369670b57028410310ecb8f95dbd6491e1262c7317e70984b0bbf93f9a4e040d8f78efec927ce7a3ae5d41288ba5a295d762631f WHIRLPOOL 61626839941c24efe9da090863a009bb8f315943b0f849bb6857070d19b7b049647d627ba53888bb03b85241e66027dc5f9484cf2a9672804fcc890056ddae77
 MISC ChangeLog-2015 9820 SHA256 c04eab9e06d155055ed32e1f248edb290468db42c18fee61fcd397aa1389e0e6 SHA512 ea1a2e1d0f058213d9f9df6fc4a9ac3030457820513fc9af2d8be380ffeee27778a12643adeeb055830b1a3e6860d7103434d02793e49b575d959bda7af1c2c8 WHIRLPOOL cfc04dfe0abf7061cf80ef018dc9dc5cd52863069a92285357c15114ea24d07d49a071634d3360925ad804e05e00cbab68a56fd845f8efeb16e7fb5cac0cbc26
 MISC metadata.xml 314 SHA256 5dc91703411eec541187b8fc48a2d603b84f6000a46dd6b2b1d4f25c298965e9 SHA512 0baa2e4f8b229b455faa8ca4a17e2f4eb9479cf4ed41c21d835bdd43fba5cb3bea22d80c8f6ac5c1518d40ea4e5208fbeda1d7236c612507410d8609a9c919e0 WHIRLPOOL 1a975972deffe98468e53d9a93d978eee4af9caea62ae0a1b51e396afa50fd892ceffc29f1866794f04762af65a9298a52bf1cf9a428c866a33432bef33ea12d
diff --git a/sec-policy/selinux-sxid/selinux-sxid-2.20170204-r1.ebuild b/sec-policy/selinux-sxid/selinux-sxid-2.20170204-r1.ebuild
index e47cd0bfb8be..78004d97bad7 100644
--- a/sec-policy/selinux-sxid/selinux-sxid-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-sxid/selinux-sxid-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-sxid/selinux-sxid-2.20170204-r2.ebuild b/sec-policy/selinux-sxid/selinux-sxid-2.20170204-r2.ebuild
index 734fb101cc65..53981821277d 100644
--- a/sec-policy/selinux-sxid/selinux-sxid-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-sxid/selinux-sxid-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-sxid/selinux-sxid-2.20170204-r3.ebuild b/sec-policy/selinux-sxid/selinux-sxid-2.20170204-r3.ebuild
index 734fb101cc65..53981821277d 100644
--- a/sec-policy/selinux-sxid/selinux-sxid-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-sxid/selinux-sxid-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-sxid/selinux-sxid-2.20170204-r4.ebuild b/sec-policy/selinux-sxid/selinux-sxid-2.20170204-r4.ebuild
index 734fb101cc65..53981821277d 100644
--- a/sec-policy/selinux-sxid/selinux-sxid-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-sxid/selinux-sxid-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-sxid/selinux-sxid-2.20170805-r2.ebuild b/sec-policy/selinux-sxid/selinux-sxid-2.20170805-r2.ebuild
index 734fb101cc65..53981821277d 100644
--- a/sec-policy/selinux-sxid/selinux-sxid-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-sxid/selinux-sxid-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-sxid/selinux-sxid-2.20170805-r3.ebuild b/sec-policy/selinux-sxid/selinux-sxid-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..78004d97bad7
--- /dev/null
+++ b/sec-policy/selinux-sxid/selinux-sxid-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-sxid/selinux-sxid-9999.ebuild b/sec-policy/selinux-sxid/selinux-sxid-9999.ebuild
index e47cd0bfb8be..78004d97bad7 100644
--- a/sec-policy/selinux-sxid/selinux-sxid-9999.ebuild
+++ b/sec-policy/selinux-sxid/selinux-sxid-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-syncthing/Manifest b/sec-policy/selinux-syncthing/Manifest
index ec552b04c36c..1babbba1a2fd 100644
--- a/sec-policy/selinux-syncthing/Manifest
+++ b/sec-policy/selinux-syncthing/Manifest
@@ -3,12 +3,14 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-syncthing-2.20170204-r1.ebuild 289 SHA256 c31a58dda07ceb9f64bd865b119ee04acea8605d1383f3ce71d188fa5903cff0 SHA512 319d2cd6e5e856f765eb88672f8748618ffdb7aac533bd54c1b64721ac9889f4e411b3d8785901cae11c2f4dd8cfdbcebaa1fb7192d92118afece9c6034e84d2 WHIRLPOOL 6035f1ef669ff4879e2d7e6292fd1d7b442cdbdbe48a2f051dc311d150f94876334a64436a8ea2851a68b88740daff0c9c14ebe5e450a503d0b9d9a94b2a1781
-EBUILD selinux-syncthing-2.20170204-r2.ebuild 287 SHA256 d66b8c078c6f2ae51a7857f6557f18b4d825a74d2e7afda6b5696a6b131d4949 SHA512 b7ce72d008d6c3c8e1e8ba8e79e05d774ee25bbfdfe44f520ecd4abdc9423aed2ca8749c331df9ae5cd8af777849783812d2edef1c7a01a9f0241f8d67f18fd7 WHIRLPOOL 1cd875e706050444d626658d002affeb5888a3d4dd651427d2df0c9adda3d9e7ba038ee6547ff8279fca8a801822229bedd9729e310a039cfddd9922a1b6097b
-EBUILD selinux-syncthing-2.20170204-r3.ebuild 287 SHA256 d66b8c078c6f2ae51a7857f6557f18b4d825a74d2e7afda6b5696a6b131d4949 SHA512 b7ce72d008d6c3c8e1e8ba8e79e05d774ee25bbfdfe44f520ecd4abdc9423aed2ca8749c331df9ae5cd8af777849783812d2edef1c7a01a9f0241f8d67f18fd7 WHIRLPOOL 1cd875e706050444d626658d002affeb5888a3d4dd651427d2df0c9adda3d9e7ba038ee6547ff8279fca8a801822229bedd9729e310a039cfddd9922a1b6097b
-EBUILD selinux-syncthing-2.20170204-r4.ebuild 287 SHA256 d66b8c078c6f2ae51a7857f6557f18b4d825a74d2e7afda6b5696a6b131d4949 SHA512 b7ce72d008d6c3c8e1e8ba8e79e05d774ee25bbfdfe44f520ecd4abdc9423aed2ca8749c331df9ae5cd8af777849783812d2edef1c7a01a9f0241f8d67f18fd7 WHIRLPOOL 1cd875e706050444d626658d002affeb5888a3d4dd651427d2df0c9adda3d9e7ba038ee6547ff8279fca8a801822229bedd9729e310a039cfddd9922a1b6097b
-EBUILD selinux-syncthing-2.20170805-r2.ebuild 287 SHA256 d66b8c078c6f2ae51a7857f6557f18b4d825a74d2e7afda6b5696a6b131d4949 SHA512 b7ce72d008d6c3c8e1e8ba8e79e05d774ee25bbfdfe44f520ecd4abdc9423aed2ca8749c331df9ae5cd8af777849783812d2edef1c7a01a9f0241f8d67f18fd7 WHIRLPOOL 1cd875e706050444d626658d002affeb5888a3d4dd651427d2df0c9adda3d9e7ba038ee6547ff8279fca8a801822229bedd9729e310a039cfddd9922a1b6097b
-EBUILD selinux-syncthing-9999.ebuild 289 SHA256 c31a58dda07ceb9f64bd865b119ee04acea8605d1383f3ce71d188fa5903cff0 SHA512 319d2cd6e5e856f765eb88672f8748618ffdb7aac533bd54c1b64721ac9889f4e411b3d8785901cae11c2f4dd8cfdbcebaa1fb7192d92118afece9c6034e84d2 WHIRLPOOL 6035f1ef669ff4879e2d7e6292fd1d7b442cdbdbe48a2f051dc311d150f94876334a64436a8ea2851a68b88740daff0c9c14ebe5e450a503d0b9d9a94b2a1781
+EBUILD selinux-syncthing-2.20170204-r1.ebuild 290 SHA256 2132f5a40391327957c944ac67d332c95159f0180c3dde59bbbbe1f79782148d SHA512 95169f6ab6b871b29f8639bc0b36959ff09e984691370c5508691fa839091e03a27472b8c9739f891ebbdfae9990c633908a149e5bbdc52e5aeb26cc58cf6d16 WHIRLPOOL d4f62d36fc3b45f532187b64107bbc543967c1b253788bd6f4eda20d6dfafe9785bdf121a492ae47082fd839a532fefa86f00b0e2fe14036ec92a2c969769f8a
+EBUILD selinux-syncthing-2.20170204-r2.ebuild 288 SHA256 64d554f956f60ab431c3ed16f14a5103bc582acc073388fc338aa70b7ae67b9a SHA512 a636a5ab365373fae954f86bd4cadcdd9c60509a28bc278fd58a2dbbe90b6ae97491c431f2899477a0fb110d5dccc96db0179ff054fc7461c2b0652851632a85 WHIRLPOOL 51446cb07c5944eebb9cc647b6010a893aa478051b62025b75a670598c3dc11e70df23cfa2a650c71302a51e001cb478743530fe52981409347ba0e78348880f
+EBUILD selinux-syncthing-2.20170204-r3.ebuild 288 SHA256 64d554f956f60ab431c3ed16f14a5103bc582acc073388fc338aa70b7ae67b9a SHA512 a636a5ab365373fae954f86bd4cadcdd9c60509a28bc278fd58a2dbbe90b6ae97491c431f2899477a0fb110d5dccc96db0179ff054fc7461c2b0652851632a85 WHIRLPOOL 51446cb07c5944eebb9cc647b6010a893aa478051b62025b75a670598c3dc11e70df23cfa2a650c71302a51e001cb478743530fe52981409347ba0e78348880f
+EBUILD selinux-syncthing-2.20170204-r4.ebuild 288 SHA256 64d554f956f60ab431c3ed16f14a5103bc582acc073388fc338aa70b7ae67b9a SHA512 a636a5ab365373fae954f86bd4cadcdd9c60509a28bc278fd58a2dbbe90b6ae97491c431f2899477a0fb110d5dccc96db0179ff054fc7461c2b0652851632a85 WHIRLPOOL 51446cb07c5944eebb9cc647b6010a893aa478051b62025b75a670598c3dc11e70df23cfa2a650c71302a51e001cb478743530fe52981409347ba0e78348880f
+EBUILD selinux-syncthing-2.20170805-r2.ebuild 288 SHA256 64d554f956f60ab431c3ed16f14a5103bc582acc073388fc338aa70b7ae67b9a SHA512 a636a5ab365373fae954f86bd4cadcdd9c60509a28bc278fd58a2dbbe90b6ae97491c431f2899477a0fb110d5dccc96db0179ff054fc7461c2b0652851632a85 WHIRLPOOL 51446cb07c5944eebb9cc647b6010a893aa478051b62025b75a670598c3dc11e70df23cfa2a650c71302a51e001cb478743530fe52981409347ba0e78348880f
+EBUILD selinux-syncthing-2.20170805-r3.ebuild 290 SHA256 2132f5a40391327957c944ac67d332c95159f0180c3dde59bbbbe1f79782148d SHA512 95169f6ab6b871b29f8639bc0b36959ff09e984691370c5508691fa839091e03a27472b8c9739f891ebbdfae9990c633908a149e5bbdc52e5aeb26cc58cf6d16 WHIRLPOOL d4f62d36fc3b45f532187b64107bbc543967c1b253788bd6f4eda20d6dfafe9785bdf121a492ae47082fd839a532fefa86f00b0e2fe14036ec92a2c969769f8a
+EBUILD selinux-syncthing-9999.ebuild 290 SHA256 2132f5a40391327957c944ac67d332c95159f0180c3dde59bbbbe1f79782148d SHA512 95169f6ab6b871b29f8639bc0b36959ff09e984691370c5508691fa839091e03a27472b8c9739f891ebbdfae9990c633908a149e5bbdc52e5aeb26cc58cf6d16 WHIRLPOOL d4f62d36fc3b45f532187b64107bbc543967c1b253788bd6f4eda20d6dfafe9785bdf121a492ae47082fd839a532fefa86f00b0e2fe14036ec92a2c969769f8a
 MISC metadata.xml 319 SHA256 b61aa2c0932452e0d84c7093467a6408b84510a134b5f9b033e060b7f7ebb196 SHA512 0ae48ef15966fa6b5b11a0b5e067061a5385c22c78b016caaa29a77457d5f48522abe1303c870cc1117d3a1a67d8b7f47ad8da9e9703ec13d05656d86b2168fa WHIRLPOOL a6e258350cb3bc254c93246e4c446165d3deed81e4a232a2d2739b40cdeede0b9259fb7f16f02898b6dd180dff7e1d7456d37f8f4b4ccab97f88bbdab384d0b3
diff --git a/sec-policy/selinux-syncthing/selinux-syncthing-2.20170204-r1.ebuild b/sec-policy/selinux-syncthing/selinux-syncthing-2.20170204-r1.ebuild
index 731e589fafe6..770ad757c47f 100644
--- a/sec-policy/selinux-syncthing/selinux-syncthing-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-syncthing/selinux-syncthing-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-syncthing/selinux-syncthing-2.20170204-r2.ebuild b/sec-policy/selinux-syncthing/selinux-syncthing-2.20170204-r2.ebuild
index 3ea4cfd96a16..f09aa093c1f5 100644
--- a/sec-policy/selinux-syncthing/selinux-syncthing-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-syncthing/selinux-syncthing-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-syncthing/selinux-syncthing-2.20170204-r3.ebuild b/sec-policy/selinux-syncthing/selinux-syncthing-2.20170204-r3.ebuild
index 3ea4cfd96a16..f09aa093c1f5 100644
--- a/sec-policy/selinux-syncthing/selinux-syncthing-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-syncthing/selinux-syncthing-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-syncthing/selinux-syncthing-2.20170204-r4.ebuild b/sec-policy/selinux-syncthing/selinux-syncthing-2.20170204-r4.ebuild
index 3ea4cfd96a16..f09aa093c1f5 100644
--- a/sec-policy/selinux-syncthing/selinux-syncthing-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-syncthing/selinux-syncthing-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-syncthing/selinux-syncthing-2.20170805-r2.ebuild b/sec-policy/selinux-syncthing/selinux-syncthing-2.20170805-r2.ebuild
index 3ea4cfd96a16..f09aa093c1f5 100644
--- a/sec-policy/selinux-syncthing/selinux-syncthing-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-syncthing/selinux-syncthing-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-syncthing/selinux-syncthing-2.20170805-r3.ebuild b/sec-policy/selinux-syncthing/selinux-syncthing-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..770ad757c47f
--- /dev/null
+++ b/sec-policy/selinux-syncthing/selinux-syncthing-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-syncthing/selinux-syncthing-9999.ebuild b/sec-policy/selinux-syncthing/selinux-syncthing-9999.ebuild
index 731e589fafe6..770ad757c47f 100644
--- a/sec-policy/selinux-syncthing/selinux-syncthing-9999.ebuild
+++ b/sec-policy/selinux-syncthing/selinux-syncthing-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-sysstat/Manifest b/sec-policy/selinux-sysstat/Manifest
index 0b3dd402bb55..7ec8582ae566 100644
--- a/sec-policy/selinux-sysstat/Manifest
+++ b/sec-policy/selinux-sysstat/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-sysstat-2.20170204-r1.ebuild 285 SHA256 0cd3725bd61fa8417eb7c64349ff63de110cdeb79c3067dc543cdddf6cc47b25 SHA512 603ab7e9b91070dd40c95fda4f4d15034e8c2dc0034f3f8b16bce78285e942b7d46371761016583a6ab9df8f57adf5464e756153d27ca9b22760db849064ca1c WHIRLPOOL e5c8d231d96dbadc2d1b8b0e3fe81641d5023074a4fe06d8d0234744ea5232742f086f6ff0278ba532313ab7710bc50506dad6b9c4f542380a743256fe9884de
-EBUILD selinux-sysstat-2.20170204-r2.ebuild 283 SHA256 7c065eae7820edd808c82d20aca2c0b617ddcca5382a3f53b03d98bc680255a2 SHA512 271c1eb69757fb3d8c898242a3869b73e1693cf324db0cec52c07cac7b1c62df08b9e73f168655800949b820ff1d68c0fe8ea7132777704de9cca8dda2c4d596 WHIRLPOOL 1275609a8a822df88a4b32ce120aec9c14d5e5d2e6b7a8e2500ba859d1419247e53ea2b538ade9af209acf408186c33294722a014612408785b103eeb677bdc5
-EBUILD selinux-sysstat-2.20170204-r3.ebuild 283 SHA256 7c065eae7820edd808c82d20aca2c0b617ddcca5382a3f53b03d98bc680255a2 SHA512 271c1eb69757fb3d8c898242a3869b73e1693cf324db0cec52c07cac7b1c62df08b9e73f168655800949b820ff1d68c0fe8ea7132777704de9cca8dda2c4d596 WHIRLPOOL 1275609a8a822df88a4b32ce120aec9c14d5e5d2e6b7a8e2500ba859d1419247e53ea2b538ade9af209acf408186c33294722a014612408785b103eeb677bdc5
-EBUILD selinux-sysstat-2.20170204-r4.ebuild 283 SHA256 7c065eae7820edd808c82d20aca2c0b617ddcca5382a3f53b03d98bc680255a2 SHA512 271c1eb69757fb3d8c898242a3869b73e1693cf324db0cec52c07cac7b1c62df08b9e73f168655800949b820ff1d68c0fe8ea7132777704de9cca8dda2c4d596 WHIRLPOOL 1275609a8a822df88a4b32ce120aec9c14d5e5d2e6b7a8e2500ba859d1419247e53ea2b538ade9af209acf408186c33294722a014612408785b103eeb677bdc5
-EBUILD selinux-sysstat-2.20170805-r2.ebuild 283 SHA256 7c065eae7820edd808c82d20aca2c0b617ddcca5382a3f53b03d98bc680255a2 SHA512 271c1eb69757fb3d8c898242a3869b73e1693cf324db0cec52c07cac7b1c62df08b9e73f168655800949b820ff1d68c0fe8ea7132777704de9cca8dda2c4d596 WHIRLPOOL 1275609a8a822df88a4b32ce120aec9c14d5e5d2e6b7a8e2500ba859d1419247e53ea2b538ade9af209acf408186c33294722a014612408785b103eeb677bdc5
-EBUILD selinux-sysstat-9999.ebuild 285 SHA256 0cd3725bd61fa8417eb7c64349ff63de110cdeb79c3067dc543cdddf6cc47b25 SHA512 603ab7e9b91070dd40c95fda4f4d15034e8c2dc0034f3f8b16bce78285e942b7d46371761016583a6ab9df8f57adf5464e756153d27ca9b22760db849064ca1c WHIRLPOOL e5c8d231d96dbadc2d1b8b0e3fe81641d5023074a4fe06d8d0234744ea5232742f086f6ff0278ba532313ab7710bc50506dad6b9c4f542380a743256fe9884de
+EBUILD selinux-sysstat-2.20170204-r1.ebuild 286 SHA256 2bd34ca4655c5b67bbd26b6426fc5a68a9625cc86848646688d675370d891cc8 SHA512 f00d7f8ce98117bb8c4fa474c52a6e83f0c6900afba1c3392fec9cbe31588891fa0b6cb5065a4cef066b53897dbb24369341d10979e2e825aac0460d935e9515 WHIRLPOOL 65912c0c95d8dad924b37b8d94b0ec89b305994bf2538161b190586b338c580fde8dc142a516fc21c1e1766350b64509fb5c7fb556218e1ed5c20ae69050e3de
+EBUILD selinux-sysstat-2.20170204-r2.ebuild 284 SHA256 4e8327775d46f3a54d20f7a5d16428e9dc5bf046a794068f2789f629995f04a6 SHA512 50541dd30b19915719e910107f80372a745ea4eb3d656c82ad91a60ae270fbdb98b76c6182f2d3c195ca44d8e802b63f4bbcda57006358af6690259c66a04cec WHIRLPOOL a10a9b9971188bc2b62af791ef710abc52fd74b2fc72a1f569cd16cdfcafd802fbf96a748018af3e8e0cda81b349873c4851de69287cc3cc6941ab5e21299b26
+EBUILD selinux-sysstat-2.20170204-r3.ebuild 284 SHA256 4e8327775d46f3a54d20f7a5d16428e9dc5bf046a794068f2789f629995f04a6 SHA512 50541dd30b19915719e910107f80372a745ea4eb3d656c82ad91a60ae270fbdb98b76c6182f2d3c195ca44d8e802b63f4bbcda57006358af6690259c66a04cec WHIRLPOOL a10a9b9971188bc2b62af791ef710abc52fd74b2fc72a1f569cd16cdfcafd802fbf96a748018af3e8e0cda81b349873c4851de69287cc3cc6941ab5e21299b26
+EBUILD selinux-sysstat-2.20170204-r4.ebuild 284 SHA256 4e8327775d46f3a54d20f7a5d16428e9dc5bf046a794068f2789f629995f04a6 SHA512 50541dd30b19915719e910107f80372a745ea4eb3d656c82ad91a60ae270fbdb98b76c6182f2d3c195ca44d8e802b63f4bbcda57006358af6690259c66a04cec WHIRLPOOL a10a9b9971188bc2b62af791ef710abc52fd74b2fc72a1f569cd16cdfcafd802fbf96a748018af3e8e0cda81b349873c4851de69287cc3cc6941ab5e21299b26
+EBUILD selinux-sysstat-2.20170805-r2.ebuild 284 SHA256 4e8327775d46f3a54d20f7a5d16428e9dc5bf046a794068f2789f629995f04a6 SHA512 50541dd30b19915719e910107f80372a745ea4eb3d656c82ad91a60ae270fbdb98b76c6182f2d3c195ca44d8e802b63f4bbcda57006358af6690259c66a04cec WHIRLPOOL a10a9b9971188bc2b62af791ef710abc52fd74b2fc72a1f569cd16cdfcafd802fbf96a748018af3e8e0cda81b349873c4851de69287cc3cc6941ab5e21299b26
+EBUILD selinux-sysstat-2.20170805-r3.ebuild 286 SHA256 2bd34ca4655c5b67bbd26b6426fc5a68a9625cc86848646688d675370d891cc8 SHA512 f00d7f8ce98117bb8c4fa474c52a6e83f0c6900afba1c3392fec9cbe31588891fa0b6cb5065a4cef066b53897dbb24369341d10979e2e825aac0460d935e9515 WHIRLPOOL 65912c0c95d8dad924b37b8d94b0ec89b305994bf2538161b190586b338c580fde8dc142a516fc21c1e1766350b64509fb5c7fb556218e1ed5c20ae69050e3de
+EBUILD selinux-sysstat-9999.ebuild 286 SHA256 2bd34ca4655c5b67bbd26b6426fc5a68a9625cc86848646688d675370d891cc8 SHA512 f00d7f8ce98117bb8c4fa474c52a6e83f0c6900afba1c3392fec9cbe31588891fa0b6cb5065a4cef066b53897dbb24369341d10979e2e825aac0460d935e9515 WHIRLPOOL 65912c0c95d8dad924b37b8d94b0ec89b305994bf2538161b190586b338c580fde8dc142a516fc21c1e1766350b64509fb5c7fb556218e1ed5c20ae69050e3de
 MISC ChangeLog 10687 SHA256 c3efb8b94cfa6e5d89b06e3d5659fd9a0694eeda2dec9a97a80fd3ed5b03206e SHA512 22d889f6ba40863bcb9add8c5ae43fed5e66da2df715d15beb3588f9a4355929110401f42a826f226b29120b1345033ec7ec79e845a8325eb765da8800f1020a WHIRLPOOL 3e7ab3e51bcbdaa09df4fa86614876791612b674b65f519984ea35a163e2baba21a8bf03701c9b60113f0e03e26ad2145bbcf947624bbc1e5adaed869f12e2fe
 MISC ChangeLog-2015 10172 SHA256 1b1411246c6c12fcef2abe6a25df0a2662555349279a7558ceb0349ce3ac224c SHA512 b8be264783d6b69ee642c96b0c901665edb556701c93daee3adbbfc40caf7291e99ea849f3e2893929d58693996fd0da9e76985f97d560409ff4625ed856abbe WHIRLPOOL 551659640a5941e9a1f0b7061b81f854b53597b06e0e71f838b9411fc6bd9b57c9c82fb532e4502e42290593c470d60214aef3eedc3744b42ae2b1ed0404dd5b
 MISC metadata.xml 317 SHA256 d6ca66ac65473a19111b44429f5d1d6eaeca7e7aa0057d3e241bd6e60695ee48 SHA512 dab3ab7e1b48828952a50e5b936336fa179a5e7d852e82061dd2c0d2caed0ce4c52dd06c6610ab0b19c6441a927eb826eaabd84100edff7271e73be4165f35d5 WHIRLPOOL ff035b4ca865047f11e7ebe2b00660af6ad441866bb96dbd71bc86565c2a850a4d898ad79b5c56d368d1a200fbd76a578a221bda3b18ad699c1c197aa40a72f0
diff --git a/sec-policy/selinux-sysstat/selinux-sysstat-2.20170204-r1.ebuild b/sec-policy/selinux-sysstat/selinux-sysstat-2.20170204-r1.ebuild
index 7da4519e4a26..3d7093c2ea1f 100644
--- a/sec-policy/selinux-sysstat/selinux-sysstat-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-sysstat/selinux-sysstat-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-sysstat/selinux-sysstat-2.20170204-r2.ebuild b/sec-policy/selinux-sysstat/selinux-sysstat-2.20170204-r2.ebuild
index b299daaf0c27..6a019365f64c 100644
--- a/sec-policy/selinux-sysstat/selinux-sysstat-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-sysstat/selinux-sysstat-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-sysstat/selinux-sysstat-2.20170204-r3.ebuild b/sec-policy/selinux-sysstat/selinux-sysstat-2.20170204-r3.ebuild
index b299daaf0c27..6a019365f64c 100644
--- a/sec-policy/selinux-sysstat/selinux-sysstat-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-sysstat/selinux-sysstat-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-sysstat/selinux-sysstat-2.20170204-r4.ebuild b/sec-policy/selinux-sysstat/selinux-sysstat-2.20170204-r4.ebuild
index b299daaf0c27..6a019365f64c 100644
--- a/sec-policy/selinux-sysstat/selinux-sysstat-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-sysstat/selinux-sysstat-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-sysstat/selinux-sysstat-2.20170805-r2.ebuild b/sec-policy/selinux-sysstat/selinux-sysstat-2.20170805-r2.ebuild
index b299daaf0c27..6a019365f64c 100644
--- a/sec-policy/selinux-sysstat/selinux-sysstat-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-sysstat/selinux-sysstat-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-sysstat/selinux-sysstat-2.20170805-r3.ebuild b/sec-policy/selinux-sysstat/selinux-sysstat-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..3d7093c2ea1f
--- /dev/null
+++ b/sec-policy/selinux-sysstat/selinux-sysstat-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-sysstat/selinux-sysstat-9999.ebuild b/sec-policy/selinux-sysstat/selinux-sysstat-9999.ebuild
index 7da4519e4a26..3d7093c2ea1f 100644
--- a/sec-policy/selinux-sysstat/selinux-sysstat-9999.ebuild
+++ b/sec-policy/selinux-sysstat/selinux-sysstat-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-tboot/Manifest b/sec-policy/selinux-tboot/Manifest
index 9e0c5fcf2e2b..307064e8583a 100644
--- a/sec-policy/selinux-tboot/Manifest
+++ b/sec-policy/selinux-tboot/Manifest
@@ -3,13 +3,15 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-tboot-2.20170204-r1.ebuild 281 SHA256 79dc2d9a7114232922383099aa66b8aafaeb3048e06ca4cc41f7971eba2aebf0 SHA512 3d8e57c8a8fbfed8f9b3dc816c1912a90fcae142da1a9ec74adfb8f0ffe8fa8f993719e8bacdb1ed938c5814faad251da59e579bc2152be60781f779667e2ff9 WHIRLPOOL aae67fd5c5201d3706d7298c516a3795a41c51c4c1573335e92f54e156f5af3d8d05db29d82ba96401fab2b4d9d0c66fe9b72c20feb7d335fa9c3a7f96f46956
-EBUILD selinux-tboot-2.20170204-r2.ebuild 279 SHA256 d94a7abfb68fec79d6ae1ed8c4c9e27f3e06117cd2bdfce99a75189b04792df7 SHA512 37631d85461379c738e2ca06554197782c0382206be2f8481f07ab22ebf6316d2a4ed6f5a11651259503d64d18c0146007952a72633dab5f26a27cb083bcf7e8 WHIRLPOOL 6f085d122c0071b8c5871cbede2b20f84328c51039b2eab5d7d99118a48310d1fb1af2dee917c65877814a5d6cd63d96b3431d611aebc67c2508951e588494c1
-EBUILD selinux-tboot-2.20170204-r3.ebuild 279 SHA256 d94a7abfb68fec79d6ae1ed8c4c9e27f3e06117cd2bdfce99a75189b04792df7 SHA512 37631d85461379c738e2ca06554197782c0382206be2f8481f07ab22ebf6316d2a4ed6f5a11651259503d64d18c0146007952a72633dab5f26a27cb083bcf7e8 WHIRLPOOL 6f085d122c0071b8c5871cbede2b20f84328c51039b2eab5d7d99118a48310d1fb1af2dee917c65877814a5d6cd63d96b3431d611aebc67c2508951e588494c1
-EBUILD selinux-tboot-2.20170204-r4.ebuild 279 SHA256 d94a7abfb68fec79d6ae1ed8c4c9e27f3e06117cd2bdfce99a75189b04792df7 SHA512 37631d85461379c738e2ca06554197782c0382206be2f8481f07ab22ebf6316d2a4ed6f5a11651259503d64d18c0146007952a72633dab5f26a27cb083bcf7e8 WHIRLPOOL 6f085d122c0071b8c5871cbede2b20f84328c51039b2eab5d7d99118a48310d1fb1af2dee917c65877814a5d6cd63d96b3431d611aebc67c2508951e588494c1
-EBUILD selinux-tboot-2.20170805-r2.ebuild 279 SHA256 d94a7abfb68fec79d6ae1ed8c4c9e27f3e06117cd2bdfce99a75189b04792df7 SHA512 37631d85461379c738e2ca06554197782c0382206be2f8481f07ab22ebf6316d2a4ed6f5a11651259503d64d18c0146007952a72633dab5f26a27cb083bcf7e8 WHIRLPOOL 6f085d122c0071b8c5871cbede2b20f84328c51039b2eab5d7d99118a48310d1fb1af2dee917c65877814a5d6cd63d96b3431d611aebc67c2508951e588494c1
-EBUILD selinux-tboot-9999.ebuild 281 SHA256 79dc2d9a7114232922383099aa66b8aafaeb3048e06ca4cc41f7971eba2aebf0 SHA512 3d8e57c8a8fbfed8f9b3dc816c1912a90fcae142da1a9ec74adfb8f0ffe8fa8f993719e8bacdb1ed938c5814faad251da59e579bc2152be60781f779667e2ff9 WHIRLPOOL aae67fd5c5201d3706d7298c516a3795a41c51c4c1573335e92f54e156f5af3d8d05db29d82ba96401fab2b4d9d0c66fe9b72c20feb7d335fa9c3a7f96f46956
+EBUILD selinux-tboot-2.20170204-r1.ebuild 282 SHA256 8d8f7046a1548be929bc6f36b345391fa02f6ef0cbd60ab29f8b90c1bc3cc7ee SHA512 5f499c39d47b9fb43eba196c9abe72a838f4026dcad1f83fa8c263b107711301c13197034c55bb9e0cc9a664705bd0c74ed9b639c6d25c470c414376d4987f2d WHIRLPOOL 9acf52714502de327c86174cd0ca2964af310aed43ada8b1300af10083fc8248fd37e99c87bda4c61b45ad6f882af8e89827a11af05a4a36da2999da529aa97b
+EBUILD selinux-tboot-2.20170204-r2.ebuild 280 SHA256 b88e14919e19f677fb6227f9860385e8fbeb6c9e35eb0dd82a264d4c456bd39a SHA512 9c4dbe968352504211c54ddc3402c8c647acc80d42338d16e3ddfbf2ed85b0e0294c96f457b510b59986488cfd48e4ccdc96a9e949d07533c4b9e5309f26b832 WHIRLPOOL f31a86b46138b017b3b4b72fc2fd3ed1c89a52ade599ea6b0154acd6a4a82d55c719d61db1f0e6435b1934880c787ea4f18538aa28401e0af712c4035b55ebd0
+EBUILD selinux-tboot-2.20170204-r3.ebuild 280 SHA256 b88e14919e19f677fb6227f9860385e8fbeb6c9e35eb0dd82a264d4c456bd39a SHA512 9c4dbe968352504211c54ddc3402c8c647acc80d42338d16e3ddfbf2ed85b0e0294c96f457b510b59986488cfd48e4ccdc96a9e949d07533c4b9e5309f26b832 WHIRLPOOL f31a86b46138b017b3b4b72fc2fd3ed1c89a52ade599ea6b0154acd6a4a82d55c719d61db1f0e6435b1934880c787ea4f18538aa28401e0af712c4035b55ebd0
+EBUILD selinux-tboot-2.20170204-r4.ebuild 280 SHA256 b88e14919e19f677fb6227f9860385e8fbeb6c9e35eb0dd82a264d4c456bd39a SHA512 9c4dbe968352504211c54ddc3402c8c647acc80d42338d16e3ddfbf2ed85b0e0294c96f457b510b59986488cfd48e4ccdc96a9e949d07533c4b9e5309f26b832 WHIRLPOOL f31a86b46138b017b3b4b72fc2fd3ed1c89a52ade599ea6b0154acd6a4a82d55c719d61db1f0e6435b1934880c787ea4f18538aa28401e0af712c4035b55ebd0
+EBUILD selinux-tboot-2.20170805-r2.ebuild 280 SHA256 b88e14919e19f677fb6227f9860385e8fbeb6c9e35eb0dd82a264d4c456bd39a SHA512 9c4dbe968352504211c54ddc3402c8c647acc80d42338d16e3ddfbf2ed85b0e0294c96f457b510b59986488cfd48e4ccdc96a9e949d07533c4b9e5309f26b832 WHIRLPOOL f31a86b46138b017b3b4b72fc2fd3ed1c89a52ade599ea6b0154acd6a4a82d55c719d61db1f0e6435b1934880c787ea4f18538aa28401e0af712c4035b55ebd0
+EBUILD selinux-tboot-2.20170805-r3.ebuild 282 SHA256 8d8f7046a1548be929bc6f36b345391fa02f6ef0cbd60ab29f8b90c1bc3cc7ee SHA512 5f499c39d47b9fb43eba196c9abe72a838f4026dcad1f83fa8c263b107711301c13197034c55bb9e0cc9a664705bd0c74ed9b639c6d25c470c414376d4987f2d WHIRLPOOL 9acf52714502de327c86174cd0ca2964af310aed43ada8b1300af10083fc8248fd37e99c87bda4c61b45ad6f882af8e89827a11af05a4a36da2999da529aa97b
+EBUILD selinux-tboot-9999.ebuild 282 SHA256 8d8f7046a1548be929bc6f36b345391fa02f6ef0cbd60ab29f8b90c1bc3cc7ee SHA512 5f499c39d47b9fb43eba196c9abe72a838f4026dcad1f83fa8c263b107711301c13197034c55bb9e0cc9a664705bd0c74ed9b639c6d25c470c414376d4987f2d WHIRLPOOL 9acf52714502de327c86174cd0ca2964af310aed43ada8b1300af10083fc8248fd37e99c87bda4c61b45ad6f882af8e89827a11af05a4a36da2999da529aa97b
 MISC ChangeLog 4237 SHA256 45cdac4472d49d7822832452d95d1398c33c6ae3abb74eec71155da860325083 SHA512 2a0b6c9a80728bea82cb4853826ed8684d00b4652c6d3419d94171c9b496cbfc37e5fed9226c7c65e2d092e15ef2025af7f133b1a7ba7aeeb58415594779c13c WHIRLPOOL 5dd16db35b9fa6487fb2e890f0579e99acef52ca4a9eee479402879582aee080c1b25854fbe43c9c5ebad349b5c80d871f0e317f4aca93262fc37bce2f31bf5f
 MISC metadata.xml 335 SHA256 dedd6e81c098205a0cc12bf16a5cffb9ad13a3b03e931a6178e2af4112552595 SHA512 893b7c0695b5811aa706cbdee4a48d90de09b9e6e24305b5dd73f51d4a0f06c3ea32911e0e800b5fde6d2f5024095d501fedd600bc542ca14e83809696b3d028 WHIRLPOOL 3ced86059024fd3b4c598f8a700e8c5aba8d3d6744ee1c673097e748648daf9518f884d1237226a8c768a0298d46f46a37fca27d02ec743a5d226e6176e69da8
diff --git a/sec-policy/selinux-tboot/selinux-tboot-2.20170204-r1.ebuild b/sec-policy/selinux-tboot/selinux-tboot-2.20170204-r1.ebuild
index a707cb9d587e..90dfb5417720 100644
--- a/sec-policy/selinux-tboot/selinux-tboot-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-tboot/selinux-tboot-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-tboot/selinux-tboot-2.20170204-r2.ebuild b/sec-policy/selinux-tboot/selinux-tboot-2.20170204-r2.ebuild
index 9e66d60ecd87..9e6ed3ef669c 100644
--- a/sec-policy/selinux-tboot/selinux-tboot-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-tboot/selinux-tboot-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-tboot/selinux-tboot-2.20170204-r3.ebuild b/sec-policy/selinux-tboot/selinux-tboot-2.20170204-r3.ebuild
index 9e66d60ecd87..9e6ed3ef669c 100644
--- a/sec-policy/selinux-tboot/selinux-tboot-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-tboot/selinux-tboot-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-tboot/selinux-tboot-2.20170204-r4.ebuild b/sec-policy/selinux-tboot/selinux-tboot-2.20170204-r4.ebuild
index 9e66d60ecd87..9e6ed3ef669c 100644
--- a/sec-policy/selinux-tboot/selinux-tboot-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-tboot/selinux-tboot-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-tboot/selinux-tboot-2.20170805-r2.ebuild b/sec-policy/selinux-tboot/selinux-tboot-2.20170805-r2.ebuild
index 9e66d60ecd87..9e6ed3ef669c 100644
--- a/sec-policy/selinux-tboot/selinux-tboot-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-tboot/selinux-tboot-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-tboot/selinux-tboot-2.20170805-r3.ebuild b/sec-policy/selinux-tboot/selinux-tboot-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..90dfb5417720
--- /dev/null
+++ b/sec-policy/selinux-tboot/selinux-tboot-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-tboot/selinux-tboot-9999.ebuild b/sec-policy/selinux-tboot/selinux-tboot-9999.ebuild
index a707cb9d587e..90dfb5417720 100644
--- a/sec-policy/selinux-tboot/selinux-tboot-9999.ebuild
+++ b/sec-policy/selinux-tboot/selinux-tboot-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-tcpd/Manifest b/sec-policy/selinux-tcpd/Manifest
index bc8f410771c7..17de0eaae933 100644
--- a/sec-policy/selinux-tcpd/Manifest
+++ b/sec-policy/selinux-tcpd/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-tcpd-2.20170204-r1.ebuild 373 SHA256 3de29b29c4b829bef772e0fd6d85af5ca595a9363e9feb2b6db2bc0edc3a8da4 SHA512 73d89c97de114d8d7ddffcd154cb7c2233b6601659a6ce4664b2ff400c5bdb8eedf01dd69f35dfa673ad03ab9ab7106d02b017b5441f93b1f352e93aee4e737c WHIRLPOOL ea810817f14ff2747a6d18e27a57f222f0b900466dc6d1f47b94f41e6a9afcc184f5699814ed3520d8bf5987f60c010fa0db80991668b34c2c52fba4228f7622
-EBUILD selinux-tcpd-2.20170204-r2.ebuild 371 SHA256 e49090120d4cfece4123e743f928e3c8894675d5be2ed4fb221f11c891e307b7 SHA512 ce65403edd7264e727ef9c206d1572f5d2ac3a4db9c754233998abe0c0573d4bc494cee2dae86950533cec5bbf8bc9dfc8561b8b6872eb22dad4ee6e1e6f7045 WHIRLPOOL fac1b09c82cb34ce684cf7d305061a38ccad8f86a1bd1494e935fbfe73f229ff619a7b2ef1c831b083d1369bcaac3de9d9588aa2abfa88a3a58d0a58f2336eaf
-EBUILD selinux-tcpd-2.20170204-r3.ebuild 371 SHA256 e49090120d4cfece4123e743f928e3c8894675d5be2ed4fb221f11c891e307b7 SHA512 ce65403edd7264e727ef9c206d1572f5d2ac3a4db9c754233998abe0c0573d4bc494cee2dae86950533cec5bbf8bc9dfc8561b8b6872eb22dad4ee6e1e6f7045 WHIRLPOOL fac1b09c82cb34ce684cf7d305061a38ccad8f86a1bd1494e935fbfe73f229ff619a7b2ef1c831b083d1369bcaac3de9d9588aa2abfa88a3a58d0a58f2336eaf
-EBUILD selinux-tcpd-2.20170204-r4.ebuild 371 SHA256 e49090120d4cfece4123e743f928e3c8894675d5be2ed4fb221f11c891e307b7 SHA512 ce65403edd7264e727ef9c206d1572f5d2ac3a4db9c754233998abe0c0573d4bc494cee2dae86950533cec5bbf8bc9dfc8561b8b6872eb22dad4ee6e1e6f7045 WHIRLPOOL fac1b09c82cb34ce684cf7d305061a38ccad8f86a1bd1494e935fbfe73f229ff619a7b2ef1c831b083d1369bcaac3de9d9588aa2abfa88a3a58d0a58f2336eaf
-EBUILD selinux-tcpd-2.20170805-r2.ebuild 371 SHA256 e49090120d4cfece4123e743f928e3c8894675d5be2ed4fb221f11c891e307b7 SHA512 ce65403edd7264e727ef9c206d1572f5d2ac3a4db9c754233998abe0c0573d4bc494cee2dae86950533cec5bbf8bc9dfc8561b8b6872eb22dad4ee6e1e6f7045 WHIRLPOOL fac1b09c82cb34ce684cf7d305061a38ccad8f86a1bd1494e935fbfe73f229ff619a7b2ef1c831b083d1369bcaac3de9d9588aa2abfa88a3a58d0a58f2336eaf
-EBUILD selinux-tcpd-9999.ebuild 373 SHA256 3de29b29c4b829bef772e0fd6d85af5ca595a9363e9feb2b6db2bc0edc3a8da4 SHA512 73d89c97de114d8d7ddffcd154cb7c2233b6601659a6ce4664b2ff400c5bdb8eedf01dd69f35dfa673ad03ab9ab7106d02b017b5441f93b1f352e93aee4e737c WHIRLPOOL ea810817f14ff2747a6d18e27a57f222f0b900466dc6d1f47b94f41e6a9afcc184f5699814ed3520d8bf5987f60c010fa0db80991668b34c2c52fba4228f7622
+EBUILD selinux-tcpd-2.20170204-r1.ebuild 374 SHA256 007747f91f061db0c014609c0c71c3816f9307bcdbae4642c518e6c4c3883dee SHA512 eed42c09121833b6208ec36f4cefad7f02d76cae5e35654bda28045ad02f55bdb4bfcfd4019fa822f7da7226ed9e44e1b687a41446d25906963077529b72f39b WHIRLPOOL 026d95259f013b8a78b27b74a9a6b2228eecb5603897be0590efd326dba17739bd726f63fed375d11fe8f0228871eccf0a175f3fd0de24d301197e768a99e583
+EBUILD selinux-tcpd-2.20170204-r2.ebuild 372 SHA256 4ef16db9660cce691aa83cdaa48bff43d3882bf4f2c93ccadb65c8924efd1996 SHA512 2bb89d4f0fa448d50e1b4a11038f93738b17e3519889b265bbe8838998f5c0c1bf272f8de4d9ac552b8b67654035705a62eaf69447107776ead8b2879c676b87 WHIRLPOOL 4f9d812242839a8ff48b932712468a5eb34b7447f489c61ec58a071e4d2feb74d8d1b6723161310665e920c52d8410a8fa020e5a870ca4c727a41e2180b177bc
+EBUILD selinux-tcpd-2.20170204-r3.ebuild 372 SHA256 4ef16db9660cce691aa83cdaa48bff43d3882bf4f2c93ccadb65c8924efd1996 SHA512 2bb89d4f0fa448d50e1b4a11038f93738b17e3519889b265bbe8838998f5c0c1bf272f8de4d9ac552b8b67654035705a62eaf69447107776ead8b2879c676b87 WHIRLPOOL 4f9d812242839a8ff48b932712468a5eb34b7447f489c61ec58a071e4d2feb74d8d1b6723161310665e920c52d8410a8fa020e5a870ca4c727a41e2180b177bc
+EBUILD selinux-tcpd-2.20170204-r4.ebuild 372 SHA256 4ef16db9660cce691aa83cdaa48bff43d3882bf4f2c93ccadb65c8924efd1996 SHA512 2bb89d4f0fa448d50e1b4a11038f93738b17e3519889b265bbe8838998f5c0c1bf272f8de4d9ac552b8b67654035705a62eaf69447107776ead8b2879c676b87 WHIRLPOOL 4f9d812242839a8ff48b932712468a5eb34b7447f489c61ec58a071e4d2feb74d8d1b6723161310665e920c52d8410a8fa020e5a870ca4c727a41e2180b177bc
+EBUILD selinux-tcpd-2.20170805-r2.ebuild 372 SHA256 4ef16db9660cce691aa83cdaa48bff43d3882bf4f2c93ccadb65c8924efd1996 SHA512 2bb89d4f0fa448d50e1b4a11038f93738b17e3519889b265bbe8838998f5c0c1bf272f8de4d9ac552b8b67654035705a62eaf69447107776ead8b2879c676b87 WHIRLPOOL 4f9d812242839a8ff48b932712468a5eb34b7447f489c61ec58a071e4d2feb74d8d1b6723161310665e920c52d8410a8fa020e5a870ca4c727a41e2180b177bc
+EBUILD selinux-tcpd-2.20170805-r3.ebuild 374 SHA256 007747f91f061db0c014609c0c71c3816f9307bcdbae4642c518e6c4c3883dee SHA512 eed42c09121833b6208ec36f4cefad7f02d76cae5e35654bda28045ad02f55bdb4bfcfd4019fa822f7da7226ed9e44e1b687a41446d25906963077529b72f39b WHIRLPOOL 026d95259f013b8a78b27b74a9a6b2228eecb5603897be0590efd326dba17739bd726f63fed375d11fe8f0228871eccf0a175f3fd0de24d301197e768a99e583
+EBUILD selinux-tcpd-9999.ebuild 374 SHA256 007747f91f061db0c014609c0c71c3816f9307bcdbae4642c518e6c4c3883dee SHA512 eed42c09121833b6208ec36f4cefad7f02d76cae5e35654bda28045ad02f55bdb4bfcfd4019fa822f7da7226ed9e44e1b687a41446d25906963077529b72f39b WHIRLPOOL 026d95259f013b8a78b27b74a9a6b2228eecb5603897be0590efd326dba17739bd726f63fed375d11fe8f0228871eccf0a175f3fd0de24d301197e768a99e583
 MISC ChangeLog 10387 SHA256 56475fd4c8991ea526187f2874ae149b9bd54ee47c71e2cc2c0357405e1850c0 SHA512 8ff3f14bcc5561a50f8e614705048b4dd26280690a177de6552f0a6a59bfd3d2d6644a8524c18bc982928c592234306c87484eed50f994228ad7df2c973c1199 WHIRLPOOL 2045b60ee9c9c10c579512cec69d1aa5275a7cdaced60d53f30592e22c330bb6be3b42eb287bbeb3b19a101b90683cce5277e168b0e58d0e5df69e3caba8008b
 MISC ChangeLog-2015 11235 SHA256 093004a863f55629578ed8847f7c559eae224bd41bcd82dd53fc01563add0f12 SHA512 fe40cae30b8b3abc0e18f7a14e6e0d54ccd256b0fcfd451452f859523062b7f92c2d37e70ebe765f84f4bf9bdd8d80dfe66dfb7f09f328f40c7e59ebded9ac4d WHIRLPOOL 2511faf7d6a3dbb5545642d16571327248de5770ab2f5271efaf4f70cd4bcf3ec10125a58005b412a2a4e92cdd2c8db7c3282d80430f7c6e9ed474e966a57170
 MISC metadata.xml 314 SHA256 c5cf70d25a0c994f3e57a82f48b844ef6b4f6d20b18f8e3de9a03658d51a26bd SHA512 5fe5784f0e2a678a0202842e256c029ca34fcf992151a05f0f015ba8abaaa0b71729ffb3e9400c9dbedbb90830efd17d363ac60a4a042d24ecdee368341483ce WHIRLPOOL 82f067916451c070347ada48e8a2663a8f43570ccfa2d1cb28578654900c1fa162ca8096409b6e1efff1bdfede0f9155d82d25963e35eb5c4ab9c90ace9f4214
diff --git a/sec-policy/selinux-tcpd/selinux-tcpd-2.20170204-r1.ebuild b/sec-policy/selinux-tcpd/selinux-tcpd-2.20170204-r1.ebuild
index 6ba666373e6f..0c4d8ce778f6 100644
--- a/sec-policy/selinux-tcpd/selinux-tcpd-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-tcpd/selinux-tcpd-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-tcpd/selinux-tcpd-2.20170204-r2.ebuild b/sec-policy/selinux-tcpd/selinux-tcpd-2.20170204-r2.ebuild
index 48689aba73f2..18e3c007e6c0 100644
--- a/sec-policy/selinux-tcpd/selinux-tcpd-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-tcpd/selinux-tcpd-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-tcpd/selinux-tcpd-2.20170204-r3.ebuild b/sec-policy/selinux-tcpd/selinux-tcpd-2.20170204-r3.ebuild
index 48689aba73f2..18e3c007e6c0 100644
--- a/sec-policy/selinux-tcpd/selinux-tcpd-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-tcpd/selinux-tcpd-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-tcpd/selinux-tcpd-2.20170204-r4.ebuild b/sec-policy/selinux-tcpd/selinux-tcpd-2.20170204-r4.ebuild
index 48689aba73f2..18e3c007e6c0 100644
--- a/sec-policy/selinux-tcpd/selinux-tcpd-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-tcpd/selinux-tcpd-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-tcpd/selinux-tcpd-2.20170805-r2.ebuild b/sec-policy/selinux-tcpd/selinux-tcpd-2.20170805-r2.ebuild
index 48689aba73f2..18e3c007e6c0 100644
--- a/sec-policy/selinux-tcpd/selinux-tcpd-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-tcpd/selinux-tcpd-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-tcpd/selinux-tcpd-2.20170805-r3.ebuild b/sec-policy/selinux-tcpd/selinux-tcpd-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..0c4d8ce778f6
--- /dev/null
+++ b/sec-policy/selinux-tcpd/selinux-tcpd-2.20170805-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-tcpd/selinux-tcpd-9999.ebuild b/sec-policy/selinux-tcpd/selinux-tcpd-9999.ebuild
index 6ba666373e6f..0c4d8ce778f6 100644
--- a/sec-policy/selinux-tcpd/selinux-tcpd-9999.ebuild
+++ b/sec-policy/selinux-tcpd/selinux-tcpd-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-tcsd/Manifest b/sec-policy/selinux-tcsd/Manifest
index 466cb4817590..33b275b38139 100644
--- a/sec-policy/selinux-tcsd/Manifest
+++ b/sec-policy/selinux-tcsd/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-tcsd-2.20170204-r1.ebuild 279 SHA256 cdb33e9bbee65abf63f9465f65fc9e5d2cff3ec2e38ef1ddc6b552345274b076 SHA512 ba56c5e2779e6bd4b8331dd7fcebb633900458bf1de4484b10b7f192b3073ab881e6ba56869047e6ba6c2371d7823e3eb7c4d6c7d5d1499fc14c85b85b34912e WHIRLPOOL 8a80190d4c9c4ac1fa605dddcedf298b062ad8354d8fa519a7cc683125ee1d8984f36db33ea389a7daa1de169dc9c15d1a4f887e3a01a2cce66fbf9dd762a7cd
-EBUILD selinux-tcsd-2.20170204-r2.ebuild 277 SHA256 e95dfd5820e70426cc6b63c1bfcac8c53908942acfa7faba71733a3b851c6a60 SHA512 4393e2326cfd488558fc3cacbcf82815d74e49be44b3090367c519643fb6709af4ec0f4e718f193a0aa0a3638c45226e20330de6db0d9d30f781db35ec14ab1a WHIRLPOOL 057b30f2aabafebfa1f11d6182a5d6cd9f4e320d52f022428137ec1f410025451e0a8457048377660d45af9baa8cfb97d0d4680386289cf21e3aca74b95940e6
-EBUILD selinux-tcsd-2.20170204-r3.ebuild 277 SHA256 e95dfd5820e70426cc6b63c1bfcac8c53908942acfa7faba71733a3b851c6a60 SHA512 4393e2326cfd488558fc3cacbcf82815d74e49be44b3090367c519643fb6709af4ec0f4e718f193a0aa0a3638c45226e20330de6db0d9d30f781db35ec14ab1a WHIRLPOOL 057b30f2aabafebfa1f11d6182a5d6cd9f4e320d52f022428137ec1f410025451e0a8457048377660d45af9baa8cfb97d0d4680386289cf21e3aca74b95940e6
-EBUILD selinux-tcsd-2.20170204-r4.ebuild 277 SHA256 e95dfd5820e70426cc6b63c1bfcac8c53908942acfa7faba71733a3b851c6a60 SHA512 4393e2326cfd488558fc3cacbcf82815d74e49be44b3090367c519643fb6709af4ec0f4e718f193a0aa0a3638c45226e20330de6db0d9d30f781db35ec14ab1a WHIRLPOOL 057b30f2aabafebfa1f11d6182a5d6cd9f4e320d52f022428137ec1f410025451e0a8457048377660d45af9baa8cfb97d0d4680386289cf21e3aca74b95940e6
-EBUILD selinux-tcsd-2.20170805-r2.ebuild 277 SHA256 e95dfd5820e70426cc6b63c1bfcac8c53908942acfa7faba71733a3b851c6a60 SHA512 4393e2326cfd488558fc3cacbcf82815d74e49be44b3090367c519643fb6709af4ec0f4e718f193a0aa0a3638c45226e20330de6db0d9d30f781db35ec14ab1a WHIRLPOOL 057b30f2aabafebfa1f11d6182a5d6cd9f4e320d52f022428137ec1f410025451e0a8457048377660d45af9baa8cfb97d0d4680386289cf21e3aca74b95940e6
-EBUILD selinux-tcsd-9999.ebuild 279 SHA256 cdb33e9bbee65abf63f9465f65fc9e5d2cff3ec2e38ef1ddc6b552345274b076 SHA512 ba56c5e2779e6bd4b8331dd7fcebb633900458bf1de4484b10b7f192b3073ab881e6ba56869047e6ba6c2371d7823e3eb7c4d6c7d5d1499fc14c85b85b34912e WHIRLPOOL 8a80190d4c9c4ac1fa605dddcedf298b062ad8354d8fa519a7cc683125ee1d8984f36db33ea389a7daa1de169dc9c15d1a4f887e3a01a2cce66fbf9dd762a7cd
+EBUILD selinux-tcsd-2.20170204-r1.ebuild 280 SHA256 f8638d123d6a8c37b0d495827c7553f64627725092e18c9fbcde2370670d0b90 SHA512 0c31b575b6774879c87fc28126d3eda7ed4b46948af1904e05f50f9308bbe5f249bd450ed83e40b77bcd08dc933de013b157243ac43619afbfcb15b62b986b63 WHIRLPOOL 13f79f0144fbc66fd8553c9227986d678ec8369ff34ae5d42f4450ed35cd8bc06f40af25f4821c9301d605acfa8fbccb54abd8685f469f38949900ff40269f8f
+EBUILD selinux-tcsd-2.20170204-r2.ebuild 278 SHA256 d85081c12c6bc58f1be14351926a44c1534ea5966b2daa7f64a07512a1037948 SHA512 41a75c0cecde46c34da619e4ab96bb3ba903a5a80a59f27fe0e35df7f8799b142014d408adbed2a17572bfd822601ec80c2c928b23a26e26ebf1ebbe74ff6f40 WHIRLPOOL d9479e8cc0c5a9c6a1e989e1a84f99be62cd60ff8f0edaf6dfc948f4b2265fd4258087aa1705daa4440459b3f3897d10ef510b17f2a9b12314ac76acf16882b9
+EBUILD selinux-tcsd-2.20170204-r3.ebuild 278 SHA256 d85081c12c6bc58f1be14351926a44c1534ea5966b2daa7f64a07512a1037948 SHA512 41a75c0cecde46c34da619e4ab96bb3ba903a5a80a59f27fe0e35df7f8799b142014d408adbed2a17572bfd822601ec80c2c928b23a26e26ebf1ebbe74ff6f40 WHIRLPOOL d9479e8cc0c5a9c6a1e989e1a84f99be62cd60ff8f0edaf6dfc948f4b2265fd4258087aa1705daa4440459b3f3897d10ef510b17f2a9b12314ac76acf16882b9
+EBUILD selinux-tcsd-2.20170204-r4.ebuild 278 SHA256 d85081c12c6bc58f1be14351926a44c1534ea5966b2daa7f64a07512a1037948 SHA512 41a75c0cecde46c34da619e4ab96bb3ba903a5a80a59f27fe0e35df7f8799b142014d408adbed2a17572bfd822601ec80c2c928b23a26e26ebf1ebbe74ff6f40 WHIRLPOOL d9479e8cc0c5a9c6a1e989e1a84f99be62cd60ff8f0edaf6dfc948f4b2265fd4258087aa1705daa4440459b3f3897d10ef510b17f2a9b12314ac76acf16882b9
+EBUILD selinux-tcsd-2.20170805-r2.ebuild 278 SHA256 d85081c12c6bc58f1be14351926a44c1534ea5966b2daa7f64a07512a1037948 SHA512 41a75c0cecde46c34da619e4ab96bb3ba903a5a80a59f27fe0e35df7f8799b142014d408adbed2a17572bfd822601ec80c2c928b23a26e26ebf1ebbe74ff6f40 WHIRLPOOL d9479e8cc0c5a9c6a1e989e1a84f99be62cd60ff8f0edaf6dfc948f4b2265fd4258087aa1705daa4440459b3f3897d10ef510b17f2a9b12314ac76acf16882b9
+EBUILD selinux-tcsd-2.20170805-r3.ebuild 280 SHA256 f8638d123d6a8c37b0d495827c7553f64627725092e18c9fbcde2370670d0b90 SHA512 0c31b575b6774879c87fc28126d3eda7ed4b46948af1904e05f50f9308bbe5f249bd450ed83e40b77bcd08dc933de013b157243ac43619afbfcb15b62b986b63 WHIRLPOOL 13f79f0144fbc66fd8553c9227986d678ec8369ff34ae5d42f4450ed35cd8bc06f40af25f4821c9301d605acfa8fbccb54abd8685f469f38949900ff40269f8f
+EBUILD selinux-tcsd-9999.ebuild 280 SHA256 f8638d123d6a8c37b0d495827c7553f64627725092e18c9fbcde2370670d0b90 SHA512 0c31b575b6774879c87fc28126d3eda7ed4b46948af1904e05f50f9308bbe5f249bd450ed83e40b77bcd08dc933de013b157243ac43619afbfcb15b62b986b63 WHIRLPOOL 13f79f0144fbc66fd8553c9227986d678ec8369ff34ae5d42f4450ed35cd8bc06f40af25f4821c9301d605acfa8fbccb54abd8685f469f38949900ff40269f8f
 MISC ChangeLog 10387 SHA256 0a699b10e56ba790cd44cfbca78108bc0cfd3c6b7f96ebbef4deb12a0acb9044 SHA512 8eff42d21d25ef8cf0ff2d5ed56ced2fd51c29d35a9bd70439f7e7f84d2c463fa81897943456722e1b7f9b96889ae26a36565ee18f8cc2b7a96c06d7e64b969b WHIRLPOOL 531a37a15c075e9a1251aa03ab5c676a1a699b1cea18d02a3e685f503cf7d033340b00c960acc43c4924eca8c71bd38d63eb289b715c0f468690d5545aa5affe
 MISC ChangeLog-2015 4276 SHA256 047496c393b1859cb117d291ea47528b4b959a11507f603c382fd8a245ab87c7 SHA512 882d3d30e26d65951ecee534e45bee2b933bc1f851f2c24365e33a271da6844c60a3e337e2858988e87de63507773e2a13125d43a74e0b0a474918ee8ebed3e8 WHIRLPOOL ca77d7404e81e72a49998aa39c18ba136d429dd92b1d35163ac16ffe7794e6e1c1663ae07f16d5af8d8bfc85bfe666d59356e5845680df7b2e2573ed5754ffd6
 MISC metadata.xml 314 SHA256 0660f7a6b8d4fe1777743f72267c5210e94ee167f267d6088d76b16dee552ede SHA512 12aed2a47c90c7da82be53abc650160c5b012b358dea0b609ed3c2761ba49cf7113901b4f82121972af204b582aeed230d74f18fbd8c5469dedf5c5fc642cc74 WHIRLPOOL 3980639663121f1a86a549e5708f6d841f4376b296dfe1a54ceda8746e09a4a347db5481e5edba94be4fe39fdc9638a8fc7ff493598a921e425ad288702b118d
diff --git a/sec-policy/selinux-tcsd/selinux-tcsd-2.20170204-r1.ebuild b/sec-policy/selinux-tcsd/selinux-tcsd-2.20170204-r1.ebuild
index f3691368a84b..ab910d37f2ba 100644
--- a/sec-policy/selinux-tcsd/selinux-tcsd-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-tcsd/selinux-tcsd-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-tcsd/selinux-tcsd-2.20170204-r2.ebuild b/sec-policy/selinux-tcsd/selinux-tcsd-2.20170204-r2.ebuild
index 018862904f20..070a4fc6fff8 100644
--- a/sec-policy/selinux-tcsd/selinux-tcsd-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-tcsd/selinux-tcsd-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-tcsd/selinux-tcsd-2.20170204-r3.ebuild b/sec-policy/selinux-tcsd/selinux-tcsd-2.20170204-r3.ebuild
index 018862904f20..070a4fc6fff8 100644
--- a/sec-policy/selinux-tcsd/selinux-tcsd-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-tcsd/selinux-tcsd-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-tcsd/selinux-tcsd-2.20170204-r4.ebuild b/sec-policy/selinux-tcsd/selinux-tcsd-2.20170204-r4.ebuild
index 018862904f20..070a4fc6fff8 100644
--- a/sec-policy/selinux-tcsd/selinux-tcsd-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-tcsd/selinux-tcsd-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-tcsd/selinux-tcsd-2.20170805-r2.ebuild b/sec-policy/selinux-tcsd/selinux-tcsd-2.20170805-r2.ebuild
index 018862904f20..070a4fc6fff8 100644
--- a/sec-policy/selinux-tcsd/selinux-tcsd-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-tcsd/selinux-tcsd-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-tcsd/selinux-tcsd-2.20170805-r3.ebuild b/sec-policy/selinux-tcsd/selinux-tcsd-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..ab910d37f2ba
--- /dev/null
+++ b/sec-policy/selinux-tcsd/selinux-tcsd-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-tcsd/selinux-tcsd-9999.ebuild b/sec-policy/selinux-tcsd/selinux-tcsd-9999.ebuild
index f3691368a84b..ab910d37f2ba 100644
--- a/sec-policy/selinux-tcsd/selinux-tcsd-9999.ebuild
+++ b/sec-policy/selinux-tcsd/selinux-tcsd-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-telnet/Manifest b/sec-policy/selinux-telnet/Manifest
index e34e574394fe..6af61c64a647 100644
--- a/sec-policy/selinux-telnet/Manifest
+++ b/sec-policy/selinux-telnet/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-telnet-2.20170204-r1.ebuild 389 SHA256 b949aaf98017f461db9ac3c93bd0f81f2e826d08d1625666f63c9079f45fb18e SHA512 f68fd03d41bf28507b6250bebb2431938d6af869ca12c8ceebd539e5c780a069ac5a8dcf5567818c9d756c9be4ecf9628fda80a02db57274a7e05f1cfa91533e WHIRLPOOL 385aa294bf298946159f77677a99acb8b05beb5430a913bfadcc5cb7971a5ec5e442dfc35a5c1630cef6343fd71dd8934e5307a76862c8f18cd6869b26cf264a
-EBUILD selinux-telnet-2.20170204-r2.ebuild 387 SHA256 7269fe5b4673300064d9032871b2b1a285df5e21097a88651cd65fdeb40df6d6 SHA512 dc6bcedeee22483984d0f02389103d9460da81ce163ce63c8334c25ed41c9c5504b62ebda2ec6a9bb6882e1fcf5b8ee498777dffd282dddfc4c32e65beee9628 WHIRLPOOL 1530f947fac386cb56d7022d023b85dcdf8963141f62bd4c12aff3ac84a7bffca4c7c4227a7fb265fcef43627598aceb041b114273499222bf6f16eeee2f7d01
-EBUILD selinux-telnet-2.20170204-r3.ebuild 387 SHA256 7269fe5b4673300064d9032871b2b1a285df5e21097a88651cd65fdeb40df6d6 SHA512 dc6bcedeee22483984d0f02389103d9460da81ce163ce63c8334c25ed41c9c5504b62ebda2ec6a9bb6882e1fcf5b8ee498777dffd282dddfc4c32e65beee9628 WHIRLPOOL 1530f947fac386cb56d7022d023b85dcdf8963141f62bd4c12aff3ac84a7bffca4c7c4227a7fb265fcef43627598aceb041b114273499222bf6f16eeee2f7d01
-EBUILD selinux-telnet-2.20170204-r4.ebuild 387 SHA256 7269fe5b4673300064d9032871b2b1a285df5e21097a88651cd65fdeb40df6d6 SHA512 dc6bcedeee22483984d0f02389103d9460da81ce163ce63c8334c25ed41c9c5504b62ebda2ec6a9bb6882e1fcf5b8ee498777dffd282dddfc4c32e65beee9628 WHIRLPOOL 1530f947fac386cb56d7022d023b85dcdf8963141f62bd4c12aff3ac84a7bffca4c7c4227a7fb265fcef43627598aceb041b114273499222bf6f16eeee2f7d01
-EBUILD selinux-telnet-2.20170805-r2.ebuild 387 SHA256 7269fe5b4673300064d9032871b2b1a285df5e21097a88651cd65fdeb40df6d6 SHA512 dc6bcedeee22483984d0f02389103d9460da81ce163ce63c8334c25ed41c9c5504b62ebda2ec6a9bb6882e1fcf5b8ee498777dffd282dddfc4c32e65beee9628 WHIRLPOOL 1530f947fac386cb56d7022d023b85dcdf8963141f62bd4c12aff3ac84a7bffca4c7c4227a7fb265fcef43627598aceb041b114273499222bf6f16eeee2f7d01
-EBUILD selinux-telnet-9999.ebuild 389 SHA256 b949aaf98017f461db9ac3c93bd0f81f2e826d08d1625666f63c9079f45fb18e SHA512 f68fd03d41bf28507b6250bebb2431938d6af869ca12c8ceebd539e5c780a069ac5a8dcf5567818c9d756c9be4ecf9628fda80a02db57274a7e05f1cfa91533e WHIRLPOOL 385aa294bf298946159f77677a99acb8b05beb5430a913bfadcc5cb7971a5ec5e442dfc35a5c1630cef6343fd71dd8934e5307a76862c8f18cd6869b26cf264a
+EBUILD selinux-telnet-2.20170204-r1.ebuild 390 SHA256 4f2024cdb506d04e8659ca46451c0a0b2c73e5a9d00193c6e5b881b178085be5 SHA512 af1f55df68650962dc3254aae42ad90ed765dbfb341efebad4937b6b38e80222a76802e5b400c5e2c133600de84e579235db0b9f665046aa0dbcf9b74c4f5bb7 WHIRLPOOL 685a830590731385c687ce0f10229a57620472b1cd036e207de007a132b48fcb1a18f584c2af78515e42bf58daf24876aa978ccef00155a5c74e70ce403b22a1
+EBUILD selinux-telnet-2.20170204-r2.ebuild 388 SHA256 11fd6b5b49b0e2e2da6d823d2cb8ef0a9d4abd658bbf477ba1d8bf712d3cbe54 SHA512 d2cb2bbf78266e33ea0654a1e8b2431095ea82b8b0de95a8365c4bc6050640c8485519c2a4861e2af5ce30a12b3fcde954e4c36c223fccb928929ec06e267c2a WHIRLPOOL 7c17fd5f2bfafd763968db80aba3cc93df6ff61d04294ab37c567c00db1e0f2aca582f02b0aed7f026a8d9076098d8a691fa78d9239c027b47ebdb2aa20aefa9
+EBUILD selinux-telnet-2.20170204-r3.ebuild 388 SHA256 11fd6b5b49b0e2e2da6d823d2cb8ef0a9d4abd658bbf477ba1d8bf712d3cbe54 SHA512 d2cb2bbf78266e33ea0654a1e8b2431095ea82b8b0de95a8365c4bc6050640c8485519c2a4861e2af5ce30a12b3fcde954e4c36c223fccb928929ec06e267c2a WHIRLPOOL 7c17fd5f2bfafd763968db80aba3cc93df6ff61d04294ab37c567c00db1e0f2aca582f02b0aed7f026a8d9076098d8a691fa78d9239c027b47ebdb2aa20aefa9
+EBUILD selinux-telnet-2.20170204-r4.ebuild 388 SHA256 11fd6b5b49b0e2e2da6d823d2cb8ef0a9d4abd658bbf477ba1d8bf712d3cbe54 SHA512 d2cb2bbf78266e33ea0654a1e8b2431095ea82b8b0de95a8365c4bc6050640c8485519c2a4861e2af5ce30a12b3fcde954e4c36c223fccb928929ec06e267c2a WHIRLPOOL 7c17fd5f2bfafd763968db80aba3cc93df6ff61d04294ab37c567c00db1e0f2aca582f02b0aed7f026a8d9076098d8a691fa78d9239c027b47ebdb2aa20aefa9
+EBUILD selinux-telnet-2.20170805-r2.ebuild 388 SHA256 11fd6b5b49b0e2e2da6d823d2cb8ef0a9d4abd658bbf477ba1d8bf712d3cbe54 SHA512 d2cb2bbf78266e33ea0654a1e8b2431095ea82b8b0de95a8365c4bc6050640c8485519c2a4861e2af5ce30a12b3fcde954e4c36c223fccb928929ec06e267c2a WHIRLPOOL 7c17fd5f2bfafd763968db80aba3cc93df6ff61d04294ab37c567c00db1e0f2aca582f02b0aed7f026a8d9076098d8a691fa78d9239c027b47ebdb2aa20aefa9
+EBUILD selinux-telnet-2.20170805-r3.ebuild 390 SHA256 4f2024cdb506d04e8659ca46451c0a0b2c73e5a9d00193c6e5b881b178085be5 SHA512 af1f55df68650962dc3254aae42ad90ed765dbfb341efebad4937b6b38e80222a76802e5b400c5e2c133600de84e579235db0b9f665046aa0dbcf9b74c4f5bb7 WHIRLPOOL 685a830590731385c687ce0f10229a57620472b1cd036e207de007a132b48fcb1a18f584c2af78515e42bf58daf24876aa978ccef00155a5c74e70ce403b22a1
+EBUILD selinux-telnet-9999.ebuild 390 SHA256 4f2024cdb506d04e8659ca46451c0a0b2c73e5a9d00193c6e5b881b178085be5 SHA512 af1f55df68650962dc3254aae42ad90ed765dbfb341efebad4937b6b38e80222a76802e5b400c5e2c133600de84e579235db0b9f665046aa0dbcf9b74c4f5bb7 WHIRLPOOL 685a830590731385c687ce0f10229a57620472b1cd036e207de007a132b48fcb1a18f584c2af78515e42bf58daf24876aa978ccef00155a5c74e70ce403b22a1
 MISC ChangeLog 10571 SHA256 a63daae1c2785ae5e5d631ed94c847833658a0cf5e026c01295e75d49f559d5b SHA512 fd0562941333b26010cbfa1ca728d9429f3958edf3977aaad899a360913e88caae41c5d80dca37670eb58f07a5a8c70759ab05e5015197c3a74b656366a2ebc3 WHIRLPOOL bb3d7bc58fe3f917455012826fcb94ae7afb538a36cbd27b74a71498d1cbfe05fa649f88e8be3793470466aeb1ddf0b8ba7fde21dca02f51a0e506b5d9daf236
 MISC ChangeLog-2015 10384 SHA256 5ee4436fbd2cc861c99b0fba0e503ea2638665174ee5ee262097cb128ec7e0fd SHA512 69848b2f4d8d5f5b946193c1606521fd71b0e3a0e13af016bf2de1a022c215b8ae92965440d7384009fdcedaa68864584a45a282f29b6835b37bcd744d340e3c WHIRLPOOL d09a8f82ddea2d3e22d5318a3a6708bcc54e29a78aa2e1dc73930791daadb473932b0bdb98b5e7d718f62342b52b307bbe1438fa7d9c46ffc66176902af3fcc5
 MISC metadata.xml 316 SHA256 44ab3bf428421791e8bc6fb18cef862af008b236a3ad229a6c8a1dd6024b6445 SHA512 09fc5cf80795fa3e4565a9102ee44138f0c8e4f14a308634bd55b9cb1a6e2dadfc8afa7f6ff1993b1e2d9ee738c8de4c91aeb34e3974695ad9165815bff49222 WHIRLPOOL 8a88bad98d6124909753c578feafd94f5d6398c9e22e4ee1b631b3f6d4e1e4a402e4d40cb3391addada6e3fe911bebde6071f941218771e3cbf5f8c872b5b80c
diff --git a/sec-policy/selinux-telnet/selinux-telnet-2.20170204-r1.ebuild b/sec-policy/selinux-telnet/selinux-telnet-2.20170204-r1.ebuild
index 8f82d54cbba8..e310a9be1384 100644
--- a/sec-policy/selinux-telnet/selinux-telnet-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-telnet/selinux-telnet-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-telnet/selinux-telnet-2.20170204-r2.ebuild b/sec-policy/selinux-telnet/selinux-telnet-2.20170204-r2.ebuild
index 3927de80a989..1ca26530766f 100644
--- a/sec-policy/selinux-telnet/selinux-telnet-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-telnet/selinux-telnet-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-telnet/selinux-telnet-2.20170204-r3.ebuild b/sec-policy/selinux-telnet/selinux-telnet-2.20170204-r3.ebuild
index 3927de80a989..1ca26530766f 100644
--- a/sec-policy/selinux-telnet/selinux-telnet-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-telnet/selinux-telnet-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-telnet/selinux-telnet-2.20170204-r4.ebuild b/sec-policy/selinux-telnet/selinux-telnet-2.20170204-r4.ebuild
index 3927de80a989..1ca26530766f 100644
--- a/sec-policy/selinux-telnet/selinux-telnet-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-telnet/selinux-telnet-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-telnet/selinux-telnet-2.20170805-r2.ebuild b/sec-policy/selinux-telnet/selinux-telnet-2.20170805-r2.ebuild
index 3927de80a989..1ca26530766f 100644
--- a/sec-policy/selinux-telnet/selinux-telnet-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-telnet/selinux-telnet-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-telnet/selinux-telnet-2.20170805-r3.ebuild b/sec-policy/selinux-telnet/selinux-telnet-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..e310a9be1384
--- /dev/null
+++ b/sec-policy/selinux-telnet/selinux-telnet-2.20170805-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-telnet/selinux-telnet-9999.ebuild b/sec-policy/selinux-telnet/selinux-telnet-9999.ebuild
index 8f82d54cbba8..e310a9be1384 100644
--- a/sec-policy/selinux-telnet/selinux-telnet-9999.ebuild
+++ b/sec-policy/selinux-telnet/selinux-telnet-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-tftp/Manifest b/sec-policy/selinux-tftp/Manifest
index 69622501f59d..197cb624a54a 100644
--- a/sec-policy/selinux-tftp/Manifest
+++ b/sec-policy/selinux-tftp/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-tftp-2.20170204-r1.ebuild 279 SHA256 c1e01d32668efc3b2b254a53ac67a53c8d7c05f4a6ae249803bb82d492832b47 SHA512 f5d67a046608b2549a3d8b4461634ec1f1bd666a46ac6ee2906a8adecec25c62a0a437cae16f2a339683381dae14a55a5d8e23d7ba6a2b4b4193878e31b489b0 WHIRLPOOL 3dbc2c7cbe5e87249fb6e7dad5ed9e979cf798311b119f03f3ff4994e578ae067245f83465bc9dd8761c463f1e37cc831217f95bcb5987c3de5072200178bd74
-EBUILD selinux-tftp-2.20170204-r2.ebuild 277 SHA256 d8ab44c15b20f9772af09f5c62a16d4780693757b0ca5a9609d55beda43a2605 SHA512 bbddaf9d42d2dbf513421144ca952eeb1e4c263d6190e3768c91d4f00b20369c3a90e0bfdf8c1e7c33691ef4cd13dc89da9ac640fd6c4d1d6728fa48239b09e3 WHIRLPOOL 6e96be7a33668d42157841c334843e41c249e495be05fbacb30251e86873c7e3d1516f7a2d865ea7f5baa389dbff846222e83cff7d914efe7df01136d56629e0
-EBUILD selinux-tftp-2.20170204-r3.ebuild 277 SHA256 d8ab44c15b20f9772af09f5c62a16d4780693757b0ca5a9609d55beda43a2605 SHA512 bbddaf9d42d2dbf513421144ca952eeb1e4c263d6190e3768c91d4f00b20369c3a90e0bfdf8c1e7c33691ef4cd13dc89da9ac640fd6c4d1d6728fa48239b09e3 WHIRLPOOL 6e96be7a33668d42157841c334843e41c249e495be05fbacb30251e86873c7e3d1516f7a2d865ea7f5baa389dbff846222e83cff7d914efe7df01136d56629e0
-EBUILD selinux-tftp-2.20170204-r4.ebuild 277 SHA256 d8ab44c15b20f9772af09f5c62a16d4780693757b0ca5a9609d55beda43a2605 SHA512 bbddaf9d42d2dbf513421144ca952eeb1e4c263d6190e3768c91d4f00b20369c3a90e0bfdf8c1e7c33691ef4cd13dc89da9ac640fd6c4d1d6728fa48239b09e3 WHIRLPOOL 6e96be7a33668d42157841c334843e41c249e495be05fbacb30251e86873c7e3d1516f7a2d865ea7f5baa389dbff846222e83cff7d914efe7df01136d56629e0
-EBUILD selinux-tftp-2.20170805-r2.ebuild 277 SHA256 d8ab44c15b20f9772af09f5c62a16d4780693757b0ca5a9609d55beda43a2605 SHA512 bbddaf9d42d2dbf513421144ca952eeb1e4c263d6190e3768c91d4f00b20369c3a90e0bfdf8c1e7c33691ef4cd13dc89da9ac640fd6c4d1d6728fa48239b09e3 WHIRLPOOL 6e96be7a33668d42157841c334843e41c249e495be05fbacb30251e86873c7e3d1516f7a2d865ea7f5baa389dbff846222e83cff7d914efe7df01136d56629e0
-EBUILD selinux-tftp-9999.ebuild 279 SHA256 c1e01d32668efc3b2b254a53ac67a53c8d7c05f4a6ae249803bb82d492832b47 SHA512 f5d67a046608b2549a3d8b4461634ec1f1bd666a46ac6ee2906a8adecec25c62a0a437cae16f2a339683381dae14a55a5d8e23d7ba6a2b4b4193878e31b489b0 WHIRLPOOL 3dbc2c7cbe5e87249fb6e7dad5ed9e979cf798311b119f03f3ff4994e578ae067245f83465bc9dd8761c463f1e37cc831217f95bcb5987c3de5072200178bd74
+EBUILD selinux-tftp-2.20170204-r1.ebuild 280 SHA256 915405fedfaa62e8bdffb63fbc9665a9d5589c2d2809bfc68ee62e7caf420b2c SHA512 bb60564eb8c6b70ccd3a637c8c4cba45b0089cb05313ddb6fb21aab3aa35a4b692a647af90072ed8cc622581e3ff3f6d0d7d982a11cb954804d17eb1e866ded2 WHIRLPOOL 9d17fb1d47806c930233fc983bb2cae15eb7a305f190caa5559199d1734f91b0f57188d400a00d5f378257af6e9feb29f64f7fecf2f4dfb74a5d2bde033ae1d8
+EBUILD selinux-tftp-2.20170204-r2.ebuild 278 SHA256 f65a359e332341918348853d3dc678e7b13a2298acb24d14e8a110cd1a4fb233 SHA512 d5f1cbd77651ec81a1568bf1ca0d792b3698713ed679651b94558988bafa519a50fe3672a477e97942173cc955d3732fa1b309d1f9c25fd27ae93bbb2c619198 WHIRLPOOL e6f29946d703306ad83bd83d35a4cf5c3e88d488d58cae028da1a69e7036c6928f73f03d75113b27546cfd3207cb5aa7b7c47ae585187beed76696cd29bcd2f7
+EBUILD selinux-tftp-2.20170204-r3.ebuild 278 SHA256 f65a359e332341918348853d3dc678e7b13a2298acb24d14e8a110cd1a4fb233 SHA512 d5f1cbd77651ec81a1568bf1ca0d792b3698713ed679651b94558988bafa519a50fe3672a477e97942173cc955d3732fa1b309d1f9c25fd27ae93bbb2c619198 WHIRLPOOL e6f29946d703306ad83bd83d35a4cf5c3e88d488d58cae028da1a69e7036c6928f73f03d75113b27546cfd3207cb5aa7b7c47ae585187beed76696cd29bcd2f7
+EBUILD selinux-tftp-2.20170204-r4.ebuild 278 SHA256 f65a359e332341918348853d3dc678e7b13a2298acb24d14e8a110cd1a4fb233 SHA512 d5f1cbd77651ec81a1568bf1ca0d792b3698713ed679651b94558988bafa519a50fe3672a477e97942173cc955d3732fa1b309d1f9c25fd27ae93bbb2c619198 WHIRLPOOL e6f29946d703306ad83bd83d35a4cf5c3e88d488d58cae028da1a69e7036c6928f73f03d75113b27546cfd3207cb5aa7b7c47ae585187beed76696cd29bcd2f7
+EBUILD selinux-tftp-2.20170805-r2.ebuild 278 SHA256 f65a359e332341918348853d3dc678e7b13a2298acb24d14e8a110cd1a4fb233 SHA512 d5f1cbd77651ec81a1568bf1ca0d792b3698713ed679651b94558988bafa519a50fe3672a477e97942173cc955d3732fa1b309d1f9c25fd27ae93bbb2c619198 WHIRLPOOL e6f29946d703306ad83bd83d35a4cf5c3e88d488d58cae028da1a69e7036c6928f73f03d75113b27546cfd3207cb5aa7b7c47ae585187beed76696cd29bcd2f7
+EBUILD selinux-tftp-2.20170805-r3.ebuild 280 SHA256 915405fedfaa62e8bdffb63fbc9665a9d5589c2d2809bfc68ee62e7caf420b2c SHA512 bb60564eb8c6b70ccd3a637c8c4cba45b0089cb05313ddb6fb21aab3aa35a4b692a647af90072ed8cc622581e3ff3f6d0d7d982a11cb954804d17eb1e866ded2 WHIRLPOOL 9d17fb1d47806c930233fc983bb2cae15eb7a305f190caa5559199d1734f91b0f57188d400a00d5f378257af6e9feb29f64f7fecf2f4dfb74a5d2bde033ae1d8
+EBUILD selinux-tftp-9999.ebuild 280 SHA256 915405fedfaa62e8bdffb63fbc9665a9d5589c2d2809bfc68ee62e7caf420b2c SHA512 bb60564eb8c6b70ccd3a637c8c4cba45b0089cb05313ddb6fb21aab3aa35a4b692a647af90072ed8cc622581e3ff3f6d0d7d982a11cb954804d17eb1e866ded2 WHIRLPOOL 9d17fb1d47806c930233fc983bb2cae15eb7a305f190caa5559199d1734f91b0f57188d400a00d5f378257af6e9feb29f64f7fecf2f4dfb74a5d2bde033ae1d8
 MISC ChangeLog 10387 SHA256 a6b5becc8c4452d9ab5237f496dbde86bf1d004a15a11d88a2ad417ce34078da SHA512 39ea493b0c4c75ed19c13ccedb45022b927907ebd4e923452c139f79bbae70cb693bbae2cfeb31c180be7c819b5db416c86e4b9c2295103da35aac4ff1351c36 WHIRLPOOL 74a7ffcc7c8c8d16283d56d5f63cde907d0b3290809e0a0f27c0ad116e4cf50359fd03b65f858b8d520b613ff43f3a8bd66d59bda94ebc782a9dcf1055d6b418
 MISC ChangeLog-2015 9333 SHA256 5f8710e0b23fd1e0c28d9af00dd74c778982acfd6429fdb0f84516e64a38afc1 SHA512 5d83a2eedeed733a0827450c60b6575bc658e03130bad7402391f34ca32ba8529b12870f76856227c139ad59f5083f498239ce9a7ea0c0ccb1e2bdda8308f963 WHIRLPOOL 832e247552472b077857b815a5c2778092f8e0583898300ebae9d02ebd4f317af0e8ceee9d2fdf627fdfea95a4feb1390e860eac4fc9341b14c3f83c9077b9f1
 MISC metadata.xml 314 SHA256 b6ef1d9e9216a88870780de7cd879c61860b8f031c928732236a1cede4e61e70 SHA512 697206bf11d8ea4c4935fff9751b8abe279f21d513d288e61b1d4a485c64236452bf37e7a3940a8b2c151c0981b6feda30c7985b32069a0647adc7ad8c70aea1 WHIRLPOOL 6634ac56ac3877555398c73a72d1d17bd3a2707cc7bebde8f65ded170c89bb3db370f7b532328f486584eb88057a38759afb10dd2271361ff4be38b425d76bf1
diff --git a/sec-policy/selinux-tftp/selinux-tftp-2.20170204-r1.ebuild b/sec-policy/selinux-tftp/selinux-tftp-2.20170204-r1.ebuild
index 5cb6582bd077..7aad3f461a12 100644
--- a/sec-policy/selinux-tftp/selinux-tftp-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-tftp/selinux-tftp-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-tftp/selinux-tftp-2.20170204-r2.ebuild b/sec-policy/selinux-tftp/selinux-tftp-2.20170204-r2.ebuild
index 732f56ec43cb..e0fd48b2a2c5 100644
--- a/sec-policy/selinux-tftp/selinux-tftp-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-tftp/selinux-tftp-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-tftp/selinux-tftp-2.20170204-r3.ebuild b/sec-policy/selinux-tftp/selinux-tftp-2.20170204-r3.ebuild
index 732f56ec43cb..e0fd48b2a2c5 100644
--- a/sec-policy/selinux-tftp/selinux-tftp-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-tftp/selinux-tftp-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-tftp/selinux-tftp-2.20170204-r4.ebuild b/sec-policy/selinux-tftp/selinux-tftp-2.20170204-r4.ebuild
index 732f56ec43cb..e0fd48b2a2c5 100644
--- a/sec-policy/selinux-tftp/selinux-tftp-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-tftp/selinux-tftp-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-tftp/selinux-tftp-2.20170805-r2.ebuild b/sec-policy/selinux-tftp/selinux-tftp-2.20170805-r2.ebuild
index 732f56ec43cb..e0fd48b2a2c5 100644
--- a/sec-policy/selinux-tftp/selinux-tftp-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-tftp/selinux-tftp-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-tftp/selinux-tftp-2.20170805-r3.ebuild b/sec-policy/selinux-tftp/selinux-tftp-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..7aad3f461a12
--- /dev/null
+++ b/sec-policy/selinux-tftp/selinux-tftp-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-tftp/selinux-tftp-9999.ebuild b/sec-policy/selinux-tftp/selinux-tftp-9999.ebuild
index 5cb6582bd077..7aad3f461a12 100644
--- a/sec-policy/selinux-tftp/selinux-tftp-9999.ebuild
+++ b/sec-policy/selinux-tftp/selinux-tftp-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-tgtd/Manifest b/sec-policy/selinux-tgtd/Manifest
index a876ee3096fc..2c26876fc873 100644
--- a/sec-policy/selinux-tgtd/Manifest
+++ b/sec-policy/selinux-tgtd/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-tgtd-2.20170204-r1.ebuild 279 SHA256 4e7b2d5c6c43b89a2daf4ca221347ce364a046142f7d0684ffc0fbe513e8bf55 SHA512 a6ae890f582cb2099c20c5eae5d53c4b910036879d30583f079a31824c929b95fc3a6c122066c9c8364ad9449e456800493235804370267511884af515896ba0 WHIRLPOOL a8bef064a0d92e7bc70f300a2db4495f60d2ec6caf61b45bdb7e55d8e64d15dfa785c2dd8501418267179bf67f91e027852891a2e2d09db964ecd29cde78049c
-EBUILD selinux-tgtd-2.20170204-r2.ebuild 277 SHA256 88fee562d2e579316d1f8396406a7d38cf10f2699ebfe5102cbc061e24560716 SHA512 f5f8055550a825409f4e4646bbd2c1536f29723fdfb902052cfec613128581dc947bd33b1a374f4b0098ee8fca57303398c177aae83e90866b94b0522cabb822 WHIRLPOOL 3d6e6541647e11cc74d9b0096768a607326a3bc33461c5797ef2d3cd0db8193cb1a77d2fa0077728be044946e38aa722195ccf78ac0dfaca4fad0590b43c7893
-EBUILD selinux-tgtd-2.20170204-r3.ebuild 277 SHA256 88fee562d2e579316d1f8396406a7d38cf10f2699ebfe5102cbc061e24560716 SHA512 f5f8055550a825409f4e4646bbd2c1536f29723fdfb902052cfec613128581dc947bd33b1a374f4b0098ee8fca57303398c177aae83e90866b94b0522cabb822 WHIRLPOOL 3d6e6541647e11cc74d9b0096768a607326a3bc33461c5797ef2d3cd0db8193cb1a77d2fa0077728be044946e38aa722195ccf78ac0dfaca4fad0590b43c7893
-EBUILD selinux-tgtd-2.20170204-r4.ebuild 277 SHA256 88fee562d2e579316d1f8396406a7d38cf10f2699ebfe5102cbc061e24560716 SHA512 f5f8055550a825409f4e4646bbd2c1536f29723fdfb902052cfec613128581dc947bd33b1a374f4b0098ee8fca57303398c177aae83e90866b94b0522cabb822 WHIRLPOOL 3d6e6541647e11cc74d9b0096768a607326a3bc33461c5797ef2d3cd0db8193cb1a77d2fa0077728be044946e38aa722195ccf78ac0dfaca4fad0590b43c7893
-EBUILD selinux-tgtd-2.20170805-r2.ebuild 277 SHA256 88fee562d2e579316d1f8396406a7d38cf10f2699ebfe5102cbc061e24560716 SHA512 f5f8055550a825409f4e4646bbd2c1536f29723fdfb902052cfec613128581dc947bd33b1a374f4b0098ee8fca57303398c177aae83e90866b94b0522cabb822 WHIRLPOOL 3d6e6541647e11cc74d9b0096768a607326a3bc33461c5797ef2d3cd0db8193cb1a77d2fa0077728be044946e38aa722195ccf78ac0dfaca4fad0590b43c7893
-EBUILD selinux-tgtd-9999.ebuild 279 SHA256 4e7b2d5c6c43b89a2daf4ca221347ce364a046142f7d0684ffc0fbe513e8bf55 SHA512 a6ae890f582cb2099c20c5eae5d53c4b910036879d30583f079a31824c929b95fc3a6c122066c9c8364ad9449e456800493235804370267511884af515896ba0 WHIRLPOOL a8bef064a0d92e7bc70f300a2db4495f60d2ec6caf61b45bdb7e55d8e64d15dfa785c2dd8501418267179bf67f91e027852891a2e2d09db964ecd29cde78049c
+EBUILD selinux-tgtd-2.20170204-r1.ebuild 280 SHA256 85b287bd5a7e56e559ecddbd429d1456518c11626776ea634777a2eb615bc90b SHA512 f935c7ae309f2e80c007f871eacd875ece8d74767b3510ab89526d9d9623716008ec50b3fa698b18aadb52d124c8d9facb37b6c0268f629f8611f6e8667b0a08 WHIRLPOOL c633d2e0c96e467e8e589b90134253620b03f00b64d27668fa0a093b2e0e2a67078b4c6e4425b32ddbc31cb6e306978e4102ee72ac3b31f3d21d478d46de3393
+EBUILD selinux-tgtd-2.20170204-r2.ebuild 278 SHA256 ca9afd0c4166fb108126fdc78cabb21c36a834379fe872532cdbab3e49e045c6 SHA512 32ccfa08bb111ada87fe959bfedddb06e46426343d648cdd42640ae325e04779a92efb748b07a38e2456a4b2b31fa835fa506fa366ba8da58bc60a97fac88462 WHIRLPOOL 00e8d06b79ed4565ebaed5560f328f24dbf04afae92a6cded39f2831a8db94c62a28162504c1f48e3294dc4d80ceafac3cdc30c1a0a759c4ab1db9093a7ae5be
+EBUILD selinux-tgtd-2.20170204-r3.ebuild 278 SHA256 ca9afd0c4166fb108126fdc78cabb21c36a834379fe872532cdbab3e49e045c6 SHA512 32ccfa08bb111ada87fe959bfedddb06e46426343d648cdd42640ae325e04779a92efb748b07a38e2456a4b2b31fa835fa506fa366ba8da58bc60a97fac88462 WHIRLPOOL 00e8d06b79ed4565ebaed5560f328f24dbf04afae92a6cded39f2831a8db94c62a28162504c1f48e3294dc4d80ceafac3cdc30c1a0a759c4ab1db9093a7ae5be
+EBUILD selinux-tgtd-2.20170204-r4.ebuild 278 SHA256 ca9afd0c4166fb108126fdc78cabb21c36a834379fe872532cdbab3e49e045c6 SHA512 32ccfa08bb111ada87fe959bfedddb06e46426343d648cdd42640ae325e04779a92efb748b07a38e2456a4b2b31fa835fa506fa366ba8da58bc60a97fac88462 WHIRLPOOL 00e8d06b79ed4565ebaed5560f328f24dbf04afae92a6cded39f2831a8db94c62a28162504c1f48e3294dc4d80ceafac3cdc30c1a0a759c4ab1db9093a7ae5be
+EBUILD selinux-tgtd-2.20170805-r2.ebuild 278 SHA256 ca9afd0c4166fb108126fdc78cabb21c36a834379fe872532cdbab3e49e045c6 SHA512 32ccfa08bb111ada87fe959bfedddb06e46426343d648cdd42640ae325e04779a92efb748b07a38e2456a4b2b31fa835fa506fa366ba8da58bc60a97fac88462 WHIRLPOOL 00e8d06b79ed4565ebaed5560f328f24dbf04afae92a6cded39f2831a8db94c62a28162504c1f48e3294dc4d80ceafac3cdc30c1a0a759c4ab1db9093a7ae5be
+EBUILD selinux-tgtd-2.20170805-r3.ebuild 280 SHA256 85b287bd5a7e56e559ecddbd429d1456518c11626776ea634777a2eb615bc90b SHA512 f935c7ae309f2e80c007f871eacd875ece8d74767b3510ab89526d9d9623716008ec50b3fa698b18aadb52d124c8d9facb37b6c0268f629f8611f6e8667b0a08 WHIRLPOOL c633d2e0c96e467e8e589b90134253620b03f00b64d27668fa0a093b2e0e2a67078b4c6e4425b32ddbc31cb6e306978e4102ee72ac3b31f3d21d478d46de3393
+EBUILD selinux-tgtd-9999.ebuild 280 SHA256 85b287bd5a7e56e559ecddbd429d1456518c11626776ea634777a2eb615bc90b SHA512 f935c7ae309f2e80c007f871eacd875ece8d74767b3510ab89526d9d9623716008ec50b3fa698b18aadb52d124c8d9facb37b6c0268f629f8611f6e8667b0a08 WHIRLPOOL c633d2e0c96e467e8e589b90134253620b03f00b64d27668fa0a093b2e0e2a67078b4c6e4425b32ddbc31cb6e306978e4102ee72ac3b31f3d21d478d46de3393
 MISC ChangeLog 10387 SHA256 a9a0fc54a35ab5c11533193bb6d34e850e98bd20cd20558f6e3edbdf4451a03d SHA512 a9c9456fb221e0d497bf9bce146e6b6ed19e820b3db533295f9dbc55fd3208dc8c03f49790d8d2bbb0b79457d71c9a303b2247b8fd01020cfa7df25b1b1bd4f2 WHIRLPOOL 522c44ddcbf550d9a4a2cb7cacd7b911116e3090a67df81a92d3da18759eb992206b8d13963e104ad4f64fd8298b285918a671109e209f360e3f30158bce392f
 MISC ChangeLog-2015 9636 SHA256 44cbe852331f2e407f293363e6e7ddf76c4fbe171a1df9eb44784b9c4c364287 SHA512 c04c0740cb0a0f46c09fb7383b7e758a2629cc3cf878a8a9a9eca1206db29722ad880b506811976b1e4a3864c4f96ad3f14ff5a7943c6378d79b2bb5dd7ca003 WHIRLPOOL 2361e7a7cb6401f33fa809452d7655ddea63df492e4e0a06b7047499081c6eb8766f2f1bf0fa7d0397fe4a1a3cdc21a4a354a60a67be78535454465646781795
 MISC metadata.xml 314 SHA256 e457c2819522a889ffc187fa7ca017cb49658eebc30b626c329f1786c7a2b20b SHA512 7ff6b603403c8ab2e2832738a2078a20d56226a35f70d61b9d067044d7a71d160965a93e76bf705456f8a61b268324d910d43d4dab11d84efc0455eb247db5a4 WHIRLPOOL 508a84fbcc6f5bb2fea2fb9dd92cd944b4172a988fafc2dafaf48677c0b9e57f91b0e2fc873fe3f978a71498f28a076eaadd855656f92ea655052b25f8c20bb5
diff --git a/sec-policy/selinux-tgtd/selinux-tgtd-2.20170204-r1.ebuild b/sec-policy/selinux-tgtd/selinux-tgtd-2.20170204-r1.ebuild
index 4405750c9da5..ebb8910a0195 100644
--- a/sec-policy/selinux-tgtd/selinux-tgtd-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-tgtd/selinux-tgtd-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-tgtd/selinux-tgtd-2.20170204-r2.ebuild b/sec-policy/selinux-tgtd/selinux-tgtd-2.20170204-r2.ebuild
index 5228e25835c3..ccf0acbaf89c 100644
--- a/sec-policy/selinux-tgtd/selinux-tgtd-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-tgtd/selinux-tgtd-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-tgtd/selinux-tgtd-2.20170204-r3.ebuild b/sec-policy/selinux-tgtd/selinux-tgtd-2.20170204-r3.ebuild
index 5228e25835c3..ccf0acbaf89c 100644
--- a/sec-policy/selinux-tgtd/selinux-tgtd-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-tgtd/selinux-tgtd-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-tgtd/selinux-tgtd-2.20170204-r4.ebuild b/sec-policy/selinux-tgtd/selinux-tgtd-2.20170204-r4.ebuild
index 5228e25835c3..ccf0acbaf89c 100644
--- a/sec-policy/selinux-tgtd/selinux-tgtd-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-tgtd/selinux-tgtd-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-tgtd/selinux-tgtd-2.20170805-r2.ebuild b/sec-policy/selinux-tgtd/selinux-tgtd-2.20170805-r2.ebuild
index 5228e25835c3..ccf0acbaf89c 100644
--- a/sec-policy/selinux-tgtd/selinux-tgtd-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-tgtd/selinux-tgtd-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-tgtd/selinux-tgtd-2.20170805-r3.ebuild b/sec-policy/selinux-tgtd/selinux-tgtd-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..ebb8910a0195
--- /dev/null
+++ b/sec-policy/selinux-tgtd/selinux-tgtd-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-tgtd/selinux-tgtd-9999.ebuild b/sec-policy/selinux-tgtd/selinux-tgtd-9999.ebuild
index 4405750c9da5..ebb8910a0195 100644
--- a/sec-policy/selinux-tgtd/selinux-tgtd-9999.ebuild
+++ b/sec-policy/selinux-tgtd/selinux-tgtd-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-thunderbird/Manifest b/sec-policy/selinux-thunderbird/Manifest
index ca4e72c0e7a7..6494765032e8 100644
--- a/sec-policy/selinux-thunderbird/Manifest
+++ b/sec-policy/selinux-thunderbird/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-thunderbird-2.20170204-r1.ebuild 391 SHA256 9618992ba9b0f80280be4b48251f7615fdd48ce60e7491c7b29c04c36b2923b9 SHA512 e05bdf5da4be28ae289105a48cecea870724227c4128e6c1d48825521c4dd220508331b4b3c4ea72021c64fc1bbe17692bb20278ffc399b39f5b0ba7697e29e4 WHIRLPOOL 270715da9b9e8afb39ddf64baec84e47c9f9ef4f234f8461fd389156069889bd3d4710bd180896f1a6a08d33229119bba93daf6224fdc01f21f6702a22f99d50
-EBUILD selinux-thunderbird-2.20170204-r2.ebuild 389 SHA256 3ecb5624b782c6fd1052c9661db1d3751d9a16e3bb76a89910be798e536d8564 SHA512 b17bb948b63ecc1debe18a968d342988ba6346ff781d883ea78ef322c5b0009aa2623612463221f9c414108c1f9cace750af9541fed2275614be8e362eb6020c WHIRLPOOL c43e528b7ed434c3ddec0e5dbe177e4ff07ea81ed28a979ee17fdc769fb9d6fcca3edbbbd97e08c3e8ecc2f08e3c1aa26297a58039f5be3879124047f1b9a89b
-EBUILD selinux-thunderbird-2.20170204-r3.ebuild 389 SHA256 3ecb5624b782c6fd1052c9661db1d3751d9a16e3bb76a89910be798e536d8564 SHA512 b17bb948b63ecc1debe18a968d342988ba6346ff781d883ea78ef322c5b0009aa2623612463221f9c414108c1f9cace750af9541fed2275614be8e362eb6020c WHIRLPOOL c43e528b7ed434c3ddec0e5dbe177e4ff07ea81ed28a979ee17fdc769fb9d6fcca3edbbbd97e08c3e8ecc2f08e3c1aa26297a58039f5be3879124047f1b9a89b
-EBUILD selinux-thunderbird-2.20170204-r4.ebuild 389 SHA256 3ecb5624b782c6fd1052c9661db1d3751d9a16e3bb76a89910be798e536d8564 SHA512 b17bb948b63ecc1debe18a968d342988ba6346ff781d883ea78ef322c5b0009aa2623612463221f9c414108c1f9cace750af9541fed2275614be8e362eb6020c WHIRLPOOL c43e528b7ed434c3ddec0e5dbe177e4ff07ea81ed28a979ee17fdc769fb9d6fcca3edbbbd97e08c3e8ecc2f08e3c1aa26297a58039f5be3879124047f1b9a89b
-EBUILD selinux-thunderbird-2.20170805-r2.ebuild 389 SHA256 3ecb5624b782c6fd1052c9661db1d3751d9a16e3bb76a89910be798e536d8564 SHA512 b17bb948b63ecc1debe18a968d342988ba6346ff781d883ea78ef322c5b0009aa2623612463221f9c414108c1f9cace750af9541fed2275614be8e362eb6020c WHIRLPOOL c43e528b7ed434c3ddec0e5dbe177e4ff07ea81ed28a979ee17fdc769fb9d6fcca3edbbbd97e08c3e8ecc2f08e3c1aa26297a58039f5be3879124047f1b9a89b
-EBUILD selinux-thunderbird-9999.ebuild 391 SHA256 9618992ba9b0f80280be4b48251f7615fdd48ce60e7491c7b29c04c36b2923b9 SHA512 e05bdf5da4be28ae289105a48cecea870724227c4128e6c1d48825521c4dd220508331b4b3c4ea72021c64fc1bbe17692bb20278ffc399b39f5b0ba7697e29e4 WHIRLPOOL 270715da9b9e8afb39ddf64baec84e47c9f9ef4f234f8461fd389156069889bd3d4710bd180896f1a6a08d33229119bba93daf6224fdc01f21f6702a22f99d50
+EBUILD selinux-thunderbird-2.20170204-r1.ebuild 392 SHA256 6f03a240f395566495cd73ded831a63dbe5cf285eced09dac65daa65fbd26d8b SHA512 5bc301cfc155ff736bef4b0456d4ba50f04cbbdc09311d6a0786667cd77688c6eb06d0d90bb4fc54bc5d7329c2f15e3677205c7634c1dd021db84390b995edf0 WHIRLPOOL 89f3f67be5d9206af74fd0f03967ae463b0adf8a30d240b26a3be58712dc4b55ea1b7e5618de58a68f877d93b7b9e7dd2407bb001490d761c8d7679d76834615
+EBUILD selinux-thunderbird-2.20170204-r2.ebuild 390 SHA256 c2f9469edabab51dc64bf415f16aa9c199a5103f7101e5ea3981c9669e3a931b SHA512 6f977f8d183a7832daf3a4790dc340da97f292b6b6e24387817b57251f2d6e53cb1e6fc7596bfd95e67a79cda36a82e8aca01f9b9e4c8d71a3b4ca92c48a6ae1 WHIRLPOOL dbdde12b686c9f49950ca88d7c2247925224d78c998e6f2b58b213e341c7ce656f5d563d1d7235baafe47431f66d9f6022ddad188c2391b7bf70fcb6c0a70bcd
+EBUILD selinux-thunderbird-2.20170204-r3.ebuild 390 SHA256 c2f9469edabab51dc64bf415f16aa9c199a5103f7101e5ea3981c9669e3a931b SHA512 6f977f8d183a7832daf3a4790dc340da97f292b6b6e24387817b57251f2d6e53cb1e6fc7596bfd95e67a79cda36a82e8aca01f9b9e4c8d71a3b4ca92c48a6ae1 WHIRLPOOL dbdde12b686c9f49950ca88d7c2247925224d78c998e6f2b58b213e341c7ce656f5d563d1d7235baafe47431f66d9f6022ddad188c2391b7bf70fcb6c0a70bcd
+EBUILD selinux-thunderbird-2.20170204-r4.ebuild 390 SHA256 c2f9469edabab51dc64bf415f16aa9c199a5103f7101e5ea3981c9669e3a931b SHA512 6f977f8d183a7832daf3a4790dc340da97f292b6b6e24387817b57251f2d6e53cb1e6fc7596bfd95e67a79cda36a82e8aca01f9b9e4c8d71a3b4ca92c48a6ae1 WHIRLPOOL dbdde12b686c9f49950ca88d7c2247925224d78c998e6f2b58b213e341c7ce656f5d563d1d7235baafe47431f66d9f6022ddad188c2391b7bf70fcb6c0a70bcd
+EBUILD selinux-thunderbird-2.20170805-r2.ebuild 390 SHA256 c2f9469edabab51dc64bf415f16aa9c199a5103f7101e5ea3981c9669e3a931b SHA512 6f977f8d183a7832daf3a4790dc340da97f292b6b6e24387817b57251f2d6e53cb1e6fc7596bfd95e67a79cda36a82e8aca01f9b9e4c8d71a3b4ca92c48a6ae1 WHIRLPOOL dbdde12b686c9f49950ca88d7c2247925224d78c998e6f2b58b213e341c7ce656f5d563d1d7235baafe47431f66d9f6022ddad188c2391b7bf70fcb6c0a70bcd
+EBUILD selinux-thunderbird-2.20170805-r3.ebuild 392 SHA256 6f03a240f395566495cd73ded831a63dbe5cf285eced09dac65daa65fbd26d8b SHA512 5bc301cfc155ff736bef4b0456d4ba50f04cbbdc09311d6a0786667cd77688c6eb06d0d90bb4fc54bc5d7329c2f15e3677205c7634c1dd021db84390b995edf0 WHIRLPOOL 89f3f67be5d9206af74fd0f03967ae463b0adf8a30d240b26a3be58712dc4b55ea1b7e5618de58a68f877d93b7b9e7dd2407bb001490d761c8d7679d76834615
+EBUILD selinux-thunderbird-9999.ebuild 392 SHA256 6f03a240f395566495cd73ded831a63dbe5cf285eced09dac65daa65fbd26d8b SHA512 5bc301cfc155ff736bef4b0456d4ba50f04cbbdc09311d6a0786667cd77688c6eb06d0d90bb4fc54bc5d7329c2f15e3677205c7634c1dd021db84390b995edf0 WHIRLPOOL 89f3f67be5d9206af74fd0f03967ae463b0adf8a30d240b26a3be58712dc4b55ea1b7e5618de58a68f877d93b7b9e7dd2407bb001490d761c8d7679d76834615
 MISC ChangeLog 11071 SHA256 96747ba6ac1f1086a852e67ab494dbbb977d4bc1dfdfa9770f17d61187e233e1 SHA512 ecb3a20071226ef27cb6aa46d8e23c9f742631052f20d50254d59b6e34fe7cd66f1b0b2984c6aabfdfef035b0f461db7f390601f2bd778ba0e91871a3b6afedc WHIRLPOOL c700a1e274f8a495e4df8563972173ef22252b9e04f4d9c11d370e757766b76e86633e51690f994c45fb50a9a7508d3b1ab7ff2a69d91de772daa48ca6a19de7
 MISC ChangeLog-2015 10732 SHA256 93e32235f332609398053d9cf0f726dfa2f37b8994ebe0e6a4fe30f3e01a69a6 SHA512 e1b053f5ef79b4e87c4d34dd7e19f15f8fc7b7509fe94fa21b174379a1e7f331d979c8badf1248053dd2b7faadfef0dc7c18f5e928b375c828fbefe9a3e0ed78 WHIRLPOOL 05218a6d36df571177b335e633656aa7622e5eefb7f71ffc9669c08eea9685820c7c9a20a1242361e7bb799c2b8014a4b0b79458dc5d1ec62c31029733689731
 MISC metadata.xml 321 SHA256 5a482f501eba94cc7c4800a9f02976ee7050de09d7a517c0cd42bfa632b84193 SHA512 883b02eb500849986493b7ef57241788991bbb266076583b5d5436b31c841ca789eda0d04e74e3ff7b1bff87270a409352f077d62d4b8bf280c12f36da01856e WHIRLPOOL b0a49a75bb94e3cea870fb3ba58c71749d0d2e3fccdc03bde0fda0fede79626fd65b754d1b59505f1bb908fced3f636314b0eb3eab4dd9597d8d9c35bd2ef14e
diff --git a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170204-r1.ebuild b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170204-r1.ebuild
index 29a0ca51064b..07d2fda0570c 100644
--- a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170204-r2.ebuild b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170204-r2.ebuild
index e5ca06c8db8e..7ead7c22e75c 100644
--- a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170204-r3.ebuild b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170204-r3.ebuild
index e5ca06c8db8e..7ead7c22e75c 100644
--- a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170204-r4.ebuild b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170204-r4.ebuild
index e5ca06c8db8e..7ead7c22e75c 100644
--- a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170805-r2.ebuild b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170805-r2.ebuild
index e5ca06c8db8e..7ead7c22e75c 100644
--- a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170805-r3.ebuild b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..07d2fda0570c
--- /dev/null
+++ b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170805-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-thunderbird/selinux-thunderbird-9999.ebuild b/sec-policy/selinux-thunderbird/selinux-thunderbird-9999.ebuild
index 29a0ca51064b..07d2fda0570c 100644
--- a/sec-policy/selinux-thunderbird/selinux-thunderbird-9999.ebuild
+++ b/sec-policy/selinux-thunderbird/selinux-thunderbird-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-timidity/Manifest b/sec-policy/selinux-timidity/Manifest
index 0ae62a04e35d..037e47832e83 100644
--- a/sec-policy/selinux-timidity/Manifest
+++ b/sec-policy/selinux-timidity/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-timidity-2.20170204-r1.ebuild 287 SHA256 cda060b21166b61fa59b0214f25cbe90ec0a6125e46afe4475b6356a08c5b649 SHA512 dffb6b29e2c02906a0595c5e4b8d65c985d72bdab57a4e2134381f17c2b555cde58481e0021d3c0a0828148ee2654296f6b53c8e048f0798d63933a522377d09 WHIRLPOOL a1310bb29af079036a21d9622002f56ea6e02371929b601b9f335613ca9ab4d7e781f3cc75b45778c0dc79e2142502f9618cff49aee482d78e2b5fd018d42ab6
-EBUILD selinux-timidity-2.20170204-r2.ebuild 285 SHA256 095306c3a98a74dc15341e4b98c7c51be3067c0778792aa694e26770fda17ca5 SHA512 67267d5a295c9ef235aada80a8ad1b7af2a9aa11fca84a313d579922dcac6cb60b88680fb5d1f1684ff59e9de7d28d5304a06ff7db3ba42a283d9862a75c6538 WHIRLPOOL e977811adec57a53e7fd4603c298fa4c418cb9eb50a6e4c557f354e7875eaf8529dee78ea06b00be4243638f7edaf6cf01930be198b8717cc0fdad1b003eb0e1
-EBUILD selinux-timidity-2.20170204-r3.ebuild 285 SHA256 095306c3a98a74dc15341e4b98c7c51be3067c0778792aa694e26770fda17ca5 SHA512 67267d5a295c9ef235aada80a8ad1b7af2a9aa11fca84a313d579922dcac6cb60b88680fb5d1f1684ff59e9de7d28d5304a06ff7db3ba42a283d9862a75c6538 WHIRLPOOL e977811adec57a53e7fd4603c298fa4c418cb9eb50a6e4c557f354e7875eaf8529dee78ea06b00be4243638f7edaf6cf01930be198b8717cc0fdad1b003eb0e1
-EBUILD selinux-timidity-2.20170204-r4.ebuild 285 SHA256 095306c3a98a74dc15341e4b98c7c51be3067c0778792aa694e26770fda17ca5 SHA512 67267d5a295c9ef235aada80a8ad1b7af2a9aa11fca84a313d579922dcac6cb60b88680fb5d1f1684ff59e9de7d28d5304a06ff7db3ba42a283d9862a75c6538 WHIRLPOOL e977811adec57a53e7fd4603c298fa4c418cb9eb50a6e4c557f354e7875eaf8529dee78ea06b00be4243638f7edaf6cf01930be198b8717cc0fdad1b003eb0e1
-EBUILD selinux-timidity-2.20170805-r2.ebuild 285 SHA256 095306c3a98a74dc15341e4b98c7c51be3067c0778792aa694e26770fda17ca5 SHA512 67267d5a295c9ef235aada80a8ad1b7af2a9aa11fca84a313d579922dcac6cb60b88680fb5d1f1684ff59e9de7d28d5304a06ff7db3ba42a283d9862a75c6538 WHIRLPOOL e977811adec57a53e7fd4603c298fa4c418cb9eb50a6e4c557f354e7875eaf8529dee78ea06b00be4243638f7edaf6cf01930be198b8717cc0fdad1b003eb0e1
-EBUILD selinux-timidity-9999.ebuild 287 SHA256 cda060b21166b61fa59b0214f25cbe90ec0a6125e46afe4475b6356a08c5b649 SHA512 dffb6b29e2c02906a0595c5e4b8d65c985d72bdab57a4e2134381f17c2b555cde58481e0021d3c0a0828148ee2654296f6b53c8e048f0798d63933a522377d09 WHIRLPOOL a1310bb29af079036a21d9622002f56ea6e02371929b601b9f335613ca9ab4d7e781f3cc75b45778c0dc79e2142502f9618cff49aee482d78e2b5fd018d42ab6
+EBUILD selinux-timidity-2.20170204-r1.ebuild 288 SHA256 b5ddba0e183020288281c00fa55f84a63aa9890f3f42af17c2894d868a3e9c51 SHA512 82240ca68e2cbf22996232ffc8145c669ba516fa5e41234baedea25e1a1153bbfb91035aa8e563a87e7b93762ba470774c34068460b8a5432d0c1546495e8c0d WHIRLPOOL 21ec40fb103c569f3d11aea0ea5440940377266a18e270bf7154b7f217d5424216005e2eff4d89532452f429944ff61571b70f52ccc953e8b0815ecba5904954
+EBUILD selinux-timidity-2.20170204-r2.ebuild 286 SHA256 59b0038c6d3f4d43f638ca722820186e9379897702fe07836066efc86075934b SHA512 a4fc8f01b28711ddd96d8c55e4b86a833677f8d1ca9d9786e54db172f647cca78e9ab332010861338c10410f0ec471aa8a12eb63d2d2cb9e31df70044bd5720e WHIRLPOOL 82f42db5906673c86959dcd5bdab6fae4b2c36425eb7eea3d4f8a2088cc3344b515e4504c4548a36ceca11d356b75fcf38a00215182dab13afb946350eb7ff0e
+EBUILD selinux-timidity-2.20170204-r3.ebuild 286 SHA256 59b0038c6d3f4d43f638ca722820186e9379897702fe07836066efc86075934b SHA512 a4fc8f01b28711ddd96d8c55e4b86a833677f8d1ca9d9786e54db172f647cca78e9ab332010861338c10410f0ec471aa8a12eb63d2d2cb9e31df70044bd5720e WHIRLPOOL 82f42db5906673c86959dcd5bdab6fae4b2c36425eb7eea3d4f8a2088cc3344b515e4504c4548a36ceca11d356b75fcf38a00215182dab13afb946350eb7ff0e
+EBUILD selinux-timidity-2.20170204-r4.ebuild 286 SHA256 59b0038c6d3f4d43f638ca722820186e9379897702fe07836066efc86075934b SHA512 a4fc8f01b28711ddd96d8c55e4b86a833677f8d1ca9d9786e54db172f647cca78e9ab332010861338c10410f0ec471aa8a12eb63d2d2cb9e31df70044bd5720e WHIRLPOOL 82f42db5906673c86959dcd5bdab6fae4b2c36425eb7eea3d4f8a2088cc3344b515e4504c4548a36ceca11d356b75fcf38a00215182dab13afb946350eb7ff0e
+EBUILD selinux-timidity-2.20170805-r2.ebuild 286 SHA256 59b0038c6d3f4d43f638ca722820186e9379897702fe07836066efc86075934b SHA512 a4fc8f01b28711ddd96d8c55e4b86a833677f8d1ca9d9786e54db172f647cca78e9ab332010861338c10410f0ec471aa8a12eb63d2d2cb9e31df70044bd5720e WHIRLPOOL 82f42db5906673c86959dcd5bdab6fae4b2c36425eb7eea3d4f8a2088cc3344b515e4504c4548a36ceca11d356b75fcf38a00215182dab13afb946350eb7ff0e
+EBUILD selinux-timidity-2.20170805-r3.ebuild 288 SHA256 b5ddba0e183020288281c00fa55f84a63aa9890f3f42af17c2894d868a3e9c51 SHA512 82240ca68e2cbf22996232ffc8145c669ba516fa5e41234baedea25e1a1153bbfb91035aa8e563a87e7b93762ba470774c34068460b8a5432d0c1546495e8c0d WHIRLPOOL 21ec40fb103c569f3d11aea0ea5440940377266a18e270bf7154b7f217d5424216005e2eff4d89532452f429944ff61571b70f52ccc953e8b0815ecba5904954
+EBUILD selinux-timidity-9999.ebuild 288 SHA256 b5ddba0e183020288281c00fa55f84a63aa9890f3f42af17c2894d868a3e9c51 SHA512 82240ca68e2cbf22996232ffc8145c669ba516fa5e41234baedea25e1a1153bbfb91035aa8e563a87e7b93762ba470774c34068460b8a5432d0c1546495e8c0d WHIRLPOOL 21ec40fb103c569f3d11aea0ea5440940377266a18e270bf7154b7f217d5424216005e2eff4d89532452f429944ff61571b70f52ccc953e8b0815ecba5904954
 MISC ChangeLog 10793 SHA256 65be5a704a3edb55a9026e5d53c9823ff7195d5cfca6a6e2db771fc76322b73e SHA512 d52607401396e4db02a53d15391eb78a62437b5e215169eb0b1dbc0522b6df96888c400559034c01f6f95576f0980b4a0243e17ed6d652957f844a3ff92cb3d5 WHIRLPOOL 548242e1a9b34b31de70214a1a3e7bd12e2aaf5d1ddf4a2f9525a8da73920f3f9751c9d03eb8b5db55d0717c3c16f5a0a1cdeb4d8a54efb0493d3fd49520a89d
 MISC ChangeLog-2015 10102 SHA256 5df60e9d9dba47e677172da344c864a7b8c2c55e3de51b5763b1153c0c47870a SHA512 7a657592ccff770ab0fd3059024ec3a037a9093e7a87ea3eb5838c424abf5f6f536cefd2270816cb26d2ddc3a482245d232c413f2af8dfabaf80c5539fef01b1 WHIRLPOOL a0653456043a6981f69f137ea21712321da4ceb1a174e8b93d9aabb6c944039a249498f2304ff3ad3c447a0dd36e9583447a042f55db1b8024eb18f017046d37
 MISC metadata.xml 318 SHA256 8707d06080e5081f4dcc74b9e84f84c39031edab902d4517fe5dc19313fb82e0 SHA512 60ed41e8c07067ddc123bcf078ffa3448facf9eb0bdd79f59031bc75ad1f46ee6fdd512a542f5240752bd3ce548e1dd782c027fa9e3f42375cff6e89fa46dc8b WHIRLPOOL b2ce34e23fe2cae1bda48ccae75467747342a898f51d0e9dcbaebb96c54abb435851d9ce323bb85e096be73b1e419076a4692f1303c22fc2c582b3200557694c
diff --git a/sec-policy/selinux-timidity/selinux-timidity-2.20170204-r1.ebuild b/sec-policy/selinux-timidity/selinux-timidity-2.20170204-r1.ebuild
index d02574156f0f..087a9e76ffa7 100644
--- a/sec-policy/selinux-timidity/selinux-timidity-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-timidity/selinux-timidity-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-timidity/selinux-timidity-2.20170204-r2.ebuild b/sec-policy/selinux-timidity/selinux-timidity-2.20170204-r2.ebuild
index 34caab8c0da7..5142bf04b71c 100644
--- a/sec-policy/selinux-timidity/selinux-timidity-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-timidity/selinux-timidity-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-timidity/selinux-timidity-2.20170204-r3.ebuild b/sec-policy/selinux-timidity/selinux-timidity-2.20170204-r3.ebuild
index 34caab8c0da7..5142bf04b71c 100644
--- a/sec-policy/selinux-timidity/selinux-timidity-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-timidity/selinux-timidity-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-timidity/selinux-timidity-2.20170204-r4.ebuild b/sec-policy/selinux-timidity/selinux-timidity-2.20170204-r4.ebuild
index 34caab8c0da7..5142bf04b71c 100644
--- a/sec-policy/selinux-timidity/selinux-timidity-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-timidity/selinux-timidity-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-timidity/selinux-timidity-2.20170805-r2.ebuild b/sec-policy/selinux-timidity/selinux-timidity-2.20170805-r2.ebuild
index 34caab8c0da7..5142bf04b71c 100644
--- a/sec-policy/selinux-timidity/selinux-timidity-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-timidity/selinux-timidity-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-timidity/selinux-timidity-2.20170805-r3.ebuild b/sec-policy/selinux-timidity/selinux-timidity-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..087a9e76ffa7
--- /dev/null
+++ b/sec-policy/selinux-timidity/selinux-timidity-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-timidity/selinux-timidity-9999.ebuild b/sec-policy/selinux-timidity/selinux-timidity-9999.ebuild
index d02574156f0f..087a9e76ffa7 100644
--- a/sec-policy/selinux-timidity/selinux-timidity-9999.ebuild
+++ b/sec-policy/selinux-timidity/selinux-timidity-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-tmpreaper/Manifest b/sec-policy/selinux-tmpreaper/Manifest
index cf8e112878fb..271bbf31d59a 100644
--- a/sec-policy/selinux-tmpreaper/Manifest
+++ b/sec-policy/selinux-tmpreaper/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-tmpreaper-2.20170204-r1.ebuild 289 SHA256 a9b3d6b53912cf3cfb6345ff7a7fe4199e8a332c82922b4a65413c2600f00772 SHA512 961feb05992221dc92b6a7d7b08befe8538161127af57d2c6fe9f5861029ffb68d895811957d5e3fed1389a95db288e1775c91d1fa3018bc96ffd58af0982853 WHIRLPOOL bf5a50c912fee7b6ea8e4b2a9899909d33c0a07560a11216cdafc726908879ceec59e0600e567d5a735d8c2954d1033ad6cde78c4fa0b01181c45c77e9df99e2
-EBUILD selinux-tmpreaper-2.20170204-r2.ebuild 287 SHA256 0b4ee03f8b47beb4924db74ed4615a7d3e995342ba57457fa8b7bd81a25275bb SHA512 2455b291dd7477990b94b200386eae946afb28a9fab11dbc9af98bf5a1cdefac1ec546a698c3d955587079baf1c2a4ae1818973707d791f7bec03aa2ae6dff3e WHIRLPOOL f5f3819df238c68673b8c5860edaef1ef5e281737a7f0f2fb55c40df8b0b7f6934892ac809be53436148e8ca2369daffd06c470ced9e558fe5e43a4299af86b5
-EBUILD selinux-tmpreaper-2.20170204-r3.ebuild 287 SHA256 0b4ee03f8b47beb4924db74ed4615a7d3e995342ba57457fa8b7bd81a25275bb SHA512 2455b291dd7477990b94b200386eae946afb28a9fab11dbc9af98bf5a1cdefac1ec546a698c3d955587079baf1c2a4ae1818973707d791f7bec03aa2ae6dff3e WHIRLPOOL f5f3819df238c68673b8c5860edaef1ef5e281737a7f0f2fb55c40df8b0b7f6934892ac809be53436148e8ca2369daffd06c470ced9e558fe5e43a4299af86b5
-EBUILD selinux-tmpreaper-2.20170204-r4.ebuild 287 SHA256 0b4ee03f8b47beb4924db74ed4615a7d3e995342ba57457fa8b7bd81a25275bb SHA512 2455b291dd7477990b94b200386eae946afb28a9fab11dbc9af98bf5a1cdefac1ec546a698c3d955587079baf1c2a4ae1818973707d791f7bec03aa2ae6dff3e WHIRLPOOL f5f3819df238c68673b8c5860edaef1ef5e281737a7f0f2fb55c40df8b0b7f6934892ac809be53436148e8ca2369daffd06c470ced9e558fe5e43a4299af86b5
-EBUILD selinux-tmpreaper-2.20170805-r2.ebuild 287 SHA256 0b4ee03f8b47beb4924db74ed4615a7d3e995342ba57457fa8b7bd81a25275bb SHA512 2455b291dd7477990b94b200386eae946afb28a9fab11dbc9af98bf5a1cdefac1ec546a698c3d955587079baf1c2a4ae1818973707d791f7bec03aa2ae6dff3e WHIRLPOOL f5f3819df238c68673b8c5860edaef1ef5e281737a7f0f2fb55c40df8b0b7f6934892ac809be53436148e8ca2369daffd06c470ced9e558fe5e43a4299af86b5
-EBUILD selinux-tmpreaper-9999.ebuild 289 SHA256 a9b3d6b53912cf3cfb6345ff7a7fe4199e8a332c82922b4a65413c2600f00772 SHA512 961feb05992221dc92b6a7d7b08befe8538161127af57d2c6fe9f5861029ffb68d895811957d5e3fed1389a95db288e1775c91d1fa3018bc96ffd58af0982853 WHIRLPOOL bf5a50c912fee7b6ea8e4b2a9899909d33c0a07560a11216cdafc726908879ceec59e0600e567d5a735d8c2954d1033ad6cde78c4fa0b01181c45c77e9df99e2
+EBUILD selinux-tmpreaper-2.20170204-r1.ebuild 290 SHA256 fcce3ca24dc8ad87f620e37073b27a76bf04559bc4599a601f444cbddd82331d SHA512 5afd9ac9c7cb97240ea82e5f171f32c491cb1c5c6398434eb51a7524b7f69fdcd6d51c9275cb97f1078802909b756650d1d2e605c080af4f9643406bfdbf0c30 WHIRLPOOL e0754b1f188f133074a352957ad4c78d10d9a1ff8e35a780dae573270f6dfc1b0ff273bea7112c2832e6bd8f111afdf4d61834f87967f3ed6e1319e668ab347c
+EBUILD selinux-tmpreaper-2.20170204-r2.ebuild 288 SHA256 4d82af0fba36639c5e906f228be9d2b06f08022fc3ce2ade596b44f479e4af7c SHA512 49f6cfd39c6a1f93e35bb87cd916e0a5a13df4844cc891967e6cb5387728906b8cddc3f9aafc85d04800ef1846fe1e1ec6a25d706b6aee8312daab14e4da7ad8 WHIRLPOOL 058496c356578b6107e1028ff7eeba2fc8e66109b5075664c3fd0b31cc1b9662298c6a7adbdea6ed8b1eb09ddb1f582f14f60f60c687cdc2d34a7b02a10a86e1
+EBUILD selinux-tmpreaper-2.20170204-r3.ebuild 288 SHA256 4d82af0fba36639c5e906f228be9d2b06f08022fc3ce2ade596b44f479e4af7c SHA512 49f6cfd39c6a1f93e35bb87cd916e0a5a13df4844cc891967e6cb5387728906b8cddc3f9aafc85d04800ef1846fe1e1ec6a25d706b6aee8312daab14e4da7ad8 WHIRLPOOL 058496c356578b6107e1028ff7eeba2fc8e66109b5075664c3fd0b31cc1b9662298c6a7adbdea6ed8b1eb09ddb1f582f14f60f60c687cdc2d34a7b02a10a86e1
+EBUILD selinux-tmpreaper-2.20170204-r4.ebuild 288 SHA256 4d82af0fba36639c5e906f228be9d2b06f08022fc3ce2ade596b44f479e4af7c SHA512 49f6cfd39c6a1f93e35bb87cd916e0a5a13df4844cc891967e6cb5387728906b8cddc3f9aafc85d04800ef1846fe1e1ec6a25d706b6aee8312daab14e4da7ad8 WHIRLPOOL 058496c356578b6107e1028ff7eeba2fc8e66109b5075664c3fd0b31cc1b9662298c6a7adbdea6ed8b1eb09ddb1f582f14f60f60c687cdc2d34a7b02a10a86e1
+EBUILD selinux-tmpreaper-2.20170805-r2.ebuild 288 SHA256 4d82af0fba36639c5e906f228be9d2b06f08022fc3ce2ade596b44f479e4af7c SHA512 49f6cfd39c6a1f93e35bb87cd916e0a5a13df4844cc891967e6cb5387728906b8cddc3f9aafc85d04800ef1846fe1e1ec6a25d706b6aee8312daab14e4da7ad8 WHIRLPOOL 058496c356578b6107e1028ff7eeba2fc8e66109b5075664c3fd0b31cc1b9662298c6a7adbdea6ed8b1eb09ddb1f582f14f60f60c687cdc2d34a7b02a10a86e1
+EBUILD selinux-tmpreaper-2.20170805-r3.ebuild 290 SHA256 fcce3ca24dc8ad87f620e37073b27a76bf04559bc4599a601f444cbddd82331d SHA512 5afd9ac9c7cb97240ea82e5f171f32c491cb1c5c6398434eb51a7524b7f69fdcd6d51c9275cb97f1078802909b756650d1d2e605c080af4f9643406bfdbf0c30 WHIRLPOOL e0754b1f188f133074a352957ad4c78d10d9a1ff8e35a780dae573270f6dfc1b0ff273bea7112c2832e6bd8f111afdf4d61834f87967f3ed6e1319e668ab347c
+EBUILD selinux-tmpreaper-9999.ebuild 290 SHA256 fcce3ca24dc8ad87f620e37073b27a76bf04559bc4599a601f444cbddd82331d SHA512 5afd9ac9c7cb97240ea82e5f171f32c491cb1c5c6398434eb51a7524b7f69fdcd6d51c9275cb97f1078802909b756650d1d2e605c080af4f9643406bfdbf0c30 WHIRLPOOL e0754b1f188f133074a352957ad4c78d10d9a1ff8e35a780dae573270f6dfc1b0ff273bea7112c2832e6bd8f111afdf4d61834f87967f3ed6e1319e668ab347c
 MISC ChangeLog 10887 SHA256 d3b0cef221df626ebabcdbcc3066845888b772133b8559ac5d7dc47e7dd1001d SHA512 d7c40d75f08ea3d41691e8aaa69e532d612ffa2047c0c3fca3a236050055b1cc12824ead51fc08808347f7f991ab94e9f43b267def2eae9bb888932a095d7bcd WHIRLPOOL 925553a4b256e10cf775c8cd9b41ce5709717bb68bc2757241583e837d56a79f006f086b351604597578cfa2ead928680554c2088fc99daa5fcf493fa09c928f
 MISC ChangeLog-2015 10221 SHA256 a8573b0f97627b77fc66dc477b3cf3f1d4d1f982ef4569290abd314d3fbf5359 SHA512 544492c2c67dc88f822cd44005b8ab65b550f3806ba89ef066847eae8fa067bfc18735a043441958e2d56d7eee365dc4cf1190a759ab46e9027e4e0a34d99946 WHIRLPOOL c690b7fa3f2785a49d6c621ad44c017cb98f9c10ea5e425d111b6613fa1714bf8ed89ee91207c55f6e369e53bd6e81fbd9a67ea60b77ff8215b45383ee9d1a6c
 MISC metadata.xml 319 SHA256 081ea8c65f1d4c349f34c1d1073beb2b5e52dd462f75169cfe90ce7ebf5d9260 SHA512 1968fd2f682e983d15fb072d2dab31a3aa7e7a25a6fc29d0e66639719c4de662d664864541e5533dc968d7a34551658db31a485a291e3c7dc7f59d649b1f7c34 WHIRLPOOL 25015b8c3313e113c504020447758a195c7431d47c1d1dd1e551f65f83f1ac58a5c8f633c3b34e5590e51cc72341138666bfecf0db5321f7fcd4e42e68a8a8a9
diff --git a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20170204-r1.ebuild b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20170204-r1.ebuild
index 2bf3c693ee53..8db99f896b5e 100644
--- a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20170204-r2.ebuild b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20170204-r2.ebuild
index df3f09062186..b75a1daff5d6 100644
--- a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20170204-r3.ebuild b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20170204-r3.ebuild
index df3f09062186..b75a1daff5d6 100644
--- a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20170204-r4.ebuild b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20170204-r4.ebuild
index df3f09062186..b75a1daff5d6 100644
--- a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20170805-r2.ebuild b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20170805-r2.ebuild
index df3f09062186..b75a1daff5d6 100644
--- a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20170805-r3.ebuild b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..8db99f896b5e
--- /dev/null
+++ b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-tmpreaper/selinux-tmpreaper-9999.ebuild b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-9999.ebuild
index 2bf3c693ee53..8db99f896b5e 100644
--- a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-9999.ebuild
+++ b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-tor/Manifest b/sec-policy/selinux-tor/Manifest
index 3eb35b6241ae..c6ae6ad73555 100644
--- a/sec-policy/selinux-tor/Manifest
+++ b/sec-policy/selinux-tor/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-tor-2.20170204-r1.ebuild 277 SHA256 dc3f15b1d72764a28670ba91c71e80a0843b214765679a9d3249d6fc53fff82c SHA512 81a6af6ace6ba974a42f572e8f42e25c7091b9f2988160883a578410ec485a27f250268d380184606c3f63d0ff60f3c7270a4a626ec7b016bf015b525fb95070 WHIRLPOOL fe0ef5d892ffd32fd6a0ecc4456af6cfdf7bbf07141a8294f9621a02f3138efde146d6f072d33b483c6496f985bc8dcac7ca66f02ec22869e2cbff114d2b981d
-EBUILD selinux-tor-2.20170204-r2.ebuild 275 SHA256 5c780a2bcecde811bc97d8f35b43c0498bf9e8eee95fdc7c770d6792ffc75562 SHA512 491b0069b1dd830eab2afe612727dc48821a240c566db465fb819a4a1ba966eea3cc0311aa1c7d853c5975de51709fc0b1ce4cb837908602d05ac5fca4171b01 WHIRLPOOL ac038875ebb7a328db7c9c63ff8c1eca670f8843a8a00804cf1d56e3b73908c69211a424ebb931496147e55d577da7944e389c93eb019bc62b49a377e333b3d7
-EBUILD selinux-tor-2.20170204-r3.ebuild 275 SHA256 5c780a2bcecde811bc97d8f35b43c0498bf9e8eee95fdc7c770d6792ffc75562 SHA512 491b0069b1dd830eab2afe612727dc48821a240c566db465fb819a4a1ba966eea3cc0311aa1c7d853c5975de51709fc0b1ce4cb837908602d05ac5fca4171b01 WHIRLPOOL ac038875ebb7a328db7c9c63ff8c1eca670f8843a8a00804cf1d56e3b73908c69211a424ebb931496147e55d577da7944e389c93eb019bc62b49a377e333b3d7
-EBUILD selinux-tor-2.20170204-r4.ebuild 275 SHA256 5c780a2bcecde811bc97d8f35b43c0498bf9e8eee95fdc7c770d6792ffc75562 SHA512 491b0069b1dd830eab2afe612727dc48821a240c566db465fb819a4a1ba966eea3cc0311aa1c7d853c5975de51709fc0b1ce4cb837908602d05ac5fca4171b01 WHIRLPOOL ac038875ebb7a328db7c9c63ff8c1eca670f8843a8a00804cf1d56e3b73908c69211a424ebb931496147e55d577da7944e389c93eb019bc62b49a377e333b3d7
-EBUILD selinux-tor-2.20170805-r2.ebuild 275 SHA256 5c780a2bcecde811bc97d8f35b43c0498bf9e8eee95fdc7c770d6792ffc75562 SHA512 491b0069b1dd830eab2afe612727dc48821a240c566db465fb819a4a1ba966eea3cc0311aa1c7d853c5975de51709fc0b1ce4cb837908602d05ac5fca4171b01 WHIRLPOOL ac038875ebb7a328db7c9c63ff8c1eca670f8843a8a00804cf1d56e3b73908c69211a424ebb931496147e55d577da7944e389c93eb019bc62b49a377e333b3d7
-EBUILD selinux-tor-9999.ebuild 277 SHA256 dc3f15b1d72764a28670ba91c71e80a0843b214765679a9d3249d6fc53fff82c SHA512 81a6af6ace6ba974a42f572e8f42e25c7091b9f2988160883a578410ec485a27f250268d380184606c3f63d0ff60f3c7270a4a626ec7b016bf015b525fb95070 WHIRLPOOL fe0ef5d892ffd32fd6a0ecc4456af6cfdf7bbf07141a8294f9621a02f3138efde146d6f072d33b483c6496f985bc8dcac7ca66f02ec22869e2cbff114d2b981d
+EBUILD selinux-tor-2.20170204-r1.ebuild 278 SHA256 ee8f14947b35d2943bf15a8e27fc3aa33688017f75fa833323588306bc77b0ff SHA512 c481337bbf2245cdacdd9d3e73b9d97380c0d8e591e3f2208a0559624aac3a1ff43ac7da355968fee73257fc11aa26177aa1a019ec9a847c734c44b88ae0fb24 WHIRLPOOL dbf190ffe1b2da49caef2d5e0013c6be0659409546cdc4bf86ca222e020c2b93c51405f7d1eb9f1f174aadfbf7e96616640e842d55dc2023a8f7ea857cd0f25c
+EBUILD selinux-tor-2.20170204-r2.ebuild 276 SHA256 38f401f8818dadb5ecbdba617925393bbebbebd2bb8eed72a077276b9c1948d1 SHA512 0bf82fb9c60437e9c3bce0b6d9f90e1f2282416911379c25dd43c6c9e313029718eaf2800e11f7ecc114d82d69a033a5b13666ffeb39f857e682548dc72c2d22 WHIRLPOOL e8d5040129c8de5df30b846b1e8cae291991a4e5690fe911f25f0f8abbcd205a170ecd07901b9e619b64af7ee6d54e877c1b7b61bc257d783e16b24e84dae6c0
+EBUILD selinux-tor-2.20170204-r3.ebuild 276 SHA256 38f401f8818dadb5ecbdba617925393bbebbebd2bb8eed72a077276b9c1948d1 SHA512 0bf82fb9c60437e9c3bce0b6d9f90e1f2282416911379c25dd43c6c9e313029718eaf2800e11f7ecc114d82d69a033a5b13666ffeb39f857e682548dc72c2d22 WHIRLPOOL e8d5040129c8de5df30b846b1e8cae291991a4e5690fe911f25f0f8abbcd205a170ecd07901b9e619b64af7ee6d54e877c1b7b61bc257d783e16b24e84dae6c0
+EBUILD selinux-tor-2.20170204-r4.ebuild 276 SHA256 38f401f8818dadb5ecbdba617925393bbebbebd2bb8eed72a077276b9c1948d1 SHA512 0bf82fb9c60437e9c3bce0b6d9f90e1f2282416911379c25dd43c6c9e313029718eaf2800e11f7ecc114d82d69a033a5b13666ffeb39f857e682548dc72c2d22 WHIRLPOOL e8d5040129c8de5df30b846b1e8cae291991a4e5690fe911f25f0f8abbcd205a170ecd07901b9e619b64af7ee6d54e877c1b7b61bc257d783e16b24e84dae6c0
+EBUILD selinux-tor-2.20170805-r2.ebuild 276 SHA256 38f401f8818dadb5ecbdba617925393bbebbebd2bb8eed72a077276b9c1948d1 SHA512 0bf82fb9c60437e9c3bce0b6d9f90e1f2282416911379c25dd43c6c9e313029718eaf2800e11f7ecc114d82d69a033a5b13666ffeb39f857e682548dc72c2d22 WHIRLPOOL e8d5040129c8de5df30b846b1e8cae291991a4e5690fe911f25f0f8abbcd205a170ecd07901b9e619b64af7ee6d54e877c1b7b61bc257d783e16b24e84dae6c0
+EBUILD selinux-tor-2.20170805-r3.ebuild 278 SHA256 ee8f14947b35d2943bf15a8e27fc3aa33688017f75fa833323588306bc77b0ff SHA512 c481337bbf2245cdacdd9d3e73b9d97380c0d8e591e3f2208a0559624aac3a1ff43ac7da355968fee73257fc11aa26177aa1a019ec9a847c734c44b88ae0fb24 WHIRLPOOL dbf190ffe1b2da49caef2d5e0013c6be0659409546cdc4bf86ca222e020c2b93c51405f7d1eb9f1f174aadfbf7e96616640e842d55dc2023a8f7ea857cd0f25c
+EBUILD selinux-tor-9999.ebuild 278 SHA256 ee8f14947b35d2943bf15a8e27fc3aa33688017f75fa833323588306bc77b0ff SHA512 c481337bbf2245cdacdd9d3e73b9d97380c0d8e591e3f2208a0559624aac3a1ff43ac7da355968fee73257fc11aa26177aa1a019ec9a847c734c44b88ae0fb24 WHIRLPOOL dbf190ffe1b2da49caef2d5e0013c6be0659409546cdc4bf86ca222e020c2b93c51405f7d1eb9f1f174aadfbf7e96616640e842d55dc2023a8f7ea857cd0f25c
 MISC ChangeLog 10295 SHA256 e703675c9422f5f16d5e965daf2b40adceb62c0d65d41ba32a888b8bb9c2773b SHA512 080fd6f127688f88120cbe9ea89604f11f83a469a896d37e97fe71f66bb795acb84387628cee6c9e7e930d5a4ea05588991bb21ad8fa51043ab474d5fac2357c WHIRLPOOL a01abd0c37bc332240faf49c3ef52c35848170560e228f9df54928418b225253241dcc47bda6ae15a4970c3b504b8e094e73d37cb7493143123a88013d1dfba9
 MISC ChangeLog-2015 9523 SHA256 2059b11f4726bdaaa7ef765b059e6c939643449acb810ff70427f85c0be6b70c SHA512 830ba74b88148d7d48cc3f8a625bf18ff00a4ccb82739bab1cf7ecf9641e74c0ef46a5ac77f5fee8ab8db92073ad3e26b743e5f7178ce2b52c99ce50248b473d WHIRLPOOL 2bbeb90cacff6e02c8245a48c9e4950cc3c7694c76f645b2bd5b3b6786b0df01954adf05ee2dab844b3463fe262e22c728842043f4f2fdc3bf53cdf173e71e6d
 MISC metadata.xml 313 SHA256 fa280397d53419201308283f6236971eb5e49b3191d7a3c61c3015752cc898e0 SHA512 812fc17e450c14ed18f79425f4db05719e57e9baa896dde3775434e6e59c93148b95ca466b4aa8113066c442a577bc526ef52037adbf2c54468645c4055c87be WHIRLPOOL fcc8bf903f5f4492c61b0c9cb87365b183c4da4379e8c648f20b8c8de5c466dea933b1a3e37bf145bdb5a11b3f36880b37b5ff81a57b37baa494ca438c9b1491
diff --git a/sec-policy/selinux-tor/selinux-tor-2.20170204-r1.ebuild b/sec-policy/selinux-tor/selinux-tor-2.20170204-r1.ebuild
index 279caad12cfc..a35c78a3000b 100644
--- a/sec-policy/selinux-tor/selinux-tor-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-tor/selinux-tor-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-tor/selinux-tor-2.20170204-r2.ebuild b/sec-policy/selinux-tor/selinux-tor-2.20170204-r2.ebuild
index 3be6b5d1c78f..bd211fc676fc 100644
--- a/sec-policy/selinux-tor/selinux-tor-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-tor/selinux-tor-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-tor/selinux-tor-2.20170204-r3.ebuild b/sec-policy/selinux-tor/selinux-tor-2.20170204-r3.ebuild
index 3be6b5d1c78f..bd211fc676fc 100644
--- a/sec-policy/selinux-tor/selinux-tor-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-tor/selinux-tor-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-tor/selinux-tor-2.20170204-r4.ebuild b/sec-policy/selinux-tor/selinux-tor-2.20170204-r4.ebuild
index 3be6b5d1c78f..bd211fc676fc 100644
--- a/sec-policy/selinux-tor/selinux-tor-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-tor/selinux-tor-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-tor/selinux-tor-2.20170805-r2.ebuild b/sec-policy/selinux-tor/selinux-tor-2.20170805-r2.ebuild
index 3be6b5d1c78f..bd211fc676fc 100644
--- a/sec-policy/selinux-tor/selinux-tor-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-tor/selinux-tor-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-tor/selinux-tor-2.20170805-r3.ebuild b/sec-policy/selinux-tor/selinux-tor-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..a35c78a3000b
--- /dev/null
+++ b/sec-policy/selinux-tor/selinux-tor-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-tor/selinux-tor-9999.ebuild b/sec-policy/selinux-tor/selinux-tor-9999.ebuild
index 279caad12cfc..a35c78a3000b 100644
--- a/sec-policy/selinux-tor/selinux-tor-9999.ebuild
+++ b/sec-policy/selinux-tor/selinux-tor-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-tripwire/Manifest b/sec-policy/selinux-tripwire/Manifest
index 0275325df9a3..bf4561218c0e 100644
--- a/sec-policy/selinux-tripwire/Manifest
+++ b/sec-policy/selinux-tripwire/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-tripwire-2.20170204-r1.ebuild 287 SHA256 cdde34ada27432d568cf85057d847bb3d7f096a9ba5d0a30a7e90e0152d8e2ce SHA512 a848cf71230fe2a6326f51412428a0109b1c95337faaffd94f92f77af0e421a311142ec716161c34a80db1628ce3ae6c858b5e9afca2eb7d47e9c05ff5a49169 WHIRLPOOL 59cff0d69d9779f94e67bb11d35349bbea0a5666325faacb5b77a88f5b7694f2fdae1ddf7b8af5db0e02fb7f206343c7a1ea3f5af95a6dc0723a620ff6cfbba5
-EBUILD selinux-tripwire-2.20170204-r2.ebuild 285 SHA256 8f463da18d7ab1365ac5a8f5923cf0c880a660cdc0b50dd0f96ef094c579c49b SHA512 419aec7e1954e0335aee2d00f2e286b00c9c5142bf6c5a167859498f73569ffefcb98a465e81025eaff10f106356eb04e25ef206c248faebca4385ec2e5e8763 WHIRLPOOL a2dab38d059eaa8ffc20969f6dda6b233619df7a4795558c8f12a0b6b81d523727bbe530b17b651ab3d8e1de6b6364ed9752965865efdcb3b8d5974202adb4c3
-EBUILD selinux-tripwire-2.20170204-r3.ebuild 285 SHA256 8f463da18d7ab1365ac5a8f5923cf0c880a660cdc0b50dd0f96ef094c579c49b SHA512 419aec7e1954e0335aee2d00f2e286b00c9c5142bf6c5a167859498f73569ffefcb98a465e81025eaff10f106356eb04e25ef206c248faebca4385ec2e5e8763 WHIRLPOOL a2dab38d059eaa8ffc20969f6dda6b233619df7a4795558c8f12a0b6b81d523727bbe530b17b651ab3d8e1de6b6364ed9752965865efdcb3b8d5974202adb4c3
-EBUILD selinux-tripwire-2.20170204-r4.ebuild 285 SHA256 8f463da18d7ab1365ac5a8f5923cf0c880a660cdc0b50dd0f96ef094c579c49b SHA512 419aec7e1954e0335aee2d00f2e286b00c9c5142bf6c5a167859498f73569ffefcb98a465e81025eaff10f106356eb04e25ef206c248faebca4385ec2e5e8763 WHIRLPOOL a2dab38d059eaa8ffc20969f6dda6b233619df7a4795558c8f12a0b6b81d523727bbe530b17b651ab3d8e1de6b6364ed9752965865efdcb3b8d5974202adb4c3
-EBUILD selinux-tripwire-2.20170805-r2.ebuild 285 SHA256 8f463da18d7ab1365ac5a8f5923cf0c880a660cdc0b50dd0f96ef094c579c49b SHA512 419aec7e1954e0335aee2d00f2e286b00c9c5142bf6c5a167859498f73569ffefcb98a465e81025eaff10f106356eb04e25ef206c248faebca4385ec2e5e8763 WHIRLPOOL a2dab38d059eaa8ffc20969f6dda6b233619df7a4795558c8f12a0b6b81d523727bbe530b17b651ab3d8e1de6b6364ed9752965865efdcb3b8d5974202adb4c3
-EBUILD selinux-tripwire-9999.ebuild 287 SHA256 cdde34ada27432d568cf85057d847bb3d7f096a9ba5d0a30a7e90e0152d8e2ce SHA512 a848cf71230fe2a6326f51412428a0109b1c95337faaffd94f92f77af0e421a311142ec716161c34a80db1628ce3ae6c858b5e9afca2eb7d47e9c05ff5a49169 WHIRLPOOL 59cff0d69d9779f94e67bb11d35349bbea0a5666325faacb5b77a88f5b7694f2fdae1ddf7b8af5db0e02fb7f206343c7a1ea3f5af95a6dc0723a620ff6cfbba5
+EBUILD selinux-tripwire-2.20170204-r1.ebuild 288 SHA256 0ea0cc16e4c1b8fcb9f4f5f08b515b9a5d406dce01d4c20da0b2eae9767a9eb4 SHA512 311e9920ea49a99401733a5a13073a60195fde6782853866a4e06d5a5e17deee17e30063f41c13e2f3bc0b52b079df0a323b976301a0d701260506fd7da6e173 WHIRLPOOL 7f688b5a1110c9fa291eb0bc2d1d2ca322e0713d0f92ac95fc4cba162e9d0e922c1b038889fc7f399ae77774bfc0b68162fb43434202bd739f187d450d03a715
+EBUILD selinux-tripwire-2.20170204-r2.ebuild 286 SHA256 3bd3f9c9c0e9b016a14346f4063bff5d6bf2b5a569623e88744cd8c16a39c889 SHA512 561dc8b5350abb44cfce8fd91f334adf5fe6c466086548fb3ebe17247ea495492e39b28523c310781e13fba30566a6182048978af4c9d5d39ff51de1947d10cc WHIRLPOOL f257b2fcf03687768179eeb975edc058c3953fbbf6aa452cf9ea1095d658632c2ce799edd2c480e8b1f5cda1d493e7c4155629b3c5043ffafeffef6880b23471
+EBUILD selinux-tripwire-2.20170204-r3.ebuild 286 SHA256 3bd3f9c9c0e9b016a14346f4063bff5d6bf2b5a569623e88744cd8c16a39c889 SHA512 561dc8b5350abb44cfce8fd91f334adf5fe6c466086548fb3ebe17247ea495492e39b28523c310781e13fba30566a6182048978af4c9d5d39ff51de1947d10cc WHIRLPOOL f257b2fcf03687768179eeb975edc058c3953fbbf6aa452cf9ea1095d658632c2ce799edd2c480e8b1f5cda1d493e7c4155629b3c5043ffafeffef6880b23471
+EBUILD selinux-tripwire-2.20170204-r4.ebuild 286 SHA256 3bd3f9c9c0e9b016a14346f4063bff5d6bf2b5a569623e88744cd8c16a39c889 SHA512 561dc8b5350abb44cfce8fd91f334adf5fe6c466086548fb3ebe17247ea495492e39b28523c310781e13fba30566a6182048978af4c9d5d39ff51de1947d10cc WHIRLPOOL f257b2fcf03687768179eeb975edc058c3953fbbf6aa452cf9ea1095d658632c2ce799edd2c480e8b1f5cda1d493e7c4155629b3c5043ffafeffef6880b23471
+EBUILD selinux-tripwire-2.20170805-r2.ebuild 286 SHA256 3bd3f9c9c0e9b016a14346f4063bff5d6bf2b5a569623e88744cd8c16a39c889 SHA512 561dc8b5350abb44cfce8fd91f334adf5fe6c466086548fb3ebe17247ea495492e39b28523c310781e13fba30566a6182048978af4c9d5d39ff51de1947d10cc WHIRLPOOL f257b2fcf03687768179eeb975edc058c3953fbbf6aa452cf9ea1095d658632c2ce799edd2c480e8b1f5cda1d493e7c4155629b3c5043ffafeffef6880b23471
+EBUILD selinux-tripwire-2.20170805-r3.ebuild 288 SHA256 0ea0cc16e4c1b8fcb9f4f5f08b515b9a5d406dce01d4c20da0b2eae9767a9eb4 SHA512 311e9920ea49a99401733a5a13073a60195fde6782853866a4e06d5a5e17deee17e30063f41c13e2f3bc0b52b079df0a323b976301a0d701260506fd7da6e173 WHIRLPOOL 7f688b5a1110c9fa291eb0bc2d1d2ca322e0713d0f92ac95fc4cba162e9d0e922c1b038889fc7f399ae77774bfc0b68162fb43434202bd739f187d450d03a715
+EBUILD selinux-tripwire-9999.ebuild 288 SHA256 0ea0cc16e4c1b8fcb9f4f5f08b515b9a5d406dce01d4c20da0b2eae9767a9eb4 SHA512 311e9920ea49a99401733a5a13073a60195fde6782853866a4e06d5a5e17deee17e30063f41c13e2f3bc0b52b079df0a323b976301a0d701260506fd7da6e173 WHIRLPOOL 7f688b5a1110c9fa291eb0bc2d1d2ca322e0713d0f92ac95fc4cba162e9d0e922c1b038889fc7f399ae77774bfc0b68162fb43434202bd739f187d450d03a715
 MISC ChangeLog 10793 SHA256 2edfa29cbc8c83cbf4b715ab181047de247a140580cd76abb5a9d1229fed91d3 SHA512 96a0a1aa90ac46330c60a70955a2eb607775b29e35a5e6621d373503cba3bbcc9dbfbae1b3e08fccf1731ac6dc7179f9002ba854a015cf8ad076323f87cef45e WHIRLPOOL 522a695a0f0003e4bbaf0d61d33ec96300655edf15976416a2aa647fc89915f4f9ddd1cb8af397d526af3edc398dee700e516c2378936f2faddd7ccbeb033686
 MISC ChangeLog-2015 10102 SHA256 4d3ac6a179adafc862ac1756a12c800bb231903421c8f26f71887ecfae190f1d SHA512 f1be51adf06c1a8fdfa5ad19206e4e9b29121fdb12dc4b657f365c37f97bee2fe3b6cf7be4cfea0125a25b6a51326ff46fa16a9e9385450e8b4f2397dff99922 WHIRLPOOL 983ce7dd7aeee604e5c3a3feba1283e9feb79a3d2316c735482061a22e0cdce26b0645c11a2eab7ccfb8e4dc132568e6233b4ec3cf2dbed48939cae2a4952a38
 MISC metadata.xml 318 SHA256 6cace67859993e2eaf93cd87ea5a72fe151b2d39e39a12d017f9ca656318e607 SHA512 10c01fcc08c2dbc4367fb8e5f2e5c336794d5d15fef2511047d12e45c2fc88c3456d57022aecc5a131d7d267841e9123a84dcd6d06c87f2967cdc52651d9dd2c WHIRLPOOL 6a4a99b31f8b754acc307f079d3671107a6b4fe373c4775de79d42b20cdbb9f3605334382447727e6856a03dff4bb6306bc34cc105bddde494b597b3a80a3669
diff --git a/sec-policy/selinux-tripwire/selinux-tripwire-2.20170204-r1.ebuild b/sec-policy/selinux-tripwire/selinux-tripwire-2.20170204-r1.ebuild
index cd5baea3e5f6..074454b60692 100644
--- a/sec-policy/selinux-tripwire/selinux-tripwire-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-tripwire/selinux-tripwire-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-tripwire/selinux-tripwire-2.20170204-r2.ebuild b/sec-policy/selinux-tripwire/selinux-tripwire-2.20170204-r2.ebuild
index 5d862903b550..fd6e987a85a9 100644
--- a/sec-policy/selinux-tripwire/selinux-tripwire-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-tripwire/selinux-tripwire-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-tripwire/selinux-tripwire-2.20170204-r3.ebuild b/sec-policy/selinux-tripwire/selinux-tripwire-2.20170204-r3.ebuild
index 5d862903b550..fd6e987a85a9 100644
--- a/sec-policy/selinux-tripwire/selinux-tripwire-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-tripwire/selinux-tripwire-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-tripwire/selinux-tripwire-2.20170204-r4.ebuild b/sec-policy/selinux-tripwire/selinux-tripwire-2.20170204-r4.ebuild
index 5d862903b550..fd6e987a85a9 100644
--- a/sec-policy/selinux-tripwire/selinux-tripwire-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-tripwire/selinux-tripwire-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-tripwire/selinux-tripwire-2.20170805-r2.ebuild b/sec-policy/selinux-tripwire/selinux-tripwire-2.20170805-r2.ebuild
index 5d862903b550..fd6e987a85a9 100644
--- a/sec-policy/selinux-tripwire/selinux-tripwire-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-tripwire/selinux-tripwire-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-tripwire/selinux-tripwire-2.20170805-r3.ebuild b/sec-policy/selinux-tripwire/selinux-tripwire-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..074454b60692
--- /dev/null
+++ b/sec-policy/selinux-tripwire/selinux-tripwire-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-tripwire/selinux-tripwire-9999.ebuild b/sec-policy/selinux-tripwire/selinux-tripwire-9999.ebuild
index cd5baea3e5f6..074454b60692 100644
--- a/sec-policy/selinux-tripwire/selinux-tripwire-9999.ebuild
+++ b/sec-policy/selinux-tripwire/selinux-tripwire-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ucspitcp/Manifest b/sec-policy/selinux-ucspitcp/Manifest
index 188e3a4013e6..ae65ad66638c 100644
--- a/sec-policy/selinux-ucspitcp/Manifest
+++ b/sec-policy/selinux-ucspitcp/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-ucspitcp-2.20170204-r1.ebuild 287 SHA256 abf37d908dea6805c9763af9cf2141b5773cad56b35c2b0db49801740f4534fe SHA512 764791b252ed13f1ae20cf662da1fdb244a40c3c3522453cde524d8628b2a1876f66c1472222865a71c7b86a3e02fcb08e0b0b42bcffd70e4d09e498cde6e013 WHIRLPOOL 6efebf03d6d389501e6f17d052d333981d18049f86f797bcf288ae7f27ec2e8862cec6e0ef477993a61a8cab2325a65a2367ff67ad1b39815bbfca0d60c55b8a
-EBUILD selinux-ucspitcp-2.20170204-r2.ebuild 285 SHA256 3ce62bac9408fa257e11269ffe59eaa4fb10e7047c70c44277fcf0f9d77dbec2 SHA512 1e1c1c30853219966bd59ad7dbd5f4d0d73e599c0c05e4d579a04d3c259fd2d47da4a19c05952eb436c1b134ee16744dc3a68cea439401c25b5e09d8a17bc22e WHIRLPOOL 29cda6b52accb26551a2db3dd858f14dd1e8d692d7664a6901984694dac0c2ef71b06175a941f2b3889fb10d25a89e814acba933d9858c50c8d2b7e62d225dc4
-EBUILD selinux-ucspitcp-2.20170204-r3.ebuild 285 SHA256 3ce62bac9408fa257e11269ffe59eaa4fb10e7047c70c44277fcf0f9d77dbec2 SHA512 1e1c1c30853219966bd59ad7dbd5f4d0d73e599c0c05e4d579a04d3c259fd2d47da4a19c05952eb436c1b134ee16744dc3a68cea439401c25b5e09d8a17bc22e WHIRLPOOL 29cda6b52accb26551a2db3dd858f14dd1e8d692d7664a6901984694dac0c2ef71b06175a941f2b3889fb10d25a89e814acba933d9858c50c8d2b7e62d225dc4
-EBUILD selinux-ucspitcp-2.20170204-r4.ebuild 285 SHA256 3ce62bac9408fa257e11269ffe59eaa4fb10e7047c70c44277fcf0f9d77dbec2 SHA512 1e1c1c30853219966bd59ad7dbd5f4d0d73e599c0c05e4d579a04d3c259fd2d47da4a19c05952eb436c1b134ee16744dc3a68cea439401c25b5e09d8a17bc22e WHIRLPOOL 29cda6b52accb26551a2db3dd858f14dd1e8d692d7664a6901984694dac0c2ef71b06175a941f2b3889fb10d25a89e814acba933d9858c50c8d2b7e62d225dc4
-EBUILD selinux-ucspitcp-2.20170805-r2.ebuild 285 SHA256 3ce62bac9408fa257e11269ffe59eaa4fb10e7047c70c44277fcf0f9d77dbec2 SHA512 1e1c1c30853219966bd59ad7dbd5f4d0d73e599c0c05e4d579a04d3c259fd2d47da4a19c05952eb436c1b134ee16744dc3a68cea439401c25b5e09d8a17bc22e WHIRLPOOL 29cda6b52accb26551a2db3dd858f14dd1e8d692d7664a6901984694dac0c2ef71b06175a941f2b3889fb10d25a89e814acba933d9858c50c8d2b7e62d225dc4
-EBUILD selinux-ucspitcp-9999.ebuild 287 SHA256 abf37d908dea6805c9763af9cf2141b5773cad56b35c2b0db49801740f4534fe SHA512 764791b252ed13f1ae20cf662da1fdb244a40c3c3522453cde524d8628b2a1876f66c1472222865a71c7b86a3e02fcb08e0b0b42bcffd70e4d09e498cde6e013 WHIRLPOOL 6efebf03d6d389501e6f17d052d333981d18049f86f797bcf288ae7f27ec2e8862cec6e0ef477993a61a8cab2325a65a2367ff67ad1b39815bbfca0d60c55b8a
+EBUILD selinux-ucspitcp-2.20170204-r1.ebuild 288 SHA256 64c14c49577c254433139bead05fb577e28e6c5be19571c8e0382fdad9234c83 SHA512 ed8c8ebe92d1e8fe14ecb3486a3a90a5a8767b48ad2be3e9121a18be0051f397c4652cb70016a5accfc7fcbfdf393b6da7ee2e3e863ca1157e0f4673cea3dcfe WHIRLPOOL 1b445a7fc15584f3ccde406f13aa3d5c3e4f59def2c411715fb2d73c176a01eb4de1c1c9b7ed44102eca4e9529bf9890579a03f773a1762bc86fab7196f768f2
+EBUILD selinux-ucspitcp-2.20170204-r2.ebuild 286 SHA256 02cf6e92df389a622a1e802ff19892fa8c81e44c0c2e903d7ccba540a2d1b659 SHA512 6d9dcc64dd19a6304fe199d5e62c35514e3f6e7f1b5294f396b12e17aa38232eb9bc6923d346bae26c08f219d73a3a64edc4563fad9c453c12e36b4d1a67b706 WHIRLPOOL c8b87b414b426774c63ccaddc9cb47bcb23ae7fb394596b40bf440ec157276047191e5f63d59d24a4ebbfe79b57e2abdb304053c0fad22ee8488484418ad8be9
+EBUILD selinux-ucspitcp-2.20170204-r3.ebuild 286 SHA256 02cf6e92df389a622a1e802ff19892fa8c81e44c0c2e903d7ccba540a2d1b659 SHA512 6d9dcc64dd19a6304fe199d5e62c35514e3f6e7f1b5294f396b12e17aa38232eb9bc6923d346bae26c08f219d73a3a64edc4563fad9c453c12e36b4d1a67b706 WHIRLPOOL c8b87b414b426774c63ccaddc9cb47bcb23ae7fb394596b40bf440ec157276047191e5f63d59d24a4ebbfe79b57e2abdb304053c0fad22ee8488484418ad8be9
+EBUILD selinux-ucspitcp-2.20170204-r4.ebuild 286 SHA256 02cf6e92df389a622a1e802ff19892fa8c81e44c0c2e903d7ccba540a2d1b659 SHA512 6d9dcc64dd19a6304fe199d5e62c35514e3f6e7f1b5294f396b12e17aa38232eb9bc6923d346bae26c08f219d73a3a64edc4563fad9c453c12e36b4d1a67b706 WHIRLPOOL c8b87b414b426774c63ccaddc9cb47bcb23ae7fb394596b40bf440ec157276047191e5f63d59d24a4ebbfe79b57e2abdb304053c0fad22ee8488484418ad8be9
+EBUILD selinux-ucspitcp-2.20170805-r2.ebuild 286 SHA256 02cf6e92df389a622a1e802ff19892fa8c81e44c0c2e903d7ccba540a2d1b659 SHA512 6d9dcc64dd19a6304fe199d5e62c35514e3f6e7f1b5294f396b12e17aa38232eb9bc6923d346bae26c08f219d73a3a64edc4563fad9c453c12e36b4d1a67b706 WHIRLPOOL c8b87b414b426774c63ccaddc9cb47bcb23ae7fb394596b40bf440ec157276047191e5f63d59d24a4ebbfe79b57e2abdb304053c0fad22ee8488484418ad8be9
+EBUILD selinux-ucspitcp-2.20170805-r3.ebuild 288 SHA256 64c14c49577c254433139bead05fb577e28e6c5be19571c8e0382fdad9234c83 SHA512 ed8c8ebe92d1e8fe14ecb3486a3a90a5a8767b48ad2be3e9121a18be0051f397c4652cb70016a5accfc7fcbfdf393b6da7ee2e3e863ca1157e0f4673cea3dcfe WHIRLPOOL 1b445a7fc15584f3ccde406f13aa3d5c3e4f59def2c411715fb2d73c176a01eb4de1c1c9b7ed44102eca4e9529bf9890579a03f773a1762bc86fab7196f768f2
+EBUILD selinux-ucspitcp-9999.ebuild 288 SHA256 64c14c49577c254433139bead05fb577e28e6c5be19571c8e0382fdad9234c83 SHA512 ed8c8ebe92d1e8fe14ecb3486a3a90a5a8767b48ad2be3e9121a18be0051f397c4652cb70016a5accfc7fcbfdf393b6da7ee2e3e863ca1157e0f4673cea3dcfe WHIRLPOOL 1b445a7fc15584f3ccde406f13aa3d5c3e4f59def2c411715fb2d73c176a01eb4de1c1c9b7ed44102eca4e9529bf9890579a03f773a1762bc86fab7196f768f2
 MISC ChangeLog 10793 SHA256 d08096b2fb7fcd113b0f594db9631db9ca6bf782911c51b1f0792ad0af8fdbfe SHA512 1fd9b1e0d47416a339d93dc34b6852ec9be3d8d9f6be4a49f4c0aa1b8522ee60ddcdf04fbf2c028a25494efea8696f8548ae853c0c8bd19b70b85d111cd0fed1 WHIRLPOOL fbabe21655df00107d8c162ac4011a012ffed0b8ce835da4078a5dcb7d338bac95cabc2bb6c538808ff54affbeb5d119041fd6281c87350daa84b259cf4ec3f5
 MISC ChangeLog-2015 10053 SHA256 2aab2e8a10c54e50203fb37153b37e8f9b15f8903d1acd6e503604535f5eea57 SHA512 f3eff7dfe6a763c51dd1765db1590cc7b1c3677395f85585ae4423028f2fa9fd3c278bb2de8d9890182180e656d78ab9df2644d8f6ce5971d4369bfc9e78aa74 WHIRLPOOL 4f00feb5b123d150255fd73c9cfbe2b4721d3d977d49caf224df1d7fbede978931c840730d91915b9641a5b61ca73a92378a337722af4e1f204e97a9420bd5ef
 MISC metadata.xml 318 SHA256 f7f052cda1634c87da67c999d839f88eb5bac2aa7a31da048e83ffbbdfd75d97 SHA512 bc88dff90d9f7ef337ce73f739422a0a0463980c87836abcd07beff56a122d7c9a7503007fe8bfd9a93cc86d61ee27a766c3d72b5562e7d7d52599c12228c41a WHIRLPOOL ff7cc5b3ea122b5a8102e7659a7121c15b7c38e31afb2ee8c06c8402ad3d48283b618209c834b7d0336c4cfe4c9ec9d4a81a29f866fb0b590f5d68c24e1014c6
diff --git a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20170204-r1.ebuild b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20170204-r1.ebuild
index 656d4f43efe8..4f0acd849293 100644
--- a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20170204-r2.ebuild b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20170204-r2.ebuild
index c10ba95fff2c..eb74383dee3b 100644
--- a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20170204-r3.ebuild b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20170204-r3.ebuild
index c10ba95fff2c..eb74383dee3b 100644
--- a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20170204-r4.ebuild b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20170204-r4.ebuild
index c10ba95fff2c..eb74383dee3b 100644
--- a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20170805-r2.ebuild b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20170805-r2.ebuild
index c10ba95fff2c..eb74383dee3b 100644
--- a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20170805-r3.ebuild b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..4f0acd849293
--- /dev/null
+++ b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-ucspitcp/selinux-ucspitcp-9999.ebuild b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-9999.ebuild
index 656d4f43efe8..4f0acd849293 100644
--- a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-9999.ebuild
+++ b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ulogd/Manifest b/sec-policy/selinux-ulogd/Manifest
index 10080432182b..a502a71e5070 100644
--- a/sec-policy/selinux-ulogd/Manifest
+++ b/sec-policy/selinux-ulogd/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-ulogd-2.20170204-r1.ebuild 281 SHA256 def11a04c886182bae77d905f5c890301180c4a2dd0efc7153643e7d116aaeab SHA512 640412e836af77508af295fd2e9ca59cafe329a522d08503a3f3563a6cacc8c930472f97907f0ec275522b360941f3a844ae87bbced9f8e957b4fe71f9977f72 WHIRLPOOL 6386ef3628a929063dba5eb9fa53d57e02a89f85b1d48ac249630b9ca9d432a4028a86a97e65b28e8f79478dbe453a045416f77571f35b68fbcdeafd0585d4d8
-EBUILD selinux-ulogd-2.20170204-r2.ebuild 279 SHA256 5611195456ec66847f4bbdf6e42f73b5b93107a0f6363fa29297fc3fc41e4f30 SHA512 52f78d5668591660637cccc2721764191fcb0e63308a778b414ac0eb07651a0ae3f6d9936d3b4a7f5ddefb8b2a652392a69f149e101d65a6807f783712213810 WHIRLPOOL 9b789d1f704dbdc0030ae0bdbf887f616349a85e1513a6ec0cd698e306558bd8650b8aa12cf395ab862d4670173c684606714c641557ee86ffd7b606345bc7c7
-EBUILD selinux-ulogd-2.20170204-r3.ebuild 279 SHA256 5611195456ec66847f4bbdf6e42f73b5b93107a0f6363fa29297fc3fc41e4f30 SHA512 52f78d5668591660637cccc2721764191fcb0e63308a778b414ac0eb07651a0ae3f6d9936d3b4a7f5ddefb8b2a652392a69f149e101d65a6807f783712213810 WHIRLPOOL 9b789d1f704dbdc0030ae0bdbf887f616349a85e1513a6ec0cd698e306558bd8650b8aa12cf395ab862d4670173c684606714c641557ee86ffd7b606345bc7c7
-EBUILD selinux-ulogd-2.20170204-r4.ebuild 279 SHA256 5611195456ec66847f4bbdf6e42f73b5b93107a0f6363fa29297fc3fc41e4f30 SHA512 52f78d5668591660637cccc2721764191fcb0e63308a778b414ac0eb07651a0ae3f6d9936d3b4a7f5ddefb8b2a652392a69f149e101d65a6807f783712213810 WHIRLPOOL 9b789d1f704dbdc0030ae0bdbf887f616349a85e1513a6ec0cd698e306558bd8650b8aa12cf395ab862d4670173c684606714c641557ee86ffd7b606345bc7c7
-EBUILD selinux-ulogd-2.20170805-r2.ebuild 279 SHA256 5611195456ec66847f4bbdf6e42f73b5b93107a0f6363fa29297fc3fc41e4f30 SHA512 52f78d5668591660637cccc2721764191fcb0e63308a778b414ac0eb07651a0ae3f6d9936d3b4a7f5ddefb8b2a652392a69f149e101d65a6807f783712213810 WHIRLPOOL 9b789d1f704dbdc0030ae0bdbf887f616349a85e1513a6ec0cd698e306558bd8650b8aa12cf395ab862d4670173c684606714c641557ee86ffd7b606345bc7c7
-EBUILD selinux-ulogd-9999.ebuild 281 SHA256 def11a04c886182bae77d905f5c890301180c4a2dd0efc7153643e7d116aaeab SHA512 640412e836af77508af295fd2e9ca59cafe329a522d08503a3f3563a6cacc8c930472f97907f0ec275522b360941f3a844ae87bbced9f8e957b4fe71f9977f72 WHIRLPOOL 6386ef3628a929063dba5eb9fa53d57e02a89f85b1d48ac249630b9ca9d432a4028a86a97e65b28e8f79478dbe453a045416f77571f35b68fbcdeafd0585d4d8
+EBUILD selinux-ulogd-2.20170204-r1.ebuild 282 SHA256 704bf97534206e11d0ffd288754dea78829fedeb085857436ec6aef43c699eb2 SHA512 91ec1489c4c0059d72a8e468053d48f33f1e68b8114606784f3bb01e106fd042019dc589c65c455ae86b6e86d4b2e8bf0fca0e260882e9291bf71ab1031fd787 WHIRLPOOL a506a5ae62e314de6cca422b40a3474cf1ddca0b29a1aae9ca41044bbaafd5f7b546f4dd0251cca8228bcac38e7eb38ee10795961b2f02beec4029658c1d2f46
+EBUILD selinux-ulogd-2.20170204-r2.ebuild 280 SHA256 fb13c2c12b677ffea3a10f3f321cd81ef9d95e04ae5fd95e6642afcd00bd31a1 SHA512 04076908cd60f3aa43250ef5108c3faaa25e8107579aab71a31c2d2730d56dca2a77f703f93e864dde02ac5f5da9a619eab44a12405b253be78150536a6e31cb WHIRLPOOL f85798b0fff6f3be3508871f33c7f05e8eae1518e4dbfca70e726a18a559b22703ee4c35d396d058576f9e97c9d39beea44536143c2f729ac43e788d97e108a5
+EBUILD selinux-ulogd-2.20170204-r3.ebuild 280 SHA256 fb13c2c12b677ffea3a10f3f321cd81ef9d95e04ae5fd95e6642afcd00bd31a1 SHA512 04076908cd60f3aa43250ef5108c3faaa25e8107579aab71a31c2d2730d56dca2a77f703f93e864dde02ac5f5da9a619eab44a12405b253be78150536a6e31cb WHIRLPOOL f85798b0fff6f3be3508871f33c7f05e8eae1518e4dbfca70e726a18a559b22703ee4c35d396d058576f9e97c9d39beea44536143c2f729ac43e788d97e108a5
+EBUILD selinux-ulogd-2.20170204-r4.ebuild 280 SHA256 fb13c2c12b677ffea3a10f3f321cd81ef9d95e04ae5fd95e6642afcd00bd31a1 SHA512 04076908cd60f3aa43250ef5108c3faaa25e8107579aab71a31c2d2730d56dca2a77f703f93e864dde02ac5f5da9a619eab44a12405b253be78150536a6e31cb WHIRLPOOL f85798b0fff6f3be3508871f33c7f05e8eae1518e4dbfca70e726a18a559b22703ee4c35d396d058576f9e97c9d39beea44536143c2f729ac43e788d97e108a5
+EBUILD selinux-ulogd-2.20170805-r2.ebuild 280 SHA256 fb13c2c12b677ffea3a10f3f321cd81ef9d95e04ae5fd95e6642afcd00bd31a1 SHA512 04076908cd60f3aa43250ef5108c3faaa25e8107579aab71a31c2d2730d56dca2a77f703f93e864dde02ac5f5da9a619eab44a12405b253be78150536a6e31cb WHIRLPOOL f85798b0fff6f3be3508871f33c7f05e8eae1518e4dbfca70e726a18a559b22703ee4c35d396d058576f9e97c9d39beea44536143c2f729ac43e788d97e108a5
+EBUILD selinux-ulogd-2.20170805-r3.ebuild 282 SHA256 704bf97534206e11d0ffd288754dea78829fedeb085857436ec6aef43c699eb2 SHA512 91ec1489c4c0059d72a8e468053d48f33f1e68b8114606784f3bb01e106fd042019dc589c65c455ae86b6e86d4b2e8bf0fca0e260882e9291bf71ab1031fd787 WHIRLPOOL a506a5ae62e314de6cca422b40a3474cf1ddca0b29a1aae9ca41044bbaafd5f7b546f4dd0251cca8228bcac38e7eb38ee10795961b2f02beec4029658c1d2f46
+EBUILD selinux-ulogd-9999.ebuild 282 SHA256 704bf97534206e11d0ffd288754dea78829fedeb085857436ec6aef43c699eb2 SHA512 91ec1489c4c0059d72a8e468053d48f33f1e68b8114606784f3bb01e106fd042019dc589c65c455ae86b6e86d4b2e8bf0fca0e260882e9291bf71ab1031fd787 WHIRLPOOL a506a5ae62e314de6cca422b40a3474cf1ddca0b29a1aae9ca41044bbaafd5f7b546f4dd0251cca8228bcac38e7eb38ee10795961b2f02beec4029658c1d2f46
 MISC ChangeLog 10479 SHA256 11131ca5019ba15360bcb1898fd3c27a9736d98bb5b11b7370917eb800a8d2c0 SHA512 20e0ef4205642fd2aa897d8c1405c6a0b19187fe28ffc9660ff5c473ebc97ef87222ff5c1a4540cb700342c46dbf45b369251a00d4ec3166cb581e766943a347 WHIRLPOOL e1dcd35ec3cb01eb4dc525742b96910a7f88e0cdb09482dcd1dd5757964962e4e0b0f7e5033bffc50ed19a489dd477cc48e29f675fe79b3db97c3eafccdfaf0a
 MISC ChangeLog-2015 9749 SHA256 0dda3c34eca655a94f63b20f7685eb6779977b525d69e0bcb3eeded818e89e27 SHA512 c825d1a134e362902346aa8b864966cc62959c40119d3a02cfb461bc8084b581d9f408a215fcd71e8ebcda05dc2e6544b2e2f839517634c5f06475b43f85347a WHIRLPOOL 1c8c865dbb22e22d104f1b6f844726dcecbcd3b46f8d6193e0ca390e41a8195ece7d0a5319b861a65f92377dfd306359370b0045c45556c704975ceafb921073
 MISC metadata.xml 315 SHA256 7d771e967c8f2b01b8c7a11918e3e55abdde5a6156f0eba7ae41105c1a76ecb6 SHA512 43d0ad46433208b51b68ed06a3529a2895e9cc835f233f69b38034ddb07addf44c66da5054c0cb87289aee78af243494af13cd6eeda89dc122baddb1bf0f2cc5 WHIRLPOOL 384c2fef89e73b7df0e85e3922e6a3948220c9b1290d0f0ad0c9b54c332a37529e50985e49648867cbb6f1803dc7aee5da9968884e7f630cb391c2f55b30b7fd
diff --git a/sec-policy/selinux-ulogd/selinux-ulogd-2.20170204-r1.ebuild b/sec-policy/selinux-ulogd/selinux-ulogd-2.20170204-r1.ebuild
index 4a3d50652b01..000c027b33f6 100644
--- a/sec-policy/selinux-ulogd/selinux-ulogd-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-ulogd/selinux-ulogd-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ulogd/selinux-ulogd-2.20170204-r2.ebuild b/sec-policy/selinux-ulogd/selinux-ulogd-2.20170204-r2.ebuild
index 973d7246ea0f..21dfb6cfe665 100644
--- a/sec-policy/selinux-ulogd/selinux-ulogd-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-ulogd/selinux-ulogd-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ulogd/selinux-ulogd-2.20170204-r3.ebuild b/sec-policy/selinux-ulogd/selinux-ulogd-2.20170204-r3.ebuild
index 973d7246ea0f..21dfb6cfe665 100644
--- a/sec-policy/selinux-ulogd/selinux-ulogd-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-ulogd/selinux-ulogd-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ulogd/selinux-ulogd-2.20170204-r4.ebuild b/sec-policy/selinux-ulogd/selinux-ulogd-2.20170204-r4.ebuild
index 973d7246ea0f..21dfb6cfe665 100644
--- a/sec-policy/selinux-ulogd/selinux-ulogd-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-ulogd/selinux-ulogd-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ulogd/selinux-ulogd-2.20170805-r2.ebuild b/sec-policy/selinux-ulogd/selinux-ulogd-2.20170805-r2.ebuild
index 973d7246ea0f..21dfb6cfe665 100644
--- a/sec-policy/selinux-ulogd/selinux-ulogd-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-ulogd/selinux-ulogd-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-ulogd/selinux-ulogd-2.20170805-r3.ebuild b/sec-policy/selinux-ulogd/selinux-ulogd-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..000c027b33f6
--- /dev/null
+++ b/sec-policy/selinux-ulogd/selinux-ulogd-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-ulogd/selinux-ulogd-9999.ebuild b/sec-policy/selinux-ulogd/selinux-ulogd-9999.ebuild
index 4a3d50652b01..000c027b33f6 100644
--- a/sec-policy/selinux-ulogd/selinux-ulogd-9999.ebuild
+++ b/sec-policy/selinux-ulogd/selinux-ulogd-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-uml/Manifest b/sec-policy/selinux-uml/Manifest
index 33858ef9a15e..4d0460c29f87 100644
--- a/sec-policy/selinux-uml/Manifest
+++ b/sec-policy/selinux-uml/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-uml-2.20170204-r1.ebuild 277 SHA256 71db1aacda9c9e805019650a23c1e476ab1006752209d14918ba9bf76275b597 SHA512 7e20b2a6dd0e3ad8a4f8d350f7b9b6dcf26adbf7c9f37a18a35d624c7204cbfefb70e0bdc506cc97f2905a8a5769147376c5ce5e64136acae5dc66a4fcca279c WHIRLPOOL dfaa9d350854b03945e5ff6d8e9d68eb194f89ece474a662a4a478f54338852958822e07267626b69dc32ffa441a8cd9ade94912a9765f5bc9e08697f4011946
-EBUILD selinux-uml-2.20170204-r2.ebuild 275 SHA256 593a720ce5ff4e5009a9f7279d07c5fab1803346218fae3f982faf66d7b620ff SHA512 7826066c27ca01deae4aa592e7be9de236d685f174d1c86ed2183d5f11f47504abd25a7fb81b54328522073a014d8160b6f1101a3e7a050557ef6f88afcfe1d5 WHIRLPOOL cb70574ac844a9cd0476a9230893ca8ef158f4a4f9ac624c4d37e4b3a170dff4c2c54f95a9fc680ca46be4c8cd7545e5d8ad2e6933c08afe03092ba026d61cc0
-EBUILD selinux-uml-2.20170204-r3.ebuild 275 SHA256 593a720ce5ff4e5009a9f7279d07c5fab1803346218fae3f982faf66d7b620ff SHA512 7826066c27ca01deae4aa592e7be9de236d685f174d1c86ed2183d5f11f47504abd25a7fb81b54328522073a014d8160b6f1101a3e7a050557ef6f88afcfe1d5 WHIRLPOOL cb70574ac844a9cd0476a9230893ca8ef158f4a4f9ac624c4d37e4b3a170dff4c2c54f95a9fc680ca46be4c8cd7545e5d8ad2e6933c08afe03092ba026d61cc0
-EBUILD selinux-uml-2.20170204-r4.ebuild 275 SHA256 593a720ce5ff4e5009a9f7279d07c5fab1803346218fae3f982faf66d7b620ff SHA512 7826066c27ca01deae4aa592e7be9de236d685f174d1c86ed2183d5f11f47504abd25a7fb81b54328522073a014d8160b6f1101a3e7a050557ef6f88afcfe1d5 WHIRLPOOL cb70574ac844a9cd0476a9230893ca8ef158f4a4f9ac624c4d37e4b3a170dff4c2c54f95a9fc680ca46be4c8cd7545e5d8ad2e6933c08afe03092ba026d61cc0
-EBUILD selinux-uml-2.20170805-r2.ebuild 275 SHA256 593a720ce5ff4e5009a9f7279d07c5fab1803346218fae3f982faf66d7b620ff SHA512 7826066c27ca01deae4aa592e7be9de236d685f174d1c86ed2183d5f11f47504abd25a7fb81b54328522073a014d8160b6f1101a3e7a050557ef6f88afcfe1d5 WHIRLPOOL cb70574ac844a9cd0476a9230893ca8ef158f4a4f9ac624c4d37e4b3a170dff4c2c54f95a9fc680ca46be4c8cd7545e5d8ad2e6933c08afe03092ba026d61cc0
-EBUILD selinux-uml-9999.ebuild 277 SHA256 71db1aacda9c9e805019650a23c1e476ab1006752209d14918ba9bf76275b597 SHA512 7e20b2a6dd0e3ad8a4f8d350f7b9b6dcf26adbf7c9f37a18a35d624c7204cbfefb70e0bdc506cc97f2905a8a5769147376c5ce5e64136acae5dc66a4fcca279c WHIRLPOOL dfaa9d350854b03945e5ff6d8e9d68eb194f89ece474a662a4a478f54338852958822e07267626b69dc32ffa441a8cd9ade94912a9765f5bc9e08697f4011946
+EBUILD selinux-uml-2.20170204-r1.ebuild 278 SHA256 9ed33f20107a84d1eb906d6456936733b9c284f0cf549f466b8286f0fde15a20 SHA512 3660735270f80018260baf7243d6d61dc4daa9ce24eacd90c7cf53d51de6e6c1872df872eb660f08509d6706baf9ee6653becf80f8e1b1824b85773c988731fd WHIRLPOOL d47cb6c71c81fe0f43bacb3ea4ecd6d749a2dee3f45a8b72a7966a80b3ae280719ea5115f74218f499bdaa93d22ab333942d4f68ece1f320c9f308e45c4da847
+EBUILD selinux-uml-2.20170204-r2.ebuild 276 SHA256 7bc25d662105c65df56dd8a2fed9db39e2c853ab7abc63047e750c53be68f575 SHA512 942ebcc16866f3dd0eb7afd41ad396589c446ab2d9ffe68e6dfaeb650e366ee562b654174e4ab3ca6612f74e38a2a2a531603b19452a52bae0ff88944fabf2a2 WHIRLPOOL 7782324e7ea1175629f057a603b04373c811c3173e60e5d57d94bb2a47dac72979229a4c96b04208ba896dd0e52279650e299778430abc9983bc2387a2fe0832
+EBUILD selinux-uml-2.20170204-r3.ebuild 276 SHA256 7bc25d662105c65df56dd8a2fed9db39e2c853ab7abc63047e750c53be68f575 SHA512 942ebcc16866f3dd0eb7afd41ad396589c446ab2d9ffe68e6dfaeb650e366ee562b654174e4ab3ca6612f74e38a2a2a531603b19452a52bae0ff88944fabf2a2 WHIRLPOOL 7782324e7ea1175629f057a603b04373c811c3173e60e5d57d94bb2a47dac72979229a4c96b04208ba896dd0e52279650e299778430abc9983bc2387a2fe0832
+EBUILD selinux-uml-2.20170204-r4.ebuild 276 SHA256 7bc25d662105c65df56dd8a2fed9db39e2c853ab7abc63047e750c53be68f575 SHA512 942ebcc16866f3dd0eb7afd41ad396589c446ab2d9ffe68e6dfaeb650e366ee562b654174e4ab3ca6612f74e38a2a2a531603b19452a52bae0ff88944fabf2a2 WHIRLPOOL 7782324e7ea1175629f057a603b04373c811c3173e60e5d57d94bb2a47dac72979229a4c96b04208ba896dd0e52279650e299778430abc9983bc2387a2fe0832
+EBUILD selinux-uml-2.20170805-r2.ebuild 276 SHA256 7bc25d662105c65df56dd8a2fed9db39e2c853ab7abc63047e750c53be68f575 SHA512 942ebcc16866f3dd0eb7afd41ad396589c446ab2d9ffe68e6dfaeb650e366ee562b654174e4ab3ca6612f74e38a2a2a531603b19452a52bae0ff88944fabf2a2 WHIRLPOOL 7782324e7ea1175629f057a603b04373c811c3173e60e5d57d94bb2a47dac72979229a4c96b04208ba896dd0e52279650e299778430abc9983bc2387a2fe0832
+EBUILD selinux-uml-2.20170805-r3.ebuild 278 SHA256 9ed33f20107a84d1eb906d6456936733b9c284f0cf549f466b8286f0fde15a20 SHA512 3660735270f80018260baf7243d6d61dc4daa9ce24eacd90c7cf53d51de6e6c1872df872eb660f08509d6706baf9ee6653becf80f8e1b1824b85773c988731fd WHIRLPOOL d47cb6c71c81fe0f43bacb3ea4ecd6d749a2dee3f45a8b72a7966a80b3ae280719ea5115f74218f499bdaa93d22ab333942d4f68ece1f320c9f308e45c4da847
+EBUILD selinux-uml-9999.ebuild 278 SHA256 9ed33f20107a84d1eb906d6456936733b9c284f0cf549f466b8286f0fde15a20 SHA512 3660735270f80018260baf7243d6d61dc4daa9ce24eacd90c7cf53d51de6e6c1872df872eb660f08509d6706baf9ee6653becf80f8e1b1824b85773c988731fd WHIRLPOOL d47cb6c71c81fe0f43bacb3ea4ecd6d749a2dee3f45a8b72a7966a80b3ae280719ea5115f74218f499bdaa93d22ab333942d4f68ece1f320c9f308e45c4da847
 MISC ChangeLog 10295 SHA256 878b66e381ac68b5526173621a257e8f0eea4f299866a1d85ee43618cac50ec5 SHA512 e61a86046be8792d417c6d0e1b02b7041235de938922132efbcd294ef5897c11449c5694948ff8818e230ad73159784951e44bb03220ac2d3d9a69c6ce2aa47c WHIRLPOOL 4688774f91a27f1301b46704be7d509a05cb90a823e615583d7b4e105e46d66aae3257fe4ac982c666f7b70d7a979b4efc7f2db87ee19bdd46382029251ea64a
 MISC ChangeLog-2015 9523 SHA256 86e88bb2b98eb7d7d7ebed5853f498f8e0f8f53a2b93190e26d6cd95b05ff9d8 SHA512 fb408efa0776323de35917d04d631c45b3c629438d87c2c7ad7e84177cc06c14252d64ac60ac366024db6694f0873404e345f2b698110d3354c6a0d778c87914 WHIRLPOOL 941292b64555f2d84e07758d24835b91b3505fc44b796fc8a705e634538d4c5ace4e3be8334828687ee0b77e673b234ec3216bd240797b06b196adf139d88c2c
 MISC metadata.xml 313 SHA256 e254f9cf1f7ca4c12a56da2e4d9e93d0b68fc595514c5be4e3d6215c6919603a SHA512 8baf21630b68613adafb49e007574ff1f62067c7f77ddacbf7bce11289e02b9a6c22fc89430ffac207615fbe28efb4384bd29abc36d10616b08c427a2cbd61db WHIRLPOOL b48c299cfdcb36019c96331998839eda8815555238978919b2f107a57987f6ed566513bf1432e1936922d4b38f6b31ea8ad1f2528daab9e89ab3af7a17fdcd0d
diff --git a/sec-policy/selinux-uml/selinux-uml-2.20170204-r1.ebuild b/sec-policy/selinux-uml/selinux-uml-2.20170204-r1.ebuild
index 51238df71c10..b6515dea628a 100644
--- a/sec-policy/selinux-uml/selinux-uml-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-uml/selinux-uml-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-uml/selinux-uml-2.20170204-r2.ebuild b/sec-policy/selinux-uml/selinux-uml-2.20170204-r2.ebuild
index 36c1f3785b24..7f5c71535ec1 100644
--- a/sec-policy/selinux-uml/selinux-uml-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-uml/selinux-uml-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-uml/selinux-uml-2.20170204-r3.ebuild b/sec-policy/selinux-uml/selinux-uml-2.20170204-r3.ebuild
index 36c1f3785b24..7f5c71535ec1 100644
--- a/sec-policy/selinux-uml/selinux-uml-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-uml/selinux-uml-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-uml/selinux-uml-2.20170204-r4.ebuild b/sec-policy/selinux-uml/selinux-uml-2.20170204-r4.ebuild
index 36c1f3785b24..7f5c71535ec1 100644
--- a/sec-policy/selinux-uml/selinux-uml-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-uml/selinux-uml-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-uml/selinux-uml-2.20170805-r2.ebuild b/sec-policy/selinux-uml/selinux-uml-2.20170805-r2.ebuild
index 36c1f3785b24..7f5c71535ec1 100644
--- a/sec-policy/selinux-uml/selinux-uml-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-uml/selinux-uml-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-uml/selinux-uml-2.20170805-r3.ebuild b/sec-policy/selinux-uml/selinux-uml-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..b6515dea628a
--- /dev/null
+++ b/sec-policy/selinux-uml/selinux-uml-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-uml/selinux-uml-9999.ebuild b/sec-policy/selinux-uml/selinux-uml-9999.ebuild
index 51238df71c10..b6515dea628a 100644
--- a/sec-policy/selinux-uml/selinux-uml-9999.ebuild
+++ b/sec-policy/selinux-uml/selinux-uml-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-unconfined/Manifest b/sec-policy/selinux-unconfined/Manifest
index ae508d2967cd..f20e2ffcf8f3 100644
--- a/sec-policy/selinux-unconfined/Manifest
+++ b/sec-policy/selinux-unconfined/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-unconfined-2.20170204-r1.ebuild 291 SHA256 b04c819f2fd7f0fac642c86e008c4e553d44467791e359956c7fbc2481081479 SHA512 f58d5672bc7baec7058a4a7a378b357d0fb390a5352739a7312d62e4ccf1a27ae2af977d46fd70243cb4001776b9b211659f4e88cf9ca460291ac286eceda195 WHIRLPOOL a19b5c444f4a104d7e991e367d345e04fff2c9c07231b56ea27c50a3669e72136030a8c549c6978ac1c7fe5a90d0037cf1853a3f7c443dae698e6427fa722717
-EBUILD selinux-unconfined-2.20170204-r2.ebuild 289 SHA256 041706f39bb8c13e682a9447a5982cec2d9dd776dbd779967bfcaba088e0872e SHA512 2f8d8afcf512471ef6585b1658fe0a0880c2fa59c933625362de2ddfbcf7d1036569e7c1e7334ae83677520525f2d446177b8db486b9505cf035b66355628390 WHIRLPOOL eb9c4e4d682ec796455f8fb4100c3c518911f268e4b74fb95ee3180607cfe5ef14e33814ddbab5797f51d3ca9c4a335cb5a02bbc0cabe7eedb8f3bddf3769309
-EBUILD selinux-unconfined-2.20170204-r3.ebuild 289 SHA256 041706f39bb8c13e682a9447a5982cec2d9dd776dbd779967bfcaba088e0872e SHA512 2f8d8afcf512471ef6585b1658fe0a0880c2fa59c933625362de2ddfbcf7d1036569e7c1e7334ae83677520525f2d446177b8db486b9505cf035b66355628390 WHIRLPOOL eb9c4e4d682ec796455f8fb4100c3c518911f268e4b74fb95ee3180607cfe5ef14e33814ddbab5797f51d3ca9c4a335cb5a02bbc0cabe7eedb8f3bddf3769309
-EBUILD selinux-unconfined-2.20170204-r4.ebuild 289 SHA256 041706f39bb8c13e682a9447a5982cec2d9dd776dbd779967bfcaba088e0872e SHA512 2f8d8afcf512471ef6585b1658fe0a0880c2fa59c933625362de2ddfbcf7d1036569e7c1e7334ae83677520525f2d446177b8db486b9505cf035b66355628390 WHIRLPOOL eb9c4e4d682ec796455f8fb4100c3c518911f268e4b74fb95ee3180607cfe5ef14e33814ddbab5797f51d3ca9c4a335cb5a02bbc0cabe7eedb8f3bddf3769309
-EBUILD selinux-unconfined-2.20170805-r2.ebuild 289 SHA256 041706f39bb8c13e682a9447a5982cec2d9dd776dbd779967bfcaba088e0872e SHA512 2f8d8afcf512471ef6585b1658fe0a0880c2fa59c933625362de2ddfbcf7d1036569e7c1e7334ae83677520525f2d446177b8db486b9505cf035b66355628390 WHIRLPOOL eb9c4e4d682ec796455f8fb4100c3c518911f268e4b74fb95ee3180607cfe5ef14e33814ddbab5797f51d3ca9c4a335cb5a02bbc0cabe7eedb8f3bddf3769309
-EBUILD selinux-unconfined-9999.ebuild 291 SHA256 b04c819f2fd7f0fac642c86e008c4e553d44467791e359956c7fbc2481081479 SHA512 f58d5672bc7baec7058a4a7a378b357d0fb390a5352739a7312d62e4ccf1a27ae2af977d46fd70243cb4001776b9b211659f4e88cf9ca460291ac286eceda195 WHIRLPOOL a19b5c444f4a104d7e991e367d345e04fff2c9c07231b56ea27c50a3669e72136030a8c549c6978ac1c7fe5a90d0037cf1853a3f7c443dae698e6427fa722717
+EBUILD selinux-unconfined-2.20170204-r1.ebuild 292 SHA256 f6c421537a28285ffa9e307252276e7041871792cde0397bea41612a6318417b SHA512 8c12825359a1bafb9003732e3823264286eefc2c395196c14437104e4861235a29f6a9a35be9fd7daa776c748e9b9d337ec2948bc2b458079d1bbf3307d96a24 WHIRLPOOL 9d27597518a22cb517f367e1d08b30b7a92688c0b462b8a4f6f72128f4a627fce0986882cf6d1537bca63ca780ff4776d2cc2bfba28442e5830d8d44fc8b9f4e
+EBUILD selinux-unconfined-2.20170204-r2.ebuild 290 SHA256 db7592408c1800f7feae7df9347e7bfa91c8d102827b156289156dfff3708de4 SHA512 8285596975ddb919612ed132de92db0c2b15fd4e31edb44c99cc60c2c0d25c0485d151cb88c6906bd4208cb85bb76cc59f775a2f90f1e679dc2140ac18d6a7f8 WHIRLPOOL b3b3e2aae2104205e3af10c32193927ed0fe0693b9b1b473769221da4e88bfbeb10d70a47faf00420cac41a14d77fb78224f75de85451003af37a2506b31f65f
+EBUILD selinux-unconfined-2.20170204-r3.ebuild 290 SHA256 db7592408c1800f7feae7df9347e7bfa91c8d102827b156289156dfff3708de4 SHA512 8285596975ddb919612ed132de92db0c2b15fd4e31edb44c99cc60c2c0d25c0485d151cb88c6906bd4208cb85bb76cc59f775a2f90f1e679dc2140ac18d6a7f8 WHIRLPOOL b3b3e2aae2104205e3af10c32193927ed0fe0693b9b1b473769221da4e88bfbeb10d70a47faf00420cac41a14d77fb78224f75de85451003af37a2506b31f65f
+EBUILD selinux-unconfined-2.20170204-r4.ebuild 290 SHA256 db7592408c1800f7feae7df9347e7bfa91c8d102827b156289156dfff3708de4 SHA512 8285596975ddb919612ed132de92db0c2b15fd4e31edb44c99cc60c2c0d25c0485d151cb88c6906bd4208cb85bb76cc59f775a2f90f1e679dc2140ac18d6a7f8 WHIRLPOOL b3b3e2aae2104205e3af10c32193927ed0fe0693b9b1b473769221da4e88bfbeb10d70a47faf00420cac41a14d77fb78224f75de85451003af37a2506b31f65f
+EBUILD selinux-unconfined-2.20170805-r2.ebuild 290 SHA256 db7592408c1800f7feae7df9347e7bfa91c8d102827b156289156dfff3708de4 SHA512 8285596975ddb919612ed132de92db0c2b15fd4e31edb44c99cc60c2c0d25c0485d151cb88c6906bd4208cb85bb76cc59f775a2f90f1e679dc2140ac18d6a7f8 WHIRLPOOL b3b3e2aae2104205e3af10c32193927ed0fe0693b9b1b473769221da4e88bfbeb10d70a47faf00420cac41a14d77fb78224f75de85451003af37a2506b31f65f
+EBUILD selinux-unconfined-2.20170805-r3.ebuild 292 SHA256 f6c421537a28285ffa9e307252276e7041871792cde0397bea41612a6318417b SHA512 8c12825359a1bafb9003732e3823264286eefc2c395196c14437104e4861235a29f6a9a35be9fd7daa776c748e9b9d337ec2948bc2b458079d1bbf3307d96a24 WHIRLPOOL 9d27597518a22cb517f367e1d08b30b7a92688c0b462b8a4f6f72128f4a627fce0986882cf6d1537bca63ca780ff4776d2cc2bfba28442e5830d8d44fc8b9f4e
+EBUILD selinux-unconfined-9999.ebuild 292 SHA256 f6c421537a28285ffa9e307252276e7041871792cde0397bea41612a6318417b SHA512 8c12825359a1bafb9003732e3823264286eefc2c395196c14437104e4861235a29f6a9a35be9fd7daa776c748e9b9d337ec2948bc2b458079d1bbf3307d96a24 WHIRLPOOL 9d27597518a22cb517f367e1d08b30b7a92688c0b462b8a4f6f72128f4a627fce0986882cf6d1537bca63ca780ff4776d2cc2bfba28442e5830d8d44fc8b9f4e
 MISC ChangeLog 10258 SHA256 80d5fe86027271ef3d50ade3b6d1829c699d09b748191c898d7ad14b9f6ae5c9 SHA512 748a9e3ebc60a39445edc8ae5d0142a896f3f4dc6de43c7a374807223d4fc6ca6ba583b098b44ebd92ca994934c6e9d9408b83a4d5ca0571aa4ba496050faf42 WHIRLPOOL a5b258a651cb3d8e391721529aad31cd70ffb07a4d5d8c5a0c743f010eeca62cf8c6e07f63c1ca4d0c23c7d778a074caa608c95c3495724dc4a23820159daaf2
 MISC ChangeLog-2015 9951 SHA256 4c953360872eb55bc8b61123e9bf756f10ebe228b6de9574df6a4baeeaf08bf8 SHA512 a19f90f3e914e672a3964e3b8d09f913369167c71b44fe9f80a0a15c79ed4ee2afb95d5c9bdb6cc0cc78997c0a7b0e65b582454393674fe96788677f372ccca6 WHIRLPOOL 1087f295ea775683e7cc5ece6cd0ac0f7766ca967520d48d34fbe0d980e5dc40638a2a896bba9e9f6ff0d874e8685e60cd41b451ad93f88215e9eefe610e15ca
 MISC metadata.xml 328 SHA256 cc43ed3e3721a13f94429c585cdfec8659163a024c53841c90af420ea396870a SHA512 dcf584f01f9b74b9e5196147219616837c1c46a73b258a37ddd8d183b9bd61d6c0819d92e27390d67b4d6d01b8b1a1447010d6437459a329c3eaa4a79f39b050 WHIRLPOOL 60204ff1b8762465e345c47b35366396160af802101bd0735ea83197e674f3f5cfe7c9ec168aea7e6a000bde027bd574057405ac6e5e9dd474f76544fcd1b5dc
diff --git a/sec-policy/selinux-unconfined/selinux-unconfined-2.20170204-r1.ebuild b/sec-policy/selinux-unconfined/selinux-unconfined-2.20170204-r1.ebuild
index 55c26e0a54a0..11d2e71947f3 100644
--- a/sec-policy/selinux-unconfined/selinux-unconfined-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-unconfined/selinux-unconfined-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-unconfined/selinux-unconfined-2.20170204-r2.ebuild b/sec-policy/selinux-unconfined/selinux-unconfined-2.20170204-r2.ebuild
index aa90c02c5574..f5d4a5975a3e 100644
--- a/sec-policy/selinux-unconfined/selinux-unconfined-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-unconfined/selinux-unconfined-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-unconfined/selinux-unconfined-2.20170204-r3.ebuild b/sec-policy/selinux-unconfined/selinux-unconfined-2.20170204-r3.ebuild
index aa90c02c5574..f5d4a5975a3e 100644
--- a/sec-policy/selinux-unconfined/selinux-unconfined-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-unconfined/selinux-unconfined-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-unconfined/selinux-unconfined-2.20170204-r4.ebuild b/sec-policy/selinux-unconfined/selinux-unconfined-2.20170204-r4.ebuild
index aa90c02c5574..f5d4a5975a3e 100644
--- a/sec-policy/selinux-unconfined/selinux-unconfined-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-unconfined/selinux-unconfined-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-unconfined/selinux-unconfined-2.20170805-r2.ebuild b/sec-policy/selinux-unconfined/selinux-unconfined-2.20170805-r2.ebuild
index aa90c02c5574..f5d4a5975a3e 100644
--- a/sec-policy/selinux-unconfined/selinux-unconfined-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-unconfined/selinux-unconfined-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-unconfined/selinux-unconfined-2.20170805-r3.ebuild b/sec-policy/selinux-unconfined/selinux-unconfined-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..11d2e71947f3
--- /dev/null
+++ b/sec-policy/selinux-unconfined/selinux-unconfined-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-unconfined/selinux-unconfined-9999.ebuild b/sec-policy/selinux-unconfined/selinux-unconfined-9999.ebuild
index 55c26e0a54a0..11d2e71947f3 100644
--- a/sec-policy/selinux-unconfined/selinux-unconfined-9999.ebuild
+++ b/sec-policy/selinux-unconfined/selinux-unconfined-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-uptime/Manifest b/sec-policy/selinux-uptime/Manifest
index 96b717aedf72..d961cf31e789 100644
--- a/sec-policy/selinux-uptime/Manifest
+++ b/sec-policy/selinux-uptime/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-uptime-2.20170204-r1.ebuild 283 SHA256 51d3530acc880b472aa03d921912dfdcef0ec09c3efe16f9c778580f5c31e585 SHA512 b24adf267cb8bb28008d4a79f748d924eb2927564a9d9e8310140283968dfa7d0da8170f68f58d773619406ae034b970502c317e1c1f04efb1aa5de92b9e6ebd WHIRLPOOL c8c7b9eda786382b4b62b7378769cb8354e1ada8f028474c5022888b2300f36312a9a3387a18a5178bc80c9d5f4fab25f01b472748b79b22cd0ff7384de38240
-EBUILD selinux-uptime-2.20170204-r2.ebuild 281 SHA256 c454af8e795ff8bd2ae34f446912e92a3c9af5be3f0b924cde49881b8f9d4681 SHA512 3ac73a5193e97b137233101701a183ca0932deb224f7c40ed9dee0739f6c233949a9f51f36f7f5b09daeb98f9fb6bd340ca553d7333947d5466ae3eafdd5efa8 WHIRLPOOL 43bc6378e7056406df461c5084bb2d20bd4f901dbe32245ada22af1704a8cea829da943dcacacf23814abf42da0d8fc85088081c72358b6db7658e90386bbf87
-EBUILD selinux-uptime-2.20170204-r3.ebuild 281 SHA256 c454af8e795ff8bd2ae34f446912e92a3c9af5be3f0b924cde49881b8f9d4681 SHA512 3ac73a5193e97b137233101701a183ca0932deb224f7c40ed9dee0739f6c233949a9f51f36f7f5b09daeb98f9fb6bd340ca553d7333947d5466ae3eafdd5efa8 WHIRLPOOL 43bc6378e7056406df461c5084bb2d20bd4f901dbe32245ada22af1704a8cea829da943dcacacf23814abf42da0d8fc85088081c72358b6db7658e90386bbf87
-EBUILD selinux-uptime-2.20170204-r4.ebuild 281 SHA256 c454af8e795ff8bd2ae34f446912e92a3c9af5be3f0b924cde49881b8f9d4681 SHA512 3ac73a5193e97b137233101701a183ca0932deb224f7c40ed9dee0739f6c233949a9f51f36f7f5b09daeb98f9fb6bd340ca553d7333947d5466ae3eafdd5efa8 WHIRLPOOL 43bc6378e7056406df461c5084bb2d20bd4f901dbe32245ada22af1704a8cea829da943dcacacf23814abf42da0d8fc85088081c72358b6db7658e90386bbf87
-EBUILD selinux-uptime-2.20170805-r2.ebuild 281 SHA256 c454af8e795ff8bd2ae34f446912e92a3c9af5be3f0b924cde49881b8f9d4681 SHA512 3ac73a5193e97b137233101701a183ca0932deb224f7c40ed9dee0739f6c233949a9f51f36f7f5b09daeb98f9fb6bd340ca553d7333947d5466ae3eafdd5efa8 WHIRLPOOL 43bc6378e7056406df461c5084bb2d20bd4f901dbe32245ada22af1704a8cea829da943dcacacf23814abf42da0d8fc85088081c72358b6db7658e90386bbf87
-EBUILD selinux-uptime-9999.ebuild 283 SHA256 51d3530acc880b472aa03d921912dfdcef0ec09c3efe16f9c778580f5c31e585 SHA512 b24adf267cb8bb28008d4a79f748d924eb2927564a9d9e8310140283968dfa7d0da8170f68f58d773619406ae034b970502c317e1c1f04efb1aa5de92b9e6ebd WHIRLPOOL c8c7b9eda786382b4b62b7378769cb8354e1ada8f028474c5022888b2300f36312a9a3387a18a5178bc80c9d5f4fab25f01b472748b79b22cd0ff7384de38240
+EBUILD selinux-uptime-2.20170204-r1.ebuild 284 SHA256 da5a900e0ac387ce0c222608823046046db774a89f78b0ac027cf550b2a63de4 SHA512 0ded768478c416e640d9ec589aea705a51bfd4ebdc3476c8173e8b07f399fa3a55a9b4062e89b43d96fcc648bcd368298af7f7e59817d3eca412babaaa677549 WHIRLPOOL c12433beab9d0dea90afa90ed516e0db7a42ed80fa31558c77ed2fbf05ab009fc6911a309e8a89cafa3fdeaed0e8abed5f2557ce6f40d8915d0eedefc589f9f2
+EBUILD selinux-uptime-2.20170204-r2.ebuild 282 SHA256 9317545c507bf99bee2f5b082a22977dc1764ca2ba9d7ca515fbf3c2d229d6a7 SHA512 6f164e8afd353091b8760c70a1f52e3d66e5c0ed0fcedcc9e15d95b89948c800d2a2008e890205841e9a090e6b68abd2bd60cf670e8b3abcf219cfae76e0d229 WHIRLPOOL 834bfe9872333bdfb76eff2e232f575dd5f5d4a1b09af5184118aa5bf6d391e9acc851b8671eb9553d347f4e7efa760796c9a9cb02cd638b55234cb3cac87f5d
+EBUILD selinux-uptime-2.20170204-r3.ebuild 282 SHA256 9317545c507bf99bee2f5b082a22977dc1764ca2ba9d7ca515fbf3c2d229d6a7 SHA512 6f164e8afd353091b8760c70a1f52e3d66e5c0ed0fcedcc9e15d95b89948c800d2a2008e890205841e9a090e6b68abd2bd60cf670e8b3abcf219cfae76e0d229 WHIRLPOOL 834bfe9872333bdfb76eff2e232f575dd5f5d4a1b09af5184118aa5bf6d391e9acc851b8671eb9553d347f4e7efa760796c9a9cb02cd638b55234cb3cac87f5d
+EBUILD selinux-uptime-2.20170204-r4.ebuild 282 SHA256 9317545c507bf99bee2f5b082a22977dc1764ca2ba9d7ca515fbf3c2d229d6a7 SHA512 6f164e8afd353091b8760c70a1f52e3d66e5c0ed0fcedcc9e15d95b89948c800d2a2008e890205841e9a090e6b68abd2bd60cf670e8b3abcf219cfae76e0d229 WHIRLPOOL 834bfe9872333bdfb76eff2e232f575dd5f5d4a1b09af5184118aa5bf6d391e9acc851b8671eb9553d347f4e7efa760796c9a9cb02cd638b55234cb3cac87f5d
+EBUILD selinux-uptime-2.20170805-r2.ebuild 282 SHA256 9317545c507bf99bee2f5b082a22977dc1764ca2ba9d7ca515fbf3c2d229d6a7 SHA512 6f164e8afd353091b8760c70a1f52e3d66e5c0ed0fcedcc9e15d95b89948c800d2a2008e890205841e9a090e6b68abd2bd60cf670e8b3abcf219cfae76e0d229 WHIRLPOOL 834bfe9872333bdfb76eff2e232f575dd5f5d4a1b09af5184118aa5bf6d391e9acc851b8671eb9553d347f4e7efa760796c9a9cb02cd638b55234cb3cac87f5d
+EBUILD selinux-uptime-2.20170805-r3.ebuild 284 SHA256 da5a900e0ac387ce0c222608823046046db774a89f78b0ac027cf550b2a63de4 SHA512 0ded768478c416e640d9ec589aea705a51bfd4ebdc3476c8173e8b07f399fa3a55a9b4062e89b43d96fcc648bcd368298af7f7e59817d3eca412babaaa677549 WHIRLPOOL c12433beab9d0dea90afa90ed516e0db7a42ed80fa31558c77ed2fbf05ab009fc6911a309e8a89cafa3fdeaed0e8abed5f2557ce6f40d8915d0eedefc589f9f2
+EBUILD selinux-uptime-9999.ebuild 284 SHA256 da5a900e0ac387ce0c222608823046046db774a89f78b0ac027cf550b2a63de4 SHA512 0ded768478c416e640d9ec589aea705a51bfd4ebdc3476c8173e8b07f399fa3a55a9b4062e89b43d96fcc648bcd368298af7f7e59817d3eca412babaaa677549 WHIRLPOOL c12433beab9d0dea90afa90ed516e0db7a42ed80fa31558c77ed2fbf05ab009fc6911a309e8a89cafa3fdeaed0e8abed5f2557ce6f40d8915d0eedefc589f9f2
 MISC ChangeLog 10571 SHA256 7fabb638af9356c979558adb383b7e4a2c9f7114ff07822d07e649d95d5ad460 SHA512 ffd8e14e40ac0a5da37a8de9718da41781aa548e040e91f67e2030eb6af0385d713bcff75749bb6caad65ccc62671b253c3b9e0af3fe91c9ced8965f75a85d3f WHIRLPOOL c83f7471dd6d62e33a9172fa915d4094f3df2d07258a20fd2c6e2bf475b9847b140fd26639f2ea59f8ffd92df8525dee16886e5536ed351123963de1d0462629
 MISC ChangeLog-2015 9862 SHA256 563bb06a6fd44f58b3f4ea2e4102b141a14668eb8049189e450d110cc54acc3a SHA512 01084fdc399ab2b36a15a520cdc07793769af14f7120fc6ad4df483d6d80b3ce493374614fbeedd5bdecd844c9509fe13c27d6bfff7dcda731f19ebbafeb9748 WHIRLPOOL 7661d79656ebcc0dc17e8410afada774d1e4d6714d98975d1e521c0df6e004aa9aee600c511dc08bbbc41839cb8374beaa0d2387d929a1ab41314fd69a1a520d
 MISC metadata.xml 316 SHA256 cdc6776081f8a480bea2e82758146b4b7b9da49bef7f369dad4cef590eb4414b SHA512 9ed46568e9691f16b8574be220647e054032aa60cee04ddd1d69c739a6f7afeadef8bfd95d81f238339a9a4b2276190328c49d57c99d0a57bb2c16d63d6777f2 WHIRLPOOL 0a1368217f76e55812c3b51930076d28cb201e28b42dda6e311927c221577bfcb1e062f8d90d503a78abd62863c04e2fcf89f74279346b3914cd697184d663be
diff --git a/sec-policy/selinux-uptime/selinux-uptime-2.20170204-r1.ebuild b/sec-policy/selinux-uptime/selinux-uptime-2.20170204-r1.ebuild
index a09d68cffc4f..7708280c3c98 100644
--- a/sec-policy/selinux-uptime/selinux-uptime-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-uptime/selinux-uptime-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-uptime/selinux-uptime-2.20170204-r2.ebuild b/sec-policy/selinux-uptime/selinux-uptime-2.20170204-r2.ebuild
index 95fa82ab0267..5a87d03a0013 100644
--- a/sec-policy/selinux-uptime/selinux-uptime-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-uptime/selinux-uptime-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-uptime/selinux-uptime-2.20170204-r3.ebuild b/sec-policy/selinux-uptime/selinux-uptime-2.20170204-r3.ebuild
index 95fa82ab0267..5a87d03a0013 100644
--- a/sec-policy/selinux-uptime/selinux-uptime-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-uptime/selinux-uptime-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-uptime/selinux-uptime-2.20170204-r4.ebuild b/sec-policy/selinux-uptime/selinux-uptime-2.20170204-r4.ebuild
index 95fa82ab0267..5a87d03a0013 100644
--- a/sec-policy/selinux-uptime/selinux-uptime-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-uptime/selinux-uptime-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-uptime/selinux-uptime-2.20170805-r2.ebuild b/sec-policy/selinux-uptime/selinux-uptime-2.20170805-r2.ebuild
index 95fa82ab0267..5a87d03a0013 100644
--- a/sec-policy/selinux-uptime/selinux-uptime-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-uptime/selinux-uptime-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-uptime/selinux-uptime-2.20170805-r3.ebuild b/sec-policy/selinux-uptime/selinux-uptime-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..7708280c3c98
--- /dev/null
+++ b/sec-policy/selinux-uptime/selinux-uptime-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-uptime/selinux-uptime-9999.ebuild b/sec-policy/selinux-uptime/selinux-uptime-9999.ebuild
index a09d68cffc4f..7708280c3c98 100644
--- a/sec-policy/selinux-uptime/selinux-uptime-9999.ebuild
+++ b/sec-policy/selinux-uptime/selinux-uptime-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-usbmuxd/Manifest b/sec-policy/selinux-usbmuxd/Manifest
index 3d530cf93a5b..3da820ae3cbb 100644
--- a/sec-policy/selinux-usbmuxd/Manifest
+++ b/sec-policy/selinux-usbmuxd/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-usbmuxd-2.20170204-r1.ebuild 285 SHA256 841f4e67adf98a5bfb874ce02c2c23c28f41767fca0a1fd5f0105917a80acb0a SHA512 4c0bf55a2c7069519cba8eaad7ebc5047d40cd87c05c382c9c9ad53ada5dcd7d0385303cab6a7b1340db24d82bae68f0b0ddc3c3b2c6671540b474a3b09a7baf WHIRLPOOL adb347e2cbbc2de36d58afdf7e21bfb45ae22985ce1f83cc9d92339850bdebda1303dae79a2beb43d017342923e6e24226f6358b9e577ef2ceccd627c3ec413a
-EBUILD selinux-usbmuxd-2.20170204-r2.ebuild 283 SHA256 ea142c0f3ef084b4f3018054a2661dfe269a03eebe6e87f2fbd89633cf50d799 SHA512 8387a46ce92248138eec8a8ca963f714b35659d7412fa5143a44905ea97b2e055cb90274f697aa582cc64cd5fae7cdb739fd3dd24e2ac94b5174e4378fa75f41 WHIRLPOOL fdd227b78814a6ef30249a6586fe8dca8f8427e88895c0c420d55bb72dd8499d207888fe94016880e1ecf9f794003e0dbcc001274ea479d9fbbc1645237b3ec0
-EBUILD selinux-usbmuxd-2.20170204-r3.ebuild 283 SHA256 ea142c0f3ef084b4f3018054a2661dfe269a03eebe6e87f2fbd89633cf50d799 SHA512 8387a46ce92248138eec8a8ca963f714b35659d7412fa5143a44905ea97b2e055cb90274f697aa582cc64cd5fae7cdb739fd3dd24e2ac94b5174e4378fa75f41 WHIRLPOOL fdd227b78814a6ef30249a6586fe8dca8f8427e88895c0c420d55bb72dd8499d207888fe94016880e1ecf9f794003e0dbcc001274ea479d9fbbc1645237b3ec0
-EBUILD selinux-usbmuxd-2.20170204-r4.ebuild 283 SHA256 ea142c0f3ef084b4f3018054a2661dfe269a03eebe6e87f2fbd89633cf50d799 SHA512 8387a46ce92248138eec8a8ca963f714b35659d7412fa5143a44905ea97b2e055cb90274f697aa582cc64cd5fae7cdb739fd3dd24e2ac94b5174e4378fa75f41 WHIRLPOOL fdd227b78814a6ef30249a6586fe8dca8f8427e88895c0c420d55bb72dd8499d207888fe94016880e1ecf9f794003e0dbcc001274ea479d9fbbc1645237b3ec0
-EBUILD selinux-usbmuxd-2.20170805-r2.ebuild 283 SHA256 ea142c0f3ef084b4f3018054a2661dfe269a03eebe6e87f2fbd89633cf50d799 SHA512 8387a46ce92248138eec8a8ca963f714b35659d7412fa5143a44905ea97b2e055cb90274f697aa582cc64cd5fae7cdb739fd3dd24e2ac94b5174e4378fa75f41 WHIRLPOOL fdd227b78814a6ef30249a6586fe8dca8f8427e88895c0c420d55bb72dd8499d207888fe94016880e1ecf9f794003e0dbcc001274ea479d9fbbc1645237b3ec0
-EBUILD selinux-usbmuxd-9999.ebuild 285 SHA256 841f4e67adf98a5bfb874ce02c2c23c28f41767fca0a1fd5f0105917a80acb0a SHA512 4c0bf55a2c7069519cba8eaad7ebc5047d40cd87c05c382c9c9ad53ada5dcd7d0385303cab6a7b1340db24d82bae68f0b0ddc3c3b2c6671540b474a3b09a7baf WHIRLPOOL adb347e2cbbc2de36d58afdf7e21bfb45ae22985ce1f83cc9d92339850bdebda1303dae79a2beb43d017342923e6e24226f6358b9e577ef2ceccd627c3ec413a
+EBUILD selinux-usbmuxd-2.20170204-r1.ebuild 286 SHA256 477e7bd1fe7f98f286952d77f8e7f2d2d96f42c630f11411330233847f14d314 SHA512 bdca5e59fcd6d50a58b3b0bca8cb7bd3fc832487800e92e5849aaac7bb79b7c339cdbcd44a45f922d05347886a5c4434b9f013886d8af4f5d27f9ad81f5aee0d WHIRLPOOL 93f97fef7628d2080f770f995cd217869fa72a3e8cce3cb71c611326ade83e644cde0c7c01a015f1ff54463b323aebb7d7c25a381078b2461ae20562eab47bad
+EBUILD selinux-usbmuxd-2.20170204-r2.ebuild 284 SHA256 79656414e50f53871844b6a59a479db2fe3891609c900c1127e179e99adff2a7 SHA512 1815119dad2cfedc732af4fe1e09c6a648e28491d99a1ae7ef5308bdcc9c4ad554a77c299e99aa724fb756c5f81f528944b360cc8d06bb959ad6f19a30c24630 WHIRLPOOL 58fbbd6aedd4c0865730d8c736c84a7904f0db9eddceeaec75bb186e218d4214fcd446fea61799effae6242883120f6277bac8ebb6659a8dcba512be941e8aa0
+EBUILD selinux-usbmuxd-2.20170204-r3.ebuild 284 SHA256 79656414e50f53871844b6a59a479db2fe3891609c900c1127e179e99adff2a7 SHA512 1815119dad2cfedc732af4fe1e09c6a648e28491d99a1ae7ef5308bdcc9c4ad554a77c299e99aa724fb756c5f81f528944b360cc8d06bb959ad6f19a30c24630 WHIRLPOOL 58fbbd6aedd4c0865730d8c736c84a7904f0db9eddceeaec75bb186e218d4214fcd446fea61799effae6242883120f6277bac8ebb6659a8dcba512be941e8aa0
+EBUILD selinux-usbmuxd-2.20170204-r4.ebuild 284 SHA256 79656414e50f53871844b6a59a479db2fe3891609c900c1127e179e99adff2a7 SHA512 1815119dad2cfedc732af4fe1e09c6a648e28491d99a1ae7ef5308bdcc9c4ad554a77c299e99aa724fb756c5f81f528944b360cc8d06bb959ad6f19a30c24630 WHIRLPOOL 58fbbd6aedd4c0865730d8c736c84a7904f0db9eddceeaec75bb186e218d4214fcd446fea61799effae6242883120f6277bac8ebb6659a8dcba512be941e8aa0
+EBUILD selinux-usbmuxd-2.20170805-r2.ebuild 284 SHA256 79656414e50f53871844b6a59a479db2fe3891609c900c1127e179e99adff2a7 SHA512 1815119dad2cfedc732af4fe1e09c6a648e28491d99a1ae7ef5308bdcc9c4ad554a77c299e99aa724fb756c5f81f528944b360cc8d06bb959ad6f19a30c24630 WHIRLPOOL 58fbbd6aedd4c0865730d8c736c84a7904f0db9eddceeaec75bb186e218d4214fcd446fea61799effae6242883120f6277bac8ebb6659a8dcba512be941e8aa0
+EBUILD selinux-usbmuxd-2.20170805-r3.ebuild 286 SHA256 477e7bd1fe7f98f286952d77f8e7f2d2d96f42c630f11411330233847f14d314 SHA512 bdca5e59fcd6d50a58b3b0bca8cb7bd3fc832487800e92e5849aaac7bb79b7c339cdbcd44a45f922d05347886a5c4434b9f013886d8af4f5d27f9ad81f5aee0d WHIRLPOOL 93f97fef7628d2080f770f995cd217869fa72a3e8cce3cb71c611326ade83e644cde0c7c01a015f1ff54463b323aebb7d7c25a381078b2461ae20562eab47bad
+EBUILD selinux-usbmuxd-9999.ebuild 286 SHA256 477e7bd1fe7f98f286952d77f8e7f2d2d96f42c630f11411330233847f14d314 SHA512 bdca5e59fcd6d50a58b3b0bca8cb7bd3fc832487800e92e5849aaac7bb79b7c339cdbcd44a45f922d05347886a5c4434b9f013886d8af4f5d27f9ad81f5aee0d WHIRLPOOL 93f97fef7628d2080f770f995cd217869fa72a3e8cce3cb71c611326ade83e644cde0c7c01a015f1ff54463b323aebb7d7c25a381078b2461ae20562eab47bad
 MISC ChangeLog 10687 SHA256 53e8244696efba92d4ec3b89677b3ef1b30e4276bf36fe1bf83b7e75d0f58e06 SHA512 77a5a37edbdcc140891d6c0fded8e82e9d76ce3f25957a2f311450379e231bf34639e73b2c6f9f2b741afa5176ab7a0794f486f306041a3cb064dc7552e622ab WHIRLPOOL be21796b24a48969ff65c5eceb993ad9616e4dc9a0027a873d7c9331573fe82e5d94808a008364f1bd9b86d64a977421cfe690488502da2821440bb0af25089a
 MISC ChangeLog-2015 9977 SHA256 a948d62d001144fe770a64424a892668f917844aa8e1d03288dd1e27e484adde SHA512 a71a0a25571158d6e3cf210bc78e4d805fa09916537591184940e2746902db453378110607542dbb6a7dfc524660eae147ab77f40d1391ac0062ec739ea97984 WHIRLPOOL ed2e4c58a5c11381714c13982c17bf6f3468fd829000050fcb87de4ae2aaa81fc62180fbdc65e71c6330bf13865e228d6f542cb1f8d52d5676bff6e2196403b4
 MISC metadata.xml 317 SHA256 a1a2c46a75deaa0af15c6d8a9a5eded01f7498402f8a51e53bd1095119a90a08 SHA512 665ff350330f9449152e4d72346e30788b685ec475ed56d90cfa6666b719c99fe1c26ed45281febe03d6104fd7a41d4cc0458b4f72bfce59d019c4dd43fe4bc1 WHIRLPOOL 274b8acf36bb98095b1cf7a95e021e955ab852126c02ec415f067a22080ab9bd88c6c8e63a74e8159a424c93a73fcb3de36b0b796e3feadcce6becb5181a3ef5
diff --git a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20170204-r1.ebuild b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20170204-r1.ebuild
index 7ea17ad0af93..df10f9c69bd5 100644
--- a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20170204-r2.ebuild b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20170204-r2.ebuild
index 3772e37ab6d3..e2e4e1d57829 100644
--- a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20170204-r3.ebuild b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20170204-r3.ebuild
index 3772e37ab6d3..e2e4e1d57829 100644
--- a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20170204-r4.ebuild b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20170204-r4.ebuild
index 3772e37ab6d3..e2e4e1d57829 100644
--- a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20170805-r2.ebuild b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20170805-r2.ebuild
index 3772e37ab6d3..e2e4e1d57829 100644
--- a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20170805-r3.ebuild b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..df10f9c69bd5
--- /dev/null
+++ b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-usbmuxd/selinux-usbmuxd-9999.ebuild b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-9999.ebuild
index 7ea17ad0af93..df10f9c69bd5 100644
--- a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-9999.ebuild
+++ b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-uucp/Manifest b/sec-policy/selinux-uucp/Manifest
index 05f0874eb52f..4dac4f98b20f 100644
--- a/sec-policy/selinux-uucp/Manifest
+++ b/sec-policy/selinux-uucp/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-uucp-2.20170204-r1.ebuild 373 SHA256 6ab60640430df1a2f2177c07c67742f03619a64714cb0021aaa8ebde61345f7e SHA512 12a0ef8298d1219e05d8cd0158765169c9b665aadfc3aba15154455bd7f16f728bd4db3cd7d8d0ea1120bea1590a934f5dca1e0060dbc6565c4ee5350161764c WHIRLPOOL 373927940eeeac883a526e08f605d653d91efe4abf976c1be850f3662c474ed59fdbb7f29da6017fd5636f07d1050734e0380827d27f93531d06eeebe151bb68
-EBUILD selinux-uucp-2.20170204-r2.ebuild 371 SHA256 a7867fd5d38d489a2962c148d1de22f01131ac7c11ea37109eff9766409a0cbb SHA512 bbeea3d3f26e0cf499e3b8d2cbf689b198962125ce7996e6acfc5e9b5a19faa35ee902a05d04e84415d29e151c4a0453ddf5c7cccdda0b6799a9bdfb1692d89a WHIRLPOOL 459b7788e5a9f3bb09928c71bc14a159635b9913599d8d624f9820b14f795be1d37f602f87c0031ef2f985a6eac7638577636c340003b945c8706a8fba0e52b9
-EBUILD selinux-uucp-2.20170204-r3.ebuild 371 SHA256 a7867fd5d38d489a2962c148d1de22f01131ac7c11ea37109eff9766409a0cbb SHA512 bbeea3d3f26e0cf499e3b8d2cbf689b198962125ce7996e6acfc5e9b5a19faa35ee902a05d04e84415d29e151c4a0453ddf5c7cccdda0b6799a9bdfb1692d89a WHIRLPOOL 459b7788e5a9f3bb09928c71bc14a159635b9913599d8d624f9820b14f795be1d37f602f87c0031ef2f985a6eac7638577636c340003b945c8706a8fba0e52b9
-EBUILD selinux-uucp-2.20170204-r4.ebuild 371 SHA256 a7867fd5d38d489a2962c148d1de22f01131ac7c11ea37109eff9766409a0cbb SHA512 bbeea3d3f26e0cf499e3b8d2cbf689b198962125ce7996e6acfc5e9b5a19faa35ee902a05d04e84415d29e151c4a0453ddf5c7cccdda0b6799a9bdfb1692d89a WHIRLPOOL 459b7788e5a9f3bb09928c71bc14a159635b9913599d8d624f9820b14f795be1d37f602f87c0031ef2f985a6eac7638577636c340003b945c8706a8fba0e52b9
-EBUILD selinux-uucp-2.20170805-r2.ebuild 371 SHA256 a7867fd5d38d489a2962c148d1de22f01131ac7c11ea37109eff9766409a0cbb SHA512 bbeea3d3f26e0cf499e3b8d2cbf689b198962125ce7996e6acfc5e9b5a19faa35ee902a05d04e84415d29e151c4a0453ddf5c7cccdda0b6799a9bdfb1692d89a WHIRLPOOL 459b7788e5a9f3bb09928c71bc14a159635b9913599d8d624f9820b14f795be1d37f602f87c0031ef2f985a6eac7638577636c340003b945c8706a8fba0e52b9
-EBUILD selinux-uucp-9999.ebuild 373 SHA256 6ab60640430df1a2f2177c07c67742f03619a64714cb0021aaa8ebde61345f7e SHA512 12a0ef8298d1219e05d8cd0158765169c9b665aadfc3aba15154455bd7f16f728bd4db3cd7d8d0ea1120bea1590a934f5dca1e0060dbc6565c4ee5350161764c WHIRLPOOL 373927940eeeac883a526e08f605d653d91efe4abf976c1be850f3662c474ed59fdbb7f29da6017fd5636f07d1050734e0380827d27f93531d06eeebe151bb68
+EBUILD selinux-uucp-2.20170204-r1.ebuild 374 SHA256 3acfb956e87fc457564e19764ac9301441dffe0fc78aca266b81beb856ccf96d SHA512 35b9d4d7c054653612cd2cfa9ddad25bce2a509275b2bd65873e6f6df1dd5060ab68a8c7d67f62d9f3ab6beb214075c8e43b23e434bc9c6ecd3c6f7e347cfb8f WHIRLPOOL 2696b8a95f3c2ee2f986812bd4cb11718b60c431288649f716b81623277a96dcbf0dcc63ec11cc0c11c153f6a73a5438f82c48e4ded686e9dfcbba5139865b25
+EBUILD selinux-uucp-2.20170204-r2.ebuild 372 SHA256 ad35bd31db65c2c88efec3506a33eb58186ba15685defca07227d2f77a666db1 SHA512 f85e587c59fed5c5c69970b56121c6915a472aaacce5dca472b031abf6433a37bc054db7d94ef403b1087e1cfa6f512f1cbb04a56090a3ec9cc316aa30b74a93 WHIRLPOOL 3307a22e2bb26b3257f5930d8d6becf68a64888a4f67cc1c60665511925d4986b876303aab80f726fc27886a6695917e703682dfa30e58ba6fc16a8387e13a18
+EBUILD selinux-uucp-2.20170204-r3.ebuild 372 SHA256 ad35bd31db65c2c88efec3506a33eb58186ba15685defca07227d2f77a666db1 SHA512 f85e587c59fed5c5c69970b56121c6915a472aaacce5dca472b031abf6433a37bc054db7d94ef403b1087e1cfa6f512f1cbb04a56090a3ec9cc316aa30b74a93 WHIRLPOOL 3307a22e2bb26b3257f5930d8d6becf68a64888a4f67cc1c60665511925d4986b876303aab80f726fc27886a6695917e703682dfa30e58ba6fc16a8387e13a18
+EBUILD selinux-uucp-2.20170204-r4.ebuild 372 SHA256 ad35bd31db65c2c88efec3506a33eb58186ba15685defca07227d2f77a666db1 SHA512 f85e587c59fed5c5c69970b56121c6915a472aaacce5dca472b031abf6433a37bc054db7d94ef403b1087e1cfa6f512f1cbb04a56090a3ec9cc316aa30b74a93 WHIRLPOOL 3307a22e2bb26b3257f5930d8d6becf68a64888a4f67cc1c60665511925d4986b876303aab80f726fc27886a6695917e703682dfa30e58ba6fc16a8387e13a18
+EBUILD selinux-uucp-2.20170805-r2.ebuild 372 SHA256 ad35bd31db65c2c88efec3506a33eb58186ba15685defca07227d2f77a666db1 SHA512 f85e587c59fed5c5c69970b56121c6915a472aaacce5dca472b031abf6433a37bc054db7d94ef403b1087e1cfa6f512f1cbb04a56090a3ec9cc316aa30b74a93 WHIRLPOOL 3307a22e2bb26b3257f5930d8d6becf68a64888a4f67cc1c60665511925d4986b876303aab80f726fc27886a6695917e703682dfa30e58ba6fc16a8387e13a18
+EBUILD selinux-uucp-2.20170805-r3.ebuild 374 SHA256 3acfb956e87fc457564e19764ac9301441dffe0fc78aca266b81beb856ccf96d SHA512 35b9d4d7c054653612cd2cfa9ddad25bce2a509275b2bd65873e6f6df1dd5060ab68a8c7d67f62d9f3ab6beb214075c8e43b23e434bc9c6ecd3c6f7e347cfb8f WHIRLPOOL 2696b8a95f3c2ee2f986812bd4cb11718b60c431288649f716b81623277a96dcbf0dcc63ec11cc0c11c153f6a73a5438f82c48e4ded686e9dfcbba5139865b25
+EBUILD selinux-uucp-9999.ebuild 374 SHA256 3acfb956e87fc457564e19764ac9301441dffe0fc78aca266b81beb856ccf96d SHA512 35b9d4d7c054653612cd2cfa9ddad25bce2a509275b2bd65873e6f6df1dd5060ab68a8c7d67f62d9f3ab6beb214075c8e43b23e434bc9c6ecd3c6f7e347cfb8f WHIRLPOOL 2696b8a95f3c2ee2f986812bd4cb11718b60c431288649f716b81623277a96dcbf0dcc63ec11cc0c11c153f6a73a5438f82c48e4ded686e9dfcbba5139865b25
 MISC ChangeLog 10387 SHA256 0a42d0decd5907f5fb4268299d74d487d21808a173da988fff2f23a69cf7932e SHA512 3d0d46ba0150956d0762f5d36fe5a01eaafd2dd0563a0a69690e54f1db02b8386759ceb340aff5cfe91d80f2d66ac91692f274adc468ef43cf1345733255cdf0 WHIRLPOOL 05f0582f419bba8a3e977e80ef2e61aba5d207134160668e53e129f9330e6ea3d2698bca6bb7c9ba118d8d559b092b08446327a4def2a5912bfcb70df27229d0
 MISC ChangeLog-2015 9610 SHA256 017fa6a3132c2a001842d0c0dcb2432ab145464616ed8fd326f714f7df6ed1ca SHA512 20434ecda2c450a6e77b9df615205b159e0895e185a5e22ffd06b13851bb8b59090cb570d0e7d84edd0cafeb588e3fecb9fc5e5cdc11039184f2acdb42adb10c WHIRLPOOL 2de57f61009aba70c757c4043a85fa0e77d87e2920f89a7ba8491545418f9863253d619b545b4635ffbd67053f5f419c52d8689ca7e496e6f709c5f592c103ee
 MISC metadata.xml 314 SHA256 69775c60ae82faa7579bdbb82b309af7b405030232cfa8f1b549009e3656a7cf SHA512 aa9491ed1334875262b8071e567e17188fdbba3e6befe80fdcc42784848f2b843fba7cd1dbd9f6958f67a221fd838405859a946cbd487130348cf8ed922df174 WHIRLPOOL 5cb4346acbd96f5f9e7f5a29f9776e8c6bf5caeafb9b6de6bda8d5c121c7aad04135b9a5c6070a656c0e553362067e32285995349486d3f7b6e546defd66c5b6
diff --git a/sec-policy/selinux-uucp/selinux-uucp-2.20170204-r1.ebuild b/sec-policy/selinux-uucp/selinux-uucp-2.20170204-r1.ebuild
index 12604c366c72..b52c5d01321a 100644
--- a/sec-policy/selinux-uucp/selinux-uucp-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-uucp/selinux-uucp-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-uucp/selinux-uucp-2.20170204-r2.ebuild b/sec-policy/selinux-uucp/selinux-uucp-2.20170204-r2.ebuild
index 1e1b42c57ac7..969d32f72b87 100644
--- a/sec-policy/selinux-uucp/selinux-uucp-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-uucp/selinux-uucp-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-uucp/selinux-uucp-2.20170204-r3.ebuild b/sec-policy/selinux-uucp/selinux-uucp-2.20170204-r3.ebuild
index 1e1b42c57ac7..969d32f72b87 100644
--- a/sec-policy/selinux-uucp/selinux-uucp-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-uucp/selinux-uucp-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-uucp/selinux-uucp-2.20170204-r4.ebuild b/sec-policy/selinux-uucp/selinux-uucp-2.20170204-r4.ebuild
index 1e1b42c57ac7..969d32f72b87 100644
--- a/sec-policy/selinux-uucp/selinux-uucp-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-uucp/selinux-uucp-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-uucp/selinux-uucp-2.20170805-r2.ebuild b/sec-policy/selinux-uucp/selinux-uucp-2.20170805-r2.ebuild
index 1e1b42c57ac7..969d32f72b87 100644
--- a/sec-policy/selinux-uucp/selinux-uucp-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-uucp/selinux-uucp-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-uucp/selinux-uucp-2.20170805-r3.ebuild b/sec-policy/selinux-uucp/selinux-uucp-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..b52c5d01321a
--- /dev/null
+++ b/sec-policy/selinux-uucp/selinux-uucp-2.20170805-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-uucp/selinux-uucp-9999.ebuild b/sec-policy/selinux-uucp/selinux-uucp-9999.ebuild
index 12604c366c72..b52c5d01321a 100644
--- a/sec-policy/selinux-uucp/selinux-uucp-9999.ebuild
+++ b/sec-policy/selinux-uucp/selinux-uucp-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-uwimap/Manifest b/sec-policy/selinux-uwimap/Manifest
index 083c803e7276..6b58682cf391 100644
--- a/sec-policy/selinux-uwimap/Manifest
+++ b/sec-policy/selinux-uwimap/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-uwimap-2.20170204-r1.ebuild 283 SHA256 319b41707db33f2889a89f6ba56a6ba09245825552cc638523d95c87445e0f61 SHA512 71456667023cf6e054a4105111aaa72bdd184049b0646df43dffac5bd34ebd942f6818ae612654a6aec8c7442069fc6a8e5d947530f50c7cdcd7566608bfa313 WHIRLPOOL 8255e2f02e6cb9c8ccaaf23cd273b7acacf2060eaa6412ac2e1f0ae66fd55bbfc74c2e7bb3bf4f79a8b4f11a9f1059e59af10797205a897767aa0f88ca456766
-EBUILD selinux-uwimap-2.20170204-r2.ebuild 281 SHA256 1891b2b264c06f0827992d3112c0bbfa4aabaf78b6cd144a0e0784a5af068707 SHA512 21849ce6d6c3b4425c9fba3e0f09041de6c22c0cd02e3cf8ac7728d09b64c6ca7c0c8ead51e6a9a2be775e09fd217a0afe03ff81d0304bebf2a7fd24fb46e012 WHIRLPOOL cfc5cfd14b4a7166130fc8dd1aa81f0a13195d096a1d3d54e1429e2d6dc30d4733e20186fc55aefc637db250097976b1ae531da49d8c0e40b7ce0825d2993fb3
-EBUILD selinux-uwimap-2.20170204-r3.ebuild 281 SHA256 1891b2b264c06f0827992d3112c0bbfa4aabaf78b6cd144a0e0784a5af068707 SHA512 21849ce6d6c3b4425c9fba3e0f09041de6c22c0cd02e3cf8ac7728d09b64c6ca7c0c8ead51e6a9a2be775e09fd217a0afe03ff81d0304bebf2a7fd24fb46e012 WHIRLPOOL cfc5cfd14b4a7166130fc8dd1aa81f0a13195d096a1d3d54e1429e2d6dc30d4733e20186fc55aefc637db250097976b1ae531da49d8c0e40b7ce0825d2993fb3
-EBUILD selinux-uwimap-2.20170204-r4.ebuild 281 SHA256 1891b2b264c06f0827992d3112c0bbfa4aabaf78b6cd144a0e0784a5af068707 SHA512 21849ce6d6c3b4425c9fba3e0f09041de6c22c0cd02e3cf8ac7728d09b64c6ca7c0c8ead51e6a9a2be775e09fd217a0afe03ff81d0304bebf2a7fd24fb46e012 WHIRLPOOL cfc5cfd14b4a7166130fc8dd1aa81f0a13195d096a1d3d54e1429e2d6dc30d4733e20186fc55aefc637db250097976b1ae531da49d8c0e40b7ce0825d2993fb3
-EBUILD selinux-uwimap-2.20170805-r2.ebuild 281 SHA256 1891b2b264c06f0827992d3112c0bbfa4aabaf78b6cd144a0e0784a5af068707 SHA512 21849ce6d6c3b4425c9fba3e0f09041de6c22c0cd02e3cf8ac7728d09b64c6ca7c0c8ead51e6a9a2be775e09fd217a0afe03ff81d0304bebf2a7fd24fb46e012 WHIRLPOOL cfc5cfd14b4a7166130fc8dd1aa81f0a13195d096a1d3d54e1429e2d6dc30d4733e20186fc55aefc637db250097976b1ae531da49d8c0e40b7ce0825d2993fb3
-EBUILD selinux-uwimap-9999.ebuild 283 SHA256 319b41707db33f2889a89f6ba56a6ba09245825552cc638523d95c87445e0f61 SHA512 71456667023cf6e054a4105111aaa72bdd184049b0646df43dffac5bd34ebd942f6818ae612654a6aec8c7442069fc6a8e5d947530f50c7cdcd7566608bfa313 WHIRLPOOL 8255e2f02e6cb9c8ccaaf23cd273b7acacf2060eaa6412ac2e1f0ae66fd55bbfc74c2e7bb3bf4f79a8b4f11a9f1059e59af10797205a897767aa0f88ca456766
+EBUILD selinux-uwimap-2.20170204-r1.ebuild 284 SHA256 4581bb391d4980c796dc9aad51122cea79ffa9ccd6237ef2392884e51c848cb8 SHA512 ea0d57ddcc47bf7bcb03f8bef6be001159e64d07603066ff111011e79158070b4fd05101307df15d0b9977e1dfb01b57e41d81d0cc6537e19a8595a6b09a2191 WHIRLPOOL a568b4db819807358362eac40083ad9ec20ba054c9280155d9b43d111c6f1504398b0afe5b60307aa5fce742d2dac67f7a534f9d255b6b22c3ccde747a4bb29e
+EBUILD selinux-uwimap-2.20170204-r2.ebuild 282 SHA256 1719a9cc20a1706e76f3454e591c7aceecf67b9bc40c63f3d0412697414ef103 SHA512 26a180cedda97c6a2b63f580e3d42b3d2617e54f6d2fc22ee37bb27b00a354c16f9d99bfeb9efae3e63ee137c8b707801642bce1a414724a92c2764b50e3df33 WHIRLPOOL 4e61e242abf4269cea5bdf6949c1874c42a5cf82befbe84fe1e56b569ac920761842a39d76f18c6d8e2a8f9197a784432981ad5abde5b0f5b9271163de737c92
+EBUILD selinux-uwimap-2.20170204-r3.ebuild 282 SHA256 1719a9cc20a1706e76f3454e591c7aceecf67b9bc40c63f3d0412697414ef103 SHA512 26a180cedda97c6a2b63f580e3d42b3d2617e54f6d2fc22ee37bb27b00a354c16f9d99bfeb9efae3e63ee137c8b707801642bce1a414724a92c2764b50e3df33 WHIRLPOOL 4e61e242abf4269cea5bdf6949c1874c42a5cf82befbe84fe1e56b569ac920761842a39d76f18c6d8e2a8f9197a784432981ad5abde5b0f5b9271163de737c92
+EBUILD selinux-uwimap-2.20170204-r4.ebuild 282 SHA256 1719a9cc20a1706e76f3454e591c7aceecf67b9bc40c63f3d0412697414ef103 SHA512 26a180cedda97c6a2b63f580e3d42b3d2617e54f6d2fc22ee37bb27b00a354c16f9d99bfeb9efae3e63ee137c8b707801642bce1a414724a92c2764b50e3df33 WHIRLPOOL 4e61e242abf4269cea5bdf6949c1874c42a5cf82befbe84fe1e56b569ac920761842a39d76f18c6d8e2a8f9197a784432981ad5abde5b0f5b9271163de737c92
+EBUILD selinux-uwimap-2.20170805-r2.ebuild 282 SHA256 1719a9cc20a1706e76f3454e591c7aceecf67b9bc40c63f3d0412697414ef103 SHA512 26a180cedda97c6a2b63f580e3d42b3d2617e54f6d2fc22ee37bb27b00a354c16f9d99bfeb9efae3e63ee137c8b707801642bce1a414724a92c2764b50e3df33 WHIRLPOOL 4e61e242abf4269cea5bdf6949c1874c42a5cf82befbe84fe1e56b569ac920761842a39d76f18c6d8e2a8f9197a784432981ad5abde5b0f5b9271163de737c92
+EBUILD selinux-uwimap-2.20170805-r3.ebuild 284 SHA256 4581bb391d4980c796dc9aad51122cea79ffa9ccd6237ef2392884e51c848cb8 SHA512 ea0d57ddcc47bf7bcb03f8bef6be001159e64d07603066ff111011e79158070b4fd05101307df15d0b9977e1dfb01b57e41d81d0cc6537e19a8595a6b09a2191 WHIRLPOOL a568b4db819807358362eac40083ad9ec20ba054c9280155d9b43d111c6f1504398b0afe5b60307aa5fce742d2dac67f7a534f9d255b6b22c3ccde747a4bb29e
+EBUILD selinux-uwimap-9999.ebuild 284 SHA256 4581bb391d4980c796dc9aad51122cea79ffa9ccd6237ef2392884e51c848cb8 SHA512 ea0d57ddcc47bf7bcb03f8bef6be001159e64d07603066ff111011e79158070b4fd05101307df15d0b9977e1dfb01b57e41d81d0cc6537e19a8595a6b09a2191 WHIRLPOOL a568b4db819807358362eac40083ad9ec20ba054c9280155d9b43d111c6f1504398b0afe5b60307aa5fce742d2dac67f7a534f9d255b6b22c3ccde747a4bb29e
 MISC ChangeLog 10571 SHA256 24ce77c9f55884de9e92e0de8136cefbd18c135b4c47cf5308cbde1ef1ed0757 SHA512 6580829a83e88ddd848194d067ae029069b87dcc0b2dc76e9955771eabe14c87647e54ac5b81b53fc0d61a5f3e20e2483d5623473fea898f601041995b88e653 WHIRLPOOL 663a9ca414a67d452bcb1eb662e0289be7a7c12c272ca514e1454fa42633805b14272ab245413761efab9106fac896354b7c80d401a75360ffb55f24a7781aae
 MISC ChangeLog-2015 9536 SHA256 510773bfb382fb87cdb66c634a8f4a2f576ca163d96c92f9463c833652cd8a99 SHA512 a2da6e703604b47e0ebf11cd701b81ac1dc7f9de60e09e6979ba9ec99ac117a4f62f088de7106e41fc794255abd3134613fde80ab7b14a1ed4e300dffe39c8f6 WHIRLPOOL 8cc198b3dba4b0ca9ca58534e43faf3ca6c7b61e1994e517734b198c669c27e77c5f0baf8e9e9c74813c377656dac1ca1ff9b1aff18d1a691a56c9b53dc90989
 MISC metadata.xml 316 SHA256 c0bfb58993533cc0a775ab7c868bb7194be623baf838960ddc1ad88075bfe082 SHA512 687b16d372a27eb09ed8eadbd694b3ad9ff3ddcdee85aebc5cb685fe91767e6523bbd8db0a928d47bc3670a59966c474d6a761ba5d2f86bc44423693e52e6077 WHIRLPOOL c73c18b6c3aec3e9c9baab98b0932c19a1b09d4826406d2469fecaf736bcd5682f8917381fdfea05765e0ed85cae374fe340952489d153f54dbf2a8cf8f39cb1
diff --git a/sec-policy/selinux-uwimap/selinux-uwimap-2.20170204-r1.ebuild b/sec-policy/selinux-uwimap/selinux-uwimap-2.20170204-r1.ebuild
index 72064c068874..8cb2b52fc63c 100644
--- a/sec-policy/selinux-uwimap/selinux-uwimap-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-uwimap/selinux-uwimap-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-uwimap/selinux-uwimap-2.20170204-r2.ebuild b/sec-policy/selinux-uwimap/selinux-uwimap-2.20170204-r2.ebuild
index fb471db386ab..b475676e6381 100644
--- a/sec-policy/selinux-uwimap/selinux-uwimap-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-uwimap/selinux-uwimap-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-uwimap/selinux-uwimap-2.20170204-r3.ebuild b/sec-policy/selinux-uwimap/selinux-uwimap-2.20170204-r3.ebuild
index fb471db386ab..b475676e6381 100644
--- a/sec-policy/selinux-uwimap/selinux-uwimap-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-uwimap/selinux-uwimap-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-uwimap/selinux-uwimap-2.20170204-r4.ebuild b/sec-policy/selinux-uwimap/selinux-uwimap-2.20170204-r4.ebuild
index fb471db386ab..b475676e6381 100644
--- a/sec-policy/selinux-uwimap/selinux-uwimap-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-uwimap/selinux-uwimap-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-uwimap/selinux-uwimap-2.20170805-r2.ebuild b/sec-policy/selinux-uwimap/selinux-uwimap-2.20170805-r2.ebuild
index fb471db386ab..b475676e6381 100644
--- a/sec-policy/selinux-uwimap/selinux-uwimap-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-uwimap/selinux-uwimap-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-uwimap/selinux-uwimap-2.20170805-r3.ebuild b/sec-policy/selinux-uwimap/selinux-uwimap-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..8cb2b52fc63c
--- /dev/null
+++ b/sec-policy/selinux-uwimap/selinux-uwimap-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-uwimap/selinux-uwimap-9999.ebuild b/sec-policy/selinux-uwimap/selinux-uwimap-9999.ebuild
index 72064c068874..8cb2b52fc63c 100644
--- a/sec-policy/selinux-uwimap/selinux-uwimap-9999.ebuild
+++ b/sec-policy/selinux-uwimap/selinux-uwimap-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-uwsgi/Manifest b/sec-policy/selinux-uwsgi/Manifest
index 0f2f19e1a41e..e43c2aad3140 100644
--- a/sec-policy/selinux-uwsgi/Manifest
+++ b/sec-policy/selinux-uwsgi/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-uwsgi-2.20170204-r1.ebuild 281 SHA256 8ac68dcef1d7873a6d2963b31a04af300e0d5121070b288a6ceb9e23ed921f3c SHA512 16cb747db840321f7dd68f74439b90153bccb5f9c23159e3981e3788c36eee9a2e971e60fd0b7c1ea5f5cf216c393eaf66b12a298f258bf4558df16c229484fc WHIRLPOOL 1f8ccc4a34724a4365f66ce6c8ce74f08844b216afa9e6f73e2fa3a42054fcb5a8e6ebcd149c593ff7fcec0cb342419fe1010e76ae6b0198f1048698c8bc1186
-EBUILD selinux-uwsgi-2.20170204-r2.ebuild 279 SHA256 93e1cb18cfe74c23c793cee961bfda2aa4302079c20b5dca9b1135e2ccb4702b SHA512 36d57f62c231ab00323e146db0819a118c1abdd74c76b02768b4b9566f4b4f6204e8ee1af3c98f0533931eae1ee3a9bedb932954e3ecd3df0c005d487d9bfa20 WHIRLPOOL 9cd1edd8010ea911bd87bf659b2b51bb55db035151fe9c17aaddac286569579456ebd1cc08f69bae033805139ee922664bd0a705538b11863e851a4ff2fd5c51
-EBUILD selinux-uwsgi-2.20170204-r3.ebuild 279 SHA256 93e1cb18cfe74c23c793cee961bfda2aa4302079c20b5dca9b1135e2ccb4702b SHA512 36d57f62c231ab00323e146db0819a118c1abdd74c76b02768b4b9566f4b4f6204e8ee1af3c98f0533931eae1ee3a9bedb932954e3ecd3df0c005d487d9bfa20 WHIRLPOOL 9cd1edd8010ea911bd87bf659b2b51bb55db035151fe9c17aaddac286569579456ebd1cc08f69bae033805139ee922664bd0a705538b11863e851a4ff2fd5c51
-EBUILD selinux-uwsgi-2.20170204-r4.ebuild 279 SHA256 93e1cb18cfe74c23c793cee961bfda2aa4302079c20b5dca9b1135e2ccb4702b SHA512 36d57f62c231ab00323e146db0819a118c1abdd74c76b02768b4b9566f4b4f6204e8ee1af3c98f0533931eae1ee3a9bedb932954e3ecd3df0c005d487d9bfa20 WHIRLPOOL 9cd1edd8010ea911bd87bf659b2b51bb55db035151fe9c17aaddac286569579456ebd1cc08f69bae033805139ee922664bd0a705538b11863e851a4ff2fd5c51
-EBUILD selinux-uwsgi-2.20170805-r2.ebuild 279 SHA256 93e1cb18cfe74c23c793cee961bfda2aa4302079c20b5dca9b1135e2ccb4702b SHA512 36d57f62c231ab00323e146db0819a118c1abdd74c76b02768b4b9566f4b4f6204e8ee1af3c98f0533931eae1ee3a9bedb932954e3ecd3df0c005d487d9bfa20 WHIRLPOOL 9cd1edd8010ea911bd87bf659b2b51bb55db035151fe9c17aaddac286569579456ebd1cc08f69bae033805139ee922664bd0a705538b11863e851a4ff2fd5c51
-EBUILD selinux-uwsgi-9999.ebuild 281 SHA256 8ac68dcef1d7873a6d2963b31a04af300e0d5121070b288a6ceb9e23ed921f3c SHA512 16cb747db840321f7dd68f74439b90153bccb5f9c23159e3981e3788c36eee9a2e971e60fd0b7c1ea5f5cf216c393eaf66b12a298f258bf4558df16c229484fc WHIRLPOOL 1f8ccc4a34724a4365f66ce6c8ce74f08844b216afa9e6f73e2fa3a42054fcb5a8e6ebcd149c593ff7fcec0cb342419fe1010e76ae6b0198f1048698c8bc1186
+EBUILD selinux-uwsgi-2.20170204-r1.ebuild 282 SHA256 b686febd84e4d0f4eb6edb1b331450024917212b137435d704ee9637c53fb3fc SHA512 6fb41475267d49f47b94baf66f6947a8b8c4c0d689b68cc228cdb4f6a5e52cdc96be9baba2abb7e92967dbfb61eb6c4c37f37d30705925a35bc6872c26ddcd68 WHIRLPOOL 3fc5ec296f1d66105c78185c1c117100b37c646d18e413d67a32b9876ce7279aacf90761998c3cf0717e6e524203321a86d9a69f011b6b780464c2af3da57136
+EBUILD selinux-uwsgi-2.20170204-r2.ebuild 280 SHA256 b1f539103d2cc33c61b8c581e8800801c7349b73adb1b01d0fb83f56b09c2226 SHA512 aa00a0db437f7be2e763f1f3d599cc806f0b8aeeb612c905c4c5f08e5cdd5957e0c29371c17e7b5b9a7bfe5109050475e03b90475f2352b466a9a20e29ee0b17 WHIRLPOOL abde2718e1881762d12ee7a0b73916595a4d8914d839611a1781b129f8ac93988051086da816d26d657780f120d8b368f1dda0cd7619f1cbc972b5ba125ef6d7
+EBUILD selinux-uwsgi-2.20170204-r3.ebuild 280 SHA256 b1f539103d2cc33c61b8c581e8800801c7349b73adb1b01d0fb83f56b09c2226 SHA512 aa00a0db437f7be2e763f1f3d599cc806f0b8aeeb612c905c4c5f08e5cdd5957e0c29371c17e7b5b9a7bfe5109050475e03b90475f2352b466a9a20e29ee0b17 WHIRLPOOL abde2718e1881762d12ee7a0b73916595a4d8914d839611a1781b129f8ac93988051086da816d26d657780f120d8b368f1dda0cd7619f1cbc972b5ba125ef6d7
+EBUILD selinux-uwsgi-2.20170204-r4.ebuild 280 SHA256 b1f539103d2cc33c61b8c581e8800801c7349b73adb1b01d0fb83f56b09c2226 SHA512 aa00a0db437f7be2e763f1f3d599cc806f0b8aeeb612c905c4c5f08e5cdd5957e0c29371c17e7b5b9a7bfe5109050475e03b90475f2352b466a9a20e29ee0b17 WHIRLPOOL abde2718e1881762d12ee7a0b73916595a4d8914d839611a1781b129f8ac93988051086da816d26d657780f120d8b368f1dda0cd7619f1cbc972b5ba125ef6d7
+EBUILD selinux-uwsgi-2.20170805-r2.ebuild 280 SHA256 b1f539103d2cc33c61b8c581e8800801c7349b73adb1b01d0fb83f56b09c2226 SHA512 aa00a0db437f7be2e763f1f3d599cc806f0b8aeeb612c905c4c5f08e5cdd5957e0c29371c17e7b5b9a7bfe5109050475e03b90475f2352b466a9a20e29ee0b17 WHIRLPOOL abde2718e1881762d12ee7a0b73916595a4d8914d839611a1781b129f8ac93988051086da816d26d657780f120d8b368f1dda0cd7619f1cbc972b5ba125ef6d7
+EBUILD selinux-uwsgi-2.20170805-r3.ebuild 282 SHA256 b686febd84e4d0f4eb6edb1b331450024917212b137435d704ee9637c53fb3fc SHA512 6fb41475267d49f47b94baf66f6947a8b8c4c0d689b68cc228cdb4f6a5e52cdc96be9baba2abb7e92967dbfb61eb6c4c37f37d30705925a35bc6872c26ddcd68 WHIRLPOOL 3fc5ec296f1d66105c78185c1c117100b37c646d18e413d67a32b9876ce7279aacf90761998c3cf0717e6e524203321a86d9a69f011b6b780464c2af3da57136
+EBUILD selinux-uwsgi-9999.ebuild 282 SHA256 b686febd84e4d0f4eb6edb1b331450024917212b137435d704ee9637c53fb3fc SHA512 6fb41475267d49f47b94baf66f6947a8b8c4c0d689b68cc228cdb4f6a5e52cdc96be9baba2abb7e92967dbfb61eb6c4c37f37d30705925a35bc6872c26ddcd68 WHIRLPOOL 3fc5ec296f1d66105c78185c1c117100b37c646d18e413d67a32b9876ce7279aacf90761998c3cf0717e6e524203321a86d9a69f011b6b780464c2af3da57136
 MISC ChangeLog 9391 SHA256 fadec5749fca5acaac7864eb13227c4a835ca7cbc78b0c72b82d8d66920d4c0d SHA512 c1ecb57931a7936ebff12bd635a503944b3f0d14361ef8d2a1b9d9bf2b4c1935af0b75dc929dbd905952e78ea20995e255feea2a1d23bb2dd7f28019343c8e98 WHIRLPOOL 38cf99b5910fe843e915851684d53ee69b979c2c3fd4c52ddc7efe564160c9c13af2cb6e2c9fba22a94c8baa2d9b23fdc600a02d82cb0d2c806aa8841717527a
 MISC ChangeLog-2015 1363 SHA256 cc3f15526bb7ced3073fe58d8c53e2ebd3c8a72d927d3834c46330834d1f8b9f SHA512 6f8adacca192c78d6c2b83c3812464cf866a3b8cb34b9672262038b16f60f0c5aea4bdbb4b58517bb96130300aa91e8d96312198361f121161c9db991eee872f WHIRLPOOL c46fcce1fdce178e1d1f915af22d2f918be97321b5c7eff88c3a25bc27a5cf274935111d77fe77547d287cb8180b80e5d9906fb82d80fd03a44f6ca101f8d6c5
 MISC metadata.xml 315 SHA256 854e0197ea720a7cd44ba8f9851ff72417cb94ea5e9907e56e26dc60d5168efd SHA512 14aeb44c80b9433064e670dd4f1036507965fead0068adc05311bd13eff263f7c177a20b30f4057d3e1af7fc708de09777d820f6a7ce7dee67d305a61d198e24 WHIRLPOOL 00502e55248bfead3b2617ee11c76ed83e740231ab5e362a69e4802428aba1ff41501c19f4b2690b9cb546eac45d6e25090c7a6f20c1422112bf02f797a6ff31
diff --git a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20170204-r1.ebuild b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20170204-r1.ebuild
index fcb32ac8d30d..3f59203ab90f 100644
--- a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20170204-r2.ebuild b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20170204-r2.ebuild
index daa3f2840510..1b94bdcad05b 100644
--- a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20170204-r3.ebuild b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20170204-r3.ebuild
index daa3f2840510..1b94bdcad05b 100644
--- a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20170204-r4.ebuild b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20170204-r4.ebuild
index daa3f2840510..1b94bdcad05b 100644
--- a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20170805-r2.ebuild b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20170805-r2.ebuild
index daa3f2840510..1b94bdcad05b 100644
--- a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20170805-r3.ebuild b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..3f59203ab90f
--- /dev/null
+++ b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-uwsgi/selinux-uwsgi-9999.ebuild b/sec-policy/selinux-uwsgi/selinux-uwsgi-9999.ebuild
index fcb32ac8d30d..3f59203ab90f 100644
--- a/sec-policy/selinux-uwsgi/selinux-uwsgi-9999.ebuild
+++ b/sec-policy/selinux-uwsgi/selinux-uwsgi-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-varnishd/Manifest b/sec-policy/selinux-varnishd/Manifest
index 51dc9771299e..acc0a9c6344c 100644
--- a/sec-policy/selinux-varnishd/Manifest
+++ b/sec-policy/selinux-varnishd/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-varnishd-2.20170204-r1.ebuild 287 SHA256 fda4e930b904086c44231359c1335d0dee33f9c768b95fd2edf018cf623f3561 SHA512 fa4399fc3192a8ec825d047c8491ffe5bfae5375c56c510091d661ecffefb975137364a69dae5946836e299e8e7072434bd8949849952b2ecfde78e2714e208b WHIRLPOOL cdf135780748265c8122f5cb7acf483cf0a37227dbe04689e192b85c23fe64c7aa388df77fffa998a0d41c3bd0e992f7d34aa4eee54a5cc4dec16a725feda579
-EBUILD selinux-varnishd-2.20170204-r2.ebuild 285 SHA256 15cdb684002756d36270e3ea508af885a088d2b8d5ce2e220127f630b9defb2f SHA512 b64f91c03917807f55a74be8133bfe652f9073a4ce8eaf7e46816ef7f760f7ed1915db54ccb43beafbacea95b3b256c5d7840d40b39fb9af557a9816c5bba2bd WHIRLPOOL adadd84f89c7480fe45a8a96378bff5168242ffcf1710fe358029bbd85adc47d0a4747513db53aa588b73e0b103fab9c037dc3b1d169602028dd7068b724e789
-EBUILD selinux-varnishd-2.20170204-r3.ebuild 285 SHA256 15cdb684002756d36270e3ea508af885a088d2b8d5ce2e220127f630b9defb2f SHA512 b64f91c03917807f55a74be8133bfe652f9073a4ce8eaf7e46816ef7f760f7ed1915db54ccb43beafbacea95b3b256c5d7840d40b39fb9af557a9816c5bba2bd WHIRLPOOL adadd84f89c7480fe45a8a96378bff5168242ffcf1710fe358029bbd85adc47d0a4747513db53aa588b73e0b103fab9c037dc3b1d169602028dd7068b724e789
-EBUILD selinux-varnishd-2.20170204-r4.ebuild 285 SHA256 15cdb684002756d36270e3ea508af885a088d2b8d5ce2e220127f630b9defb2f SHA512 b64f91c03917807f55a74be8133bfe652f9073a4ce8eaf7e46816ef7f760f7ed1915db54ccb43beafbacea95b3b256c5d7840d40b39fb9af557a9816c5bba2bd WHIRLPOOL adadd84f89c7480fe45a8a96378bff5168242ffcf1710fe358029bbd85adc47d0a4747513db53aa588b73e0b103fab9c037dc3b1d169602028dd7068b724e789
-EBUILD selinux-varnishd-2.20170805-r2.ebuild 285 SHA256 15cdb684002756d36270e3ea508af885a088d2b8d5ce2e220127f630b9defb2f SHA512 b64f91c03917807f55a74be8133bfe652f9073a4ce8eaf7e46816ef7f760f7ed1915db54ccb43beafbacea95b3b256c5d7840d40b39fb9af557a9816c5bba2bd WHIRLPOOL adadd84f89c7480fe45a8a96378bff5168242ffcf1710fe358029bbd85adc47d0a4747513db53aa588b73e0b103fab9c037dc3b1d169602028dd7068b724e789
-EBUILD selinux-varnishd-9999.ebuild 287 SHA256 fda4e930b904086c44231359c1335d0dee33f9c768b95fd2edf018cf623f3561 SHA512 fa4399fc3192a8ec825d047c8491ffe5bfae5375c56c510091d661ecffefb975137364a69dae5946836e299e8e7072434bd8949849952b2ecfde78e2714e208b WHIRLPOOL cdf135780748265c8122f5cb7acf483cf0a37227dbe04689e192b85c23fe64c7aa388df77fffa998a0d41c3bd0e992f7d34aa4eee54a5cc4dec16a725feda579
+EBUILD selinux-varnishd-2.20170204-r1.ebuild 288 SHA256 085b0ea3e21d19a3d5bfd023ddc6b62bb424dad273d6d0abe82072b77c09fc48 SHA512 a4a0d7a456054b9ee70127e62868110e0ce64708abc6edc2515e55572dca8b03d28dc6a00d5f409ded778b2b62d5da404962471f9af5cefca8c177ab1bfb81d7 WHIRLPOOL 3a88cd0a85c24bc2e36248b5ac50e5aa4861e61542ebeda6a53f754df56d569e155707bd59318a654b849859939786e9399c7adb1ef6d202d5ea1dd4a49db415
+EBUILD selinux-varnishd-2.20170204-r2.ebuild 286 SHA256 5b6e16aac28fd4b8734f408d91a203e99b2b65f4c48b21839151dde09505c2f7 SHA512 116bc759c6f6659e923220480b3a74b641c02dbeff12ccddaa32c423fd10043cd3541fdf9353c77895aabc081b1634eb218e2e0abf5cf386b96f1ea79d3ea305 WHIRLPOOL 9c6fb35902b6f08a91d6d0d989509e56316f3560bf1f937c1b2c6f23f5c47aebcb5b3b6aca4228a3fd8e16204bf68015903051fa862df4dd577a45e78bbb4a91
+EBUILD selinux-varnishd-2.20170204-r3.ebuild 286 SHA256 5b6e16aac28fd4b8734f408d91a203e99b2b65f4c48b21839151dde09505c2f7 SHA512 116bc759c6f6659e923220480b3a74b641c02dbeff12ccddaa32c423fd10043cd3541fdf9353c77895aabc081b1634eb218e2e0abf5cf386b96f1ea79d3ea305 WHIRLPOOL 9c6fb35902b6f08a91d6d0d989509e56316f3560bf1f937c1b2c6f23f5c47aebcb5b3b6aca4228a3fd8e16204bf68015903051fa862df4dd577a45e78bbb4a91
+EBUILD selinux-varnishd-2.20170204-r4.ebuild 286 SHA256 5b6e16aac28fd4b8734f408d91a203e99b2b65f4c48b21839151dde09505c2f7 SHA512 116bc759c6f6659e923220480b3a74b641c02dbeff12ccddaa32c423fd10043cd3541fdf9353c77895aabc081b1634eb218e2e0abf5cf386b96f1ea79d3ea305 WHIRLPOOL 9c6fb35902b6f08a91d6d0d989509e56316f3560bf1f937c1b2c6f23f5c47aebcb5b3b6aca4228a3fd8e16204bf68015903051fa862df4dd577a45e78bbb4a91
+EBUILD selinux-varnishd-2.20170805-r2.ebuild 286 SHA256 5b6e16aac28fd4b8734f408d91a203e99b2b65f4c48b21839151dde09505c2f7 SHA512 116bc759c6f6659e923220480b3a74b641c02dbeff12ccddaa32c423fd10043cd3541fdf9353c77895aabc081b1634eb218e2e0abf5cf386b96f1ea79d3ea305 WHIRLPOOL 9c6fb35902b6f08a91d6d0d989509e56316f3560bf1f937c1b2c6f23f5c47aebcb5b3b6aca4228a3fd8e16204bf68015903051fa862df4dd577a45e78bbb4a91
+EBUILD selinux-varnishd-2.20170805-r3.ebuild 288 SHA256 085b0ea3e21d19a3d5bfd023ddc6b62bb424dad273d6d0abe82072b77c09fc48 SHA512 a4a0d7a456054b9ee70127e62868110e0ce64708abc6edc2515e55572dca8b03d28dc6a00d5f409ded778b2b62d5da404962471f9af5cefca8c177ab1bfb81d7 WHIRLPOOL 3a88cd0a85c24bc2e36248b5ac50e5aa4861e61542ebeda6a53f754df56d569e155707bd59318a654b849859939786e9399c7adb1ef6d202d5ea1dd4a49db415
+EBUILD selinux-varnishd-9999.ebuild 288 SHA256 085b0ea3e21d19a3d5bfd023ddc6b62bb424dad273d6d0abe82072b77c09fc48 SHA512 a4a0d7a456054b9ee70127e62868110e0ce64708abc6edc2515e55572dca8b03d28dc6a00d5f409ded778b2b62d5da404962471f9af5cefca8c177ab1bfb81d7 WHIRLPOOL 3a88cd0a85c24bc2e36248b5ac50e5aa4861e61542ebeda6a53f754df56d569e155707bd59318a654b849859939786e9399c7adb1ef6d202d5ea1dd4a49db415
 MISC ChangeLog 10793 SHA256 98e9d6d7e72fed367bc142644b9460f5f53799b0d0ee4351ba5b002bc66b69b2 SHA512 791fa332c1474405dc054f07474e6a11d4773c16df3b39a480a4da1a2e5333972c43bb0afdfeeb3e92bfa4f8fcab2f220dd988ddc9a4e6d002bc59f489d8932d WHIRLPOOL a7c55c62b76229b9ec6d69746afb54e24b8488d97334d75204911d06876b5468128123f1c8bf8db77df010001884acc0818868cfc640b329ededdd29432c5139
 MISC ChangeLog-2015 10102 SHA256 376870b6407322d00bfb5555ad23f5d484bb5b374bc3c4339840c750bea2862e SHA512 a82e563aad08ab000f2a2a131d917c970ea1dea9af819b03813f857557ab0f65a4610d32d95adff7c4c4eb302f5fb26dee66ad9af7541df23767836342e2df04 WHIRLPOOL b309692f9253317e8618c7cb9cb345adbe5b61edbc5bacd4ab78f982ec3dfe7ea04fa297405603ee4d03e3a065b4c1ab269b51779deefdd595b73742ed813f4d
 MISC metadata.xml 318 SHA256 0c4c32f123392c765476683875fafdff72988ab16acf1dbd2c83d4916b875298 SHA512 3385342c923b2616dd114a23706ae2094a384ced315787b9a47fe77a81c3ecf2effd26fb7faa403dabcf622b5893808950b0202eee80fee075c75e99c3f9a891 WHIRLPOOL f698191db7ff30b0e30ca1a3187112a45b1e0d2773ad177c6f4985711761acf7e3a4db50f4d6820e345343a24414af801c3561471dcb6ff82b66f92f3b17ea05
diff --git a/sec-policy/selinux-varnishd/selinux-varnishd-2.20170204-r1.ebuild b/sec-policy/selinux-varnishd/selinux-varnishd-2.20170204-r1.ebuild
index 7c346fac6181..8034483d39a7 100644
--- a/sec-policy/selinux-varnishd/selinux-varnishd-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-varnishd/selinux-varnishd-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-varnishd/selinux-varnishd-2.20170204-r2.ebuild b/sec-policy/selinux-varnishd/selinux-varnishd-2.20170204-r2.ebuild
index aa060fb5f939..7a2f763d1f29 100644
--- a/sec-policy/selinux-varnishd/selinux-varnishd-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-varnishd/selinux-varnishd-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-varnishd/selinux-varnishd-2.20170204-r3.ebuild b/sec-policy/selinux-varnishd/selinux-varnishd-2.20170204-r3.ebuild
index aa060fb5f939..7a2f763d1f29 100644
--- a/sec-policy/selinux-varnishd/selinux-varnishd-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-varnishd/selinux-varnishd-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-varnishd/selinux-varnishd-2.20170204-r4.ebuild b/sec-policy/selinux-varnishd/selinux-varnishd-2.20170204-r4.ebuild
index aa060fb5f939..7a2f763d1f29 100644
--- a/sec-policy/selinux-varnishd/selinux-varnishd-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-varnishd/selinux-varnishd-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-varnishd/selinux-varnishd-2.20170805-r2.ebuild b/sec-policy/selinux-varnishd/selinux-varnishd-2.20170805-r2.ebuild
index aa060fb5f939..7a2f763d1f29 100644
--- a/sec-policy/selinux-varnishd/selinux-varnishd-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-varnishd/selinux-varnishd-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-varnishd/selinux-varnishd-2.20170805-r3.ebuild b/sec-policy/selinux-varnishd/selinux-varnishd-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..8034483d39a7
--- /dev/null
+++ b/sec-policy/selinux-varnishd/selinux-varnishd-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-varnishd/selinux-varnishd-9999.ebuild b/sec-policy/selinux-varnishd/selinux-varnishd-9999.ebuild
index 7c346fac6181..8034483d39a7 100644
--- a/sec-policy/selinux-varnishd/selinux-varnishd-9999.ebuild
+++ b/sec-policy/selinux-varnishd/selinux-varnishd-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-vbetool/Manifest b/sec-policy/selinux-vbetool/Manifest
index 2d12ea4ebbf4..c444d2ed68d8 100644
--- a/sec-policy/selinux-vbetool/Manifest
+++ b/sec-policy/selinux-vbetool/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-vbetool-2.20170204-r1.ebuild 285 SHA256 147018051bde51d38def723fdcb06e2065ec96825cb60049a5c66accdcc4a865 SHA512 5e9f5f8e709389be4676ec340bf3952e29e0746b5a2ea2945be909daa763ef121c7ac8869ef60d9746d8c381615f23d2548fc47a60c9b6b9d809636f4ce4fc63 WHIRLPOOL f9797147c1d2a0ce1c46076504ee290ca67775d09b95effdc5c27967802150c0c9db82ba021eafd50a0006edf4fa1a27acc132e159e541cde2b66f98ac8024db
-EBUILD selinux-vbetool-2.20170204-r2.ebuild 283 SHA256 2bf6d0d668ef4e5e0f918fa427b695f7c19ea4e3bd89ca9cb4ea1db607ce7d77 SHA512 13be8bce7c0fd27b8df7b92ac094ae64d4d962aaeefd64525ddad044f6e83b07c12478c9e3667fa756695e248a35b0a3fd60435649f23d2ea0de73f8df09afe7 WHIRLPOOL 3dc931a774966d70b84826d0059baa68c121fdebd7831c9bc6229771dd5c36ddf6f65ca51f30aa61b6dc2a5e07f90effdf3fd6e6eab910e3b6decbb725339987
-EBUILD selinux-vbetool-2.20170204-r3.ebuild 283 SHA256 2bf6d0d668ef4e5e0f918fa427b695f7c19ea4e3bd89ca9cb4ea1db607ce7d77 SHA512 13be8bce7c0fd27b8df7b92ac094ae64d4d962aaeefd64525ddad044f6e83b07c12478c9e3667fa756695e248a35b0a3fd60435649f23d2ea0de73f8df09afe7 WHIRLPOOL 3dc931a774966d70b84826d0059baa68c121fdebd7831c9bc6229771dd5c36ddf6f65ca51f30aa61b6dc2a5e07f90effdf3fd6e6eab910e3b6decbb725339987
-EBUILD selinux-vbetool-2.20170204-r4.ebuild 283 SHA256 2bf6d0d668ef4e5e0f918fa427b695f7c19ea4e3bd89ca9cb4ea1db607ce7d77 SHA512 13be8bce7c0fd27b8df7b92ac094ae64d4d962aaeefd64525ddad044f6e83b07c12478c9e3667fa756695e248a35b0a3fd60435649f23d2ea0de73f8df09afe7 WHIRLPOOL 3dc931a774966d70b84826d0059baa68c121fdebd7831c9bc6229771dd5c36ddf6f65ca51f30aa61b6dc2a5e07f90effdf3fd6e6eab910e3b6decbb725339987
-EBUILD selinux-vbetool-2.20170805-r2.ebuild 283 SHA256 2bf6d0d668ef4e5e0f918fa427b695f7c19ea4e3bd89ca9cb4ea1db607ce7d77 SHA512 13be8bce7c0fd27b8df7b92ac094ae64d4d962aaeefd64525ddad044f6e83b07c12478c9e3667fa756695e248a35b0a3fd60435649f23d2ea0de73f8df09afe7 WHIRLPOOL 3dc931a774966d70b84826d0059baa68c121fdebd7831c9bc6229771dd5c36ddf6f65ca51f30aa61b6dc2a5e07f90effdf3fd6e6eab910e3b6decbb725339987
-EBUILD selinux-vbetool-9999.ebuild 285 SHA256 147018051bde51d38def723fdcb06e2065ec96825cb60049a5c66accdcc4a865 SHA512 5e9f5f8e709389be4676ec340bf3952e29e0746b5a2ea2945be909daa763ef121c7ac8869ef60d9746d8c381615f23d2548fc47a60c9b6b9d809636f4ce4fc63 WHIRLPOOL f9797147c1d2a0ce1c46076504ee290ca67775d09b95effdc5c27967802150c0c9db82ba021eafd50a0006edf4fa1a27acc132e159e541cde2b66f98ac8024db
+EBUILD selinux-vbetool-2.20170204-r1.ebuild 286 SHA256 90348546e823b0e75afb5d0d7f0efe3a7037bc57778992135596a53d5f5696b0 SHA512 644c4347318ebdbee6f04cd5045eef145fb1291181e430d7c64a1e8f735778e18980747f8b12c5d476d430d80c3fa8f94063df711016899773a61aeba14a73cf WHIRLPOOL dcd734369481cb2e097fcb0b43d885972d52fc160014fa552454c049b72a9a2baec409d248e6a5b159a81d5a4f8b0a221b081bce9a12f63251676318865b6709
+EBUILD selinux-vbetool-2.20170204-r2.ebuild 284 SHA256 cd603c617df93ee8ecfea04de70305dec8a71905df1edf42dc3a40bc77fc882e SHA512 a9281530eaa8b2c1d0d8419cd041d05dd0e72ecc3875a529cf1f344e40fb6c258368f4c398c491ceb0c9e3732f2c293ce5e35548e8c63bfee242cd02dca6205b WHIRLPOOL b2dda88d81e6cae877011143440fac39c5e5f0b6bbc5786f300253155f97163db211c29b13011d8c51482cbcb17100edbc1ebfc9af6a06d4b5df3c9b489cf3fe
+EBUILD selinux-vbetool-2.20170204-r3.ebuild 284 SHA256 cd603c617df93ee8ecfea04de70305dec8a71905df1edf42dc3a40bc77fc882e SHA512 a9281530eaa8b2c1d0d8419cd041d05dd0e72ecc3875a529cf1f344e40fb6c258368f4c398c491ceb0c9e3732f2c293ce5e35548e8c63bfee242cd02dca6205b WHIRLPOOL b2dda88d81e6cae877011143440fac39c5e5f0b6bbc5786f300253155f97163db211c29b13011d8c51482cbcb17100edbc1ebfc9af6a06d4b5df3c9b489cf3fe
+EBUILD selinux-vbetool-2.20170204-r4.ebuild 284 SHA256 cd603c617df93ee8ecfea04de70305dec8a71905df1edf42dc3a40bc77fc882e SHA512 a9281530eaa8b2c1d0d8419cd041d05dd0e72ecc3875a529cf1f344e40fb6c258368f4c398c491ceb0c9e3732f2c293ce5e35548e8c63bfee242cd02dca6205b WHIRLPOOL b2dda88d81e6cae877011143440fac39c5e5f0b6bbc5786f300253155f97163db211c29b13011d8c51482cbcb17100edbc1ebfc9af6a06d4b5df3c9b489cf3fe
+EBUILD selinux-vbetool-2.20170805-r2.ebuild 284 SHA256 cd603c617df93ee8ecfea04de70305dec8a71905df1edf42dc3a40bc77fc882e SHA512 a9281530eaa8b2c1d0d8419cd041d05dd0e72ecc3875a529cf1f344e40fb6c258368f4c398c491ceb0c9e3732f2c293ce5e35548e8c63bfee242cd02dca6205b WHIRLPOOL b2dda88d81e6cae877011143440fac39c5e5f0b6bbc5786f300253155f97163db211c29b13011d8c51482cbcb17100edbc1ebfc9af6a06d4b5df3c9b489cf3fe
+EBUILD selinux-vbetool-2.20170805-r3.ebuild 286 SHA256 90348546e823b0e75afb5d0d7f0efe3a7037bc57778992135596a53d5f5696b0 SHA512 644c4347318ebdbee6f04cd5045eef145fb1291181e430d7c64a1e8f735778e18980747f8b12c5d476d430d80c3fa8f94063df711016899773a61aeba14a73cf WHIRLPOOL dcd734369481cb2e097fcb0b43d885972d52fc160014fa552454c049b72a9a2baec409d248e6a5b159a81d5a4f8b0a221b081bce9a12f63251676318865b6709
+EBUILD selinux-vbetool-9999.ebuild 286 SHA256 90348546e823b0e75afb5d0d7f0efe3a7037bc57778992135596a53d5f5696b0 SHA512 644c4347318ebdbee6f04cd5045eef145fb1291181e430d7c64a1e8f735778e18980747f8b12c5d476d430d80c3fa8f94063df711016899773a61aeba14a73cf WHIRLPOOL dcd734369481cb2e097fcb0b43d885972d52fc160014fa552454c049b72a9a2baec409d248e6a5b159a81d5a4f8b0a221b081bce9a12f63251676318865b6709
 MISC ChangeLog 10687 SHA256 366903df9d7dc1db19793738ba785f3469e103a637e67f78a389ba1afe06cfbc SHA512 595d82e84abbba94b7632291516a704559e25e7ae57f719e3afeb740b4fb03220eeb1494c77d32e809fd6b4c01f777da1ce5429ea73242332a450461fd204f2c WHIRLPOOL c6bc885bbba377425f006749d7d36b3f02dfdda0521518cc2249e2c2dd13668c22914e24117ff37d1ec3db2b8ebccfb948c686c0f4681fef8e325e679569112e
 MISC ChangeLog-2015 9977 SHA256 938502fa7dea8dc3dd7b571b73e9223b998caff5b4365cfe1fdd8ad41c3bd684 SHA512 561bbab5dd043812e247a1ad0e47286df46da0bf8e2851a1d1e245cd0603455f7c90e9dab9d3c2d01258536345c4ea0b725f805a17553833b236058839bf6075 WHIRLPOOL e58276b7e1e3976eabd46d0ce7c4de2f696055783b60d46c7ca4d64419b2121652eda10cf64cae71430c19a50faaaa43ee93b6686eed3e3edd838c6921c02cbe
 MISC metadata.xml 317 SHA256 5afcfdf86d55ff3bf85b88823514d4633e98e671c36602841c8a14cf80f5895c SHA512 4fee052e81194420528867acdb66be7ef51270f9d621773aec3da0ef33bafbdacb48cde9fe9da2cbac390b209eaac1579c3bb36cf999d2ff3bd00770913e1486 WHIRLPOOL d0cf243373db458d125b59aaa78df8d4979f54dfd6041059939819f1731f4e268d9336ab371292daa908581979a31001c35c978fe96cb387dd26ceb05ddec9ac
diff --git a/sec-policy/selinux-vbetool/selinux-vbetool-2.20170204-r1.ebuild b/sec-policy/selinux-vbetool/selinux-vbetool-2.20170204-r1.ebuild
index e071c7aad438..97bea22ece75 100644
--- a/sec-policy/selinux-vbetool/selinux-vbetool-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-vbetool/selinux-vbetool-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-vbetool/selinux-vbetool-2.20170204-r2.ebuild b/sec-policy/selinux-vbetool/selinux-vbetool-2.20170204-r2.ebuild
index 94a1b46e6c72..b63eaefd1be6 100644
--- a/sec-policy/selinux-vbetool/selinux-vbetool-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-vbetool/selinux-vbetool-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-vbetool/selinux-vbetool-2.20170204-r3.ebuild b/sec-policy/selinux-vbetool/selinux-vbetool-2.20170204-r3.ebuild
index 94a1b46e6c72..b63eaefd1be6 100644
--- a/sec-policy/selinux-vbetool/selinux-vbetool-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-vbetool/selinux-vbetool-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-vbetool/selinux-vbetool-2.20170204-r4.ebuild b/sec-policy/selinux-vbetool/selinux-vbetool-2.20170204-r4.ebuild
index 94a1b46e6c72..b63eaefd1be6 100644
--- a/sec-policy/selinux-vbetool/selinux-vbetool-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-vbetool/selinux-vbetool-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-vbetool/selinux-vbetool-2.20170805-r2.ebuild b/sec-policy/selinux-vbetool/selinux-vbetool-2.20170805-r2.ebuild
index 94a1b46e6c72..b63eaefd1be6 100644
--- a/sec-policy/selinux-vbetool/selinux-vbetool-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-vbetool/selinux-vbetool-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-vbetool/selinux-vbetool-2.20170805-r3.ebuild b/sec-policy/selinux-vbetool/selinux-vbetool-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..97bea22ece75
--- /dev/null
+++ b/sec-policy/selinux-vbetool/selinux-vbetool-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-vbetool/selinux-vbetool-9999.ebuild b/sec-policy/selinux-vbetool/selinux-vbetool-9999.ebuild
index e071c7aad438..97bea22ece75 100644
--- a/sec-policy/selinux-vbetool/selinux-vbetool-9999.ebuild
+++ b/sec-policy/selinux-vbetool/selinux-vbetool-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-vdagent/Manifest b/sec-policy/selinux-vdagent/Manifest
index 33f9da9ae97f..934ff38f7d2f 100644
--- a/sec-policy/selinux-vdagent/Manifest
+++ b/sec-policy/selinux-vdagent/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-vdagent-2.20170204-r1.ebuild 285 SHA256 98d84854a70abea918414255b7cdc5db64e2fbc8f0880921a4677265296a783b SHA512 863ae9f7d4431cb01b79b991d6e04f9fea4c6c4fccadc9d693dec105b0f1c22e7cd1c84d68809669db904d10d68f5d39871115e176f3ccc04ce59105e653c160 WHIRLPOOL 94aab8e807751f3b5f5e77f552521b4ecba8a061acdf1c1e3a43cf3b42eef01457d7e39dcb1c4c1ccf6643d44f5648cb1fee0780001a0f22f5a054e62ba389df
-EBUILD selinux-vdagent-2.20170204-r2.ebuild 283 SHA256 d4cf3e48bd02a909c0da030d016d8ef5b93ddc4b2e19e5f861b3ab8ccca545ee SHA512 4c02ebb6dd7c7515e2c5440a8e83ad7e156713030c0fb1cb87909c184689cccfc100cdea8698a96b863b3a2674b27955d4515b38012d98b9750db015a52ecd7a WHIRLPOOL 9b9636386ec1330bd2b8606b7139dac92d2af650b706070c2e6a0965f982ddbd63d0179514333f6b487fc6816f89ea2e6ed1de11088f4c8b51bd0441b76db03c
-EBUILD selinux-vdagent-2.20170204-r3.ebuild 283 SHA256 d4cf3e48bd02a909c0da030d016d8ef5b93ddc4b2e19e5f861b3ab8ccca545ee SHA512 4c02ebb6dd7c7515e2c5440a8e83ad7e156713030c0fb1cb87909c184689cccfc100cdea8698a96b863b3a2674b27955d4515b38012d98b9750db015a52ecd7a WHIRLPOOL 9b9636386ec1330bd2b8606b7139dac92d2af650b706070c2e6a0965f982ddbd63d0179514333f6b487fc6816f89ea2e6ed1de11088f4c8b51bd0441b76db03c
-EBUILD selinux-vdagent-2.20170204-r4.ebuild 283 SHA256 d4cf3e48bd02a909c0da030d016d8ef5b93ddc4b2e19e5f861b3ab8ccca545ee SHA512 4c02ebb6dd7c7515e2c5440a8e83ad7e156713030c0fb1cb87909c184689cccfc100cdea8698a96b863b3a2674b27955d4515b38012d98b9750db015a52ecd7a WHIRLPOOL 9b9636386ec1330bd2b8606b7139dac92d2af650b706070c2e6a0965f982ddbd63d0179514333f6b487fc6816f89ea2e6ed1de11088f4c8b51bd0441b76db03c
-EBUILD selinux-vdagent-2.20170805-r2.ebuild 283 SHA256 d4cf3e48bd02a909c0da030d016d8ef5b93ddc4b2e19e5f861b3ab8ccca545ee SHA512 4c02ebb6dd7c7515e2c5440a8e83ad7e156713030c0fb1cb87909c184689cccfc100cdea8698a96b863b3a2674b27955d4515b38012d98b9750db015a52ecd7a WHIRLPOOL 9b9636386ec1330bd2b8606b7139dac92d2af650b706070c2e6a0965f982ddbd63d0179514333f6b487fc6816f89ea2e6ed1de11088f4c8b51bd0441b76db03c
-EBUILD selinux-vdagent-9999.ebuild 285 SHA256 98d84854a70abea918414255b7cdc5db64e2fbc8f0880921a4677265296a783b SHA512 863ae9f7d4431cb01b79b991d6e04f9fea4c6c4fccadc9d693dec105b0f1c22e7cd1c84d68809669db904d10d68f5d39871115e176f3ccc04ce59105e653c160 WHIRLPOOL 94aab8e807751f3b5f5e77f552521b4ecba8a061acdf1c1e3a43cf3b42eef01457d7e39dcb1c4c1ccf6643d44f5648cb1fee0780001a0f22f5a054e62ba389df
+EBUILD selinux-vdagent-2.20170204-r1.ebuild 286 SHA256 7c1467b565a5e439dbec1a2e8f00e52749e4f2d2b99c287d3a01ab7860881ce1 SHA512 cbca3403930c09de1650762452a7946e375b010cf9c1116be629cb65682c882c8f7f9f2211bb8a19d815ef40a6f84b305a87003ed3fbf314ed0dfe76cb543513 WHIRLPOOL edb1c8716b2e236f8b03b94b6af7cb803c9c21d5b097caa5a0e1ebdaf39314bd68a735d82400556ab7e298d23dde78694c33b067597fb7b969d7b3a99504c096
+EBUILD selinux-vdagent-2.20170204-r2.ebuild 284 SHA256 95e4b012c2e3cb188c1204fe4ae8f9c07bd7ae1b9e0fc813804fbac6c6cd86da SHA512 add20e86d8af0524ff8831e872f712145ed160201b8653576eebc523e087b2f0d42702714dabc3b5ac2e87ec28ecb121347e1a0aa7e9763a8c887734fe465de3 WHIRLPOOL f995fde3df556b17a848b2a3152aaa88569827e49ae1ee2b909a39789e6c7450217137d7079a4557fa9cae8ee7c6f9511e99304cc55ec9e2ee22592a6cbe47f8
+EBUILD selinux-vdagent-2.20170204-r3.ebuild 284 SHA256 95e4b012c2e3cb188c1204fe4ae8f9c07bd7ae1b9e0fc813804fbac6c6cd86da SHA512 add20e86d8af0524ff8831e872f712145ed160201b8653576eebc523e087b2f0d42702714dabc3b5ac2e87ec28ecb121347e1a0aa7e9763a8c887734fe465de3 WHIRLPOOL f995fde3df556b17a848b2a3152aaa88569827e49ae1ee2b909a39789e6c7450217137d7079a4557fa9cae8ee7c6f9511e99304cc55ec9e2ee22592a6cbe47f8
+EBUILD selinux-vdagent-2.20170204-r4.ebuild 284 SHA256 95e4b012c2e3cb188c1204fe4ae8f9c07bd7ae1b9e0fc813804fbac6c6cd86da SHA512 add20e86d8af0524ff8831e872f712145ed160201b8653576eebc523e087b2f0d42702714dabc3b5ac2e87ec28ecb121347e1a0aa7e9763a8c887734fe465de3 WHIRLPOOL f995fde3df556b17a848b2a3152aaa88569827e49ae1ee2b909a39789e6c7450217137d7079a4557fa9cae8ee7c6f9511e99304cc55ec9e2ee22592a6cbe47f8
+EBUILD selinux-vdagent-2.20170805-r2.ebuild 284 SHA256 95e4b012c2e3cb188c1204fe4ae8f9c07bd7ae1b9e0fc813804fbac6c6cd86da SHA512 add20e86d8af0524ff8831e872f712145ed160201b8653576eebc523e087b2f0d42702714dabc3b5ac2e87ec28ecb121347e1a0aa7e9763a8c887734fe465de3 WHIRLPOOL f995fde3df556b17a848b2a3152aaa88569827e49ae1ee2b909a39789e6c7450217137d7079a4557fa9cae8ee7c6f9511e99304cc55ec9e2ee22592a6cbe47f8
+EBUILD selinux-vdagent-2.20170805-r3.ebuild 286 SHA256 7c1467b565a5e439dbec1a2e8f00e52749e4f2d2b99c287d3a01ab7860881ce1 SHA512 cbca3403930c09de1650762452a7946e375b010cf9c1116be629cb65682c882c8f7f9f2211bb8a19d815ef40a6f84b305a87003ed3fbf314ed0dfe76cb543513 WHIRLPOOL edb1c8716b2e236f8b03b94b6af7cb803c9c21d5b097caa5a0e1ebdaf39314bd68a735d82400556ab7e298d23dde78694c33b067597fb7b969d7b3a99504c096
+EBUILD selinux-vdagent-9999.ebuild 286 SHA256 7c1467b565a5e439dbec1a2e8f00e52749e4f2d2b99c287d3a01ab7860881ce1 SHA512 cbca3403930c09de1650762452a7946e375b010cf9c1116be629cb65682c882c8f7f9f2211bb8a19d815ef40a6f84b305a87003ed3fbf314ed0dfe76cb543513 WHIRLPOOL edb1c8716b2e236f8b03b94b6af7cb803c9c21d5b097caa5a0e1ebdaf39314bd68a735d82400556ab7e298d23dde78694c33b067597fb7b969d7b3a99504c096
 MISC ChangeLog 10687 SHA256 2e1f21f411a6e3abda35a1727e0248b50436239e3be571e5a3a55c53083cf68b SHA512 41ad52ac6c6c2cc04e2670c95e4fe7dd4d8d267defe457ab4d8a34d468df03921ef77095ebf5a6dc0d0a82666bb160aabf61085bcc1879edf05becf6d139047f WHIRLPOOL 5c8eadb8e3711a4385ac21abc6a1b53a8fc482b825692b58ed56cfe20dbb454372ad527dcbe0f9f9551b1e068710bf8ad7de19a625ba2f3275e23b5689567259
 MISC ChangeLog-2015 8133 SHA256 ec21d356dbf67019ccc71354fe3e7c6777059b190156e18b1f626af76800f2d3 SHA512 fb6b842d69a79be6a7bea41d1ff68c74202a3264e5b2fc6ed49d227ea19af12fe79455ca2ddb303db666aaf825349d6ef80b18e1e18e00520b4f1b3727ea42ae WHIRLPOOL 35c8a6a9f4f74df2bc8d1a010aca0cdb67cddf15d26645c2468ea411c16de2f2a16eb92d05fb8956a27ff338ec549a3459f43efc52134c78862e7c26f0e4efeb
 MISC metadata.xml 317 SHA256 ad7265332f652453f6ecde4e3335e22694dbb53c97c82e668c7d712699245b83 SHA512 e9c10cc57616d2df0efd1fe633998fcdfcb91ca11333f24045a146f45d42eae8b9e70a846e000f3331d4c84c5fbbad6ac29ee30a51d4c347bab682f7b80f8adb WHIRLPOOL f992d40581026496093f0cf6c5adb8541d3af9b074dd847c436e6c17ab4592af43a695f55ed89bf3caf8e87bfbfdace0e8e08f30f97ef32bfa69b640eaf61c20
diff --git a/sec-policy/selinux-vdagent/selinux-vdagent-2.20170204-r1.ebuild b/sec-policy/selinux-vdagent/selinux-vdagent-2.20170204-r1.ebuild
index 4df1ba1cff78..9fde11bddc8f 100644
--- a/sec-policy/selinux-vdagent/selinux-vdagent-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-vdagent/selinux-vdagent-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-vdagent/selinux-vdagent-2.20170204-r2.ebuild b/sec-policy/selinux-vdagent/selinux-vdagent-2.20170204-r2.ebuild
index 9bc16d19fcfc..ca4e87518c36 100644
--- a/sec-policy/selinux-vdagent/selinux-vdagent-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-vdagent/selinux-vdagent-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-vdagent/selinux-vdagent-2.20170204-r3.ebuild b/sec-policy/selinux-vdagent/selinux-vdagent-2.20170204-r3.ebuild
index 9bc16d19fcfc..ca4e87518c36 100644
--- a/sec-policy/selinux-vdagent/selinux-vdagent-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-vdagent/selinux-vdagent-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-vdagent/selinux-vdagent-2.20170204-r4.ebuild b/sec-policy/selinux-vdagent/selinux-vdagent-2.20170204-r4.ebuild
index 9bc16d19fcfc..ca4e87518c36 100644
--- a/sec-policy/selinux-vdagent/selinux-vdagent-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-vdagent/selinux-vdagent-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-vdagent/selinux-vdagent-2.20170805-r2.ebuild b/sec-policy/selinux-vdagent/selinux-vdagent-2.20170805-r2.ebuild
index 9bc16d19fcfc..ca4e87518c36 100644
--- a/sec-policy/selinux-vdagent/selinux-vdagent-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-vdagent/selinux-vdagent-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-vdagent/selinux-vdagent-2.20170805-r3.ebuild b/sec-policy/selinux-vdagent/selinux-vdagent-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..9fde11bddc8f
--- /dev/null
+++ b/sec-policy/selinux-vdagent/selinux-vdagent-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-vdagent/selinux-vdagent-9999.ebuild b/sec-policy/selinux-vdagent/selinux-vdagent-9999.ebuild
index 4df1ba1cff78..9fde11bddc8f 100644
--- a/sec-policy/selinux-vdagent/selinux-vdagent-9999.ebuild
+++ b/sec-policy/selinux-vdagent/selinux-vdagent-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-vde/Manifest b/sec-policy/selinux-vde/Manifest
index 5ee1754850a7..cffe4c309656 100644
--- a/sec-policy/selinux-vde/Manifest
+++ b/sec-policy/selinux-vde/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-vde-2.20170204-r1.ebuild 277 SHA256 8ad497cd3201b08869793f280739be96673732fc4083aa42b76448278b64250c SHA512 a9cf032b1fae4d5a6d7f7f519b0ed23b135b0203f08565fcd14c7eb661b88d5c4ecfb60768731929a062a7a9e4f6cca16b649008909ec954c03f7f3e6a4b539a WHIRLPOOL a7b607db8acd97ff3c61d4243a6ceacc0d5ed4ab93f01ee593ac0346efeaec9f01483e232a71dd31d1fe17712addbb12343e0142d0832ab7687d200b1bce2381
-EBUILD selinux-vde-2.20170204-r2.ebuild 275 SHA256 ec62aa173bedf7d834e7ac51bd17c7bd49da444d9a6079477f4d2a730186ca6a SHA512 dcc796e3d761bca4419a8894c3359fd378ebf3564d1f28d2acb7abecfefb5c5862a66641d13af3052128a374a4e1cdacafdd9fa1db14e86463d72d361ae78158 WHIRLPOOL 1c06f358f00542d025330dd0bbb1530cee5108ecb124bbb04e39dd6f3dcc19f069a8e7ab082188bc1e5bf30fcbbce0eb67339827248d1221470eb5eca047cb94
-EBUILD selinux-vde-2.20170204-r3.ebuild 275 SHA256 ec62aa173bedf7d834e7ac51bd17c7bd49da444d9a6079477f4d2a730186ca6a SHA512 dcc796e3d761bca4419a8894c3359fd378ebf3564d1f28d2acb7abecfefb5c5862a66641d13af3052128a374a4e1cdacafdd9fa1db14e86463d72d361ae78158 WHIRLPOOL 1c06f358f00542d025330dd0bbb1530cee5108ecb124bbb04e39dd6f3dcc19f069a8e7ab082188bc1e5bf30fcbbce0eb67339827248d1221470eb5eca047cb94
-EBUILD selinux-vde-2.20170204-r4.ebuild 275 SHA256 ec62aa173bedf7d834e7ac51bd17c7bd49da444d9a6079477f4d2a730186ca6a SHA512 dcc796e3d761bca4419a8894c3359fd378ebf3564d1f28d2acb7abecfefb5c5862a66641d13af3052128a374a4e1cdacafdd9fa1db14e86463d72d361ae78158 WHIRLPOOL 1c06f358f00542d025330dd0bbb1530cee5108ecb124bbb04e39dd6f3dcc19f069a8e7ab082188bc1e5bf30fcbbce0eb67339827248d1221470eb5eca047cb94
-EBUILD selinux-vde-2.20170805-r2.ebuild 275 SHA256 ec62aa173bedf7d834e7ac51bd17c7bd49da444d9a6079477f4d2a730186ca6a SHA512 dcc796e3d761bca4419a8894c3359fd378ebf3564d1f28d2acb7abecfefb5c5862a66641d13af3052128a374a4e1cdacafdd9fa1db14e86463d72d361ae78158 WHIRLPOOL 1c06f358f00542d025330dd0bbb1530cee5108ecb124bbb04e39dd6f3dcc19f069a8e7ab082188bc1e5bf30fcbbce0eb67339827248d1221470eb5eca047cb94
-EBUILD selinux-vde-9999.ebuild 277 SHA256 8ad497cd3201b08869793f280739be96673732fc4083aa42b76448278b64250c SHA512 a9cf032b1fae4d5a6d7f7f519b0ed23b135b0203f08565fcd14c7eb661b88d5c4ecfb60768731929a062a7a9e4f6cca16b649008909ec954c03f7f3e6a4b539a WHIRLPOOL a7b607db8acd97ff3c61d4243a6ceacc0d5ed4ab93f01ee593ac0346efeaec9f01483e232a71dd31d1fe17712addbb12343e0142d0832ab7687d200b1bce2381
+EBUILD selinux-vde-2.20170204-r1.ebuild 278 SHA256 f92250d58291d215f044f8963634b9b3e466bdecd672bd648aab023bd6820fb7 SHA512 63a88bb13bd342f72336dab6bb01d06e3078ff292bf668a0c9e0211009c3361a70f24e29863a4563cde4beef02124a6021d905fd94e5439bd7ef18152625e089 WHIRLPOOL 98139dadf6c693ff18161480fd7c934defd288747441b771bb830240d0bd3fec50ce1524cc76887ac46dcb315855fb1ab4e6a7a0ce2deb6bb6ab10f34b9754a7
+EBUILD selinux-vde-2.20170204-r2.ebuild 276 SHA256 78ec4a08cf3c8c347f0faf1961850581b7f4024857347d13eed67fd1bc887854 SHA512 1a9e2d0e65d2f69a492a44b61b19032e21be7137f943e07e9d1bf95c863d9ae3dcf3139cd66f3ce694d1c09d002f5c047a11fa23e3722be0dd32a07f52a9e4d5 WHIRLPOOL 4ea1080210cbedd5584dc1d0e4343be1a3d1c401e50c00efe1d5f931cb2606367c7479a16fe69f2d8658b7e21b0a44c63c5ae0183a0b2395befdac71de6ecf9c
+EBUILD selinux-vde-2.20170204-r3.ebuild 276 SHA256 78ec4a08cf3c8c347f0faf1961850581b7f4024857347d13eed67fd1bc887854 SHA512 1a9e2d0e65d2f69a492a44b61b19032e21be7137f943e07e9d1bf95c863d9ae3dcf3139cd66f3ce694d1c09d002f5c047a11fa23e3722be0dd32a07f52a9e4d5 WHIRLPOOL 4ea1080210cbedd5584dc1d0e4343be1a3d1c401e50c00efe1d5f931cb2606367c7479a16fe69f2d8658b7e21b0a44c63c5ae0183a0b2395befdac71de6ecf9c
+EBUILD selinux-vde-2.20170204-r4.ebuild 276 SHA256 78ec4a08cf3c8c347f0faf1961850581b7f4024857347d13eed67fd1bc887854 SHA512 1a9e2d0e65d2f69a492a44b61b19032e21be7137f943e07e9d1bf95c863d9ae3dcf3139cd66f3ce694d1c09d002f5c047a11fa23e3722be0dd32a07f52a9e4d5 WHIRLPOOL 4ea1080210cbedd5584dc1d0e4343be1a3d1c401e50c00efe1d5f931cb2606367c7479a16fe69f2d8658b7e21b0a44c63c5ae0183a0b2395befdac71de6ecf9c
+EBUILD selinux-vde-2.20170805-r2.ebuild 276 SHA256 78ec4a08cf3c8c347f0faf1961850581b7f4024857347d13eed67fd1bc887854 SHA512 1a9e2d0e65d2f69a492a44b61b19032e21be7137f943e07e9d1bf95c863d9ae3dcf3139cd66f3ce694d1c09d002f5c047a11fa23e3722be0dd32a07f52a9e4d5 WHIRLPOOL 4ea1080210cbedd5584dc1d0e4343be1a3d1c401e50c00efe1d5f931cb2606367c7479a16fe69f2d8658b7e21b0a44c63c5ae0183a0b2395befdac71de6ecf9c
+EBUILD selinux-vde-2.20170805-r3.ebuild 278 SHA256 f92250d58291d215f044f8963634b9b3e466bdecd672bd648aab023bd6820fb7 SHA512 63a88bb13bd342f72336dab6bb01d06e3078ff292bf668a0c9e0211009c3361a70f24e29863a4563cde4beef02124a6021d905fd94e5439bd7ef18152625e089 WHIRLPOOL 98139dadf6c693ff18161480fd7c934defd288747441b771bb830240d0bd3fec50ce1524cc76887ac46dcb315855fb1ab4e6a7a0ce2deb6bb6ab10f34b9754a7
+EBUILD selinux-vde-9999.ebuild 278 SHA256 f92250d58291d215f044f8963634b9b3e466bdecd672bd648aab023bd6820fb7 SHA512 63a88bb13bd342f72336dab6bb01d06e3078ff292bf668a0c9e0211009c3361a70f24e29863a4563cde4beef02124a6021d905fd94e5439bd7ef18152625e089 WHIRLPOOL 98139dadf6c693ff18161480fd7c934defd288747441b771bb830240d0bd3fec50ce1524cc76887ac46dcb315855fb1ab4e6a7a0ce2deb6bb6ab10f34b9754a7
 MISC ChangeLog 10295 SHA256 2350c47e3103a1edb584cffa39b7421c2d3b29bcd481227beea953aafbd326db SHA512 16f0c00fac3a743a576ab00ec0d826bedb55e975baf237954edb7312a05de6d862875d054a3af19703ab5b16cab92c2bc72af5060c181d9ad48286eb86cf94e5 WHIRLPOOL 0e06ce7a04f30e4213605d0d422c0c7bd6e9906ac5d7b71b5f85c3b2a7197cd02bea78f56f7fefce70f3bca3a8fcdef60cffa7a53d1b922fac1fb70a876b0c73
 MISC ChangeLog-2015 10145 SHA256 4b8bddcbf9e5747e5ae1445a46f0f0853dca01e8e7ab66db502940ce046d6d49 SHA512 4fdcf7906e53a6797a84107840c928a6204949f65d830cb67e8df40f54022ba18046b9a9b9fb700644a13e6fdc6fe37ffdeab39109ee8ea6f844507f9cdbe96c WHIRLPOOL 06471fe929fc5367c0cd3d2e69e62a51d8a1e1f7d395d75090154af8a6639a4b41cd6ed20c910d6ac25fd54276817ff3a545e19bd7f9e6fe201e2bc7740ea145
 MISC metadata.xml 313 SHA256 ff8b9af63814cac994f3eef941140591d2b6a3cc671fc9f7c1f4427abca9e14c SHA512 40aca5ba39fd653e4c621b4a0eff2b9eaed17e78f92144fd561c32470b72e69e0e191976af1f3bf6152e3b19c8fcc017be3ddeca3a4b191cfa513f6f42549e1e WHIRLPOOL db405c8e8ff91a85b9770fc4d2a43bbe671a3866dfdc69086b112524d938ae6c7435d4961986fd6977cb353a7c5ca47f450dad025bc8814d98b92ec7af1b762b
diff --git a/sec-policy/selinux-vde/selinux-vde-2.20170204-r1.ebuild b/sec-policy/selinux-vde/selinux-vde-2.20170204-r1.ebuild
index 89c0de496d53..6b53aaf68e45 100644
--- a/sec-policy/selinux-vde/selinux-vde-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-vde/selinux-vde-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-vde/selinux-vde-2.20170204-r2.ebuild b/sec-policy/selinux-vde/selinux-vde-2.20170204-r2.ebuild
index b417a85f7435..f0957f8c5d3f 100644
--- a/sec-policy/selinux-vde/selinux-vde-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-vde/selinux-vde-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-vde/selinux-vde-2.20170204-r3.ebuild b/sec-policy/selinux-vde/selinux-vde-2.20170204-r3.ebuild
index b417a85f7435..f0957f8c5d3f 100644
--- a/sec-policy/selinux-vde/selinux-vde-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-vde/selinux-vde-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-vde/selinux-vde-2.20170204-r4.ebuild b/sec-policy/selinux-vde/selinux-vde-2.20170204-r4.ebuild
index b417a85f7435..f0957f8c5d3f 100644
--- a/sec-policy/selinux-vde/selinux-vde-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-vde/selinux-vde-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-vde/selinux-vde-2.20170805-r2.ebuild b/sec-policy/selinux-vde/selinux-vde-2.20170805-r2.ebuild
index b417a85f7435..f0957f8c5d3f 100644
--- a/sec-policy/selinux-vde/selinux-vde-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-vde/selinux-vde-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-vde/selinux-vde-2.20170805-r3.ebuild b/sec-policy/selinux-vde/selinux-vde-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..6b53aaf68e45
--- /dev/null
+++ b/sec-policy/selinux-vde/selinux-vde-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-vde/selinux-vde-9999.ebuild b/sec-policy/selinux-vde/selinux-vde-9999.ebuild
index 89c0de496d53..6b53aaf68e45 100644
--- a/sec-policy/selinux-vde/selinux-vde-9999.ebuild
+++ b/sec-policy/selinux-vde/selinux-vde-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-virt/Manifest b/sec-policy/selinux-virt/Manifest
index 2fa06a7252a7..d9e0464f7b93 100644
--- a/sec-policy/selinux-virt/Manifest
+++ b/sec-policy/selinux-virt/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-virt-2.20170204-r1.ebuild 279 SHA256 f2fa7cd15fdd1294c9afa50e5a839761ce5d127a04227a5348124186bfd3489e SHA512 73db114e5ac14bcd61c23c58eb9f5c7bdc10c080da24dd55aad84f2dcd03aa1701517bedb1349923c7e5b2f6c9d0239600c8fd3abcfd8614145557f704e24576 WHIRLPOOL e3484da736ebc6de704a2f565692b76f351c9fe9d774c371850632a0180f0b28deb3fc847ce147004e8d916521ad390bfde0bbf8feddee4c1001be25e40777ef
-EBUILD selinux-virt-2.20170204-r2.ebuild 277 SHA256 c1571f786f281c2fa52030437c191bc4bcfbdbbc09a078ed5034bdf8642c3b7a SHA512 1eefadd5c56a15e7ea9f674a6a4a7347b32e5c318e7f5b3af1c38d75563cfd82a77c6940ccf36cdcc4104ae57b862aaceb20fc525fd4e3eae1a3fa72a727d14b WHIRLPOOL d499b37077647335e2cfa3233996656c505f62f224c3735c282a33a56201bcc791aff4693399bf1e4c477fa7ac796dcfbfd3c72c468d18bcc1ba05d717901910
-EBUILD selinux-virt-2.20170204-r3.ebuild 277 SHA256 c1571f786f281c2fa52030437c191bc4bcfbdbbc09a078ed5034bdf8642c3b7a SHA512 1eefadd5c56a15e7ea9f674a6a4a7347b32e5c318e7f5b3af1c38d75563cfd82a77c6940ccf36cdcc4104ae57b862aaceb20fc525fd4e3eae1a3fa72a727d14b WHIRLPOOL d499b37077647335e2cfa3233996656c505f62f224c3735c282a33a56201bcc791aff4693399bf1e4c477fa7ac796dcfbfd3c72c468d18bcc1ba05d717901910
-EBUILD selinux-virt-2.20170204-r4.ebuild 277 SHA256 c1571f786f281c2fa52030437c191bc4bcfbdbbc09a078ed5034bdf8642c3b7a SHA512 1eefadd5c56a15e7ea9f674a6a4a7347b32e5c318e7f5b3af1c38d75563cfd82a77c6940ccf36cdcc4104ae57b862aaceb20fc525fd4e3eae1a3fa72a727d14b WHIRLPOOL d499b37077647335e2cfa3233996656c505f62f224c3735c282a33a56201bcc791aff4693399bf1e4c477fa7ac796dcfbfd3c72c468d18bcc1ba05d717901910
-EBUILD selinux-virt-2.20170805-r2.ebuild 277 SHA256 c1571f786f281c2fa52030437c191bc4bcfbdbbc09a078ed5034bdf8642c3b7a SHA512 1eefadd5c56a15e7ea9f674a6a4a7347b32e5c318e7f5b3af1c38d75563cfd82a77c6940ccf36cdcc4104ae57b862aaceb20fc525fd4e3eae1a3fa72a727d14b WHIRLPOOL d499b37077647335e2cfa3233996656c505f62f224c3735c282a33a56201bcc791aff4693399bf1e4c477fa7ac796dcfbfd3c72c468d18bcc1ba05d717901910
-EBUILD selinux-virt-9999.ebuild 279 SHA256 f2fa7cd15fdd1294c9afa50e5a839761ce5d127a04227a5348124186bfd3489e SHA512 73db114e5ac14bcd61c23c58eb9f5c7bdc10c080da24dd55aad84f2dcd03aa1701517bedb1349923c7e5b2f6c9d0239600c8fd3abcfd8614145557f704e24576 WHIRLPOOL e3484da736ebc6de704a2f565692b76f351c9fe9d774c371850632a0180f0b28deb3fc847ce147004e8d916521ad390bfde0bbf8feddee4c1001be25e40777ef
+EBUILD selinux-virt-2.20170204-r1.ebuild 280 SHA256 7eea75732cac0a4b2fa4374a3d9381192ade2f819bbf285eb775d75b8a63ed24 SHA512 5bf96dc492c14c5e49420e5f709039551ed5ac0684110913c98b9dad3bcc1bf4dc842f85a44f368592f3091eb67b97b9b42398451a7fb5a9cf649dd18f0ff69d WHIRLPOOL bbaa1acd9c7ea71f8e8372f2dfac7ba2ac3b958a378a2794549a242a153ae5f2f14b966b827199ba1d65d36ae60982eae1e4a4e17e7a980d394a61576363c93e
+EBUILD selinux-virt-2.20170204-r2.ebuild 278 SHA256 c90cd76faed6429a017a25d6bbb1a49fb2f7467e0a6ba9eec40695ee41a15bf4 SHA512 fe61f61f2c0d1af1ce896029ee5159f6fcf93368890565f77f2aa64c28d84313c3cd635104330ad610633ab37bdf16578617b846ab9831bcb842d6396e2a1330 WHIRLPOOL 7d5db11ef134d613788d480885a5bbc10cb50dcc334f887f12023e38a2e273f761e672e5e0d1daa8c9ce9b8c854d63096830c6f68863ff507bfb9871706f67b1
+EBUILD selinux-virt-2.20170204-r3.ebuild 278 SHA256 c90cd76faed6429a017a25d6bbb1a49fb2f7467e0a6ba9eec40695ee41a15bf4 SHA512 fe61f61f2c0d1af1ce896029ee5159f6fcf93368890565f77f2aa64c28d84313c3cd635104330ad610633ab37bdf16578617b846ab9831bcb842d6396e2a1330 WHIRLPOOL 7d5db11ef134d613788d480885a5bbc10cb50dcc334f887f12023e38a2e273f761e672e5e0d1daa8c9ce9b8c854d63096830c6f68863ff507bfb9871706f67b1
+EBUILD selinux-virt-2.20170204-r4.ebuild 278 SHA256 c90cd76faed6429a017a25d6bbb1a49fb2f7467e0a6ba9eec40695ee41a15bf4 SHA512 fe61f61f2c0d1af1ce896029ee5159f6fcf93368890565f77f2aa64c28d84313c3cd635104330ad610633ab37bdf16578617b846ab9831bcb842d6396e2a1330 WHIRLPOOL 7d5db11ef134d613788d480885a5bbc10cb50dcc334f887f12023e38a2e273f761e672e5e0d1daa8c9ce9b8c854d63096830c6f68863ff507bfb9871706f67b1
+EBUILD selinux-virt-2.20170805-r2.ebuild 278 SHA256 c90cd76faed6429a017a25d6bbb1a49fb2f7467e0a6ba9eec40695ee41a15bf4 SHA512 fe61f61f2c0d1af1ce896029ee5159f6fcf93368890565f77f2aa64c28d84313c3cd635104330ad610633ab37bdf16578617b846ab9831bcb842d6396e2a1330 WHIRLPOOL 7d5db11ef134d613788d480885a5bbc10cb50dcc334f887f12023e38a2e273f761e672e5e0d1daa8c9ce9b8c854d63096830c6f68863ff507bfb9871706f67b1
+EBUILD selinux-virt-2.20170805-r3.ebuild 280 SHA256 7eea75732cac0a4b2fa4374a3d9381192ade2f819bbf285eb775d75b8a63ed24 SHA512 5bf96dc492c14c5e49420e5f709039551ed5ac0684110913c98b9dad3bcc1bf4dc842f85a44f368592f3091eb67b97b9b42398451a7fb5a9cf649dd18f0ff69d WHIRLPOOL bbaa1acd9c7ea71f8e8372f2dfac7ba2ac3b958a378a2794549a242a153ae5f2f14b966b827199ba1d65d36ae60982eae1e4a4e17e7a980d394a61576363c93e
+EBUILD selinux-virt-9999.ebuild 280 SHA256 7eea75732cac0a4b2fa4374a3d9381192ade2f819bbf285eb775d75b8a63ed24 SHA512 5bf96dc492c14c5e49420e5f709039551ed5ac0684110913c98b9dad3bcc1bf4dc842f85a44f368592f3091eb67b97b9b42398451a7fb5a9cf649dd18f0ff69d WHIRLPOOL bbaa1acd9c7ea71f8e8372f2dfac7ba2ac3b958a378a2794549a242a153ae5f2f14b966b827199ba1d65d36ae60982eae1e4a4e17e7a980d394a61576363c93e
 MISC ChangeLog 10465 SHA256 617212ed567949eaceb66fc762da0a570e01fe8144fd59ddab57bd76f9df5f2a SHA512 e704942bf4608f27485277fa1dfdb9dbfb08759800e83249fde1ebab487b1265a2816e97fcda05e0c9f505dd76865f42eba99ffadf936ef72b9756dfd4baa1f1 WHIRLPOOL c430f54c31387a7ec09ffc06d0ebb788fbe2559f56181a123700e1666dc6ac3b6bc3f260e8ca957b78ccb5ca759d7a93956b55798f275d8d194b2d8dfa928e90
 MISC ChangeLog-2015 10388 SHA256 df4a98dc5c709ec965f6f82cce6be9ebe9d60509cb819c1b8a9f8c0eb51cd99c SHA512 10ade2f9d1f3bbae2ef71782ac0132065b9603724f08a6ac81ce1c049e33ed6e74abae16af19603c377b67d6cc283dbf00c69105d75e1d559f4ba6797642ba56 WHIRLPOOL 37175db60cb0e00f58bad2168fa6c6956755e5f126a5fa96264747fffd9981c3fe6c20892c3f636d6d5bddb98aaad2c8b457e41dbed518f17b9dcfc4fd261745
 MISC metadata.xml 314 SHA256 be52e35c887e489806f4db6f9cc24a5a76f0d9e62b02b4bc0f203162bcfa4bf0 SHA512 0a2c6884ff96c1bab8de52467afdba253e06c6d873d5e389ac2f84c485e4e4fa1bd5cb95a907b0ab49777755afcc1a26446f653ded9b3e3f64b576af14013296 WHIRLPOOL ecdcfb7f9ea1801906b74d47dedf5ade6f3dd9a147614dc19e26efa36edac20cd648491b5bd96d95194f5f5c181d3cb6268be6837887dde647970d82cc75763c
diff --git a/sec-policy/selinux-virt/selinux-virt-2.20170204-r1.ebuild b/sec-policy/selinux-virt/selinux-virt-2.20170204-r1.ebuild
index f577dadd1bb5..1e81f92d5cc7 100644
--- a/sec-policy/selinux-virt/selinux-virt-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-virt/selinux-virt-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-virt/selinux-virt-2.20170204-r2.ebuild b/sec-policy/selinux-virt/selinux-virt-2.20170204-r2.ebuild
index c3ca8822dbf6..6c625e778520 100644
--- a/sec-policy/selinux-virt/selinux-virt-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-virt/selinux-virt-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-virt/selinux-virt-2.20170204-r3.ebuild b/sec-policy/selinux-virt/selinux-virt-2.20170204-r3.ebuild
index c3ca8822dbf6..6c625e778520 100644
--- a/sec-policy/selinux-virt/selinux-virt-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-virt/selinux-virt-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-virt/selinux-virt-2.20170204-r4.ebuild b/sec-policy/selinux-virt/selinux-virt-2.20170204-r4.ebuild
index c3ca8822dbf6..6c625e778520 100644
--- a/sec-policy/selinux-virt/selinux-virt-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-virt/selinux-virt-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-virt/selinux-virt-2.20170805-r2.ebuild b/sec-policy/selinux-virt/selinux-virt-2.20170805-r2.ebuild
index c3ca8822dbf6..6c625e778520 100644
--- a/sec-policy/selinux-virt/selinux-virt-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-virt/selinux-virt-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-virt/selinux-virt-2.20170805-r3.ebuild b/sec-policy/selinux-virt/selinux-virt-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..1e81f92d5cc7
--- /dev/null
+++ b/sec-policy/selinux-virt/selinux-virt-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-virt/selinux-virt-9999.ebuild b/sec-policy/selinux-virt/selinux-virt-9999.ebuild
index f577dadd1bb5..1e81f92d5cc7 100644
--- a/sec-policy/selinux-virt/selinux-virt-9999.ebuild
+++ b/sec-policy/selinux-virt/selinux-virt-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-vlock/Manifest b/sec-policy/selinux-vlock/Manifest
index 001557c8b101..50af2cece948 100644
--- a/sec-policy/selinux-vlock/Manifest
+++ b/sec-policy/selinux-vlock/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-vlock-2.20170204-r1.ebuild 281 SHA256 e664e90643c6707283b89cfe08fc8ff5e845416826e55bd15bf91c6484ab623f SHA512 b139231066ab7885a4bc1ae1d6a2b4daf3f63426828d7f15d48965ae1b77f817e2d61f2f4e17b3d53a76e092161cc63b1e2f063fb8cfc82e8909dee6bcc8efd5 WHIRLPOOL a802e831f5272d1c42b017433c738d1c15234af5e3c099d369f78b0fb80adc5d30803f2e345ee1603f75729aeec8d053bdeaaf9e42bda9d9a9410ddab24cf8a6
-EBUILD selinux-vlock-2.20170204-r2.ebuild 279 SHA256 5d6d92aa633fb4cc971dc0e49ad5fd6bd7a4e5f6e80dfdb43f18bc2bf7e2762f SHA512 e4f523c66f4c83b0070140657eb704b63d492fe9eef13513678c5fdd7279d4278299d7c58bebfac1726a9123be7a229049a722532aaec2ab3b2d7431124dea78 WHIRLPOOL baa6e325470d6aee90519ead32571e2637536901947dcbcbf54d1c8e84a6f4807b6a58b10989f952e4ed72f8233fc2ae0b746ad0b00fa29f70ab820bd7545bc5
-EBUILD selinux-vlock-2.20170204-r3.ebuild 279 SHA256 5d6d92aa633fb4cc971dc0e49ad5fd6bd7a4e5f6e80dfdb43f18bc2bf7e2762f SHA512 e4f523c66f4c83b0070140657eb704b63d492fe9eef13513678c5fdd7279d4278299d7c58bebfac1726a9123be7a229049a722532aaec2ab3b2d7431124dea78 WHIRLPOOL baa6e325470d6aee90519ead32571e2637536901947dcbcbf54d1c8e84a6f4807b6a58b10989f952e4ed72f8233fc2ae0b746ad0b00fa29f70ab820bd7545bc5
-EBUILD selinux-vlock-2.20170204-r4.ebuild 279 SHA256 5d6d92aa633fb4cc971dc0e49ad5fd6bd7a4e5f6e80dfdb43f18bc2bf7e2762f SHA512 e4f523c66f4c83b0070140657eb704b63d492fe9eef13513678c5fdd7279d4278299d7c58bebfac1726a9123be7a229049a722532aaec2ab3b2d7431124dea78 WHIRLPOOL baa6e325470d6aee90519ead32571e2637536901947dcbcbf54d1c8e84a6f4807b6a58b10989f952e4ed72f8233fc2ae0b746ad0b00fa29f70ab820bd7545bc5
-EBUILD selinux-vlock-2.20170805-r2.ebuild 279 SHA256 5d6d92aa633fb4cc971dc0e49ad5fd6bd7a4e5f6e80dfdb43f18bc2bf7e2762f SHA512 e4f523c66f4c83b0070140657eb704b63d492fe9eef13513678c5fdd7279d4278299d7c58bebfac1726a9123be7a229049a722532aaec2ab3b2d7431124dea78 WHIRLPOOL baa6e325470d6aee90519ead32571e2637536901947dcbcbf54d1c8e84a6f4807b6a58b10989f952e4ed72f8233fc2ae0b746ad0b00fa29f70ab820bd7545bc5
-EBUILD selinux-vlock-9999.ebuild 281 SHA256 e664e90643c6707283b89cfe08fc8ff5e845416826e55bd15bf91c6484ab623f SHA512 b139231066ab7885a4bc1ae1d6a2b4daf3f63426828d7f15d48965ae1b77f817e2d61f2f4e17b3d53a76e092161cc63b1e2f063fb8cfc82e8909dee6bcc8efd5 WHIRLPOOL a802e831f5272d1c42b017433c738d1c15234af5e3c099d369f78b0fb80adc5d30803f2e345ee1603f75729aeec8d053bdeaaf9e42bda9d9a9410ddab24cf8a6
+EBUILD selinux-vlock-2.20170204-r1.ebuild 282 SHA256 17b8dd93f43a6940d974bf999294301d834e4d67468b8103bae89e6bb12af653 SHA512 87a355509b1b4c003a48a600434ef805b18d69572674c58b1d022e99a58863fde715bc519386aa16413c2b5779692180f9716333a8e0b5dfdb2b9053d24ee163 WHIRLPOOL bf113956cd19976ecf92ec53dcea6c5d70a07d172b91695363c20a3042ff89b787b7f7935268bb3d9a955cbf08779763a19a3dc2e77c5e61ad9871a83d11633e
+EBUILD selinux-vlock-2.20170204-r2.ebuild 280 SHA256 087d55be52fb51526f2d28f0e10d91e5747e5199b4d004526774a6c51988b3a4 SHA512 49f5dd2962ce625a7a668708e6961276fd6c0eba312289d038d0bc6bd776ae1b78dc94b9fc965787ff96abc97480c81bc9e7dca8d51563c60e850a082f48336b WHIRLPOOL b32210414b4a063404f9e3efed9a4eaa68d671eb137d06e89505e3841c944277f600c77452c23516ceb78f83ab6b19d46c795b981e9d575308acfeea0c680cab
+EBUILD selinux-vlock-2.20170204-r3.ebuild 280 SHA256 087d55be52fb51526f2d28f0e10d91e5747e5199b4d004526774a6c51988b3a4 SHA512 49f5dd2962ce625a7a668708e6961276fd6c0eba312289d038d0bc6bd776ae1b78dc94b9fc965787ff96abc97480c81bc9e7dca8d51563c60e850a082f48336b WHIRLPOOL b32210414b4a063404f9e3efed9a4eaa68d671eb137d06e89505e3841c944277f600c77452c23516ceb78f83ab6b19d46c795b981e9d575308acfeea0c680cab
+EBUILD selinux-vlock-2.20170204-r4.ebuild 280 SHA256 087d55be52fb51526f2d28f0e10d91e5747e5199b4d004526774a6c51988b3a4 SHA512 49f5dd2962ce625a7a668708e6961276fd6c0eba312289d038d0bc6bd776ae1b78dc94b9fc965787ff96abc97480c81bc9e7dca8d51563c60e850a082f48336b WHIRLPOOL b32210414b4a063404f9e3efed9a4eaa68d671eb137d06e89505e3841c944277f600c77452c23516ceb78f83ab6b19d46c795b981e9d575308acfeea0c680cab
+EBUILD selinux-vlock-2.20170805-r2.ebuild 280 SHA256 087d55be52fb51526f2d28f0e10d91e5747e5199b4d004526774a6c51988b3a4 SHA512 49f5dd2962ce625a7a668708e6961276fd6c0eba312289d038d0bc6bd776ae1b78dc94b9fc965787ff96abc97480c81bc9e7dca8d51563c60e850a082f48336b WHIRLPOOL b32210414b4a063404f9e3efed9a4eaa68d671eb137d06e89505e3841c944277f600c77452c23516ceb78f83ab6b19d46c795b981e9d575308acfeea0c680cab
+EBUILD selinux-vlock-2.20170805-r3.ebuild 282 SHA256 17b8dd93f43a6940d974bf999294301d834e4d67468b8103bae89e6bb12af653 SHA512 87a355509b1b4c003a48a600434ef805b18d69572674c58b1d022e99a58863fde715bc519386aa16413c2b5779692180f9716333a8e0b5dfdb2b9053d24ee163 WHIRLPOOL bf113956cd19976ecf92ec53dcea6c5d70a07d172b91695363c20a3042ff89b787b7f7935268bb3d9a955cbf08779763a19a3dc2e77c5e61ad9871a83d11633e
+EBUILD selinux-vlock-9999.ebuild 282 SHA256 17b8dd93f43a6940d974bf999294301d834e4d67468b8103bae89e6bb12af653 SHA512 87a355509b1b4c003a48a600434ef805b18d69572674c58b1d022e99a58863fde715bc519386aa16413c2b5779692180f9716333a8e0b5dfdb2b9053d24ee163 WHIRLPOOL bf113956cd19976ecf92ec53dcea6c5d70a07d172b91695363c20a3042ff89b787b7f7935268bb3d9a955cbf08779763a19a3dc2e77c5e61ad9871a83d11633e
 MISC ChangeLog 10479 SHA256 4eeb639e72c662af0ac5c194b02e4410bfb73c3476be890de947ac3589d373ca SHA512 ddc8e8ea2ecabdd52ab7b5a3a233055bea36f4e5f1bcef9c4265c15a7262808ea4719e6764f0f9aa5deb0dd52141bf27dfca2dfd0ddf2580b68dbbebe456a250 WHIRLPOOL 712da4d5b18aab35ae2de4fe75acb3d45e1d56eb85aec01537e0c14e3009cb04d6b6f34241994eb33e18b36407c44b9b8c84489b6068cf5c3e0c5c8f5096ec71
 MISC ChangeLog-2015 9749 SHA256 3ef6ddf9316fba56a92df4676947678b4c793bb24eaf3a2aa282df91f1b389a2 SHA512 d791e3c8f74b4deb1c087dfc54f70fbb58e18e31b1dba075a215b69912fe0d25e2d45433b15db71225c1e9968f30ee7d9cf5b9e9f774d089e7d361b3ad2634bd WHIRLPOOL 037dedb2b04be333e87fdc797c692a545802dbce370015b055643f2b9462eb913c548e829aaa14181bc17daa878f32fc1edaaa94683fc747394ae8421552b207
 MISC metadata.xml 315 SHA256 227a2e1e2f5a0c5e76b9950cfe9e03353d70f9dbc2d566609786db97d6203ee3 SHA512 5ded38e727d6a36ea133c0500a64212b193ff5935a53386bf4ca2286e4d18e9468ad18f5fb4c80e9d0cde1d4e1713f4a5fbfe7ede03ed17e3ee573dce1a094b1 WHIRLPOOL 3853e62a3ec1f03906d9d253713f6439cf4da81e0f216e526fb7dfcaaba7f389cfd9fb73c127c40a695ded92f2c96312d8d8cff41500e85ba439e47844504039
diff --git a/sec-policy/selinux-vlock/selinux-vlock-2.20170204-r1.ebuild b/sec-policy/selinux-vlock/selinux-vlock-2.20170204-r1.ebuild
index 7df46c97cec4..908b9dd52b8b 100644
--- a/sec-policy/selinux-vlock/selinux-vlock-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-vlock/selinux-vlock-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-vlock/selinux-vlock-2.20170204-r2.ebuild b/sec-policy/selinux-vlock/selinux-vlock-2.20170204-r2.ebuild
index 19904afa7787..292f78fe8861 100644
--- a/sec-policy/selinux-vlock/selinux-vlock-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-vlock/selinux-vlock-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-vlock/selinux-vlock-2.20170204-r3.ebuild b/sec-policy/selinux-vlock/selinux-vlock-2.20170204-r3.ebuild
index 19904afa7787..292f78fe8861 100644
--- a/sec-policy/selinux-vlock/selinux-vlock-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-vlock/selinux-vlock-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-vlock/selinux-vlock-2.20170204-r4.ebuild b/sec-policy/selinux-vlock/selinux-vlock-2.20170204-r4.ebuild
index 19904afa7787..292f78fe8861 100644
--- a/sec-policy/selinux-vlock/selinux-vlock-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-vlock/selinux-vlock-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-vlock/selinux-vlock-2.20170805-r2.ebuild b/sec-policy/selinux-vlock/selinux-vlock-2.20170805-r2.ebuild
index 19904afa7787..292f78fe8861 100644
--- a/sec-policy/selinux-vlock/selinux-vlock-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-vlock/selinux-vlock-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-vlock/selinux-vlock-2.20170805-r3.ebuild b/sec-policy/selinux-vlock/selinux-vlock-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..908b9dd52b8b
--- /dev/null
+++ b/sec-policy/selinux-vlock/selinux-vlock-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-vlock/selinux-vlock-9999.ebuild b/sec-policy/selinux-vlock/selinux-vlock-9999.ebuild
index 7df46c97cec4..908b9dd52b8b 100644
--- a/sec-policy/selinux-vlock/selinux-vlock-9999.ebuild
+++ b/sec-policy/selinux-vlock/selinux-vlock-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-vmware/Manifest b/sec-policy/selinux-vmware/Manifest
index c91304688a81..a0d0cbf11215 100644
--- a/sec-policy/selinux-vmware/Manifest
+++ b/sec-policy/selinux-vmware/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-vmware-2.20170204-r1.ebuild 381 SHA256 926772bd1da952cf2761b138bb4d4f3425a9838af77d6be18ae20e57d8133362 SHA512 ad582441a21798a0a557bbd4f2de8fab634a2bc703937e8b0701e651f06781b2568166611b6812a7edec61261ea56317f461537d675295f386722d545a24298f WHIRLPOOL aff7125bf2fab3da535b4e3ba6ae0a38082a5554f964b28f3a0d5b7612c959f371889943738b48fbbb932862303b0c1d3fd98e813f6b174e68f064c2ac7e18dd
-EBUILD selinux-vmware-2.20170204-r2.ebuild 379 SHA256 eb7a07abf97583ba58e3de7dcf65bba9892d305126889486769157dafdb94a28 SHA512 3b6471bd779e3e1294961c05aab9c2f56f39ba7424b1f6b855047e9b999ba7ffb476319ba56982ddc901ec7d77c47cef1ab4d67001503183a038d6dff08a362b WHIRLPOOL 08b418cea3a7603601b10b1dfe1079035b0019f1df377f2abbf666056ed31015aa260ee98917f852ebe40f54570877861dfcef28138e9db4ff893be1d894b12c
-EBUILD selinux-vmware-2.20170204-r3.ebuild 379 SHA256 eb7a07abf97583ba58e3de7dcf65bba9892d305126889486769157dafdb94a28 SHA512 3b6471bd779e3e1294961c05aab9c2f56f39ba7424b1f6b855047e9b999ba7ffb476319ba56982ddc901ec7d77c47cef1ab4d67001503183a038d6dff08a362b WHIRLPOOL 08b418cea3a7603601b10b1dfe1079035b0019f1df377f2abbf666056ed31015aa260ee98917f852ebe40f54570877861dfcef28138e9db4ff893be1d894b12c
-EBUILD selinux-vmware-2.20170204-r4.ebuild 379 SHA256 eb7a07abf97583ba58e3de7dcf65bba9892d305126889486769157dafdb94a28 SHA512 3b6471bd779e3e1294961c05aab9c2f56f39ba7424b1f6b855047e9b999ba7ffb476319ba56982ddc901ec7d77c47cef1ab4d67001503183a038d6dff08a362b WHIRLPOOL 08b418cea3a7603601b10b1dfe1079035b0019f1df377f2abbf666056ed31015aa260ee98917f852ebe40f54570877861dfcef28138e9db4ff893be1d894b12c
-EBUILD selinux-vmware-2.20170805-r2.ebuild 379 SHA256 eb7a07abf97583ba58e3de7dcf65bba9892d305126889486769157dafdb94a28 SHA512 3b6471bd779e3e1294961c05aab9c2f56f39ba7424b1f6b855047e9b999ba7ffb476319ba56982ddc901ec7d77c47cef1ab4d67001503183a038d6dff08a362b WHIRLPOOL 08b418cea3a7603601b10b1dfe1079035b0019f1df377f2abbf666056ed31015aa260ee98917f852ebe40f54570877861dfcef28138e9db4ff893be1d894b12c
-EBUILD selinux-vmware-9999.ebuild 381 SHA256 926772bd1da952cf2761b138bb4d4f3425a9838af77d6be18ae20e57d8133362 SHA512 ad582441a21798a0a557bbd4f2de8fab634a2bc703937e8b0701e651f06781b2568166611b6812a7edec61261ea56317f461537d675295f386722d545a24298f WHIRLPOOL aff7125bf2fab3da535b4e3ba6ae0a38082a5554f964b28f3a0d5b7612c959f371889943738b48fbbb932862303b0c1d3fd98e813f6b174e68f064c2ac7e18dd
+EBUILD selinux-vmware-2.20170204-r1.ebuild 382 SHA256 fa789e0b6b0d74bc078579949f81262555df411989175aa6b6821eea248ef8a7 SHA512 2e3e8d351d0d2f78220aff7a4b86bce74c00672375c4e55d72fe30479598e80cfae7cea6f8c53fce75a1e78512b9385ca1405058356bab835e7b8bee3e566f91 WHIRLPOOL 2d79dc97aa85482c8692bf1a8d14bdb53c6df6f6c39341b610d6f7de9c6c328adc22041b259defa0ec5870ed02fff1aeb0f4a190ee425246467ad7d967039559
+EBUILD selinux-vmware-2.20170204-r2.ebuild 380 SHA256 052455d6b9b6c625943a2d1630cf4015491227ba3cace8b0e49690edea0266c6 SHA512 89217f6d0d04924235c8b557c528cb63006471381adcd83bfbedee2a60a1665f9d0b3901c99d1900db4ea5457ddc20218fbf5eab5e8ed4bdc0df95169d0ddb66 WHIRLPOOL e5d26824aa050c4b52ad9a48ad36b8498f6c1378928a0df99e30e53c872097e2d215f0a984c16d50368efca7e536ee204cc58fb521f5cbdb27d7f10e445fd37b
+EBUILD selinux-vmware-2.20170204-r3.ebuild 380 SHA256 052455d6b9b6c625943a2d1630cf4015491227ba3cace8b0e49690edea0266c6 SHA512 89217f6d0d04924235c8b557c528cb63006471381adcd83bfbedee2a60a1665f9d0b3901c99d1900db4ea5457ddc20218fbf5eab5e8ed4bdc0df95169d0ddb66 WHIRLPOOL e5d26824aa050c4b52ad9a48ad36b8498f6c1378928a0df99e30e53c872097e2d215f0a984c16d50368efca7e536ee204cc58fb521f5cbdb27d7f10e445fd37b
+EBUILD selinux-vmware-2.20170204-r4.ebuild 380 SHA256 052455d6b9b6c625943a2d1630cf4015491227ba3cace8b0e49690edea0266c6 SHA512 89217f6d0d04924235c8b557c528cb63006471381adcd83bfbedee2a60a1665f9d0b3901c99d1900db4ea5457ddc20218fbf5eab5e8ed4bdc0df95169d0ddb66 WHIRLPOOL e5d26824aa050c4b52ad9a48ad36b8498f6c1378928a0df99e30e53c872097e2d215f0a984c16d50368efca7e536ee204cc58fb521f5cbdb27d7f10e445fd37b
+EBUILD selinux-vmware-2.20170805-r2.ebuild 380 SHA256 052455d6b9b6c625943a2d1630cf4015491227ba3cace8b0e49690edea0266c6 SHA512 89217f6d0d04924235c8b557c528cb63006471381adcd83bfbedee2a60a1665f9d0b3901c99d1900db4ea5457ddc20218fbf5eab5e8ed4bdc0df95169d0ddb66 WHIRLPOOL e5d26824aa050c4b52ad9a48ad36b8498f6c1378928a0df99e30e53c872097e2d215f0a984c16d50368efca7e536ee204cc58fb521f5cbdb27d7f10e445fd37b
+EBUILD selinux-vmware-2.20170805-r3.ebuild 382 SHA256 fa789e0b6b0d74bc078579949f81262555df411989175aa6b6821eea248ef8a7 SHA512 2e3e8d351d0d2f78220aff7a4b86bce74c00672375c4e55d72fe30479598e80cfae7cea6f8c53fce75a1e78512b9385ca1405058356bab835e7b8bee3e566f91 WHIRLPOOL 2d79dc97aa85482c8692bf1a8d14bdb53c6df6f6c39341b610d6f7de9c6c328adc22041b259defa0ec5870ed02fff1aeb0f4a190ee425246467ad7d967039559
+EBUILD selinux-vmware-9999.ebuild 382 SHA256 fa789e0b6b0d74bc078579949f81262555df411989175aa6b6821eea248ef8a7 SHA512 2e3e8d351d0d2f78220aff7a4b86bce74c00672375c4e55d72fe30479598e80cfae7cea6f8c53fce75a1e78512b9385ca1405058356bab835e7b8bee3e566f91 WHIRLPOOL 2d79dc97aa85482c8692bf1a8d14bdb53c6df6f6c39341b610d6f7de9c6c328adc22041b259defa0ec5870ed02fff1aeb0f4a190ee425246467ad7d967039559
 MISC ChangeLog 10571 SHA256 1aeec633331b6de3f1a93e8c46aba1524e9e50ec345e8b204f7da681e260fa08 SHA512 daa95c95722242c941ff98ce7f1332aa325c1459df6e919b70d9a317a31d4a386c1388bfff7782c0a32f4b4b5a77f3e352577d90fe94e5a70fdad7d9f9559328 WHIRLPOOL 6bd4cfcd61d539b1d239844763fdb1cc492e643aae3a05e15a60ec61812184950e3eeee1d15b1812dfe58a020b069459e46182dceb26042458251696885a2ff4
 MISC ChangeLog-2015 10604 SHA256 7b85b3f72e8b9a08c010d8158c5962746c8e247c771584f41671d1c0139ac743 SHA512 a1d0cecdc74bbdd9e84e1fab74786fa757b1261e4ed576ad56b369259732a1b72987c65c74943d9e74843f25d8ed81ee06ade630e588a4fd9c808691e48d1da4 WHIRLPOOL 8ce401b529991442283d255d01d9b88f2c62191c99532f4b43eec54b7e92d45b66b482762aafae15409ff65ff815d40f639ea345d790cacd2b6e86963cd71d7e
 MISC metadata.xml 316 SHA256 cf0ef9a74c9cf88418c4c66004a17325ae70cd3de408176629da9c2bf6214c69 SHA512 6410be397d5216abf34e154e3d52de5bccddeceebe65bf886df5628c459cbc346c585debcc4d89ceac8302d9eb80acc1c7460c0a6327344850896aad2050d6fb WHIRLPOOL 19645ee23701ad6e9e8b5fb9f39bda236ad72622c7e235f82b3e072aa8c1ada65b4832b5fa1a08e6b3561b30b0f1a78108a95ef7ee70683d5a572afda85a14e2
diff --git a/sec-policy/selinux-vmware/selinux-vmware-2.20170204-r1.ebuild b/sec-policy/selinux-vmware/selinux-vmware-2.20170204-r1.ebuild
index 3839cd77bb2d..6845b4dbd1fd 100644
--- a/sec-policy/selinux-vmware/selinux-vmware-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-vmware/selinux-vmware-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-vmware/selinux-vmware-2.20170204-r2.ebuild b/sec-policy/selinux-vmware/selinux-vmware-2.20170204-r2.ebuild
index b0687287aa60..8f875de1fced 100644
--- a/sec-policy/selinux-vmware/selinux-vmware-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-vmware/selinux-vmware-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-vmware/selinux-vmware-2.20170204-r3.ebuild b/sec-policy/selinux-vmware/selinux-vmware-2.20170204-r3.ebuild
index b0687287aa60..8f875de1fced 100644
--- a/sec-policy/selinux-vmware/selinux-vmware-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-vmware/selinux-vmware-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-vmware/selinux-vmware-2.20170204-r4.ebuild b/sec-policy/selinux-vmware/selinux-vmware-2.20170204-r4.ebuild
index b0687287aa60..8f875de1fced 100644
--- a/sec-policy/selinux-vmware/selinux-vmware-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-vmware/selinux-vmware-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-vmware/selinux-vmware-2.20170805-r2.ebuild b/sec-policy/selinux-vmware/selinux-vmware-2.20170805-r2.ebuild
index b0687287aa60..8f875de1fced 100644
--- a/sec-policy/selinux-vmware/selinux-vmware-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-vmware/selinux-vmware-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-vmware/selinux-vmware-2.20170805-r3.ebuild b/sec-policy/selinux-vmware/selinux-vmware-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..6845b4dbd1fd
--- /dev/null
+++ b/sec-policy/selinux-vmware/selinux-vmware-2.20170805-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-vmware/selinux-vmware-9999.ebuild b/sec-policy/selinux-vmware/selinux-vmware-9999.ebuild
index 3839cd77bb2d..6845b4dbd1fd 100644
--- a/sec-policy/selinux-vmware/selinux-vmware-9999.ebuild
+++ b/sec-policy/selinux-vmware/selinux-vmware-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-vnstatd/Manifest b/sec-policy/selinux-vnstatd/Manifest
index 7ac9190749c2..55879e2c7085 100644
--- a/sec-policy/selinux-vnstatd/Manifest
+++ b/sec-policy/selinux-vnstatd/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-vnstatd-2.20170204-r1.ebuild 285 SHA256 105f930e4f1230874a031df02a204fd4e0bf038e544679df7d1be02f9185d484 SHA512 9343320d5828b08c169a83450fe911562cdc19cef8aea935cfdf38cc2ea8882a9c052a7dee65e66ba89172806e2fb77834fef01038c1926fa7fb849366a8d747 WHIRLPOOL e06a3bde014c98f826636e550d01edb4e701324b8299aa9833a12907a5ff1ea02b9f797c1566eeb2fd9bd4958ccb3f05717b4cc50f1e8b0235a5facbeedac988
-EBUILD selinux-vnstatd-2.20170204-r2.ebuild 283 SHA256 f094bcba21850cdb726eb1eb41cac16b29bac40ce910565b151b72f1e5bdabf1 SHA512 41749f1105b06a94f0ada5901c68663be90aee1f3196f883017c9d9cc8cea5266f23856a390b202458a271a190d374b01962583d062ed6594d1913740585d3cd WHIRLPOOL fb57642d10c961eec9861c94bff09b363c341fac551f9a12d02d81fe34ad82f6cff8508418c7d4588d9b3ee0d6663dd6d07689e8505eb2aed2180e9d00e7ca15
-EBUILD selinux-vnstatd-2.20170204-r3.ebuild 283 SHA256 f094bcba21850cdb726eb1eb41cac16b29bac40ce910565b151b72f1e5bdabf1 SHA512 41749f1105b06a94f0ada5901c68663be90aee1f3196f883017c9d9cc8cea5266f23856a390b202458a271a190d374b01962583d062ed6594d1913740585d3cd WHIRLPOOL fb57642d10c961eec9861c94bff09b363c341fac551f9a12d02d81fe34ad82f6cff8508418c7d4588d9b3ee0d6663dd6d07689e8505eb2aed2180e9d00e7ca15
-EBUILD selinux-vnstatd-2.20170204-r4.ebuild 283 SHA256 f094bcba21850cdb726eb1eb41cac16b29bac40ce910565b151b72f1e5bdabf1 SHA512 41749f1105b06a94f0ada5901c68663be90aee1f3196f883017c9d9cc8cea5266f23856a390b202458a271a190d374b01962583d062ed6594d1913740585d3cd WHIRLPOOL fb57642d10c961eec9861c94bff09b363c341fac551f9a12d02d81fe34ad82f6cff8508418c7d4588d9b3ee0d6663dd6d07689e8505eb2aed2180e9d00e7ca15
-EBUILD selinux-vnstatd-2.20170805-r2.ebuild 283 SHA256 f094bcba21850cdb726eb1eb41cac16b29bac40ce910565b151b72f1e5bdabf1 SHA512 41749f1105b06a94f0ada5901c68663be90aee1f3196f883017c9d9cc8cea5266f23856a390b202458a271a190d374b01962583d062ed6594d1913740585d3cd WHIRLPOOL fb57642d10c961eec9861c94bff09b363c341fac551f9a12d02d81fe34ad82f6cff8508418c7d4588d9b3ee0d6663dd6d07689e8505eb2aed2180e9d00e7ca15
-EBUILD selinux-vnstatd-9999.ebuild 285 SHA256 105f930e4f1230874a031df02a204fd4e0bf038e544679df7d1be02f9185d484 SHA512 9343320d5828b08c169a83450fe911562cdc19cef8aea935cfdf38cc2ea8882a9c052a7dee65e66ba89172806e2fb77834fef01038c1926fa7fb849366a8d747 WHIRLPOOL e06a3bde014c98f826636e550d01edb4e701324b8299aa9833a12907a5ff1ea02b9f797c1566eeb2fd9bd4958ccb3f05717b4cc50f1e8b0235a5facbeedac988
+EBUILD selinux-vnstatd-2.20170204-r1.ebuild 286 SHA256 df0cc3de4c84cf56505ab83b8ea88b28152ecde21d854f8a90200662c87d38ef SHA512 a0d7f18d0e533c29b24019c7d8dc53cc0dd4f2f30c59a42eb2bfa292c53a8ce1104cced3db2ad0e5498349dd066b6518fbb184beb583d53d48c58ddf73c3d6c6 WHIRLPOOL 54575d66aa226329c66fbb6289760d26d3e9285672858a646051f58292e3663295595aac5ca878186841f4c07cfd838b287c9074337e959cfb9c9313a49e4544
+EBUILD selinux-vnstatd-2.20170204-r2.ebuild 284 SHA256 d41d81ca1e0eacb50292650710982dd60f9fa57881058b202c2279f192210eac SHA512 0970e5e49e611d78bca9544e2daba988fd4f5aa6bee376ec351bd5f02a95ce4a14c1cf679e5cac96ec95c2b63dd217ad99b285a5ebd616f735c880f5abaf21d7 WHIRLPOOL 20e8e12a14be34c2a027480b78e9dc0e6e19fa93d31aa4c5756ce2b46494089d0d04f0237c535f446edadd8127e9911bd3a26d12d5deb20c86569d331c9b4e5c
+EBUILD selinux-vnstatd-2.20170204-r3.ebuild 284 SHA256 d41d81ca1e0eacb50292650710982dd60f9fa57881058b202c2279f192210eac SHA512 0970e5e49e611d78bca9544e2daba988fd4f5aa6bee376ec351bd5f02a95ce4a14c1cf679e5cac96ec95c2b63dd217ad99b285a5ebd616f735c880f5abaf21d7 WHIRLPOOL 20e8e12a14be34c2a027480b78e9dc0e6e19fa93d31aa4c5756ce2b46494089d0d04f0237c535f446edadd8127e9911bd3a26d12d5deb20c86569d331c9b4e5c
+EBUILD selinux-vnstatd-2.20170204-r4.ebuild 284 SHA256 d41d81ca1e0eacb50292650710982dd60f9fa57881058b202c2279f192210eac SHA512 0970e5e49e611d78bca9544e2daba988fd4f5aa6bee376ec351bd5f02a95ce4a14c1cf679e5cac96ec95c2b63dd217ad99b285a5ebd616f735c880f5abaf21d7 WHIRLPOOL 20e8e12a14be34c2a027480b78e9dc0e6e19fa93d31aa4c5756ce2b46494089d0d04f0237c535f446edadd8127e9911bd3a26d12d5deb20c86569d331c9b4e5c
+EBUILD selinux-vnstatd-2.20170805-r2.ebuild 284 SHA256 d41d81ca1e0eacb50292650710982dd60f9fa57881058b202c2279f192210eac SHA512 0970e5e49e611d78bca9544e2daba988fd4f5aa6bee376ec351bd5f02a95ce4a14c1cf679e5cac96ec95c2b63dd217ad99b285a5ebd616f735c880f5abaf21d7 WHIRLPOOL 20e8e12a14be34c2a027480b78e9dc0e6e19fa93d31aa4c5756ce2b46494089d0d04f0237c535f446edadd8127e9911bd3a26d12d5deb20c86569d331c9b4e5c
+EBUILD selinux-vnstatd-2.20170805-r3.ebuild 286 SHA256 df0cc3de4c84cf56505ab83b8ea88b28152ecde21d854f8a90200662c87d38ef SHA512 a0d7f18d0e533c29b24019c7d8dc53cc0dd4f2f30c59a42eb2bfa292c53a8ce1104cced3db2ad0e5498349dd066b6518fbb184beb583d53d48c58ddf73c3d6c6 WHIRLPOOL 54575d66aa226329c66fbb6289760d26d3e9285672858a646051f58292e3663295595aac5ca878186841f4c07cfd838b287c9074337e959cfb9c9313a49e4544
+EBUILD selinux-vnstatd-9999.ebuild 286 SHA256 df0cc3de4c84cf56505ab83b8ea88b28152ecde21d854f8a90200662c87d38ef SHA512 a0d7f18d0e533c29b24019c7d8dc53cc0dd4f2f30c59a42eb2bfa292c53a8ce1104cced3db2ad0e5498349dd066b6518fbb184beb583d53d48c58ddf73c3d6c6 WHIRLPOOL 54575d66aa226329c66fbb6289760d26d3e9285672858a646051f58292e3663295595aac5ca878186841f4c07cfd838b287c9074337e959cfb9c9313a49e4544
 MISC ChangeLog 10687 SHA256 d710ab0cd039a91393e3aecdefb2c985625b68cf37f817a6512da916056906e5 SHA512 8a8941832c0fd3397b677509ef2d7134b906c4227c9dfa6eb90b6ab4ec230e22680a99df75a7ea1670afef85420875157f1345fcf1b57b3fe9ac3acdac63a3f0 WHIRLPOOL c86c557f787fcbd01d8dfa1a33b434ba8dc23adfb3650e39928ee5e8e6d09ceef2dcbad0a4d32b8bc1a8948f994da6a3ff9a83992b16896467fcf1da7fe5d27d
 MISC ChangeLog-2015 9709 SHA256 dff132a4fd2a1e854a274cf0d513e671f601d6338f5dc7fbe6498fb71d13519c SHA512 1cf0898404365df2691f0e9f2bc4882aa6dde24e4ea51c2c975fd7eb03e3c8b2c7c2a2992b49d8c3dec3d6853752af7f33dbec2db63a406741d32d87e7e6d94b WHIRLPOOL a3df7b09a435f880dc1fd59082d9b6586a3e897fd2bb184701a977ea1303b6142c0ec7ee6850a05bdc9cf671e7208a6070d6357c5ee91625bcf5206884ab1ddc
 MISC metadata.xml 317 SHA256 17f52a90b31ca3bd34986647314a4b343f45b1e1af4af5eb619e80cd71f9f95e SHA512 0384e8de44653fbeffaa82186ce1b560fa1a1f9f7c5e5255cfa61988d4189cf698da7f17abfbc35d8f608735d609496fe53077d5d9e84f870e2e376cc728c072 WHIRLPOOL c7aa1f35bf63e35687cfabff7d57e32a5b66175b881f21d7a50371356ddc09999934d2da490bc6da626396514d1b38efc54a9acb70e4ae63fbd8af3dba889ca5
diff --git a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20170204-r1.ebuild b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20170204-r1.ebuild
index b99e38bb25bb..f4b210298df8 100644
--- a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20170204-r2.ebuild b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20170204-r2.ebuild
index 4e2bfdbb48aa..cfefdd158567 100644
--- a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20170204-r3.ebuild b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20170204-r3.ebuild
index 4e2bfdbb48aa..cfefdd158567 100644
--- a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20170204-r4.ebuild b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20170204-r4.ebuild
index 4e2bfdbb48aa..cfefdd158567 100644
--- a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20170805-r2.ebuild b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20170805-r2.ebuild
index 4e2bfdbb48aa..cfefdd158567 100644
--- a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20170805-r3.ebuild b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..f4b210298df8
--- /dev/null
+++ b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-vnstatd/selinux-vnstatd-9999.ebuild b/sec-policy/selinux-vnstatd/selinux-vnstatd-9999.ebuild
index b99e38bb25bb..f4b210298df8 100644
--- a/sec-policy/selinux-vnstatd/selinux-vnstatd-9999.ebuild
+++ b/sec-policy/selinux-vnstatd/selinux-vnstatd-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-vpn/Manifest b/sec-policy/selinux-vpn/Manifest
index d5938f8ae65c..d8f57296a742 100644
--- a/sec-policy/selinux-vpn/Manifest
+++ b/sec-policy/selinux-vpn/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-vpn-2.20170204-r1.ebuild 277 SHA256 3d507060ac1508c5a287358fd59a4c044a234b8f0aa49c9c90647b9f0685c3f4 SHA512 03552bc74636611846b8489998ec23cf16fde8720138efa0452284403cf0b536c3f6359e01b0e550ed88a8367033cd5b8aea22c216aec2a235708292d111768e WHIRLPOOL 800795b7034af7ea17e37c428c5b3969078115e427dddc96860e21f3c5c1cb664cf412726df2c26a94e7440b384d9855491eb95d29981f555c208bbdf6dbed4d
-EBUILD selinux-vpn-2.20170204-r2.ebuild 275 SHA256 a4f023427e37265e1f296b18694a1c9cb0ef0a3504ba5822207b092e7ef621eb SHA512 4cfeeb83c6120ac6744304664f960b601b8468bc0d61a7503c75741f41e91353dd55a10f4d4a1c2630b45e555ba9de04fbbbbfa0800f66c132b33d4d821a4de3 WHIRLPOOL 3d296ebf75791e036dc052d7dfb091ee266b34f418a4b035160da64665889d5752d7a5342c65dfe8e02a7b5fcae9995b3eebd8a93330132bbf35a1ffda177266
-EBUILD selinux-vpn-2.20170204-r3.ebuild 275 SHA256 a4f023427e37265e1f296b18694a1c9cb0ef0a3504ba5822207b092e7ef621eb SHA512 4cfeeb83c6120ac6744304664f960b601b8468bc0d61a7503c75741f41e91353dd55a10f4d4a1c2630b45e555ba9de04fbbbbfa0800f66c132b33d4d821a4de3 WHIRLPOOL 3d296ebf75791e036dc052d7dfb091ee266b34f418a4b035160da64665889d5752d7a5342c65dfe8e02a7b5fcae9995b3eebd8a93330132bbf35a1ffda177266
-EBUILD selinux-vpn-2.20170204-r4.ebuild 275 SHA256 a4f023427e37265e1f296b18694a1c9cb0ef0a3504ba5822207b092e7ef621eb SHA512 4cfeeb83c6120ac6744304664f960b601b8468bc0d61a7503c75741f41e91353dd55a10f4d4a1c2630b45e555ba9de04fbbbbfa0800f66c132b33d4d821a4de3 WHIRLPOOL 3d296ebf75791e036dc052d7dfb091ee266b34f418a4b035160da64665889d5752d7a5342c65dfe8e02a7b5fcae9995b3eebd8a93330132bbf35a1ffda177266
-EBUILD selinux-vpn-2.20170805-r2.ebuild 275 SHA256 a4f023427e37265e1f296b18694a1c9cb0ef0a3504ba5822207b092e7ef621eb SHA512 4cfeeb83c6120ac6744304664f960b601b8468bc0d61a7503c75741f41e91353dd55a10f4d4a1c2630b45e555ba9de04fbbbbfa0800f66c132b33d4d821a4de3 WHIRLPOOL 3d296ebf75791e036dc052d7dfb091ee266b34f418a4b035160da64665889d5752d7a5342c65dfe8e02a7b5fcae9995b3eebd8a93330132bbf35a1ffda177266
-EBUILD selinux-vpn-9999.ebuild 277 SHA256 3d507060ac1508c5a287358fd59a4c044a234b8f0aa49c9c90647b9f0685c3f4 SHA512 03552bc74636611846b8489998ec23cf16fde8720138efa0452284403cf0b536c3f6359e01b0e550ed88a8367033cd5b8aea22c216aec2a235708292d111768e WHIRLPOOL 800795b7034af7ea17e37c428c5b3969078115e427dddc96860e21f3c5c1cb664cf412726df2c26a94e7440b384d9855491eb95d29981f555c208bbdf6dbed4d
+EBUILD selinux-vpn-2.20170204-r1.ebuild 278 SHA256 2bc833c34d900884643fa0b895915d265103605905479179ac70df270d6f2fbb SHA512 c32e36f7de207fc5cc25e083e85058f121929fd751b5d6ce291197c1e93180376ab0d82c6d6f77f3ccfac103527562f97e731614f0401e024607fa0a11f9f6a3 WHIRLPOOL 4f6cc72ad21355265efde90b8035cc6a51e5db21801088f822355ad93715695725166bb3715ea3eb38c4d724e17a36659edb89110b61b75a1ec6e902fbec8d11
+EBUILD selinux-vpn-2.20170204-r2.ebuild 276 SHA256 5e2f199980409042470a53f4b241686a6fa99c7d3244f24ad0260b7240ea30b7 SHA512 b731ce1e3926f4fa4e92528a453bcd1967800dc8bb708acefe49897acddaf52ecd6f796716cb7d1311feb4779c80f698dd9d2a2a97a50be1404af2fdba1c05d9 WHIRLPOOL 46638fc554c08de49444438a4cf281c78c21b8edb9f0b9181c2559cf399a15de25e4e7010ea846483f7039b1c2f91256fc99a928731dac1e82caed544dc418ca
+EBUILD selinux-vpn-2.20170204-r3.ebuild 276 SHA256 5e2f199980409042470a53f4b241686a6fa99c7d3244f24ad0260b7240ea30b7 SHA512 b731ce1e3926f4fa4e92528a453bcd1967800dc8bb708acefe49897acddaf52ecd6f796716cb7d1311feb4779c80f698dd9d2a2a97a50be1404af2fdba1c05d9 WHIRLPOOL 46638fc554c08de49444438a4cf281c78c21b8edb9f0b9181c2559cf399a15de25e4e7010ea846483f7039b1c2f91256fc99a928731dac1e82caed544dc418ca
+EBUILD selinux-vpn-2.20170204-r4.ebuild 276 SHA256 5e2f199980409042470a53f4b241686a6fa99c7d3244f24ad0260b7240ea30b7 SHA512 b731ce1e3926f4fa4e92528a453bcd1967800dc8bb708acefe49897acddaf52ecd6f796716cb7d1311feb4779c80f698dd9d2a2a97a50be1404af2fdba1c05d9 WHIRLPOOL 46638fc554c08de49444438a4cf281c78c21b8edb9f0b9181c2559cf399a15de25e4e7010ea846483f7039b1c2f91256fc99a928731dac1e82caed544dc418ca
+EBUILD selinux-vpn-2.20170805-r2.ebuild 276 SHA256 5e2f199980409042470a53f4b241686a6fa99c7d3244f24ad0260b7240ea30b7 SHA512 b731ce1e3926f4fa4e92528a453bcd1967800dc8bb708acefe49897acddaf52ecd6f796716cb7d1311feb4779c80f698dd9d2a2a97a50be1404af2fdba1c05d9 WHIRLPOOL 46638fc554c08de49444438a4cf281c78c21b8edb9f0b9181c2559cf399a15de25e4e7010ea846483f7039b1c2f91256fc99a928731dac1e82caed544dc418ca
+EBUILD selinux-vpn-2.20170805-r3.ebuild 278 SHA256 2bc833c34d900884643fa0b895915d265103605905479179ac70df270d6f2fbb SHA512 c32e36f7de207fc5cc25e083e85058f121929fd751b5d6ce291197c1e93180376ab0d82c6d6f77f3ccfac103527562f97e731614f0401e024607fa0a11f9f6a3 WHIRLPOOL 4f6cc72ad21355265efde90b8035cc6a51e5db21801088f822355ad93715695725166bb3715ea3eb38c4d724e17a36659edb89110b61b75a1ec6e902fbec8d11
+EBUILD selinux-vpn-9999.ebuild 278 SHA256 2bc833c34d900884643fa0b895915d265103605905479179ac70df270d6f2fbb SHA512 c32e36f7de207fc5cc25e083e85058f121929fd751b5d6ce291197c1e93180376ab0d82c6d6f77f3ccfac103527562f97e731614f0401e024607fa0a11f9f6a3 WHIRLPOOL 4f6cc72ad21355265efde90b8035cc6a51e5db21801088f822355ad93715695725166bb3715ea3eb38c4d724e17a36659edb89110b61b75a1ec6e902fbec8d11
 MISC ChangeLog 10295 SHA256 18d5aedfbbf3220f1096c5e4c5653fae97bf5c5550d97b9b499734fb915d90ce SHA512 f51078c574a0ad499f9efe5c92362d814eb524b4722a173b790df1acda15b1e9a845738d143c97393067421d85efa19a03959ceefd082be94baddcd3b16ab144 WHIRLPOOL 6cdf43781f1d802e4c0e83679814a58da6b93010014873eabbac46c3b5379b62b770b134692ffad6967c2f49fe36b00cdde7415f0dab0644176856890b1adcef
 MISC ChangeLog-2015 9523 SHA256 3885c66767e992284bc405a1ec1a3769e692c71e44d8b688575c1f36c7d908bf SHA512 7552848606dd6ef0708499d1828cda4037c471c2a5f19168a0e32a48b6c08ce9fc961471e6c07a56142429fbfcd0909075d4dd22475d54fe8e5ec32d269ad8a1 WHIRLPOOL 9a455c70469ee2fc12790180d0739f691408f0b1d6d98aba665dca5e268bfbd299a6f7ead3f5cd2bbf23e0b387e3e7ec73fc8620da139b728f496bdafe1dd582
 MISC metadata.xml 313 SHA256 f3d0c3ac5b27e34c1ee109f5dca1d34edfa52e6de4a86c7554e961dfe97faebb SHA512 5932c33a47a1c1a8a64b94fc174b8f284d4fbfec1852b6a971d5b72008bce6c5d532f3075ab5dbf61eca24e8f59e8723facf83c57b7d5a0d3ee490cf34abb302 WHIRLPOOL fa7be5d02d547cbe2270382b38fe2a41ad47cad43cda5faa4d9d9727637d20047fa912de90c917ec4f854be0e95fe0ae7ec1d669439f39d92b261e3c3effc4e3
diff --git a/sec-policy/selinux-vpn/selinux-vpn-2.20170204-r1.ebuild b/sec-policy/selinux-vpn/selinux-vpn-2.20170204-r1.ebuild
index d4ee3c980666..7c2d0498e818 100644
--- a/sec-policy/selinux-vpn/selinux-vpn-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-vpn/selinux-vpn-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-vpn/selinux-vpn-2.20170204-r2.ebuild b/sec-policy/selinux-vpn/selinux-vpn-2.20170204-r2.ebuild
index 5813f5a81d8c..bd9a0bb823e3 100644
--- a/sec-policy/selinux-vpn/selinux-vpn-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-vpn/selinux-vpn-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-vpn/selinux-vpn-2.20170204-r3.ebuild b/sec-policy/selinux-vpn/selinux-vpn-2.20170204-r3.ebuild
index 5813f5a81d8c..bd9a0bb823e3 100644
--- a/sec-policy/selinux-vpn/selinux-vpn-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-vpn/selinux-vpn-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-vpn/selinux-vpn-2.20170204-r4.ebuild b/sec-policy/selinux-vpn/selinux-vpn-2.20170204-r4.ebuild
index 5813f5a81d8c..bd9a0bb823e3 100644
--- a/sec-policy/selinux-vpn/selinux-vpn-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-vpn/selinux-vpn-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-vpn/selinux-vpn-2.20170805-r2.ebuild b/sec-policy/selinux-vpn/selinux-vpn-2.20170805-r2.ebuild
index 5813f5a81d8c..bd9a0bb823e3 100644
--- a/sec-policy/selinux-vpn/selinux-vpn-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-vpn/selinux-vpn-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-vpn/selinux-vpn-2.20170805-r3.ebuild b/sec-policy/selinux-vpn/selinux-vpn-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..7c2d0498e818
--- /dev/null
+++ b/sec-policy/selinux-vpn/selinux-vpn-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-vpn/selinux-vpn-9999.ebuild b/sec-policy/selinux-vpn/selinux-vpn-9999.ebuild
index d4ee3c980666..7c2d0498e818 100644
--- a/sec-policy/selinux-vpn/selinux-vpn-9999.ebuild
+++ b/sec-policy/selinux-vpn/selinux-vpn-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-watchdog/Manifest b/sec-policy/selinux-watchdog/Manifest
index 0884c68a9732..ff96437e6d6c 100644
--- a/sec-policy/selinux-watchdog/Manifest
+++ b/sec-policy/selinux-watchdog/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-watchdog-2.20170204-r1.ebuild 287 SHA256 ad2b50ff4aa4c3aca1ab219ec21f0aac64a98b44b57943ca2aa4dbe69091355d SHA512 dc0b48153998fa0e5b13f4046fb8a8facd5dd37b0fa944df88c83a8f363ef89d279b5f5facf3bb7f34e07dbc09d4b6a35a35dc6ced387cb598f6bba2a8f94f39 WHIRLPOOL cc5a79567ebb6f5bdf288bf65f87fdbb460cb209428ced9bf19b3eccabc609b76272c437fcdae24603e50fa9197f5bdee853026eef09ff9297e4cd730de9737b
-EBUILD selinux-watchdog-2.20170204-r2.ebuild 285 SHA256 9f09833a495f23c0988396f2663c189ce96e0907d2a3ef7273f7690fe2f66f7a SHA512 adee0604de3243a20340ea08072989c9ec449f10fbac1d7fd535610d88d890c2cd0c52d51dafdc6f6d0ba1c9e9d8c1dc5a9de37f26a5331d82c3947f0b95f862 WHIRLPOOL d0b3667dfea45566b9f54ad156e6b65bda0ce06d88b5b9457039d8afac26e0735c393ec404c785ac2d0a40f82b41f10d4b0d4489615531e5880d2d8001522c13
-EBUILD selinux-watchdog-2.20170204-r3.ebuild 285 SHA256 9f09833a495f23c0988396f2663c189ce96e0907d2a3ef7273f7690fe2f66f7a SHA512 adee0604de3243a20340ea08072989c9ec449f10fbac1d7fd535610d88d890c2cd0c52d51dafdc6f6d0ba1c9e9d8c1dc5a9de37f26a5331d82c3947f0b95f862 WHIRLPOOL d0b3667dfea45566b9f54ad156e6b65bda0ce06d88b5b9457039d8afac26e0735c393ec404c785ac2d0a40f82b41f10d4b0d4489615531e5880d2d8001522c13
-EBUILD selinux-watchdog-2.20170204-r4.ebuild 285 SHA256 9f09833a495f23c0988396f2663c189ce96e0907d2a3ef7273f7690fe2f66f7a SHA512 adee0604de3243a20340ea08072989c9ec449f10fbac1d7fd535610d88d890c2cd0c52d51dafdc6f6d0ba1c9e9d8c1dc5a9de37f26a5331d82c3947f0b95f862 WHIRLPOOL d0b3667dfea45566b9f54ad156e6b65bda0ce06d88b5b9457039d8afac26e0735c393ec404c785ac2d0a40f82b41f10d4b0d4489615531e5880d2d8001522c13
-EBUILD selinux-watchdog-2.20170805-r2.ebuild 285 SHA256 9f09833a495f23c0988396f2663c189ce96e0907d2a3ef7273f7690fe2f66f7a SHA512 adee0604de3243a20340ea08072989c9ec449f10fbac1d7fd535610d88d890c2cd0c52d51dafdc6f6d0ba1c9e9d8c1dc5a9de37f26a5331d82c3947f0b95f862 WHIRLPOOL d0b3667dfea45566b9f54ad156e6b65bda0ce06d88b5b9457039d8afac26e0735c393ec404c785ac2d0a40f82b41f10d4b0d4489615531e5880d2d8001522c13
-EBUILD selinux-watchdog-9999.ebuild 287 SHA256 ad2b50ff4aa4c3aca1ab219ec21f0aac64a98b44b57943ca2aa4dbe69091355d SHA512 dc0b48153998fa0e5b13f4046fb8a8facd5dd37b0fa944df88c83a8f363ef89d279b5f5facf3bb7f34e07dbc09d4b6a35a35dc6ced387cb598f6bba2a8f94f39 WHIRLPOOL cc5a79567ebb6f5bdf288bf65f87fdbb460cb209428ced9bf19b3eccabc609b76272c437fcdae24603e50fa9197f5bdee853026eef09ff9297e4cd730de9737b
+EBUILD selinux-watchdog-2.20170204-r1.ebuild 288 SHA256 7d26af53c07dd601e536887970f88acf59aec341da01f206f57cdb7b0a78701c SHA512 999c7c3fea2ca8a1bd1a7eda3681bd2dd9d0746126fb5fe6d7dcb875cd20e58e65a9c3fb576fc5327f12d2970f1efc29e24bd372d8eb35f339f3c1544d5ef15b WHIRLPOOL ad1732d97f63e41b3b21e08926019a026430a856876cc9f8121b8e6c4aba5365a75131f07233c3a1438d3723328334408c7bd71d106e169ddaefd4cbb1b59551
+EBUILD selinux-watchdog-2.20170204-r2.ebuild 286 SHA256 74440cd8a29b9d63165f8e59bbac2ea257e1afa3eda345baa562bc84578dc17b SHA512 7eb82ea02e2daa9736e7bc166432a49b7103815186cb3fe43a243741b24137090ed94993048e4cc9cab23e05396d5540fcbd408bc3b4fc7bf4bc1447491d83dd WHIRLPOOL 8b52e96cfc1f81b64376adf127669d9923b2c969aed4c5d93facccea71f96a5a6b1e2904aab87f09837103bb02eddfaee4aa07d10a9930c13bf8a83e3206d5e1
+EBUILD selinux-watchdog-2.20170204-r3.ebuild 286 SHA256 74440cd8a29b9d63165f8e59bbac2ea257e1afa3eda345baa562bc84578dc17b SHA512 7eb82ea02e2daa9736e7bc166432a49b7103815186cb3fe43a243741b24137090ed94993048e4cc9cab23e05396d5540fcbd408bc3b4fc7bf4bc1447491d83dd WHIRLPOOL 8b52e96cfc1f81b64376adf127669d9923b2c969aed4c5d93facccea71f96a5a6b1e2904aab87f09837103bb02eddfaee4aa07d10a9930c13bf8a83e3206d5e1
+EBUILD selinux-watchdog-2.20170204-r4.ebuild 286 SHA256 74440cd8a29b9d63165f8e59bbac2ea257e1afa3eda345baa562bc84578dc17b SHA512 7eb82ea02e2daa9736e7bc166432a49b7103815186cb3fe43a243741b24137090ed94993048e4cc9cab23e05396d5540fcbd408bc3b4fc7bf4bc1447491d83dd WHIRLPOOL 8b52e96cfc1f81b64376adf127669d9923b2c969aed4c5d93facccea71f96a5a6b1e2904aab87f09837103bb02eddfaee4aa07d10a9930c13bf8a83e3206d5e1
+EBUILD selinux-watchdog-2.20170805-r2.ebuild 286 SHA256 74440cd8a29b9d63165f8e59bbac2ea257e1afa3eda345baa562bc84578dc17b SHA512 7eb82ea02e2daa9736e7bc166432a49b7103815186cb3fe43a243741b24137090ed94993048e4cc9cab23e05396d5540fcbd408bc3b4fc7bf4bc1447491d83dd WHIRLPOOL 8b52e96cfc1f81b64376adf127669d9923b2c969aed4c5d93facccea71f96a5a6b1e2904aab87f09837103bb02eddfaee4aa07d10a9930c13bf8a83e3206d5e1
+EBUILD selinux-watchdog-2.20170805-r3.ebuild 288 SHA256 7d26af53c07dd601e536887970f88acf59aec341da01f206f57cdb7b0a78701c SHA512 999c7c3fea2ca8a1bd1a7eda3681bd2dd9d0746126fb5fe6d7dcb875cd20e58e65a9c3fb576fc5327f12d2970f1efc29e24bd372d8eb35f339f3c1544d5ef15b WHIRLPOOL ad1732d97f63e41b3b21e08926019a026430a856876cc9f8121b8e6c4aba5365a75131f07233c3a1438d3723328334408c7bd71d106e169ddaefd4cbb1b59551
+EBUILD selinux-watchdog-9999.ebuild 288 SHA256 7d26af53c07dd601e536887970f88acf59aec341da01f206f57cdb7b0a78701c SHA512 999c7c3fea2ca8a1bd1a7eda3681bd2dd9d0746126fb5fe6d7dcb875cd20e58e65a9c3fb576fc5327f12d2970f1efc29e24bd372d8eb35f339f3c1544d5ef15b WHIRLPOOL ad1732d97f63e41b3b21e08926019a026430a856876cc9f8121b8e6c4aba5365a75131f07233c3a1438d3723328334408c7bd71d106e169ddaefd4cbb1b59551
 MISC ChangeLog 10793 SHA256 075d38d6767a0aa5ef2eef7ec0e39d20a4aa3733211578b19c2a4694aa4f48bc SHA512 cf0a1de2dc67e174724c98602505154642defe29940bba2117c2a0647a3a711ec11591221d12248b5551e8b02a18ef59e38b4a24817fab13d4d45a9b82083a7a WHIRLPOOL 85ff344986a47a3e7457380855b3b1ff5e50598a4076a0f39652ccaceccdb5297ec499eb6f8fd0a1d2c8a5afa5dc628dea460f3464d7b59804a9ae8eb185795c
 MISC ChangeLog-2015 10102 SHA256 658eaaa3c099519496151e4ac3eff62643595aa170659777a4752b3919a41c7a SHA512 0babfb32bb2a8c151b738e35006169861d188761463409dc40d5c3cbe805223019aded172feeae6c64f40510ecf3d2f6c85cc0081102df7301bd4579e184bbfd WHIRLPOOL 1084e797996ffb465ac22675d5e133f05e5cff23f420e00b3e8a14495edf9dac730fb5a8eea5ab912bd078f04bd7bef715b1fee47618796c90de3970306d3ba2
 MISC metadata.xml 318 SHA256 9d8a5e820f49941efdca3affbbdd9597e57d6a7330c9f8a9f0d82e4bb9b54207 SHA512 3c77f235f65bc644d316ec2bb0d859ee22c622049c4f406904a7c24a4c17156636d86f249f4dca2a15a90d0334da677df3038956991a256f591fe3c7c2284957 WHIRLPOOL 2c69f23c4447dc286cc02b3280c98767e7d1384d8d03248208d6a293034302c7077bcb9a53c2ef81bc225310a2240a788d14e3078116917d376f006497693707
diff --git a/sec-policy/selinux-watchdog/selinux-watchdog-2.20170204-r1.ebuild b/sec-policy/selinux-watchdog/selinux-watchdog-2.20170204-r1.ebuild
index aa65ae339beb..8fe981a7e558 100644
--- a/sec-policy/selinux-watchdog/selinux-watchdog-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-watchdog/selinux-watchdog-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-watchdog/selinux-watchdog-2.20170204-r2.ebuild b/sec-policy/selinux-watchdog/selinux-watchdog-2.20170204-r2.ebuild
index 9700394b89a1..fad30c50079d 100644
--- a/sec-policy/selinux-watchdog/selinux-watchdog-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-watchdog/selinux-watchdog-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-watchdog/selinux-watchdog-2.20170204-r3.ebuild b/sec-policy/selinux-watchdog/selinux-watchdog-2.20170204-r3.ebuild
index 9700394b89a1..fad30c50079d 100644
--- a/sec-policy/selinux-watchdog/selinux-watchdog-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-watchdog/selinux-watchdog-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-watchdog/selinux-watchdog-2.20170204-r4.ebuild b/sec-policy/selinux-watchdog/selinux-watchdog-2.20170204-r4.ebuild
index 9700394b89a1..fad30c50079d 100644
--- a/sec-policy/selinux-watchdog/selinux-watchdog-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-watchdog/selinux-watchdog-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-watchdog/selinux-watchdog-2.20170805-r2.ebuild b/sec-policy/selinux-watchdog/selinux-watchdog-2.20170805-r2.ebuild
index 9700394b89a1..fad30c50079d 100644
--- a/sec-policy/selinux-watchdog/selinux-watchdog-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-watchdog/selinux-watchdog-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-watchdog/selinux-watchdog-2.20170805-r3.ebuild b/sec-policy/selinux-watchdog/selinux-watchdog-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..8fe981a7e558
--- /dev/null
+++ b/sec-policy/selinux-watchdog/selinux-watchdog-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-watchdog/selinux-watchdog-9999.ebuild b/sec-policy/selinux-watchdog/selinux-watchdog-9999.ebuild
index aa65ae339beb..8fe981a7e558 100644
--- a/sec-policy/selinux-watchdog/selinux-watchdog-9999.ebuild
+++ b/sec-policy/selinux-watchdog/selinux-watchdog-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-webalizer/Manifest b/sec-policy/selinux-webalizer/Manifest
index e410759a5994..749957b2f653 100644
--- a/sec-policy/selinux-webalizer/Manifest
+++ b/sec-policy/selinux-webalizer/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-webalizer-2.20170204-r1.ebuild 386 SHA256 523d9611aa45ea284fecacea93606e7ad168013c3a89e83a904848fe338cf9ad SHA512 cd6cd775d6c9fb37ebdd48e241f313780b8530b9add762d3feb183841e7bf395712bf69b0b54fdba086ed6b6839193463990d062de22c7d816eaca3c8348e8d2 WHIRLPOOL 1e698600eed1183cd9eeca0c72cf99ad9a1b4f942df5dc9876a213371dd2e7cac371a48f718d9c40bb68c6cb303bfa27fb00ba29e1880eafdce8b354e74369f4
-EBUILD selinux-webalizer-2.20170204-r2.ebuild 384 SHA256 e344a7f9a6dd9c9e56f915c4f6a864a67722d1a09d55fe3fa3bfa03b11ff1ad5 SHA512 83559b75a73294f3c7f2e1aa85706cb6ccf00f68564fedf01ce1e600846c7be43b89c2ed04dbf1e2a721cf6f1e33d1a4cd0e3684b7a6c7c45c0071ff28da4169 WHIRLPOOL 850649a7514aca74849c8a28bfc147b38c181690fac0c1646de43457f5bf936992870091abb20bf1968ef4ca22e28f85536d9216e65a30be077c3a93973dd72d
-EBUILD selinux-webalizer-2.20170204-r3.ebuild 384 SHA256 e344a7f9a6dd9c9e56f915c4f6a864a67722d1a09d55fe3fa3bfa03b11ff1ad5 SHA512 83559b75a73294f3c7f2e1aa85706cb6ccf00f68564fedf01ce1e600846c7be43b89c2ed04dbf1e2a721cf6f1e33d1a4cd0e3684b7a6c7c45c0071ff28da4169 WHIRLPOOL 850649a7514aca74849c8a28bfc147b38c181690fac0c1646de43457f5bf936992870091abb20bf1968ef4ca22e28f85536d9216e65a30be077c3a93973dd72d
-EBUILD selinux-webalizer-2.20170204-r4.ebuild 384 SHA256 e344a7f9a6dd9c9e56f915c4f6a864a67722d1a09d55fe3fa3bfa03b11ff1ad5 SHA512 83559b75a73294f3c7f2e1aa85706cb6ccf00f68564fedf01ce1e600846c7be43b89c2ed04dbf1e2a721cf6f1e33d1a4cd0e3684b7a6c7c45c0071ff28da4169 WHIRLPOOL 850649a7514aca74849c8a28bfc147b38c181690fac0c1646de43457f5bf936992870091abb20bf1968ef4ca22e28f85536d9216e65a30be077c3a93973dd72d
-EBUILD selinux-webalizer-2.20170805-r2.ebuild 384 SHA256 e344a7f9a6dd9c9e56f915c4f6a864a67722d1a09d55fe3fa3bfa03b11ff1ad5 SHA512 83559b75a73294f3c7f2e1aa85706cb6ccf00f68564fedf01ce1e600846c7be43b89c2ed04dbf1e2a721cf6f1e33d1a4cd0e3684b7a6c7c45c0071ff28da4169 WHIRLPOOL 850649a7514aca74849c8a28bfc147b38c181690fac0c1646de43457f5bf936992870091abb20bf1968ef4ca22e28f85536d9216e65a30be077c3a93973dd72d
-EBUILD selinux-webalizer-9999.ebuild 386 SHA256 523d9611aa45ea284fecacea93606e7ad168013c3a89e83a904848fe338cf9ad SHA512 cd6cd775d6c9fb37ebdd48e241f313780b8530b9add762d3feb183841e7bf395712bf69b0b54fdba086ed6b6839193463990d062de22c7d816eaca3c8348e8d2 WHIRLPOOL 1e698600eed1183cd9eeca0c72cf99ad9a1b4f942df5dc9876a213371dd2e7cac371a48f718d9c40bb68c6cb303bfa27fb00ba29e1880eafdce8b354e74369f4
+EBUILD selinux-webalizer-2.20170204-r1.ebuild 387 SHA256 00c0391d213091fc52b0ba0ede6c66f1899d77b8c82bb8bafa87182e7ea289b0 SHA512 8ce716769e63bb9d5e369f60d821684f537f98e745a57be4d3be134f6e501b4b1ff0f8478847e0801999cd2a1f578938e3f4d5d448cb38733ce0cef695a5155c WHIRLPOOL 0f00d5a9d598a74e7fd1540b18257bf021757e18ad8d3b657b67ebacf7533067202961bdd48f3965010a7ebfe64a9aa04182e23133e2047b96a2e3e9c189659c
+EBUILD selinux-webalizer-2.20170204-r2.ebuild 385 SHA256 061b711720b02d0139c38bcf2ed9329a7f04ec14df7b69ca539a1bbee5c2cc51 SHA512 a7d31d0d99dca62ca98e7523f93df195100bbda351c94f1e2bda0fd23ed3fc922267f61dbba5d9c8799bbf0ad0322583c773953b407b09dd940ad0d08235e0f1 WHIRLPOOL 6eb8519ee8445cd5a14e9966d66e0b2c230f0791f1f1e9c1f5af827d338ab45f73e5543200173a1cf681611d67b2e31db9c51386744ecfdb1863d85a5447dd04
+EBUILD selinux-webalizer-2.20170204-r3.ebuild 385 SHA256 061b711720b02d0139c38bcf2ed9329a7f04ec14df7b69ca539a1bbee5c2cc51 SHA512 a7d31d0d99dca62ca98e7523f93df195100bbda351c94f1e2bda0fd23ed3fc922267f61dbba5d9c8799bbf0ad0322583c773953b407b09dd940ad0d08235e0f1 WHIRLPOOL 6eb8519ee8445cd5a14e9966d66e0b2c230f0791f1f1e9c1f5af827d338ab45f73e5543200173a1cf681611d67b2e31db9c51386744ecfdb1863d85a5447dd04
+EBUILD selinux-webalizer-2.20170204-r4.ebuild 385 SHA256 061b711720b02d0139c38bcf2ed9329a7f04ec14df7b69ca539a1bbee5c2cc51 SHA512 a7d31d0d99dca62ca98e7523f93df195100bbda351c94f1e2bda0fd23ed3fc922267f61dbba5d9c8799bbf0ad0322583c773953b407b09dd940ad0d08235e0f1 WHIRLPOOL 6eb8519ee8445cd5a14e9966d66e0b2c230f0791f1f1e9c1f5af827d338ab45f73e5543200173a1cf681611d67b2e31db9c51386744ecfdb1863d85a5447dd04
+EBUILD selinux-webalizer-2.20170805-r2.ebuild 385 SHA256 061b711720b02d0139c38bcf2ed9329a7f04ec14df7b69ca539a1bbee5c2cc51 SHA512 a7d31d0d99dca62ca98e7523f93df195100bbda351c94f1e2bda0fd23ed3fc922267f61dbba5d9c8799bbf0ad0322583c773953b407b09dd940ad0d08235e0f1 WHIRLPOOL 6eb8519ee8445cd5a14e9966d66e0b2c230f0791f1f1e9c1f5af827d338ab45f73e5543200173a1cf681611d67b2e31db9c51386744ecfdb1863d85a5447dd04
+EBUILD selinux-webalizer-2.20170805-r3.ebuild 387 SHA256 00c0391d213091fc52b0ba0ede6c66f1899d77b8c82bb8bafa87182e7ea289b0 SHA512 8ce716769e63bb9d5e369f60d821684f537f98e745a57be4d3be134f6e501b4b1ff0f8478847e0801999cd2a1f578938e3f4d5d448cb38733ce0cef695a5155c WHIRLPOOL 0f00d5a9d598a74e7fd1540b18257bf021757e18ad8d3b657b67ebacf7533067202961bdd48f3965010a7ebfe64a9aa04182e23133e2047b96a2e3e9c189659c
+EBUILD selinux-webalizer-9999.ebuild 387 SHA256 00c0391d213091fc52b0ba0ede6c66f1899d77b8c82bb8bafa87182e7ea289b0 SHA512 8ce716769e63bb9d5e369f60d821684f537f98e745a57be4d3be134f6e501b4b1ff0f8478847e0801999cd2a1f578938e3f4d5d448cb38733ce0cef695a5155c WHIRLPOOL 0f00d5a9d598a74e7fd1540b18257bf021757e18ad8d3b657b67ebacf7533067202961bdd48f3965010a7ebfe64a9aa04182e23133e2047b96a2e3e9c189659c
 MISC ChangeLog 10887 SHA256 8b6c74cf9bc2ef28ccce50e4f199af8266f9ab2ea28bc47ef5e229c796aee676 SHA512 c7637154028a092dc1002a0612f584925f33127b49e0b09d3e908f0870eca47d096ad0f6dfbbedc2e6edb9ccd576eca82c857e4168b41814eb222e56908e74c5 WHIRLPOOL a4726d92e687e54774bbbd70280de3f912f91fc349a64f762fdce9ab3e30860ed99b09c01c8a27506765af3022fcb462c8fa1e23d9bd2d390d267a98a0a6dc87
 MISC ChangeLog-2015 10527 SHA256 939bb7dcace754e7fe5d9cabfe085129f301c5ba5892f5fb85bc6ecbaa0c8b89 SHA512 8d89d43c4347a4c63d8f39cb6b2bb9f4a42861cf3292cae70edbb5ff32c46d1ca5b95553b3cc6f16c1856770cd6e2da01a4df6205f0dd8515b630ba64e655463 WHIRLPOOL 83d65849564e560fceb64eed709db123c1025710d388a1cb66bb86092b6aa90265603107c72c0cb4ccda035fa684b58497c14c92944802707fa27bdbfa25e3c1
 MISC metadata.xml 319 SHA256 b2e4801a6db8a1b048df498c8c807f114c18361dfd3d257baf907eeb155e06d0 SHA512 6986d5695bb17f98f786b3639631f0a2571c91b2e90f33bc4b8e63b8390c70995b1b9010d22e9ce2ec23444342c246aa1e36f6da0675831c59534c0da6a0cb04 WHIRLPOOL 21c74140ce19260a47fc6d1752b263dec530628e501a96c0a6796c32f32e5ae9dd5e8eb6d73e33157d1d3f7e3001e65a00044a72bfbecb536901a9c57823f1bf
diff --git a/sec-policy/selinux-webalizer/selinux-webalizer-2.20170204-r1.ebuild b/sec-policy/selinux-webalizer/selinux-webalizer-2.20170204-r1.ebuild
index 12cdd100bcf1..925130750022 100644
--- a/sec-policy/selinux-webalizer/selinux-webalizer-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-webalizer/selinux-webalizer-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-webalizer/selinux-webalizer-2.20170204-r2.ebuild b/sec-policy/selinux-webalizer/selinux-webalizer-2.20170204-r2.ebuild
index ddf6a877f368..2d855739245b 100644
--- a/sec-policy/selinux-webalizer/selinux-webalizer-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-webalizer/selinux-webalizer-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-webalizer/selinux-webalizer-2.20170204-r3.ebuild b/sec-policy/selinux-webalizer/selinux-webalizer-2.20170204-r3.ebuild
index ddf6a877f368..2d855739245b 100644
--- a/sec-policy/selinux-webalizer/selinux-webalizer-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-webalizer/selinux-webalizer-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-webalizer/selinux-webalizer-2.20170204-r4.ebuild b/sec-policy/selinux-webalizer/selinux-webalizer-2.20170204-r4.ebuild
index ddf6a877f368..2d855739245b 100644
--- a/sec-policy/selinux-webalizer/selinux-webalizer-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-webalizer/selinux-webalizer-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-webalizer/selinux-webalizer-2.20170805-r2.ebuild b/sec-policy/selinux-webalizer/selinux-webalizer-2.20170805-r2.ebuild
index ddf6a877f368..2d855739245b 100644
--- a/sec-policy/selinux-webalizer/selinux-webalizer-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-webalizer/selinux-webalizer-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-webalizer/selinux-webalizer-2.20170805-r3.ebuild b/sec-policy/selinux-webalizer/selinux-webalizer-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..925130750022
--- /dev/null
+++ b/sec-policy/selinux-webalizer/selinux-webalizer-2.20170805-r3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-webalizer/selinux-webalizer-9999.ebuild b/sec-policy/selinux-webalizer/selinux-webalizer-9999.ebuild
index 12cdd100bcf1..925130750022 100644
--- a/sec-policy/selinux-webalizer/selinux-webalizer-9999.ebuild
+++ b/sec-policy/selinux-webalizer/selinux-webalizer-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-wine/Manifest b/sec-policy/selinux-wine/Manifest
index 424a35a34273..d88834f1d460 100644
--- a/sec-policy/selinux-wine/Manifest
+++ b/sec-policy/selinux-wine/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-wine-2.20170204-r1.ebuild 279 SHA256 b1e99a1579d2ae7e07f00491561ca8a8a2a1fec53808a3ddbb1409435b843b7c SHA512 e43d697703d07e8b87941607a3b33dcba5c73df20ed80430a3c4b36aa364f1779fdefbadb0da81276dd771b6b5281a0169b153e42dc9283f554e52834e20fb6e WHIRLPOOL bdc5a5ad38a1f7fe657d0ec61bd52d8eeacac32231210907cc6501f9cad0a73e2899abf26ae8007783b03893605ae2f23df14626ac0421d37789c4393dd486d7
-EBUILD selinux-wine-2.20170204-r2.ebuild 277 SHA256 0e45cbe86f72320a245c9c333b233f7e62a990f543ac3a7b5c6c9aca0b6386d3 SHA512 c61860f0fd6df69221b000b7c8dfa4b8e62659a4124f3de36aa79ff5df157f95ad4b5896efafc64fa384f318395079c9034fcd4f5cf9199bbcf287e000b58f7f WHIRLPOOL f0de512675453b2b63ba345ea21a9c61c266eb81d7f13885ae3258a6c5ad763fc2d4b9c61ae593e5e415e5ca26dbc7018bc779c6629bf5059d88e4d7ce34a676
-EBUILD selinux-wine-2.20170204-r3.ebuild 277 SHA256 0e45cbe86f72320a245c9c333b233f7e62a990f543ac3a7b5c6c9aca0b6386d3 SHA512 c61860f0fd6df69221b000b7c8dfa4b8e62659a4124f3de36aa79ff5df157f95ad4b5896efafc64fa384f318395079c9034fcd4f5cf9199bbcf287e000b58f7f WHIRLPOOL f0de512675453b2b63ba345ea21a9c61c266eb81d7f13885ae3258a6c5ad763fc2d4b9c61ae593e5e415e5ca26dbc7018bc779c6629bf5059d88e4d7ce34a676
-EBUILD selinux-wine-2.20170204-r4.ebuild 277 SHA256 0e45cbe86f72320a245c9c333b233f7e62a990f543ac3a7b5c6c9aca0b6386d3 SHA512 c61860f0fd6df69221b000b7c8dfa4b8e62659a4124f3de36aa79ff5df157f95ad4b5896efafc64fa384f318395079c9034fcd4f5cf9199bbcf287e000b58f7f WHIRLPOOL f0de512675453b2b63ba345ea21a9c61c266eb81d7f13885ae3258a6c5ad763fc2d4b9c61ae593e5e415e5ca26dbc7018bc779c6629bf5059d88e4d7ce34a676
-EBUILD selinux-wine-2.20170805-r2.ebuild 277 SHA256 0e45cbe86f72320a245c9c333b233f7e62a990f543ac3a7b5c6c9aca0b6386d3 SHA512 c61860f0fd6df69221b000b7c8dfa4b8e62659a4124f3de36aa79ff5df157f95ad4b5896efafc64fa384f318395079c9034fcd4f5cf9199bbcf287e000b58f7f WHIRLPOOL f0de512675453b2b63ba345ea21a9c61c266eb81d7f13885ae3258a6c5ad763fc2d4b9c61ae593e5e415e5ca26dbc7018bc779c6629bf5059d88e4d7ce34a676
-EBUILD selinux-wine-9999.ebuild 279 SHA256 b1e99a1579d2ae7e07f00491561ca8a8a2a1fec53808a3ddbb1409435b843b7c SHA512 e43d697703d07e8b87941607a3b33dcba5c73df20ed80430a3c4b36aa364f1779fdefbadb0da81276dd771b6b5281a0169b153e42dc9283f554e52834e20fb6e WHIRLPOOL bdc5a5ad38a1f7fe657d0ec61bd52d8eeacac32231210907cc6501f9cad0a73e2899abf26ae8007783b03893605ae2f23df14626ac0421d37789c4393dd486d7
+EBUILD selinux-wine-2.20170204-r1.ebuild 280 SHA256 72a9c8272ada3c4d438216cd2b1f4299bfb020551c25d6a1644c7ca93f2b8943 SHA512 f7999bee2cd65fc5f287858d8494808a374d2a3485085df71802fc05b8f5764f33794a1080a941986dc5aaf37ef24fd97196fce583a98386102592650439279c WHIRLPOOL 48e6c47ffc668d00a7b03c2932b0024f48ebf368b1e678a0e7b42f6562f475df1269b4abe13637a96e6e942f0805e5489c8bf047e9b47dc16fb77c696c5feca4
+EBUILD selinux-wine-2.20170204-r2.ebuild 278 SHA256 abafe400efd1f48d962f050c712ceb2be3cd451324050715b7c762c2cb08e2a6 SHA512 cd0381670e4a95aff743e7c469fcccc927cbb2a5baf6b32ea70a07d46c51a3a078a267e9b6d2d45a169f3411ebb36399e0f343aea1fcf184916946b3c72e9f15 WHIRLPOOL 4be9fc774b27f3a94e2c88e61ffb83a8b4518e408651282bed1a4cc153a529d14ffc9e5bfacc97c5f661b0dce2b011d8087d327ae9dba18ba5f5fe64a15b2bd2
+EBUILD selinux-wine-2.20170204-r3.ebuild 278 SHA256 abafe400efd1f48d962f050c712ceb2be3cd451324050715b7c762c2cb08e2a6 SHA512 cd0381670e4a95aff743e7c469fcccc927cbb2a5baf6b32ea70a07d46c51a3a078a267e9b6d2d45a169f3411ebb36399e0f343aea1fcf184916946b3c72e9f15 WHIRLPOOL 4be9fc774b27f3a94e2c88e61ffb83a8b4518e408651282bed1a4cc153a529d14ffc9e5bfacc97c5f661b0dce2b011d8087d327ae9dba18ba5f5fe64a15b2bd2
+EBUILD selinux-wine-2.20170204-r4.ebuild 278 SHA256 abafe400efd1f48d962f050c712ceb2be3cd451324050715b7c762c2cb08e2a6 SHA512 cd0381670e4a95aff743e7c469fcccc927cbb2a5baf6b32ea70a07d46c51a3a078a267e9b6d2d45a169f3411ebb36399e0f343aea1fcf184916946b3c72e9f15 WHIRLPOOL 4be9fc774b27f3a94e2c88e61ffb83a8b4518e408651282bed1a4cc153a529d14ffc9e5bfacc97c5f661b0dce2b011d8087d327ae9dba18ba5f5fe64a15b2bd2
+EBUILD selinux-wine-2.20170805-r2.ebuild 278 SHA256 abafe400efd1f48d962f050c712ceb2be3cd451324050715b7c762c2cb08e2a6 SHA512 cd0381670e4a95aff743e7c469fcccc927cbb2a5baf6b32ea70a07d46c51a3a078a267e9b6d2d45a169f3411ebb36399e0f343aea1fcf184916946b3c72e9f15 WHIRLPOOL 4be9fc774b27f3a94e2c88e61ffb83a8b4518e408651282bed1a4cc153a529d14ffc9e5bfacc97c5f661b0dce2b011d8087d327ae9dba18ba5f5fe64a15b2bd2
+EBUILD selinux-wine-2.20170805-r3.ebuild 280 SHA256 72a9c8272ada3c4d438216cd2b1f4299bfb020551c25d6a1644c7ca93f2b8943 SHA512 f7999bee2cd65fc5f287858d8494808a374d2a3485085df71802fc05b8f5764f33794a1080a941986dc5aaf37ef24fd97196fce583a98386102592650439279c WHIRLPOOL 48e6c47ffc668d00a7b03c2932b0024f48ebf368b1e678a0e7b42f6562f475df1269b4abe13637a96e6e942f0805e5489c8bf047e9b47dc16fb77c696c5feca4
+EBUILD selinux-wine-9999.ebuild 280 SHA256 72a9c8272ada3c4d438216cd2b1f4299bfb020551c25d6a1644c7ca93f2b8943 SHA512 f7999bee2cd65fc5f287858d8494808a374d2a3485085df71802fc05b8f5764f33794a1080a941986dc5aaf37ef24fd97196fce583a98386102592650439279c WHIRLPOOL 48e6c47ffc668d00a7b03c2932b0024f48ebf368b1e678a0e7b42f6562f475df1269b4abe13637a96e6e942f0805e5489c8bf047e9b47dc16fb77c696c5feca4
 MISC ChangeLog 10387 SHA256 44a1f392fca1b795eed75ea7102923464c2ab7e83f8fe222fc2584a50239ad7f SHA512 3d59e9874acb1ecaccaf7f0f5ea4ba66d13ff659450e82e8352e52c6d5f8fb4b21a38dbde54782937f9449908ef00e5f444c3fd52e289559489dcfa436379b10 WHIRLPOOL f1ce6cea61a3c65b3003781115d9573bf844a259127bb0bba9e23d2eba6d34c568b214f7ab0246d63b5292c6e5b28a5e672b509ef1b67b9bd4e43e12043ad405
 MISC ChangeLog-2015 9636 SHA256 b2f532a15d2bbfddffccbca781a50aa470d45a074ee988b2cf50e84658320f00 SHA512 24d5ebdc8a3a156b2d86d63a08d93d395e581e9e5d33fabbf70d647d8626dfdda0046d30e969a3d73b9c0364f7ac41d9233f89db42f563aa6b011604b1722217 WHIRLPOOL 2a206d756e91448164cf346c8e01861d9dc2cb69b4a6d903deb4bd64d56fd74e5bc792ccae230809dd28f0a7cf57d383dfeca497860858c45ca087f2f06330fa
 MISC metadata.xml 314 SHA256 7c82c3e663cb5aaf6484aeb91334043b764a887bf2d5564b2b5fdb49821ef049 SHA512 50bcf648ab54f3c7eb0a7027ccdf189eae0279672792f52cd52ac894a589154f9ca5feafb5d0eb646d666f1a0c1300c7403cd60efeda86087b44516ebca2da44 WHIRLPOOL 6232f52347668fdbdc16623d3abe7abb8ec581e08a72305dc6201819c06104f3366d2f8d99dc86459b07bc6453b6610153b1ab2873aa8bb173cfc8cecf960b10
diff --git a/sec-policy/selinux-wine/selinux-wine-2.20170204-r1.ebuild b/sec-policy/selinux-wine/selinux-wine-2.20170204-r1.ebuild
index a38a86606364..027c75dc915b 100644
--- a/sec-policy/selinux-wine/selinux-wine-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-wine/selinux-wine-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-wine/selinux-wine-2.20170204-r2.ebuild b/sec-policy/selinux-wine/selinux-wine-2.20170204-r2.ebuild
index 17e3892e1b14..b3e3abbe3939 100644
--- a/sec-policy/selinux-wine/selinux-wine-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-wine/selinux-wine-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-wine/selinux-wine-2.20170204-r3.ebuild b/sec-policy/selinux-wine/selinux-wine-2.20170204-r3.ebuild
index 17e3892e1b14..b3e3abbe3939 100644
--- a/sec-policy/selinux-wine/selinux-wine-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-wine/selinux-wine-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-wine/selinux-wine-2.20170204-r4.ebuild b/sec-policy/selinux-wine/selinux-wine-2.20170204-r4.ebuild
index 17e3892e1b14..b3e3abbe3939 100644
--- a/sec-policy/selinux-wine/selinux-wine-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-wine/selinux-wine-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-wine/selinux-wine-2.20170805-r2.ebuild b/sec-policy/selinux-wine/selinux-wine-2.20170805-r2.ebuild
index 17e3892e1b14..b3e3abbe3939 100644
--- a/sec-policy/selinux-wine/selinux-wine-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-wine/selinux-wine-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-wine/selinux-wine-2.20170805-r3.ebuild b/sec-policy/selinux-wine/selinux-wine-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..027c75dc915b
--- /dev/null
+++ b/sec-policy/selinux-wine/selinux-wine-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-wine/selinux-wine-9999.ebuild b/sec-policy/selinux-wine/selinux-wine-9999.ebuild
index a38a86606364..027c75dc915b 100644
--- a/sec-policy/selinux-wine/selinux-wine-9999.ebuild
+++ b/sec-policy/selinux-wine/selinux-wine-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-wireshark/Manifest b/sec-policy/selinux-wireshark/Manifest
index a4628e74968d..c336cd4f52a3 100644
--- a/sec-policy/selinux-wireshark/Manifest
+++ b/sec-policy/selinux-wireshark/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-wireshark-2.20170204-r1.ebuild 289 SHA256 f72d3f5f5ea235e2cd8cd85be2275d4bf1b679733c7edd42d4e4b158cabab6cf SHA512 430bf0b469b5a43a965e5148afb9271f7e39e4e26ba8a4e609ea20e37aa2961487c762f4e8f5bae585a7f7862f54bd7a5ee0febdd23262a95c6997af97536971 WHIRLPOOL ee4c794a7208dd0ebd4e62755f9f32af215a5e89d6259c5da15d25e7308c426d3a00403ba6af3c9fb90df2e2f0a9003ad76ae2d6bf298d1a1ea6aca54916fdc9
-EBUILD selinux-wireshark-2.20170204-r2.ebuild 287 SHA256 2e9490671b75ca67ddad9c84406d6c76e1e00439896886c5d6cba1c4b8f45d21 SHA512 3ca431872709d8fc0b6d47e85a88e809cd927a6f16eee7cbdacce78cd264542f1421d089c3ccbaca15c265e282739899422c14f050667102d76ad96d1a38c764 WHIRLPOOL 3e5f47a371e6203a4edebe26696e413baf38e915b4533f85cbdfaf5c17283061cb7e60a6913f2bf8b34f583aeeee0dc38629cf4ab8e61370fdda2d83fa64c6b5
-EBUILD selinux-wireshark-2.20170204-r3.ebuild 287 SHA256 2e9490671b75ca67ddad9c84406d6c76e1e00439896886c5d6cba1c4b8f45d21 SHA512 3ca431872709d8fc0b6d47e85a88e809cd927a6f16eee7cbdacce78cd264542f1421d089c3ccbaca15c265e282739899422c14f050667102d76ad96d1a38c764 WHIRLPOOL 3e5f47a371e6203a4edebe26696e413baf38e915b4533f85cbdfaf5c17283061cb7e60a6913f2bf8b34f583aeeee0dc38629cf4ab8e61370fdda2d83fa64c6b5
-EBUILD selinux-wireshark-2.20170204-r4.ebuild 287 SHA256 2e9490671b75ca67ddad9c84406d6c76e1e00439896886c5d6cba1c4b8f45d21 SHA512 3ca431872709d8fc0b6d47e85a88e809cd927a6f16eee7cbdacce78cd264542f1421d089c3ccbaca15c265e282739899422c14f050667102d76ad96d1a38c764 WHIRLPOOL 3e5f47a371e6203a4edebe26696e413baf38e915b4533f85cbdfaf5c17283061cb7e60a6913f2bf8b34f583aeeee0dc38629cf4ab8e61370fdda2d83fa64c6b5
-EBUILD selinux-wireshark-2.20170805-r2.ebuild 287 SHA256 2e9490671b75ca67ddad9c84406d6c76e1e00439896886c5d6cba1c4b8f45d21 SHA512 3ca431872709d8fc0b6d47e85a88e809cd927a6f16eee7cbdacce78cd264542f1421d089c3ccbaca15c265e282739899422c14f050667102d76ad96d1a38c764 WHIRLPOOL 3e5f47a371e6203a4edebe26696e413baf38e915b4533f85cbdfaf5c17283061cb7e60a6913f2bf8b34f583aeeee0dc38629cf4ab8e61370fdda2d83fa64c6b5
-EBUILD selinux-wireshark-9999.ebuild 289 SHA256 f72d3f5f5ea235e2cd8cd85be2275d4bf1b679733c7edd42d4e4b158cabab6cf SHA512 430bf0b469b5a43a965e5148afb9271f7e39e4e26ba8a4e609ea20e37aa2961487c762f4e8f5bae585a7f7862f54bd7a5ee0febdd23262a95c6997af97536971 WHIRLPOOL ee4c794a7208dd0ebd4e62755f9f32af215a5e89d6259c5da15d25e7308c426d3a00403ba6af3c9fb90df2e2f0a9003ad76ae2d6bf298d1a1ea6aca54916fdc9
+EBUILD selinux-wireshark-2.20170204-r1.ebuild 290 SHA256 be6c456c6c5ef9492a7642ad83cd06f2b6b0df75d0e6d56d5a2fa9cc8a014dab SHA512 98a690ef6fc2adf79a6821018006a86eadb8fec6c6974a012ba0388f8bb75eb175bd69997039d6205aab386dfaee860b0c3941bd4779162a2c643a150d17ba8e WHIRLPOOL d12d8b230672a0ac94a9ad097e06501e2d8d559846e31e5544a8683768c38799fcbf619aac1bef11d63e17714aa89ff0c428677eeb8cb868737da25ca8671457
+EBUILD selinux-wireshark-2.20170204-r2.ebuild 288 SHA256 b2d8a9ce5b5eb6f5bd212f454f8e42077df3e92447eda517ad02bc6ac585a73c SHA512 15b2100d575468fea73c61ae5b6edafe9dae9e24bc2ec54a92b1c2ffdbedf039c772a4c62724d6cd54dc9d1605b381ef3d643513f4f6ea59636752378b064b25 WHIRLPOOL adeafd0dd104ef8c5b372c3fdc588285f18022016ee7b87a69d47bb828da2228217c3283c59258d2f5bb6e3c5d884c9393de059a08919669d1005c55cece388f
+EBUILD selinux-wireshark-2.20170204-r3.ebuild 288 SHA256 b2d8a9ce5b5eb6f5bd212f454f8e42077df3e92447eda517ad02bc6ac585a73c SHA512 15b2100d575468fea73c61ae5b6edafe9dae9e24bc2ec54a92b1c2ffdbedf039c772a4c62724d6cd54dc9d1605b381ef3d643513f4f6ea59636752378b064b25 WHIRLPOOL adeafd0dd104ef8c5b372c3fdc588285f18022016ee7b87a69d47bb828da2228217c3283c59258d2f5bb6e3c5d884c9393de059a08919669d1005c55cece388f
+EBUILD selinux-wireshark-2.20170204-r4.ebuild 288 SHA256 b2d8a9ce5b5eb6f5bd212f454f8e42077df3e92447eda517ad02bc6ac585a73c SHA512 15b2100d575468fea73c61ae5b6edafe9dae9e24bc2ec54a92b1c2ffdbedf039c772a4c62724d6cd54dc9d1605b381ef3d643513f4f6ea59636752378b064b25 WHIRLPOOL adeafd0dd104ef8c5b372c3fdc588285f18022016ee7b87a69d47bb828da2228217c3283c59258d2f5bb6e3c5d884c9393de059a08919669d1005c55cece388f
+EBUILD selinux-wireshark-2.20170805-r2.ebuild 288 SHA256 b2d8a9ce5b5eb6f5bd212f454f8e42077df3e92447eda517ad02bc6ac585a73c SHA512 15b2100d575468fea73c61ae5b6edafe9dae9e24bc2ec54a92b1c2ffdbedf039c772a4c62724d6cd54dc9d1605b381ef3d643513f4f6ea59636752378b064b25 WHIRLPOOL adeafd0dd104ef8c5b372c3fdc588285f18022016ee7b87a69d47bb828da2228217c3283c59258d2f5bb6e3c5d884c9393de059a08919669d1005c55cece388f
+EBUILD selinux-wireshark-2.20170805-r3.ebuild 290 SHA256 be6c456c6c5ef9492a7642ad83cd06f2b6b0df75d0e6d56d5a2fa9cc8a014dab SHA512 98a690ef6fc2adf79a6821018006a86eadb8fec6c6974a012ba0388f8bb75eb175bd69997039d6205aab386dfaee860b0c3941bd4779162a2c643a150d17ba8e WHIRLPOOL d12d8b230672a0ac94a9ad097e06501e2d8d559846e31e5544a8683768c38799fcbf619aac1bef11d63e17714aa89ff0c428677eeb8cb868737da25ca8671457
+EBUILD selinux-wireshark-9999.ebuild 290 SHA256 be6c456c6c5ef9492a7642ad83cd06f2b6b0df75d0e6d56d5a2fa9cc8a014dab SHA512 98a690ef6fc2adf79a6821018006a86eadb8fec6c6974a012ba0388f8bb75eb175bd69997039d6205aab386dfaee860b0c3941bd4779162a2c643a150d17ba8e WHIRLPOOL d12d8b230672a0ac94a9ad097e06501e2d8d559846e31e5544a8683768c38799fcbf619aac1bef11d63e17714aa89ff0c428677eeb8cb868737da25ca8671457
 MISC ChangeLog 10887 SHA256 6df58c20bc26386de9c7b20ad0916b9539543f52c2dc5e6f4eb2f270285fe4d9 SHA512 923d9385f8f8040a4326ae792afbb9aeba8d10d59763049bd08db0ba7ba8eaa3f4e7a2d0fe492db5e9e420710d575304adba0518f5483e2e2c472b4dace1816d WHIRLPOOL 8c1476c0fbd507e8923a5fb4e8447b64cf2e86111ba43ab79b5325d4e46c1668462107c217b67b247c04ba969678e9f96da51347600fab4ccb2862e9ff14641e
 MISC ChangeLog-2015 12533 SHA256 5dbf05bbf52de32d3802b03ca1a9499d5562a37ed0796aff0df0bfb0d2c7aec8 SHA512 8ed5700123b214427e09fc81e2c705728869524552e9adf07cd83a32752ba6d6aebef52c263f18c5de9cd75e9fa663f910f184f9a5916a2886bfd3fe36342ec7 WHIRLPOOL 83fac190010a18668af32e720a4804b409e2185174d0e1499728230a49c4eee2cfadf5d9efb6e4f340cc1ce3516312834dbc892e65a7b376e7b759959bb50a85
 MISC metadata.xml 319 SHA256 2ff43d30f7db5346bd885bcf074dbbfdf27a41b8422c1e3148a372a70798b31c SHA512 80924418148b0afd56b379bf7b8295dcc9544be8b78dc0716f5b0e692be198fcb5629a283e5cb42a9eeee6cb4af348232bb3538bc27929b8e58494c6859327a0 WHIRLPOOL b37b33b8b2095f9e3ee1f5145b9e6a839c4fbf1897f673ed944b38b44b8da59b469a112f1b2201849d808b4b880b5f702df514bd53133c6ed05f1011717cd551
diff --git a/sec-policy/selinux-wireshark/selinux-wireshark-2.20170204-r1.ebuild b/sec-policy/selinux-wireshark/selinux-wireshark-2.20170204-r1.ebuild
index 97e9cac2a806..c10051b4366f 100644
--- a/sec-policy/selinux-wireshark/selinux-wireshark-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-wireshark/selinux-wireshark-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-wireshark/selinux-wireshark-2.20170204-r2.ebuild b/sec-policy/selinux-wireshark/selinux-wireshark-2.20170204-r2.ebuild
index 5e1fc7c0d3c3..60ec7ab1acdf 100644
--- a/sec-policy/selinux-wireshark/selinux-wireshark-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-wireshark/selinux-wireshark-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-wireshark/selinux-wireshark-2.20170204-r3.ebuild b/sec-policy/selinux-wireshark/selinux-wireshark-2.20170204-r3.ebuild
index 5e1fc7c0d3c3..60ec7ab1acdf 100644
--- a/sec-policy/selinux-wireshark/selinux-wireshark-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-wireshark/selinux-wireshark-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-wireshark/selinux-wireshark-2.20170204-r4.ebuild b/sec-policy/selinux-wireshark/selinux-wireshark-2.20170204-r4.ebuild
index 5e1fc7c0d3c3..60ec7ab1acdf 100644
--- a/sec-policy/selinux-wireshark/selinux-wireshark-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-wireshark/selinux-wireshark-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-wireshark/selinux-wireshark-2.20170805-r2.ebuild b/sec-policy/selinux-wireshark/selinux-wireshark-2.20170805-r2.ebuild
index 5e1fc7c0d3c3..60ec7ab1acdf 100644
--- a/sec-policy/selinux-wireshark/selinux-wireshark-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-wireshark/selinux-wireshark-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-wireshark/selinux-wireshark-2.20170805-r3.ebuild b/sec-policy/selinux-wireshark/selinux-wireshark-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..c10051b4366f
--- /dev/null
+++ b/sec-policy/selinux-wireshark/selinux-wireshark-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-wireshark/selinux-wireshark-9999.ebuild b/sec-policy/selinux-wireshark/selinux-wireshark-9999.ebuild
index 97e9cac2a806..c10051b4366f 100644
--- a/sec-policy/selinux-wireshark/selinux-wireshark-9999.ebuild
+++ b/sec-policy/selinux-wireshark/selinux-wireshark-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-wm/Manifest b/sec-policy/selinux-wm/Manifest
index f3b1d75a3943..a6d6e0ecf355 100644
--- a/sec-policy/selinux-wm/Manifest
+++ b/sec-policy/selinux-wm/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-wm-2.20170204-r1.ebuild 275 SHA256 ef790f46976c8654aa8359283b4a25fe6ab7e53ef549ca98dfd86b91e6d0c933 SHA512 4a77c92f9fd7e9398cdc86963828776958596eb22c19e119b9ea9a9d1eee6c8f50e67061f4263ed1cc311bb8cc5dd64c3330df9a13fd409c0d1e028305693b48 WHIRLPOOL 1536ec408eb3c52c37e77419ce1a83b28abb5fd8a1c784d477a40a6102312f29f24d4d7f822e16c93c7642293160b51402e66791700a1d56bab4306037d165a1
-EBUILD selinux-wm-2.20170204-r2.ebuild 273 SHA256 54ab148616476745c3c940189456b1555c6320b4884c1f637c87099f94f4102a SHA512 935a3f79acbad4d32918cc535418a057722a1bcf049f06b09fe3df82b7875573facdbc49f383435f55f1dc2481aae5319750cb74da9a6378b76e9490c99a25df WHIRLPOOL abbf9fba60e4099e1f8bb79a249f86a584dd20444abd0931117da5368a3bf9cacdf133905d75c15f361e3b5684862a5d427d37fac0d8c4d7cae81caa33c411ae
-EBUILD selinux-wm-2.20170204-r3.ebuild 273 SHA256 54ab148616476745c3c940189456b1555c6320b4884c1f637c87099f94f4102a SHA512 935a3f79acbad4d32918cc535418a057722a1bcf049f06b09fe3df82b7875573facdbc49f383435f55f1dc2481aae5319750cb74da9a6378b76e9490c99a25df WHIRLPOOL abbf9fba60e4099e1f8bb79a249f86a584dd20444abd0931117da5368a3bf9cacdf133905d75c15f361e3b5684862a5d427d37fac0d8c4d7cae81caa33c411ae
-EBUILD selinux-wm-2.20170204-r4.ebuild 273 SHA256 54ab148616476745c3c940189456b1555c6320b4884c1f637c87099f94f4102a SHA512 935a3f79acbad4d32918cc535418a057722a1bcf049f06b09fe3df82b7875573facdbc49f383435f55f1dc2481aae5319750cb74da9a6378b76e9490c99a25df WHIRLPOOL abbf9fba60e4099e1f8bb79a249f86a584dd20444abd0931117da5368a3bf9cacdf133905d75c15f361e3b5684862a5d427d37fac0d8c4d7cae81caa33c411ae
-EBUILD selinux-wm-2.20170805-r2.ebuild 273 SHA256 54ab148616476745c3c940189456b1555c6320b4884c1f637c87099f94f4102a SHA512 935a3f79acbad4d32918cc535418a057722a1bcf049f06b09fe3df82b7875573facdbc49f383435f55f1dc2481aae5319750cb74da9a6378b76e9490c99a25df WHIRLPOOL abbf9fba60e4099e1f8bb79a249f86a584dd20444abd0931117da5368a3bf9cacdf133905d75c15f361e3b5684862a5d427d37fac0d8c4d7cae81caa33c411ae
-EBUILD selinux-wm-9999.ebuild 275 SHA256 ef790f46976c8654aa8359283b4a25fe6ab7e53ef549ca98dfd86b91e6d0c933 SHA512 4a77c92f9fd7e9398cdc86963828776958596eb22c19e119b9ea9a9d1eee6c8f50e67061f4263ed1cc311bb8cc5dd64c3330df9a13fd409c0d1e028305693b48 WHIRLPOOL 1536ec408eb3c52c37e77419ce1a83b28abb5fd8a1c784d477a40a6102312f29f24d4d7f822e16c93c7642293160b51402e66791700a1d56bab4306037d165a1
+EBUILD selinux-wm-2.20170204-r1.ebuild 276 SHA256 2876f8d3d95bff834418cb479e26ac67ce57f166c5a6505710ef368163135865 SHA512 29d8195a7320143ea63eb49e7a032921fec7779f2c13c59b30cb6b86784e85fdd6e0a79997bf63195cca37886f72b07db6dbd2b39f560c6d1fe3bbcc51ef8488 WHIRLPOOL 30427a86cbc8f62504097f18e6b873ddc81051bd9fff3f3ba287f503f1064b5eb689fd63977731b21238c4c2bf12d0c3cc8db74084a16662a808712e4db19e92
+EBUILD selinux-wm-2.20170204-r2.ebuild 274 SHA256 944befbc586fd07b83a663ea5eacce8301f32980dc612340b9a9272f38d37f8f SHA512 75189b300ee6adeeabda5c18eb6f43ce9b1bfba72c607ddf34f89970e7bf299037aad9c61408e00c16092d0bf76b3e3df240ad880f9f865f1f5dd8254e300dd2 WHIRLPOOL c7688916b8d9e5adf268864e81fd54c420133a50b5ffd5f21f45fa9d80acb586670a36abe4f182b7bf688ba448f0c178178dca2a8443de9fafeac965a83e7d0a
+EBUILD selinux-wm-2.20170204-r3.ebuild 274 SHA256 944befbc586fd07b83a663ea5eacce8301f32980dc612340b9a9272f38d37f8f SHA512 75189b300ee6adeeabda5c18eb6f43ce9b1bfba72c607ddf34f89970e7bf299037aad9c61408e00c16092d0bf76b3e3df240ad880f9f865f1f5dd8254e300dd2 WHIRLPOOL c7688916b8d9e5adf268864e81fd54c420133a50b5ffd5f21f45fa9d80acb586670a36abe4f182b7bf688ba448f0c178178dca2a8443de9fafeac965a83e7d0a
+EBUILD selinux-wm-2.20170204-r4.ebuild 274 SHA256 944befbc586fd07b83a663ea5eacce8301f32980dc612340b9a9272f38d37f8f SHA512 75189b300ee6adeeabda5c18eb6f43ce9b1bfba72c607ddf34f89970e7bf299037aad9c61408e00c16092d0bf76b3e3df240ad880f9f865f1f5dd8254e300dd2 WHIRLPOOL c7688916b8d9e5adf268864e81fd54c420133a50b5ffd5f21f45fa9d80acb586670a36abe4f182b7bf688ba448f0c178178dca2a8443de9fafeac965a83e7d0a
+EBUILD selinux-wm-2.20170805-r2.ebuild 274 SHA256 944befbc586fd07b83a663ea5eacce8301f32980dc612340b9a9272f38d37f8f SHA512 75189b300ee6adeeabda5c18eb6f43ce9b1bfba72c607ddf34f89970e7bf299037aad9c61408e00c16092d0bf76b3e3df240ad880f9f865f1f5dd8254e300dd2 WHIRLPOOL c7688916b8d9e5adf268864e81fd54c420133a50b5ffd5f21f45fa9d80acb586670a36abe4f182b7bf688ba448f0c178178dca2a8443de9fafeac965a83e7d0a
+EBUILD selinux-wm-2.20170805-r3.ebuild 276 SHA256 2876f8d3d95bff834418cb479e26ac67ce57f166c5a6505710ef368163135865 SHA512 29d8195a7320143ea63eb49e7a032921fec7779f2c13c59b30cb6b86784e85fdd6e0a79997bf63195cca37886f72b07db6dbd2b39f560c6d1fe3bbcc51ef8488 WHIRLPOOL 30427a86cbc8f62504097f18e6b873ddc81051bd9fff3f3ba287f503f1064b5eb689fd63977731b21238c4c2bf12d0c3cc8db74084a16662a808712e4db19e92
+EBUILD selinux-wm-9999.ebuild 276 SHA256 2876f8d3d95bff834418cb479e26ac67ce57f166c5a6505710ef368163135865 SHA512 29d8195a7320143ea63eb49e7a032921fec7779f2c13c59b30cb6b86784e85fdd6e0a79997bf63195cca37886f72b07db6dbd2b39f560c6d1fe3bbcc51ef8488 WHIRLPOOL 30427a86cbc8f62504097f18e6b873ddc81051bd9fff3f3ba287f503f1064b5eb689fd63977731b21238c4c2bf12d0c3cc8db74084a16662a808712e4db19e92
 MISC ChangeLog 10203 SHA256 7caf6233a04aa034e1ce02f0477a083fd370c00e2d610acf86decfdc960d49fd SHA512 d4a094e20546c9aee5511830187098dc5b289a41b2f63c06e4fb74ee75f6f573106b1d8c99e050d2303187921cae941a2b40abbbba14a60928231b5a9759c758 WHIRLPOOL 9414020c2bd023d7b840c794c203ccaf17f42047f2fa98549a0b26f1c9682d7a9c61183ae95cd7989a60b9515dfe8197578162879269976f395c18db4a29b3b5
 MISC ChangeLog-2015 9145 SHA256 f2a15d3e0f1ba74e544b62a56fa5495d2034cb1c56015e9183cb241dc6d5c128 SHA512 370549c8955085df856fba886e27449356e9ee89127a632db9ca2c796d5aeb39dd48a089f2587e0878832d64c0acb62e821971e1e2f05c5c0e28d69d283a35ca WHIRLPOOL dcad86ca16bda53aa520800719534ae8a4c5d3a91209ede44481a5045d28f64526dd886c84743d70824beaa1f744db1a6240135f311fc361720c20c166a9902b
 MISC metadata.xml 312 SHA256 4a7a2d75ebe8607f392992e60781e492fc392e239c3ea1087f7bc42be80c4c6a SHA512 af59f138e5a0a4e5cfc193cbffb4a43623325f89fd7241630fef628faede5bfe521f4d8309cc4eb93bd51b25e7e0a62134d3579f9dddaa68e42ac410e0e2f437 WHIRLPOOL 9b197736ea05ed71a06fd0b12d4ab57dec4c482b1c263b661b783053c16e146e69916a90a99380462b293b243ef5d1cd69980145002f961ab2f9a3a8209b6f4f
diff --git a/sec-policy/selinux-wm/selinux-wm-2.20170204-r1.ebuild b/sec-policy/selinux-wm/selinux-wm-2.20170204-r1.ebuild
index 4cf0c5d46243..c5f1f0e33b99 100644
--- a/sec-policy/selinux-wm/selinux-wm-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-wm/selinux-wm-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-wm/selinux-wm-2.20170204-r2.ebuild b/sec-policy/selinux-wm/selinux-wm-2.20170204-r2.ebuild
index 01e3b82571de..dadc5193812c 100644
--- a/sec-policy/selinux-wm/selinux-wm-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-wm/selinux-wm-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-wm/selinux-wm-2.20170204-r3.ebuild b/sec-policy/selinux-wm/selinux-wm-2.20170204-r3.ebuild
index 01e3b82571de..dadc5193812c 100644
--- a/sec-policy/selinux-wm/selinux-wm-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-wm/selinux-wm-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-wm/selinux-wm-2.20170204-r4.ebuild b/sec-policy/selinux-wm/selinux-wm-2.20170204-r4.ebuild
index 01e3b82571de..dadc5193812c 100644
--- a/sec-policy/selinux-wm/selinux-wm-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-wm/selinux-wm-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-wm/selinux-wm-2.20170805-r2.ebuild b/sec-policy/selinux-wm/selinux-wm-2.20170805-r2.ebuild
index 01e3b82571de..dadc5193812c 100644
--- a/sec-policy/selinux-wm/selinux-wm-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-wm/selinux-wm-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-wm/selinux-wm-2.20170805-r3.ebuild b/sec-policy/selinux-wm/selinux-wm-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..c5f1f0e33b99
--- /dev/null
+++ b/sec-policy/selinux-wm/selinux-wm-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-wm/selinux-wm-9999.ebuild b/sec-policy/selinux-wm/selinux-wm-9999.ebuild
index 4cf0c5d46243..c5f1f0e33b99 100644
--- a/sec-policy/selinux-wm/selinux-wm-9999.ebuild
+++ b/sec-policy/selinux-wm/selinux-wm-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-xen/Manifest b/sec-policy/selinux-xen/Manifest
index 15633c8d4597..dd8bfe0c8d33 100644
--- a/sec-policy/selinux-xen/Manifest
+++ b/sec-policy/selinux-xen/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-xen-2.20170204-r1.ebuild 277 SHA256 7e1748089d85982648dac37fb33095298b28b87550ac32399dc7ebbb442669b4 SHA512 ced85ac4545990635484f5f1fd99ca05406418ef99cdd362942bd5f29a1e4f2445698bd26192c899f7b5324eae9b1f32ce7a24bd059e81e6c9a1a84e7f8b1b1f WHIRLPOOL 282c9ffea454debda66e81f1b729c44043f25077d0cc7140566f499ea0d1a33e599bacd8274268e55d07a39eb056e004e85e43b9c15a0199eb106b72d444192f
-EBUILD selinux-xen-2.20170204-r2.ebuild 275 SHA256 990ce5b4626dd169447b0fea83167a4b02e49409fc0b6834e748d716816b28b5 SHA512 fb97f42bd58322c5340e04fae53d87f1df1cae034e0f279b5ae8ccde51992e9ff56170ee967344ccaf2a173f6fbe7184d9d571d4d1a6e66ac6bf1639505165a1 WHIRLPOOL cfe2f5664269ba2df5284e0bf4df91c2b38a588b0bfbc1c700ea74321bfa6ed8adde819d56a158568b0f9121b8a442ef65bce7e51e04e17fb1e24da639510d2e
-EBUILD selinux-xen-2.20170204-r3.ebuild 275 SHA256 990ce5b4626dd169447b0fea83167a4b02e49409fc0b6834e748d716816b28b5 SHA512 fb97f42bd58322c5340e04fae53d87f1df1cae034e0f279b5ae8ccde51992e9ff56170ee967344ccaf2a173f6fbe7184d9d571d4d1a6e66ac6bf1639505165a1 WHIRLPOOL cfe2f5664269ba2df5284e0bf4df91c2b38a588b0bfbc1c700ea74321bfa6ed8adde819d56a158568b0f9121b8a442ef65bce7e51e04e17fb1e24da639510d2e
-EBUILD selinux-xen-2.20170204-r4.ebuild 275 SHA256 990ce5b4626dd169447b0fea83167a4b02e49409fc0b6834e748d716816b28b5 SHA512 fb97f42bd58322c5340e04fae53d87f1df1cae034e0f279b5ae8ccde51992e9ff56170ee967344ccaf2a173f6fbe7184d9d571d4d1a6e66ac6bf1639505165a1 WHIRLPOOL cfe2f5664269ba2df5284e0bf4df91c2b38a588b0bfbc1c700ea74321bfa6ed8adde819d56a158568b0f9121b8a442ef65bce7e51e04e17fb1e24da639510d2e
-EBUILD selinux-xen-2.20170805-r2.ebuild 275 SHA256 990ce5b4626dd169447b0fea83167a4b02e49409fc0b6834e748d716816b28b5 SHA512 fb97f42bd58322c5340e04fae53d87f1df1cae034e0f279b5ae8ccde51992e9ff56170ee967344ccaf2a173f6fbe7184d9d571d4d1a6e66ac6bf1639505165a1 WHIRLPOOL cfe2f5664269ba2df5284e0bf4df91c2b38a588b0bfbc1c700ea74321bfa6ed8adde819d56a158568b0f9121b8a442ef65bce7e51e04e17fb1e24da639510d2e
-EBUILD selinux-xen-9999.ebuild 277 SHA256 7e1748089d85982648dac37fb33095298b28b87550ac32399dc7ebbb442669b4 SHA512 ced85ac4545990635484f5f1fd99ca05406418ef99cdd362942bd5f29a1e4f2445698bd26192c899f7b5324eae9b1f32ce7a24bd059e81e6c9a1a84e7f8b1b1f WHIRLPOOL 282c9ffea454debda66e81f1b729c44043f25077d0cc7140566f499ea0d1a33e599bacd8274268e55d07a39eb056e004e85e43b9c15a0199eb106b72d444192f
+EBUILD selinux-xen-2.20170204-r1.ebuild 278 SHA256 163262fea66125a93eba61bcc341115bd94c368739f892513875bdd6a83bede5 SHA512 084266843378d6e8830157fed1903232d9390932ecbe8c5b28db366bcebeee7ef2f35c53af96d243474c355cfd52aafa68fe4b519faae6133e6d2f4e37b75c21 WHIRLPOOL 2eb5542514a862243eb9f7997e8e7c6579fadab114f93c60452a2d56b072c087317fdcbb9cf161406b363842123107c8c8d9d8f4e8f63cc737d43b0365207841
+EBUILD selinux-xen-2.20170204-r2.ebuild 276 SHA256 a8d089fc126493367bc3138f0f47d3954099413ec74505e19cf8c257fbc58489 SHA512 7772e6d69260029758f5035a8552802f84895cbf67d84afbbaa0ee3156a096e6507a64865541e23c9851ab9d97829081d92c327ebfc5d40235399d6314656aa9 WHIRLPOOL bf650ec75bdbb145e6010849a0be44a5e1ea0b0ac24c697e32a0917a98eb2e4e3a6344a9b82d385e27ee52c5557cc125c4a9db437a5f8e9a8423fc565a651c19
+EBUILD selinux-xen-2.20170204-r3.ebuild 276 SHA256 a8d089fc126493367bc3138f0f47d3954099413ec74505e19cf8c257fbc58489 SHA512 7772e6d69260029758f5035a8552802f84895cbf67d84afbbaa0ee3156a096e6507a64865541e23c9851ab9d97829081d92c327ebfc5d40235399d6314656aa9 WHIRLPOOL bf650ec75bdbb145e6010849a0be44a5e1ea0b0ac24c697e32a0917a98eb2e4e3a6344a9b82d385e27ee52c5557cc125c4a9db437a5f8e9a8423fc565a651c19
+EBUILD selinux-xen-2.20170204-r4.ebuild 276 SHA256 a8d089fc126493367bc3138f0f47d3954099413ec74505e19cf8c257fbc58489 SHA512 7772e6d69260029758f5035a8552802f84895cbf67d84afbbaa0ee3156a096e6507a64865541e23c9851ab9d97829081d92c327ebfc5d40235399d6314656aa9 WHIRLPOOL bf650ec75bdbb145e6010849a0be44a5e1ea0b0ac24c697e32a0917a98eb2e4e3a6344a9b82d385e27ee52c5557cc125c4a9db437a5f8e9a8423fc565a651c19
+EBUILD selinux-xen-2.20170805-r2.ebuild 276 SHA256 a8d089fc126493367bc3138f0f47d3954099413ec74505e19cf8c257fbc58489 SHA512 7772e6d69260029758f5035a8552802f84895cbf67d84afbbaa0ee3156a096e6507a64865541e23c9851ab9d97829081d92c327ebfc5d40235399d6314656aa9 WHIRLPOOL bf650ec75bdbb145e6010849a0be44a5e1ea0b0ac24c697e32a0917a98eb2e4e3a6344a9b82d385e27ee52c5557cc125c4a9db437a5f8e9a8423fc565a651c19
+EBUILD selinux-xen-2.20170805-r3.ebuild 278 SHA256 163262fea66125a93eba61bcc341115bd94c368739f892513875bdd6a83bede5 SHA512 084266843378d6e8830157fed1903232d9390932ecbe8c5b28db366bcebeee7ef2f35c53af96d243474c355cfd52aafa68fe4b519faae6133e6d2f4e37b75c21 WHIRLPOOL 2eb5542514a862243eb9f7997e8e7c6579fadab114f93c60452a2d56b072c087317fdcbb9cf161406b363842123107c8c8d9d8f4e8f63cc737d43b0365207841
+EBUILD selinux-xen-9999.ebuild 278 SHA256 163262fea66125a93eba61bcc341115bd94c368739f892513875bdd6a83bede5 SHA512 084266843378d6e8830157fed1903232d9390932ecbe8c5b28db366bcebeee7ef2f35c53af96d243474c355cfd52aafa68fe4b519faae6133e6d2f4e37b75c21 WHIRLPOOL 2eb5542514a862243eb9f7997e8e7c6579fadab114f93c60452a2d56b072c087317fdcbb9cf161406b363842123107c8c8d9d8f4e8f63cc737d43b0365207841
 MISC ChangeLog 10295 SHA256 01acaa8350c91560a5f05fb092313cdaf514b05f991455c3ab207ea838283b03 SHA512 20fdcb6a869faeac3e6a641393104b63144b37e0bfad8225090c430c4716091ce39051b1aba4149b5be14100ba2c7d2eeb712fd722992854c10aea3124ac3dd3 WHIRLPOOL 342c176bfaa7de8788f6e9cf50893624cf7f58ccc7ec80e38ea9136e179bd07ebefd26407c36db18ce725b38b80cae65f35d11e3827ca166312e98e32cf88616
 MISC ChangeLog-2015 9995 SHA256 aa61c00d88736db4eed56235df01ff699b8b0c5fc70cc3f7e616b6c1ca324002 SHA512 f997d450903bbdedbf7679b38017d35ad99812a8e9da9f2a8653e6c2450ff2ac6e021c6b682c093b32ef90239890066d1aab684d072eda3202d7824253d54e2c WHIRLPOOL 506c9806b86e4effe2d1ee63bf4849459f9c8cae6f71b8c833f59dc19abe31b8e85b4602c5e132b64d988923386a64814d9709a2196e421ba0191258fbb3de52
 MISC metadata.xml 313 SHA256 a1c30d093a7bd87f0f3360787de32499c504bc9aac571e7ba485c5a8820387ba SHA512 9fcb80cf02e136d443c02877c738b8495f7ca07338d952e62e22a602ec39658117877871398b501700e31ab481a1566a04f6e30c797970191368b023e2bcb806 WHIRLPOOL 323a2107f2cd69f1f4d871f242bd0feaea4df56f4537c4f16f3ecc8904c6f769fd16357a98785fcaea3f0c421574d432d6bb634a830662bdb26a50f7a5b32219
diff --git a/sec-policy/selinux-xen/selinux-xen-2.20170204-r1.ebuild b/sec-policy/selinux-xen/selinux-xen-2.20170204-r1.ebuild
index 321e13657e57..cb4b6a78f1ba 100644
--- a/sec-policy/selinux-xen/selinux-xen-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-xen/selinux-xen-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-xen/selinux-xen-2.20170204-r2.ebuild b/sec-policy/selinux-xen/selinux-xen-2.20170204-r2.ebuild
index 563be32cdcbd..a046cb71491c 100644
--- a/sec-policy/selinux-xen/selinux-xen-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-xen/selinux-xen-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-xen/selinux-xen-2.20170204-r3.ebuild b/sec-policy/selinux-xen/selinux-xen-2.20170204-r3.ebuild
index 563be32cdcbd..a046cb71491c 100644
--- a/sec-policy/selinux-xen/selinux-xen-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-xen/selinux-xen-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-xen/selinux-xen-2.20170204-r4.ebuild b/sec-policy/selinux-xen/selinux-xen-2.20170204-r4.ebuild
index 563be32cdcbd..a046cb71491c 100644
--- a/sec-policy/selinux-xen/selinux-xen-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-xen/selinux-xen-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-xen/selinux-xen-2.20170805-r2.ebuild b/sec-policy/selinux-xen/selinux-xen-2.20170805-r2.ebuild
index 563be32cdcbd..a046cb71491c 100644
--- a/sec-policy/selinux-xen/selinux-xen-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-xen/selinux-xen-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-xen/selinux-xen-2.20170805-r3.ebuild b/sec-policy/selinux-xen/selinux-xen-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..cb4b6a78f1ba
--- /dev/null
+++ b/sec-policy/selinux-xen/selinux-xen-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-xen/selinux-xen-9999.ebuild b/sec-policy/selinux-xen/selinux-xen-9999.ebuild
index 321e13657e57..cb4b6a78f1ba 100644
--- a/sec-policy/selinux-xen/selinux-xen-9999.ebuild
+++ b/sec-policy/selinux-xen/selinux-xen-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-xfs/Manifest b/sec-policy/selinux-xfs/Manifest
index 74ce4e544166..fab93bb5a836 100644
--- a/sec-policy/selinux-xfs/Manifest
+++ b/sec-policy/selinux-xfs/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-xfs-2.20170204-r1.ebuild 277 SHA256 a4ab7e09294bcffb6f99bf60b6d62c8d4fb7510e4579caacb106d0739e61db5d SHA512 7fb6fc23badf3ee55fe3ab165e291c0556f461b421aa9523745f41df8b919fd9b5bdb8a53dd6b24b92545fcd48951125768530b394ee8c47fadefca5d6a2c845 WHIRLPOOL 2f727bd727773fa477b41d94f3306ccad9a8c3fe4e5fd467f03ba69cc77682bbac4e6b8d36ec64d083ea5881dbaa24aff73ff682055b694ee579936146429732
-EBUILD selinux-xfs-2.20170204-r2.ebuild 275 SHA256 135a1e04aa321ed30ef064296fd025e629a8ca31b3f4f4a149b25492eac85420 SHA512 6e362e03f8b188ed47859705b0ee8aa2748f4ea12821b9a0abaafee3170e1070847056e394ea3fcfcd1ded42d14e1c67f8756806424f9379a09ef1a3d8834073 WHIRLPOOL 57527b8bdc359c80414b3763e6c68c7e42138059f604d37732414d9432bee3728e4d4c0d0b2ee4d89a8eaf12c131fe173fdd9c44ec50071a2ea173f8a58736c5
-EBUILD selinux-xfs-2.20170204-r3.ebuild 275 SHA256 135a1e04aa321ed30ef064296fd025e629a8ca31b3f4f4a149b25492eac85420 SHA512 6e362e03f8b188ed47859705b0ee8aa2748f4ea12821b9a0abaafee3170e1070847056e394ea3fcfcd1ded42d14e1c67f8756806424f9379a09ef1a3d8834073 WHIRLPOOL 57527b8bdc359c80414b3763e6c68c7e42138059f604d37732414d9432bee3728e4d4c0d0b2ee4d89a8eaf12c131fe173fdd9c44ec50071a2ea173f8a58736c5
-EBUILD selinux-xfs-2.20170204-r4.ebuild 275 SHA256 135a1e04aa321ed30ef064296fd025e629a8ca31b3f4f4a149b25492eac85420 SHA512 6e362e03f8b188ed47859705b0ee8aa2748f4ea12821b9a0abaafee3170e1070847056e394ea3fcfcd1ded42d14e1c67f8756806424f9379a09ef1a3d8834073 WHIRLPOOL 57527b8bdc359c80414b3763e6c68c7e42138059f604d37732414d9432bee3728e4d4c0d0b2ee4d89a8eaf12c131fe173fdd9c44ec50071a2ea173f8a58736c5
-EBUILD selinux-xfs-2.20170805-r2.ebuild 275 SHA256 135a1e04aa321ed30ef064296fd025e629a8ca31b3f4f4a149b25492eac85420 SHA512 6e362e03f8b188ed47859705b0ee8aa2748f4ea12821b9a0abaafee3170e1070847056e394ea3fcfcd1ded42d14e1c67f8756806424f9379a09ef1a3d8834073 WHIRLPOOL 57527b8bdc359c80414b3763e6c68c7e42138059f604d37732414d9432bee3728e4d4c0d0b2ee4d89a8eaf12c131fe173fdd9c44ec50071a2ea173f8a58736c5
-EBUILD selinux-xfs-9999.ebuild 277 SHA256 a4ab7e09294bcffb6f99bf60b6d62c8d4fb7510e4579caacb106d0739e61db5d SHA512 7fb6fc23badf3ee55fe3ab165e291c0556f461b421aa9523745f41df8b919fd9b5bdb8a53dd6b24b92545fcd48951125768530b394ee8c47fadefca5d6a2c845 WHIRLPOOL 2f727bd727773fa477b41d94f3306ccad9a8c3fe4e5fd467f03ba69cc77682bbac4e6b8d36ec64d083ea5881dbaa24aff73ff682055b694ee579936146429732
+EBUILD selinux-xfs-2.20170204-r1.ebuild 278 SHA256 aa5425dbde4f4a39ebdfb1eafa499d487c91d634159833139a50b1f9b2538d19 SHA512 b11264b2df58f1cbd634a65c27517a96263d181ef65f0780636aef4e7e15a51d1fcca8e16870af046fe066aad529bf4ad24b901491ffbeba169098f39d12a0bf WHIRLPOOL 0d5fab2c78946fba71144666bc63e280fa680de085b27cdb2f52b4b69b377aea6a6ec5b533dea9eb2279b9a7b0ce72d170c7fb263e4243203b19f5760b96c227
+EBUILD selinux-xfs-2.20170204-r2.ebuild 276 SHA256 6d43e568a8baa1d9cd0001adab3baecc5c59a86eca4b22e8d16a0e18abf3c56a SHA512 7ff8bbb9d24a6156b862742a6839718deb02c8ebbacfa914ec73614ef66325db560130a8d085a92632edf363010dea3670b2cee5421c4f624737503d2b80cdd2 WHIRLPOOL fe38d1dd5037da5d2ae983d5f567b86d550857603b687bcc51ec83a761c7670468ed22a75413eca0f91785afb544962d4b7679878f9070990bb9d241f3232913
+EBUILD selinux-xfs-2.20170204-r3.ebuild 276 SHA256 6d43e568a8baa1d9cd0001adab3baecc5c59a86eca4b22e8d16a0e18abf3c56a SHA512 7ff8bbb9d24a6156b862742a6839718deb02c8ebbacfa914ec73614ef66325db560130a8d085a92632edf363010dea3670b2cee5421c4f624737503d2b80cdd2 WHIRLPOOL fe38d1dd5037da5d2ae983d5f567b86d550857603b687bcc51ec83a761c7670468ed22a75413eca0f91785afb544962d4b7679878f9070990bb9d241f3232913
+EBUILD selinux-xfs-2.20170204-r4.ebuild 276 SHA256 6d43e568a8baa1d9cd0001adab3baecc5c59a86eca4b22e8d16a0e18abf3c56a SHA512 7ff8bbb9d24a6156b862742a6839718deb02c8ebbacfa914ec73614ef66325db560130a8d085a92632edf363010dea3670b2cee5421c4f624737503d2b80cdd2 WHIRLPOOL fe38d1dd5037da5d2ae983d5f567b86d550857603b687bcc51ec83a761c7670468ed22a75413eca0f91785afb544962d4b7679878f9070990bb9d241f3232913
+EBUILD selinux-xfs-2.20170805-r2.ebuild 276 SHA256 6d43e568a8baa1d9cd0001adab3baecc5c59a86eca4b22e8d16a0e18abf3c56a SHA512 7ff8bbb9d24a6156b862742a6839718deb02c8ebbacfa914ec73614ef66325db560130a8d085a92632edf363010dea3670b2cee5421c4f624737503d2b80cdd2 WHIRLPOOL fe38d1dd5037da5d2ae983d5f567b86d550857603b687bcc51ec83a761c7670468ed22a75413eca0f91785afb544962d4b7679878f9070990bb9d241f3232913
+EBUILD selinux-xfs-2.20170805-r3.ebuild 278 SHA256 aa5425dbde4f4a39ebdfb1eafa499d487c91d634159833139a50b1f9b2538d19 SHA512 b11264b2df58f1cbd634a65c27517a96263d181ef65f0780636aef4e7e15a51d1fcca8e16870af046fe066aad529bf4ad24b901491ffbeba169098f39d12a0bf WHIRLPOOL 0d5fab2c78946fba71144666bc63e280fa680de085b27cdb2f52b4b69b377aea6a6ec5b533dea9eb2279b9a7b0ce72d170c7fb263e4243203b19f5760b96c227
+EBUILD selinux-xfs-9999.ebuild 278 SHA256 aa5425dbde4f4a39ebdfb1eafa499d487c91d634159833139a50b1f9b2538d19 SHA512 b11264b2df58f1cbd634a65c27517a96263d181ef65f0780636aef4e7e15a51d1fcca8e16870af046fe066aad529bf4ad24b901491ffbeba169098f39d12a0bf WHIRLPOOL 0d5fab2c78946fba71144666bc63e280fa680de085b27cdb2f52b4b69b377aea6a6ec5b533dea9eb2279b9a7b0ce72d170c7fb263e4243203b19f5760b96c227
 MISC ChangeLog 10295 SHA256 28f1ff36e0b022f25b38a274937152f3a706c6a989ab86ff416b53fa39661c6d SHA512 9263eb08120ae3810f8e7fa9b63b9ecc33f36ec03b730ec399b6545ffae1907bf2abe7e12013108f2dcbef747e9ad1e8fd2aca5a438dc2639cb454a722ff4f31 WHIRLPOOL 04802c84a85efa5958705d97e31aacc09c653972eef4e749930090eefa37066abfbf2419a0090d9a6033da1cbdf0fd0012cb9bf6020dd7f4eb2d0a8da757b5fe
 MISC ChangeLog-2015 9523 SHA256 b7a6fef1968b7de510849073eb34f9b3cdde1df1273b614ef31279d469dbf437 SHA512 3c3d6500b6918815c11364ef8c1bfeef00b293c9c287dc3fc3590f2ee6b2269062906b33291f656b732ae7a7c3da6d909a3df13ccbb968389ea23e7f260cba71 WHIRLPOOL acb7dd94d121d7008067de1b0a1ccecf6815f755e05a77fff71e84952d8ea24634a158b4d5f5fe6ae663e49a455b6d9eb6c7268be39f42ef1e2a594d433e4906
 MISC metadata.xml 313 SHA256 b826e23b84b1628d29b75009be60ae992be373f7c1760d714f39b3199199dffa SHA512 5e9759c65739b4c1392585addc79b9b430fbdc6a564d27836398d686e3e89b84b4213243b571022ee7703413b5212d212a92fbb3feb0134a14a8c31ab5e67bee WHIRLPOOL ef656a46fcc21e55c8e34af49557f285a1b488223239fe503ba921de13e41eb0f24e46e8c92fe792d83769e6e85a6751e1545e3807d5cbf5746c5a26dde62eb9
diff --git a/sec-policy/selinux-xfs/selinux-xfs-2.20170204-r1.ebuild b/sec-policy/selinux-xfs/selinux-xfs-2.20170204-r1.ebuild
index fe68ca4c1129..a2cc37d8b263 100644
--- a/sec-policy/selinux-xfs/selinux-xfs-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-xfs/selinux-xfs-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-xfs/selinux-xfs-2.20170204-r2.ebuild b/sec-policy/selinux-xfs/selinux-xfs-2.20170204-r2.ebuild
index 3bcffbe3c0b3..bd58f42cd8ff 100644
--- a/sec-policy/selinux-xfs/selinux-xfs-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-xfs/selinux-xfs-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-xfs/selinux-xfs-2.20170204-r3.ebuild b/sec-policy/selinux-xfs/selinux-xfs-2.20170204-r3.ebuild
index 3bcffbe3c0b3..bd58f42cd8ff 100644
--- a/sec-policy/selinux-xfs/selinux-xfs-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-xfs/selinux-xfs-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-xfs/selinux-xfs-2.20170204-r4.ebuild b/sec-policy/selinux-xfs/selinux-xfs-2.20170204-r4.ebuild
index 3bcffbe3c0b3..bd58f42cd8ff 100644
--- a/sec-policy/selinux-xfs/selinux-xfs-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-xfs/selinux-xfs-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-xfs/selinux-xfs-2.20170805-r2.ebuild b/sec-policy/selinux-xfs/selinux-xfs-2.20170805-r2.ebuild
index 3bcffbe3c0b3..bd58f42cd8ff 100644
--- a/sec-policy/selinux-xfs/selinux-xfs-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-xfs/selinux-xfs-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-xfs/selinux-xfs-2.20170805-r3.ebuild b/sec-policy/selinux-xfs/selinux-xfs-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..a2cc37d8b263
--- /dev/null
+++ b/sec-policy/selinux-xfs/selinux-xfs-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-xfs/selinux-xfs-9999.ebuild b/sec-policy/selinux-xfs/selinux-xfs-9999.ebuild
index fe68ca4c1129..a2cc37d8b263 100644
--- a/sec-policy/selinux-xfs/selinux-xfs-9999.ebuild
+++ b/sec-policy/selinux-xfs/selinux-xfs-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-xprint/Manifest b/sec-policy/selinux-xprint/Manifest
index f07f5777b0fe..86d0bd16b89c 100644
--- a/sec-policy/selinux-xprint/Manifest
+++ b/sec-policy/selinux-xprint/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-xprint-2.20170204-r1.ebuild 283 SHA256 532ad03387031efd91a4e3a5fe6dc7816d859730aedbdf0b11157632cce92ee1 SHA512 c82aff614a0159574b08e48846e7015e19bced38c42594327cea052e6054aaacaab9a7ff26f422d704da3c46d09954a8a9e5d19cfad2ba2ae1a2349b13e1c2c4 WHIRLPOOL 234a97ee0f689751c9cfcee77ac3cab47e20c45b3749772a6a2c75a1e0b1d08d5af33992794239e1d8a11cdf79fc7612dcbce3794139a3095bf49e150b54bbea
-EBUILD selinux-xprint-2.20170204-r2.ebuild 281 SHA256 61f703841fed91537e10682b040164ccacf75a520bdb850535fe78f8615f526d SHA512 3c27fc6d5032845e3ffc3a3d26db9082f3b4a1f773fb3fd0768cf125f307a9a6400d4ccd81ccf958440a9ea6aed8ba453b9a47d192501ee5160327216ca7272a WHIRLPOOL 3b508444e6440c531d05f8085a494744a62229634429198a49d30e7ddd2d08392d074f2c1f0e714fbd971f657402bca4b53ee0c7086416a55e67d048a11cfbb5
-EBUILD selinux-xprint-2.20170204-r3.ebuild 281 SHA256 61f703841fed91537e10682b040164ccacf75a520bdb850535fe78f8615f526d SHA512 3c27fc6d5032845e3ffc3a3d26db9082f3b4a1f773fb3fd0768cf125f307a9a6400d4ccd81ccf958440a9ea6aed8ba453b9a47d192501ee5160327216ca7272a WHIRLPOOL 3b508444e6440c531d05f8085a494744a62229634429198a49d30e7ddd2d08392d074f2c1f0e714fbd971f657402bca4b53ee0c7086416a55e67d048a11cfbb5
-EBUILD selinux-xprint-2.20170204-r4.ebuild 281 SHA256 61f703841fed91537e10682b040164ccacf75a520bdb850535fe78f8615f526d SHA512 3c27fc6d5032845e3ffc3a3d26db9082f3b4a1f773fb3fd0768cf125f307a9a6400d4ccd81ccf958440a9ea6aed8ba453b9a47d192501ee5160327216ca7272a WHIRLPOOL 3b508444e6440c531d05f8085a494744a62229634429198a49d30e7ddd2d08392d074f2c1f0e714fbd971f657402bca4b53ee0c7086416a55e67d048a11cfbb5
-EBUILD selinux-xprint-2.20170805-r2.ebuild 281 SHA256 61f703841fed91537e10682b040164ccacf75a520bdb850535fe78f8615f526d SHA512 3c27fc6d5032845e3ffc3a3d26db9082f3b4a1f773fb3fd0768cf125f307a9a6400d4ccd81ccf958440a9ea6aed8ba453b9a47d192501ee5160327216ca7272a WHIRLPOOL 3b508444e6440c531d05f8085a494744a62229634429198a49d30e7ddd2d08392d074f2c1f0e714fbd971f657402bca4b53ee0c7086416a55e67d048a11cfbb5
-EBUILD selinux-xprint-9999.ebuild 283 SHA256 532ad03387031efd91a4e3a5fe6dc7816d859730aedbdf0b11157632cce92ee1 SHA512 c82aff614a0159574b08e48846e7015e19bced38c42594327cea052e6054aaacaab9a7ff26f422d704da3c46d09954a8a9e5d19cfad2ba2ae1a2349b13e1c2c4 WHIRLPOOL 234a97ee0f689751c9cfcee77ac3cab47e20c45b3749772a6a2c75a1e0b1d08d5af33992794239e1d8a11cdf79fc7612dcbce3794139a3095bf49e150b54bbea
+EBUILD selinux-xprint-2.20170204-r1.ebuild 284 SHA256 b5e651080f0691154bab49f24368f6ba13110fb6574169433215eb7bcfadf188 SHA512 50c5451066788ab806200ef14bebad8b33987cd18390b49eef01262751ea766704d32cbf75d0a9f3117b95ddee6815088bad44827d309af06da848a9d61312fd WHIRLPOOL 1fcc9122f4f430b7ecef1620ab9e0ead49d8c4a81252913e7a0d373c5357f81acb38b38a10ad8e7221ac0a855f938be7bda1d6b2dc9e2e88a7c8091eb5d9a910
+EBUILD selinux-xprint-2.20170204-r2.ebuild 282 SHA256 8f0be82df566ef81c6c5e62a3397717702789ca14033556a4a57fac7cc6b6aec SHA512 ecc2828c0f8c0f3653d388844a7011838abb4b5360650ce46eb520c172589f81b85f98151acf4a8f047b441e277aeeb6c45b8cbe2f830768757ed70d7879c3ec WHIRLPOOL 45e183a08cb4c05d05e3c9757f53d9ea4460442257e23110190b1b411dbb556cc7cca54775ce1b0ee3bccfdcc5468db8592406dfe0474caa7837e1ad6d736b6d
+EBUILD selinux-xprint-2.20170204-r3.ebuild 282 SHA256 8f0be82df566ef81c6c5e62a3397717702789ca14033556a4a57fac7cc6b6aec SHA512 ecc2828c0f8c0f3653d388844a7011838abb4b5360650ce46eb520c172589f81b85f98151acf4a8f047b441e277aeeb6c45b8cbe2f830768757ed70d7879c3ec WHIRLPOOL 45e183a08cb4c05d05e3c9757f53d9ea4460442257e23110190b1b411dbb556cc7cca54775ce1b0ee3bccfdcc5468db8592406dfe0474caa7837e1ad6d736b6d
+EBUILD selinux-xprint-2.20170204-r4.ebuild 282 SHA256 8f0be82df566ef81c6c5e62a3397717702789ca14033556a4a57fac7cc6b6aec SHA512 ecc2828c0f8c0f3653d388844a7011838abb4b5360650ce46eb520c172589f81b85f98151acf4a8f047b441e277aeeb6c45b8cbe2f830768757ed70d7879c3ec WHIRLPOOL 45e183a08cb4c05d05e3c9757f53d9ea4460442257e23110190b1b411dbb556cc7cca54775ce1b0ee3bccfdcc5468db8592406dfe0474caa7837e1ad6d736b6d
+EBUILD selinux-xprint-2.20170805-r2.ebuild 282 SHA256 8f0be82df566ef81c6c5e62a3397717702789ca14033556a4a57fac7cc6b6aec SHA512 ecc2828c0f8c0f3653d388844a7011838abb4b5360650ce46eb520c172589f81b85f98151acf4a8f047b441e277aeeb6c45b8cbe2f830768757ed70d7879c3ec WHIRLPOOL 45e183a08cb4c05d05e3c9757f53d9ea4460442257e23110190b1b411dbb556cc7cca54775ce1b0ee3bccfdcc5468db8592406dfe0474caa7837e1ad6d736b6d
+EBUILD selinux-xprint-2.20170805-r3.ebuild 284 SHA256 b5e651080f0691154bab49f24368f6ba13110fb6574169433215eb7bcfadf188 SHA512 50c5451066788ab806200ef14bebad8b33987cd18390b49eef01262751ea766704d32cbf75d0a9f3117b95ddee6815088bad44827d309af06da848a9d61312fd WHIRLPOOL 1fcc9122f4f430b7ecef1620ab9e0ead49d8c4a81252913e7a0d373c5357f81acb38b38a10ad8e7221ac0a855f938be7bda1d6b2dc9e2e88a7c8091eb5d9a910
+EBUILD selinux-xprint-9999.ebuild 284 SHA256 b5e651080f0691154bab49f24368f6ba13110fb6574169433215eb7bcfadf188 SHA512 50c5451066788ab806200ef14bebad8b33987cd18390b49eef01262751ea766704d32cbf75d0a9f3117b95ddee6815088bad44827d309af06da848a9d61312fd WHIRLPOOL 1fcc9122f4f430b7ecef1620ab9e0ead49d8c4a81252913e7a0d373c5357f81acb38b38a10ad8e7221ac0a855f938be7bda1d6b2dc9e2e88a7c8091eb5d9a910
 MISC ChangeLog 10571 SHA256 3e5ff237c19ebf54f0420cfe7b66e311929dbca5e2c0cb6274598c2e73a77375 SHA512 fc9108c13d724c72e46128776e2e656a67bdf3afea5e8d3818bc70fe14958159e0321e475e784c25d98cbbeee942d240f7f0a8bed1249840d81e155bfcc7afe4 WHIRLPOOL e4a11bbe6df8a8edf850ecb200f41b15eb001e71683db138c8501ad67e865d9add7fb02e163be16fee52cc8f5fea6e32d183f0a66b550e10a4ef9518eef64336
 MISC ChangeLog-2015 9595 SHA256 02e34149351b6831157304e97d2a37bf1935b732d79faaa2281ba3e8b775cd09 SHA512 19ad989f9e0f3c096df8b44e3e242b62619a61d19adbcc24b568cf12531cb0de700223de66314a37ab105355a065402a0026cb8903526acd42f694cda9b10fbc WHIRLPOOL 03a1d70b523272c04786192312099af00ca9cd5eb3f334d57fc0ba41337d6809f9430975ab680d1ea495cd16b23ada7488184643c596d361f261258e85d0a8e9
 MISC metadata.xml 316 SHA256 1c99c472bcb426216c5890850a2a438dba0fd1f729efa38b63b96c5b9981c5dc SHA512 6025b0050ab23d7f203102d346962ab4042058052e4bd2fad5b376b8d408fc266e252fee0b99f218f39adb538c22b8cf740bf628b3c6f1db586af3e9c1ef988e WHIRLPOOL 442d8e556a7234df7264c9670abef383271b393cf66146adc64ffb492ea71e4cb1c6acb8b394d68ffa270ca2f07664edb8db4b5971bcc8580a9ca5565bcca958
diff --git a/sec-policy/selinux-xprint/selinux-xprint-2.20170204-r1.ebuild b/sec-policy/selinux-xprint/selinux-xprint-2.20170204-r1.ebuild
index d9b38b4b7f33..229b7c9dc101 100644
--- a/sec-policy/selinux-xprint/selinux-xprint-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-xprint/selinux-xprint-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-xprint/selinux-xprint-2.20170204-r2.ebuild b/sec-policy/selinux-xprint/selinux-xprint-2.20170204-r2.ebuild
index 12b4343c3bef..e0a484593be8 100644
--- a/sec-policy/selinux-xprint/selinux-xprint-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-xprint/selinux-xprint-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-xprint/selinux-xprint-2.20170204-r3.ebuild b/sec-policy/selinux-xprint/selinux-xprint-2.20170204-r3.ebuild
index 12b4343c3bef..e0a484593be8 100644
--- a/sec-policy/selinux-xprint/selinux-xprint-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-xprint/selinux-xprint-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-xprint/selinux-xprint-2.20170204-r4.ebuild b/sec-policy/selinux-xprint/selinux-xprint-2.20170204-r4.ebuild
index 12b4343c3bef..e0a484593be8 100644
--- a/sec-policy/selinux-xprint/selinux-xprint-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-xprint/selinux-xprint-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-xprint/selinux-xprint-2.20170805-r2.ebuild b/sec-policy/selinux-xprint/selinux-xprint-2.20170805-r2.ebuild
index 12b4343c3bef..e0a484593be8 100644
--- a/sec-policy/selinux-xprint/selinux-xprint-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-xprint/selinux-xprint-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-xprint/selinux-xprint-2.20170805-r3.ebuild b/sec-policy/selinux-xprint/selinux-xprint-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..229b7c9dc101
--- /dev/null
+++ b/sec-policy/selinux-xprint/selinux-xprint-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-xprint/selinux-xprint-9999.ebuild b/sec-policy/selinux-xprint/selinux-xprint-9999.ebuild
index d9b38b4b7f33..229b7c9dc101 100644
--- a/sec-policy/selinux-xprint/selinux-xprint-9999.ebuild
+++ b/sec-policy/selinux-xprint/selinux-xprint-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-xscreensaver/Manifest b/sec-policy/selinux-xscreensaver/Manifest
index fc938b6c900e..f3e3fb19d21a 100644
--- a/sec-policy/selinux-xscreensaver/Manifest
+++ b/sec-policy/selinux-xscreensaver/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-xscreensaver-2.20170204-r1.ebuild 393 SHA256 7ac80b27ee1baeb1b26eb0abdc5319fb7e8df98b5c3ecdcb92711013969cc14c SHA512 c219dc0600049cd881c2c1983853c5a2b61df089076f75e0e02c0d97833eaf4af931cd5fbd016d60cce64deedc90697a78cc6c2df6d44b4e1b5532efa61e0c80 WHIRLPOOL 74825dc2a4ecbf0f214fb2651a5d4be59e77fca04801c6eafe13c1a588e2e4dee6f8dd8844dea1af50641745d15bc51b03904ed1895a19823d18bfe8733536a9
-EBUILD selinux-xscreensaver-2.20170204-r2.ebuild 391 SHA256 aea58d4184753399f0ec5fc3bada9f2031f2c509bc815a25fe130ec82dc33c03 SHA512 c6c68ee67064f93dd362545dffc69343979e95dbf1c0018751a6ca6b7ba202090dec7cea4bdde81e2e31aee11fb1c9ffb5db21ab7ad796e4753675f01ac188dc WHIRLPOOL 2dfe40c85cf2c204a33ae03cd3e9206ad00ae2a969f0370b427b2310b96db03fb8bee7879dea327ef970cb3627a1351b9af4848d67f5ee8c200a39ec3ae0cf6a
-EBUILD selinux-xscreensaver-2.20170204-r3.ebuild 391 SHA256 aea58d4184753399f0ec5fc3bada9f2031f2c509bc815a25fe130ec82dc33c03 SHA512 c6c68ee67064f93dd362545dffc69343979e95dbf1c0018751a6ca6b7ba202090dec7cea4bdde81e2e31aee11fb1c9ffb5db21ab7ad796e4753675f01ac188dc WHIRLPOOL 2dfe40c85cf2c204a33ae03cd3e9206ad00ae2a969f0370b427b2310b96db03fb8bee7879dea327ef970cb3627a1351b9af4848d67f5ee8c200a39ec3ae0cf6a
-EBUILD selinux-xscreensaver-2.20170204-r4.ebuild 391 SHA256 aea58d4184753399f0ec5fc3bada9f2031f2c509bc815a25fe130ec82dc33c03 SHA512 c6c68ee67064f93dd362545dffc69343979e95dbf1c0018751a6ca6b7ba202090dec7cea4bdde81e2e31aee11fb1c9ffb5db21ab7ad796e4753675f01ac188dc WHIRLPOOL 2dfe40c85cf2c204a33ae03cd3e9206ad00ae2a969f0370b427b2310b96db03fb8bee7879dea327ef970cb3627a1351b9af4848d67f5ee8c200a39ec3ae0cf6a
-EBUILD selinux-xscreensaver-2.20170805-r2.ebuild 391 SHA256 aea58d4184753399f0ec5fc3bada9f2031f2c509bc815a25fe130ec82dc33c03 SHA512 c6c68ee67064f93dd362545dffc69343979e95dbf1c0018751a6ca6b7ba202090dec7cea4bdde81e2e31aee11fb1c9ffb5db21ab7ad796e4753675f01ac188dc WHIRLPOOL 2dfe40c85cf2c204a33ae03cd3e9206ad00ae2a969f0370b427b2310b96db03fb8bee7879dea327ef970cb3627a1351b9af4848d67f5ee8c200a39ec3ae0cf6a
-EBUILD selinux-xscreensaver-9999.ebuild 393 SHA256 7ac80b27ee1baeb1b26eb0abdc5319fb7e8df98b5c3ecdcb92711013969cc14c SHA512 c219dc0600049cd881c2c1983853c5a2b61df089076f75e0e02c0d97833eaf4af931cd5fbd016d60cce64deedc90697a78cc6c2df6d44b4e1b5532efa61e0c80 WHIRLPOOL 74825dc2a4ecbf0f214fb2651a5d4be59e77fca04801c6eafe13c1a588e2e4dee6f8dd8844dea1af50641745d15bc51b03904ed1895a19823d18bfe8733536a9
+EBUILD selinux-xscreensaver-2.20170204-r1.ebuild 394 SHA256 4dbd572c3da2edb618615a3f0401bab44c140a1003ae47bb8b618da7cfeb22d6 SHA512 950c446f9e63773bf40fddec758842d2c82415a7886fd89b046bac0188ed02e26edb5350a6570bf04bd678cb7bf2065a5d462c23161ed16d353037129fa1c118 WHIRLPOOL 10d30ada87fbcabe0e3fad6657191afd6a445d4cb211560cde3d1a3c4acc4fb108b1e7be7444f6d7b3386fb93df47f7fb8e016dd1e8725baa55387431aa36aa8
+EBUILD selinux-xscreensaver-2.20170204-r2.ebuild 392 SHA256 9ab02784a082cde86e356a5df91c6f3a29c7f20af0267a0e89d2eb72efdb2cda SHA512 31ab57bb35c3acc159371db9a32c71a99b3ba4c92aaa18c2c65ba4160af2a696fb9cb3b12ab0898a5ad92dbdb8db2cc84f14424053d4bf2f226a81b82840a7c2 WHIRLPOOL 941077f1a7dc4896f181e9b170e80c0358ddb3d782012f21fbda5480be95208c294929675aea93dbc6853b76f80e5534da6e1f5f161baa38767df6fee857f1b2
+EBUILD selinux-xscreensaver-2.20170204-r3.ebuild 392 SHA256 9ab02784a082cde86e356a5df91c6f3a29c7f20af0267a0e89d2eb72efdb2cda SHA512 31ab57bb35c3acc159371db9a32c71a99b3ba4c92aaa18c2c65ba4160af2a696fb9cb3b12ab0898a5ad92dbdb8db2cc84f14424053d4bf2f226a81b82840a7c2 WHIRLPOOL 941077f1a7dc4896f181e9b170e80c0358ddb3d782012f21fbda5480be95208c294929675aea93dbc6853b76f80e5534da6e1f5f161baa38767df6fee857f1b2
+EBUILD selinux-xscreensaver-2.20170204-r4.ebuild 392 SHA256 9ab02784a082cde86e356a5df91c6f3a29c7f20af0267a0e89d2eb72efdb2cda SHA512 31ab57bb35c3acc159371db9a32c71a99b3ba4c92aaa18c2c65ba4160af2a696fb9cb3b12ab0898a5ad92dbdb8db2cc84f14424053d4bf2f226a81b82840a7c2 WHIRLPOOL 941077f1a7dc4896f181e9b170e80c0358ddb3d782012f21fbda5480be95208c294929675aea93dbc6853b76f80e5534da6e1f5f161baa38767df6fee857f1b2
+EBUILD selinux-xscreensaver-2.20170805-r2.ebuild 392 SHA256 9ab02784a082cde86e356a5df91c6f3a29c7f20af0267a0e89d2eb72efdb2cda SHA512 31ab57bb35c3acc159371db9a32c71a99b3ba4c92aaa18c2c65ba4160af2a696fb9cb3b12ab0898a5ad92dbdb8db2cc84f14424053d4bf2f226a81b82840a7c2 WHIRLPOOL 941077f1a7dc4896f181e9b170e80c0358ddb3d782012f21fbda5480be95208c294929675aea93dbc6853b76f80e5534da6e1f5f161baa38767df6fee857f1b2
+EBUILD selinux-xscreensaver-2.20170805-r3.ebuild 394 SHA256 4dbd572c3da2edb618615a3f0401bab44c140a1003ae47bb8b618da7cfeb22d6 SHA512 950c446f9e63773bf40fddec758842d2c82415a7886fd89b046bac0188ed02e26edb5350a6570bf04bd678cb7bf2065a5d462c23161ed16d353037129fa1c118 WHIRLPOOL 10d30ada87fbcabe0e3fad6657191afd6a445d4cb211560cde3d1a3c4acc4fb108b1e7be7444f6d7b3386fb93df47f7fb8e016dd1e8725baa55387431aa36aa8
+EBUILD selinux-xscreensaver-9999.ebuild 394 SHA256 4dbd572c3da2edb618615a3f0401bab44c140a1003ae47bb8b618da7cfeb22d6 SHA512 950c446f9e63773bf40fddec758842d2c82415a7886fd89b046bac0188ed02e26edb5350a6570bf04bd678cb7bf2065a5d462c23161ed16d353037129fa1c118 WHIRLPOOL 10d30ada87fbcabe0e3fad6657191afd6a445d4cb211560cde3d1a3c4acc4fb108b1e7be7444f6d7b3386fb93df47f7fb8e016dd1e8725baa55387431aa36aa8
 MISC ChangeLog 11167 SHA256 fb264151014f3079b6480eee79f988687956bf4f293a69fbccc3233b93646b26 SHA512 9efc683ddce472332b180c4fa6683189de3a10a2ae7635ebcd0c8e34f391ffa71c06407eba1b108899928bbc57515d9a9674d5bc2a227e1755593db828dce359 WHIRLPOOL 2ff17c3161f882b24fdda6b23e353b2bf49fc36314d13e20397067bb043d17fcf090e8c81f556fb021df7ff701336c546d1acdb0bbbec993a9bf5c8a53698515
 MISC ChangeLog-2015 10852 SHA256 5b791f23ba61e5f8678ae5c88f46088efdd1517c3f9fba0185cef4fe68880978 SHA512 51ee66481152a9e7b3e8571d669838f8e6a80e31f0882bc7d9e273ebe9e5b44f2ceca7732c8565b2d25d2a2a143300e103938761fa66c3d307c57ed3ff93e31e WHIRLPOOL 31c8e0005a3c045ab3facd7be726fdb22d0b5273352f8f3cf48c6d8a99f07530b37bcc67ac6dd2f854dececa997d2b9416fa118f4fa9e7b1c364dcfb9ce379c8
 MISC metadata.xml 322 SHA256 d1efc6b73a4bba3eb155b56ff44003bd3db6ac75efb025d5161c64b84a5bbb5e SHA512 405222d4ec4a70637897d7122cfb105c70ecb118237a3a614faf5af8f97789ce88820cb4455ffa6c661b17c9352d8d31eb3afc46e9b02bc338d3ee23f16aca07 WHIRLPOOL abc596a1c208422cb5c84054e666ca33a5cbaed4caabe421a8e42a840db101b46c00b4f25de6869290136caf7e5bcef107cd0c5e99092c4273cd0754c3e970dc
diff --git a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20170204-r1.ebuild b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20170204-r1.ebuild
index 00572af83e80..f333201746de 100644
--- a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20170204-r2.ebuild b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20170204-r2.ebuild
index cc6632e62b3c..18f231a7f287 100644
--- a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20170204-r3.ebuild b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20170204-r3.ebuild
index cc6632e62b3c..18f231a7f287 100644
--- a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20170204-r4.ebuild b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20170204-r4.ebuild
index cc6632e62b3c..18f231a7f287 100644
--- a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20170805-r2.ebuild b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20170805-r2.ebuild
index cc6632e62b3c..18f231a7f287 100644
--- a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20170805-r3.ebuild b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..f333201746de
--- /dev/null
+++ b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20170805-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-xscreensaver/selinux-xscreensaver-9999.ebuild b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-9999.ebuild
index 00572af83e80..f333201746de 100644
--- a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-9999.ebuild
+++ b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-xserver/Manifest b/sec-policy/selinux-xserver/Manifest
index 37e8ac23454c..fbf808947d2f 100644
--- a/sec-policy/selinux-xserver/Manifest
+++ b/sec-policy/selinux-xserver/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-xserver-2.20170204-r1.ebuild 285 SHA256 732fba752dc75f591cd051125aa5605b922dd4642561440de64f65dbcaed21a4 SHA512 876c05949a28eb2e7ceaddbf32c55ca87e3df7799c95bea525f719ff565fc4db82e5287f0bf9f799baca7a9bdd32b37c88d396a77aa37c7966fda80704c6e3e8 WHIRLPOOL e01cff03e93dcca897e6fd256f790359a84b39eab71b94e3a5fc0000734335bc896826b7f58109d9351928427871cb46cb9aa5623a9441833da4c0807e2e59ff
-EBUILD selinux-xserver-2.20170204-r2.ebuild 283 SHA256 6f324dc4a90e735769f6b7875652472bfdbd2573793929caf507362f36b5116f SHA512 7c51a5a561ed5c6bc223551b55aefd833cd17b1e39a38c7ac49e8c3f8fc448946224f79909593d351d22c993de668fffc59927a65ca111c445119c703435857b WHIRLPOOL 18e54a956c24119e47b4347ae85b76fa96b73958e773d55eba74b57c9824eedfa694387372c29edf0ffbd9d83e1fb772204720679c662a081741b526f4cb8af7
-EBUILD selinux-xserver-2.20170204-r3.ebuild 283 SHA256 6f324dc4a90e735769f6b7875652472bfdbd2573793929caf507362f36b5116f SHA512 7c51a5a561ed5c6bc223551b55aefd833cd17b1e39a38c7ac49e8c3f8fc448946224f79909593d351d22c993de668fffc59927a65ca111c445119c703435857b WHIRLPOOL 18e54a956c24119e47b4347ae85b76fa96b73958e773d55eba74b57c9824eedfa694387372c29edf0ffbd9d83e1fb772204720679c662a081741b526f4cb8af7
-EBUILD selinux-xserver-2.20170204-r4.ebuild 283 SHA256 6f324dc4a90e735769f6b7875652472bfdbd2573793929caf507362f36b5116f SHA512 7c51a5a561ed5c6bc223551b55aefd833cd17b1e39a38c7ac49e8c3f8fc448946224f79909593d351d22c993de668fffc59927a65ca111c445119c703435857b WHIRLPOOL 18e54a956c24119e47b4347ae85b76fa96b73958e773d55eba74b57c9824eedfa694387372c29edf0ffbd9d83e1fb772204720679c662a081741b526f4cb8af7
-EBUILD selinux-xserver-2.20170805-r2.ebuild 283 SHA256 6f324dc4a90e735769f6b7875652472bfdbd2573793929caf507362f36b5116f SHA512 7c51a5a561ed5c6bc223551b55aefd833cd17b1e39a38c7ac49e8c3f8fc448946224f79909593d351d22c993de668fffc59927a65ca111c445119c703435857b WHIRLPOOL 18e54a956c24119e47b4347ae85b76fa96b73958e773d55eba74b57c9824eedfa694387372c29edf0ffbd9d83e1fb772204720679c662a081741b526f4cb8af7
-EBUILD selinux-xserver-9999.ebuild 285 SHA256 732fba752dc75f591cd051125aa5605b922dd4642561440de64f65dbcaed21a4 SHA512 876c05949a28eb2e7ceaddbf32c55ca87e3df7799c95bea525f719ff565fc4db82e5287f0bf9f799baca7a9bdd32b37c88d396a77aa37c7966fda80704c6e3e8 WHIRLPOOL e01cff03e93dcca897e6fd256f790359a84b39eab71b94e3a5fc0000734335bc896826b7f58109d9351928427871cb46cb9aa5623a9441833da4c0807e2e59ff
+EBUILD selinux-xserver-2.20170204-r1.ebuild 286 SHA256 22504b006c4cbc6cc719ea8d394a4bf74737f521cbd34f4b186d884f7de604a0 SHA512 2a036e6b550e6442e0e5a245161b421e02f8eae9acab821af2fa064a6c4f55ff1e2f269a72defbc5ca399af7b0381c4e393b5b4c9248b41ca026cf0a776f8fa9 WHIRLPOOL 06a64fb131f4fb398a26c363a4cdee667a4b2b127cf6e7066861ef209edc34781c6f75ac5882c1443fee9a01aafb70d657e1a8b3757aaa5332576924927deaab
+EBUILD selinux-xserver-2.20170204-r2.ebuild 284 SHA256 b051c8bae8c92334aee14df274b92c41f6741682c6fb1f3f16cb4548d576fecf SHA512 cd1e9f8f70b97aebbcf3c3c846181a89c5c06f0285c79b9c5cfaaaec7f85ac9c76b6db75aaf3b15d6e17cb3ab01966652f44d23c904e47fd1e05d516a8a39f55 WHIRLPOOL 02512388c26c15aba4aec447406259e83d0992a02eee9516ec8e709347ae3b2a1d0543df4b2d164438782f47ebb162fe2ab039d873d0cc36d411795ac18815de
+EBUILD selinux-xserver-2.20170204-r3.ebuild 284 SHA256 b051c8bae8c92334aee14df274b92c41f6741682c6fb1f3f16cb4548d576fecf SHA512 cd1e9f8f70b97aebbcf3c3c846181a89c5c06f0285c79b9c5cfaaaec7f85ac9c76b6db75aaf3b15d6e17cb3ab01966652f44d23c904e47fd1e05d516a8a39f55 WHIRLPOOL 02512388c26c15aba4aec447406259e83d0992a02eee9516ec8e709347ae3b2a1d0543df4b2d164438782f47ebb162fe2ab039d873d0cc36d411795ac18815de
+EBUILD selinux-xserver-2.20170204-r4.ebuild 284 SHA256 b051c8bae8c92334aee14df274b92c41f6741682c6fb1f3f16cb4548d576fecf SHA512 cd1e9f8f70b97aebbcf3c3c846181a89c5c06f0285c79b9c5cfaaaec7f85ac9c76b6db75aaf3b15d6e17cb3ab01966652f44d23c904e47fd1e05d516a8a39f55 WHIRLPOOL 02512388c26c15aba4aec447406259e83d0992a02eee9516ec8e709347ae3b2a1d0543df4b2d164438782f47ebb162fe2ab039d873d0cc36d411795ac18815de
+EBUILD selinux-xserver-2.20170805-r2.ebuild 284 SHA256 b051c8bae8c92334aee14df274b92c41f6741682c6fb1f3f16cb4548d576fecf SHA512 cd1e9f8f70b97aebbcf3c3c846181a89c5c06f0285c79b9c5cfaaaec7f85ac9c76b6db75aaf3b15d6e17cb3ab01966652f44d23c904e47fd1e05d516a8a39f55 WHIRLPOOL 02512388c26c15aba4aec447406259e83d0992a02eee9516ec8e709347ae3b2a1d0543df4b2d164438782f47ebb162fe2ab039d873d0cc36d411795ac18815de
+EBUILD selinux-xserver-2.20170805-r3.ebuild 286 SHA256 22504b006c4cbc6cc719ea8d394a4bf74737f521cbd34f4b186d884f7de604a0 SHA512 2a036e6b550e6442e0e5a245161b421e02f8eae9acab821af2fa064a6c4f55ff1e2f269a72defbc5ca399af7b0381c4e393b5b4c9248b41ca026cf0a776f8fa9 WHIRLPOOL 06a64fb131f4fb398a26c363a4cdee667a4b2b127cf6e7066861ef209edc34781c6f75ac5882c1443fee9a01aafb70d657e1a8b3757aaa5332576924927deaab
+EBUILD selinux-xserver-9999.ebuild 286 SHA256 22504b006c4cbc6cc719ea8d394a4bf74737f521cbd34f4b186d884f7de604a0 SHA512 2a036e6b550e6442e0e5a245161b421e02f8eae9acab821af2fa064a6c4f55ff1e2f269a72defbc5ca399af7b0381c4e393b5b4c9248b41ca026cf0a776f8fa9 WHIRLPOOL 06a64fb131f4fb398a26c363a4cdee667a4b2b127cf6e7066861ef209edc34781c6f75ac5882c1443fee9a01aafb70d657e1a8b3757aaa5332576924927deaab
 MISC ChangeLog 10687 SHA256 f502a29f6ae481f492aedc5b5a5fdbd0b65095a192fbe11733c0c31f4be2939d SHA512 8d6af0c65c194a96b1e00aecc2f0ac54301849a0f1ad2a3a564d47912404010b4474b4df7413d96778bcb8eb85e5ac3a538187bca8184d603a4323e90a7b7964 WHIRLPOOL f4ebdc1657c64632ea1bbe4f4659866f26476f08b5a042ed6bbbc7bab068001d1399fffb686798d36284c250a875f8d86902786be7a877dc51d7ba111bac9905
 MISC ChangeLog-2015 11581 SHA256 c42df686ef708b1de48bfb65feeb13ac025cfb304af5a4b46030ad1214fc0997 SHA512 438eb92f921eeca9e63f3252a98fdeabb3422076333e9046f618680a79f73d94085e48564d85e0af1c182ae41ecf55ef0dabc87455dae22317ab260b9c64e719 WHIRLPOOL fc42a4759e446fbf4e00c80a94e30b2f247cd551dff55bdc4f1377788dbfbccb69895be3c70b54123dd79bf317af02acbc7ce42e6742ca37629f69022b11fece
 MISC metadata.xml 317 SHA256 e299f77aec354ad645393047e09d4ee58f252c92256c06910ab576ed1e47b418 SHA512 cdc8ee6cf27d1f6b67ab653cb4db301225fde367b52f0e37f31e15acb0ec0b9fc49be756b64a39188c8bf4e3e6ba417142659b98f1a5795b8cd350464b9fa359 WHIRLPOOL 71362e64520c52175f5dce2e1886c4edbe5cb740a3ca0bf7fbb3b5714d5f49e388992211d0fb2fb8ecac7b5077bc4c20d3216af3ae5685fa327b5cdb97935c61
diff --git a/sec-policy/selinux-xserver/selinux-xserver-2.20170204-r1.ebuild b/sec-policy/selinux-xserver/selinux-xserver-2.20170204-r1.ebuild
index 6b49e4e99e32..1238af8bff1c 100644
--- a/sec-policy/selinux-xserver/selinux-xserver-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-xserver/selinux-xserver-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-xserver/selinux-xserver-2.20170204-r2.ebuild b/sec-policy/selinux-xserver/selinux-xserver-2.20170204-r2.ebuild
index 5fa3142f2b57..9fdf569dc086 100644
--- a/sec-policy/selinux-xserver/selinux-xserver-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-xserver/selinux-xserver-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-xserver/selinux-xserver-2.20170204-r3.ebuild b/sec-policy/selinux-xserver/selinux-xserver-2.20170204-r3.ebuild
index 5fa3142f2b57..9fdf569dc086 100644
--- a/sec-policy/selinux-xserver/selinux-xserver-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-xserver/selinux-xserver-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-xserver/selinux-xserver-2.20170204-r4.ebuild b/sec-policy/selinux-xserver/selinux-xserver-2.20170204-r4.ebuild
index 5fa3142f2b57..9fdf569dc086 100644
--- a/sec-policy/selinux-xserver/selinux-xserver-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-xserver/selinux-xserver-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-xserver/selinux-xserver-2.20170805-r2.ebuild b/sec-policy/selinux-xserver/selinux-xserver-2.20170805-r2.ebuild
index 5fa3142f2b57..9fdf569dc086 100644
--- a/sec-policy/selinux-xserver/selinux-xserver-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-xserver/selinux-xserver-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-xserver/selinux-xserver-2.20170805-r3.ebuild b/sec-policy/selinux-xserver/selinux-xserver-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..1238af8bff1c
--- /dev/null
+++ b/sec-policy/selinux-xserver/selinux-xserver-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-xserver/selinux-xserver-9999.ebuild b/sec-policy/selinux-xserver/selinux-xserver-9999.ebuild
index 6b49e4e99e32..1238af8bff1c 100644
--- a/sec-policy/selinux-xserver/selinux-xserver-9999.ebuild
+++ b/sec-policy/selinux-xserver/selinux-xserver-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-zabbix/Manifest b/sec-policy/selinux-zabbix/Manifest
index f9ef255f0f0f..21eb7f41c2fd 100644
--- a/sec-policy/selinux-zabbix/Manifest
+++ b/sec-policy/selinux-zabbix/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-zabbix-2.20170204-r1.ebuild 283 SHA256 db4bd96f9b28cf4d1ae6b55fc24fac7d3b6c476573fe594a0e226a1a945015fd SHA512 e0eae5f907d9c44b8a431f15d35e951663474bd423f3df17eca870e28114e797a2fd6fca4735f3f034d887bd6c51ef2ef33e405f57b78929cbc7a1dfc64f9f98 WHIRLPOOL b904540a489d45a407afdb0c33ab14c32582bc567c092878cd39cae4a12924a27fb1a1c3cb7c29508ca39eacd95102394176a890ad7f84b88bbea0d2bc7e76b5
-EBUILD selinux-zabbix-2.20170204-r2.ebuild 281 SHA256 630b3dc7f70a66946b4a0d3f750805301aae0822fa858ae6861d47bf8aa89c96 SHA512 33641c848aaef3fb38a8403c90cf03008601835cd2f73ff1c059fae00f4cd8ae9070b63c4f5254c179410cccd3848de037de0ea7623d6483d66ed931b8d9b8e4 WHIRLPOOL 247ff478611a3e8752468a6b857ea66fd11d9e9d0247b21551715c928690d4330a104319c48518a9e71c856d7a47e1744072d6f03dd17a4bac7d497c6e7c47c1
-EBUILD selinux-zabbix-2.20170204-r3.ebuild 281 SHA256 630b3dc7f70a66946b4a0d3f750805301aae0822fa858ae6861d47bf8aa89c96 SHA512 33641c848aaef3fb38a8403c90cf03008601835cd2f73ff1c059fae00f4cd8ae9070b63c4f5254c179410cccd3848de037de0ea7623d6483d66ed931b8d9b8e4 WHIRLPOOL 247ff478611a3e8752468a6b857ea66fd11d9e9d0247b21551715c928690d4330a104319c48518a9e71c856d7a47e1744072d6f03dd17a4bac7d497c6e7c47c1
-EBUILD selinux-zabbix-2.20170204-r4.ebuild 281 SHA256 630b3dc7f70a66946b4a0d3f750805301aae0822fa858ae6861d47bf8aa89c96 SHA512 33641c848aaef3fb38a8403c90cf03008601835cd2f73ff1c059fae00f4cd8ae9070b63c4f5254c179410cccd3848de037de0ea7623d6483d66ed931b8d9b8e4 WHIRLPOOL 247ff478611a3e8752468a6b857ea66fd11d9e9d0247b21551715c928690d4330a104319c48518a9e71c856d7a47e1744072d6f03dd17a4bac7d497c6e7c47c1
-EBUILD selinux-zabbix-2.20170805-r2.ebuild 281 SHA256 630b3dc7f70a66946b4a0d3f750805301aae0822fa858ae6861d47bf8aa89c96 SHA512 33641c848aaef3fb38a8403c90cf03008601835cd2f73ff1c059fae00f4cd8ae9070b63c4f5254c179410cccd3848de037de0ea7623d6483d66ed931b8d9b8e4 WHIRLPOOL 247ff478611a3e8752468a6b857ea66fd11d9e9d0247b21551715c928690d4330a104319c48518a9e71c856d7a47e1744072d6f03dd17a4bac7d497c6e7c47c1
-EBUILD selinux-zabbix-9999.ebuild 283 SHA256 db4bd96f9b28cf4d1ae6b55fc24fac7d3b6c476573fe594a0e226a1a945015fd SHA512 e0eae5f907d9c44b8a431f15d35e951663474bd423f3df17eca870e28114e797a2fd6fca4735f3f034d887bd6c51ef2ef33e405f57b78929cbc7a1dfc64f9f98 WHIRLPOOL b904540a489d45a407afdb0c33ab14c32582bc567c092878cd39cae4a12924a27fb1a1c3cb7c29508ca39eacd95102394176a890ad7f84b88bbea0d2bc7e76b5
+EBUILD selinux-zabbix-2.20170204-r1.ebuild 284 SHA256 3e194a6076b9d7ed3d677317db4e2a22c54d6b4b1356c2f5991e5e23fc6a72a9 SHA512 45cb06bc6f20cc63597926930a2e455b5fccc5cd73a23a25408687eaa590b026d59238a8731e04a73b801c131c95b9485290722f84dd3aa6b6c7ab08fe9117c8 WHIRLPOOL 014e533022c47b0ecac3bcf7fa4e518ab203b082cac6bb880a3f4e649abe9961c1e8a8f46dccb63a51a895f586926b0b2cd56b16b8707688f2cc1b385300d7db
+EBUILD selinux-zabbix-2.20170204-r2.ebuild 282 SHA256 26a68bef1bb5c1d0fdffbcc85f86dcd41b6e0cc9c176db9e56c15024ce82cf33 SHA512 0f9106d524e52ffbf0a2c9f41856f84f5afb0848e6df7ef6a7581cb90da6d272f88180bd6599eb91180f2ad044b1b72cf440574cf97c643381e0e99cde1d2b05 WHIRLPOOL a9a011dd6458c2747da510b17f1b3f88bd2beef9ffa155c9b5f29bc0f7c48ddf0c55d07fdd78ab1f02cb5fe880c1d64df2fbeaa644083b019b9f9a9b01634632
+EBUILD selinux-zabbix-2.20170204-r3.ebuild 282 SHA256 26a68bef1bb5c1d0fdffbcc85f86dcd41b6e0cc9c176db9e56c15024ce82cf33 SHA512 0f9106d524e52ffbf0a2c9f41856f84f5afb0848e6df7ef6a7581cb90da6d272f88180bd6599eb91180f2ad044b1b72cf440574cf97c643381e0e99cde1d2b05 WHIRLPOOL a9a011dd6458c2747da510b17f1b3f88bd2beef9ffa155c9b5f29bc0f7c48ddf0c55d07fdd78ab1f02cb5fe880c1d64df2fbeaa644083b019b9f9a9b01634632
+EBUILD selinux-zabbix-2.20170204-r4.ebuild 282 SHA256 26a68bef1bb5c1d0fdffbcc85f86dcd41b6e0cc9c176db9e56c15024ce82cf33 SHA512 0f9106d524e52ffbf0a2c9f41856f84f5afb0848e6df7ef6a7581cb90da6d272f88180bd6599eb91180f2ad044b1b72cf440574cf97c643381e0e99cde1d2b05 WHIRLPOOL a9a011dd6458c2747da510b17f1b3f88bd2beef9ffa155c9b5f29bc0f7c48ddf0c55d07fdd78ab1f02cb5fe880c1d64df2fbeaa644083b019b9f9a9b01634632
+EBUILD selinux-zabbix-2.20170805-r2.ebuild 282 SHA256 26a68bef1bb5c1d0fdffbcc85f86dcd41b6e0cc9c176db9e56c15024ce82cf33 SHA512 0f9106d524e52ffbf0a2c9f41856f84f5afb0848e6df7ef6a7581cb90da6d272f88180bd6599eb91180f2ad044b1b72cf440574cf97c643381e0e99cde1d2b05 WHIRLPOOL a9a011dd6458c2747da510b17f1b3f88bd2beef9ffa155c9b5f29bc0f7c48ddf0c55d07fdd78ab1f02cb5fe880c1d64df2fbeaa644083b019b9f9a9b01634632
+EBUILD selinux-zabbix-2.20170805-r3.ebuild 284 SHA256 3e194a6076b9d7ed3d677317db4e2a22c54d6b4b1356c2f5991e5e23fc6a72a9 SHA512 45cb06bc6f20cc63597926930a2e455b5fccc5cd73a23a25408687eaa590b026d59238a8731e04a73b801c131c95b9485290722f84dd3aa6b6c7ab08fe9117c8 WHIRLPOOL 014e533022c47b0ecac3bcf7fa4e518ab203b082cac6bb880a3f4e649abe9961c1e8a8f46dccb63a51a895f586926b0b2cd56b16b8707688f2cc1b385300d7db
+EBUILD selinux-zabbix-9999.ebuild 284 SHA256 3e194a6076b9d7ed3d677317db4e2a22c54d6b4b1356c2f5991e5e23fc6a72a9 SHA512 45cb06bc6f20cc63597926930a2e455b5fccc5cd73a23a25408687eaa590b026d59238a8731e04a73b801c131c95b9485290722f84dd3aa6b6c7ab08fe9117c8 WHIRLPOOL 014e533022c47b0ecac3bcf7fa4e518ab203b082cac6bb880a3f4e649abe9961c1e8a8f46dccb63a51a895f586926b0b2cd56b16b8707688f2cc1b385300d7db
 MISC ChangeLog 10571 SHA256 4605c61ea7ace299f91c7326ca65e47f33a82f99d388ae03d25873b065ddf469 SHA512 f1329d4c8cc83762f7af6b36ab95565d204db7bc1a71a00a92c52ab703e918364b2aa6cebad631cb68a86c57017ae2a0888f1b465810bb306c26b1725b1d880c WHIRLPOOL 93558cc9abc72f60cf9dafe9782be475d6612fcefdad59c6f538b43ace0ecd251c5065ac2634e431a715152498cae94f579b049df467e769812da24e3f7a705d
 MISC ChangeLog-2015 10176 SHA256 f367811bbe6ff43fa61473ad44cb1df88db4625d4d5e8023244784e5c8fde4c8 SHA512 020f999801e7b86e6871e56c99ddf821d2f33bb271edd3fe95a2d9116f2365c6487ae64236685a440f6705f0b7c791a8e07075d296f4e3483a0f108801a913f0 WHIRLPOOL f7c524a266949630d2d810f2fdc8828f503b20e4aa166e3d0b0234c5ad60997ea1d85f6e7268a09ffca9030b595d6eaf1ace976656af621ccc839e64980d24c4
 MISC metadata.xml 316 SHA256 45b902019623d847a6819f5bb85438a2416cf84d95482b88a2ed9264a83fe492 SHA512 723a790e3ec5cc0449a7d62d4f3d997a52de7c66238f0d8e6b4a1036e15df38b4aa1f57a559ef98747e85ab0208897aa5733a09bcfe498475bed45edea162b12 WHIRLPOOL bb50638f423684a2235ae7d1e1a265ff1d2593424e721ef2b4bdca2fdc269bf6db838d7857430b310dde23817af8821df2ed04c700384933a50cc4e1e1a83527
diff --git a/sec-policy/selinux-zabbix/selinux-zabbix-2.20170204-r1.ebuild b/sec-policy/selinux-zabbix/selinux-zabbix-2.20170204-r1.ebuild
index 0478378ab92b..3f47ff20c816 100644
--- a/sec-policy/selinux-zabbix/selinux-zabbix-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-zabbix/selinux-zabbix-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-zabbix/selinux-zabbix-2.20170204-r2.ebuild b/sec-policy/selinux-zabbix/selinux-zabbix-2.20170204-r2.ebuild
index 97c3d69c40f5..1855783c9e50 100644
--- a/sec-policy/selinux-zabbix/selinux-zabbix-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-zabbix/selinux-zabbix-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-zabbix/selinux-zabbix-2.20170204-r3.ebuild b/sec-policy/selinux-zabbix/selinux-zabbix-2.20170204-r3.ebuild
index 97c3d69c40f5..1855783c9e50 100644
--- a/sec-policy/selinux-zabbix/selinux-zabbix-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-zabbix/selinux-zabbix-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-zabbix/selinux-zabbix-2.20170204-r4.ebuild b/sec-policy/selinux-zabbix/selinux-zabbix-2.20170204-r4.ebuild
index 97c3d69c40f5..1855783c9e50 100644
--- a/sec-policy/selinux-zabbix/selinux-zabbix-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-zabbix/selinux-zabbix-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-zabbix/selinux-zabbix-2.20170805-r2.ebuild b/sec-policy/selinux-zabbix/selinux-zabbix-2.20170805-r2.ebuild
index 97c3d69c40f5..1855783c9e50 100644
--- a/sec-policy/selinux-zabbix/selinux-zabbix-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-zabbix/selinux-zabbix-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-zabbix/selinux-zabbix-2.20170805-r3.ebuild b/sec-policy/selinux-zabbix/selinux-zabbix-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..3f47ff20c816
--- /dev/null
+++ b/sec-policy/selinux-zabbix/selinux-zabbix-2.20170805-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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
diff --git a/sec-policy/selinux-zabbix/selinux-zabbix-9999.ebuild b/sec-policy/selinux-zabbix/selinux-zabbix-9999.ebuild
index 0478378ab92b..3f47ff20c816 100644
--- a/sec-policy/selinux-zabbix/selinux-zabbix-9999.ebuild
+++ b/sec-policy/selinux-zabbix/selinux-zabbix-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""