gentoo resync : 28.04.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-04-28 20:02:04 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-04-28 20:02:04 +0100
commit: a4e2a46beb5e4858ef27bdedbb0ff6d2ced430ad (patch)
tree: 852c90a4bf354c30ea66504f70bfab5401fba18d /sec-policy
parent: 5e8702bcbbed438e6c6cce023e7ef0cc9baa3e02 (diff)
773 files changed, 5444 insertions, 512 deletions
diff --git a/sec-policy/Manifest.gz b/sec-policy/Manifest.gz
index 215a4a1c3ac5..e150e5889329 100644
--- a/sec-policy/Manifest.gz
+++ b/sec-policy/Manifest.gz
diff --git a/sec-policy/selinux-abrt/Manifest b/sec-policy/selinux-abrt/Manifest
index 669a21098a84..88d8490fc315 100644
--- a/sec-policy/selinux-abrt/Manifest
+++ b/sec-policy/selinux-abrt/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-abrt-2.20170805-r2.ebuild 278 BLAKE2B a31408f965e0aa66e9890dcfddf
 EBUILD selinux-abrt-2.20170805-r3.ebuild 278 BLAKE2B a31408f965e0aa66e9890dcfddfbc58d2f80ed70c6a9cbeb8e8550c04eefc0f00184bf66fc8cecd61c84894207046b33266940446466c16abbd91df129c26afc SHA512 40c21e5f225e5e9cb372034da8b67db74762391cd5ede1a331d976c063d23dd49adf5ddd7c3015bd9757888856172778dd2b793e77514faed9e0d8f673e596b9
 EBUILD selinux-abrt-2.20170805-r4.ebuild 280 BLAKE2B 70794beaf79c20487160074b3005009a8daccc7b5a10d8cf9992ce51df3e9be796cf36cb3276f2f5cb56328c20c970297a8b8957c983aef40f739e4c4a2c3cfe SHA512 5c8482d26f83c82459cff7118f0890a9ea1c299695535670f5a22050a5cfde2511a4aa33b79b95c88c30316920deb889ddea9d6a1776bdd9c617148a5fde1bf1
 EBUILD selinux-abrt-2.20180114-r1.ebuild 278 BLAKE2B 14448ac8460247df1f60f95ba332b8d6bc23956950e06d76520d300be140d6625786ddacd487180a1742ae5885ba7148ad8ff31b8a3bec7ec2f16c02a5e25741 SHA512 5738cc689707e85c7e449eb799b149c352d78b0bc26e2ca1adbb919a5433359f5313c9bd1c9f86f36bdb4cc9d9f78c2b5a4280343f14a9b0b0d81b1c181d0cca
-EBUILD selinux-abrt-9999.ebuild 280 BLAKE2B 70794beaf79c20487160074b3005009a8daccc7b5a10d8cf9992ce51df3e9be796cf36cb3276f2f5cb56328c20c970297a8b8957c983aef40f739e4c4a2c3cfe SHA512 5c8482d26f83c82459cff7118f0890a9ea1c299695535670f5a22050a5cfde2511a4aa33b79b95c88c30316920deb889ddea9d6a1776bdd9c617148a5fde1bf1
+EBUILD selinux-abrt-2.20180114-r2.ebuild 280 BLAKE2B 88f99a4483c8ed1235892d4aa9d17df4c7a4448e10463d13e6e651ed1c82d4425cff02c4d5d99012680ddbca6586fb5cbfd630a557be12ba26131bbccea534fc SHA512 8464df9d5dddf0f462271499e0fe4ded5db27c90ad3125911dd16c0aed004fc2cdc6a4aa757c0cb7ee83bfe8845b530baecf857944794c7afa71ae58e1211b96
+EBUILD selinux-abrt-9999.ebuild 280 BLAKE2B 88f99a4483c8ed1235892d4aa9d17df4c7a4448e10463d13e6e651ed1c82d4425cff02c4d5d99012680ddbca6586fb5cbfd630a557be12ba26131bbccea534fc SHA512 8464df9d5dddf0f462271499e0fe4ded5db27c90ad3125911dd16c0aed004fc2cdc6a4aa757c0cb7ee83bfe8845b530baecf857944794c7afa71ae58e1211b96
 MISC metadata.xml 314 BLAKE2B a9aeb3ee56eda731aac4307519a5adcc7bc1530574eff9720c6110b7f509881f50fef50fcd32ee5efcfca1b75bb9cce9e1f438b9a368ba40fa5c77eb3c2f2d5a SHA512 b3d4a77a87b4deac8607f1b27a93c8b98e56ab0006d47d295bbd6da521788e8259d0497cd7369de74908d8d50d592d7c2a866957cd472c66de603bdc4e07a28a
diff --git a/sec-policy/selinux-abrt/selinux-abrt-2.20180114-r2.ebuild b/sec-policy/selinux-abrt/selinux-abrt-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..16244467e5a4
--- /dev/null
+++ b/sec-policy/selinux-abrt/selinux-abrt-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 fccfc9d3f0c7..16244467e5a4 100644
--- a/sec-policy/selinux-abrt/selinux-abrt-9999.ebuild
+++ b/sec-policy/selinux-abrt/selinux-abrt-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-accountsd/Manifest b/sec-policy/selinux-accountsd/Manifest
index 0163ea518a29..5b4efb3921d3 100644
--- a/sec-policy/selinux-accountsd/Manifest
+++ b/sec-policy/selinux-accountsd/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-accountsd-2.20170805-r2.ebuild 381 BLAKE2B 07b0dae19393685dfe27a5
 EBUILD selinux-accountsd-2.20170805-r3.ebuild 381 BLAKE2B 07b0dae19393685dfe27a53e263e08623e2f94ec5af091eefe72a0c9a3fb3117ac796b8dbb3855e3b289a09c17885d816e372ff2317d503d3568bfeda7b711ac SHA512 2ffd1045017e2045f569a5be17b4ea9a3fa8143c68bea3133bdb0601db4e3feb75a3538dc0f004ee262de63de926a8e8419dbcbf2c3904cad90b3542a711e3e2
 EBUILD selinux-accountsd-2.20170805-r4.ebuild 383 BLAKE2B 98f30e783a2d2b6dd9b1164e0a2ae762cabcef8383afdb59dc73484dd6adc8de2ed754e7ab65378c4f8ab95c214cfc3e1a8c62e7bf29f8d8e3f71490cf6726f3 SHA512 91db923427caa52357bfd86cf5d10ce5e355ba2a71bac07994c5723ebb55ced8107bf874c079e20e34bb5cfcf3894aa3e3b68f4c3946b9f2749a464af3a53574
 EBUILD selinux-accountsd-2.20180114-r1.ebuild 381 BLAKE2B e690461f73a6637048aa192893210d832dd9f4a7d0b776bfc784c2e8ee421521c763dd51a587bfeb8a37e74df4fbde58001bf3e5df29b7ae24a74f45d36212ac SHA512 19d467e07a13ef8dd187c498c4350bb4fcb28c2e6b7e1ffc8e26822888cc561fdce22b2fbdfc2b20af099f32a5e6401421f43d2c78336e01914230fefed3c8a1
-EBUILD selinux-accountsd-9999.ebuild 383 BLAKE2B 98f30e783a2d2b6dd9b1164e0a2ae762cabcef8383afdb59dc73484dd6adc8de2ed754e7ab65378c4f8ab95c214cfc3e1a8c62e7bf29f8d8e3f71490cf6726f3 SHA512 91db923427caa52357bfd86cf5d10ce5e355ba2a71bac07994c5723ebb55ced8107bf874c079e20e34bb5cfcf3894aa3e3b68f4c3946b9f2749a464af3a53574
+EBUILD selinux-accountsd-2.20180114-r2.ebuild 383 BLAKE2B dffe4673eb88161222b8bc3cef1c82b4b7d28fe29a611e3041253fc720ab186cb0734b7eb79b421577093cd8ef72203ed52824d29f2a861e768a31e2230d3f75 SHA512 c991c2aacfe1d4c4430d5f1eeec3194d68bc713394e8553a2eeb3b4da0228f015fecc7fd079ef999a8bc0c3d42f80bba1d7dc663dceee53c213f7cd284863434
+EBUILD selinux-accountsd-9999.ebuild 383 BLAKE2B dffe4673eb88161222b8bc3cef1c82b4b7d28fe29a611e3041253fc720ab186cb0734b7eb79b421577093cd8ef72203ed52824d29f2a861e768a31e2230d3f75 SHA512 c991c2aacfe1d4c4430d5f1eeec3194d68bc713394e8553a2eeb3b4da0228f015fecc7fd079ef999a8bc0c3d42f80bba1d7dc663dceee53c213f7cd284863434
 MISC metadata.xml 319 BLAKE2B 2db1e4990fa93a4687f70a6f07fc9c5ac1de4115ec232f4586a8279158bedd333caa185421da45832561ab34fbf54ceefe6665e28843e71d66215f5e74fea157 SHA512 d6458bc554feed33eabcf07a330ffba0317fbf3fcd3704f93db022cf555ca2ab257b59c62bb903c8e104cf7f606248946907540e0cadd1854e39e2ea6878d9e4
diff --git a/sec-policy/selinux-accountsd/selinux-accountsd-2.20180114-r2.ebuild b/sec-policy/selinux-accountsd/selinux-accountsd-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..a4d002b6a69b
--- /dev/null
+++ b/sec-policy/selinux-accountsd/selinux-accountsd-2.20180114-r2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 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 a1c85cb64604..a4d002b6a69b 100644
--- a/sec-policy/selinux-accountsd/selinux-accountsd-9999.ebuild
+++ b/sec-policy/selinux-accountsd/selinux-accountsd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-acct/Manifest b/sec-policy/selinux-acct/Manifest
index fb234af34f02..fd35d8983e3d 100644
--- a/sec-policy/selinux-acct/Manifest
+++ b/sec-policy/selinux-acct/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-acct-2.20170805-r2.ebuild 278 BLAKE2B 6b20e4ca78a98ee9d790be01f5d
 EBUILD selinux-acct-2.20170805-r3.ebuild 278 BLAKE2B 6b20e4ca78a98ee9d790be01f5d5b3292b422d60627d9983e931a2ada605d391baf12c4ec9fd74d397fc55e02567a58e73ae0275de185d1a95c4ef7b3475faf7 SHA512 3db18b90a1415164b6dc91da522263cbfa9b985d89577415de67f4e8a8773d2c72d8ae9a3fbe11e2e021719bec82d8b7743bed2aef22d36d20db9eac477b23e6
 EBUILD selinux-acct-2.20170805-r4.ebuild 280 BLAKE2B b6810b6e526be4cdc4816e56aa9b993101535cf0f1be054497c0c5cf530e03e1b697e600c0ee561086411a9fa6cfff93a3a30335d4d9ccd1ab690c335fb5aa12 SHA512 a886f62df0485964d557bac73f26b0b810f0a34968a7cb5e6e7301557b6e0a50b72590a0f784acd7e5c18c8b453b560ea83e49072a68dc88a90e00a25be5e081
 EBUILD selinux-acct-2.20180114-r1.ebuild 278 BLAKE2B 835818028645cf6268a1085d6ebf81f17e160163f496072001a190d65a4d6de340670780b9012f813f73ac6e2226edd9aa2759987ef3a24274490711c490613a SHA512 6cb60c6543e3dd6b9dc50c5100a1be11d5dd272c6cb6ab6cfbb7e8344130782dcbbb8abf0682524e630116f2c75adefadb35a8e786033f5f1f9432cb86813db6
-EBUILD selinux-acct-9999.ebuild 280 BLAKE2B b6810b6e526be4cdc4816e56aa9b993101535cf0f1be054497c0c5cf530e03e1b697e600c0ee561086411a9fa6cfff93a3a30335d4d9ccd1ab690c335fb5aa12 SHA512 a886f62df0485964d557bac73f26b0b810f0a34968a7cb5e6e7301557b6e0a50b72590a0f784acd7e5c18c8b453b560ea83e49072a68dc88a90e00a25be5e081
+EBUILD selinux-acct-2.20180114-r2.ebuild 280 BLAKE2B bf2adfc61fe0c27535a3b59243e984d7ec35f720638dbec46caf9b2f6cc2260d50f3e8a884c31dd949df29585b91407cd34169faaf0a95f6f40029e179979eff SHA512 2e72f5c740aceedb0dd0833abc1e88601c1b8ff1aec1bc45325415e8db53c4b028f5630faf13e5dbcf194636082e4f170e7ce975369516494a753a6574391f80
+EBUILD selinux-acct-9999.ebuild 280 BLAKE2B bf2adfc61fe0c27535a3b59243e984d7ec35f720638dbec46caf9b2f6cc2260d50f3e8a884c31dd949df29585b91407cd34169faaf0a95f6f40029e179979eff SHA512 2e72f5c740aceedb0dd0833abc1e88601c1b8ff1aec1bc45325415e8db53c4b028f5630faf13e5dbcf194636082e4f170e7ce975369516494a753a6574391f80
 MISC metadata.xml 314 BLAKE2B 9a10659585a888cbb5577aadf1ac833608cf700a42f27a8048835bdc873f4b9aebb60a1b529f21e8d1b7c828cf50bd2e0457f623ae2b555053db097b18f00dc7 SHA512 3baaefcdf1846cec59a14866f9a1bcd9a0fbad615069a45eb2c6d74df733533d10bb03adbeef08496c7c4462694649eb619ae36eccdf1e9e91740c495edcb054
diff --git a/sec-policy/selinux-acct/selinux-acct-2.20180114-r2.ebuild b/sec-policy/selinux-acct/selinux-acct-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..bb4f2d3ea880
--- /dev/null
+++ b/sec-policy/selinux-acct/selinux-acct-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 ec9e00ae08e9..bb4f2d3ea880 100644
--- a/sec-policy/selinux-acct/selinux-acct-9999.ebuild
+++ b/sec-policy/selinux-acct/selinux-acct-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-ada/Manifest b/sec-policy/selinux-ada/Manifest
index 2fc9362f3801..b99f94dbfee1 100644
--- a/sec-policy/selinux-ada/Manifest
+++ b/sec-policy/selinux-ada/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-ada-2.20170805-r2.ebuild 276 BLAKE2B d2b8ae83763e3aaf34d946e7f485
 EBUILD selinux-ada-2.20170805-r3.ebuild 276 BLAKE2B d2b8ae83763e3aaf34d946e7f485275f3f42db921609bf0382c6d1fc805618665c6c322f5a92d7f13536c8ea41adc0b0591107719926bf14a9a990302ea74525 SHA512 10a1ba0bb7df9fe09890e1a51faf7cb65927d6a285484b22f53299a1d7d42fd5acbf4592dd0e10083bbe30e777c4e94cb6383787a0f29bc88119f5637b2cb2f7
 EBUILD selinux-ada-2.20170805-r4.ebuild 278 BLAKE2B 04fc35b289647fa709f3540e4cf79e63d406be1f8ac5801ebc1bb60c5d1f47c201c629607aa021286744fc3f0ed122945321618f1a017c39f9961f78f31889bc SHA512 5d0a18b3e05909fb1ad4fc9433388c7f95907f15cddbd6524421cee0f570d122682af2c01b633bd14419af5209917514b4eee72181d525c2817a75a995c46be8
 EBUILD selinux-ada-2.20180114-r1.ebuild 276 BLAKE2B 80b3e73e990ba36ed8e2b50617e44af17635bf603fb9e0752e0023ffb7cfff63795736f19dfb11cee844618dd953724aaff06ae0a38fe9689bad3d2b30b17b33 SHA512 adc70da605ba9a69a6ffc3aa7fd79cc11d7daccf174ac4c33415561bb432281626faf2a3660f82f0f4dd1362935c38dd4ce13d4e0ba3f7da26cdf2e89d979d11
-EBUILD selinux-ada-9999.ebuild 278 BLAKE2B 04fc35b289647fa709f3540e4cf79e63d406be1f8ac5801ebc1bb60c5d1f47c201c629607aa021286744fc3f0ed122945321618f1a017c39f9961f78f31889bc SHA512 5d0a18b3e05909fb1ad4fc9433388c7f95907f15cddbd6524421cee0f570d122682af2c01b633bd14419af5209917514b4eee72181d525c2817a75a995c46be8
+EBUILD selinux-ada-2.20180114-r2.ebuild 278 BLAKE2B 452d5e763ea273aa35915a92b0badfa3623089d5a288e5c3e727725d52b944e1a37ef7adfe72758ebaa3edb6392185085d9e9865854d2e01fb779273d3172224 SHA512 3908f5a4f157ba5ee88fda2c684f2c680167869a20fb9e35d04bd737285c37fb958e98125639298a83f45b314e2d4b47827b1b94739c8f2067dd0e34282f45a4
+EBUILD selinux-ada-9999.ebuild 278 BLAKE2B 452d5e763ea273aa35915a92b0badfa3623089d5a288e5c3e727725d52b944e1a37ef7adfe72758ebaa3edb6392185085d9e9865854d2e01fb779273d3172224 SHA512 3908f5a4f157ba5ee88fda2c684f2c680167869a20fb9e35d04bd737285c37fb958e98125639298a83f45b314e2d4b47827b1b94739c8f2067dd0e34282f45a4
 MISC metadata.xml 313 BLAKE2B ede61a44528842cd37d2a8fe8ad6a0f3018510bc2d37f2029fc4d2b9b59ac4844e0d2d2ecf91b61f044bad161d1e292fce1d7e26efa24d2cc9d874de6862bc69 SHA512 9412dc7f263273b69ac4665caa58138477732b72b6c3f1fcbb09781127434b532d34384c40c2b92bb2e10396b2bc67135a8e767c4fdae16e253b39684104b4cc
diff --git a/sec-policy/selinux-ada/selinux-ada-2.20180114-r2.ebuild b/sec-policy/selinux-ada/selinux-ada-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..b224e8eab965
--- /dev/null
+++ b/sec-policy/selinux-ada/selinux-ada-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 022f41b890f3..b224e8eab965 100644
--- a/sec-policy/selinux-ada/selinux-ada-9999.ebuild
+++ b/sec-policy/selinux-ada/selinux-ada-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-afs/Manifest b/sec-policy/selinux-afs/Manifest
index 3e0d69cbbb0a..e32172e3ede9 100644
--- a/sec-policy/selinux-afs/Manifest
+++ b/sec-policy/selinux-afs/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-afs-2.20170805-r2.ebuild 276 BLAKE2B 3294c79cc940423ac42e10eca9dc
 EBUILD selinux-afs-2.20170805-r3.ebuild 276 BLAKE2B 3294c79cc940423ac42e10eca9dc02fbb9ea238d78845be779347ba17aad7c1a969e96d3b1a9b88fdee83a8d436ea980295aa90e1ab8b816a1cd4a91d571b375 SHA512 8e87bbe3c5f2dfc963b1624519d945e1ff9ab9ec8ecff2f7c7934a924969f616f3f4e664493e869a45e929813a559f1d40a37a331da9fe0950cb90308578036f
 EBUILD selinux-afs-2.20170805-r4.ebuild 278 BLAKE2B afc98f44c6f24dec10f6077121bc240ac36fb2c0bb3d22a1323c8dca5353a68472000c6add3833475da29eb42bc70158a1083280f87b9663d6f9b797b7f7d894 SHA512 6c7de1144da950f2b23bd461bca3d9d3e5019c8d3b9bde6668e29942207054390533897338f470a5ea33e35ff31ed64eec1233226507081c0b6874864fd206e4
 EBUILD selinux-afs-2.20180114-r1.ebuild 276 BLAKE2B fbb22198b0062c249cf53b7d1d21bc7b21fa6d84fc6831ce141b8d47a9ba4ddf349f787bab859cd600bd0da1b26e01b2984c7dda622be53b8587345f9e02d2cd SHA512 3a333da5eccc519db3f4cdfcc7498b56e399d75aa1f098d3a53f6b0a339c79eb6f7296a710dabdcf36219edfd12d2a9c45026526d709888ce7bd82a8d3819794
-EBUILD selinux-afs-9999.ebuild 278 BLAKE2B afc98f44c6f24dec10f6077121bc240ac36fb2c0bb3d22a1323c8dca5353a68472000c6add3833475da29eb42bc70158a1083280f87b9663d6f9b797b7f7d894 SHA512 6c7de1144da950f2b23bd461bca3d9d3e5019c8d3b9bde6668e29942207054390533897338f470a5ea33e35ff31ed64eec1233226507081c0b6874864fd206e4
+EBUILD selinux-afs-2.20180114-r2.ebuild 278 BLAKE2B 6bd6e036a2128c93bba88b35b03d4cd4516a93c3222af43c388358541aad15ac0c780b0d48e5b67cba4187aefacc80e49db83f013970795d2e95521eca65aac2 SHA512 e19dc975e9f9e0a63b8257876106e50f3ce0613ea2964438dc5adc74204563b4fa9e8f646babe91896afc226bf85d1940e6a2f7cb0a2e557a44d9a679d221f37
+EBUILD selinux-afs-9999.ebuild 278 BLAKE2B 6bd6e036a2128c93bba88b35b03d4cd4516a93c3222af43c388358541aad15ac0c780b0d48e5b67cba4187aefacc80e49db83f013970795d2e95521eca65aac2 SHA512 e19dc975e9f9e0a63b8257876106e50f3ce0613ea2964438dc5adc74204563b4fa9e8f646babe91896afc226bf85d1940e6a2f7cb0a2e557a44d9a679d221f37
 MISC metadata.xml 313 BLAKE2B 7b38235217ab30ab97d9ca8da2d57e2f776f75b6f6ac4946477c20ddc13408d1302baa55f73d315613d35ba3c55eafde625888cae5a6929ac7ab5346f2603650 SHA512 b684826f0ad47ac371f231ebc834fbed092a7bc39730ca9aeb5a28eb1b604e19b21ec6e731b7f9f54f8e5580fe35dc87332dd44c37c9fba44c4bf78a7daa04ef
diff --git a/sec-policy/selinux-afs/selinux-afs-2.20180114-r2.ebuild b/sec-policy/selinux-afs/selinux-afs-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..8b497cad73df
--- /dev/null
+++ b/sec-policy/selinux-afs/selinux-afs-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 2bc1bec56412..8b497cad73df 100644
--- a/sec-policy/selinux-afs/selinux-afs-9999.ebuild
+++ b/sec-policy/selinux-afs/selinux-afs-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-aide/Manifest b/sec-policy/selinux-aide/Manifest
index 5c59352abd51..8dbfa44bee79 100644
--- a/sec-policy/selinux-aide/Manifest
+++ b/sec-policy/selinux-aide/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-aide-2.20170805-r2.ebuild 278 BLAKE2B d3210702843e8f3a825aaa525e6
 EBUILD selinux-aide-2.20170805-r3.ebuild 278 BLAKE2B d3210702843e8f3a825aaa525e63d0d858dd28d61a1e1929d2ad5d42681451d67bf6097f4c459a21f2629d505213e9fa4094a11930bd056019dd55d293a14b3c SHA512 0ad3e0fb0d064fca7c5ef6654350ca020575a7aafa091ccdf16daa8dddf3b0767a8f7c1734ecaeeb8d7fd334e246db91c740f5b50aef0b88be9a6c9251e933f9
 EBUILD selinux-aide-2.20170805-r4.ebuild 280 BLAKE2B e9eb74f4a9baea500e4f2ecd1b6613b940140b640b536c78c28331fdf0c12cd63ed2fe62a074ed1193cddcc189b99545ac555ad6456bc4a6aa03d2cdff329f0f SHA512 ad0739aed3be03055247b22fcb0d11ce645139e53675e410c26c77bc2cb9582c1b1e2881fc3c30e7fad700cd2851e464cef926a752b6c9249166754b8168cb98
 EBUILD selinux-aide-2.20180114-r1.ebuild 278 BLAKE2B 8f21d5fb6bf2a8c006bb995864832c2c2ae9a641f93fa781f43a23e69c28a0a25724e28b1df770b6b964117c346ccb010df71aed5795940ebfb25f9690c8a8ea SHA512 6312bbc2c5520eb0c407ce2f174ddafb6302960f7e6cc4b9db7c9f4af302d9c3a55a35333c432feaa9f90b4ac279d43017f5e2745c02642613e052cbd57f990a
-EBUILD selinux-aide-9999.ebuild 280 BLAKE2B e9eb74f4a9baea500e4f2ecd1b6613b940140b640b536c78c28331fdf0c12cd63ed2fe62a074ed1193cddcc189b99545ac555ad6456bc4a6aa03d2cdff329f0f SHA512 ad0739aed3be03055247b22fcb0d11ce645139e53675e410c26c77bc2cb9582c1b1e2881fc3c30e7fad700cd2851e464cef926a752b6c9249166754b8168cb98
+EBUILD selinux-aide-2.20180114-r2.ebuild 280 BLAKE2B 0619ecbb757875177cc1d01218b4644e31b41820e0af4a69381ac2f9a43d4d7950ce72719d4c27a05211ac3544d764b7c5b1e1b6cb7a5ebd3331135a5b476906 SHA512 df9e4f9a6e9b6fadd48d3fe550355369933c4d9cbaac5f0d2de9d75758de97e1ce3dd01e6ee4cb27253eabce1121695c55f5839ce4b17a8c02a316f92524bae3
+EBUILD selinux-aide-9999.ebuild 280 BLAKE2B 0619ecbb757875177cc1d01218b4644e31b41820e0af4a69381ac2f9a43d4d7950ce72719d4c27a05211ac3544d764b7c5b1e1b6cb7a5ebd3331135a5b476906 SHA512 df9e4f9a6e9b6fadd48d3fe550355369933c4d9cbaac5f0d2de9d75758de97e1ce3dd01e6ee4cb27253eabce1121695c55f5839ce4b17a8c02a316f92524bae3
 MISC metadata.xml 314 BLAKE2B e34b139fe06e3ea9cbce95a309248a9ac900d5e97897761294d05e3d89d5c4fc6e4841ce4f8de90827b45a78572d007c192973a9380de30cc1968b049dfb9699 SHA512 3ae94807091069e074f1efdd413a2acb748d0cae2f5ac3edaa1469536aebf9f8c1125298696dbaa50a48ee6ca1f212cf5e02c7ec2664b48633a2f345e4c5421d
diff --git a/sec-policy/selinux-aide/selinux-aide-2.20180114-r2.ebuild b/sec-policy/selinux-aide/selinux-aide-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..9764c0700398
--- /dev/null
+++ b/sec-policy/selinux-aide/selinux-aide-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 1788dc1864f5..9764c0700398 100644
--- a/sec-policy/selinux-aide/selinux-aide-9999.ebuild
+++ b/sec-policy/selinux-aide/selinux-aide-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-alsa/Manifest b/sec-policy/selinux-alsa/Manifest
index 14e69c5aad67..b9fabf050461 100644
--- a/sec-policy/selinux-alsa/Manifest
+++ b/sec-policy/selinux-alsa/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-alsa-2.20170805-r2.ebuild 278 BLAKE2B 8f5f8cb91fdfb143d331b0709db
 EBUILD selinux-alsa-2.20170805-r3.ebuild 278 BLAKE2B 8f5f8cb91fdfb143d331b0709db031fe4a48ee46eed1e4ebfdac2fc7df8bf02c976def5d3ab3dda9ec08fa31f5ff4c8a02c72516a1294e30e8927216c1ea3c29 SHA512 7ec518ad0e13fa68e76b75b3f67701157104e80ef13249950ed497b697b79306d019655b71957de0cbb20c182964ff84f7541c7bc2a0e24174c0923266fd7d61
 EBUILD selinux-alsa-2.20170805-r4.ebuild 280 BLAKE2B fa064450d0f8727dd1390da4ff870874421493f6902ee103e90deeead0dde0ee726970f89069b83748e3e035f1516d7ff72b51d5d2c5cfdc7a779ff1b8735048 SHA512 3674a694f9763e43a752bf2a2707d509451a52175b91d60a186280363ec7adc66a73980ab36045b536e2ee3e95455799c0c38a63912163e9e40569e9024bc6ea
 EBUILD selinux-alsa-2.20180114-r1.ebuild 278 BLAKE2B 69e4037e0ec56d6a24d935ff153c8251783a9671605ccd19841b481f684c8d938665695f5172bd6435d334b72942beb1668dac34c2178c6d3c5bcdc925d78c3f SHA512 6362acb4f3828c8a0917d4a4968f75a23a119d2a46c32c731341aeb85a62f2e0bd118c82c45d9561ecdd7b98cc655f05e9269ce584adbcca3fe1483b0c79e381
-EBUILD selinux-alsa-9999.ebuild 280 BLAKE2B fa064450d0f8727dd1390da4ff870874421493f6902ee103e90deeead0dde0ee726970f89069b83748e3e035f1516d7ff72b51d5d2c5cfdc7a779ff1b8735048 SHA512 3674a694f9763e43a752bf2a2707d509451a52175b91d60a186280363ec7adc66a73980ab36045b536e2ee3e95455799c0c38a63912163e9e40569e9024bc6ea
+EBUILD selinux-alsa-2.20180114-r2.ebuild 280 BLAKE2B 66498f44a74ad33219d282e1f3b9a74f29a08ac5ef7ebdbc5a6f6eb6b6727a8e2817dddcb4da7a5902df2db9b72e7b8479e2dd384da3d03ff0d537ebb6bcf107 SHA512 14a2d18227bbe77b5d904e624d76a4736626e163ef5e3966621e0372ddff162862010259a0a0781751f85012a07fe0e63a4389b7fa2a9a322b7842f51baefeda
+EBUILD selinux-alsa-9999.ebuild 280 BLAKE2B 66498f44a74ad33219d282e1f3b9a74f29a08ac5ef7ebdbc5a6f6eb6b6727a8e2817dddcb4da7a5902df2db9b72e7b8479e2dd384da3d03ff0d537ebb6bcf107 SHA512 14a2d18227bbe77b5d904e624d76a4736626e163ef5e3966621e0372ddff162862010259a0a0781751f85012a07fe0e63a4389b7fa2a9a322b7842f51baefeda
 MISC metadata.xml 314 BLAKE2B 804e8fd77ee3d8a8ef928de31a5db28fe522eafed3695574154fd70316f49d793c62a758dd53e5902c322c23bd9edc4f18888258e41b8701d3ae5cf4c573560c SHA512 dec699cdcba4fb0219f7fb71afbfca634d1a5767121078a206289fda39d33a622f2986064e29f16548290f4ca8aa71150667e92fbb4d799ece93209b2f1967c2
diff --git a/sec-policy/selinux-alsa/selinux-alsa-2.20180114-r2.ebuild b/sec-policy/selinux-alsa/selinux-alsa-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..c13f83b1040f
--- /dev/null
+++ b/sec-policy/selinux-alsa/selinux-alsa-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 b0c22d727324..c13f83b1040f 100644
--- a/sec-policy/selinux-alsa/selinux-alsa-9999.ebuild
+++ b/sec-policy/selinux-alsa/selinux-alsa-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-amanda/Manifest b/sec-policy/selinux-amanda/Manifest
index 27b8f5700493..24a54d98a632 100644
--- a/sec-policy/selinux-amanda/Manifest
+++ b/sec-policy/selinux-amanda/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-amanda-2.20170805-r2.ebuild 376 BLAKE2B 333914160f179fc1a629769a7
 EBUILD selinux-amanda-2.20170805-r3.ebuild 376 BLAKE2B 333914160f179fc1a629769a7dd192b75927b1c1c970db8f82eb212a6ff203510986fde7eec9085b78097112b801ad17c05bdf93c946183f33f49cf7e398ad43 SHA512 3d7966fb334b9804265ec6d1d98bf19f838dbc21766eb4e2c185afaa18d45f256e6a3df2f55b65f69c764c6ee5fc68d328c123c0a8b85705c5ec039eb718c865
 EBUILD selinux-amanda-2.20170805-r4.ebuild 378 BLAKE2B 5ae5a8969c75dcf15f72f4d7704039af8f6b638058295b30cbf83f530326360883542d3c04b2a5bee79f521e336ce13bb366f9cefcef8fac1f870dd862e2e122 SHA512 c9232febe94e63d87f68d9117dd4c23ad1f8b8ff989c478847d302173208dfe2ebfd3eb23f157d2ea2dcb56d4b2e5bab5e4ed2f9c10bb39849254fda1af08f10
 EBUILD selinux-amanda-2.20180114-r1.ebuild 376 BLAKE2B 3b573737fb73e34f5a3a17aeca31bf0b34e32c0dd0df0515c4b8929693c0a4efc42193cb5dbcf1800249ca5ef3c965ec9158ec4b5e1dec646ea30504e388285f SHA512 ca2dde23325eab0bead876188b4b95f370737c24eaa58f35aac195cb9430d11dcd1ea958a137695f46e26072782bbdc5648dbc850ff35d5340b5b67b74fdd151
-EBUILD selinux-amanda-9999.ebuild 378 BLAKE2B 5ae5a8969c75dcf15f72f4d7704039af8f6b638058295b30cbf83f530326360883542d3c04b2a5bee79f521e336ce13bb366f9cefcef8fac1f870dd862e2e122 SHA512 c9232febe94e63d87f68d9117dd4c23ad1f8b8ff989c478847d302173208dfe2ebfd3eb23f157d2ea2dcb56d4b2e5bab5e4ed2f9c10bb39849254fda1af08f10
+EBUILD selinux-amanda-2.20180114-r2.ebuild 378 BLAKE2B f05d3e24e87efa85390431108c5ea318c5aeee59777eb08337052c6e5cc076acbca28d3aadbc28770b87a704bb8d8017bfa460da675eda36f79ae40a139f00ca SHA512 bdc94e45001a2fd5f9ba987704584f51445282589fa682aac6938cad1aef9c43032714043fc9c2c1206417353660bfc277fada5842124b3de15a4875498d098d
+EBUILD selinux-amanda-9999.ebuild 378 BLAKE2B f05d3e24e87efa85390431108c5ea318c5aeee59777eb08337052c6e5cc076acbca28d3aadbc28770b87a704bb8d8017bfa460da675eda36f79ae40a139f00ca SHA512 bdc94e45001a2fd5f9ba987704584f51445282589fa682aac6938cad1aef9c43032714043fc9c2c1206417353660bfc277fada5842124b3de15a4875498d098d
 MISC metadata.xml 316 BLAKE2B 31b7d1885430846c69fc4563f57d45836ff9a08877ae5e96df4b464cc445ade4843d6cda2bb12aa1154fee717eef45f24d4a79e98d7419153115df81d1976d15 SHA512 175f419f4f7218403e30c562aea9be81f919761be0aec6ff0e931328e2f4b0c260f80f1ef9d883507e86fb749e73049fdd45d30851df3eee7ad0c915d0e89284
diff --git a/sec-policy/selinux-amanda/selinux-amanda-2.20180114-r2.ebuild b/sec-policy/selinux-amanda/selinux-amanda-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..6cce4fee502d
--- /dev/null
+++ b/sec-policy/selinux-amanda/selinux-amanda-2.20180114-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 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 852ae5b812fb..6cce4fee502d 100644
--- a/sec-policy/selinux-amanda/selinux-amanda-9999.ebuild
+++ b/sec-policy/selinux-amanda/selinux-amanda-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-amavis/Manifest b/sec-policy/selinux-amavis/Manifest
index 443ea08e0bc2..db108d220aef 100644
--- a/sec-policy/selinux-amavis/Manifest
+++ b/sec-policy/selinux-amavis/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-amavis-2.20170805-r2.ebuild 282 BLAKE2B 1edc10473323554f5bb7e0d87
 EBUILD selinux-amavis-2.20170805-r3.ebuild 282 BLAKE2B 1edc10473323554f5bb7e0d8724a569de4ba10e831b98f5583842f06e785c3f5655e421b58d935ba79157256c206d880b9132193479258bc8dfd2334acfc5d99 SHA512 b9c77582980466ae78e87cfaf21b909c507e048fa54072ba1d0c25567b07c0d2bd0368a178e7605a5d5faae8d04831f062a1941de2b15dc38d72d619a4337adc
 EBUILD selinux-amavis-2.20170805-r4.ebuild 284 BLAKE2B f8ad0d88f27bfe0aea549d46229dd8bb7f15a2d024249b91ca6efbe84e77a8da5b5365000adb80783cd4353db7980861011b1756e24cd3ddb23375e6193200db SHA512 886df583cbb9d96132651e58a92487acfe62a58985de5ab51f03f740c91b3db9c8d5a1010a28718c8ff6e0ad997506b479ca46f705c3ff7e94c3da764154ded7
 EBUILD selinux-amavis-2.20180114-r1.ebuild 282 BLAKE2B 1b857a90d864e2beecff6e6b2f9894fc2a8ad5ec7c6b32e4f23f24e38fe19e2c818517f9a54a6329223be3699ce73c494cf68b9e16ff29d52002bff18d9f3851 SHA512 e131b48bf6d80e892cbbe610e3dd5fe7b0b07f2c2a021e6cf069fffc1a223a10da62991bc811b0552ac57735e16791d82ff564dd170387577936292fb8bb582f
-EBUILD selinux-amavis-9999.ebuild 284 BLAKE2B f8ad0d88f27bfe0aea549d46229dd8bb7f15a2d024249b91ca6efbe84e77a8da5b5365000adb80783cd4353db7980861011b1756e24cd3ddb23375e6193200db SHA512 886df583cbb9d96132651e58a92487acfe62a58985de5ab51f03f740c91b3db9c8d5a1010a28718c8ff6e0ad997506b479ca46f705c3ff7e94c3da764154ded7
+EBUILD selinux-amavis-2.20180114-r2.ebuild 284 BLAKE2B 4f49a7a3b93d788bdc3ea9ca51d7e60beda6d12c4ca3237449955dae0a3581b93febc4cc4df44cf8702bd28c59420de54585430ef747989dac29f244cb88d31b SHA512 b9a4e96d5fe2f07de2fb27a20d4f2ca36078f0a71c91139041de26be1f83d0918125ecaa7f0b32370a9b744847049807c746b95652d67d6ac4d2e45918842547
+EBUILD selinux-amavis-9999.ebuild 284 BLAKE2B 4f49a7a3b93d788bdc3ea9ca51d7e60beda6d12c4ca3237449955dae0a3581b93febc4cc4df44cf8702bd28c59420de54585430ef747989dac29f244cb88d31b SHA512 b9a4e96d5fe2f07de2fb27a20d4f2ca36078f0a71c91139041de26be1f83d0918125ecaa7f0b32370a9b744847049807c746b95652d67d6ac4d2e45918842547
 MISC metadata.xml 316 BLAKE2B aa2a01d791833d7cbabf044b7cbd8d1644ec81d305e02bd43fa0a5f71444d02dd9719cae25a656144a592d75be8bbd8c0593e1365e1d28a3c9c1e6e957da0146 SHA512 fe718a2ad4043b9e7a44e68158c792a8f27f604632640d186fdedc222e3d6c9c74cbcb5e39e443df698aa33ba699e7d056974843e62b9f9616524dc718f5965b
diff --git a/sec-policy/selinux-amavis/selinux-amavis-2.20180114-r2.ebuild b/sec-policy/selinux-amavis/selinux-amavis-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..35bcba26802e
--- /dev/null
+++ b/sec-policy/selinux-amavis/selinux-amavis-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 965eab088ddd..35bcba26802e 100644
--- a/sec-policy/selinux-amavis/selinux-amavis-9999.ebuild
+++ b/sec-policy/selinux-amavis/selinux-amavis-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-android/Manifest b/sec-policy/selinux-android/Manifest
index 6fc52bcba6a1..2f386192efc9 100644
--- a/sec-policy/selinux-android/Manifest
+++ b/sec-policy/selinux-android/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-android-2.20170805-r2.ebuild 433 BLAKE2B e64c318944f3e5df4d9f230d
 EBUILD selinux-android-2.20170805-r3.ebuild 433 BLAKE2B e64c318944f3e5df4d9f230d3a5a7521ca508b2bf0e5fd147c96686f63e850ba532617e59ade75221ed966bf3ddcb04a31143240a76b1a209641616397edcace SHA512 33dfa31a5b903babf01005a7415a332fe5e9bf3525c78f197ee6fea0b7b1dcfd7f37d542fb94b924b34099ee979fd62004c5b52c419ac0f0d70b3064c294a4a2
 EBUILD selinux-android-2.20170805-r4.ebuild 435 BLAKE2B 73aff42e27a5a55278ca0cbed3305d7a76c793eeff7fe8b4984510d05751ae3b423133c3033a44e5fa3e52c5bcff058ecab4c469477c3af2316dd46ed56a861a SHA512 0814b60ee0f7846b2331d0d509bedd45f0a49d9194fac9a60bda177d942f68aca68b313a97182e5deb07d1b7f523ad86979a5e65c189c97374b94ce651e69a76
 EBUILD selinux-android-2.20180114-r1.ebuild 433 BLAKE2B c9e514389ca165a5116ca9010b59b83952981b54d32a078e15f56fdf21a98f5629775ef24dd9b870da57b205c130ddb0dc15f6d687a69e272d70ccee62bd799e SHA512 7045846caadde5d99b5e2b2049be011b771f28a34b541a36bb50c7a9995e13e72d43dfeff43a9ab1ee81013a85dd0e2d8c92d429557c4989c49df3473f29645b
-EBUILD selinux-android-9999.ebuild 435 BLAKE2B 73aff42e27a5a55278ca0cbed3305d7a76c793eeff7fe8b4984510d05751ae3b423133c3033a44e5fa3e52c5bcff058ecab4c469477c3af2316dd46ed56a861a SHA512 0814b60ee0f7846b2331d0d509bedd45f0a49d9194fac9a60bda177d942f68aca68b313a97182e5deb07d1b7f523ad86979a5e65c189c97374b94ce651e69a76
+EBUILD selinux-android-2.20180114-r2.ebuild 435 BLAKE2B 25d20cfddb37edb18b743c7a8365e2190edb996a87f9e5b2c49b7082cfc0456a0bf651d181f1c36cb1cfd457ecb449732d4612f19eaa51d179a007cd2171db62 SHA512 dd9773515c7f8566f403f9e28817e634a4b9a560da71e3f1af8e498160b858bdccc948737a124a2598f1664f4eda4124f3f5969c16340aa01e0c65f370b97ee2
+EBUILD selinux-android-9999.ebuild 435 BLAKE2B 25d20cfddb37edb18b743c7a8365e2190edb996a87f9e5b2c49b7082cfc0456a0bf651d181f1c36cb1cfd457ecb449732d4612f19eaa51d179a007cd2171db62 SHA512 dd9773515c7f8566f403f9e28817e634a4b9a560da71e3f1af8e498160b858bdccc948737a124a2598f1664f4eda4124f3f5969c16340aa01e0c65f370b97ee2
 MISC metadata.xml 317 BLAKE2B 0eb943554a2dce9c3ddd27c1599d70bf3023fa16142d335ba27922287a8201002822ce6b396551cae6b1ee47c686de96638c1aa44906c14a673cbdea181775c2 SHA512 fdaad87814ab78792c7bb30ba017e2f7ae7e25dd11701b2cca62c6847f5f79a59d453865aee812ce0c1d6842f9ba1867ac0206fecfd2edbc40da6ee45f56a428
diff --git a/sec-policy/selinux-android/selinux-android-2.20180114-r2.ebuild b/sec-policy/selinux-android/selinux-android-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..1090e96d263d
--- /dev/null
+++ b/sec-policy/selinux-android/selinux-android-2.20180114-r2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 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 9c8c811f3570..1090e96d263d 100644
--- a/sec-policy/selinux-android/selinux-android-9999.ebuild
+++ b/sec-policy/selinux-android/selinux-android-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-apache/Manifest b/sec-policy/selinux-apache/Manifest
index b82adcff23d8..8a07bdf3a202 100644
--- a/sec-policy/selinux-apache/Manifest
+++ b/sec-policy/selinux-apache/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-apache-2.20170805-r2.ebuild 382 BLAKE2B b9396b341e165c96bc0635fc9
 EBUILD selinux-apache-2.20170805-r3.ebuild 382 BLAKE2B b9396b341e165c96bc0635fc91117d3fe8abce404c123533693d8491de119b1258b5e3d010a3cbcaff1c97cdcdfaa478f5b05838bb48a07c38435476303eb07f SHA512 3440db6eedc2193ebcc61a57c3f3ffaefac2439a6560e2c3f994ba1ea85e9b3d862ae84f1cf78af09ca81231115469b2081d60ff3bbd4c375281aeed3cf94f54
 EBUILD selinux-apache-2.20170805-r4.ebuild 384 BLAKE2B 9ba742c148a1443e30abb8851de65a8ebd5b9bffe25fb528330b2053beedce69d4e000034a977d2087bcdd97c027b45117fde6262f3db3754fea8f39c8e3efa7 SHA512 9f03a7c6160ce61df1f7047b1e50fde73b392cc2cef433b0cecaeefc06412ab7626f3d8642b0fa601240330a907deb38e2cd62bb321cc50dd8e177c97e7bd59b
 EBUILD selinux-apache-2.20180114-r1.ebuild 382 BLAKE2B 2b6773e146e41eb3242ea6f1a006423fb8975446ff7ede91d94487b8293d18ff651f8c7807cc4d061b3257448cd3a70fe4b763f8500c723bc0c1dab557ef5676 SHA512 a5a4fcfe6652fab2b6a29b42ee96cbfc119ab33490a3390435c7ea04b5c24b80d42b432dca97b737b3f9c7d23d1b34de2169b0df7e8eaac9f718b3458f7b6086
-EBUILD selinux-apache-9999.ebuild 384 BLAKE2B 9ba742c148a1443e30abb8851de65a8ebd5b9bffe25fb528330b2053beedce69d4e000034a977d2087bcdd97c027b45117fde6262f3db3754fea8f39c8e3efa7 SHA512 9f03a7c6160ce61df1f7047b1e50fde73b392cc2cef433b0cecaeefc06412ab7626f3d8642b0fa601240330a907deb38e2cd62bb321cc50dd8e177c97e7bd59b
+EBUILD selinux-apache-2.20180114-r2.ebuild 384 BLAKE2B 3816bd97bbe6c21a2b931bd2434be9ff9e0e2e18a0f86460a9565018126cb174529496efedf793a21471462f51d875e0dff669c688516aa1547dbe87265f49df SHA512 7edaadb7c90f786051749b6f7823f692dbe4f2e29a763c49b10f80caf840a0af8a8d277fb5041a0510257332ff977850c736de1427ceb3717b1132f45ff53ef8
+EBUILD selinux-apache-9999.ebuild 384 BLAKE2B 3816bd97bbe6c21a2b931bd2434be9ff9e0e2e18a0f86460a9565018126cb174529496efedf793a21471462f51d875e0dff669c688516aa1547dbe87265f49df SHA512 7edaadb7c90f786051749b6f7823f692dbe4f2e29a763c49b10f80caf840a0af8a8d277fb5041a0510257332ff977850c736de1427ceb3717b1132f45ff53ef8
 MISC metadata.xml 316 BLAKE2B 7bc6c7cc3d055719a8d6fd244d495a0c7eb666157ccd55ddda35ae818dbb8afc8c4b5cd2777610dd872bcfd3ff0ce63b96b478d41517857efacc672f2e38ad08 SHA512 f8795858dc0c9f6b6384f67f6f83c6a59ba1da9ba3c1ef070604e2fbade2f202e88ca876e995512da3f89c1b0f163e8e206734c1f4a78a4170307a6840976293
diff --git a/sec-policy/selinux-apache/selinux-apache-2.20180114-r2.ebuild b/sec-policy/selinux-apache/selinux-apache-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..077ce01d6342
--- /dev/null
+++ b/sec-policy/selinux-apache/selinux-apache-2.20180114-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 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 4e93a6c2168f..077ce01d6342 100644
--- a/sec-policy/selinux-apache/selinux-apache-9999.ebuild
+++ b/sec-policy/selinux-apache/selinux-apache-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-apcupsd/Manifest b/sec-policy/selinux-apcupsd/Manifest
index 552c4a88728c..880eba703d4b 100644
--- a/sec-policy/selinux-apcupsd/Manifest
+++ b/sec-policy/selinux-apcupsd/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-apcupsd-2.20170805-r2.ebuild 380 BLAKE2B a6506297b6de931074bd7817
 EBUILD selinux-apcupsd-2.20170805-r3.ebuild 380 BLAKE2B a6506297b6de931074bd7817fdeea2d7fef426ec26aed60f9e9fe86ae1317b9237cbfb04f058f262162159a9916d7a0b5a0506bdbb7e0d220ddd37c2a877cffc SHA512 3bde712a9d9e6e07aad57ae2c1f4d856bcf8d52198631b5633724594d27b8c058faa3aedd4446e64768075b49133e1e257ef4f86463413ab58b59b77ce74a513
 EBUILD selinux-apcupsd-2.20170805-r4.ebuild 382 BLAKE2B 9a5a6bf7cd49671cb304b2d9b78fe886465f0a8d5ef5a668cb0a9d14649a39a8825b0db3d0af4bc6456ef45a89944da1a307909de703c590e0870df56e067879 SHA512 80e0949835c0c0b0a514af3cb932c22ff0a78ef7c1284209b91ee94e085edb5f23ea2c71d32c35cfb18013abc9a3b9fc445227e048194241d5f88e423a0244b2
 EBUILD selinux-apcupsd-2.20180114-r1.ebuild 380 BLAKE2B a1a225da65e7e43c1b38a9f284d5287d744b69930a3a506bbf6d27c7b995be75d55ac5f044cbf7dbef3c9ee80f9e5c7817489a1e24d77cecbd93041101087e4e SHA512 2b348194d990c1459abc4e84b2e59a20a6179fd8cb6dfa3eaf2e41572c6bdeb5b6b1e32406d39bbc02986385667d1aec889c795f4bd069842227651df5e16dd7
-EBUILD selinux-apcupsd-9999.ebuild 382 BLAKE2B 9a5a6bf7cd49671cb304b2d9b78fe886465f0a8d5ef5a668cb0a9d14649a39a8825b0db3d0af4bc6456ef45a89944da1a307909de703c590e0870df56e067879 SHA512 80e0949835c0c0b0a514af3cb932c22ff0a78ef7c1284209b91ee94e085edb5f23ea2c71d32c35cfb18013abc9a3b9fc445227e048194241d5f88e423a0244b2
+EBUILD selinux-apcupsd-2.20180114-r2.ebuild 382 BLAKE2B 78f29e8ae0186f95473521050a56c136b89a22ba462c8bff7d0d592484174588723ca6af4169662d27134a18205f23f6429037dd9ba7528d7a3450587f3f58f0 SHA512 a9090c93fa49e64393691c2599963d150e60566007836a68063cdc5b43ecc5d975935b971adda83f3afa4b29a2cd4628f83d4d2504aa4a04affb85d5834b674e
+EBUILD selinux-apcupsd-9999.ebuild 382 BLAKE2B 78f29e8ae0186f95473521050a56c136b89a22ba462c8bff7d0d592484174588723ca6af4169662d27134a18205f23f6429037dd9ba7528d7a3450587f3f58f0 SHA512 a9090c93fa49e64393691c2599963d150e60566007836a68063cdc5b43ecc5d975935b971adda83f3afa4b29a2cd4628f83d4d2504aa4a04affb85d5834b674e
 MISC metadata.xml 317 BLAKE2B 36a8cdec46ee79e127fad419024564374d2ccea486979e0275ea3aefcccf87f6ad519954bc696e700cca523fb04f4da7d5e66e703b2ae195934e15ad9cb0c421 SHA512 60b1efe0a05b69802dc9be53e4420921416667159ec6a0803a119c1ef4524cf9178ef60521f1f5a12c62c3d405ca3fc145f71aedbffa14190933614091379a01
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20180114-r2.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..67784a4a30c6
--- /dev/null
+++ b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20180114-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 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 44ec399af7be..67784a4a30c6 100644
--- a/sec-policy/selinux-apcupsd/selinux-apcupsd-9999.ebuild
+++ b/sec-policy/selinux-apcupsd/selinux-apcupsd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-apm/Manifest b/sec-policy/selinux-apm/Manifest
index 09b250315245..eeb02957fc04 100644
--- a/sec-policy/selinux-apm/Manifest
+++ b/sec-policy/selinux-apm/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-apm-2.20170805-r2.ebuild 811 BLAKE2B 3f3e419952481921f4e14e832134
 EBUILD selinux-apm-2.20170805-r3.ebuild 811 BLAKE2B 3f3e419952481921f4e14e832134f5cd67110f47824c3478fa52ba52af031e58db2876bf6164e6f5ae382ca7b07e4e9d67d059d466dcaa0960eb0eb891992194 SHA512 300c7da3a2b0887cab82be2e21c5cabc3667115d3e0574b361992da0a5ead5946e5f9d288e1dc387c04c4f618d8526837b7bd7043f57ebaa5d41499dcdb68b3d
 EBUILD selinux-apm-2.20170805-r4.ebuild 813 BLAKE2B cfe761b3c6bd3bf7b798123f742e7833f156e9d10f114e9fce6236c7ed7cb434b1b4f85492300a48685c840b1f36258d37446637b6fe52b0d35bb86dc47346dc SHA512 9633fea36343b9c84a6fce2bb8d69ce9f70c5a37946c5c65d069579d900afaff66298ee9714103511a11022bec3821c29b47134f89c00611d9914a99310504c6
 EBUILD selinux-apm-2.20180114-r1.ebuild 811 BLAKE2B ee8ac809c6bbd3f0a55869c813f5e3fcb679f3cbb77c6099337ba805b9bf4321216deb83034580afa0b5549ef1c2150160954c5226fee496c27ef13395dfc4e9 SHA512 e4568748d776c019721a559b893db7b3b940854e6cd9be8d2631c1b2e4d17896b02bd0863a23aabf179e0f27a808bdf1d1cc97bdc07c587ba3e346fc81f05a08
-EBUILD selinux-apm-9999.ebuild 813 BLAKE2B cfe761b3c6bd3bf7b798123f742e7833f156e9d10f114e9fce6236c7ed7cb434b1b4f85492300a48685c840b1f36258d37446637b6fe52b0d35bb86dc47346dc SHA512 9633fea36343b9c84a6fce2bb8d69ce9f70c5a37946c5c65d069579d900afaff66298ee9714103511a11022bec3821c29b47134f89c00611d9914a99310504c6
+EBUILD selinux-apm-2.20180114-r2.ebuild 813 BLAKE2B 02d4357122907b444873e6702f258db294a21f625aa35f2473d128cb7c026fe59058c5adbb76f03a2e89f5001e417669ab46ebc43ccad7647d282714026c8caf SHA512 5f16b6ff30e52a22050cf332487315598ec0830390a696bdc90e234d762c3686178aaeef3ed69768d5a4ac6e40346feccda31cc5b544970408ebb795502237ae
+EBUILD selinux-apm-9999.ebuild 813 BLAKE2B 02d4357122907b444873e6702f258db294a21f625aa35f2473d128cb7c026fe59058c5adbb76f03a2e89f5001e417669ab46ebc43ccad7647d282714026c8caf SHA512 5f16b6ff30e52a22050cf332487315598ec0830390a696bdc90e234d762c3686178aaeef3ed69768d5a4ac6e40346feccda31cc5b544970408ebb795502237ae
 MISC metadata.xml 313 BLAKE2B 909f5fce3d131c6329123f5e35a79476a45dcf4efd8a0ac47ae70abe6ee6da7a4816d42e85ddb22ca425259c296108762dc85e962d8f83ed3f6ad2f06b6e58f4 SHA512 9616055313d194ea536d3d633887c199e71a976f044e357de7da9da4e53b274105869f4c85539133d66ced469fab27d44524251bb389dbdbf3298d7799baec3a
diff --git a/sec-policy/selinux-apm/selinux-apm-2.20180114-r2.ebuild b/sec-policy/selinux-apm/selinux-apm-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..a5f7f30b0e7a
--- /dev/null
+++ b/sec-policy/selinux-apm/selinux-apm-2.20180114-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 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 d389ead90e00..a5f7f30b0e7a 100644
--- a/sec-policy/selinux-apm/selinux-apm-9999.ebuild
+++ b/sec-policy/selinux-apm/selinux-apm-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-arpwatch/Manifest b/sec-policy/selinux-arpwatch/Manifest
index 1571516a33f8..8869d820b336 100644
--- a/sec-policy/selinux-arpwatch/Manifest
+++ b/sec-policy/selinux-arpwatch/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-arpwatch-2.20170805-r2.ebuild 286 BLAKE2B 9e43dc8831f8601b81c9e1a
 EBUILD selinux-arpwatch-2.20170805-r3.ebuild 286 BLAKE2B 9e43dc8831f8601b81c9e1ad18ac126467eb16c4550b9924045be48261cc4b042052476b9d82b6ac20012f682b0a648e8c1b17514b98a119f8982a1384aa96a8 SHA512 32bcb935ef7d40f4e2a8470a1b20796cc6addcf68171541c14f72e302b617033f299a9bcb342f17db34a92736a5c38637f7c32995dc2932c99131f84ffc93de5
 EBUILD selinux-arpwatch-2.20170805-r4.ebuild 288 BLAKE2B fba92ab5bcbdda83a35c2098e2fa4fbe0f0e5c861e66eaed90a1d1fcd8424e3d5379c097e374c17b6a9988debfaa2213a55b9db1496337d5604cf40f553479ce SHA512 fdef4b3a1739d93f6a0c3e294561d339cb1c3825ddbecb3ff1ea91fdfabce1fd37d48f518bceea576a3097f9b78958374b9ff282c4d1371f93145d41bc32a7ee
 EBUILD selinux-arpwatch-2.20180114-r1.ebuild 286 BLAKE2B 4968a9834da18a657aba2ef8532e84922fb472697c15e0c7bf508ef8b0c1daaca4ce9e37bea461ddea71cbde7a2a06679c9ce53d04420ebe3ea62ff42c2b3627 SHA512 165337e1d0f661a4b82a43c70712f4a50dcd1396ce58206e969c05c9c32a199de71d001d80ffa2899945d9bf5910f14e551e1bd07edae678602dc76c664ea9b6
-EBUILD selinux-arpwatch-9999.ebuild 288 BLAKE2B fba92ab5bcbdda83a35c2098e2fa4fbe0f0e5c861e66eaed90a1d1fcd8424e3d5379c097e374c17b6a9988debfaa2213a55b9db1496337d5604cf40f553479ce SHA512 fdef4b3a1739d93f6a0c3e294561d339cb1c3825ddbecb3ff1ea91fdfabce1fd37d48f518bceea576a3097f9b78958374b9ff282c4d1371f93145d41bc32a7ee
+EBUILD selinux-arpwatch-2.20180114-r2.ebuild 288 BLAKE2B ecbddc7bd83d09508c97ba4f69b2aaa3b034ab89acb5259f1418a472fdf8358cb4931d3708b07d063e3379fb444db0b758ccd4d344e39ad11f9c8ad4207b0e20 SHA512 1cff0f6c2c75d957b774a3235fce6a5ace7a34273f808d394d6b01b2c37b72287ef5224d44e71c64d19a05594e428c230bb3e9c577a2e9a8825b524088188a3a
+EBUILD selinux-arpwatch-9999.ebuild 288 BLAKE2B ecbddc7bd83d09508c97ba4f69b2aaa3b034ab89acb5259f1418a472fdf8358cb4931d3708b07d063e3379fb444db0b758ccd4d344e39ad11f9c8ad4207b0e20 SHA512 1cff0f6c2c75d957b774a3235fce6a5ace7a34273f808d394d6b01b2c37b72287ef5224d44e71c64d19a05594e428c230bb3e9c577a2e9a8825b524088188a3a
 MISC metadata.xml 318 BLAKE2B 5ae25a1f92a7aaf41d0dc2cf33495365e90bad3310c41af2ab48c7aaafe0449f5b2ca1d1d31c37f2a69cfc2e793859de8f57e6f0d5d3eb99a86530f960badc1b SHA512 4917bd6c1284df4face1c8b14e2df39187fb36bd5094fd460bd324bebfdd69b825b783daab79ff957b77579ddfaef98ff65121a78cc15cbbcae37e8fea53d8db
diff --git a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20180114-r2.ebuild b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..a07ffc2e1c8f
--- /dev/null
+++ b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 7d675ca0f2fe..a07ffc2e1c8f 100644
--- a/sec-policy/selinux-arpwatch/selinux-arpwatch-9999.ebuild
+++ b/sec-policy/selinux-arpwatch/selinux-arpwatch-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-asterisk/Manifest b/sec-policy/selinux-asterisk/Manifest
index 787e9cfca96e..5647f53a84fe 100644
--- a/sec-policy/selinux-asterisk/Manifest
+++ b/sec-policy/selinux-asterisk/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-asterisk-2.20170805-r2.ebuild 286 BLAKE2B f16eb032ff79c14529b2da3
 EBUILD selinux-asterisk-2.20170805-r3.ebuild 286 BLAKE2B f16eb032ff79c14529b2da374b72946791d139df1010c320f33f917aa1dbb1338466e693803470f6863197dbb6107006298f0c8d65f85069991d779ab126da56 SHA512 d16ec877300871ff493b261b809e20e7aa2306834307e8425152b68531c1ffeca5f73d1ed8d0aab1028c7481d542bb8c523799f10929e0f9ad47148e428067a7
 EBUILD selinux-asterisk-2.20170805-r4.ebuild 288 BLAKE2B bbeeac6b844758bee39ffcdb27e8846fd0de1fd2a925add426b4cf4ec78b4257da89bf7ece155c0df5906e4ab6757d677c7ddf5e32b8d53d7b42b29907b0c348 SHA512 bb5c57d0b1760a5835a6ff3c6eb88fbd47141127a47624369dfd2d95015e9e11e92b750fde136073535a46c7eeb50f2de2e8d3390b857d21e71d18db2d4f4ac4
 EBUILD selinux-asterisk-2.20180114-r1.ebuild 286 BLAKE2B bb616b27ae9224cac9cb951051aac7b19504a7caadce81adac53e131aa2bd521168bc5970103fa34f097efd9b77ee2d20768d8d25730f5e22a1490ba3bf4c36b SHA512 e70983ecb1324229b6df0d19ea3d767132762649bff5c78f5cb95f7427734cf3ee57a7a9cb68356bb849fe1c9b5a57139c37da325ba87f707cbd1d450445d4d8
-EBUILD selinux-asterisk-9999.ebuild 288 BLAKE2B bbeeac6b844758bee39ffcdb27e8846fd0de1fd2a925add426b4cf4ec78b4257da89bf7ece155c0df5906e4ab6757d677c7ddf5e32b8d53d7b42b29907b0c348 SHA512 bb5c57d0b1760a5835a6ff3c6eb88fbd47141127a47624369dfd2d95015e9e11e92b750fde136073535a46c7eeb50f2de2e8d3390b857d21e71d18db2d4f4ac4
+EBUILD selinux-asterisk-2.20180114-r2.ebuild 288 BLAKE2B 9ed889d209f1abc2d1881758fbae06b1f57b01e16437fa485f0ea4f0c0d4e56a15820b4f17bccd7fd39457ccf14a37ad6257ec59f8eabeb1d8c9a7d6bd8ef23c SHA512 f4390b053bd01a1473fc37d1d191140ccc798bac910994b45f8b35c51a6b99510b6014b21706f2cf65fe8c5dcd1c32e5f39f96bbe05b724cdc4c4c560a0c8a57
+EBUILD selinux-asterisk-9999.ebuild 288 BLAKE2B 9ed889d209f1abc2d1881758fbae06b1f57b01e16437fa485f0ea4f0c0d4e56a15820b4f17bccd7fd39457ccf14a37ad6257ec59f8eabeb1d8c9a7d6bd8ef23c SHA512 f4390b053bd01a1473fc37d1d191140ccc798bac910994b45f8b35c51a6b99510b6014b21706f2cf65fe8c5dcd1c32e5f39f96bbe05b724cdc4c4c560a0c8a57
 MISC metadata.xml 318 BLAKE2B 19b2f4f1ae7f3ca7873f362bf74b0c997ee59f5273f16774c01cb9dd094e315389d09dc124381495ad4c83bec68093b981ffde7a5f7fa593e07eaedeafce2d6c SHA512 33015c2f0865e82401513b3615960fa0f13b51839ab82fe874f3134d1d4240ad4ac5f7c34b0cb3b6db50fb6f5860634db84281ec6518de23d4d56f2e9cf20ae5
diff --git a/sec-policy/selinux-asterisk/selinux-asterisk-2.20180114-r2.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..76ca59655949
--- /dev/null
+++ b/sec-policy/selinux-asterisk/selinux-asterisk-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 30bc3aaba1a8..76ca59655949 100644
--- a/sec-policy/selinux-asterisk/selinux-asterisk-9999.ebuild
+++ b/sec-policy/selinux-asterisk/selinux-asterisk-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-at/Manifest b/sec-policy/selinux-at/Manifest
index 010905136db0..6fad2c99a92b 100644
--- a/sec-policy/selinux-at/Manifest
+++ b/sec-policy/selinux-at/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-at-2.20170805-r2.ebuild 274 BLAKE2B 8889f22c61304cfd3807bd9d045ec
 EBUILD selinux-at-2.20170805-r3.ebuild 274 BLAKE2B 8889f22c61304cfd3807bd9d045ec4f9c02fc95492efa393101d517c7bec780451b458fb4e369a5f141d210ccb31b8af37799008c6834745eda8d5f6c2c72f33 SHA512 3251f55edec1da13d3535228f22e01e58ea2ebe84506df205c2c67265358178e402d777f95881bcc915dbbac772f28c94516edf5f67e6915fe6dc89b4bf5ec88
 EBUILD selinux-at-2.20170805-r4.ebuild 276 BLAKE2B 566a1c96afda206bbc42f5b39f94f8845f7c08b6c59af5c3b386f720246fde996df3b0d313d71e45e7e672e92215f068c80974e14f72a2dfc4ea7f6952143703 SHA512 c1992b4d225439daddf525fafab1f144a43b33e1855fa58e7b2b1f6a628ad4b7720f50d9e33b6b66ff17761c3fb2aa2ef50c0010047dea766f10a3106dddf7df
 EBUILD selinux-at-2.20180114-r1.ebuild 274 BLAKE2B acd4fc9fc65ac9860a277331fb1984825239270ae6d7db5e0ce903a402a47b393a47e519793cec5f7f52726affb93864f2d267d45b44b036557287946b59e0e5 SHA512 2d00e67eb2b74e87d8672246241253d7c79f3748cbf2ffc0a3bf427a296cc102a0241f271604987dd10eadc2953162b1e36bcc35324aeb6923554dbcfc1267b3
-EBUILD selinux-at-9999.ebuild 276 BLAKE2B 566a1c96afda206bbc42f5b39f94f8845f7c08b6c59af5c3b386f720246fde996df3b0d313d71e45e7e672e92215f068c80974e14f72a2dfc4ea7f6952143703 SHA512 c1992b4d225439daddf525fafab1f144a43b33e1855fa58e7b2b1f6a628ad4b7720f50d9e33b6b66ff17761c3fb2aa2ef50c0010047dea766f10a3106dddf7df
+EBUILD selinux-at-2.20180114-r2.ebuild 276 BLAKE2B 7d059ddf4fb6f79709b46e844c46d5a3e305c1516ec170553800cbe1ca5469f65bdb3b3992a08ee5834f0e5ccff0a9b6e554e119570d85565351d4ba1039461e SHA512 50810d8f6729a4bda774a412ac65dc783070804c02d8556a07b491a0c70f0d4b18cae7d1bf4ebd381d29b3ee96cef25125f63bddfee2caa7e998ba1487e9bf7e
+EBUILD selinux-at-9999.ebuild 276 BLAKE2B 7d059ddf4fb6f79709b46e844c46d5a3e305c1516ec170553800cbe1ca5469f65bdb3b3992a08ee5834f0e5ccff0a9b6e554e119570d85565351d4ba1039461e SHA512 50810d8f6729a4bda774a412ac65dc783070804c02d8556a07b491a0c70f0d4b18cae7d1bf4ebd381d29b3ee96cef25125f63bddfee2caa7e998ba1487e9bf7e
 MISC metadata.xml 312 BLAKE2B cd411cd53bcbd27cdb2e71835c8d78684618419c265d17c3b9844abc9c14427ff3369ac949392bc1ad632a14926f2891b640941e6c59bc57a9033700856e6f13 SHA512 0d8118c4453dfb4796c10532034c98ab3ed08255c27881959dfa818486918c9c36616d0b9921fbe5af35f238593d6b39011d48a9c8b302e577ea2ee7ed5fd333
diff --git a/sec-policy/selinux-at/selinux-at-2.20180114-r2.ebuild b/sec-policy/selinux-at/selinux-at-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..d5d07f6dd98d
--- /dev/null
+++ b/sec-policy/selinux-at/selinux-at-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 60be724ec280..d5d07f6dd98d 100644
--- a/sec-policy/selinux-at/selinux-at-9999.ebuild
+++ b/sec-policy/selinux-at/selinux-at-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-automount/Manifest b/sec-policy/selinux-automount/Manifest
index 000c0a7fa6ff..bfed4978147a 100644
--- a/sec-policy/selinux-automount/Manifest
+++ b/sec-policy/selinux-automount/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-automount-2.20170805-r2.ebuild 288 BLAKE2B fca4a5e76ebff7db61f607
 EBUILD selinux-automount-2.20170805-r3.ebuild 288 BLAKE2B fca4a5e76ebff7db61f607db98e70cd8ffa0301dad1701c12d57f19f0015a9d382ac8d3a87efc64112d684df57800195be4275ff0e45b3a7a8c10f9468075af7 SHA512 a761bd9151a620aad48d4f3d6f35a79ef83df07a8b13c295f0e0d8877c572df70dbb540a38120b97e5d35c6ada94be5aed7ad07503ccb26b491067ad9532dbb0
 EBUILD selinux-automount-2.20170805-r4.ebuild 290 BLAKE2B db29327a13d713244d8da5faa07f0ee0b39274f2d41f42ef6b516ee438e60587ccfa10dee162632e3b3aae49b8eca119524418b000ed8230413f19a3d7a3c377 SHA512 c7ed768a3a3b47d1941b0cd096503aae8e4210262044701840e3a0c3653e00353f0fb9ddd6fff93bef452580fd0b7165220ecd5fbb78724002c538a457db5d57
 EBUILD selinux-automount-2.20180114-r1.ebuild 288 BLAKE2B 90115b2a0412af2744c8231106169e7ec3ec917d3aec09728cd8bb79d99436658542386972fd2672d9f3f043bae41cb6ba6cf638dbd7b5766c6f9189ef59ff5b SHA512 69f594cc4963ce677ac5b918cbac3089283820db6bcb51ca8cb30c70043bc7955abebdd6b2f5caa1c0cf5279319c6f35c57884ac4c1d0b678d180daf67ce1f0a
-EBUILD selinux-automount-9999.ebuild 290 BLAKE2B db29327a13d713244d8da5faa07f0ee0b39274f2d41f42ef6b516ee438e60587ccfa10dee162632e3b3aae49b8eca119524418b000ed8230413f19a3d7a3c377 SHA512 c7ed768a3a3b47d1941b0cd096503aae8e4210262044701840e3a0c3653e00353f0fb9ddd6fff93bef452580fd0b7165220ecd5fbb78724002c538a457db5d57
+EBUILD selinux-automount-2.20180114-r2.ebuild 290 BLAKE2B 8e0ca09e38d11531a12ec539f63f3c7f97d2a78cb2b34a9ca9e9274ba6cb4ea30e8fa374a3b92ef7cc68e4eda88db37f7447dbb8ab5f75325a2c38625e11a122 SHA512 e6698bdd64c90c4417a036aad361611231bcbcdb556a3f3b09e14a8ba5568fd03fb7972e47e9057ba1d9e2fd701696bb22d5042ec836b68e6853cf176ffa1a36
+EBUILD selinux-automount-9999.ebuild 290 BLAKE2B 8e0ca09e38d11531a12ec539f63f3c7f97d2a78cb2b34a9ca9e9274ba6cb4ea30e8fa374a3b92ef7cc68e4eda88db37f7447dbb8ab5f75325a2c38625e11a122 SHA512 e6698bdd64c90c4417a036aad361611231bcbcdb556a3f3b09e14a8ba5568fd03fb7972e47e9057ba1d9e2fd701696bb22d5042ec836b68e6853cf176ffa1a36
 MISC metadata.xml 319 BLAKE2B 9d1c7f70a181a970e9c1e12a4708344025d78e5008e81323d255093af8e7974eaad668e0807e7ca9a7b7be0a1825cd290620c7f2e5ff48ac6c0722249eecfa0b SHA512 df7fb7f023892cb790bb12bcf25abd4ed0bffe469cfcdffa399d0e3f13535e5a9b29c8aebc8ef11c9171f033da569597c9824cf1789d1042e0493f4d14aa6fec
diff --git a/sec-policy/selinux-automount/selinux-automount-2.20180114-r2.ebuild b/sec-policy/selinux-automount/selinux-automount-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..98c74562e3e3
--- /dev/null
+++ b/sec-policy/selinux-automount/selinux-automount-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 908d5219c7b3..98c74562e3e3 100644
--- a/sec-policy/selinux-automount/selinux-automount-9999.ebuild
+++ b/sec-policy/selinux-automount/selinux-automount-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-avahi/Manifest b/sec-policy/selinux-avahi/Manifest
index 25a25f6f17b1..b94597062fe6 100644
--- a/sec-policy/selinux-avahi/Manifest
+++ b/sec-policy/selinux-avahi/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-avahi-2.20170805-r2.ebuild 280 BLAKE2B 1f01209b402c703f9054dc5091
 EBUILD selinux-avahi-2.20170805-r3.ebuild 280 BLAKE2B 1f01209b402c703f9054dc50912b05dabf015e6da1a1274e1db0734de4479dd5825a3e47ae44a8821ac3f627f9410e03866d29208a120d30b7ce21d91a03ddd7 SHA512 07930eca88272ab1d895b5640ceee40f5eef1e4a71e890649096cad16516badefe298661eda73216333918367bfa5ecc24f0c5f2a45eee97094a3a96bfca9e16
 EBUILD selinux-avahi-2.20170805-r4.ebuild 282 BLAKE2B c960d496318897a9d6f81db7b15a7c0b32cbe15e7198fdd72415b7c6f3a9c1c2def8637af17f18f602bfced3038ae9362ef28fcc14891730f68351f04b8c2d70 SHA512 543d6968dad88ce5d0a661320723af462587091ce8e253e63fb19a12afabb5082d9e52353189d00f61966b7b9fc763786208c84335fd686d08c894b58c3ff6d1
 EBUILD selinux-avahi-2.20180114-r1.ebuild 280 BLAKE2B 25f9d63f4734aacde5f3ce57f69027611ad6d80de1852da701a6cf00774505c99ad005949fc6b73bd1b0d6944ddae67870f55bf3fa6fab46105847e2acee398c SHA512 3f0682b759ddaf2c9a079c0764526f5e76af1a087a2fe7e9c20526cba089e58864442b40c9fd9e0571dd2207457582e56fda49ae3f6fa8bb8bde3f0ebce7e278
-EBUILD selinux-avahi-9999.ebuild 282 BLAKE2B c960d496318897a9d6f81db7b15a7c0b32cbe15e7198fdd72415b7c6f3a9c1c2def8637af17f18f602bfced3038ae9362ef28fcc14891730f68351f04b8c2d70 SHA512 543d6968dad88ce5d0a661320723af462587091ce8e253e63fb19a12afabb5082d9e52353189d00f61966b7b9fc763786208c84335fd686d08c894b58c3ff6d1
+EBUILD selinux-avahi-2.20180114-r2.ebuild 282 BLAKE2B 15fde30d17dae5d6ed03fa84410888197fca1fa8f5a9f7671b3d8ef9164b0153b70c0e87158536c27385def6817b822db73b5433ec5f2165f20d263a2b400b7e SHA512 fc4760a095c7c5b46854b73c8f188d195683baa75f6d479392cb4f954e73bd20a53999d88ed0a0142b26ad28fd7fef4990b8569bb8b9840c1916f708cba616a5
+EBUILD selinux-avahi-9999.ebuild 282 BLAKE2B 15fde30d17dae5d6ed03fa84410888197fca1fa8f5a9f7671b3d8ef9164b0153b70c0e87158536c27385def6817b822db73b5433ec5f2165f20d263a2b400b7e SHA512 fc4760a095c7c5b46854b73c8f188d195683baa75f6d479392cb4f954e73bd20a53999d88ed0a0142b26ad28fd7fef4990b8569bb8b9840c1916f708cba616a5
 MISC metadata.xml 315 BLAKE2B 7cda989834ad58ea2460821062d71ad45f8e2e563caf4a2bc582262362d2ae282403e0be36eeb4bb2a3c28a55fca9ae5341d6fb5e3604fa57a71768b841ed246 SHA512 891d4ca0710d0f8ebbeaae86e71ff03f0011ded5cdafde29af66684e39f27ab8a6ff3b447b9138434503938484b7c9947c1f386a67860acb316ed1fdd91177e3
diff --git a/sec-policy/selinux-avahi/selinux-avahi-2.20180114-r2.ebuild b/sec-policy/selinux-avahi/selinux-avahi-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..ff1e5370ad15
--- /dev/null
+++ b/sec-policy/selinux-avahi/selinux-avahi-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 f6123cfbbb86..ff1e5370ad15 100644
--- a/sec-policy/selinux-avahi/selinux-avahi-9999.ebuild
+++ b/sec-policy/selinux-avahi/selinux-avahi-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-awstats/Manifest b/sec-policy/selinux-awstats/Manifest
index cfd6494fda4e..1b8b8406469d 100644
--- a/sec-policy/selinux-awstats/Manifest
+++ b/sec-policy/selinux-awstats/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-awstats-2.20170805-r2.ebuild 380 BLAKE2B 2e2611749e5a048ccf0cd88b
 EBUILD selinux-awstats-2.20170805-r3.ebuild 380 BLAKE2B 2e2611749e5a048ccf0cd88bde3a6ec4a7e1b580825ff580040b2b282f510476105859ff09d40de5a20ea6cf49be1eb5fb86c7da38f8eb33e69042a2860df6ff SHA512 78217b121ee717950300bf74b20baeff3799f21848dc3cebdfdd3062898f6ebaf2c49959d1c2a7921dbe52b06fb713443733729c0915476121e193b06b3f1c30
 EBUILD selinux-awstats-2.20170805-r4.ebuild 382 BLAKE2B e6293e1727f5040cb93b03f404d7f956748e5b28123701319bed36977fc8dd86ebb3622e354577971b4774c938efc2f88edf848843b3e9cf463ddb3ab92369b9 SHA512 c9268dbe2875d2dc40b3a2a47849f98997bae255315f9fbf44dcf8639f3a69c331d047fc13ba1ab46bc011687ff0fae69d3c83d337eb1b8ba4661216d1df2d39
 EBUILD selinux-awstats-2.20180114-r1.ebuild 380 BLAKE2B 7b3f43aceb65a7ea8d0707346e4e028256d9cf5312de85f8db2b2914f6c648756e3f132aa01ebd608a04b35d41ddac9dcf0a5751ae77112fc1d6d37376cef1d1 SHA512 5c9e7529915516a76e81dac38ccde11359f2c1b31734c01a259d8a521d92688f002bb2d40684bc4ebe5373550456a6e1ed3422574f78c1d9c1046bc8acc6fe90
-EBUILD selinux-awstats-9999.ebuild 382 BLAKE2B e6293e1727f5040cb93b03f404d7f956748e5b28123701319bed36977fc8dd86ebb3622e354577971b4774c938efc2f88edf848843b3e9cf463ddb3ab92369b9 SHA512 c9268dbe2875d2dc40b3a2a47849f98997bae255315f9fbf44dcf8639f3a69c331d047fc13ba1ab46bc011687ff0fae69d3c83d337eb1b8ba4661216d1df2d39
+EBUILD selinux-awstats-2.20180114-r2.ebuild 382 BLAKE2B f2e6e3ed4a1ede3492b756aa511a0aec8c0d84d544c1d0a5350b6d354d05222ab9aaf6572cd024945c43ed91a574f342a39ff65cbd294958193457c2e2161f42 SHA512 57e72771158f81e0cf3f32dbe1b5bfee9c11ac7b0e44fff23cae384972816128e745978c7492e8f5e5557497fcb27aa3f5f0b66df8c5c28729da92fb5b23b03c
+EBUILD selinux-awstats-9999.ebuild 382 BLAKE2B f2e6e3ed4a1ede3492b756aa511a0aec8c0d84d544c1d0a5350b6d354d05222ab9aaf6572cd024945c43ed91a574f342a39ff65cbd294958193457c2e2161f42 SHA512 57e72771158f81e0cf3f32dbe1b5bfee9c11ac7b0e44fff23cae384972816128e745978c7492e8f5e5557497fcb27aa3f5f0b66df8c5c28729da92fb5b23b03c
 MISC metadata.xml 317 BLAKE2B ef3132bec05c99928997bde44181ef17235bc9dd2ff78bf1fbab078c2bf2925622e19419d624a51aa6574f1f880191690f3184c1472407cdf286c416544bef04 SHA512 0b9ddebb84974b0eef29ff4eb9b3449593d2652944d17648e297db2a6f301531c1c003efac88215970b739b9e6c2fc733e21edb3257f2138ce8aa95047a70fa9
diff --git a/sec-policy/selinux-awstats/selinux-awstats-2.20180114-r2.ebuild b/sec-policy/selinux-awstats/selinux-awstats-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..967aa579c24d
--- /dev/null
+++ b/sec-policy/selinux-awstats/selinux-awstats-2.20180114-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 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 09e5c4fe1978..967aa579c24d 100644
--- a/sec-policy/selinux-awstats/selinux-awstats-9999.ebuild
+++ b/sec-policy/selinux-awstats/selinux-awstats-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-backup/Manifest b/sec-policy/selinux-backup/Manifest
index aca4231ad107..e05cdc098040 100644
--- a/sec-policy/selinux-backup/Manifest
+++ b/sec-policy/selinux-backup/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-backup-2.20170805-r2.ebuild 295 BLAKE2B ad9bf8f8059667c6632c0f707
 EBUILD selinux-backup-2.20170805-r3.ebuild 295 BLAKE2B ad9bf8f8059667c6632c0f7073bd464ce9a52fa2440e03e9bc0d6683f9d93a1a5d37d173ad6a638de19355915127cdbf261c2b0c70f9ce238861fcad85d0aeef SHA512 9f249ae0c1dc164957bbee7b230858b3b7eb8714623c476380382d82b6b7243eca2e75fcedb0e12f4d1b66c10b57f62ec632fad5180618e8df22550ca1d6de6d
 EBUILD selinux-backup-2.20170805-r4.ebuild 297 BLAKE2B 27709490067d90b840d8ecf31c7404f5b8925009077bccf49307c441e09f7e0b6e17f1f89e19bf4159e1d759c4d8d3c03e628ee8d953b19f8b22f8c2cdd064d2 SHA512 8a0ae54d4e036fc16b7cd2684c1f41a0c406dee0a5fd78e51a4413339d198ee338a1350dea3ed9265533711490db40423b6de59684d5cad1f0b9f5824e2d9ae8
 EBUILD selinux-backup-2.20180114-r1.ebuild 295 BLAKE2B 7ff6c3e188b4af86155f93c0fe042034de10641f0f4ca11bb5ce55b02c453706a355b8d934833cc40c8a847bb43ccc2af42e0d1662e41d111c9ccd5cabf0ab58 SHA512 df3a7d48d57c85ed85560ff6d161c0d54298b98ec15e90954b8c29a24078a79a485dc914cad1d0303cabed1e4b45054777e68e99fe4c41d85355ea9918ec7883
-EBUILD selinux-backup-9999.ebuild 297 BLAKE2B 27709490067d90b840d8ecf31c7404f5b8925009077bccf49307c441e09f7e0b6e17f1f89e19bf4159e1d759c4d8d3c03e628ee8d953b19f8b22f8c2cdd064d2 SHA512 8a0ae54d4e036fc16b7cd2684c1f41a0c406dee0a5fd78e51a4413339d198ee338a1350dea3ed9265533711490db40423b6de59684d5cad1f0b9f5824e2d9ae8
+EBUILD selinux-backup-2.20180114-r2.ebuild 297 BLAKE2B abdf74e2c6f99d4e6bc8baaf68858997e0be0316be41d65ad857561c3900ad9bee6f3f3be21a8997470a3d7d74d71c868bc700033118f98189410becedf7bb81 SHA512 be818d490f55c88df363fa3bee02f71fcf88815284998f91f08cc5d81d80f3982ed60c74dc856f76cfde51837a13962bf28fcd6f2d310d48fe6ec122d088265c
+EBUILD selinux-backup-9999.ebuild 297 BLAKE2B abdf74e2c6f99d4e6bc8baaf68858997e0be0316be41d65ad857561c3900ad9bee6f3f3be21a8997470a3d7d74d71c868bc700033118f98189410becedf7bb81 SHA512 be818d490f55c88df363fa3bee02f71fcf88815284998f91f08cc5d81d80f3982ed60c74dc856f76cfde51837a13962bf28fcd6f2d310d48fe6ec122d088265c
 MISC metadata.xml 329 BLAKE2B a10467077df9d62a7d16cb8c0ae23601c02dfcbd65ddeee59f6c3185e04c41e3a6de49607f03b43181b692446714e7b8e64a1b37beafc57b5d8ae581da38526c SHA512 0c171ebf47304dac2737f47f0b7246540d41a8b14a59b7354b64ec0a0dd70345fe0fb634cd8c03636b9a8c3510bede5d1a9a12f072e6c91fae04734d334d1f20
diff --git a/sec-policy/selinux-backup/selinux-backup-2.20180114-r2.ebuild b/sec-policy/selinux-backup/selinux-backup-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..235b2655afe2
--- /dev/null
+++ b/sec-policy/selinux-backup/selinux-backup-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 df29db3b1fcb..235b2655afe2 100644
--- a/sec-policy/selinux-backup/selinux-backup-9999.ebuild
+++ b/sec-policy/selinux-backup/selinux-backup-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-bacula/Manifest b/sec-policy/selinux-bacula/Manifest
index 8cc25a89b385..43998c7eb108 100644
--- a/sec-policy/selinux-bacula/Manifest
+++ b/sec-policy/selinux-bacula/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-bacula-2.20170805-r2.ebuild 282 BLAKE2B 5da3013d0fd8b39e9987a5ec3
 EBUILD selinux-bacula-2.20170805-r3.ebuild 282 BLAKE2B 5da3013d0fd8b39e9987a5ec3abbf9b015adb187d5a39cba729f08812ce96df2db3506c6b6e4fcd6127b906cab225279ba3e313d603c1a51928eeb890f1c8b36 SHA512 fb68dbdd6441bb5a88b9328519abd70d6ec1b7fa5a9acf28c8d9cec4edec27736a7ba7e7fb857e1e1a991681c90244171a3d1a420039ee8f7bbf1d5d3e2683b6
 EBUILD selinux-bacula-2.20170805-r4.ebuild 284 BLAKE2B 52b948274d02a2d213c40c39ec067fadc7de5f9a9e756e030133ccc3c4a394c9c1bfc1cf0693ec872e8eb9c2c30ac60e1a112d5c11dbdd606f1fbdc6dc8504fe SHA512 e3fbaced964a16f3dae73e21b6c50fbead88d7c8930613422472efea20c2f3c5179fcd06f7070adaa64dad5340cf76496e368af3dd626de2c5b5dfea75f8490d
 EBUILD selinux-bacula-2.20180114-r1.ebuild 282 BLAKE2B 89ff8825fcade423ab0edfbe5f73ef5ddede8fefc53940b3ac9b4da9babb926aa99fe5f87c8f476473b03f96e068ffc4f210dbee16e491b65f08202f5d755078 SHA512 8a713ac2301c3051472692d9ed1e00c9217e3c4dfa1801d43372759c8edf86df3f51533be81ea76e48d7e6553da3bf4ea476ddfa0cc52d50e6f702d3986c72a0
-EBUILD selinux-bacula-9999.ebuild 284 BLAKE2B 52b948274d02a2d213c40c39ec067fadc7de5f9a9e756e030133ccc3c4a394c9c1bfc1cf0693ec872e8eb9c2c30ac60e1a112d5c11dbdd606f1fbdc6dc8504fe SHA512 e3fbaced964a16f3dae73e21b6c50fbead88d7c8930613422472efea20c2f3c5179fcd06f7070adaa64dad5340cf76496e368af3dd626de2c5b5dfea75f8490d
+EBUILD selinux-bacula-2.20180114-r2.ebuild 284 BLAKE2B 78a6c7976a1617be11792aa0fa09eda7c65168be046b60c93418a6272ab4fbedacc715315b3235446c0c104fef99385a827d9ace6fc4bf38a999ea7dabdf3761 SHA512 dab0a32bac3b2bb677edff56e78c70b6726f733e458b981293097bafead8d763ec1009774f7aa6024e55bf372bae5eaaa96bb7dab2c9247dfb2e63dbce4182fb
+EBUILD selinux-bacula-9999.ebuild 284 BLAKE2B 78a6c7976a1617be11792aa0fa09eda7c65168be046b60c93418a6272ab4fbedacc715315b3235446c0c104fef99385a827d9ace6fc4bf38a999ea7dabdf3761 SHA512 dab0a32bac3b2bb677edff56e78c70b6726f733e458b981293097bafead8d763ec1009774f7aa6024e55bf372bae5eaaa96bb7dab2c9247dfb2e63dbce4182fb
 MISC metadata.xml 316 BLAKE2B dc6935ac38b7c07ca95aee076ada83f985acacc3fb09eeb221466886c6d5362fc84fd24c16f068a2f733dc23dd3b4f5ef5173432e099002029785c2fbb7fc4ed SHA512 372cf73fefff21230ab25228a49d88abf1d32ba3dbb9241ebcba8d18b6802f8ac4965ff05f92f680cbc3057115b8821eeb6be263ee187f17b1ef563fa8d22d1f
diff --git a/sec-policy/selinux-bacula/selinux-bacula-2.20180114-r2.ebuild b/sec-policy/selinux-bacula/selinux-bacula-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..b50372799c1e
--- /dev/null
+++ b/sec-policy/selinux-bacula/selinux-bacula-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 c56d67a6f4af..b50372799c1e 100644
--- a/sec-policy/selinux-bacula/selinux-bacula-9999.ebuild
+++ b/sec-policy/selinux-bacula/selinux-bacula-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-base-policy/Manifest b/sec-policy/selinux-base-policy/Manifest
index 0d6d0595ffc0..2e7e48b8c9fe 100644
--- a/sec-policy/selinux-base-policy/Manifest
+++ b/sec-policy/selinux-base-policy/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-base-policy-2.20170805-r2.ebuild 3603 BLAKE2B 0d8294c8cec01620bc7
 EBUILD selinux-base-policy-2.20170805-r3.ebuild 3603 BLAKE2B 0d8294c8cec01620bc7f1c2ea6d957a8b05d109196322a8c482ed9d8c7f517e14329b13ac4762ffc5483bd207d81e75cb113ae29c39c1da4ca8c4b16fcdc919e SHA512 0057be4e522c0704ef4080751a94e445cf42d658cd8b1227eb0b1c7074de57010cd31b90dcb757a0f0ab6672b5b1a53341800142b11869dcffbede53e0e59282
 EBUILD selinux-base-policy-2.20170805-r4.ebuild 3605 BLAKE2B 4f27262143270f66d1dc3752647adc4c6b8285d1147e3cd6247f6783f10a7c0fa3d11a4cd5b085218fc18d46d73c832cf340787d9d30af2dec09e7e8fba34559 SHA512 bb23adb0d62440dabb05d44566eef538d4fc0c905eb2c5c9f7b1ce85ea6ee2ed5770e0cb986b9ce71930538570c478621fb5ec740e55f3a00c63e82fa1e2d1f7
 EBUILD selinux-base-policy-2.20180114-r1.ebuild 3603 BLAKE2B 0d8294c8cec01620bc7f1c2ea6d957a8b05d109196322a8c482ed9d8c7f517e14329b13ac4762ffc5483bd207d81e75cb113ae29c39c1da4ca8c4b16fcdc919e SHA512 0057be4e522c0704ef4080751a94e445cf42d658cd8b1227eb0b1c7074de57010cd31b90dcb757a0f0ab6672b5b1a53341800142b11869dcffbede53e0e59282
+EBUILD selinux-base-policy-2.20180114-r2.ebuild 3605 BLAKE2B 4f27262143270f66d1dc3752647adc4c6b8285d1147e3cd6247f6783f10a7c0fa3d11a4cd5b085218fc18d46d73c832cf340787d9d30af2dec09e7e8fba34559 SHA512 bb23adb0d62440dabb05d44566eef538d4fc0c905eb2c5c9f7b1ce85ea6ee2ed5770e0cb986b9ce71930538570c478621fb5ec740e55f3a00c63e82fa1e2d1f7
 EBUILD selinux-base-policy-9999.ebuild 3605 BLAKE2B 4f27262143270f66d1dc3752647adc4c6b8285d1147e3cd6247f6783f10a7c0fa3d11a4cd5b085218fc18d46d73c832cf340787d9d30af2dec09e7e8fba34559 SHA512 bb23adb0d62440dabb05d44566eef538d4fc0c905eb2c5c9f7b1ce85ea6ee2ed5770e0cb986b9ce71930538570c478621fb5ec740e55f3a00c63e82fa1e2d1f7
 MISC metadata.xml 534 BLAKE2B 1bb289204431150ae974c9fd677926faf72e75def3294b9df405a048e398ac3b6147de8483512487edaeea378e1dbd32df0675acb7fa50326c48382603c5dbfe SHA512 d8340bec9d0ec0feb396b17b53a6d53e3caa7ddd1efdc5e5de07baf86592ad0526d08fc08908295cf18a915eef1c7429c72970d56967162b2390eed6f28c822a
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r2.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..ffcbe80f607c
--- /dev/null
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r2.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2018 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://wiki.gentoo.org/wiki/Project:SELinux"
+DESCRIPTION="SELinux policy for core modules"
+
+IUSE="systemd +unconfined"
+
+PDEPEND="unconfined? ( sec-policy/selinux-unconfined )"
+DEPEND="=sec-policy/selinux-base-${PVR}[systemd?]"
+
+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}
+
+		semodule -s ${i} ${COMMAND}
+	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/Manifest b/sec-policy/selinux-base/Manifest
index ec38f58abab5..c4837bbd673e 100644
--- a/sec-policy/selinux-base/Manifest
+++ b/sec-policy/selinux-base/Manifest
@@ -8,6 +8,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -19,5 +20,6 @@ EBUILD selinux-base-2.20170805-r2.ebuild 4225 BLAKE2B 1b767058fd8a870edc18cc21b9
 EBUILD selinux-base-2.20170805-r3.ebuild 4225 BLAKE2B 1b767058fd8a870edc18cc21b9c2973721ed9fa29d1aa50fb338752df06cc8a2c01ef451aefa579652e88ad4e63898de0927234df1e6506f28da69acd55a9889 SHA512 c656f41074d167d28b8a89b0278a72ecd960bd5151cc8ea8bf387f30ba8278213fbb6461c19b1b418d58d2a85fbff325d69a42ec8deb862b92ac64210b5fbffc
 EBUILD selinux-base-2.20170805-r4.ebuild 4227 BLAKE2B 18c1170398d476703df986d56568a8f7dde7a9ceed5c21583e56062066903d4de926fa1138da395be68807124484640b3f3c1d3a27c19a45bca497000bf73397 SHA512 500be37b5d0cff6f2ac558a3bb8eaf6e6fc7e597226307dca6c8246c4254ca652bff466deeae81084ee9d05efef93e8fb3075007d4cae2d8bed593b0d5b70f02
 EBUILD selinux-base-2.20180114-r1.ebuild 4225 BLAKE2B 787204b62302c43e3bb5025ae66c9973e0fe1b8f5574e487c2cc916f553aff15ebf14f6047e69299ca14b2f9faf18c39bd711bb4e1acb2aeb75ed1b45d2dec7c SHA512 6c1c7932dbbdf55075b0d0c04fa96767ad490785ce70449f9b4a3344c3a890b361980a04dab62c8d9c30c08fec3436f4c5a60cfac9809c8e913639570e04d66c
+EBUILD selinux-base-2.20180114-r2.ebuild 4227 BLAKE2B 2805a6a1851567ba8c92da6fb03bf768474946fc92ab16c99c588a5a837188ecf6ae0c31b4038587770222f00a168daf38ab7a65a569a5977d817b959d8547c6 SHA512 9f5348bbe0daa39df84de5ca32e82590e0e8f3227451b9aa534b78582a4d8579aaba08823f89e29bf30e15d2f2accedac08a8678cc25611d0c4f546a267d37f2
 EBUILD selinux-base-9999.ebuild 4227 BLAKE2B 2805a6a1851567ba8c92da6fb03bf768474946fc92ab16c99c588a5a837188ecf6ae0c31b4038587770222f00a168daf38ab7a65a569a5977d817b959d8547c6 SHA512 9f5348bbe0daa39df84de5ca32e82590e0e8f3227451b9aa534b78582a4d8579aaba08823f89e29bf30e15d2f2accedac08a8678cc25611d0c4f546a267d37f2
 MISC metadata.xml 839 BLAKE2B 797f551065b80455c9538f115d680016954b7fc05cd5232ca09b86d83163c81e9ed868ea6b9be08d3c1284dcfd3527e88660befb747a631f4d2292331410cb52 SHA512 330017a98a3f9f4e6d6004955eb939c8d9c1c92fe6d091f78cdd7d2f6a02838c67a8a3268f38dad7df27f909ff51dc295d5de748f9767a257b5dad36c74d921a
diff --git a/sec-policy/selinux-base/selinux-base-2.20180114-r2.ebuild b/sec-policy/selinux-base/selinux-base-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..b779ed9e7cf9
--- /dev/null
+++ b/sec-policy/selinux-base/selinux-base-2.20180114-r2.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2018 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://wiki.gentoo.org/wiki/Project:SELinux"
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND=">=sys-apps/policycoreutils-2.7
+	virtual/udev"
+DEPEND="${RDEPEND}
+	sys-devel/m4
+	>=sys-apps/checkpolicy-2.7"
+
+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-bind/Manifest b/sec-policy/selinux-bind/Manifest
index a23b84c99a8b..23720ae43297 100644
--- a/sec-policy/selinux-bind/Manifest
+++ b/sec-policy/selinux-bind/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-bind-2.20170805-r2.ebuild 278 BLAKE2B ba82dfa9063723c10356207af1e
 EBUILD selinux-bind-2.20170805-r3.ebuild 278 BLAKE2B ba82dfa9063723c10356207af1eaa66ea062b433c4b0158fd8602e94e827d3844f3086c3147226107bfd15a1612c73e9f8459fbc9f8913d499a0df14c5c67489 SHA512 051e510b34ecc9f2a7d7ae73873601fd33ebf8abe0fe652dbd2ad24029bc3a0dee41bf7b538c22fcd841646af3afdce95aed6efc1de9e07f544c916428e86cc8
 EBUILD selinux-bind-2.20170805-r4.ebuild 280 BLAKE2B f5d872d31544346c0f2fd1680e69fb1d35b76788c8bd69a20ff959aec7c9ab5ae9f8e2d6be3b21e06997e4b6372c751471d361183198d0ff299f602fc2a97c6e SHA512 9de3bf8f814083fb9bdb081df25a328707ea790fc8ffb3da8c1d592772cb5d51a5dbf2032942a68d7bfbeeb0894d565f6d68ae413ca61e4208817b2fcaa99411
 EBUILD selinux-bind-2.20180114-r1.ebuild 278 BLAKE2B e15df438ee73bbf4b95d6534c5200f09ee892e28447a5ea3918d9d8ebfebaa085f89afe8e2a175b96fdcce5934caf46d3cd88daa34ca6862771350f2a6ab0e79 SHA512 8a5250f11f9f8b62db99503731e4b144730d710a6677004a13187f41147f63b4a5fbd3f42bf640189f67ae1d6d97710e2f531e32ad536d0d2d96faf46db803e4
-EBUILD selinux-bind-9999.ebuild 280 BLAKE2B f5d872d31544346c0f2fd1680e69fb1d35b76788c8bd69a20ff959aec7c9ab5ae9f8e2d6be3b21e06997e4b6372c751471d361183198d0ff299f602fc2a97c6e SHA512 9de3bf8f814083fb9bdb081df25a328707ea790fc8ffb3da8c1d592772cb5d51a5dbf2032942a68d7bfbeeb0894d565f6d68ae413ca61e4208817b2fcaa99411
+EBUILD selinux-bind-2.20180114-r2.ebuild 280 BLAKE2B 9681c852bc197af8b3a24fadcd4c0e3c7770e6943d0bbab68ea3bbbb382edec4a5e7d0ee8f9d98b1816ee6c95449bb8d736bf6a5bd3513b12a373466ad96dfbd SHA512 2900801fd0122b357ecb2e7d37113d48b553c07bcb08923f9e182d9475f3c8f86bca52608b19a1c2fa493104492eef8562b90e384ddb42a4818c15204dd14c19
+EBUILD selinux-bind-9999.ebuild 280 BLAKE2B 9681c852bc197af8b3a24fadcd4c0e3c7770e6943d0bbab68ea3bbbb382edec4a5e7d0ee8f9d98b1816ee6c95449bb8d736bf6a5bd3513b12a373466ad96dfbd SHA512 2900801fd0122b357ecb2e7d37113d48b553c07bcb08923f9e182d9475f3c8f86bca52608b19a1c2fa493104492eef8562b90e384ddb42a4818c15204dd14c19
 MISC metadata.xml 314 BLAKE2B d4d110f172517ad4a4913425d261f06ce6111ac5e67455e148212f5f1934cbbdcc0471b110c891bd546b19fd144b325589aba60aa032ed1ce9f807f872415582 SHA512 9062d22c1c459260c2f1202823ac2bc9e2a6ba8214380785a6f92b5eeb2470017249d24e64e1abc92dfe58910a45b860f5b81cfdc0643198b5c5bf84e6598372
diff --git a/sec-policy/selinux-bind/selinux-bind-2.20180114-r2.ebuild b/sec-policy/selinux-bind/selinux-bind-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..c08eed19e706
--- /dev/null
+++ b/sec-policy/selinux-bind/selinux-bind-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 b3da5a34f97f..c08eed19e706 100644
--- a/sec-policy/selinux-bind/selinux-bind-9999.ebuild
+++ b/sec-policy/selinux-bind/selinux-bind-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-bitcoin/Manifest b/sec-policy/selinux-bitcoin/Manifest
index b5d074f20d0c..4cc092ce89c6 100644
--- a/sec-policy/selinux-bitcoin/Manifest
+++ b/sec-policy/selinux-bitcoin/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-bitcoin-2.20170805-r2.ebuild 284 BLAKE2B 0126f57f321e302ebe73763b
 EBUILD selinux-bitcoin-2.20170805-r3.ebuild 284 BLAKE2B 0126f57f321e302ebe73763b00fda8fab47b98aaedd5576aa4de582bdb06c2a6028fc8f67f8c5bc0c036ccb5c21c7762af36b88c3d621ab55941e64de837e53b SHA512 1b561adec5af2c32e2306a0e16372321b98a7f1290a65580f9e44d72cf34fad1ba45408fb58c5161f306756b4b897afe6f6786551c15cc800b460a481281017e
 EBUILD selinux-bitcoin-2.20170805-r4.ebuild 286 BLAKE2B 24334fd93f13e5c7d9cebc18d482d61ca3b553867ed14125439868e59a19d170bc4e8d702684ac9420ab9b9b44f82074d5427751ae8bf72e94e4f8fe81521e02 SHA512 f1e5269dd9b9ef50bb14ef6b6e2ea269ef12deee7640b16dde8d8977a626f677d3b8ac24398f9ac58bdce8bcdf60f2a43857ff052cca35ac2d6fb956f7aa9d3f
 EBUILD selinux-bitcoin-2.20180114-r1.ebuild 284 BLAKE2B 3e02f143a0f2551f5e4929a1ea35ec6bb2d1d5e5732c60d613fdd2900c5aaa0d2af7cc67ae23fc97098ee370d438a443755e6ffb906a47da2f8ff66befa84c13 SHA512 581f829392330d42dd27a4a987b12113d4d111f1abd50205dfb8a96577fc1ee0615576d167f3c391248fdcb1d8257d249f2f0f43f4a5ba70216aca1a373772bd
-EBUILD selinux-bitcoin-9999.ebuild 286 BLAKE2B 24334fd93f13e5c7d9cebc18d482d61ca3b553867ed14125439868e59a19d170bc4e8d702684ac9420ab9b9b44f82074d5427751ae8bf72e94e4f8fe81521e02 SHA512 f1e5269dd9b9ef50bb14ef6b6e2ea269ef12deee7640b16dde8d8977a626f677d3b8ac24398f9ac58bdce8bcdf60f2a43857ff052cca35ac2d6fb956f7aa9d3f
+EBUILD selinux-bitcoin-2.20180114-r2.ebuild 286 BLAKE2B aada5b48af24d5ece4203a01c2f9aa3cd829159faa6cb881f0425751144bbf45e2354673e542a41dbc15bf69ad508477a2c0a37858ce155d2b51ca289faf2ac4 SHA512 7960e81e9ba39fb85e8085abbfc5b3fe119f5cef0a500875ae4a4c2d041433017cc41bf4e36d2312a437ece09f7cfb02924e12f285bf59c8328308e9cff491ff
+EBUILD selinux-bitcoin-9999.ebuild 286 BLAKE2B aada5b48af24d5ece4203a01c2f9aa3cd829159faa6cb881f0425751144bbf45e2354673e542a41dbc15bf69ad508477a2c0a37858ce155d2b51ca289faf2ac4 SHA512 7960e81e9ba39fb85e8085abbfc5b3fe119f5cef0a500875ae4a4c2d041433017cc41bf4e36d2312a437ece09f7cfb02924e12f285bf59c8328308e9cff491ff
 MISC metadata.xml 317 BLAKE2B 2bf5e205be759496e9432490df495d4131fdb36a5e809709eb8a506e1d5a36fe4894a5dcbb64604910b2dcada0c7da5cf5fc71e175704e181d3170d33228bfcb SHA512 3478dc7035310237bd5df88943831b1ec05b7c8975c0d275a67b2f0c216a3447942077c131244efa347bbb8cdf91543e290a2d84f153e603fcc492e4079e7537
diff --git a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20180114-r2.ebuild b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..6b32fb1c8d60
--- /dev/null
+++ b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 24a913d8dba5..6b32fb1c8d60 100644
--- a/sec-policy/selinux-bitcoin/selinux-bitcoin-9999.ebuild
+++ b/sec-policy/selinux-bitcoin/selinux-bitcoin-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-bitlbee/Manifest b/sec-policy/selinux-bitlbee/Manifest
index eaf3fa8379a0..3ca527a4a8e2 100644
--- a/sec-policy/selinux-bitlbee/Manifest
+++ b/sec-policy/selinux-bitlbee/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-bitlbee-2.20170805-r2.ebuild 379 BLAKE2B d574b46e313134065f231e3d
 EBUILD selinux-bitlbee-2.20170805-r3.ebuild 379 BLAKE2B d574b46e313134065f231e3da07681b0334a1699a9b0f8716b2a04ebbfa7bc6d05f8459d1d0f3a1752bc4ee4ec137066beb1d87dba41acebcd0e14487dddf12c SHA512 4f0561d002239b822bfc3761ff18694115bc95a3216ce7ee1307e1bef7bec3873c3ac84a2387b11e2ed974cee54ef9ccb2880aa003a741b2dc2470260885d845
 EBUILD selinux-bitlbee-2.20170805-r4.ebuild 381 BLAKE2B c5a9178adeea5d27a771865c3200588dbdbe9f5395b7874487014868da9141f4a10f4757f32d694ad4afb904fbd1f9e191256b6054bf63638271631b856acdcb SHA512 59b945bf366a671ca180664f6d3906b4bfe78bab6e822ae1121b1206d5b1a7607fc4a968421fe49ec26198983261ee0c5e1ed911f48effdd6383d3ee850fc076
 EBUILD selinux-bitlbee-2.20180114-r1.ebuild 379 BLAKE2B e5395c419305a03362f28f21b5f556e662cf35372a19fd6bfef3a7d745406b941a1acf6191612edd6a72e96a9988c90e0c57f92d822464c094c340f8299ae3c3 SHA512 86d51c755948f624185db623a6769f0c2b2988925458701c077fd438a6937ba816a54cd36a3613bb747c6826fe607eac29e6873522c9227b00a9abcdc534c412
-EBUILD selinux-bitlbee-9999.ebuild 381 BLAKE2B c5a9178adeea5d27a771865c3200588dbdbe9f5395b7874487014868da9141f4a10f4757f32d694ad4afb904fbd1f9e191256b6054bf63638271631b856acdcb SHA512 59b945bf366a671ca180664f6d3906b4bfe78bab6e822ae1121b1206d5b1a7607fc4a968421fe49ec26198983261ee0c5e1ed911f48effdd6383d3ee850fc076
+EBUILD selinux-bitlbee-2.20180114-r2.ebuild 381 BLAKE2B bf1166593f798de1fcc106beaafbb4d6824a8a8f20f51ada6cf332d441209ac282d1fe042ec1e27e48e1fe68c68c1825c88d8d323c0b32749f10a0da30e24fdd SHA512 137b5156670aa3a0ee7d98299c6dc7a3e8d521ddd6572aafce81ae1fe0151d170c78425efb7bfacd7ff87fa7b87c0fa9d20bbb95eaa850d4a36adc68041179ce
+EBUILD selinux-bitlbee-9999.ebuild 381 BLAKE2B bf1166593f798de1fcc106beaafbb4d6824a8a8f20f51ada6cf332d441209ac282d1fe042ec1e27e48e1fe68c68c1825c88d8d323c0b32749f10a0da30e24fdd SHA512 137b5156670aa3a0ee7d98299c6dc7a3e8d521ddd6572aafce81ae1fe0151d170c78425efb7bfacd7ff87fa7b87c0fa9d20bbb95eaa850d4a36adc68041179ce
 MISC metadata.xml 317 BLAKE2B f9c9b5fcf4de89f18b2a74b18af457fd54942be1c9a9b0a43a07ee34df828599dfecf84a0dcda60dd5cf8b7e98d8e2792b0a8e3aa1ca6e71bc0201b4932ec880 SHA512 551ce283639086916b90d0e0da81e66946c957e946c333fd4b11d482e57483e6adfe5145417e37bc7bb7ee47da60b645e34271e82ffe86cb05e22f65da348df9
diff --git a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20180114-r2.ebuild b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..78fbf6bdc40b
--- /dev/null
+++ b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20180114-r2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 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 e5e8a067939d..78fbf6bdc40b 100644
--- a/sec-policy/selinux-bitlbee/selinux-bitlbee-9999.ebuild
+++ b/sec-policy/selinux-bitlbee/selinux-bitlbee-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-bluetooth/Manifest b/sec-policy/selinux-bluetooth/Manifest
index 6352d705cf06..1a23e0a9679c 100644
--- a/sec-policy/selinux-bluetooth/Manifest
+++ b/sec-policy/selinux-bluetooth/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-bluetooth-2.20170805-r2.ebuild 288 BLAKE2B 7a54908e5ccc41ee73b9e7
 EBUILD selinux-bluetooth-2.20170805-r3.ebuild 288 BLAKE2B 7a54908e5ccc41ee73b9e72cd550339d1cc8c9f1f763659e3f42a4fda625decb186682c6c9db7e894bc21ecb776413efd79cd6925dc6174bc05a878d5a6042ea SHA512 aceda81c8802289b6e34f86d342c26f5b8d36cf2fdd713c1d9571c0631dd961fa0f605ecbeebe3fb6b17ad90906d7d6170c1d18b16945214f8ea4aef41ef21bb
 EBUILD selinux-bluetooth-2.20170805-r4.ebuild 290 BLAKE2B 108cbf0325a32f987a3be380623bd65ae0e3cfb6f8eade559ea2d611769c28296e05e642a4519337b742337375a7b910b94142006362f5ddaa144f2cff67a57e SHA512 1660976a4a77219d76e9ca55b6bcc7074d5a97b1abcb18232bf335bbeab39a60f19852216b1e8dd6f8483503d8dbffafe2e509bc8564c7f7a0daf79de341ed7a
 EBUILD selinux-bluetooth-2.20180114-r1.ebuild 288 BLAKE2B 76f5481de8be8635754463a7aa44edbd009c37141362bb21865d0076d9597ca7eff135e098dd3ef6c648e4c32632394a8c029ff2635a650e3103ea577fbf95f0 SHA512 92b3ad02cd3abcef4c3a26752631d4b96f65fdc89d37419b8fc3878dee3625789c1b44252d5a7f7c08f6bbe4bd4c3b94396294ecc27119c03e9a75e8961f8023
-EBUILD selinux-bluetooth-9999.ebuild 290 BLAKE2B 108cbf0325a32f987a3be380623bd65ae0e3cfb6f8eade559ea2d611769c28296e05e642a4519337b742337375a7b910b94142006362f5ddaa144f2cff67a57e SHA512 1660976a4a77219d76e9ca55b6bcc7074d5a97b1abcb18232bf335bbeab39a60f19852216b1e8dd6f8483503d8dbffafe2e509bc8564c7f7a0daf79de341ed7a
+EBUILD selinux-bluetooth-2.20180114-r2.ebuild 290 BLAKE2B 600d1648f2c206f995a5a73eb67faf83fca451be451187b683ab1bd3ea2bc1993f22946302b854071a99281c38e345c9328f369d0d8b4f7e66284e7a61993faf SHA512 288555daa61647ab553ded399658f5e9183b851c6ae6e9109774991e8cdf919a35865e92d87d9501be4575b40ae845f64e5a3655d9c1e19ec8acba467d5af7fd
+EBUILD selinux-bluetooth-9999.ebuild 290 BLAKE2B 600d1648f2c206f995a5a73eb67faf83fca451be451187b683ab1bd3ea2bc1993f22946302b854071a99281c38e345c9328f369d0d8b4f7e66284e7a61993faf SHA512 288555daa61647ab553ded399658f5e9183b851c6ae6e9109774991e8cdf919a35865e92d87d9501be4575b40ae845f64e5a3655d9c1e19ec8acba467d5af7fd
 MISC metadata.xml 319 BLAKE2B 77895c048b499cf4233a28baa860e5e9bcb4c52d919342c27d619cce316973b3f71a1f4a10edb2e3b605442a8bd6ff5bdf2eedf32e58de89d7354c7dcf796c5d SHA512 23cc2ad068f0758998957a4d8cfaa9f2ee39fbd8a7dee48834f6907611229e2d623f78b8f169eaf1cae6c66665d663d28d9072b98506947de8c6d84ca0398c0a
diff --git a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20180114-r2.ebuild b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..e708bb5381a9
--- /dev/null
+++ b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 a32d89d332ef..e708bb5381a9 100644
--- a/sec-policy/selinux-bluetooth/selinux-bluetooth-9999.ebuild
+++ b/sec-policy/selinux-bluetooth/selinux-bluetooth-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-brctl/Manifest b/sec-policy/selinux-brctl/Manifest
index 44d2894b3c59..a9ec89e7f2e7 100644
--- a/sec-policy/selinux-brctl/Manifest
+++ b/sec-policy/selinux-brctl/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-brctl-2.20170805-r2.ebuild 280 BLAKE2B 33bb67ab966e37ac721d2be42a
 EBUILD selinux-brctl-2.20170805-r3.ebuild 280 BLAKE2B 33bb67ab966e37ac721d2be42af4636dffba570ffa20f75ac7e80aaf7fdf43f44eb1a06a749856d93de9d598f2d3daf7f6de9d5df0ed01d5551cddaf42802356 SHA512 24ae0ddc85f833bf7d52e310befdf5a75a8869db07d224433963454ea9f65efa0336015898130a3072ae1471e67593120e63f43a77e0d0b0823c2ce8e85da1a0
 EBUILD selinux-brctl-2.20170805-r4.ebuild 282 BLAKE2B 71333cbfd77bc6bd7b02d18bca7f8c8f4e2edb86e5418154237c461695f188b8774773cce95597d2a2139ad9d7da4aeabe57cbc1f471f5b6828da371e6ad7b0a SHA512 34232e7421d68bf8f5c87dcecf113316ff582ad01c701d771b393a630b1ec267eb8bfec5193ca06b7e8169d853cdce4923aadaa61170aa058d97c1c72aad5ed6
 EBUILD selinux-brctl-2.20180114-r1.ebuild 280 BLAKE2B 58236f0cbd1cadcb492edb1c1890c233a0c466021e6e4ec44b88a8689b3e3245b786878c11a625171e1b2109459b117294e4537881acdbf342075807650e832c SHA512 76d27b343160c1253b98ebb265257e6de54e41e6af09ad19ba5d84c1e787e8ba3e559fae6d838d3a0d4b6c38304b2d678d29cb357593eaac326aee8b4fa16a75
-EBUILD selinux-brctl-9999.ebuild 282 BLAKE2B 71333cbfd77bc6bd7b02d18bca7f8c8f4e2edb86e5418154237c461695f188b8774773cce95597d2a2139ad9d7da4aeabe57cbc1f471f5b6828da371e6ad7b0a SHA512 34232e7421d68bf8f5c87dcecf113316ff582ad01c701d771b393a630b1ec267eb8bfec5193ca06b7e8169d853cdce4923aadaa61170aa058d97c1c72aad5ed6
+EBUILD selinux-brctl-2.20180114-r2.ebuild 282 BLAKE2B b900d7645a31a0d819c3a1b5c31796becaa634b60095b4a862b4d1911ff9313637bb992767a11c3a07bf682412a1f4861de1dedff0ff6e11eed095bc70e49746 SHA512 882a0fde367fa21bccbe7729f131aa2982b1c61d91da25e2a1ccd1212a1979d3e81cb882913e548b882b1486ec83dc5d1358e83443136856f9cacd17d4beb07c
+EBUILD selinux-brctl-9999.ebuild 282 BLAKE2B b900d7645a31a0d819c3a1b5c31796becaa634b60095b4a862b4d1911ff9313637bb992767a11c3a07bf682412a1f4861de1dedff0ff6e11eed095bc70e49746 SHA512 882a0fde367fa21bccbe7729f131aa2982b1c61d91da25e2a1ccd1212a1979d3e81cb882913e548b882b1486ec83dc5d1358e83443136856f9cacd17d4beb07c
 MISC metadata.xml 315 BLAKE2B 21a1f569bbdae9a692fa08c5d226bb6304010fd00bdbb30d8295d8ebc8da159029ed67cb151225af0aadb2a004391c4fe80204e6d53efa21dd21c809a5ae3154 SHA512 23d754daa42126bda3f13dca1fc91726bf4562978ce88efacaefe003b19365c97356b716db8a53a12f99b119fbfd890dbe9d6d782e63cee9722c61cb047f65f6
diff --git a/sec-policy/selinux-brctl/selinux-brctl-2.20180114-r2.ebuild b/sec-policy/selinux-brctl/selinux-brctl-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..e160f1e6735f
--- /dev/null
+++ b/sec-policy/selinux-brctl/selinux-brctl-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 65ee67a2614d..e160f1e6735f 100644
--- a/sec-policy/selinux-brctl/selinux-brctl-9999.ebuild
+++ b/sec-policy/selinux-brctl/selinux-brctl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-cachefilesd/Manifest b/sec-policy/selinux-cachefilesd/Manifest
index abe13aa3533f..a7bccae752e1 100644
--- a/sec-policy/selinux-cachefilesd/Manifest
+++ b/sec-policy/selinux-cachefilesd/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-cachefilesd-2.20170805-r2.ebuild 292 BLAKE2B 5486d2fcf7e252ddadf5
 EBUILD selinux-cachefilesd-2.20170805-r3.ebuild 292 BLAKE2B 5486d2fcf7e252ddadf56809ceeca41518969becd7321455b26ee60349866ee27cadbb3a0c84c562109559be79d8c27d24e44b00f3448cdd6eccd26e96e45063 SHA512 3ad9418f3c042837b83f85c23fbae8b157aa130d3d08f585a4dc971f5f6fc0a9bc43e63de4a410e0f1c0e84dc12ac0952a5b0408ad59d0a854ad242a3056bc3e
 EBUILD selinux-cachefilesd-2.20170805-r4.ebuild 294 BLAKE2B 412a219654131785c274abfb03ea1478e8ed746549dd33eafe733b33a676d55f960d78840c44dc4729c86a36617396216aa3b13427b95e069cbc32313e09a768 SHA512 02229a442a31e2d61fa068dbd33e68e7b171cab470d29e983a5697d99c750bc78c41dde8d9c80bea83704423c9ecf7cfc03c297ab03af4158b355b7ba9b381ab
 EBUILD selinux-cachefilesd-2.20180114-r1.ebuild 292 BLAKE2B 45a9fb567074a09e72d256e0fdd21f1dd50d9daa308f77e4da0d1e7f86384ed832166e8ff51026a0dd62ae37220806c528cc9b0405b0a0110750f2f4671326d9 SHA512 a7e2a15540d79ee880a63026e9b999203c43836e8eaa7aafe4e94b8770336c82db7afbc92f283b730941dc5eecea65570714192e0815a107d1281e2c0a18f3b8
-EBUILD selinux-cachefilesd-9999.ebuild 294 BLAKE2B 412a219654131785c274abfb03ea1478e8ed746549dd33eafe733b33a676d55f960d78840c44dc4729c86a36617396216aa3b13427b95e069cbc32313e09a768 SHA512 02229a442a31e2d61fa068dbd33e68e7b171cab470d29e983a5697d99c750bc78c41dde8d9c80bea83704423c9ecf7cfc03c297ab03af4158b355b7ba9b381ab
+EBUILD selinux-cachefilesd-2.20180114-r2.ebuild 294 BLAKE2B 48b9fac86252443eccd3ea326f4471b86fa3fa2246e8f287c5ce5886614640e42f36ed9ac01311f90ed285e67ce646e1fb6da3263e7b2cc9a1794ea0b3c78c0d SHA512 d6af12307ebde115c68a0ee758ba4bf5ebdcc250ea74c62d8aa279cb0bc52c3320242781775bc0f25c380045278f58c8c7b84ae0294785923a1ce241b2d66683
+EBUILD selinux-cachefilesd-9999.ebuild 294 BLAKE2B 48b9fac86252443eccd3ea326f4471b86fa3fa2246e8f287c5ce5886614640e42f36ed9ac01311f90ed285e67ce646e1fb6da3263e7b2cc9a1794ea0b3c78c0d SHA512 d6af12307ebde115c68a0ee758ba4bf5ebdcc250ea74c62d8aa279cb0bc52c3320242781775bc0f25c380045278f58c8c7b84ae0294785923a1ce241b2d66683
 MISC metadata.xml 321 BLAKE2B 700dac90fc3d2d192dce2d3c60453e2c75365a64b092b874f8b049b5c6b587292e5d8cb2b409839621b518a6bd93db364ecb49a729a8903c059988770694f06b SHA512 16b6e111c04de229332ccf3c692d634e1f0fd1d832495e580bd0c5371b220fb07aed2c3ce2391c775b839902099d6bc342d3e190b70ae1ac3f07fdf93fb67077
diff --git a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20180114-r2.ebuild b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..99c5f3d0bc6a
--- /dev/null
+++ b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 165217dc1f47..99c5f3d0bc6a 100644
--- a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-9999.ebuild
+++ b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-calamaris/Manifest b/sec-policy/selinux-calamaris/Manifest
index ab1d52a1d8cc..ada13937d9e3 100644
--- a/sec-policy/selinux-calamaris/Manifest
+++ b/sec-policy/selinux-calamaris/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-calamaris-2.20170805-r2.ebuild 288 BLAKE2B 2d8ee1dacd0168b00acc2d
 EBUILD selinux-calamaris-2.20170805-r3.ebuild 288 BLAKE2B 2d8ee1dacd0168b00acc2dea034b2cf0ad94431a41cfa9a63252fe1c8066661b3f6c6221b78d4b034ce93e01f27f1fac7516bc5208275988665b45826f74b322 SHA512 d6982b3122558254960aa40194dae45b6a42d1f6760bad4c3dcf30a0480646120f7aeb51029c711950a39a71674e426644bddc9c8aa6b53ec4fe28d1f666cd59
 EBUILD selinux-calamaris-2.20170805-r4.ebuild 290 BLAKE2B c2c4454ed2a68e371b3a82e84a464153c190b2fc30584f9791b12a1802e376c8eeece73a06b1523a1edf8b62ed079b066b8b4b8dcb54fb450068df5e5a60016d SHA512 5fd542093da3e601c2ec603ee0b7a38ee6f13c9b2712641d00af7f9365935953953b699d08bfcccc83286060da4d2b1c35700ea2d402c962de7ee32956578f2a
 EBUILD selinux-calamaris-2.20180114-r1.ebuild 288 BLAKE2B aef9467d001fb495a52df303ff85ddf2da57750d8a2add28e1001341a499fa15f5ae4141910bff8d106df978ddac645d56c2a6d6216ffc1a6badcb6db27f8eb1 SHA512 c98a40dd67e9e841572927621bf59b1507f75ffe74e86f8decd5b09268c1603edcb66c40216e33ec23ba80087da95ebe544ff82b534e15104355646b2aaaccf7
-EBUILD selinux-calamaris-9999.ebuild 290 BLAKE2B c2c4454ed2a68e371b3a82e84a464153c190b2fc30584f9791b12a1802e376c8eeece73a06b1523a1edf8b62ed079b066b8b4b8dcb54fb450068df5e5a60016d SHA512 5fd542093da3e601c2ec603ee0b7a38ee6f13c9b2712641d00af7f9365935953953b699d08bfcccc83286060da4d2b1c35700ea2d402c962de7ee32956578f2a
+EBUILD selinux-calamaris-2.20180114-r2.ebuild 290 BLAKE2B 833684e911209f8e1bdc465bb43bc8342ce92d5d18a634069cdf2fe83269f76596b0ec78906fe4143074f246157b355ca9fb2d85f60c5c2cd25250e8ca5a4372 SHA512 a2da855c4791ad9af2a6b83a2c1d55778a575e5c8345ce8b7ca8a769afe20678d99c92e247e9e913a8ea6b9f9bc3df2bca4d0ee9954ea34d55793b948a336f3a
+EBUILD selinux-calamaris-9999.ebuild 290 BLAKE2B 833684e911209f8e1bdc465bb43bc8342ce92d5d18a634069cdf2fe83269f76596b0ec78906fe4143074f246157b355ca9fb2d85f60c5c2cd25250e8ca5a4372 SHA512 a2da855c4791ad9af2a6b83a2c1d55778a575e5c8345ce8b7ca8a769afe20678d99c92e247e9e913a8ea6b9f9bc3df2bca4d0ee9954ea34d55793b948a336f3a
 MISC metadata.xml 319 BLAKE2B 1c58cda4753da502bad82f0f9c99b6cfcd96b33f1c9c89e3470503fc0d93e2dd81940cdeff3d3f4951b4d4d14ada408bb343f900a6a974bb5cd85db6c0034cd5 SHA512 edaf87737833fd3c1d0d956adb41875d96d4dbaa0f0c709c5ca8e7645e1eef616871d7e0b20b5cbd8cbbbe3710d5b694c5436cc0b30e21228fd2e3291d201ea1
diff --git a/sec-policy/selinux-calamaris/selinux-calamaris-2.20180114-r2.ebuild b/sec-policy/selinux-calamaris/selinux-calamaris-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..799409419ec1
--- /dev/null
+++ b/sec-policy/selinux-calamaris/selinux-calamaris-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 01ab06cafe39..799409419ec1 100644
--- a/sec-policy/selinux-calamaris/selinux-calamaris-9999.ebuild
+++ b/sec-policy/selinux-calamaris/selinux-calamaris-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-canna/Manifest b/sec-policy/selinux-canna/Manifest
index f8bca56c6774..b0e8b563b959 100644
--- a/sec-policy/selinux-canna/Manifest
+++ b/sec-policy/selinux-canna/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-canna-2.20170805-r2.ebuild 280 BLAKE2B 94e7982cb8712c8c42f40c4e6f
 EBUILD selinux-canna-2.20170805-r3.ebuild 280 BLAKE2B 94e7982cb8712c8c42f40c4e6f9d92b53b7b648596d32cd992a73439d47a8c6688497615b20de3eb6967cc7792a65f923e46320eacd84b1a68494e4c03f76b04 SHA512 77789ec8872f8e47ee1c1401a91dee93312b371740e95273beb730a22f83ac17af64e638d400c41d09d419a43413740416503f8a358de48a339fc4a6b8ea64d5
 EBUILD selinux-canna-2.20170805-r4.ebuild 282 BLAKE2B 1f32b3225dfb6c3ac4c5b4b2da7c20e00791eb86583ddb70f4aefa186c944d28b82dbcacd0dab795ba600d0602452ae8e56dbeba399a66b1627fd90f81bb2610 SHA512 9212bab3d830a0c4bf5d7209176882dca0d22c335c6aa6f08ba521d94405853971ebe08bd27f245614401ecb7e04e073e0293ccf8157b6df3cddcc338df03f1c
 EBUILD selinux-canna-2.20180114-r1.ebuild 280 BLAKE2B ad564675d7be4f22a700e406a43048dbb0f9d5f781f0adcd965b1c93abc64c639d816bfd9a2c10ef7c27a78d60b8a514bb1c5b59f2e666c5c0c1465a2e1dca7d SHA512 7311537e732176504ed77322c3c95dd68deaa6edfc44cc9465a592b802fa6dba238ccd3c887c6687af9c51c89950b27c3d183a36f07d50d8d18f81b60b334502
-EBUILD selinux-canna-9999.ebuild 282 BLAKE2B 1f32b3225dfb6c3ac4c5b4b2da7c20e00791eb86583ddb70f4aefa186c944d28b82dbcacd0dab795ba600d0602452ae8e56dbeba399a66b1627fd90f81bb2610 SHA512 9212bab3d830a0c4bf5d7209176882dca0d22c335c6aa6f08ba521d94405853971ebe08bd27f245614401ecb7e04e073e0293ccf8157b6df3cddcc338df03f1c
+EBUILD selinux-canna-2.20180114-r2.ebuild 282 BLAKE2B cd6c33c5d85f105506462f16f427bff4f23a36bb6c7a42f4450c6e6dd93cb4fdf0e8e10e1b4ff9afe3556575c94af075b390dd12a4a4651b541a36d83a825a61 SHA512 3611c6a33c1bbbcfea8aeaa63e43e0dff5c39409fcbac66b33cff84ffd95a75078416de12c2c383b0b57a7c927dc4d77c5481105b8c9c35e5b3613e86aaa5df8
+EBUILD selinux-canna-9999.ebuild 282 BLAKE2B cd6c33c5d85f105506462f16f427bff4f23a36bb6c7a42f4450c6e6dd93cb4fdf0e8e10e1b4ff9afe3556575c94af075b390dd12a4a4651b541a36d83a825a61 SHA512 3611c6a33c1bbbcfea8aeaa63e43e0dff5c39409fcbac66b33cff84ffd95a75078416de12c2c383b0b57a7c927dc4d77c5481105b8c9c35e5b3613e86aaa5df8
 MISC metadata.xml 315 BLAKE2B 675fbadeb697d9af143ccec9b334e5f7f44effe1a0f6a05e1f05b9a5f6d763e13930c294169a8ff912f324ff463d218a0737a49b36facace2fdb4b8b07f388c5 SHA512 e769ff18487231316820a744d1567208e4ed3d329e1eb7ddabdaece562292189ac0486732261c737339d40687019319baccc52ddfa2a99b2a75cde4a4b450ee9
diff --git a/sec-policy/selinux-canna/selinux-canna-2.20180114-r2.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..33f018f5f6ce
--- /dev/null
+++ b/sec-policy/selinux-canna/selinux-canna-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 82d4746419dd..33f018f5f6ce 100644
--- a/sec-policy/selinux-canna/selinux-canna-9999.ebuild
+++ b/sec-policy/selinux-canna/selinux-canna-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-ccs/Manifest b/sec-policy/selinux-ccs/Manifest
index 09ed092f518c..c3172159afae 100644
--- a/sec-policy/selinux-ccs/Manifest
+++ b/sec-policy/selinux-ccs/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-ccs-2.20170805-r2.ebuild 276 BLAKE2B c1417e3bee7cedcf5ae93a16b108
 EBUILD selinux-ccs-2.20170805-r3.ebuild 276 BLAKE2B c1417e3bee7cedcf5ae93a16b108449d5d3326aa15e44faa785d5c0f25a5713dbe4544434446c293dab71a27e9b2b9662c5f4e81c5fc8dc88c7c69e9f88bad6d SHA512 74c3e230e63410c78b467910cd2ece14175fdc81326c4b422b9f27fb7b2c22e5ac8e90b1caccf88481c41b81799ba67871b7f2129ba36ba79587716a99322618
 EBUILD selinux-ccs-2.20170805-r4.ebuild 278 BLAKE2B 7a0de4d4509eee1580681de9e740b7fb57f2d6c37815b0e96874f241856c6fd1e95cbe6a63a1083c2e37a01a9921485b4fc6604aab8bbe702826316508f7f165 SHA512 8e6bf6e263393257e88a758c5ba401fc3637b0345921daa44d09bac915c8ede3050f6d655dd84b66d5b587514b0f2b192c43aa90793055dea0dc0db78088d4cb
 EBUILD selinux-ccs-2.20180114-r1.ebuild 276 BLAKE2B e562c570e9702ac268adcedd405b99475f01efb1ad285ef35c1703d86fb7cc16aeceb516df10722d2b23dbd42cb95c53808e1fea1e9b740debeb580e9026d9e0 SHA512 21da52d677cb06fc1b55543634d227b29eb859580ec6ba99f77f44c6d699a5708836d5beccfd2ce388403ab750b779e1ffae560ac7eb981e0ffa57061fb0b57c
-EBUILD selinux-ccs-9999.ebuild 278 BLAKE2B 7a0de4d4509eee1580681de9e740b7fb57f2d6c37815b0e96874f241856c6fd1e95cbe6a63a1083c2e37a01a9921485b4fc6604aab8bbe702826316508f7f165 SHA512 8e6bf6e263393257e88a758c5ba401fc3637b0345921daa44d09bac915c8ede3050f6d655dd84b66d5b587514b0f2b192c43aa90793055dea0dc0db78088d4cb
+EBUILD selinux-ccs-2.20180114-r2.ebuild 278 BLAKE2B a57b60f43d4fb5bb2b0998ddf1c9dc3e8e1b4cb8b4b1f74258a1d1df53081d398586469909bea6d32300ebbdb0d98ef29219df46cf6c01fadab609e968c07112 SHA512 be1029eddc622842c8ba7bd6fbc66385d546025ceb6dd6de5538fe0c7f8623fe58c1f9aaf38a699d4a545cfbfa219eb49e824711f49af757c9669c45b49222be
+EBUILD selinux-ccs-9999.ebuild 278 BLAKE2B a57b60f43d4fb5bb2b0998ddf1c9dc3e8e1b4cb8b4b1f74258a1d1df53081d398586469909bea6d32300ebbdb0d98ef29219df46cf6c01fadab609e968c07112 SHA512 be1029eddc622842c8ba7bd6fbc66385d546025ceb6dd6de5538fe0c7f8623fe58c1f9aaf38a699d4a545cfbfa219eb49e824711f49af757c9669c45b49222be
 MISC metadata.xml 313 BLAKE2B 97e2ffbb66364d5710045e11689425c4a307ec5f8900bf999db57142d704a302658558d087c03ed499dd40d99138d7d44447614de2ea358373d0582c30676323 SHA512 be700477be516907f457fa88bce00b34cb30c8ba470736e40f8cb180c1c8e19ad8888df8e45d41c0d283dad0396ccea00477026222a5cf2936bc4f82b6261ac6
diff --git a/sec-policy/selinux-ccs/selinux-ccs-2.20180114-r2.ebuild b/sec-policy/selinux-ccs/selinux-ccs-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..40dac97d118c
--- /dev/null
+++ b/sec-policy/selinux-ccs/selinux-ccs-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 f9d2983ed2dc..40dac97d118c 100644
--- a/sec-policy/selinux-ccs/selinux-ccs-9999.ebuild
+++ b/sec-policy/selinux-ccs/selinux-ccs-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-cdrecord/Manifest b/sec-policy/selinux-cdrecord/Manifest
index 5b9a0109a073..0fd0d6324378 100644
--- a/sec-policy/selinux-cdrecord/Manifest
+++ b/sec-policy/selinux-cdrecord/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-cdrecord-2.20170805-r2.ebuild 286 BLAKE2B 1ccf10d12cb1c19b1e5e0c9
 EBUILD selinux-cdrecord-2.20170805-r3.ebuild 286 BLAKE2B 1ccf10d12cb1c19b1e5e0c9665159d8ea0c72aea51efdbc3723618e8c5982e1e9ed229cc40ba3684a6fd2f8e90029b0380310c16e0fc483cdeee158174f04dde SHA512 7532c3c1a208bb37d9285352ee799265f01d73023759db09ee7da9928520c60503404c0ae981813290009892992241424440e82e25d109e01a92f92d368baa2d
 EBUILD selinux-cdrecord-2.20170805-r4.ebuild 288 BLAKE2B 9cfd512241d531b51a76eafbcebe228488d6f0a3ec418b64d9d9a8b438a76e91de0912b17a518f59cf82ad198e3c3918ff6587eb2af55dae3db4734d6e33caf2 SHA512 846af34522a894e474feb5d7a4c63e9189ac357a497c1212051cb8139d6016efbd5d094b3480fae3219c056449ba607e5f5087cca6fd6aeb6d0ceeb26fb81fbd
 EBUILD selinux-cdrecord-2.20180114-r1.ebuild 286 BLAKE2B a655817ed4d6489efaa650f118ad32585d068d50bddfd2c63456484155cba5412d1995550c2a2228844cd004f20534b504f93a20b12fcb198e032973a3419153 SHA512 54b304b0fd2a688b5a353654411ff69cff5e80609736740e90f2a37e23190d2171def5ec561e2a84e4875399e225856f7730a6058207ed022f6fe72603bf8122
-EBUILD selinux-cdrecord-9999.ebuild 288 BLAKE2B 9cfd512241d531b51a76eafbcebe228488d6f0a3ec418b64d9d9a8b438a76e91de0912b17a518f59cf82ad198e3c3918ff6587eb2af55dae3db4734d6e33caf2 SHA512 846af34522a894e474feb5d7a4c63e9189ac357a497c1212051cb8139d6016efbd5d094b3480fae3219c056449ba607e5f5087cca6fd6aeb6d0ceeb26fb81fbd
+EBUILD selinux-cdrecord-2.20180114-r2.ebuild 288 BLAKE2B a0f82c8611e6ec46cea0c033cce7987b5521b229f7e3eebda8445d0a0c4ed1d0387ef6488ddec3c4f66abab5a52aabd94f4cebd4e49a14a6a7cf9fa737a293ca SHA512 b7809930e9331ed04991ed644f2d35a62499ece03cc4abee1658b54aeb5a1343c7107f0591dd2fb5aa9239f67c7b9d4a47b40ac3462c378e22f16ec8d282a760
+EBUILD selinux-cdrecord-9999.ebuild 288 BLAKE2B a0f82c8611e6ec46cea0c033cce7987b5521b229f7e3eebda8445d0a0c4ed1d0387ef6488ddec3c4f66abab5a52aabd94f4cebd4e49a14a6a7cf9fa737a293ca SHA512 b7809930e9331ed04991ed644f2d35a62499ece03cc4abee1658b54aeb5a1343c7107f0591dd2fb5aa9239f67c7b9d4a47b40ac3462c378e22f16ec8d282a760
 MISC metadata.xml 318 BLAKE2B 277095870372899df6eed127113b9efe82a78ffe2d03b8df09e32ef4dd23287d291e573e65f14f903279d931393ebe2f903115228cb0f2f34763c090cfe1af45 SHA512 c2a9030ca10cf81b9eb40957e99c3dd31bef004c7bf94da5bef7013ca32a224e65e21a6ccb93b91db873b5b9b68e3aa482e332c870976920e5939c83266d182a
diff --git a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20180114-r2.ebuild b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..a7f9587a269c
--- /dev/null
+++ b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 ba2c56444f42..a7f9587a269c 100644
--- a/sec-policy/selinux-cdrecord/selinux-cdrecord-9999.ebuild
+++ b/sec-policy/selinux-cdrecord/selinux-cdrecord-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-ceph/Manifest b/sec-policy/selinux-ceph/Manifest
index ed9e9ffdb637..c9aa85242603 100644
--- a/sec-policy/selinux-ceph/Manifest
+++ b/sec-policy/selinux-ceph/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-ceph-2.20170805-r2.ebuild 278 BLAKE2B 62241c123f0797e392a41bea0b5
 EBUILD selinux-ceph-2.20170805-r3.ebuild 278 BLAKE2B 62241c123f0797e392a41bea0b5ee19939132d93772c37a948d7c6057e0a858f9cfc2167eac0567ec1f4cce30471739b521291fea7660250c5df0f87c1733411 SHA512 c2428f63e72b3ccb9060bdbec6ebd5f8d67eace8d59a2c8aa307db496d568e644c5b0522245c61ab5271a23990a2b6ad21205872395cc02bee2d674cbee7787a
 EBUILD selinux-ceph-2.20170805-r4.ebuild 280 BLAKE2B 8b6f7b2d1778a6973cecbfd0d91b92d3eda3902c1614822e230aece1e7e63570f8a624322587230714322d2be129de895e15345e205d9c679e9c8912ea25078d SHA512 f1eedf0cdc4c5bbcdc216c17acc7ab3e09444d59b08b3ccbb4e353357f48b2551c3f5842e1f6a3abcec87789963ff94fc3442d3338ba098032e26e9b68e53cb7
 EBUILD selinux-ceph-2.20180114-r1.ebuild 278 BLAKE2B 1f4b71dd5360e8ad36f0b7783b26c759488ea3759b58c0e2e6e9b89bf03f274c110a5ec762236dce043818560e8af5b2cb5dc81fd9bb7534bc4b161e56a6f9c9 SHA512 04ba5035c523192f8bd3e4ffcc8b632ea4850f27606627773e600c438267530533f5077fe088b708e5930d514f09dbd1ebd77ace14db724a8a1b50481177d29d
-EBUILD selinux-ceph-9999.ebuild 280 BLAKE2B 8b6f7b2d1778a6973cecbfd0d91b92d3eda3902c1614822e230aece1e7e63570f8a624322587230714322d2be129de895e15345e205d9c679e9c8912ea25078d SHA512 f1eedf0cdc4c5bbcdc216c17acc7ab3e09444d59b08b3ccbb4e353357f48b2551c3f5842e1f6a3abcec87789963ff94fc3442d3338ba098032e26e9b68e53cb7
+EBUILD selinux-ceph-2.20180114-r2.ebuild 280 BLAKE2B 515062d2dfd2e00ea39c18322945321f5d6f9ce90a307881835610268c7393d943be1109364adbc06f272b932f9c1b004d54aeeb7dd328a374e2d17d64738c2c SHA512 cc81cc3538ed2f410c749042dc176741402d3df9fbae1c39d9d1511790f42250419d499e080fe6bb75a8666386b1ec7dae55a47bff04d008f4ee82b42c56a6db
+EBUILD selinux-ceph-9999.ebuild 280 BLAKE2B 515062d2dfd2e00ea39c18322945321f5d6f9ce90a307881835610268c7393d943be1109364adbc06f272b932f9c1b004d54aeeb7dd328a374e2d17d64738c2c SHA512 cc81cc3538ed2f410c749042dc176741402d3df9fbae1c39d9d1511790f42250419d499e080fe6bb75a8666386b1ec7dae55a47bff04d008f4ee82b42c56a6db
 MISC metadata.xml 314 BLAKE2B 444357eaf7e8b989ecb2a74f717c3f8ded048ad87bc3288008b8beb86bb6ae7d5e5c8a06c1e0e2b927b1b3de2b55876672e8ab55cf01d1bc4c432e47291234c8 SHA512 d3e9c09959bfad3e2f60aa141354eac5cdbdee34df07f06c04a6af6564b1ad8396d2f220eadf6c7c883ee0e33c755537f0adfc2ec1039bb61b0ec90a9d07d282
diff --git a/sec-policy/selinux-ceph/selinux-ceph-2.20180114-r2.ebuild b/sec-policy/selinux-ceph/selinux-ceph-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..760e26def4d1
--- /dev/null
+++ b/sec-policy/selinux-ceph/selinux-ceph-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 99d200867dfb..760e26def4d1 100644
--- a/sec-policy/selinux-ceph/selinux-ceph-9999.ebuild
+++ b/sec-policy/selinux-ceph/selinux-ceph-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-cgmanager/Manifest b/sec-policy/selinux-cgmanager/Manifest
index 324be5f38e7d..0625e6876b51 100644
--- a/sec-policy/selinux-cgmanager/Manifest
+++ b/sec-policy/selinux-cgmanager/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-cgmanager-2.20170805-r2.ebuild 288 BLAKE2B 1757c4714ade3cf646ce5a
 EBUILD selinux-cgmanager-2.20170805-r3.ebuild 288 BLAKE2B 1757c4714ade3cf646ce5ae14fb298f2363802a8707b5d7208685ee1894fba1298b6c3737c1c64ca4fdad0a6f2222ad01ca7c1968fc8e0feb06da9e7a22c33bb SHA512 9e267f92f7b77c4a9fcad86e54f9b2592a42b6cb2c8b27fedaf2d236db427a376e5c0490d3b0d39927ef4ff4a89943534b04af65efb75650f62cf2bf89a83ba6
 EBUILD selinux-cgmanager-2.20170805-r4.ebuild 290 BLAKE2B a939a2bf8dc1cfb842e0f404606a77d8d7bcbbb96fd07d83116ac46b068767d312cb97a8d2ffebe58af457c34f503cd8f046517f2443702fcbccb11a7728f972 SHA512 e9c75fb1fc3721cd04dc8e4994e83458301be804ec2cda723ccac0ab42d9bd63d1b7958bcdc9cfbeb3f714941af3ca855164419403c9d2519c93ba47c20648cd
 EBUILD selinux-cgmanager-2.20180114-r1.ebuild 288 BLAKE2B 28806ba59e461f6d2e7da6460d86c42d09b6aced9244fdfd2d11d7082b69d0cf0d571c5820581833dd68a625d3a0dcc08fa4c6d44e06d0355ed5e3472ef86e5d SHA512 972f7abfffd1024c57d6aa10aaccafa473a8758a59af9ebfe29630bf66c8dfd344b82f17f47da90f4f175bfe2c167311e674a04f745ce5c7b127a369988f674f
-EBUILD selinux-cgmanager-9999.ebuild 290 BLAKE2B a939a2bf8dc1cfb842e0f404606a77d8d7bcbbb96fd07d83116ac46b068767d312cb97a8d2ffebe58af457c34f503cd8f046517f2443702fcbccb11a7728f972 SHA512 e9c75fb1fc3721cd04dc8e4994e83458301be804ec2cda723ccac0ab42d9bd63d1b7958bcdc9cfbeb3f714941af3ca855164419403c9d2519c93ba47c20648cd
+EBUILD selinux-cgmanager-2.20180114-r2.ebuild 290 BLAKE2B 04d2aadb6503b435bde2dce583c5231db9a2eb4b3bce50275510b38e125e9bc22fd78b3832ed9f128f769cf11867e72a6d6877e952b55adae2c24a181fdaa9b7 SHA512 f1e7b90885b666767e70cc49cee1e7eb5d9b2010b34e43a805509796d009f236f3a013463f61616136df39a5469316beb62785f41cc678db7a325110a7eeb058
+EBUILD selinux-cgmanager-9999.ebuild 290 BLAKE2B 04d2aadb6503b435bde2dce583c5231db9a2eb4b3bce50275510b38e125e9bc22fd78b3832ed9f128f769cf11867e72a6d6877e952b55adae2c24a181fdaa9b7 SHA512 f1e7b90885b666767e70cc49cee1e7eb5d9b2010b34e43a805509796d009f236f3a013463f61616136df39a5469316beb62785f41cc678db7a325110a7eeb058
 MISC metadata.xml 338 BLAKE2B 5ead11f88099181dfac530eae53a88d027fcd0b989adaef605f55c7a131e83ed4e581ae90ae0c6334c37f7c81fadf4cca50215e2d7321b9204b7b3f9783260bb SHA512 94f4ae40489fd875bd8c5fd8e57c5e103909205e1cc872e706d44192eb045c646b9f8f5225acd74eac0f10cdcf06a8c30a9e0d8305d6913666ecf780e40faeb8
diff --git a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20180114-r2.ebuild b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..4e076e8694ad
--- /dev/null
+++ b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 b04b419ed7ec..4e076e8694ad 100644
--- a/sec-policy/selinux-cgmanager/selinux-cgmanager-9999.ebuild
+++ b/sec-policy/selinux-cgmanager/selinux-cgmanager-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-cgroup/Manifest b/sec-policy/selinux-cgroup/Manifest
index 3e7b3974f189..80d4a01f8408 100644
--- a/sec-policy/selinux-cgroup/Manifest
+++ b/sec-policy/selinux-cgroup/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-cgroup-2.20170805-r2.ebuild 282 BLAKE2B 4a19d07d80464f2ecd5aefc5f
 EBUILD selinux-cgroup-2.20170805-r3.ebuild 282 BLAKE2B 4a19d07d80464f2ecd5aefc5ffefbfefbe5d063f0142ca29de1ed9ab5c37e7dc4ac85f162920f28fde1a70cfaa485fbf06a264435f2e30f6e9c5ca0bc768ddc2 SHA512 fdf21dca57bede74f9a8222a42959bcc41107b01e4b28f65aa4a1c5ed55005677311ab3b4ba972cb32eabfd432930c3e9dee72231b9d2b85d058a84b666ec189
 EBUILD selinux-cgroup-2.20170805-r4.ebuild 284 BLAKE2B d47bc1b8187115063f6e88f3890ad48744f2880e76a8d4cf9d7a42ca4858ea2a02dfdb50c411471c6ee6b0041a3011f930515e6a08ed64862eda80e4729d65ff SHA512 fae06d6e543a4fa116cfa4429057b95eaa225372bbd50ed5dc8c285b69c6278f229dbf4e78cef2ade12b8b81ec901ed8aa3eb906b7dbcbf54abcfee3452a2e1f
 EBUILD selinux-cgroup-2.20180114-r1.ebuild 282 BLAKE2B 6e9dfb1c9edb4126bffeb9cb0810ad2e29639f5cd802c85a9280685a5061d4af8cae9085829dbbd7daa9d6ff3d544833b1070f1ae4933184d0665e0ab3bb84e4 SHA512 b5e64f9e745d4d7def776dd8182b9d05b5d707b553d3c3bc05a4daf5d78e1891e839ec235405eb6fb7dc255fd9c7609bda82a028abb37abc93373fa62e0fc8c1
-EBUILD selinux-cgroup-9999.ebuild 284 BLAKE2B d47bc1b8187115063f6e88f3890ad48744f2880e76a8d4cf9d7a42ca4858ea2a02dfdb50c411471c6ee6b0041a3011f930515e6a08ed64862eda80e4729d65ff SHA512 fae06d6e543a4fa116cfa4429057b95eaa225372bbd50ed5dc8c285b69c6278f229dbf4e78cef2ade12b8b81ec901ed8aa3eb906b7dbcbf54abcfee3452a2e1f
+EBUILD selinux-cgroup-2.20180114-r2.ebuild 284 BLAKE2B cc4285d28ed38140b4d7667e419cd7a96c51dca187cac3a110385667844ea8ad5ed6e1cb64932dc1f6d997a583339fff2e1922785aec4013646a3f4fee306f06 SHA512 1812648d5d437d71d02f80147dcae8aec7b305b63a2395451d16c77a5d71622045b14ea2e375b7729c5870f6089f3c75443219d736b41e813a481063701bb664
+EBUILD selinux-cgroup-9999.ebuild 284 BLAKE2B cc4285d28ed38140b4d7667e419cd7a96c51dca187cac3a110385667844ea8ad5ed6e1cb64932dc1f6d997a583339fff2e1922785aec4013646a3f4fee306f06 SHA512 1812648d5d437d71d02f80147dcae8aec7b305b63a2395451d16c77a5d71622045b14ea2e375b7729c5870f6089f3c75443219d736b41e813a481063701bb664
 MISC metadata.xml 316 BLAKE2B 4ab37a97ff87330a7bfa17880a37f1895b75c1efe830484da145380ada7229f44a7fb5fb58c1018afd66502059ae05ef8b8cd5407cdb107af66da769f96129b5 SHA512 5f6f16a1e6e45cc3483dda299489e6cb5ef903f60d2a9831e234bac9bcff876dcf382a51ba0151905bb876053339ec95802298838f22821bee7c3b3f4cdb1bda
diff --git a/sec-policy/selinux-cgroup/selinux-cgroup-2.20180114-r2.ebuild b/sec-policy/selinux-cgroup/selinux-cgroup-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..885e7b0cb6d5
--- /dev/null
+++ b/sec-policy/selinux-cgroup/selinux-cgroup-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 48e62f2483f0..885e7b0cb6d5 100644
--- a/sec-policy/selinux-cgroup/selinux-cgroup-9999.ebuild
+++ b/sec-policy/selinux-cgroup/selinux-cgroup-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-chromium/Manifest b/sec-policy/selinux-chromium/Manifest
index 6b62f1d78d8c..d914ece79450 100644
--- a/sec-policy/selinux-chromium/Manifest
+++ b/sec-policy/selinux-chromium/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-chromium-2.20170805-r2.ebuild 389 BLAKE2B ef6f6809a67a2e9be96981a
 EBUILD selinux-chromium-2.20170805-r3.ebuild 389 BLAKE2B ef6f6809a67a2e9be96981ac9c1a10ad0178f502dc7b53150b7f8a4557d291294992c6164777c37e875a602e850f1f6b46c884dcd05fbeffe34d7826a457c13e SHA512 7d3928d5fbe50c3ebd0f753c8d4c4825e14e193da09f6790d98b88b3ffa9a1cfdf3d9df9f022edd975ea70fab37b9e33bd8bbe913a9e8d1a1efac8ab2c38c2bd
 EBUILD selinux-chromium-2.20170805-r4.ebuild 391 BLAKE2B 317c2ee51f71fd029a60786c191cca3fd17759df799cf75877863b471c704de552939457843bed1e98d67f98a8d15d50c04831a16685e32662b852508afb4cb2 SHA512 882fcdb7998ea5a014dd71be392ab9e918187e0c6e8394a8df5a877edbed748ffee214457997949d94557541f9f953d12d46c7e374aea6c8b8ec3bdd14697258
 EBUILD selinux-chromium-2.20180114-r1.ebuild 389 BLAKE2B a20f32218542a567a3867f96930eddfb03f4bd70e71793610be110b46ea1caf58cec992a74bfed51f9798493f2f639512defa8dde5bb30a2965a01444f2beb36 SHA512 a3e1aa5dffd88f5164780c040d4ff922fcb209e2a44e90397f1e42ca0972c14e9ca5c0a2e1b7b778fafed6ad5870555ef2180b85135fd075cd7533ef627f8672
-EBUILD selinux-chromium-9999.ebuild 391 BLAKE2B 317c2ee51f71fd029a60786c191cca3fd17759df799cf75877863b471c704de552939457843bed1e98d67f98a8d15d50c04831a16685e32662b852508afb4cb2 SHA512 882fcdb7998ea5a014dd71be392ab9e918187e0c6e8394a8df5a877edbed748ffee214457997949d94557541f9f953d12d46c7e374aea6c8b8ec3bdd14697258
+EBUILD selinux-chromium-2.20180114-r2.ebuild 391 BLAKE2B 0811eaa7be1569e0ea4bd5240785dabfefe32d8d88b1b73c666a474d5d871385af220f276146c3e30aa427de0e535534b1d229242ca5c8179ae6aadfcdb30771 SHA512 5e2efd8292ecb3d2adf21b7d86c85b2211e6e0e7768e6e2ece55ded6ec44ef40c8d4c63732de21554cfd1ed63f8fd60cdbfed437f62d8d2876af8ebb69473656
+EBUILD selinux-chromium-9999.ebuild 391 BLAKE2B 0811eaa7be1569e0ea4bd5240785dabfefe32d8d88b1b73c666a474d5d871385af220f276146c3e30aa427de0e535534b1d229242ca5c8179ae6aadfcdb30771 SHA512 5e2efd8292ecb3d2adf21b7d86c85b2211e6e0e7768e6e2ece55ded6ec44ef40c8d4c63732de21554cfd1ed63f8fd60cdbfed437f62d8d2876af8ebb69473656
 MISC metadata.xml 318 BLAKE2B c7ed04aeaf5f0bdf6fef164f5fbbda80e2479f25fc6abbb505e8ebd1d29f05b505594a4e6ebf3c9662d5d1e5aff01755842ae22a155a1f4e3950fe7257ac781a SHA512 35a3ae361b20adc58424c078918cfb959fb4ed36ec73789d171ae30628b37da1444f9a028138a56aa6d3cb5605ecdaa48695bc8608dc0df54647492c07c88846
diff --git a/sec-policy/selinux-chromium/selinux-chromium-2.20180114-r2.ebuild b/sec-policy/selinux-chromium/selinux-chromium-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..1698c89c8ec8
--- /dev/null
+++ b/sec-policy/selinux-chromium/selinux-chromium-2.20180114-r2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 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 385e71fce9da..1698c89c8ec8 100644
--- a/sec-policy/selinux-chromium/selinux-chromium-9999.ebuild
+++ b/sec-policy/selinux-chromium/selinux-chromium-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-chronyd/Manifest b/sec-policy/selinux-chronyd/Manifest
index af4edbba3850..a484bd22d40e 100644
--- a/sec-policy/selinux-chronyd/Manifest
+++ b/sec-policy/selinux-chronyd/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-chronyd-2.20170805-r2.ebuild 284 BLAKE2B 95d3db4142d7bc33c330f0c3
 EBUILD selinux-chronyd-2.20170805-r3.ebuild 284 BLAKE2B 95d3db4142d7bc33c330f0c3c9d18edf38ba32aa3555333e96eba263bbfa739a94f9c3459ae294abdec241e677b43b773dc2cc273f06764471c8b9571362343a SHA512 35ce841f97a197fb78648d25be1a188670424cb07ecc1a20682a70004fc16fdc33bd60190e4d0228de12edf4ac52f42fba3b03dfc80a8aa7527c39724331604a
 EBUILD selinux-chronyd-2.20170805-r4.ebuild 286 BLAKE2B 00e224a83948231660657bf20dbc3f886ac7e95a9e37a90b1636ce3cf5cd7af5547d3728762b5210ff8764ee70c272e6ae8c4c0ca955b2288e5e6215b5b56120 SHA512 f53c87cfa595925f0b6f109bf91632184be76b1fe0c7a7ed5086963646b9c74ace1a7d4725ba357f7eeef77a7f9dc7d89af8308ad423b24019cc35c13198acbe
 EBUILD selinux-chronyd-2.20180114-r1.ebuild 284 BLAKE2B e6069ef348e76b69b567dafca2a8a09a5503cdd8a49c516bbc17065cd63671a2e1f24dd1fff1df61002c868524842b22444d557f438fc91ef400b86f441219e4 SHA512 c94af3b3d93cfe14dcddae87ffcc329439c370f3332a24321c6e5c4b4ce177b767be048858f47f177008eda53452c4301d14d25045dfcca0b13045c240c10148
-EBUILD selinux-chronyd-9999.ebuild 286 BLAKE2B 00e224a83948231660657bf20dbc3f886ac7e95a9e37a90b1636ce3cf5cd7af5547d3728762b5210ff8764ee70c272e6ae8c4c0ca955b2288e5e6215b5b56120 SHA512 f53c87cfa595925f0b6f109bf91632184be76b1fe0c7a7ed5086963646b9c74ace1a7d4725ba357f7eeef77a7f9dc7d89af8308ad423b24019cc35c13198acbe
+EBUILD selinux-chronyd-2.20180114-r2.ebuild 286 BLAKE2B 7cb3bd180866d62e0a850b9029657b585a0d16365f091e3130c832719218df3efcd518a9640e019d891ce34424ec8d1f471138c1c8ec73d063da22677922763b SHA512 9da5b0fdbf270940c3e9eb511ed393f36a28bf3c29eef4d8f6b0e462feed5d75d670b9739cfef15c09ffa170eb3abe387e75fc44e16c0cf01f4042873cf6d7b1
+EBUILD selinux-chronyd-9999.ebuild 286 BLAKE2B 7cb3bd180866d62e0a850b9029657b585a0d16365f091e3130c832719218df3efcd518a9640e019d891ce34424ec8d1f471138c1c8ec73d063da22677922763b SHA512 9da5b0fdbf270940c3e9eb511ed393f36a28bf3c29eef4d8f6b0e462feed5d75d670b9739cfef15c09ffa170eb3abe387e75fc44e16c0cf01f4042873cf6d7b1
 MISC metadata.xml 317 BLAKE2B 76b647d80d58d09d093b0e1f60ad302e332fdd9af4ebb7b6b9a089b49944a88e27f63312ea4bdce1ac753d55d448e8b977eee9e19a4ebb233b158caaff0d7a87 SHA512 567ce0e458597f415e01f706a700f210e033acf7887684adc26a51f57e8587a6b48a74c75cee937d0a69123ad4884a0e1e889a5227989681349564f9d02b4c85
diff --git a/sec-policy/selinux-chronyd/selinux-chronyd-2.20180114-r2.ebuild b/sec-policy/selinux-chronyd/selinux-chronyd-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..1d020ca13aec
--- /dev/null
+++ b/sec-policy/selinux-chronyd/selinux-chronyd-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 e8394421bf40..1d020ca13aec 100644
--- a/sec-policy/selinux-chronyd/selinux-chronyd-9999.ebuild
+++ b/sec-policy/selinux-chronyd/selinux-chronyd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-clamav/Manifest b/sec-policy/selinux-clamav/Manifest
index a165edec921b..483818772c6c 100644
--- a/sec-policy/selinux-clamav/Manifest
+++ b/sec-policy/selinux-clamav/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-clamav-2.20170805-r2.ebuild 282 BLAKE2B 5023017e38f6b3dc8542a6355
 EBUILD selinux-clamav-2.20170805-r3.ebuild 282 BLAKE2B 5023017e38f6b3dc8542a6355672a428be0ba55f812c6832328b1d66087582500779d079e7d109c819dac4aa4f5e25ee006faaa11584ca238bf0bf93d498d2da SHA512 e5d6609195b663d687284b407d044aa1fadaf8057d29cc58cd10270b9a73871da92802b94eddb0db6535109aa3b45d48972e32c202771f375f4f2c7fea90d3f2
 EBUILD selinux-clamav-2.20170805-r4.ebuild 284 BLAKE2B cf30bf14d41ba78fb41c20aca0c4d6c247b668612d58117bb6cd555dd52b4c8848e659d31754209a01daf7f1f8ad5db311d913b70b1bab9efa1fa5db90bcf2ef SHA512 41181ad8ee7b2b5cdda4c31ceab788339e52d70dd878ef8a8e76f4f2b9b673ad8175b5edb98e558b49af36c027d48f7eb09449f63fca011eba4d44537a841124
 EBUILD selinux-clamav-2.20180114-r1.ebuild 282 BLAKE2B e18889feac7dd3529792f26fb755f41da855ca5ca8705dace198026a65934066a1ad13ae939f14959b7add23fefc0fe3a0806e49d3fe218a9fd303001676e7bd SHA512 24fc90e7ffd53cc5cf024d63c6a4c5810fe290bd0643521e44bb8435b8161306a79615c40e48d9ad7f890a0ba985cf6011f73ec9521c732c14e14be7d8772b1a
-EBUILD selinux-clamav-9999.ebuild 284 BLAKE2B cf30bf14d41ba78fb41c20aca0c4d6c247b668612d58117bb6cd555dd52b4c8848e659d31754209a01daf7f1f8ad5db311d913b70b1bab9efa1fa5db90bcf2ef SHA512 41181ad8ee7b2b5cdda4c31ceab788339e52d70dd878ef8a8e76f4f2b9b673ad8175b5edb98e558b49af36c027d48f7eb09449f63fca011eba4d44537a841124
+EBUILD selinux-clamav-2.20180114-r2.ebuild 284 BLAKE2B 75c9ccea4ffd8630ec4995dc438fb6095aa14f638eeb66a4540e0c17b983e16f307e9cd37f5baa83da8140283b882bc48d9c94ba46d23ec509e4d04a32d8d3e6 SHA512 ea510ad0d8b2de946442a7b710f08f4fe89bf40988a533b233538b1bae06a5bed951d4670716c0ce87cfce45a1976c913c4735fc5d2df4694a491167188eb986
+EBUILD selinux-clamav-9999.ebuild 284 BLAKE2B 75c9ccea4ffd8630ec4995dc438fb6095aa14f638eeb66a4540e0c17b983e16f307e9cd37f5baa83da8140283b882bc48d9c94ba46d23ec509e4d04a32d8d3e6 SHA512 ea510ad0d8b2de946442a7b710f08f4fe89bf40988a533b233538b1bae06a5bed951d4670716c0ce87cfce45a1976c913c4735fc5d2df4694a491167188eb986
 MISC metadata.xml 316 BLAKE2B 7960e2c8f85fde2ce87b6ec978f64ceca50c7a5135187a01b2c6ead802b564e02d64f458fc12cacf7a848820c0acebe044cf4bdb79f10471391a4c6e4339e0af SHA512 f1979723a6f2267cb7614e961f3af14fb84e05912d27c2a153695abb993c4d406c9558c12a3cc1ea1e44b7592dcbdf28573708fcb27cf5defa0608c58f00fbd7
diff --git a/sec-policy/selinux-clamav/selinux-clamav-2.20180114-r2.ebuild b/sec-policy/selinux-clamav/selinux-clamav-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..e65376ea36cd
--- /dev/null
+++ b/sec-policy/selinux-clamav/selinux-clamav-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 cc2182e6c321..e65376ea36cd 100644
--- a/sec-policy/selinux-clamav/selinux-clamav-9999.ebuild
+++ b/sec-policy/selinux-clamav/selinux-clamav-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-clockspeed/Manifest b/sec-policy/selinux-clockspeed/Manifest
index d3c9ada4a3e7..638640407db0 100644
--- a/sec-policy/selinux-clockspeed/Manifest
+++ b/sec-policy/selinux-clockspeed/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-clockspeed-2.20170805-r2.ebuild 290 BLAKE2B ec0d460e547f3ed488ebe
 EBUILD selinux-clockspeed-2.20170805-r3.ebuild 290 BLAKE2B ec0d460e547f3ed488ebeff207a44b0cdccb5367dd3824836a189d0826cb659850201f8e1f7d8c24257bbd63680e638f0aae86af91922be908a86108dc93a352 SHA512 23566f25eac5ec927aa59e9159e5c0e58704870aa2b0055c225165c52b0ff6d12031ca6c7a7624179f3e150289ec478c97da243351c36570b10de68843a9505b
 EBUILD selinux-clockspeed-2.20170805-r4.ebuild 292 BLAKE2B 5b634ea995b14eaadd5119605d56939af0db9922f5c374c5bfa1624e8c6862a78b2571c66409c0b2bd9f9b134df76a45b84b4ce7b52cf5432ac6ec061f99f348 SHA512 661ac8ce4cfd795057a4991c4a733004801eda5c68819c7551a0b1a68962ff8163e38c9d17a0b4e1b68372f6055a287e06dea4a25f461e9695e8e54494135c1c
 EBUILD selinux-clockspeed-2.20180114-r1.ebuild 290 BLAKE2B 3417ae6ca0e663b3e0b16859783f81b005432eb38409898bea8a8271878a859c9b8cc5cd41399566b4e8e2a93f8389a5ca366b845847a495b1bfe365184825c9 SHA512 85519cc204421fe74f05ecb37eeba085c566e9cf6377c51bac7b54db83f3a84f241ec924d7d37eb0924e9b43990a8f8765067e424af930f7aadcd11787541f09
-EBUILD selinux-clockspeed-9999.ebuild 292 BLAKE2B 5b634ea995b14eaadd5119605d56939af0db9922f5c374c5bfa1624e8c6862a78b2571c66409c0b2bd9f9b134df76a45b84b4ce7b52cf5432ac6ec061f99f348 SHA512 661ac8ce4cfd795057a4991c4a733004801eda5c68819c7551a0b1a68962ff8163e38c9d17a0b4e1b68372f6055a287e06dea4a25f461e9695e8e54494135c1c
+EBUILD selinux-clockspeed-2.20180114-r2.ebuild 292 BLAKE2B 5901402fd478d1c5efc4473889cc33e70e8b1d1081e9d63f14e6bea873c2323eec5b504d4560ca94075790bce46f7fc0d8fa88624610a04cb48e0bca2a3d8502 SHA512 546ae11276f1d838de3b1c85b0130ce9b169b8ebd06aee573a5c59fb99cacaada5b0cd765f61920f7f423f4de87cd7e1a1672c54472df4d77d8e0d0b822a12dc
+EBUILD selinux-clockspeed-9999.ebuild 292 BLAKE2B 5901402fd478d1c5efc4473889cc33e70e8b1d1081e9d63f14e6bea873c2323eec5b504d4560ca94075790bce46f7fc0d8fa88624610a04cb48e0bca2a3d8502 SHA512 546ae11276f1d838de3b1c85b0130ce9b169b8ebd06aee573a5c59fb99cacaada5b0cd765f61920f7f423f4de87cd7e1a1672c54472df4d77d8e0d0b822a12dc
 MISC metadata.xml 320 BLAKE2B 760f3041fd82667196780a0ea9491ec8186e56c2e3fb60edab38584cead30b307cae4e8a589ba06096db7dbe259562989e3de8f842ca7d0dba0d7d17ba65c202 SHA512 7bafbbd72540c4ce4cda253f41f30180c5eaad307c5f53b87e0415587e2aa119204daed097e2db7d3ab025d48313ad4b0c9e5af5e1b0d31b640e099fe7ef3254
diff --git a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20180114-r2.ebuild b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..d83bc877500c
--- /dev/null
+++ b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 748170655bd3..d83bc877500c 100644
--- a/sec-policy/selinux-clockspeed/selinux-clockspeed-9999.ebuild
+++ b/sec-policy/selinux-clockspeed/selinux-clockspeed-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-collectd/Manifest b/sec-policy/selinux-collectd/Manifest
index 957318742d98..7adac7102e25 100644
--- a/sec-policy/selinux-collectd/Manifest
+++ b/sec-policy/selinux-collectd/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-collectd-2.20170805-r2.ebuild 384 BLAKE2B 86c46998e89789a775b3edb
 EBUILD selinux-collectd-2.20170805-r3.ebuild 384 BLAKE2B 86c46998e89789a775b3edb2455016d0247bbafa83f052355e5c6b937fccd7220d6a602ce92a6c10977d12b096c7e134ece9a71a6ab1665efd95ea4808e1362f SHA512 e76aba36518e7080ca51093bd644ac296345dc5ed3f61b6b5a5b08f9bd2ea61ee9e7927269944bd09d54db13c3b9c4d09e722159cd1493b6cd49e0d2e317609d
 EBUILD selinux-collectd-2.20170805-r4.ebuild 386 BLAKE2B 84a818529877753ad106e7b5bd7396d3309a80f3b72895bdc2aaea3fba24f958994a5ed4556fe9b6ff20213a10fc5cfabe2c85005220d8f7d7181642c757cb4d SHA512 c2a06fd6c26ced5c718636b6f62a9b61c9daa888ed02921f7dce2899f6ae6e28ebebe8bc187937fda760fe625c8c261e864d78b24d40e6676fd26d1151fbb342
 EBUILD selinux-collectd-2.20180114-r1.ebuild 384 BLAKE2B e2faffda08dd86db36e5380f9799973b8f9aaf950ba789de2b65edaad2b1ba2bc9aabdfd6c6deee4ac2dfe62d9740a10d35f25696e1dbf7c9d51a50cbb5643db SHA512 e74afb7f2d640d0532696757224e7ba9fc6183820811faf57e77a59459f77a29742a46421feed1baacac68878c3fd00c446c80119e6d1d6613e4bfc0ce384f2e
-EBUILD selinux-collectd-9999.ebuild 386 BLAKE2B 84a818529877753ad106e7b5bd7396d3309a80f3b72895bdc2aaea3fba24f958994a5ed4556fe9b6ff20213a10fc5cfabe2c85005220d8f7d7181642c757cb4d SHA512 c2a06fd6c26ced5c718636b6f62a9b61c9daa888ed02921f7dce2899f6ae6e28ebebe8bc187937fda760fe625c8c261e864d78b24d40e6676fd26d1151fbb342
+EBUILD selinux-collectd-2.20180114-r2.ebuild 386 BLAKE2B a0ada1b380690f03e6630fcf9c77dd783ab14135bcae03cce604b112a917f795dae5bc017ef91b798408dcb5a6fc3fc6344e878e76306498ef68aec63e46e653 SHA512 31f4d90d4ab0b1c7c8a0ae8ad4dc7867d7d947c6d3f7ffd4cbddc1db15b92b5467f041ffef463ee74bd0347d6d5d7ce88c21356ea76b679bdfa4a5979a988e92
+EBUILD selinux-collectd-9999.ebuild 386 BLAKE2B a0ada1b380690f03e6630fcf9c77dd783ab14135bcae03cce604b112a917f795dae5bc017ef91b798408dcb5a6fc3fc6344e878e76306498ef68aec63e46e653 SHA512 31f4d90d4ab0b1c7c8a0ae8ad4dc7867d7d947c6d3f7ffd4cbddc1db15b92b5467f041ffef463ee74bd0347d6d5d7ce88c21356ea76b679bdfa4a5979a988e92
 MISC metadata.xml 318 BLAKE2B be69d0693525604ac1c29e2fec3384e737f531ad9f94245b9cc65d8d2d5ac3c46079d7206565da1b5d5a89d1aa5be8f78eddc31fa158768dbfdb37f96826561b SHA512 6da5121253ae7018f81cc66a816a364e836e226e2e679f245acd61d6bdbe5fed013032bc4d3f38b917a4372a436ee08b53d0c379b9daa3f8ef6c7797fcd59b54
diff --git a/sec-policy/selinux-collectd/selinux-collectd-2.20180114-r2.ebuild b/sec-policy/selinux-collectd/selinux-collectd-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..72250ed6c043
--- /dev/null
+++ b/sec-policy/selinux-collectd/selinux-collectd-2.20180114-r2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 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 814ff4a9f1b1..72250ed6c043 100644
--- a/sec-policy/selinux-collectd/selinux-collectd-9999.ebuild
+++ b/sec-policy/selinux-collectd/selinux-collectd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-consolekit/Manifest b/sec-policy/selinux-consolekit/Manifest
index 725111a2ea4d..23b9392e50bc 100644
--- a/sec-policy/selinux-consolekit/Manifest
+++ b/sec-policy/selinux-consolekit/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-consolekit-2.20170805-r2.ebuild 290 BLAKE2B 79460a4732ed7437d5189
 EBUILD selinux-consolekit-2.20170805-r3.ebuild 290 BLAKE2B 79460a4732ed7437d5189f1aeef0a2b0809289be082f2f8c47f8b6803d45fa6899351e0cd6876e88f8d5105adbf2393c84f4cdb5910b81543b956a2042817ac8 SHA512 d8777ac810defa34ec2d5b22df1e5ec04ea96298f131cad805ee77c838f30724dccc6d9de66de3e3badfdffec95c5b4751fd3905982cf7d111e56bc4d573c565
 EBUILD selinux-consolekit-2.20170805-r4.ebuild 292 BLAKE2B a8c3137e9c92ab37f22e72b82241eb136187efddacaa3133809da87e54a951be37dcdd16357043368d9747255dd038ba6a8f3d0fbd1d8d67d0d5d7f7e39aa0fe SHA512 7c854971f86b8498f139b14fdc6b5cacff7fdb25a7be2717998abe0cd8a08afc9f69f5f9eef508369ca446d94a870aad397318c7d4b8b4b2fdb99ad4732cff7e
 EBUILD selinux-consolekit-2.20180114-r1.ebuild 290 BLAKE2B 244bf65e1b3cca07eee102197915df263bc00de5165adbc287006547681d8830b3181f6e55fbce942ae727d9f1c399925406509ff381c2e06232a744573b1ce5 SHA512 e22897baa22c80a08f5206fea5d2497945fa84788161525f5087902ea9e6857205b5486de35e72f45eebdf00098409655a76fb5dad0a50a2cbc17a8660605d30
-EBUILD selinux-consolekit-9999.ebuild 292 BLAKE2B a8c3137e9c92ab37f22e72b82241eb136187efddacaa3133809da87e54a951be37dcdd16357043368d9747255dd038ba6a8f3d0fbd1d8d67d0d5d7f7e39aa0fe SHA512 7c854971f86b8498f139b14fdc6b5cacff7fdb25a7be2717998abe0cd8a08afc9f69f5f9eef508369ca446d94a870aad397318c7d4b8b4b2fdb99ad4732cff7e
+EBUILD selinux-consolekit-2.20180114-r2.ebuild 292 BLAKE2B b959b47a3f2d5f290a613af7ea0d186e0df376f4720025b8724763f07c178566f8ff281d1071bec43eb8aaa3dec8a874239a190f090df73da83662671d20b11b SHA512 c3445e03e84edb69950237deb03a5f8f404393a5661b19cf2a3ec728911280f25fa70b423614123f2a07c9b9b27753503439339d0af021a23ca34719bd415e16
+EBUILD selinux-consolekit-9999.ebuild 292 BLAKE2B b959b47a3f2d5f290a613af7ea0d186e0df376f4720025b8724763f07c178566f8ff281d1071bec43eb8aaa3dec8a874239a190f090df73da83662671d20b11b SHA512 c3445e03e84edb69950237deb03a5f8f404393a5661b19cf2a3ec728911280f25fa70b423614123f2a07c9b9b27753503439339d0af021a23ca34719bd415e16
 MISC metadata.xml 320 BLAKE2B 0726c22f0efb654d222e7ac8915a1bf952c61a99a3cf4c3a316d1b3c1119ef1a930629f1c5ac98f1aacdb0f406eacaf705dac8b1711144b654e9d4ae9c597c81 SHA512 2cec206212671d162d6ae717d104543e9dbc5efa80f01f72d6aa1a7cd1863577b58d80b57cae6259ade3f4a88a12a5a1cbbacc060739f012879468be0ea03e3a
diff --git a/sec-policy/selinux-consolekit/selinux-consolekit-2.20180114-r2.ebuild b/sec-policy/selinux-consolekit/selinux-consolekit-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..084d9430ec27
--- /dev/null
+++ b/sec-policy/selinux-consolekit/selinux-consolekit-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 c306c4a21f00..084d9430ec27 100644
--- a/sec-policy/selinux-consolekit/selinux-consolekit-9999.ebuild
+++ b/sec-policy/selinux-consolekit/selinux-consolekit-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-corosync/Manifest b/sec-policy/selinux-corosync/Manifest
index 6a148543f387..51094a9d107d 100644
--- a/sec-policy/selinux-corosync/Manifest
+++ b/sec-policy/selinux-corosync/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-corosync-2.20170805-r2.ebuild 286 BLAKE2B 9abccb1bb70ddc029ffa255
 EBUILD selinux-corosync-2.20170805-r3.ebuild 286 BLAKE2B 9abccb1bb70ddc029ffa255707d3b6703b67d39e41d5832fcdb9617858d2dc7ca607038557150b93428e2123437bc0b9e277154baedcc1506c0216fb9299a727 SHA512 9c0cef8de814520979decea4a00c04eddac23470e4e5380b2c72d413d8acb754c254cb92d3943e95c6b17de799d6180a104f57bfc8c0a6b2333dfd20c1c9ec1e
 EBUILD selinux-corosync-2.20170805-r4.ebuild 288 BLAKE2B b84c5f0de71a56026f94d958d9f4e07ae2c26b5f7d21f2efbb1743c9741143ef4f702f987b6f9a979a4f8f1fffa5388307bc2e32e379060c082b84afca371bf5 SHA512 d75940e7d1a0c95fe3cd3af159c41db3738d1ec9ac4432c063f56a8f6cc318b9672050f39f159dba04365c64f3701ea28cb430c9a241f7da2767867a60fdb62f
 EBUILD selinux-corosync-2.20180114-r1.ebuild 286 BLAKE2B f1ab17a91642010aacc6d085b8121979d25a39e75345e50cfc4e8dd41636f1ba8c3513f08c243c0966d02659a3a1e19e60c4730f2cea19c8294cf28cf33bd3c5 SHA512 4fe08cd0dde9a9704c269cbe2fb0e10a99b347294d4aa3396807451842c6f4682d2d5a9c30a12fefdad4d79ea847db34f89f022f061a5489cdedea78d1220c34
-EBUILD selinux-corosync-9999.ebuild 288 BLAKE2B b84c5f0de71a56026f94d958d9f4e07ae2c26b5f7d21f2efbb1743c9741143ef4f702f987b6f9a979a4f8f1fffa5388307bc2e32e379060c082b84afca371bf5 SHA512 d75940e7d1a0c95fe3cd3af159c41db3738d1ec9ac4432c063f56a8f6cc318b9672050f39f159dba04365c64f3701ea28cb430c9a241f7da2767867a60fdb62f
+EBUILD selinux-corosync-2.20180114-r2.ebuild 288 BLAKE2B bbb15d438b4dc3f34779c413bd81483cd5af0e8ca6a8352a5edf8edeb141761cecce475182b99da6a2480219a39f58f1b561ee974e479c7da36b9e71d4f28375 SHA512 1e39b5920b7eb32bd331f43dd2f44c46bec2325996e151e79cd7deba260379721c8c8d5111e9d5d1426cd550998bae35074391ebede14f25a5f66f2f671e53cd
+EBUILD selinux-corosync-9999.ebuild 288 BLAKE2B bbb15d438b4dc3f34779c413bd81483cd5af0e8ca6a8352a5edf8edeb141761cecce475182b99da6a2480219a39f58f1b561ee974e479c7da36b9e71d4f28375 SHA512 1e39b5920b7eb32bd331f43dd2f44c46bec2325996e151e79cd7deba260379721c8c8d5111e9d5d1426cd550998bae35074391ebede14f25a5f66f2f671e53cd
 MISC metadata.xml 318 BLAKE2B 6dba862352dff5eb9f0a33f37c5fdecd6e7beb99b01e47c259398c2dc79adf04dcfd4b376f10190385fa8e510eb7b12603235097b653d58e7da1d915b69206b1 SHA512 13956c6e5e42d77e6588be5abeb1adeda5d425aa0187a430aad4f5c69cf28ff34d5d8afd83c0a2965454ffc2500f3c5f8c3300e8bb4992b9e1de5a501d0497b1
diff --git a/sec-policy/selinux-corosync/selinux-corosync-2.20180114-r2.ebuild b/sec-policy/selinux-corosync/selinux-corosync-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..dd5454d318ad
--- /dev/null
+++ b/sec-policy/selinux-corosync/selinux-corosync-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 3e8874f582ed..dd5454d318ad 100644
--- a/sec-policy/selinux-corosync/selinux-corosync-9999.ebuild
+++ b/sec-policy/selinux-corosync/selinux-corosync-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-couchdb/Manifest b/sec-policy/selinux-couchdb/Manifest
index ce1886f7f652..11955380c500 100644
--- a/sec-policy/selinux-couchdb/Manifest
+++ b/sec-policy/selinux-couchdb/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-couchdb-2.20170805-r2.ebuild 284 BLAKE2B 31bfac3aeee22c8f787226d3
 EBUILD selinux-couchdb-2.20170805-r3.ebuild 284 BLAKE2B 31bfac3aeee22c8f787226d397560ea52a2a27eab8308a664c9e1d82d777765297b281a9476a680bc60e4ad6609638348d05d6eb3bfeb5bc45405472a495d17e SHA512 af7e90767834a5fbbccbb17f86cad6ca20aaf3a724294d15c64079b4c5197daa5bec6452af87468600c1945b6c2ecb9a11171c118cf820b71da2145d83e084e5
 EBUILD selinux-couchdb-2.20170805-r4.ebuild 286 BLAKE2B 211efd4a83fcde4ef52ce7dd58279117f6b4436eed54eaf539d39d4c7226634c177e630b9748c906df05c0db8b80ad36adc9008eefceb19b568acdc8288fbc7e SHA512 c8182dd937ccb08b6abf56909b4f0ccdac0559239684ee7753ce576f444baf9d71653159f5bd828331c1af194ae682b3e927249c4fdf0f83c2a868933d404f22
 EBUILD selinux-couchdb-2.20180114-r1.ebuild 284 BLAKE2B c961197f2487eee27da7aa612f8d673f1b82a38caa9be64a7265915c66661586259c7a448750d329820d3dba4c83afd876e1c14514eb0b666906ba9498f50b1e SHA512 bd3527b8171e02ec2ec7659f56234e4ecd6401af3d182e2a894749c94bae3c071a90b8aae5bb40f3d87bbf5fb036b3c12340af14e2a7102a1cea994ebeb528ae
-EBUILD selinux-couchdb-9999.ebuild 286 BLAKE2B 211efd4a83fcde4ef52ce7dd58279117f6b4436eed54eaf539d39d4c7226634c177e630b9748c906df05c0db8b80ad36adc9008eefceb19b568acdc8288fbc7e SHA512 c8182dd937ccb08b6abf56909b4f0ccdac0559239684ee7753ce576f444baf9d71653159f5bd828331c1af194ae682b3e927249c4fdf0f83c2a868933d404f22
+EBUILD selinux-couchdb-2.20180114-r2.ebuild 286 BLAKE2B 054274d8a44593f280c9c49236c5190fd6e321f088f8bfe00210904cc624cc64fea0c18a8f3db4a656f41c9e27453eab984db6e5b0d90f0dc63893a1b6758134 SHA512 faa851337eac4c43f3f449ae03b545ea6669ed1e7cb974855876ab8f54adf845fb7146d5b8ebe86f2efd1d9c71197edc27c058b1de6e710b9624d07df32f8a68
+EBUILD selinux-couchdb-9999.ebuild 286 BLAKE2B 054274d8a44593f280c9c49236c5190fd6e321f088f8bfe00210904cc624cc64fea0c18a8f3db4a656f41c9e27453eab984db6e5b0d90f0dc63893a1b6758134 SHA512 faa851337eac4c43f3f449ae03b545ea6669ed1e7cb974855876ab8f54adf845fb7146d5b8ebe86f2efd1d9c71197edc27c058b1de6e710b9624d07df32f8a68
 MISC metadata.xml 317 BLAKE2B d943379ea7b56183adf18645a4c3c6352a3d259ad5140789a8a9b5aca17d665fadd8d06618ca93ff92135f4ddba37d9a4b76094eb8e9bad3e048636ed23cb35a SHA512 43fda061c7a92dc5b9602aa01616bd876000263114982314135e8e544c1b209b55438736c3287ea456faba6f7666564d66cac0897ea4c8c29a0211ddd86b7dd9
diff --git a/sec-policy/selinux-couchdb/selinux-couchdb-2.20180114-r2.ebuild b/sec-policy/selinux-couchdb/selinux-couchdb-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..941f36368fcd
--- /dev/null
+++ b/sec-policy/selinux-couchdb/selinux-couchdb-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 6d8c2b236897..941f36368fcd 100644
--- a/sec-policy/selinux-couchdb/selinux-couchdb-9999.ebuild
+++ b/sec-policy/selinux-couchdb/selinux-couchdb-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-courier/Manifest b/sec-policy/selinux-courier/Manifest
index 997d19d4682c..10590d0b40d7 100644
--- a/sec-policy/selinux-courier/Manifest
+++ b/sec-policy/selinux-courier/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-courier-2.20170805-r2.ebuild 284 BLAKE2B d7f187097fde47caeefc6129
 EBUILD selinux-courier-2.20170805-r3.ebuild 284 BLAKE2B d7f187097fde47caeefc612908fa82ed2bb33358618aaa61895139a2ea45fe3c8657afc8eb358c2f64e6ac3775d835c44c8e25dfbcb842e1dfbc618eb0ba9a08 SHA512 d7aaa3294b8f8c511ed86b98b1b31f94d558517ec3916f9cda115d7527280dd407dc2b5b07d9a98b153ecb87851692dcbd6cbf5e519861172b69c2e43dfe7e1b
 EBUILD selinux-courier-2.20170805-r4.ebuild 286 BLAKE2B df865fabf7773af4ee3bba4b3fbd48fadcd77b8289c92ccd96a07f7900c94e542a472a68a7c1cca72332a72305237f681be760af0bbb03cc19ab9852f8d0c0e1 SHA512 8cd5fdd8c204e86fbeb23dea5748cb2653981ffe885ae7a2c5d63b44bf50da71c8b421f1e41113601da5ed705326d3e2d52dd8ce293485706eaeabead02d6c39
 EBUILD selinux-courier-2.20180114-r1.ebuild 284 BLAKE2B b9ccc575a3bd9da475e82d71c87c893bbd4dd0bf36a46e426dc81195673dcf076d8f47718022a913676296985d2663c689cc6c9a422a4c696dc598663b53854a SHA512 fe1f103f31fec89fbeeb9c3865e2fc243db3d7d897070d1718e43a9f97328f4e4152de2694a5a278ddc98a9e1a32275c4adb39c64de90aa49691c2b4dc45d17b
-EBUILD selinux-courier-9999.ebuild 286 BLAKE2B df865fabf7773af4ee3bba4b3fbd48fadcd77b8289c92ccd96a07f7900c94e542a472a68a7c1cca72332a72305237f681be760af0bbb03cc19ab9852f8d0c0e1 SHA512 8cd5fdd8c204e86fbeb23dea5748cb2653981ffe885ae7a2c5d63b44bf50da71c8b421f1e41113601da5ed705326d3e2d52dd8ce293485706eaeabead02d6c39
+EBUILD selinux-courier-2.20180114-r2.ebuild 286 BLAKE2B 035e6fca082d6ea66ae74b3c642f4cb70f3904f0337bd1079b9e3304c0168b4f602449c1e4409f27de00f3302addaee519d40b1b25e2858c077a3167e5ba8366 SHA512 db8018fbce4284508712b4ccf8b41c581e93dc47d28c5c1ec6238f4732995a654294e644f72680ecb6e8f47fa194f2fff77bddc7924ef4ef04fd3b00e24763f1
+EBUILD selinux-courier-9999.ebuild 286 BLAKE2B 035e6fca082d6ea66ae74b3c642f4cb70f3904f0337bd1079b9e3304c0168b4f602449c1e4409f27de00f3302addaee519d40b1b25e2858c077a3167e5ba8366 SHA512 db8018fbce4284508712b4ccf8b41c581e93dc47d28c5c1ec6238f4732995a654294e644f72680ecb6e8f47fa194f2fff77bddc7924ef4ef04fd3b00e24763f1
 MISC metadata.xml 317 BLAKE2B 5b253862e05652fdaf7df04a7c858b9f2ec63b2088225ceacbadd26f4b489bcbe4593c74ec73cc6a50d80955a93537019168de09ebc32e18dc80540eca6d6b44 SHA512 90512d732a7e87c960108c4ab698a7d4205d016bc019a7e90a5776eeee024393354bafcdf07774cba6cbf028ba54003897cd732a48591905407cc32c672085e9
diff --git a/sec-policy/selinux-courier/selinux-courier-2.20180114-r2.ebuild b/sec-policy/selinux-courier/selinux-courier-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..0bffc4d35084
--- /dev/null
+++ b/sec-policy/selinux-courier/selinux-courier-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 f5edf27c3631..0bffc4d35084 100644
--- a/sec-policy/selinux-courier/selinux-courier-9999.ebuild
+++ b/sec-policy/selinux-courier/selinux-courier-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-cpucontrol/Manifest b/sec-policy/selinux-cpucontrol/Manifest
index 9fceb3de1f0c..3a5c2c6735c9 100644
--- a/sec-policy/selinux-cpucontrol/Manifest
+++ b/sec-policy/selinux-cpucontrol/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-cpucontrol-2.20170805-r2.ebuild 290 BLAKE2B df1c3373d2ac574d09269
 EBUILD selinux-cpucontrol-2.20170805-r3.ebuild 290 BLAKE2B df1c3373d2ac574d09269a4fc5f0eee134284402aaf719204a68fd2f62d5dd7f5acd88c2b2e4b144b6d8c2b3daf97fb1a970f2662c715bb0cc0d79fc7290c189 SHA512 5b11cc1ec281a94e3486a844424a289f4f794ee9bcf6f3c0b3513147df28f86e05f83b49fa58f7bd431930b3ef8ed791a95eb9f889287a0256f1448a6cc28370
 EBUILD selinux-cpucontrol-2.20170805-r4.ebuild 292 BLAKE2B 73953dd8caf49c2883fc0ea618d5c468f1e6cf05363614b11a655930ee18eacd98bdee1dd5bb15322ca4d533ff672364e1019950be1202ffebcb2db7989fc6ca SHA512 7afc55c524e9723f582da69e727c8a3188b359a4073d603de91029b75bd621d310cd0ded9e8f100010c6b50d762e5f410d2d71dc5e73856479cf31a229a8d70e
 EBUILD selinux-cpucontrol-2.20180114-r1.ebuild 290 BLAKE2B 7c1de236d6884928dbc87d4b6eccc568c4f5f64cf30c094a233fb7e4b207b2ec40eb3624b39fec762f893b82df0ad86f9c5ea652f75921eb3e2bb51fdddabb65 SHA512 40aea489ea270feea19ab52eeb9f83f4838d7a9c06755c675188326ae80a59140fcdc7ad7ddda88c23cfe7a5bdc1e374c51f748c66aaa6ed4475b49bee9404c1
-EBUILD selinux-cpucontrol-9999.ebuild 292 BLAKE2B 73953dd8caf49c2883fc0ea618d5c468f1e6cf05363614b11a655930ee18eacd98bdee1dd5bb15322ca4d533ff672364e1019950be1202ffebcb2db7989fc6ca SHA512 7afc55c524e9723f582da69e727c8a3188b359a4073d603de91029b75bd621d310cd0ded9e8f100010c6b50d762e5f410d2d71dc5e73856479cf31a229a8d70e
+EBUILD selinux-cpucontrol-2.20180114-r2.ebuild 292 BLAKE2B 90f101dc18eb2221d278302d4317645747206e0a44142bcc09b292771e076a2c627d750458852476628768021618ba146105dd3b43cc14b7a47f6895b9999cc2 SHA512 f65c7a525b4e1e9e65e40ef971747924dbff6f69a9f163dfbdeab57706f906c33fd9db1f5ca431d5f01fd4c9e67a6012b4390458f276e2ff5fbe8c99fbf3853b
+EBUILD selinux-cpucontrol-9999.ebuild 292 BLAKE2B 90f101dc18eb2221d278302d4317645747206e0a44142bcc09b292771e076a2c627d750458852476628768021618ba146105dd3b43cc14b7a47f6895b9999cc2 SHA512 f65c7a525b4e1e9e65e40ef971747924dbff6f69a9f163dfbdeab57706f906c33fd9db1f5ca431d5f01fd4c9e67a6012b4390458f276e2ff5fbe8c99fbf3853b
 MISC metadata.xml 320 BLAKE2B f9a459ad3ee2c922f96cb0ab568409dea7f25e2b483977e2dbc143af8c2fa9d75e3110f6e8204025ddd9639715235a47863afb7bd67ab0bc39bba1965975f1fd SHA512 f51c895b670b210dfd339f77a0abdaf240d3a85dfda0de494d3128fe21d9e14e28d4b98cee9af199273ac96c58dc66f2344363b7c7d9fd744291c9027825a86d
diff --git a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20180114-r2.ebuild b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..5c59da7db4eb
--- /dev/null
+++ b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 3a0cfda0dc6f..5c59da7db4eb 100644
--- a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-9999.ebuild
+++ b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-cpufreqselector/Manifest b/sec-policy/selinux-cpufreqselector/Manifest
index 94fa9c44a42c..7ff61704cfb0 100644
--- a/sec-policy/selinux-cpufreqselector/Manifest
+++ b/sec-policy/selinux-cpufreqselector/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-cpufreqselector-2.20170805-r2.ebuild 300 BLAKE2B 32a070e700ace213
 EBUILD selinux-cpufreqselector-2.20170805-r3.ebuild 300 BLAKE2B 32a070e700ace2133aa6341fcd28c9e579f2c5c4f4460f5aa3a85ad100a699c48196a282708c8d2e207fc0583815b6b755e58d57522f3a56e832ae208808dd93 SHA512 b2e3927168bb49784727f3ae80be79325eada1637a61f5ee384eba7cf0eec723d5f1557d6d79fcfe9964a16c2770c0d0f70a56f4d78d3df227750640099abfa2
 EBUILD selinux-cpufreqselector-2.20170805-r4.ebuild 302 BLAKE2B 753fe75b315660018c650ef6aaad968b386d3b13e0eab56eb5728e0001ef23a7865a542e9a87c67c85a05449feed2be33e3ffc7aa6af6841e0c71e836f732699 SHA512 b79ae2784c81f7f795e480914f7228c8d1e1eeb03e2f82119c74d3b5f318ebc60a83a5601b37d973c350a3d42a9bff8103b43e921f29d47ccec07eb6d8858ca5
 EBUILD selinux-cpufreqselector-2.20180114-r1.ebuild 300 BLAKE2B 4d75b44eedea359dcd289c328033e5869a29d209e15ef2fd198785273526f001cac58567a022e3b3406f03c5895cfa9291a7d9cb441a45455ff4badcd9523d78 SHA512 f9642a0ddeadc52f48f8e9398ae53fbce350e38729a65aaaf30e8769a6e4bd9afcfa90af7f2c6b097341058af2284648d09c4eeb47da35ac906a63f93ab19778
-EBUILD selinux-cpufreqselector-9999.ebuild 302 BLAKE2B 753fe75b315660018c650ef6aaad968b386d3b13e0eab56eb5728e0001ef23a7865a542e9a87c67c85a05449feed2be33e3ffc7aa6af6841e0c71e836f732699 SHA512 b79ae2784c81f7f795e480914f7228c8d1e1eeb03e2f82119c74d3b5f318ebc60a83a5601b37d973c350a3d42a9bff8103b43e921f29d47ccec07eb6d8858ca5
+EBUILD selinux-cpufreqselector-2.20180114-r2.ebuild 302 BLAKE2B 304cbb5e443532c0081439410070203d0b1da972bbdab59d409d6e2d83ee1dd0a747319ad6041bb5fbd03d6626c5b4c134e950e54eec05c23430558bdb606ef7 SHA512 38544db23220e3f9dd281b3f250adf5cb83754df1109c1de1a4aa87be5a9d4d51519006f38ea7f6143bc18971e2857dae215c8a6944b160f38b4097a2906b046
+EBUILD selinux-cpufreqselector-9999.ebuild 302 BLAKE2B 304cbb5e443532c0081439410070203d0b1da972bbdab59d409d6e2d83ee1dd0a747319ad6041bb5fbd03d6626c5b4c134e950e54eec05c23430558bdb606ef7 SHA512 38544db23220e3f9dd281b3f250adf5cb83754df1109c1de1a4aa87be5a9d4d51519006f38ea7f6143bc18971e2857dae215c8a6944b160f38b4097a2906b046
 MISC metadata.xml 325 BLAKE2B 6da93f91708af6a99357f791fe3391ed190761d48455473e903ecb366b3dbff15d6d6a6132cb4638e0b61bb77bdcd03f7deabe8c637fa02c4e0cd40cdd9a9e6e SHA512 0aef2f311fb25142a08caca6f25f0b1a903631e4742c79dc79afda113e0cbfc6be2ea807afd10b2f31acd8aec3810864614e685e89b83f664f9e1955d4e8ea3b
diff --git a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20180114-r2.ebuild b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..4644b016b922
--- /dev/null
+++ b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 31d48df30f19..4644b016b922 100644
--- a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-9999.ebuild
+++ b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-cups/Manifest b/sec-policy/selinux-cups/Manifest
index 2846d5f0a346..bbdbb3434941 100644
--- a/sec-policy/selinux-cups/Manifest
+++ b/sec-policy/selinux-cups/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-cups-2.20170805-r2.ebuild 368 BLAKE2B a0d8e5e6f158cbb4f28acbeb35a
 EBUILD selinux-cups-2.20170805-r3.ebuild 368 BLAKE2B a0d8e5e6f158cbb4f28acbeb35a2057fbec156a45f94abb575a26699f53636c3687458bbe86772dd1af80a98dcb16efa7193509ca1b620d27600483d0d79dd8f SHA512 4571219c1f2bf80f92462acefa4fe9d1ab5b9700b57e9b82ed9028e5389447776d68547cb6706599615c2078c2a6661197e3f6d1d51b8695b2f2e1423e70e6a6
 EBUILD selinux-cups-2.20170805-r4.ebuild 370 BLAKE2B 2d1ce80e360d234e1433f6c8caa7a46a1c54bd925c168bd368b74dbdd80762c72d59edce44201bb588936a90d39eee565f747c0d762289a767bd0a174a070d0d SHA512 0c096742effbe529a141e668a61b53a5095bf1eb35e1a15b26282993da1a0f42a8519e43a722b2d8124343fd3370de780f60964db71d5b6674777d47bf7fee13
 EBUILD selinux-cups-2.20180114-r1.ebuild 368 BLAKE2B d36074b86f2ee837ccb5a40bfa987bca28a598ebdad7a3e0d13f864f7696fc4bfed4445202d999c69e2f101af355e2d8d1e88c35464d1ec39555fab11f9d33ad SHA512 237851dc3d4b13069c2683bc257ab4b08be9acb301982279e46444a730844537d27d910acf4b3d85283c653e2a592c873594542be748aefcb280af1bfb780ce1
-EBUILD selinux-cups-9999.ebuild 370 BLAKE2B 2d1ce80e360d234e1433f6c8caa7a46a1c54bd925c168bd368b74dbdd80762c72d59edce44201bb588936a90d39eee565f747c0d762289a767bd0a174a070d0d SHA512 0c096742effbe529a141e668a61b53a5095bf1eb35e1a15b26282993da1a0f42a8519e43a722b2d8124343fd3370de780f60964db71d5b6674777d47bf7fee13
+EBUILD selinux-cups-2.20180114-r2.ebuild 370 BLAKE2B 1a6a21abea290681f8ff0c44c4478241a3d055a1eb40a6e357d94fd942edfcf006baac29aa5952b43f687bf0c1f1a0611bddb613297727d8019da7efac23328f SHA512 16dbe034c5e538f40b4f67bc68e96e5d0169fe82d9016e97f1e88fd32c57fae743e79cfab051cf4802d118eae11c3917d581f4ac98f42efc7a8806ba7e2bc27f
+EBUILD selinux-cups-9999.ebuild 370 BLAKE2B 1a6a21abea290681f8ff0c44c4478241a3d055a1eb40a6e357d94fd942edfcf006baac29aa5952b43f687bf0c1f1a0611bddb613297727d8019da7efac23328f SHA512 16dbe034c5e538f40b4f67bc68e96e5d0169fe82d9016e97f1e88fd32c57fae743e79cfab051cf4802d118eae11c3917d581f4ac98f42efc7a8806ba7e2bc27f
 MISC metadata.xml 314 BLAKE2B bd165fe274c682223b50a6adcfc385fb4d2853c833c82d3bd1e36ede581a1511bf31d8e8ca3068533f2ff154655446c7e486e543b0576df77e3ae374a5c6564d SHA512 3e3d89bc53170e64971ce9e3effcd321f19a95b2ceaaf97a8a3212121848c3bdc88d6f1d2a1211efd04209165c1cd24e54a2cda9bdc841d9dc3470e3aa7e23a7
diff --git a/sec-policy/selinux-cups/selinux-cups-2.20180114-r2.ebuild b/sec-policy/selinux-cups/selinux-cups-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..45dc986ba8b0
--- /dev/null
+++ b/sec-policy/selinux-cups/selinux-cups-2.20180114-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 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 f7f3da060978..45dc986ba8b0 100644
--- a/sec-policy/selinux-cups/selinux-cups-9999.ebuild
+++ b/sec-policy/selinux-cups/selinux-cups-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-cvs/Manifest b/sec-policy/selinux-cvs/Manifest
index 2e2b409dfedb..b49d943c7a24 100644
--- a/sec-policy/selinux-cvs/Manifest
+++ b/sec-policy/selinux-cvs/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-cvs-2.20170805-r2.ebuild 424 BLAKE2B 5f133c11aa2329a8eaf557c1e671
 EBUILD selinux-cvs-2.20170805-r3.ebuild 424 BLAKE2B 5f133c11aa2329a8eaf557c1e6711c9d5daae1a102c7acfa54c879933cf9d4daec590b490c499217772e8c5c44a2255892f001a5508e04ce76d3c5fb48e26a5a SHA512 32f107944ca64ba946da8922adeadfc79751e6e90efa57df96b6166b0148a1221a9ee36e671d4968d7ab78f5468d7bf01f0a2a065ff124fd3cc7ab1ab12f8c50
 EBUILD selinux-cvs-2.20170805-r4.ebuild 426 BLAKE2B e4663429433c74a226175dcb485f8b16291bc401f8dc146f4c64141b9d7b069a661533781eaddd59ff1d7868c9a7d09cba27ba2a77724354892c5474ec795ce1 SHA512 a77b3e31cee5d5e262a50c0e98a33219d5e3868bb3639fdbe9683ab67d725bb04540a424d0915d83db31031dfbadf7c030ad7ca050ff170988268e7447277fde
 EBUILD selinux-cvs-2.20180114-r1.ebuild 424 BLAKE2B d124ba5ac3e8c6999b4b4dff2099c76cc5664a5d6dadf2e3f27f7fd1fc3ecbb43d10a7f6d0740a4ae027f6342be1be071c7917c003988759dd8fd1648c5ef8cd SHA512 2c78fcaf45548d965f5d494685ce701b1d8714acf18e3be207bf33f41bfd09fcf3d53c9852b457a8c0c8612d02e197aa6213445cc024637aff53ca0818bfb490
-EBUILD selinux-cvs-9999.ebuild 426 BLAKE2B e4663429433c74a226175dcb485f8b16291bc401f8dc146f4c64141b9d7b069a661533781eaddd59ff1d7868c9a7d09cba27ba2a77724354892c5474ec795ce1 SHA512 a77b3e31cee5d5e262a50c0e98a33219d5e3868bb3639fdbe9683ab67d725bb04540a424d0915d83db31031dfbadf7c030ad7ca050ff170988268e7447277fde
+EBUILD selinux-cvs-2.20180114-r2.ebuild 426 BLAKE2B 0a24c1e69546c1166d50b7ae7647693a39ab5383d00b49ce6d95a94f1c69aebc3d208c6d2ee4f1b98c6333bd84d6d0f4e8cb0acc464ae2ffc6f59178f47c4f15 SHA512 f86a9e445e48adfd63e04e8dee78f334cccf8cec8b0bdce84bdf9d55aafaa1db0caeed02a53c43017f23bb52e342f50ae19880d2c60d78103f5381cd0800d95a
+EBUILD selinux-cvs-9999.ebuild 426 BLAKE2B 0a24c1e69546c1166d50b7ae7647693a39ab5383d00b49ce6d95a94f1c69aebc3d208c6d2ee4f1b98c6333bd84d6d0f4e8cb0acc464ae2ffc6f59178f47c4f15 SHA512 f86a9e445e48adfd63e04e8dee78f334cccf8cec8b0bdce84bdf9d55aafaa1db0caeed02a53c43017f23bb52e342f50ae19880d2c60d78103f5381cd0800d95a
 MISC metadata.xml 313 BLAKE2B 703f78367a1b094227e5c85a203f9cbd6b5126e619cc81d5910ee71d63096221354fa016fd10cf399348ed62b66d526f4be04b5e73496fbcc29a58179b921eca SHA512 6d7001e06d985c2395e10c6272950a5bc76279c60ad5ca17d54fbe12e449c2b6485fc5d3e88775f4ab2a3d9c5ccbc37f412a783a7841ba54901f34a520f8c5b1
diff --git a/sec-policy/selinux-cvs/selinux-cvs-2.20180114-r2.ebuild b/sec-policy/selinux-cvs/selinux-cvs-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..582dc0abdc03
--- /dev/null
+++ b/sec-policy/selinux-cvs/selinux-cvs-2.20180114-r2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 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 5dfc34680758..582dc0abdc03 100644
--- a/sec-policy/selinux-cvs/selinux-cvs-9999.ebuild
+++ b/sec-policy/selinux-cvs/selinux-cvs-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-cyphesis/Manifest b/sec-policy/selinux-cyphesis/Manifest
index 01302445f260..eaaf8a775a14 100644
--- a/sec-policy/selinux-cyphesis/Manifest
+++ b/sec-policy/selinux-cyphesis/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-cyphesis-2.20170805-r2.ebuild 286 BLAKE2B e452216fdcdfa774644e8e0
 EBUILD selinux-cyphesis-2.20170805-r3.ebuild 286 BLAKE2B e452216fdcdfa774644e8e0169c186e266ac83ef512a9984e48b59905b43d2d99425dd87dd46c21fc0941a087e45c50e1355c69c0c216c40a7dccc7559a17cc2 SHA512 5e037d0f6f90d07cf2a56f0e4920b06449d1c4f55b9f8b69d5efa831b88396a02cf9ad80c364f72039aca2ebd1f75fefb2b5c071bd52391e10be89e59384a353
 EBUILD selinux-cyphesis-2.20170805-r4.ebuild 288 BLAKE2B 4c252e7e729d0742ef53ec82e47c80747428160382ed8c93252261fc1a8aba5c029d125b01300697af352645087016dd191acf294f4fcbbf7eaf10a673e74798 SHA512 39e3f96100867221df4721cbe46d2c3f32cfa9d2b7f311eaadf85804389a21c66dda332d3fe2a16070d7b7c69429d18df0dbcc9af3402cf8c5102b00f1ce03db
 EBUILD selinux-cyphesis-2.20180114-r1.ebuild 286 BLAKE2B af68719283763c2a11b4e6e151c1f434255ebf314d36f8738fbfde446940fc5faa433ab8da8347879820d58f96f4ef16510d007126fd1349d64ebebdf0a7b05c SHA512 c5d72501b795a0d642e60206f9813067742b3ddbb2e8b37a36041c2cf7518fd4968181872486fe2ce54520c0e0e91646db3e65e87a2d53a3290c9ed92f5cb2af
-EBUILD selinux-cyphesis-9999.ebuild 288 BLAKE2B 4c252e7e729d0742ef53ec82e47c80747428160382ed8c93252261fc1a8aba5c029d125b01300697af352645087016dd191acf294f4fcbbf7eaf10a673e74798 SHA512 39e3f96100867221df4721cbe46d2c3f32cfa9d2b7f311eaadf85804389a21c66dda332d3fe2a16070d7b7c69429d18df0dbcc9af3402cf8c5102b00f1ce03db
+EBUILD selinux-cyphesis-2.20180114-r2.ebuild 288 BLAKE2B 91c08b7a60d429256421706584cbe90aa9ebe0d71f23dafbb377a15281a4134b714a4a0a23274f48b09fa51135e490e89ee8e4cecd240f9646c14275847fe52f SHA512 78c064946a2f2c4f5a5235b0ddc78060163dae164a8205ba5adfec1e1c5c742ec9bbbbd81d27be86c963c0f1c5942049e14d3d6707f578959a906d00183825da
+EBUILD selinux-cyphesis-9999.ebuild 288 BLAKE2B 91c08b7a60d429256421706584cbe90aa9ebe0d71f23dafbb377a15281a4134b714a4a0a23274f48b09fa51135e490e89ee8e4cecd240f9646c14275847fe52f SHA512 78c064946a2f2c4f5a5235b0ddc78060163dae164a8205ba5adfec1e1c5c742ec9bbbbd81d27be86c963c0f1c5942049e14d3d6707f578959a906d00183825da
 MISC metadata.xml 318 BLAKE2B 2570233d3c042ab5a91b4b9c07c99a280cd7c6c1f69e71219b56310917280a26e16463660c4b1922f81d49857acca546db06033e9dcf40846d0a54aaf61a0af6 SHA512 58e70c654d22bceeb06ee1f89577451cdf23871d63bb17427e18da11d7adb5edf7f20264ca4cc934be2b44e471973addaf717e0254f2814217f5a0a25309be2e
diff --git a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20180114-r2.ebuild b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..4bbdb67ee7e1
--- /dev/null
+++ b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 01ba8f935e3e..4bbdb67ee7e1 100644
--- a/sec-policy/selinux-cyphesis/selinux-cyphesis-9999.ebuild
+++ b/sec-policy/selinux-cyphesis/selinux-cyphesis-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-daemontools/Manifest b/sec-policy/selinux-daemontools/Manifest
index eecce242e436..f0aaaaabc17b 100644
--- a/sec-policy/selinux-daemontools/Manifest
+++ b/sec-policy/selinux-daemontools/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-daemontools-2.20170805-r2.ebuild 292 BLAKE2B 6147db72ef8666ba81a4
 EBUILD selinux-daemontools-2.20170805-r3.ebuild 292 BLAKE2B 6147db72ef8666ba81a4834c36a008aff3539273ec8d6d5fbde5d1173edc7e9685b2203f5b40fff7eb6fe4386998af145b32e4ba1be98f61f398ba8ebcab84df SHA512 0218613a7884241ad11e5c02f09f6124c527f517457a3cc6f3c23dce979bf1267dc967115519b1f78657b2ce2d1932f84483f4815ae27d75c23792c537dfb879
 EBUILD selinux-daemontools-2.20170805-r4.ebuild 294 BLAKE2B e3174a98ad030b64f9b11441e6c64a69880f979b605ccc3f5be9d407383d64ac7baaebb6dcbfe4cd0aa0a5ef17d7a4bf73d6235bd5eebb06ed24cf58008b3b59 SHA512 3753ab23a1031a11bd0f01c8e2f64d6a09ebaaae9dd8e368c21ada26d7bc09aae884d1ea341b37b5f0ee39c6d263774440280809af78f0382a3b5837c921cf81
 EBUILD selinux-daemontools-2.20180114-r1.ebuild 292 BLAKE2B 1d73cb370683f64f70ca8fb5c451d52b75f1bd597d00ad638c74a65ce7c92ea1b707f6595008d68d6d852edd6f1c11244ce5fdf41973810545fe5b825633a6bd SHA512 caf019eb1b105af4f41820e88b555fdffc5626e7b24939ecb12d93fb9d79400eff7dc7071a18124f5b5878d8b5d88fa6d3ff9681932a4e091128160610939e3c
-EBUILD selinux-daemontools-9999.ebuild 294 BLAKE2B e3174a98ad030b64f9b11441e6c64a69880f979b605ccc3f5be9d407383d64ac7baaebb6dcbfe4cd0aa0a5ef17d7a4bf73d6235bd5eebb06ed24cf58008b3b59 SHA512 3753ab23a1031a11bd0f01c8e2f64d6a09ebaaae9dd8e368c21ada26d7bc09aae884d1ea341b37b5f0ee39c6d263774440280809af78f0382a3b5837c921cf81
+EBUILD selinux-daemontools-2.20180114-r2.ebuild 294 BLAKE2B fa34a3ec8d0ddabcfc1ffcf8f71482cf401c7e5f1321cd2b037437825dca7ab891967b89525df1ff0e256877a097e7b5cafc3eeb0a4cc50017d85e95c8c4a998 SHA512 b33cda9b6228d6f2fb2c81a2da98920ce3aecbebb41287a8e2a4977ea6fd9a16b4c67b0d7fc6ac0c5f143a40fcec0c84638124ba6b2a1c96d86a062f85c16924
+EBUILD selinux-daemontools-9999.ebuild 294 BLAKE2B fa34a3ec8d0ddabcfc1ffcf8f71482cf401c7e5f1321cd2b037437825dca7ab891967b89525df1ff0e256877a097e7b5cafc3eeb0a4cc50017d85e95c8c4a998 SHA512 b33cda9b6228d6f2fb2c81a2da98920ce3aecbebb41287a8e2a4977ea6fd9a16b4c67b0d7fc6ac0c5f143a40fcec0c84638124ba6b2a1c96d86a062f85c16924
 MISC metadata.xml 321 BLAKE2B 6d6514d6443844395a0800a3a2d652d4383f1c21aa10f7d00198fdb028be2c6a171c32d0e9af0f84d6da4d8b99ed3a2ce931b43c2d55c1e4e864721ce3d9c3e2 SHA512 2b805bc57fdb8ce67f8628d2ff8e97923ecd5f3ed6502bab2a97fda612f613c5af1964fe33f0b110757d2f60c795ff1b2b94e89c2f4cc4508d148fbfd20c12e1
diff --git a/sec-policy/selinux-daemontools/selinux-daemontools-2.20180114-r2.ebuild b/sec-policy/selinux-daemontools/selinux-daemontools-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..3927f59ea456
--- /dev/null
+++ b/sec-policy/selinux-daemontools/selinux-daemontools-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 550743a1d4d6..3927f59ea456 100644
--- a/sec-policy/selinux-daemontools/selinux-daemontools-9999.ebuild
+++ b/sec-policy/selinux-daemontools/selinux-daemontools-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-dante/Manifest b/sec-policy/selinux-dante/Manifest
index 6f48a574e731..c8d52197e53d 100644
--- a/sec-policy/selinux-dante/Manifest
+++ b/sec-policy/selinux-dante/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-dante-2.20170805-r2.ebuild 280 BLAKE2B bef0eaa38b10086349acfab52c
 EBUILD selinux-dante-2.20170805-r3.ebuild 280 BLAKE2B bef0eaa38b10086349acfab52c34b65ce2692acbc4eb22144427709ccb47314263f20aa5298d6491578767ad04c0d85c26aa5a3a50d74b12de2401e75450e212 SHA512 9433451947b874fcecfb4d17acd3fa685c44c64b2442426247112b71194bb8431d6c9415a55d1e5d05641e51463de8193f82379bf1a7a1d23af5803833986271
 EBUILD selinux-dante-2.20170805-r4.ebuild 282 BLAKE2B 17688efba3ed7cf10ffa66cfb1aff94957b7c3797385c4e9d6daf3671cdc774837a27d655f72b73fa2544aaef516a7ef13f64cb4fab5d5909cb549e351bbcdcd SHA512 ee684018536da113a47cb31d5b172bbc951210db50798f158eb83bba85f9214c5e6140de284fb2ed6af4f55874c32034e05c364269f33bdcd922bb417d7d73ea
 EBUILD selinux-dante-2.20180114-r1.ebuild 280 BLAKE2B f56beb65314a6ff8a9a370e0391b8955ebf257a5d07bdec08c6c472ab6b8f63651b8335794ea40870bfea448fff7678493a2b024ff4db6d852727154f6eec209 SHA512 190a680ef8c9552a12ef11772698d747eaa12f17548aa043772f4743e9b1257d50676f43875a8eb67b3eb74f3dfb0b97ee50f061142b8d2d22e6fedcfbc72e27
-EBUILD selinux-dante-9999.ebuild 282 BLAKE2B 17688efba3ed7cf10ffa66cfb1aff94957b7c3797385c4e9d6daf3671cdc774837a27d655f72b73fa2544aaef516a7ef13f64cb4fab5d5909cb549e351bbcdcd SHA512 ee684018536da113a47cb31d5b172bbc951210db50798f158eb83bba85f9214c5e6140de284fb2ed6af4f55874c32034e05c364269f33bdcd922bb417d7d73ea
+EBUILD selinux-dante-2.20180114-r2.ebuild 282 BLAKE2B ac6f53953f4682447995ca906183434e68a8d252a2be2477043aeda478a9ac0fee0fe6d68f7dad266dca22004e2d7b6bdb2ddcb96263afee60cab4713047446d SHA512 14fcf5e36de28c5147cfa26c4772ed4ebfeacfa2c239aeba1a897a05cfe8b1493cf22f81cf527878841f46330779b12c4c67ecfc28bf794dcdc848bc99214b57
+EBUILD selinux-dante-9999.ebuild 282 BLAKE2B ac6f53953f4682447995ca906183434e68a8d252a2be2477043aeda478a9ac0fee0fe6d68f7dad266dca22004e2d7b6bdb2ddcb96263afee60cab4713047446d SHA512 14fcf5e36de28c5147cfa26c4772ed4ebfeacfa2c239aeba1a897a05cfe8b1493cf22f81cf527878841f46330779b12c4c67ecfc28bf794dcdc848bc99214b57
 MISC metadata.xml 315 BLAKE2B 4a9614e97425dcef15e5f81c7703c071f393a540f4fcd20669e3989ec2f660215121f84b413d88d294a20a4234d208ae6008b2c80cd8857890d2163a100a2916 SHA512 e9a60869542dab4e36aa4a2cdc6bbcbb12a825ba498aefc79d3a3ffbc6b3f22025ec4ab0fce073c983a6a3c4f9d144e2dd9f6019f74e641ec6876c6a3d3ce25b
diff --git a/sec-policy/selinux-dante/selinux-dante-2.20180114-r2.ebuild b/sec-policy/selinux-dante/selinux-dante-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..4e8f92b6d411
--- /dev/null
+++ b/sec-policy/selinux-dante/selinux-dante-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 e2de99289f2e..4e8f92b6d411 100644
--- a/sec-policy/selinux-dante/selinux-dante-9999.ebuild
+++ b/sec-policy/selinux-dante/selinux-dante-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-dbadm/Manifest b/sec-policy/selinux-dbadm/Manifest
index cb0fbc8bad84..dc4780036c86 100644
--- a/sec-policy/selinux-dbadm/Manifest
+++ b/sec-policy/selinux-dbadm/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-dbadm-2.20170805-r2.ebuild 280 BLAKE2B 719bc2376359d85c6273701a55
 EBUILD selinux-dbadm-2.20170805-r3.ebuild 280 BLAKE2B 719bc2376359d85c6273701a551c667aa53f68578a726a8d6639b7be53fda26bdc1758bd4ba222c8f0a114d3d1b2b2d970a5c2bfdaf2642d89660226937a5f26 SHA512 16f4a497cdbbcfc03349c5506c8821cf817e9db84995241e5522f3084bc7045faaea0c46ddfa63d83aa07f946ee84bb4e86c16b8614cfa9cebd71fcabce92a89
 EBUILD selinux-dbadm-2.20170805-r4.ebuild 282 BLAKE2B f2b1fe91b2ad3db0aae4c3742cc0b4fcc2b888513172d35126c320463ddcaba8ab3a8a0e6495a9a9c9ae6a4266baabd890c459ab94bbbbf04d3d4d9e6ad58747 SHA512 338b04a5a7b1748de3b8c7f6c75996bb6328287980a101cdc6831cb2a308cb9e0f4a6781d0b9044cd081bab3f875b6dfe29ec2a21bda2985e5cbe2196c4a2110
 EBUILD selinux-dbadm-2.20180114-r1.ebuild 280 BLAKE2B 381d99cae9c278ff55999c757fd14b0bee14c456dfe05798d5dfe1d456459ec586757278f982642f468b02a328b46d731eda468bb919d1cd77792572a4c248f1 SHA512 4683f934bcd58636290b2d6dced456cfe5c5cdd6629585454f1ea741deacc27fcecab8b88cf25a56db40ce47fd52da3722ba9b2d1975b1e09e2ef7e02a8262bc
-EBUILD selinux-dbadm-9999.ebuild 282 BLAKE2B f2b1fe91b2ad3db0aae4c3742cc0b4fcc2b888513172d35126c320463ddcaba8ab3a8a0e6495a9a9c9ae6a4266baabd890c459ab94bbbbf04d3d4d9e6ad58747 SHA512 338b04a5a7b1748de3b8c7f6c75996bb6328287980a101cdc6831cb2a308cb9e0f4a6781d0b9044cd081bab3f875b6dfe29ec2a21bda2985e5cbe2196c4a2110
+EBUILD selinux-dbadm-2.20180114-r2.ebuild 282 BLAKE2B 2234965836cfea53911610a4863709da8d94d97d9573e8b9aaa2b83377158d2c9d74ddc27a11b17cfda8f817fe6a23dc24d70957295e585b09027544d64a93de SHA512 b42b594acdef838300ec488d01d7e190b60f424480ce702f1a41e665900bbe6606610174568472bd882ed2985f9dbf4e5ba715b6795825ad93ce775d1704d67e
+EBUILD selinux-dbadm-9999.ebuild 282 BLAKE2B 2234965836cfea53911610a4863709da8d94d97d9573e8b9aaa2b83377158d2c9d74ddc27a11b17cfda8f817fe6a23dc24d70957295e585b09027544d64a93de SHA512 b42b594acdef838300ec488d01d7e190b60f424480ce702f1a41e665900bbe6606610174568472bd882ed2985f9dbf4e5ba715b6795825ad93ce775d1704d67e
 MISC metadata.xml 315 BLAKE2B 110047b31921d4401c5cd28fede2d4ea7478c78491d2f2ddd2736400d233813230fac16c929172a71af8bafaaed42bd2b5dcf8b52e698ee0441aceb3b158379a SHA512 c87f64c70f1f825f314d5febb85d0172d528a8e643472d4c47f3b9e0fc28e89fdb62e0f5bd77813bd2239e13b22310d152e34768d69a99f4240d1c2aa43e5bd0
diff --git a/sec-policy/selinux-dbadm/selinux-dbadm-2.20180114-r2.ebuild b/sec-policy/selinux-dbadm/selinux-dbadm-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..862759a2ffb5
--- /dev/null
+++ b/sec-policy/selinux-dbadm/selinux-dbadm-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 6fa3539250e5..862759a2ffb5 100644
--- a/sec-policy/selinux-dbadm/selinux-dbadm-9999.ebuild
+++ b/sec-policy/selinux-dbadm/selinux-dbadm-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-dbskk/Manifest b/sec-policy/selinux-dbskk/Manifest
index cee44783f508..12e5679a9e0d 100644
--- a/sec-policy/selinux-dbskk/Manifest
+++ b/sec-policy/selinux-dbskk/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-dbskk-2.20170805-r2.ebuild 374 BLAKE2B c4ab5a501d0741602b84866234
 EBUILD selinux-dbskk-2.20170805-r3.ebuild 374 BLAKE2B c4ab5a501d0741602b8486623458eec6b7c5c7c60fe63dd9bd4282ec8e25221d7b78d0db7530f828a7dc35905d54118965b8491390c691ca7eb70abdcde9cbf1 SHA512 f4819930cbdac8e9305aa67d02babe9453cd4348413e1629001367333b6cc3b5db7bd5d2c64073a1ce95bd043141a285e68aafdf621cdcc21d56163b6f129724
 EBUILD selinux-dbskk-2.20170805-r4.ebuild 376 BLAKE2B e6f13e427f7a107b5215d2f2b1295cac3be2b096f85aa44af5ae323b4c896e441ec485e5e8d1ea232e779a9bc88ced0c608c0c135853dde54b23e8fcab323f4a SHA512 13e1d2877bf9ccb9b8d3d23927d7e66062124ed515c2d7d65a94719af5124468d8725705df957108afae243b4c0a479e928f805651fa4123b6680d0a103399dc
 EBUILD selinux-dbskk-2.20180114-r1.ebuild 374 BLAKE2B 3199a4ec06202b1d8d6c616ce410c06d1949ca70f9654925043e96dce9b8b1c01bd7dd2813f0caf2e26f9d7310064d2c8bbd4c8a3c2e7deb27190577b553d5ef SHA512 1282386135ffddcc08dd3c05ac80d841ce03115841084684d0322d5cf4280d1e86521055ecdd5c56704f128852cf5615912b19dbbf30004d7dddcd5076ddf724
-EBUILD selinux-dbskk-9999.ebuild 376 BLAKE2B e6f13e427f7a107b5215d2f2b1295cac3be2b096f85aa44af5ae323b4c896e441ec485e5e8d1ea232e779a9bc88ced0c608c0c135853dde54b23e8fcab323f4a SHA512 13e1d2877bf9ccb9b8d3d23927d7e66062124ed515c2d7d65a94719af5124468d8725705df957108afae243b4c0a479e928f805651fa4123b6680d0a103399dc
+EBUILD selinux-dbskk-2.20180114-r2.ebuild 376 BLAKE2B 4276d8b588244310a6afa03709637dea9beef8ca68d0aad55add6927d226434630e31d436460c9760ef1e2d01a6e8c47757ffe18d07d0fdde8fd2033ebd4d8ef SHA512 44c423de8c8a30a942374c31aa8d313dbe52bc3eb34f1c798e4e405bf32d6c115e59a16e73c79e26a0419e5c9131220aa0ad7734896a840255311e00e5c5152d
+EBUILD selinux-dbskk-9999.ebuild 376 BLAKE2B 4276d8b588244310a6afa03709637dea9beef8ca68d0aad55add6927d226434630e31d436460c9760ef1e2d01a6e8c47757ffe18d07d0fdde8fd2033ebd4d8ef SHA512 44c423de8c8a30a942374c31aa8d313dbe52bc3eb34f1c798e4e405bf32d6c115e59a16e73c79e26a0419e5c9131220aa0ad7734896a840255311e00e5c5152d
 MISC metadata.xml 315 BLAKE2B 6c0f1abd410df11d4316dcb65dc8ca479cddc8c968c1572260cd0903f4e71d02676856a2f7c0fc86143ea1c3589ca46da943e1f0b542729e3819472608adf7a7 SHA512 6343c4ff0f737a41d7651884b4193cb14fa546125723e032c1f9e277a006fc321102a081b8017388c3d7001bebbec12ad4b83c0b2e347e8abdb01ef41a4d5945
diff --git a/sec-policy/selinux-dbskk/selinux-dbskk-2.20180114-r2.ebuild b/sec-policy/selinux-dbskk/selinux-dbskk-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..98edbc85d0ba
--- /dev/null
+++ b/sec-policy/selinux-dbskk/selinux-dbskk-2.20180114-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 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 6c92882d3140..98edbc85d0ba 100644
--- a/sec-policy/selinux-dbskk/selinux-dbskk-9999.ebuild
+++ b/sec-policy/selinux-dbskk/selinux-dbskk-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-dbus/Manifest b/sec-policy/selinux-dbus/Manifest
index 3ae52cf9c170..8353d91a7562 100644
--- a/sec-policy/selinux-dbus/Manifest
+++ b/sec-policy/selinux-dbus/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-dbus-2.20170805-r2.ebuild 278 BLAKE2B 9ae15f091d1a703ffbebcf2a49f
 EBUILD selinux-dbus-2.20170805-r3.ebuild 278 BLAKE2B 9ae15f091d1a703ffbebcf2a49f20e7b212fe9a6743c59b200ac51b155982310903efdaa9d64706b2d9840122487eedd0680c5994bac2045856e3f8a6e4066b7 SHA512 d824b702f1e297e08e3eabf09ce5a1b16875819be4b70a1dc6c88ba767741cf6c813ab0e9f8a03f04ad3dc4736d37e278b8b49a71ae58d55ef63472b50011ce9
 EBUILD selinux-dbus-2.20170805-r4.ebuild 280 BLAKE2B b03191f868c7c7ad8ea8683f4d40b46b52982459b9b616e0273c649b305ba742a35160e48a6c72f0c91753a539b2d6b39b43c417cc1f58a912f74bac302b1a05 SHA512 931f64ffd9ebdb05344c2d7494862bdd5f943f298caf7d2fac9d6579bf8781206f22bd7eda4a0dc1aa9ed1a199af0f8020fbcc68964876b6aaf742dfea2e550c
 EBUILD selinux-dbus-2.20180114-r1.ebuild 278 BLAKE2B 2569c69b88347fa2d03f2ba989334985092ef2e0cc0bb5bea747dccd6ca090d3d0666cad6fe026a3886da346f356f0b651e185c0a1b01ca63d0548b24a9a4762 SHA512 5ca9cc85796d7f5a619cb6ca85c041d023dd5772d3fbf57bb2d941e916279ff922335e3cc6621d92d618ec24fa9e7368ba7ec1b74542328210f92eec2c6fea0e
-EBUILD selinux-dbus-9999.ebuild 280 BLAKE2B b03191f868c7c7ad8ea8683f4d40b46b52982459b9b616e0273c649b305ba742a35160e48a6c72f0c91753a539b2d6b39b43c417cc1f58a912f74bac302b1a05 SHA512 931f64ffd9ebdb05344c2d7494862bdd5f943f298caf7d2fac9d6579bf8781206f22bd7eda4a0dc1aa9ed1a199af0f8020fbcc68964876b6aaf742dfea2e550c
+EBUILD selinux-dbus-2.20180114-r2.ebuild 280 BLAKE2B 3e28b3d4d8318ced51fbde7ac34fcaec622f4d8ffda68fbe270ad3fd6bb812209d6243d7bbb390003a632bb40219a2c80f689b26557372b9980ea46b1f0c99a3 SHA512 c12c940dc60938ee6d70174ccd9e06ed0926754980bc879685c8577a75e4c7b495da446cb312ec9020bbffd4992948e39a206d6d0d435dcf7929317694fefab6
+EBUILD selinux-dbus-9999.ebuild 280 BLAKE2B 3e28b3d4d8318ced51fbde7ac34fcaec622f4d8ffda68fbe270ad3fd6bb812209d6243d7bbb390003a632bb40219a2c80f689b26557372b9980ea46b1f0c99a3 SHA512 c12c940dc60938ee6d70174ccd9e06ed0926754980bc879685c8577a75e4c7b495da446cb312ec9020bbffd4992948e39a206d6d0d435dcf7929317694fefab6
 MISC metadata.xml 314 BLAKE2B 4fcd6165b52aa91bc2922a04f61cb4822869918c12752f97fcb9fd5b8d05e8f2136355e9f77d9642c2daf5c7bad71210a93433819405ee7915b11ce18fc90033 SHA512 a92e00860f8191520785ee5e38c2f824330b7d7f625813e3be52cbf1a46262b32e6a110663a8842423dc6f1d27ceffac15142847a8d8da6e6e249d8c69328a92
diff --git a/sec-policy/selinux-dbus/selinux-dbus-2.20180114-r2.ebuild b/sec-policy/selinux-dbus/selinux-dbus-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..c24f8df7469e
--- /dev/null
+++ b/sec-policy/selinux-dbus/selinux-dbus-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 16443054382f..c24f8df7469e 100644
--- a/sec-policy/selinux-dbus/selinux-dbus-9999.ebuild
+++ b/sec-policy/selinux-dbus/selinux-dbus-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-dcc/Manifest b/sec-policy/selinux-dcc/Manifest
index 51460646efee..11a0cbad8312 100644
--- a/sec-policy/selinux-dcc/Manifest
+++ b/sec-policy/selinux-dcc/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-dcc-2.20170805-r2.ebuild 276 BLAKE2B 7ce812cc14f2048d41bb311e1460
 EBUILD selinux-dcc-2.20170805-r3.ebuild 276 BLAKE2B 7ce812cc14f2048d41bb311e146008ba75cd81116b76e9d1ff789da5358b51305701918dfcbb9331e7c17fabdad3170ee68c2b3b74139492af70459a1df7de28 SHA512 7a7c222e13c28249a46c96bc390933301b0efffd123d4fda2eabfb6a84e6c5a8fecd13b21977499d8401d778ba7df1cc2ef54eb1b04d7fc17bf825932b27b94f
 EBUILD selinux-dcc-2.20170805-r4.ebuild 278 BLAKE2B ce0d29e45095f58a72c57207b71a8ba62cb4308074e3fb57a280062426a24038f8fccb90701257ab4a7faa146cea847a3ae08f2845dc85d3671c1e72eb39fe2e SHA512 61e037454bf3f2ede1912f7e94f825c06934eff668b517ef5e4b58e18e62caa3fa79b50122a27d46f501499d0540c98b81259ac1d8a01645345e56e999ebf362
 EBUILD selinux-dcc-2.20180114-r1.ebuild 276 BLAKE2B 4eb4cbb74f8dcf11954085be4dc817c31de4c3c2a0edf5d93ed625c5bf2d374f5524a1dcee5a26f0aadc9f811ca002b7663bec3e8786e47449416c747ef1dbcb SHA512 77efe74b398e3082a6a734d74bbf9bbb852826d44c3f17c276e4d992507f533f525c8b90c033256ff8ea99f1e06dee015bd3c4007e6811a5e849e0a632ed8944
-EBUILD selinux-dcc-9999.ebuild 278 BLAKE2B ce0d29e45095f58a72c57207b71a8ba62cb4308074e3fb57a280062426a24038f8fccb90701257ab4a7faa146cea847a3ae08f2845dc85d3671c1e72eb39fe2e SHA512 61e037454bf3f2ede1912f7e94f825c06934eff668b517ef5e4b58e18e62caa3fa79b50122a27d46f501499d0540c98b81259ac1d8a01645345e56e999ebf362
+EBUILD selinux-dcc-2.20180114-r2.ebuild 278 BLAKE2B 995c331706d56ff647d47e6bdebb12843b7e6a29e5c6ffcbcab24f993e633a4c027a66f8bfa1c778ab8d1358d0f98b13043d8a6c8919feb3e98bdd61eff38c03 SHA512 9b6af4bc0375e40dc9904e77811ed9a3a74c4314ec32378b93f787c31f5a24cfa8c703d98d354186759fc8ef9fd56f3e465b9b80803b80baa44f936d5b99ddb7
+EBUILD selinux-dcc-9999.ebuild 278 BLAKE2B 995c331706d56ff647d47e6bdebb12843b7e6a29e5c6ffcbcab24f993e633a4c027a66f8bfa1c778ab8d1358d0f98b13043d8a6c8919feb3e98bdd61eff38c03 SHA512 9b6af4bc0375e40dc9904e77811ed9a3a74c4314ec32378b93f787c31f5a24cfa8c703d98d354186759fc8ef9fd56f3e465b9b80803b80baa44f936d5b99ddb7
 MISC metadata.xml 313 BLAKE2B 72b1c9d78d51969f6d03fc534af7b9e32c422df26519a8e208f56b6e0c7a98da72cfd5da986bbb19c600562dd343f25357cf365ec3e4be206d7036b1d813b6c8 SHA512 ef501f3bda02fad46ab6b41261dbab964ddfc5afe9db0717e95e417dc9836858c6b6bec1942ae37e9f8cb9c2c7661acf032e15488aab5442dd072d41ec7e156f
diff --git a/sec-policy/selinux-dcc/selinux-dcc-2.20180114-r2.ebuild b/sec-policy/selinux-dcc/selinux-dcc-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..e6cabc4e2e37
--- /dev/null
+++ b/sec-policy/selinux-dcc/selinux-dcc-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 7d7eb206a34a..e6cabc4e2e37 100644
--- a/sec-policy/selinux-dcc/selinux-dcc-9999.ebuild
+++ b/sec-policy/selinux-dcc/selinux-dcc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-ddclient/Manifest b/sec-policy/selinux-ddclient/Manifest
index b9b9167dd891..b7d4335c4139 100644
--- a/sec-policy/selinux-ddclient/Manifest
+++ b/sec-policy/selinux-ddclient/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-ddclient-2.20170805-r2.ebuild 286 BLAKE2B 3ab331fbbcaa003749f0980
 EBUILD selinux-ddclient-2.20170805-r3.ebuild 286 BLAKE2B 3ab331fbbcaa003749f09803521dc4c6e31d0566a8da442c79dd55b242787e036a7e5377bdc8c7423b037b52be8ddaab4adaed6435b70250e4c1d05d1706e9da SHA512 a2fc27c07165180b3769432cf970d1be519ab318d613ba4018814ce6b53134a53d215f428d70be96b233b7e12b3ca019726c6034286e350f9af0c3db02dc2c17
 EBUILD selinux-ddclient-2.20170805-r4.ebuild 288 BLAKE2B 4d386ea3afd75bed1a417f5a7096e7e63442682f473c1dbc5a21227ebaf7484fefaf9605f198b1a4a7e81dec3f2281677e198286e6bdc4162f7158d2d8ba6e28 SHA512 8aa32b9852c6784c6ecdb9a60dd9e1c702b5ae63a72ad5c28de479c75de546fa04f04f4a40396aaeb991426eb94183c76911435ae7810374b2ec97ec7777a725
 EBUILD selinux-ddclient-2.20180114-r1.ebuild 286 BLAKE2B 338d213dc780376cf5e2aaa61540e84607e943779b2b80c97cc894a5eefc2238b1b317de0088e0215837ee5713d42e157c9209574b951ba849d3eb3e18364586 SHA512 98ddb9d72131d24e1ed8bf9ff8921e2642fb31733bdbdf4ef1b58ed20be335eee78878b07639bb4413f5540829d4f70fde80729dbb8a708c9b4bc4ca5be8b2ab
-EBUILD selinux-ddclient-9999.ebuild 288 BLAKE2B 4d386ea3afd75bed1a417f5a7096e7e63442682f473c1dbc5a21227ebaf7484fefaf9605f198b1a4a7e81dec3f2281677e198286e6bdc4162f7158d2d8ba6e28 SHA512 8aa32b9852c6784c6ecdb9a60dd9e1c702b5ae63a72ad5c28de479c75de546fa04f04f4a40396aaeb991426eb94183c76911435ae7810374b2ec97ec7777a725
+EBUILD selinux-ddclient-2.20180114-r2.ebuild 288 BLAKE2B c137f635c72af1aa7a12c98cd91726e67ec23c2328973fa2b040e464ebec7c0ad3ca80c91b70fe4b99db3429f607e4d1ef07b65f99cee5bf4ea5fdd2d55fb830 SHA512 d7b959dad37b060cd2761883dba91e2a9aa8dc4c47325dd6617104771da03d428a08568fcb7ac9ef35e9d74ade08b742bd50c0d8a27e6da51d9d6d5da5d1906b
+EBUILD selinux-ddclient-9999.ebuild 288 BLAKE2B c137f635c72af1aa7a12c98cd91726e67ec23c2328973fa2b040e464ebec7c0ad3ca80c91b70fe4b99db3429f607e4d1ef07b65f99cee5bf4ea5fdd2d55fb830 SHA512 d7b959dad37b060cd2761883dba91e2a9aa8dc4c47325dd6617104771da03d428a08568fcb7ac9ef35e9d74ade08b742bd50c0d8a27e6da51d9d6d5da5d1906b
 MISC metadata.xml 318 BLAKE2B 26ca491ead35c7aa0e490849739e7eb814815cdac8d86980667b69cdb9751a640fe4b3fc50a74c5a1ba897b68b6a9ce57e745bec1f24a0bd7d679597152db4a4 SHA512 e02add998ae60515272a524c40bc4fc3f31d2ea91f1690badb7c8fee19a99f0b84d4909f04c4e0f65af614a295e1177ddad05479dfd5b9f3ab620cc536b7dc40
diff --git a/sec-policy/selinux-ddclient/selinux-ddclient-2.20180114-r2.ebuild b/sec-policy/selinux-ddclient/selinux-ddclient-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..a4a614ec0441
--- /dev/null
+++ b/sec-policy/selinux-ddclient/selinux-ddclient-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 ddf11df4075d..a4a614ec0441 100644
--- a/sec-policy/selinux-ddclient/selinux-ddclient-9999.ebuild
+++ b/sec-policy/selinux-ddclient/selinux-ddclient-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-ddcprobe/Manifest b/sec-policy/selinux-ddcprobe/Manifest
index 6c5064c76d03..6e887a13abe2 100644
--- a/sec-policy/selinux-ddcprobe/Manifest
+++ b/sec-policy/selinux-ddcprobe/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-ddcprobe-2.20170805-r2.ebuild 286 BLAKE2B 2d7a7d67b2e1f734b4f3483
 EBUILD selinux-ddcprobe-2.20170805-r3.ebuild 286 BLAKE2B 2d7a7d67b2e1f734b4f34831a91c312684edfad5433e46ca6a4f0a56e93642004d0548002a58d59abc8d752a0fdc61b5d8b98b79caa007a23116f55c3ed8492e SHA512 4ccf5ae0099d08d7531760d08856d81750d7f70703e7e5411420786806deceae81b988f515a49b3caf08bd0cd37292fdbe887ef2a8faa6578838634a64383a45
 EBUILD selinux-ddcprobe-2.20170805-r4.ebuild 288 BLAKE2B f97747f27b1b8eefeecee6f6cda449ceb91f3402f7745c88d13296350179be5082025fad421778778140bbe5facdf7dddf7ff8dcef9fbf3cd0a4906dd9d2a9e7 SHA512 6fcbca94028ecee22f9f25526e19f4cd468f79773273432689864d723886a6b5f4ada57bea9da738eb6dc6c1d95bac63a2a416a39c1bcfe509ad979a4ca76b41
 EBUILD selinux-ddcprobe-2.20180114-r1.ebuild 286 BLAKE2B bbfab612c0c6368f8aadea60b74a4cf84ea696318a9628b951773efe7ee6c232ae73d317d7d9552b97e106b2d1d7b287e28dddbad8ae905b3b573d6ca8138916 SHA512 65aa9c28d83fcd58e54921821a3377a760ee3ed9b9ce5e32a1a928f9b243c944736906758a1a4c8d585c52f6e72c4814976ea089abac5f6d98cf3eb575bf4b92
-EBUILD selinux-ddcprobe-9999.ebuild 288 BLAKE2B f97747f27b1b8eefeecee6f6cda449ceb91f3402f7745c88d13296350179be5082025fad421778778140bbe5facdf7dddf7ff8dcef9fbf3cd0a4906dd9d2a9e7 SHA512 6fcbca94028ecee22f9f25526e19f4cd468f79773273432689864d723886a6b5f4ada57bea9da738eb6dc6c1d95bac63a2a416a39c1bcfe509ad979a4ca76b41
+EBUILD selinux-ddcprobe-2.20180114-r2.ebuild 288 BLAKE2B b735650b27f7d7736887098b4cb69a475b148ecf09061df30fa747308b698e2464a3dbdc8de62a2075b0372f906630b7008e211bcf6cc1b191f0d088543dd5ab SHA512 ce1a8ec4404f27ebb6088a602aa86ff9a9c533f1cde08dbb8edf03b80a600fca976884a9cf974e0cb0283f6c56e932056445c6c621cf5df46dc71833d1de15ae
+EBUILD selinux-ddcprobe-9999.ebuild 288 BLAKE2B b735650b27f7d7736887098b4cb69a475b148ecf09061df30fa747308b698e2464a3dbdc8de62a2075b0372f906630b7008e211bcf6cc1b191f0d088543dd5ab SHA512 ce1a8ec4404f27ebb6088a602aa86ff9a9c533f1cde08dbb8edf03b80a600fca976884a9cf974e0cb0283f6c56e932056445c6c621cf5df46dc71833d1de15ae
 MISC metadata.xml 318 BLAKE2B 8ea59d3e7d74b92ef2e32b967e9606e80fe4ff72bebea772eb272e578c70d9e4562aa31c0efef3288dd584aaca119ad379180256f1f4003d0012e5da3a69af76 SHA512 70b987e8cfc216fc7f312aee7a1b4dea757f886dac76ebfcd6dd367b2454d02ff6dee1b11c16324cf3c5c005fdf6d74a209503d82c74b1472275ac059d99498d
diff --git a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20180114-r2.ebuild b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..7610bd34daae
--- /dev/null
+++ b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 570d37c13b71..7610bd34daae 100644
--- a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-9999.ebuild
+++ b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-denyhosts/Manifest b/sec-policy/selinux-denyhosts/Manifest
index 8a23459c6608..fe696071b4d1 100644
--- a/sec-policy/selinux-denyhosts/Manifest
+++ b/sec-policy/selinux-denyhosts/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-denyhosts-2.20170805-r2.ebuild 288 BLAKE2B 1b0a6e27b69fb106756669
 EBUILD selinux-denyhosts-2.20170805-r3.ebuild 288 BLAKE2B 1b0a6e27b69fb10675666963d101afe32190401be6e5a71c2f69316ed419d696106123e6dc080dcaec273293008d0f19415393856a7bb3d58ab792b0bcd9fd6a SHA512 fa24859870763b68e0e4112e61a1a4aed0047a6c5793b264d5eb0eeedd46182e7a9006927969158bf09504bbc6f132413fbfbd20276129532d9c69351343d9ed
 EBUILD selinux-denyhosts-2.20170805-r4.ebuild 290 BLAKE2B 574757e3b1f4907e832c8a6ad0fda2799c57a0672cc9673a1baf2884eed99f1f81c3c2876b84a688aa6422ef9f000e9d63dc5c5c508941388b26b616678210fc SHA512 d6461fe5594de0a81bb7ff107a28b98b1e44143d127210b61102a6648c30cbf5ff3fa395b0b7aa97c15956c3dc852f85e6b01613effc1e85bd08535e8e446b48
 EBUILD selinux-denyhosts-2.20180114-r1.ebuild 288 BLAKE2B 1094017dd669f3ee74866ddd795cdda48cd23f09c8f7880c84926e9247428a5110330187e3987fe421f5300e5ae108d913d917b2357fc1f54a8ae23af6859fa0 SHA512 dfef3cb1c9e2caef526015f63c4cc3f20deda28b89afd87de2bcd28a41ea2f38ac5291a3a22e42f747c25776fa78c0ecb02719b9b2a24447281a7479a2999030
-EBUILD selinux-denyhosts-9999.ebuild 290 BLAKE2B 574757e3b1f4907e832c8a6ad0fda2799c57a0672cc9673a1baf2884eed99f1f81c3c2876b84a688aa6422ef9f000e9d63dc5c5c508941388b26b616678210fc SHA512 d6461fe5594de0a81bb7ff107a28b98b1e44143d127210b61102a6648c30cbf5ff3fa395b0b7aa97c15956c3dc852f85e6b01613effc1e85bd08535e8e446b48
+EBUILD selinux-denyhosts-2.20180114-r2.ebuild 290 BLAKE2B 5f5c8a011471dbdb5e7128e07cf5c7150d123a020ad4c4a1b2df38392e60406392092df2a9471d76f300e74c37092527c23320e3230ce7afbcda576c37857e9f SHA512 c31002c0ebf564498c5138ce2fca6ebf7036970ad0e02d073d34e8fcf6173e5ff53be9058ace87c27115f05a286239389be53061da6598a22b32926d20daa5a2
+EBUILD selinux-denyhosts-9999.ebuild 290 BLAKE2B 5f5c8a011471dbdb5e7128e07cf5c7150d123a020ad4c4a1b2df38392e60406392092df2a9471d76f300e74c37092527c23320e3230ce7afbcda576c37857e9f SHA512 c31002c0ebf564498c5138ce2fca6ebf7036970ad0e02d073d34e8fcf6173e5ff53be9058ace87c27115f05a286239389be53061da6598a22b32926d20daa5a2
 MISC metadata.xml 319 BLAKE2B 43810ff5ba18ac57ea1aeee013566f684ecc5e747cad3b555b4a35991118c03b1022a08684266ee115aa9b5df3f038d24d42f2e23542b1b4446a2549d5b1a904 SHA512 b1f81195c4854d94076bf7a5117c4191ba41a58acc7a8922c0a8aecf5ea7ebed3e870c1dfaee33b4be5906a7c420ca6362c4e782304309b74ca769b56054dc80
diff --git a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20180114-r2.ebuild b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..877366a77e16
--- /dev/null
+++ b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 bfa1effa9131..877366a77e16 100644
--- a/sec-policy/selinux-denyhosts/selinux-denyhosts-9999.ebuild
+++ b/sec-policy/selinux-denyhosts/selinux-denyhosts-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-devicekit/Manifest b/sec-policy/selinux-devicekit/Manifest
index b1d4c9a1efcd..c3f0c92f0419 100644
--- a/sec-policy/selinux-devicekit/Manifest
+++ b/sec-policy/selinux-devicekit/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-devicekit-2.20170805-r2.ebuild 381 BLAKE2B d55473d87c2d1d91865f23
 EBUILD selinux-devicekit-2.20170805-r3.ebuild 381 BLAKE2B d55473d87c2d1d91865f2317e940d710a21673baf7f6d1c6e3c63c1dd5f5183836ae1f92b5fa903c638e1201403c38977de5490a15b4731deaa410add4134423 SHA512 b7d5c5cc4581ee80d9ee8d5388fe589e3427ec20f23c1bc07b5ff33ecc7c4fe33830dc60807ce7bfc08f9a8de8b8fbac7ae10417c639c9c06901b37d831f0281
 EBUILD selinux-devicekit-2.20170805-r4.ebuild 383 BLAKE2B 5199757ced2ed584321e575dae80012cb4d0ec29709655eececa18f2c77a0d57bd1696b73803c69d79f130c759204ff8ae4d2637e66c1e9ae6b6195ddbb4f428 SHA512 3b73da7e828fd7fb63a2c410a45f7ed52af1a8fab3479bcaf95fdd9d6a33dcc7e7b314daca172f62952f0b7d2d77b0e25f73576334b5b0e99bb5a2b5572ef975
 EBUILD selinux-devicekit-2.20180114-r1.ebuild 381 BLAKE2B 7dd3552901f3837fb5f6e240026381fb20dee57bcf7a8689363e098f6e274d8cd845ce7a0ba3533840c5f526ae496b32d82fa578c6deb3e54e9a665a2f2eda6b SHA512 2a6942fc46e05cebec4222d2d23e959a455365ab055fd9f8389baf6a56be2ddd918d7c2dac822b1af1b92fb45380a2001f65a76dcdea4787666a0f661b5cdeda
-EBUILD selinux-devicekit-9999.ebuild 383 BLAKE2B 5199757ced2ed584321e575dae80012cb4d0ec29709655eececa18f2c77a0d57bd1696b73803c69d79f130c759204ff8ae4d2637e66c1e9ae6b6195ddbb4f428 SHA512 3b73da7e828fd7fb63a2c410a45f7ed52af1a8fab3479bcaf95fdd9d6a33dcc7e7b314daca172f62952f0b7d2d77b0e25f73576334b5b0e99bb5a2b5572ef975
+EBUILD selinux-devicekit-2.20180114-r2.ebuild 383 BLAKE2B 33eb2481cef9fa92b2e9e8dfdb4765b83f3e3e8ac849224427c0fa13f14d27a1b6f96090a5ab4ee0fc6fe76fe8d373b5428b1c96b010d1df8c6172be25bb955f SHA512 bf74814b616c938a0d8379a33425e7ba81586d8f9226119a8d6f8fc93537aeec72d3539530221f886ddf16215f0d95a4f5b44ef7cecbb0a39a6938c3df79b7c6
+EBUILD selinux-devicekit-9999.ebuild 383 BLAKE2B 33eb2481cef9fa92b2e9e8dfdb4765b83f3e3e8ac849224427c0fa13f14d27a1b6f96090a5ab4ee0fc6fe76fe8d373b5428b1c96b010d1df8c6172be25bb955f SHA512 bf74814b616c938a0d8379a33425e7ba81586d8f9226119a8d6f8fc93537aeec72d3539530221f886ddf16215f0d95a4f5b44ef7cecbb0a39a6938c3df79b7c6
 MISC metadata.xml 319 BLAKE2B 19df3379053729b3be3174b80bd4df6ab786b63d2314672280e8d05804291099de6305de7a3d48b4f36fb3160f56b7196738387489e23acdaf155bfd4d97dcdc SHA512 050e2d0054e24c19050680c508a5e92d1d452a36ea729cc92fd503a66ea58b0a8a67c002684c8a7ea7a93c0562b518ec5f51df62007f0d1643a335cab86a9275
diff --git a/sec-policy/selinux-devicekit/selinux-devicekit-2.20180114-r2.ebuild b/sec-policy/selinux-devicekit/selinux-devicekit-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..8635987d27c4
--- /dev/null
+++ b/sec-policy/selinux-devicekit/selinux-devicekit-2.20180114-r2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 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 7fe49468301f..8635987d27c4 100644
--- a/sec-policy/selinux-devicekit/selinux-devicekit-9999.ebuild
+++ b/sec-policy/selinux-devicekit/selinux-devicekit-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-dhcp/Manifest b/sec-policy/selinux-dhcp/Manifest
index 97473787bb09..8215bfa5bdbf 100644
--- a/sec-policy/selinux-dhcp/Manifest
+++ b/sec-policy/selinux-dhcp/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-dhcp-2.20170805-r2.ebuild 278 BLAKE2B 8d1d696761ffd3bc19e38cb7b05
 EBUILD selinux-dhcp-2.20170805-r3.ebuild 278 BLAKE2B 8d1d696761ffd3bc19e38cb7b05e03db3f008c849cdac5f9c5d9424391aa2ef95cef22358356aa0aee125020d8d59d9e3e438ba8d76ee9a2912decdd5898490a SHA512 cd3a108de1d88e1a0dc2182c68a768ba6639123cb7ad0d1063a8de310d43d6132c69161439414da1e113cecf89eec36bc50195492f19483182e917f4c84445a2
 EBUILD selinux-dhcp-2.20170805-r4.ebuild 280 BLAKE2B 8c63bb06ed3c16626171d33e7c365afaedfe958619b58cbfc68043964ec95f829f1dd61508529d8f1e5e1f7405d7d92fbaa8cf287031e4b5ca14265b62e22d4e SHA512 58cd17a389f588c818941d1f1962b5876a5939e872c2eef89e0318e8c9a26d604de65c1a3ad311bb5ff7127edde70a1e1ff86357bd3f9f1adb8f0128a47344ed
 EBUILD selinux-dhcp-2.20180114-r1.ebuild 278 BLAKE2B 9f0eda59a11601f44c28594214e410841902567f0bdc76a162b3acfaf1556178eaee4001cd2c75ba8eca431e52991b5240886cc962b42fc028b07bc064d9c24b SHA512 b81c962fd2d9c09e41da581ca69f919735466e7f8c00cf17ebb058a09bd2ebc0717f817641bb56cb08f3127aa062d4e05a9a232dae9fa48019a340b3892cd101
-EBUILD selinux-dhcp-9999.ebuild 280 BLAKE2B 8c63bb06ed3c16626171d33e7c365afaedfe958619b58cbfc68043964ec95f829f1dd61508529d8f1e5e1f7405d7d92fbaa8cf287031e4b5ca14265b62e22d4e SHA512 58cd17a389f588c818941d1f1962b5876a5939e872c2eef89e0318e8c9a26d604de65c1a3ad311bb5ff7127edde70a1e1ff86357bd3f9f1adb8f0128a47344ed
+EBUILD selinux-dhcp-2.20180114-r2.ebuild 280 BLAKE2B 3058fd05c8d75e97ff981125bb72361029878c8811d25ce8c944d471fd2a6637faa0f3bc3ab4ebee784b6040a59d5ed62d337e207dd8169d035b24ec5b3bbc70 SHA512 3ce114cec139382112a643755141a9fa7fe760817b90ce14627745cbcfd2361464dcc8badcfb6299237bca594f1574c54d68223f86d4f228fc688e39ac78d30e
+EBUILD selinux-dhcp-9999.ebuild 280 BLAKE2B 3058fd05c8d75e97ff981125bb72361029878c8811d25ce8c944d471fd2a6637faa0f3bc3ab4ebee784b6040a59d5ed62d337e207dd8169d035b24ec5b3bbc70 SHA512 3ce114cec139382112a643755141a9fa7fe760817b90ce14627745cbcfd2361464dcc8badcfb6299237bca594f1574c54d68223f86d4f228fc688e39ac78d30e
 MISC metadata.xml 314 BLAKE2B 7c9ade7ecfc9dff591107acbc0173d499c623147232bbd1d813d54e8d416fad826015c68c0796deba6bcf57f14af972c9c25af14d85d639a37f4abf50d4dacfc SHA512 40ea84ff6d5136b2da274d6a300e6c3daa1fdcbc7df92538895e071c37c2cbb6520949c4cf42ff9056dff84ff773e042748e6b8fc07d9253cb8ef5542001931b
diff --git a/sec-policy/selinux-dhcp/selinux-dhcp-2.20180114-r2.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..75aea97a567e
--- /dev/null
+++ b/sec-policy/selinux-dhcp/selinux-dhcp-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 520dbcd29dc2..75aea97a567e 100644
--- a/sec-policy/selinux-dhcp/selinux-dhcp-9999.ebuild
+++ b/sec-policy/selinux-dhcp/selinux-dhcp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-dictd/Manifest b/sec-policy/selinux-dictd/Manifest
index 2a7c1fd34838..171e0a0a9b58 100644
--- a/sec-policy/selinux-dictd/Manifest
+++ b/sec-policy/selinux-dictd/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-dictd-2.20170805-r2.ebuild 280 BLAKE2B 0e98cef7ff83fe25d661424896
 EBUILD selinux-dictd-2.20170805-r3.ebuild 280 BLAKE2B 0e98cef7ff83fe25d66142489657417d4f6e80096c76426f334a01619803fb02482aceda36cae52855b3beeeb7964bce15e0709bf1c3df288aebd9ce519a33ed SHA512 aad88ffa0de3ceccc46f0120b922b463e73dbb8649697baca6bedd0d63911e3392fe960aaa04e340753d1e7d01607b898ab5da84ec6b1cf0ecc78b4fc8fa9552
 EBUILD selinux-dictd-2.20170805-r4.ebuild 282 BLAKE2B 65546c4a04b853d43f2c734ddc26307136e590d8dced4735052eff442b176420de4f504b78cd44dab7d6c36a2489c82334fe86bfa4f2376c5cfe4b393468d158 SHA512 a5af417f0329bc8939f6e20b53dafcf09bd16abf8729ee352540471c087abf49f638306a1e0f5a24536cefe3567b101570d0fbd2671c9287b0cb91d0da4e41c2
 EBUILD selinux-dictd-2.20180114-r1.ebuild 280 BLAKE2B 2086dc6befd36106b3ee1c642e27f744f4d1d1d69e98d4a876a50daadb113492504268dd8b2cba3a61d4a8e8a1e1d47beee9e025e159d23bf106a87b74f7a856 SHA512 c427e4a692bb22dcc7329933ac94c4c4742d2c706fcd5025b00aae9f50439a2b826cf1f9f6f1cf430260ffded055dc2a7181fe8028611be8f83160d56d68a3f2
-EBUILD selinux-dictd-9999.ebuild 282 BLAKE2B 65546c4a04b853d43f2c734ddc26307136e590d8dced4735052eff442b176420de4f504b78cd44dab7d6c36a2489c82334fe86bfa4f2376c5cfe4b393468d158 SHA512 a5af417f0329bc8939f6e20b53dafcf09bd16abf8729ee352540471c087abf49f638306a1e0f5a24536cefe3567b101570d0fbd2671c9287b0cb91d0da4e41c2
+EBUILD selinux-dictd-2.20180114-r2.ebuild 282 BLAKE2B ef297e319462589561b3c028b133c674c16e543af852e328fb22a2a1f7c18a8f824ed1ed4e4bc7979ffeb0237638dc1667c9dff366f8db12c355ff48b2172b33 SHA512 64603ce15f5e0956645fe7262a68aaf908aaea559a9ce2063dcf06945f3511046b63b58116a251517eeee08bd5cc6e7daae0ef2f2447c96d2b35d8a4ee0a52c9
+EBUILD selinux-dictd-9999.ebuild 282 BLAKE2B ef297e319462589561b3c028b133c674c16e543af852e328fb22a2a1f7c18a8f824ed1ed4e4bc7979ffeb0237638dc1667c9dff366f8db12c355ff48b2172b33 SHA512 64603ce15f5e0956645fe7262a68aaf908aaea559a9ce2063dcf06945f3511046b63b58116a251517eeee08bd5cc6e7daae0ef2f2447c96d2b35d8a4ee0a52c9
 MISC metadata.xml 315 BLAKE2B 6c3cb785d70993fdc4d2adaf234fb780b86279256a852cf5102134d51db57eebecedb3dc09e05bf527f80287ce40656a0c6c05885ad0f8e80e4fa139f51ddc4b SHA512 02c4865816cef6be48361eae1ae305c74b1c0808a4f56b5eb8d2ac31526eed898d6b4d506ed7c649d387c0cb10f4915289a218dfe40b78a3ca14f613a39f4157
diff --git a/sec-policy/selinux-dictd/selinux-dictd-2.20180114-r2.ebuild b/sec-policy/selinux-dictd/selinux-dictd-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..2d32bb503a41
--- /dev/null
+++ b/sec-policy/selinux-dictd/selinux-dictd-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 dd7cf2f34df0..2d32bb503a41 100644
--- a/sec-policy/selinux-dictd/selinux-dictd-9999.ebuild
+++ b/sec-policy/selinux-dictd/selinux-dictd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-dirmngr/Manifest b/sec-policy/selinux-dirmngr/Manifest
index f578552e700c..2eec037d0052 100644
--- a/sec-policy/selinux-dirmngr/Manifest
+++ b/sec-policy/selinux-dirmngr/Manifest
@@ -1,8 +1,10 @@
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
 EBUILD selinux-dirmngr-2.20170805-r4.ebuild 286 BLAKE2B 3c3a2d2ac3fa330bb32ba8d515bdcf299f1ab868d5d23a6affb41ef06e485ff07cb9a0e08ef8a59a24d47cd7bf72b7e6b4825b7469a38ec2a1beaaee603ab06e SHA512 ed9eaeac9b671f7156da80bb4552ddd1844b5edefe9eecf2cc537b834ef05e84d4fbc373ae7b28870ed040916f2590066e44f5ec95dda6227d95edb0a2846c96
 EBUILD selinux-dirmngr-2.20180114-r1.ebuild 284 BLAKE2B 6ee47587b4ae99a401207a275a669b11bab2017c4fc35ed7b34945453f5230ff7f9d7a172b017f327ce62daab5f2bd318771c98a7c30f88083ea9b7279d1f328 SHA512 5854039cd68edafe1f88ea317a9e26907e80275cbfdfbabf1a016d95b4a32f4cc9ba000f8d1c595485a8f826ae442b796adc69bea56bb02d3fc5079b1dc5bbfe
-EBUILD selinux-dirmngr-9999.ebuild 286 BLAKE2B 3c3a2d2ac3fa330bb32ba8d515bdcf299f1ab868d5d23a6affb41ef06e485ff07cb9a0e08ef8a59a24d47cd7bf72b7e6b4825b7469a38ec2a1beaaee603ab06e SHA512 ed9eaeac9b671f7156da80bb4552ddd1844b5edefe9eecf2cc537b834ef05e84d4fbc373ae7b28870ed040916f2590066e44f5ec95dda6227d95edb0a2846c96
+EBUILD selinux-dirmngr-2.20180114-r2.ebuild 286 BLAKE2B 15ac5a4fbd7ed62ad6129fd6e04d6510532301c49ae76ddddc836956565abd03de09c67ccf89733b4f989e02f283054e6cd4dbc47e9c205b74c7884476728ff0 SHA512 aa51a91e468ac42b476ec82c5a31e2474c2cc94428d7cf5244e94b31e73debdfbb12698788ba45dc1de5ea7f24475b4d75d5f6d14e99eaeba02facc5e966ad17
+EBUILD selinux-dirmngr-9999.ebuild 286 BLAKE2B 15ac5a4fbd7ed62ad6129fd6e04d6510532301c49ae76ddddc836956565abd03de09c67ccf89733b4f989e02f283054e6cd4dbc47e9c205b74c7884476728ff0 SHA512 aa51a91e468ac42b476ec82c5a31e2474c2cc94428d7cf5244e94b31e73debdfbb12698788ba45dc1de5ea7f24475b4d75d5f6d14e99eaeba02facc5e966ad17
 MISC metadata.xml 317 BLAKE2B 797c5e5f1c668c0528e160b2c254f8253f6e09bfa6e7ab92187d9d980c20eea9d8bc55744137f6e0ee3b3fee3625ed36edb12a61bc9e6df1bf4619f351800f59 SHA512 059adc0970cb771c2025a010952755316b64d534921fa68acfd93534db445e44abee7e29554471e2d17d3b7eb7c8cea8603358812e3875f66633938f6b5ba553
diff --git a/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20180114-r2.ebuild b/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..0416233eb076
--- /dev/null
+++ b/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="dirmngr"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dirmngr"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-dirmngr/selinux-dirmngr-9999.ebuild b/sec-policy/selinux-dirmngr/selinux-dirmngr-9999.ebuild
index 83febaf24086..0416233eb076 100644
--- a/sec-policy/selinux-dirmngr/selinux-dirmngr-9999.ebuild
+++ b/sec-policy/selinux-dirmngr/selinux-dirmngr-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-dirsrv/Manifest b/sec-policy/selinux-dirsrv/Manifest
index add8e02be19b..59bcd8accd55 100644
--- a/sec-policy/selinux-dirsrv/Manifest
+++ b/sec-policy/selinux-dirsrv/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-dirsrv-2.20170805-r2.ebuild 282 BLAKE2B 916398e7c9881cedc1a1ff822
 EBUILD selinux-dirsrv-2.20170805-r3.ebuild 282 BLAKE2B 916398e7c9881cedc1a1ff822d83e62bf2a4e08df977a1ede9ddcdd9d58c6a071e9f552a7e511a23be498b7f12aead2287aaa956c60dd38a1466c5fbfe8ef7b3 SHA512 324337fc9a497bd592b06b0c338e98815e153f5abd54a6e326bbc33723ad601af2b072e8512e03aacb65c760480f7b559bf28a1dd4ffba1c33b871b4481330ff
 EBUILD selinux-dirsrv-2.20170805-r4.ebuild 284 BLAKE2B a4aca060eeef99a8b53baecde23629370d840c921a9ec24ea5f4fbaaf767a12b2a5cc2870580375a07a93c5158bb2b620f0915fd2793f33c0ef47ccecfe0d400 SHA512 1cdd5c18721c8ca813ebae53d74c4f01ba5df84899383ea9b3320f78a1c77bcce98d8256fd3a67c6f82655270f00d95553fb186043c71278dbc1e7246072a135
 EBUILD selinux-dirsrv-2.20180114-r1.ebuild 282 BLAKE2B b28d95175d198b46784aaff8ca5ce09f222db8056e5cf5cfa0d0d10aa63cf7fea3c0b5d9ee429725edb44845856769d4a6eb107d65da9a1786ccc3f797fc97ff SHA512 817e44ba301c2b96a01fa072f0ca867f3b7ed0fea29b0f139c2ac32b0f8169dd77573d309a2cb510b7372e4e81ed7665c114f062bb010a196086da3609de7140
-EBUILD selinux-dirsrv-9999.ebuild 284 BLAKE2B a4aca060eeef99a8b53baecde23629370d840c921a9ec24ea5f4fbaaf767a12b2a5cc2870580375a07a93c5158bb2b620f0915fd2793f33c0ef47ccecfe0d400 SHA512 1cdd5c18721c8ca813ebae53d74c4f01ba5df84899383ea9b3320f78a1c77bcce98d8256fd3a67c6f82655270f00d95553fb186043c71278dbc1e7246072a135
+EBUILD selinux-dirsrv-2.20180114-r2.ebuild 284 BLAKE2B 2cca4f21340ef6c962f96f15f5d108fc5888afc26ebc282199b0ff8707c116ecb6302c3a41393ce44c2cc30871bed87eb780506e111b560af13e00cf6053af8e SHA512 831ffac89dd9b11ba8c916f612ae26f6d6ce375825157375df1176cb6d5bf6bd4a34b96061b7e9f740275a4442e69585f8f3fefb9819ba515b1613ccfd838117
+EBUILD selinux-dirsrv-9999.ebuild 284 BLAKE2B 2cca4f21340ef6c962f96f15f5d108fc5888afc26ebc282199b0ff8707c116ecb6302c3a41393ce44c2cc30871bed87eb780506e111b560af13e00cf6053af8e SHA512 831ffac89dd9b11ba8c916f612ae26f6d6ce375825157375df1176cb6d5bf6bd4a34b96061b7e9f740275a4442e69585f8f3fefb9819ba515b1613ccfd838117
 MISC metadata.xml 316 BLAKE2B d5958060111e46d47e53c36a8465a3fcdc63cfb433b2236c7d7b60aea0f72c9a33a72f5fedd8f418f20fbd3be4080ae1252cba9968ce142d9385cdf13bb458c8 SHA512 9392b125315ce8aaeac508910a071d09007a8cf56fbeaf82a935af65958599622d3eeef89eef93c72e2cac81582a4d1dc5ddace14e255764db5df80d9553cb50
diff --git a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20180114-r2.ebuild b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..a55356877e2a
--- /dev/null
+++ b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 5192f6530f14..a55356877e2a 100644
--- a/sec-policy/selinux-dirsrv/selinux-dirsrv-9999.ebuild
+++ b/sec-policy/selinux-dirsrv/selinux-dirsrv-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-distcc/Manifest b/sec-policy/selinux-distcc/Manifest
index 802b79fe3418..73be4879d881 100644
--- a/sec-policy/selinux-distcc/Manifest
+++ b/sec-policy/selinux-distcc/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-distcc-2.20170805-r2.ebuild 282 BLAKE2B 689ec6ab9971c350cbcb93d06
 EBUILD selinux-distcc-2.20170805-r3.ebuild 282 BLAKE2B 689ec6ab9971c350cbcb93d062a9841a16d1f3b1654e28c755c0215f07832b8bb4ad9bfd2b683ba2152dc552268ad58b2d8e96fc8c3697478ee1f6d2698d06a3 SHA512 aef164f27845c9d60a3687fb86830e9cb79894ef56cdd0f47eba595e7c01936d877a66ebe07a898bfae665af6a5495f9a41f7c442fb1c90310592d68ddcda425
 EBUILD selinux-distcc-2.20170805-r4.ebuild 284 BLAKE2B d415c0e0e239a9ee7be0b8ee3154d5158ffa0bd86a3cec0fd1ef3aa723cfafaa25ba66624b1855f36344dda9e2504906b6f613492da0cb8789f9ab21ebc65458 SHA512 13edfc37c4d512915db725ba4dbb7ecad9646532bd20f63340d2fbac8785d3c52232aafb28c3a94c0b472a10da4076e05d9b4b72a04f64b00b091fa2b6ccd619
 EBUILD selinux-distcc-2.20180114-r1.ebuild 282 BLAKE2B 10da4486447142b592fdf68ed059c1cab8408cedeef5cda795d1f03a80cef4e6323e81275790570efe92ca1502f266e586faadf307766f2eb17e55965dfa3b79 SHA512 13151cec63fb66c6e1b5f4c8103d0ce654fdb368dfb24e63f83b4b6dc097b8be779b303e1c5a8a51b9f7753480e112fa57e3e7ca29f20442507d81306dd57871
-EBUILD selinux-distcc-9999.ebuild 284 BLAKE2B d415c0e0e239a9ee7be0b8ee3154d5158ffa0bd86a3cec0fd1ef3aa723cfafaa25ba66624b1855f36344dda9e2504906b6f613492da0cb8789f9ab21ebc65458 SHA512 13edfc37c4d512915db725ba4dbb7ecad9646532bd20f63340d2fbac8785d3c52232aafb28c3a94c0b472a10da4076e05d9b4b72a04f64b00b091fa2b6ccd619
+EBUILD selinux-distcc-2.20180114-r2.ebuild 284 BLAKE2B a849739206390224313fd788c68164e22a729ea6b781db6491f5186dafa40dbc6c8afcf71500a72d15ea05efbe56a8cdb69ac9114e6d15873df79cba5b38af97 SHA512 32b82946a439e730f86d45652bf73f3b6a6d3f1414cf6be29f2da63319be171df81102ce4832f6f5ea0635153e152bd824d60ef687a3b60bd50eeace4c9bd690
+EBUILD selinux-distcc-9999.ebuild 284 BLAKE2B a849739206390224313fd788c68164e22a729ea6b781db6491f5186dafa40dbc6c8afcf71500a72d15ea05efbe56a8cdb69ac9114e6d15873df79cba5b38af97 SHA512 32b82946a439e730f86d45652bf73f3b6a6d3f1414cf6be29f2da63319be171df81102ce4832f6f5ea0635153e152bd824d60ef687a3b60bd50eeace4c9bd690
 MISC metadata.xml 316 BLAKE2B 8f0a143701ede64165bd298ad78e39d6aa50d3dcc078928ded40470022d1a88ba72f685acccba96f7d14f2e8514d29e06d22639bd7f88da33f19338b05376f69 SHA512 d11cb8bc6cf54e4c1ba0e2e00ef18db5c5a91e3138347156c04b2e4bc9cd002220c5406d19020993746fa41014b85e80d779a82a80c2db01b8bae02aea6d1fa4
diff --git a/sec-policy/selinux-distcc/selinux-distcc-2.20180114-r2.ebuild b/sec-policy/selinux-distcc/selinux-distcc-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..111905d35fc6
--- /dev/null
+++ b/sec-policy/selinux-distcc/selinux-distcc-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 3c4706bd83ad..111905d35fc6 100644
--- a/sec-policy/selinux-distcc/selinux-distcc-9999.ebuild
+++ b/sec-policy/selinux-distcc/selinux-distcc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-djbdns/Manifest b/sec-policy/selinux-djbdns/Manifest
index dc8668631d40..e62bea2701ae 100644
--- a/sec-policy/selinux-djbdns/Manifest
+++ b/sec-policy/selinux-djbdns/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-djbdns-2.20170805-r2.ebuild 446 BLAKE2B d3d0d7ad10785a58ae3ed40ac
 EBUILD selinux-djbdns-2.20170805-r3.ebuild 446 BLAKE2B d3d0d7ad10785a58ae3ed40ac1fcb9d2c8aa45d52a12f0deca05ebd8eee370987e703b24d4c1fc4cd5011aadfb0eb613f9d97de12d16386b1a23f6005f395eef SHA512 f2a351d846917e15918a79df6f30d5ca9bf037401bd4cc385d0e1fb41fd8ad8996169fd23dc439cc301812d82b026b76411861640ca76d49888d976df1e0b87c
 EBUILD selinux-djbdns-2.20170805-r4.ebuild 448 BLAKE2B 1025c4c28d7a13c305706fc75c66d1afcc300623e0ef12ee130302783921c56a3ec5491e77d29178bdd7b0610d2b5c909229a1e46ec2553436ccbeb5fc8dd512 SHA512 765262cd6c4e0d260aa609166b23dee4103ac456355fd95498b209e01d1186cf189c472a0b6fdc1f20e9777830d8588419c3d424cf0a14bfe6b32f12825a222d
 EBUILD selinux-djbdns-2.20180114-r1.ebuild 446 BLAKE2B a81b22789f7e9d4f19d52a0923ca0c1ee5996bf94ab6d3b8dce8254f1e0598ce1b7e811f74106e037b581d8214c0efe0de594f8ba7ca6b6cc711b89d86a49272 SHA512 e4a10530455eac44c2b4be280477c4f1af4d64170e4650656574e8a297bdd97bd3028dffed0ed26794f77d6e44542f8e794a872f2691b383f0aff40209525abb
-EBUILD selinux-djbdns-9999.ebuild 448 BLAKE2B 1025c4c28d7a13c305706fc75c66d1afcc300623e0ef12ee130302783921c56a3ec5491e77d29178bdd7b0610d2b5c909229a1e46ec2553436ccbeb5fc8dd512 SHA512 765262cd6c4e0d260aa609166b23dee4103ac456355fd95498b209e01d1186cf189c472a0b6fdc1f20e9777830d8588419c3d424cf0a14bfe6b32f12825a222d
+EBUILD selinux-djbdns-2.20180114-r2.ebuild 448 BLAKE2B eb06001eb69da903bb9b5978da4aca9e29b30b0df5a1dff6a09f81e3ccaab73067c2f3fdb0de6b7c4696f45d54f1cf4132fc69e7fbde69af70428707dbe3cf32 SHA512 4f69a6e5a84a55cace93beb6c0ade83a58ce2007893546701d7132d610ac767e5f2f099c72709d160e98f2d748fed13bbf922ae30aeaefb74ab6dc36878da42c
+EBUILD selinux-djbdns-9999.ebuild 448 BLAKE2B eb06001eb69da903bb9b5978da4aca9e29b30b0df5a1dff6a09f81e3ccaab73067c2f3fdb0de6b7c4696f45d54f1cf4132fc69e7fbde69af70428707dbe3cf32 SHA512 4f69a6e5a84a55cace93beb6c0ade83a58ce2007893546701d7132d610ac767e5f2f099c72709d160e98f2d748fed13bbf922ae30aeaefb74ab6dc36878da42c
 MISC metadata.xml 316 BLAKE2B 94ad6fd295fcdec5d40784cb276b30d35ce1c9a4aa3dd4840b80b7ec51077b72d1c1e886219ef76040617bedf30f875823d3b89ac2a467205b53770788c35f82 SHA512 7431b1e50c034acffe00d3aabdf88c497390908543c1e4b13ae47532d5b9519bd8c5a4b3062c8df790c218a5880a06ca425f8cb1b114f62cad5038b54f8e2587
diff --git a/sec-policy/selinux-djbdns/selinux-djbdns-2.20180114-r2.ebuild b/sec-policy/selinux-djbdns/selinux-djbdns-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..6d03e0a05302
--- /dev/null
+++ b/sec-policy/selinux-djbdns/selinux-djbdns-2.20180114-r2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 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 8d7216ec1da2..6d03e0a05302 100644
--- a/sec-policy/selinux-djbdns/selinux-djbdns-9999.ebuild
+++ b/sec-policy/selinux-djbdns/selinux-djbdns-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-dkim/Manifest b/sec-policy/selinux-dkim/Manifest
index ff5e4fc98c11..a99c390fb6aa 100644
--- a/sec-policy/selinux-dkim/Manifest
+++ b/sec-policy/selinux-dkim/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-dkim-2.20170805-r2.ebuild 375 BLAKE2B 7a5ed27316ec2452b4d50f1d6dd
 EBUILD selinux-dkim-2.20170805-r3.ebuild 375 BLAKE2B 7a5ed27316ec2452b4d50f1d6dd33c10a006be0dcedd26e90b92c4c27ec448c2dd2d3dc8fcf70fb59e92cfe720be92a6735e27295ae067842e3745c7994f55f0 SHA512 0af0c48a6418fb9f5b30189516ccabadd61e3abf673f4d82d3b72d15b1b981b4faa0a88425e7430c57e6a9e54c6da24dea6b9118522bedfba63d301376553b56
 EBUILD selinux-dkim-2.20170805-r4.ebuild 377 BLAKE2B 377e289da21e3dab88728e6ad5829b592817c66a978d822b4713ea249510161a68a5d40011923be1306e05e8471f75969f836acff940c31bf16a5e62f7b48df4 SHA512 20338b7f29629d8d25d1eb5590057263f6ecc7cb2bf953e3c3b5ba2632919e8068825f8a7e837ad482453292b7bd8a58d2e95b95e0c72b2cf2991ba0faef7820
 EBUILD selinux-dkim-2.20180114-r1.ebuild 375 BLAKE2B ecd0fdc5ce40ad8f72c7bbd56bd696b3e59fc075dc8395ae8008717f9e84a174320d0fa19e96450a92c7aaacb3cdaf0142533843ebe9cb24b0094b149026ff76 SHA512 6faf0f19e9546e49c4be38e526048b836afd94420002ada5c7b091864907b0798e0882ec869ac78ea4e281f16fa9e035a54693d6b9741b8041aa942b589bf1f7
-EBUILD selinux-dkim-9999.ebuild 377 BLAKE2B 377e289da21e3dab88728e6ad5829b592817c66a978d822b4713ea249510161a68a5d40011923be1306e05e8471f75969f836acff940c31bf16a5e62f7b48df4 SHA512 20338b7f29629d8d25d1eb5590057263f6ecc7cb2bf953e3c3b5ba2632919e8068825f8a7e837ad482453292b7bd8a58d2e95b95e0c72b2cf2991ba0faef7820
+EBUILD selinux-dkim-2.20180114-r2.ebuild 377 BLAKE2B ea78b57eb862fdc139ad26db4fd7159d0fd8245247d23621a43312d2961ea0aa1238527ba5883f5d086dddb80b453bfcad459c2d9fae85bdc33fcc0acc160b9d SHA512 5b27db16dfa580aea99735a794b10c44f3546d01ae9f1934837d97c188f79d417d9b9d9f566ab4d6c6186b427ccc5d2fc9c6265eac98f92d32c258c7f4c98623
+EBUILD selinux-dkim-9999.ebuild 377 BLAKE2B ea78b57eb862fdc139ad26db4fd7159d0fd8245247d23621a43312d2961ea0aa1238527ba5883f5d086dddb80b453bfcad459c2d9fae85bdc33fcc0acc160b9d SHA512 5b27db16dfa580aea99735a794b10c44f3546d01ae9f1934837d97c188f79d417d9b9d9f566ab4d6c6186b427ccc5d2fc9c6265eac98f92d32c258c7f4c98623
 MISC metadata.xml 314 BLAKE2B 52a2ee591bb7e3d3377433b75e6b94fd6fe583fa6325fc79d111bd08f8164d275fdd7d2251e633777df699d78c2af7fd52cd7c0c2500a0354692430c0cd8e312 SHA512 a38550fb1e03f39702b4f45f068d6726aea262a480a35360e055b2ab98accf4f83395ff3f566babce8a75d3b654eb5b2cc729fcdac5441426494750b6eb59120
diff --git a/sec-policy/selinux-dkim/selinux-dkim-2.20180114-r2.ebuild b/sec-policy/selinux-dkim/selinux-dkim-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..725721271283
--- /dev/null
+++ b/sec-policy/selinux-dkim/selinux-dkim-2.20180114-r2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 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 cd6a5e88374e..725721271283 100644
--- a/sec-policy/selinux-dkim/selinux-dkim-9999.ebuild
+++ b/sec-policy/selinux-dkim/selinux-dkim-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-dmidecode/Manifest b/sec-policy/selinux-dmidecode/Manifest
index 3c21918efd5a..e5beab14c7c4 100644
--- a/sec-policy/selinux-dmidecode/Manifest
+++ b/sec-policy/selinux-dmidecode/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-dmidecode-2.20170805-r2.ebuild 288 BLAKE2B db8c8a8144ae91054a98d7
 EBUILD selinux-dmidecode-2.20170805-r3.ebuild 288 BLAKE2B db8c8a8144ae91054a98d76642c4dc32bdbc9ea44a6d531fd105ad790994734aa19dbaa2d684a5dff9df147df112c26a3244f40686da40c42a4470e9d20c06ee SHA512 b1c83dd19a8e304ba1fc552a8c79099d42f9d5159878c7e704a38afae7cf9075b5356a10cb2f51ed08567a86f3cf1e73b241a4e3be4ec646b2b50368a57c5533
 EBUILD selinux-dmidecode-2.20170805-r4.ebuild 290 BLAKE2B 61e5ee55b22dc90579cf9bec01a5c498941f41af6d595e4270046aa23d859b243b236014e07a5f49a4c0eb362ba56cf5ccffc655f7cc480c33c3cbe19d2d5a33 SHA512 6d44adcf84c02343a2977547a73140b8c1581e9a9b27ea0db5da827ac93143148e914052f0a9fb202199104f7ec354ccd24d0159fa465c6f495a549b0b33a79d
 EBUILD selinux-dmidecode-2.20180114-r1.ebuild 288 BLAKE2B 95a04055c2b5a4229d1fd106c5fd14d0268ee0704bcb449b7a8e9142c5b6022aa56d2a2922dc3deb5013072f10c84b5467e634f9812b8814a5838fead38c46a0 SHA512 519b459cfaaf5e6118c2ce33bc5013c536b67c955038abcfa9726d3befabaac1f18e13edf9cadbf1e7ea3a8e176151cdfc06f5712dad70dee005917f8de27de8
-EBUILD selinux-dmidecode-9999.ebuild 290 BLAKE2B 61e5ee55b22dc90579cf9bec01a5c498941f41af6d595e4270046aa23d859b243b236014e07a5f49a4c0eb362ba56cf5ccffc655f7cc480c33c3cbe19d2d5a33 SHA512 6d44adcf84c02343a2977547a73140b8c1581e9a9b27ea0db5da827ac93143148e914052f0a9fb202199104f7ec354ccd24d0159fa465c6f495a549b0b33a79d
+EBUILD selinux-dmidecode-2.20180114-r2.ebuild 290 BLAKE2B 40fb04c58685f79ca71d56b35e4556649b9863954c3b72738522a014d9401115b4b78804965a2da3ac1b115754b99b8e8aa452d32b8a722a215c4cf18475f794 SHA512 232652b41d6c5818f55b2dcccfc94c758106c9be4c76e514c33eb8012d6fc39a6789f33645f032471f4b749f933367b0e469b7073fbaf81afaeedb6376bdddbe
+EBUILD selinux-dmidecode-9999.ebuild 290 BLAKE2B 40fb04c58685f79ca71d56b35e4556649b9863954c3b72738522a014d9401115b4b78804965a2da3ac1b115754b99b8e8aa452d32b8a722a215c4cf18475f794 SHA512 232652b41d6c5818f55b2dcccfc94c758106c9be4c76e514c33eb8012d6fc39a6789f33645f032471f4b749f933367b0e469b7073fbaf81afaeedb6376bdddbe
 MISC metadata.xml 319 BLAKE2B a91428c1e8c58f2901df33a3bfecaa09414f9a4a7cb2cea6350a7795c5c0a8e87f95139807d2025cf0fd725404bef1b5bc56880d7a44b4264ee5e5d6adcbecf1 SHA512 d866eeed95bad62f746cb0576f592abc6f0728661fa06563d55146ccacddcc50e9154d0c7bb0b673acae16ef0f80dd80b70763a810d829920cc6e0483b7830ec
diff --git a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20180114-r2.ebuild b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..8e615d71505e
--- /dev/null
+++ b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 f8577819b41a..8e615d71505e 100644
--- a/sec-policy/selinux-dmidecode/selinux-dmidecode-9999.ebuild
+++ b/sec-policy/selinux-dmidecode/selinux-dmidecode-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-dnsmasq/Manifest b/sec-policy/selinux-dnsmasq/Manifest
index 5a3437a09cad..644aeb7403df 100644
--- a/sec-policy/selinux-dnsmasq/Manifest
+++ b/sec-policy/selinux-dnsmasq/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-dnsmasq-2.20170805-r2.ebuild 284 BLAKE2B 6f42bf8fb7c66052006f1536
 EBUILD selinux-dnsmasq-2.20170805-r3.ebuild 284 BLAKE2B 6f42bf8fb7c66052006f15361d1730b30fa9d24fbe4f7b6ac99b30c0af61398ae628d485ed0bf9eefd43183d7a69ca5e046fc3cee91bde8df2b23713cfc8680b SHA512 05701aa342642590702d9a2a489237b1f167750be3706ebdb5f2b2c1b34330d76075e545285eac73b65385bc680f36b8dd76a3616dd47929240323e4c085de24
 EBUILD selinux-dnsmasq-2.20170805-r4.ebuild 286 BLAKE2B 40fe1622875bd3178bc03fe3bd548d2c7c0fd14b000566820aeaf71a7940478019391af26e882f652f70030d921347869ee436e44f7956ac3ea7addc6f75ee38 SHA512 bbecf4664cc6925f7803003df8cf9525e66e351b2f8c16053db6bc6ae2223187b0d35faac1d7e42500ca3f2df407ed7ba65cbda33413a3e6de134eb8f1ec3b26
 EBUILD selinux-dnsmasq-2.20180114-r1.ebuild 284 BLAKE2B b67c2202f0ecca890cf7e8df0d68ff9163162d4e720e93b1acddaf08f824fd2ef1629ceee3a2d47dcc78f0f50253aabc2d16a27e867b519cfaf2bc12eeec8748 SHA512 fb06be5bae2aba1706f29527014428301db798cf062db79d5a071e117af62c17ebd75d175a785508be3e9e39a797c356c24ad032778777e92524f0b39cdd8ce2
-EBUILD selinux-dnsmasq-9999.ebuild 286 BLAKE2B 40fe1622875bd3178bc03fe3bd548d2c7c0fd14b000566820aeaf71a7940478019391af26e882f652f70030d921347869ee436e44f7956ac3ea7addc6f75ee38 SHA512 bbecf4664cc6925f7803003df8cf9525e66e351b2f8c16053db6bc6ae2223187b0d35faac1d7e42500ca3f2df407ed7ba65cbda33413a3e6de134eb8f1ec3b26
+EBUILD selinux-dnsmasq-2.20180114-r2.ebuild 286 BLAKE2B 84793b4c937a436e07195616ddaae01337ef89a7f484cce426d79995d0ef966f57f6fe903ab52f9b2ba3dee27540b8d0209ab090646d30a3838ef58da0d9f617 SHA512 6c7110caecadb6596dcb8e8b811e174395c01fb548eae76c755eec5abf6c2e46b46a055bd72bac6864aa2a977990713d812ed2a5d39165af988162c20202490a
+EBUILD selinux-dnsmasq-9999.ebuild 286 BLAKE2B 84793b4c937a436e07195616ddaae01337ef89a7f484cce426d79995d0ef966f57f6fe903ab52f9b2ba3dee27540b8d0209ab090646d30a3838ef58da0d9f617 SHA512 6c7110caecadb6596dcb8e8b811e174395c01fb548eae76c755eec5abf6c2e46b46a055bd72bac6864aa2a977990713d812ed2a5d39165af988162c20202490a
 MISC metadata.xml 317 BLAKE2B 2c180da5a4bb38b80679465ea103b0cfdd396830b4ab9f22de8bb2134f603e840a7225661d575ca48fc378cf5790c3026ca6c9ec1a2c4de08264292db1813b26 SHA512 badb018cf0e4f48bf7394d4c8b882cae63fbd47755668c58159f23f2ae6b5ff18d15f17790eb6721f2585cdb307e37f3430c9616641581dab70ef3b866157464
diff --git a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20180114-r2.ebuild b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..e12df6ce58f6
--- /dev/null
+++ b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 898a5615d884..e12df6ce58f6 100644
--- a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-9999.ebuild
+++ b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-dovecot/Manifest b/sec-policy/selinux-dovecot/Manifest
index bc110f37204d..45fb0134a3d8 100644
--- a/sec-policy/selinux-dovecot/Manifest
+++ b/sec-policy/selinux-dovecot/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-dovecot-2.20170805-r2.ebuild 284 BLAKE2B e8fc9871c9f8829c3dac1e02
 EBUILD selinux-dovecot-2.20170805-r3.ebuild 284 BLAKE2B e8fc9871c9f8829c3dac1e02c3c34a1d508bcd8011e1c0a6854d45eb02ce0a6cbee6476e0781ac4e1524f8fd4fd5785737abe744d3f1cf2a290688a282abbadb SHA512 c885dfcafeb86cfe3ead3dd11f04d9f4d4552a260af53f34568ebd6a9f065a64122c3b5fd4cb7812401dfda37f992a735bd5db1e196f8387822694cff90dc464
 EBUILD selinux-dovecot-2.20170805-r4.ebuild 286 BLAKE2B 1d6502fc342b07f29a0c4f5924826cbc9bc65a4a4b2beb917fa15ac448c996cd13f166e9d0da970ec1818c2138e26e4a966971107b875faa1f82551af7490c4d SHA512 3e885e9fc01b6b601079754e67f4589a16eecf840f02280ca998b44b2a5d0f96f463fe4c3df59c78fc707a349384afb1f138be79e0874456b0d0604154a5ffec
 EBUILD selinux-dovecot-2.20180114-r1.ebuild 284 BLAKE2B d51c8bdd38720f3b0ab23a9b438546dd18de60b64444ba704b198e71e505f00aa4d952bf66eda7ec19cd39423284cd039d263f29999674ca45f463b06b7e9c27 SHA512 d237e2b8a4cd65501450c2c9f1306047555ec922260b056587a1cf6531fbda7313983e1c6809b93d0494755abede9af3652825f121a07accb65677738623da56
-EBUILD selinux-dovecot-9999.ebuild 286 BLAKE2B 1d6502fc342b07f29a0c4f5924826cbc9bc65a4a4b2beb917fa15ac448c996cd13f166e9d0da970ec1818c2138e26e4a966971107b875faa1f82551af7490c4d SHA512 3e885e9fc01b6b601079754e67f4589a16eecf840f02280ca998b44b2a5d0f96f463fe4c3df59c78fc707a349384afb1f138be79e0874456b0d0604154a5ffec
+EBUILD selinux-dovecot-2.20180114-r2.ebuild 286 BLAKE2B fc54984eb4b1eb4fec0507628ec2b9bf35d72aa47ee0a5319f545465bc38d4f4daa97a6cbda1f055a1743d98bf9d1ab22e67ac00a97e05909fed998bf2129dc5 SHA512 c58475100aa32828664c8fdf5cfa5af35bbe8051527b3e58e43757c804015f35fd686d8c802967ab3c17c68070cd77bba11d69712cd5b556f276dc2efe0a829b
+EBUILD selinux-dovecot-9999.ebuild 286 BLAKE2B fc54984eb4b1eb4fec0507628ec2b9bf35d72aa47ee0a5319f545465bc38d4f4daa97a6cbda1f055a1743d98bf9d1ab22e67ac00a97e05909fed998bf2129dc5 SHA512 c58475100aa32828664c8fdf5cfa5af35bbe8051527b3e58e43757c804015f35fd686d8c802967ab3c17c68070cd77bba11d69712cd5b556f276dc2efe0a829b
 MISC metadata.xml 317 BLAKE2B bd378647bd4b9d38fda7a04f6baf817da4cfb58ae8acf6b1ebb1fc4e088d4e71a99700562d2ac08e8ccaab094c1d446ffeb8aa5bcec9b85333808fa9f225bd88 SHA512 c48caae167d778fc011c650d92060756d568ec1b57957f7b581d93acd0ceed15f2da615c9cdc4571765935e9f62b073211e90c79cc19727aee2b0fcc13a23510
diff --git a/sec-policy/selinux-dovecot/selinux-dovecot-2.20180114-r2.ebuild b/sec-policy/selinux-dovecot/selinux-dovecot-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..3f4f764487e3
--- /dev/null
+++ b/sec-policy/selinux-dovecot/selinux-dovecot-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 0d2ff0050289..3f4f764487e3 100644
--- a/sec-policy/selinux-dovecot/selinux-dovecot-9999.ebuild
+++ b/sec-policy/selinux-dovecot/selinux-dovecot-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-dpkg/Manifest b/sec-policy/selinux-dpkg/Manifest
index aefa2e86c88a..c67fb456d2b4 100644
--- a/sec-policy/selinux-dpkg/Manifest
+++ b/sec-policy/selinux-dpkg/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-dpkg-2.20170805-r2.ebuild 278 BLAKE2B 462cb37481e6e3644f112896564
 EBUILD selinux-dpkg-2.20170805-r3.ebuild 278 BLAKE2B 462cb37481e6e3644f112896564c2f5b91bb3c704578371dcd88c7a7a44b58c04a85a003ac68e48f6ec1126b356440424d7982bf57191cfe7d88e87013dde895 SHA512 155b8d1eb1b3c5152c46d1468f61527662111379815a56e2d87b49ada1ace28cf6d3431adb9743740f3d16a226ad5b1f54e75cfe557c3db28be20a4f0e876890
 EBUILD selinux-dpkg-2.20170805-r4.ebuild 280 BLAKE2B 94dada9fc0944b3d87f4e201b414f66c9c754f09914c6dad886ddf11cb37c4c884fbbef966ecc84567ca9f49ec226a0bd2138b38b96d6ed32502a58e713d997c SHA512 b8964968ac607b07a1f5ec861bb3ea3037a7c2df27e15207bb3c843e0b7ab8d345c63bccbe3ad68bfd8db13613a282a3b07e7fa3746c751a2ed8e68a0f4bf5d0
 EBUILD selinux-dpkg-2.20180114-r1.ebuild 278 BLAKE2B 849b6751f721c931481c3aa2d0504b005ace0534223a1ad5dd34108e7bdd3fdf6a1cf75d50bf7a6fb69b89fcf5f0300b6e39fa0e4c3e4bcdcba7f9b2486ee9eb SHA512 316f118ad7b635c8d0a3ad615b87459f9a21273d8a0f104565f05d551b0b78fcf8b5f070e59a9e0fa41114ce5bf9f3bab938a94f1cf07d865d49707ff096590c
-EBUILD selinux-dpkg-9999.ebuild 280 BLAKE2B 94dada9fc0944b3d87f4e201b414f66c9c754f09914c6dad886ddf11cb37c4c884fbbef966ecc84567ca9f49ec226a0bd2138b38b96d6ed32502a58e713d997c SHA512 b8964968ac607b07a1f5ec861bb3ea3037a7c2df27e15207bb3c843e0b7ab8d345c63bccbe3ad68bfd8db13613a282a3b07e7fa3746c751a2ed8e68a0f4bf5d0
+EBUILD selinux-dpkg-2.20180114-r2.ebuild 280 BLAKE2B 3a8d566662c26dc656447089df6a28bf8e8ea4860ef76b1f2c01f7bebc73173f27856b2b61f90607cd3ab19748521f34d92ccb8ef05d6c69d7141f1c9710027c SHA512 0876cb2cd469995bc88989eb40166eccfb61b3478e9b80d5de82919081efa4df72b3d042f0aa29f741ecb81f63d886caa1051d9ee033d9bb5f71d090ff72747b
+EBUILD selinux-dpkg-9999.ebuild 280 BLAKE2B 3a8d566662c26dc656447089df6a28bf8e8ea4860ef76b1f2c01f7bebc73173f27856b2b61f90607cd3ab19748521f34d92ccb8ef05d6c69d7141f1c9710027c SHA512 0876cb2cd469995bc88989eb40166eccfb61b3478e9b80d5de82919081efa4df72b3d042f0aa29f741ecb81f63d886caa1051d9ee033d9bb5f71d090ff72747b
 MISC metadata.xml 314 BLAKE2B 3723d66dcaeb3e3276c7dc99b11debed63f9d2a34cc34f3bde1007c2015d024afac6081b3b07a0890aeedec7c869f4635d8f0249c7578f06b96c8ab3ca876c7f SHA512 4dc73eaa9a7604687d8a74bac77bd1f595a1e5f10916589fcee39af23db6afec167d30a3f7851eebcc1c942684ce71651fbbbe98d2dae98d8a2d892b314896b3
diff --git a/sec-policy/selinux-dpkg/selinux-dpkg-2.20180114-r2.ebuild b/sec-policy/selinux-dpkg/selinux-dpkg-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..0458ecafbca5
--- /dev/null
+++ b/sec-policy/selinux-dpkg/selinux-dpkg-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 0c6a27f0f0c6..0458ecafbca5 100644
--- a/sec-policy/selinux-dpkg/selinux-dpkg-9999.ebuild
+++ b/sec-policy/selinux-dpkg/selinux-dpkg-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-dracut/Manifest b/sec-policy/selinux-dracut/Manifest
index ab5e7f0bd725..8678684b6681 100644
--- a/sec-policy/selinux-dracut/Manifest
+++ b/sec-policy/selinux-dracut/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-dracut-2.20170805-r2.ebuild 282 BLAKE2B d0c7bb96e753eeb877660bf3d
 EBUILD selinux-dracut-2.20170805-r3.ebuild 282 BLAKE2B d0c7bb96e753eeb877660bf3d651cb846fee0afabd6d1dd5e86e487c6cb1332572d97de383bf141eef2f2f84df0be272ada16c9f1d1f93c60ea8c1f3273c06a4 SHA512 cf681974b73e6f750a5b7918314a644e8ac421894a0ef804c379fbb90d2fbd7f54744267d54102ea476ca081e80d78da527919ce0ebbb75659fd094c14b9a6d5
 EBUILD selinux-dracut-2.20170805-r4.ebuild 284 BLAKE2B 1aa8b339aa1fb34048c35d9afd5b31369e51590c106b165af93f63e5e90988d6c1ef295ff8fb87accfc6a7046fd984900a7c428f1b14cb9956472a40d0b18bf4 SHA512 d8b035f9060f8515b57d7d617b475977ec585a5b6ead185d885fea6f7912bef07cbce8616946f984d7128604f28e6f8636e940ee00ef49f1baf48b116eeb5666
 EBUILD selinux-dracut-2.20180114-r1.ebuild 282 BLAKE2B e538f9acf5e994ce641f0fb572862a512c5285b1215f7c34e44b808b9665b90571f0a3f8de686b694d6052f1123b461675f55f628e23a2c0f6b973e3815853dc SHA512 9cc2e17ac780ce9454543ef604c756f09191438505b352840117f02074140d994ea658a1b721d8bc5771df18d38180e4fdedc4cb6362f38f0a3c58d5725af734
-EBUILD selinux-dracut-9999.ebuild 284 BLAKE2B 1aa8b339aa1fb34048c35d9afd5b31369e51590c106b165af93f63e5e90988d6c1ef295ff8fb87accfc6a7046fd984900a7c428f1b14cb9956472a40d0b18bf4 SHA512 d8b035f9060f8515b57d7d617b475977ec585a5b6ead185d885fea6f7912bef07cbce8616946f984d7128604f28e6f8636e940ee00ef49f1baf48b116eeb5666
+EBUILD selinux-dracut-2.20180114-r2.ebuild 284 BLAKE2B 29174e47b5227accb466a85ebc2de16b75d310074e51e2a485ae4c036a3e5160be6bff6c939e6ac7e82adadef5ab2355e8d9c72dd48089975b6c085014cc9d27 SHA512 31938f2405c8153ab69f15c2a82e76430dcbeeef44e5bf97c926069b392b74e9154794ceee09aef54ed1fdbf01f994e19052339081b7cb376a8dbce8d1aea73d
+EBUILD selinux-dracut-9999.ebuild 284 BLAKE2B 29174e47b5227accb466a85ebc2de16b75d310074e51e2a485ae4c036a3e5160be6bff6c939e6ac7e82adadef5ab2355e8d9c72dd48089975b6c085014cc9d27 SHA512 31938f2405c8153ab69f15c2a82e76430dcbeeef44e5bf97c926069b392b74e9154794ceee09aef54ed1fdbf01f994e19052339081b7cb376a8dbce8d1aea73d
 MISC metadata.xml 316 BLAKE2B 29c2809e3a45df49908273931adf865e193d059333270de4b37f86cad3c83dff9636ae3f96f6fa841d27716f4e4591b152ac581f997c0fdb103cee4e8a050d68 SHA512 ba6cf5bed2367c69a18d097224989ea7c5208b718f670d040634afad0a017f15ff370bfe7012bc71880b2e234fbb85a0831976c77bc4ed46328607724dd0bfe3
diff --git a/sec-policy/selinux-dracut/selinux-dracut-2.20180114-r2.ebuild b/sec-policy/selinux-dracut/selinux-dracut-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..ab4f4e3bd132
--- /dev/null
+++ b/sec-policy/selinux-dracut/selinux-dracut-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 75c012e1a920..ab4f4e3bd132 100644
--- a/sec-policy/selinux-dracut/selinux-dracut-9999.ebuild
+++ b/sec-policy/selinux-dracut/selinux-dracut-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-dropbox/Manifest b/sec-policy/selinux-dropbox/Manifest
index 713b1ca791d7..867a6b36692f 100644
--- a/sec-policy/selinux-dropbox/Manifest
+++ b/sec-policy/selinux-dropbox/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-dropbox-2.20170805-r2.ebuild 432 BLAKE2B a3f254a427ee1893fe4d04b1
 EBUILD selinux-dropbox-2.20170805-r3.ebuild 432 BLAKE2B a3f254a427ee1893fe4d04b1f3101d7ad2027867aa9fb46218c6da4ed8b2ec8f5b5ccda3537a682407ccdbf6179070d015b515b24ae42d7edfdfbbe6e3efc512 SHA512 4a403280a7ebeb38601d394fd9ea5955e7d39b1ed0dc9eb0517bece8a93274f2791162e36d610adc7bf4322b263ac35aa75420fb18a6420d7bf5da339f2bedb8
 EBUILD selinux-dropbox-2.20170805-r4.ebuild 434 BLAKE2B beba280b0ad71eca1760d2101d39552ee0c92fad7769705adb0aee8d3039da08611186477c8f16380d758eb612763e42a3b56739929b5bf8219a5ed23360000f SHA512 ad5ebcf263461e126a58582f187faa3c0a18a56ae2d0ef0d481db0915c4af88cca50deee77831449dcbad9f9ef001c27fe61e1b5561537e6a3ae41019f33ce2c
 EBUILD selinux-dropbox-2.20180114-r1.ebuild 432 BLAKE2B 371840718b25972f5d42cdada825c929a95e3b13adc2f3164caba91baff00e3ca61171d1df5fbd551d5a15ecc9c5cb63d90dded16cc4375e67d982b6374a4255 SHA512 5f5d68126da1d6b6a93f686e91aa985575baa1222f038a7cc473dd9d6aac3825d2edf34a52b152baa7a68f1d75135cc4d471ce3e344516182ba06a9f2f2df66c
-EBUILD selinux-dropbox-9999.ebuild 434 BLAKE2B beba280b0ad71eca1760d2101d39552ee0c92fad7769705adb0aee8d3039da08611186477c8f16380d758eb612763e42a3b56739929b5bf8219a5ed23360000f SHA512 ad5ebcf263461e126a58582f187faa3c0a18a56ae2d0ef0d481db0915c4af88cca50deee77831449dcbad9f9ef001c27fe61e1b5561537e6a3ae41019f33ce2c
+EBUILD selinux-dropbox-2.20180114-r2.ebuild 434 BLAKE2B baf516b36d9fe954e5918e47d30425c491f093d8d08fa28208b46adc78a2dc2c12959e22dc5bbed2634c87acd8dd92ae03d2379d1dacb404230f21b28a200319 SHA512 b0036ba75bb8b360199b7e83abf1cc60a9c47505dda8fcf10b4a181cc14107c285e5dd7e67ee76a223b4c94dfe42af05f8b1dd9580dd2494bc51f51794207a3e
+EBUILD selinux-dropbox-9999.ebuild 434 BLAKE2B baf516b36d9fe954e5918e47d30425c491f093d8d08fa28208b46adc78a2dc2c12959e22dc5bbed2634c87acd8dd92ae03d2379d1dacb404230f21b28a200319 SHA512 b0036ba75bb8b360199b7e83abf1cc60a9c47505dda8fcf10b4a181cc14107c285e5dd7e67ee76a223b4c94dfe42af05f8b1dd9580dd2494bc51f51794207a3e
 MISC metadata.xml 317 BLAKE2B 7db5d1a4e812a844ab0528bf724b389ab91a0c5eec2edc2086c64cff779f210f5e4dc852731d976b88f407c6efa61551a823f1834b6eed8fef136d18f58008d8 SHA512 9f232635f6084134360a64b5f1fcf84580b5df46feff6d897d4a53651329ca930ca23b15ae40316748a2914cddff3358b49bdb15bf7312973d6a9ada604dc717
diff --git a/sec-policy/selinux-dropbox/selinux-dropbox-2.20180114-r2.ebuild b/sec-policy/selinux-dropbox/selinux-dropbox-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..d25d2723627f
--- /dev/null
+++ b/sec-policy/selinux-dropbox/selinux-dropbox-2.20180114-r2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 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 70286e8066b8..d25d2723627f 100644
--- a/sec-policy/selinux-dropbox/selinux-dropbox-9999.ebuild
+++ b/sec-policy/selinux-dropbox/selinux-dropbox-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-entropyd/Manifest b/sec-policy/selinux-entropyd/Manifest
index 54f9589e484f..ca42133a65d5 100644
--- a/sec-policy/selinux-entropyd/Manifest
+++ b/sec-policy/selinux-entropyd/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-entropyd-2.20170805-r2.ebuild 286 BLAKE2B c157ece3aefd338994321c9
 EBUILD selinux-entropyd-2.20170805-r3.ebuild 286 BLAKE2B c157ece3aefd338994321c96a74c2fcab6fdf95fcbf77027fa2b52ce13854edb1fda0e787adc10226196b5f89ea1f8a51e66b80e4697ebc5e5cf1b9f0bb4385a SHA512 6059aa795bc1561bf747b6884465c57793a3b4d392a8c4ba89e69212362f7a6affc70ba01095f49f3a461731b240f99fdc565975631dc7af872e4ed5425f75d1
 EBUILD selinux-entropyd-2.20170805-r4.ebuild 288 BLAKE2B 4f2c14f354e73e4c8c8fa5f5771f29f33ca3975b4ca913d1b4730f35e085a1c800244b1a9bec88f77741482a5bcd7c1685e8eda5bda86d11b8e23332467e4805 SHA512 532df8d2ae82fceb83249e47c25450f1a73f7249b1e31a345862baa04401529a06bd2ebf1777a3294f46d1a1c164eea0b38e1a193cdc2b7d0d0b1fef02cde23a
 EBUILD selinux-entropyd-2.20180114-r1.ebuild 286 BLAKE2B d91ec84be9f08f769dc8837fb585c853b08e8f319f3a575607f5132b0af2d08970cd2ba261c1ae986ef653dc8a1c25023ed79a3b1de95af7313155c03e55878d SHA512 503f1eadde311785402cc3e02ac177b975d92a6352f555d80397093c1210aff06196864fc7307c8e445a63934a7b241d6a7318e5a9440be1dc20680c46c087dd
-EBUILD selinux-entropyd-9999.ebuild 288 BLAKE2B 4f2c14f354e73e4c8c8fa5f5771f29f33ca3975b4ca913d1b4730f35e085a1c800244b1a9bec88f77741482a5bcd7c1685e8eda5bda86d11b8e23332467e4805 SHA512 532df8d2ae82fceb83249e47c25450f1a73f7249b1e31a345862baa04401529a06bd2ebf1777a3294f46d1a1c164eea0b38e1a193cdc2b7d0d0b1fef02cde23a
+EBUILD selinux-entropyd-2.20180114-r2.ebuild 288 BLAKE2B 9aa5ee3cc94ee1adfa1cc457627f6a5a367f4bb5558d4355a1e8d474d584f1c3243d238243e24f6bedc3f142ffea7d655215309696df1260c5cfc0f26143900c SHA512 e3430f2ac62898d882db2cd83bb143ba2bc942a6d0a3c4413301b01e3b2069556af7fa2bbd5808295b5cc23f68190481e3bae94b7e3f7ad29e9873b159c25564
+EBUILD selinux-entropyd-9999.ebuild 288 BLAKE2B 9aa5ee3cc94ee1adfa1cc457627f6a5a367f4bb5558d4355a1e8d474d584f1c3243d238243e24f6bedc3f142ffea7d655215309696df1260c5cfc0f26143900c SHA512 e3430f2ac62898d882db2cd83bb143ba2bc942a6d0a3c4413301b01e3b2069556af7fa2bbd5808295b5cc23f68190481e3bae94b7e3f7ad29e9873b159c25564
 MISC metadata.xml 333 BLAKE2B 413e0582ad11233747036b6669533af49c9c6f43954d104bdfd062efb891c36bdfe526b0eac7317c5c7a350c480ce7e903f7b87b9eaf776d21c7a84576627d9d SHA512 0d80f8560f5d0dd12ac9913f52a7d6ce5f96567b727fd68c7f66ee96edb25dd5adc168bf2618c6992d56d96c049ac44240621ae576b46b536f4851dad9c049cf
diff --git a/sec-policy/selinux-entropyd/selinux-entropyd-2.20180114-r2.ebuild b/sec-policy/selinux-entropyd/selinux-entropyd-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..d58341e4fc36
--- /dev/null
+++ b/sec-policy/selinux-entropyd/selinux-entropyd-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 be9434592141..d58341e4fc36 100644
--- a/sec-policy/selinux-entropyd/selinux-entropyd-9999.ebuild
+++ b/sec-policy/selinux-entropyd/selinux-entropyd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-evolution/Manifest b/sec-policy/selinux-evolution/Manifest
index 1af5a83df923..2e5ff3246094 100644
--- a/sec-policy/selinux-evolution/Manifest
+++ b/sec-policy/selinux-evolution/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-evolution-2.20170805-r2.ebuild 386 BLAKE2B d72669a01e2b1397ce1346
 EBUILD selinux-evolution-2.20170805-r3.ebuild 386 BLAKE2B d72669a01e2b1397ce1346f90c5e518af18eb701ccd0db599e73698f90aadf91eebfd5a8b53b567645862666b6fc459004148f1b5f00950848d7c9a0b608fbb7 SHA512 47bc347d2a71635eaea7d0ec93dbc320d4dbf2df986f4282480be80b323a404cbcfcc0a298f5f7540a793fc168f10be39f41bba81dc7e34ac9ac06e8ae7f899c
 EBUILD selinux-evolution-2.20170805-r4.ebuild 388 BLAKE2B a458eee69c3ddaf15f3b1e61ba22f0a6f9c8f1c8b5baae2d5dbc4797e94e3bb4ae00227cf8bfa9f65065e370afbed30f482bd397b45e77497402d68b58ae9a52 SHA512 60b6b46027fbefd7288ff2863455d9a40f55395b4560b8c38fb0b081747473f9cc7c1dffc37aa62766b70781578cceed32d3bf9f3067309e760c49c5f6b14435
 EBUILD selinux-evolution-2.20180114-r1.ebuild 386 BLAKE2B 45bd407a0bc5c8ed37390fc133a5af2b7f4226b70afffebbbc1979da4057f69c1698ccc5265c036e4c02aed566497ab05399ca45e1ee3af366aa21c3f939c3fd SHA512 cfa6b12d75ff108e4d4f7603503bfb8f125f5787d48c3710877611f269a1fb7d31fdf38a19a6e85d5665391fdec2e62c200c1f1b9a6724f0aaac97b225a8c8d6
-EBUILD selinux-evolution-9999.ebuild 388 BLAKE2B a458eee69c3ddaf15f3b1e61ba22f0a6f9c8f1c8b5baae2d5dbc4797e94e3bb4ae00227cf8bfa9f65065e370afbed30f482bd397b45e77497402d68b58ae9a52 SHA512 60b6b46027fbefd7288ff2863455d9a40f55395b4560b8c38fb0b081747473f9cc7c1dffc37aa62766b70781578cceed32d3bf9f3067309e760c49c5f6b14435
+EBUILD selinux-evolution-2.20180114-r2.ebuild 388 BLAKE2B bd7d2a8ebceba62476b33cca24cdbc3f1c5a2656371c235c2f2269fec782993e529b26a1044b319ce8a4750a5e59947fb07d5b42cbc70eb9629ee42d565a729d SHA512 403695e28f11d5b58eb1f3c7d8ad8dc8abb310d1fef609cc9efaff6568b35fa8431a37dd997696c03174b721ed4f862d83978aac12b4e713293a17161603987f
+EBUILD selinux-evolution-9999.ebuild 388 BLAKE2B bd7d2a8ebceba62476b33cca24cdbc3f1c5a2656371c235c2f2269fec782993e529b26a1044b319ce8a4750a5e59947fb07d5b42cbc70eb9629ee42d565a729d SHA512 403695e28f11d5b58eb1f3c7d8ad8dc8abb310d1fef609cc9efaff6568b35fa8431a37dd997696c03174b721ed4f862d83978aac12b4e713293a17161603987f
 MISC metadata.xml 319 BLAKE2B 827cd797e5422e54ce6d813dfe5c600dabb778ac4d9f099202b206abae98931807176d07aeb0020fa41a3d62e4aeaeef0b98b33f18b9f827bd5a85f691b7630a SHA512 5fd8bf75b73ea55686dc7d253d26fd4fb43cd89e46e141ee4fcb4da6b4ea9056aafb499f0bdc5e7d3cf15fb286497e05402a282d21f93ae6d18bd6b2cef0f0b4
diff --git a/sec-policy/selinux-evolution/selinux-evolution-2.20180114-r2.ebuild b/sec-policy/selinux-evolution/selinux-evolution-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..c5fb02648452
--- /dev/null
+++ b/sec-policy/selinux-evolution/selinux-evolution-2.20180114-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 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 16c61488cca9..c5fb02648452 100644
--- a/sec-policy/selinux-evolution/selinux-evolution-9999.ebuild
+++ b/sec-policy/selinux-evolution/selinux-evolution-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-exim/Manifest b/sec-policy/selinux-exim/Manifest
index 8e7a9253a182..f05ad808921d 100644
--- a/sec-policy/selinux-exim/Manifest
+++ b/sec-policy/selinux-exim/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-exim-2.20170805-r2.ebuild 278 BLAKE2B 2dc294ed2f4de9b8613142d93f4
 EBUILD selinux-exim-2.20170805-r3.ebuild 278 BLAKE2B 2dc294ed2f4de9b8613142d93f461932531e08a858be84f57c8fe0ff04caea05a20fbe997ce929f484755ae34c4b99ddcc4a8830c2cce1344123325029a002fd SHA512 7f86e624b8cb9e83c2f4f75b82b2e3e6885b6f0dd17e66999eacc9c3c29322f6542d8a691e54b3e775264fb683e3960e6a2c096e53e05c74169c73f6bab88286
 EBUILD selinux-exim-2.20170805-r4.ebuild 280 BLAKE2B 2379bcddd56d5fc59735514382999633ef3664522eb1376d6058d84b18698155006a6e6f33a0bd0010a1b7ef7a6dd469f0a1074af5ecace9ebeba67c1a50b13c SHA512 01ab22b764f32bb29f8c3091358bbf61521ef355f8b64b804983c6a9ea4d3ddd8529bb44cb64ef40f7404b4606910cc7a258a2cf0b0179945a92b899e19362b4
 EBUILD selinux-exim-2.20180114-r1.ebuild 278 BLAKE2B d35a8243d349eb44902771a5ed881ae61baabfa15fa72dc21623bea235a4231926254b4b2067a375e1dde272ef84a31814c73dbd9f9e094b4499aaf71fc87fe4 SHA512 7e6dfee86ca8d1eee1703cbdf48c1fdd6770bbf6042fa980a9d9d4d11518f078d50ace9d596be5c4447c97878876c43000b2a5cbca1ed64edeff3b4b0ee1b6cb
-EBUILD selinux-exim-9999.ebuild 280 BLAKE2B 2379bcddd56d5fc59735514382999633ef3664522eb1376d6058d84b18698155006a6e6f33a0bd0010a1b7ef7a6dd469f0a1074af5ecace9ebeba67c1a50b13c SHA512 01ab22b764f32bb29f8c3091358bbf61521ef355f8b64b804983c6a9ea4d3ddd8529bb44cb64ef40f7404b4606910cc7a258a2cf0b0179945a92b899e19362b4
+EBUILD selinux-exim-2.20180114-r2.ebuild 280 BLAKE2B 27c56aa9de7e12fddcf22d07a3889a5e4bf567643e42e9805443ea43491b5fcd4ab60fa4ec8b4b2a4aac39d1cfcb8c7106ed45620570c4da4e44663890422802 SHA512 5a4ef393f6365d4f74669d08e3802b220c077138d46cdd68d635aa65f17c9e580a5abc619aaffcd329482bb59b28a040071be35d737f1d8d925f943f69fe9aa2
+EBUILD selinux-exim-9999.ebuild 280 BLAKE2B 27c56aa9de7e12fddcf22d07a3889a5e4bf567643e42e9805443ea43491b5fcd4ab60fa4ec8b4b2a4aac39d1cfcb8c7106ed45620570c4da4e44663890422802 SHA512 5a4ef393f6365d4f74669d08e3802b220c077138d46cdd68d635aa65f17c9e580a5abc619aaffcd329482bb59b28a040071be35d737f1d8d925f943f69fe9aa2
 MISC metadata.xml 314 BLAKE2B c2415733accb4920f1d02a77d2af6b2c4ec0ad8e90fb9e6a8d501dd19ae8036470b1280d075b2ed0cfdd90110a650566d9ae68a953318dfdfa41bf5b5251a46d SHA512 219657ec49c7edd6b2f78c3edcd2f06a9a5e12324988bb3dba22f3da68903ea42f9cdbd48ddd95a21abe6b59b27244e6c654869dee7db1a653ab7bc89fd36b1a
diff --git a/sec-policy/selinux-exim/selinux-exim-2.20180114-r2.ebuild b/sec-policy/selinux-exim/selinux-exim-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..73ffc301d15c
--- /dev/null
+++ b/sec-policy/selinux-exim/selinux-exim-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 0a93a9896758..73ffc301d15c 100644
--- a/sec-policy/selinux-exim/selinux-exim-9999.ebuild
+++ b/sec-policy/selinux-exim/selinux-exim-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-fail2ban/Manifest b/sec-policy/selinux-fail2ban/Manifest
index 7864b9bfb977..4da2f609ac06 100644
--- a/sec-policy/selinux-fail2ban/Manifest
+++ b/sec-policy/selinux-fail2ban/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-fail2ban-2.20170805-r2.ebuild 286 BLAKE2B 71e230c5a39df97998b4907
 EBUILD selinux-fail2ban-2.20170805-r3.ebuild 286 BLAKE2B 71e230c5a39df97998b49078de6621e214c3da5912749a664180060caa2707771b4824df8d7d1d90cc117a631f916814203ad3516a2edca041bb1f4cdb2c373c SHA512 dd737ec119e99aca5bda7a557b89ec6b9c74f068ae884121962d32c0ad5a8f88f260315bf0299a9ee8d1aa81079d6852a1792ff60d18bb86c08c383676495592
 EBUILD selinux-fail2ban-2.20170805-r4.ebuild 288 BLAKE2B 8e88f917df69911542e3226fc45ba177954132328138eb382171cfdf6a8201a4bc499801f741ec262383d7e24be9d22bce866f74b3caa2082261aae1d82e5bd2 SHA512 e53629026965f59981ead269c101c2ca14463f2a27eb484b71411fc5dedc938236ac1c95592e314b07af91e9bb58537e9b7c46305b8805eb1d15c013befcbe3b
 EBUILD selinux-fail2ban-2.20180114-r1.ebuild 286 BLAKE2B 18de2881e70cd43bcd40c02a2e44314166c601e213efb7f065da26bb71b3f1aa431dc3460619ae1272f6077ed5b7a2e6033771b994c44e10ab6604a5257128c1 SHA512 c8c047312f7a5972a676f62013756afbe8897f6f2d3861af44036b62eab966e7271cfec99c555c70a3d3d19efbc114b6b015332a3f59cef8a1498c10a4ce7488
-EBUILD selinux-fail2ban-9999.ebuild 288 BLAKE2B 8e88f917df69911542e3226fc45ba177954132328138eb382171cfdf6a8201a4bc499801f741ec262383d7e24be9d22bce866f74b3caa2082261aae1d82e5bd2 SHA512 e53629026965f59981ead269c101c2ca14463f2a27eb484b71411fc5dedc938236ac1c95592e314b07af91e9bb58537e9b7c46305b8805eb1d15c013befcbe3b
+EBUILD selinux-fail2ban-2.20180114-r2.ebuild 288 BLAKE2B d3ba286ea343b95ca6e0c114cc20acd32576890f7394e6136448122c1323292c022d1e4e5a1c313ce4676c4c7676522998b58ef7d8396cab1aa88e0ebe58a65e SHA512 9ad46e3b624c74649c134655994f13bff97e6b11228b7520124d56a15ea637799bdab79fa9b106a7bd8185c443d04ad573ce20f95f90b5427f5b4ad21a711871
+EBUILD selinux-fail2ban-9999.ebuild 288 BLAKE2B d3ba286ea343b95ca6e0c114cc20acd32576890f7394e6136448122c1323292c022d1e4e5a1c313ce4676c4c7676522998b58ef7d8396cab1aa88e0ebe58a65e SHA512 9ad46e3b624c74649c134655994f13bff97e6b11228b7520124d56a15ea637799bdab79fa9b106a7bd8185c443d04ad573ce20f95f90b5427f5b4ad21a711871
 MISC metadata.xml 318 BLAKE2B e95df98e6f8f3f9e88df4a93bb326b51d7ca228e96eb7eae30654ab441bbd9930478e22755a1988dac5142d546c905be0acd1baa888a635a5ed8173fda53b4ca SHA512 e3d5af97c4cc7917dd015904de3badbecf54cf8fd3c10c294d33d3bee38b5b7b0b82888ebfac3afbc7d9b53b15e876bd16be1ba5a6567e7736a30bb1c1995349
diff --git a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20180114-r2.ebuild b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..2135a7bb5fb7
--- /dev/null
+++ b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 b52254f9da68..2135a7bb5fb7 100644
--- a/sec-policy/selinux-fail2ban/selinux-fail2ban-9999.ebuild
+++ b/sec-policy/selinux-fail2ban/selinux-fail2ban-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-fetchmail/Manifest b/sec-policy/selinux-fetchmail/Manifest
index 671d24dde96d..8b7ecd264522 100644
--- a/sec-policy/selinux-fetchmail/Manifest
+++ b/sec-policy/selinux-fetchmail/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-fetchmail-2.20170805-r2.ebuild 288 BLAKE2B 5e6c0bda6b0f94981e6ab2
 EBUILD selinux-fetchmail-2.20170805-r3.ebuild 288 BLAKE2B 5e6c0bda6b0f94981e6ab2c6d3c001129b02578c50ab900ed2e8f4b9a33d3b6701c4812a0253a6157ba1a82dd1dc59930b3b218c2d6022ca14456a5a8f874ab7 SHA512 240af1340e2354cc0c2d67ff55900a69baa6db3007cb75eaa6235ef170611bfd1e2729e0d454d353b94ec01d59ab7619912e020d944900880804cc90cbe0de95
 EBUILD selinux-fetchmail-2.20170805-r4.ebuild 290 BLAKE2B c29a10f2b1204654a9c244af9d2d985594d4b9d33cf1fb50fd03c5183997d363e9cbaa37036e993a60f2502d23eedaef5e4f01ed5ca3cdc48f109e90edbdf4c7 SHA512 8ff07ba58d3055cc4028043089e65f2b3d249640bdbb20035b6c351334a8ced22654d36edf0f5afcd1cb4c398707964892c00c71ee3fe06bd732ec56d9e6efda
 EBUILD selinux-fetchmail-2.20180114-r1.ebuild 288 BLAKE2B b44657971263ce459cdb732684efa8571f820bd967a696af02c2ef0fa699010ce45ddc0880564d9465755b43feb32ede01aadc1547cf4a264bd29be34e74720b SHA512 04ff3bc24d3faa9e97ca821343728583cec3d6e87a3eec742222c89f81b85993e6886f01f37799d17f3b4fe6125b5b0d3126c7f74b83c651da37c1036e8b2cf9
-EBUILD selinux-fetchmail-9999.ebuild 290 BLAKE2B c29a10f2b1204654a9c244af9d2d985594d4b9d33cf1fb50fd03c5183997d363e9cbaa37036e993a60f2502d23eedaef5e4f01ed5ca3cdc48f109e90edbdf4c7 SHA512 8ff07ba58d3055cc4028043089e65f2b3d249640bdbb20035b6c351334a8ced22654d36edf0f5afcd1cb4c398707964892c00c71ee3fe06bd732ec56d9e6efda
+EBUILD selinux-fetchmail-2.20180114-r2.ebuild 290 BLAKE2B e84e446c107a25f807382e19b23959936f9ece26fe71815bd34fc5c861847041e26ad1561a31cc8eca99b7cfb6c4b0ce0510bfa5713be762529dc4cfe2437476 SHA512 cc184e4349ea7beb4a528805ffd429b394010bc24a7eeb37f6faa2c7e5be9700b2e89605013a0ff37c020b502cea29ee0893aef841ed31fae201053745183557
+EBUILD selinux-fetchmail-9999.ebuild 290 BLAKE2B e84e446c107a25f807382e19b23959936f9ece26fe71815bd34fc5c861847041e26ad1561a31cc8eca99b7cfb6c4b0ce0510bfa5713be762529dc4cfe2437476 SHA512 cc184e4349ea7beb4a528805ffd429b394010bc24a7eeb37f6faa2c7e5be9700b2e89605013a0ff37c020b502cea29ee0893aef841ed31fae201053745183557
 MISC metadata.xml 319 BLAKE2B e073dc2b6ff305b6eada410f65d501d465ee269aaece755ae147580c52b4487bd805947f5bcce1f80cfda5dc0995caec87f6cb73ff393837b7877462b1f3296e SHA512 7e8e5cc8a4d87c86538ce4d507c43763e77be4819715c302c6c616fd6d84c010c109fba0ee147ed4dee2398f5d924e28561b4d9fb4b8c7f99acb8861ac05b472
diff --git a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20180114-r2.ebuild b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..1c4c778ba5af
--- /dev/null
+++ b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 3f6a235d2487..1c4c778ba5af 100644
--- a/sec-policy/selinux-fetchmail/selinux-fetchmail-9999.ebuild
+++ b/sec-policy/selinux-fetchmail/selinux-fetchmail-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-finger/Manifest b/sec-policy/selinux-finger/Manifest
index d1abe6c697e2..12e4c431bf41 100644
--- a/sec-policy/selinux-finger/Manifest
+++ b/sec-policy/selinux-finger/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-finger-2.20170805-r2.ebuild 377 BLAKE2B ff667a395281176cce09b774a
 EBUILD selinux-finger-2.20170805-r3.ebuild 377 BLAKE2B ff667a395281176cce09b774ad959c3086a88d7e2b690bc6eda78133790c9a0a5d03fbf0012ea0a8d6a73bcb7599c357a47bde5131016d238c3c7617e679b79e SHA512 1f4ce42ec01a318be586e92aea495c867d60e04d14c7fd08bf40b3bb410b34593a8ed3501d61e85d34fe1bac212811af46322290fd631c3e4acd7279a171c802
 EBUILD selinux-finger-2.20170805-r4.ebuild 379 BLAKE2B 4f202cb92bf811ad058b0a237aaa99f405f01afa734035c993769a74eb892facdcfea1d1d0f4f0599bafd2f62e582d5d6ba4e04db23fca3c420e234cb179815d SHA512 88c1c9c746a4c19b16deac479d5d22197f0f2ff040541bd1648b505aac33929bf4b94f2c429d048ca6d0cce0cf98291c2fa41bbf1175ca7f966b24eacc31a2e0
 EBUILD selinux-finger-2.20180114-r1.ebuild 377 BLAKE2B cb8e2b93da9c49c82941aeb2797349f04eaa26ac80ad0fa85f8e70a12fb2706d5c1afb956ecc7b0e83209d5716651eb03776ba1e7c717d2554d2a72650899876 SHA512 650e792126aad2ac4fdacfbc6dc0e9649bc4fcc1c77a8561e8d35f54cc5c7c163972ef61c456b3fa451863b448836956929fce6fb6a4b6d41327a78b7924dc9d
-EBUILD selinux-finger-9999.ebuild 379 BLAKE2B 4f202cb92bf811ad058b0a237aaa99f405f01afa734035c993769a74eb892facdcfea1d1d0f4f0599bafd2f62e582d5d6ba4e04db23fca3c420e234cb179815d SHA512 88c1c9c746a4c19b16deac479d5d22197f0f2ff040541bd1648b505aac33929bf4b94f2c429d048ca6d0cce0cf98291c2fa41bbf1175ca7f966b24eacc31a2e0
+EBUILD selinux-finger-2.20180114-r2.ebuild 379 BLAKE2B ae42f00c0b1ae7b927bb35b8cf05f6e3fa7befff3c195a613673ad8b3104819c2604e6680a4095df6c33a23b649e4375811045b789d2652173105781e0990cc4 SHA512 100020ba8690a677e51bc22043f5697b076b490f16b92067fb4ffd9fcb2a6150ffdb017ee8e5c4fe3f72ce0a8346a11aa4e13e63d0b204beead795a594a887b5
+EBUILD selinux-finger-9999.ebuild 379 BLAKE2B ae42f00c0b1ae7b927bb35b8cf05f6e3fa7befff3c195a613673ad8b3104819c2604e6680a4095df6c33a23b649e4375811045b789d2652173105781e0990cc4 SHA512 100020ba8690a677e51bc22043f5697b076b490f16b92067fb4ffd9fcb2a6150ffdb017ee8e5c4fe3f72ce0a8346a11aa4e13e63d0b204beead795a594a887b5
 MISC metadata.xml 316 BLAKE2B 4616dff4829030f8809d5bfd76c5b3ba9efa72963c9e758418b06bd85a1538125526b60d1fe6fd282dbe9cc04a9139f85f8a134751be0ba47b157d8e5d62d9a1 SHA512 52daa0a0cca3fc954aafb579561bbd1c68d17cb2b1ab8f03b0de5be5a6d0c02dcdd1c1384a6b55dfe83e41ebf62da5dd3cb39bc11e03eacab82b18ce198ab8a7
diff --git a/sec-policy/selinux-finger/selinux-finger-2.20180114-r2.ebuild b/sec-policy/selinux-finger/selinux-finger-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..04668c6ca0b6
--- /dev/null
+++ b/sec-policy/selinux-finger/selinux-finger-2.20180114-r2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 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 eb23f0062012..04668c6ca0b6 100644
--- a/sec-policy/selinux-finger/selinux-finger-9999.ebuild
+++ b/sec-policy/selinux-finger/selinux-finger-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-flash/Manifest b/sec-policy/selinux-flash/Manifest
index 623d9493dc51..42ebe0853c6f 100644
--- a/sec-policy/selinux-flash/Manifest
+++ b/sec-policy/selinux-flash/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-flash-2.20170805-r2.ebuild 280 BLAKE2B 445b038d4a164313e67c5e3887
 EBUILD selinux-flash-2.20170805-r3.ebuild 280 BLAKE2B 445b038d4a164313e67c5e388736f345e4d390803f37e264d36dd79aa536d61e12175aa18cfdbf2481b67553a5f8fe7d3fdb33e80da335a9be537827a9e68660 SHA512 f02542149abf6b4ddf112b52e6ad85f0f54d98a6a79449d00a54bd38848354ad65edbb808e02601b3f04f83155eab7f549efb13d7f3784b935a585b3623708d3
 EBUILD selinux-flash-2.20170805-r4.ebuild 282 BLAKE2B dc53ae431fc71dcbe747079ec4f982119ca2e6fa4ceb39d7a7b2bde47152d88f5f4f8e067eb0106ba74781902c94db3c85316f3760856f5a188684aa32ba4a02 SHA512 693a00499184276b494b9bcf6999968407d9a3f1f789d62a93f488e9522c86c816da1ef208a234de0da3406f70799316d71e37147bb65389ee12e56727844bf5
 EBUILD selinux-flash-2.20180114-r1.ebuild 280 BLAKE2B 053fa938e689a0ec43a8d940c5024d63b8cdbeba5dc448f8ac2b2f7fb47768f8d06d3950f4c0227075499a640f76f537b42f9dcf2edb12ccccedc85090c520e4 SHA512 263956232acec65293b38252b4bdbfbdb34a27b6e11e42a517a9d17c98c8ea5c59f3b9897f324519a8b479a69fd2cc3fbccc544b7ed1318175c960917c317151
-EBUILD selinux-flash-9999.ebuild 282 BLAKE2B dc53ae431fc71dcbe747079ec4f982119ca2e6fa4ceb39d7a7b2bde47152d88f5f4f8e067eb0106ba74781902c94db3c85316f3760856f5a188684aa32ba4a02 SHA512 693a00499184276b494b9bcf6999968407d9a3f1f789d62a93f488e9522c86c816da1ef208a234de0da3406f70799316d71e37147bb65389ee12e56727844bf5
+EBUILD selinux-flash-2.20180114-r2.ebuild 282 BLAKE2B 43f2ebf65c5f79b67426e9b8e3b736892283f82ed7abdd801800f7560cb8cf3a0ecacb6a78fbd176be8b355dfeedf8da77826a47d1213412f60785c71852c57c SHA512 d39d2fc8e0ebd4499573661e15dca2afb3737293131cf0a1d8626a3b78b3967497837d0344704fdbe17801c49b24f5f6cb4aad14d261c27c67acbad915bb51b1
+EBUILD selinux-flash-9999.ebuild 282 BLAKE2B 43f2ebf65c5f79b67426e9b8e3b736892283f82ed7abdd801800f7560cb8cf3a0ecacb6a78fbd176be8b355dfeedf8da77826a47d1213412f60785c71852c57c SHA512 d39d2fc8e0ebd4499573661e15dca2afb3737293131cf0a1d8626a3b78b3967497837d0344704fdbe17801c49b24f5f6cb4aad14d261c27c67acbad915bb51b1
 MISC metadata.xml 326 BLAKE2B 7bf48ddd76caa0a0e6ffa9ac59dbe33b521498795ec20b8da4a155ff8c7c729e5c8904569ce4793780c78abb5ad92b2292af23be21fca3c1b1eda793ef375757 SHA512 0534363003255e27ff839750cb0a7363afe38894d5ffda86dca467dcc0c25cd0de3c186ae856391d3466602eedde24599fee66c2a2786bb662da5abb646a9d50
diff --git a/sec-policy/selinux-flash/selinux-flash-2.20180114-r2.ebuild b/sec-policy/selinux-flash/selinux-flash-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..09267ae8a349
--- /dev/null
+++ b/sec-policy/selinux-flash/selinux-flash-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 b72f895854fe..09267ae8a349 100644
--- a/sec-policy/selinux-flash/selinux-flash-9999.ebuild
+++ b/sec-policy/selinux-flash/selinux-flash-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-fprintd/Manifest b/sec-policy/selinux-fprintd/Manifest
index bc4c2f15b977..9197365274fc 100644
--- a/sec-policy/selinux-fprintd/Manifest
+++ b/sec-policy/selinux-fprintd/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-fprintd-2.20170805-r2.ebuild 376 BLAKE2B 7a6287b35365c8f1b369151f
 EBUILD selinux-fprintd-2.20170805-r3.ebuild 376 BLAKE2B 7a6287b35365c8f1b369151f85bafd66b06d909fbbbdf7962976d99299659f6a35637f7ef69ebc39bf96dd73d2f6e6268474456ff9d8f279ad4b4558e19163f8 SHA512 367d01eeb451d55109349bf19487c4931c46ffe0cd85af3d1c7c043f1b4d44c90f6491212087c110a66c5d679c821bb19cce03cd6ff321b8d81531b35529c3a3
 EBUILD selinux-fprintd-2.20170805-r4.ebuild 378 BLAKE2B c9a82aff7eee483aa5756e09ef61cd2b0b8fa81ea941968b80e820c904483b2c761ebfb196dd8c34814418aa97d2a93be31e4b4084089ee68ea2c322679d643e SHA512 7c44ff20bf43e7d9ba3ccd844759ce7e423b4e72214b84ce4c25cde3e876b6fbe21cbd8880ee5f89220b825719135cf4e677a93b6d7f138d16a6d7035609bed9
 EBUILD selinux-fprintd-2.20180114-r1.ebuild 376 BLAKE2B b0b06f790bb6eefb2441e6e96e9b69c599eb8eaed3db9b0a6f1aeb28276cf19c2baf1bdc87b9e2af4b69b9139dd00b2ddc43849fb2a05bd187be510b77555d93 SHA512 e8b9bb62cd7e3aaad9767728c0fb256339f04e8a3961b6b96e9af52fbd579627cd8ce520e100f95881dcdb1775c899853236720766ff3ff22e141782c05498bf
-EBUILD selinux-fprintd-9999.ebuild 378 BLAKE2B c9a82aff7eee483aa5756e09ef61cd2b0b8fa81ea941968b80e820c904483b2c761ebfb196dd8c34814418aa97d2a93be31e4b4084089ee68ea2c322679d643e SHA512 7c44ff20bf43e7d9ba3ccd844759ce7e423b4e72214b84ce4c25cde3e876b6fbe21cbd8880ee5f89220b825719135cf4e677a93b6d7f138d16a6d7035609bed9
+EBUILD selinux-fprintd-2.20180114-r2.ebuild 378 BLAKE2B 20be727aae31ede351d819a5cc3cff1669391f63ac90e9209f49570cd2eab95a5a6e946c4edcd38bd89f325b22ed1eef2a3908d7c2cb84216456809d3e40399f SHA512 13bb722fbf653d86f5fefb86def05ad837b2e3747478bae91242dd59c5b2c7d855a454a7e7fdbf495224e1d451557fc2f11b0e371cd50510d1705e670fc594f9
+EBUILD selinux-fprintd-9999.ebuild 378 BLAKE2B 20be727aae31ede351d819a5cc3cff1669391f63ac90e9209f49570cd2eab95a5a6e946c4edcd38bd89f325b22ed1eef2a3908d7c2cb84216456809d3e40399f SHA512 13bb722fbf653d86f5fefb86def05ad837b2e3747478bae91242dd59c5b2c7d855a454a7e7fdbf495224e1d451557fc2f11b0e371cd50510d1705e670fc594f9
 MISC metadata.xml 317 BLAKE2B 9f9ccfabc8cfba6051f77a746c06cd1a0752fc436b99969b9a08ec19cb2c4bfa810570df992eb9477ae043661184d7752435a8b32b063ed0c5eae9bf02c04d33 SHA512 b81abea30f23855ef1ab888e412acae6e66013ed0805219a09cdf6b89dfb06bb76f009aa4adb2caf880b4db26193af2fd90d4d95b74e94568438687dbc578d19
diff --git a/sec-policy/selinux-fprintd/selinux-fprintd-2.20180114-r2.ebuild b/sec-policy/selinux-fprintd/selinux-fprintd-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..0e40c0e7a66c
--- /dev/null
+++ b/sec-policy/selinux-fprintd/selinux-fprintd-2.20180114-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 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 d302e23cb97d..0e40c0e7a66c 100644
--- a/sec-policy/selinux-fprintd/selinux-fprintd-9999.ebuild
+++ b/sec-policy/selinux-fprintd/selinux-fprintd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-ftp/Manifest b/sec-policy/selinux-ftp/Manifest
index eeb713909a1d..836ad83963c7 100644
--- a/sec-policy/selinux-ftp/Manifest
+++ b/sec-policy/selinux-ftp/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-ftp-2.20170805-r2.ebuild 276 BLAKE2B 9cf29b3ea4f1fe613fe33a66bafa
 EBUILD selinux-ftp-2.20170805-r3.ebuild 276 BLAKE2B 9cf29b3ea4f1fe613fe33a66bafa8b3f8fb923b813c17b1df936176836373e8c3b163ac5b53631c381bd501de47219200822d503fd370160eabf7fa2cd18fe08 SHA512 e6da029767e22934af7e09443ccb370025ce5b4241a67ac61e2cb47784c0692d0c9a2393f03c75debe84b3a2d30cb5f99fb8d2816b899de38c87add603f953fc
 EBUILD selinux-ftp-2.20170805-r4.ebuild 278 BLAKE2B 2176d309bfadfce32a131c39a3f850eee60d939994a9dad1df251465f36678fd45d468082a93f8cd38530f6efdbcc66a8e3fa2b4e44132e3da932840710d6c59 SHA512 224834fc17de3d8aa1869721f6385d16c6fcae5df2a7f4f00633b1f0491f79f791a0bdc1be6660a555edd623bd28e00772c3e4a321d0dda9aed59d1b31279223
 EBUILD selinux-ftp-2.20180114-r1.ebuild 276 BLAKE2B 9bdb6a9b7cb1ef72481eb81b6888ecffabcd4efe06105a4478d9dcc25c242a2e510ff1a3b8164d42c05e6811e28c22caf82be2f5bdddbffc71ceb9da2125976a SHA512 d91002e2bbf29abb24ddf3ed0f12c9d7d06b2f6eb6bd974fabf8c39adba4c37b28b174e61afa0cd46af2d9dc3103e31ac1de4104def8c54b3d157d58edb30cca
-EBUILD selinux-ftp-9999.ebuild 278 BLAKE2B 2176d309bfadfce32a131c39a3f850eee60d939994a9dad1df251465f36678fd45d468082a93f8cd38530f6efdbcc66a8e3fa2b4e44132e3da932840710d6c59 SHA512 224834fc17de3d8aa1869721f6385d16c6fcae5df2a7f4f00633b1f0491f79f791a0bdc1be6660a555edd623bd28e00772c3e4a321d0dda9aed59d1b31279223
+EBUILD selinux-ftp-2.20180114-r2.ebuild 278 BLAKE2B 951d287c1ae115ef1e7460e764dd814b4d5f0d4184c1def363037c6209c74be8e31d57e245955cb460f00c8d31f2acf8fa58834127fc5f88c6df095160cdad06 SHA512 dfadcebb73fef617b79e0e2dba40d18650fa35e19baaaacf63430bfa9e273bd0f9ddb7f085c86e30745b15bb9dba283202af6cfe761887c430008a6e32d85183
+EBUILD selinux-ftp-9999.ebuild 278 BLAKE2B 951d287c1ae115ef1e7460e764dd814b4d5f0d4184c1def363037c6209c74be8e31d57e245955cb460f00c8d31f2acf8fa58834127fc5f88c6df095160cdad06 SHA512 dfadcebb73fef617b79e0e2dba40d18650fa35e19baaaacf63430bfa9e273bd0f9ddb7f085c86e30745b15bb9dba283202af6cfe761887c430008a6e32d85183
 MISC metadata.xml 313 BLAKE2B 517baf67e6834fdc3d1442c7c372f23a739c737068e2e13c33def26402837b2e3697cf39240bca81fe68180f8e509dc0e2d3c19f10780aa5a4a6a9ad0351ee72 SHA512 766f08c10b53ad30173f64f9ca3306cc2441442a6dfb3fd48d485bd0c3c2bb95896e447f6e1d94db1b6808c111489e2e5c2f40c64b1642303d801c99d1fe8c57
diff --git a/sec-policy/selinux-ftp/selinux-ftp-2.20180114-r2.ebuild b/sec-policy/selinux-ftp/selinux-ftp-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..6353d9496e45
--- /dev/null
+++ b/sec-policy/selinux-ftp/selinux-ftp-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 8e0376cb5ebb..6353d9496e45 100644
--- a/sec-policy/selinux-ftp/selinux-ftp-9999.ebuild
+++ b/sec-policy/selinux-ftp/selinux-ftp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-games/Manifest b/sec-policy/selinux-games/Manifest
index 94b350e822d8..2d099a48e644 100644
--- a/sec-policy/selinux-games/Manifest
+++ b/sec-policy/selinux-games/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-games-2.20170805-r2.ebuild 280 BLAKE2B 87852b1c1725c3f498b708db1c
 EBUILD selinux-games-2.20170805-r3.ebuild 280 BLAKE2B 87852b1c1725c3f498b708db1c417c3a9b89bb443a54bc1b46f89a91982f9e6ebfa8bc8ab61f8f8c00e8404bbe4ee14e6027fb2fd421f2ef3088eefc9e22d190 SHA512 164274c9a33d9bd0210568b4294ec61994a41ac04c99951aa68dd9ad596d2120a0228f3c40b95d44418807e3a9cb5548a136b8d7e095c9cb666196d399eedfc0
 EBUILD selinux-games-2.20170805-r4.ebuild 282 BLAKE2B 051f5fb9a7980fa7b9ee125506ec4291e691beb29a5c9c4fb613c5de3cd422ca3774f251a0b69055fbc17e692d989003c36ab8db2b76f7fe2ee0cb69b0c4d48e SHA512 8d2292aac43ddd08870c6418c473bfd57ca7c9e4a6f745273f9ab94616a1749674c38bdf788592ffb84ebd79a155dc07e46948a8798c526d1ab75d24c9408066
 EBUILD selinux-games-2.20180114-r1.ebuild 280 BLAKE2B d2dbf9504ad2fae821a010e88388f014d7fa4ed093f57cfef8461eb3a5bbc4ef91ddb02d30e5c566033f168c454694d8144dc54500d3f1c1aa97483ba511aa66 SHA512 8579f3d952fd9742975ba40b511e893fa54eb19af9170e52e6b9418f70dee592ee07c0b59511ed21624f801a25670a3ff45b98cf455db45c47dfef1f9e525ccc
-EBUILD selinux-games-9999.ebuild 282 BLAKE2B 051f5fb9a7980fa7b9ee125506ec4291e691beb29a5c9c4fb613c5de3cd422ca3774f251a0b69055fbc17e692d989003c36ab8db2b76f7fe2ee0cb69b0c4d48e SHA512 8d2292aac43ddd08870c6418c473bfd57ca7c9e4a6f745273f9ab94616a1749674c38bdf788592ffb84ebd79a155dc07e46948a8798c526d1ab75d24c9408066
+EBUILD selinux-games-2.20180114-r2.ebuild 282 BLAKE2B 8d7837cae56dbc97fb2d48d34083db6fadae9a408219cfb01bdd8c47cadd66e64b124f639607752d7d352eef22f21d940c7f5c4a618706ebbe517718d8485eb3 SHA512 7e3110d42f869688e9adcd0513402d2fec5785bcd74e018a0e6e2576bec3bb27a31ef3e134b8b9ad9b15b0ca6a55aae6d04ba83a42e28ec750bfa904fa3fd134
+EBUILD selinux-games-9999.ebuild 282 BLAKE2B 8d7837cae56dbc97fb2d48d34083db6fadae9a408219cfb01bdd8c47cadd66e64b124f639607752d7d352eef22f21d940c7f5c4a618706ebbe517718d8485eb3 SHA512 7e3110d42f869688e9adcd0513402d2fec5785bcd74e018a0e6e2576bec3bb27a31ef3e134b8b9ad9b15b0ca6a55aae6d04ba83a42e28ec750bfa904fa3fd134
 MISC metadata.xml 315 BLAKE2B 1232c932d995c55e4fccd0caf1b2b1d352878d82747b3a8c6eb52098afd11ba83aabb33b483293c7eaf1caf81add060c2cb0ad03f6339404fea29ce65f851c9a SHA512 056daa36a74927c8200145591e5fbabc9404fea497de85f944ab497c9b75507a34c7f40696829dbdb5d7d7edb8a74e8bc4fce97acba3ec84bbdf8000a106544b
diff --git a/sec-policy/selinux-games/selinux-games-2.20180114-r2.ebuild b/sec-policy/selinux-games/selinux-games-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..4057d0081474
--- /dev/null
+++ b/sec-policy/selinux-games/selinux-games-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 4c24909e61d9..4057d0081474 100644
--- a/sec-policy/selinux-games/selinux-games-9999.ebuild
+++ b/sec-policy/selinux-games/selinux-games-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-gatekeeper/Manifest b/sec-policy/selinux-gatekeeper/Manifest
index 09ace78dcb63..fea418d27bd6 100644
--- a/sec-policy/selinux-gatekeeper/Manifest
+++ b/sec-policy/selinux-gatekeeper/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-gatekeeper-2.20170805-r2.ebuild 290 BLAKE2B 5b1aee806b59aea062acd
 EBUILD selinux-gatekeeper-2.20170805-r3.ebuild 290 BLAKE2B 5b1aee806b59aea062acdbf814d9890dfa022a3f290248bddbaaf00d2e68809496a084ce55425437a70702d1e00538606845d34746e39996bd48ab8a710d6fbe SHA512 e2b72d453e1b39bed45c1ac2135fb7a7043fea216cedba176fcf87033606b3c0bdbf015832573f474bc0107ae26baf301165d5105ae0fdcdbe4f86f2fbc0ea67
 EBUILD selinux-gatekeeper-2.20170805-r4.ebuild 292 BLAKE2B a90a98b707604b2d81e82bf2e666b3b2b8fe6cece3ee6beb1737707bf9c0adddd577c40d4e3a8f14763f757b038f72aa2ac9d0cf9b077de496298e9fdf1ac5f3 SHA512 151b0dec849d4533b68f3d8be0b465a2b441bfe8f38ac9cf0a0e6845966140139591dbbd9f3348801eacd9930358490a1a581448fe9993c134c45eb38025cc87
 EBUILD selinux-gatekeeper-2.20180114-r1.ebuild 290 BLAKE2B 6b0ee589fd681020df5bfb6b529553a08516632ac4319d64bcec52ed1efd4406b690cfe5f94d7e029f25b59fa25879dd11be03103efb9ed0bc1f345b90f608c1 SHA512 2aae8002cd3e3735e3e082c14e6e7c7f4ba9fac233743a6c2efa444c6b10f6285958f5b8b684b8b6e723a11e0ad7d18127e324f5844bd1905fb9d337ac45a1c5
-EBUILD selinux-gatekeeper-9999.ebuild 292 BLAKE2B a90a98b707604b2d81e82bf2e666b3b2b8fe6cece3ee6beb1737707bf9c0adddd577c40d4e3a8f14763f757b038f72aa2ac9d0cf9b077de496298e9fdf1ac5f3 SHA512 151b0dec849d4533b68f3d8be0b465a2b441bfe8f38ac9cf0a0e6845966140139591dbbd9f3348801eacd9930358490a1a581448fe9993c134c45eb38025cc87
+EBUILD selinux-gatekeeper-2.20180114-r2.ebuild 292 BLAKE2B 23ed75ae334fb75924eb269fb16163e77a2ad1f2c0a9fc1c7318562d84308cab3db8234c60741ef3d0d9622d37e25143c8a3aabe5a4744930e88f4d10b0c8c5e SHA512 4f0a4243811c1daaf8c44e759a1ce3b7c2d38961f05031dd88a201dd6ce5e2b06838bcfa3183d7792470cf46991c387f13a7a55115d4e86d7342f8849afeaf85
+EBUILD selinux-gatekeeper-9999.ebuild 292 BLAKE2B 23ed75ae334fb75924eb269fb16163e77a2ad1f2c0a9fc1c7318562d84308cab3db8234c60741ef3d0d9622d37e25143c8a3aabe5a4744930e88f4d10b0c8c5e SHA512 4f0a4243811c1daaf8c44e759a1ce3b7c2d38961f05031dd88a201dd6ce5e2b06838bcfa3183d7792470cf46991c387f13a7a55115d4e86d7342f8849afeaf85
 MISC metadata.xml 320 BLAKE2B d91c149118f412ba61feff679a92152bee2bc3be1cd62c5ba9e3caa0a0fc94a0161c5f70595c7e2616f93359693e05037e181f26cd334955b90e7ce0e967d69b SHA512 d03bbe8a36c743c5a8ec79df643d4075e1edb314f2d37b6579e155acd141e3d1c08d8c070f0690c899b166fa469e2774a546132f19353c81a541f831087aa55b
diff --git a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20180114-r2.ebuild b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..c10d2e7e7c9f
--- /dev/null
+++ b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 1c7fb8d34324..c10d2e7e7c9f 100644
--- a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-9999.ebuild
+++ b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-git/Manifest b/sec-policy/selinux-git/Manifest
index e10307dc59ff..4501b1222f74 100644
--- a/sec-policy/selinux-git/Manifest
+++ b/sec-policy/selinux-git/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-git-2.20170805-r2.ebuild 372 BLAKE2B 0d1224aea9956cc54e0595f96b67
 EBUILD selinux-git-2.20170805-r3.ebuild 372 BLAKE2B 0d1224aea9956cc54e0595f96b676d2f12977c45034eef1f763e178630975ed56ef876a61b2438e79c1bf52f895e2ff15806dafd8c0bdd95d0a7f4108117f5e7 SHA512 960473bce9ba66eebe09bbd3361bea582419dd1fdc230c3928f8640f9f6fd0ae63a840a2dbe500f2270e77e0cfa8fa468309eb494e6b1ac0feb3bd1e373dc5be
 EBUILD selinux-git-2.20170805-r4.ebuild 374 BLAKE2B f47ddf03eaea721c74cdae9feac6663ce7c48fc4a3103cd247682e704b67b1b31c3828f7fbcc549fbe256d742eef1af55b987a4b3d48cdaaa4755b5107775cf9 SHA512 61118174098f658adb0c617c867bac82ddf8adfe4b3e70282ff8d52da961d9eb517a349357c1a8f6fd39e48effbfa94fc24d41a206f19513e402cf0a3daee5a0
 EBUILD selinux-git-2.20180114-r1.ebuild 372 BLAKE2B f18cebe3b7e6d07178a70ad20065f934c256dcb7878a3f86a6ee2071a11336e3e72b5979f7de256c0402a19a67baea6429b4c62600c4667e9906df5592706094 SHA512 bee9100fde860491d73906929a81833357b292b6bd19df089fbf403ce35ba88ec7df2c88c67087691f5eee22a98f630a7a57f88bce047942c71b489e2a2f8286
-EBUILD selinux-git-9999.ebuild 374 BLAKE2B f47ddf03eaea721c74cdae9feac6663ce7c48fc4a3103cd247682e704b67b1b31c3828f7fbcc549fbe256d742eef1af55b987a4b3d48cdaaa4755b5107775cf9 SHA512 61118174098f658adb0c617c867bac82ddf8adfe4b3e70282ff8d52da961d9eb517a349357c1a8f6fd39e48effbfa94fc24d41a206f19513e402cf0a3daee5a0
+EBUILD selinux-git-2.20180114-r2.ebuild 374 BLAKE2B 2d994f2b95b65f8275af1679d8a03d12a98ede2b5552c6f5b761232684af8f77aa737593ce199bf281c5a71a75e5fa68416cb530a7d9d501c9b2f0d316e29690 SHA512 4f02acaf0a49ee83a5075de0379842608f4d55ff3803c48e3a7b487cf2324d3f0b91245a8cecb41c03cf906ce6572ffa5db8e8272994743bda6c196f3d6cd7f3
+EBUILD selinux-git-9999.ebuild 374 BLAKE2B 2d994f2b95b65f8275af1679d8a03d12a98ede2b5552c6f5b761232684af8f77aa737593ce199bf281c5a71a75e5fa68416cb530a7d9d501c9b2f0d316e29690 SHA512 4f02acaf0a49ee83a5075de0379842608f4d55ff3803c48e3a7b487cf2324d3f0b91245a8cecb41c03cf906ce6572ffa5db8e8272994743bda6c196f3d6cd7f3
 MISC metadata.xml 313 BLAKE2B effb568bf70e783215963ed3cbabecdbdf7bf8246a47791737925a4198f3daa55c471e223d89b83d58e3d3c2eaec75cc7d2a127a781b1bf1410cb346c28d3505 SHA512 907a80ca3d13826b0ddf500695e9d568cc90a3708a4fa87d442a9b32b93f94795d8d5bb8cfb191a95fc1eae4173c4bdba8192e427606ce6c74b00aa8d25239b6
diff --git a/sec-policy/selinux-git/selinux-git-2.20180114-r2.ebuild b/sec-policy/selinux-git/selinux-git-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..c88c3cfb5859
--- /dev/null
+++ b/sec-policy/selinux-git/selinux-git-2.20180114-r2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 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 7efd60bfe073..c88c3cfb5859 100644
--- a/sec-policy/selinux-git/selinux-git-9999.ebuild
+++ b/sec-policy/selinux-git/selinux-git-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-gitosis/Manifest b/sec-policy/selinux-gitosis/Manifest
index b32b420136e9..f2b819c880a8 100644
--- a/sec-policy/selinux-gitosis/Manifest
+++ b/sec-policy/selinux-gitosis/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-gitosis-2.20170805-r2.ebuild 284 BLAKE2B dd8ffc4e97f086bfda42ae77
 EBUILD selinux-gitosis-2.20170805-r3.ebuild 284 BLAKE2B dd8ffc4e97f086bfda42ae77320afd671cd74546e1d99b1cbc9927c451651ac8863fb990f586d49ef2ccace37cafcd5348ffed535a5ff1ca9204b7ddf322a5f1 SHA512 1913ac1d59f9f57ebf7736ac7624f3b37d07cf2082861984973d7a2ba62088f2a01822524d3915554e5dccfc1cf6eb5f30f05482631b4bca8d7a35996e1c37e5
 EBUILD selinux-gitosis-2.20170805-r4.ebuild 286 BLAKE2B eca7be85f5c4ff67c0a047a9575288e50921aceb5462a6039fd56e45f36c7327fe0edb8cdacc0d60c96b6d8d642c07868a9a96b8fcc075345c47ba38a529edc0 SHA512 51e8548c8395447f8be3ce3d8e3ffdbd380a24fcfc927d765062008016d97e1b1b504815bdbf55bf863607e713607a9c0c508269a06c0310a3a57d4a448c627f
 EBUILD selinux-gitosis-2.20180114-r1.ebuild 284 BLAKE2B e2c3faf80ecbed4275cef356e96777576abca75d1c82f137825228f78ab5b835fb8e072da43d272c736038a42d167cff74c7e7a1a5b7af625efd6e1ff96edb9a SHA512 394bbd7995f8bb52846c8cf075472d78244aaaa921209442e1ff9dc2c3cd6de92ddd89e70363a9bbcd61a8d2c0c820034f4912b2d0719737184cf14ad2fb7408
-EBUILD selinux-gitosis-9999.ebuild 286 BLAKE2B eca7be85f5c4ff67c0a047a9575288e50921aceb5462a6039fd56e45f36c7327fe0edb8cdacc0d60c96b6d8d642c07868a9a96b8fcc075345c47ba38a529edc0 SHA512 51e8548c8395447f8be3ce3d8e3ffdbd380a24fcfc927d765062008016d97e1b1b504815bdbf55bf863607e713607a9c0c508269a06c0310a3a57d4a448c627f
+EBUILD selinux-gitosis-2.20180114-r2.ebuild 286 BLAKE2B e10d8157035d778398d843ad45efec06e2555db024498c0e78522b66ad0877231a569d3ed3eb4e469db967227a1d31d30b82ec7c09f03e226d99e3a2a32a8018 SHA512 53654112606cd53dbf1c1feb67279e7d39558aff834d74c852e20da7ee0d762db7449b835e1b7776ce27dfaa09702594e842c41242d7b076f3d003a9b18d8094
+EBUILD selinux-gitosis-9999.ebuild 286 BLAKE2B e10d8157035d778398d843ad45efec06e2555db024498c0e78522b66ad0877231a569d3ed3eb4e469db967227a1d31d30b82ec7c09f03e226d99e3a2a32a8018 SHA512 53654112606cd53dbf1c1feb67279e7d39558aff834d74c852e20da7ee0d762db7449b835e1b7776ce27dfaa09702594e842c41242d7b076f3d003a9b18d8094
 MISC metadata.xml 317 BLAKE2B 2783356823beb4808b1b3cc33c32ff6791ce87dc8f0ee675a1f115b085ecb6514a324846b3f495822f0682fc45f7287e3380ece31d4231412bfd101f628fbdeb SHA512 aaf3e9dc008475b8fa3eea3471cc12fbac3ff7473303649cc8d4189513657f0dbf7ddb9b9cce659220ef4100a4560d551547886923c7cf43e12316c6bde03d17
diff --git a/sec-policy/selinux-gitosis/selinux-gitosis-2.20180114-r2.ebuild b/sec-policy/selinux-gitosis/selinux-gitosis-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..0f2fb118b3e1
--- /dev/null
+++ b/sec-policy/selinux-gitosis/selinux-gitosis-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 995d98230feb..0f2fb118b3e1 100644
--- a/sec-policy/selinux-gitosis/selinux-gitosis-9999.ebuild
+++ b/sec-policy/selinux-gitosis/selinux-gitosis-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-gnome/Manifest b/sec-policy/selinux-gnome/Manifest
index 2159e1b45d8c..ce50f93f7326 100644
--- a/sec-policy/selinux-gnome/Manifest
+++ b/sec-policy/selinux-gnome/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-gnome-2.20170805-r2.ebuild 280 BLAKE2B ab856761057296fba5b73d24c8
 EBUILD selinux-gnome-2.20170805-r3.ebuild 280 BLAKE2B ab856761057296fba5b73d24c8e40d4ff7fa3c05ee8bdbc50965384a47cca012ee12e42cce591177b7f272c33b9d2718ef713bc260ea3c5b4ac4f9b2ffc86029 SHA512 b58d0f03ab3dd7db70f5983f3393fe0b8d0e2be1f82e0a89bc7784a615bf0226df399f872616ec052a51f029c72fc85f818d40eb4c7524a7190202bf87c20dd2
 EBUILD selinux-gnome-2.20170805-r4.ebuild 282 BLAKE2B 10a878b9c15c3f63c0086da4246bf70726266674864067dbcbcfad00cece11748c1d2d44da3980a5f09630c46c05fef58a725a52f35c1bdd8fd0afc2f9e11064 SHA512 c74c5392e1bae262f9290aa8e8296b7d2e21efa08b793c2779e0335c1fe6c9fa3136d5d52279f95729e297656475518e5d4ce72e669f968722a16e4a55ef1a35
 EBUILD selinux-gnome-2.20180114-r1.ebuild 280 BLAKE2B 56c25071d6c04a7463516bccd17ebbc574a085d422965abd5a58516bc7798725697b2ac5fc469092a3b92f57d5bde8436e03e46a9f19320fc29c5fe2d342dd2f SHA512 dcba23c72712d6b0f262c3b46998eb18d113c06fd24d4ba40a4b64fb8649dde6e0a95b3bba08f3e87bfb550acd89ca9d3aff67a5c404c508f842b164e021d483
-EBUILD selinux-gnome-9999.ebuild 282 BLAKE2B 10a878b9c15c3f63c0086da4246bf70726266674864067dbcbcfad00cece11748c1d2d44da3980a5f09630c46c05fef58a725a52f35c1bdd8fd0afc2f9e11064 SHA512 c74c5392e1bae262f9290aa8e8296b7d2e21efa08b793c2779e0335c1fe6c9fa3136d5d52279f95729e297656475518e5d4ce72e669f968722a16e4a55ef1a35
+EBUILD selinux-gnome-2.20180114-r2.ebuild 282 BLAKE2B 01b4b8d382fb97acff433527e8e37fb9c6ac0ad8e1b443d51c9aa9bd9d90a605255ab4c39b14a1d5ea6d2646aeb9d513772b93fc2af116a87c5372b223294574 SHA512 580cc8d5b3f35a3f814b40ecf04220bcaba632d479207a94f8819a9bed8baed4fed0b3885227843855b4428b727a60a6da517265fe66ecb5a2d7cd6ef790441f
+EBUILD selinux-gnome-9999.ebuild 282 BLAKE2B 01b4b8d382fb97acff433527e8e37fb9c6ac0ad8e1b443d51c9aa9bd9d90a605255ab4c39b14a1d5ea6d2646aeb9d513772b93fc2af116a87c5372b223294574 SHA512 580cc8d5b3f35a3f814b40ecf04220bcaba632d479207a94f8819a9bed8baed4fed0b3885227843855b4428b727a60a6da517265fe66ecb5a2d7cd6ef790441f
 MISC metadata.xml 315 BLAKE2B 1932f9fe6969fec43c46097b2085ca52cd1127fc78f06a4447166ec95c342c7fb04dad5d35f6f38506e94f5cb099e500085fbe692c7949a5dcca1ac423988b2d SHA512 31d6b3a85661d1b7438e748deb4b92fb4908ace1ee215381d47953c265a75f171b58138d775e9bc1c55aeeb1e375e0ebbc6f6d98e9292fcb27a83e79975f54f3
diff --git a/sec-policy/selinux-gnome/selinux-gnome-2.20180114-r2.ebuild b/sec-policy/selinux-gnome/selinux-gnome-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..0038031ba9d5
--- /dev/null
+++ b/sec-policy/selinux-gnome/selinux-gnome-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 092756b47a10..0038031ba9d5 100644
--- a/sec-policy/selinux-gnome/selinux-gnome-9999.ebuild
+++ b/sec-policy/selinux-gnome/selinux-gnome-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-googletalk/Manifest b/sec-policy/selinux-googletalk/Manifest
index 91327a61d7e2..45d92b48c40d 100644
--- a/sec-policy/selinux-googletalk/Manifest
+++ b/sec-policy/selinux-googletalk/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-googletalk-2.20170805-r2.ebuild 294 BLAKE2B 9e4c80d94d79e0abb3b59
 EBUILD selinux-googletalk-2.20170805-r3.ebuild 294 BLAKE2B 9e4c80d94d79e0abb3b5965e9ae0c1b78d37b1b0c27448e7c1d1b6ed428522c1cf342985108d35b4500b577a403fe5ab272f9b57472219b248a2dfb0d1f83d98 SHA512 fcb9de8065b8456db8e880a38cd6110be8e432a6cb32ef34c094d7ced1029b2fba0169f709d4b837ae87afa1e7a57c907a0b733dc1ecbb453d2bd419a7919bc6
 EBUILD selinux-googletalk-2.20170805-r4.ebuild 296 BLAKE2B 85f889444504616d731e97337499fbb126fbd02ea2dd8c001c58c241ae61a47a2995d59c0441737b54a153ad7e4da379b00de2632d74d885941a9454a950a354 SHA512 c8e6acd0c6991be782be496556d9228b89537f0571eef01202f558b0aaf3b943cda029e9ea1dccd9d73b2d339d7eab8b7e3200a0916a701924052df01ae8a929
 EBUILD selinux-googletalk-2.20180114-r1.ebuild 294 BLAKE2B 7e9eb49026cde11de107c3adf05e096ef9829246d270ce76aa4c7728d5a14b5f5f2ba5e9b7c5db717868db81f5f94d6f5ea0b89a0a76cee0a119c04a9e842389 SHA512 fd377f68c3cc8b10747fbe1d579ff788ab3b120adfa4648a5dca853986f5a258e6c4b78fc86a0c4d3091520e059e8ad7edaac19ba0c52ef1659e1c18ab3e9338
-EBUILD selinux-googletalk-9999.ebuild 296 BLAKE2B 85f889444504616d731e97337499fbb126fbd02ea2dd8c001c58c241ae61a47a2995d59c0441737b54a153ad7e4da379b00de2632d74d885941a9454a950a354 SHA512 c8e6acd0c6991be782be496556d9228b89537f0571eef01202f558b0aaf3b943cda029e9ea1dccd9d73b2d339d7eab8b7e3200a0916a701924052df01ae8a929
+EBUILD selinux-googletalk-2.20180114-r2.ebuild 296 BLAKE2B 5b6e3c089fe50ba2019321e8617968fa94f2fabd1bf3d9ccf5dd5c35c82ab94c54a6eb5083b3cf5178b52f106984607bb763e7e84164bd90acae1b5c52c57007 SHA512 b576f1a91b85712d257a651be4298f56dffed4345ed8b764f9c062595f866e7e80f45c40b1f595bf84575f7794c4b9ae41bffb185480444c5dcbb95f664a2ba3
+EBUILD selinux-googletalk-9999.ebuild 296 BLAKE2B 5b6e3c089fe50ba2019321e8617968fa94f2fabd1bf3d9ccf5dd5c35c82ab94c54a6eb5083b3cf5178b52f106984607bb763e7e84164bd90acae1b5c52c57007 SHA512 b576f1a91b85712d257a651be4298f56dffed4345ed8b764f9c062595f866e7e80f45c40b1f595bf84575f7794c4b9ae41bffb185480444c5dcbb95f664a2ba3
 MISC metadata.xml 321 BLAKE2B 2d10b65fda50b9f62a890a562f6c972873d80f356cdb3d73cb7f88f4481dc780c2a5031064b71371758b9ec8a34b277b33c433286bb82ae05c7f675ed0746927 SHA512 e09997299b9a7ed78be623f1158549b24d507e8393f47da561094dc216cfbd5f715ab169875c3faa42025da80972d825c55fac9335392731d7a181f78c41286b
diff --git a/sec-policy/selinux-googletalk/selinux-googletalk-2.20180114-r2.ebuild b/sec-policy/selinux-googletalk/selinux-googletalk-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..715779dd67c1
--- /dev/null
+++ b/sec-policy/selinux-googletalk/selinux-googletalk-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 7acb35a9c323..715779dd67c1 100644
--- a/sec-policy/selinux-googletalk/selinux-googletalk-9999.ebuild
+++ b/sec-policy/selinux-googletalk/selinux-googletalk-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-gorg/Manifest b/sec-policy/selinux-gorg/Manifest
index 39fc48638f2b..516abb6b7215 100644
--- a/sec-policy/selinux-gorg/Manifest
+++ b/sec-policy/selinux-gorg/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-gorg-2.20170805-r2.ebuild 278 BLAKE2B 15a311879b2618087e42f80eb67
 EBUILD selinux-gorg-2.20170805-r3.ebuild 278 BLAKE2B 15a311879b2618087e42f80eb67ee21b84800252dd8b227de5907b62aa7c7a31ce20c60c71bed278f17e408d1910c0945dd593fd2d2a739f0181e141246ff5d1 SHA512 f51686b852d508bb39bdf5d3fb94ae0da4079837b6b21e45adacd868d97ad99e7eec8ae872d14c5a68ee002fb62e39701ab33d827192763e72d8dcde351eb4cd
 EBUILD selinux-gorg-2.20170805-r4.ebuild 280 BLAKE2B df0f29126bf4b298e896fd1a1627acc90357ab2e759f6ac866a780982c088531271570019d87de832fb44b58fd500159953e8e4cc016661c63c73feec35f0770 SHA512 a9656bbef538f64cb147f4ffa22f05ccae099e293ddf1a683703d7e22b528b5df801a0f78a4eeb8b68c2e6d763209e0599f9f7936ba3b9c85750bcd902b2129a
 EBUILD selinux-gorg-2.20180114-r1.ebuild 278 BLAKE2B 8fe4d5379f2c72bdd11bd548bf796f0311729cc76be80ef51b3da033a543e63b4a45415c5c9a1c4f79befe363382de2112d4c00cc8c0718c59c6149c287c6666 SHA512 c09443eac98ed28ea7c402c29d8761a892949e3869eb5243e8c54c9494ef9353311e1f35047ed7f36fba3865d6245393487a54782a051c2af65293511c1eac60
-EBUILD selinux-gorg-9999.ebuild 280 BLAKE2B df0f29126bf4b298e896fd1a1627acc90357ab2e759f6ac866a780982c088531271570019d87de832fb44b58fd500159953e8e4cc016661c63c73feec35f0770 SHA512 a9656bbef538f64cb147f4ffa22f05ccae099e293ddf1a683703d7e22b528b5df801a0f78a4eeb8b68c2e6d763209e0599f9f7936ba3b9c85750bcd902b2129a
+EBUILD selinux-gorg-2.20180114-r2.ebuild 280 BLAKE2B f15386379354a20cdc159d5dffc80ba7abdd6de882a389b4c00b83a80350e7efa6b1bd724fcaacf033ef9d304d0cad330ce8be814f4d0482fe43ad2825446e44 SHA512 96e96d2ff2a3e5d2e24760082703d34ff8422db371314a7f78fd5f247d4d6efcdea1cd9a1e89931370508a36cb15b60280a62dc8743c82e7cbb5adf6ffdbb900
+EBUILD selinux-gorg-9999.ebuild 280 BLAKE2B f15386379354a20cdc159d5dffc80ba7abdd6de882a389b4c00b83a80350e7efa6b1bd724fcaacf033ef9d304d0cad330ce8be814f4d0482fe43ad2825446e44 SHA512 96e96d2ff2a3e5d2e24760082703d34ff8422db371314a7f78fd5f247d4d6efcdea1cd9a1e89931370508a36cb15b60280a62dc8743c82e7cbb5adf6ffdbb900
 MISC metadata.xml 314 BLAKE2B c5f46fdd3046a5e9ca0fe3a6a518f39329090fe38761a84e147868e126a108d1d04d29de16cd7d7e4bab04672cd77d2ca594c0f29b7593e05ec1dac3d54a1fd7 SHA512 bbbf21e449ca7c6bc287093a5c8f42db23f0f41f41316b7b5f08e7a1bcbcdd3e54c2e79bbeec9533ef78c2a8ef5e6c029ffad2f02eee7532e219fef42b0f99b8
diff --git a/sec-policy/selinux-gorg/selinux-gorg-2.20180114-r2.ebuild b/sec-policy/selinux-gorg/selinux-gorg-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..1538462400a9
--- /dev/null
+++ b/sec-policy/selinux-gorg/selinux-gorg-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 f4eff5e13fcf..1538462400a9 100644
--- a/sec-policy/selinux-gorg/selinux-gorg-9999.ebuild
+++ b/sec-policy/selinux-gorg/selinux-gorg-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-gpg/Manifest b/sec-policy/selinux-gpg/Manifest
index cc002d96cf73..44b95b3dae83 100644
--- a/sec-policy/selinux-gpg/Manifest
+++ b/sec-policy/selinux-gpg/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-gpg-2.20170805-r2.ebuild 276 BLAKE2B c1f58855eb976232f91c9fcff386
 EBUILD selinux-gpg-2.20170805-r3.ebuild 276 BLAKE2B c1f58855eb976232f91c9fcff386a6ee36b6d340cf5a96234d47e63a70591e6fc9fc2263de936612b5882b3c569c3f644375becae5fedd90c56291e25813b438 SHA512 70eb06d51999bc1cbbe8c14df3bc5729eca2f0057b0e95564aeaa011b68c7bc9e8f1d2bba262a04b40bfb5511bc6d9d42b278280bcf2d04c3dcad3f44c2139c7
 EBUILD selinux-gpg-2.20170805-r4.ebuild 377 BLAKE2B 627fd0e4b57cb9fd3c17a357d429c0f057b66c5b75ac2bcb9feb740517df862e77d7f62fbe5164df91ca73e529e50de88371f96c4b37cfea984ff280d468a94f SHA512 ed572b8c2d639deb6e01abdef2919db94f3493a3a4f14f83636a87295a20df3b7288b22a89eca1dd2ab0aae970db3aea2a07bbd3b115259c73a836cccdb242e7
 EBUILD selinux-gpg-2.20180114-r1.ebuild 375 BLAKE2B 8f82301056fd5b042dde285220f4eab3478ee7feb530323a6ddffe408b3f1b86d666c07161c19215a8bb2b311a57a837cd94ff302e589386875cb3bebac1612a SHA512 35b8edef3d506aa496b5746911227d93384ff3af629374ba97a488a549879edfc57bdf12924f97e3906c63fcdf31f05a224d1fccd336e6cca348b9f123c87ac7
-EBUILD selinux-gpg-9999.ebuild 377 BLAKE2B 627fd0e4b57cb9fd3c17a357d429c0f057b66c5b75ac2bcb9feb740517df862e77d7f62fbe5164df91ca73e529e50de88371f96c4b37cfea984ff280d468a94f SHA512 ed572b8c2d639deb6e01abdef2919db94f3493a3a4f14f83636a87295a20df3b7288b22a89eca1dd2ab0aae970db3aea2a07bbd3b115259c73a836cccdb242e7
+EBUILD selinux-gpg-2.20180114-r2.ebuild 377 BLAKE2B 77d92a948b3f1efbdfea3e400ef57cbe0c26b0ce728964cf8dd1e25225e3f4a74356edaeaf7ad4c3284462f48c005570239bdd01c0d3716c853077db2dabed4c SHA512 6b07e76281819406a5d6bfc8d668ca9816bf25383891a0119c01e67d54398cc447cec135b6dc1a97427f6dfe39a7af0e5039434bec31805399e26c17a3b88da7
+EBUILD selinux-gpg-9999.ebuild 377 BLAKE2B 77d92a948b3f1efbdfea3e400ef57cbe0c26b0ce728964cf8dd1e25225e3f4a74356edaeaf7ad4c3284462f48c005570239bdd01c0d3716c853077db2dabed4c SHA512 6b07e76281819406a5d6bfc8d668ca9816bf25383891a0119c01e67d54398cc447cec135b6dc1a97427f6dfe39a7af0e5039434bec31805399e26c17a3b88da7
 MISC metadata.xml 315 BLAKE2B f1ad4327dbf000875d21f426a15d4e8acd3f1f6c0a4934697f805d5a3f9a304ddfac85e5563119d39f40ce78adb9869208ef0e54f580a34e7649c7a1c8edeba3 SHA512 5d35232f8849235b089f2f8b7e4eb1b1692e805a196605e51d78ac960613ba9116b25ddeb4bc3141a043af41454ad653bd4cd44ab8bf386c0d89075b75028f35
diff --git a/sec-policy/selinux-gpg/selinux-gpg-2.20180114-r2.ebuild b/sec-policy/selinux-gpg/selinux-gpg-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..34f5b61061ad
--- /dev/null
+++ b/sec-policy/selinux-gpg/selinux-gpg-2.20180114-r2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 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
+
+DEPEND="${DEPEND}
+	sec-policy/selinux-dirmngr
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-dirmngr
+"
diff --git a/sec-policy/selinux-gpg/selinux-gpg-9999.ebuild b/sec-policy/selinux-gpg/selinux-gpg-9999.ebuild
index fbf406d7ff60..34f5b61061ad 100644
--- a/sec-policy/selinux-gpg/selinux-gpg-9999.ebuild
+++ b/sec-policy/selinux-gpg/selinux-gpg-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-gpm/Manifest b/sec-policy/selinux-gpm/Manifest
index e9ee3955602e..f35bb27f8516 100644
--- a/sec-policy/selinux-gpm/Manifest
+++ b/sec-policy/selinux-gpm/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-gpm-2.20170805-r2.ebuild 276 BLAKE2B 27f31fb9e250ab636bd6f470b17b
 EBUILD selinux-gpm-2.20170805-r3.ebuild 276 BLAKE2B 27f31fb9e250ab636bd6f470b17b5e4dedb7b9698b946f4d1d9cc5cd0aafbbdd48221c697e9718dc49c23999819f51c0099b2b6475ff63eee98867ffea9e975a SHA512 2133eebcecc220920e6db0a6dea183a7885e3814edbcd0957771e616f51ea3a55110dc619669365ba2d8bcd4ef93fd60227a9cac18acf557d019a07ceb19881b
 EBUILD selinux-gpm-2.20170805-r4.ebuild 278 BLAKE2B 8047d2b09f4e27c2e958b3f409ddc051e394e8b3c7bdbae5b16d93a994667a90b216694a257d04df2d7211caa55dfe97149f61060a2e88529c5d6716888441b1 SHA512 021f77c663d5b10aeadf93be5ac914b92bb58593042725925960f3f23a443f1a198a257e28c5de13b5227b9a2c21716509dcb8ba86ee14c467fa7eb09e86b53c
 EBUILD selinux-gpm-2.20180114-r1.ebuild 276 BLAKE2B fe19eac7a2a7bbdbfa83496d1584e9c6f21f10d0be87455bd13a906b11afa5ffcc6a4c93e0acf71880a71467e96c24042ecbeb02dc821f6aaabccebf041c45a9 SHA512 a5ee0c98a6c6e12ab64959016d43556fd2a6031dcb73e5ab4257f115bb38c21810b61ff98e486773dc69d4b08a63a838e07438e73fb91ff2169624bab4e7ee53
-EBUILD selinux-gpm-9999.ebuild 278 BLAKE2B 8047d2b09f4e27c2e958b3f409ddc051e394e8b3c7bdbae5b16d93a994667a90b216694a257d04df2d7211caa55dfe97149f61060a2e88529c5d6716888441b1 SHA512 021f77c663d5b10aeadf93be5ac914b92bb58593042725925960f3f23a443f1a198a257e28c5de13b5227b9a2c21716509dcb8ba86ee14c467fa7eb09e86b53c
+EBUILD selinux-gpm-2.20180114-r2.ebuild 278 BLAKE2B 462472303125c0016635256d3997ca31cd610248441d1b17d816107933e1447d5a14537af847276a5c90211d100a9dd1c485ad9d35467f434cb902cc222fb7bb SHA512 79cbf6574e9963fc3b4b7119dba9a16c188d5b164a99b21435ab1d064099e02614e481d10bc06c515c6a47cc25e4927cd1a57e43cac673006ed1da1b76c0df67
+EBUILD selinux-gpm-9999.ebuild 278 BLAKE2B 462472303125c0016635256d3997ca31cd610248441d1b17d816107933e1447d5a14537af847276a5c90211d100a9dd1c485ad9d35467f434cb902cc222fb7bb SHA512 79cbf6574e9963fc3b4b7119dba9a16c188d5b164a99b21435ab1d064099e02614e481d10bc06c515c6a47cc25e4927cd1a57e43cac673006ed1da1b76c0df67
 MISC metadata.xml 313 BLAKE2B 0156d87c7a5dfa2fcb253ff1cb51bf894ad4aee416fc5f8fa1bbe5db086b73b9bfd28b07fa715284d3526e6724a4f52a852a6b274b14afbd3ed86de0be3375d4 SHA512 c51b135cecad18c17f0597b098d2c0e0d60fcc4a51c70534bb7b4d39e85374cdfc6b793734f514c62194d603b6a0bde889c6772b2438e01bc3632842e1a3c1d7
diff --git a/sec-policy/selinux-gpm/selinux-gpm-2.20180114-r2.ebuild b/sec-policy/selinux-gpm/selinux-gpm-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..9a99c34dc431
--- /dev/null
+++ b/sec-policy/selinux-gpm/selinux-gpm-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 32c356ae9091..9a99c34dc431 100644
--- a/sec-policy/selinux-gpm/selinux-gpm-9999.ebuild
+++ b/sec-policy/selinux-gpm/selinux-gpm-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-gpsd/Manifest b/sec-policy/selinux-gpsd/Manifest
index 8521fd94cc9c..e165cab89b42 100644
--- a/sec-policy/selinux-gpsd/Manifest
+++ b/sec-policy/selinux-gpsd/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-gpsd-2.20170805-r2.ebuild 278 BLAKE2B d04c57c8c34a0ef0bedf0e8e105
 EBUILD selinux-gpsd-2.20170805-r3.ebuild 278 BLAKE2B d04c57c8c34a0ef0bedf0e8e105f2e6446b3ae34a210aa34d549867040a8bddc6a640ea2283ad90dfac105ef059d64581bdee2fdbd94faa097bf8823606ca9a6 SHA512 caaed11a93921d4cfc10b0eea0250bf0f74aadeb976e0a83c9e2a949e8299972e2075b007f00244d471a2d71effbbf2bbcfa8255525343d2ec23eb8b3f64736a
 EBUILD selinux-gpsd-2.20170805-r4.ebuild 280 BLAKE2B 2e8b490709574e1f25191501d55111295e9c5eebd23502291cfa73583c391f0a18239b199cae39683ba9bd94bb8a0ed28f42e0a60f5977fdada26d78095066b8 SHA512 262719337e7626ff706b3318b3013cecfee751c9681710e1849b8f663e506064aada986041e006f7dc220c9a28db917da97702836565caa620c45de2b0218edf
 EBUILD selinux-gpsd-2.20180114-r1.ebuild 278 BLAKE2B 4111994d1fb16ea92326a3f52945bfec5072eb11eccd1276e996f18057fe8fff84c3bc30f418153e879aa89403bc052840fa1dca036ec58ba507f62b16eb39cd SHA512 b21b6808c534f0035b0c33110060dc8888a454227193219f86ef4d59e2996708a4535850ce52dc28c75fa474e5f112eadf8e1acbb0627e7257cf3c0c6f5e76c2
-EBUILD selinux-gpsd-9999.ebuild 280 BLAKE2B 2e8b490709574e1f25191501d55111295e9c5eebd23502291cfa73583c391f0a18239b199cae39683ba9bd94bb8a0ed28f42e0a60f5977fdada26d78095066b8 SHA512 262719337e7626ff706b3318b3013cecfee751c9681710e1849b8f663e506064aada986041e006f7dc220c9a28db917da97702836565caa620c45de2b0218edf
+EBUILD selinux-gpsd-2.20180114-r2.ebuild 280 BLAKE2B f3d2743affce65d62c28e460d541f9c3ac1379d8800876eb7d006396dfcc3ddb5ca8bd367366a64a79c80481ad82b3e7478952b4b1be0f2b3d2d31fdaf0b5c88 SHA512 c0838c5c06866dfa1ceeae27e9ff82b18e38ecbd82bf5d1b71e66fc0c62e1c937ecff2fefb0e2e7508b9d13f0a88f47735561f207c041b0598d860ce59cd46b0
+EBUILD selinux-gpsd-9999.ebuild 280 BLAKE2B f3d2743affce65d62c28e460d541f9c3ac1379d8800876eb7d006396dfcc3ddb5ca8bd367366a64a79c80481ad82b3e7478952b4b1be0f2b3d2d31fdaf0b5c88 SHA512 c0838c5c06866dfa1ceeae27e9ff82b18e38ecbd82bf5d1b71e66fc0c62e1c937ecff2fefb0e2e7508b9d13f0a88f47735561f207c041b0598d860ce59cd46b0
 MISC metadata.xml 314 BLAKE2B 3ff140fdf0bff20956c6daf624624ae51a6002199bc2e5c68c65a13882ca1a983595bee054bb0f417ec42293e177535f2abf923073825caade7da39db1ebad65 SHA512 15038df07a6a26d2e27fcefb00f460d3dce414f5fa30ff7e40a818d27c25747afd61caa1888f3c7b7a4f4030aa0b6f34187e2b36d7ba549a65ad084378043027
diff --git a/sec-policy/selinux-gpsd/selinux-gpsd-2.20180114-r2.ebuild b/sec-policy/selinux-gpsd/selinux-gpsd-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..bf438a7ffa19
--- /dev/null
+++ b/sec-policy/selinux-gpsd/selinux-gpsd-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 f5f7d014b04e..bf438a7ffa19 100644
--- a/sec-policy/selinux-gpsd/selinux-gpsd-9999.ebuild
+++ b/sec-policy/selinux-gpsd/selinux-gpsd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-gssproxy/Manifest b/sec-policy/selinux-gssproxy/Manifest
index 13030eac549a..b200a45b441e 100644
--- a/sec-policy/selinux-gssproxy/Manifest
+++ b/sec-policy/selinux-gssproxy/Manifest
@@ -1,10 +1,12 @@
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
 EBUILD selinux-gssproxy-2.20170805-r3.ebuild 286 BLAKE2B 15f7642f886571f21c5ceeaea4e0059c6947dbc5252d83bb6aafe592fbc6f3739f51d115536c0d87da674b0bd4c3e3f690296483f9dca7716a504666498f15dd SHA512 364e1c2a368ac2de0c65b385fb3e27cdd34a3ddf3f159cb108b718208a347fd9ceb02183daa812673cc45230ee5ebde7c331375674af547ee6528a31b333f5e2
 EBUILD selinux-gssproxy-2.20170805-r4.ebuild 288 BLAKE2B 4348d8aae0cbf71ff4d5109dff7442c16dcc66cf008cfd71a115c5d860e4d4ad3680c58d9a9b89a7b5d014988379055b318bca4a029d605b12e107f8f3f9395c SHA512 7b633bfc8b0ba5a15801c4c9ef5beaf9ffd5f4636aa0c55b18a2aec45f5a9fa90f32a8ea356f66a937112c87c150bee65768a6dd3a2e7ea34660449432f64ce7
 EBUILD selinux-gssproxy-2.20180114-r1.ebuild 286 BLAKE2B 5bb8c83d1742e6e5bef300d8a0cce83ed766c06dcd3abc6d3d816cd39ae480875b7b50aff9d177323b7b429e553d555ccb8babf012decae78485c17b36337a57 SHA512 298d589cc6d81e103505328a2198b29e2506cb7d6f641e02a74b99d50fcebf21e32bb1fac7d98af4f1fe821a7141c518004f2e2ca3d2ba23222b7f27611fb025
-EBUILD selinux-gssproxy-9999.ebuild 288 BLAKE2B 4348d8aae0cbf71ff4d5109dff7442c16dcc66cf008cfd71a115c5d860e4d4ad3680c58d9a9b89a7b5d014988379055b318bca4a029d605b12e107f8f3f9395c SHA512 7b633bfc8b0ba5a15801c4c9ef5beaf9ffd5f4636aa0c55b18a2aec45f5a9fa90f32a8ea356f66a937112c87c150bee65768a6dd3a2e7ea34660449432f64ce7
+EBUILD selinux-gssproxy-2.20180114-r2.ebuild 288 BLAKE2B 645f656d5211e51f01a616e28cb9b4ec12e0734fd422c9c26b97e160114e65786c0f62beb36342d1492d387a24f9a316d796826a36e2d003ed8d1193dcfba506 SHA512 10575c93ea61f07caa2e14adc466ceb0683363d7a045ea9cfafdf3de1faebc0089600ad07cf7eddf68f405db18bb2d80f74986e6b4e290e6ba0ac201fcc79e38
+EBUILD selinux-gssproxy-9999.ebuild 288 BLAKE2B 645f656d5211e51f01a616e28cb9b4ec12e0734fd422c9c26b97e160114e65786c0f62beb36342d1492d387a24f9a316d796826a36e2d003ed8d1193dcfba506 SHA512 10575c93ea61f07caa2e14adc466ceb0683363d7a045ea9cfafdf3de1faebc0089600ad07cf7eddf68f405db18bb2d80f74986e6b4e290e6ba0ac201fcc79e38
 MISC metadata.xml 318 BLAKE2B 4ac0a5cf3a0f05bbca7dc3c68462a83d55ecf1b463620627a3ee500eca9d1f9e5319eff72f76bd38a935c8f1379122ddd750c4c9003688afd0bf9d9a4238ea9a SHA512 172d47914a3c198f958c1f796e949cf65948ecea9d3c5e1228ff10070bdbaddab3ec63ce9d1d47ea727f57d7574233f8149beec0f52a4de00f3027f97d9452d8
diff --git a/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20180114-r2.ebuild b/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..5ec1fa45c248
--- /dev/null
+++ b/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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
index c4d41d41b472..5ec1fa45c248 100644
--- a/sec-policy/selinux-gssproxy/selinux-gssproxy-9999.ebuild
+++ b/sec-policy/selinux-gssproxy/selinux-gssproxy-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-hddtemp/Manifest b/sec-policy/selinux-hddtemp/Manifest
index 5bc10e901cf6..5520577170b1 100644
--- a/sec-policy/selinux-hddtemp/Manifest
+++ b/sec-policy/selinux-hddtemp/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-hddtemp-2.20170805-r2.ebuild 284 BLAKE2B 626ccc78a9c86e02d7d49090
 EBUILD selinux-hddtemp-2.20170805-r3.ebuild 284 BLAKE2B 626ccc78a9c86e02d7d49090d042dff8f31b843abf4d2be41f2f4dc84f3ca8fa8fc52a90646d17632aefee350abaf354e4c53eb472c11eb7364fb265b757125d SHA512 853296d0775ea8cfee74a42c86c1e20db9e58fa4b2c3b0162cd596cb3fc9283688424b55a40b0fffc864f52d5c1bde2748fa3aad2830f269462ecb1be0b6c0cb
 EBUILD selinux-hddtemp-2.20170805-r4.ebuild 286 BLAKE2B 8f71217769b8c96360efd7d70afbc5a58e0850926e836daac136bff59b0f418b8bcb6186cad48fe1ec4730b3b331987d857b4cd8c55f62797a2e52e959f792f0 SHA512 95714a293b9302903239f460666f8d35127af968b3a6774639a77ff2f9c0e87651496b78976496b89cb87a6bd7ad4728949b3a579b8d5c30146d1f4dee1ee31e
 EBUILD selinux-hddtemp-2.20180114-r1.ebuild 284 BLAKE2B ec9771533e66050cbc9c2de0424e748ec988345f3e6bc81bc3bf9b6fbe07a669bc841089e3a81adb341490be3593904268ee57fd8013df7dc3f29dd41466948a SHA512 43cf238ba699b7fed624f9469757872de6329b40c6d8db7bb6aa6b9c0f9a161f411c9972246768509daa2e5d57f74388208cd1c96193f30e4454979b136ae240
-EBUILD selinux-hddtemp-9999.ebuild 286 BLAKE2B 8f71217769b8c96360efd7d70afbc5a58e0850926e836daac136bff59b0f418b8bcb6186cad48fe1ec4730b3b331987d857b4cd8c55f62797a2e52e959f792f0 SHA512 95714a293b9302903239f460666f8d35127af968b3a6774639a77ff2f9c0e87651496b78976496b89cb87a6bd7ad4728949b3a579b8d5c30146d1f4dee1ee31e
+EBUILD selinux-hddtemp-2.20180114-r2.ebuild 286 BLAKE2B 47728d56bd4fb51cde0c2dce236d5cc62d75d585260a7f7ecb312946730cad012797bbc9312409e062e3e25cfe901862925a1d11378afb16e2b06514b5eb40f7 SHA512 215a747fb3f0787acf0ef0757f26210052631cafc7d7ebbad631e090f897e605906aaf5d428c6adc345259dec79ac50773ed50df7cb128b44a8ac0b29d9094fb
+EBUILD selinux-hddtemp-9999.ebuild 286 BLAKE2B 47728d56bd4fb51cde0c2dce236d5cc62d75d585260a7f7ecb312946730cad012797bbc9312409e062e3e25cfe901862925a1d11378afb16e2b06514b5eb40f7 SHA512 215a747fb3f0787acf0ef0757f26210052631cafc7d7ebbad631e090f897e605906aaf5d428c6adc345259dec79ac50773ed50df7cb128b44a8ac0b29d9094fb
 MISC metadata.xml 317 BLAKE2B a8f2c2d734a44304ef1c2f8640e9c12d3901d39fa71a72bdc51861bf595de88f574a450f5cb0bb8e4dc6cccb100b5067aad3c9f9b0f6741dedbe7c78ccde5b9d SHA512 2be1948142bfe89c0091371632d7a8bc662cc2f65e7e07bc2635602decc6bf3557191d3989d285a4428cc05d950a815a1b7a6938d1bfc86594e755a25fc3df71
diff --git a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20180114-r2.ebuild b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..9cadc59e8777
--- /dev/null
+++ b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 35d6f1c5297a..9cadc59e8777 100644
--- a/sec-policy/selinux-hddtemp/selinux-hddtemp-9999.ebuild
+++ b/sec-policy/selinux-hddtemp/selinux-hddtemp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-howl/Manifest b/sec-policy/selinux-howl/Manifest
index f7b6e547f621..7ea45b556a7d 100644
--- a/sec-policy/selinux-howl/Manifest
+++ b/sec-policy/selinux-howl/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-howl-2.20170805-r2.ebuild 278 BLAKE2B 024328c0a7ce66f44d213a84795
 EBUILD selinux-howl-2.20170805-r3.ebuild 278 BLAKE2B 024328c0a7ce66f44d213a847958eb1bd423bda527fbb28a01084978a35f29a4d5f064ca16e1701ed51fb8750fbd0a2e69ae143ecf1a2adfa3db7b4c8e42b474 SHA512 15cd7ae8b17e514504e32d64acd4b9785344a6a1b7341a4663b821b708e48f0ef8b729469bce895adc8a0db9c8dd74ef12cd2ac1acb67b984abc21a75162a0d8
 EBUILD selinux-howl-2.20170805-r4.ebuild 280 BLAKE2B 80dac2d05551924293fcfe86e8099106633c9783751400fa41546c871dab9f4d3c0dc6f95916dcb85e63ed94400fc2ba5bbd928cbceec0008fbf064a2a6293c2 SHA512 40222272b1337b6b395acd5bdb564aec33cec1f1abbc4e3bbe3a1b66773085070b4d1df658d4008b9db3349de42c2ec36104101dc4b1238a2a6837bd2330641a
 EBUILD selinux-howl-2.20180114-r1.ebuild 278 BLAKE2B 83d478db36f8618284ec6f2006dd70976d0eb824d10cd104a3475ac20217e1ee75ab663400380fa82c394a66fef48a65b4d80e64fd2f1790fa26a0bc161876ae SHA512 57b9c8edef72d9f932e1982331183101a66757342d7f9a180cc0a754dd0fec25483842122e853dc8a8256e32431c0dbc2287c051b77c146abb7f3d265cd19090
-EBUILD selinux-howl-9999.ebuild 280 BLAKE2B 80dac2d05551924293fcfe86e8099106633c9783751400fa41546c871dab9f4d3c0dc6f95916dcb85e63ed94400fc2ba5bbd928cbceec0008fbf064a2a6293c2 SHA512 40222272b1337b6b395acd5bdb564aec33cec1f1abbc4e3bbe3a1b66773085070b4d1df658d4008b9db3349de42c2ec36104101dc4b1238a2a6837bd2330641a
+EBUILD selinux-howl-2.20180114-r2.ebuild 280 BLAKE2B cd3625eec20f4ff83471312e37c424f6037c4d6e6280fe6b896294bc6d5fae1a7650ece207dc72801618e3abb072171b21038fab937f46e7d8a3fda81886df8e SHA512 e806d420905815473f1e997986cfa7ea11dff25028618d6403ca55afad1583023f0914b53ea54f89defa1d2b5c9f052a780134dbfa28f77d724319492e423d8c
+EBUILD selinux-howl-9999.ebuild 280 BLAKE2B cd3625eec20f4ff83471312e37c424f6037c4d6e6280fe6b896294bc6d5fae1a7650ece207dc72801618e3abb072171b21038fab937f46e7d8a3fda81886df8e SHA512 e806d420905815473f1e997986cfa7ea11dff25028618d6403ca55afad1583023f0914b53ea54f89defa1d2b5c9f052a780134dbfa28f77d724319492e423d8c
 MISC metadata.xml 314 BLAKE2B ab9f8685632c6231f1b32f125e499723048e8edec178166a9caf7c8a6630218af7737802dfbb5c3777d26990bc559da1dee145d4794d9663d4b744405de9a3ee SHA512 f983d404a2995149e5399efa664d1f81398b2fa9bea2e071cb1a8b54e6efd0d43cd42ac4d2bd7ff9d0586158ead91b8bf67169cc7761815073469498396c4da9
diff --git a/sec-policy/selinux-howl/selinux-howl-2.20180114-r2.ebuild b/sec-policy/selinux-howl/selinux-howl-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..ce74d9396b95
--- /dev/null
+++ b/sec-policy/selinux-howl/selinux-howl-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 37f0c1f248a4..ce74d9396b95 100644
--- a/sec-policy/selinux-howl/selinux-howl-9999.ebuild
+++ b/sec-policy/selinux-howl/selinux-howl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-icecast/Manifest b/sec-policy/selinux-icecast/Manifest
index f64288ded226..887659617c7e 100644
--- a/sec-policy/selinux-icecast/Manifest
+++ b/sec-policy/selinux-icecast/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-icecast-2.20170805-r2.ebuild 284 BLAKE2B 14b24e5b223bf2f01165d763
 EBUILD selinux-icecast-2.20170805-r3.ebuild 284 BLAKE2B 14b24e5b223bf2f01165d7639cf1c12cbde416277bc1d072ac520953b61b5e0cb3f7de2552e5edd6481c03ae6d5613f4dc21662fa8a52d0b992c56ffb5c57e16 SHA512 37bb515dd22a50e81d12e50537790f1d1048c2ce11130ae59e70f348c3e0daf924c4e9cef9d2d9068292b5a96cea5e931b5a141d3c76580d72e23a61e5b9da66
 EBUILD selinux-icecast-2.20170805-r4.ebuild 286 BLAKE2B 8bcf945b1bf52008dbd9dee733ee93538340e6e64a4fc36140f60b9a9159883fb912b48252de9d73f727963bc23be1d99447be31c7d86835d2a0aca69b97013e SHA512 41fede15b84daa85c265d175b5e3d27775bf51ef66058b4ba2b2d88dd1ee82803cc3e31a0bc09ef525ff0f57adb9c21db576026214442d32751944008616d6a1
 EBUILD selinux-icecast-2.20180114-r1.ebuild 284 BLAKE2B 00cc4ff5633578f8342272212592eaf2bf35f9e11d1ae736e9df5b7cc47a501eeb2dd4ab0d33712b3e049d71c8d42c8702a76b4c0d5c552e79344fb6ec22b8a3 SHA512 31f93dafc1617482cc30d9927b17f9532b8121f48e0ccfb55369d8e849e49584779a067fcc3f71b89b7b433f56d6b4ea53c7f56d92db7fe6f825eaa30b4d3b84
-EBUILD selinux-icecast-9999.ebuild 286 BLAKE2B 8bcf945b1bf52008dbd9dee733ee93538340e6e64a4fc36140f60b9a9159883fb912b48252de9d73f727963bc23be1d99447be31c7d86835d2a0aca69b97013e SHA512 41fede15b84daa85c265d175b5e3d27775bf51ef66058b4ba2b2d88dd1ee82803cc3e31a0bc09ef525ff0f57adb9c21db576026214442d32751944008616d6a1
+EBUILD selinux-icecast-2.20180114-r2.ebuild 286 BLAKE2B d0c5ee1103b886e9c6845651d36464c4ebfb491255c600097b50c43e1eb35e969f4a8b1628b16182f7e5f6454ca8e4c307aefd0972f680ae15616e1453a9edae SHA512 ba82efda116302c2df5f5a128ed1327d30b5702984f76b252fdc9b5d99bbcb69e0af42c181d27ef086a5f88fdac3967a9b5b26098b682784c3e088523bc44d58
+EBUILD selinux-icecast-9999.ebuild 286 BLAKE2B d0c5ee1103b886e9c6845651d36464c4ebfb491255c600097b50c43e1eb35e969f4a8b1628b16182f7e5f6454ca8e4c307aefd0972f680ae15616e1453a9edae SHA512 ba82efda116302c2df5f5a128ed1327d30b5702984f76b252fdc9b5d99bbcb69e0af42c181d27ef086a5f88fdac3967a9b5b26098b682784c3e088523bc44d58
 MISC metadata.xml 317 BLAKE2B 5c15c4fe74c3663381d1f85a850ebd86baa744f8649459c741e90fa9126b4b653edea9ea15a07e106dbb9f5d18ef5795a221f4e9eb15708915c651f1b4a72830 SHA512 db55ad061f07883e2a62e74ebeabb5d05c9595fd74b0719068cb54da1ffea47738112c8287242c38b1499a1a9b7bddc1f71edfab4b4a4b1f1262c50791395f21
diff --git a/sec-policy/selinux-icecast/selinux-icecast-2.20180114-r2.ebuild b/sec-policy/selinux-icecast/selinux-icecast-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..738fc05228ae
--- /dev/null
+++ b/sec-policy/selinux-icecast/selinux-icecast-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 a00b3189d6e3..738fc05228ae 100644
--- a/sec-policy/selinux-icecast/selinux-icecast-9999.ebuild
+++ b/sec-policy/selinux-icecast/selinux-icecast-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-ifplugd/Manifest b/sec-policy/selinux-ifplugd/Manifest
index 7751bab84245..a66b9065bb5a 100644
--- a/sec-policy/selinux-ifplugd/Manifest
+++ b/sec-policy/selinux-ifplugd/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-ifplugd-2.20170805-r2.ebuild 284 BLAKE2B 151bfedb085947d0492e3c60
 EBUILD selinux-ifplugd-2.20170805-r3.ebuild 284 BLAKE2B 151bfedb085947d0492e3c60bc032b526693960e8320f0a74750ec3e219c625d56d6c3db983966cb5b30515d69a484dcaa9d2e28d277b6d9dc54163565d93083 SHA512 c8fce41d350ff9bdbb39f93bc5a083a2f8c36647390aff2a580a63b61a492062b47134d1e15fc1e1f1f6973a9a1c186c65ac4cf7660955dfd2bdca56fab31b27
 EBUILD selinux-ifplugd-2.20170805-r4.ebuild 286 BLAKE2B e178e7146dacc9c255814acc6e0cb33335835cbd8f93c8a87c300343b47641fab03b2a1611782e0ab633895eb77010a0415c16fc193e395c2b04f465c5fe9a6f SHA512 1bcc024bc2b7f7af2b4d866ef481c9181ebf5fb04e175b4718c26ae8722977049cfcfbef1923e0f753275ce9e82ad651bb4dc269b1697a72927558de6cb28127
 EBUILD selinux-ifplugd-2.20180114-r1.ebuild 284 BLAKE2B 84169e52841df2ddb979fe8235d398a2fff7f20bcc9b914af366956613f28d2a381d0316434b5575be1b0e837ad636392cec07a96b73e31464c0b5857df55103 SHA512 3e6afcc7dcc14fd0477349a425668b17290c489d23bfae263d3c9d7009ec8bcbd027290152dcbb5d4d7be3645d41c573e216f90a18530828890a776d287d280a
-EBUILD selinux-ifplugd-9999.ebuild 286 BLAKE2B e178e7146dacc9c255814acc6e0cb33335835cbd8f93c8a87c300343b47641fab03b2a1611782e0ab633895eb77010a0415c16fc193e395c2b04f465c5fe9a6f SHA512 1bcc024bc2b7f7af2b4d866ef481c9181ebf5fb04e175b4718c26ae8722977049cfcfbef1923e0f753275ce9e82ad651bb4dc269b1697a72927558de6cb28127
+EBUILD selinux-ifplugd-2.20180114-r2.ebuild 286 BLAKE2B c56774666c3af8176bc730c1a7618152b97e2c012edc2e170e19a54769e75fec83e02d545aa131a90dcc948372a10402aa4af693190f7e61cf9405c01f2dbf91 SHA512 1a29c4110e36b414b72b2ff70a40e6da5e892242ed0d3739d7143e82bda8b34f8ba790d76a9c18fd5a54b2a3a331210d7ecd6d4cb7c01f33f2bd4f478623c1a8
+EBUILD selinux-ifplugd-9999.ebuild 286 BLAKE2B c56774666c3af8176bc730c1a7618152b97e2c012edc2e170e19a54769e75fec83e02d545aa131a90dcc948372a10402aa4af693190f7e61cf9405c01f2dbf91 SHA512 1a29c4110e36b414b72b2ff70a40e6da5e892242ed0d3739d7143e82bda8b34f8ba790d76a9c18fd5a54b2a3a331210d7ecd6d4cb7c01f33f2bd4f478623c1a8
 MISC metadata.xml 317 BLAKE2B 21371e37cc40f9799d708dc4d68da349bab8757b0d733326ce75f2f97833c528417135f784b29e4bb1ceed7d20e27dad7b15f2c4496f8ab812a5c8b083236052 SHA512 8905d0861d320d44fff344d2208982c611ac72402a9355a23a8b2f43fdf4f13aef9f8b504c1bcb12357852ad51f4f74d1a11b3a71e53fb43ac2ac3d57e268f3a
diff --git a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20180114-r2.ebuild b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..41ac6475c514
--- /dev/null
+++ b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 d329259c12b4..41ac6475c514 100644
--- a/sec-policy/selinux-ifplugd/selinux-ifplugd-9999.ebuild
+++ b/sec-policy/selinux-ifplugd/selinux-ifplugd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-imaze/Manifest b/sec-policy/selinux-imaze/Manifest
index 828b723ad4b6..00fc0e8c4fe1 100644
--- a/sec-policy/selinux-imaze/Manifest
+++ b/sec-policy/selinux-imaze/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-imaze-2.20170805-r2.ebuild 280 BLAKE2B 52d0f19ed9ef7fa4878f3fcb5f
 EBUILD selinux-imaze-2.20170805-r3.ebuild 280 BLAKE2B 52d0f19ed9ef7fa4878f3fcb5fee6d6709f1698efe68d4f34d44e0616b64118e12bcbd77f6a18ec8c20ef360ca35c2c36a267473bf7467c365d9264f8a7be16b SHA512 1fbed40d3337b5bdff349f564cd071f8001a3db35f61c47500d003cc14604c8bbcdadb365e9de21807d458631b1e6e2f4262da5269c9d9ddb8703a5e0bbc21db
 EBUILD selinux-imaze-2.20170805-r4.ebuild 282 BLAKE2B d81b99b4a9613117b94d11adefb47ada7b3f2bb3edd8def65fbfb9bdea3280c7ac52a5eb7a0141aaf9131660a83e7152d0924d6e868ec27734fa4c78ede3401f SHA512 6f83f58a38fa35e29e1aee4522761498c57ec32c32865fda0269806aab937259349d31807f66e12735bf76894df2ab44c11a9aceb9ba563e9e5124f8e3f909bc
 EBUILD selinux-imaze-2.20180114-r1.ebuild 280 BLAKE2B ea387bfd3ba1e46675eb5e146b28b8356adc6c2b00fc8606e10758b3037f4605f4f77cee269ded467bf85c0d02c389316d7af75ecde94c474eac242ce6295f62 SHA512 354f401b8b62cb6663c8f34422d0376946e8319561eec33c53ca4bc4c216fce435e2ce0da5ad233d6914d6913a3585b86c91d081940367a35e6f029384190d05
-EBUILD selinux-imaze-9999.ebuild 282 BLAKE2B d81b99b4a9613117b94d11adefb47ada7b3f2bb3edd8def65fbfb9bdea3280c7ac52a5eb7a0141aaf9131660a83e7152d0924d6e868ec27734fa4c78ede3401f SHA512 6f83f58a38fa35e29e1aee4522761498c57ec32c32865fda0269806aab937259349d31807f66e12735bf76894df2ab44c11a9aceb9ba563e9e5124f8e3f909bc
+EBUILD selinux-imaze-2.20180114-r2.ebuild 282 BLAKE2B e769ffc3484d2fb8db26b107535570a377b29458bf13eb69fcf6fa6203164b9a174c44741f0d61522fc74f0713bd23d689d2bdc7640f431415b341cab59a53bf SHA512 522efc3487450d59b5e71bb4da7d471ac9621a54609a9c11aa55942db0c3a42d718021b3f2d15dcad8583028c4130706ab2867c2d539bfb878f59cce96b8cdd1
+EBUILD selinux-imaze-9999.ebuild 282 BLAKE2B e769ffc3484d2fb8db26b107535570a377b29458bf13eb69fcf6fa6203164b9a174c44741f0d61522fc74f0713bd23d689d2bdc7640f431415b341cab59a53bf SHA512 522efc3487450d59b5e71bb4da7d471ac9621a54609a9c11aa55942db0c3a42d718021b3f2d15dcad8583028c4130706ab2867c2d539bfb878f59cce96b8cdd1
 MISC metadata.xml 315 BLAKE2B d844e1ef27a53d646a98320bdfc18a7ac7e8876a01d70f404546c1a2ef2c5a173e4e636bc234bb262a3dbf729747ca9104444d4ae30e4d9acca632ca56d98090 SHA512 8c12773bd2c0c5009639149ff2c80024af96995b148e4e164ccf7ecc44e12333adeb109b245676703f6ff18f13b0b7caa7907b45fe06f688b7c56b71958696ea
diff --git a/sec-policy/selinux-imaze/selinux-imaze-2.20180114-r2.ebuild b/sec-policy/selinux-imaze/selinux-imaze-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..934faa978982
--- /dev/null
+++ b/sec-policy/selinux-imaze/selinux-imaze-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 450c9c57c0a0..934faa978982 100644
--- a/sec-policy/selinux-imaze/selinux-imaze-9999.ebuild
+++ b/sec-policy/selinux-imaze/selinux-imaze-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-inetd/Manifest b/sec-policy/selinux-inetd/Manifest
index d4d620fad1c9..1c48725b7c32 100644
--- a/sec-policy/selinux-inetd/Manifest
+++ b/sec-policy/selinux-inetd/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-inetd-2.20170805-r2.ebuild 280 BLAKE2B 2116bd3ddb9be3efed05c677df
 EBUILD selinux-inetd-2.20170805-r3.ebuild 280 BLAKE2B 2116bd3ddb9be3efed05c677df711f0b13b14b710bbabf5842dd4436b3a5db0f43102995a5371800c9fc5d86a559ab8901d2720d6e117a2afb0ac440333f7a4f SHA512 5ce514775f9b01549841e8bd178974570953d5fb9590dafffaccbdfd41f9936f935ca5bc6be0ce2ddff9affd1382eb072c9297e08878e6a1db640efb87c373ac
 EBUILD selinux-inetd-2.20170805-r4.ebuild 282 BLAKE2B 52cf9b61c3a94797571b7db8825657b07d90d7234b1e652d3ace5e29e8f6033d88c3466ce5d6d6678d77ddee5a996bdd3159a4187d066055debbe81c03cd12e3 SHA512 dfe9e114aa7ab2bacd01a6639be8c109c3ddf8c561577355cba90ca8798591ad97b3e32c4af97d490e3720514b553b92234fcbfa8d5946909c51e077f7842ce2
 EBUILD selinux-inetd-2.20180114-r1.ebuild 280 BLAKE2B 2a4eb321f08a2d87412610ba8812293e8f7046e98598bf791a6f5b95e77f2f5da39a7e8caaa2b58ff8a908b69b3068e4a25723b2881e97c32b08b47e2565b593 SHA512 3f7fbdb218db805e87f65ee36ac742f48f8017e1a65c2678a7de4b263084a1d3ff7c957188e6fbdc6a1f34364c79a06384842d35faedf56024a1f00fe9c3b189
-EBUILD selinux-inetd-9999.ebuild 282 BLAKE2B 52cf9b61c3a94797571b7db8825657b07d90d7234b1e652d3ace5e29e8f6033d88c3466ce5d6d6678d77ddee5a996bdd3159a4187d066055debbe81c03cd12e3 SHA512 dfe9e114aa7ab2bacd01a6639be8c109c3ddf8c561577355cba90ca8798591ad97b3e32c4af97d490e3720514b553b92234fcbfa8d5946909c51e077f7842ce2
+EBUILD selinux-inetd-2.20180114-r2.ebuild 282 BLAKE2B 82cb6096721da5d856d55449aad6fab0a4f7b2b6440effdff732562ad6e389b2d327abf5152b8ce645dc12396135e5b427f174f04e95b08824c731e4166a592b SHA512 1a6e0f73edf567dc316f7342e45b294d8103e5e3a64df8d17ba3bbe87948963f3521e5d70b5693f6da328dc097d46f578fa7fbe7cb093fd9e1a338e9f7fa84dc
+EBUILD selinux-inetd-9999.ebuild 282 BLAKE2B 82cb6096721da5d856d55449aad6fab0a4f7b2b6440effdff732562ad6e389b2d327abf5152b8ce645dc12396135e5b427f174f04e95b08824c731e4166a592b SHA512 1a6e0f73edf567dc316f7342e45b294d8103e5e3a64df8d17ba3bbe87948963f3521e5d70b5693f6da328dc097d46f578fa7fbe7cb093fd9e1a338e9f7fa84dc
 MISC metadata.xml 315 BLAKE2B a9eb3c49b5be3317c1de43cd686a7d9e28c5139ca87a9113f88ff3021fb996165890da6fb7bd0caa41eda11038b47dd534e593218520634f2d2a512ecae7617e SHA512 438620bab81d97f74d43168aac08340ab265551b7865d8ce2613fe7ac0885903abaf0d43be01861fb2736cbe047e56c6ff89a8665aacdd05b48c1df86616a358
diff --git a/sec-policy/selinux-inetd/selinux-inetd-2.20180114-r2.ebuild b/sec-policy/selinux-inetd/selinux-inetd-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..9330c3d1d3ae
--- /dev/null
+++ b/sec-policy/selinux-inetd/selinux-inetd-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 5dfc645611fe..9330c3d1d3ae 100644
--- a/sec-policy/selinux-inetd/selinux-inetd-9999.ebuild
+++ b/sec-policy/selinux-inetd/selinux-inetd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-inn/Manifest b/sec-policy/selinux-inn/Manifest
index 44e8b968d931..9ecc7302bf8a 100644
--- a/sec-policy/selinux-inn/Manifest
+++ b/sec-policy/selinux-inn/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-inn-2.20170805-r2.ebuild 276 BLAKE2B 91dbb8853dbefddc0a892a642ed2
 EBUILD selinux-inn-2.20170805-r3.ebuild 276 BLAKE2B 91dbb8853dbefddc0a892a642ed23a1b6ebcd79beef073444f743f04cee78a7a535fdea4818278086cc11062cc00b0d40366adc963dc66c2fe44d1dc92377653 SHA512 5663a3665c8fa4a9fa5f8102f5e838e98ecadc8a1973ef3a249923847c1a3a22464779ae874490eedc911063900bc6214729e2da8585f578303a17f594e64511
 EBUILD selinux-inn-2.20170805-r4.ebuild 278 BLAKE2B a1c700a60ca922b53a677c189db787efc87ceb23b5ffc3849560d5f977822e2d0515231fd2be562edca2e399f75a44abc13ab82aa94b67b6b3d2c8c0a0d7ed2e SHA512 652f786bbc3f78086bc4eb68db2e78f824f4fab0036b01d53bcac725c66fe0b7bf04e2157e7fe5f5f7e44b874eedc47cd1d212e05e381d8a3d4ab71b55c48ebe
 EBUILD selinux-inn-2.20180114-r1.ebuild 276 BLAKE2B 64c57f88ce9b650e58d03d5d87fa0a6a7f837abdf120fd125d2dee85e039cedb27120cdc7dea8b8becd1278a44a5dd0e415550e9f730ceced9c62180ab074978 SHA512 d9084823cfb674736e48ed416eb9ac2605cddd9c8953d8e15bb2fbdbf7447a6b9717c0de54549f1a4dc9d053113db03d4e9153ab4fdfaf309ed0538478841c49
-EBUILD selinux-inn-9999.ebuild 278 BLAKE2B a1c700a60ca922b53a677c189db787efc87ceb23b5ffc3849560d5f977822e2d0515231fd2be562edca2e399f75a44abc13ab82aa94b67b6b3d2c8c0a0d7ed2e SHA512 652f786bbc3f78086bc4eb68db2e78f824f4fab0036b01d53bcac725c66fe0b7bf04e2157e7fe5f5f7e44b874eedc47cd1d212e05e381d8a3d4ab71b55c48ebe
+EBUILD selinux-inn-2.20180114-r2.ebuild 278 BLAKE2B f54e71778325116c0f9a4907f75a7aa9c7e8a0358f4e065b025627a97160aebfd8263be98da97259dd7c0aaa11971a0b44044dba44c87e7761ddb314ab988948 SHA512 12de60c38dd3cc53915447d109be08f93674a457a1ab9d1fcdaebdc454966afed3a11a58264529dbf5fd4502760114c6034249b47e7b160f44fe14ed78be70c5
+EBUILD selinux-inn-9999.ebuild 278 BLAKE2B f54e71778325116c0f9a4907f75a7aa9c7e8a0358f4e065b025627a97160aebfd8263be98da97259dd7c0aaa11971a0b44044dba44c87e7761ddb314ab988948 SHA512 12de60c38dd3cc53915447d109be08f93674a457a1ab9d1fcdaebdc454966afed3a11a58264529dbf5fd4502760114c6034249b47e7b160f44fe14ed78be70c5
 MISC metadata.xml 313 BLAKE2B bb0ed4879acef51b74bbee0cb44c07dcade072dac9bf86f147f50e0042b3376f3a082515f320ba73aa30146ff961fa2a098c9debd81f248c98453b6857eb18da SHA512 697ce85e544cbd0e530b6aa1408ec7cb391c832327ac4012f0bc7b844af03632c3593550bcbb6fc717821b29b68f42ce48d594274240de164ef490c95ed6b5f6
diff --git a/sec-policy/selinux-inn/selinux-inn-2.20180114-r2.ebuild b/sec-policy/selinux-inn/selinux-inn-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..2f668dd26f26
--- /dev/null
+++ b/sec-policy/selinux-inn/selinux-inn-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 aa1cf8cf674f..2f668dd26f26 100644
--- a/sec-policy/selinux-inn/selinux-inn-9999.ebuild
+++ b/sec-policy/selinux-inn/selinux-inn-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-ipsec/Manifest b/sec-policy/selinux-ipsec/Manifest
index a5bf9a94ad79..f50733d17cfe 100644
--- a/sec-policy/selinux-ipsec/Manifest
+++ b/sec-policy/selinux-ipsec/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-ipsec-2.20170805-r2.ebuild 280 BLAKE2B 4b773b18298b4edd493367e4ff
 EBUILD selinux-ipsec-2.20170805-r3.ebuild 280 BLAKE2B 4b773b18298b4edd493367e4ffcf3dcb13deb9dbe4f81c9207616e33b56c5443503b869ce6a888d3d21ffd574b5ccb9c04d86d21f4e7967390b68a9389262689 SHA512 9d4a8ede24d15681db02ad12b24c773a9763df2bc9697c6f96bd0f7e988101636261c64709a3edaa53a8cfe597bb49ce23882a098c44e32a2b2c10852a64530d
 EBUILD selinux-ipsec-2.20170805-r4.ebuild 282 BLAKE2B 3bb2889965a9b5587dda687633c7610f74118a835ec1c59cbc8f47d0948586bbf1a861e7c25ddfc147a26b40b99116ea2403526c337bd7018e10dcc1bcdf2107 SHA512 b0df3bf894a2e0a76a1c096fabe3e8c8ddee947ec8d4a1a02120a5459bc077b9dc0035d513af8ed2e8714dde9224cd182c94891bd0eee25a93e3b7b099bf546e
 EBUILD selinux-ipsec-2.20180114-r1.ebuild 280 BLAKE2B 00b755f93f4f65344087591efb89019fd89754083d6089de4c4c568dd93bf5630a9a83da601dee73f89a48c5c7dd490ab0f8508cb61ad3cd3cffff7d1c97685f SHA512 db1aeb018b6386cef146cebeae32e75e991b7d9c17b07e71a02defb849f6d106343882a9fa13903d764de01b9e47b34ee8417b3a16f40d0c9501e59c5f9e0dcc
-EBUILD selinux-ipsec-9999.ebuild 282 BLAKE2B 3bb2889965a9b5587dda687633c7610f74118a835ec1c59cbc8f47d0948586bbf1a861e7c25ddfc147a26b40b99116ea2403526c337bd7018e10dcc1bcdf2107 SHA512 b0df3bf894a2e0a76a1c096fabe3e8c8ddee947ec8d4a1a02120a5459bc077b9dc0035d513af8ed2e8714dde9224cd182c94891bd0eee25a93e3b7b099bf546e
+EBUILD selinux-ipsec-2.20180114-r2.ebuild 282 BLAKE2B 404bf2524a77692ef78785a5a75fe734a806b2e52513156149d25e2c8add33f63523f53ed5a0143ff9795d3601a94bb9d4cffe712c77c36a27b600b77907621f SHA512 a9f67a25f8dfb841c95bc89df4131a62e4c85a85c6dad63f85255c26f54d792e71c28a4e1f5dce46a276209e8b0329356b662803f3c7e0a39eed70e8de9ef2fc
+EBUILD selinux-ipsec-9999.ebuild 282 BLAKE2B 404bf2524a77692ef78785a5a75fe734a806b2e52513156149d25e2c8add33f63523f53ed5a0143ff9795d3601a94bb9d4cffe712c77c36a27b600b77907621f SHA512 a9f67a25f8dfb841c95bc89df4131a62e4c85a85c6dad63f85255c26f54d792e71c28a4e1f5dce46a276209e8b0329356b662803f3c7e0a39eed70e8de9ef2fc
 MISC metadata.xml 315 BLAKE2B b8e6cfb46c3e1d84e5f32bc51b17606599cdc025a88dc452bd6c12784845b627819e6c974c710020d41536bd38835f77801a47e0d0a75af26776f112a231139d SHA512 602a740c62ae3a51f2d1d21912b9a1ec5a910a8062813ef0101f4ed0e80c54c78c8595dce19be2cff521a92b251702aa6768c05e4b6fe2301c8cd3e266bd8948
diff --git a/sec-policy/selinux-ipsec/selinux-ipsec-2.20180114-r2.ebuild b/sec-policy/selinux-ipsec/selinux-ipsec-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..afe4efc9a73b
--- /dev/null
+++ b/sec-policy/selinux-ipsec/selinux-ipsec-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 c4ddfcfdab11..afe4efc9a73b 100644
--- a/sec-policy/selinux-ipsec/selinux-ipsec-9999.ebuild
+++ b/sec-policy/selinux-ipsec/selinux-ipsec-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-irc/Manifest b/sec-policy/selinux-irc/Manifest
index 384b14192ee2..8960460f2f35 100644
--- a/sec-policy/selinux-irc/Manifest
+++ b/sec-policy/selinux-irc/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-irc-2.20170805-r2.ebuild 276 BLAKE2B 92e463833b8c20c80e388772da0b
 EBUILD selinux-irc-2.20170805-r3.ebuild 276 BLAKE2B 92e463833b8c20c80e388772da0bb130eb5e9adf50ebfe679c926249d6e1beffd771b6472755ad846fe8c5ada5d23cd23d0b0455e449ca7b2ffbd118dfa67723 SHA512 626da120eb698469aac706843368ad82ee340ad046003c8df99c6afdbea1adec033d5083870c7c53f981e01ce90beec9db78eee3aa2277da8041a89a1e3b306b
 EBUILD selinux-irc-2.20170805-r4.ebuild 278 BLAKE2B f0a6990b5d60b0d9dfbfd58bf22519f5aa8147f19d34617d1e736f9831ef96ef58889302fb46f7dd370b21bba0024c053e92d0691c2eaacd26a5f146a19b0cee SHA512 c4cf0fcbdb1f4ece3b865e76617f7e9779f745d896328992591f36dcb91a4fb7f9b07314b2c1c0bcd72e53df5c965e01e68499356d518964c72c5fc69ccf521c
 EBUILD selinux-irc-2.20180114-r1.ebuild 276 BLAKE2B ec1dbc760cabe2147927372c8ed012ce58315fe90dd75853e810fc7df7912f23435b8df68ebd7a7e8474cbb529e142906ef7c12451166a29a697600530ec6f4d SHA512 ed269d2d2f417cac1519c6667ed7808eb3edbbf2fcb8a72b314985474dde79ff00e43c81b25ce5ba4ffd7c7aa77a935b6a698f17d0be210e917906efb7aee2a7
-EBUILD selinux-irc-9999.ebuild 278 BLAKE2B f0a6990b5d60b0d9dfbfd58bf22519f5aa8147f19d34617d1e736f9831ef96ef58889302fb46f7dd370b21bba0024c053e92d0691c2eaacd26a5f146a19b0cee SHA512 c4cf0fcbdb1f4ece3b865e76617f7e9779f745d896328992591f36dcb91a4fb7f9b07314b2c1c0bcd72e53df5c965e01e68499356d518964c72c5fc69ccf521c
+EBUILD selinux-irc-2.20180114-r2.ebuild 278 BLAKE2B 22bd4c8542b1830336c737f2a525bf044d8af2d38852e9ae0789bc9a43b4baf2c708b677ab3547ae86704d2b706fc397a6af053f603cbb3f3f5fcc40722d6e01 SHA512 47673607390fb0c897f438a5ba458fa4a6bb4ba87b403468fd80cede151853bb0343f79eef67e65095dd6206697eeacee5e25339af990be65064cbd51fe3b15d
+EBUILD selinux-irc-9999.ebuild 278 BLAKE2B 22bd4c8542b1830336c737f2a525bf044d8af2d38852e9ae0789bc9a43b4baf2c708b677ab3547ae86704d2b706fc397a6af053f603cbb3f3f5fcc40722d6e01 SHA512 47673607390fb0c897f438a5ba458fa4a6bb4ba87b403468fd80cede151853bb0343f79eef67e65095dd6206697eeacee5e25339af990be65064cbd51fe3b15d
 MISC metadata.xml 313 BLAKE2B f75266dc159e6b7855968a1226cd33e813b387b09cfe8f810b7f828fca40fb0f5f5b16100b4225b6f89a45d8a9233834c8daa802e1d9c08e8f0d046cf7d3d51c SHA512 79d10315a82d308f9417e6d0b331363b33a8022f0e5366412c0452f614e98243e946cccc605b55cb71cb7f5361a2aa3ae45fd5cbad9d4664cac406930734ea58
diff --git a/sec-policy/selinux-irc/selinux-irc-2.20180114-r2.ebuild b/sec-policy/selinux-irc/selinux-irc-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..248af928b807
--- /dev/null
+++ b/sec-policy/selinux-irc/selinux-irc-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 3d43669f0515..248af928b807 100644
--- a/sec-policy/selinux-irc/selinux-irc-9999.ebuild
+++ b/sec-policy/selinux-irc/selinux-irc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-ircd/Manifest b/sec-policy/selinux-ircd/Manifest
index 6842c300feb7..67b9308834bc 100644
--- a/sec-policy/selinux-ircd/Manifest
+++ b/sec-policy/selinux-ircd/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-ircd-2.20170805-r2.ebuild 278 BLAKE2B 6f4e5536330e2f64b9933dd94f8
 EBUILD selinux-ircd-2.20170805-r3.ebuild 278 BLAKE2B 6f4e5536330e2f64b9933dd94f8ed88f6445479ccccd6beebe311dcbeb2378c2f3683e0250064847d60e5231bb6690eb0d0c9e21c0343c756900574205fee2b8 SHA512 26fe99eb16ef290a685b27820291f1e84fe81284b4898861b0becbd31b14dbb8b7f7488a640baad81717408c4fd62aa9c894241fd257af63333f7393d1e155a8
 EBUILD selinux-ircd-2.20170805-r4.ebuild 280 BLAKE2B b2a55847fd742d7c94af3b767e6b3ac25ab03333831947ed25f076462183ce3235cd9c9caec96e35ceb9f5b3f7d329f82f64ca6b5996ce41a3d0ca4510df1213 SHA512 30da19de0f102312ac1549d5b6ca438e2309c1dd6b33c4a5a3d7a7c44eb2d691a9597ec87f5faf2653f9492ec207f390579e348ab20e93b45f45b21d66503175
 EBUILD selinux-ircd-2.20180114-r1.ebuild 278 BLAKE2B a3b620a0f8d99c72dc3e258c2b2eea18788ef00712f1e2428f1e9076be3298bd9b380cf5f6355d6505230327574316a1e886233024c404b4b84b7e8f2c4665c5 SHA512 074ff5c9061afe585579f19cf0ceb9f67d1d9abeb10a2f0c781d72ecec71678afd6200b757c1e107185bdf04bc4178d87be45b1891b4ada70b0308dc378b0497
-EBUILD selinux-ircd-9999.ebuild 280 BLAKE2B b2a55847fd742d7c94af3b767e6b3ac25ab03333831947ed25f076462183ce3235cd9c9caec96e35ceb9f5b3f7d329f82f64ca6b5996ce41a3d0ca4510df1213 SHA512 30da19de0f102312ac1549d5b6ca438e2309c1dd6b33c4a5a3d7a7c44eb2d691a9597ec87f5faf2653f9492ec207f390579e348ab20e93b45f45b21d66503175
+EBUILD selinux-ircd-2.20180114-r2.ebuild 280 BLAKE2B cf7f4d5b7138cf936a61079de60ebcd2fc0d0aa2ca96907f6ec86e652c2b93096fd33f5997dd45e39020c142e992eba4ca2f311e6ed87273a59f79aac6448c38 SHA512 67f6d19ef77ef464d85c5ecb78f5e6e94805ed78b37d9e77818735406d9e7a29382c5a933848ba549acc5a435af1a0ac68068d34547f1e245e06b2362c994268
+EBUILD selinux-ircd-9999.ebuild 280 BLAKE2B cf7f4d5b7138cf936a61079de60ebcd2fc0d0aa2ca96907f6ec86e652c2b93096fd33f5997dd45e39020c142e992eba4ca2f311e6ed87273a59f79aac6448c38 SHA512 67f6d19ef77ef464d85c5ecb78f5e6e94805ed78b37d9e77818735406d9e7a29382c5a933848ba549acc5a435af1a0ac68068d34547f1e245e06b2362c994268
 MISC metadata.xml 314 BLAKE2B ad8986a6f937d46dcb66254f589a49979a9bae8a019f0c104c89f20b523416f1204683984038c76be066ab0c80797435a18f74f48356ee4b5520b9573b90e493 SHA512 8832769974dbfe7244583d60b35e9fab3a73eac269a237895979ea704098a00d92089ad4efe9c1a110b71fd2da271518b5f80212815f9b2097f7c6438f607ce6
diff --git a/sec-policy/selinux-ircd/selinux-ircd-2.20180114-r2.ebuild b/sec-policy/selinux-ircd/selinux-ircd-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..1b5dc73ec5b9
--- /dev/null
+++ b/sec-policy/selinux-ircd/selinux-ircd-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 cdffe7a88d49..1b5dc73ec5b9 100644
--- a/sec-policy/selinux-ircd/selinux-ircd-9999.ebuild
+++ b/sec-policy/selinux-ircd/selinux-ircd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-irqbalance/Manifest b/sec-policy/selinux-irqbalance/Manifest
index 0b4e5d0bed8f..3d35f07a056d 100644
--- a/sec-policy/selinux-irqbalance/Manifest
+++ b/sec-policy/selinux-irqbalance/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-irqbalance-2.20170805-r2.ebuild 290 BLAKE2B 3fcc9d3213205995296c8
 EBUILD selinux-irqbalance-2.20170805-r3.ebuild 290 BLAKE2B 3fcc9d3213205995296c8670ab0c626ad94bc81791168395642f4b2adb3edf03563fa0bd45b92ccd63a689bff1a22d0fa29d8dca0338d756fa02628b897641d0 SHA512 4b10d7e9c6c485661436dd6b00c23349f820bbfd0887e1b79951b3e5d97f71889942387b4dc7579a9ca88181a64d45ecf25a0bd99dbd2d9016a88f0b8df16113
 EBUILD selinux-irqbalance-2.20170805-r4.ebuild 292 BLAKE2B fe0e880b71edd5c778d969a6b08e9d3d25d2b283447b53240591bb9a19d884ce3ea28065b0f2e5d4bd43b98510fec59d0c0aec26378dffaa2ac96b892de26d6d SHA512 1d40a7d0948058341b2f2e6b018a146f89c5ed7e120b8aa9f72d8beac1a5c985948ee2d712b2577b4b799da65a2e784a2c9d10de3ebb11c9a9802d77ca8845b2
 EBUILD selinux-irqbalance-2.20180114-r1.ebuild 290 BLAKE2B 1a3b3b284304b2a3d4791cd49b942837758e6c114c70beb4e1985b97d0a29537f4ef2f8070ac056b8d1b9e189e680cfaaea4fe96b963b4511aef2527a0059ab8 SHA512 78342d57561b61059885ae9cb7311d68295a9022a6c1eddb9164f33cce81e44a47e30637b8748172c027c98257cb8632590ab3f6dac77286003d895b6a1bafe2
-EBUILD selinux-irqbalance-9999.ebuild 292 BLAKE2B fe0e880b71edd5c778d969a6b08e9d3d25d2b283447b53240591bb9a19d884ce3ea28065b0f2e5d4bd43b98510fec59d0c0aec26378dffaa2ac96b892de26d6d SHA512 1d40a7d0948058341b2f2e6b018a146f89c5ed7e120b8aa9f72d8beac1a5c985948ee2d712b2577b4b799da65a2e784a2c9d10de3ebb11c9a9802d77ca8845b2
+EBUILD selinux-irqbalance-2.20180114-r2.ebuild 292 BLAKE2B 4cfdf4ba03c8516684799e313f4c3559edf931dac90b869bf93aa615c78342ad6a250bdf148a9c01aa98b9a95ce1abc85982e76221ab10023a930049f5a41f7b SHA512 21f94784267b3c078ac282e7abd53392c52e5f5df9580cf37e54e2121d8d6ccffe9a0f14548cc734a83aaa048f95da8b38f11735c58ef3586b2fb94284ef2e11
+EBUILD selinux-irqbalance-9999.ebuild 292 BLAKE2B 4cfdf4ba03c8516684799e313f4c3559edf931dac90b869bf93aa615c78342ad6a250bdf148a9c01aa98b9a95ce1abc85982e76221ab10023a930049f5a41f7b SHA512 21f94784267b3c078ac282e7abd53392c52e5f5df9580cf37e54e2121d8d6ccffe9a0f14548cc734a83aaa048f95da8b38f11735c58ef3586b2fb94284ef2e11
 MISC metadata.xml 320 BLAKE2B 5fa14aca6d178a397ce0a1874d8be6f9c104276635636b4c0126bb3ff84a73a0672560ff3e176d54acfde446915dce87fe15fbcc3ecec5622b7e1f939dc43d31 SHA512 e2e7fb33bdd96b5dfa7f0278225c5696da53693800ed86b6ea7e9a7f5685ce6dda87bb3775752068a20f9232fe1638d6b553859f8fa1707b0f36dcc493ef1bc9
diff --git a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20180114-r2.ebuild b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..4d7b25864b7e
--- /dev/null
+++ b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 1f967d7f50c5..4d7b25864b7e 100644
--- a/sec-policy/selinux-irqbalance/selinux-irqbalance-9999.ebuild
+++ b/sec-policy/selinux-irqbalance/selinux-irqbalance-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-jabber/Manifest b/sec-policy/selinux-jabber/Manifest
index 4eaae884697c..21c542fcc15f 100644
--- a/sec-policy/selinux-jabber/Manifest
+++ b/sec-policy/selinux-jabber/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-jabber-2.20170805-r2.ebuild 282 BLAKE2B 414045e305de467c9665c0af5
 EBUILD selinux-jabber-2.20170805-r3.ebuild 282 BLAKE2B 414045e305de467c9665c0af5dc4b998b9d2af49b2a5d857be2eb7b3c094918f250d5b646499aec5d19a9487af028de7b4ae23947f7546239ec4af7d33653c2c SHA512 aff08ea6d5748f085737191dc2057f2794c52c87514dfb2714ca0aa38074c7485e4a0f874e4175de55d1549d90cb3b3952f42c574221c3d6d9878b4b99826c6a
 EBUILD selinux-jabber-2.20170805-r4.ebuild 284 BLAKE2B fb13528f2eec408ee480674e7bddd528c021d6f5ae7bfbb76d5a0f3f6dde02e401eefcc02a65911b3230d0be1c5bdd47d76bfb1e0f25b6fe82fdbb219b051a56 SHA512 1242f51907cd796deda6889897296a2c7cc07e09f604513d600307e84589ed38930942f3816b03b2598dd9483df0fd1acd9643f1699d02a4daecd6e9a7fd7e08
 EBUILD selinux-jabber-2.20180114-r1.ebuild 282 BLAKE2B cda9eff6fbac5773386a0534b0035d0bd8ed38a1a55bd8a64d37632fb01cf2ceb443791f628d0b316c571a10d8fdeff329bcf1fdc7550f442f1e2a8f4bbba6e2 SHA512 c2b1c424a1f2fc9878e134bf0150af8c4529f50fa4f6d8874fa3dcbd63e35f433d2193dbe6db7672bfa3f034dd90d6d24e53da064ebff85c15c0c7a33f3ef16b
-EBUILD selinux-jabber-9999.ebuild 284 BLAKE2B fb13528f2eec408ee480674e7bddd528c021d6f5ae7bfbb76d5a0f3f6dde02e401eefcc02a65911b3230d0be1c5bdd47d76bfb1e0f25b6fe82fdbb219b051a56 SHA512 1242f51907cd796deda6889897296a2c7cc07e09f604513d600307e84589ed38930942f3816b03b2598dd9483df0fd1acd9643f1699d02a4daecd6e9a7fd7e08
+EBUILD selinux-jabber-2.20180114-r2.ebuild 284 BLAKE2B 39cd6d6e864b86fd529bae96d4924e9479ae456185f321ace36f74d6f71d1199d729f0bd6b593b53568b46b9ef4b5a891507d0a69219c5a75d28870b7542eb92 SHA512 90103398c26d29b8be1cc3d314867d88ddec0e936d34a0d7f0f218cbbcb78ad48a9e48bae04d8278b86020bc22eba227d22e7b6ca1d69d6310c785ddcd76d7b2
+EBUILD selinux-jabber-9999.ebuild 284 BLAKE2B 39cd6d6e864b86fd529bae96d4924e9479ae456185f321ace36f74d6f71d1199d729f0bd6b593b53568b46b9ef4b5a891507d0a69219c5a75d28870b7542eb92 SHA512 90103398c26d29b8be1cc3d314867d88ddec0e936d34a0d7f0f218cbbcb78ad48a9e48bae04d8278b86020bc22eba227d22e7b6ca1d69d6310c785ddcd76d7b2
 MISC metadata.xml 316 BLAKE2B 263c8405f8376db80cdc680d1452a5a64465a8040fb2ccf2b0a74213173a1858e3aeba5310fbdd2079c2ef7bbf7815da4f14b813cd8d0a5ab0a8639648d4467f SHA512 269cb023c313456e0ff91148007509ef5cdaea6c33ceb42ba3bf57674fc4c709d719824a3e95f3171773c4979d03be50873ac62fdb2f8bea86e5904703dd76bc
diff --git a/sec-policy/selinux-jabber/selinux-jabber-2.20180114-r2.ebuild b/sec-policy/selinux-jabber/selinux-jabber-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..5cda0ea5f16b
--- /dev/null
+++ b/sec-policy/selinux-jabber/selinux-jabber-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 442bb867c229..5cda0ea5f16b 100644
--- a/sec-policy/selinux-jabber/selinux-jabber-9999.ebuild
+++ b/sec-policy/selinux-jabber/selinux-jabber-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-java/Manifest b/sec-policy/selinux-java/Manifest
index 82553e3e63fd..fdb2f1610a5b 100644
--- a/sec-policy/selinux-java/Manifest
+++ b/sec-policy/selinux-java/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-java-2.20170805-r2.ebuild 282 BLAKE2B d119a0224424ffd6dec056d18e0
 EBUILD selinux-java-2.20170805-r3.ebuild 282 BLAKE2B d119a0224424ffd6dec056d18e0b0d762a4f7c405db757eb79a70aaf484ca4ff9ae67618fe4843d7133fff309e5cd6c3bdf4175de63c6f71f6139f991b2a2744 SHA512 b5b83dfb8e254e4ab214400d0f31f7e3a337649d8da5b4321f27ae4ac6e79e7767333747f65deec014ee33a9ae62dac817a61577fbce30eea3c74e126ae595b4
 EBUILD selinux-java-2.20170805-r4.ebuild 284 BLAKE2B f16162a88486212bd0a57d46b334b56ccbc5b5b9d95772ce365804862f8ae24b6302568d78625014963a9c2c426dfb8fe561d4cc6a202d5f5fad444715c9c62a SHA512 3bb68c2e6129cc3f7cd97c5da2fbe14c24de7ecdac2656683a244c1f5b9159707df4a91740d05ccca6346b2382dea4ad25f013bd34e2d7edea7bdf23cb459593
 EBUILD selinux-java-2.20180114-r1.ebuild 282 BLAKE2B 203d52667b2744b47168528eb53a78722294a267775738db026f2993b458657e404ed781c6cb03b9c6a8b6621e6c3c416901f20099d8d232677388f47e6f300e SHA512 62891f2a4e9045a531e1149a9148adc7c798d43915d839a1021fbb99c8bbefe5c0cc9bb0e5554ce773b0cc3d9c13ebc0764b559ee75288d6c4e6076bc1348cb0
-EBUILD selinux-java-9999.ebuild 284 BLAKE2B f16162a88486212bd0a57d46b334b56ccbc5b5b9d95772ce365804862f8ae24b6302568d78625014963a9c2c426dfb8fe561d4cc6a202d5f5fad444715c9c62a SHA512 3bb68c2e6129cc3f7cd97c5da2fbe14c24de7ecdac2656683a244c1f5b9159707df4a91740d05ccca6346b2382dea4ad25f013bd34e2d7edea7bdf23cb459593
+EBUILD selinux-java-2.20180114-r2.ebuild 284 BLAKE2B c3328f8fc326b28b9fa4974341c716d7be73a07d2b02c92b8e1791b4e91e9f4608783b81b8bd3a782b77389898411a6250c6431d44419f42a387db2be7c9190d SHA512 ca10912bd5ea5d69b03ab482e20f4a31e9ce2f9a02bc66b36ccfb97f4c280e580e682f09ec6c98ed603c4ced8807534796848af24366a6f4a3321f8161b2a00b
+EBUILD selinux-java-9999.ebuild 284 BLAKE2B c3328f8fc326b28b9fa4974341c716d7be73a07d2b02c92b8e1791b4e91e9f4608783b81b8bd3a782b77389898411a6250c6431d44419f42a387db2be7c9190d SHA512 ca10912bd5ea5d69b03ab482e20f4a31e9ce2f9a02bc66b36ccfb97f4c280e580e682f09ec6c98ed603c4ced8807534796848af24366a6f4a3321f8161b2a00b
 MISC metadata.xml 314 BLAKE2B 88ef45c4d4dd356bb361916a45ae25046b69e40bd24a963f0460e54cfb0f5e273ec5dc418b208b10d57c5dd0cf0d50984b055a8614677bf5887118274f55250f SHA512 6abe4c867275288d443678ad009b88232db9ae9a9565a0bf4bf5a07dd424d28ee1be71351e74f3aef0c7c4e236125089f10ca13f2799004c6eca3a7081326b57
diff --git a/sec-policy/selinux-java/selinux-java-2.20180114-r2.ebuild b/sec-policy/selinux-java/selinux-java-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..d9242ad11ef6
--- /dev/null
+++ b/sec-policy/selinux-java/selinux-java-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 05561d39f0d7..d9242ad11ef6 100644
--- a/sec-policy/selinux-java/selinux-java-9999.ebuild
+++ b/sec-policy/selinux-java/selinux-java-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-kdeconnect/Manifest b/sec-policy/selinux-kdeconnect/Manifest
index d43abbe7c020..65ef4fcc2c7a 100644
--- a/sec-policy/selinux-kdeconnect/Manifest
+++ b/sec-policy/selinux-kdeconnect/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-kdeconnect-2.20170805-r2.ebuild 290 BLAKE2B 600095d321bd94e44be30
 EBUILD selinux-kdeconnect-2.20170805-r3.ebuild 290 BLAKE2B 600095d321bd94e44be30db25568da4ecf38f3a95c8d1b58e2aa4df6ed302f32fa245d9c84ddc5a23317eaf233484472a8f7622113f572049f274b87a0eae43f SHA512 ce7706a51fd1ef7bcf562eddc2c6be948484dc90fa7bd3f3278ca33654c070b3e19a565b85931019ddd3c281c4416b6c3af81c43b2a33de3d2c6523da8f4fbb6
 EBUILD selinux-kdeconnect-2.20170805-r4.ebuild 292 BLAKE2B 4598f8d5eb7fe46db360b5279a9745e7ef7590a4ed0e3ada3a4004cfc160861fe954ab4698a61e4ae77d0d6590ed21a2c4d8f7207d90e0165e63f9d82f09e022 SHA512 1b81a19b393fb91d30856372be698ecbb782c5921dad4dd46ba3d3bf3e42690c77055ad306710c95c8bd1ac2f94acb4fe0948505c6e97a27329fc3a2500ce616
 EBUILD selinux-kdeconnect-2.20180114-r1.ebuild 290 BLAKE2B 522cfeaf30af854f6b620151ddb899d13e1b99c31185f7fbfd6ac44d6ad12fb44d827021e079c17a495c11dd835a50f845980d96712c2b1e32dff5287f0d10ef SHA512 367360ed7ac03c07ac03212fc3ae131af5248fc1207c50e3e5e43c9df9eeaee8edd654b847769c27635574d6af8504c0b6b0f159755fe86c7042ead787a95836
-EBUILD selinux-kdeconnect-9999.ebuild 292 BLAKE2B 4598f8d5eb7fe46db360b5279a9745e7ef7590a4ed0e3ada3a4004cfc160861fe954ab4698a61e4ae77d0d6590ed21a2c4d8f7207d90e0165e63f9d82f09e022 SHA512 1b81a19b393fb91d30856372be698ecbb782c5921dad4dd46ba3d3bf3e42690c77055ad306710c95c8bd1ac2f94acb4fe0948505c6e97a27329fc3a2500ce616
+EBUILD selinux-kdeconnect-2.20180114-r2.ebuild 292 BLAKE2B 10c1307fab2823e6a570b3e174f1c4afacf42cc287ebe8dc322c3f33edc78e2984ec4ed961692e4d316e05db3f25aab9846511ccbd63075fcf15553176829007 SHA512 a7911804aa9a16c6b8decfc7b369f929e4fdc832677717d4c8bd3bd37ad4c5d2f23678c8af081e0ef7058ec7b0d76413061481383c89e46996ecface4e439f96
+EBUILD selinux-kdeconnect-9999.ebuild 292 BLAKE2B 10c1307fab2823e6a570b3e174f1c4afacf42cc287ebe8dc322c3f33edc78e2984ec4ed961692e4d316e05db3f25aab9846511ccbd63075fcf15553176829007 SHA512 a7911804aa9a16c6b8decfc7b369f929e4fdc832677717d4c8bd3bd37ad4c5d2f23678c8af081e0ef7058ec7b0d76413061481383c89e46996ecface4e439f96
 MISC metadata.xml 320 BLAKE2B 43e71bffab415a3c2f7d13cf88852fbb2887efc0c53b8a60df96bed740bdb0fd5b31b59987c96648e43e680de654b94b99f3de77dab601a28aa0d0cc187f04f4 SHA512 ab0e14cd212f45bc18bd3fd8c63b5c1f28b71f9c8ffbbf7c3dc913b1c5dadd8a082d362e0cc9f5b16faf16f7eecff743f45186161cc002f9b4011b39866dc0a3
diff --git a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20180114-r2.ebuild b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..d0153053b417
--- /dev/null
+++ b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 f60a7bd6e180..d0153053b417 100644
--- a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-9999.ebuild
+++ b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-kdump/Manifest b/sec-policy/selinux-kdump/Manifest
index adf161f60c23..e17a05f50c1c 100644
--- a/sec-policy/selinux-kdump/Manifest
+++ b/sec-policy/selinux-kdump/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-kdump-2.20170805-r2.ebuild 280 BLAKE2B 1a597db5c04ee2ead980f246ff
 EBUILD selinux-kdump-2.20170805-r3.ebuild 280 BLAKE2B 1a597db5c04ee2ead980f246ff81e069f62194257a0b692362651cdc22425cdfbb85427e840a72d9c0610726d6838111e67c13ff09607e163010a817c5b463b6 SHA512 203dba46c2720fe3f733c4fea85b1cdf542b04e3eb57bbeb5ca25ab09122abe0e3426c9bb8160c13f6766c4b073854265868197fb21811c6fefbbbdb2b2003ae
 EBUILD selinux-kdump-2.20170805-r4.ebuild 282 BLAKE2B 143069d3b2edcba4c2533e70f059a7bde476c0cafe356739b0b4b5071f402cdfd28d03e054f802753f5d3aa53d444374107a68a24cd2bbf3ef19b0ea9426449c SHA512 c146fb71939f8968eb435986a9ca1aca176cdf1a96308071e01de59552ee39d900f63574428611c460d846fadb412ce359f92c88e10879bd5ee4857de27c9c2f
 EBUILD selinux-kdump-2.20180114-r1.ebuild 280 BLAKE2B 08f383ede40fc74440f7a1a04b37a24876b76edf1187f436dd182bd9768e1b78e5a157df7bc1a2befd5e798d71d066c6fb0f94e5857937f0ea744ed100fd2315 SHA512 99c6812e319001d3dc402548333e4f982a30ede70952e88425b515906013d41e3c827b807791903697fe90b25dab72c1d55a7319d5c8543014deec0b13b6e153
-EBUILD selinux-kdump-9999.ebuild 282 BLAKE2B 143069d3b2edcba4c2533e70f059a7bde476c0cafe356739b0b4b5071f402cdfd28d03e054f802753f5d3aa53d444374107a68a24cd2bbf3ef19b0ea9426449c SHA512 c146fb71939f8968eb435986a9ca1aca176cdf1a96308071e01de59552ee39d900f63574428611c460d846fadb412ce359f92c88e10879bd5ee4857de27c9c2f
+EBUILD selinux-kdump-2.20180114-r2.ebuild 282 BLAKE2B 90cb2c657ef57615ad1f35b004f3fdb53c636391a7e694e759d227f2ea204d90d9563bdf99ea6c56cbe057f598a6c3272c59d86c285f68feaf2f0e5e5d45380b SHA512 bb215372c7cf13641a8d0f4d3437e7ed09c59665d15ef186712ffd5ea81b19823c071fdb7f1772ce579b35ef21dd1a6e472fff704490f7a815acf6ed06532a8e
+EBUILD selinux-kdump-9999.ebuild 282 BLAKE2B 90cb2c657ef57615ad1f35b004f3fdb53c636391a7e694e759d227f2ea204d90d9563bdf99ea6c56cbe057f598a6c3272c59d86c285f68feaf2f0e5e5d45380b SHA512 bb215372c7cf13641a8d0f4d3437e7ed09c59665d15ef186712ffd5ea81b19823c071fdb7f1772ce579b35ef21dd1a6e472fff704490f7a815acf6ed06532a8e
 MISC metadata.xml 315 BLAKE2B 5a90634892dcd621a33900cf7dee3e544bf0557b468310f08707bf599139660f213ff38182b21c55cf3d02cdb71880f26016529ce770ff3b42fadf60eaa56258 SHA512 9676f97f6e2e5fd7d8578c1c11662630f5ddc156a3adca855ba145e146531ca54a8f969c689e0c5e233531b9b8ca05a94a03802ab8a3cc18015bce1a0d3b3980
diff --git a/sec-policy/selinux-kdump/selinux-kdump-2.20180114-r2.ebuild b/sec-policy/selinux-kdump/selinux-kdump-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..658c34f327a3
--- /dev/null
+++ b/sec-policy/selinux-kdump/selinux-kdump-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 47b5a73190ad..658c34f327a3 100644
--- a/sec-policy/selinux-kdump/selinux-kdump-9999.ebuild
+++ b/sec-policy/selinux-kdump/selinux-kdump-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-kerberos/Manifest b/sec-policy/selinux-kerberos/Manifest
index d431719e52ea..d10aa4f8a887 100644
--- a/sec-policy/selinux-kerberos/Manifest
+++ b/sec-policy/selinux-kerberos/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-kerberos-2.20170805-r2.ebuild 286 BLAKE2B 73dac7b7e75910f95df4175
 EBUILD selinux-kerberos-2.20170805-r3.ebuild 286 BLAKE2B 73dac7b7e75910f95df4175cabb4f80e5499c290d4bf6f69818b75a0ce8fc927e8bc06adaddd6ef6969cf408fb5d8dd2a0309e51624ed6b8b22edb500331fad8 SHA512 7065f4a7c1e0b212cf3b702c1a2df72781443ddac17c2a14c93e2fcc4ac6646471e667b67c5de54d044eb5d35bb271a7e584f426ce229c5a8c0cd403419f9bf1
 EBUILD selinux-kerberos-2.20170805-r4.ebuild 288 BLAKE2B d5daeb328a1ad4458e431556c2c159c7a5c645d8560723052c271f919f3158230e86af0b8cbb27179baa168bab90855b617d34fff294fa3fe7d2e3c5300f166d SHA512 220e38526134071d1ae14d338a9040acce5285641f5c2d53582d4b4de79bfe442d2b1d20cb756e30dcc133fe8453a7c34bb5c8aa3e16f5f2ebb812043a70e015
 EBUILD selinux-kerberos-2.20180114-r1.ebuild 286 BLAKE2B d65e18d8059502b1dbc10b9d6299cc472a1ffb1d1d9bd4150b68c82b63d2462b3b4ce47bd6d3921ca50a9cf850a16d793045da98adbd637b2b63964f29c0245b SHA512 7cb01ba1430849b65fdbab2c4fc159c22dd8388649d9085dbbd397f18a24972a98700c97b1678249282c8cfbdcb386d97c80bbaadedb2bae4c68735d6e92b005
-EBUILD selinux-kerberos-9999.ebuild 288 BLAKE2B d5daeb328a1ad4458e431556c2c159c7a5c645d8560723052c271f919f3158230e86af0b8cbb27179baa168bab90855b617d34fff294fa3fe7d2e3c5300f166d SHA512 220e38526134071d1ae14d338a9040acce5285641f5c2d53582d4b4de79bfe442d2b1d20cb756e30dcc133fe8453a7c34bb5c8aa3e16f5f2ebb812043a70e015
+EBUILD selinux-kerberos-2.20180114-r2.ebuild 288 BLAKE2B e98ebf9f5d4618460b6661c4c61593abc2c77baffeca23d761e7d7a108e2223706cef882ddbe20de60f29b21bccdb2ae1ba8e89493101539094fc5142bf4a8f9 SHA512 d786e2d320ac570278a1201494043bea677346194e604591b472d5420fef4146d6af60ca7855e3ddf836131a50d416646cbe4e4d874ec97bea174bcee3b909f4
+EBUILD selinux-kerberos-9999.ebuild 288 BLAKE2B e98ebf9f5d4618460b6661c4c61593abc2c77baffeca23d761e7d7a108e2223706cef882ddbe20de60f29b21bccdb2ae1ba8e89493101539094fc5142bf4a8f9 SHA512 d786e2d320ac570278a1201494043bea677346194e604591b472d5420fef4146d6af60ca7855e3ddf836131a50d416646cbe4e4d874ec97bea174bcee3b909f4
 MISC metadata.xml 318 BLAKE2B e6059f2ad603ee10e5f075ccf2c32b901923e09e6ae0e64b9605ab411ac21e6b1ec0d1928ae7dfb2564f72fe5031dd86813e20fc417ab37b9bd91333aed1721e SHA512 7c5a7eeb9d6dbfd9ff85af7392e3b522d558726d72dada332dd3df088c5b8bb52cdc9cbd707ba1da49b6a36a0fce9bdbdbd58830bb411d99d0f75fe29adfa27c
diff --git a/sec-policy/selinux-kerberos/selinux-kerberos-2.20180114-r2.ebuild b/sec-policy/selinux-kerberos/selinux-kerberos-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..3c70dba4223c
--- /dev/null
+++ b/sec-policy/selinux-kerberos/selinux-kerberos-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 8a747d140fef..3c70dba4223c 100644
--- a/sec-policy/selinux-kerberos/selinux-kerberos-9999.ebuild
+++ b/sec-policy/selinux-kerberos/selinux-kerberos-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-kerneloops/Manifest b/sec-policy/selinux-kerneloops/Manifest
index 2d0663282aae..8d4662b035b6 100644
--- a/sec-policy/selinux-kerneloops/Manifest
+++ b/sec-policy/selinux-kerneloops/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-kerneloops-2.20170805-r2.ebuild 290 BLAKE2B e4f95d2a6c7a01dea09b6
 EBUILD selinux-kerneloops-2.20170805-r3.ebuild 290 BLAKE2B e4f95d2a6c7a01dea09b64ead1b549b14ced1e22d19327ccbc983e8300d4a486f0dc8f03a0ebb4a842fca5077ea2d1ab6af64483ccfd3d91f25fd81ab5a1a141 SHA512 213d4155310b54352f521f65b99f7db60a3a55269a6ddc87a5aa14a812975d54c662b8cc8578db51b8b2864568cd7aa6300e7374a87f7178f4971cbd56487d69
 EBUILD selinux-kerneloops-2.20170805-r4.ebuild 292 BLAKE2B 2089df71589b7d392084de3b47359d9a475c58ab81de6780c2f3db2e4995d7d6ee9788cc8791a7e195cc85a2ceef7b05816134d95f605e619cb94148887c71a3 SHA512 465c4b2e0e3de2ec2c1abeceab994cec808468e5c140468484bd425ef3cdaa7146aafbf75501eea7669c79e2316d1eec090cea1cfe6bc0ec7cfbd53ee98c3055
 EBUILD selinux-kerneloops-2.20180114-r1.ebuild 290 BLAKE2B 4e8b772c2a65060140c319efa05459d1f902a7a6ab1bead2923ec5d34d6bc67aacf0f71b21ac3df5f6b39f24d7fd7079f987f3c151179542c3181ae35e98977c SHA512 705bfcaea97c6f5d93bca5b3c75f73b035ca43d7d470c808676556c33fd1bed5510897d01bd0e310595f88c1c077a1eac0dd93e2d4e9ef4e8655ab237f1a9cbd
-EBUILD selinux-kerneloops-9999.ebuild 292 BLAKE2B 2089df71589b7d392084de3b47359d9a475c58ab81de6780c2f3db2e4995d7d6ee9788cc8791a7e195cc85a2ceef7b05816134d95f605e619cb94148887c71a3 SHA512 465c4b2e0e3de2ec2c1abeceab994cec808468e5c140468484bd425ef3cdaa7146aafbf75501eea7669c79e2316d1eec090cea1cfe6bc0ec7cfbd53ee98c3055
+EBUILD selinux-kerneloops-2.20180114-r2.ebuild 292 BLAKE2B 60955babaece40d4c411eafb354d45d1ca776494fd277782e708cb4c39808d9a27cae662995cd4a76730f8e964b93807203259a920dd9019bf852180e95e41f3 SHA512 9aaca8b3fb0c733bf52b4d9cb0e2edc6601bdadc512d3e4905684a1cc302c500f2abcbf7686288e6ec1b58c27793b9bc5d891b076dc714e5f39ba5f7a1ee9675
+EBUILD selinux-kerneloops-9999.ebuild 292 BLAKE2B 60955babaece40d4c411eafb354d45d1ca776494fd277782e708cb4c39808d9a27cae662995cd4a76730f8e964b93807203259a920dd9019bf852180e95e41f3 SHA512 9aaca8b3fb0c733bf52b4d9cb0e2edc6601bdadc512d3e4905684a1cc302c500f2abcbf7686288e6ec1b58c27793b9bc5d891b076dc714e5f39ba5f7a1ee9675
 MISC metadata.xml 320 BLAKE2B b414c390eb4c160312b7c9a4d393bc9f05bc036397ed1b4663aafc2d72418f09fa650e7b88dd40f147d8da88f3e83b9055138a53f92f0d653837d751a9544cd2 SHA512 84353674a6bc581ee9d8e25410b630574201701a8ccf025f6789e488b045fae7ea6662ebd17aa92273d2ea5b61c0c0d7218919449ec60a4f69c88d12fd1e5c69
diff --git a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20180114-r2.ebuild b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..ce419430b0ed
--- /dev/null
+++ b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 0779d104ce8d..ce419430b0ed 100644
--- a/sec-policy/selinux-kerneloops/selinux-kerneloops-9999.ebuild
+++ b/sec-policy/selinux-kerneloops/selinux-kerneloops-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-kismet/Manifest b/sec-policy/selinux-kismet/Manifest
index 41399bc375a2..955a12ecca9d 100644
--- a/sec-policy/selinux-kismet/Manifest
+++ b/sec-policy/selinux-kismet/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-kismet-2.20170805-r2.ebuild 282 BLAKE2B 1e1ac8e082359ebdb7ab1f43d
 EBUILD selinux-kismet-2.20170805-r3.ebuild 282 BLAKE2B 1e1ac8e082359ebdb7ab1f43d2ee5db63fde44eb740f9be19643bc100c9413accf3ebf4f0047e0bc73c78be0d528b2fc197b5ba153a4b84ec4ede34063ddf7e4 SHA512 3d51728ccaaaa00eb87b1481410dc973b638725cef4251574d561b053864005b05c9876647a673c74bae2f6bc7ef4f556753e83f7ff1b4a60cf16705bbe42773
 EBUILD selinux-kismet-2.20170805-r4.ebuild 284 BLAKE2B 25367e6c04b385178e98d463a455d48ffac64b03bb47381d73b3abba07ae239404df6efc6eefc0a396540a1827be11078c0f2c252edd2d41089c866c894644ac SHA512 14d7d2e1cfaaab9e733ef2a470a2073756e71794f6cd814b22c486202fd072bffad0d8500b595d2d7c2815ca5ab5e85dd101ef7a57f8e1338efef7cc0054a581
 EBUILD selinux-kismet-2.20180114-r1.ebuild 282 BLAKE2B ea8a57163fe730c7ee78c202569a2e28a7843e1fab8782e7c47c00f970410dda67a2f1a65eb2f65b4b6ff06b8e88ca1fd3d00c9d90c98a459e24afe26f937aed SHA512 b4716d3dec21a6b3e878095584bb4441cf4d8e989e3d325696275b5fb316808adbb72170b3056cb6e11d30d42a047ad4001d487f07114f89af59327941f2a5b1
-EBUILD selinux-kismet-9999.ebuild 284 BLAKE2B 25367e6c04b385178e98d463a455d48ffac64b03bb47381d73b3abba07ae239404df6efc6eefc0a396540a1827be11078c0f2c252edd2d41089c866c894644ac SHA512 14d7d2e1cfaaab9e733ef2a470a2073756e71794f6cd814b22c486202fd072bffad0d8500b595d2d7c2815ca5ab5e85dd101ef7a57f8e1338efef7cc0054a581
+EBUILD selinux-kismet-2.20180114-r2.ebuild 284 BLAKE2B e436b2aeeefb3dc0e98d1940c5c8cb7f8c7a1f57eccb4214cdffd56792512405eb63f54abf3ed47041be51dbc7050d58615e7f724d57205f809487647c7c40d3 SHA512 c49ff7522d192e34b808b974818a1fe51521d83790f7e48aacfc74fce033fc74b6f0ba145197826663f56ccda9a4a3438b062838324df96433cf7bf58f31f5c7
+EBUILD selinux-kismet-9999.ebuild 284 BLAKE2B e436b2aeeefb3dc0e98d1940c5c8cb7f8c7a1f57eccb4214cdffd56792512405eb63f54abf3ed47041be51dbc7050d58615e7f724d57205f809487647c7c40d3 SHA512 c49ff7522d192e34b808b974818a1fe51521d83790f7e48aacfc74fce033fc74b6f0ba145197826663f56ccda9a4a3438b062838324df96433cf7bf58f31f5c7
 MISC metadata.xml 316 BLAKE2B 7c41f7092fe7ab9ca102e311c97b9f680b91cb29db60863f231f850f6bf47d38f5b15b3f6cd62e8f737b379f5bff9701529eebe078c7d95dcbfa7cb08b3a19d7 SHA512 48f0a31367966ccbb1564017c9329ee4d4990333904312f9b2b59f1b8b213974c3861d59ba49ed2f94f6eea1948556bdfcad0d3308c5ca70341316220ec44fc7
diff --git a/sec-policy/selinux-kismet/selinux-kismet-2.20180114-r2.ebuild b/sec-policy/selinux-kismet/selinux-kismet-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..9de91d19d567
--- /dev/null
+++ b/sec-policy/selinux-kismet/selinux-kismet-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 dd31cb4033bc..9de91d19d567 100644
--- a/sec-policy/selinux-kismet/selinux-kismet-9999.ebuild
+++ b/sec-policy/selinux-kismet/selinux-kismet-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-ksmtuned/Manifest b/sec-policy/selinux-ksmtuned/Manifest
index 78cd0e1f10e2..9ef07a22e940 100644
--- a/sec-policy/selinux-ksmtuned/Manifest
+++ b/sec-policy/selinux-ksmtuned/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-ksmtuned-2.20170805-r2.ebuild 286 BLAKE2B ce19ddddca7e376ab800d3c
 EBUILD selinux-ksmtuned-2.20170805-r3.ebuild 286 BLAKE2B ce19ddddca7e376ab800d3ca0de6669ae916e845c67048d65888e3e5294ff564b3cc58e0227946ae763d2b2095a45aaaad6a5d8eeba1f4e4ff0f835f291db8fb SHA512 15db5ee76ba57cf0f0597755751ca7ec935ca4c5426daf677af01a3db336848adc7c9d49db361394d51cb5b80d5cfac73b559de4c5318a52a13aeb764081e406
 EBUILD selinux-ksmtuned-2.20170805-r4.ebuild 288 BLAKE2B 5c2d643888eb63eff1de2d091fd431daeef19d5e699e00942af2274e2825b2e8bfd5ecad28c7c80e7001d7d20d54f15c92d261d73cfdf4cbddda796fa44b0377 SHA512 222f62f769ade1f9605fdc246dc541d9e5272b7892ad9da51fd963217d41489fc2a4b56e436f9f2792d14b08cf4b04f8db7cf7adaab55a6aab7f87cf74776cf3
 EBUILD selinux-ksmtuned-2.20180114-r1.ebuild 286 BLAKE2B d74481fdba74c67e32fc7776e5a2d56afb4622fc7a70844b2080b3940fbbd5489325ab821da7661bd3466bf65aa085b67aa02c40ff9de87af28647e2a2a34997 SHA512 c8d65198f2a05443deef3525532fc1bdc43be02dfe05a1dd260f8413439e1625edd8d5fbbdc5841d58595475beb71494ea79379933a80d62078c109687cd53fe
-EBUILD selinux-ksmtuned-9999.ebuild 288 BLAKE2B 5c2d643888eb63eff1de2d091fd431daeef19d5e699e00942af2274e2825b2e8bfd5ecad28c7c80e7001d7d20d54f15c92d261d73cfdf4cbddda796fa44b0377 SHA512 222f62f769ade1f9605fdc246dc541d9e5272b7892ad9da51fd963217d41489fc2a4b56e436f9f2792d14b08cf4b04f8db7cf7adaab55a6aab7f87cf74776cf3
+EBUILD selinux-ksmtuned-2.20180114-r2.ebuild 288 BLAKE2B 8b04cbbaafaeac90e208d0e5770a7262e339f70154028741ee4c0616b65c02fc42f52e99eac0915000b0d73bd4b5f93f5eeab3db6b7a511d01212648741ec60e SHA512 21d71bf60cdcfeb8d2589c2f4e753b560e4d645a0be90a6c0a4b185f827805f1a5c6505a03dade75ad1a33c27fc0cd328977f1ff8b94a828a667e4bc3ffe7497
+EBUILD selinux-ksmtuned-9999.ebuild 288 BLAKE2B 8b04cbbaafaeac90e208d0e5770a7262e339f70154028741ee4c0616b65c02fc42f52e99eac0915000b0d73bd4b5f93f5eeab3db6b7a511d01212648741ec60e SHA512 21d71bf60cdcfeb8d2589c2f4e753b560e4d645a0be90a6c0a4b185f827805f1a5c6505a03dade75ad1a33c27fc0cd328977f1ff8b94a828a667e4bc3ffe7497
 MISC metadata.xml 318 BLAKE2B 0e008ad609d3c3233bbb182c1fc0f9c68644dc549ea061c606b4091d351da404d79839b7fc6cee020fb1fe3ed5220415ded3b80e0df22baffffd5498af3a613e SHA512 2c5d3c14cd6464c30370575797fa54c5b897dfa28b05198324d5b79eb65d9b75a23282469ebc112137274a5ffcd5340e7a688cd9cf1b1f9195d87d6e4e12ae9c
diff --git a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20180114-r2.ebuild b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..acb143010d43
--- /dev/null
+++ b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 507d008d2d31..acb143010d43 100644
--- a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-9999.ebuild
+++ b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-kudzu/Manifest b/sec-policy/selinux-kudzu/Manifest
index 69c7512aa449..ba750990c646 100644
--- a/sec-policy/selinux-kudzu/Manifest
+++ b/sec-policy/selinux-kudzu/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-kudzu-2.20170805-r2.ebuild 280 BLAKE2B 91dc03d4af2e29b35e72db4ce9
 EBUILD selinux-kudzu-2.20170805-r3.ebuild 280 BLAKE2B 91dc03d4af2e29b35e72db4ce9d42bef61caee79c4c938c075bc40c22b534e151fac0d45e91224d69aa0c758688ed00a7c24d012b33daf9a124ae3ef2a8351b5 SHA512 759032334c68fb10f606457cd17e66f1639e830d0ed6f5def6ee5cb0deddf7e45310ac3e8d5ba00a04f30a7966ca2c1aced33845b09401b097fce37fd7720da9
 EBUILD selinux-kudzu-2.20170805-r4.ebuild 282 BLAKE2B 2d1281d945f4c9ec256c0c6898fc96f928421727fd16e025d80e426ad09e9d818ae31e21f238ede8388bc35706da0ffdffbc8f47ff2299779917adbeaa7266e3 SHA512 ee12fec88796a14721984a452b013c8e57812496317b1f66c86cfed89c66d500aa92a954b8d881a285d5e33c629020b3668eec63f0ec3fd83e7821afcd43cce0
 EBUILD selinux-kudzu-2.20180114-r1.ebuild 280 BLAKE2B 1c9fc8582ce2058bac91c4bb8bd965aee867c6f4a3bdff07f781b7f636e48718935dfaf9fc97a6cee6cd8596a016c8c6496a94c64f60b46a373c521c483ea540 SHA512 1af4c756ca0377df000594d7738eec35dfd87b3db7dfbb6da8ed5cc71493666a6a8e907d0891bca3188d0e72961c7fd827a6c204c0454258f76cced84f1c8f20
-EBUILD selinux-kudzu-9999.ebuild 282 BLAKE2B 2d1281d945f4c9ec256c0c6898fc96f928421727fd16e025d80e426ad09e9d818ae31e21f238ede8388bc35706da0ffdffbc8f47ff2299779917adbeaa7266e3 SHA512 ee12fec88796a14721984a452b013c8e57812496317b1f66c86cfed89c66d500aa92a954b8d881a285d5e33c629020b3668eec63f0ec3fd83e7821afcd43cce0
+EBUILD selinux-kudzu-2.20180114-r2.ebuild 282 BLAKE2B b5a64b6bc7c028b9a3d16baca5d3faddc3559c02346d0e919c30da28d03f38aff7c8b1d54e5538e037501d94f5b7a408f41bb780df15acc5880ba2ebc6350f2c SHA512 3de947edd2f8958c8e98a2e43257af3f4762aeb44406649343ba72da06ce0c01bc44799feec15a555d82a5dccc1ec6c04b169d6ad8acdd7174970e3a8b9f6955
+EBUILD selinux-kudzu-9999.ebuild 282 BLAKE2B b5a64b6bc7c028b9a3d16baca5d3faddc3559c02346d0e919c30da28d03f38aff7c8b1d54e5538e037501d94f5b7a408f41bb780df15acc5880ba2ebc6350f2c SHA512 3de947edd2f8958c8e98a2e43257af3f4762aeb44406649343ba72da06ce0c01bc44799feec15a555d82a5dccc1ec6c04b169d6ad8acdd7174970e3a8b9f6955
 MISC metadata.xml 315 BLAKE2B 5266f866f1e292ed61b8e9e3c6b1b18c16054f7bb54919adec9b4f38613b75e0bbe2fac08f1632403bdf00a55c370e91cef0a5e4b87b6d00485784e433fd6a21 SHA512 bd0badbc4aa7c515fd361c07c690377e11b17befbc0062be81ea8208ae445ca7f716f2613227e9b16426d12ef6714cf26803dad9d9b524811c8425bfcaa10cc5
diff --git a/sec-policy/selinux-kudzu/selinux-kudzu-2.20180114-r2.ebuild b/sec-policy/selinux-kudzu/selinux-kudzu-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..45827dff4600
--- /dev/null
+++ b/sec-policy/selinux-kudzu/selinux-kudzu-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 ac845a64b551..45827dff4600 100644
--- a/sec-policy/selinux-kudzu/selinux-kudzu-9999.ebuild
+++ b/sec-policy/selinux-kudzu/selinux-kudzu-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-ldap/Manifest b/sec-policy/selinux-ldap/Manifest
index d391777a3471..78c4d77d638e 100644
--- a/sec-policy/selinux-ldap/Manifest
+++ b/sec-policy/selinux-ldap/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-ldap-2.20170805-r2.ebuild 278 BLAKE2B b9421a15ec29b0007c9dfc8fdb5
 EBUILD selinux-ldap-2.20170805-r3.ebuild 278 BLAKE2B b9421a15ec29b0007c9dfc8fdb55599174f9c4fb7fcc1d239615eb9e65aad8c36b63cd1546e9eb07b372f581fd6de3b76901a785e8995b89274eaef878c6aeb8 SHA512 f375443af23c2b3b81b442c86bc3db6514ed392081f8986f02eaa3ae6f848c759b27a50a2240a9664ba165cc83eff25fa044f6237d7ffad6415e88486289bd14
 EBUILD selinux-ldap-2.20170805-r4.ebuild 280 BLAKE2B 0b8a1b8ef24ff19f861c856ece0d14e928400c195f50a27f05ab7dbbff280db08bd7bae47b4b9c374023e860062e34aa65dc29e970407833e468f1173794d1d9 SHA512 2f01ba21c0820092847f2b3f8422f0dd9e5882b6ba7d2bcf35b53e8ad600948a897cca20db2fb24b6b98f8fd9116988adcf37ee015cf0583dc9ba9f58b666875
 EBUILD selinux-ldap-2.20180114-r1.ebuild 278 BLAKE2B 59ab9bb8a94d9eb852c9318d71c09d87882217cdd77f12b52f8ea386b6df317c2e15e7d8e94ecf79341b1d4d727c8b759336087dafe48e9b176b0d2bde9e4b8b SHA512 d3f54fc3d7be1632aed0e22ed51d49b3e4e8b9d6384067f051e4bf4aed73597bfbad529fe0e7d8537e7712c7ca329e09c01a1f86f609d8d0e568ad6bcb49ea43
-EBUILD selinux-ldap-9999.ebuild 280 BLAKE2B 0b8a1b8ef24ff19f861c856ece0d14e928400c195f50a27f05ab7dbbff280db08bd7bae47b4b9c374023e860062e34aa65dc29e970407833e468f1173794d1d9 SHA512 2f01ba21c0820092847f2b3f8422f0dd9e5882b6ba7d2bcf35b53e8ad600948a897cca20db2fb24b6b98f8fd9116988adcf37ee015cf0583dc9ba9f58b666875
+EBUILD selinux-ldap-2.20180114-r2.ebuild 280 BLAKE2B 01f4feda196b3029b0c35a84b760f5587377b769e8632bd358775d7d3fc4272656625eacdab9947107f5b0cc32f3a55151dd43d95ce7fcc3369a056d71280d01 SHA512 e232af34d48b67d68428bf80c4f6077f89e651550858d0363d404ab660ed730caeffa09640bfd8a37716bea718994bdf00e520a4203e9d03aab1ffb863115298
+EBUILD selinux-ldap-9999.ebuild 280 BLAKE2B 01f4feda196b3029b0c35a84b760f5587377b769e8632bd358775d7d3fc4272656625eacdab9947107f5b0cc32f3a55151dd43d95ce7fcc3369a056d71280d01 SHA512 e232af34d48b67d68428bf80c4f6077f89e651550858d0363d404ab660ed730caeffa09640bfd8a37716bea718994bdf00e520a4203e9d03aab1ffb863115298
 MISC metadata.xml 318 BLAKE2B fb1d3d5b87f8aac5d5d49e186c63bb171983f260a97a621b88c4047f1ea79a463ca3b88a047a5d1e9932a03fb6fa569429ba86cb830e782f8d383a9e80344f37 SHA512 636c91232655cac886c240aa32b8280ea47601e5c55eeb7d7a202caad891e0d149e895406b414302d733868182896f9a7ff68a09a2a406689de7b8ad018771d0
diff --git a/sec-policy/selinux-ldap/selinux-ldap-2.20180114-r2.ebuild b/sec-policy/selinux-ldap/selinux-ldap-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..df0d6e69d5b3
--- /dev/null
+++ b/sec-policy/selinux-ldap/selinux-ldap-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 c6e413af1000..df0d6e69d5b3 100644
--- a/sec-policy/selinux-ldap/selinux-ldap-9999.ebuild
+++ b/sec-policy/selinux-ldap/selinux-ldap-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-links/Manifest b/sec-policy/selinux-links/Manifest
index fe635ddbba22..47a7b947a847 100644
--- a/sec-policy/selinux-links/Manifest
+++ b/sec-policy/selinux-links/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-links-2.20170805-r2.ebuild 280 BLAKE2B 9b0d2ccb9bd0f19a519167fd78
 EBUILD selinux-links-2.20170805-r3.ebuild 280 BLAKE2B 9b0d2ccb9bd0f19a519167fd78a08954bd34151309e51740c035d293114db2688a6f937381b622d3367ea544b3ba73f18e3c15ffd6231bdf6861d83d259588e5 SHA512 81d7c9ea511c1e1c6aa964ed94966b35d1ab0d7b193697333a5898070941355ac562859443410488d53d0706e66400e886338dd5340e09b05d3daed1c0ce0f45
 EBUILD selinux-links-2.20170805-r4.ebuild 282 BLAKE2B 3f5dbdda8f5416e191ea3b817f0ae53bc6abe1a4853e655a4e081ea3e46a72e4c87119845af52a916bffa549db8283276dfe055d38639bc7c5167a3ea72d2b5f SHA512 90f19f11e3c20c270fe050e1516d8cb153ce77a8f284e926cd82342e05d3b06623fac2c2bf96df63b10f9be6ace3fb0a4fe4348b4e8ac17eb1848a3d384f79d9
 EBUILD selinux-links-2.20180114-r1.ebuild 280 BLAKE2B 1694b38695ac8f4f103b99e3f011a5ba9c77a5db354648929cae1d30a9b052e63055588f6e3963bed658a4e805f20c9d0020611c804effcf9f2c5790bdb42c48 SHA512 6aff064d0f303f4dc7d4754f084ccacb80e5d853499f76a0765566b047bc9f5f4eb34a3e2f4316dbdc8bc302d94abe0bac83958519d56df762bf1f4283c65c40
-EBUILD selinux-links-9999.ebuild 282 BLAKE2B 3f5dbdda8f5416e191ea3b817f0ae53bc6abe1a4853e655a4e081ea3e46a72e4c87119845af52a916bffa549db8283276dfe055d38639bc7c5167a3ea72d2b5f SHA512 90f19f11e3c20c270fe050e1516d8cb153ce77a8f284e926cd82342e05d3b06623fac2c2bf96df63b10f9be6ace3fb0a4fe4348b4e8ac17eb1848a3d384f79d9
+EBUILD selinux-links-2.20180114-r2.ebuild 282 BLAKE2B b186fbe9a6393f7f132b5d5318be26d81e8a8b666cecef8bb58bb6f76ccd1dba0f6c2b4817c52907fe593c2f9b3e83de49716f1c28a236b2e0056c6b33ecaf43 SHA512 4d694d9987975eaa2d0d25251318f641e772e259d73835a7e54c2d5928104850c0e33033da3d786472ff01cff0d527ba935f6e21afc0f0a0fb8f160153eac257
+EBUILD selinux-links-9999.ebuild 282 BLAKE2B b186fbe9a6393f7f132b5d5318be26d81e8a8b666cecef8bb58bb6f76ccd1dba0f6c2b4817c52907fe593c2f9b3e83de49716f1c28a236b2e0056c6b33ecaf43 SHA512 4d694d9987975eaa2d0d25251318f641e772e259d73835a7e54c2d5928104850c0e33033da3d786472ff01cff0d527ba935f6e21afc0f0a0fb8f160153eac257
 MISC metadata.xml 315 BLAKE2B b5fcf7545c331d474867d047a6293eb1b4316723c51728ee5e392a817a0c2f52313d062ed0b53973875b1fe84b4991cf2f4ef9f49a8980ba36c196a1938384bf SHA512 7424e06fb28587f673f2e510b5b15f3d88bcfe6502870fb295219069950c4496254f40d8124f4e49029ea3a52c7864ec3c8623de21c6e845940f22cdf5f71e8a
diff --git a/sec-policy/selinux-links/selinux-links-2.20180114-r2.ebuild b/sec-policy/selinux-links/selinux-links-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..12a9b9d2e1a6
--- /dev/null
+++ b/sec-policy/selinux-links/selinux-links-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 0bcedfffe5dd..12a9b9d2e1a6 100644
--- a/sec-policy/selinux-links/selinux-links-9999.ebuild
+++ b/sec-policy/selinux-links/selinux-links-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-lircd/Manifest b/sec-policy/selinux-lircd/Manifest
index bd5210058c9d..ae4f5cecf997 100644
--- a/sec-policy/selinux-lircd/Manifest
+++ b/sec-policy/selinux-lircd/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-lircd-2.20170805-r2.ebuild 280 BLAKE2B 36c1444aeaee08c8d8c4ea8c48
 EBUILD selinux-lircd-2.20170805-r3.ebuild 280 BLAKE2B 36c1444aeaee08c8d8c4ea8c48417206b3cc6c3ee0084e0838095d0f64a741b87d0ceaee71bd47a7f920a27f9d4573635d3a093b6925af280739a0ea3561fb8b SHA512 7d4ac7c6ff7a7d720a4e6c56785e729858a1260232d80198a3a13765f533808ec5e9287247b792b5417d19daca98294b03da2f1541c3591682ee0d40fb5c9dfd
 EBUILD selinux-lircd-2.20170805-r4.ebuild 282 BLAKE2B 7a3750f16a518f360feddbb66c45419e1c9ce1b1a1afe6eebad24010168558b1400a35a81461d1f3b416f59e0ca16442de85b5706031024953e44b432c7e482c SHA512 6f6c5fdd7aee5686c7e80b2b2da554f918240714924be114363a75da0ccb5e59cb762af10196ae0861ba79c1f5ef11e9833d7d0eee74be164b69ba3e3b581dde
 EBUILD selinux-lircd-2.20180114-r1.ebuild 280 BLAKE2B 0ec17efa4d31eafec47df1a76e0921737bc066834faf2091d9807cc88c44b7f38505f08fa12f1977b280270ca1fd726a38cee90b8a9c3b52c29bcce5d7fc650c SHA512 ed93f261b092600e6e78bd684fc5d67d7494528e282119b17f111b1c4f20b28b76e728ca647573f6b753b4ac961dc4c4800c9d5a24bc87735c40509fd5e19d10
-EBUILD selinux-lircd-9999.ebuild 282 BLAKE2B 7a3750f16a518f360feddbb66c45419e1c9ce1b1a1afe6eebad24010168558b1400a35a81461d1f3b416f59e0ca16442de85b5706031024953e44b432c7e482c SHA512 6f6c5fdd7aee5686c7e80b2b2da554f918240714924be114363a75da0ccb5e59cb762af10196ae0861ba79c1f5ef11e9833d7d0eee74be164b69ba3e3b581dde
+EBUILD selinux-lircd-2.20180114-r2.ebuild 282 BLAKE2B 5799854e7055f7c7b2a99a48da449846a9f4dcc41feff7680ca73ef94506ba2049faaf7607117acb5cce27304dad3013b121c0589d621f8fe8ffea6c09475503 SHA512 20a0b3a22c3e3e7f80c28cde0d65690122281058f6abe4d87b35b03aa9da8ed5ee63c6b728f93f17549214867a29d0f86b877c4029d7c935c6cde1d280e10c84
+EBUILD selinux-lircd-9999.ebuild 282 BLAKE2B 5799854e7055f7c7b2a99a48da449846a9f4dcc41feff7680ca73ef94506ba2049faaf7607117acb5cce27304dad3013b121c0589d621f8fe8ffea6c09475503 SHA512 20a0b3a22c3e3e7f80c28cde0d65690122281058f6abe4d87b35b03aa9da8ed5ee63c6b728f93f17549214867a29d0f86b877c4029d7c935c6cde1d280e10c84
 MISC metadata.xml 315 BLAKE2B c7de893548597a8afca883e27ef053856c01df653834bb48b428c970e90e6d0f62454ca7b06763228164046ff198c7520827d9b8c77fbe5015318307c082a790 SHA512 9d04fdc81f5f216b29dd4b7c1a1a88f0b112bb1eb713b75b67b33db0ebfbc82c71572515347febcb2c71bf843e8422100c5f1da33b836b4612900231459719e7
diff --git a/sec-policy/selinux-lircd/selinux-lircd-2.20180114-r2.ebuild b/sec-policy/selinux-lircd/selinux-lircd-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..b4d38f9204f1
--- /dev/null
+++ b/sec-policy/selinux-lircd/selinux-lircd-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 523955cf2879..b4d38f9204f1 100644
--- a/sec-policy/selinux-lircd/selinux-lircd-9999.ebuild
+++ b/sec-policy/selinux-lircd/selinux-lircd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-loadkeys/Manifest b/sec-policy/selinux-loadkeys/Manifest
index 16487c4499c9..99afb6f4a85f 100644
--- a/sec-policy/selinux-loadkeys/Manifest
+++ b/sec-policy/selinux-loadkeys/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-loadkeys-2.20170805-r2.ebuild 286 BLAKE2B 20d0b63a187349caa24d685
 EBUILD selinux-loadkeys-2.20170805-r3.ebuild 286 BLAKE2B 20d0b63a187349caa24d6858aef1a15fa9a391f90ab0c8edae41bcaaf4f273ebcd533a83dd4e51f4ac5de1be31b50f477780c12cd77a74d966e29cb66d46aa61 SHA512 d23e7f69005505b870ccfa59fe8b14fd095aa14c264cd3b81008dea9cdccdabde90fd51ecb7217f3433f9c05eef8b6eb51023ea86c3e8722fbc3305bc19aa2e2
 EBUILD selinux-loadkeys-2.20170805-r4.ebuild 288 BLAKE2B 5a89defc5f924c5fc58bdbadb5ac88f74383c100f4a3b876706e096baf3b45d26cb4449f22a9e426d5499fc0387596f9e1dae7b08b363c18771981d7f93d4706 SHA512 cc217920009519a39dc64ef71640f6ffbf8d61c58182c5d81ae668a7575abc6060b2902a6c3c050d51d936eedf4eddbfb7567a0b3ddb9013b99acdfb73705093
 EBUILD selinux-loadkeys-2.20180114-r1.ebuild 286 BLAKE2B f36b5a0536d3100922525b6e24c92fd7d0c311798ac27011b8ba55f477510ffa669dc737ab79a664a4db433fa7404fd8f07f362de4c7eb430c5da116b7ffb079 SHA512 20e1534d13ef86595a6ffc0d8889c78d06576a553472ccb89040f3203317a2647fcd88539defb9c770f472fcabb37676df602e5fe82b1340c3dc7f07ae102cad
-EBUILD selinux-loadkeys-9999.ebuild 288 BLAKE2B 5a89defc5f924c5fc58bdbadb5ac88f74383c100f4a3b876706e096baf3b45d26cb4449f22a9e426d5499fc0387596f9e1dae7b08b363c18771981d7f93d4706 SHA512 cc217920009519a39dc64ef71640f6ffbf8d61c58182c5d81ae668a7575abc6060b2902a6c3c050d51d936eedf4eddbfb7567a0b3ddb9013b99acdfb73705093
+EBUILD selinux-loadkeys-2.20180114-r2.ebuild 288 BLAKE2B 7eeab48b2f1c030540e20a6ca88584bd5382bb7b80a2dac76c8ca9d9a66feb645a544eb565b73a5be4fb9d9a02ef43d52ff03aaad257826650b2761d01d8d857 SHA512 be8ae78be2d5a542ae4d94c49c4697eda87bfafa1c242845a5835b6dd17a184dd482d3ba80314ba7776db5193696ee316927340f370cc11da99d5968f7d7209d
+EBUILD selinux-loadkeys-9999.ebuild 288 BLAKE2B 7eeab48b2f1c030540e20a6ca88584bd5382bb7b80a2dac76c8ca9d9a66feb645a544eb565b73a5be4fb9d9a02ef43d52ff03aaad257826650b2761d01d8d857 SHA512 be8ae78be2d5a542ae4d94c49c4697eda87bfafa1c242845a5835b6dd17a184dd482d3ba80314ba7776db5193696ee316927340f370cc11da99d5968f7d7209d
 MISC metadata.xml 318 BLAKE2B 18f6edce47c51b76593e30d7aa65c9fb96b9437f4bfb3c42a63209f0ead735ce8e3376d16c600b21ced48514eb7b98e1c0d676f60971502078901d80cb6bd08f SHA512 439186e025dfd23a3d5d0906647428b694742a73493a57ec1d4b63e4c4f81e8cf0329336afb890f3089051a791296765ad9916af15bbea20215bb6698ea22f4d
diff --git a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20180114-r2.ebuild b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..f47cbc382bd5
--- /dev/null
+++ b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 ca13bafa86e9..f47cbc382bd5 100644
--- a/sec-policy/selinux-loadkeys/selinux-loadkeys-9999.ebuild
+++ b/sec-policy/selinux-loadkeys/selinux-loadkeys-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-lockdev/Manifest b/sec-policy/selinux-lockdev/Manifest
index 2dce0193c8fc..e27413e6f871 100644
--- a/sec-policy/selinux-lockdev/Manifest
+++ b/sec-policy/selinux-lockdev/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-lockdev-2.20170805-r2.ebuild 284 BLAKE2B ebc968ee0b52cdbd5055ec35
 EBUILD selinux-lockdev-2.20170805-r3.ebuild 284 BLAKE2B ebc968ee0b52cdbd5055ec35b9a571e6f035374e7d560fb4ddcc67102ca2e1035cd4b74d4fc82dfb0f57f9ae76daca74ce94eff86e3d36106dc1721538877f18 SHA512 04c7b439600500d944ea233253f556df59e30e981ebf537accc22c17de6ca03ec1792ac047e7edbf76586dcb3ef132e85fd715e2d5d9062ded8d5277ad4b84b6
 EBUILD selinux-lockdev-2.20170805-r4.ebuild 286 BLAKE2B 767f17951b755e811e66caf0185171293a43ccd28bfbe3888a3bf99499042c44aee33db9986030067e2b261ec76440c0e743ef73f8ab939f8af39622754bcaaf SHA512 d36d65c67eeac4b10dbf747f225e2d31b2485d4acdea54f551b30cc1d209586c684c80cc65241bee9a64a22c6a1beef6bc3f01f6e150c6581581cd3f120b6d4d
 EBUILD selinux-lockdev-2.20180114-r1.ebuild 284 BLAKE2B 6509d66dd88f5b00dc2b5ed3a04fb08e1da9d6e6d4df604545f8cd3ea17c676c9f7ef1a4411cab73fe09761d50a88f4e60a7ea2477f4656f26032fc56b607399 SHA512 8fa66f28df93482e6259a6d05b2865c24b27beebbab37bbd25b33ff9b54eb7586871ecefb297e1072aab0ad5ee0385499e2ff9e077be3901b623375956e9d8a9
-EBUILD selinux-lockdev-9999.ebuild 286 BLAKE2B 767f17951b755e811e66caf0185171293a43ccd28bfbe3888a3bf99499042c44aee33db9986030067e2b261ec76440c0e743ef73f8ab939f8af39622754bcaaf SHA512 d36d65c67eeac4b10dbf747f225e2d31b2485d4acdea54f551b30cc1d209586c684c80cc65241bee9a64a22c6a1beef6bc3f01f6e150c6581581cd3f120b6d4d
+EBUILD selinux-lockdev-2.20180114-r2.ebuild 286 BLAKE2B 45a899b2bba2a143403f2164b22fc2124ed64d9b5825bd98b4097ad1de252ac9febb7fed2841c74f5ec9c9b876f81b45be3238f41241584917728b47e6b9be91 SHA512 4cea30fcb506f50c644d4e6c646da7878750588367b4d1c8c942d60c9598b3669b255ea7497aa6778e018f035aaabd1a4c81d831d083b0c461ba4f93e86f4174
+EBUILD selinux-lockdev-9999.ebuild 286 BLAKE2B 45a899b2bba2a143403f2164b22fc2124ed64d9b5825bd98b4097ad1de252ac9febb7fed2841c74f5ec9c9b876f81b45be3238f41241584917728b47e6b9be91 SHA512 4cea30fcb506f50c644d4e6c646da7878750588367b4d1c8c942d60c9598b3669b255ea7497aa6778e018f035aaabd1a4c81d831d083b0c461ba4f93e86f4174
 MISC metadata.xml 317 BLAKE2B 08130a25336c5ec4393ead62f4e28f20101014d346088fcdfb454a12c510e5c86140990efc8761c92833558f9bed3ee4b13a8be2345ffb6fe65fc0387dab481a SHA512 03fda7bf63650835f954517ae6277944215299e0d44567b59c7235a5790ff74391e021b86954e77f9af6fe3edf9552bf553b75e34b772c93d75f1f3a52d26d2d
diff --git a/sec-policy/selinux-lockdev/selinux-lockdev-2.20180114-r2.ebuild b/sec-policy/selinux-lockdev/selinux-lockdev-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..09c1bb019c76
--- /dev/null
+++ b/sec-policy/selinux-lockdev/selinux-lockdev-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 1d3c797a71da..09c1bb019c76 100644
--- a/sec-policy/selinux-lockdev/selinux-lockdev-9999.ebuild
+++ b/sec-policy/selinux-lockdev/selinux-lockdev-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-logrotate/Manifest b/sec-policy/selinux-logrotate/Manifest
index cd1df5e7e582..eb125d7f7e5b 100644
--- a/sec-policy/selinux-logrotate/Manifest
+++ b/sec-policy/selinux-logrotate/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-logrotate-2.20170805-r2.ebuild 288 BLAKE2B 7ed28c3dd88b73fec79ed3
 EBUILD selinux-logrotate-2.20170805-r3.ebuild 288 BLAKE2B 7ed28c3dd88b73fec79ed37340208303c9d2207f9eb8b5fbfc14d6a59e71af4d9f8ed1be56ffbdd9a1b8a38dac6cdbee90f491866435ebc258f7c16e0bb98bbe SHA512 b7370a186feb501334aa392fb3b110cc1a7e3b17974bc3e554a6dbc011c0f576dc68840c832ec8af55e78e2d18dec3d0011205ffef9373750f1baf7555c5712f
 EBUILD selinux-logrotate-2.20170805-r4.ebuild 290 BLAKE2B 69e7643c1d24e2927a859be089092c57a8bbf09147d3e70b2932bfad3c68ded8923a33b7a63eef1747455f9d8eeda5fb095f65649254dab17e6468ee5d2a705f SHA512 5624e9618cc8180315f82f1da8ce566ed5df9143dda38da29c7bfbc4b28ada600aff96e5a624281ad9cddd7c18f4b194340c8e7b5988eb426a74c61647ce24b3
 EBUILD selinux-logrotate-2.20180114-r1.ebuild 288 BLAKE2B c2c022b7e3a0c0a00f5f1a0a9ebf337bb06532f949415e840afa4689b01f0c368a704a3512efcd216a7dfaf8b93f1beab9e9c2d9073ac1688b7f102b0d947199 SHA512 c54c6e2335362651a807de5d7616170f584b80372d9336780c8016d656df5918096542eb362887379845ba5005d579493fbd7dc755a2e2c03eb70b77db7813e7
-EBUILD selinux-logrotate-9999.ebuild 290 BLAKE2B 69e7643c1d24e2927a859be089092c57a8bbf09147d3e70b2932bfad3c68ded8923a33b7a63eef1747455f9d8eeda5fb095f65649254dab17e6468ee5d2a705f SHA512 5624e9618cc8180315f82f1da8ce566ed5df9143dda38da29c7bfbc4b28ada600aff96e5a624281ad9cddd7c18f4b194340c8e7b5988eb426a74c61647ce24b3
+EBUILD selinux-logrotate-2.20180114-r2.ebuild 290 BLAKE2B abdb8e1883eb7715bfe0dff8df18fb8cf8baa98562bea08192344ff9387e551d69cff904683146afcb98a5afda075262cf50933235cb5a69cb891c83d0bf18df SHA512 2e8ce5f999210e39bcd93e38ad8c15f41979119eb6ed0d3055e5c43d153298d67c39bb655400faaa2ae08cef5dcca3e3bc092fdee57889075c8e19c9b9f0110a
+EBUILD selinux-logrotate-9999.ebuild 290 BLAKE2B abdb8e1883eb7715bfe0dff8df18fb8cf8baa98562bea08192344ff9387e551d69cff904683146afcb98a5afda075262cf50933235cb5a69cb891c83d0bf18df SHA512 2e8ce5f999210e39bcd93e38ad8c15f41979119eb6ed0d3055e5c43d153298d67c39bb655400faaa2ae08cef5dcca3e3bc092fdee57889075c8e19c9b9f0110a
 MISC metadata.xml 319 BLAKE2B b23741f933d94eb0e498321a6c389a74c95a0aa5c7a2e3ebd05f5835e1b9f77b3946f0cae556d310ed5f1c86d66158b498f57bd4cda3aad105de606fd4d923b5 SHA512 cb02bc8a888c83776ca20c832c91c72ad8c72fae6e498d75442c516e71fd3a8c1620b885974e8d3a34815cb624bef74f357d90593d4d4dfc0a35113401e28048
diff --git a/sec-policy/selinux-logrotate/selinux-logrotate-2.20180114-r2.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..844b28f1c301
--- /dev/null
+++ b/sec-policy/selinux-logrotate/selinux-logrotate-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 b2095c2205e4..844b28f1c301 100644
--- a/sec-policy/selinux-logrotate/selinux-logrotate-9999.ebuild
+++ b/sec-policy/selinux-logrotate/selinux-logrotate-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-logsentry/Manifest b/sec-policy/selinux-logsentry/Manifest
index 0174a2b1adc7..22fade98a3a2 100644
--- a/sec-policy/selinux-logsentry/Manifest
+++ b/sec-policy/selinux-logsentry/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-logsentry-2.20170805-r2.ebuild 288 BLAKE2B 953c7a23f5cbcdb6a7fed4
 EBUILD selinux-logsentry-2.20170805-r3.ebuild 288 BLAKE2B 953c7a23f5cbcdb6a7fed43d4e82b1b8e8ef7ed31486f34e4a445f6a407c75404e615e2e7c836b23e703c1f06a3e4f99e9f363fb80da7c5f83f9dc6cf014080f SHA512 45247ecf5a43ab6da751c029cf0b6a740cc3a1c726edb4fca69f3e2db2f5b5556fd5c7e43a82915249336f991ba2fe7e4802985c1e17b151fab11a1359b004f2
 EBUILD selinux-logsentry-2.20170805-r4.ebuild 290 BLAKE2B b88aa1a8b5a487c7d6f9e56bc1af48476a12a1d60cd99250cded5164d173866a5310e4d8d28f7aecd0c9da2e3eb0949cc698a35d0fe0667c7f4de8faa4fad230 SHA512 d20869d54d19706f6b38bcb7a0161310f84869b5c73a0d379ee731e0bbf68babd74702038259e825ec27332e511f066b1bf3c52bcf738b7d5629becf040589a6
 EBUILD selinux-logsentry-2.20180114-r1.ebuild 288 BLAKE2B 580845bed16396e6757c4e05a57830314391b30eb92129c67c9989c627371e3d752bd538f10215927007d2b0fff0b24596501fc116f2c1ee236470428c1c58b8 SHA512 d5d176c92462d00e5ea994687aa10b1c06f879b8548b8acb4ae4be8d0276f15f0c332f35001866f31ec9cdefa337aff989245b11f376071d0ec1b487240a48be
-EBUILD selinux-logsentry-9999.ebuild 290 BLAKE2B b88aa1a8b5a487c7d6f9e56bc1af48476a12a1d60cd99250cded5164d173866a5310e4d8d28f7aecd0c9da2e3eb0949cc698a35d0fe0667c7f4de8faa4fad230 SHA512 d20869d54d19706f6b38bcb7a0161310f84869b5c73a0d379ee731e0bbf68babd74702038259e825ec27332e511f066b1bf3c52bcf738b7d5629becf040589a6
+EBUILD selinux-logsentry-2.20180114-r2.ebuild 290 BLAKE2B 5e090f1ba430227e48658f6c4b0d4122fefe07202cf45acf8f3fb354318dbf7c542a38e1aaf7e87f70e09d5e8691cb1c9759e0a252650a6ac7c8ac32c63d5a84 SHA512 4934c2735777dddc82c9c16d8f1251d908249868179a39bb32dfe9273e3861b9e74036204a3c0c6b97ab1ed4fd552b9baaa8974e979030372792b169484cb44d
+EBUILD selinux-logsentry-9999.ebuild 290 BLAKE2B 5e090f1ba430227e48658f6c4b0d4122fefe07202cf45acf8f3fb354318dbf7c542a38e1aaf7e87f70e09d5e8691cb1c9759e0a252650a6ac7c8ac32c63d5a84 SHA512 4934c2735777dddc82c9c16d8f1251d908249868179a39bb32dfe9273e3861b9e74036204a3c0c6b97ab1ed4fd552b9baaa8974e979030372792b169484cb44d
 MISC metadata.xml 319 BLAKE2B 56ac266d2b53e0d67f40dbf9dc8cc67131ef2df1850f1101a531ff8e5bf8099212cb024811b87c2ac726f9118350739f9cf139804c7e30d4e80923796362b87f SHA512 8f566c30ab3450fd5f24a28bff2f948e13efb047005069b4954266a6442182332f74294edf4964064ed41ce973d58b63f6c0216c57380b47853321a2b797e1a2
diff --git a/sec-policy/selinux-logsentry/selinux-logsentry-2.20180114-r2.ebuild b/sec-policy/selinux-logsentry/selinux-logsentry-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..b4593b5031c6
--- /dev/null
+++ b/sec-policy/selinux-logsentry/selinux-logsentry-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 b60407d2ed6a..b4593b5031c6 100644
--- a/sec-policy/selinux-logsentry/selinux-logsentry-9999.ebuild
+++ b/sec-policy/selinux-logsentry/selinux-logsentry-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-logwatch/Manifest b/sec-policy/selinux-logwatch/Manifest
index 54fa64b49245..5e446833e36a 100644
--- a/sec-policy/selinux-logwatch/Manifest
+++ b/sec-policy/selinux-logwatch/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-logwatch-2.20170805-r2.ebuild 286 BLAKE2B 0c4c173643039a56520b438
 EBUILD selinux-logwatch-2.20170805-r3.ebuild 286 BLAKE2B 0c4c173643039a56520b438272922f3a4df338be5b663363dd1e9469c46ae302fc7c0a13c6e18ea50b01bd7aff33bfedf4915bacacc52e871635993a71c17f0d SHA512 1916eec316392c31f04e74a6da4f038e92cb8889f6fee062a1088da0a32eca41baa041ee608b05d4810e4645fb200610ca6266c8743e8f7061733fc0275352f8
 EBUILD selinux-logwatch-2.20170805-r4.ebuild 288 BLAKE2B 73278d5acae5f442eebb6c80d48025c696711c2773c5598c9f907bdddb77497616359085ea4d8ee240041e6cba3ca17564db83593862e3fb8e03b3e41df3b925 SHA512 c913d9d3075fc324ff027ff6b52edbbcb79cbbded39e42afc96a0ba5bea7d2cc3dfa8dee6a7c1ef2897c227b1b685c3cd39b33a09efe0dc12082658f1b3ef47e
 EBUILD selinux-logwatch-2.20180114-r1.ebuild 286 BLAKE2B 1affb24e23c79d10433d7a3b475b9482d0fb99d8c31ba4ce8f7223e46bfe32b121977767837db1539e3013d941b06951a9d42442baea29e7c397a19ff858b35d SHA512 3d011e2a73dd7af367bd274fe54ff2ef0704789d9cb8cb393afc3b20d7564b36d390354c7cc38e14a37bdb8cff07c6c7b55476adfa5ace64c7bebe9d6879c657
-EBUILD selinux-logwatch-9999.ebuild 288 BLAKE2B 73278d5acae5f442eebb6c80d48025c696711c2773c5598c9f907bdddb77497616359085ea4d8ee240041e6cba3ca17564db83593862e3fb8e03b3e41df3b925 SHA512 c913d9d3075fc324ff027ff6b52edbbcb79cbbded39e42afc96a0ba5bea7d2cc3dfa8dee6a7c1ef2897c227b1b685c3cd39b33a09efe0dc12082658f1b3ef47e
+EBUILD selinux-logwatch-2.20180114-r2.ebuild 288 BLAKE2B 248713398dc92913c32cf45e80526bfed603494a233bb4c2561ea776ef84b43215a8a1fdc6305a888a922a87c3d8c42140c6cda0b1a121b2c70f4928db9dc379 SHA512 e1abc47a1dfe5b6342894f8c5a45cb718c687aa57414086069561ce86695061c72a8ee2f717ddbd895311f0a41398971be4fca5fef269774c27385374cabed3a
+EBUILD selinux-logwatch-9999.ebuild 288 BLAKE2B 248713398dc92913c32cf45e80526bfed603494a233bb4c2561ea776ef84b43215a8a1fdc6305a888a922a87c3d8c42140c6cda0b1a121b2c70f4928db9dc379 SHA512 e1abc47a1dfe5b6342894f8c5a45cb718c687aa57414086069561ce86695061c72a8ee2f717ddbd895311f0a41398971be4fca5fef269774c27385374cabed3a
 MISC metadata.xml 318 BLAKE2B 376d0452a036c9a51c1aa405e531f58d00e19802c57a8ff64c5548a96b583220dfaab02b7d89bb9d686109cf0bbebfbe7a0a3c906dedfd4e8c3a8fec170ec511 SHA512 4a7407a0137f66d16b507fc695b45b9e21f4ebfab64d4cb0a755a5c961e1cb2deb84807209b2039f1de6867319091236b4eaa37647c8107db2f9e04caf6383bd
diff --git a/sec-policy/selinux-logwatch/selinux-logwatch-2.20180114-r2.ebuild b/sec-policy/selinux-logwatch/selinux-logwatch-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..5e3afa99aab0
--- /dev/null
+++ b/sec-policy/selinux-logwatch/selinux-logwatch-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 402975aec14a..5e3afa99aab0 100644
--- a/sec-policy/selinux-logwatch/selinux-logwatch-9999.ebuild
+++ b/sec-policy/selinux-logwatch/selinux-logwatch-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-lpd/Manifest b/sec-policy/selinux-lpd/Manifest
index 724852300523..8f6b62256080 100644
--- a/sec-policy/selinux-lpd/Manifest
+++ b/sec-policy/selinux-lpd/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-lpd-2.20170805-r2.ebuild 276 BLAKE2B aed3a278e7fb92b7832668193d5d
 EBUILD selinux-lpd-2.20170805-r3.ebuild 276 BLAKE2B aed3a278e7fb92b7832668193d5d13a104f5dc684769901217c2ec01b44c204727a813de2055099c9830310ac2db4f34a42e640b7bba9ed03bbbd30c1c695d1b SHA512 1eac05feab99593f87574a0b904b05c6aca4df9edf00bb1743e14288f6abf0c91423f330e070198180d5239190868d7f8e72474ff218e222c8ca84f2da801784
 EBUILD selinux-lpd-2.20170805-r4.ebuild 278 BLAKE2B 43d7a74b1cf253cbd8110a37e47bbb2a61ca1ced11e8e37fa948098e152a49441ba292372869790bea19b6842cbe2c3f1cb3b1d40476e7e3a8daf03d996b23a1 SHA512 21fa11fc80bd790560e4c8c52c60e7a54439b20cbe95cc62829d3d94363fdfb79c0251a20f7fe2807bce699bb37936403d607cf48a91b6cd774dca10abf2708b
 EBUILD selinux-lpd-2.20180114-r1.ebuild 276 BLAKE2B 6bb1cee38b563650deac14c6cebeb1ebffdaba5e1cff151d6a4679ac5d13ad46dd83e156952ade05600b599bea9375dd0c169cb1916c1a361ffe447ed6ae963e SHA512 9d423e65370573d452177b332f33a0e92df99116e1bcf230bb41ab0fb2549e7ca06b300ffd5e018b89cd31bfd888eacdc67468117f6b3bca99ad55ee58653c04
-EBUILD selinux-lpd-9999.ebuild 278 BLAKE2B 43d7a74b1cf253cbd8110a37e47bbb2a61ca1ced11e8e37fa948098e152a49441ba292372869790bea19b6842cbe2c3f1cb3b1d40476e7e3a8daf03d996b23a1 SHA512 21fa11fc80bd790560e4c8c52c60e7a54439b20cbe95cc62829d3d94363fdfb79c0251a20f7fe2807bce699bb37936403d607cf48a91b6cd774dca10abf2708b
+EBUILD selinux-lpd-2.20180114-r2.ebuild 278 BLAKE2B d1773e89aa8b7dd1995a41c57f7680ff8245d6c24b1924743845bfd0963d6c2fed49382375154270dc11af9420d26ff06a1b007f1e3ffef0b537ec11d5f33841 SHA512 23e918b22f639343ad5a913ec54c89628bc8de5cdb2f0ab861315df7b3c0944289e185c5f308a207f9c21d62689a02a230f3a194d28eaa07d6d9c9eb71145ad2
+EBUILD selinux-lpd-9999.ebuild 278 BLAKE2B d1773e89aa8b7dd1995a41c57f7680ff8245d6c24b1924743845bfd0963d6c2fed49382375154270dc11af9420d26ff06a1b007f1e3ffef0b537ec11d5f33841 SHA512 23e918b22f639343ad5a913ec54c89628bc8de5cdb2f0ab861315df7b3c0944289e185c5f308a207f9c21d62689a02a230f3a194d28eaa07d6d9c9eb71145ad2
 MISC metadata.xml 313 BLAKE2B 296a070541acd47ca37a948cd1df1ec41bbdcb4c3f254f1af346d434a48c68a4cb9d607ef7b939b544b319f28166e26e6052abe3d1610fe35ec504b5e5d19ba1 SHA512 03d93808ba7e8db5cc04b91fc47ec9975edc36e1586851e16bde078f0d37c7560a4c33ee00c865332ffca409c8cb07f9a9d3427e160528c111e64f51ad46ff77
diff --git a/sec-policy/selinux-lpd/selinux-lpd-2.20180114-r2.ebuild b/sec-policy/selinux-lpd/selinux-lpd-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..c0511bb2d938
--- /dev/null
+++ b/sec-policy/selinux-lpd/selinux-lpd-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 839cb34d661a..c0511bb2d938 100644
--- a/sec-policy/selinux-lpd/selinux-lpd-9999.ebuild
+++ b/sec-policy/selinux-lpd/selinux-lpd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-mailman/Manifest b/sec-policy/selinux-mailman/Manifest
index 37bd135e5887..1c3d1a118723 100644
--- a/sec-policy/selinux-mailman/Manifest
+++ b/sec-policy/selinux-mailman/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-mailman-2.20170805-r2.ebuild 284 BLAKE2B 4eb28cecaddd2f412718ff95
 EBUILD selinux-mailman-2.20170805-r3.ebuild 284 BLAKE2B 4eb28cecaddd2f412718ff95bf5bbc127cdf44794a45d4d0c86ce249c2db9c02b362562447d3940425cec31ed7e13ab6c9a917046f07e3fd4096cc0ecf6d77e3 SHA512 d81b2926589612a4a638693fb7ac5b1b1e97e3dc349e92a53822187b57a2ac146e1b227c37aed0cd4950bcb3c940a7fdb350c34c7cd2f289cb648e5c4cedddb0
 EBUILD selinux-mailman-2.20170805-r4.ebuild 286 BLAKE2B b016cac56657e6d0e2680447f5e9096444abd4d4eabe1f42866130dad6e26f2df771b6c696673785e9f0d41000700b7c8acf2d8af869804cf6f026cebf2a69b7 SHA512 21ac5e5e0f708a7eb0b9c3c16bce2cdc36f8a170e19e457f02a67babb71e3f6f627a23b53f124056fc1c970c175279cad6f01ed1fa51c038657c04360b2bb8b1
 EBUILD selinux-mailman-2.20180114-r1.ebuild 284 BLAKE2B 61251a5c7148f50ff283ffe07157eb0dbff38ee17022f8564355ae968153b0f89ef287588258aeb5b1bf2fd589ed993fe466c5a0f43920e16a1cdbc1b731fb6f SHA512 8b0361b09fb8c9aa7d0bb9af6f6f22aaef5a4c750f5c80acf62063cc384c749031456a79fcc205642738f9c238c90b492d67ebeb4820809fcd13a1f60b6d799e
-EBUILD selinux-mailman-9999.ebuild 286 BLAKE2B b016cac56657e6d0e2680447f5e9096444abd4d4eabe1f42866130dad6e26f2df771b6c696673785e9f0d41000700b7c8acf2d8af869804cf6f026cebf2a69b7 SHA512 21ac5e5e0f708a7eb0b9c3c16bce2cdc36f8a170e19e457f02a67babb71e3f6f627a23b53f124056fc1c970c175279cad6f01ed1fa51c038657c04360b2bb8b1
+EBUILD selinux-mailman-2.20180114-r2.ebuild 286 BLAKE2B 3dea8a5c49f95fdb62226f5553654210440c7ecd1bb1fa24f0aa3bf1ee3fe05a18675a7c158fc5066db3266ca9b6f70944878a2eaabb44b76b832453559ca194 SHA512 101cb0988f956388cc5d10c183ebf8974eb7c99258f4aa9dae062f55c4c672ff753e7c8f447f37974b556d83dc67bbf719e6ec20978f0c1d0ccbd512fca66cc1
+EBUILD selinux-mailman-9999.ebuild 286 BLAKE2B 3dea8a5c49f95fdb62226f5553654210440c7ecd1bb1fa24f0aa3bf1ee3fe05a18675a7c158fc5066db3266ca9b6f70944878a2eaabb44b76b832453559ca194 SHA512 101cb0988f956388cc5d10c183ebf8974eb7c99258f4aa9dae062f55c4c672ff753e7c8f447f37974b556d83dc67bbf719e6ec20978f0c1d0ccbd512fca66cc1
 MISC metadata.xml 317 BLAKE2B 5ade8770d43e7f5003060d64c8716fecce914f0123e695a57c83afed3099b491f4161605ae6d4dcc0a22a9317726121eac9a67b50ebfa11bba5654c3ea4c966f SHA512 2c542b0d9cf5698b68e2fb6052480e3e3e0c28f2b06cca88016cb67cc8930ca81bf4c8958124bc447571a8527ece7834e47d7f8f8f1e49a52d308b04e9378b09
diff --git a/sec-policy/selinux-mailman/selinux-mailman-2.20180114-r2.ebuild b/sec-policy/selinux-mailman/selinux-mailman-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..984440327ed0
--- /dev/null
+++ b/sec-policy/selinux-mailman/selinux-mailman-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 94b0bef5e7d2..984440327ed0 100644
--- a/sec-policy/selinux-mailman/selinux-mailman-9999.ebuild
+++ b/sec-policy/selinux-mailman/selinux-mailman-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-makewhatis/Manifest b/sec-policy/selinux-makewhatis/Manifest
index 837ba4dc35ce..3e5bd7e4fbb2 100644
--- a/sec-policy/selinux-makewhatis/Manifest
+++ b/sec-policy/selinux-makewhatis/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-makewhatis-2.20170805-r2.ebuild 290 BLAKE2B 8de374c8625aaf34cf7bc
 EBUILD selinux-makewhatis-2.20170805-r3.ebuild 290 BLAKE2B 8de374c8625aaf34cf7bc6ce7417c67ec8fa85a501be12816083502dce0d5c33897a684dd2e6fa7dcf29c48ead4ba8705be22a0ec211daa14081ce1356f534b0 SHA512 86eb82746cbf121836b7045e6edece5381ed0b86b198ae3bee0a92b212a2b1783f6afd11b9f4e11dc35ed75b0d392936a21df95f647124e23e4fe5dac7c8b130
 EBUILD selinux-makewhatis-2.20170805-r4.ebuild 292 BLAKE2B 21e93aabf90e2a92bf0109ca2cc5a39c4a19677b626d3293a7039245db3ec71a8f683cbe4f9b59f39b15957f1b9785709f50f1b7d35427ea7cc035dbc3a8fada SHA512 0a0d25bf49d4d67effa5e64a3c7cd869ddf28480f065e703f5e9c784b350a0a6c625cdb13cdf37d26591c9cb7576097afdb77f8ea193a77556bc6895144d3594
 EBUILD selinux-makewhatis-2.20180114-r1.ebuild 290 BLAKE2B ad579193ba62f00ecb9e678ac5a959c763adaa3bb0806654b2d3976cfc1d501191a89d02c42ca516db337a2a01bcf7d00ff1a2b58023e865b556b33928429ff8 SHA512 7c4a73b3f722edb2e81b134b6311a352e0dc8b9fc4f41aabda8d339094e6d22c37e7c579aa9512242312173aec12b262e1503fffc8ad1511b3cb3aa23b990957
-EBUILD selinux-makewhatis-9999.ebuild 292 BLAKE2B 21e93aabf90e2a92bf0109ca2cc5a39c4a19677b626d3293a7039245db3ec71a8f683cbe4f9b59f39b15957f1b9785709f50f1b7d35427ea7cc035dbc3a8fada SHA512 0a0d25bf49d4d67effa5e64a3c7cd869ddf28480f065e703f5e9c784b350a0a6c625cdb13cdf37d26591c9cb7576097afdb77f8ea193a77556bc6895144d3594
+EBUILD selinux-makewhatis-2.20180114-r2.ebuild 292 BLAKE2B 1bb78baba1dd4fc078c4aed66ea51e0a85f0f23b4028daa4a875d38c89b32a9f587c758b2be1cb66e629a200ef6d469715e951347fe158adfa223705d175293e SHA512 023819defd024667a1dfa39a4c94bb09b2853107bdea8ceeacd772dfa200552190617e38bda37d7efb7ede2e6f08e468db06fb123e576c40457ae45c2bf88a8c
+EBUILD selinux-makewhatis-9999.ebuild 292 BLAKE2B 1bb78baba1dd4fc078c4aed66ea51e0a85f0f23b4028daa4a875d38c89b32a9f587c758b2be1cb66e629a200ef6d469715e951347fe158adfa223705d175293e SHA512 023819defd024667a1dfa39a4c94bb09b2853107bdea8ceeacd772dfa200552190617e38bda37d7efb7ede2e6f08e468db06fb123e576c40457ae45c2bf88a8c
 MISC metadata.xml 320 BLAKE2B a265a990113bf8db09888651333afc37c1211d09dbd681c28df733462fe35caa192770a298c5595e11abb4ef907756c4506451f67be96d8932fda325b1175e5f SHA512 bc95b01949705d19d1f46eb6d0281381fec137ca312fa6d1ee1ecdbd7cd4b79ec2cefa93032f8ac4e33039b299455f0dc0806b06754066f5134dd0d025beb417
diff --git a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20180114-r2.ebuild b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..cc05d1066e42
--- /dev/null
+++ b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 d2ef7e421b30..cc05d1066e42 100644
--- a/sec-policy/selinux-makewhatis/selinux-makewhatis-9999.ebuild
+++ b/sec-policy/selinux-makewhatis/selinux-makewhatis-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-mandb/Manifest b/sec-policy/selinux-mandb/Manifest
index d30948139956..85bc7ea2c245 100644
--- a/sec-policy/selinux-mandb/Manifest
+++ b/sec-policy/selinux-mandb/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-mandb-2.20170805-r2.ebuild 280 BLAKE2B b4806c97a21cf427d8d1c245ab
 EBUILD selinux-mandb-2.20170805-r3.ebuild 280 BLAKE2B b4806c97a21cf427d8d1c245ab0925775aa212fbcc431488182ac35d3f285828b69a42ff8989de9d3bc7c83db550c0e222b7972ceb9306f040bd3e5e292339af SHA512 2fee152252d3297ca3f777a043d1932497565f3aff7f25f4ded231f9a4116f068d46a09eeb1005252c22d87e2c5f0d824770ef7133c4f50965868279e3897d25
 EBUILD selinux-mandb-2.20170805-r4.ebuild 282 BLAKE2B 831527f594c7d32f5a7a97a0d2be851f4829e3d5a2beaba539684faf1e2fa8cb8fdd65eff2839963d1b421211854027b826ec4013ce92524888bddb0ae83586c SHA512 93c95e217c30dfdd1da9c437116580516bdf44e9c5119b5c629fab3c295e060a51c7d37fb3ccfd55018af72e050265d6c749f61f78f1544a3c9bca393aa52c48
 EBUILD selinux-mandb-2.20180114-r1.ebuild 280 BLAKE2B 76f427ba513dda98294b86b455f67aec0b5351b67f64699b10899cf6999fb1f2c83c559cf15710d532e99fe99d0788d0b94af80e480181a95e09b04a6d7e98bc SHA512 8ee309232d4acae6fbd50f4f0f7a1371da4704a5660e03652f80653862c263aa1c3188f081d53b4504e182f2436169a372d69dfc139e6b9be4bc8e51a99c495c
-EBUILD selinux-mandb-9999.ebuild 282 BLAKE2B 831527f594c7d32f5a7a97a0d2be851f4829e3d5a2beaba539684faf1e2fa8cb8fdd65eff2839963d1b421211854027b826ec4013ce92524888bddb0ae83586c SHA512 93c95e217c30dfdd1da9c437116580516bdf44e9c5119b5c629fab3c295e060a51c7d37fb3ccfd55018af72e050265d6c749f61f78f1544a3c9bca393aa52c48
+EBUILD selinux-mandb-2.20180114-r2.ebuild 282 BLAKE2B c7f353877a9b753c7db28d03f555f58035bff852e94dbf0a1a92d8a4dc602c19d615f1669ec66a608f23b6cb3244bafa5785b8687bc99d2804b697cc465cc88d SHA512 f222bf287d5bd0673646c22f3a5452273eebe0419cf489e55123c6908091b293f2c1633bedb258c58f0ae1fbc6c82e3d337efa0d7c8e7fd7cf26913e2d48af41
+EBUILD selinux-mandb-9999.ebuild 282 BLAKE2B c7f353877a9b753c7db28d03f555f58035bff852e94dbf0a1a92d8a4dc602c19d615f1669ec66a608f23b6cb3244bafa5785b8687bc99d2804b697cc465cc88d SHA512 f222bf287d5bd0673646c22f3a5452273eebe0419cf489e55123c6908091b293f2c1633bedb258c58f0ae1fbc6c82e3d337efa0d7c8e7fd7cf26913e2d48af41
 MISC metadata.xml 315 BLAKE2B 95d3f83b404b3156ccaab92641107d67fd67c9b8d953695d57e531ef27e9a842dc89147e671a3cd25f9e95cbb8bf4826bd47b655714a793b5991c8d670e643d3 SHA512 d7b487c06c8e54342d58e1905e552b7879b76963c9dfa6ff0203e1c29f2268604a9aef7f9d02992fda0f61b8315afab6709cd2708c99f4c00ce1ce3971bb536c
diff --git a/sec-policy/selinux-mandb/selinux-mandb-2.20180114-r2.ebuild b/sec-policy/selinux-mandb/selinux-mandb-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..c8db292f4e56
--- /dev/null
+++ b/sec-policy/selinux-mandb/selinux-mandb-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 87177e7f1e53..c8db292f4e56 100644
--- a/sec-policy/selinux-mandb/selinux-mandb-9999.ebuild
+++ b/sec-policy/selinux-mandb/selinux-mandb-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-mcelog/Manifest b/sec-policy/selinux-mcelog/Manifest
index af613fd1c701..ec375a4eb5d8 100644
--- a/sec-policy/selinux-mcelog/Manifest
+++ b/sec-policy/selinux-mcelog/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-mcelog-2.20170805-r2.ebuild 282 BLAKE2B caaf0891375cd64a7a5ad7e4e
 EBUILD selinux-mcelog-2.20170805-r3.ebuild 282 BLAKE2B caaf0891375cd64a7a5ad7e4e1a6b0c91dbce4fd515b67bb2c610a81d2563c906211ae7a8a4540c64912e01f33bac6e60412b72df3f5cf941e0f362758e99963 SHA512 920e4644796b6628baea361157c2fa569692e6140ec6fac698bfcb735dd533f02aeee6718f9f80a0f0298805e7adc0f233a0db189b8b63c946b38048ea221e22
 EBUILD selinux-mcelog-2.20170805-r4.ebuild 284 BLAKE2B 55386b99953f8c9fc8117b0833537921a7c67860e4231d0a8b95c132e4d5ecce01bdc0271022f7820f0e3d1fea4f7298f7facbe88a676933f4aa5d65bff784d4 SHA512 2e52bf3dd34547e1bc62a306c7eb23f2c9bfa978c7553f723141e212c392c1f7aa4a2a334362a3cd2b2ca1621b0e733fef1b48cae23f12898a733cf851f38424
 EBUILD selinux-mcelog-2.20180114-r1.ebuild 282 BLAKE2B 2b325e7a12ab360373abeeb2233cd024b1da57556951a35a6f49054bd787e2d878ee5b2e4d5f4cb124bb629c44094f8e076b80aedbdcd42d0cd1a78b7ad338e5 SHA512 1f04e00039e026d198eb39514f86c3046c3192bc7945d62bc8d7304a330f274d859b4940083c603cd7bad1ebcb692904bde0b9313b58e7aeafcd77b389b3817e
-EBUILD selinux-mcelog-9999.ebuild 284 BLAKE2B 55386b99953f8c9fc8117b0833537921a7c67860e4231d0a8b95c132e4d5ecce01bdc0271022f7820f0e3d1fea4f7298f7facbe88a676933f4aa5d65bff784d4 SHA512 2e52bf3dd34547e1bc62a306c7eb23f2c9bfa978c7553f723141e212c392c1f7aa4a2a334362a3cd2b2ca1621b0e733fef1b48cae23f12898a733cf851f38424
+EBUILD selinux-mcelog-2.20180114-r2.ebuild 284 BLAKE2B 668c86d7f1cbfdd3ed92ba81da5a1fcfdd5c232aed055a1af451f54c6f0183958cc816570e3ddc1298c0b505cb7d5bd26098fd91dd37b26c49affb665e805891 SHA512 a73f4f43fe17ba9590925c24dbba1ec20e44ea27a4fbe443ea943265a9e0f88cd7540ec9b9e6a45e93525599c84bb86ac6f4f64c175ffa977c740f95b135875e
+EBUILD selinux-mcelog-9999.ebuild 284 BLAKE2B 668c86d7f1cbfdd3ed92ba81da5a1fcfdd5c232aed055a1af451f54c6f0183958cc816570e3ddc1298c0b505cb7d5bd26098fd91dd37b26c49affb665e805891 SHA512 a73f4f43fe17ba9590925c24dbba1ec20e44ea27a4fbe443ea943265a9e0f88cd7540ec9b9e6a45e93525599c84bb86ac6f4f64c175ffa977c740f95b135875e
 MISC metadata.xml 316 BLAKE2B be4ad3832b18bd9e26aa46ccf572100dc64879ad860c75e6f6135a928f9ceaca16d8aae6f04bf7ea5ee26cb0008ff927b330e3d8c6f484e9cf4ccc879545de20 SHA512 8d61276e7343ddf65a6874ea736d342da652068bd08a0806888afb2adc9245490f4e1cff4f63788752f18ccc2e1afe3f4aad0db3932d3af76fe1e12f0ec48b35
diff --git a/sec-policy/selinux-mcelog/selinux-mcelog-2.20180114-r2.ebuild b/sec-policy/selinux-mcelog/selinux-mcelog-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..8ad129985e68
--- /dev/null
+++ b/sec-policy/selinux-mcelog/selinux-mcelog-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 ae3b9155f4df..8ad129985e68 100644
--- a/sec-policy/selinux-mcelog/selinux-mcelog-9999.ebuild
+++ b/sec-policy/selinux-mcelog/selinux-mcelog-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-memcached/Manifest b/sec-policy/selinux-memcached/Manifest
index 709fd6cf3022..507c85b36c5c 100644
--- a/sec-policy/selinux-memcached/Manifest
+++ b/sec-policy/selinux-memcached/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-memcached-2.20170805-r2.ebuild 288 BLAKE2B c5ddd924905108cf7390f6
 EBUILD selinux-memcached-2.20170805-r3.ebuild 288 BLAKE2B c5ddd924905108cf7390f62344a218c8183db8fe23a4b3ce145bee71d5cc5aa178e3b2eb4a281c212956124ccc601310ee391f05c26ee44c6c7f184755814322 SHA512 9f535f7dcb26223f738b8591cfa945bdd271eb82b1392d8ede01c16a88921bb4c4388ba2068358f7117481078d09c2adff9ed417909110e7da57b44dc953e3d6
 EBUILD selinux-memcached-2.20170805-r4.ebuild 290 BLAKE2B efa50b3eb0e7ccc0642663b9c027f397c999c2a8800efbba4884445352b97aca7bc076c9c136cddaa30ba838b692752df1b14f1be9144b2dc9d341c032ac0bec SHA512 b8886cd2885e2c05d54d67598220f2c491fc99af5f29951348c33324e55502f7eccc6094abd8603009a91b2b8b03bd0fa5b6fcaa17e757d29be4fa1a6d0c48c2
 EBUILD selinux-memcached-2.20180114-r1.ebuild 288 BLAKE2B c3318a48abd28b8d803f58f31a022d0efa0d5e30b0c27bf0405921ba7c3620f721ad8bd7d73a5f83534fb066e733b4193d57842c3c1529ba6744065026f055d7 SHA512 6b45b9629aaa229f4869352c08076bd0b74e05b6caa0362d628e9f1a7b9d8e0b5ffbd8a3e3d9d1234bd5614cbd2fb4886f57c551d3c3fc0fdd592aa6e2b9feb1
-EBUILD selinux-memcached-9999.ebuild 290 BLAKE2B efa50b3eb0e7ccc0642663b9c027f397c999c2a8800efbba4884445352b97aca7bc076c9c136cddaa30ba838b692752df1b14f1be9144b2dc9d341c032ac0bec SHA512 b8886cd2885e2c05d54d67598220f2c491fc99af5f29951348c33324e55502f7eccc6094abd8603009a91b2b8b03bd0fa5b6fcaa17e757d29be4fa1a6d0c48c2
+EBUILD selinux-memcached-2.20180114-r2.ebuild 290 BLAKE2B aff4daa07ce4e211b54249025f1fcdf858be87112fea8dde3960084600f1246c523f17545f184a7e4a5c978d359cce13fabe0576f8a941863bfacd03fe010ce6 SHA512 bc1cad12775a97ac9192fefadff1fee103055200f1c187f590e4ea7f312923212f159e836979e72978bc07e65ffce2b7a6e045da29858677d824676cf111ba17
+EBUILD selinux-memcached-9999.ebuild 290 BLAKE2B aff4daa07ce4e211b54249025f1fcdf858be87112fea8dde3960084600f1246c523f17545f184a7e4a5c978d359cce13fabe0576f8a941863bfacd03fe010ce6 SHA512 bc1cad12775a97ac9192fefadff1fee103055200f1c187f590e4ea7f312923212f159e836979e72978bc07e65ffce2b7a6e045da29858677d824676cf111ba17
 MISC metadata.xml 319 BLAKE2B c34d581f6b79142497f663b8b9023a750f845e460d724694efd5c495c27e3c01b2df9b3be085260ab6f3529b42bd4a8343e39a13ead394a46222dca4cf40ff4e SHA512 7a186901e5cade308e538d8f4fbd4afa50af93c4d046978a385ca0c83f3e481da51c70586b8d803f690030d8ca6b9e6c9b73436c5eee63237de86c6c3edf78b0
diff --git a/sec-policy/selinux-memcached/selinux-memcached-2.20180114-r2.ebuild b/sec-policy/selinux-memcached/selinux-memcached-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..a835ef04fc2d
--- /dev/null
+++ b/sec-policy/selinux-memcached/selinux-memcached-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 40e9d79f726f..a835ef04fc2d 100644
--- a/sec-policy/selinux-memcached/selinux-memcached-9999.ebuild
+++ b/sec-policy/selinux-memcached/selinux-memcached-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-milter/Manifest b/sec-policy/selinux-milter/Manifest
index ef948e980d71..6d01d2ef6243 100644
--- a/sec-policy/selinux-milter/Manifest
+++ b/sec-policy/selinux-milter/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-milter-2.20170805-r2.ebuild 282 BLAKE2B 9f6100c5ea14063a70f9e39d6
 EBUILD selinux-milter-2.20170805-r3.ebuild 282 BLAKE2B 9f6100c5ea14063a70f9e39d617445f91a330f6e86cc7171d7354c1ac7101e482d97a929eb6d101d1474c49075c760d8bdb3f739c9c8adad0dd8740fc5e3b0d2 SHA512 008c01d327a44af40ebd13a83bec3b09c423de67975395b98217fc98e1bbf9840124d47ffea2cb22aa8641a698d5cb7d0fff7c4a89c0b750e29661e1e6241fdd
 EBUILD selinux-milter-2.20170805-r4.ebuild 284 BLAKE2B 055c050ec329635755aa784eae47e72202b113e0fec8d9e11635e54643a2a5c28881d50d13629f9b6747e0058269a80d9f47526e357f24060d8b0b01f1abc086 SHA512 7e517c42ee2fdbab7798567c70b1f08a50156fd60c513945a8bc5dd648c84a1beb7ffcbef64f042ca422892feaff564f7abaada6e1b11c32ff689c85693c99b8
 EBUILD selinux-milter-2.20180114-r1.ebuild 282 BLAKE2B d55903d85b334715243a7af90edb560fd0606085fcdcdd6f0d76fc084f42e849f91e3d309c73daf4b4ca667f571295c080ecf1d2825972c9052a4dc1b3ba8666 SHA512 123204b48a3ac9a122007fb55ee8853e772e4c68c5f9cc1e7101984bdd74baabc24420b8a3d7bd468314e4b3f414e94211f74240c377902eca183766e6bc9e5f
-EBUILD selinux-milter-9999.ebuild 284 BLAKE2B 055c050ec329635755aa784eae47e72202b113e0fec8d9e11635e54643a2a5c28881d50d13629f9b6747e0058269a80d9f47526e357f24060d8b0b01f1abc086 SHA512 7e517c42ee2fdbab7798567c70b1f08a50156fd60c513945a8bc5dd648c84a1beb7ffcbef64f042ca422892feaff564f7abaada6e1b11c32ff689c85693c99b8
+EBUILD selinux-milter-2.20180114-r2.ebuild 284 BLAKE2B 8cde0d2f190a4aab9134c8269fba989c4ef5a2503f38807a32f11150d244c2d3f90c43a17c65f35f2d1dfb3782f2d81e96f61c4b9afed2331b809ba65ec19eb6 SHA512 e04165cfc8464d5ec1dc4184745e45a638aee740105398735ab7baa5048d22aa046642e78b2e67cac401a46fe576441cd606b7c094b1153fa263cf283202ffe8
+EBUILD selinux-milter-9999.ebuild 284 BLAKE2B 8cde0d2f190a4aab9134c8269fba989c4ef5a2503f38807a32f11150d244c2d3f90c43a17c65f35f2d1dfb3782f2d81e96f61c4b9afed2331b809ba65ec19eb6 SHA512 e04165cfc8464d5ec1dc4184745e45a638aee740105398735ab7baa5048d22aa046642e78b2e67cac401a46fe576441cd606b7c094b1153fa263cf283202ffe8
 MISC metadata.xml 316 BLAKE2B d0482a4d41556c4c8177df2842603bb3fc7f296f5bef7b721de2e3e12b1e9286953614bfa6e18e9caaa00ddf15e85c1b7e4be7f567c6417e8c70f663062836f8 SHA512 d3f36e28dd8e18aec87946218c34d88ed23720dab347f459ed95fa746b205432509c2e2c45497945d8d7e8683bee0d0b3bbfefe2d7e2ff6220a41815a2381e8e
diff --git a/sec-policy/selinux-milter/selinux-milter-2.20180114-r2.ebuild b/sec-policy/selinux-milter/selinux-milter-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..415133d64542
--- /dev/null
+++ b/sec-policy/selinux-milter/selinux-milter-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 78963a43df13..415133d64542 100644
--- a/sec-policy/selinux-milter/selinux-milter-9999.ebuild
+++ b/sec-policy/selinux-milter/selinux-milter-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-modemmanager/Manifest b/sec-policy/selinux-modemmanager/Manifest
index c1a18c66a741..722bc9c2d6c7 100644
--- a/sec-policy/selinux-modemmanager/Manifest
+++ b/sec-policy/selinux-modemmanager/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-modemmanager-2.20170805-r2.ebuild 386 BLAKE2B 13798cb76dd0f0ec069
 EBUILD selinux-modemmanager-2.20170805-r3.ebuild 386 BLAKE2B 13798cb76dd0f0ec0698106185c547e57b0b82e156885b984ad2ad721fc69fe4de976864f57f7c91962d14b1eeb748f2249ae221c0cd2f7f76ce5a74860471f1 SHA512 7bd30fb24b50d547ae36808c005de596dbc165764a4e92d482b0dc538dab9e03ddb61a91144d8b51e9a7522799bfe17b609a0401c73da91c333165c4499a1a7b
 EBUILD selinux-modemmanager-2.20170805-r4.ebuild 388 BLAKE2B 6a3caaef59aa4d3283beb643b4e93a97eed85f76fd68c7cb130967b1df3243ab09a908ebdc87112c7e1e8f88c5a407c9b759325ba3dbd58f55bfa7edd70edc45 SHA512 b8e597a89aa4fd31358a6427010f29d683e58fae2687d9fe2b85d0bdb38ca28a7eef138969b2b5bbee598e697cf3e879dc3afb1d612d845527a97b4db8b15013
 EBUILD selinux-modemmanager-2.20180114-r1.ebuild 386 BLAKE2B 2b97e0c24770ba95db3bd2568348289a6f021855c1aa05b93eaa925a4ac155d2089b0d341ca5c9b9408616782d33d8813933efa120589392555e359a985ade75 SHA512 49a5ac4ce984fb3d966e08471bb29dd728d1168e1765995092e8f5a0f2b37420242ccd6282dc98bd028922fbfab9df82ade9922a560d9970c046f776d4ffcb19
-EBUILD selinux-modemmanager-9999.ebuild 388 BLAKE2B 6a3caaef59aa4d3283beb643b4e93a97eed85f76fd68c7cb130967b1df3243ab09a908ebdc87112c7e1e8f88c5a407c9b759325ba3dbd58f55bfa7edd70edc45 SHA512 b8e597a89aa4fd31358a6427010f29d683e58fae2687d9fe2b85d0bdb38ca28a7eef138969b2b5bbee598e697cf3e879dc3afb1d612d845527a97b4db8b15013
+EBUILD selinux-modemmanager-2.20180114-r2.ebuild 388 BLAKE2B 78b2dff5a614718f6407b2d1f6091a8c0f36f0c79df96bec233253eaa8607e09d4233bda62074c71b7c7b4bbdabafa461554ef6f83800b2cbb516cbd6dfe2c4c SHA512 945d1c2a6344a194751d51240ca61bd60708703b98f79bedd5174c7148d786266cc9031b03845bd52d923354c79d14bf4aa027c267b0a7fe364a5f8937543831
+EBUILD selinux-modemmanager-9999.ebuild 388 BLAKE2B 78b2dff5a614718f6407b2d1f6091a8c0f36f0c79df96bec233253eaa8607e09d4233bda62074c71b7c7b4bbdabafa461554ef6f83800b2cbb516cbd6dfe2c4c SHA512 945d1c2a6344a194751d51240ca61bd60708703b98f79bedd5174c7148d786266cc9031b03845bd52d923354c79d14bf4aa027c267b0a7fe364a5f8937543831
 MISC metadata.xml 322 BLAKE2B 8aec0e42986a81957e9e2bae812e952567b59c3c041922f2ea8222fc1acf4b41608f30d0f03d9671e1bc5a3fc7247796ca38e9c47fa9701fca6ec3a7e194f93c SHA512 830ca621d92823ba149cdec9e44812c2f84ec451de1616c7147cd8640d4620ba9bc91dc95584ec081bb9b31de180f4b568d8cb8988077442c98259a2e9bbd399
diff --git a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20180114-r2.ebuild b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..bcd8127f743d
--- /dev/null
+++ b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20180114-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 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 6c204aed8092..bcd8127f743d 100644
--- a/sec-policy/selinux-modemmanager/selinux-modemmanager-9999.ebuild
+++ b/sec-policy/selinux-modemmanager/selinux-modemmanager-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-mono/Manifest b/sec-policy/selinux-mono/Manifest
index ab9c52538b4e..ae774063c87c 100644
--- a/sec-policy/selinux-mono/Manifest
+++ b/sec-policy/selinux-mono/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-mono-2.20170805-r2.ebuild 278 BLAKE2B 4767191fa4a9ff0c717ade72eb5
 EBUILD selinux-mono-2.20170805-r3.ebuild 278 BLAKE2B 4767191fa4a9ff0c717ade72eb53845476165365836f9587dc3b296bd22f3383e54ffc8a4a8bc9954566c120da440bf6883b330ef381f7daf5a5232315255e72 SHA512 c9385d3bc60b5960619e64493d69f46cd05880cf3950f2b1d0256956700ba9431678aaefe4d74d2e7302a2909197597f6717b6df030de8563b48214b635f5ea3
 EBUILD selinux-mono-2.20170805-r4.ebuild 280 BLAKE2B 230ff77f471082cab59994ed1d373a51f18329b180622723380d784bb0aa4ae7bd39f80d1cfe8b0947898abcd4e029435e035333b4ed9b5ad526e97d3a145122 SHA512 6f6b1d46178b95928f949b548db96f669f24ba41b5388797dc6d5e7e3d45f0f2eb8f2fb4ffdb4608476c7b76950ff9b65d7a6224e895fe7904580c2215094507
 EBUILD selinux-mono-2.20180114-r1.ebuild 278 BLAKE2B 2b12ad2922c5eb0182ceebf51485b05d2927c32924c914de722f64b1865b1895536aa60ccc603cb82667c1aa1541c9f88da8fa2e6c62ef364c4dadc2278fa639 SHA512 fc99b59307b1ca5b8fa2f9d83fb07c7d4de412250da671968dade9241b1754570b22b33858684e0ef5a45a0bc4efc7f36da1ff8e9885e1515820199ef2dc4ec1
-EBUILD selinux-mono-9999.ebuild 280 BLAKE2B 230ff77f471082cab59994ed1d373a51f18329b180622723380d784bb0aa4ae7bd39f80d1cfe8b0947898abcd4e029435e035333b4ed9b5ad526e97d3a145122 SHA512 6f6b1d46178b95928f949b548db96f669f24ba41b5388797dc6d5e7e3d45f0f2eb8f2fb4ffdb4608476c7b76950ff9b65d7a6224e895fe7904580c2215094507
+EBUILD selinux-mono-2.20180114-r2.ebuild 280 BLAKE2B 37649a353c91bc456a64764f69192db150a6fdc094dfd49ec7693e62342418623f3fbe4306e233fc2b3fce3d0861db2de5bd92486d8bc847a2c35e9bd5b81a2e SHA512 7f45183c37b12d00819febdf414dd812299beee66d37a71b78c63fb6acfc7645b33e0feed99df0ec68062faaf98b6fa3d5d635034b5bf462a05ed34ae51d0666
+EBUILD selinux-mono-9999.ebuild 280 BLAKE2B 37649a353c91bc456a64764f69192db150a6fdc094dfd49ec7693e62342418623f3fbe4306e233fc2b3fce3d0861db2de5bd92486d8bc847a2c35e9bd5b81a2e SHA512 7f45183c37b12d00819febdf414dd812299beee66d37a71b78c63fb6acfc7645b33e0feed99df0ec68062faaf98b6fa3d5d635034b5bf462a05ed34ae51d0666
 MISC metadata.xml 314 BLAKE2B 57962d2d2ce159f638a1c086cbf3b5ffce2cdce728ea5cd7b8850431f728120a0b2fa04e68e0cf32fc27e301fea58be5b04dc0778757afb8d5d82a09efa10bcd SHA512 8c8beb605d3c5f0bc763dca943cc89871bd50eb086d2c18dac03402a13a0dd584073b8c2f4dbfa0bdeda14e4b795395a0806f3d622cce4108593860ce26d08a7
diff --git a/sec-policy/selinux-mono/selinux-mono-2.20180114-r2.ebuild b/sec-policy/selinux-mono/selinux-mono-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..1f2dc9e10a6b
--- /dev/null
+++ b/sec-policy/selinux-mono/selinux-mono-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 e77111606246..1f2dc9e10a6b 100644
--- a/sec-policy/selinux-mono/selinux-mono-9999.ebuild
+++ b/sec-policy/selinux-mono/selinux-mono-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-mozilla/Manifest b/sec-policy/selinux-mozilla/Manifest
index 6d5197826f90..1757045b38f2 100644
--- a/sec-policy/selinux-mozilla/Manifest
+++ b/sec-policy/selinux-mozilla/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-mozilla-2.20170805-r2.ebuild 386 BLAKE2B 5ee499942f0f7d97e35c596e
 EBUILD selinux-mozilla-2.20170805-r3.ebuild 386 BLAKE2B 5ee499942f0f7d97e35c596e059325f43cbe1480dfc8d879ef5ae98abda179b2aaf652170a1bab00ca479b9a6cd5ecf6657f4f73f24244332f41a40d71894253 SHA512 270a7e9c32edb4234197ceda8d886966524fc7d6c6bba7990067bb468e8748f25be87f15d90dc3a7b300a8573c10c931b50759fe96d6b193492eb9d3bb52d105
 EBUILD selinux-mozilla-2.20170805-r4.ebuild 388 BLAKE2B 427906d7e249f62c17144e0749ae04d5f9a59d2ee0d1ee4e2007e2c4c173a08f09bd6a385e02439203fb93de8a8d36ff20c868e49334e76042b98f2531e315ab SHA512 409155bbe533888b1358cfb9089e756e21255960a052488e9a09fbe206e063758d2a999d1f248a5dbff966a1747a009fa784a128714c3231d20006161d40562f
 EBUILD selinux-mozilla-2.20180114-r1.ebuild 386 BLAKE2B ed99526b9913e0cf44c4760accc90594cc44673cc47a7d9ee7a9c4b854ae8660aef8b7280a5f0649619b30e0d0603e45ef47cc7772fd1efd9bdcf7a3e1a35057 SHA512 70d2e826e60878f17c78a3c23c9599e60c8cad6898833d79dc4b11cd98adc1779ed211e81485841873a2a8c2f0afd6b7f44385a1614aa6963111bfc3ffdd2c04
-EBUILD selinux-mozilla-9999.ebuild 388 BLAKE2B 427906d7e249f62c17144e0749ae04d5f9a59d2ee0d1ee4e2007e2c4c173a08f09bd6a385e02439203fb93de8a8d36ff20c868e49334e76042b98f2531e315ab SHA512 409155bbe533888b1358cfb9089e756e21255960a052488e9a09fbe206e063758d2a999d1f248a5dbff966a1747a009fa784a128714c3231d20006161d40562f
+EBUILD selinux-mozilla-2.20180114-r2.ebuild 388 BLAKE2B 087038236bf10c9392d65e5fe5f0ed46de60267cb25b406081cb51c48a9968f895d671880f3504e7d2a2018380c271e80ab090ab204f67087bb71e88ddb7a163 SHA512 b911f995a1b182b641a6d183fbaeb4a4820174b7038393f937b1603b9f07ff7b0338e2d2b9332c71a5195cb615bc255967e9ab065056a26222fb1637ce5c6fe3
+EBUILD selinux-mozilla-9999.ebuild 388 BLAKE2B 087038236bf10c9392d65e5fe5f0ed46de60267cb25b406081cb51c48a9968f895d671880f3504e7d2a2018380c271e80ab090ab204f67087bb71e88ddb7a163 SHA512 b911f995a1b182b641a6d183fbaeb4a4820174b7038393f937b1603b9f07ff7b0338e2d2b9332c71a5195cb615bc255967e9ab065056a26222fb1637ce5c6fe3
 MISC metadata.xml 317 BLAKE2B ad2ade96838b5a417ba33a4bd8bc29759e7722ccc57be5c2a8f1c4a5ecf164ca9cf5f5bd9e45176dfd60e83e37269a2ea3aedda6fd4a96769c02c87d7fdceb85 SHA512 de84d7a15921be8c58ffe8bb4cbb4cb890853bf3450a7622bc86dc63d8937dac59a0c683616781ce084b59a2121e118ed0d7fcec73cb9b6a2ef57fea8aaa2167
diff --git a/sec-policy/selinux-mozilla/selinux-mozilla-2.20180114-r2.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..e2e9e97b72b5
--- /dev/null
+++ b/sec-policy/selinux-mozilla/selinux-mozilla-2.20180114-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 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 3649e88c3dd6..e2e9e97b72b5 100644
--- a/sec-policy/selinux-mozilla/selinux-mozilla-9999.ebuild
+++ b/sec-policy/selinux-mozilla/selinux-mozilla-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-mpd/Manifest b/sec-policy/selinux-mpd/Manifest
index 3bbaae6a2a39..7690b65e2d2c 100644
--- a/sec-policy/selinux-mpd/Manifest
+++ b/sec-policy/selinux-mpd/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-mpd-2.20170805-r2.ebuild 276 BLAKE2B 39ded38f1a7f44e6cdb5c6b352da
 EBUILD selinux-mpd-2.20170805-r3.ebuild 276 BLAKE2B 39ded38f1a7f44e6cdb5c6b352da829732414cfc7e8285ec5a0cce17fdfdd9ab14454d0a5970232711b67716ac4890b7eaea04a68dacbe4321bc1412dfd34925 SHA512 757843b5991cec659097d33b790c14e06f6563aa873b8c372a36a16a0027940550c7e9afcd44f06b5ebc12cd464251c4842d0e139125626ee0ace64aed162736
 EBUILD selinux-mpd-2.20170805-r4.ebuild 278 BLAKE2B f587a706e28b11ff315f7b16c94f1f953084654f1c6636ac8786323196d0e8d548a460dcc1f616f720de6a63a80504cf46ee5a37e1d99bc4a9954ac537ceeef0 SHA512 42db79dd427c885124edca742497a8b1f6d86e5bacdbb8cde2ac85ce527cc3363fdbe963f8961c0166f53dab6f6d5d555b83d79eca9a22728bab886554021d02
 EBUILD selinux-mpd-2.20180114-r1.ebuild 276 BLAKE2B ebc2c472622718536454e93bd53fa0a3cdeaa955c598d965ccd980d9a2a765e624ef08d1b314569da9c92db3b8878630a70993de391d89c9847d31dd6f966d01 SHA512 6dd9361120854f1f88a64c364de16aca00df8887e12d409e884c3d92e6ba059fcebad2ad8ef0e5b8ef8f3647920428be4c9795b629f7c2aa0956b5be39ba35ed
-EBUILD selinux-mpd-9999.ebuild 278 BLAKE2B f587a706e28b11ff315f7b16c94f1f953084654f1c6636ac8786323196d0e8d548a460dcc1f616f720de6a63a80504cf46ee5a37e1d99bc4a9954ac537ceeef0 SHA512 42db79dd427c885124edca742497a8b1f6d86e5bacdbb8cde2ac85ce527cc3363fdbe963f8961c0166f53dab6f6d5d555b83d79eca9a22728bab886554021d02
+EBUILD selinux-mpd-2.20180114-r2.ebuild 278 BLAKE2B 3c8bd5a6195b8490a735539f4c0a839a21c85425803a40f646b29ceb87f3b4946c3d7bf6737e3f4307c51d1f0f24a90b8396a39a8744f87e71190f8380631c78 SHA512 145757bd0e249852b7b098ccb20222f6bd88adf3e0d81fadf28aa0fd81689ae63a547f1351b65f5a5924bcc4d19bd53e27800b0cf5b93c972b5e917218419dd3
+EBUILD selinux-mpd-9999.ebuild 278 BLAKE2B 3c8bd5a6195b8490a735539f4c0a839a21c85425803a40f646b29ceb87f3b4946c3d7bf6737e3f4307c51d1f0f24a90b8396a39a8744f87e71190f8380631c78 SHA512 145757bd0e249852b7b098ccb20222f6bd88adf3e0d81fadf28aa0fd81689ae63a547f1351b65f5a5924bcc4d19bd53e27800b0cf5b93c972b5e917218419dd3
 MISC metadata.xml 313 BLAKE2B 56c3875a7e1c3bde39af4122fc4cc48590656c6fa7bb4e4cb36c92045afbcf7d891e49bae22d40b400c2deed09ebe68ae164cebf6307e7aeb24fda0db5fb842a SHA512 6b549fa3968053908625a20d90fffebc16b8b3e4e9b35cf6fd5af36eedc7283512b43e7b40fd42791d41b4dff2c030313bea318bfcd513f7e9a447a2a58d4f43
diff --git a/sec-policy/selinux-mpd/selinux-mpd-2.20180114-r2.ebuild b/sec-policy/selinux-mpd/selinux-mpd-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..304f5af1016c
--- /dev/null
+++ b/sec-policy/selinux-mpd/selinux-mpd-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 0a1db71ae8b4..304f5af1016c 100644
--- a/sec-policy/selinux-mpd/selinux-mpd-9999.ebuild
+++ b/sec-policy/selinux-mpd/selinux-mpd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-mplayer/Manifest b/sec-policy/selinux-mplayer/Manifest
index f29e420a8ce9..831fee9707b7 100644
--- a/sec-policy/selinux-mplayer/Manifest
+++ b/sec-policy/selinux-mplayer/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-mplayer-2.20170805-r2.ebuild 288 BLAKE2B 47d505ecaa7c2d6839b06809
 EBUILD selinux-mplayer-2.20170805-r3.ebuild 288 BLAKE2B 47d505ecaa7c2d6839b06809faf174b2e132461dc0aebd20eeed3fcb88a064b10dd6245b4b5cb08091ba53f12285fcfb952758e05a37893d2a5f4d78246e93a6 SHA512 9450e162c0a0d1285b8d2cee0960040205d46a548ecd871fa9fc8df1c022270e04591d6efd90afaa75872b59685c25f9edd85fe06745ba24c94ffffc817f9028
 EBUILD selinux-mplayer-2.20170805-r4.ebuild 290 BLAKE2B 9c425fcdc8b053b92d648598371cbea41438d7093683460ecd05225a9f8fb963b74e1d57510e1050f4c5148a4a0f92f285a7f3eea77b7784f179966f50b57e0e SHA512 4aff9e610af74f87984b5b14c3055a5e136172ebbe96e0b58c7859cc075513a8d1ab4405622b2e552f5b1fff391326765f1444993ca04b80005c3d6b2e98a79e
 EBUILD selinux-mplayer-2.20180114-r1.ebuild 288 BLAKE2B c1fe750537a400b18d81dac3ac548163bb1a576c06e5122dea18aa2485aee7d21535b1d8cc1421c0502092ec36a9c3ad790293474237b409ef991e6bb46e6e68 SHA512 4ab227a345e8027d13252588f846b8766fb350da886eab45e0c629b7ce259453c7888eb6f0b1222652d2caa54e80ec0fd5201a1dcf3d42cba630c14c8895b859
-EBUILD selinux-mplayer-9999.ebuild 290 BLAKE2B 9c425fcdc8b053b92d648598371cbea41438d7093683460ecd05225a9f8fb963b74e1d57510e1050f4c5148a4a0f92f285a7f3eea77b7784f179966f50b57e0e SHA512 4aff9e610af74f87984b5b14c3055a5e136172ebbe96e0b58c7859cc075513a8d1ab4405622b2e552f5b1fff391326765f1444993ca04b80005c3d6b2e98a79e
+EBUILD selinux-mplayer-2.20180114-r2.ebuild 290 BLAKE2B 782c128836026f813a7efcc469599bd177824bbb0d1e63ce58dc41366234b24397b04430a66f83e3a9eeb7bdd069bcba1afe03a39610b719bc0b76eaf7f23573 SHA512 9af4ff961759c1104d8f6021b18a4cc498fd65939011a07e148f199388ea6755909236f8510605d52090332732c183c6b0da1b58cd72c175350102dbbb833693
+EBUILD selinux-mplayer-9999.ebuild 290 BLAKE2B 782c128836026f813a7efcc469599bd177824bbb0d1e63ce58dc41366234b24397b04430a66f83e3a9eeb7bdd069bcba1afe03a39610b719bc0b76eaf7f23573 SHA512 9af4ff961759c1104d8f6021b18a4cc498fd65939011a07e148f199388ea6755909236f8510605d52090332732c183c6b0da1b58cd72c175350102dbbb833693
 MISC metadata.xml 317 BLAKE2B 86b31fb450909c4a3131419b92f8046aeb53575d0053424a06be4936a4f2e21d2cb7278db928d66e801e5569efc249380d94ecb6698602283b9f5cb4f8968ab5 SHA512 57f431a7e6dbf14548477b092ae19d706f17aa579ff51c6fafc87ce00690a365027449aff1e6eadfbdd6e071421c4e8173a912feb6670947551a30354f76c764
diff --git a/sec-policy/selinux-mplayer/selinux-mplayer-2.20180114-r2.ebuild b/sec-policy/selinux-mplayer/selinux-mplayer-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..fbc2e02fe8a6
--- /dev/null
+++ b/sec-policy/selinux-mplayer/selinux-mplayer-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 72bbe9045800..fbc2e02fe8a6 100644
--- a/sec-policy/selinux-mplayer/selinux-mplayer-9999.ebuild
+++ b/sec-policy/selinux-mplayer/selinux-mplayer-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-mrtg/Manifest b/sec-policy/selinux-mrtg/Manifest
index b19c216d3a7c..ccaddd120c16 100644
--- a/sec-policy/selinux-mrtg/Manifest
+++ b/sec-policy/selinux-mrtg/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-mrtg-2.20170805-r2.ebuild 278 BLAKE2B 77530246e34bd6bc9e6aa75be64
 EBUILD selinux-mrtg-2.20170805-r3.ebuild 278 BLAKE2B 77530246e34bd6bc9e6aa75be64c7f494a3101709163281615c5e9b20481b0a0fa67b4d9375543afb4e0682418f58c261cc4b850844668f935a308d94d5d535f SHA512 1043cc043022201617c95cf2d542b27342b899abf35496d947a58e8127cf0219b742aedaa2bdd9c3d57447d8b43ee02477bb0d70e19fd04fecf35b0c6014dff1
 EBUILD selinux-mrtg-2.20170805-r4.ebuild 280 BLAKE2B 7b6f1cbbc7b058158002c280fed4bbbaba63dcd48e9457e1a3d5d6900320e2e6b53502bd8fe560bcb4a45b46389b3506eeda42e6c736a820ca43ade1fa7ebdc1 SHA512 5d5f200e06f66d5ed63206d79ea234d6d8039bb55463848fd8b06f3459d998bc4b81d7fc39a595cfab11f2dc2ec6dfeb576d3fb44d65d0ab0fc510f9290d79ea
 EBUILD selinux-mrtg-2.20180114-r1.ebuild 278 BLAKE2B 28b5083c7616898794afd68e497effa237883572c58d065f6b631b3064522c3a6a82ef5c8ac20d91c4aff8ef747d2e544bfdbf669a1c0934238c68a4e8440d4e SHA512 1511e5d9a8a64e58c923b913363e57ede18261a54d3484566b96aefb2fd682c1115e09b0e0c436b8c8a98ab27b18231204fbce645575f583afdf22b0f8e820b2
-EBUILD selinux-mrtg-9999.ebuild 280 BLAKE2B 7b6f1cbbc7b058158002c280fed4bbbaba63dcd48e9457e1a3d5d6900320e2e6b53502bd8fe560bcb4a45b46389b3506eeda42e6c736a820ca43ade1fa7ebdc1 SHA512 5d5f200e06f66d5ed63206d79ea234d6d8039bb55463848fd8b06f3459d998bc4b81d7fc39a595cfab11f2dc2ec6dfeb576d3fb44d65d0ab0fc510f9290d79ea
+EBUILD selinux-mrtg-2.20180114-r2.ebuild 280 BLAKE2B 4eaa7b0378340dd55517c96aaac58fd8d8a8ee0645aa28625295ac9223668ae18db75f778b29885f32fda030d2867f3c1f827b954067594d5e630c99af68810b SHA512 0ccddae75c754c173ff0ba837664fe6988dca32909cf37f66fbad33b102d90817e9aabb7a2c4c01f708872449f96c3ea76009575aedab974f0fb6c49faed248f
+EBUILD selinux-mrtg-9999.ebuild 280 BLAKE2B 4eaa7b0378340dd55517c96aaac58fd8d8a8ee0645aa28625295ac9223668ae18db75f778b29885f32fda030d2867f3c1f827b954067594d5e630c99af68810b SHA512 0ccddae75c754c173ff0ba837664fe6988dca32909cf37f66fbad33b102d90817e9aabb7a2c4c01f708872449f96c3ea76009575aedab974f0fb6c49faed248f
 MISC metadata.xml 314 BLAKE2B 9869ea3f73a19aceef604cc504383d7fb45c1e011ee4839dcc946f9d15c50e57d23e3643f49613a321da719ee7ecd2ef775efddbe7e2bd7850dca89a0a7f31a7 SHA512 5e0e1440238a7083dbb60b7174c389296846c3a4a96e2f0136e197ecc47cd7c03ff6a59b9b30c92c5ec78ca046c021eb6af38575a8360a619e1ccb95fc85bed3
diff --git a/sec-policy/selinux-mrtg/selinux-mrtg-2.20180114-r2.ebuild b/sec-policy/selinux-mrtg/selinux-mrtg-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..5a3b8257ed47
--- /dev/null
+++ b/sec-policy/selinux-mrtg/selinux-mrtg-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 c968719ab67f..5a3b8257ed47 100644
--- a/sec-policy/selinux-mrtg/selinux-mrtg-9999.ebuild
+++ b/sec-policy/selinux-mrtg/selinux-mrtg-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-munin/Manifest b/sec-policy/selinux-munin/Manifest
index 210e48f1f5cc..8d88d9379b07 100644
--- a/sec-policy/selinux-munin/Manifest
+++ b/sec-policy/selinux-munin/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-munin-2.20170805-r2.ebuild 376 BLAKE2B d8341723f371168d765f82a399
 EBUILD selinux-munin-2.20170805-r3.ebuild 376 BLAKE2B d8341723f371168d765f82a399bfd9f9ef79a2665f89c043d7b6a0f54b9c9b898ad61ef15207787dbf6a614225f62688decb51b54ce864030949bdeacb160839 SHA512 d885e60ed3647382bf8f51231da453b039b9a49eefc8920433a06bf9b5720e6417b9ecaa1efac92290fe5c0f6359e2d33ff5194a89d25cfe24ec4f10e6931941
 EBUILD selinux-munin-2.20170805-r4.ebuild 378 BLAKE2B c0885925b8a581dfa7eb338f2891150da16c90ddb15095626a02204cd1919b7fef716978f566f545228af791c3b286a7cf110028a4cf8fbf530389dacaca519c SHA512 2ef5a45586a0358d10ec726f6c05059064b0f2955f5d537760c3f6369837e0b4522b4766054c7a641ca036015a05ab0b6cde589e6ce6c3b60eb35e504414e6ca
 EBUILD selinux-munin-2.20180114-r1.ebuild 376 BLAKE2B b481f500c3fb6034eaa30bb6a4a7f01f7de91df6fc6f90336d5cdaca4a3feb8960545d400267b1527369e9b30080d719483ae06ffeb8a85e54b9a554d20457f1 SHA512 429375708c60175af3f6c36213868a4ada2c79bc27e220aa664b9347219edf70d36ae6a86489b1e766c2aec5393418ad60160b8fa678fa187d1257c7a4a5c688
-EBUILD selinux-munin-9999.ebuild 378 BLAKE2B c0885925b8a581dfa7eb338f2891150da16c90ddb15095626a02204cd1919b7fef716978f566f545228af791c3b286a7cf110028a4cf8fbf530389dacaca519c SHA512 2ef5a45586a0358d10ec726f6c05059064b0f2955f5d537760c3f6369837e0b4522b4766054c7a641ca036015a05ab0b6cde589e6ce6c3b60eb35e504414e6ca
+EBUILD selinux-munin-2.20180114-r2.ebuild 378 BLAKE2B 84ec865cd89b81a185ea307cb5755cf9fe2e7751c37647fe53a403acda3c53650b280b8bcd02f393aa65cddf1849549b8434d15310f46c21124ed17ccee499fd SHA512 14f4a31bc763fba316ff87aa0c4cb42625d82720bd31d89cb4d7022e48f587ca34090cdb005bceb58c0da906b9093da557678addfb0f1e8fe16654cc242bf595
+EBUILD selinux-munin-9999.ebuild 378 BLAKE2B 84ec865cd89b81a185ea307cb5755cf9fe2e7751c37647fe53a403acda3c53650b280b8bcd02f393aa65cddf1849549b8434d15310f46c21124ed17ccee499fd SHA512 14f4a31bc763fba316ff87aa0c4cb42625d82720bd31d89cb4d7022e48f587ca34090cdb005bceb58c0da906b9093da557678addfb0f1e8fe16654cc242bf595
 MISC metadata.xml 315 BLAKE2B 5b0a30d9351d16aa2e63f73393208384826c5124f4da01c7f9b30ad696ce81f2cc2bf311986266f4138de5cc1b12b6dad882952948aa60d65616a7b03588d40e SHA512 e8b021d51d8fe289205ff90c3b3a955bb6445d492aae83b48d269e0b5773b813f9ef4a54776588f4c0135dde15d59560f558cc1d11a4d0d62f4720d656557c55
diff --git a/sec-policy/selinux-munin/selinux-munin-2.20180114-r2.ebuild b/sec-policy/selinux-munin/selinux-munin-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..fd86c50e8c82
--- /dev/null
+++ b/sec-policy/selinux-munin/selinux-munin-2.20180114-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 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 13ac5a6041ff..fd86c50e8c82 100644
--- a/sec-policy/selinux-munin/selinux-munin-9999.ebuild
+++ b/sec-policy/selinux-munin/selinux-munin-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-mutt/Manifest b/sec-policy/selinux-mutt/Manifest
index ae91f7186376..d61cc115c684 100644
--- a/sec-policy/selinux-mutt/Manifest
+++ b/sec-policy/selinux-mutt/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-mutt-2.20170805-r2.ebuild 278 BLAKE2B 1fc4b62346f74e32691f934baf1
 EBUILD selinux-mutt-2.20170805-r3.ebuild 278 BLAKE2B 1fc4b62346f74e32691f934baf1f65065267174204b8fe0fda7d288a13021472e6fac6cf65f4051f8b5e7855d7d504253df79086596318d4ce602c2341a4e2d0 SHA512 e0e48f228c67d8ea7d68af7b01e43e2b15be848c24afcf8144efce3ab442b5f6748e558cb0f20a05c8cc03e15bb5408f8ade9bb6e082f3aefa3782f9066282b4
 EBUILD selinux-mutt-2.20170805-r4.ebuild 280 BLAKE2B 2bf5e8b8289112f1b3caba114e708636492befdaa2856dc69e45755de4334bfeffde952261117a123a7f3efcd3612c57bc8bc7cac8b28c7f47c26039335ad092 SHA512 8fb2f9396012948682414c8b1a2ee4a36599e024cd0cd25848c4e7d5f5fcf5a9453319c989e06d26b3f1f539bdf377da8efe0b5384d39ae4080ea60907fbb98e
 EBUILD selinux-mutt-2.20180114-r1.ebuild 278 BLAKE2B 52fa750ef826ffe4e48fdca095b41a62b4dbd2a60cfd5be49527404732cbd756fdc27b74da6f2314792f4a95b819a0d9f51ee05600d36c1b2fb3ccec71e580ea SHA512 7471e159b7603e7b096d4a6013507f46e2704813ea16eac89be1a859ecf155663b233380f88cfcec983dd1d8b9aa8e70d097d9b991d00c5bf8b3a003d5a0ce53
-EBUILD selinux-mutt-9999.ebuild 280 BLAKE2B 2bf5e8b8289112f1b3caba114e708636492befdaa2856dc69e45755de4334bfeffde952261117a123a7f3efcd3612c57bc8bc7cac8b28c7f47c26039335ad092 SHA512 8fb2f9396012948682414c8b1a2ee4a36599e024cd0cd25848c4e7d5f5fcf5a9453319c989e06d26b3f1f539bdf377da8efe0b5384d39ae4080ea60907fbb98e
+EBUILD selinux-mutt-2.20180114-r2.ebuild 280 BLAKE2B be593f9696e8366b7eeb8bdddf9b8602d730af3fc053171e9dd4ff45c7f113ac01ec218c5751fc6b015591a5ec74845b8c84dc0c4ccd16895f6977747a34affc SHA512 557c68371585154e36bf0701617856c5228e62d60ea9487c6ebc3f80dd94a14bf9c11f0131b1d6a87424359a76dfeac9ca4003afb839190e2359b466d50fae2c
+EBUILD selinux-mutt-9999.ebuild 280 BLAKE2B be593f9696e8366b7eeb8bdddf9b8602d730af3fc053171e9dd4ff45c7f113ac01ec218c5751fc6b015591a5ec74845b8c84dc0c4ccd16895f6977747a34affc SHA512 557c68371585154e36bf0701617856c5228e62d60ea9487c6ebc3f80dd94a14bf9c11f0131b1d6a87424359a76dfeac9ca4003afb839190e2359b466d50fae2c
 MISC metadata.xml 314 BLAKE2B 14db2b3469abab7da356b04aae1da84b6edcd11ad35130d2f1c1f2f4d287acf97e205539450052fab29c5b9fc9276626e1594096b8ae251ed06abc918e686b47 SHA512 87a3948b2f9708c5516bb4141e5673d45390ed2b0bc3e49ebc8298c7177abb1c3a99442d60d22d99fcc13d08251fef29efd9bda3ea14eb588164209eab2c4c4c
diff --git a/sec-policy/selinux-mutt/selinux-mutt-2.20180114-r2.ebuild b/sec-policy/selinux-mutt/selinux-mutt-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..2f811eb9e42e
--- /dev/null
+++ b/sec-policy/selinux-mutt/selinux-mutt-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 f7c456f1ff19..2f811eb9e42e 100644
--- a/sec-policy/selinux-mutt/selinux-mutt-9999.ebuild
+++ b/sec-policy/selinux-mutt/selinux-mutt-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-mysql/Manifest b/sec-policy/selinux-mysql/Manifest
index b8039f385e66..513e6ec5d829 100644
--- a/sec-policy/selinux-mysql/Manifest
+++ b/sec-policy/selinux-mysql/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-mysql-2.20170805-r2.ebuild 280 BLAKE2B e6505cdc0b6295320842c4ebf9
 EBUILD selinux-mysql-2.20170805-r3.ebuild 280 BLAKE2B e6505cdc0b6295320842c4ebf99667b8758f70084198a9b41918eac13d0b63b3157280bee9bef9954c2d54363e53d8c8f4b59b6e38b3cd9b371700226c5865ea SHA512 0228577662f0b5abcceaa6e626e1787c1a31f0953857b7573e78f503db5b966e3f44f17711b648f0a7cfebd8c454b31659fe94336696383f45d8db0f8a5d98dd
 EBUILD selinux-mysql-2.20170805-r4.ebuild 282 BLAKE2B fe90fb44eb3a59075fe4f6f7f3166d56cb046912772dff61e7bb6b903cfc3e3b51f158c5265be47268ba64686f625185fbd17c6e10cc6787ae6af0ccd8938066 SHA512 e85312159a9f05c78f9e65525e245f818aab9542fad5d492cb803ee6dcc97dea037dbeed32413774e5b3ba40ccc4d58f764afa533fe833349da26ae6c0c3b6b3
 EBUILD selinux-mysql-2.20180114-r1.ebuild 280 BLAKE2B 27edb8a2dcd31a47fff86745180f162f21281f7953cc7b509f5291dbfff1372c0a134cedde4d13ea5d0d3a00e0de2f681787ddb5cd9468203ff0c762651ac81b SHA512 8acdda96c3df4169e81260ab48fb7f5168e130bd90d99c874fb1bdc28fcf25a3473645dd27f4a4b6ecd55f2ed2e5693bbdc55f82ccfbc8e82d2abb3a71e46b23
-EBUILD selinux-mysql-9999.ebuild 282 BLAKE2B fe90fb44eb3a59075fe4f6f7f3166d56cb046912772dff61e7bb6b903cfc3e3b51f158c5265be47268ba64686f625185fbd17c6e10cc6787ae6af0ccd8938066 SHA512 e85312159a9f05c78f9e65525e245f818aab9542fad5d492cb803ee6dcc97dea037dbeed32413774e5b3ba40ccc4d58f764afa533fe833349da26ae6c0c3b6b3
+EBUILD selinux-mysql-2.20180114-r2.ebuild 282 BLAKE2B 69aa3df600c88406291e4248b14b2bc99a0fefe7042498eb8cf1db770ad14c1b5f5731c31362ec27a35dfc69caedbb271e32e6b858328e53befdde1b4b19f1b8 SHA512 b7701d44f0fa344f79a1a045dee3fc556e2215950fbdd36317a90d67518ebadb8cd3e189ffa921b0e4af0944c63177bde77e1c3ac95c679ae5d821ad65e3bbc2
+EBUILD selinux-mysql-9999.ebuild 282 BLAKE2B 69aa3df600c88406291e4248b14b2bc99a0fefe7042498eb8cf1db770ad14c1b5f5731c31362ec27a35dfc69caedbb271e32e6b858328e53befdde1b4b19f1b8 SHA512 b7701d44f0fa344f79a1a045dee3fc556e2215950fbdd36317a90d67518ebadb8cd3e189ffa921b0e4af0944c63177bde77e1c3ac95c679ae5d821ad65e3bbc2
 MISC metadata.xml 315 BLAKE2B dd4dc39a65cad0c1af7fa9d63bed6b0b4be0672149b9992dacb6b348e171bd857b53040ff3ce253c76104016ac41ede91956b4ff0f2962e4874eaf0ef870ea26 SHA512 aafeb5465f6e05bf143959c7964e5539bea915238572612d6b6cd118a30ea57fca14735e70d4a39fee37a5203cd160988c830653fb2cd751cf4e14acc6f78508
diff --git a/sec-policy/selinux-mysql/selinux-mysql-2.20180114-r2.ebuild b/sec-policy/selinux-mysql/selinux-mysql-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..367f1ee95c27
--- /dev/null
+++ b/sec-policy/selinux-mysql/selinux-mysql-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 dfc625b9d286..367f1ee95c27 100644
--- a/sec-policy/selinux-mysql/selinux-mysql-9999.ebuild
+++ b/sec-policy/selinux-mysql/selinux-mysql-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-nagios/Manifest b/sec-policy/selinux-nagios/Manifest
index debd21826d9d..cb77f87079fd 100644
--- a/sec-policy/selinux-nagios/Manifest
+++ b/sec-policy/selinux-nagios/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-nagios-2.20170805-r2.ebuild 378 BLAKE2B ebd99bb11d4fb3420de5a5c6e
 EBUILD selinux-nagios-2.20170805-r3.ebuild 378 BLAKE2B ebd99bb11d4fb3420de5a5c6e9ed7173aae11e8b6c17baeaec1f05646bef4a1154b715ddf7386762da090a62aa2431ca804fde9007965b5b75a608684a801f3c SHA512 585b34ef2cb0cb77a2a2840b6c0ae944e27bf70d725e81fffc833b1e8a2976fbba853dc0a783d7f987c1fae144f7b5ade908223e50c07cd1e3da35751c2ccab8
 EBUILD selinux-nagios-2.20170805-r4.ebuild 380 BLAKE2B 3f07aeec380a2590d04968a8c48c1f1b58995e9e95a416b9fb4fe92ed6fb4727d2beb01d0ba8cec192a57c0b0d604f1ba0878c2088fe1c1caca2e3479f4873ee SHA512 38f297aee1e79711a0fc7443ced989e0f44a89f1be14ad206db920a2469cca4dc96051befa3a52b4bf988e8580975573b52d9a8539543033becd2adec8894ed9
 EBUILD selinux-nagios-2.20180114-r1.ebuild 378 BLAKE2B 32ad3d8cdef590cb43a54ef3137932ba1a61a1a614944fe6c99beeadb2be608f50c3c8d3d67a14d7fe6aebedfb59cae2916258ad2c121187e374737358601a9e SHA512 e7566bfcb434de97cdc577f82920296859c8e2e1ac9d173e1b1c226e0638faf95cf82ba9c2c2f2fe01c06bd94d91b89aa7626fb6b753a30ef5b52d4ccb0af411
-EBUILD selinux-nagios-9999.ebuild 380 BLAKE2B 3f07aeec380a2590d04968a8c48c1f1b58995e9e95a416b9fb4fe92ed6fb4727d2beb01d0ba8cec192a57c0b0d604f1ba0878c2088fe1c1caca2e3479f4873ee SHA512 38f297aee1e79711a0fc7443ced989e0f44a89f1be14ad206db920a2469cca4dc96051befa3a52b4bf988e8580975573b52d9a8539543033becd2adec8894ed9
+EBUILD selinux-nagios-2.20180114-r2.ebuild 380 BLAKE2B ce2fdc7a1acb4930ac92d88a46367e2ad14442979c04a66ed29fedbb0c5fcfbdaeaed9915df1d061a6082285173a475d5829eab59b7bb4fac01b86f3536b220a SHA512 087555cdd22fa69d09ef4ecf40d231619ef505f825892d08acc02e8e03351e670876a1046ccc6768bef744de86e789770f07075251817845fb2ce6688a8a8ba0
+EBUILD selinux-nagios-9999.ebuild 380 BLAKE2B ce2fdc7a1acb4930ac92d88a46367e2ad14442979c04a66ed29fedbb0c5fcfbdaeaed9915df1d061a6082285173a475d5829eab59b7bb4fac01b86f3536b220a SHA512 087555cdd22fa69d09ef4ecf40d231619ef505f825892d08acc02e8e03351e670876a1046ccc6768bef744de86e789770f07075251817845fb2ce6688a8a8ba0
 MISC metadata.xml 316 BLAKE2B 73f32348443cb66f5d8274a05c1993b656d2be9d4c10ede6269793703d156ecf50259c73ff79b11af06aabd9c16c6d69ad875c38dab97c55072301748f8c6d61 SHA512 d41b531c5f7456da060d2d335d0f9e8ac94c307127b3124e9ce6e1c92a9ce6fa5cbfcc7fc2e62ec51d15e966b43f50b8006ee95422cc790a4c17a1a9000dc9f5
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20180114-r2.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..5bf419cc42d4
--- /dev/null
+++ b/sec-policy/selinux-nagios/selinux-nagios-2.20180114-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 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 6390a69a57ce..5bf419cc42d4 100644
--- a/sec-policy/selinux-nagios/selinux-nagios-9999.ebuild
+++ b/sec-policy/selinux-nagios/selinux-nagios-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-ncftool/Manifest b/sec-policy/selinux-ncftool/Manifest
index d63afc631872..71abbdac3d89 100644
--- a/sec-policy/selinux-ncftool/Manifest
+++ b/sec-policy/selinux-ncftool/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-ncftool-2.20170805-r2.ebuild 284 BLAKE2B 07da67bad2e2f5210931e563
 EBUILD selinux-ncftool-2.20170805-r3.ebuild 284 BLAKE2B 07da67bad2e2f5210931e563ccb59e19eac44a6b3c8dfab93d404bbbedfe7eb46765cb2a40cfb7dfe3cd10d3ed7dd9a05b69f177ab030efd78ad0b5a266e2707 SHA512 8c945683087679f651ad7e478a502f478dac525571466eb37a242a92f1564d0fe0d0fe71041e8d13867f8b7d7d560beb9c5c0962448a15c184314633dca587e0
 EBUILD selinux-ncftool-2.20170805-r4.ebuild 286 BLAKE2B 855c2e2aca46d9f3d73b18d29cc167ea30af8e0731ab74ba0b835ea3c9f904d95041d0da21433722dbf5d60e1905762f99b0de9a0291da6b5d3080b9d4a68d3c SHA512 538ce4a1822228fb5bffa8e73569d7fbc9e1d5c9fb7c8dc164a10c7f748bad4c8d9a25171ff03a964b76616e62ea2fb4c388ec1c588058d795f640077610797c
 EBUILD selinux-ncftool-2.20180114-r1.ebuild 284 BLAKE2B 0d284f1fadabba54c50d1f1d6cbbcba94e45e53b98a38b27e24398caf6fbcfaa278417f76a2ad5cb39a0c4afceec474acd5db76aba4355af3e39dd416a36d9ab SHA512 d8240aa1818324ab80e184f523c91ad07bd0b31c222a3adbb69cd5f87bdc9672f3d1e583625e363a25301a702d4c5e7970d38d8d5dbdecf7729f9c5b7a82dc5a
-EBUILD selinux-ncftool-9999.ebuild 286 BLAKE2B 855c2e2aca46d9f3d73b18d29cc167ea30af8e0731ab74ba0b835ea3c9f904d95041d0da21433722dbf5d60e1905762f99b0de9a0291da6b5d3080b9d4a68d3c SHA512 538ce4a1822228fb5bffa8e73569d7fbc9e1d5c9fb7c8dc164a10c7f748bad4c8d9a25171ff03a964b76616e62ea2fb4c388ec1c588058d795f640077610797c
+EBUILD selinux-ncftool-2.20180114-r2.ebuild 286 BLAKE2B 5b097eaa6f20b5687416c32d100233a26b9a378e7efcb250e8605cc88533c8abd698b05b516c04c5b12740ff305f43535a1c0021e72fada8a840fa05b98ec892 SHA512 c9b0322af75ddf288a0ab2c56c693f400c8e437cefbc7231b5633776608678fd4a528264ac4bfc499f95b6884b6ce1719fbfb9650664536078b2ae5b8bcd85fc
+EBUILD selinux-ncftool-9999.ebuild 286 BLAKE2B 5b097eaa6f20b5687416c32d100233a26b9a378e7efcb250e8605cc88533c8abd698b05b516c04c5b12740ff305f43535a1c0021e72fada8a840fa05b98ec892 SHA512 c9b0322af75ddf288a0ab2c56c693f400c8e437cefbc7231b5633776608678fd4a528264ac4bfc499f95b6884b6ce1719fbfb9650664536078b2ae5b8bcd85fc
 MISC metadata.xml 317 BLAKE2B 65121da87d0f50d6b1309c953c5e8c3afb350072b70d71f7f25363e8286da650d8c4be29f2fd11056ecec3d2441838d6046cbc89e5e12fe6ca60e24f02cfecf8 SHA512 672a4431cf13c8b31c165ef0a1cb0020b1e5ce4106169661f9f55374178fa961c960096d4d4f4a628d8c15789ea1f0b693ac5872f46765e2f7526dc11f8ad30c
diff --git a/sec-policy/selinux-ncftool/selinux-ncftool-2.20180114-r2.ebuild b/sec-policy/selinux-ncftool/selinux-ncftool-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..a941042f000e
--- /dev/null
+++ b/sec-policy/selinux-ncftool/selinux-ncftool-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 ce074baad76b..a941042f000e 100644
--- a/sec-policy/selinux-ncftool/selinux-ncftool-9999.ebuild
+++ b/sec-policy/selinux-ncftool/selinux-ncftool-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-nessus/Manifest b/sec-policy/selinux-nessus/Manifest
index 95a497a2e348..dd5cedd3ec96 100644
--- a/sec-policy/selinux-nessus/Manifest
+++ b/sec-policy/selinux-nessus/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-nessus-2.20170805-r2.ebuild 282 BLAKE2B 15bd665d8dc95835f40e786e7
 EBUILD selinux-nessus-2.20170805-r3.ebuild 282 BLAKE2B 15bd665d8dc95835f40e786e79dc6029b83a13e4adf2802968acd2a460dc98d64d113d692e5373471eee3e6cdd6c7db46e0ceaa5f82f7a9e1143b29a5b189b1a SHA512 12186be6580a7cb9bf5b2c31eb04ddd3313ff917bef69b48ed741594c1419f12a53c2363d01338d72ee9357055b84060f2a793e5c4422980e7f036c5c933b97b
 EBUILD selinux-nessus-2.20170805-r4.ebuild 284 BLAKE2B 691d877fb185be09bdb710de4af555eb3436282ddaf8ee95b24031e1096cd2ce953ee6f8951ad4bc5a5e7d2feaf5cf6ca0c9453f7c774aa5fa246d611e17e201 SHA512 6e4ba774c8d084c07665c45883c36838c079053764b494d2981f7ff80dad1e61ba2dcb81fbdfb2ab7a4d868d0a1c00ec820cf3221a5bcbabeb1a7654104b0627
 EBUILD selinux-nessus-2.20180114-r1.ebuild 282 BLAKE2B d18284f3594c77a5d22e4cce61c2450f4d64db624e106732a0875f4138981742907719fed65d8156a2deecec9d86e7e255b141abd108fbd592fc10bb83b6a52a SHA512 b9cfffa3f5b5a67d35ff8c5f04ab65034d80afe5304591a48232129b1e5bbc51a605a8bbe58f73f9453219df8e770c5384fa715b2257d4f9e910717329283310
-EBUILD selinux-nessus-9999.ebuild 284 BLAKE2B 691d877fb185be09bdb710de4af555eb3436282ddaf8ee95b24031e1096cd2ce953ee6f8951ad4bc5a5e7d2feaf5cf6ca0c9453f7c774aa5fa246d611e17e201 SHA512 6e4ba774c8d084c07665c45883c36838c079053764b494d2981f7ff80dad1e61ba2dcb81fbdfb2ab7a4d868d0a1c00ec820cf3221a5bcbabeb1a7654104b0627
+EBUILD selinux-nessus-2.20180114-r2.ebuild 284 BLAKE2B 69194a944ae5e6352b983a40f8a434cac6e391e55a49c860e1c10e65ac7eecefbc0940b9768c827bc6d8482056b029dbb927f0424af73f79c3c93d99482fb9c6 SHA512 223d3bb566eaaff5f6d7a268a87e59105793412a029972b5663d3f2526fb6815dcdf42f1938e4adc3f68ed9b51de25dd55071de90c7c2eaf97ebb109004fb6aa
+EBUILD selinux-nessus-9999.ebuild 284 BLAKE2B 69194a944ae5e6352b983a40f8a434cac6e391e55a49c860e1c10e65ac7eecefbc0940b9768c827bc6d8482056b029dbb927f0424af73f79c3c93d99482fb9c6 SHA512 223d3bb566eaaff5f6d7a268a87e59105793412a029972b5663d3f2526fb6815dcdf42f1938e4adc3f68ed9b51de25dd55071de90c7c2eaf97ebb109004fb6aa
 MISC metadata.xml 316 BLAKE2B 7bb5aceefc53184451f08c1277171170110d3b9e82ce9785c14cca1c007e4e0dbd28e6904147119c14ddec710f804f95f28875da90422153aa1eb59c8f6ae4fd SHA512 b7f0c0e49c6a43610f87535899fb40b6b9fc73b3f4e4aaaa405764ee2268a3fad518d4fd696b57b505c3729460298eed3a9eb454dbeb8d4f9814ee2ff53438b4
diff --git a/sec-policy/selinux-nessus/selinux-nessus-2.20180114-r2.ebuild b/sec-policy/selinux-nessus/selinux-nessus-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..e3e8e63caa48
--- /dev/null
+++ b/sec-policy/selinux-nessus/selinux-nessus-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 c1601de1831a..e3e8e63caa48 100644
--- a/sec-policy/selinux-nessus/selinux-nessus-9999.ebuild
+++ b/sec-policy/selinux-nessus/selinux-nessus-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-networkmanager/Manifest b/sec-policy/selinux-networkmanager/Manifest
index 1715a347ce96..354718cdc5f8 100644
--- a/sec-policy/selinux-networkmanager/Manifest
+++ b/sec-policy/selinux-networkmanager/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-networkmanager-2.20170805-r2.ebuild 298 BLAKE2B 339c04c781e3c3e05
 EBUILD selinux-networkmanager-2.20170805-r3.ebuild 298 BLAKE2B 339c04c781e3c3e057a51b8b4259364fb0259350b7f5237b11ae0f45ce8529a8c6bb16c5834037d82123939f41ce71aee48dc1721bb234105dd31cec233f3668 SHA512 584115fe63798d8a87ab46738f5adadfa16f343dc6c8c493e782ff6ce5a46708433925632e9227c924be6e5aa6194950a8ec06cbdbe1afe570f3b370833bbf5f
 EBUILD selinux-networkmanager-2.20170805-r4.ebuild 300 BLAKE2B 58563954614138e607abbefbb86e666356c9cfcdeb08c34fb346bf8f9ebec9d4aafcca230ed1aae1b84e64ffb5463b863e152a113422f7cb9903d03c13901d3b SHA512 1be3601ab5eb808ca587356a3084ca5bb8b2896b84663f673742d92ac537479715520e326f1066e26134170c451055648cd6d36487cb4f7ccfbdf42d6b620115
 EBUILD selinux-networkmanager-2.20180114-r1.ebuild 298 BLAKE2B e735f37707ddfca78370dadfe6f3b8852124e9916175c29ee4533045d20c71e3da8d798ca84f92858308e7053698b60b7308642b22f17d6a1b96136aa88891e4 SHA512 812f52848f4f2bbb936955fc9dec7d1ce0601b6ab57f0c5a41b2fdb5a2fdcd633faac666255d03797fa4b02eb97db0eebccc50731d6dbf62d16d9eaec2edb053
-EBUILD selinux-networkmanager-9999.ebuild 300 BLAKE2B 58563954614138e607abbefbb86e666356c9cfcdeb08c34fb346bf8f9ebec9d4aafcca230ed1aae1b84e64ffb5463b863e152a113422f7cb9903d03c13901d3b SHA512 1be3601ab5eb808ca587356a3084ca5bb8b2896b84663f673742d92ac537479715520e326f1066e26134170c451055648cd6d36487cb4f7ccfbdf42d6b620115
+EBUILD selinux-networkmanager-2.20180114-r2.ebuild 300 BLAKE2B 9c79fbd5dffedddeb6cafb053bc099a57ad49d5c017ff80beda40d8cb38424c031bce948673d23a609a056881d944380812d614aad64fcec156dfe76feaf5240 SHA512 f10f062359a20f2c274b17a624ca9e8527688e1da5d04d03506698c4f2c8171b868d782089925448640bcc124701848c0e00d3a83d93863ed59761194a149617
+EBUILD selinux-networkmanager-9999.ebuild 300 BLAKE2B 9c79fbd5dffedddeb6cafb053bc099a57ad49d5c017ff80beda40d8cb38424c031bce948673d23a609a056881d944380812d614aad64fcec156dfe76feaf5240 SHA512 f10f062359a20f2c274b17a624ca9e8527688e1da5d04d03506698c4f2c8171b868d782089925448640bcc124701848c0e00d3a83d93863ed59761194a149617
 MISC metadata.xml 324 BLAKE2B 11f974ba31e403c660eee09c59b4c8489665237b205e4a7e5a919293046575b69d76ce1bbea199342160f6c5c0d39698eba27a2c08ced09e7e9ca814b382cf34 SHA512 310ecd0be68aece22be60ec8d52fcf6fab187d9bb70300e9e7ebab713a0191f770b1fabd836d4f7af6ce351d7a8e6d03ef9cf8dde07afcbfbe86d1dae1fdcd5a
diff --git a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20180114-r2.ebuild b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..a6052e7f0e44
--- /dev/null
+++ b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 684e79d51dd7..a6052e7f0e44 100644
--- a/sec-policy/selinux-networkmanager/selinux-networkmanager-9999.ebuild
+++ b/sec-policy/selinux-networkmanager/selinux-networkmanager-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-nginx/Manifest b/sec-policy/selinux-nginx/Manifest
index 2367e2071030..528b4c809ff3 100644
--- a/sec-policy/selinux-nginx/Manifest
+++ b/sec-policy/selinux-nginx/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-nginx-2.20170805-r2.ebuild 375 BLAKE2B 2963f2a6b00e3d10bb8be87ab6
 EBUILD selinux-nginx-2.20170805-r3.ebuild 375 BLAKE2B 2963f2a6b00e3d10bb8be87ab6dde3e1d979404fe1ae064daca13856a36461f42aa4e74b3fe333d33f6b4d34efdc39b1b065e77963f7f28e45ed8db2f8c43ea3 SHA512 f1e634f29eb323a8f9826eef0bd666dc53ad6b26a2cf5d9fa99b5f92e2a41a0834600ae4b93523d5c8ede69e6e177f16ad275a17c5577516bfe0cc692c268d76
 EBUILD selinux-nginx-2.20170805-r4.ebuild 377 BLAKE2B 391ebfdd30ce7bb2cfd281224b9783a36e3e3771141d6ce79a3607b411fa656ebe9fb358cc2cfdd55f7db98fe35a95d9dc23cd89e5438882c67358ffa4649b9e SHA512 7d5b7465ac1eb32622eaaa4810a22af37f01d3b0bf04d506db3418677f802934928299467f20a8832b706a1e976930e7d8e4a2d6c00e0f579c7c1ce4646d534a
 EBUILD selinux-nginx-2.20180114-r1.ebuild 375 BLAKE2B a40891117ba673f44c6e7704108005dc1cdb8a51dde5af12659956c4fc294c66bf0558415b656ef4390a4fbd04b96cbe1dd003c16b9ccd15d87c2a8862dd0bed SHA512 896d5281b76ec286757fd8435f01022694b4055d4a5083475987c3d1a4f1c4294a43bb547157936e2a27e0cbf54559b01557f864363b72cdb0f3b4ac1f0dfcda
-EBUILD selinux-nginx-9999.ebuild 377 BLAKE2B 391ebfdd30ce7bb2cfd281224b9783a36e3e3771141d6ce79a3607b411fa656ebe9fb358cc2cfdd55f7db98fe35a95d9dc23cd89e5438882c67358ffa4649b9e SHA512 7d5b7465ac1eb32622eaaa4810a22af37f01d3b0bf04d506db3418677f802934928299467f20a8832b706a1e976930e7d8e4a2d6c00e0f579c7c1ce4646d534a
+EBUILD selinux-nginx-2.20180114-r2.ebuild 377 BLAKE2B eda273645dca0d1db66f755b44ac36ff55427ec225ac242ce305e85bcfde41df960a3a00ecb16327519b61b82ec203dca056eef0c2c180c7182e2464df8f11c9 SHA512 eadb4bb94e96f8cb80a1a41bdba50dae50c990391d37fecc08a1fe50236d6b747a7087e8aa2a7cb4ecfb067f43554e65d98b3d589c326b3db72ac9e863d55baa
+EBUILD selinux-nginx-9999.ebuild 377 BLAKE2B eda273645dca0d1db66f755b44ac36ff55427ec225ac242ce305e85bcfde41df960a3a00ecb16327519b61b82ec203dca056eef0c2c180c7182e2464df8f11c9 SHA512 eadb4bb94e96f8cb80a1a41bdba50dae50c990391d37fecc08a1fe50236d6b747a7087e8aa2a7cb4ecfb067f43554e65d98b3d589c326b3db72ac9e863d55baa
 MISC metadata.xml 315 BLAKE2B 19c860410de694561fa09b50d87c5ea3290bb66c7b9b587c3a28e245d858519d10ac0e303b1038e1f9a3b9f9401425876d59f286289ffa657d06449f7cd7054a SHA512 3728836b5b16fc9d04bb74db4e7f0f9ab5418e3831c54ff56af4c65b7d3cfda5c1e710b5ed79766e08e0a978b744b0fe658644fb66e88776886a44296ea70f02
diff --git a/sec-policy/selinux-nginx/selinux-nginx-2.20180114-r2.ebuild b/sec-policy/selinux-nginx/selinux-nginx-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..250ecf0ab249
--- /dev/null
+++ b/sec-policy/selinux-nginx/selinux-nginx-2.20180114-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 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 926ca451833e..250ecf0ab249 100644
--- a/sec-policy/selinux-nginx/selinux-nginx-9999.ebuild
+++ b/sec-policy/selinux-nginx/selinux-nginx-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-nslcd/Manifest b/sec-policy/selinux-nslcd/Manifest
index c28c17d91f4c..e4bbee5ae1d6 100644
--- a/sec-policy/selinux-nslcd/Manifest
+++ b/sec-policy/selinux-nslcd/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-nslcd-2.20170805-r2.ebuild 280 BLAKE2B 15859a5bd809c5622a8a30dfb0
 EBUILD selinux-nslcd-2.20170805-r3.ebuild 280 BLAKE2B 15859a5bd809c5622a8a30dfb0acfacefe7543099a551a41803d96745f5f1ff8e0e4c7c54f1cca1f2f12e296d4c252c6101505b5ca6d37ade8b7799fa8d4864d SHA512 5692c7420601ef83861b6b59b5ad5c7775e88c236d1ae27b2f3ca704ef44fc3e5d3146dbd1b2e49efc66292422a7e147c4937f6feb59eab78a732f689c551585
 EBUILD selinux-nslcd-2.20170805-r4.ebuild 282 BLAKE2B fbe41d1d3b835e628aaeadc4b68952dce685faf4a9c20577404ae9f2c9815c8b986420f2b81da8c48e375dca684778f57d305f5df0ce65a635ec17ce9732826d SHA512 62b491afab24fd6d650482d99c3e5f8ed1a12fd9d0a8e720ac8344db02b954571c017748a29a6c6a4407272bd5e75ad5d658359bad3907fb25cb98667b9186d7
 EBUILD selinux-nslcd-2.20180114-r1.ebuild 280 BLAKE2B dc966dc0edcd24aa8a1b93d2f4880b7ceb55ac54b97b54ee4ac8b149e50af619dac7478d525f47be3474ec6b2fadf25f8f61c9d1e136a643ca6ad08d6b41f99e SHA512 20a1a923ff9b473310462201f8bc646803885fd6032c7ba435075545dada24d33a0be8c40c34f37f79d14c0d52eef0baa72438d68ef4e5e81f864c735d827e07
-EBUILD selinux-nslcd-9999.ebuild 282 BLAKE2B fbe41d1d3b835e628aaeadc4b68952dce685faf4a9c20577404ae9f2c9815c8b986420f2b81da8c48e375dca684778f57d305f5df0ce65a635ec17ce9732826d SHA512 62b491afab24fd6d650482d99c3e5f8ed1a12fd9d0a8e720ac8344db02b954571c017748a29a6c6a4407272bd5e75ad5d658359bad3907fb25cb98667b9186d7
+EBUILD selinux-nslcd-2.20180114-r2.ebuild 282 BLAKE2B c39f1955471d6461445ae1462f37ca55faef4b0afe9320665e0e6198e56b36e7fe7d9be0e9971d5ec191022556b74d09b1d69bda6ae6f485ccdc4b3aa312264a SHA512 bfb2c839f9694da97e55f0a16592ba60115e58e0d2590ef026a8d04c194513d8adc92d9ba24bc288fb80dcab75d2acb08763680ceb52c19f438350e8218e2301
+EBUILD selinux-nslcd-9999.ebuild 282 BLAKE2B c39f1955471d6461445ae1462f37ca55faef4b0afe9320665e0e6198e56b36e7fe7d9be0e9971d5ec191022556b74d09b1d69bda6ae6f485ccdc4b3aa312264a SHA512 bfb2c839f9694da97e55f0a16592ba60115e58e0d2590ef026a8d04c194513d8adc92d9ba24bc288fb80dcab75d2acb08763680ceb52c19f438350e8218e2301
 MISC metadata.xml 315 BLAKE2B ce1a4e8077f570bc9e064e31bb38711eaa068f8d94c20de64c1b631ec94979b5a9075c59599cc14692c26c0985c4dd5b15081a640aab5bc887f2faab694e1090 SHA512 c347218b8973a5e113fd27cbfdbc3f7b0f19938714ea7ac0896f1d3755aebee20409a94ecd8ada8131e7e4bee1e3286f81bd1129bdb4d27cbf10cd88fbefba78
diff --git a/sec-policy/selinux-nslcd/selinux-nslcd-2.20180114-r2.ebuild b/sec-policy/selinux-nslcd/selinux-nslcd-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..32a1b1cd1c32
--- /dev/null
+++ b/sec-policy/selinux-nslcd/selinux-nslcd-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 1911d5845dd7..32a1b1cd1c32 100644
--- a/sec-policy/selinux-nslcd/selinux-nslcd-9999.ebuild
+++ b/sec-policy/selinux-nslcd/selinux-nslcd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-ntop/Manifest b/sec-policy/selinux-ntop/Manifest
index 8d868496bd1d..5ce959bfa2e3 100644
--- a/sec-policy/selinux-ntop/Manifest
+++ b/sec-policy/selinux-ntop/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-ntop-2.20170805-r2.ebuild 278 BLAKE2B c7de878174130ba91c82a23f9d6
 EBUILD selinux-ntop-2.20170805-r3.ebuild 278 BLAKE2B c7de878174130ba91c82a23f9d60e973a12961bcd48a90d748db53c6ae215d4dab95a0d6078acc028ce68228dc468185e6241915cbfd04823b51f30b085a9a2a SHA512 f835ddfc67c38bec8dceba95ba11039eb4b6608e02ba2f0a8ec4bbf77091c43bbf89b7d7c06ec3c444933cd25b0a0df9276844cc183f164a00d5b73338b145f1
 EBUILD selinux-ntop-2.20170805-r4.ebuild 280 BLAKE2B 219ca383ed452c8c1a209f0334721443ef22825e1714b3bf7d2761a44622ba2dcbfdb62e0a6d725e30becebf52b8cc22e41b6d46a19a522d9f10b8738b024a2e SHA512 01c602a12217535d87d254634f1ab5e8616027b696b06333ed7a2b3b251e8584bbca57067dce866af16a8f4ec3e550f7470f245e3a51c23dbcda08d6ea45555e
 EBUILD selinux-ntop-2.20180114-r1.ebuild 278 BLAKE2B 2284810124a60ecfbd65c57ae9ef848432d214048f0e1ee7435aec669fd6b92fa93bc581c814810ca1218a99bd0b46a2abdbb8b8ebc94cb2da6d0ad359bf89e0 SHA512 4391a137f0d4741e1ca81473056883831ac93d53be6b1d034329250942e3710f315c4db8ae18c68de90f1fbd8f2cd814ec7dac2c0abe39b2f1ab0b3fd18b4591
-EBUILD selinux-ntop-9999.ebuild 280 BLAKE2B 219ca383ed452c8c1a209f0334721443ef22825e1714b3bf7d2761a44622ba2dcbfdb62e0a6d725e30becebf52b8cc22e41b6d46a19a522d9f10b8738b024a2e SHA512 01c602a12217535d87d254634f1ab5e8616027b696b06333ed7a2b3b251e8584bbca57067dce866af16a8f4ec3e550f7470f245e3a51c23dbcda08d6ea45555e
+EBUILD selinux-ntop-2.20180114-r2.ebuild 280 BLAKE2B 286a5b459f8e6ddb3181b74c107560f6f04b0b673ef1016e3451b0040228cc32df1f7395c0d321b426a41277b18c94fbbfee7d5d2e47d48fbe104482b330b04a SHA512 c58a97c1025011aa96d5bde92646aef74d6a577beda85882b2f0da80678890b56834d05b0dcb65fc0bacce103b5307bcb164b52a55a8865e18c869d830d13b23
+EBUILD selinux-ntop-9999.ebuild 280 BLAKE2B 286a5b459f8e6ddb3181b74c107560f6f04b0b673ef1016e3451b0040228cc32df1f7395c0d321b426a41277b18c94fbbfee7d5d2e47d48fbe104482b330b04a SHA512 c58a97c1025011aa96d5bde92646aef74d6a577beda85882b2f0da80678890b56834d05b0dcb65fc0bacce103b5307bcb164b52a55a8865e18c869d830d13b23
 MISC metadata.xml 314 BLAKE2B 566f04094da0302734856467282a2e4471d3602732a35368e8a92520919ce926c51f8c6c0e86cecce5914b40a4d885e67d365430bfa73fd0c0ca94799908f6d5 SHA512 c8b7f3a30b340a90da32b188b2ea37ea243e11843aa69310c49e2b2f7e69556c77f96e5f2f9355dca5d46d3c3fa6899f1732e14ff43e6173413aa06fe974333f
diff --git a/sec-policy/selinux-ntop/selinux-ntop-2.20180114-r2.ebuild b/sec-policy/selinux-ntop/selinux-ntop-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..818cd6a734df
--- /dev/null
+++ b/sec-policy/selinux-ntop/selinux-ntop-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 b234f2c1347f..818cd6a734df 100644
--- a/sec-policy/selinux-ntop/selinux-ntop-9999.ebuild
+++ b/sec-policy/selinux-ntop/selinux-ntop-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-ntp/Manifest b/sec-policy/selinux-ntp/Manifest
index 95175ac37016..d612b7bed803 100644
--- a/sec-policy/selinux-ntp/Manifest
+++ b/sec-policy/selinux-ntp/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-ntp-2.20170805-r2.ebuild 276 BLAKE2B def9e44d9683922aea6abadffa60
 EBUILD selinux-ntp-2.20170805-r3.ebuild 276 BLAKE2B def9e44d9683922aea6abadffa605ded9cca3aa2f71e4d10e41eff60805186db0dce342bfe26fde72caf53ec543eb4abae732cac770f63b2c7ffd8d1df5ff420 SHA512 1fa0c446d5e3ce7b128b4d4f6a652ce7afc047ebdcb8d92357eeeb33b989ac81c1461bc295bb18d61904a5e891fec3c9d6d3880671c7952b2ffe8d0056c63bed
 EBUILD selinux-ntp-2.20170805-r4.ebuild 278 BLAKE2B 6924a343f3b30d91c4e9800fead8baa7804a3390157abf8a4a891db5529cc1f87357dcd7e711d4fd6294382d4f4e5d9725d6dd3348c4573be553c4e3ad242c7c SHA512 84260058e67bf10eca361682ae219ab25708fd1377e654d0b7f3290977690ccfcc89194b62bfec3edb80c487985fe31995f4dc576d66ff7c9784e9bd638625b1
 EBUILD selinux-ntp-2.20180114-r1.ebuild 276 BLAKE2B 86125d84d17c72949e87aec6f08ab49e587b795fc9ad4ff7c70ef210976625d70e186b43dea9c3599ff058336712b0a6eb0a0d5358d94e011c6f938d36915f3e SHA512 61c8efdaa233baa76e4cf639d6d3acc33dfe98b84da6c83525b0e2ea5526f28adcd582fa98a89873b2eb0aa202b351b97ce1311d60868033d1f09dea79622f3e
-EBUILD selinux-ntp-9999.ebuild 278 BLAKE2B 6924a343f3b30d91c4e9800fead8baa7804a3390157abf8a4a891db5529cc1f87357dcd7e711d4fd6294382d4f4e5d9725d6dd3348c4573be553c4e3ad242c7c SHA512 84260058e67bf10eca361682ae219ab25708fd1377e654d0b7f3290977690ccfcc89194b62bfec3edb80c487985fe31995f4dc576d66ff7c9784e9bd638625b1
+EBUILD selinux-ntp-2.20180114-r2.ebuild 278 BLAKE2B 993af43fbca4180b117e3059436df5f458020c5ce1fec70f7df64c72e3f83ec034f9dd95f9f72f305bb90b006f1647feaad43cfb4a928db21680f4c41dde801f SHA512 9a3016ab9233de6ec29520895bae8a834992fd456accee562542766b19924394a5ce02addc51ccbe5cf73a88cb619b923e57f131f16090d019b2154178805d8f
+EBUILD selinux-ntp-9999.ebuild 278 BLAKE2B 993af43fbca4180b117e3059436df5f458020c5ce1fec70f7df64c72e3f83ec034f9dd95f9f72f305bb90b006f1647feaad43cfb4a928db21680f4c41dde801f SHA512 9a3016ab9233de6ec29520895bae8a834992fd456accee562542766b19924394a5ce02addc51ccbe5cf73a88cb619b923e57f131f16090d019b2154178805d8f
 MISC metadata.xml 313 BLAKE2B abe800009008c7147fadad7c39286afcf0227560fa37c8b4f362db3227209c5ec6686d3328cc5eea5f8699b74b18a08cfe562dba47d26025e8887a76c8f794ee SHA512 a8e07dfa0336b16ca67328dc4a299930348e725477f9cb37026e8d73a50635294ea9f1ab9174e3de396211596adfdc156e71e897cd177c7d590da460d6e19b41
diff --git a/sec-policy/selinux-ntp/selinux-ntp-2.20180114-r2.ebuild b/sec-policy/selinux-ntp/selinux-ntp-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..430225fcdc26
--- /dev/null
+++ b/sec-policy/selinux-ntp/selinux-ntp-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 0370a473c119..430225fcdc26 100644
--- a/sec-policy/selinux-ntp/selinux-ntp-9999.ebuild
+++ b/sec-policy/selinux-ntp/selinux-ntp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-nut/Manifest b/sec-policy/selinux-nut/Manifest
index 04d00448418c..644b2a1a2bf2 100644
--- a/sec-policy/selinux-nut/Manifest
+++ b/sec-policy/selinux-nut/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-nut-2.20170805-r2.ebuild 372 BLAKE2B c8645e583ea3a477ba227fae7e91
 EBUILD selinux-nut-2.20170805-r3.ebuild 372 BLAKE2B c8645e583ea3a477ba227fae7e91ca37350205ca5760658e6c4ae444c035b83e0ef54e1a3137de41f6372a63bd4f9f26eb579ed14993781bff16576381f5291a SHA512 2762121b4a52d87711f1dee91c9d0f46f7548ce8db5ad55420f0bc1671eeb55be48f12e5a5ce535b3122faf6f6c7903f7bfc1874687defb1ec1605d73eeb44d8
 EBUILD selinux-nut-2.20170805-r4.ebuild 374 BLAKE2B 7580150e8e0b64ae8ecc598fdc05fd84c475e5ed51f739cd2d41e507f3436469ca1ec8e182a491b2f932cc28e2bb4ada47ac732ef4d811b4820d73ce9fe63a53 SHA512 a53e567ee0aac9a11c24c08e0317ad250c7df8362693177fb2ba0a4fe3a692e01c4ee5f822db56ba92940d85fafbf61b1d317a4147fd471e379f21eeb12d2c5e
 EBUILD selinux-nut-2.20180114-r1.ebuild 372 BLAKE2B 3062809e821f4a5ef60570ec9d702993fd37f0e63384570d3e6cab7c6b187a608a48018915188bcf1b663247e46191a07eeb519ebfbce502091b59c0844fe69f SHA512 4c41faf56960a4173a2eb3db5af12d28eeb0217df532ed2ad7f753f1b09fa14c206cc40d6fd93a67f38f31fcbd6eb9f1795a473e705b2d25853d16e379ff49c5
-EBUILD selinux-nut-9999.ebuild 374 BLAKE2B 7580150e8e0b64ae8ecc598fdc05fd84c475e5ed51f739cd2d41e507f3436469ca1ec8e182a491b2f932cc28e2bb4ada47ac732ef4d811b4820d73ce9fe63a53 SHA512 a53e567ee0aac9a11c24c08e0317ad250c7df8362693177fb2ba0a4fe3a692e01c4ee5f822db56ba92940d85fafbf61b1d317a4147fd471e379f21eeb12d2c5e
+EBUILD selinux-nut-2.20180114-r2.ebuild 374 BLAKE2B 3ff37d650df15b2749a33e87ac97571238d86f5076af69d88b997cf36d04a2274249456a3d17b086c25a70f9b90fffc2e1f66fa160e5c81898d5f1db220806b6 SHA512 469184b594ae885b86caa1b1fe45748ddbbba4abbd4d377389216ac51c50f124db4a21157fc4b769ef61e6b17aa7fb1e825f9411643cf20098f2b424231557e9
+EBUILD selinux-nut-9999.ebuild 374 BLAKE2B 3ff37d650df15b2749a33e87ac97571238d86f5076af69d88b997cf36d04a2274249456a3d17b086c25a70f9b90fffc2e1f66fa160e5c81898d5f1db220806b6 SHA512 469184b594ae885b86caa1b1fe45748ddbbba4abbd4d377389216ac51c50f124db4a21157fc4b769ef61e6b17aa7fb1e825f9411643cf20098f2b424231557e9
 MISC metadata.xml 313 BLAKE2B 9b567dc3e05486c4bd208301cee25627046f3b9c5c097a4ace7ee30649e70fb90f99243009f57d9a61156a20a505a230f6f4b514007b358573d496a5ba1c886a SHA512 27ce423f0771c0420170fe4a345d4c16186376a787202bdb57dc770889295602d15574c95e916c6e50edb4877ff6216d7032893c601dc9f5f4c614452b5b6b1f
diff --git a/sec-policy/selinux-nut/selinux-nut-2.20180114-r2.ebuild b/sec-policy/selinux-nut/selinux-nut-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..a4fb8098acf4
--- /dev/null
+++ b/sec-policy/selinux-nut/selinux-nut-2.20180114-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 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 1d268740c79e..a4fb8098acf4 100644
--- a/sec-policy/selinux-nut/selinux-nut-9999.ebuild
+++ b/sec-policy/selinux-nut/selinux-nut-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-nx/Manifest b/sec-policy/selinux-nx/Manifest
index 3493906adc10..2a7fd965c88d 100644
--- a/sec-policy/selinux-nx/Manifest
+++ b/sec-policy/selinux-nx/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-nx-2.20170805-r2.ebuild 274 BLAKE2B 1b129ba90784bca9fce8e4c0e65bc
 EBUILD selinux-nx-2.20170805-r3.ebuild 274 BLAKE2B 1b129ba90784bca9fce8e4c0e65bc7045b610b0124d30cf1b4ccfa9ff7d825c133ea26dd0d81a3e826f0a070fc5bc14dc37a15eab399c4e07e073f5073b977f5 SHA512 f7c29dedbb7b37b2e0d46e0815612319b2a263f9f7f53fca1afe38e894cda0ab4cd9c7db68f8e58de1bc28882d323eb28fac9d359bf236c96ef624d550e2fb50
 EBUILD selinux-nx-2.20170805-r4.ebuild 276 BLAKE2B 1dc373af8fb74698fcfc492ca8cb415d17b34583fcc557422f9318285ded2190599278f2c29d3f33bda174b22e17450452166759f2dd8dfa9466978a9785774c SHA512 adc9190ac7444c198cb9793ba333ad07529b14a4aed2eabcc7cc0d681a4a7ea8a4e618303f9dbd50b1e7d5bc407cb15bad52d4495bfddc1edc085f9aa5eae254
 EBUILD selinux-nx-2.20180114-r1.ebuild 274 BLAKE2B 05108e4746f6bfb1e79ca102e95072406f1116c41c5e48f6b527e106a2007fc809b92238864429b4a9291ef929cfea57560544518ac32161b3eff770ac4bd5e3 SHA512 7c9bcf23657d8b2900f0aa196953bd1ab252d1e8713ea192dcec9fb4293172c48e99fc21af00bb53dbea87df244284a1f061d582155cde5dc0a6a412856c84ef
-EBUILD selinux-nx-9999.ebuild 276 BLAKE2B 1dc373af8fb74698fcfc492ca8cb415d17b34583fcc557422f9318285ded2190599278f2c29d3f33bda174b22e17450452166759f2dd8dfa9466978a9785774c SHA512 adc9190ac7444c198cb9793ba333ad07529b14a4aed2eabcc7cc0d681a4a7ea8a4e618303f9dbd50b1e7d5bc407cb15bad52d4495bfddc1edc085f9aa5eae254
+EBUILD selinux-nx-2.20180114-r2.ebuild 276 BLAKE2B 98e7536f4c6aade0906058697faff54f9a8e2dda25e0f910afbcad84f97d62ba0c6c6c25143de35bf47034c443afc6a15d365a24deefffbd389e2c0b26bdd18a SHA512 35ef3bacb487e5a6c8deecc5e155684a99147ad5be6e05b110f181f743b8092bf6992d6adfeabc19b962b143e7db15deab9472110926f72e1ad45be483522241
+EBUILD selinux-nx-9999.ebuild 276 BLAKE2B 98e7536f4c6aade0906058697faff54f9a8e2dda25e0f910afbcad84f97d62ba0c6c6c25143de35bf47034c443afc6a15d365a24deefffbd389e2c0b26bdd18a SHA512 35ef3bacb487e5a6c8deecc5e155684a99147ad5be6e05b110f181f743b8092bf6992d6adfeabc19b962b143e7db15deab9472110926f72e1ad45be483522241
 MISC metadata.xml 312 BLAKE2B ce5b19a15c4c2255a16c90631f486f3e19e2568f021c6c12d5ade7c23c663a4d8f3eea86bb2ff43f38b7d973c56f720625e576a00879660b9c5da103e116826f SHA512 2974c5cf4c601110b07cdb7dbc5a246002de84c2c3f440b4b7ba80e1f325c34449d39ea026d63fa2a8a347d6025c5c487ce80429f8889b0b89f11c8cc2a5ab15
diff --git a/sec-policy/selinux-nx/selinux-nx-2.20180114-r2.ebuild b/sec-policy/selinux-nx/selinux-nx-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..eaae5499cf3a
--- /dev/null
+++ b/sec-policy/selinux-nx/selinux-nx-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 32b6df252108..eaae5499cf3a 100644
--- a/sec-policy/selinux-nx/selinux-nx-9999.ebuild
+++ b/sec-policy/selinux-nx/selinux-nx-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-oddjob/Manifest b/sec-policy/selinux-oddjob/Manifest
index 458656ebfa31..3a25dff62418 100644
--- a/sec-policy/selinux-oddjob/Manifest
+++ b/sec-policy/selinux-oddjob/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-oddjob-2.20170805-r2.ebuild 282 BLAKE2B f2f47ac182ba49db1d279b018
 EBUILD selinux-oddjob-2.20170805-r3.ebuild 282 BLAKE2B f2f47ac182ba49db1d279b018b7a5a4024c5c36e2460c26231a7297172f8d4bc8cb1eb587a9cfea9349e0f13beb1c9b6cfb81fd080150cfc9ff3b71ccd0bcc3d SHA512 f56dde3c7082e107e3ff190ea059f40c64e9473902b4ef58b505537423c50836ceffe0fdc947cf5ef32e64a7afe7b749d34870b9b86510d093128c75e65ef446
 EBUILD selinux-oddjob-2.20170805-r4.ebuild 284 BLAKE2B 0bed561baaba61d9f075ff15b191a84f3d7dac0c9362fa420a48ab9874dd36a8cc7c4dd0488b1aecc9607788e5a407f1538b5bade7c5c093d53adb1df609e65b SHA512 6a93548be71481d5bbd98115a309f52733798394c2a0394684fb5ee608f22b77ea1af504296b45967ad36c95eaa808ae1c9c4a13a05388b7f622e80a106cf2a3
 EBUILD selinux-oddjob-2.20180114-r1.ebuild 282 BLAKE2B 4a379431b7d6bd3a881bb4e0b47be7f8fcb4a1448a2a305a48f27f17ba0095f1861a8f1b558d7b628b21c38e9e0c6cfd5d439190f5b1abd3839cd1e99242cc94 SHA512 c91237411c3096b0a04e7cef34b98b7901fb896171fb0e3c7540ffdce6a6ac8cd34d68e9a6163cca1b1032adbd24ab0ef94d82022afb1b400101550c74c731a6
-EBUILD selinux-oddjob-9999.ebuild 284 BLAKE2B 0bed561baaba61d9f075ff15b191a84f3d7dac0c9362fa420a48ab9874dd36a8cc7c4dd0488b1aecc9607788e5a407f1538b5bade7c5c093d53adb1df609e65b SHA512 6a93548be71481d5bbd98115a309f52733798394c2a0394684fb5ee608f22b77ea1af504296b45967ad36c95eaa808ae1c9c4a13a05388b7f622e80a106cf2a3
+EBUILD selinux-oddjob-2.20180114-r2.ebuild 284 BLAKE2B ed63c6cafc7e1a1df2d386962a3b1ec55eb493748792a5c46afef4a2cad750a9330bb7bebe9621696ff179e9fe409bef1df81beb11c97ce844c0e9e9917ceb4d SHA512 c2f1755f7edaf9e044adbc145191bd93abc920c39b91bf4d404e48e9018210a0ea2a3d268e481e11c8a4c96babf5111f4cf13705c43a9261135f4fe9a082f89c
+EBUILD selinux-oddjob-9999.ebuild 284 BLAKE2B ed63c6cafc7e1a1df2d386962a3b1ec55eb493748792a5c46afef4a2cad750a9330bb7bebe9621696ff179e9fe409bef1df81beb11c97ce844c0e9e9917ceb4d SHA512 c2f1755f7edaf9e044adbc145191bd93abc920c39b91bf4d404e48e9018210a0ea2a3d268e481e11c8a4c96babf5111f4cf13705c43a9261135f4fe9a082f89c
 MISC metadata.xml 334 BLAKE2B ad589091646cdb6c4b3e272d47f0cb5131ffcc65b198b4cd9e18ad651dfb96b148956fd414a77951fb58a4a1b3499ef0f8366e9bd5c3135d3d7303427059ea3b SHA512 488d945f4cfc2c9a101c66ededd0280dc4fc9a83d3a0aa2496de1c5fbc756092cd1540526d499729432e325c03f1cb5a893773df3162b3d80dfcda2a07eabe93
diff --git a/sec-policy/selinux-oddjob/selinux-oddjob-2.20180114-r2.ebuild b/sec-policy/selinux-oddjob/selinux-oddjob-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..6cf65e47af84
--- /dev/null
+++ b/sec-policy/selinux-oddjob/selinux-oddjob-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 3ce719e3c642..6cf65e47af84 100644
--- a/sec-policy/selinux-oddjob/selinux-oddjob-9999.ebuild
+++ b/sec-policy/selinux-oddjob/selinux-oddjob-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-oident/Manifest b/sec-policy/selinux-oident/Manifest
index 6a1909ba5dcc..865f8afa5805 100644
--- a/sec-policy/selinux-oident/Manifest
+++ b/sec-policy/selinux-oident/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-oident-2.20170805-r2.ebuild 282 BLAKE2B 99b786e5832a2696b1f5fc8fb
 EBUILD selinux-oident-2.20170805-r3.ebuild 282 BLAKE2B 99b786e5832a2696b1f5fc8fbeaf91bf8b6470023905153413038e7300bb8a25b1976411038b859a6fcbc3e2f48aa8a614e09b97a81ae4be8cee7114102845cc SHA512 0a5458c6c655ba69f1939e222f3ec69c89ab9913396f6da5ac8c4743550c1c9ce27dd13f2345e986129c3e1a2b7f8bb78fd89bde3362c799591f09c35bbba7bc
 EBUILD selinux-oident-2.20170805-r4.ebuild 284 BLAKE2B 0325c83b32c4f8d9e47a45871017b7f83e9d1ef4c46ba8938ea5f28464efa913ae1585964b103a36324f41db793c70e68ce8543d10ba4c215ac44a6b9073bca5 SHA512 5a2f2125aa69e8423877c55d18467822b41b4854b40052907d2b0741dd2b518d9a53fc1cc288d00273d59bdce3533c3d68daf7d66182fd4e657b53cc83b7f33c
 EBUILD selinux-oident-2.20180114-r1.ebuild 282 BLAKE2B caa2aff586d36d303b7be2b4ac0fb72cc7cfe455d1e79bc47b347b1c71888aceeca20e2904e873c6a4412bba998e50ec02fe22be50eb64a4208e8639861fd028 SHA512 3314ac956ecbc9ed0278308bab37773bfb44ad79aeacffd8cbe5fbdbf980b3d2830a3f3b53091c450b802683cb629c2e62f20b37dd3547da5f2f466ef0c365ff
-EBUILD selinux-oident-9999.ebuild 284 BLAKE2B 0325c83b32c4f8d9e47a45871017b7f83e9d1ef4c46ba8938ea5f28464efa913ae1585964b103a36324f41db793c70e68ce8543d10ba4c215ac44a6b9073bca5 SHA512 5a2f2125aa69e8423877c55d18467822b41b4854b40052907d2b0741dd2b518d9a53fc1cc288d00273d59bdce3533c3d68daf7d66182fd4e657b53cc83b7f33c
+EBUILD selinux-oident-2.20180114-r2.ebuild 284 BLAKE2B 442348f25d861e4e5f31e9b4c13efc4cec2f4a65ea87ebe3920299030ac02aa79a7ff4792c0eb1653fa16daa5b276c8645063f434cfba4ce1838811b9c409185 SHA512 ecc1190e8c53f85a39c31ffb5161f13ba84cc5fd693e5dc082e24215504e1d43b52da295fffc938c386a1a5d441a05d0b850eab09fc262f2ae476b33e1246f03
+EBUILD selinux-oident-9999.ebuild 284 BLAKE2B 442348f25d861e4e5f31e9b4c13efc4cec2f4a65ea87ebe3920299030ac02aa79a7ff4792c0eb1653fa16daa5b276c8645063f434cfba4ce1838811b9c409185 SHA512 ecc1190e8c53f85a39c31ffb5161f13ba84cc5fd693e5dc082e24215504e1d43b52da295fffc938c386a1a5d441a05d0b850eab09fc262f2ae476b33e1246f03
 MISC metadata.xml 316 BLAKE2B fdea156e5b038e408170545c6323f7de20b6b9c30fda9ee7c001fec9b0e1557c58a652cb2e0e61821600e2e8e6c36614e256b79aa6f2a072377152b8c113f8cd SHA512 bf1249529ca86fa8714111c62b51db48ba0239663e4192968a7717958d67c3c36f9ad03d0bc43a7baf04d2026bafeb409bcb9b7dffad2711c2a2349204041ed2
diff --git a/sec-policy/selinux-oident/selinux-oident-2.20180114-r2.ebuild b/sec-policy/selinux-oident/selinux-oident-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..931c5f14889c
--- /dev/null
+++ b/sec-policy/selinux-oident/selinux-oident-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 fd3eb560f53e..931c5f14889c 100644
--- a/sec-policy/selinux-oident/selinux-oident-9999.ebuild
+++ b/sec-policy/selinux-oident/selinux-oident-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-openct/Manifest b/sec-policy/selinux-openct/Manifest
index 6b1652198d55..1efdfb8701da 100644
--- a/sec-policy/selinux-openct/Manifest
+++ b/sec-policy/selinux-openct/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-openct-2.20170805-r2.ebuild 282 BLAKE2B 805ec99632d0aad8da992353d
 EBUILD selinux-openct-2.20170805-r3.ebuild 282 BLAKE2B 805ec99632d0aad8da992353dfcc21848b60e7587250ab4809b64a35ff5be335157983a4dfde65b5e8736698e081dafb77dbb516f44ee6d5f01fcef57deeb642 SHA512 d3a4ad721feea16ac0b2330bb6136da01ee324a21b2221c06f4fb1b37915e2612180980467f3a6b723288066bcfaa7973f6f0a359feb63e50e9e4734ef606170
 EBUILD selinux-openct-2.20170805-r4.ebuild 284 BLAKE2B dbcf0f23b3fe025b36d160ebe3ff6c5aaa1baa546227e4f2c031ba509c16374b177139db30c4bbe91edb55212da5f01e7378193bc7e03ab7325636eea393b91b SHA512 4a0783698255db839ca415ac48c4d4438bf0bb3efa47b774a9ad3040c1c370ccc88cc8227702fd4ee8995f1c05041a4602c167a69b1560892df6a0c79ab41927
 EBUILD selinux-openct-2.20180114-r1.ebuild 282 BLAKE2B 41552c3fce6ebcb670c349724a74819e86450825ba8ef016c4adbb605ab86fd7cfbfbafcb44bd67b70234e53964769e96569425641f87df1f4a46a6c0364b9e3 SHA512 2be34004ae3bfbb7a27c4ac7efeaec1a748f1ab2ffc3fef925b43ebf8b4965b73deb41baaf251dcb0603b88509aa2327c09d720240e9fa5b6fcc18f390204910
-EBUILD selinux-openct-9999.ebuild 284 BLAKE2B dbcf0f23b3fe025b36d160ebe3ff6c5aaa1baa546227e4f2c031ba509c16374b177139db30c4bbe91edb55212da5f01e7378193bc7e03ab7325636eea393b91b SHA512 4a0783698255db839ca415ac48c4d4438bf0bb3efa47b774a9ad3040c1c370ccc88cc8227702fd4ee8995f1c05041a4602c167a69b1560892df6a0c79ab41927
+EBUILD selinux-openct-2.20180114-r2.ebuild 284 BLAKE2B ae928c8dbd24d74563cdd5ff2c33c04954d6e07a5487676802739a8c8ce462698a64fae943b3275e5c3165eda22f9de33b4a5c1986dba91088e0a005fedb1265 SHA512 f70acdcca26423c00fd2bc50e7eb7dfca41da9002736e6e99fcd4a90f8e80faecd4b034512f597df758e0d8c3f902d46034296e06fde3b2432756f5a207bc09b
+EBUILD selinux-openct-9999.ebuild 284 BLAKE2B ae928c8dbd24d74563cdd5ff2c33c04954d6e07a5487676802739a8c8ce462698a64fae943b3275e5c3165eda22f9de33b4a5c1986dba91088e0a005fedb1265 SHA512 f70acdcca26423c00fd2bc50e7eb7dfca41da9002736e6e99fcd4a90f8e80faecd4b034512f597df758e0d8c3f902d46034296e06fde3b2432756f5a207bc09b
 MISC metadata.xml 316 BLAKE2B 5a71ac1fdc33e227acfaf2db6d5db8b3bde2ac47c9e00b8bf350f128d552ff12964dd04c6ae4e36143307bde27f3bf6af20966f8c118fbf45c042d4f1a7185b4 SHA512 2f34a907f602c48245d3b5bce00bc178b2c8d58d28ee6992438179375e116ec2beb5d9422cf7897af985910402fce75c9d9b50a2d372e59bcbaa59dedb7490bc
diff --git a/sec-policy/selinux-openct/selinux-openct-2.20180114-r2.ebuild b/sec-policy/selinux-openct/selinux-openct-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..accd8f695a5d
--- /dev/null
+++ b/sec-policy/selinux-openct/selinux-openct-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 fe1edaa9eafd..accd8f695a5d 100644
--- a/sec-policy/selinux-openct/selinux-openct-9999.ebuild
+++ b/sec-policy/selinux-openct/selinux-openct-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-openrc/Manifest b/sec-policy/selinux-openrc/Manifest
index e051b7d643e2..87e8bd5e347e 100644
--- a/sec-policy/selinux-openrc/Manifest
+++ b/sec-policy/selinux-openrc/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-openrc-2.20170805-r2.ebuild 282 BLAKE2B f7a3089e0a4fa560ec37d27cf
 EBUILD selinux-openrc-2.20170805-r3.ebuild 282 BLAKE2B f7a3089e0a4fa560ec37d27cf356ceea2b225de8e2a61ef6aec9f824fb1e8d02d834b2d35698c0205ac8c6102a45704005b99c42d4247341c5232500428c8162 SHA512 5cb94b69e6266c2183e1fae5286b6b9091f832ee2448074bf1fbc72fb677238991ed4b75c0dd6516d212660147010dc0dc2e625c7dcd1ca80b9b81e0617f1f14
 EBUILD selinux-openrc-2.20170805-r4.ebuild 284 BLAKE2B 234ab87a4f4cbaec17170aacfcb87e94afa23a85fbab3468050fd3da22858ad4fbbfe5c4d4d7465d8db8f9d249a484fd4c96aaee54cf4fda78f528264123a370 SHA512 647bd90e04ef02b80ccb042e6053771a1bf5edc1477cc42c6b96f88e12e8b33afb4df3b3e623423dcc74b314077586d8f14e8473d3ba8221acbfa66ee0a2a1a1
 EBUILD selinux-openrc-2.20180114-r1.ebuild 282 BLAKE2B 29e21d8a671ea178c9271ebf4eaab28778d7f5187d248f97900c9a9f0a26359240f8607b496bcba2d301587894062e34aee880c90f94ac106f5f7f62b0976dd6 SHA512 7a26eb020d4c2718faccc0b6077bfb8c8913f4b8b0abd909f7afd16bc6c470526b67db1016356a5e5a7275837c049c3b10035b7b02f3b7dbe5fe0076c4e0a29d
-EBUILD selinux-openrc-9999.ebuild 284 BLAKE2B 234ab87a4f4cbaec17170aacfcb87e94afa23a85fbab3468050fd3da22858ad4fbbfe5c4d4d7465d8db8f9d249a484fd4c96aaee54cf4fda78f528264123a370 SHA512 647bd90e04ef02b80ccb042e6053771a1bf5edc1477cc42c6b96f88e12e8b33afb4df3b3e623423dcc74b314077586d8f14e8473d3ba8221acbfa66ee0a2a1a1
+EBUILD selinux-openrc-2.20180114-r2.ebuild 284 BLAKE2B 313134eba93ce4e5bcde5cafe837ad5aab947074532079f15c1be7800a2416c0fb7488f7ee9f029b04d456731d008fcdc42bbb821ef7d03882596c041a123e26 SHA512 01f422752468623d55e3c674ba4f21dddb9c5d29646ea434ad11027a9379eefa2009078bd5111c1ac4f51be0f246cf7f540951939ccc6bf637d96e5a2e499c11
+EBUILD selinux-openrc-9999.ebuild 284 BLAKE2B 313134eba93ce4e5bcde5cafe837ad5aab947074532079f15c1be7800a2416c0fb7488f7ee9f029b04d456731d008fcdc42bbb821ef7d03882596c041a123e26 SHA512 01f422752468623d55e3c674ba4f21dddb9c5d29646ea434ad11027a9379eefa2009078bd5111c1ac4f51be0f246cf7f540951939ccc6bf637d96e5a2e499c11
 MISC metadata.xml 316 BLAKE2B ef625d3f5e926917f4433d9edcb72b4ba245ae29561833f4878f7169643a36da79209de521951749d8a2f0184452d2055c97c581bf8136594da02ce172597395 SHA512 0cf24e90730fd2dbe20f789319b4a5f5e8a0f17613a0ae5bd75fecf9b9f4575c3980fc51680b279b82e91fbdb0f2ba01009f025afd6c5216d538a7c37a6b91d7
diff --git a/sec-policy/selinux-openrc/selinux-openrc-2.20180114-r2.ebuild b/sec-policy/selinux-openrc/selinux-openrc-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..f7967faa52e1
--- /dev/null
+++ b/sec-policy/selinux-openrc/selinux-openrc-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 3809ff69dbd0..f7967faa52e1 100644
--- a/sec-policy/selinux-openrc/selinux-openrc-9999.ebuild
+++ b/sec-policy/selinux-openrc/selinux-openrc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-openvpn/Manifest b/sec-policy/selinux-openvpn/Manifest
index cddccd98813e..f4d58dc7da00 100644
--- a/sec-policy/selinux-openvpn/Manifest
+++ b/sec-policy/selinux-openvpn/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-openvpn-2.20170805-r2.ebuild 284 BLAKE2B e010e64d17b6367a2a11f7ab
 EBUILD selinux-openvpn-2.20170805-r3.ebuild 284 BLAKE2B e010e64d17b6367a2a11f7ab1d5b50528a5ec2f4a3edfb732f2e9fd361b36aa3b89ae580157eab86ebf637f82beca27ec13d99e4b9955e2daf182fd40b191006 SHA512 f5788c5c43434414db670a112d5072b45998d763db795398d2f712b3609e4dcd5a1add524d5aae13c79a7c9cc38b528422d06d7e059192c5a2a9e556cb2133d5
 EBUILD selinux-openvpn-2.20170805-r4.ebuild 286 BLAKE2B 2d9cc41db0bc5c7ccb4ad2fd63773ffa5194af1c024204fabe62d6482ff544b21a4cdab3d71055ee065c7ebb10bf7262951dcab53a4e3082b9f32dc8563c00e7 SHA512 d50afb395a5ab1c8c210211bfcc4c45d504dff138a55203e3526fe04d45f32cdea03fb0c61eb1dab56ca2a067c6189e5986ad78e95b6c8abe9bb92395c51c35f
 EBUILD selinux-openvpn-2.20180114-r1.ebuild 284 BLAKE2B 50b509b2fa573ed2e8b6e35478174642483d4fa9050bcd5bbaf5596a94f3bdc0c3ed1615b318184e38999162f573a80bf4c94e66e4afcb110628de68f0ec0550 SHA512 249a145290294dc7b49c948adfae2831b018b8d2097bf7791b8e1d96eef52310bd49427e4df4d7219028a916b389ff94b1648c0e1c771cbfcb259e3a90070305
-EBUILD selinux-openvpn-9999.ebuild 286 BLAKE2B 2d9cc41db0bc5c7ccb4ad2fd63773ffa5194af1c024204fabe62d6482ff544b21a4cdab3d71055ee065c7ebb10bf7262951dcab53a4e3082b9f32dc8563c00e7 SHA512 d50afb395a5ab1c8c210211bfcc4c45d504dff138a55203e3526fe04d45f32cdea03fb0c61eb1dab56ca2a067c6189e5986ad78e95b6c8abe9bb92395c51c35f
+EBUILD selinux-openvpn-2.20180114-r2.ebuild 286 BLAKE2B 9870b13ff62577402f2bf741e8cfc541f882e7996087e2de920b53c761ec45308e971506c7c0f1ef7abd174e99f5ac38cf6e343fc77c01112436d62d9c6b52a9 SHA512 5fb9eef8e6f7ddf9a2235a2a041bf0dcd92fba3ba96c78ec4885aa9b47670740dfa632f5bc85469e83ec7e1a02ed0bff9dd041bbed076b89a5e9cf2885472269
+EBUILD selinux-openvpn-9999.ebuild 286 BLAKE2B 9870b13ff62577402f2bf741e8cfc541f882e7996087e2de920b53c761ec45308e971506c7c0f1ef7abd174e99f5ac38cf6e343fc77c01112436d62d9c6b52a9 SHA512 5fb9eef8e6f7ddf9a2235a2a041bf0dcd92fba3ba96c78ec4885aa9b47670740dfa632f5bc85469e83ec7e1a02ed0bff9dd041bbed076b89a5e9cf2885472269
 MISC metadata.xml 317 BLAKE2B dd336bd2ceb38396b70383f3d53ed8d39c14641e3e5b3f95c9c7e032bcbd9de96de4d364a8465fa8a55b9bebe80fbb926b69c7a494077d764f5331698e86a4dc SHA512 404052219f5f8e5b95dc2e34baef116609b40581aa99d5e93861807d28fbc1eb23a4368e2e01ee6dd6c4cec76294fe567bf860bb4c0db36bf34b1972d3ca1dab
diff --git a/sec-policy/selinux-openvpn/selinux-openvpn-2.20180114-r2.ebuild b/sec-policy/selinux-openvpn/selinux-openvpn-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..5814dd787ebf
--- /dev/null
+++ b/sec-policy/selinux-openvpn/selinux-openvpn-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 7536af68e6ee..5814dd787ebf 100644
--- a/sec-policy/selinux-openvpn/selinux-openvpn-9999.ebuild
+++ b/sec-policy/selinux-openvpn/selinux-openvpn-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-pan/Manifest b/sec-policy/selinux-pan/Manifest
index 9315041d478d..1990b3e3ecb5 100644
--- a/sec-policy/selinux-pan/Manifest
+++ b/sec-policy/selinux-pan/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-pan-2.20170805-r2.ebuild 374 BLAKE2B 07aab61dadbcefa88c7c1a078943
 EBUILD selinux-pan-2.20170805-r3.ebuild 374 BLAKE2B 07aab61dadbcefa88c7c1a078943570191423f1a91b4897df571eb8978039ea4f78845c6197359740669f88b19b320970481fbe33c7f5dfbe14c7d7828fb7d97 SHA512 673dc43e2673aeac2e70f7cccc8eefda4a6b843f5bdef929afd05655cfe4ccd532c5f41e923680dc4767637b108c7180de1040e6c1a21ecd1c7319f21ca809dd
 EBUILD selinux-pan-2.20170805-r4.ebuild 376 BLAKE2B 0e1afd52ebc5b1e933a2b98dd8d6a71dbd2b1c755e8bd4c06fa052da83a5ff93b115d12578f79b0c6ba48f331281020e433bbed45a2569812fd9254793373f42 SHA512 271e5246d3a246cca2744e390870c8fac026ee8ae6befa609b42d244d5c5de76e251e7ae0a7f2e3e62b0ef25d59168c868ca10afc58a1e326aa93b654347c473
 EBUILD selinux-pan-2.20180114-r1.ebuild 374 BLAKE2B ce75258541c84d8854a4255280705dde69a63b5fba71ae9568b025aa708ca8850f0f200441decc857e441f0cc30a1f9bd248e4892f31887325ba970a0766c0d3 SHA512 7dfdd0dfe599875db62de637693bada6b714e263dfe23aac538c6971513981fc15563d1a60f8218fd43cdd7be3565cde636c4fc6dfd99ba92146747a717befa5
-EBUILD selinux-pan-9999.ebuild 376 BLAKE2B 0e1afd52ebc5b1e933a2b98dd8d6a71dbd2b1c755e8bd4c06fa052da83a5ff93b115d12578f79b0c6ba48f331281020e433bbed45a2569812fd9254793373f42 SHA512 271e5246d3a246cca2744e390870c8fac026ee8ae6befa609b42d244d5c5de76e251e7ae0a7f2e3e62b0ef25d59168c868ca10afc58a1e326aa93b654347c473
+EBUILD selinux-pan-2.20180114-r2.ebuild 376 BLAKE2B e23435e0a3c0f4b938459b37600c2cb4ed1b3b9f47e7f77946c517f36d700ebd2dc3a3d0ac683f43b04c831b87cf0e96879d0e23f0abdeaca8cd4ed36ef762b6 SHA512 582e855b3f35d5d2a54c44c09bc6ddda6de6547473e6aba04d6d1f6852c1524d6ce3e8c381e843979d5d3a8feb0bb7cf5f63e5578df3f4cb24fc55d002a270c4
+EBUILD selinux-pan-9999.ebuild 376 BLAKE2B e23435e0a3c0f4b938459b37600c2cb4ed1b3b9f47e7f77946c517f36d700ebd2dc3a3d0ac683f43b04c831b87cf0e96879d0e23f0abdeaca8cd4ed36ef762b6 SHA512 582e855b3f35d5d2a54c44c09bc6ddda6de6547473e6aba04d6d1f6852c1524d6ce3e8c381e843979d5d3a8feb0bb7cf5f63e5578df3f4cb24fc55d002a270c4
 MISC metadata.xml 313 BLAKE2B 00b319beed1e12194de64ce3825134a40dd1a48666aed759d136ed77b52dece7d4ea81752e443c0eb2fd3a41ed038b814bf56f7591e6430bd2b0cff4f1523d08 SHA512 c7b7a83c7cbe58b4294977429326fd22b59391fd3c670e4a4083687c4eff871665af17d9ee4cdd14efac69f630d97d38eaf1e5bc37a7ff538cd847c993408a1a
diff --git a/sec-policy/selinux-pan/selinux-pan-2.20180114-r2.ebuild b/sec-policy/selinux-pan/selinux-pan-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..c9aa8c17ed05
--- /dev/null
+++ b/sec-policy/selinux-pan/selinux-pan-2.20180114-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 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 741fbe8a33e2..c9aa8c17ed05 100644
--- a/sec-policy/selinux-pan/selinux-pan-9999.ebuild
+++ b/sec-policy/selinux-pan/selinux-pan-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-pcmcia/Manifest b/sec-policy/selinux-pcmcia/Manifest
index 07aedd3c1031..f1489de2bf94 100644
--- a/sec-policy/selinux-pcmcia/Manifest
+++ b/sec-policy/selinux-pcmcia/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-pcmcia-2.20170805-r2.ebuild 282 BLAKE2B ba31b45e4d55082a1a954e017
 EBUILD selinux-pcmcia-2.20170805-r3.ebuild 282 BLAKE2B ba31b45e4d55082a1a954e0170d57dc0156b0f2245add91025ce7ede5a54d03f942f3ea5c0ff10bae4a5dbad999500f50a25ef4be2f36f3dc3cd6f610873c39a SHA512 264b8f02668863e8cc048896a63cafaf507223e6a2bcf33cc40fa76e2a2b74a6641098bf10727bcbfcc8af924ec8132c556d5e6e3c84e900dd82f68ff992520d
 EBUILD selinux-pcmcia-2.20170805-r4.ebuild 284 BLAKE2B 1d0a5bee2331fd0b000b4130e8f14d5611247a3291ae9aa82b6e27a0b7e57544db7ace27d1866ba27f3f6df9c88ac0b90fcc5fffe49030d7ff20f69f27d4fa7a SHA512 36d3a13f6e0835f236f61229eaaa46563d5ad0ef56b8d8c303156c420ef25a47df5a5e89ac7d36a8a3c02079eb9bc6d5ab7c452b54f887dc2527568dfd9c2d33
 EBUILD selinux-pcmcia-2.20180114-r1.ebuild 282 BLAKE2B 24430e64f73c7e4f5a1344a01f0892729c7eca0c6f21b91cbf56b308e36bd87a69dbd85bdf0e8d4c0a4d39f4485c7cfc0606d310c3de59c53246930e453a8462 SHA512 39938301b80534c5d4af5a2c5decf7a265295797904ca57fb9cf38d1e1ed79d9a88db0185973368027d4c9612731f902e6175397b2badfff80fd4efb41781fc0
-EBUILD selinux-pcmcia-9999.ebuild 284 BLAKE2B 1d0a5bee2331fd0b000b4130e8f14d5611247a3291ae9aa82b6e27a0b7e57544db7ace27d1866ba27f3f6df9c88ac0b90fcc5fffe49030d7ff20f69f27d4fa7a SHA512 36d3a13f6e0835f236f61229eaaa46563d5ad0ef56b8d8c303156c420ef25a47df5a5e89ac7d36a8a3c02079eb9bc6d5ab7c452b54f887dc2527568dfd9c2d33
+EBUILD selinux-pcmcia-2.20180114-r2.ebuild 284 BLAKE2B 626e0b07b0dee2f76281f68fb70a5aa59fb4bb69ca58ddc57a8688b0cb251e99439a1c9cd73eb220d3f33d3be08df2399475243ca11be0357cf64627ab03abca SHA512 63d9e666ff23a5c0a824f7c834c157f405563c5f422d3b1a873af0f27648c3a269d247f292d23bf538e3d813f7d442e74401aa8ace5842beb589a0284e68caba
+EBUILD selinux-pcmcia-9999.ebuild 284 BLAKE2B 626e0b07b0dee2f76281f68fb70a5aa59fb4bb69ca58ddc57a8688b0cb251e99439a1c9cd73eb220d3f33d3be08df2399475243ca11be0357cf64627ab03abca SHA512 63d9e666ff23a5c0a824f7c834c157f405563c5f422d3b1a873af0f27648c3a269d247f292d23bf538e3d813f7d442e74401aa8ace5842beb589a0284e68caba
 MISC metadata.xml 316 BLAKE2B cc90a9ff7d7b6e65a1f4559b90413d7b6460fa82c4afb91ba3c1f02e551431c9e797f5126c997c9c9a8bb2a1348faa744bed3a116cb98bf73c8b6ffbf755a064 SHA512 644a200cefcb82931e5c53f504228299b407d25c41b933af09a705755fe7c6c017da62e70162fe83221d534d33be77c82235c39bade584af62249e97a963abd3
diff --git a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20180114-r2.ebuild b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..f79f167b79a6
--- /dev/null
+++ b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 6b569dce36a2..f79f167b79a6 100644
--- a/sec-policy/selinux-pcmcia/selinux-pcmcia-9999.ebuild
+++ b/sec-policy/selinux-pcmcia/selinux-pcmcia-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-pcscd/Manifest b/sec-policy/selinux-pcscd/Manifest
index dfbe06466ed3..2ff4601049ee 100644
--- a/sec-policy/selinux-pcscd/Manifest
+++ b/sec-policy/selinux-pcscd/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-pcscd-2.20170805-r2.ebuild 280 BLAKE2B 9c398eed40356455460f9409eb
 EBUILD selinux-pcscd-2.20170805-r3.ebuild 280 BLAKE2B 9c398eed40356455460f9409eb0a3894a741ee2dd6538e3c13f1d85634529760cd151b0edf2fb041700e3aac4e2f3942ae2d7277128d2829d9b62c26aaea6855 SHA512 95ad2f1e5d7113ee3f2886769aab2bb7341ae72cb5fba682a3f0305f7bfa89bfe7f55eb570b1de5c59aabc0bd27146f300a9368c629971793a2ecd2308f33253
 EBUILD selinux-pcscd-2.20170805-r4.ebuild 282 BLAKE2B 6bb31e933150f113ab1c131b481e228df439c7d8558b2f1ef848490a8717d394e72e8d39b4d75ab281a602cf28ecd7b0b612c4a6f710ed9b6f4b5d91057af1db SHA512 2023a44c06bb74372315b55bb48e3cc4630542cc2721d5c0e7ba8392a3d99a07f58c689776c342e100c4f2f108dc4dc5e72cc15176187fbb52bc35972065a1b2
 EBUILD selinux-pcscd-2.20180114-r1.ebuild 280 BLAKE2B 3a6384e0ccc0e6425bd4829f6a17694d6bf8d6a94b0f1963989b0896ad17c3e26f3defaeddd28c3b5918e45e1eba2e64469cec3beeeb3e60482b17972d022a92 SHA512 e7463b34072f589a8d7910620dbad82a958ee6c4c85752883f2a4d201857bd912918c3da156f176e6cd7d6b9da5814e97016d0fbfbba3e1cf65ba93f15a690e4
-EBUILD selinux-pcscd-9999.ebuild 282 BLAKE2B 6bb31e933150f113ab1c131b481e228df439c7d8558b2f1ef848490a8717d394e72e8d39b4d75ab281a602cf28ecd7b0b612c4a6f710ed9b6f4b5d91057af1db SHA512 2023a44c06bb74372315b55bb48e3cc4630542cc2721d5c0e7ba8392a3d99a07f58c689776c342e100c4f2f108dc4dc5e72cc15176187fbb52bc35972065a1b2
+EBUILD selinux-pcscd-2.20180114-r2.ebuild 282 BLAKE2B cc4f115270f04182686dfb848d3f4fda0625644c6fb89d0d63998fbed53c39e2ff444a4c0a4a45996697a2cf94a853f13d600b3a76975cf233c8103b5189ffa0 SHA512 05127d9dca3198ffd2bbb71e7b7ca2463c6426ac15d093b0393785140e905695062421cdbdae9c552bf89f1ae7f50a545bbc38d20e0e46032b9cc7efae960c7e
+EBUILD selinux-pcscd-9999.ebuild 282 BLAKE2B cc4f115270f04182686dfb848d3f4fda0625644c6fb89d0d63998fbed53c39e2ff444a4c0a4a45996697a2cf94a853f13d600b3a76975cf233c8103b5189ffa0 SHA512 05127d9dca3198ffd2bbb71e7b7ca2463c6426ac15d093b0393785140e905695062421cdbdae9c552bf89f1ae7f50a545bbc38d20e0e46032b9cc7efae960c7e
 MISC metadata.xml 315 BLAKE2B ecff7b2e5046a9d47a71a286d57f8cfae05d578c284f0a93508b2ac6e36695123b1ec98836fc1daee2020976f7163a3651be97ef6453347c11e4ce6733648195 SHA512 07d74c79dedc7fa7d45e23d019551a2358b69c08b1ff86a22bd8b41068c33a951520e21563844bf75f9fa0b9e966c41d91ad834a6ecbdc2293f210fc45091566
diff --git a/sec-policy/selinux-pcscd/selinux-pcscd-2.20180114-r2.ebuild b/sec-policy/selinux-pcscd/selinux-pcscd-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..989d82a295c7
--- /dev/null
+++ b/sec-policy/selinux-pcscd/selinux-pcscd-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 494fe7d84678..989d82a295c7 100644
--- a/sec-policy/selinux-pcscd/selinux-pcscd-9999.ebuild
+++ b/sec-policy/selinux-pcscd/selinux-pcscd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-perdition/Manifest b/sec-policy/selinux-perdition/Manifest
index 0e9d5e62b762..da579ea5195a 100644
--- a/sec-policy/selinux-perdition/Manifest
+++ b/sec-policy/selinux-perdition/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-perdition-2.20170805-r2.ebuild 288 BLAKE2B f60d9aa82738187a64a4fb
 EBUILD selinux-perdition-2.20170805-r3.ebuild 288 BLAKE2B f60d9aa82738187a64a4fb900c2df089a205c11400d0e1a378d0536ca1538d7aebfa7a6c7700b0e83008297a3d1f55cfdc20718dc7371d441266a1242375f707 SHA512 910acdf0ce0ab350ac82618588bcee42ce5f9d8fbe633829a1cbd72d77b99f637b58cee3a2565471737aec36c8f9d9698e179899f756835757741f3413b9fd85
 EBUILD selinux-perdition-2.20170805-r4.ebuild 290 BLAKE2B 46eca07d6cd1e091637dcc476a5786ad4d01ae1e9d482e8e5d434289fa36bb66911a7c00f6bbbcffba93df711f391837fa1397a6e4d7a00b67dee22ccc63ca92 SHA512 b36946cce789a242068b4181059ab1ad0c95575f34dee5f6373f65c0efbcd6f962fe53ab0b3e8f793d01564e20fee856c39354e6f947c9bc77a526a1808ed32b
 EBUILD selinux-perdition-2.20180114-r1.ebuild 288 BLAKE2B d8f1fdf63ea6846f2936bfb2c41a9505e5b4cc226901a36319f49d70b747e04ab738dcbaab53759e5cf49351c87885000bc4f71aeb65d2199818ac096ac91254 SHA512 9df1a7fd1d48f1c56e432e84e14eb3083b781861a81c479ad3ea05d919628939253a69d145d640499fb4cddb8464ba962a6beaacd5e2d8afd4522fc9b88d5fe2
-EBUILD selinux-perdition-9999.ebuild 290 BLAKE2B 46eca07d6cd1e091637dcc476a5786ad4d01ae1e9d482e8e5d434289fa36bb66911a7c00f6bbbcffba93df711f391837fa1397a6e4d7a00b67dee22ccc63ca92 SHA512 b36946cce789a242068b4181059ab1ad0c95575f34dee5f6373f65c0efbcd6f962fe53ab0b3e8f793d01564e20fee856c39354e6f947c9bc77a526a1808ed32b
+EBUILD selinux-perdition-2.20180114-r2.ebuild 290 BLAKE2B 1f31d50c05513a5287369a2d368f6e6cf80faba8c0799ebcbf3ae71b6c16417d000d02d5a5ea571e6c15cb19ef12eafa37f80da31d153ddae0d1f6e83d9142de SHA512 96e35266d3284893d8d1dac92c71641496ac23114c0fb59f854f515ef39a0f2c8fdf189f440d0e62b5964c249cf82ac63a59e4951833fe0c55c287d733f99b69
+EBUILD selinux-perdition-9999.ebuild 290 BLAKE2B 1f31d50c05513a5287369a2d368f6e6cf80faba8c0799ebcbf3ae71b6c16417d000d02d5a5ea571e6c15cb19ef12eafa37f80da31d153ddae0d1f6e83d9142de SHA512 96e35266d3284893d8d1dac92c71641496ac23114c0fb59f854f515ef39a0f2c8fdf189f440d0e62b5964c249cf82ac63a59e4951833fe0c55c287d733f99b69
 MISC metadata.xml 319 BLAKE2B 5f81c14cad4ee37a46611e0955e94fdf96b7f908006816cc7c7416aedd4cc9e9ee5b15c7f25a0ed355d5797d57f7a7d50ce9512417c9c5ce9056f81ef77f53b6 SHA512 7857badc182ef47415327b8560a32dcf20284532b2c1123cf4b0ce6d4cc3f2d2dfda7b03f6125694d709160ff4a7e54398c381fb49e2215340e419ee360ae605
diff --git a/sec-policy/selinux-perdition/selinux-perdition-2.20180114-r2.ebuild b/sec-policy/selinux-perdition/selinux-perdition-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..d84c6e5b0da8
--- /dev/null
+++ b/sec-policy/selinux-perdition/selinux-perdition-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 5e3f0a2e7714..d84c6e5b0da8 100644
--- a/sec-policy/selinux-perdition/selinux-perdition-9999.ebuild
+++ b/sec-policy/selinux-perdition/selinux-perdition-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-phpfpm/Manifest b/sec-policy/selinux-phpfpm/Manifest
index 5dc78ecb932a..0c01fb99f430 100644
--- a/sec-policy/selinux-phpfpm/Manifest
+++ b/sec-policy/selinux-phpfpm/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-phpfpm-2.20170805-r2.ebuild 378 BLAKE2B 3464237f1f43efdd97d75ff82
 EBUILD selinux-phpfpm-2.20170805-r3.ebuild 378 BLAKE2B 3464237f1f43efdd97d75ff82f3d4d5e3a41511c5ce66074d41180d6189df0cf0d962bd79ea4cd338c72f4e5a296cca599ddc22ee86dcea8037c7f0a4d99a454 SHA512 91ec36db97104e83d1e1188f69333da7479d2fa09689f1675e34b4063db905fac6ecf92300dba98f8f5425af7abbb94f5fc9fef320161cac9ff30699878446ac
 EBUILD selinux-phpfpm-2.20170805-r4.ebuild 380 BLAKE2B 1d5b876774bf0e37e76a370a44fa5bfe0290d1f706163526d5337342d8a1e38eb54adcc7752609df275f9003c191a25523c9c981edfc85f3ef29320b108b7264 SHA512 4a97b337e4cab7acc28b9825bb3ea956823b8acd69c3c9178c65d18c325c801c31e59bae97ff487fc322645288a8b8b2decad58a483ef6fd38d1e8f8cd9d075e
 EBUILD selinux-phpfpm-2.20180114-r1.ebuild 378 BLAKE2B 1ee2960b59f4859f12d451e004649a0b32b95408e57bb2811896dae8529c7a551ce79ff427eaa0bedc134608ef88280c22e729509362d78e9cf814bb8c1ea738 SHA512 0b6cded271592617ad5d8f552f8a55be91af3adf80cf7713b305d7c2c43eacbb3af40f601d41000f718e1b40767665ba95d893a24ed8a4befd2537e6b102e40e
-EBUILD selinux-phpfpm-9999.ebuild 380 BLAKE2B 1d5b876774bf0e37e76a370a44fa5bfe0290d1f706163526d5337342d8a1e38eb54adcc7752609df275f9003c191a25523c9c981edfc85f3ef29320b108b7264 SHA512 4a97b337e4cab7acc28b9825bb3ea956823b8acd69c3c9178c65d18c325c801c31e59bae97ff487fc322645288a8b8b2decad58a483ef6fd38d1e8f8cd9d075e
+EBUILD selinux-phpfpm-2.20180114-r2.ebuild 380 BLAKE2B 3694c381aecfd427fbc3dc9069a729cdd0e923a6dc8b36e5204082acbf91f537274e52e40d27c1c60de3d1af42e904922dd45a8a5f4735cf2009f0fa3030314c SHA512 33a73b97d169cf0e27a135cf924041ba933e3aad3c65fb3fe028a814f7197c9eed3b01deffb2532a9783769cc66a69d877456a04028467227adaec315bd614fe
+EBUILD selinux-phpfpm-9999.ebuild 380 BLAKE2B 3694c381aecfd427fbc3dc9069a729cdd0e923a6dc8b36e5204082acbf91f537274e52e40d27c1c60de3d1af42e904922dd45a8a5f4735cf2009f0fa3030314c SHA512 33a73b97d169cf0e27a135cf924041ba933e3aad3c65fb3fe028a814f7197c9eed3b01deffb2532a9783769cc66a69d877456a04028467227adaec315bd614fe
 MISC metadata.xml 316 BLAKE2B 491ffb7eba4985bada61e934b968c15e8eaa6bb358065a9eaa02e9d637c9f6fa5db6cbac130b5c00cc16ebd9d867082c7d734923f932132a9e6ac6c015f452df SHA512 9e18c465be0429fc172b0f8636488175749a69d8066deca7c00bd7d456b12ba9beb1c115fc1468add61c4d34863aa617d1710372a4c75f0f3ba66e3e9265e242
diff --git a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20180114-r2.ebuild b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..34cea65b1a0c
--- /dev/null
+++ b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20180114-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 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 8e7706cdf177..34cea65b1a0c 100644
--- a/sec-policy/selinux-phpfpm/selinux-phpfpm-9999.ebuild
+++ b/sec-policy/selinux-phpfpm/selinux-phpfpm-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-plymouthd/Manifest b/sec-policy/selinux-plymouthd/Manifest
index aacab44f84d2..97f722be59a3 100644
--- a/sec-policy/selinux-plymouthd/Manifest
+++ b/sec-policy/selinux-plymouthd/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-plymouthd-2.20170805-r2.ebuild 288 BLAKE2B 27a2b86e21d8a294df8505
 EBUILD selinux-plymouthd-2.20170805-r3.ebuild 288 BLAKE2B 27a2b86e21d8a294df8505c554b6a062c53c1832b44033175f53a319a65ba47ad9a3878af682bf6279f362687b97200ffe12c29d8ef306add5d4adda78970cfe SHA512 63a532c80b10aa6a4ac9ac772226b1492f6f78258446d24d6465cdab5a2979de203f9368cad410e2f416c5b28a471ee143b724569febeec766868d435bac5edf
 EBUILD selinux-plymouthd-2.20170805-r4.ebuild 290 BLAKE2B cc2b7660eea14d4df74666992a679fab40c0dd04de1b65ad95c4afe82dae3de107c74058da28b2624e3ed12d66f586031065388f5d9d2d03bd6a3a0049d265ec SHA512 9bc1a5a50f57360af52f83fe8ebb8bffa2e0b94b88ef54992324211693207a9849755f7202dce5a0b50e309868870a6fc25f04a409e4895b23d71f864b154a36
 EBUILD selinux-plymouthd-2.20180114-r1.ebuild 288 BLAKE2B fcaf7da46081233346a42a7e428800594a1b0e89552cca0410ebafa7e5a5a8d0be271d078792a1077e6acdf629cb5cb97117b20fea03e94188c2a141d3d05c67 SHA512 fca637f699222b6c88ea53e6c062061ec82c68aa4a0a88449dd2b489fc7cc48739dc5ccdedec3af5f20e9707d45ea6f66be8adae55d066fc896f7c1b2632851b
-EBUILD selinux-plymouthd-9999.ebuild 290 BLAKE2B cc2b7660eea14d4df74666992a679fab40c0dd04de1b65ad95c4afe82dae3de107c74058da28b2624e3ed12d66f586031065388f5d9d2d03bd6a3a0049d265ec SHA512 9bc1a5a50f57360af52f83fe8ebb8bffa2e0b94b88ef54992324211693207a9849755f7202dce5a0b50e309868870a6fc25f04a409e4895b23d71f864b154a36
+EBUILD selinux-plymouthd-2.20180114-r2.ebuild 290 BLAKE2B df4dcdeb44641d9d2a139c82074bb9cc100d9c84d43a3ca3b1a4ce11be7109a3291e695b4a5e7a8a0e03d469e7870c7e6155f25da25e9e49dbd63df008edc9b8 SHA512 8054bb24381253a5edcabc539c3fe020417749c741c214e22a40cf0215632f1ec213a55b842582ab4bda38b35039c0748615cb4d9f44225ff5e2164d50d37e85
+EBUILD selinux-plymouthd-9999.ebuild 290 BLAKE2B df4dcdeb44641d9d2a139c82074bb9cc100d9c84d43a3ca3b1a4ce11be7109a3291e695b4a5e7a8a0e03d469e7870c7e6155f25da25e9e49dbd63df008edc9b8 SHA512 8054bb24381253a5edcabc539c3fe020417749c741c214e22a40cf0215632f1ec213a55b842582ab4bda38b35039c0748615cb4d9f44225ff5e2164d50d37e85
 MISC metadata.xml 319 BLAKE2B c640f4703f9a4a02cb667d7bf67ebc0806f4c50d5f0dff51bd02af057b475fd2f795f06682fdcbbc8aafc3216b7a2c649f19dc6e5f3182bb8bd1c87df6ee1c9b SHA512 ec3d23e23f563f0ed5979e38b0809c54b5ac69e831934a5078cf9c8ca6dd4fd88570f53be750f1e0330d917129dce6b636dd6d3f17c23daa42e08b4a1e1979a0
diff --git a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20180114-r2.ebuild b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..241f5416f25e
--- /dev/null
+++ b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 f9b5a3ae0830..241f5416f25e 100644
--- a/sec-policy/selinux-plymouthd/selinux-plymouthd-9999.ebuild
+++ b/sec-policy/selinux-plymouthd/selinux-plymouthd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-podsleuth/Manifest b/sec-policy/selinux-podsleuth/Manifest
index 32ec66516b02..91ba9564dd14 100644
--- a/sec-policy/selinux-podsleuth/Manifest
+++ b/sec-policy/selinux-podsleuth/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-podsleuth-2.20170805-r2.ebuild 288 BLAKE2B f335ead531b4c1434a51c3
 EBUILD selinux-podsleuth-2.20170805-r3.ebuild 288 BLAKE2B f335ead531b4c1434a51c324eb82244699caaa0e70fd3b90113149f3d747d2fbd4bf2da7d40146ae867d20a915023ba22a8973ddb7fd7bc13f2e6b868935e7f1 SHA512 24f25eaeb5328d363294af62799fd45b0e0ee4755fdcc035e6a3d2da3df7142d6926fd3937ffedd6e75fccb1b489f319b52f7b56e78778751c06ea546f5e6ebf
 EBUILD selinux-podsleuth-2.20170805-r4.ebuild 290 BLAKE2B f7aafec9e3c07f08a90822d85d371092de54d13ddd5aa70e1aba488befc6bae78ca1851f57fc307059136e53a16903dc1168636a2e511edc0b4976d13459b490 SHA512 d071cba7b2d5f03188e1adee57f4e10bbf684d480fb1bb5e91a751427ef63ced0d1a38e5379c1c761e43da870be2c1455f8d97d731e8a8f9b784e822342b9046
 EBUILD selinux-podsleuth-2.20180114-r1.ebuild 288 BLAKE2B 1aa8898a2804f83c8bd4867e508c9f5a3dc26deac8f378498fa544c1d6c1a6b65fddf6996e0f5379137f7afacc3e5ed29072fed6393844eff2e2f308cdcbb021 SHA512 6dd6e1e064d366886d78a8042f4c0a17e4ae56cbbdb5014b4847943b752067c9b4002f7639222653b934589b1c015e58224c8f6ba32ee8d0a27f6ff9d89221ca
-EBUILD selinux-podsleuth-9999.ebuild 290 BLAKE2B f7aafec9e3c07f08a90822d85d371092de54d13ddd5aa70e1aba488befc6bae78ca1851f57fc307059136e53a16903dc1168636a2e511edc0b4976d13459b490 SHA512 d071cba7b2d5f03188e1adee57f4e10bbf684d480fb1bb5e91a751427ef63ced0d1a38e5379c1c761e43da870be2c1455f8d97d731e8a8f9b784e822342b9046
+EBUILD selinux-podsleuth-2.20180114-r2.ebuild 290 BLAKE2B 470400ab7c02d619486c00a23eb639a94bb272c639f8cf3b76c5a14c887921626b6d406df53bf08a305ba7ee184b7b59aaaae03aac95c2f93cdbfb4bcd51d964 SHA512 fd011e04a23cba4833c06489b0fb2ccf4d3f3ab5761a8fa46bdc6d4d3f055e5b513978b499eaa1e47478708c437254fcc059a31084f63f1092109a16b8ec871b
+EBUILD selinux-podsleuth-9999.ebuild 290 BLAKE2B 470400ab7c02d619486c00a23eb639a94bb272c639f8cf3b76c5a14c887921626b6d406df53bf08a305ba7ee184b7b59aaaae03aac95c2f93cdbfb4bcd51d964 SHA512 fd011e04a23cba4833c06489b0fb2ccf4d3f3ab5761a8fa46bdc6d4d3f055e5b513978b499eaa1e47478708c437254fcc059a31084f63f1092109a16b8ec871b
 MISC metadata.xml 319 BLAKE2B 6b1ef1db3cd6c566b2c7197e1372c95ac3cb61b1e051337532db604bc38458eff42cbb5c2e1056fd7e2d260682559e6deeae7b4f8949a0fb0d0142a35d0596a4 SHA512 1f97d533c42cf5a869d2ab25691faee9f3b08b2eccedaf36b14e1e3097dee240dc689bacc980f3d6dec3366041bbb83aa0a23c9c33be132334b8f3262868e7db
diff --git a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20180114-r2.ebuild b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..f17b187cb320
--- /dev/null
+++ b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 302379b6be20..f17b187cb320 100644
--- a/sec-policy/selinux-podsleuth/selinux-podsleuth-9999.ebuild
+++ b/sec-policy/selinux-podsleuth/selinux-podsleuth-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-policykit/Manifest b/sec-policy/selinux-policykit/Manifest
index baa7c6290a3a..b790701cd43c 100644
--- a/sec-policy/selinux-policykit/Manifest
+++ b/sec-policy/selinux-policykit/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-policykit-2.20170805-r2.ebuild 288 BLAKE2B a75c4569762576f45a94a2
 EBUILD selinux-policykit-2.20170805-r3.ebuild 288 BLAKE2B a75c4569762576f45a94a24bb59cc2088883d2286b0cd387fa71a0550425eec234ae576d248f0380dce8ce783b646e0e8de29ca79f08dd7a91bdfd4ec9a6f5b7 SHA512 0c8e9591b3f8322c89ddcdcd86fc03f689e29ebf177d8832c98c115e8ddc569c0b61dc7f85f876b5b8ca9f258cc179eb1bc4e1368e8a1dc4b313c301da1e2f21
 EBUILD selinux-policykit-2.20170805-r4.ebuild 290 BLAKE2B 874ede9a95d68ac01ce4e09111bfe8286ff19ed40569687989c2816d277114e8454bea7c48b1d90391cfe47594072946407266b5559356796238bb16ef7556e8 SHA512 51197b2d15bb950585c2a5acce28a762bcc31af2f909c2865236fadffd22d7aa66b57a2c351bc6f49e065e2c4c7a673ecb17b32a1e9c541e04f005f4005b05ff
 EBUILD selinux-policykit-2.20180114-r1.ebuild 288 BLAKE2B 1509b2dcc7deaef6f2f4bbe679090f871203b89a994b1e2480ff7ca66e232b46ce298638e206c0a787c9ce83144e2ace9642771e098eeaf0da9d59ceb4ca8125 SHA512 9546c4362a4bd4e23c717f929df5a25d7cc2aeebb8ac7eaee4116c1c5ded9951e4985469b3a4a451751cd03cad9a3a16b1b47e84491f72df744b9f176c241c75
-EBUILD selinux-policykit-9999.ebuild 290 BLAKE2B 874ede9a95d68ac01ce4e09111bfe8286ff19ed40569687989c2816d277114e8454bea7c48b1d90391cfe47594072946407266b5559356796238bb16ef7556e8 SHA512 51197b2d15bb950585c2a5acce28a762bcc31af2f909c2865236fadffd22d7aa66b57a2c351bc6f49e065e2c4c7a673ecb17b32a1e9c541e04f005f4005b05ff
+EBUILD selinux-policykit-2.20180114-r2.ebuild 290 BLAKE2B e6457b13ad609cb554c9c643cee15cb612e4ff1c0da36af70428f6d049f26a446fd9098c0da60598e0763b2051a5f82cc3f9317b630037185bfb71aea914f23b SHA512 555aabfc7d395dd31c9ca9e2a81ab80cba119aaa751636ba1be3fafb11d4e1c39db0e45f6dc0a8d2a6989dd8536a6d312a7c3abf6de6b8293047414151c13e19
+EBUILD selinux-policykit-9999.ebuild 290 BLAKE2B e6457b13ad609cb554c9c643cee15cb612e4ff1c0da36af70428f6d049f26a446fd9098c0da60598e0763b2051a5f82cc3f9317b630037185bfb71aea914f23b SHA512 555aabfc7d395dd31c9ca9e2a81ab80cba119aaa751636ba1be3fafb11d4e1c39db0e45f6dc0a8d2a6989dd8536a6d312a7c3abf6de6b8293047414151c13e19
 MISC metadata.xml 319 BLAKE2B 61b04c742d6106be38db5c1f5abed362c49c2aeb7bfeb97d3a7b0fe14fefb576a931c44baec61d0f97861554697f9b6d712e68b6c5cd77d1adf4816dd4f443dd SHA512 f12d584c6a1bb11eac0e6e282989f90b0ce0e660afa5097cc667f7a3686378a16030f1dc1adb62ff3035df60f53e3c8c49167ada253688c5d7198a3cddb9ae55
diff --git a/sec-policy/selinux-policykit/selinux-policykit-2.20180114-r2.ebuild b/sec-policy/selinux-policykit/selinux-policykit-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..63984df43a0b
--- /dev/null
+++ b/sec-policy/selinux-policykit/selinux-policykit-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 0d7dc409996d..63984df43a0b 100644
--- a/sec-policy/selinux-policykit/selinux-policykit-9999.ebuild
+++ b/sec-policy/selinux-policykit/selinux-policykit-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-portmap/Manifest b/sec-policy/selinux-portmap/Manifest
index 97fed0358fb7..860e17c040a4 100644
--- a/sec-policy/selinux-portmap/Manifest
+++ b/sec-policy/selinux-portmap/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-portmap-2.20170805-r2.ebuild 284 BLAKE2B 3e431ee50184d37b4786164a
 EBUILD selinux-portmap-2.20170805-r3.ebuild 284 BLAKE2B 3e431ee50184d37b4786164aa316630683304780150f8113fff6cd676cfcc6d063e14d2707216affee613d433d9a3d3b1250f484ce52d2cf58c6391049c8c7a0 SHA512 e40a199d033ade6e9ca9f4ceb74e4be7fd681b2e062bd8749fb0b991d0ce1aff19296cad3d48ba390a94b6f56e7586cd55aa852aabd13436e3ad3f8911dd8615
 EBUILD selinux-portmap-2.20170805-r4.ebuild 286 BLAKE2B 0edf3249003e33bc96ae7ad156d8d119afabe417d492ce77289c85cbb5f07d66d4a2e82241f346fcd7d6441f8f5c5cb638cfd616c1f17ec9e6945696fe968146 SHA512 77d108dc130386a7f611bfe06eeeb2a2bc1fb6d056caef65a73be982b9585eeab29b1efbb91de817472ad86d777fe52ace08b528eed3c3427f3082a5bef70a30
 EBUILD selinux-portmap-2.20180114-r1.ebuild 284 BLAKE2B b23b637cfb66946667c0238663ff7390482ccaad551fd0fa289a3277ec6a75502e730a411b1c5fc66723ab0a4b11062d4fe44f8d49cab777b50fe820f5bebba8 SHA512 f549f8f54445325229f2b8443366aa1ff7eb2ae8a1b331bba7e0213a323a7d5ad0bdc9ce832f29c4cbd86459decbc3047eae38f5e8282e0ca2689456aaed616a
-EBUILD selinux-portmap-9999.ebuild 286 BLAKE2B 0edf3249003e33bc96ae7ad156d8d119afabe417d492ce77289c85cbb5f07d66d4a2e82241f346fcd7d6441f8f5c5cb638cfd616c1f17ec9e6945696fe968146 SHA512 77d108dc130386a7f611bfe06eeeb2a2bc1fb6d056caef65a73be982b9585eeab29b1efbb91de817472ad86d777fe52ace08b528eed3c3427f3082a5bef70a30
+EBUILD selinux-portmap-2.20180114-r2.ebuild 286 BLAKE2B cd2d46a257dabfcbc7266911be39612313339fc653d90b045077c078d409e4b8ba86dd45c93d339290b7e3907e1f8b0185e5254960ed8af4ccb9552357952cf0 SHA512 031c2e742020d1d87e12d4fc8f2dd4c4026d85722f6201bc3f302a08a1200a2d6c96bdd40f7f7ffa9de712eba74d7a34b560dd40ae0b5f7c84ad5aad75c96b26
+EBUILD selinux-portmap-9999.ebuild 286 BLAKE2B cd2d46a257dabfcbc7266911be39612313339fc653d90b045077c078d409e4b8ba86dd45c93d339290b7e3907e1f8b0185e5254960ed8af4ccb9552357952cf0 SHA512 031c2e742020d1d87e12d4fc8f2dd4c4026d85722f6201bc3f302a08a1200a2d6c96bdd40f7f7ffa9de712eba74d7a34b560dd40ae0b5f7c84ad5aad75c96b26
 MISC metadata.xml 317 BLAKE2B 019b066f537fe5be713e1ce41f21856ff7b00dbfb3c4b9b11b964921c18ef8cd5be215641e0bf48b063444df71fdc9323a645f528bba61e7a093a086711e5558 SHA512 6d0fb959a90af947b760a5e5ab8895ba2e19538e516bff45e9f83625a405b442c04773c1c8e738b0af9f7c7dab257627bae490426861a70170fbaf47c1761526
diff --git a/sec-policy/selinux-portmap/selinux-portmap-2.20180114-r2.ebuild b/sec-policy/selinux-portmap/selinux-portmap-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..a62eeb9cf4c3
--- /dev/null
+++ b/sec-policy/selinux-portmap/selinux-portmap-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 488ef18d25d7..a62eeb9cf4c3 100644
--- a/sec-policy/selinux-portmap/selinux-portmap-9999.ebuild
+++ b/sec-policy/selinux-portmap/selinux-portmap-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-postfix/Manifest b/sec-policy/selinux-postfix/Manifest
index 39f2ba1da57f..ba220fe6cdcc 100644
--- a/sec-policy/selinux-postfix/Manifest
+++ b/sec-policy/selinux-postfix/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-postfix-2.20170805-r2.ebuild 284 BLAKE2B b6e847f12f23d522902c5f16
 EBUILD selinux-postfix-2.20170805-r3.ebuild 284 BLAKE2B b6e847f12f23d522902c5f160029fef6dab2abd362a43bb34c43ca204ed403e020b0e298fb2f19f5642752d676bcace15cea140c60c1e32adf493d406e8c55ca SHA512 656c6acb7f5fde0044b0f955ce111d52f3981a3bee1e3da0f66753727bd10e3132cb103ebfbe8a9af50098d80bdf446fdc995bb642f8046158aacd1cc28d81a6
 EBUILD selinux-postfix-2.20170805-r4.ebuild 286 BLAKE2B 79cd268ccb1c9dd7c6b04a73b4d6b06c94adbdf2061f8ca794becac7a066ee04793a5ab9293acf155ef852327a1a110e7828923d3179c9d3a0b167acece24128 SHA512 46bfe088df5279da8e97ff22d9a4607f5a607e8fac1b1db483ca40d6d0686d768210d117335e16b2ac0a7a4d7fdb2158bc0180f49f59fe3b4ed7def85ac7da31
 EBUILD selinux-postfix-2.20180114-r1.ebuild 284 BLAKE2B 60125d89fd0832e53535e6c80a41028cc7fa53157342f834859ded531d7302545dd39d769b0c346f51ddf72432311a3ecbccb5e3d61f364543d5e19cb4b912e7 SHA512 34cefe47bbce4daf87c3b56f9e72d1b743b8fc6fe3a86aa45969fffcf7020aa89b8d644a60ed6a41685419428cef18ab6a8d5a70b837bf6b82452eea37fa6199
-EBUILD selinux-postfix-9999.ebuild 286 BLAKE2B 79cd268ccb1c9dd7c6b04a73b4d6b06c94adbdf2061f8ca794becac7a066ee04793a5ab9293acf155ef852327a1a110e7828923d3179c9d3a0b167acece24128 SHA512 46bfe088df5279da8e97ff22d9a4607f5a607e8fac1b1db483ca40d6d0686d768210d117335e16b2ac0a7a4d7fdb2158bc0180f49f59fe3b4ed7def85ac7da31
+EBUILD selinux-postfix-2.20180114-r2.ebuild 286 BLAKE2B f239731c6d6f3236a955a03ef8d7ca60a27415dbcdd78eb1c2bc20b744242ec02d82d08272cfeb4ae02478a187bb5ca676e9f40656339425927aa76866c01417 SHA512 de91b37db28205a960ad1d9aff1cbe139e31ff5a62aec56527e4ec31a9dc2b067acc5c14059a019c32b0c13f48ad4f4b5dc8dc5259e00cc8f93f8bed4cd56708
+EBUILD selinux-postfix-9999.ebuild 286 BLAKE2B f239731c6d6f3236a955a03ef8d7ca60a27415dbcdd78eb1c2bc20b744242ec02d82d08272cfeb4ae02478a187bb5ca676e9f40656339425927aa76866c01417 SHA512 de91b37db28205a960ad1d9aff1cbe139e31ff5a62aec56527e4ec31a9dc2b067acc5c14059a019c32b0c13f48ad4f4b5dc8dc5259e00cc8f93f8bed4cd56708
 MISC metadata.xml 317 BLAKE2B bc62377144bd61efc49ad850d68d9b3a178767b8f5e3732a9269370980615ccc3c17432b8b241c44cabafb9d9e92122b4be11146df128bc244226b8c53ed5b37 SHA512 7109989e6380231647aaf248be3bf2fd619859ae42bf0e271ef1de45b9b663e804988c03993b18502110d86d58d35bc265c3a59e03bd3484cffe6d8f29a3e9c1
diff --git a/sec-policy/selinux-postfix/selinux-postfix-2.20180114-r2.ebuild b/sec-policy/selinux-postfix/selinux-postfix-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..c921b4c1e505
--- /dev/null
+++ b/sec-policy/selinux-postfix/selinux-postfix-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 00c6d47db3c2..c921b4c1e505 100644
--- a/sec-policy/selinux-postfix/selinux-postfix-9999.ebuild
+++ b/sec-policy/selinux-postfix/selinux-postfix-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-postgresql/Manifest b/sec-policy/selinux-postgresql/Manifest
index b9dd434fd3e0..b91f09821265 100644
--- a/sec-policy/selinux-postgresql/Manifest
+++ b/sec-policy/selinux-postgresql/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-postgresql-2.20170805-r2.ebuild 290 BLAKE2B 29abdd6b340016f21538b
 EBUILD selinux-postgresql-2.20170805-r3.ebuild 290 BLAKE2B 29abdd6b340016f21538bb26590d8e67ec501c3dd5c27a30200bd2193e70ca3d482b7b7178497d2022b406dce3e721fba53179daf4ba0ce6d158c6acbecfbd97 SHA512 840c381df469e41c7f471f4701dbb860d2d47febc0bb238e454d66480b05f4ac6b04e310e78a47028a851d394af9ae96bae537c7cb09925cb14b18027b918c35
 EBUILD selinux-postgresql-2.20170805-r4.ebuild 292 BLAKE2B ce9de3c13e5d2b8f86470c4d7a0116ce9366f37f81e99254b40ddcc77d0d20885f4720622243e5ac6a3d21ba34344e7ea50d89bddb9f2d017ea0a6b41507cfab SHA512 9821c318ac8386b57223a015dacce399ce4e71feb807574cfa6038a9effb1ffdc4e36a8bbe0c87059e2b85b4f00623ce9a8ccf137036c917c63339e7d95be058
 EBUILD selinux-postgresql-2.20180114-r1.ebuild 290 BLAKE2B 3851635b36293bb26057a8280274b36d55474273db35502d8b6eb56c05d63cbd9bf195b528d57a3615d6b015c7ce4071f21847d5f4566c98d2c08c65166c59cd SHA512 a25b7b88126fd9449db2998bbfc39fa9609922671b61a60c5f086923afe674a55275420704375143c2098b8b7e963e6e9576f5e2fef6785fca7ea819dafa990e
-EBUILD selinux-postgresql-9999.ebuild 292 BLAKE2B ce9de3c13e5d2b8f86470c4d7a0116ce9366f37f81e99254b40ddcc77d0d20885f4720622243e5ac6a3d21ba34344e7ea50d89bddb9f2d017ea0a6b41507cfab SHA512 9821c318ac8386b57223a015dacce399ce4e71feb807574cfa6038a9effb1ffdc4e36a8bbe0c87059e2b85b4f00623ce9a8ccf137036c917c63339e7d95be058
+EBUILD selinux-postgresql-2.20180114-r2.ebuild 292 BLAKE2B f87176c539de358e83d6f04024368ea88729256d8fc15f30acdc52e31b37c56cd7f1e0ea6f72707b27eb67212dc2a8dd33396328da8b5f7f3b601bd93483d734 SHA512 12b15dfb2acd99c39b2492aa8e1e7e44cdc8a7620a2bd02cdf964a01c63f5732a8b4b1ba735f870ec64e5720b4c58ce889123cc4538db1d0a05d0ab2b6bcfdf9
+EBUILD selinux-postgresql-9999.ebuild 292 BLAKE2B f87176c539de358e83d6f04024368ea88729256d8fc15f30acdc52e31b37c56cd7f1e0ea6f72707b27eb67212dc2a8dd33396328da8b5f7f3b601bd93483d734 SHA512 12b15dfb2acd99c39b2492aa8e1e7e44cdc8a7620a2bd02cdf964a01c63f5732a8b4b1ba735f870ec64e5720b4c58ce889123cc4538db1d0a05d0ab2b6bcfdf9
 MISC metadata.xml 320 BLAKE2B ef4a728b52983625b81115b7a19880b1f54d4144f46f06761620fa76e0c93c307b877c6d43322c91ed826ef5455b63e2e8a723fa5fb026695dbc3c5240c56b12 SHA512 00365c82e7ac0b2cc9cfeeb766acd22e5000f1146cee207bd7df897b560590c9a7ddfde7f4ce0d4f5f535125a29137355cdd2415ad6fd4def67535e112990853
diff --git a/sec-policy/selinux-postgresql/selinux-postgresql-2.20180114-r2.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..ccdfdb169305
--- /dev/null
+++ b/sec-policy/selinux-postgresql/selinux-postgresql-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 6c31791b6846..ccdfdb169305 100644
--- a/sec-policy/selinux-postgresql/selinux-postgresql-9999.ebuild
+++ b/sec-policy/selinux-postgresql/selinux-postgresql-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-postgrey/Manifest b/sec-policy/selinux-postgrey/Manifest
index f59e7f461b33..bcea08f833e1 100644
--- a/sec-policy/selinux-postgrey/Manifest
+++ b/sec-policy/selinux-postgrey/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-postgrey-2.20170805-r2.ebuild 286 BLAKE2B 509b406659c150d7ae94d23
 EBUILD selinux-postgrey-2.20170805-r3.ebuild 286 BLAKE2B 509b406659c150d7ae94d23357174ba6462f40ddf1793477f94c2644087b668360110c5eb7ca716cf671a9d4653e1bbdb04d49d37d0a36f4b0e0922b33d3f358 SHA512 3938f45a89e53304e71c900ae01f8a5f947aa2cecabf324011d1415fc11189dccc833f4f4a1a6fe079555c10c404b3c88af0a528c3d0fbf8abe0aab04530a178
 EBUILD selinux-postgrey-2.20170805-r4.ebuild 288 BLAKE2B 979923106aaa4287226763cefcb5f061fdff7b4003a0ae4c267dc44558a5d26dda4eaf2a0577cfd6e2ac27a8acfb5a1b796f335c421d7dd693cdcac903e53168 SHA512 06bde822722d217eab7d77cf09c78961a185ba9c7e012c5115f8b221b3c18eafe8816396e5fdcabc1dfcf4411a2ffe0a42ddafc6ad67a9b1884d42d489c794b0
 EBUILD selinux-postgrey-2.20180114-r1.ebuild 286 BLAKE2B ab43a8a24b72280e42015afbaa403c32991bf7a455b971102c501f66879e0cd1f5c53fb32b7d27a33f49e09d08cd931303f115e3a75245d3e23e262bced1bce1 SHA512 cf183d6cb3dd9db3ca43dbcbb2a159a39c9bb29e21ed656545d6db6a5b3495ead33b395309d0184c1eb5b559f29afd2f393bada6dad76fcb4677f05e32b078b7
-EBUILD selinux-postgrey-9999.ebuild 288 BLAKE2B 979923106aaa4287226763cefcb5f061fdff7b4003a0ae4c267dc44558a5d26dda4eaf2a0577cfd6e2ac27a8acfb5a1b796f335c421d7dd693cdcac903e53168 SHA512 06bde822722d217eab7d77cf09c78961a185ba9c7e012c5115f8b221b3c18eafe8816396e5fdcabc1dfcf4411a2ffe0a42ddafc6ad67a9b1884d42d489c794b0
+EBUILD selinux-postgrey-2.20180114-r2.ebuild 288 BLAKE2B 2d4ea4a66369f520ec7cae9e95725ee4874794f402a831caa3c94b1de10471a54e07a9d7ded3159851d0cd2cabf6e059ea2055b34f37590d7028df54d1dcf0f0 SHA512 654da8d40986edd4788f329e8cd2455d60ed1e6e5839ae49505447e3dff3cd3a5d4df74b8147d90a2ed7daa62869a050c367ce6fd333679432e7b72ac719c3af
+EBUILD selinux-postgrey-9999.ebuild 288 BLAKE2B 2d4ea4a66369f520ec7cae9e95725ee4874794f402a831caa3c94b1de10471a54e07a9d7ded3159851d0cd2cabf6e059ea2055b34f37590d7028df54d1dcf0f0 SHA512 654da8d40986edd4788f329e8cd2455d60ed1e6e5839ae49505447e3dff3cd3a5d4df74b8147d90a2ed7daa62869a050c367ce6fd333679432e7b72ac719c3af
 MISC metadata.xml 318 BLAKE2B c3c0c371099e41034efe77018016eac5506cf25b5cb3b03f5f5bf171186a73df923b9641df09c55bbf178227a95ef4dd3ba6b3beef2eaf4cbce93eb4f033192f SHA512 03a6f16ebf3c2f2cfe4c417434cc56007ca5df669d76ca93aacfe30a74b6bb8e6d269ef0b9eb4e96b85d638b266b5839c8713ef1be4e8925417a5004ed0d7c19
diff --git a/sec-policy/selinux-postgrey/selinux-postgrey-2.20180114-r2.ebuild b/sec-policy/selinux-postgrey/selinux-postgrey-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..a5da0c400ac3
--- /dev/null
+++ b/sec-policy/selinux-postgrey/selinux-postgrey-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 4f70a25a4dd2..a5da0c400ac3 100644
--- a/sec-policy/selinux-postgrey/selinux-postgrey-9999.ebuild
+++ b/sec-policy/selinux-postgrey/selinux-postgrey-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-ppp/Manifest b/sec-policy/selinux-ppp/Manifest
index d2721d022543..7fc6b650062f 100644
--- a/sec-policy/selinux-ppp/Manifest
+++ b/sec-policy/selinux-ppp/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-ppp-2.20170805-r2.ebuild 276 BLAKE2B a2afac69a094a39eca939ecb490a
 EBUILD selinux-ppp-2.20170805-r3.ebuild 276 BLAKE2B a2afac69a094a39eca939ecb490aaf7cc16a16fb82d7d2bb1a92b3f454e31005ac84f1fe73a290b66db52e98ff1cc7bfa0f0264773082e0c79373f28cbfbe3ca SHA512 a6797cbb831ab5aa31226afe6f5221fd3f17ac4c14f384ca87070f79c183d189d02ff0805a146a0a955239112ca5e31b18b90b3607fce5b51c18d01f2c8c90aa
 EBUILD selinux-ppp-2.20170805-r4.ebuild 278 BLAKE2B cb80bb2479bf481752bfacd97ba37e3742a9faa53bd93166a349cbc6c075a332f17d4dcf27050d65c4a31195c81c89868649f03b6e2142898d017c164dc371d9 SHA512 9f8bdd984b1b1b4531c70ca1aea89fa811635f13f1bcde0aeae17446bce75dfd4e9bee05267a927cc39fa94df05570fc22779c1ba032b8bb5d8c82f2b08645fc
 EBUILD selinux-ppp-2.20180114-r1.ebuild 276 BLAKE2B 930b7453921d0d5b5fbce985736f7738281f16f8421fed10e6c00ddeb79970a6857d75f96d97c246ff0774801d780febc4a15eeff04ec8908b6d98a27c4bc623 SHA512 faed7e4c4e7876fa45d7528b80cf3b189fdb739f34549a181ba75669e1f7558d5176bf6b10b26b2261197323682f2bac832889fa7a993021dbc547170ee0bd2b
-EBUILD selinux-ppp-9999.ebuild 278 BLAKE2B cb80bb2479bf481752bfacd97ba37e3742a9faa53bd93166a349cbc6c075a332f17d4dcf27050d65c4a31195c81c89868649f03b6e2142898d017c164dc371d9 SHA512 9f8bdd984b1b1b4531c70ca1aea89fa811635f13f1bcde0aeae17446bce75dfd4e9bee05267a927cc39fa94df05570fc22779c1ba032b8bb5d8c82f2b08645fc
+EBUILD selinux-ppp-2.20180114-r2.ebuild 278 BLAKE2B 596f8c07c02e2d942432234d601f100b68a3f6baf21132d790ea9b5bdb2e72b9c10ee5b95f8cf4ea9e40d3e81a255ae73d25d2bb8d3754a5be49db65ebf98c70 SHA512 2b6370f5d45ce0cf2447b70fbc2fd574a23b8581960c12c98bdbb03ba1649642be8d8da04130637db612012cca12b9d52a63f74afc54565763d87047e680c0f2
+EBUILD selinux-ppp-9999.ebuild 278 BLAKE2B 596f8c07c02e2d942432234d601f100b68a3f6baf21132d790ea9b5bdb2e72b9c10ee5b95f8cf4ea9e40d3e81a255ae73d25d2bb8d3754a5be49db65ebf98c70 SHA512 2b6370f5d45ce0cf2447b70fbc2fd574a23b8581960c12c98bdbb03ba1649642be8d8da04130637db612012cca12b9d52a63f74afc54565763d87047e680c0f2
 MISC metadata.xml 313 BLAKE2B 8dce03a7e86358b04a98c6f42367961c2fe621b0d8dd89551378a205218eec627d875c25b5ed2064813ca6012c608b077ab163acea43ed64e832839f553f3205 SHA512 f7b9c2a6b0c8aca070e0dbdd25fc506aa957b0a033f9cf3bef165f0c51a8d03c2c05e98a7c0712f27671c688b0e95aea4360e7313b4f9379852483d0afcbc3aa
diff --git a/sec-policy/selinux-ppp/selinux-ppp-2.20180114-r2.ebuild b/sec-policy/selinux-ppp/selinux-ppp-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..5deee503f6f2
--- /dev/null
+++ b/sec-policy/selinux-ppp/selinux-ppp-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 87dd919d6022..5deee503f6f2 100644
--- a/sec-policy/selinux-ppp/selinux-ppp-9999.ebuild
+++ b/sec-policy/selinux-ppp/selinux-ppp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-prelink/Manifest b/sec-policy/selinux-prelink/Manifest
index 706f2084e2ff..ca66458849fc 100644
--- a/sec-policy/selinux-prelink/Manifest
+++ b/sec-policy/selinux-prelink/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-prelink-2.20170805-r2.ebuild 284 BLAKE2B f18d884e34b2ec1165a36739
 EBUILD selinux-prelink-2.20170805-r3.ebuild 284 BLAKE2B f18d884e34b2ec1165a3673974162322e5f98b6590dc2a58c18bc3832541d0464e300ef59ad2d11ede47ccf4c83619820191df6350f8fabf7495c7a5ba2e395c SHA512 f1f96a000d7bcadb3dd82671515869257b3a665c596af4e4b77cd66b861f21dc7167a61b3acd036a6221add588cff235d32023a965d2d008fdb96a54e3fbca79
 EBUILD selinux-prelink-2.20170805-r4.ebuild 286 BLAKE2B d5ff481b6d93873b4c21947b26b8575ebe2dd7d2f08d44b7f540fe8a524bbc26d148d28a949b709b34ed9712f9f0250511e454ca8a3488233a01121a5cf98415 SHA512 a3e006f1f1451a0d1a4604821bbfe36cba6815da539dd468c0f6db5b89aeb22ac6b1bba379f5b9262b6c51dead5aac96d0445514ad12a037924e15da4abedad6
 EBUILD selinux-prelink-2.20180114-r1.ebuild 284 BLAKE2B ae8839f864d62249f8769eed890e7ac0ec83a3723b58a7aacaf4d565093a4fd2962284d6af3ae4e22f15dc2b85ac590accf57cdbb5e836f97db738b626519246 SHA512 44ce8cc56110c03a7420b32ef7fe3aa3ed27b88616bbc89bcc3bfdad3cf77dcd8fcd8648ae8dcb6e7823ca56e59384ee213abeaf40ad457500542e3971ef1cbb
-EBUILD selinux-prelink-9999.ebuild 286 BLAKE2B d5ff481b6d93873b4c21947b26b8575ebe2dd7d2f08d44b7f540fe8a524bbc26d148d28a949b709b34ed9712f9f0250511e454ca8a3488233a01121a5cf98415 SHA512 a3e006f1f1451a0d1a4604821bbfe36cba6815da539dd468c0f6db5b89aeb22ac6b1bba379f5b9262b6c51dead5aac96d0445514ad12a037924e15da4abedad6
+EBUILD selinux-prelink-2.20180114-r2.ebuild 286 BLAKE2B 5c56a88a0a74444bd24c5b50c631720af4e8d0920e5e0a3b40602f16a443cda67a1448efc8a9462943d0187d913b879784dcf25f100e09f781f3da64c593fe2e SHA512 55179e49f2fb5f194a7846460b71038544b7b2af3727b463fa3a9e15e18f2bf4981d102d3833a9fe7ca5adeeeefa8e42aba82b8374056571cce19b3db4f96d0a
+EBUILD selinux-prelink-9999.ebuild 286 BLAKE2B 5c56a88a0a74444bd24c5b50c631720af4e8d0920e5e0a3b40602f16a443cda67a1448efc8a9462943d0187d913b879784dcf25f100e09f781f3da64c593fe2e SHA512 55179e49f2fb5f194a7846460b71038544b7b2af3727b463fa3a9e15e18f2bf4981d102d3833a9fe7ca5adeeeefa8e42aba82b8374056571cce19b3db4f96d0a
 MISC metadata.xml 317 BLAKE2B 13304bdab3d7cf89c48d3feb1b7893a4c4014cd799a40eecf6e07adf2fd31320a75c7e4e6555f01b23148992ebceadf2da32623b2918a5885ae2a61c3ba44e31 SHA512 858d2c01c7dfe3f73a2293cb15ff34bcaeb3f92c5736a09da4eaaedb341a52e32289525a07cbac480add98386016d07b1b705aead1b9992a7541d5bdd3126c42
diff --git a/sec-policy/selinux-prelink/selinux-prelink-2.20180114-r2.ebuild b/sec-policy/selinux-prelink/selinux-prelink-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..8dc9cf31cd90
--- /dev/null
+++ b/sec-policy/selinux-prelink/selinux-prelink-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 57e11bb1b330..8dc9cf31cd90 100644
--- a/sec-policy/selinux-prelink/selinux-prelink-9999.ebuild
+++ b/sec-policy/selinux-prelink/selinux-prelink-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-prelude/Manifest b/sec-policy/selinux-prelude/Manifest
index f66739a366c6..146e7b075875 100644
--- a/sec-policy/selinux-prelude/Manifest
+++ b/sec-policy/selinux-prelude/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-prelude-2.20170805-r2.ebuild 380 BLAKE2B d0fc32c10ffe8944785af0cb
 EBUILD selinux-prelude-2.20170805-r3.ebuild 380 BLAKE2B d0fc32c10ffe8944785af0cb45f178b192162d83d2bd87819bcf3cb762fd5de05d3cee823086671666b4d079866fda01f1ff261f9b022e766c66d29b174f8743 SHA512 0edc9ac4dbe3f56359765fa6fb4267cb6bda34ee172bb805be4ac3a9bc7888b45a5c3b06b15347c1fc64d15d2d3a7bad4c2504e130bb053975e39bffb6825fb3
 EBUILD selinux-prelude-2.20170805-r4.ebuild 382 BLAKE2B 8e9372065653530e183f3f3a81d68e0e6e698a52f576cd00a79e7d249803a1c628baa862aad7d2304a12b37075176aaeee3658e29f308cec4541a340651097cb SHA512 7c0f08079abf1dec06241c2be6f1e6f528ab81c627256eab53f0430542456bd22dbc0af963a718144efb4b68d2f1e497ab6d360b8d29c39b5f282cc58d0a2c10
 EBUILD selinux-prelude-2.20180114-r1.ebuild 380 BLAKE2B 73b0198f04357b5e457be1371a846bb775c209700ffc9d27fc86adf51572be1529d3304a9ed00e5a7262e0cb895b5139fa30fa38ba60e781472014d715657f1c SHA512 1424a8dd172868c88635e565b9f8cb7c5ff21b45fde3e4afe0e35ec42963020383934fe57fa850eec696325ee4ac8143c9ec501cdddf4e9371b66cfac6bfc65d
-EBUILD selinux-prelude-9999.ebuild 382 BLAKE2B 8e9372065653530e183f3f3a81d68e0e6e698a52f576cd00a79e7d249803a1c628baa862aad7d2304a12b37075176aaeee3658e29f308cec4541a340651097cb SHA512 7c0f08079abf1dec06241c2be6f1e6f528ab81c627256eab53f0430542456bd22dbc0af963a718144efb4b68d2f1e497ab6d360b8d29c39b5f282cc58d0a2c10
+EBUILD selinux-prelude-2.20180114-r2.ebuild 382 BLAKE2B a9d4e4af99d82d78c0079e42fe617f7853f79562cf716092ea21e0bd4b61247ac01d76b3c3674fd962cb87247fde1ef77f5723ff68da5aa7420d5bea37d2403a SHA512 b0044e9e25ed4ca4e75b5c6fa9adf0a8c3e03b7f2a5cce8b50390075028bf49f66273edaa26031ad8cb016923988c677bad614760df62851c25d325b00ec14b5
+EBUILD selinux-prelude-9999.ebuild 382 BLAKE2B a9d4e4af99d82d78c0079e42fe617f7853f79562cf716092ea21e0bd4b61247ac01d76b3c3674fd962cb87247fde1ef77f5723ff68da5aa7420d5bea37d2403a SHA512 b0044e9e25ed4ca4e75b5c6fa9adf0a8c3e03b7f2a5cce8b50390075028bf49f66273edaa26031ad8cb016923988c677bad614760df62851c25d325b00ec14b5
 MISC metadata.xml 317 BLAKE2B 52ee6446cb2b505c719ee40919082eaea9dd76287b2994a0027c697e73f574584152ca522fe34c42f864b44a746006292e75af3f4511c3157f5c6b3a9f7306b3 SHA512 08ccae1fc36026c405d62f24cf756d27253247e7a29cc0fc8bbb09c9a44c071875caf81bf5fe428da00bc7d876ce69bbcee65ea8289efee6ab14a6ad797ec198
diff --git a/sec-policy/selinux-prelude/selinux-prelude-2.20180114-r2.ebuild b/sec-policy/selinux-prelude/selinux-prelude-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..346eb876da5d
--- /dev/null
+++ b/sec-policy/selinux-prelude/selinux-prelude-2.20180114-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 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 01b1601cb16f..346eb876da5d 100644
--- a/sec-policy/selinux-prelude/selinux-prelude-9999.ebuild
+++ b/sec-policy/selinux-prelude/selinux-prelude-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-privoxy/Manifest b/sec-policy/selinux-privoxy/Manifest
index 0054e77f46f6..fabf6e7612f1 100644
--- a/sec-policy/selinux-privoxy/Manifest
+++ b/sec-policy/selinux-privoxy/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-privoxy-2.20170805-r2.ebuild 284 BLAKE2B 922276bbbb6178840b1ea5e2
 EBUILD selinux-privoxy-2.20170805-r3.ebuild 284 BLAKE2B 922276bbbb6178840b1ea5e22d3913bffac0a77b6402ffd7ad95c34636c7954accca9807de18730a9e8a3b1d784640bcdf3b9cadb6d7d44a1b110260ab0e2b0f SHA512 b0e44c66ef400935dcd8768196097c333ee42d0cb433aac25e8efc3ec128fd7139167acc91049cce38e110c069e0206a5f8b901075e6e6fb834056ef1b2cb9f7
 EBUILD selinux-privoxy-2.20170805-r4.ebuild 286 BLAKE2B 92d8dc4318f032713a5c2ff957819e8e87c8e1f27b24b1d77b943eb4bc3726e0736e1cadbc2f736f5369d81c59b422f7b657c487e6e505dfad2863bdf62f02bd SHA512 ab9d314ffecf0a0dd99e286093908b4435fa9fb392b4eef377e06fa3b21897cb0232e810c2622b4ff160a0944733e463658792f84f8c9565b5e6d4a61d163737
 EBUILD selinux-privoxy-2.20180114-r1.ebuild 284 BLAKE2B a6254c3465327128b8e07f9566b39702171a7f4be9eadd736a9c9e17ba794f13a63034bd119386ddbb90f28dbf7d07e6ffc23a227aed3ad85471ee3fb42ed78e SHA512 222de7ddaa07de03b37b1471f13fe28adc0fb226c5d7cfbb5ee7f8285a91fe44acf90094de25d3edfbfd3a5ac155934f51f2f65086983fa035083040523467a5
-EBUILD selinux-privoxy-9999.ebuild 286 BLAKE2B 92d8dc4318f032713a5c2ff957819e8e87c8e1f27b24b1d77b943eb4bc3726e0736e1cadbc2f736f5369d81c59b422f7b657c487e6e505dfad2863bdf62f02bd SHA512 ab9d314ffecf0a0dd99e286093908b4435fa9fb392b4eef377e06fa3b21897cb0232e810c2622b4ff160a0944733e463658792f84f8c9565b5e6d4a61d163737
+EBUILD selinux-privoxy-2.20180114-r2.ebuild 286 BLAKE2B 0bb8e4ca634449ab11e30a2be826295aba049ce47f70ea35bc64fe644aa4ad0e733793be433589bf763f8ac558319b98f7a1dd4a71dc5a2dbf29d85e1a64a45b SHA512 f31d21bc65fd6a2fbbe556e44c24162c7dbbd5f862e050bee57420047fa92fa6b1ba8c6c270e628631f92d9c484bae880e6ae109bdb19256e7d446b84949a742
+EBUILD selinux-privoxy-9999.ebuild 286 BLAKE2B 0bb8e4ca634449ab11e30a2be826295aba049ce47f70ea35bc64fe644aa4ad0e733793be433589bf763f8ac558319b98f7a1dd4a71dc5a2dbf29d85e1a64a45b SHA512 f31d21bc65fd6a2fbbe556e44c24162c7dbbd5f862e050bee57420047fa92fa6b1ba8c6c270e628631f92d9c484bae880e6ae109bdb19256e7d446b84949a742
 MISC metadata.xml 317 BLAKE2B 9f2053b7554c349b575079a4eaa2bebacce6461c82a4834db9db952ca79e89f8835c60012fb88d05036b24bfaaf494786919fd3f33fa5a909c1cac3d1ff402c6 SHA512 3c9b547563afda91854884e1933b0957390dcbdd3259ee8944a20af10f12dc987f24428de06250172299fa92d274680f86bfdbd2c2c95d8aa675bf519238470b
diff --git a/sec-policy/selinux-privoxy/selinux-privoxy-2.20180114-r2.ebuild b/sec-policy/selinux-privoxy/selinux-privoxy-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..37dbabe24a88
--- /dev/null
+++ b/sec-policy/selinux-privoxy/selinux-privoxy-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 e3cf3ac3b34d..37dbabe24a88 100644
--- a/sec-policy/selinux-privoxy/selinux-privoxy-9999.ebuild
+++ b/sec-policy/selinux-privoxy/selinux-privoxy-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-procmail/Manifest b/sec-policy/selinux-procmail/Manifest
index bbb5dbb3c157..08b06e5a0cc1 100644
--- a/sec-policy/selinux-procmail/Manifest
+++ b/sec-policy/selinux-procmail/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-procmail-2.20170805-r2.ebuild 286 BLAKE2B f538bde206161fe049b688f
 EBUILD selinux-procmail-2.20170805-r3.ebuild 286 BLAKE2B f538bde206161fe049b688fd6c2671dbe4df4e67ba0e37e773c7d6878ab21733a06a92486156f2b69452a2bd7e2b012a06a3abf757bc08d3c4363f8fb4ce28a7 SHA512 5cfc076f61fa70c0fe3a1a60dd5ef22404a94e51dc4bf914417442e3dfaf74c64e92efb23cae2c990b24559e15545cdc78006422b5e4dbe96a2f1932607bcafc
 EBUILD selinux-procmail-2.20170805-r4.ebuild 288 BLAKE2B 1b72f5c4a940a63e2159ef0470b48d28f2de5184f179cb0ca96cb168ad37b7652bd37714bd6745748f825854a37668dac474b39560bf071431738f253fdfe991 SHA512 66a278af92f496982effe8ea4bae07704ae31d1ab6780360c13ac760f73b69b876f27e178c7ffd9869dcc9a151cf47ec2cc645c7862285385066e5733cd761e7
 EBUILD selinux-procmail-2.20180114-r1.ebuild 286 BLAKE2B f079428bf7a6d003b38c3906064a9e13a2a15ba2140c4b1794597bd8c8c5de96e59538026771c4d14e8980900afba2fcea80d30eb0e489846fbe4fd90e57bae5 SHA512 ed7a02f3bb1f5ef2e88394a76ca94cdf700e08bfd880dd66d2ef680232e499b555612c5cecb7c5255432230a5c38a07013e4466dc6483eea35ebfa679dc2b91f
-EBUILD selinux-procmail-9999.ebuild 288 BLAKE2B 1b72f5c4a940a63e2159ef0470b48d28f2de5184f179cb0ca96cb168ad37b7652bd37714bd6745748f825854a37668dac474b39560bf071431738f253fdfe991 SHA512 66a278af92f496982effe8ea4bae07704ae31d1ab6780360c13ac760f73b69b876f27e178c7ffd9869dcc9a151cf47ec2cc645c7862285385066e5733cd761e7
+EBUILD selinux-procmail-2.20180114-r2.ebuild 288 BLAKE2B 3d44034286fe53005b6ed83fdd160dad3da3aeac506d0de42356be15b7541e0ea6a645c77d67b67795c1b12e67f4e6f9ad27b92ac882e8d1b6db2432f7897b93 SHA512 8396d257dc8c819da4a6ab6957c539790325e38f4aa1949f57c900d9f7b7aa98f494a611916ab68419e748464383146589f2dcbcde95ccdac788dc37bc3d59fe
+EBUILD selinux-procmail-9999.ebuild 288 BLAKE2B 3d44034286fe53005b6ed83fdd160dad3da3aeac506d0de42356be15b7541e0ea6a645c77d67b67795c1b12e67f4e6f9ad27b92ac882e8d1b6db2432f7897b93 SHA512 8396d257dc8c819da4a6ab6957c539790325e38f4aa1949f57c900d9f7b7aa98f494a611916ab68419e748464383146589f2dcbcde95ccdac788dc37bc3d59fe
 MISC metadata.xml 318 BLAKE2B fd09708c49ff5681ba2609ceb19c7001a62077d505bd71159ceb4824f2a86fa8d865ab5a9c023ae9c088c7e531bf55986058fa79dd6e008191c6e66eeda622a9 SHA512 9d12c3604c6dbf96afab2541fbce6d92206273a42f21a3c3643a15fb3569faf2d7f7818eb69078ff8ec4431b744dac805d378c2816064128709f392bc59ba3ac
diff --git a/sec-policy/selinux-procmail/selinux-procmail-2.20180114-r2.ebuild b/sec-policy/selinux-procmail/selinux-procmail-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..a898ad1b5e30
--- /dev/null
+++ b/sec-policy/selinux-procmail/selinux-procmail-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 e0d25df17277..a898ad1b5e30 100644
--- a/sec-policy/selinux-procmail/selinux-procmail-9999.ebuild
+++ b/sec-policy/selinux-procmail/selinux-procmail-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-psad/Manifest b/sec-policy/selinux-psad/Manifest
index 5dc4da7def8a..b509999004c2 100644
--- a/sec-policy/selinux-psad/Manifest
+++ b/sec-policy/selinux-psad/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-psad-2.20170805-r2.ebuild 278 BLAKE2B 5319efb2d357a6027538de282b3
 EBUILD selinux-psad-2.20170805-r3.ebuild 278 BLAKE2B 5319efb2d357a6027538de282b3d264319af790814670318edc27f7d115f92bcec2a33a4d111e10b9e9e766d92481576cb77e2043c48c984fbc163a9166e2106 SHA512 f3eca9272e378ae3a798d271eeb67fb6370034f7a3b9bcff7015bbfe58b0947cf3b9e2b3c9353a0eceba516b5c7fb66cd9767974a7e5b08a363b67b9e3ee404b
 EBUILD selinux-psad-2.20170805-r4.ebuild 280 BLAKE2B f3200473c446b9f7571b3bc20a92571a9ac810a760121c57d2c67a9f7c99be19c50600a639d66cf3d228a79cf0b4a59b1caca889fcad0263a1cd59e7d3f2fb6a SHA512 93db3fae6a0be18987bafe2ed5cc8ff1f7f94f0dcc68bdb37de542d37b01be4e44397c1d478aa75f9c459685f764cbef5a3a5750d65ca44b3b6d36b03751efaf
 EBUILD selinux-psad-2.20180114-r1.ebuild 278 BLAKE2B c4d583e0ca99074fc3b869f19cd158f7c25a2add6b43865cfbfe55e62490a7e61053a01cf88ecae65170a7a27af19a9f9805deea7a1a7cdf2dd7f4cf73bdd7cf SHA512 9d87b0c3f2bd7760d2e602d9baf6d14ed53e0fa9713255a270e6c08408240f60c090dad64717a20ba19dd0745dd68b9947d83befe987ed57fa7877cc907d9f59
-EBUILD selinux-psad-9999.ebuild 280 BLAKE2B f3200473c446b9f7571b3bc20a92571a9ac810a760121c57d2c67a9f7c99be19c50600a639d66cf3d228a79cf0b4a59b1caca889fcad0263a1cd59e7d3f2fb6a SHA512 93db3fae6a0be18987bafe2ed5cc8ff1f7f94f0dcc68bdb37de542d37b01be4e44397c1d478aa75f9c459685f764cbef5a3a5750d65ca44b3b6d36b03751efaf
+EBUILD selinux-psad-2.20180114-r2.ebuild 280 BLAKE2B 3d624e15111c821b914a4be688c3f6d87f14b607f6cea92cc7eb0f5e77bf3bf209b4825d4fc6037e70a3e1d5dc17df8a12102e71d799e67cb9e9dceff6dd00bb SHA512 35fb88cfae678bbf38960e4827348bb0016d56ec6d97bd9ca4c2f597d114dc003143d71649acf33a3c98322d854fb6d6e96691d429df6209d1d1c39ddee91c3a
+EBUILD selinux-psad-9999.ebuild 280 BLAKE2B 3d624e15111c821b914a4be688c3f6d87f14b607f6cea92cc7eb0f5e77bf3bf209b4825d4fc6037e70a3e1d5dc17df8a12102e71d799e67cb9e9dceff6dd00bb SHA512 35fb88cfae678bbf38960e4827348bb0016d56ec6d97bd9ca4c2f597d114dc003143d71649acf33a3c98322d854fb6d6e96691d429df6209d1d1c39ddee91c3a
 MISC metadata.xml 314 BLAKE2B 7290c16148ae3d6277bf1e9887b2874b110f7b1d580857d41befc01f97986b12b77e1ffed75660be88650cc3b27840f3c8d40c278577ae6ce77bc3ce187fcde9 SHA512 bee35dcd491d4c557ffbc36f6940fa5e903fa41e373553964f995fc7c14609e50b013fb4aa78193f33a9fb39c0c7c8fbf26d1da17c8c4e648bce921296496a05
diff --git a/sec-policy/selinux-psad/selinux-psad-2.20180114-r2.ebuild b/sec-policy/selinux-psad/selinux-psad-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..a0c481b2f48b
--- /dev/null
+++ b/sec-policy/selinux-psad/selinux-psad-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 2369b22a4299..a0c481b2f48b 100644
--- a/sec-policy/selinux-psad/selinux-psad-9999.ebuild
+++ b/sec-policy/selinux-psad/selinux-psad-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-publicfile/Manifest b/sec-policy/selinux-publicfile/Manifest
index 44fbfba1f5b7..55501632f0b8 100644
--- a/sec-policy/selinux-publicfile/Manifest
+++ b/sec-policy/selinux-publicfile/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-publicfile-2.20170805-r2.ebuild 290 BLAKE2B 886e6284621135e9bdb03
 EBUILD selinux-publicfile-2.20170805-r3.ebuild 290 BLAKE2B 886e6284621135e9bdb03b92e64c6dae95988185bbf55fb58608f6acde1585fd076e8c34d940944d7041c2064ef0d05b8bef9a332ded234e28d3a6828361516f SHA512 65fe98bd452ceba930a1844ba427d1ef5be036e173141f7411c7be583e4b26b6ddca4e791e2238cfeb7279e76bf1083dbffbc297af5b9352789eb518a0b979e4
 EBUILD selinux-publicfile-2.20170805-r4.ebuild 292 BLAKE2B bd1c708f055f68f80e884b68963fe3dd6949b4c8e72461ba17ea9dac4bc8a607cf092e235dd2b49cd5e88126c5f24af59dca81358e68d11b269f490b80f64c6e SHA512 02eaa7acd1ac0ec46f30c5ee9b4c64d3954012c0fe0cd981dcdf4d4beb45fabe84a6b222630d43e8cc8be04a7cbb531cc2bbeac4ab076c0523eac11888e59258
 EBUILD selinux-publicfile-2.20180114-r1.ebuild 290 BLAKE2B e1ec439af7bc22da312c8e9cb7cf1b67625301211854412a3cb31cc84bd09f1f6ca872aa848c972d7648b70a6f904c7de50801927ce3ea05fd9967bdaf8fa61a SHA512 2e18b5e96a03ed37e88ecbbeba2210852e7cfedae05033fa6c1dff9ca1fe1d8fe72548d4c3d2b2ae848d8cea454c2469c335672eac1c654df6fc8b9bb57cf8ec
-EBUILD selinux-publicfile-9999.ebuild 292 BLAKE2B bd1c708f055f68f80e884b68963fe3dd6949b4c8e72461ba17ea9dac4bc8a607cf092e235dd2b49cd5e88126c5f24af59dca81358e68d11b269f490b80f64c6e SHA512 02eaa7acd1ac0ec46f30c5ee9b4c64d3954012c0fe0cd981dcdf4d4beb45fabe84a6b222630d43e8cc8be04a7cbb531cc2bbeac4ab076c0523eac11888e59258
+EBUILD selinux-publicfile-2.20180114-r2.ebuild 292 BLAKE2B 36b5fd272dd908229e230da571e13ac67aa5854c34b08392d32d5f3998f5d373b3eb834b45236cd01f5dcc688d6478fc2b3b3efb8f3c7499da14944ddc16188f SHA512 d2344359a6118563b25c2130579ba461272d8ae94e7d36c0f7e1ceb90167338eeac317fe13850422a3e77d18fa1c7de53f999c7086bfe7f27286c9b94d87da26
+EBUILD selinux-publicfile-9999.ebuild 292 BLAKE2B 36b5fd272dd908229e230da571e13ac67aa5854c34b08392d32d5f3998f5d373b3eb834b45236cd01f5dcc688d6478fc2b3b3efb8f3c7499da14944ddc16188f SHA512 d2344359a6118563b25c2130579ba461272d8ae94e7d36c0f7e1ceb90167338eeac317fe13850422a3e77d18fa1c7de53f999c7086bfe7f27286c9b94d87da26
 MISC metadata.xml 320 BLAKE2B 4cabac23d0424c4dc69d8c154e5d7cfe999ea5b132dfa8773168e781baabaa9145d225ddff271bcac1c9bb267e3c5c6da1cd35516f263f18dee398edf870f830 SHA512 44842cde8be2b2955172671bc0fb969c2eea4382d286d3833cef9099708f67a9c878c33245ccf85b781864921283490c821444cc6a4cdcbf477f00ab5a272420
diff --git a/sec-policy/selinux-publicfile/selinux-publicfile-2.20180114-r2.ebuild b/sec-policy/selinux-publicfile/selinux-publicfile-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..1c14791a6816
--- /dev/null
+++ b/sec-policy/selinux-publicfile/selinux-publicfile-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 3edd8cd37a4b..1c14791a6816 100644
--- a/sec-policy/selinux-publicfile/selinux-publicfile-9999.ebuild
+++ b/sec-policy/selinux-publicfile/selinux-publicfile-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-pulseaudio/Manifest b/sec-policy/selinux-pulseaudio/Manifest
index a43ffc863a3c..3c9ec4286a1f 100644
--- a/sec-policy/selinux-pulseaudio/Manifest
+++ b/sec-policy/selinux-pulseaudio/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-pulseaudio-2.20170805-r2.ebuild 290 BLAKE2B 5e5954259dc6948e53bcd
 EBUILD selinux-pulseaudio-2.20170805-r3.ebuild 290 BLAKE2B 5e5954259dc6948e53bcd0b8407712f83b4fe872adb782746e19ec3b097e9b00473b9ef803866d901c6342c9ccdbfd5012f9424a55e6a287a6f90dae67fc0559 SHA512 8571e91e31de2fb88e7fd379dde176750d50a5833067e3a2d8623ce76cb4c2573a8b97b45cb408a1497a600a4038c90842a2114a072d5e4bfd78a3ddc6baf29a
 EBUILD selinux-pulseaudio-2.20170805-r4.ebuild 292 BLAKE2B 44955da74935aae47ebdc6aed18bfdbd6c92598b7901df6b8aa30be3486b2d53b1d700a7bd1fa94416567fcd7b60476d0ff3f27af0bf519f81d7f94df5622937 SHA512 cf18fce2ed9b17058345fcae8db5fae84d4c7dea33b85c6c36fea5c1a0ed44baae7391c46126c0195eb43445dca4071346dc47a9519b6d4965dbdc18c13fc77e
 EBUILD selinux-pulseaudio-2.20180114-r1.ebuild 290 BLAKE2B b7a97302b874592274875a76945d1778945ff493ee169c95ff5c27c967c6e941904d540a91134d15a563afc46463c62395a649fd21588ad754b82b640a45ad21 SHA512 71c67046a9fc51a297d78e0bab88f3124bce3b1e9aec1e1b9a31167b4b27e16ef73c95ebdef43a8fcd006d1571aab4bf1cec456897440e746c146c1b65757c56
-EBUILD selinux-pulseaudio-9999.ebuild 292 BLAKE2B 44955da74935aae47ebdc6aed18bfdbd6c92598b7901df6b8aa30be3486b2d53b1d700a7bd1fa94416567fcd7b60476d0ff3f27af0bf519f81d7f94df5622937 SHA512 cf18fce2ed9b17058345fcae8db5fae84d4c7dea33b85c6c36fea5c1a0ed44baae7391c46126c0195eb43445dca4071346dc47a9519b6d4965dbdc18c13fc77e
+EBUILD selinux-pulseaudio-2.20180114-r2.ebuild 292 BLAKE2B b6bf6d3ef5427df4767ac3705a0028c039a6af19799895cb5aeba474433354e199ea12edadb168bd5a9cf50f86eba7629ec0cec19c29e26093757e9e81eec630 SHA512 be4474160dbb460dfe45c167895b8d90aa18dae3a873284e5059f3758375c80c7587cd3d0a75c1cdc2d0c2cd7a39c1c0beb4a112d87034dfc704c333ef447df2
+EBUILD selinux-pulseaudio-9999.ebuild 292 BLAKE2B b6bf6d3ef5427df4767ac3705a0028c039a6af19799895cb5aeba474433354e199ea12edadb168bd5a9cf50f86eba7629ec0cec19c29e26093757e9e81eec630 SHA512 be4474160dbb460dfe45c167895b8d90aa18dae3a873284e5059f3758375c80c7587cd3d0a75c1cdc2d0c2cd7a39c1c0beb4a112d87034dfc704c333ef447df2
 MISC metadata.xml 320 BLAKE2B 793c0ea0809ffaf2c30fa0089b9a9630cb625e510e96ba6b5a5b2689b1ca6e1fb810053f0a1458c92b337e5a98c74124384e52d9e39e9706f879c23860bc326a SHA512 49ed7fee8050b230c333264e6289d297cf3b4106b773446231dfcec9ce84121b39668e15304edb422ebb9477a3c03695cf8b35744f60fd81de5ac269b45a30ac
diff --git a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20180114-r2.ebuild b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..21591c2d56ee
--- /dev/null
+++ b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 32081f566756..21591c2d56ee 100644
--- a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-9999.ebuild
+++ b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-puppet/Manifest b/sec-policy/selinux-puppet/Manifest
index 68fca13f47d7..94de7fbcf205 100644
--- a/sec-policy/selinux-puppet/Manifest
+++ b/sec-policy/selinux-puppet/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-puppet-2.20170805-r2.ebuild 282 BLAKE2B 15f54c15372a6b6599490008f
 EBUILD selinux-puppet-2.20170805-r3.ebuild 282 BLAKE2B 15f54c15372a6b6599490008f4df7ebfc5f743b43ea3114ae7f59ccd6e6ff3d0892b14f5914d7d8d7a9a4fd2cade7d9ad97972eeaba6529900e87153bb8d4d5f SHA512 f2a85c8fecbfec02e5befd0c372b749b1b12b1cefbd3343cb73d5c74122ba566fcc14bd8e96296e70e98190f9dd248e9957bc729426a528fd185923f8bae7628
 EBUILD selinux-puppet-2.20170805-r4.ebuild 284 BLAKE2B cec20e9e49badf505bd508f41b58c453fbfab6dd735cd701af893c0e9ccee27be330eee017e2ff2a5796f35a3fbc2d18bf5e7b303b7251c1f1de14c5acd96f2c SHA512 7a8c427f54afc34bb685fd353aab1edd18da78b697fa1b4816d72db2d523c34b51914133efc20eb9e05ef05028985203618a6f6660486e2e048a083c3bc47cee
 EBUILD selinux-puppet-2.20180114-r1.ebuild 282 BLAKE2B e8ced202640e5728b041fdb85cdb109f19155837b0ff68ccc2179fadd54de9a4c7c42114c1f4a4826155276a014291f29bf9949620197ee91c0e9b79fc930f35 SHA512 0488b42ec219f0d4d7749d57900eec1f6fdcc4be571d68fbfc18858d8a9ecea9de55959bbfa55c91ba622a817cba2c6b6f8be9b353447e7cc17c4190531d8598
-EBUILD selinux-puppet-9999.ebuild 284 BLAKE2B cec20e9e49badf505bd508f41b58c453fbfab6dd735cd701af893c0e9ccee27be330eee017e2ff2a5796f35a3fbc2d18bf5e7b303b7251c1f1de14c5acd96f2c SHA512 7a8c427f54afc34bb685fd353aab1edd18da78b697fa1b4816d72db2d523c34b51914133efc20eb9e05ef05028985203618a6f6660486e2e048a083c3bc47cee
+EBUILD selinux-puppet-2.20180114-r2.ebuild 284 BLAKE2B df64162cec206e012dce2c3e7f8412d57a1a6b3c44e53d2473ca8b19e5ddeeda596a2d2ea6180a564dec7a9e14907ec9ec53973bb1115e3c5e73023f649c33c5 SHA512 fc0e7841d2c845cc6b1872c2db195598df5222ae366b231819a8ded80f95ccb26dfdf936fb21c8f21dcb253a7072ee69a22bc0bd5fc87c7763b0ffa453ffc249
+EBUILD selinux-puppet-9999.ebuild 284 BLAKE2B df64162cec206e012dce2c3e7f8412d57a1a6b3c44e53d2473ca8b19e5ddeeda596a2d2ea6180a564dec7a9e14907ec9ec53973bb1115e3c5e73023f649c33c5 SHA512 fc0e7841d2c845cc6b1872c2db195598df5222ae366b231819a8ded80f95ccb26dfdf936fb21c8f21dcb253a7072ee69a22bc0bd5fc87c7763b0ffa453ffc249
 MISC metadata.xml 316 BLAKE2B 41b7d803407b6b7274b78d8ac231ccb2e4042733f1fefea6b3ca488f4e0c9e8e18abe121c5d7b9779f41fd28d046d8172e6882c43c1af470de3c893b03a6e081 SHA512 075a815fc9424250d8d6a37af0aac045f22851a10053e21da5e507989bd5e98a708c3969301b3f935eb8b6b16e6823eeed9a72003e924de052289d8400518a31
diff --git a/sec-policy/selinux-puppet/selinux-puppet-2.20180114-r2.ebuild b/sec-policy/selinux-puppet/selinux-puppet-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..5f3399e38f63
--- /dev/null
+++ b/sec-policy/selinux-puppet/selinux-puppet-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 fe530c6f9110..5f3399e38f63 100644
--- a/sec-policy/selinux-puppet/selinux-puppet-9999.ebuild
+++ b/sec-policy/selinux-puppet/selinux-puppet-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-pyicqt/Manifest b/sec-policy/selinux-pyicqt/Manifest
index 6728349dd4ec..b0412a5b87fa 100644
--- a/sec-policy/selinux-pyicqt/Manifest
+++ b/sec-policy/selinux-pyicqt/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-pyicqt-2.20170805-r2.ebuild 282 BLAKE2B 7ed86c07e11ec245ca3c42660
 EBUILD selinux-pyicqt-2.20170805-r3.ebuild 282 BLAKE2B 7ed86c07e11ec245ca3c42660e1d74e5771b1ec71381b5574d7217d608980a27dc936f217d9a5c846d71217e2609dcebccad6ae7b217444dedf6655241b063f5 SHA512 023da4f6e79a529f96a9861b547fdaa02713d893c92a4b82183b07f0f19e922b16566f4e5362f37d6938ee918be89bffa1e2cb57a67649359769c8f73d241504
 EBUILD selinux-pyicqt-2.20170805-r4.ebuild 284 BLAKE2B c1b4914823555a2f38f6bb335df366539199d88a28219f31e19354d62eb6cd59df8b76f68ddc5ecc0f4238020c2564e66bed5b16c419006e573a77ba7da20a1b SHA512 0f275aefcc63b6bb614333d9d63b9373b8227b1659bde89adbdd0dd774402644fec7bf479d97d1ddc2a145b245d54ab0b76836efe5fada9ffddbae9bd373036e
 EBUILD selinux-pyicqt-2.20180114-r1.ebuild 282 BLAKE2B 30ce516978b424711498f00c0af7f5eb0ca3dc7fc8d057aaee1c8013d351ee344bf3ff9a039a6a3cca2ae31a8237940d09098ee3b2f357232e065fdbd6169ee1 SHA512 8b79ec9d92a2c203824be59933bd164e987cbe3040b312cd0c2229012820252911dab20a0a20a66cb354c4c7a032ff66b191ffa5cc09170f02abc522a49e01f8
-EBUILD selinux-pyicqt-9999.ebuild 284 BLAKE2B c1b4914823555a2f38f6bb335df366539199d88a28219f31e19354d62eb6cd59df8b76f68ddc5ecc0f4238020c2564e66bed5b16c419006e573a77ba7da20a1b SHA512 0f275aefcc63b6bb614333d9d63b9373b8227b1659bde89adbdd0dd774402644fec7bf479d97d1ddc2a145b245d54ab0b76836efe5fada9ffddbae9bd373036e
+EBUILD selinux-pyicqt-2.20180114-r2.ebuild 284 BLAKE2B a3c4d36d80ec28b2c7fbd7e870226e53b8cec56d9b006f635efab26b74e525be837841b1b68847919a1811d8cbe08bcd26cd3e1b0506f741269efe3271187e42 SHA512 11e524dc27c233568660c53fbe9b34e046d590647130ce8d81ca6971a9b2203bafd9705bd31c07ec849025def4832ac974cd6970cc2cdea9f5cdb534fada287f
+EBUILD selinux-pyicqt-9999.ebuild 284 BLAKE2B a3c4d36d80ec28b2c7fbd7e870226e53b8cec56d9b006f635efab26b74e525be837841b1b68847919a1811d8cbe08bcd26cd3e1b0506f741269efe3271187e42 SHA512 11e524dc27c233568660c53fbe9b34e046d590647130ce8d81ca6971a9b2203bafd9705bd31c07ec849025def4832ac974cd6970cc2cdea9f5cdb534fada287f
 MISC metadata.xml 316 BLAKE2B f3ecd392817e5dcc1ef59a12822299ce751eeeada34370ec54492984863020c5d829c1c43d551993567fed5c46db1aad949acd8a75c8c58ad0dd5d4311149dbc SHA512 639389768b8e94cabcef99bf8f0362d37f0711a2c9280e5b29cc5e39fa5ebc088f8048065109eba81387301cd4a4f878f2115a71ecf110bb56d3ae7483548dea
diff --git a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20180114-r2.ebuild b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..3ff7315fd87f
--- /dev/null
+++ b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 03d0ddd72959..3ff7315fd87f 100644
--- a/sec-policy/selinux-pyicqt/selinux-pyicqt-9999.ebuild
+++ b/sec-policy/selinux-pyicqt/selinux-pyicqt-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-pyzor/Manifest b/sec-policy/selinux-pyzor/Manifest
index 9edd36ab0836..04433ea6129d 100644
--- a/sec-policy/selinux-pyzor/Manifest
+++ b/sec-policy/selinux-pyzor/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-pyzor-2.20170805-r2.ebuild 280 BLAKE2B 82ad857dd0769a0492caf35a66
 EBUILD selinux-pyzor-2.20170805-r3.ebuild 280 BLAKE2B 82ad857dd0769a0492caf35a665902ac2195b231205db8898aee8d818183a1ab72e6e071d84fba27baa29a0fa3197c4bdbfa6006fc64f745611b8612b8f61d80 SHA512 cabfc1603fcdacd54aa61e483e76fa5ca9afff8bcc612161f1d8596e6353ebf22a521abf475a22a4ab88a0e811a4a4df0dfcfa23f1a847f75f7c085c909ec93b
 EBUILD selinux-pyzor-2.20170805-r4.ebuild 282 BLAKE2B e2561fb3e1b2908de7886ac4641de738719080ed0fb32082e60474580867db4dc4aa7b3576af6bec738366188a6e1f400d6c5a99b79a2ef25456ff56ad36940f SHA512 dfa691cd0e5b07200beb5aec555eceaa8b4234a5415ce6211d16abbcc597a3039f8ee3b045f1bdd633f5eed70d6848f515c9919dcbfe080c352b92662fc3a43e
 EBUILD selinux-pyzor-2.20180114-r1.ebuild 280 BLAKE2B 2f6d29e6cd31faefe5ac042e48811454f0f5712d1b7f7b29f7ee349422e8de9ace8e254bd1143aed63baa899ea749a40a6699383b8d12d8564f9ffabacba531c SHA512 fc7330631185e255e8e48a30407caf107e5879f64c4cfa785ea7e6c99c96ef815abebe21a1f0c3f2bce1d204b88f1e85ee6f33abd445f4053fc68afd5ee0d125
-EBUILD selinux-pyzor-9999.ebuild 282 BLAKE2B e2561fb3e1b2908de7886ac4641de738719080ed0fb32082e60474580867db4dc4aa7b3576af6bec738366188a6e1f400d6c5a99b79a2ef25456ff56ad36940f SHA512 dfa691cd0e5b07200beb5aec555eceaa8b4234a5415ce6211d16abbcc597a3039f8ee3b045f1bdd633f5eed70d6848f515c9919dcbfe080c352b92662fc3a43e
+EBUILD selinux-pyzor-2.20180114-r2.ebuild 282 BLAKE2B c9c8531557086e73c35bd01a60931e2bdff7f088f7d5fe77d2b1df405745d2f36909e3afebbb5abe071c3d62f45b9c02d2058b7d8fe3ad33e108b9e3c6fa6486 SHA512 4641d8fa4fd3784381e22af5e80549da82691dfcb174acb5c3cb60dd4a97446c9d7b6572b80b1f1ee98dd777c8d7dfdd8ad86db3e81214bcb2eab23d38764fc3
+EBUILD selinux-pyzor-9999.ebuild 282 BLAKE2B c9c8531557086e73c35bd01a60931e2bdff7f088f7d5fe77d2b1df405745d2f36909e3afebbb5abe071c3d62f45b9c02d2058b7d8fe3ad33e108b9e3c6fa6486 SHA512 4641d8fa4fd3784381e22af5e80549da82691dfcb174acb5c3cb60dd4a97446c9d7b6572b80b1f1ee98dd777c8d7dfdd8ad86db3e81214bcb2eab23d38764fc3
 MISC metadata.xml 315 BLAKE2B b1a3009ebe5927bf782f39e1371ddfdeafb03b69be332d51e790524a69ac9a8a259f515bb6a017533a26f7efeba3af41ce489b3900271de33b7f54b453c5711a SHA512 6a068357d8420fe2434228757a54cbd193f5a0ad645902603261d512f78853a45573143d522cee139d97e9ccbed8af8562325442aa0c89f6feb9760cb2924029
diff --git a/sec-policy/selinux-pyzor/selinux-pyzor-2.20180114-r2.ebuild b/sec-policy/selinux-pyzor/selinux-pyzor-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..ec7ec7e951f3
--- /dev/null
+++ b/sec-policy/selinux-pyzor/selinux-pyzor-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 f8260fdc84ba..ec7ec7e951f3 100644
--- a/sec-policy/selinux-pyzor/selinux-pyzor-9999.ebuild
+++ b/sec-policy/selinux-pyzor/selinux-pyzor-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-qemu/Manifest b/sec-policy/selinux-qemu/Manifest
index 95e1011cd560..962256abac04 100644
--- a/sec-policy/selinux-qemu/Manifest
+++ b/sec-policy/selinux-qemu/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-qemu-2.20170805-r2.ebuild 370 BLAKE2B fb9407c08ab1ca6476f1a710ce1
 EBUILD selinux-qemu-2.20170805-r3.ebuild 370 BLAKE2B fb9407c08ab1ca6476f1a710ce166d188bc96d75930170a6cac0a8ab92e1d6c4894e3ee5efd55c46f6aeaf4fec128af4806778e9ac7350529012cf6514946962 SHA512 e587c59bc049fe4d6af8819b5fa16d67f445afa1bc63e7ea33e381d8cf9f4b2412c17678e9ae11344c4ca37ce73e2527a10e562457cca4f4476edeadac6362fd
 EBUILD selinux-qemu-2.20170805-r4.ebuild 372 BLAKE2B 81dcf3abc5bf29d140827ac6d0521f6cd4e5c5b9a22f641b0ec935791548e6008882a70549ee55d6a3a604c47b620b4b9bc9303d043e034f737c9cc2f88da6ff SHA512 83ebd75cda1a8559094890e30defe3947ff2a764eafbe15f663a3ed0553bfeb0cc42402bdee0edccd966dd468d18db3ad2fee2d5b1fe2d1560fb1321256a8db7
 EBUILD selinux-qemu-2.20180114-r1.ebuild 370 BLAKE2B 5151e057bc53bc9ac0032f9f0e71f8021c92d9d01aaab1017e75180de64d7ddedffbefb958af56d230cc99f931aa248156bb5d661bde0851392759edab229ea9 SHA512 2fa89efad15389b44834a93e6ad6fe0b4cf7cefd196def543fa7504262e35c4841518a114347da5caaeec0cf612b29a8e62f4471b913f1b13011d93ba39b53da
-EBUILD selinux-qemu-9999.ebuild 372 BLAKE2B 81dcf3abc5bf29d140827ac6d0521f6cd4e5c5b9a22f641b0ec935791548e6008882a70549ee55d6a3a604c47b620b4b9bc9303d043e034f737c9cc2f88da6ff SHA512 83ebd75cda1a8559094890e30defe3947ff2a764eafbe15f663a3ed0553bfeb0cc42402bdee0edccd966dd468d18db3ad2fee2d5b1fe2d1560fb1321256a8db7
+EBUILD selinux-qemu-2.20180114-r2.ebuild 372 BLAKE2B 31893c722c8792c75422902ebd687e6fdc03610e780cb69ce40a71a0b0d9722d7b7cda49f5342c1c72219f04bea50873a3d136f7398439e5f5ffc956e7260df4 SHA512 290a9d9a84d524570cd372ec1fb17a437f660d327d1eeba72c58f0380c91a019e33153432ee231ebbf7634e99e672922ae9f2f877dd024fd5e2869482f5e91fd
+EBUILD selinux-qemu-9999.ebuild 372 BLAKE2B 31893c722c8792c75422902ebd687e6fdc03610e780cb69ce40a71a0b0d9722d7b7cda49f5342c1c72219f04bea50873a3d136f7398439e5f5ffc956e7260df4 SHA512 290a9d9a84d524570cd372ec1fb17a437f660d327d1eeba72c58f0380c91a019e33153432ee231ebbf7634e99e672922ae9f2f877dd024fd5e2869482f5e91fd
 MISC metadata.xml 314 BLAKE2B 0eab470121ac7e8afbc955da96c9fd85273bed160b7da7347d4176a5176aba2356ca42f82fbbdb79bebf3a53468280a20e4af2cfdabb4a5cfbb4face95de69ce SHA512 ce815f5d3ee896942198504d8b1156c2508978f6de36773b816b2d132a045889caa740a033a517b5447bd24414a97bad2950a4b43b8a4c762facffe983ff020a
diff --git a/sec-policy/selinux-qemu/selinux-qemu-2.20180114-r2.ebuild b/sec-policy/selinux-qemu/selinux-qemu-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..3ac8c85d7ff8
--- /dev/null
+++ b/sec-policy/selinux-qemu/selinux-qemu-2.20180114-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 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 55511c28b3cd..3ac8c85d7ff8 100644
--- a/sec-policy/selinux-qemu/selinux-qemu-9999.ebuild
+++ b/sec-policy/selinux-qemu/selinux-qemu-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-qmail/Manifest b/sec-policy/selinux-qmail/Manifest
index 9235dc2ea80c..0acdae300144 100644
--- a/sec-policy/selinux-qmail/Manifest
+++ b/sec-policy/selinux-qmail/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-qmail-2.20170805-r2.ebuild 280 BLAKE2B 829c9ce7a8cf1e4cd816e69ec4
 EBUILD selinux-qmail-2.20170805-r3.ebuild 280 BLAKE2B 829c9ce7a8cf1e4cd816e69ec44b60c737467927e2a2b5856aab5c681e9afb5865f11759d58c6c5ce745afdda44a88f3197d6585bef52936ca2229171d869ff7 SHA512 565fb76759b07593c5acb7ba321c0c1b78daefcbfcdab67f6a38176899780a06b108710e23ac482fe8e0fb692a917790b170ce4b2921221214b50b161e12eb5f
 EBUILD selinux-qmail-2.20170805-r4.ebuild 282 BLAKE2B bc83e2553e09d615a1819dbdfe6a5da1cea3bf8b8a910db334fd4ebea2ae0e7fccadb61aaa0f48a1ac5926bc1f27a40fce6b0308d3b4b9481fdf98c54bd811b7 SHA512 3805bd59040ef634d8fa4b6322aa1e85202fe19c1c5301724423d05c142d34c1c618f4aa0350a80aa549a639b6f1354997d6d541fc1ca536752004d651901e27
 EBUILD selinux-qmail-2.20180114-r1.ebuild 280 BLAKE2B f7ff4df29f076637641b6e617ed2704899f0e4751e069862fe0d798891a2ff994d4d5ac98434d43640b0db1777957f9badfae0003552146d94cbf25bf16778d8 SHA512 645b65efb1e48350af05f27d4382350901ac90c255aa4839832b3870cdbdf7c8ce3694cfe679cdfe1c98b7b43666938b8dabd3b755117d732beb853dba036ba9
-EBUILD selinux-qmail-9999.ebuild 282 BLAKE2B bc83e2553e09d615a1819dbdfe6a5da1cea3bf8b8a910db334fd4ebea2ae0e7fccadb61aaa0f48a1ac5926bc1f27a40fce6b0308d3b4b9481fdf98c54bd811b7 SHA512 3805bd59040ef634d8fa4b6322aa1e85202fe19c1c5301724423d05c142d34c1c618f4aa0350a80aa549a639b6f1354997d6d541fc1ca536752004d651901e27
+EBUILD selinux-qmail-2.20180114-r2.ebuild 282 BLAKE2B 53e932a141d0cba182d61ffda6c760909a027455a7372b1c9230fd87f1e8b56f816b9c6c0ef91a8534d8853ee3463f0df9e8fd162aa307a85dc511687dadd96f SHA512 f677790238f3a5c17b30970d720c29d314bca4909787235d9dcde5c41179832fdb9773cf078fa208f5ccd63b51c1668e66a9b65a39193e51af139af91b919cf7
+EBUILD selinux-qmail-9999.ebuild 282 BLAKE2B 53e932a141d0cba182d61ffda6c760909a027455a7372b1c9230fd87f1e8b56f816b9c6c0ef91a8534d8853ee3463f0df9e8fd162aa307a85dc511687dadd96f SHA512 f677790238f3a5c17b30970d720c29d314bca4909787235d9dcde5c41179832fdb9773cf078fa208f5ccd63b51c1668e66a9b65a39193e51af139af91b919cf7
 MISC metadata.xml 315 BLAKE2B 5d47ed9edc375f1f288563eaea7d28a90fc69cdc0250cd6d5c99aa9f422b87218d0a4428335bf6f450e82fd23874d58c680656f461a948786920b6ddf00a229d SHA512 b37ef0a329dedd9fb843e7d8f10d3153afab24b82336fdfd2dc03c713ce36cbf90a1506837ffefaed140d839af1a0f38e479a3f1ee6829c4d33cfef3cc8f5f95
diff --git a/sec-policy/selinux-qmail/selinux-qmail-2.20180114-r2.ebuild b/sec-policy/selinux-qmail/selinux-qmail-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..91f8c6d5ea57
--- /dev/null
+++ b/sec-policy/selinux-qmail/selinux-qmail-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 184de3cb7caa..91f8c6d5ea57 100644
--- a/sec-policy/selinux-qmail/selinux-qmail-9999.ebuild
+++ b/sec-policy/selinux-qmail/selinux-qmail-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-quota/Manifest b/sec-policy/selinux-quota/Manifest
index b79079125697..6ec5ebc504c1 100644
--- a/sec-policy/selinux-quota/Manifest
+++ b/sec-policy/selinux-quota/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-quota-2.20170805-r2.ebuild 280 BLAKE2B c14095d05ad9740309e6eae957
 EBUILD selinux-quota-2.20170805-r3.ebuild 280 BLAKE2B c14095d05ad9740309e6eae95737216b5db34c5d28fd50dd9afdfa138101fb9c9ae4e48bfb8ea161e8cc74bfe734c4390047558d8c71d7ae3efe1bb1471257d7 SHA512 3a92767983a4be99aa857eaef3be1ca53559fe8f08f4a4352dc5e6dc107fe2c0d2fa2f4321052634d8995cb80664842067ea94e048652a487a988df708c92452
 EBUILD selinux-quota-2.20170805-r4.ebuild 282 BLAKE2B 1cdae0575cb734de666489990ec2b318c2619415302f2db021bb575f0de7ddd4598465d1fab3693b39780d2b907082e6237683e1c3de991fa658bcc1f283a9b3 SHA512 5aa3da065f7b334317b1abaf8b6265ef4501ad19b6fee265a9f8736f7f15a39cb35024b2886a32b49e688ec40a46419cdbd0106a72d69235ab5b2bfed5a628e0
 EBUILD selinux-quota-2.20180114-r1.ebuild 280 BLAKE2B a0ef52eadaa28918d4f749b0996da5d5f992c3055285bf78302d9a387f6c44eb68ba59af9bdf38eadc60a7c72ff1095ddd2f22455dea08e3326305335c618b36 SHA512 8f49edbaf0a628a9d836260c87444c092711a8ab3330ae06860acdfb1f1478250bdf84413449b660d3b931f121e6124f44421ff8c2965c128a5a89b6279f83d6
-EBUILD selinux-quota-9999.ebuild 282 BLAKE2B 1cdae0575cb734de666489990ec2b318c2619415302f2db021bb575f0de7ddd4598465d1fab3693b39780d2b907082e6237683e1c3de991fa658bcc1f283a9b3 SHA512 5aa3da065f7b334317b1abaf8b6265ef4501ad19b6fee265a9f8736f7f15a39cb35024b2886a32b49e688ec40a46419cdbd0106a72d69235ab5b2bfed5a628e0
+EBUILD selinux-quota-2.20180114-r2.ebuild 282 BLAKE2B 9a3628c61a4eadbc4e231ea8f076420c3e60ebd0417209bd66fe7aab393a9957cc9b93d5e85aea5dac28b3ad923f2df09a6862ecfee5d479d9e00a46f49a8f73 SHA512 781b4988092c21e6d0d44aa1d53995bf41c2f05a3effee61e32184d78fffa63e7673a331b3b902e092dbf3a5df3cde8b9a8eb470c2e81f9e2f2335791d5bf20f
+EBUILD selinux-quota-9999.ebuild 282 BLAKE2B 9a3628c61a4eadbc4e231ea8f076420c3e60ebd0417209bd66fe7aab393a9957cc9b93d5e85aea5dac28b3ad923f2df09a6862ecfee5d479d9e00a46f49a8f73 SHA512 781b4988092c21e6d0d44aa1d53995bf41c2f05a3effee61e32184d78fffa63e7673a331b3b902e092dbf3a5df3cde8b9a8eb470c2e81f9e2f2335791d5bf20f
 MISC metadata.xml 315 BLAKE2B 736a4f87fa9901b4056fbc68ffdbbf3c91b8945d6e8ef2c8f54bdcfaf21ca8193dcd40dee2efc20cd2a8e504ba93c7e88aabab28e20b808f4c3d63abf5915870 SHA512 af9939539d2e2846f01e42e77ca895260ac530e9071407dcef52b80069bd4bed814d0405bcc8dd41715ef0528c222d1dd96a138633efec2173e98ad44c0790af
diff --git a/sec-policy/selinux-quota/selinux-quota-2.20180114-r2.ebuild b/sec-policy/selinux-quota/selinux-quota-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..36e2461e5a20
--- /dev/null
+++ b/sec-policy/selinux-quota/selinux-quota-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 221b97456a3d..36e2461e5a20 100644
--- a/sec-policy/selinux-quota/selinux-quota-9999.ebuild
+++ b/sec-policy/selinux-quota/selinux-quota-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-radius/Manifest b/sec-policy/selinux-radius/Manifest
index b803f326ed82..88fca1c32631 100644
--- a/sec-policy/selinux-radius/Manifest
+++ b/sec-policy/selinux-radius/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-radius-2.20170805-r2.ebuild 282 BLAKE2B f1e767aaf0a2937cbf49033b2
 EBUILD selinux-radius-2.20170805-r3.ebuild 282 BLAKE2B f1e767aaf0a2937cbf49033b2ba2ad4455b0f98efffab2c473e599b9f4e110fccd8e8f2b53e5af51402c0bb4b9f355b65d3ccfc74ab4e0fa22a8063e6b62155d SHA512 3ea34014909dab29ce0c5ad43cb4673299ad1c89a18a2ee945b8908e7beb176065cd4c8e29bc1cc03ffa6ad46e1a851f5cf12563954f7aeaa83c9f9317e38594
 EBUILD selinux-radius-2.20170805-r4.ebuild 284 BLAKE2B 87334cd519cc398cbda8fa98d0ec744a81175c9d3add4ef3b826cb956092b43cdcf1e4799d2ca9322f316c5095b81e5786877e64bad2c75ace185447cdba07c4 SHA512 402a35906308ed60424cc963f3b1fa97b80397d96b1f36377dfaa8be0b2a73daeee67c0852f5f57b9c0fd6e5776443fc793eece731f1f6619146a29cd05a2d11
 EBUILD selinux-radius-2.20180114-r1.ebuild 282 BLAKE2B 5402f1c6dc257cf845c2e6fb067479279c36d372477137ae9bda32ea0d0767e242d5df767209fd2b916d36af2ba2cf4adfa76eea8f7d7ceb642b0d4e29540e4b SHA512 89dab49c0d70ce81d439d61a873a2fad910c64788408da27bab21c66daf716b80eb1ba2c88e6064e804cc260677457aace649a1f3f019887e7b176fd3319f1ed
-EBUILD selinux-radius-9999.ebuild 284 BLAKE2B 87334cd519cc398cbda8fa98d0ec744a81175c9d3add4ef3b826cb956092b43cdcf1e4799d2ca9322f316c5095b81e5786877e64bad2c75ace185447cdba07c4 SHA512 402a35906308ed60424cc963f3b1fa97b80397d96b1f36377dfaa8be0b2a73daeee67c0852f5f57b9c0fd6e5776443fc793eece731f1f6619146a29cd05a2d11
+EBUILD selinux-radius-2.20180114-r2.ebuild 284 BLAKE2B 52ad7967d96d4cfc6a03cc2af39ebe04a10589be7189672d249c9912fcfc6ad4b0e2e0796d8a5cd5dc8ffc4f071b3cc619b255e57249574d9744ee1cfa0247b0 SHA512 cb0df168e59b9d8488f2da4c114966bd5d85372441cbe5120ddd2077c58b9adace99ca3fabc672f20d81b275fe61b49dd775a5e52c411d2b3f93f8d4d07b26de
+EBUILD selinux-radius-9999.ebuild 284 BLAKE2B 52ad7967d96d4cfc6a03cc2af39ebe04a10589be7189672d249c9912fcfc6ad4b0e2e0796d8a5cd5dc8ffc4f071b3cc619b255e57249574d9744ee1cfa0247b0 SHA512 cb0df168e59b9d8488f2da4c114966bd5d85372441cbe5120ddd2077c58b9adace99ca3fabc672f20d81b275fe61b49dd775a5e52c411d2b3f93f8d4d07b26de
 MISC metadata.xml 316 BLAKE2B 7e4f0c89d1b0fac60267001131b4935d92686292be9f60fcfca7ed3612aaad76c3c5d1c1e110ead346c0220ada5750c763e2fb9b6016d36b2d018898cbea76b6 SHA512 0500b19ec7cff97e422e1a5e89bfd8c6574ab2c4fc03fada1abbbb1ab62bed170be38b5c70b6a515d57cfc65dbaf0d0c365e859b8533c9afa92f78d7df9c5731
diff --git a/sec-policy/selinux-radius/selinux-radius-2.20180114-r2.ebuild b/sec-policy/selinux-radius/selinux-radius-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..5d61679de48d
--- /dev/null
+++ b/sec-policy/selinux-radius/selinux-radius-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 0bc1d7c29795..5d61679de48d 100644
--- a/sec-policy/selinux-radius/selinux-radius-9999.ebuild
+++ b/sec-policy/selinux-radius/selinux-radius-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-radvd/Manifest b/sec-policy/selinux-radvd/Manifest
index 84d8a4cef1e3..76fc3524af22 100644
--- a/sec-policy/selinux-radvd/Manifest
+++ b/sec-policy/selinux-radvd/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-radvd-2.20170805-r2.ebuild 280 BLAKE2B d03e0f83cf557eedb6862e1dc6
 EBUILD selinux-radvd-2.20170805-r3.ebuild 280 BLAKE2B d03e0f83cf557eedb6862e1dc62b5c442d4162c91d55bb15494737325f51fe99644e3a9229040d54277f848cdcc0e77728aea157684fe0fdfe38c6565b1eac70 SHA512 d2a9f62bcdf94b923c323b27038d314baa88433f6d4200a00e2fb6b04ac8caabd25e561e94ac98744ef24f0dc6ac22b99df939e69f681146a2ff0e98c1535322
 EBUILD selinux-radvd-2.20170805-r4.ebuild 282 BLAKE2B 1acb8c0ef7c1c22cffc99f5acd24aa13a4b84ef0c026e844314d638fdb53c03c6ad7175bd9492565e5f855fc8729432689a248b4af873e4b83b084c92b11a887 SHA512 5b01aa9bc75ff4ef94c02b9b620ef13c66c0d335284ff1d06aec1e3684a7d51cfb2a2b4053ab9861fd7430961432c06e53cadd778edd5f1d5761471b8b6f25c5
 EBUILD selinux-radvd-2.20180114-r1.ebuild 280 BLAKE2B f71308fa83d6b9fc56302107e2caa3ec3450cc263660013fb54bb6ef4f4a30f3f6ab597bdffca489b1c7844adc16d6a050548dd3158911ad6c689a6dab4c935d SHA512 d3ed889c36dff973be855941a54d3efb5f8e804d3bbad4e880219bd5e24b0376d5f16c8d3b3d1444d52a9d2adf7dff9acc96e4834c1a367306e2a20f0852a7fc
-EBUILD selinux-radvd-9999.ebuild 282 BLAKE2B 1acb8c0ef7c1c22cffc99f5acd24aa13a4b84ef0c026e844314d638fdb53c03c6ad7175bd9492565e5f855fc8729432689a248b4af873e4b83b084c92b11a887 SHA512 5b01aa9bc75ff4ef94c02b9b620ef13c66c0d335284ff1d06aec1e3684a7d51cfb2a2b4053ab9861fd7430961432c06e53cadd778edd5f1d5761471b8b6f25c5
+EBUILD selinux-radvd-2.20180114-r2.ebuild 282 BLAKE2B 47b306d9471279073b09c0dc5841e2729bffbca190fcb9db707b7966cc396c5099596a2b70f482d025e6fea791141bd46d08d896cfbda5fc3b1a7ee8bee726bb SHA512 c99ccc3553fb4b50cea4392a712f7b768734ac1a537ec8abb5d7b321769b2d0550871a9b1db5cb6fb59e3ae59ff8466831a163229e9ca9c6805abf797d7124ec
+EBUILD selinux-radvd-9999.ebuild 282 BLAKE2B 47b306d9471279073b09c0dc5841e2729bffbca190fcb9db707b7966cc396c5099596a2b70f482d025e6fea791141bd46d08d896cfbda5fc3b1a7ee8bee726bb SHA512 c99ccc3553fb4b50cea4392a712f7b768734ac1a537ec8abb5d7b321769b2d0550871a9b1db5cb6fb59e3ae59ff8466831a163229e9ca9c6805abf797d7124ec
 MISC metadata.xml 315 BLAKE2B ddd9d0af6e1fe07ddb8ff4a619ffab1fd862ac54a95bbb1f9bb771a73fc0d288e330090f7c0e60abbba681062cd1246a83dc5b0ca1c4c39f592e71b726d003f2 SHA512 be9c80d6e07a38b69d9f9c50cc93bbdc8851ec45b578f22cc4335960ca0f55a2835987e304cb9d40fc01eaa473cc9c7c6136c6b051ca92fa42e38543cacddf92
diff --git a/sec-policy/selinux-radvd/selinux-radvd-2.20180114-r2.ebuild b/sec-policy/selinux-radvd/selinux-radvd-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..b92e3d1ca215
--- /dev/null
+++ b/sec-policy/selinux-radvd/selinux-radvd-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 a3e239253a9a..b92e3d1ca215 100644
--- a/sec-policy/selinux-radvd/selinux-radvd-9999.ebuild
+++ b/sec-policy/selinux-radvd/selinux-radvd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-razor/Manifest b/sec-policy/selinux-razor/Manifest
index ef8bb4e3bccd..69e74654fa0c 100644
--- a/sec-policy/selinux-razor/Manifest
+++ b/sec-policy/selinux-razor/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-razor-2.20170805-r2.ebuild 280 BLAKE2B fec5a2ac8d9a4cda77190d631b
 EBUILD selinux-razor-2.20170805-r3.ebuild 280 BLAKE2B fec5a2ac8d9a4cda77190d631b1139a260bf19276e74ed46b5bfcc131b9f7c7c7ace91a4b78d881f6b0a4370dd48b2dff32c75bafaf57ba8fb96dfac5717a13a SHA512 6eacbbcf27fecb82f4f740f05566ba93270a09b2c951051a03bd8731835cb4f1d56ebe8ea37e9e288114c1b5dbce4daf8d843cf96163704bbb5b2ffede4f34f0
 EBUILD selinux-razor-2.20170805-r4.ebuild 282 BLAKE2B e0f0c1bb1e5ddf7587b2ddeccabc076fd8418357a5822a4577488880d8ca55ae5345d1dcc80963643f1e75dc1b917d87e175c40da5458afbcf13857a655d7bb1 SHA512 061395a8e514b4791d9c407867560a90e542c7a0ec37bfaa94cc5b6d5fce9ace35372ac6f0dbf70df73ff6fa53ec5070d3e6f4560cbded01240f20329272349f
 EBUILD selinux-razor-2.20180114-r1.ebuild 280 BLAKE2B 7f6346c177b76b6d3e23a9f898b3062090f09e144f09dcdcca7a58600c966f8307c9f2f2a3141dc6392e2310b803b571938d89b9fb281c331fe767260c0e303e SHA512 d7a4421b7aa4e187c6c7642606eff61bb99196ddb8336cb65a8b9ff7ef0175c3b31888a6a6b6dac75ed1e763dee135902f0b8eb761c4e752611a6216024a146a
-EBUILD selinux-razor-9999.ebuild 282 BLAKE2B e0f0c1bb1e5ddf7587b2ddeccabc076fd8418357a5822a4577488880d8ca55ae5345d1dcc80963643f1e75dc1b917d87e175c40da5458afbcf13857a655d7bb1 SHA512 061395a8e514b4791d9c407867560a90e542c7a0ec37bfaa94cc5b6d5fce9ace35372ac6f0dbf70df73ff6fa53ec5070d3e6f4560cbded01240f20329272349f
+EBUILD selinux-razor-2.20180114-r2.ebuild 282 BLAKE2B fb9e7a656918bd74c0cd7322017c6be582062342105db8e8d16e4c88d1548041dd7f70d7d1b38888f2a6a00eeb3e3eb2ca734e641f6c6c86679f83bfc93c4c66 SHA512 6708837cf2c8f35da88f16b8af214f17945ed11da5cd379a1255ff8aec8002ac553589c7c1f8f08b918d38ff598d5fe821b6df90b89cb662c826e53ea6f7613c
+EBUILD selinux-razor-9999.ebuild 282 BLAKE2B fb9e7a656918bd74c0cd7322017c6be582062342105db8e8d16e4c88d1548041dd7f70d7d1b38888f2a6a00eeb3e3eb2ca734e641f6c6c86679f83bfc93c4c66 SHA512 6708837cf2c8f35da88f16b8af214f17945ed11da5cd379a1255ff8aec8002ac553589c7c1f8f08b918d38ff598d5fe821b6df90b89cb662c826e53ea6f7613c
 MISC metadata.xml 315 BLAKE2B dec27f37b99c6e66ed79661ee687e9d564e6ed45010165318e550e7ffb53d61c8101a732ced96ec84dd787ceb9ff6d09352be44962c1dbcc02b80325fbe9ab5c SHA512 fb1fbe7d5d8a99d86dce5d79e90fa849a94cbccc66a972e92084f1dbd4c459c42920f6591918151b22cb16e0db43ffd3dd738cc8dd4cc020db25286009d82d56
diff --git a/sec-policy/selinux-razor/selinux-razor-2.20180114-r2.ebuild b/sec-policy/selinux-razor/selinux-razor-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..1d3b49748dc1
--- /dev/null
+++ b/sec-policy/selinux-razor/selinux-razor-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 625cdd8e9593..1d3b49748dc1 100644
--- a/sec-policy/selinux-razor/selinux-razor-9999.ebuild
+++ b/sec-policy/selinux-razor/selinux-razor-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-remotelogin/Manifest b/sec-policy/selinux-remotelogin/Manifest
index 1624d565e51c..dad8371b2c9a 100644
--- a/sec-policy/selinux-remotelogin/Manifest
+++ b/sec-policy/selinux-remotelogin/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-remotelogin-2.20170805-r2.ebuild 292 BLAKE2B 447a2680488dfac796b9
 EBUILD selinux-remotelogin-2.20170805-r3.ebuild 292 BLAKE2B 447a2680488dfac796b9937d10d1b84956c898d0c4f048dd61b3b331eeec8823956f4d134eb36d0d02e3d8352c81851d4b9611ebb5e7cbb7aae9080c72f76769 SHA512 65f5d997a1a4ec39bfb0fa271a9fa4d1140f4edb2dbf4c2b5b4be9d30da9397bce6b89d787786dd4281a8704980c1db840636c87ce8c8c4bc0ec25e6fb657d1d
 EBUILD selinux-remotelogin-2.20170805-r4.ebuild 294 BLAKE2B 272b73a5cc415e9b810c5d18a6cff90e8e7342b1a5f2bafa9dfa6859d92797003a173a723cb845e346540633dbd064cd7b1e19b02d4376b00a63d39c46f57e76 SHA512 aa13bf014e5601d9e271b6cb1eb965dd3039b668de18991dd88b8eeb2c536991b42c0624cc50d35e16991ce4424dba89b1e776f044b5c01ce24fa92955a3df4a
 EBUILD selinux-remotelogin-2.20180114-r1.ebuild 292 BLAKE2B 136a3487949999cf8bdfe55e2f8cdde27247e0386de45f0758ed9c1dff4c51a5e2626f849217c6121163d724a78f50b1d29ffc1836e897c0877d9adcb9ef7e2d SHA512 30b725494525381393609420108e0a5caf5754d7a299b8e888731d93cf7c934c71745ba1b6f38778aeeb51f064116c94fc38e5ad1bb5f5a43a70b94ddd4c8d61
-EBUILD selinux-remotelogin-9999.ebuild 294 BLAKE2B 272b73a5cc415e9b810c5d18a6cff90e8e7342b1a5f2bafa9dfa6859d92797003a173a723cb845e346540633dbd064cd7b1e19b02d4376b00a63d39c46f57e76 SHA512 aa13bf014e5601d9e271b6cb1eb965dd3039b668de18991dd88b8eeb2c536991b42c0624cc50d35e16991ce4424dba89b1e776f044b5c01ce24fa92955a3df4a
+EBUILD selinux-remotelogin-2.20180114-r2.ebuild 294 BLAKE2B 63b287371033938240f0783f929e1005d9d413f31191faf92e097f7edf392b471199e05aad85a6b49bfa894fd9a48265a980be04528e58873a96d5267c4ff1c5 SHA512 d5415954e07c14040b19179c98b4b74b439eec621e8dcca9445f774ad97a6b84ba766c5c40883a27c100bfc6fe2fd4625f3a9358babb7061bbeda46608865e0e
+EBUILD selinux-remotelogin-9999.ebuild 294 BLAKE2B 63b287371033938240f0783f929e1005d9d413f31191faf92e097f7edf392b471199e05aad85a6b49bfa894fd9a48265a980be04528e58873a96d5267c4ff1c5 SHA512 d5415954e07c14040b19179c98b4b74b439eec621e8dcca9445f774ad97a6b84ba766c5c40883a27c100bfc6fe2fd4625f3a9358babb7061bbeda46608865e0e
 MISC metadata.xml 321 BLAKE2B 941ee41d833475aa740383a6686ff0d464ccec0550daf105b1bad6b065d19ec7ccd63b30857f34ed5b29d87a251914cb8905aea6aadfa8682f903fca1f6735d3 SHA512 de35cd8293d68562e772d0163377341a118b1d25957533ade5621dd4d1c5d34ab0269ddc27aaef0bce6826393ad12da5e185aa9761cccaecd7668b03078a5a0b
diff --git a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20180114-r2.ebuild b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..8b28c4fbe3c5
--- /dev/null
+++ b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 cc9a91d67a4c..8b28c4fbe3c5 100644
--- a/sec-policy/selinux-remotelogin/selinux-remotelogin-9999.ebuild
+++ b/sec-policy/selinux-remotelogin/selinux-remotelogin-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-resolvconf/Manifest b/sec-policy/selinux-resolvconf/Manifest
index 72203928761c..dc490fc9d469 100644
--- a/sec-policy/selinux-resolvconf/Manifest
+++ b/sec-policy/selinux-resolvconf/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-resolvconf-2.20170805-r2.ebuild 290 BLAKE2B e62838002ba259bf79f62
 EBUILD selinux-resolvconf-2.20170805-r3.ebuild 290 BLAKE2B e62838002ba259bf79f62c075727d777035a45a74e83371e247f780f49bc6bd5ae59ed0c6d128f37ff624c18755680c14ef39f8e2c3fc173cd842f2992ceebc0 SHA512 2c19bb9a6b3081025c6c4838f658bbde2c501a96dea085c7de1f693b8649f00f88220b0d1d82c47184339ee0e72b744b75eab30fbe776e034c4128f1629f7a63
 EBUILD selinux-resolvconf-2.20170805-r4.ebuild 292 BLAKE2B 60be866278fb2b1abb9f174d789475cef88a3bac129d5292636705b7294f0247316a369914fd6628bc91e4ba1e9f5a1e7b48da135d8eca686ba5f3a38026bbd7 SHA512 03541e8acfc57674b1502027e06bab6fae1a85af0a71e6ab61765adf7c50a76b9b38b8fad1cd5683d2526391d1c3f67e41de3208be09e49d8b7db3a063fac3ad
 EBUILD selinux-resolvconf-2.20180114-r1.ebuild 290 BLAKE2B c79ad531030fcbfc49ee64b30f29e7ba942aa87f41331577701b97b9519bb9d3dd3419cb9488b8fcac157198487e1129c155c1c7cfeaf921070e84fe73cc6e4c SHA512 d6fc316a1808285e0a8d96d29020c8a876f8da462043e74e3bd63168c25520e436624a1e3c1b5dc4ff792ad44306984cb6e514884f1ea7ac5b44aa3238d33093
-EBUILD selinux-resolvconf-9999.ebuild 292 BLAKE2B 60be866278fb2b1abb9f174d789475cef88a3bac129d5292636705b7294f0247316a369914fd6628bc91e4ba1e9f5a1e7b48da135d8eca686ba5f3a38026bbd7 SHA512 03541e8acfc57674b1502027e06bab6fae1a85af0a71e6ab61765adf7c50a76b9b38b8fad1cd5683d2526391d1c3f67e41de3208be09e49d8b7db3a063fac3ad
+EBUILD selinux-resolvconf-2.20180114-r2.ebuild 292 BLAKE2B e9255dfa570f0170534214ad71ab6d958e04b4486e38e1868b3a4f20ffcf1ad6b85a87faf71bf16b2916f88baa29f9d14d974a07f8348c34a33295dec6a88e32 SHA512 0d9703c493d70dc67bc268951856ffa8d441aa71176197725682b1e144554bffb8b138d9c7aeb92b5487e1500accef287b11fff38228109227d933af0f52b8c2
+EBUILD selinux-resolvconf-9999.ebuild 292 BLAKE2B e9255dfa570f0170534214ad71ab6d958e04b4486e38e1868b3a4f20ffcf1ad6b85a87faf71bf16b2916f88baa29f9d14d974a07f8348c34a33295dec6a88e32 SHA512 0d9703c493d70dc67bc268951856ffa8d441aa71176197725682b1e144554bffb8b138d9c7aeb92b5487e1500accef287b11fff38228109227d933af0f52b8c2
 MISC metadata.xml 320 BLAKE2B fb1910a5f3e88fdfd7a95e0bf6e495eb2f2671a37a77f3fc2f804e8dc5b82f1626e0d0ac53020d83467bbca29d563efc54e119cbc3da8d760c7959827034c30f SHA512 a0886fd0602510911aa320748175141f3c30f31361994fd86a8a3923962252dfda9ec6d08a07502b514d8366fc4b7ecc0311fad268620b8eddd1be6af4f86183
diff --git a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20180114-r2.ebuild b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..e1fbd450a3b6
--- /dev/null
+++ b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 e8cbc1daf54e..e1fbd450a3b6 100644
--- a/sec-policy/selinux-resolvconf/selinux-resolvconf-9999.ebuild
+++ b/sec-policy/selinux-resolvconf/selinux-resolvconf-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-rgmanager/Manifest b/sec-policy/selinux-rgmanager/Manifest
index d4a2b3c8fa6d..763a536d5283 100644
--- a/sec-policy/selinux-rgmanager/Manifest
+++ b/sec-policy/selinux-rgmanager/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-rgmanager-2.20170805-r2.ebuild 288 BLAKE2B 5134afaa4c7d0e5ef5d517
 EBUILD selinux-rgmanager-2.20170805-r3.ebuild 288 BLAKE2B 5134afaa4c7d0e5ef5d517283db374f4bb7da9ecde9140091a0106581250d8bb477c4b7605ce21acf9b7b3c8ed6b04eac001da5b92e7ed3567f1b6fb322470bc SHA512 a2318f6992b270bfa14103e5d51f3c8038881bd9cec5f2405faca44093e7dba82966d57423091589b69bc6a0b2d09bd6842c92a6b9bed1f5ba867f1ae4f66458
 EBUILD selinux-rgmanager-2.20170805-r4.ebuild 290 BLAKE2B 55d87828681f8835c4261910e873335fb75fb99ad3a2b538fddbaa2fa1c68ba2acb8fe35377a61d3460c34b40ef89bdd2a4ef0928ed6caf080529e9f05565908 SHA512 699bdd339d310b6da3846309c3c6a0657ca71c42e942e1f2ca2a71fa8a36b482a52e580624a2e60771931d4dd74d1d54ff48ce62273263a2f2a1bd631144f413
 EBUILD selinux-rgmanager-2.20180114-r1.ebuild 288 BLAKE2B fa53326d8f2a77f4dac1c37e7787292f0e3fe65c2a8f712ada83e90f1dd0272af22c3ca7e553747b14398f61feac41856ab4d7c4cc61a26c69106d31e8ca4655 SHA512 4266859112acaba909ae5178f6a287762d9c4d48c8db22e333b70143a8efc71e8cadc19274ba50b8b9e4511538b0557ea70fce3613bd310485b155ac3e30f19a
-EBUILD selinux-rgmanager-9999.ebuild 290 BLAKE2B 55d87828681f8835c4261910e873335fb75fb99ad3a2b538fddbaa2fa1c68ba2acb8fe35377a61d3460c34b40ef89bdd2a4ef0928ed6caf080529e9f05565908 SHA512 699bdd339d310b6da3846309c3c6a0657ca71c42e942e1f2ca2a71fa8a36b482a52e580624a2e60771931d4dd74d1d54ff48ce62273263a2f2a1bd631144f413
+EBUILD selinux-rgmanager-2.20180114-r2.ebuild 290 BLAKE2B 68f162e3fafc0999d6c3f8dbba1733cd41f76694304533113ed2a232251fe65b74cc42e192bceea5256bc7bf7112ff3a137e971ec37435b6427fa31377c791ba SHA512 b0f5222906528215a62d1da520e785a6b86b7246f72b1906515b3988c127ce844dd40927dcd9d30a532184c888c6dc600ad34f40be4751fa5ac2d928074289ed
+EBUILD selinux-rgmanager-9999.ebuild 290 BLAKE2B 68f162e3fafc0999d6c3f8dbba1733cd41f76694304533113ed2a232251fe65b74cc42e192bceea5256bc7bf7112ff3a137e971ec37435b6427fa31377c791ba SHA512 b0f5222906528215a62d1da520e785a6b86b7246f72b1906515b3988c127ce844dd40927dcd9d30a532184c888c6dc600ad34f40be4751fa5ac2d928074289ed
 MISC metadata.xml 319 BLAKE2B ca194dfa68c48ec29894ecf75ddfd81e61911888fa10274f2a979f094403a6677ef3578e5b61274ad77eb51f7523d27a43df5ada162d6b475c6170ad0f409222 SHA512 3fe6e00bc4ff66fa281731582d5713081be180c8340ecd2c28501629018dac75c731d6a154cb84dc587af87e85bd787937ff64a16f9180400d0ed4894871df61
diff --git a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20180114-r2.ebuild b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..c3ff16e532a0
--- /dev/null
+++ b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 a4634675fedf..c3ff16e532a0 100644
--- a/sec-policy/selinux-rgmanager/selinux-rgmanager-9999.ebuild
+++ b/sec-policy/selinux-rgmanager/selinux-rgmanager-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-rngd/Manifest b/sec-policy/selinux-rngd/Manifest
index e8766dbc9c79..20fd462bbbde 100644
--- a/sec-policy/selinux-rngd/Manifest
+++ b/sec-policy/selinux-rngd/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-rngd-2.20170805-r2.ebuild 278 BLAKE2B f2204d69e5a694ef9f26f17e278
 EBUILD selinux-rngd-2.20170805-r3.ebuild 278 BLAKE2B f2204d69e5a694ef9f26f17e2784b495fac6b190944c99fe8833798ee81be91545e1d48e9dd179ba3b3090c89d9fecd052c891ce51a92a55e3e3b7ae52cd6b5e SHA512 78df554ed8a5ec584cfde349209334fc128328280d38105412e5644f2690c7801b95a85088310b4dd64078298c77da8d0f7e9c5a4d1aa44f6eaac294cf91c53b
 EBUILD selinux-rngd-2.20170805-r4.ebuild 280 BLAKE2B 0afb79f2decd799a4b39bb3d893b1c111151259de1e981d268a0333eb30a5b32287884b08497efbc8e149f85482a6cfa8d516f5605d612e8276526ee77a10b59 SHA512 81730c9374298549144660e309c23450121df6e33635302ff51c7222b92e963365358de3382136f3575989a534611bd26481a52453f7165e8395ccd62a63c462
 EBUILD selinux-rngd-2.20180114-r1.ebuild 278 BLAKE2B 0bee59ed11f29fb240283ba55e96f3b26b8b1cda9dccf16285d9a760cce14011982400f2c71ccc838827ce44ff2711b6490acb464dfd7913d150e55b0e6cd03e SHA512 75a2f755d889d76b9355deab8e09a0835a5696c5c59c8f789970d3b927a2df9e392cec256bcf56f2864c111407fd0185560152263426660314a7619427333e14
-EBUILD selinux-rngd-9999.ebuild 280 BLAKE2B 0afb79f2decd799a4b39bb3d893b1c111151259de1e981d268a0333eb30a5b32287884b08497efbc8e149f85482a6cfa8d516f5605d612e8276526ee77a10b59 SHA512 81730c9374298549144660e309c23450121df6e33635302ff51c7222b92e963365358de3382136f3575989a534611bd26481a52453f7165e8395ccd62a63c462
+EBUILD selinux-rngd-2.20180114-r2.ebuild 280 BLAKE2B 267223020925423a1e68dd53c2b1c519a1b09f6259ae35b6c1ec81487d939cf5ac89d97eaf36660b9aaaa3ffb038340f7523319227f7540b381acd5eb29ace63 SHA512 88dfa6634ef9ef961b49b46b009cf9bf317455c1eded4f695d467ff0ffdc96dac3cde2eafe7ea3dfe766de165551fd68c3d50915333892a17028a8eddfb00258
+EBUILD selinux-rngd-9999.ebuild 280 BLAKE2B 267223020925423a1e68dd53c2b1c519a1b09f6259ae35b6c1ec81487d939cf5ac89d97eaf36660b9aaaa3ffb038340f7523319227f7540b381acd5eb29ace63 SHA512 88dfa6634ef9ef961b49b46b009cf9bf317455c1eded4f695d467ff0ffdc96dac3cde2eafe7ea3dfe766de165551fd68c3d50915333892a17028a8eddfb00258
 MISC metadata.xml 314 BLAKE2B 513d7e06f59b864334350fbefb1a4baedca21f57aaec2505f2e76681dd04dc179e3371ac97006e533f1ecc445cd97790b10b3258b2086ee282455ad308766695 SHA512 fd3229d5a3c38e74a5ac713c58882697f0effec4f4c64a0fa6649f6b068934a9669a56c05eceff23970d884094b3336532ef36c48acbf27904a8628bdce677fc
diff --git a/sec-policy/selinux-rngd/selinux-rngd-2.20180114-r2.ebuild b/sec-policy/selinux-rngd/selinux-rngd-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..cf9dea3431e6
--- /dev/null
+++ b/sec-policy/selinux-rngd/selinux-rngd-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 fab98c37fb75..cf9dea3431e6 100644
--- a/sec-policy/selinux-rngd/selinux-rngd-9999.ebuild
+++ b/sec-policy/selinux-rngd/selinux-rngd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-roundup/Manifest b/sec-policy/selinux-roundup/Manifest
index 658afe149047..0d7f7409ce2f 100644
--- a/sec-policy/selinux-roundup/Manifest
+++ b/sec-policy/selinux-roundup/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-roundup-2.20170805-r2.ebuild 284 BLAKE2B c5b2a450715a241553cc87c1
 EBUILD selinux-roundup-2.20170805-r3.ebuild 284 BLAKE2B c5b2a450715a241553cc87c1fcd2000b06c0cfbed221fdc7245de3e1668d7f7b23c9a914254df4cd6cc3839d1227b94b2f6c7a6c69e2293968b3a558ae33ab27 SHA512 777d9e2800ae9fa47bc36dabce655dc5b51000263e43ea02feb4cde62bfb6bc59f324492484e6030bbf74c6f487f8c5cd8fcfdd7763cc922fe4d04d17fc821fb
 EBUILD selinux-roundup-2.20170805-r4.ebuild 286 BLAKE2B a66fe87956f690567a4818be08b4fedd417bb2845e6c240e5fd2898526c6e55198cd0c17892ef93701cf8edc02a2e5b34005ab4f5debace7e36ac757d630e106 SHA512 a8c9f440658db9d1889b3751c2291dd3bea564b05f356b410283f7f7299307682667df22ed36bd1e999b43cc884763b6b2e9674a0fc76a43c7e91e5644b7bd2e
 EBUILD selinux-roundup-2.20180114-r1.ebuild 284 BLAKE2B aad4498fc5fc0275ee5c58d3076e4435c0ed0cd2db2e8bd082ffc059674c1a49acefd46353a337defc5fbbc3b47f5a6f3414b236d8659bc1ce5112a57c13a5d7 SHA512 04ea35c7852a1b54da3a720a581105c909072f8718c852f35982b7dbe9aaeb91048a4025f3232df130a7d0a6fd54747b62a30f6e25b2e23aeaf78f87736917a8
-EBUILD selinux-roundup-9999.ebuild 286 BLAKE2B a66fe87956f690567a4818be08b4fedd417bb2845e6c240e5fd2898526c6e55198cd0c17892ef93701cf8edc02a2e5b34005ab4f5debace7e36ac757d630e106 SHA512 a8c9f440658db9d1889b3751c2291dd3bea564b05f356b410283f7f7299307682667df22ed36bd1e999b43cc884763b6b2e9674a0fc76a43c7e91e5644b7bd2e
+EBUILD selinux-roundup-2.20180114-r2.ebuild 286 BLAKE2B 4421b8cb967f862bded6c8a400ae2393c4c42c99fd0a587846672cf9323088ed6c4abd5b7b5cf28efe6c0c6e132da402fed126c1161a232a4eb73892b08aa7ce SHA512 9ebe58c06cceb80efb2c38fa8c87a39e6466dcd29a2de0a68bb4ede998a03eb3739a246b1722ff3aa98242686142147f09ad70c8f9f5825646cd73187a75dec3
+EBUILD selinux-roundup-9999.ebuild 286 BLAKE2B 4421b8cb967f862bded6c8a400ae2393c4c42c99fd0a587846672cf9323088ed6c4abd5b7b5cf28efe6c0c6e132da402fed126c1161a232a4eb73892b08aa7ce SHA512 9ebe58c06cceb80efb2c38fa8c87a39e6466dcd29a2de0a68bb4ede998a03eb3739a246b1722ff3aa98242686142147f09ad70c8f9f5825646cd73187a75dec3
 MISC metadata.xml 317 BLAKE2B 48aeb72f67904490c071c0de906f946a2c576225495c4e3613b6b7d1c7549536dcc94d76c59d478f2b350a24f293aef611bb2bbad618f294d61ede0eb73cecad SHA512 d52f384e061b6b658c8b1e0a692c37698e8054e4e3dcd48de402a15b76551befaedee464bd8fca9afddc11550ad735ee5f5857801eaf79579939000e4d4f5f22
diff --git a/sec-policy/selinux-roundup/selinux-roundup-2.20180114-r2.ebuild b/sec-policy/selinux-roundup/selinux-roundup-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..2a695a0dcd64
--- /dev/null
+++ b/sec-policy/selinux-roundup/selinux-roundup-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 f6155ea5c0e6..2a695a0dcd64 100644
--- a/sec-policy/selinux-roundup/selinux-roundup-9999.ebuild
+++ b/sec-policy/selinux-roundup/selinux-roundup-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-rpc/Manifest b/sec-policy/selinux-rpc/Manifest
index 2004a29908c5..19194c61c506 100644
--- a/sec-policy/selinux-rpc/Manifest
+++ b/sec-policy/selinux-rpc/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-rpc-2.20170805-r2.ebuild 276 BLAKE2B ebee430f05e54a2444b53f346a67
 EBUILD selinux-rpc-2.20170805-r3.ebuild 276 BLAKE2B ebee430f05e54a2444b53f346a67b89a1b37ab219a996191ee1253c7718d38a1952929c018d1c580bf05b9f512bc6ff2bea4bd340a54ca52cab2123829c4e175 SHA512 0b9a2530962a9f105ef29d68fef368b4ba87008b6c13b7a8b6da8871d424847598dbb7374098668df59bac48bfc57483c1c52cdf7d671799e04fb551ab585b76
 EBUILD selinux-rpc-2.20170805-r4.ebuild 278 BLAKE2B b4b4906d28341d0890c7f422ec14509751caca7f7c85e2e871a1bdc224355226b6e86c2b000bfc5d5beee2cb0a4f835e3130a2f36bbdeb360d698b7fc92fea47 SHA512 21a385ef523487562cbe8bc4174d1d0d84b6e96f32bd72bb5f064eb4a4afe46197e9ef9800afe0a922985a565d0d21c6a151e464411414d4a740864eb726e605
 EBUILD selinux-rpc-2.20180114-r1.ebuild 276 BLAKE2B 800277ef62e11d41ad679f6e512c11e44ef5da7ec52f91d735da3d407b65510aad93f787cb3cedf248a1e8321956421485f563eb3d31d3e17c196377b3208429 SHA512 31750b63182112745a6d3ed6728fa74dbac6792fcf91e71480567a823af33b4253c2a144c192a8035a053a6b75d80d46b7911a4ab46b264337a3e6b9d708c1cd
-EBUILD selinux-rpc-9999.ebuild 278 BLAKE2B b4b4906d28341d0890c7f422ec14509751caca7f7c85e2e871a1bdc224355226b6e86c2b000bfc5d5beee2cb0a4f835e3130a2f36bbdeb360d698b7fc92fea47 SHA512 21a385ef523487562cbe8bc4174d1d0d84b6e96f32bd72bb5f064eb4a4afe46197e9ef9800afe0a922985a565d0d21c6a151e464411414d4a740864eb726e605
+EBUILD selinux-rpc-2.20180114-r2.ebuild 278 BLAKE2B 1a4e5d6f1fde92a09772151a9a92ff8f6bcfd6244eeb386c964cafa414a713e9d21ecfdf9592c08806d3e40094f7af833c3180f5e3ba88ba2ee8c3bc98b9155b SHA512 c8eb5bf9ee5d19e0c6c45a496de656d5585ab661d8e9af823d9e5e03c952672b0b4da10b088f31188c0ec265e9d9810b7e2ca327d17084ee0ffd46cb4fa84889
+EBUILD selinux-rpc-9999.ebuild 278 BLAKE2B 1a4e5d6f1fde92a09772151a9a92ff8f6bcfd6244eeb386c964cafa414a713e9d21ecfdf9592c08806d3e40094f7af833c3180f5e3ba88ba2ee8c3bc98b9155b SHA512 c8eb5bf9ee5d19e0c6c45a496de656d5585ab661d8e9af823d9e5e03c952672b0b4da10b088f31188c0ec265e9d9810b7e2ca327d17084ee0ffd46cb4fa84889
 MISC metadata.xml 313 BLAKE2B 7d496dd5e180419c17a712b92c464695df58b5ef3da31834e791390ff031afbd5c4e12920424aa87d34c6fe32bbeab0257335c4c2133ba7b1bd936879ae7b1ba SHA512 ddb7d0ea7dabca0eae92354cf6f8b6a8d488a7b483fe87bcbf8ad17e6d9641531e93ab999f8e4f5b7257eee469adc400dbf00a7854538e44a58b5a718586d937
diff --git a/sec-policy/selinux-rpc/selinux-rpc-2.20180114-r2.ebuild b/sec-policy/selinux-rpc/selinux-rpc-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..dd191f5c475e
--- /dev/null
+++ b/sec-policy/selinux-rpc/selinux-rpc-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 d49e871c3dc0..dd191f5c475e 100644
--- a/sec-policy/selinux-rpc/selinux-rpc-9999.ebuild
+++ b/sec-policy/selinux-rpc/selinux-rpc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-rpcbind/Manifest b/sec-policy/selinux-rpcbind/Manifest
index 00438eb37bfb..c3097084af89 100644
--- a/sec-policy/selinux-rpcbind/Manifest
+++ b/sec-policy/selinux-rpcbind/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-rpcbind-2.20170805-r2.ebuild 284 BLAKE2B a6b816ffe809efe3c6bfff6d
 EBUILD selinux-rpcbind-2.20170805-r3.ebuild 284 BLAKE2B a6b816ffe809efe3c6bfff6ddabb0349819007c742d3dfca0e3673c94b1ea4b0f5008e137e1e3887943902c7a189da5bb46084bc1637ade7c785439ccae8e024 SHA512 71ea7fd67e41963ab0195f13a48863ec661e64e6f46e8bdd9ba5c33c33b8236f5ef0a7af1474a2629b41962fff0504b24e5b8af3147595eb73211ee134e7740a
 EBUILD selinux-rpcbind-2.20170805-r4.ebuild 286 BLAKE2B 792aaa6453011d57f5bac4fd78f78fb74a787c1216440178ca4a0d0b7b5c58c32c29c5fd5e6168264955865288f7e9b4e1c6aba3334e68c7719a06f688473e20 SHA512 58d8de2acb54ceea44e21b26b84a77a976448d39b740a2f42e10aa68b0ea114e5e98a54614f2efd179b8d1ca55c3bb03bb87e85aab7f39716340af636ac94023
 EBUILD selinux-rpcbind-2.20180114-r1.ebuild 284 BLAKE2B d9dbaec85bf96aae9b8f7989bfaa0d16da52c2c9f26b145881be4b509b1d47b86d68278d50975b80512d750f6dbffd37a305c0d328c94af3700b3bd5d21ac0df SHA512 e075f0d6a19b54e909a872cf83b9d625625f3a890b93421e521dca633056e82e1787617e4a5ea1b23aa360f2ef096724cfb406034a11c89e2282e426931daa5f
-EBUILD selinux-rpcbind-9999.ebuild 286 BLAKE2B 792aaa6453011d57f5bac4fd78f78fb74a787c1216440178ca4a0d0b7b5c58c32c29c5fd5e6168264955865288f7e9b4e1c6aba3334e68c7719a06f688473e20 SHA512 58d8de2acb54ceea44e21b26b84a77a976448d39b740a2f42e10aa68b0ea114e5e98a54614f2efd179b8d1ca55c3bb03bb87e85aab7f39716340af636ac94023
+EBUILD selinux-rpcbind-2.20180114-r2.ebuild 286 BLAKE2B 46241d1a7b69f0085b634d308f9535be1c96f6cc3bf3dddd9b99500d2cb9dd0b6d98dccd514a3686ea6a01a5ba2b150dab2f68406c47e563021fcd8e318938a1 SHA512 4a55f78657d78418b6ee4b4d9f7c06fe651555cf729556c236e26033d0f01fe12441defa1e6cbe6f153bf687f3a441df5863e476b35412ea665d672b76e94145
+EBUILD selinux-rpcbind-9999.ebuild 286 BLAKE2B 46241d1a7b69f0085b634d308f9535be1c96f6cc3bf3dddd9b99500d2cb9dd0b6d98dccd514a3686ea6a01a5ba2b150dab2f68406c47e563021fcd8e318938a1 SHA512 4a55f78657d78418b6ee4b4d9f7c06fe651555cf729556c236e26033d0f01fe12441defa1e6cbe6f153bf687f3a441df5863e476b35412ea665d672b76e94145
 MISC metadata.xml 317 BLAKE2B 8ea56a9585ed24600649e412272989d00dde035ede35ff4fe79008920db09576c9a5eaf6b7f826f050de0edc995db3ae88de9a743fb8b97012d38115a0dc4a44 SHA512 903ca4b03b1d626137474588ce532951d7ce861ccd800b63e65bb662b79e61faf5439e323a329f0870c8718ca4f38e466979f6bd78b0a4564c342e6ced8734a3
diff --git a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20180114-r2.ebuild b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..16c4589f6924
--- /dev/null
+++ b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 c2f8f06fca17..16c4589f6924 100644
--- a/sec-policy/selinux-rpcbind/selinux-rpcbind-9999.ebuild
+++ b/sec-policy/selinux-rpcbind/selinux-rpcbind-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-rpm/Manifest b/sec-policy/selinux-rpm/Manifest
index 18f2050be5b3..db54a96596ed 100644
--- a/sec-policy/selinux-rpm/Manifest
+++ b/sec-policy/selinux-rpm/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-rpm-2.20170805-r2.ebuild 276 BLAKE2B 234735c99b185b91af8b7f7a2e1e
 EBUILD selinux-rpm-2.20170805-r3.ebuild 276 BLAKE2B 234735c99b185b91af8b7f7a2e1e793170076ef4802b2b3bb9c58ce62a1c7c97c2aace6be998d1f094c189bc7499ab64882aff086d6a69c0f89988c6108586b2 SHA512 9e0cd0813b92d40e04228096858f094e82e643e251edf3cdc6d022b9a01b99b3fc9640dbbc60e1665e99d00061059ea38c095157b7e1d4e87beae804fa73ef5b
 EBUILD selinux-rpm-2.20170805-r4.ebuild 278 BLAKE2B 606f3699165355df0d9f4113cbf950766da4ee797a47e29e63db66f56a570feb9189074eac007e7293e21b77088f9409025e1abadbb3b900d6e3ee2d036b5d2c SHA512 b56b74aaa78c0a795b765955950c3d8923b07ff8459a3ff2d11738e9000d87b4db0b0500ba7023e12fa63f422c9eaef2b81ab07d1075a482fc4a6d06113bdf24
 EBUILD selinux-rpm-2.20180114-r1.ebuild 276 BLAKE2B 387831059d418204789e9af654b5d5e8e35fb937d17907ef5cc34299ed129e0b79639d53860fcc02c2cf43255f2ef9437190ca6cba48c3ee452fe53366d885ee SHA512 46aa5f078d6162981fb267af6a670a6efa16f14ff67b47585e05fffb1dead64a09e06f0640d059e355df67640ad61e3f86d2cdbcc6f9f8c8afd1890d0582913b
-EBUILD selinux-rpm-9999.ebuild 278 BLAKE2B 606f3699165355df0d9f4113cbf950766da4ee797a47e29e63db66f56a570feb9189074eac007e7293e21b77088f9409025e1abadbb3b900d6e3ee2d036b5d2c SHA512 b56b74aaa78c0a795b765955950c3d8923b07ff8459a3ff2d11738e9000d87b4db0b0500ba7023e12fa63f422c9eaef2b81ab07d1075a482fc4a6d06113bdf24
+EBUILD selinux-rpm-2.20180114-r2.ebuild 278 BLAKE2B 90c29f8a6086b783670e7ca1efda8c880344d8879cf367d19b1a0ca700f13d8f132ddf3bc39434fe6de4e96d89b22ffecee7f407ad9ffad9117c2d26dc918417 SHA512 0225b020e6736da03e2e0429a462f325b25e004cd4f5d495756ae7b280153f461e9f103460344c58368a1ec5d5e164aa802c3bee4f20280239db582b70a78232
+EBUILD selinux-rpm-9999.ebuild 278 BLAKE2B 90c29f8a6086b783670e7ca1efda8c880344d8879cf367d19b1a0ca700f13d8f132ddf3bc39434fe6de4e96d89b22ffecee7f407ad9ffad9117c2d26dc918417 SHA512 0225b020e6736da03e2e0429a462f325b25e004cd4f5d495756ae7b280153f461e9f103460344c58368a1ec5d5e164aa802c3bee4f20280239db582b70a78232
 MISC metadata.xml 313 BLAKE2B 0ab90c03f0fcaf067a288f97269c036a325cf51d9c11664e48764d5b2f54fd4a25d6bfa76c0808375ce331598a1c67a0ed8c83dd0cfbf14265b5f94fad5a3d61 SHA512 d242612261b4697fef46c087a118c428fcbb6e3a462a9dd1ed7ec95edc4405fe35ce6ab9fe05fd74d68ca0922dfb2749fd77677a123c6e452505679c8e3eec38
diff --git a/sec-policy/selinux-rpm/selinux-rpm-2.20180114-r2.ebuild b/sec-policy/selinux-rpm/selinux-rpm-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..9b767ab57db8
--- /dev/null
+++ b/sec-policy/selinux-rpm/selinux-rpm-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 45076e967f27..9b767ab57db8 100644
--- a/sec-policy/selinux-rpm/selinux-rpm-9999.ebuild
+++ b/sec-policy/selinux-rpm/selinux-rpm-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-rssh/Manifest b/sec-policy/selinux-rssh/Manifest
index d7a1c169f64f..16fb46bb5f8b 100644
--- a/sec-policy/selinux-rssh/Manifest
+++ b/sec-policy/selinux-rssh/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-rssh-2.20170805-r2.ebuild 278 BLAKE2B b67086c7b6eec1b1ef874970d2a
 EBUILD selinux-rssh-2.20170805-r3.ebuild 278 BLAKE2B b67086c7b6eec1b1ef874970d2ad9d6931c7c3a83fe104343df4438a4eb951ffabd256551ce734886c835acd41e21fbe4e88713f7d8921a0e458a37bb19f6a28 SHA512 d620a9cd11861b8a8db7874bcf977c2a47836633955839ea3654ed9163b8c8cee865b4eb167221501d2d215ddccf2f37f7d9428a84cd39df5a7a892d1a8c40ba
 EBUILD selinux-rssh-2.20170805-r4.ebuild 280 BLAKE2B 726c4b2c06aa1a46d1eca4a4aec113a38783f31c931b49c0710089d4e70998866c1554b59c659ad9ae985d71124210df89d8721c5fa5a52ab07350dbba7b19e1 SHA512 b7163f307201217150d4f897801c8c7cf968e1a8819e299bba5026c2975dd02da595ea36a4117eb17f061fde436e1eb632869e601dfad87cd4e80c6bbf5af045
 EBUILD selinux-rssh-2.20180114-r1.ebuild 278 BLAKE2B 0dff0649e4ebcbc7725c7f949fc999c8f93e1bd8ad0de1b1da2ba2b99d54cc88642f460ceb13e6164bd2f1c988bae721e0c4969e45b8111e8e5deefe663bbba0 SHA512 c3ee8e3e5e5a4f9f9f9f76db6ac2fa88d9802d436f76a2d5938cfe1e0eb10d16936e19be88631d32b99af784daced28fb87b11a9a9af06eed0f6f49abd38220c
-EBUILD selinux-rssh-9999.ebuild 280 BLAKE2B 726c4b2c06aa1a46d1eca4a4aec113a38783f31c931b49c0710089d4e70998866c1554b59c659ad9ae985d71124210df89d8721c5fa5a52ab07350dbba7b19e1 SHA512 b7163f307201217150d4f897801c8c7cf968e1a8819e299bba5026c2975dd02da595ea36a4117eb17f061fde436e1eb632869e601dfad87cd4e80c6bbf5af045
+EBUILD selinux-rssh-2.20180114-r2.ebuild 280 BLAKE2B dbdd12de67cb4578fbb1bb1ea40f34dd0e9d5c50a36dffae635316b47b6f9b2b3875597668b4707e0a9551b561f89a4b141926250d15cb01f70f99aabd8e960a SHA512 a704cbe21a30bec0bea9adefd7a47f9d19b93be5118410c36976c5da088f84d89a33d2fc109e1af1f24b478cb04f7962fe95c4f2eaf5af1976f9386cfe61980f
+EBUILD selinux-rssh-9999.ebuild 280 BLAKE2B dbdd12de67cb4578fbb1bb1ea40f34dd0e9d5c50a36dffae635316b47b6f9b2b3875597668b4707e0a9551b561f89a4b141926250d15cb01f70f99aabd8e960a SHA512 a704cbe21a30bec0bea9adefd7a47f9d19b93be5118410c36976c5da088f84d89a33d2fc109e1af1f24b478cb04f7962fe95c4f2eaf5af1976f9386cfe61980f
 MISC metadata.xml 314 BLAKE2B 6c1539b4a9e4db6f0c2727a5b007880cdb7d094a45cfa1ee30ad86b3265d23b7f141b8aa6516a3158a400f0b71ea080bad9be868379d88ad985c0b87d3a81812 SHA512 ace4b64738699a4322654bba904e10a682ffbbff7b2e7e1f28551aae8bf81188ecfe12a3400b8adbc110f6559d5b4d5820f49910a85dc0bd791cb3a73e07234d
diff --git a/sec-policy/selinux-rssh/selinux-rssh-2.20180114-r2.ebuild b/sec-policy/selinux-rssh/selinux-rssh-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..802637b63464
--- /dev/null
+++ b/sec-policy/selinux-rssh/selinux-rssh-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 f962319827c1..802637b63464 100644
--- a/sec-policy/selinux-rssh/selinux-rssh-9999.ebuild
+++ b/sec-policy/selinux-rssh/selinux-rssh-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-rtkit/Manifest b/sec-policy/selinux-rtkit/Manifest
index be59823ddfd8..99f3a71ebacf 100644
--- a/sec-policy/selinux-rtkit/Manifest
+++ b/sec-policy/selinux-rtkit/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-rtkit-2.20170805-r2.ebuild 372 BLAKE2B dafbeccf131ce60215c3bf1ef4
 EBUILD selinux-rtkit-2.20170805-r3.ebuild 372 BLAKE2B dafbeccf131ce60215c3bf1ef49d3b6b041d847778f639b172d09ea7a38908f516066028dd2bc50ef62593514d68096ba0660cf1be6049b2f2f22e891881b440 SHA512 604b0f4723ba346de19c2f9d7a7ba5e9b1362380ca4aced60915dc0ad992a60915c0e33b17ae788456e2e32aa7baa61a611b7590c687fc5d82d273ce12a0d058
 EBUILD selinux-rtkit-2.20170805-r4.ebuild 374 BLAKE2B a30fd5cf021c7bff8fae75e25789a175aa5d9de35c0f0f98788825e3601da2cfe9e3f8894a9800587dfb32817642b7aee478850dfda41fdc47a8ee7758ab6aab SHA512 899903c2c2ca652a7653ff26064c4374c70425116cae7f45505bdd1d1f0c4c93d04fbe3cb07eb27fb42082144c0e6ddba53da91a9023130ff01a33c5a8cb6d7b
 EBUILD selinux-rtkit-2.20180114-r1.ebuild 372 BLAKE2B 7d556364b3ec8b8324a93a6bb960df605e907b99ae9cf778461bce53bd951082a047526264a143f8bd3d20b5ba73b5879ea01fd7fa32def77a59ed8d997746b5 SHA512 78b55ca8bf1f6aa87629c92148ea3c9172f0d3f9195da8b24123751e4f91735269ee7ed864db79dd1d409f06e18e6a93d26910f5db546a9e0a145e9a94de9164
-EBUILD selinux-rtkit-9999.ebuild 374 BLAKE2B a30fd5cf021c7bff8fae75e25789a175aa5d9de35c0f0f98788825e3601da2cfe9e3f8894a9800587dfb32817642b7aee478850dfda41fdc47a8ee7758ab6aab SHA512 899903c2c2ca652a7653ff26064c4374c70425116cae7f45505bdd1d1f0c4c93d04fbe3cb07eb27fb42082144c0e6ddba53da91a9023130ff01a33c5a8cb6d7b
+EBUILD selinux-rtkit-2.20180114-r2.ebuild 374 BLAKE2B c59a69259280f7f56d77c4e31f805f3fa6eea8b60dc5fb623e858fed40cca6ea8018baaff6a8affac9d67035b52ebb0e51ccb7d78090bb94e48a9edd814b8a2f SHA512 7c887a0a48ab266f3c8361554dd6c92bf2396cc454aef382d8dcdc8ceb66bf0bb3195beb3ba0002a6c1426f90da491c8d1e00640c4f83681c8f271244c5cae84
+EBUILD selinux-rtkit-9999.ebuild 374 BLAKE2B c59a69259280f7f56d77c4e31f805f3fa6eea8b60dc5fb623e858fed40cca6ea8018baaff6a8affac9d67035b52ebb0e51ccb7d78090bb94e48a9edd814b8a2f SHA512 7c887a0a48ab266f3c8361554dd6c92bf2396cc454aef382d8dcdc8ceb66bf0bb3195beb3ba0002a6c1426f90da491c8d1e00640c4f83681c8f271244c5cae84
 MISC metadata.xml 315 BLAKE2B 35a8407fb69824482900b61bd80d8d7861a23b5a4b6f0c314cf92debba2290da83dfa0733428a35bbee6e108cc49f95275e6b6e28b7a307da07329f49ede626c SHA512 d3c120cce40e5aa7af88aa6603cf1389c5691023d21b0f9ead865c1cd1305008c286d7433f1364387360bbf0820ee32be67d820fc070c32ac89a6919382261a2
diff --git a/sec-policy/selinux-rtkit/selinux-rtkit-2.20180114-r2.ebuild b/sec-policy/selinux-rtkit/selinux-rtkit-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..e3c7a6ffeeca
--- /dev/null
+++ b/sec-policy/selinux-rtkit/selinux-rtkit-2.20180114-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 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 7c7434d72bea..e3c7a6ffeeca 100644
--- a/sec-policy/selinux-rtkit/selinux-rtkit-9999.ebuild
+++ b/sec-policy/selinux-rtkit/selinux-rtkit-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-rtorrent/Manifest b/sec-policy/selinux-rtorrent/Manifest
index 27ce17720923..c2b5fee93944 100644
--- a/sec-policy/selinux-rtorrent/Manifest
+++ b/sec-policy/selinux-rtorrent/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-rtorrent-2.20170805-r2.ebuild 286 BLAKE2B be995bd2e32caf2c6d3abb2
 EBUILD selinux-rtorrent-2.20170805-r3.ebuild 286 BLAKE2B be995bd2e32caf2c6d3abb2376a497760846d8a42232db30d5d02f0eb590f8d8a4211d71bd2790ae2a8ca98e501c6291b8401af721e5b07c359e7fb1a8b8a968 SHA512 40d54108313ad5bc8f160e3cdba598fa5a5d407aa7f4c6c00b40e935f7a75e92e226667abe79ca232affeb92a285e8b4d323c310e396bcf0a95b08f1eb7d4bb2
 EBUILD selinux-rtorrent-2.20170805-r4.ebuild 288 BLAKE2B 3d23378696d14e6eaf8f38771556227d487c483f4464a0f58b84cf657de71a07ee2e3e5999563a64d0517182c266884b2c7295e07479f6f969b29c3eea415da9 SHA512 ec0430392715f3fea025141fee031164d597fa6d702902294bf51df86ab06132d4945454b9747e316cc97d6606ebcffafd71f54612c0f98c0b9df76837fc7c8d
 EBUILD selinux-rtorrent-2.20180114-r1.ebuild 286 BLAKE2B fa17f9d900967bfc3f3e323b8a9e6ece938a20547989e64d8a608020465e93a61563149755830e0bba627b6a900c260539819807c93b3bd3d26afaced1d500cb SHA512 871f9aa8f5410aa3c986a0cd4e5f0d7b0587d9818985f14a73066132afb14fe34b948b3c271118ea7e9dc33ed8e675c4e4291a2e34c934de98f3e9ce7e53ebc0
-EBUILD selinux-rtorrent-9999.ebuild 288 BLAKE2B 3d23378696d14e6eaf8f38771556227d487c483f4464a0f58b84cf657de71a07ee2e3e5999563a64d0517182c266884b2c7295e07479f6f969b29c3eea415da9 SHA512 ec0430392715f3fea025141fee031164d597fa6d702902294bf51df86ab06132d4945454b9747e316cc97d6606ebcffafd71f54612c0f98c0b9df76837fc7c8d
+EBUILD selinux-rtorrent-2.20180114-r2.ebuild 288 BLAKE2B 5d078f32d7089481a39ca6936ef5603ec1e86e90fe96451872d6c8cb952b743c45dca4dc47fa997e937e1c8865396b437f1979bfaa43a168a8125eeff155f4ab SHA512 b739464aef942b18827729a74bbb14c979f8c9acdbfa4e648619b6b343b0c6a104a0c14517cb26fbfc465bcc65bf2292602862e6db10a22e59494c517a1a2a12
+EBUILD selinux-rtorrent-9999.ebuild 288 BLAKE2B 5d078f32d7089481a39ca6936ef5603ec1e86e90fe96451872d6c8cb952b743c45dca4dc47fa997e937e1c8865396b437f1979bfaa43a168a8125eeff155f4ab SHA512 b739464aef942b18827729a74bbb14c979f8c9acdbfa4e648619b6b343b0c6a104a0c14517cb26fbfc465bcc65bf2292602862e6db10a22e59494c517a1a2a12
 MISC metadata.xml 318 BLAKE2B 55d670e11602395b801aa1f7794353c9418326e4d11c4488fb14695ccc288ae364e9e1625321948295e72d6e9e710767af35566161e75eb74ae4e09c831317d7 SHA512 a16d37c7a1c742c24f0b87f126157efaf9a62929d891cb93a3abfe0937f71b56eaec201f9f648f20697347c5628f330114a6e1c2132f5364d828c1c68936c3bb
diff --git a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20180114-r2.ebuild b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..3b601d633ec8
--- /dev/null
+++ b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 3c24e1312d0f..3b601d633ec8 100644
--- a/sec-policy/selinux-rtorrent/selinux-rtorrent-9999.ebuild
+++ b/sec-policy/selinux-rtorrent/selinux-rtorrent-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-salt/Manifest b/sec-policy/selinux-salt/Manifest
index 19eb99eb27f9..dbf9db5927df 100644
--- a/sec-policy/selinux-salt/Manifest
+++ b/sec-policy/selinux-salt/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-salt-2.20170805-r2.ebuild 278 BLAKE2B 3137e4dd9d5ef010382c3d4a2f8
 EBUILD selinux-salt-2.20170805-r3.ebuild 278 BLAKE2B 3137e4dd9d5ef010382c3d4a2f895b93a6c258fa96c80d07b6f6c2b51d2f8f6a3d043082517f1c39e9efb1aec592882b5f09dda7351cb14450f2bd7139b1c565 SHA512 ab14217f85808cb88b1752b7131f64ef3439f9a56acf644b0693e037ceebd86ee5fbf746539f0cf3268276226874feb3946a02bc27bea2e0e4e1395954e50c60
 EBUILD selinux-salt-2.20170805-r4.ebuild 280 BLAKE2B 9f336e2195284f2146e4b4bdd9bd64bfbae71dd559d75f2bfb579b8c4fcd9225547cb71f1fd3fbae43617c2e143acd2b6495a86be77a88811cd36fcaa8d1e098 SHA512 561a38ade7c43d7bf06ee8269016b645175b886ec16ed506390212acc0b96597315ee321a039e666d228cfac83f1e27238634a6ca8a4e7ad4573ab2580ff35b4
 EBUILD selinux-salt-2.20180114-r1.ebuild 278 BLAKE2B 53bcdf785a5fd09a2fa1c58cebd408145513a710bb0a703136f28a3d6d340281488009073eb90dedfb34a4326fd94e8331958a042d724213ace4fd67a8ee6a21 SHA512 7b9c581c011abb9d5579adc6784a381ba8bdad5644f40282f25738fd0598b2f64aee9b6b10d24982fb8e10aa7a81be227fee92cf20c5059ce540e724e502361e
-EBUILD selinux-salt-9999.ebuild 280 BLAKE2B 9f336e2195284f2146e4b4bdd9bd64bfbae71dd559d75f2bfb579b8c4fcd9225547cb71f1fd3fbae43617c2e143acd2b6495a86be77a88811cd36fcaa8d1e098 SHA512 561a38ade7c43d7bf06ee8269016b645175b886ec16ed506390212acc0b96597315ee321a039e666d228cfac83f1e27238634a6ca8a4e7ad4573ab2580ff35b4
+EBUILD selinux-salt-2.20180114-r2.ebuild 280 BLAKE2B 57da261a6af90ce27eaad5ffd0ac852360239596d841e57aa45a74d39ddad21802c010b564007cffa6c41dfd4153b84e304b51abb3764adb64c812fff3bdee03 SHA512 c5c812652bd760a095b196d99640c98b30cc1b9ad1a8c6788bdd2c049db1034233715bbd000ac73f1534f9c2ce53e0458a4c5cab16df227b04fed246352c229a
+EBUILD selinux-salt-9999.ebuild 280 BLAKE2B 57da261a6af90ce27eaad5ffd0ac852360239596d841e57aa45a74d39ddad21802c010b564007cffa6c41dfd4153b84e304b51abb3764adb64c812fff3bdee03 SHA512 c5c812652bd760a095b196d99640c98b30cc1b9ad1a8c6788bdd2c049db1034233715bbd000ac73f1534f9c2ce53e0458a4c5cab16df227b04fed246352c229a
 MISC metadata.xml 314 BLAKE2B 2350a13155f12cb04aed75e030971f0ebb9cc7151b177bfd98c2d64dfbe6b1df79ec8fc09df61a2f5cc2ee6d641d3d1910259e6661d4522b3dfef554776bb5a0 SHA512 634ec5b038d166c8b654784e899ef50e4ffb87a855cc5fc54230276b89a84a1d879e84b52af6165edd1c4533eb37085443073d56d9f8f95e29b52945c0b6767a
diff --git a/sec-policy/selinux-salt/selinux-salt-2.20180114-r2.ebuild b/sec-policy/selinux-salt/selinux-salt-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..bc84b0e7d7ea
--- /dev/null
+++ b/sec-policy/selinux-salt/selinux-salt-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 b6d17ac4b6d5..bc84b0e7d7ea 100644
--- a/sec-policy/selinux-salt/selinux-salt-9999.ebuild
+++ b/sec-policy/selinux-salt/selinux-salt-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-samba/Manifest b/sec-policy/selinux-samba/Manifest
index 19125c0bec34..45c77a6cc161 100644
--- a/sec-policy/selinux-samba/Manifest
+++ b/sec-policy/selinux-samba/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-samba-2.20170805-r2.ebuild 280 BLAKE2B 2c956d45b7d705ead30c067613
 EBUILD selinux-samba-2.20170805-r3.ebuild 280 BLAKE2B 2c956d45b7d705ead30c067613fa239a636f7f76a0928cfa8f0b8d27dfbc1b2ff4d604a376a0a1674c1f191ac7f4eed656abaee82b49318d18a51ddb6387b8b9 SHA512 d7a4e2e623fd437d01296f8c072b787b057e35ab39e4bf301562a1f3946272b5cd1deb60fead1d85c7f644fe80cb6f8accd5cf7e97aec13f1b70079bedf0822e
 EBUILD selinux-samba-2.20170805-r4.ebuild 282 BLAKE2B a578bd7e149399eb0997b0d8e0cfffb0285b95f9191016d52849b54e2741762de13a99602b5167d2279752b7cef0afa098a2a924e6c7ee4c8b5a0a99d53b5ae8 SHA512 a6ce43835a90ec9137827413cb7e0d15225ca9615a617218fc0a5a3a181294fc4cf1fe88bb397b5591caff6f5198a89e919b744c2d4fde13ea34ffdf7118a8b7
 EBUILD selinux-samba-2.20180114-r1.ebuild 280 BLAKE2B 8106d5ffb67ceaedf752686fce0e46974697cb85dc1aa37953088857de51bb786dd7412e30b7d88125d66d2bbd05003d4a0cbac9e6177e5dab845f035822d231 SHA512 dd11d9cdfaa246dbbe28d3f1955cb793ab4ac2a9bb319ba7bf48a0d2521662fb3321b12d77bb88bb54a3ea9ab671fd9b63719a9974d11a260295aa9030976860
-EBUILD selinux-samba-9999.ebuild 282 BLAKE2B a578bd7e149399eb0997b0d8e0cfffb0285b95f9191016d52849b54e2741762de13a99602b5167d2279752b7cef0afa098a2a924e6c7ee4c8b5a0a99d53b5ae8 SHA512 a6ce43835a90ec9137827413cb7e0d15225ca9615a617218fc0a5a3a181294fc4cf1fe88bb397b5591caff6f5198a89e919b744c2d4fde13ea34ffdf7118a8b7
+EBUILD selinux-samba-2.20180114-r2.ebuild 282 BLAKE2B 3a7ab80a82719f320747810475b6eab63e1929215dbb7e95ef0a939de8c96a75fff45d61ebc0ef07f30a5c7ef75d994a60336bc369e62695e792b42189c887a6 SHA512 138863489e7fbe35ea4d2ae523e871786e0376ea7349453ee6d630e37f11b6a0e564a1fe50a5c620bcb57ae08bbdf584ce48101facb1d0b4942d5a286ff4fb3e
+EBUILD selinux-samba-9999.ebuild 282 BLAKE2B 3a7ab80a82719f320747810475b6eab63e1929215dbb7e95ef0a939de8c96a75fff45d61ebc0ef07f30a5c7ef75d994a60336bc369e62695e792b42189c887a6 SHA512 138863489e7fbe35ea4d2ae523e871786e0376ea7349453ee6d630e37f11b6a0e564a1fe50a5c620bcb57ae08bbdf584ce48101facb1d0b4942d5a286ff4fb3e
 MISC metadata.xml 315 BLAKE2B 08646bda187b856809d9bbdb57448783486da0b00f51c6e5b81ab65e54d86e3fa78934fb2774aa4f47d5a7b4328ccebe4132174d96953d33a3040afbcc6a8b59 SHA512 be5d21037154c9faad9ee42bb7337dde65086d188d3703a85e0557003efa33456dc3229ec6c3f36520ba5601d6af2c33825c0fdfa9b6611e4ba67aefe58e2224
diff --git a/sec-policy/selinux-samba/selinux-samba-2.20180114-r2.ebuild b/sec-policy/selinux-samba/selinux-samba-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..3ab5f4c3c662
--- /dev/null
+++ b/sec-policy/selinux-samba/selinux-samba-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 285da42679a2..3ab5f4c3c662 100644
--- a/sec-policy/selinux-samba/selinux-samba-9999.ebuild
+++ b/sec-policy/selinux-samba/selinux-samba-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-sasl/Manifest b/sec-policy/selinux-sasl/Manifest
index 606f8d202314..a2f7cdc38791 100644
--- a/sec-policy/selinux-sasl/Manifest
+++ b/sec-policy/selinux-sasl/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-sasl-2.20170805-r2.ebuild 278 BLAKE2B bf9744cf9ded03fbce4cfc04f47
 EBUILD selinux-sasl-2.20170805-r3.ebuild 278 BLAKE2B bf9744cf9ded03fbce4cfc04f47e11cec3dc8b1d3652d53f936b71a99784739545c5a53d9cf142cbbc11ea15b8c3c6f34fa5dcb6a09509f5af1da3b746f76ea1 SHA512 f73630c414f6d6c364d10f86d5445e19fe4a845f8ad46485a5f9eb298548799409c7af382adcd199dfdda757a5f489563c0f4995fd1580e3637628772ae36ec4
 EBUILD selinux-sasl-2.20170805-r4.ebuild 280 BLAKE2B e0a31c6aea765df8154cf887d67b10329135cf84b4964e1cb813dea47a39184fc81494ead75a2127620cfcb0bfe760cf6cb989390d68f978be8e384e1c5defa3 SHA512 ac3921327660254c03f18c073dae9f082c38fad82e5fcdfff7673c05a9bad12906030c8489cc2c25e0778ef3fa158668b99608e8fdda221971d625b593300143
 EBUILD selinux-sasl-2.20180114-r1.ebuild 278 BLAKE2B de1e42f981db6b0861ca06c5ee03dd1dd6bd6e3da980bfd63900d768e912e8ab05859e62584eca5c37da1a0d95f69eba8765badba54a6d07810d5d753ac3b98e SHA512 238ee634adbdd088ceccca41b9b2e642154ef191bfe9d8b62f2d5e45b1672841be92651a0046c77d1be0078ca6d4f43e24a1b3601afa43260d57585103559f02
-EBUILD selinux-sasl-9999.ebuild 280 BLAKE2B e0a31c6aea765df8154cf887d67b10329135cf84b4964e1cb813dea47a39184fc81494ead75a2127620cfcb0bfe760cf6cb989390d68f978be8e384e1c5defa3 SHA512 ac3921327660254c03f18c073dae9f082c38fad82e5fcdfff7673c05a9bad12906030c8489cc2c25e0778ef3fa158668b99608e8fdda221971d625b593300143
+EBUILD selinux-sasl-2.20180114-r2.ebuild 280 BLAKE2B 31589652b5685c731873da4b72f2a853ccd29c9ab6ddd55380a07025b97121b20879dded6683e2c56a4f0fadf9c9ca6980d8e2c5ede2b42c1f66969ee44e0f1e SHA512 d21d7a904257464cd9b5f4d5891764639b403610ff6b39ae550ca2150131ad1e004341a04b723b644b5ff029deaa2f638441b4510d18de89c0cfb5833213a374
+EBUILD selinux-sasl-9999.ebuild 280 BLAKE2B 31589652b5685c731873da4b72f2a853ccd29c9ab6ddd55380a07025b97121b20879dded6683e2c56a4f0fadf9c9ca6980d8e2c5ede2b42c1f66969ee44e0f1e SHA512 d21d7a904257464cd9b5f4d5891764639b403610ff6b39ae550ca2150131ad1e004341a04b723b644b5ff029deaa2f638441b4510d18de89c0cfb5833213a374
 MISC metadata.xml 314 BLAKE2B 353081e43c3d5accea023efca05e8127596b4eb0156cd37f425f298b2fac17610a8519ca0490666e77270c9bdf100bf950753652a21b4b54bf4b48e166cab84d SHA512 45edaf69b73c11c1ed1b7f7fc2b97aadeb3d11b51e2b4c8e388c556efc79441bf70d1f0c835980626e3bdb8cc8bb315204f680a6dd64402035220606449e1960
diff --git a/sec-policy/selinux-sasl/selinux-sasl-2.20180114-r2.ebuild b/sec-policy/selinux-sasl/selinux-sasl-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..5798ce3dd1bd
--- /dev/null
+++ b/sec-policy/selinux-sasl/selinux-sasl-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 2dcdf2d01349..5798ce3dd1bd 100644
--- a/sec-policy/selinux-sasl/selinux-sasl-9999.ebuild
+++ b/sec-policy/selinux-sasl/selinux-sasl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-screen/Manifest b/sec-policy/selinux-screen/Manifest
index e281eac2a461..d091df258b79 100644
--- a/sec-policy/selinux-screen/Manifest
+++ b/sec-policy/selinux-screen/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-screen-2.20170805-r2.ebuild 282 BLAKE2B 140806ce070744630e561931b
 EBUILD selinux-screen-2.20170805-r3.ebuild 282 BLAKE2B 140806ce070744630e561931b05761f983a37709ff229afa452b76e814edc500200df138b622a55b5f799938cd5552499d4c470d98df4bbd1634a6da5bb87df9 SHA512 51db16d1e3370ea88b1f2c9ea2fd35233d4157aa29b8d6d7bf94cd81cded26e6a9ade624aa1df454a21d54a4f927cefc506dfb9d679f9dd17cc5063ad7f78212
 EBUILD selinux-screen-2.20170805-r4.ebuild 284 BLAKE2B 4500afd5a697e0761a73ce24885a7dc981f3430a3f5d8e10b677c92edaf5bc26aacee6f95625ac6eccd39f7716ce5172e5ca2f9ab264d8eac7e5ffbd8bf1e062 SHA512 943f6b8dc5ca666b46121532a3115019cef0220653950edefbce326fb8d54ac566793f5726c4e276f90b1eceb87ca50f2f0f33b3bd3e04b866cfff4e62e166dc
 EBUILD selinux-screen-2.20180114-r1.ebuild 282 BLAKE2B b72341581d9eedb0946df773f447411657732b759bb2ef7379f98a54e81f00f23fc30721b74bdee8b5317a49870f7fb428e66f54dcdd4b670d6c22a349e3e815 SHA512 7fc84811b4b7eb90794312f65fdff8301f546edf6ccce6b19d74028edf892a4449a48ed5534bc44f778ca94c9fc107a62d594c4d1977dea81b1ce2d3e32d3978
-EBUILD selinux-screen-9999.ebuild 284 BLAKE2B 4500afd5a697e0761a73ce24885a7dc981f3430a3f5d8e10b677c92edaf5bc26aacee6f95625ac6eccd39f7716ce5172e5ca2f9ab264d8eac7e5ffbd8bf1e062 SHA512 943f6b8dc5ca666b46121532a3115019cef0220653950edefbce326fb8d54ac566793f5726c4e276f90b1eceb87ca50f2f0f33b3bd3e04b866cfff4e62e166dc
+EBUILD selinux-screen-2.20180114-r2.ebuild 284 BLAKE2B 42b53559269510928a8caa16a762abadc99711b65e891874a6d5749ad28f9e9287b2fa9b83e017c23c301cd5f3a3d2dfd23841efc590629fe5d6434286d38044 SHA512 fc53f22da32d74ceb7728f2430c68e328d93508bfd9ed18809929e6edabad55d876950985d7edea50ecdb83f2ea4fb591525850baf02ca06db1593ac9cec47ab
+EBUILD selinux-screen-9999.ebuild 284 BLAKE2B 42b53559269510928a8caa16a762abadc99711b65e891874a6d5749ad28f9e9287b2fa9b83e017c23c301cd5f3a3d2dfd23841efc590629fe5d6434286d38044 SHA512 fc53f22da32d74ceb7728f2430c68e328d93508bfd9ed18809929e6edabad55d876950985d7edea50ecdb83f2ea4fb591525850baf02ca06db1593ac9cec47ab
 MISC metadata.xml 316 BLAKE2B 197be4a73afaa6ab290a9589ba55be1aaa09881838010414216330577d2d785eecb1a47e1054c3824c24658e7377cb2982ac8d0f146ee11ed6beee02fb20823d SHA512 4fe7d61f85ea2a1a24235cb5d571e9c0ff213b44d985f33d2d72858e7e429992ad6e779cc641eb2712f4abc089dab74203ed2b5111c627efce0a45c0da25bd5a
diff --git a/sec-policy/selinux-screen/selinux-screen-2.20180114-r2.ebuild b/sec-policy/selinux-screen/selinux-screen-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..943274f4a0a3
--- /dev/null
+++ b/sec-policy/selinux-screen/selinux-screen-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 eecd441a1825..943274f4a0a3 100644
--- a/sec-policy/selinux-screen/selinux-screen-9999.ebuild
+++ b/sec-policy/selinux-screen/selinux-screen-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-sendmail/Manifest b/sec-policy/selinux-sendmail/Manifest
index b6ac05148fea..396ae61d46e6 100644
--- a/sec-policy/selinux-sendmail/Manifest
+++ b/sec-policy/selinux-sendmail/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-sendmail-2.20170805-r2.ebuild 286 BLAKE2B c010079a8c39b284277a29a
 EBUILD selinux-sendmail-2.20170805-r3.ebuild 286 BLAKE2B c010079a8c39b284277a29a1ffee86cf1dca3e69fe7835289f01ddc32496bbc1ba369e65046397928391cd595961076da4276d62a8592e6fbcae7d0b0f94d9a9 SHA512 655c9f4ec9b19dc3732f808f6df1e0546f97a9004ab1f6aa4f0edebd454e58582dcfd4a332f69ce95c2ff8d624c42fc868d87954b1a33c3b71406d12b62f6e26
 EBUILD selinux-sendmail-2.20170805-r4.ebuild 288 BLAKE2B c4a125e0713c75726ec46a36e1e998d33b27bfa30ea57c5cc5a86e2552d1a186fac629c4d428ddaba4968a9e151465f9230bda5f3f52f28fd7a55474db318e6b SHA512 2e5a94c30bcbd1498ce5dae67b6cdc0b18219e24be4e33bb55a913fbc21d6bed9e7439ebaf01e7f80324fe5420dcf0c3c70ce78ff616c377ed4e89d20488e5e7
 EBUILD selinux-sendmail-2.20180114-r1.ebuild 286 BLAKE2B 775fb96c91cabcb2070b37f5e6e38596534136083e691a0a9836ee644047d419c45ec7fbc3a1d246f49b57f2e6a4fe10abd56e4cb7701dba3aef1eeca0bb78b9 SHA512 72d9d4c1663b192127f031ad6a7a047442257e99b9792722790d7511ce9e774412afbd411663575489ee1becb421789e458e7a8c16d3c726ecfd34a82e030687
-EBUILD selinux-sendmail-9999.ebuild 288 BLAKE2B c4a125e0713c75726ec46a36e1e998d33b27bfa30ea57c5cc5a86e2552d1a186fac629c4d428ddaba4968a9e151465f9230bda5f3f52f28fd7a55474db318e6b SHA512 2e5a94c30bcbd1498ce5dae67b6cdc0b18219e24be4e33bb55a913fbc21d6bed9e7439ebaf01e7f80324fe5420dcf0c3c70ce78ff616c377ed4e89d20488e5e7
+EBUILD selinux-sendmail-2.20180114-r2.ebuild 288 BLAKE2B 05bd10bec2bc966773d3e51dc12d1341317378e1b72b888f737c16eec36526d1ddc6e9e2c973c410e2947b3161ba3b880ea72ceb7fdcebf6e0914f57863212a3 SHA512 2709920be12f5982f9033b80a9a38145185494fb16fad5b9768a5d0b93cf27575d07fde46f790eda463194472c3747bec2da0541f2eca51738908df9c42958e6
+EBUILD selinux-sendmail-9999.ebuild 288 BLAKE2B 05bd10bec2bc966773d3e51dc12d1341317378e1b72b888f737c16eec36526d1ddc6e9e2c973c410e2947b3161ba3b880ea72ceb7fdcebf6e0914f57863212a3 SHA512 2709920be12f5982f9033b80a9a38145185494fb16fad5b9768a5d0b93cf27575d07fde46f790eda463194472c3747bec2da0541f2eca51738908df9c42958e6
 MISC metadata.xml 318 BLAKE2B d2c93df153de9789f247d6fb548f65a2d69493673af0b806b3dd40b0101cecdd27a9a3e681bd49e9fa210b250cc17468706c4c73009b7c8fb1d3bf24180a902a SHA512 32cedde0f34cdc0e2dce0599332364e3a2b7feafaec1dab8e96c34b4ebd1274c53ea4051d555ff3fc48cf86df7c45ce929c938c3f7e914e47012a8ba8b6fbcaf
diff --git a/sec-policy/selinux-sendmail/selinux-sendmail-2.20180114-r2.ebuild b/sec-policy/selinux-sendmail/selinux-sendmail-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..b94c5bf9764c
--- /dev/null
+++ b/sec-policy/selinux-sendmail/selinux-sendmail-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 ea30505244e3..b94c5bf9764c 100644
--- a/sec-policy/selinux-sendmail/selinux-sendmail-9999.ebuild
+++ b/sec-policy/selinux-sendmail/selinux-sendmail-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-sensord/Manifest b/sec-policy/selinux-sensord/Manifest
index d9778e2b8911..97993c76bc59 100644
--- a/sec-policy/selinux-sensord/Manifest
+++ b/sec-policy/selinux-sensord/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-sensord-2.20170805-r2.ebuild 284 BLAKE2B e5964602dd9d21ac1bc6c39d
 EBUILD selinux-sensord-2.20170805-r3.ebuild 284 BLAKE2B e5964602dd9d21ac1bc6c39d69fdb2933daa19a382797fa6d3b62280ee85fcb7d3a16aa2ae3b716f4daade99415c2bb028e9f13d7b02c7a93cf9d569f72360d9 SHA512 ab86e7a2300622a9d28d9c685277e2b2de2b75a6772a07644096d7798ede0c6454b61801e5b298addbfc722a33406d6dabeaad2c466830980f865ee36d34cd75
 EBUILD selinux-sensord-2.20170805-r4.ebuild 286 BLAKE2B 779a723b368935ad8dfaf054339da52bfe3f8511157a9e9feac2b48a15020f1bf4e091e7978b3452d7e45cdb1b540a331af3cfaaff41b18840a533392e64fd5b SHA512 53b6df1e5b5a6906d58eb1edf49526e2577ccac46505e2a6cb819a3fbbe0ed483e2924ff29611641392e353b99366e800c357c0094af2bfa1b4b39403888185f
 EBUILD selinux-sensord-2.20180114-r1.ebuild 284 BLAKE2B 10d77950f9cdc680e3ea389381f00175524caa51784a79f4dea11b3d4065b93dfb6918919df9a5056ddb26146ed36abaf5129535cd5f94744a5b0435996ba5b2 SHA512 099f4b968552181f1039cc07902a40b662445689bdaf21196214924e92943cc00f962f27c396545713ac9401baadd94535c11e4c49c5a82d197b73a269b18c4f
-EBUILD selinux-sensord-9999.ebuild 286 BLAKE2B 779a723b368935ad8dfaf054339da52bfe3f8511157a9e9feac2b48a15020f1bf4e091e7978b3452d7e45cdb1b540a331af3cfaaff41b18840a533392e64fd5b SHA512 53b6df1e5b5a6906d58eb1edf49526e2577ccac46505e2a6cb819a3fbbe0ed483e2924ff29611641392e353b99366e800c357c0094af2bfa1b4b39403888185f
+EBUILD selinux-sensord-2.20180114-r2.ebuild 286 BLAKE2B 1477754bef285aed5fd5f9d03855b0be6ff3da0f3dd14da44adf2ba6acb44915a25623d7e5f70159e3a9e6d89ac3d5e5d8df0bd6fcc3d83194aa260b53973efe SHA512 8c9e7191d7d4a23ef0844ee6a53afb36a139dbbd9c8e4d25dca6887ad3a20287c47988e35686033f675d0c57e02cc7df6e91928b1269d130cc6c4f8222342935
+EBUILD selinux-sensord-9999.ebuild 286 BLAKE2B 1477754bef285aed5fd5f9d03855b0be6ff3da0f3dd14da44adf2ba6acb44915a25623d7e5f70159e3a9e6d89ac3d5e5d8df0bd6fcc3d83194aa260b53973efe SHA512 8c9e7191d7d4a23ef0844ee6a53afb36a139dbbd9c8e4d25dca6887ad3a20287c47988e35686033f675d0c57e02cc7df6e91928b1269d130cc6c4f8222342935
 MISC metadata.xml 317 BLAKE2B 7a98bdcdf553ecde53aa9469cbe665f14eacca0b14774c2f59d8c7a74580c0a9b28c81aadb9b43dd807452dbb42b42a383f14e7fc536caec35292cdfdb884ca1 SHA512 efb7c659fad7bca559bbac9b5abe6fff6b82c69a6557a167327d569be61c75a51deb7a3f2785bac38a2b000cf1bec227423906a1ea678229aba158a8227dd6d3
diff --git a/sec-policy/selinux-sensord/selinux-sensord-2.20180114-r2.ebuild b/sec-policy/selinux-sensord/selinux-sensord-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..4247b25372f9
--- /dev/null
+++ b/sec-policy/selinux-sensord/selinux-sensord-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 236c00e8a136..4247b25372f9 100644
--- a/sec-policy/selinux-sensord/selinux-sensord-9999.ebuild
+++ b/sec-policy/selinux-sensord/selinux-sensord-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-shorewall/Manifest b/sec-policy/selinux-shorewall/Manifest
index c047f6dc4a84..0556ca4ba96c 100644
--- a/sec-policy/selinux-shorewall/Manifest
+++ b/sec-policy/selinux-shorewall/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-shorewall-2.20170805-r2.ebuild 288 BLAKE2B c690ca66e22568e87b9e74
 EBUILD selinux-shorewall-2.20170805-r3.ebuild 288 BLAKE2B c690ca66e22568e87b9e748b2c5e0d2ed16aff0c87f2876336076adbd22da9466259f129bd9ee4c55bd655a8cad9b2062a98b536798ec300d08026832e9ac178 SHA512 9a7c28c4578a4ac5daad8546c77fbd90c009a82ed4642f861342310f90148a6eb53587df9ff4d1bac820410c41bb922da56adb03fc33b64c9c0318c2fbc1df17
 EBUILD selinux-shorewall-2.20170805-r4.ebuild 290 BLAKE2B 6aaeb26ae61b97700bac883a3053d3641de3ec5e5082bef69686ed7a757e741a334fa2309f4c07d54d3c7a89487afe308ccc424443230cb4c80d3ec203f14729 SHA512 b388d77a4ed849213df8ef02ab1da73f204fab753796e1b4d43b3df6d9ac7323dccff47b0492edee280aa810e5c919fc6ebdde2f1dfd50cdb755cebbe1d86bf0
 EBUILD selinux-shorewall-2.20180114-r1.ebuild 288 BLAKE2B 108a586ae38b988c5c358af60a4464524798f7db79e0afb5458d4cbdf8951c0c7a249e8be02922ba0d2d7771258656c186a88da0b2469e37e9906f8ab84642fe SHA512 7543c73dbeac5bd8023af10c118b510a3e6ea6a3811df7eedcb4c60517595446f953cd9b9e3d6b68ab5cf80c40fd14f4f05e4f48c5322793be30e802c0165ece
-EBUILD selinux-shorewall-9999.ebuild 290 BLAKE2B 6aaeb26ae61b97700bac883a3053d3641de3ec5e5082bef69686ed7a757e741a334fa2309f4c07d54d3c7a89487afe308ccc424443230cb4c80d3ec203f14729 SHA512 b388d77a4ed849213df8ef02ab1da73f204fab753796e1b4d43b3df6d9ac7323dccff47b0492edee280aa810e5c919fc6ebdde2f1dfd50cdb755cebbe1d86bf0
+EBUILD selinux-shorewall-2.20180114-r2.ebuild 290 BLAKE2B e0dc076059142695f75a3b43b3ecd1fc0bf7de98ccf25d4b9c16b93e73606c09771d1a14dba6ff9521b8ec18d4580e30c4ea84533968acd82e6f4ad40b0152e1 SHA512 b5690dd0fedf4574f92f4a537474b38fe66a2ea5db5f64b0088a8e6652ae7694067f45bd95bdea0298353eecec7b1503e4e059e5e6e6e3bab6c1a11d1ca4866d
+EBUILD selinux-shorewall-9999.ebuild 290 BLAKE2B e0dc076059142695f75a3b43b3ecd1fc0bf7de98ccf25d4b9c16b93e73606c09771d1a14dba6ff9521b8ec18d4580e30c4ea84533968acd82e6f4ad40b0152e1 SHA512 b5690dd0fedf4574f92f4a537474b38fe66a2ea5db5f64b0088a8e6652ae7694067f45bd95bdea0298353eecec7b1503e4e059e5e6e6e3bab6c1a11d1ca4866d
 MISC metadata.xml 319 BLAKE2B 770bef5667ce36c3e531cd9bb5160ec813134ebd648c97e51f9fd98b413d322d69e00058e2e91bd8755fcf08e4ba7a7ccf7e36e13ad8503a6408c221dac2cad3 SHA512 fdad724a2c1f0baf476b7a23debedd76f6966f06ed68f1f8a09d4f3fc6288879ba290ba82f625e98542799b54f82cf348f6d99b9e8b4389cffc861f50c55d4b1
diff --git a/sec-policy/selinux-shorewall/selinux-shorewall-2.20180114-r2.ebuild b/sec-policy/selinux-shorewall/selinux-shorewall-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..dfd988330a21
--- /dev/null
+++ b/sec-policy/selinux-shorewall/selinux-shorewall-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 f2350f1e5510..dfd988330a21 100644
--- a/sec-policy/selinux-shorewall/selinux-shorewall-9999.ebuild
+++ b/sec-policy/selinux-shorewall/selinux-shorewall-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-shutdown/Manifest b/sec-policy/selinux-shutdown/Manifest
index ef275ab3ce42..be365c2c7c97 100644
--- a/sec-policy/selinux-shutdown/Manifest
+++ b/sec-policy/selinux-shutdown/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-shutdown-2.20170805-r2.ebuild 286 BLAKE2B 9a81db906ad39ced4d944e9
 EBUILD selinux-shutdown-2.20170805-r3.ebuild 286 BLAKE2B 9a81db906ad39ced4d944e93b88b7e7dce90173afcb4051aa13faf169a16333e773dac2a7aa2a93e0c3ffa27edb06000bd613223cee0f4c525f50bcdf13344c9 SHA512 36db4eee9602f2d0d064c7c6c8e5441d121366cff5286883af69449bb5dceb6ad96cbeec1a27414025a6bf95faf7a0391a46d700e2a591f4bc0688e848a2fa8c
 EBUILD selinux-shutdown-2.20170805-r4.ebuild 288 BLAKE2B 69c84af832438b8fbbde58d3df42529d90f2ccbc3cefc08dd304854acfa6d6ac4677fd30b00417bb0e50acfc96474fc8af4ec2c2494bbd204ce078d603acfc17 SHA512 7a662ae671884585b48ee39f1a172f5b02e8149993cde0d5dcaaba9c18e12a4e664dec4c1a9e251c35c90999d4d7eb0065d64506599c6633da35981adb82036c
 EBUILD selinux-shutdown-2.20180114-r1.ebuild 286 BLAKE2B aa6ca83034db161ef08a1b540574e395dd4189aeeaa421dbe083151518eb03b1139bfe83d2376906e84350e6cd48d325670b6a48f6c4ebf2940a53981696a188 SHA512 63b2e22bb50aa994dd6d71a382c20dc301b903570ca110ad2ee880db410f2c76755851fa4929b38ee7ac73ec18512299a54959483ca39f785787bd3acb6891aa
-EBUILD selinux-shutdown-9999.ebuild 288 BLAKE2B 69c84af832438b8fbbde58d3df42529d90f2ccbc3cefc08dd304854acfa6d6ac4677fd30b00417bb0e50acfc96474fc8af4ec2c2494bbd204ce078d603acfc17 SHA512 7a662ae671884585b48ee39f1a172f5b02e8149993cde0d5dcaaba9c18e12a4e664dec4c1a9e251c35c90999d4d7eb0065d64506599c6633da35981adb82036c
+EBUILD selinux-shutdown-2.20180114-r2.ebuild 288 BLAKE2B 73b5cbb17f267852552ac4bb81117a02a8caca7b3ce5cc831fbe81b1f6208438ddd182717b27cb4143d3e1bcdb5778a43c84778a45f10d1da25380034fdfd601 SHA512 7b7f9d741ee204b11534f65003cd7ef531daf381f2516a1ec12bdd53006ecd0bba6f48f1a437c37eeff1ad62d3dc82ab1c3b3f124f98f9c4f7a7d20b1c58fb98
+EBUILD selinux-shutdown-9999.ebuild 288 BLAKE2B 73b5cbb17f267852552ac4bb81117a02a8caca7b3ce5cc831fbe81b1f6208438ddd182717b27cb4143d3e1bcdb5778a43c84778a45f10d1da25380034fdfd601 SHA512 7b7f9d741ee204b11534f65003cd7ef531daf381f2516a1ec12bdd53006ecd0bba6f48f1a437c37eeff1ad62d3dc82ab1c3b3f124f98f9c4f7a7d20b1c58fb98
 MISC metadata.xml 318 BLAKE2B aa7bb6373d464eeb3bb0fd6f1cde62da5e0d49891c361a555194e6e30223d5130620888282020e14afafcdacbf95db797264fed49d1027c2b6b0df99fec7e2bc SHA512 4fa45f9cb30c10064cb7c91c5331d4ca91a05cb1f74403feb9dbeadd943a0741c1849371bd444432c3ed7c0ae84e09e4742cb9e12ba9c8b8f40413a56f002767
diff --git a/sec-policy/selinux-shutdown/selinux-shutdown-2.20180114-r2.ebuild b/sec-policy/selinux-shutdown/selinux-shutdown-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..a1ee5c0570e9
--- /dev/null
+++ b/sec-policy/selinux-shutdown/selinux-shutdown-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 9c13a5d94f6e..a1ee5c0570e9 100644
--- a/sec-policy/selinux-shutdown/selinux-shutdown-9999.ebuild
+++ b/sec-policy/selinux-shutdown/selinux-shutdown-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-skype/Manifest b/sec-policy/selinux-skype/Manifest
index c40ed7faaa59..a62288635137 100644
--- a/sec-policy/selinux-skype/Manifest
+++ b/sec-policy/selinux-skype/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-skype-2.20170805-r2.ebuild 382 BLAKE2B 4cba9585212adbc26538c3b384
 EBUILD selinux-skype-2.20170805-r3.ebuild 382 BLAKE2B 4cba9585212adbc26538c3b384459f828e564466eaad85b11624e5dc735f35a26384e152ed05b00b15c5d51be83daf551efdb6276553a69c2f1e3d4e5eccb0d4 SHA512 3a8c67a865b15f12b3f889d03aa8dfd517e3ea8df597a5fbff149e206d31ddf2cc6695e94a48831e0341d59d89b05d6883253790ed054e1363fdbf888b9ae124
 EBUILD selinux-skype-2.20170805-r4.ebuild 384 BLAKE2B 258c197153862aca6021413cbb0afb71f9f36c8fc4e1bfa859c7618afdaf0fe22c8f778eeb11244a5e08ff1a3c68d6d68758b31c1361e3896132915b2a4c6230 SHA512 959b3803b8ed7e538b49c529564efec93b0f9a92f29a73afb42f357e70babbe2685bc853b95246f62f688af3195b03e5b413430a7441dc34057f59f73c5dbeca
 EBUILD selinux-skype-2.20180114-r1.ebuild 382 BLAKE2B 985fa9b9b714917b516a82c0489632ffc2c634737baf35a454a2c00f9cd99d19af0f1e63e447d40a156d04ac7e54984456014cb8fd931d881931dbe83973b5cd SHA512 25518b95a19fb6ffc0e38633bebdd44df6aac130278b8d11498d1681e9f93c984e4052dc4e52873d0b6cecac3daa06c6e8647de71aee439344d45827ff331db8
-EBUILD selinux-skype-9999.ebuild 384 BLAKE2B 258c197153862aca6021413cbb0afb71f9f36c8fc4e1bfa859c7618afdaf0fe22c8f778eeb11244a5e08ff1a3c68d6d68758b31c1361e3896132915b2a4c6230 SHA512 959b3803b8ed7e538b49c529564efec93b0f9a92f29a73afb42f357e70babbe2685bc853b95246f62f688af3195b03e5b413430a7441dc34057f59f73c5dbeca
+EBUILD selinux-skype-2.20180114-r2.ebuild 384 BLAKE2B 187ccc988495b18da32a5bb24378ad36b8f735e678713f25c0d9af30ae2e2f77544fe32f8ace666910bef7b12fd9adfaf1eb1f2c9deba8311ed413950292bc63 SHA512 3b5ca908b5515ce49303986d0cbd4b9d957ec2d1dec18b782aa181c475f2cba719b15cca0b7afe60eed3e30e0c85ecdfd8ba7ea68b4a218fc49eab76405a99fe
+EBUILD selinux-skype-9999.ebuild 384 BLAKE2B 187ccc988495b18da32a5bb24378ad36b8f735e678713f25c0d9af30ae2e2f77544fe32f8ace666910bef7b12fd9adfaf1eb1f2c9deba8311ed413950292bc63 SHA512 3b5ca908b5515ce49303986d0cbd4b9d957ec2d1dec18b782aa181c475f2cba719b15cca0b7afe60eed3e30e0c85ecdfd8ba7ea68b4a218fc49eab76405a99fe
 MISC metadata.xml 315 BLAKE2B 03028ab251445c2df09ebe2861996a9ec8006d4b044543401f97c05775f88d5789002c403876e2cff79bb6629003c1607ad289670ea18c4e913f2b4edc88ead0 SHA512 1a924ae849c1f4c698f1e30e99a612fd88ef66371170814f4e51a3940fbd463345b80156f2ed35b5aab70e808f42cd2c1a100b018659a182f96660b501fd85ba
diff --git a/sec-policy/selinux-skype/selinux-skype-2.20180114-r2.ebuild b/sec-policy/selinux-skype/selinux-skype-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..0ae995509331
--- /dev/null
+++ b/sec-policy/selinux-skype/selinux-skype-2.20180114-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 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 6c095687d264..0ae995509331 100644
--- a/sec-policy/selinux-skype/selinux-skype-9999.ebuild
+++ b/sec-policy/selinux-skype/selinux-skype-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-slocate/Manifest b/sec-policy/selinux-slocate/Manifest
index e0a680f63ef1..1a8957255ca1 100644
--- a/sec-policy/selinux-slocate/Manifest
+++ b/sec-policy/selinux-slocate/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-slocate-2.20170805-r2.ebuild 284 BLAKE2B 3da19ba0a81b3fd6105dc2c6
 EBUILD selinux-slocate-2.20170805-r3.ebuild 284 BLAKE2B 3da19ba0a81b3fd6105dc2c6bfb63371a1e24838210eff99d2fc8f79591f43f85a409ae4e65b4fdcaa3b0f5ab99c2ddfb2526b1b4b55e61f44b6fd257076ae39 SHA512 c80b9b12216f76366c35745c97eb587072c0b2ed2e28ce0339115085f69e302b34e9068d0d7a372966a35fd9690c14cba21b9c5ab41e50e6fc7b4abe169d0971
 EBUILD selinux-slocate-2.20170805-r4.ebuild 286 BLAKE2B 10450da85d7ba2f98375f78c28a57414dc80a5b22c5a26bac80a8151f7766ff7156468a57e90e960b1ff9488eb261932b10e72f94d52b0dda6c6e72f0e0b53c8 SHA512 d43d8f090028a9aa6d37ac7e36350c83e720893c8be577cb9dfadeb88b46a4d0f3bb91381b12abd876bb447edd5c64e6f6edec4f5596c5c75a4364efc75d403d
 EBUILD selinux-slocate-2.20180114-r1.ebuild 284 BLAKE2B 809d3525988975bf1c8392274d7ff2f7a31f8ecfda4047808a2d839c6b7faedd62c5c711754a66d99ffb782cf94c34b54e21ef77eafb02c45a7982859d92024a SHA512 bd7d16e44585daeb9bd3486374e2c989d3f24732aa35d37171c6b3fc1c38b6eff1cde075bf98881b07e98e6c20bd4c76e65c0197b01b790e083e828c24a87749
-EBUILD selinux-slocate-9999.ebuild 286 BLAKE2B 10450da85d7ba2f98375f78c28a57414dc80a5b22c5a26bac80a8151f7766ff7156468a57e90e960b1ff9488eb261932b10e72f94d52b0dda6c6e72f0e0b53c8 SHA512 d43d8f090028a9aa6d37ac7e36350c83e720893c8be577cb9dfadeb88b46a4d0f3bb91381b12abd876bb447edd5c64e6f6edec4f5596c5c75a4364efc75d403d
+EBUILD selinux-slocate-2.20180114-r2.ebuild 286 BLAKE2B 0715efebc68d1b4ee2a7239d1fd83179645afb669679e5a90ed00b18919d31d184aa1eabb05c9d169d7941b598642b790adfbdfbbb3032daa996fcac165048e8 SHA512 d2d2502092ad492c2419a96faa9e7d523c3851b7ea3532e14f484188ef728292a7e8895bb767a0215ab2a331e92afe685d9dc1786975ab5e325c2cbb95cf5f9b
+EBUILD selinux-slocate-9999.ebuild 286 BLAKE2B 0715efebc68d1b4ee2a7239d1fd83179645afb669679e5a90ed00b18919d31d184aa1eabb05c9d169d7941b598642b790adfbdfbbb3032daa996fcac165048e8 SHA512 d2d2502092ad492c2419a96faa9e7d523c3851b7ea3532e14f484188ef728292a7e8895bb767a0215ab2a331e92afe685d9dc1786975ab5e325c2cbb95cf5f9b
 MISC metadata.xml 317 BLAKE2B 5ce4f43bcfb01aee90580b7011699ba0623f846297d542b2f565474b8ead543e8f1a131595bf13e7b51916b10c337303535c6e41e92bd7670b9c12dc683adee7 SHA512 644efe6833d658d1f9e1181652ef2d10b13a45e8c5896235efe04a4f7f1dc9676145f501f2682a5763836038d16e3f9f0e9aad3138880b0ee77d4b3b22de66fe
diff --git a/sec-policy/selinux-slocate/selinux-slocate-2.20180114-r2.ebuild b/sec-policy/selinux-slocate/selinux-slocate-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..8393ac0bfd57
--- /dev/null
+++ b/sec-policy/selinux-slocate/selinux-slocate-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 77c44ff84c62..8393ac0bfd57 100644
--- a/sec-policy/selinux-slocate/selinux-slocate-9999.ebuild
+++ b/sec-policy/selinux-slocate/selinux-slocate-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-slrnpull/Manifest b/sec-policy/selinux-slrnpull/Manifest
index 84ccfb61d0ad..4d0e13a55130 100644
--- a/sec-policy/selinux-slrnpull/Manifest
+++ b/sec-policy/selinux-slrnpull/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-slrnpull-2.20170805-r2.ebuild 286 BLAKE2B 77bb7a976da8a7ef715311e
 EBUILD selinux-slrnpull-2.20170805-r3.ebuild 286 BLAKE2B 77bb7a976da8a7ef715311edddda935b6cd41137a2dc8799ebe68ab92e55d42df00e37f1aecffa1ef6f19b9cc569cd89650125bae55fcb5f75a70c96f65014a4 SHA512 7c760072f3b6133ca1a3ce932f60bdf793bc3a85988eb1d4cca05f86bc313059b05670f6e7c5321870475276a2e0b0841fe2ec0af0fd1af1e487a46009849f21
 EBUILD selinux-slrnpull-2.20170805-r4.ebuild 288 BLAKE2B b51fb73f6c6bee6aa1720515cf6301c1334bc8dc2785b46fa8d5076330d4efdf8a1a690e3a83b5c6d16d9ab502a934d627a78863e588d473b0f5c51e6d17009f SHA512 430bd0cefcc22ff1fc4458e0ca5d9d64bce56849d90bf95406865a06741990f71f07a5d3db6e9b74f47afd58e624215f232f87d4af9a4b12b8e1bb1784d4e2e7
 EBUILD selinux-slrnpull-2.20180114-r1.ebuild 286 BLAKE2B f3a6aaccf23d823ba6b25c378097bd25df6edd2e07196e811a71b36d64f9ab9e3c5070e2f1f7a8f8a3df648ca671ae98c22311875545e38103b492693adc4210 SHA512 270fa2d6e74eccfe589fe49a4f444821925a153635b6a6ec7f8cea4963724c82fe432e34b45a12482c58f5511057cfee25bd83f0d8458d458849dbaa8a20e93c
-EBUILD selinux-slrnpull-9999.ebuild 288 BLAKE2B b51fb73f6c6bee6aa1720515cf6301c1334bc8dc2785b46fa8d5076330d4efdf8a1a690e3a83b5c6d16d9ab502a934d627a78863e588d473b0f5c51e6d17009f SHA512 430bd0cefcc22ff1fc4458e0ca5d9d64bce56849d90bf95406865a06741990f71f07a5d3db6e9b74f47afd58e624215f232f87d4af9a4b12b8e1bb1784d4e2e7
+EBUILD selinux-slrnpull-2.20180114-r2.ebuild 288 BLAKE2B 2ba1e2a4615ea74ad8578654deb6df4ba75fa8e7e1859d7be00c6690b8bef01dd708decb0df77e3d44ce41b8d43690f72be88ef41dec1c2bcf685545c86f2451 SHA512 c1fead069940fa12bf34425698ce9b387d46a5a95364c9ca4c1373e2dacef9e4cb1d6ee6c94f092afd14adf2abf481c557936e58bfc2d9a56b1234b219b8aee4
+EBUILD selinux-slrnpull-9999.ebuild 288 BLAKE2B 2ba1e2a4615ea74ad8578654deb6df4ba75fa8e7e1859d7be00c6690b8bef01dd708decb0df77e3d44ce41b8d43690f72be88ef41dec1c2bcf685545c86f2451 SHA512 c1fead069940fa12bf34425698ce9b387d46a5a95364c9ca4c1373e2dacef9e4cb1d6ee6c94f092afd14adf2abf481c557936e58bfc2d9a56b1234b219b8aee4
 MISC metadata.xml 318 BLAKE2B 7ce08160f820c186fefe0d8fd4c286425f48c130f7b604b996e503662486e0ed5176340b744dfe54824ac00248afa95ed10f607e0a537a2dd56bf1dee3d9179e SHA512 d44cf9551886870def9addeb8e1cccfb4d79dae34507f43d45539e331e8120c6e2d49692e2aa6c3eacc86b3a57d83956298da1c4e7b12da2718fb15d812cced1
diff --git a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20180114-r2.ebuild b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..3602a91bf185
--- /dev/null
+++ b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 aa2c2be7cf12..3602a91bf185 100644
--- a/sec-policy/selinux-slrnpull/selinux-slrnpull-9999.ebuild
+++ b/sec-policy/selinux-slrnpull/selinux-slrnpull-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-smartmon/Manifest b/sec-policy/selinux-smartmon/Manifest
index 21addbeeed36..737d0eb4f69a 100644
--- a/sec-policy/selinux-smartmon/Manifest
+++ b/sec-policy/selinux-smartmon/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-smartmon-2.20170805-r2.ebuild 286 BLAKE2B 380f2cf21c901a8f5ea786e
 EBUILD selinux-smartmon-2.20170805-r3.ebuild 286 BLAKE2B 380f2cf21c901a8f5ea786ef3889382a70f27c93a247ba5f573f05663aae13ebc6f001dd84077ab3f5eacc5d5a524e0a4a5d410c9125ccdbe6aaececb9147716 SHA512 135d0637121d5f4969a8ab8bcde16df552620bf964c2029214204f942c93f77592ca0da31018e91eb2ad0e57d649738beb821ed6e6a1b482251c732bfbc81778
 EBUILD selinux-smartmon-2.20170805-r4.ebuild 288 BLAKE2B 3a8cc58b76ad65e9e1dd340c9d3c060d183a2b9ca63cdf88943fcfaf2e760a687ad19f3a1ae1fc7eb2328c0821c71322ae2f6582070757ec97f9d5790157d36a SHA512 8c7e17d1ccbbf020605b0a367c85eb6e9dac95c90786ff646dcd9687aaf14f1d4de3a1dc7b739057e5a92dfff9846c4daefd79b1c1de99cd46469cb6cc33b2bc
 EBUILD selinux-smartmon-2.20180114-r1.ebuild 286 BLAKE2B 5d5c2bd964bb8446e16ff837f374431093bceaed809a131b0ee29328a92c9b2b1600e548092cb3edd0c0fe969dfa80da8ce531557678eca71856248a5e8ec16c SHA512 4f6bd806f0e4300166bdb7c42b09c679d0a7d5c85b85f79a4b41bec5920cdb06043390963d323e6097ec0c025ea56d6c9fd8b406f47717c516237be00dd15f69
-EBUILD selinux-smartmon-9999.ebuild 288 BLAKE2B 3a8cc58b76ad65e9e1dd340c9d3c060d183a2b9ca63cdf88943fcfaf2e760a687ad19f3a1ae1fc7eb2328c0821c71322ae2f6582070757ec97f9d5790157d36a SHA512 8c7e17d1ccbbf020605b0a367c85eb6e9dac95c90786ff646dcd9687aaf14f1d4de3a1dc7b739057e5a92dfff9846c4daefd79b1c1de99cd46469cb6cc33b2bc
+EBUILD selinux-smartmon-2.20180114-r2.ebuild 288 BLAKE2B fb04b2865227efd2fccca64b6fa2b3547729446b37fa75fd67b432eabda60efddca79d666965d4aebf3e8ddafb272ab6e98ce6750b8768deb31a66fa7964a652 SHA512 9b0129f60520fd135714aa8943473883e5a86b06117cb84a2f498b808e2589efcae0655880d701b8e50dd0e23820159ece4e6d2f04d23854ec3b6e6b125effc6
+EBUILD selinux-smartmon-9999.ebuild 288 BLAKE2B fb04b2865227efd2fccca64b6fa2b3547729446b37fa75fd67b432eabda60efddca79d666965d4aebf3e8ddafb272ab6e98ce6750b8768deb31a66fa7964a652 SHA512 9b0129f60520fd135714aa8943473883e5a86b06117cb84a2f498b808e2589efcae0655880d701b8e50dd0e23820159ece4e6d2f04d23854ec3b6e6b125effc6
 MISC metadata.xml 318 BLAKE2B f431a7c8290a07e455ec0be6e5b1e8d7427fefd7d0eaefc226ac899288d71e4d39023f912b3260ea398c2e4fa6e03f6b789129568403dbed8dd8a3ebdcbf6d66 SHA512 918ce5bfdccbef2cdb0580bd1e60fa164dfe2b64d08ae080b48b311f777d2b4c14c6a5b19e826789a07febd52820bb4cfc42927317770b766908ae347e6ed71f
diff --git a/sec-policy/selinux-smartmon/selinux-smartmon-2.20180114-r2.ebuild b/sec-policy/selinux-smartmon/selinux-smartmon-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..bda18992ab22
--- /dev/null
+++ b/sec-policy/selinux-smartmon/selinux-smartmon-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 af2f50224de2..bda18992ab22 100644
--- a/sec-policy/selinux-smartmon/selinux-smartmon-9999.ebuild
+++ b/sec-policy/selinux-smartmon/selinux-smartmon-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-smokeping/Manifest b/sec-policy/selinux-smokeping/Manifest
index 0092768b3467..6309bfb3d928 100644
--- a/sec-policy/selinux-smokeping/Manifest
+++ b/sec-policy/selinux-smokeping/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-smokeping-2.20170805-r2.ebuild 384 BLAKE2B 0e6e77059d26be672dc5fd
 EBUILD selinux-smokeping-2.20170805-r3.ebuild 384 BLAKE2B 0e6e77059d26be672dc5fd86c7d236594f16c8aee3ed7c32b5744e75fab2a48e2d830fbf2c1541b39a3d6aaf0d63e2f4ea321271e1025a016284b4c97c16050c SHA512 ca622eda29aa909de146d6b769d33ee24f47d2882aa3fad05f80e0f1c0bbc4073afa8be229b85ded73e2990ae70285db5a86ff4d4ab3edfc84409f03093d73f3
 EBUILD selinux-smokeping-2.20170805-r4.ebuild 386 BLAKE2B 90eb6f40ae09217a420b66f6a2325053b9475c5e86c7591c4acf9f5307a108369811455f5e01eacec943484f90b628cc73e177612fec2a764ab89438029e6bbf SHA512 abc32b15254f34582a33f221d2e0a348dbbea0272a4a7bb222bd6ffcc2e8f660b9c0c05b084899e989546183e64629c5d4eb29ba83ba1bf4cd049275ded886d5
 EBUILD selinux-smokeping-2.20180114-r1.ebuild 384 BLAKE2B e8af79ac9fc79c49f837d28777518be4861fd1415a96705fc8d4e1a6384a1dc89eed3870e36388ea7871308ee9f036a4d34c26d25b9787951279e6fedb170936 SHA512 7d728f25328bc23b7f0a0ba25466a824df1d9f57c05ffc2f4480bef7ef417dbea7d9f0cf3b24362942e639747d146cf76cf55891c0b8b21b27e68fc45469f8a7
-EBUILD selinux-smokeping-9999.ebuild 386 BLAKE2B 90eb6f40ae09217a420b66f6a2325053b9475c5e86c7591c4acf9f5307a108369811455f5e01eacec943484f90b628cc73e177612fec2a764ab89438029e6bbf SHA512 abc32b15254f34582a33f221d2e0a348dbbea0272a4a7bb222bd6ffcc2e8f660b9c0c05b084899e989546183e64629c5d4eb29ba83ba1bf4cd049275ded886d5
+EBUILD selinux-smokeping-2.20180114-r2.ebuild 386 BLAKE2B 4fb7a6321172bae15450a494b7d2356f3be87d0e8a65b3b8683d8d1f07b33e15b56b8e0b7d9473e2b2b7553d2462f33c5fda8036a912f9e1f9a8011fac9d9d1e SHA512 5b33fc3d4ee6ea7128a1e1f7f40b95d35590935a7514c6a6d2b4a6678dd7ff14725ec68ceb6401e675e723fb4a9533f2f8fe42c31b7634cbc2a553fa72d92eab
+EBUILD selinux-smokeping-9999.ebuild 386 BLAKE2B 4fb7a6321172bae15450a494b7d2356f3be87d0e8a65b3b8683d8d1f07b33e15b56b8e0b7d9473e2b2b7553d2462f33c5fda8036a912f9e1f9a8011fac9d9d1e SHA512 5b33fc3d4ee6ea7128a1e1f7f40b95d35590935a7514c6a6d2b4a6678dd7ff14725ec68ceb6401e675e723fb4a9533f2f8fe42c31b7634cbc2a553fa72d92eab
 MISC metadata.xml 319 BLAKE2B f64021cb4ab298dc7a704b55c81ac1bd119aebd97cd69e38444773e06ce510e318cc6f5a513f4f63d0f79fefd956a83c6b005cbf2c1727c6d9c77e113995a63c SHA512 d4db53e2c965a838139c9aafbc227a9b9378c674d074392ff08e2dea5247e7bb7fa912312f12a14cf534faf48e27b182f477694a5ad2d96f5322f2ed2404e83f
diff --git a/sec-policy/selinux-smokeping/selinux-smokeping-2.20180114-r2.ebuild b/sec-policy/selinux-smokeping/selinux-smokeping-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..764fbe3b4119
--- /dev/null
+++ b/sec-policy/selinux-smokeping/selinux-smokeping-2.20180114-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 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 e8933368429b..764fbe3b4119 100644
--- a/sec-policy/selinux-smokeping/selinux-smokeping-9999.ebuild
+++ b/sec-policy/selinux-smokeping/selinux-smokeping-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-snmp/Manifest b/sec-policy/selinux-snmp/Manifest
index cf2cffdc0788..f13d2f371567 100644
--- a/sec-policy/selinux-snmp/Manifest
+++ b/sec-policy/selinux-snmp/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-snmp-2.20170805-r2.ebuild 278 BLAKE2B a69ae5c226a6fcd72676045c3e7
 EBUILD selinux-snmp-2.20170805-r3.ebuild 278 BLAKE2B a69ae5c226a6fcd72676045c3e7804ce993c88d0ef178301d9f09c40315d75994550421ba7a1342c6b305652dbc53db74e8df0fda063f36388aad255c3422255 SHA512 a0b8a7cab13372b9c62f5453bb7ebf580d0439a27743a89dbfde54f3420746628132a02fc91be93d2f0135c816a1d503809af5eb53259544861be671cb7c694a
 EBUILD selinux-snmp-2.20170805-r4.ebuild 280 BLAKE2B 92b4200c7e638364bc16d4c94399372c420b27a1c64facd1e10b0af7e0f7a12e8717c7225775f0b57214c9ed77ca7182abcf4c7fbe562dd12ea97ec8a00f5bbe SHA512 5d3731f8aa4c75c7e515e09a384aa66a37290c16b9ccf1f6476eac6368b058d3f1562a32cc5f8770e88a07035ea72976cf676d09fed54ca8a91ce29fc15d919d
 EBUILD selinux-snmp-2.20180114-r1.ebuild 278 BLAKE2B d200a6507021fd775b95621973149028e4af6f2ef8d3e791acc56ee1de9fdec579a3e2adc95ee275052990f52ba17873f48e7b5efa25fefa268966fa74e325e8 SHA512 3bd3b80bc471f2c94f4d4013ce81d3dee33f644c5351cd55aeeb1ef10405253c8362b5cefa54cd1d41719c1e5250b6e8905051c3c5660440740fbbd261525869
-EBUILD selinux-snmp-9999.ebuild 280 BLAKE2B 92b4200c7e638364bc16d4c94399372c420b27a1c64facd1e10b0af7e0f7a12e8717c7225775f0b57214c9ed77ca7182abcf4c7fbe562dd12ea97ec8a00f5bbe SHA512 5d3731f8aa4c75c7e515e09a384aa66a37290c16b9ccf1f6476eac6368b058d3f1562a32cc5f8770e88a07035ea72976cf676d09fed54ca8a91ce29fc15d919d
+EBUILD selinux-snmp-2.20180114-r2.ebuild 280 BLAKE2B fdc1de3c130acb2ad327bc60f0a8fae76bdf581df0f8dcf676fd7eebd42093ebe3ea8909260e394d80396187cecf9ad886f336ec9e78bb5864c35874ea3093d4 SHA512 f276e9097ecdd94929cee8bbd6710b73658f6af77a6b2fad70c752187bef51a8ec01399152043dc6e2b1224e3947a18cd85ad180b3abae3bc2ee035cb062d934
+EBUILD selinux-snmp-9999.ebuild 280 BLAKE2B fdc1de3c130acb2ad327bc60f0a8fae76bdf581df0f8dcf676fd7eebd42093ebe3ea8909260e394d80396187cecf9ad886f336ec9e78bb5864c35874ea3093d4 SHA512 f276e9097ecdd94929cee8bbd6710b73658f6af77a6b2fad70c752187bef51a8ec01399152043dc6e2b1224e3947a18cd85ad180b3abae3bc2ee035cb062d934
 MISC metadata.xml 314 BLAKE2B e3dedb894a12e1456e6e7de952e75ebbaa721995b7dd46320002488595c2bc26f4155184ad83b8c127a2f74859cf925107143fa53c362740228e9483dda9b0d2 SHA512 59b89808ea75eb3191a556a44d3be23f5d2f884cb0a195e3626bd11d03f0972d7a53bd15a509c8fb426f89a09e72a5485c6c12938dfe173a1f2e05dc999baee2
diff --git a/sec-policy/selinux-snmp/selinux-snmp-2.20180114-r2.ebuild b/sec-policy/selinux-snmp/selinux-snmp-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..432be580324f
--- /dev/null
+++ b/sec-policy/selinux-snmp/selinux-snmp-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 b53a3244ca41..432be580324f 100644
--- a/sec-policy/selinux-snmp/selinux-snmp-9999.ebuild
+++ b/sec-policy/selinux-snmp/selinux-snmp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-snort/Manifest b/sec-policy/selinux-snort/Manifest
index fdea57917f88..26cb0e42ed73 100644
--- a/sec-policy/selinux-snort/Manifest
+++ b/sec-policy/selinux-snort/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-snort-2.20170805-r2.ebuild 280 BLAKE2B 4cbed7c6632896781291cf3453
 EBUILD selinux-snort-2.20170805-r3.ebuild 280 BLAKE2B 4cbed7c6632896781291cf3453e1d119c51af2615aac87284a098eb2f3fae412e86cb27ff5a3598f4d5e321cf2afbc6d3b6f508dc53e80c5869cf02e31b0beee SHA512 f75d8e6fcaaef22865bd3ae19316c3f6afee07939d7e7f732879a946aecf6cc1ad016d0f40077c936d19ed26b0d4969443206537cffaa1cdc129c96771baa84f
 EBUILD selinux-snort-2.20170805-r4.ebuild 282 BLAKE2B a7b1eb50f01d4145dadb096d3c44de956d2e1d7abf59eaff781914fb0a45fe8cd10753a4ca96b284542664f650298565a125e8f540d64c30e1b97451ee78a28b SHA512 afc26103653cc637cd2274e11f75c6c18b3f4b9f8486783dd570d7833a1ca50095ed25538311e78f6945c5dd7b49601e205004dd888b49859d56cd022495d8bb
 EBUILD selinux-snort-2.20180114-r1.ebuild 280 BLAKE2B 9db715c0582bbff42aea446a5269e6fe35d710c0f55f0d9ba25956c75ae09749e873f0d0c45ff968149ed275e159229a7ca4bab6c66dea5702dc050f753ec5fb SHA512 bac1d40c6f096ee528f191b5b6a4314e8f4d1f4a334fd11fa3293f0496b363c6f16727cfa6bf2c8bb461f15915e744b4d6a433c24ef73e80498b564e9a1c5bab
-EBUILD selinux-snort-9999.ebuild 282 BLAKE2B a7b1eb50f01d4145dadb096d3c44de956d2e1d7abf59eaff781914fb0a45fe8cd10753a4ca96b284542664f650298565a125e8f540d64c30e1b97451ee78a28b SHA512 afc26103653cc637cd2274e11f75c6c18b3f4b9f8486783dd570d7833a1ca50095ed25538311e78f6945c5dd7b49601e205004dd888b49859d56cd022495d8bb
+EBUILD selinux-snort-2.20180114-r2.ebuild 282 BLAKE2B 3e7c5fd40314b1c5a5c5af2fbe27d5e6cfd81b055485dc937cff89a7cf246e44890c13b497309c54a841e3c0a67e18bd3c5666b26cd455e7bfdec884ba09b5c5 SHA512 4939c66daad5edb6104582021f6f6628912eb91c710b66b2b2c76522ca7b4b3fd41426c8c118380cbb4cba35e3b1ebcd609b62076d80620b29bae01f0e87cc2b
+EBUILD selinux-snort-9999.ebuild 282 BLAKE2B 3e7c5fd40314b1c5a5c5af2fbe27d5e6cfd81b055485dc937cff89a7cf246e44890c13b497309c54a841e3c0a67e18bd3c5666b26cd455e7bfdec884ba09b5c5 SHA512 4939c66daad5edb6104582021f6f6628912eb91c710b66b2b2c76522ca7b4b3fd41426c8c118380cbb4cba35e3b1ebcd609b62076d80620b29bae01f0e87cc2b
 MISC metadata.xml 315 BLAKE2B f39f4978caccc6f70806683fe33bf2383e5e523a5041adc7e63b07059ab7e41e5b442fedf617772030989d5f12bad5abba537ec0ae002bc9e0f8124bb63ce083 SHA512 84eaf9d6b3a721099ebb825ffb0efb1d5bb4b17b5e8181cdd6bd59028047f6458b3444c5fd2ec970f848de4b6c5d03b8242cadf3d7c99918bb1f09babbdfcdc8
diff --git a/sec-policy/selinux-snort/selinux-snort-2.20180114-r2.ebuild b/sec-policy/selinux-snort/selinux-snort-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..2a79291258ea
--- /dev/null
+++ b/sec-policy/selinux-snort/selinux-snort-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 d0581e4cfde6..2a79291258ea 100644
--- a/sec-policy/selinux-snort/selinux-snort-9999.ebuild
+++ b/sec-policy/selinux-snort/selinux-snort-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-soundserver/Manifest b/sec-policy/selinux-soundserver/Manifest
index fed441faba2a..f35d58e47e1b 100644
--- a/sec-policy/selinux-soundserver/Manifest
+++ b/sec-policy/selinux-soundserver/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-soundserver-2.20170805-r2.ebuild 292 BLAKE2B 1d40b25395568208dffe
 EBUILD selinux-soundserver-2.20170805-r3.ebuild 292 BLAKE2B 1d40b25395568208dffed067110776a4e0effd66e129d9a884fb8772cf5decec2d09ba4dff127c02aacd691d917e7f50569d30036194226ad3d7c94deb938e88 SHA512 00f90a83f857c29cbf0a2d56b84edc4390a0576a7ddeb9e4b8c3775e2a2be076cbeb113cfedafc7d840866ae691248759b7ae91fbabb6091e1bf6b5e8197d5a1
 EBUILD selinux-soundserver-2.20170805-r4.ebuild 294 BLAKE2B 49708abb613e69f2a0e9f7bbde4e8231310d4c858dd023c1dddf2b5f2d314c525e29a3306ad12c34de66ebe151538a4b764ca0627694f9718d272341d2231e8b SHA512 8e5e82c447ac33e73257a73640e2d7ce4f267b105bc80027ae711eebe97c3c1610d0fe706e0a994001ce97dd15d1eeca537e2f24e32e312d261de18f02e0e66b
 EBUILD selinux-soundserver-2.20180114-r1.ebuild 292 BLAKE2B bf9ba45689e490182a562f85137590fa8b67beb44872af0f626a2b3587bf0021e3bea653cb6915c576eb35bfeb37c3ea2a2e8dd8aa9498abea02f7e745709f9d SHA512 6bb3c7d1e7d28e63927a6f92f8a2bac369312fc8de6a46660ac0a35292c4be8ccc5d733d91dae62794737f1d1233dd79da79a35db2bf2f61209e862f03fece17
-EBUILD selinux-soundserver-9999.ebuild 294 BLAKE2B 49708abb613e69f2a0e9f7bbde4e8231310d4c858dd023c1dddf2b5f2d314c525e29a3306ad12c34de66ebe151538a4b764ca0627694f9718d272341d2231e8b SHA512 8e5e82c447ac33e73257a73640e2d7ce4f267b105bc80027ae711eebe97c3c1610d0fe706e0a994001ce97dd15d1eeca537e2f24e32e312d261de18f02e0e66b
+EBUILD selinux-soundserver-2.20180114-r2.ebuild 294 BLAKE2B 89fb2e760276a729fc0f90956f05dbe69539876fa85e91a63001d84628147e6077cb93b8b4ea5a08e9d938a462fbdeb802b9b895cdb2c1a4e96571c60c8daebb SHA512 7d20be067ca82a2e6273756c93ee2ffd927fca285b921759d5112dc232fffde49804cfa081c9821b3f36f707f8802148fc330e3cc3da87ad7ef608e9fb87c662
+EBUILD selinux-soundserver-9999.ebuild 294 BLAKE2B 89fb2e760276a729fc0f90956f05dbe69539876fa85e91a63001d84628147e6077cb93b8b4ea5a08e9d938a462fbdeb802b9b895cdb2c1a4e96571c60c8daebb SHA512 7d20be067ca82a2e6273756c93ee2ffd927fca285b921759d5112dc232fffde49804cfa081c9821b3f36f707f8802148fc330e3cc3da87ad7ef608e9fb87c662
 MISC metadata.xml 321 BLAKE2B 9bfdd274709d25944554b345f60312535acea154d2aba88c784c9c974f7e2a752b2f828b4a8cbadc95f569d09beb6846d669e8cfb3bb4d992dee2f4fcb15c7f0 SHA512 b9da9a501ff24e1b78750de04a1611143d7ef73e228018cd676cbc2d92624191acbe8b97fe640111184dd5460b7944f4f690994b8aceb64cb6ded5e418d87da7
diff --git a/sec-policy/selinux-soundserver/selinux-soundserver-2.20180114-r2.ebuild b/sec-policy/selinux-soundserver/selinux-soundserver-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..2ff6085dc186
--- /dev/null
+++ b/sec-policy/selinux-soundserver/selinux-soundserver-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 b71c67387f96..2ff6085dc186 100644
--- a/sec-policy/selinux-soundserver/selinux-soundserver-9999.ebuild
+++ b/sec-policy/selinux-soundserver/selinux-soundserver-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-spamassassin/Manifest b/sec-policy/selinux-spamassassin/Manifest
index be8274d25971..9ba82cec1dd0 100644
--- a/sec-policy/selinux-spamassassin/Manifest
+++ b/sec-policy/selinux-spamassassin/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-spamassassin-2.20170805-r2.ebuild 294 BLAKE2B 39b2ba39d1c50e7ef62
 EBUILD selinux-spamassassin-2.20170805-r3.ebuild 294 BLAKE2B 39b2ba39d1c50e7ef62ce7b86f9c88f82d45e6037caf65a33b999700884c3e50ba980e1026e5bdff30fe7ddfa3ffb7849273dabfa8e89d7d80151ee80d17c173 SHA512 3f8ee61539a1c9cd22e2a41f2185c53b0243f118697ab22a56857af22035ea925810e04eb4557724181a490bec7e1c0b00824eb48259fdc4289ada7e168ef5ad
 EBUILD selinux-spamassassin-2.20170805-r4.ebuild 296 BLAKE2B 0182c93de87b40770c32f01b7ee96593bc9ad25742489134c535e87e82c286bd688b250d430368a0a38172e27735e281e91f47ab626f3c9c256cb3fc3c31244e SHA512 511f8d4899c73226f32b049581e42a953628ca71e57f4c36c63d6fcfbfc87d2216c77d77430db6992cdafac84b2c0701fe1f9091d803004c7ea1fc3c179983c1
 EBUILD selinux-spamassassin-2.20180114-r1.ebuild 294 BLAKE2B 50c51c85763893ec673adb9ec074767830d4563b174cd3bba6bcfba06662d211f1c77ecb4a94d4caf9b465e0069f50d9b7c0fc2d5a31c4d86217d016970b2641 SHA512 be97ccc40035e67ad39be6f218139e344f90e0f665a714f83e681a86da969dc53f3777a8ebefeceba897c2c35edaf633d76e121ee841c8a0054d0ab39cc84a8a
-EBUILD selinux-spamassassin-9999.ebuild 296 BLAKE2B 0182c93de87b40770c32f01b7ee96593bc9ad25742489134c535e87e82c286bd688b250d430368a0a38172e27735e281e91f47ab626f3c9c256cb3fc3c31244e SHA512 511f8d4899c73226f32b049581e42a953628ca71e57f4c36c63d6fcfbfc87d2216c77d77430db6992cdafac84b2c0701fe1f9091d803004c7ea1fc3c179983c1
+EBUILD selinux-spamassassin-2.20180114-r2.ebuild 296 BLAKE2B 0adc2b5ac7277839776df66bcafc6b5d323c1eecee8c7147385864f4e8d2b76808e07a5ca66c03a84d6af2f1b8ce0d185e6bc2fe2b242cc0f6c5f2de8c9bcefd SHA512 abdf74bf6c3e288386658a9736c5ee51bed1f4a49c4f8b930d7495d787daab9629cc60ace2a6f981a54aa28cb63b4f33843252a892da309cd1ee05e43b44f375
+EBUILD selinux-spamassassin-9999.ebuild 296 BLAKE2B 0adc2b5ac7277839776df66bcafc6b5d323c1eecee8c7147385864f4e8d2b76808e07a5ca66c03a84d6af2f1b8ce0d185e6bc2fe2b242cc0f6c5f2de8c9bcefd SHA512 abdf74bf6c3e288386658a9736c5ee51bed1f4a49c4f8b930d7495d787daab9629cc60ace2a6f981a54aa28cb63b4f33843252a892da309cd1ee05e43b44f375
 MISC metadata.xml 322 BLAKE2B 3b45dfb6f0b204b42d1854faefd6a817d4f6433d5ce76b10838ad703dbc4ea86af21a23bbbaffdb61bffd7c41c8c1031afeb6315b3c3e06c155554fbe43d7389 SHA512 345132094265e24dad21ecc976e75750a363d6773ef83fd63c53ea744b8d3afcd9504d1e63f6758ed54e85cb8e3461e65dfb72bc67f5a63c21c50d9e71dc90ef
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20180114-r2.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..909e42792205
--- /dev/null
+++ b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 bcd8854a85b4..909e42792205 100644
--- a/sec-policy/selinux-spamassassin/selinux-spamassassin-9999.ebuild
+++ b/sec-policy/selinux-spamassassin/selinux-spamassassin-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-speedtouch/Manifest b/sec-policy/selinux-speedtouch/Manifest
index 9295dce10fc1..d5ec863e400a 100644
--- a/sec-policy/selinux-speedtouch/Manifest
+++ b/sec-policy/selinux-speedtouch/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-speedtouch-2.20170805-r2.ebuild 290 BLAKE2B 323eae427def731199667
 EBUILD selinux-speedtouch-2.20170805-r3.ebuild 290 BLAKE2B 323eae427def731199667ada640e7d03b15ef500522cb5c25a97691507cbf5c8a4b5397937c7c39d0480820b9e6cc9818d0d6d8e0db942d9a5bed2b037aac049 SHA512 60fe13ba6eb98bd179e301fde358c0207a8a4c21bf12f5458ba77bb2b059fe25ecc7de27ee18f2140a5b12aa6977ac1706768a6c0fb6dad04027bc3904a09d4a
 EBUILD selinux-speedtouch-2.20170805-r4.ebuild 292 BLAKE2B 74989873001b78ed00119e35475864884c41eff838c51170b9bb35b2bd5ebbc5b155d00deead16855587ba9c38a64d0022024270d90b0e74bd6dcf5e4c607562 SHA512 6137f4e95ed00fc55f45982fc921a847020e022f48340a42438e04e1a5c1705de4755ca290247083ea7e5e365e5ca42eb43a2b2bcb22dc3b4471d38fbd5f8baa
 EBUILD selinux-speedtouch-2.20180114-r1.ebuild 290 BLAKE2B 41812b000437cb50d45f86a05bfe43f251c9493304c1ec59557afbc4c0b4ee97e1c75b2bd7a50c92a851e32bbb7537416489cbe067757c96abe02866170cfc10 SHA512 6250e84a640e4cc3042ef42f9b5436ea8e5f0e29c084daacd85cc5f41acf2be4e2bd25b355a07a01c0243cb6aeb097108aeb37d213418329838c5864f2f84cac
-EBUILD selinux-speedtouch-9999.ebuild 292 BLAKE2B 74989873001b78ed00119e35475864884c41eff838c51170b9bb35b2bd5ebbc5b155d00deead16855587ba9c38a64d0022024270d90b0e74bd6dcf5e4c607562 SHA512 6137f4e95ed00fc55f45982fc921a847020e022f48340a42438e04e1a5c1705de4755ca290247083ea7e5e365e5ca42eb43a2b2bcb22dc3b4471d38fbd5f8baa
+EBUILD selinux-speedtouch-2.20180114-r2.ebuild 292 BLAKE2B f4a23b71c2311427d68e1ac946d80ccb1f12d888066d3e50f1ab43460b775f3a390e0e00ede50c6e1fb46691b1ad4f9c05638190f97aae33187f5f102f8aace7 SHA512 d92cfa1d0c8f557f7aed34c39cc0e15c74f304516f72285f36bcb0f24ffe5e3ad37123c19ed837b0e1cca5c9f673830afc4b08d4f4e8a6dbe1b27ec0bbeabf3e
+EBUILD selinux-speedtouch-9999.ebuild 292 BLAKE2B f4a23b71c2311427d68e1ac946d80ccb1f12d888066d3e50f1ab43460b775f3a390e0e00ede50c6e1fb46691b1ad4f9c05638190f97aae33187f5f102f8aace7 SHA512 d92cfa1d0c8f557f7aed34c39cc0e15c74f304516f72285f36bcb0f24ffe5e3ad37123c19ed837b0e1cca5c9f673830afc4b08d4f4e8a6dbe1b27ec0bbeabf3e
 MISC metadata.xml 320 BLAKE2B 34a59dc2b37e67afb4cab2ad95cf3319232f1857e85aae35ce641a22e5ec62cadea9e07725445f9185cc78e90d36b98cd864240f739372d6051bfb54bcb90094 SHA512 ef55a786bf5aa65e1bba7df8f14e019fb4f18ae58eddc64b46bdf9b0cf39ba4fde9171ee436fb5264556038d3ae464df4adbd65ca3c3213fb3925dd8e5635c96
diff --git a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20180114-r2.ebuild b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..c9c31f9b77ac
--- /dev/null
+++ b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 09634f1a006f..c9c31f9b77ac 100644
--- a/sec-policy/selinux-speedtouch/selinux-speedtouch-9999.ebuild
+++ b/sec-policy/selinux-speedtouch/selinux-speedtouch-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-squid/Manifest b/sec-policy/selinux-squid/Manifest
index f9b53ce5e9f3..994cc7a1990e 100644
--- a/sec-policy/selinux-squid/Manifest
+++ b/sec-policy/selinux-squid/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-squid-2.20170805-r2.ebuild 376 BLAKE2B 544f7a7439783901991da68058
 EBUILD selinux-squid-2.20170805-r3.ebuild 376 BLAKE2B 544f7a7439783901991da68058f8cd4d632ceb6bbd88af3696f8e3c2dc7acbd4673a8bf2dbfb9ff8c5718f3e6289d954d1cb222605d3a867cfa30576a90d2a88 SHA512 5ea60594ace42fbf8d489adc05d35078a2b7d7c49c59e0372fdf2a2337c6adf813f968b8fe098f99af43aee7b5d80708859b8e735fec52b4b57b60e3ca5d1064
 EBUILD selinux-squid-2.20170805-r4.ebuild 378 BLAKE2B ea3b14d0acc695538447cdc26dd6b75ca82305b2f7c009fc1f1aa7b6bc5e6e1a5bf538de42a94c210ffd02ba86918d31c3feb67671e7b6f62221c8b04446ec2a SHA512 256465bd4c929af1d39de325c8be1ad2940ce99020e9b4270aca4308715773ddd3b2ea9c0d348bf5eec60e18ef3b3613bc790335135127fbea2d33bc8c99dcd4
 EBUILD selinux-squid-2.20180114-r1.ebuild 376 BLAKE2B ad42454befe5ca67e0c57ba676728cd5980162aeb779b9ca4f8539cdc00480886321084bb1448113210c9bddae8bad011f5241914aea8245f7328d6c9ca0083e SHA512 27a186e36208c45f23ce6de9b747ffd78d00ba1494414519c1a2cccb284d5cce9b0170b9cbbac209ff28486e7e5d315fe75c6c73086a52fdb723428dfb1403a5
-EBUILD selinux-squid-9999.ebuild 378 BLAKE2B ea3b14d0acc695538447cdc26dd6b75ca82305b2f7c009fc1f1aa7b6bc5e6e1a5bf538de42a94c210ffd02ba86918d31c3feb67671e7b6f62221c8b04446ec2a SHA512 256465bd4c929af1d39de325c8be1ad2940ce99020e9b4270aca4308715773ddd3b2ea9c0d348bf5eec60e18ef3b3613bc790335135127fbea2d33bc8c99dcd4
+EBUILD selinux-squid-2.20180114-r2.ebuild 378 BLAKE2B b7e5cc385a14d431e42c34f7f37c73ced8cd32ecf8715635812a3b43d864d3f913bd32fd350c51a48c7f0151efff88ec085e27fd9caec3826ec9e6a719b79d3d SHA512 8e5db7995e80e9ed63418ee90124ac63194b3a667b661576479887b604d184c44cc4b6ca85213192ad561a2de61b3851f718043f7d77eeb2d633228376fec4d9
+EBUILD selinux-squid-9999.ebuild 378 BLAKE2B b7e5cc385a14d431e42c34f7f37c73ced8cd32ecf8715635812a3b43d864d3f913bd32fd350c51a48c7f0151efff88ec085e27fd9caec3826ec9e6a719b79d3d SHA512 8e5db7995e80e9ed63418ee90124ac63194b3a667b661576479887b604d184c44cc4b6ca85213192ad561a2de61b3851f718043f7d77eeb2d633228376fec4d9
 MISC metadata.xml 315 BLAKE2B 73d453753c413703df9d5b137710f031f520258d26efcdf9076ae128573efae6fc54210fb815a446015c1046c454b485476bfe912c8fbdec163965ecb22f6796 SHA512 0742eacb66c8dcaa556ca6bdc0d55789c28d5f776b065340d6f72eea41ddbd1ac34fa4d5257a11cd970e23c42b4ed36b556838d619b70b8fa78d854bfc82396d
diff --git a/sec-policy/selinux-squid/selinux-squid-2.20180114-r2.ebuild b/sec-policy/selinux-squid/selinux-squid-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..21f8d9686c17
--- /dev/null
+++ b/sec-policy/selinux-squid/selinux-squid-2.20180114-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 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 d1355ec6f9bc..21f8d9686c17 100644
--- a/sec-policy/selinux-squid/selinux-squid-9999.ebuild
+++ b/sec-policy/selinux-squid/selinux-squid-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-sssd/Manifest b/sec-policy/selinux-sssd/Manifest
index 4707725178c6..b3d13893a105 100644
--- a/sec-policy/selinux-sssd/Manifest
+++ b/sec-policy/selinux-sssd/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-sssd-2.20170805-r2.ebuild 278 BLAKE2B 8dcbad8cf3579d503f9c1e06f7e
 EBUILD selinux-sssd-2.20170805-r3.ebuild 278 BLAKE2B 8dcbad8cf3579d503f9c1e06f7e97286ee8bfc05166f1cdc65aea7e4804ff51a88f4e8edc4dfadc43b97c4ecde207ae28ef7f807af3291652591ad118ff65646 SHA512 4c97e4fc94cd8be73332ab0e91777f906fc076a3ba6c800f6d35261e38cb656987e806dfb91832eaf7dbadec066bec238236757eb2553e8726423267a81b1f0f
 EBUILD selinux-sssd-2.20170805-r4.ebuild 280 BLAKE2B b2bcccbf3c096ac24a472b02ce6fb927dfd8cdabeac1fc2dc0565b4f1ac37d4c7bf9961172683b93bc2e134a59be882a913ce31636728dd30cb742b88c38baab SHA512 c93d51c97b4a02188736100bf2e7a84b113ee8f50a62fb915c5c81a4b34a7d00e37c9cae7f9c3e7b056492184595c8d4c4ab942df32c9f990a0f848035128799
 EBUILD selinux-sssd-2.20180114-r1.ebuild 278 BLAKE2B c92e17b1905a1fbeaa97c1f4024ee7a762111f7c128abfd9c79da42ec84eaf8d7d35f19b46ac84f82f596e8347d4202fba98c001d2605cbc3e2df9908a029ce9 SHA512 71f83205f2d49cd43518397eb0182b79837c416a8160ef3abb1d9df46bfd89a231bc537e0d59e860fffafea4b85f42b5a91e1d7cb306d62981dd417d42d0d2bf
-EBUILD selinux-sssd-9999.ebuild 280 BLAKE2B b2bcccbf3c096ac24a472b02ce6fb927dfd8cdabeac1fc2dc0565b4f1ac37d4c7bf9961172683b93bc2e134a59be882a913ce31636728dd30cb742b88c38baab SHA512 c93d51c97b4a02188736100bf2e7a84b113ee8f50a62fb915c5c81a4b34a7d00e37c9cae7f9c3e7b056492184595c8d4c4ab942df32c9f990a0f848035128799
+EBUILD selinux-sssd-2.20180114-r2.ebuild 280 BLAKE2B 5cb9d618f648f664f94fd81b0c28eccafd9a106d202e425612503d2969aae6f8eb4da80befaf19b336e53a05366097c6755117e432de95286b63329b1738e494 SHA512 f7ca2e7313587c7b7ed0c87094d0da8dc2aedad3a366d2491bd45af5200807a1556ccfcfd0b2ce173d9b909502fca0489ce0cc78bb79fdb63c4649086efd5cac
+EBUILD selinux-sssd-9999.ebuild 280 BLAKE2B 5cb9d618f648f664f94fd81b0c28eccafd9a106d202e425612503d2969aae6f8eb4da80befaf19b336e53a05366097c6755117e432de95286b63329b1738e494 SHA512 f7ca2e7313587c7b7ed0c87094d0da8dc2aedad3a366d2491bd45af5200807a1556ccfcfd0b2ce173d9b909502fca0489ce0cc78bb79fdb63c4649086efd5cac
 MISC metadata.xml 314 BLAKE2B 0ce46de60572d5bc06a9c52cefaccd4bae559c48cbbf48237c71b59812367913916fd358730e0c9d18f39dacc9d7984d8adc69f5fa7c289229a12ea8d664ff0e SHA512 850856c4a38b6056377fffad65b5987f74586928976b767366f7fa8380ee67eb24c176defc0b4936b7a346256fc2575e938a689f972a6adbcad85be2900ff6d4
diff --git a/sec-policy/selinux-sssd/selinux-sssd-2.20180114-r2.ebuild b/sec-policy/selinux-sssd/selinux-sssd-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..ba214289acee
--- /dev/null
+++ b/sec-policy/selinux-sssd/selinux-sssd-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 682823541841..ba214289acee 100644
--- a/sec-policy/selinux-sssd/selinux-sssd-9999.ebuild
+++ b/sec-policy/selinux-sssd/selinux-sssd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-stunnel/Manifest b/sec-policy/selinux-stunnel/Manifest
index 6a838c2b8253..8f75314156bf 100644
--- a/sec-policy/selinux-stunnel/Manifest
+++ b/sec-policy/selinux-stunnel/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-stunnel-2.20170805-r2.ebuild 284 BLAKE2B 2e55d8674c878b2929f9699a
 EBUILD selinux-stunnel-2.20170805-r3.ebuild 284 BLAKE2B 2e55d8674c878b2929f9699a0eaae8d2314799c60f8ebaecb2ee69181d979b151009a2fba2cc3a76df2ace1d87bc033f81f4392eda2c77ae512fb4195e49e176 SHA512 2950c1064ed62e34b7800a6ab13df0dcc08613e1de0005daeaf57fe227ed20043bf182d19e30745a7fc448fcfbb93c2c31fcce967f72a8673575edb692828be5
 EBUILD selinux-stunnel-2.20170805-r4.ebuild 286 BLAKE2B 26a462e3cbeaca21cef173281347efa24a4f005a27048432403264b3a04a91dd69a5940616a3a7cf00410aee95d183166539659979b5fedda19977ff8650c066 SHA512 55926f8e6420d0df17ddc27474def1adb95a9b09e4b1499c9bd0c16f96232cc3cb904df579c458a2599fb161fd9ae3d9fedcc7d40bb8ea580d22e6ff7646a2c1
 EBUILD selinux-stunnel-2.20180114-r1.ebuild 284 BLAKE2B e1e106eb2afa0565f6ef00f3449b01c5ed0d3cd0510a5bacdc51414e1b79509a37333b97d29e766a2cb653616855aa83e8a3e0e0d65218c2c8db3791c664fb01 SHA512 ce2b9a4b4b19ebf96fd26246e3bda2bb2cf905f4bfd7e847d9572e96f392ec2a9042244e84e945c3f40970efbe44621d70a4b8b203626a06d9847cf2229502d0
-EBUILD selinux-stunnel-9999.ebuild 286 BLAKE2B 26a462e3cbeaca21cef173281347efa24a4f005a27048432403264b3a04a91dd69a5940616a3a7cf00410aee95d183166539659979b5fedda19977ff8650c066 SHA512 55926f8e6420d0df17ddc27474def1adb95a9b09e4b1499c9bd0c16f96232cc3cb904df579c458a2599fb161fd9ae3d9fedcc7d40bb8ea580d22e6ff7646a2c1
+EBUILD selinux-stunnel-2.20180114-r2.ebuild 286 BLAKE2B 6e7d1771c5d1e11b635497308a4c6d1e34763c6bb73a968194c905d3f1111bd503340ada8484100b8dcfc42f0cb150b36cc3bf2c99bb769990f5df8023bc675f SHA512 6f124f6c44fd5b3c2a7cd417d083f54abb561b7df84eca96368c877ac8ee0320210483c45e34199433a31340088bc68bfa89404a9a5e798b9a134ce7644468fc
+EBUILD selinux-stunnel-9999.ebuild 286 BLAKE2B 6e7d1771c5d1e11b635497308a4c6d1e34763c6bb73a968194c905d3f1111bd503340ada8484100b8dcfc42f0cb150b36cc3bf2c99bb769990f5df8023bc675f SHA512 6f124f6c44fd5b3c2a7cd417d083f54abb561b7df84eca96368c877ac8ee0320210483c45e34199433a31340088bc68bfa89404a9a5e798b9a134ce7644468fc
 MISC metadata.xml 317 BLAKE2B bf5e87f13017b76af0fba2e7cdc4723cc79907a563915448a9d079deadd4afec709dcb5700c9712298da4b912ed01440b19963eacfe053344865058a4640d463 SHA512 d9d1705ea1176d67de1ab424d18da867f135c5c385baea034322103ec6590bf34d38fc248205bde9aed697e367e2b4d529c039ca967663ddd0f30a3ed603a00e
diff --git a/sec-policy/selinux-stunnel/selinux-stunnel-2.20180114-r2.ebuild b/sec-policy/selinux-stunnel/selinux-stunnel-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..6d44c6fdbaad
--- /dev/null
+++ b/sec-policy/selinux-stunnel/selinux-stunnel-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 7547c9eb6f3e..6d44c6fdbaad 100644
--- a/sec-policy/selinux-stunnel/selinux-stunnel-9999.ebuild
+++ b/sec-policy/selinux-stunnel/selinux-stunnel-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-subsonic/Manifest b/sec-policy/selinux-subsonic/Manifest
index d024a4bfbfe3..e81a10d8d0bc 100644
--- a/sec-policy/selinux-subsonic/Manifest
+++ b/sec-policy/selinux-subsonic/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-subsonic-2.20170805-r2.ebuild 286 BLAKE2B 72caec7b69f9efd4b7cc40e
 EBUILD selinux-subsonic-2.20170805-r3.ebuild 286 BLAKE2B 72caec7b69f9efd4b7cc40e17fb42405bd3c7d70ae8de239cd1538f8a27d2eaaaff480ea9520d18c181b72faf93137bcfcae83f71dc13224ff4300981166fdad SHA512 76fa5d6934bc904ef2abaa91e3b1b72b4736aadc62a22a3152817f727e67676cb5932c53a11878bb06ec2fa2d076369029a9add1280ac31184766c68d5e09434
 EBUILD selinux-subsonic-2.20170805-r4.ebuild 288 BLAKE2B 0e5cbc563b757ef3a7407f4e07430690ac36351520ae71b1f26935d60c4c9685a2d172b03b04adf629268325414d5c0f95d30831e50f8a7d4ffb3d49dcc738b8 SHA512 a7e7982f371398ce8450a8be9cec93d36dc263320d852ab37d01d0db8c5e4787c7d6d27caf62b9b19a06859f47e3b8b255bbec4a16d641203994aac4660fa3c8
 EBUILD selinux-subsonic-2.20180114-r1.ebuild 286 BLAKE2B abf73054c1ac88e12d03c830627607be5f867789d636d3f285c8bc76d6af75dd5774c8ab98ee469b2c91104de6f19d4701ab7afbfaf657bb77a00a9e3fd556e3 SHA512 6a7cdcd7d9da7c44491186ae7e9b9d24e9f42e7990e7a09c793f472d8771154b083ec62dfbfb2c43657855951849eac0a1c64da33ba2d44147af51e5e67e08d8
-EBUILD selinux-subsonic-9999.ebuild 288 BLAKE2B 0e5cbc563b757ef3a7407f4e07430690ac36351520ae71b1f26935d60c4c9685a2d172b03b04adf629268325414d5c0f95d30831e50f8a7d4ffb3d49dcc738b8 SHA512 a7e7982f371398ce8450a8be9cec93d36dc263320d852ab37d01d0db8c5e4787c7d6d27caf62b9b19a06859f47e3b8b255bbec4a16d641203994aac4660fa3c8
+EBUILD selinux-subsonic-2.20180114-r2.ebuild 288 BLAKE2B 0deeeaafa3db256a979dddd65eaa35d905a40eb5c480c92b0c5c3ef5c5c4ae159d9276d6491b818a06988299786b765ded6e42f7131a231da415479d2c82c463 SHA512 449f5ae515587a3f1bbd359da3c63cdcf6f3dadbc0febd8ff32aecb0622e1133a225bccf57ade6f9e3f3b5b17389172061f178044539cd9df181bf55d1728133
+EBUILD selinux-subsonic-9999.ebuild 288 BLAKE2B 0deeeaafa3db256a979dddd65eaa35d905a40eb5c480c92b0c5c3ef5c5c4ae159d9276d6491b818a06988299786b765ded6e42f7131a231da415479d2c82c463 SHA512 449f5ae515587a3f1bbd359da3c63cdcf6f3dadbc0febd8ff32aecb0622e1133a225bccf57ade6f9e3f3b5b17389172061f178044539cd9df181bf55d1728133
 MISC metadata.xml 341 BLAKE2B 0a0fc876104016c1f6126056bab70ff8354571b39ef2defbcff7c7ff651abbd48244ba2ea7d40bf5f76aa550ae4873ee75adff58f7f379f73d86c70450b922ae SHA512 aea1601d2968cd582294b37bebb44b891131f4d4834a67c0f3adc8706a5fb4df4ba8d287db981896a1a0602c92ddfea4e76c001b2604f462de98433921dd4f09
diff --git a/sec-policy/selinux-subsonic/selinux-subsonic-2.20180114-r2.ebuild b/sec-policy/selinux-subsonic/selinux-subsonic-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..452f4a422fcd
--- /dev/null
+++ b/sec-policy/selinux-subsonic/selinux-subsonic-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 63b61085e5e5..452f4a422fcd 100644
--- a/sec-policy/selinux-subsonic/selinux-subsonic-9999.ebuild
+++ b/sec-policy/selinux-subsonic/selinux-subsonic-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-sudo/Manifest b/sec-policy/selinux-sudo/Manifest
index e531b8ca282f..dff8fc08b380 100644
--- a/sec-policy/selinux-sudo/Manifest
+++ b/sec-policy/selinux-sudo/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-sudo-2.20170805-r2.ebuild 278 BLAKE2B 8f39b00ae0e944e0994e7add0fb
 EBUILD selinux-sudo-2.20170805-r3.ebuild 278 BLAKE2B 8f39b00ae0e944e0994e7add0fbb3d4e73764e9317aae7590e6c235d127dc5399f0bd3ca4d7d74e2c706f513e456169589697615fc8e6007559a3288efc109f8 SHA512 5d05c1526e64158c9944d8a4c40355307267960d9a55a634f2a14caa539b7d1befd39448c9a547ebf3b404e16a7e5a0236b6b12e2238ba5e229786bdcec3cb12
 EBUILD selinux-sudo-2.20170805-r4.ebuild 280 BLAKE2B 8dbd61c4d0c2994225ee8ab24ec8ed324b92ee92c929a4498b8cc6b9006c2bc7d534a0071ba9212087a87d006a8a7b1f46a9c1ceb5186a3d39bbd72e3ab6e9dd SHA512 ea01fe9c8543d80ab8b153d1f1fc9e196e09483b2a7aed58edc84d559b6d41b737fee2bd9e652496dc119e87d8399a3deaae9f57e40b8eef4dbfd5700b111274
 EBUILD selinux-sudo-2.20180114-r1.ebuild 278 BLAKE2B 2b79ed822c01117b8574eb4fc381cb059a4d0bf56c5bff08056f90e7a4e301a8d9ce16781a8791a2a277da856bcfdc68bf1c2a6d0550cf977b618437dfc2790d SHA512 00c9d4e8f0cbf1980e69a3a803b56a39af20f69540dfdc30c0494e4af2ea289db28b70ba2000ac0c61e7b26e476fb316ff98e43aec8f6110370f10edb3e01356
-EBUILD selinux-sudo-9999.ebuild 280 BLAKE2B 8dbd61c4d0c2994225ee8ab24ec8ed324b92ee92c929a4498b8cc6b9006c2bc7d534a0071ba9212087a87d006a8a7b1f46a9c1ceb5186a3d39bbd72e3ab6e9dd SHA512 ea01fe9c8543d80ab8b153d1f1fc9e196e09483b2a7aed58edc84d559b6d41b737fee2bd9e652496dc119e87d8399a3deaae9f57e40b8eef4dbfd5700b111274
+EBUILD selinux-sudo-2.20180114-r2.ebuild 280 BLAKE2B fd217eec41d25001cf5b596e57da9a34cf08af28e3c902c9e8e0164bae7ded59b0a7fb5de2a1a730ce95673cc2b87ecbaa9c83c7f4eb2e8f9f35af79dffcf006 SHA512 6c7d1cf56357a71623cf5ac532e62768be49284e76410324cfd3bff4d1aef65a0cb41ca6be67020238708b2a20f6faa04c5495fd19c8aa147ab02f83fcf48458
+EBUILD selinux-sudo-9999.ebuild 280 BLAKE2B fd217eec41d25001cf5b596e57da9a34cf08af28e3c902c9e8e0164bae7ded59b0a7fb5de2a1a730ce95673cc2b87ecbaa9c83c7f4eb2e8f9f35af79dffcf006 SHA512 6c7d1cf56357a71623cf5ac532e62768be49284e76410324cfd3bff4d1aef65a0cb41ca6be67020238708b2a20f6faa04c5495fd19c8aa147ab02f83fcf48458
 MISC metadata.xml 314 BLAKE2B fa0d65ec12bf3e67b5f44eb7fcd861f83118a6546369b277d169262f48af9654c9da7f95b597eb84552a52bd049c9e18e44f65ce216e4305ddacf68e52045f18 SHA512 444deb961f20c878bf6c95a7bcdb8195b05616a6387d817f627920eeea4a982eb671990e9acf7fe8c4b2bb2d7f36a6d46ea5fde70a78fd5fcd9efe47d23f33a0
diff --git a/sec-policy/selinux-sudo/selinux-sudo-2.20180114-r2.ebuild b/sec-policy/selinux-sudo/selinux-sudo-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..f170453419a4
--- /dev/null
+++ b/sec-policy/selinux-sudo/selinux-sudo-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 6cd25b8657a4..f170453419a4 100644
--- a/sec-policy/selinux-sudo/selinux-sudo-9999.ebuild
+++ b/sec-policy/selinux-sudo/selinux-sudo-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-sxid/Manifest b/sec-policy/selinux-sxid/Manifest
index 8eb47e94c7aa..b8e6a88da8cc 100644
--- a/sec-policy/selinux-sxid/Manifest
+++ b/sec-policy/selinux-sxid/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-sxid-2.20170805-r2.ebuild 278 BLAKE2B e555532185df3d2c3523cdae4fd
 EBUILD selinux-sxid-2.20170805-r3.ebuild 278 BLAKE2B e555532185df3d2c3523cdae4fd7d4a762e5201308d71fc0f7d83cff9c169e20825804970bebfa06550e44974d27c621c1a51124300a78423ebf70bb62c487a0 SHA512 88081e487c2bb06613fbe7dccbf229999132ff3ec3811ab17f1525e7ac6e39cea9de2f29b3c96da09322f2e0e2c57d70efa23f67c0f2bf33aee1d3bff71f88dd
 EBUILD selinux-sxid-2.20170805-r4.ebuild 280 BLAKE2B 899c769ffefc8737aa7b82442fb2cd63f706cbf1ea972d73ab8952dbcedb41518872936c2456ca7e6fb0c4a42ad80ee94987b4dc1ba950a8e3bd75ccc0e78fcc SHA512 3263fdc3a536e2b8b64909b7262b3979dc43d592e2e1aca190a6dec54d9a2f4ae14dabf207e99ab0d09618667a3054a62ce85d0d45cec1d94c7d2edfb1a251b9
 EBUILD selinux-sxid-2.20180114-r1.ebuild 278 BLAKE2B eda95377b8be5421b9605eb7a32957a1faf2cd0a213b59883106b72ac6a48160dd89248259d828ccc39f5e85e4e86aa84736a957b6c6f6aed16cf04c507dad49 SHA512 4b959ffc16ebe567ce574bbc0ab0a63a94131bf49f14b06d19e2ba52143841535fd999711c0b0d856c5fa9f080238c04dc34e34ac6dd80eaa0fc85ac4c127d66
-EBUILD selinux-sxid-9999.ebuild 280 BLAKE2B 899c769ffefc8737aa7b82442fb2cd63f706cbf1ea972d73ab8952dbcedb41518872936c2456ca7e6fb0c4a42ad80ee94987b4dc1ba950a8e3bd75ccc0e78fcc SHA512 3263fdc3a536e2b8b64909b7262b3979dc43d592e2e1aca190a6dec54d9a2f4ae14dabf207e99ab0d09618667a3054a62ce85d0d45cec1d94c7d2edfb1a251b9
+EBUILD selinux-sxid-2.20180114-r2.ebuild 280 BLAKE2B a50df38fa8d78d9cd6c1678494b9cdbcd316405460fdb9a560923da0e7f9c5c2c4f8475c2ba95b513cf7c5eb144674c632e309ce73918b7487ede92e12814c2d SHA512 2f1bffd455c63d9392d795d50fecee3136ff9a80c2cb19d8a97d1ac2bbbe1d779f967bab6b99be838434dadb5cb996c43da80257c7a82852d31301e7fffd49bb
+EBUILD selinux-sxid-9999.ebuild 280 BLAKE2B a50df38fa8d78d9cd6c1678494b9cdbcd316405460fdb9a560923da0e7f9c5c2c4f8475c2ba95b513cf7c5eb144674c632e309ce73918b7487ede92e12814c2d SHA512 2f1bffd455c63d9392d795d50fecee3136ff9a80c2cb19d8a97d1ac2bbbe1d779f967bab6b99be838434dadb5cb996c43da80257c7a82852d31301e7fffd49bb
 MISC metadata.xml 314 BLAKE2B 8d371c34b9d307154ebaf04b4cd15173c06c8efbbd6565f40b8f78157f4e584485cf140199eec6b3a08e83c830aea67d97c3d0e191914c4cca3c5c7188b56dce SHA512 0baa2e4f8b229b455faa8ca4a17e2f4eb9479cf4ed41c21d835bdd43fba5cb3bea22d80c8f6ac5c1518d40ea4e5208fbeda1d7236c612507410d8609a9c919e0
diff --git a/sec-policy/selinux-sxid/selinux-sxid-2.20180114-r2.ebuild b/sec-policy/selinux-sxid/selinux-sxid-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..73566a466c1a
--- /dev/null
+++ b/sec-policy/selinux-sxid/selinux-sxid-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 78004d97bad7..73566a466c1a 100644
--- a/sec-policy/selinux-sxid/selinux-sxid-9999.ebuild
+++ b/sec-policy/selinux-sxid/selinux-sxid-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-syncthing/Manifest b/sec-policy/selinux-syncthing/Manifest
index 9855603044ef..5b23fd8cce5d 100644
--- a/sec-policy/selinux-syncthing/Manifest
+++ b/sec-policy/selinux-syncthing/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-syncthing-2.20170805-r2.ebuild 288 BLAKE2B b226c19631f1b97070988c
 EBUILD selinux-syncthing-2.20170805-r3.ebuild 288 BLAKE2B b226c19631f1b97070988c25273a188d9577e354fc6f9f92d12ae9b28377f92acf4a9c621699346d817a27a5f0410a6e974710384beb3df39df66ff9ff797396 SHA512 a636a5ab365373fae954f86bd4cadcdd9c60509a28bc278fd58a2dbbe90b6ae97491c431f2899477a0fb110d5dccc96db0179ff054fc7461c2b0652851632a85
 EBUILD selinux-syncthing-2.20170805-r4.ebuild 290 BLAKE2B ad20bb719be71cc393d039fdcd6a8683f2f7ea58fc38a95c007f3d6304cf2d51de8e30163ca1d6bc442bfa734b52f71ef125391e8bc00f0bed7b3be36a35f59b SHA512 95169f6ab6b871b29f8639bc0b36959ff09e984691370c5508691fa839091e03a27472b8c9739f891ebbdfae9990c633908a149e5bbdc52e5aeb26cc58cf6d16
 EBUILD selinux-syncthing-2.20180114-r1.ebuild 288 BLAKE2B 0de40e791e960bcee9af7aebe3fdf8d3762ee3710f11902f51b7edf0c2978291a99b6e155b068522401d5d76b22a49172f2a76ab3d4a703e0c739c8bf11f9324 SHA512 af59492d90e8f44a03884024e2fb2146a76b2ca406c9e0b629f5d8c06bee406fd426e42e51d9d47c9590511019cfa572adb1b04da03d74d41655f497a6a102a7
-EBUILD selinux-syncthing-9999.ebuild 290 BLAKE2B ad20bb719be71cc393d039fdcd6a8683f2f7ea58fc38a95c007f3d6304cf2d51de8e30163ca1d6bc442bfa734b52f71ef125391e8bc00f0bed7b3be36a35f59b SHA512 95169f6ab6b871b29f8639bc0b36959ff09e984691370c5508691fa839091e03a27472b8c9739f891ebbdfae9990c633908a149e5bbdc52e5aeb26cc58cf6d16
+EBUILD selinux-syncthing-2.20180114-r2.ebuild 290 BLAKE2B cbfcf886b65bad83e3c5b8dba3ad7fe64f80e097d145789b592ec4689e7bb0e46d7137adc2d83b74208a60afc1531ac50d594681eea4af1a6caaa75e47c3d1e1 SHA512 1ce639a1418c999346e461f1ece9f17b441ea0785aeb93c0b4292b56a26f763eaa17f061e56ff3d38da9aede4d4c48421a9843ba930cfc8194fad7eafb8765f1
+EBUILD selinux-syncthing-9999.ebuild 290 BLAKE2B cbfcf886b65bad83e3c5b8dba3ad7fe64f80e097d145789b592ec4689e7bb0e46d7137adc2d83b74208a60afc1531ac50d594681eea4af1a6caaa75e47c3d1e1 SHA512 1ce639a1418c999346e461f1ece9f17b441ea0785aeb93c0b4292b56a26f763eaa17f061e56ff3d38da9aede4d4c48421a9843ba930cfc8194fad7eafb8765f1
 MISC metadata.xml 319 BLAKE2B 880cc6e865a46e68115698fade5b2af342b717eec3fe5989a823456a5ff63f430106d7d783027b2a15df37e00067f782d40c650fa2af8f55883b01a5df3409e8 SHA512 0ae48ef15966fa6b5b11a0b5e067061a5385c22c78b016caaa29a77457d5f48522abe1303c870cc1117d3a1a67d8b7f47ad8da9e9703ec13d05656d86b2168fa
diff --git a/sec-policy/selinux-syncthing/selinux-syncthing-2.20180114-r2.ebuild b/sec-policy/selinux-syncthing/selinux-syncthing-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..fb45ab18b9ca
--- /dev/null
+++ b/sec-policy/selinux-syncthing/selinux-syncthing-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 770ad757c47f..fb45ab18b9ca 100644
--- a/sec-policy/selinux-syncthing/selinux-syncthing-9999.ebuild
+++ b/sec-policy/selinux-syncthing/selinux-syncthing-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-sysstat/Manifest b/sec-policy/selinux-sysstat/Manifest
index 41ab36882765..c2e126deb1ae 100644
--- a/sec-policy/selinux-sysstat/Manifest
+++ b/sec-policy/selinux-sysstat/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-sysstat-2.20170805-r2.ebuild 284 BLAKE2B 12787720ccb96b4ae04a67a4
 EBUILD selinux-sysstat-2.20170805-r3.ebuild 284 BLAKE2B 12787720ccb96b4ae04a67a403d4e0892ad895f7e3aa9847462791d0922e672fad789840306fae17f711b6b1c2082df3d8c2921cbe9d4628e7a50951e4d5201d SHA512 50541dd30b19915719e910107f80372a745ea4eb3d656c82ad91a60ae270fbdb98b76c6182f2d3c195ca44d8e802b63f4bbcda57006358af6690259c66a04cec
 EBUILD selinux-sysstat-2.20170805-r4.ebuild 286 BLAKE2B 58e3c824aba68b58a65466f0d20b37a443aae67f429d655743d42bd29aa923acc1aca2a67be522de5ad35b4b200e04844db63e63047f45ecef89fadeb9d7869f SHA512 f00d7f8ce98117bb8c4fa474c52a6e83f0c6900afba1c3392fec9cbe31588891fa0b6cb5065a4cef066b53897dbb24369341d10979e2e825aac0460d935e9515
 EBUILD selinux-sysstat-2.20180114-r1.ebuild 284 BLAKE2B bc712b68c9d939820e1a4dfc30fa528181bdfb4781a41c3db9d0c03c2a2f269d0e9bf7bc62f280b916c5f6c98531116462e8ae09d2048df7b94ec76bad1a16cd SHA512 2dead4902b274a9f2d38cc8ed914d66237598b76440ce7e1da3e437d55fac9818497c6ce39cce22222db700507f359c3f9bca202806dc93192552b3b636086d9
-EBUILD selinux-sysstat-9999.ebuild 286 BLAKE2B 58e3c824aba68b58a65466f0d20b37a443aae67f429d655743d42bd29aa923acc1aca2a67be522de5ad35b4b200e04844db63e63047f45ecef89fadeb9d7869f SHA512 f00d7f8ce98117bb8c4fa474c52a6e83f0c6900afba1c3392fec9cbe31588891fa0b6cb5065a4cef066b53897dbb24369341d10979e2e825aac0460d935e9515
+EBUILD selinux-sysstat-2.20180114-r2.ebuild 286 BLAKE2B 6dd55e5775ce70df80155c2f64cee20daca058005c70722e82801002212f6118abbdc2ead26c2bd1fc4579087c20d8d1b08275cab41bba375c34068730226466 SHA512 a0260f6c8a809c9516c778ad5707fdc485a12fc004e55bc8320a64b9bcb1278bc09dfaafe2f7cc7346e1c04966d1e4377a715b01a57258424ed0bf6fa2a6d4a2
+EBUILD selinux-sysstat-9999.ebuild 286 BLAKE2B 6dd55e5775ce70df80155c2f64cee20daca058005c70722e82801002212f6118abbdc2ead26c2bd1fc4579087c20d8d1b08275cab41bba375c34068730226466 SHA512 a0260f6c8a809c9516c778ad5707fdc485a12fc004e55bc8320a64b9bcb1278bc09dfaafe2f7cc7346e1c04966d1e4377a715b01a57258424ed0bf6fa2a6d4a2
 MISC metadata.xml 317 BLAKE2B 96d9b10ff7d8b6b058c4bdc14ed41cbd12f5088469b1f43e8f21f15d0416c24ec54fdf7f1c5a8b40bf1956361eba6f5057e932f68b01b15cfc67103b39f7d1e6 SHA512 dab3ab7e1b48828952a50e5b936336fa179a5e7d852e82061dd2c0d2caed0ce4c52dd06c6610ab0b19c6441a927eb826eaabd84100edff7271e73be4165f35d5
diff --git a/sec-policy/selinux-sysstat/selinux-sysstat-2.20180114-r2.ebuild b/sec-policy/selinux-sysstat/selinux-sysstat-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..1551a51a365a
--- /dev/null
+++ b/sec-policy/selinux-sysstat/selinux-sysstat-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 3d7093c2ea1f..1551a51a365a 100644
--- a/sec-policy/selinux-sysstat/selinux-sysstat-9999.ebuild
+++ b/sec-policy/selinux-sysstat/selinux-sysstat-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-tboot/Manifest b/sec-policy/selinux-tboot/Manifest
index d8e8d837230f..564548830adb 100644
--- a/sec-policy/selinux-tboot/Manifest
+++ b/sec-policy/selinux-tboot/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-tboot-2.20170805-r2.ebuild 280 BLAKE2B 907f507bb78480f1b7bfa61db5
 EBUILD selinux-tboot-2.20170805-r3.ebuild 280 BLAKE2B 907f507bb78480f1b7bfa61db5560f003054fb7329387677827733168742ea6f24ed778e0efe344ee8b2415dc257b81b6a9c9e6461fa3601bcd99a2f56f31f71 SHA512 9c4dbe968352504211c54ddc3402c8c647acc80d42338d16e3ddfbf2ed85b0e0294c96f457b510b59986488cfd48e4ccdc96a9e949d07533c4b9e5309f26b832
 EBUILD selinux-tboot-2.20170805-r4.ebuild 282 BLAKE2B b02a827eb0e87c70b5671ed4fcae0288f3a51930577fcedda63f6dd4ec956e53b00cd2a484de50b9e9cdb0c69985f516676f350af7b47a408230e3b93de5a01e SHA512 5f499c39d47b9fb43eba196c9abe72a838f4026dcad1f83fa8c263b107711301c13197034c55bb9e0cc9a664705bd0c74ed9b639c6d25c470c414376d4987f2d
 EBUILD selinux-tboot-2.20180114-r1.ebuild 280 BLAKE2B a54c20f8acae990c7736b4753c9dd67198d3041370e2728f200713fc5d47de1d8b96793828e1351eb7b2e9ce787957cf1e821b23991ffa0a7b550e2aea03a06b SHA512 da43c84bff2331210493343c95fb8bfc32b9cf40e9e689915c07f4d7aae02eda62457cefc1f715c23cead234c5ea373a18bf271d7ffe2725773b8b92aefe8a54
-EBUILD selinux-tboot-9999.ebuild 282 BLAKE2B b02a827eb0e87c70b5671ed4fcae0288f3a51930577fcedda63f6dd4ec956e53b00cd2a484de50b9e9cdb0c69985f516676f350af7b47a408230e3b93de5a01e SHA512 5f499c39d47b9fb43eba196c9abe72a838f4026dcad1f83fa8c263b107711301c13197034c55bb9e0cc9a664705bd0c74ed9b639c6d25c470c414376d4987f2d
+EBUILD selinux-tboot-2.20180114-r2.ebuild 282 BLAKE2B 7edef37f5c6621c61010e44c102e470016b074696c01ee2353f86df412ef239239929d8815ce15b8281bcbbfd50df585847497c92a0965b209e3da4cc7dc6bc6 SHA512 9832fa0c900b345fea544ec0ba8a583bda65ce7e2d7d8b67b3ca053b399cb15019434722fc678cacfd03fdc1d1b7ac68a0725f90036cd6dcff760d27432ff3a5
+EBUILD selinux-tboot-9999.ebuild 282 BLAKE2B 7edef37f5c6621c61010e44c102e470016b074696c01ee2353f86df412ef239239929d8815ce15b8281bcbbfd50df585847497c92a0965b209e3da4cc7dc6bc6 SHA512 9832fa0c900b345fea544ec0ba8a583bda65ce7e2d7d8b67b3ca053b399cb15019434722fc678cacfd03fdc1d1b7ac68a0725f90036cd6dcff760d27432ff3a5
 MISC metadata.xml 335 BLAKE2B 24e218a7e26eabb17fd01eb43a960921e4b3bc7dd936db2bc76cdcb15c29b4766052a18bbd2d1a0af659746a2eadc124175ac8d68e8a918a1be7077bbf133eb8 SHA512 893b7c0695b5811aa706cbdee4a48d90de09b9e6e24305b5dd73f51d4a0f06c3ea32911e0e800b5fde6d2f5024095d501fedd600bc542ca14e83809696b3d028
diff --git a/sec-policy/selinux-tboot/selinux-tboot-2.20180114-r2.ebuild b/sec-policy/selinux-tboot/selinux-tboot-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..71edee22c6c5
--- /dev/null
+++ b/sec-policy/selinux-tboot/selinux-tboot-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 90dfb5417720..71edee22c6c5 100644
--- a/sec-policy/selinux-tboot/selinux-tboot-9999.ebuild
+++ b/sec-policy/selinux-tboot/selinux-tboot-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-tcpd/Manifest b/sec-policy/selinux-tcpd/Manifest
index 6270d555c1d5..3e2cc078ae57 100644
--- a/sec-policy/selinux-tcpd/Manifest
+++ b/sec-policy/selinux-tcpd/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-tcpd-2.20170805-r2.ebuild 372 BLAKE2B 43678f8024d7c35e20d1d0d3411
 EBUILD selinux-tcpd-2.20170805-r3.ebuild 372 BLAKE2B 43678f8024d7c35e20d1d0d34112a08e5654038d6bee203ad0e5595e59e26e6717569d1f51b4830040342025fd07bae795f2f1e05f776276f74a4172948ed5fa SHA512 2bb89d4f0fa448d50e1b4a11038f93738b17e3519889b265bbe8838998f5c0c1bf272f8de4d9ac552b8b67654035705a62eaf69447107776ead8b2879c676b87
 EBUILD selinux-tcpd-2.20170805-r4.ebuild 374 BLAKE2B ce02f810b45fbfdccf121a8b40e75d21fcc6fd9ba4087b4cbccac3ecbc38e891d7999e77699b9366bcfe2b914070082218303a166fea70d4c5a10955a809818e SHA512 eed42c09121833b6208ec36f4cefad7f02d76cae5e35654bda28045ad02f55bdb4bfcfd4019fa822f7da7226ed9e44e1b687a41446d25906963077529b72f39b
 EBUILD selinux-tcpd-2.20180114-r1.ebuild 372 BLAKE2B e9c28b78dee5e030df7f4a960389a74aa91b4cdbb5cc2ab832910b2bdf75e755171fe86e735cd4a0ba327fe008f5e2a774dcd1b85c1fc0afed298f44ddaa5041 SHA512 e6f39d36d622704e21fafe2d58b1346d65cce3c0e3b66f4cb7448e4a66db705193683b96cfe1aa280f23e174de68d03e2f4199d1d00dac91f2dd79178bee47a3
-EBUILD selinux-tcpd-9999.ebuild 374 BLAKE2B ce02f810b45fbfdccf121a8b40e75d21fcc6fd9ba4087b4cbccac3ecbc38e891d7999e77699b9366bcfe2b914070082218303a166fea70d4c5a10955a809818e SHA512 eed42c09121833b6208ec36f4cefad7f02d76cae5e35654bda28045ad02f55bdb4bfcfd4019fa822f7da7226ed9e44e1b687a41446d25906963077529b72f39b
+EBUILD selinux-tcpd-2.20180114-r2.ebuild 374 BLAKE2B a28daa3dcbdcf008410b559ca759dcad5c749383e92d46f8ab75f4d19aeb7133012e8e563896ba202d103cef167ffc0e84e8bfa568814e42c900dc5ae95ba270 SHA512 a55dc5ff1872639822ae44f6e67d85d807b47030fcc3ff3f3798ae6867bb830fdb6d07873eddb4f98c3fad419c6d5b26e250bb34440c8eb434c230d8204fdc2a
+EBUILD selinux-tcpd-9999.ebuild 374 BLAKE2B a28daa3dcbdcf008410b559ca759dcad5c749383e92d46f8ab75f4d19aeb7133012e8e563896ba202d103cef167ffc0e84e8bfa568814e42c900dc5ae95ba270 SHA512 a55dc5ff1872639822ae44f6e67d85d807b47030fcc3ff3f3798ae6867bb830fdb6d07873eddb4f98c3fad419c6d5b26e250bb34440c8eb434c230d8204fdc2a
 MISC metadata.xml 314 BLAKE2B 7275643a566403529d2075c82da3d4dbeb78ba6cdf5d87a704952f0c19ad36913fe9e1a248809b156ffd7c3e25162df7b8f37aee6ac80ef6ed5667d36d487537 SHA512 5fe5784f0e2a678a0202842e256c029ca34fcf992151a05f0f015ba8abaaa0b71729ffb3e9400c9dbedbb90830efd17d363ac60a4a042d24ecdee368341483ce
diff --git a/sec-policy/selinux-tcpd/selinux-tcpd-2.20180114-r2.ebuild b/sec-policy/selinux-tcpd/selinux-tcpd-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..dbaebf94c9a4
--- /dev/null
+++ b/sec-policy/selinux-tcpd/selinux-tcpd-2.20180114-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 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 0c4d8ce778f6..dbaebf94c9a4 100644
--- a/sec-policy/selinux-tcpd/selinux-tcpd-9999.ebuild
+++ b/sec-policy/selinux-tcpd/selinux-tcpd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-tcsd/Manifest b/sec-policy/selinux-tcsd/Manifest
index 8ac3d076e874..5d3369fd0d07 100644
--- a/sec-policy/selinux-tcsd/Manifest
+++ b/sec-policy/selinux-tcsd/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-tcsd-2.20170805-r2.ebuild 278 BLAKE2B 20ec0801cf0d61258678b4c2c3d
 EBUILD selinux-tcsd-2.20170805-r3.ebuild 278 BLAKE2B 20ec0801cf0d61258678b4c2c3dd983732b884d802b70daf32f74df5bee4f79f271ffddaba8922ea77582b0813c97e1744621ad24eb0f987e8a0ad1865fc30dd SHA512 41a75c0cecde46c34da619e4ab96bb3ba903a5a80a59f27fe0e35df7f8799b142014d408adbed2a17572bfd822601ec80c2c928b23a26e26ebf1ebbe74ff6f40
 EBUILD selinux-tcsd-2.20170805-r4.ebuild 280 BLAKE2B c5d01ace661bd37bbf0a33a955eb1849cee8865e4d14c17d4ce55011a5a4121c8c24e6f97546c16585fcf61372e081451f97de0953faeb72c4ccc5044b3713ed SHA512 0c31b575b6774879c87fc28126d3eda7ed4b46948af1904e05f50f9308bbe5f249bd450ed83e40b77bcd08dc933de013b157243ac43619afbfcb15b62b986b63
 EBUILD selinux-tcsd-2.20180114-r1.ebuild 278 BLAKE2B 429caa4b92fe6dcdd5784100462c903ae37de24e89d269066b2db481477fec24ac46fc06c8fdc26e68cdf51b74bdde7954527a831a19c6e706b504795f31efc9 SHA512 5f07cf19475dc6f83f60d487ddf7458656b1ec239b15da7a5d6e2032cf17171fdd123dd721fb7acaa8cf767e39e47a26ecb1ceb8957ff5f153c89b35becb412f
-EBUILD selinux-tcsd-9999.ebuild 280 BLAKE2B c5d01ace661bd37bbf0a33a955eb1849cee8865e4d14c17d4ce55011a5a4121c8c24e6f97546c16585fcf61372e081451f97de0953faeb72c4ccc5044b3713ed SHA512 0c31b575b6774879c87fc28126d3eda7ed4b46948af1904e05f50f9308bbe5f249bd450ed83e40b77bcd08dc933de013b157243ac43619afbfcb15b62b986b63
+EBUILD selinux-tcsd-2.20180114-r2.ebuild 280 BLAKE2B 6eb9cbd9df6421ad3e03eadf815c70ee0b8e99906bce0ecd3ee2149e312066eada15f4c8ca2f554306ae8258782e12f377e2a7079bab9aa69aef2fff13c285a0 SHA512 e09625a1b24703c31a84676322317fd70ad749b0ace429906753e8362b8643ecd79defd8b221373193e01a99865df9f8d3bf7ffe270b37be17712e3a926109ac
+EBUILD selinux-tcsd-9999.ebuild 280 BLAKE2B 6eb9cbd9df6421ad3e03eadf815c70ee0b8e99906bce0ecd3ee2149e312066eada15f4c8ca2f554306ae8258782e12f377e2a7079bab9aa69aef2fff13c285a0 SHA512 e09625a1b24703c31a84676322317fd70ad749b0ace429906753e8362b8643ecd79defd8b221373193e01a99865df9f8d3bf7ffe270b37be17712e3a926109ac
 MISC metadata.xml 314 BLAKE2B 97c20c7e1bafbb77a72b6cf1571a100bb9d8eb89d58fa9d74994758111b73748f57066b97fe2357f146ccf628e96da1c3c3d1331fd760f31c9ec346f0b90dcf2 SHA512 12aed2a47c90c7da82be53abc650160c5b012b358dea0b609ed3c2761ba49cf7113901b4f82121972af204b582aeed230d74f18fbd8c5469dedf5c5fc642cc74
diff --git a/sec-policy/selinux-tcsd/selinux-tcsd-2.20180114-r2.ebuild b/sec-policy/selinux-tcsd/selinux-tcsd-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..adc49785ec0a
--- /dev/null
+++ b/sec-policy/selinux-tcsd/selinux-tcsd-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 ab910d37f2ba..adc49785ec0a 100644
--- a/sec-policy/selinux-tcsd/selinux-tcsd-9999.ebuild
+++ b/sec-policy/selinux-tcsd/selinux-tcsd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-telnet/Manifest b/sec-policy/selinux-telnet/Manifest
index b1d95ec8a410..4b0207ecaae3 100644
--- a/sec-policy/selinux-telnet/Manifest
+++ b/sec-policy/selinux-telnet/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-telnet-2.20170805-r2.ebuild 388 BLAKE2B 285d86cada5329ac28bd22ffd
 EBUILD selinux-telnet-2.20170805-r3.ebuild 388 BLAKE2B 285d86cada5329ac28bd22ffd95438a51b219763d1775bb729166d5710b005ea9f08fdbfb2bc3094be3c4badbafdf56c8c66b6d28deb7c4b5f6edd2d54f93497 SHA512 d2cb2bbf78266e33ea0654a1e8b2431095ea82b8b0de95a8365c4bc6050640c8485519c2a4861e2af5ce30a12b3fcde954e4c36c223fccb928929ec06e267c2a
 EBUILD selinux-telnet-2.20170805-r4.ebuild 390 BLAKE2B 03d02d334338e11cd9fc5fa48300e24e42c6ab4ea8ee99904ee5f15b5e8d0b4ce27e68ab75d58a92076271e5b9bf5e5245dda9cbaed0c9923925035a31077b4f SHA512 af1f55df68650962dc3254aae42ad90ed765dbfb341efebad4937b6b38e80222a76802e5b400c5e2c133600de84e579235db0b9f665046aa0dbcf9b74c4f5bb7
 EBUILD selinux-telnet-2.20180114-r1.ebuild 388 BLAKE2B 958ed0039723dbd68de431e348095418b53837c0ead1b27ad475810d3e64fdd9568c6d4d0a71fbc51b26b1c25cff2b99da808381352da29f309b600314af7bad SHA512 b2645ef75943d569e070a629965d2088f50584d08793b45b9a9bd1816280ce823b759bb8cc99c7d322861c40c2a168666afcfdc531d3553a8ffcfac9c5f683cb
-EBUILD selinux-telnet-9999.ebuild 390 BLAKE2B 03d02d334338e11cd9fc5fa48300e24e42c6ab4ea8ee99904ee5f15b5e8d0b4ce27e68ab75d58a92076271e5b9bf5e5245dda9cbaed0c9923925035a31077b4f SHA512 af1f55df68650962dc3254aae42ad90ed765dbfb341efebad4937b6b38e80222a76802e5b400c5e2c133600de84e579235db0b9f665046aa0dbcf9b74c4f5bb7
+EBUILD selinux-telnet-2.20180114-r2.ebuild 390 BLAKE2B 606401438985b645ae4174842309515a3a777588f0aea464026d0d55c2afa3719a37691c8827d356296f2358d99bebf5284bede9702dc8fb6993590f1e9290a6 SHA512 017ef8ebfb57635bb5b45c616807427f6293ade2b055430944ffba85d297f91114dc24acca39dfd6b2117c0c52a343e30b1486599bfc1e8fcb66f7af49d67fe1
+EBUILD selinux-telnet-9999.ebuild 390 BLAKE2B 606401438985b645ae4174842309515a3a777588f0aea464026d0d55c2afa3719a37691c8827d356296f2358d99bebf5284bede9702dc8fb6993590f1e9290a6 SHA512 017ef8ebfb57635bb5b45c616807427f6293ade2b055430944ffba85d297f91114dc24acca39dfd6b2117c0c52a343e30b1486599bfc1e8fcb66f7af49d67fe1
 MISC metadata.xml 316 BLAKE2B f9dacecead9d85c43146f0521bba36ef38ec49370642a692230d46fb5154f911a507a3a18fcb53444170d1708dd317e43f40266d3919c4dc88f2c42c417d7b21 SHA512 09fc5cf80795fa3e4565a9102ee44138f0c8e4f14a308634bd55b9cb1a6e2dadfc8afa7f6ff1993b1e2d9ee738c8de4c91aeb34e3974695ad9165815bff49222
diff --git a/sec-policy/selinux-telnet/selinux-telnet-2.20180114-r2.ebuild b/sec-policy/selinux-telnet/selinux-telnet-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..ed9362153891
--- /dev/null
+++ b/sec-policy/selinux-telnet/selinux-telnet-2.20180114-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 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 e310a9be1384..ed9362153891 100644
--- a/sec-policy/selinux-telnet/selinux-telnet-9999.ebuild
+++ b/sec-policy/selinux-telnet/selinux-telnet-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-tftp/Manifest b/sec-policy/selinux-tftp/Manifest
index 06a3a786c78a..36096bb1ac9f 100644
--- a/sec-policy/selinux-tftp/Manifest
+++ b/sec-policy/selinux-tftp/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-tftp-2.20170805-r2.ebuild 278 BLAKE2B b8a19033d817638747b29aa287c
 EBUILD selinux-tftp-2.20170805-r3.ebuild 278 BLAKE2B b8a19033d817638747b29aa287c799d90ec323fb595029121748765bf9022ac2aac47fce239e04654c810644bec77c689b795752e6c60ebd031b035aa306d25a SHA512 d5f1cbd77651ec81a1568bf1ca0d792b3698713ed679651b94558988bafa519a50fe3672a477e97942173cc955d3732fa1b309d1f9c25fd27ae93bbb2c619198
 EBUILD selinux-tftp-2.20170805-r4.ebuild 280 BLAKE2B e79077698cf62bfe74bb8d8af8f511ab62d15a44fb508f099ff6eedb6a530ec928d393f3dd9f0fb97113dea84f60620289a5b41422ee0fd61e53cdc717e3e261 SHA512 bb60564eb8c6b70ccd3a637c8c4cba45b0089cb05313ddb6fb21aab3aa35a4b692a647af90072ed8cc622581e3ff3f6d0d7d982a11cb954804d17eb1e866ded2
 EBUILD selinux-tftp-2.20180114-r1.ebuild 278 BLAKE2B c2f349d617e46484844cf04bee0d3ef22ceb78ac87ac92d7900b7ee62e9161ce4e523fdf920e453dd550e48dc7651b1e90df80fee45a8e48591520816cf3371b SHA512 686ee13b563b0c1e8e3c98de8d26acfeeddd67ab48bc358d7fd6391832aa103e7b093cc0864f43f1349f94c6c77bdc55cdb36d1cf71e7ebad86f63c0cca40dc7
-EBUILD selinux-tftp-9999.ebuild 280 BLAKE2B e79077698cf62bfe74bb8d8af8f511ab62d15a44fb508f099ff6eedb6a530ec928d393f3dd9f0fb97113dea84f60620289a5b41422ee0fd61e53cdc717e3e261 SHA512 bb60564eb8c6b70ccd3a637c8c4cba45b0089cb05313ddb6fb21aab3aa35a4b692a647af90072ed8cc622581e3ff3f6d0d7d982a11cb954804d17eb1e866ded2
+EBUILD selinux-tftp-2.20180114-r2.ebuild 280 BLAKE2B 05f5bfbca7aa108f68b6126dfcc8eb63c6ec6650fc22640a6764bafe1dd53dc0bcb0f4983804a4fd7041e8e75650ca56a5248ae2c358d29fee8c99b6c773359b SHA512 09cfebeafab7e7ae75fc9cc2d7c7dbc6e438c50212d06cd013c28ca9ae5896b5137f82653acf3b98b4055c0afb300f641341d59aedf6d67709c665ae177a98b1
+EBUILD selinux-tftp-9999.ebuild 280 BLAKE2B 05f5bfbca7aa108f68b6126dfcc8eb63c6ec6650fc22640a6764bafe1dd53dc0bcb0f4983804a4fd7041e8e75650ca56a5248ae2c358d29fee8c99b6c773359b SHA512 09cfebeafab7e7ae75fc9cc2d7c7dbc6e438c50212d06cd013c28ca9ae5896b5137f82653acf3b98b4055c0afb300f641341d59aedf6d67709c665ae177a98b1
 MISC metadata.xml 314 BLAKE2B 036c95216e3d91689bb297ee53e07038b3a26723ed4ea4dd2cf87972e22c1ae71c7e587e43bbf4c204ea8cdf43ecab6523a484e61c98cbb6abb4813d82407b58 SHA512 697206bf11d8ea4c4935fff9751b8abe279f21d513d288e61b1d4a485c64236452bf37e7a3940a8b2c151c0981b6feda30c7985b32069a0647adc7ad8c70aea1
diff --git a/sec-policy/selinux-tftp/selinux-tftp-2.20180114-r2.ebuild b/sec-policy/selinux-tftp/selinux-tftp-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..6a14788e1b36
--- /dev/null
+++ b/sec-policy/selinux-tftp/selinux-tftp-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 7aad3f461a12..6a14788e1b36 100644
--- a/sec-policy/selinux-tftp/selinux-tftp-9999.ebuild
+++ b/sec-policy/selinux-tftp/selinux-tftp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-tgtd/Manifest b/sec-policy/selinux-tgtd/Manifest
index fdb64a2c3ecf..bd0135e0375e 100644
--- a/sec-policy/selinux-tgtd/Manifest
+++ b/sec-policy/selinux-tgtd/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-tgtd-2.20170805-r2.ebuild 278 BLAKE2B e314ce620b35943a4460d403975
 EBUILD selinux-tgtd-2.20170805-r3.ebuild 278 BLAKE2B e314ce620b35943a4460d403975107fc7393252dd842794798bb739f404d6697d7089588c051296084f75e92648173569a82f8574e883d8ae71a0a6eaa3df4ea SHA512 32ccfa08bb111ada87fe959bfedddb06e46426343d648cdd42640ae325e04779a92efb748b07a38e2456a4b2b31fa835fa506fa366ba8da58bc60a97fac88462
 EBUILD selinux-tgtd-2.20170805-r4.ebuild 280 BLAKE2B 3d3e333fff0733254742256773629671bed893b820a0da11175ced52fda7a2c2d03d314b3c2c9f34e99e91ed6215e3665196f1151090b3562c0b49e58ad4855c SHA512 f935c7ae309f2e80c007f871eacd875ece8d74767b3510ab89526d9d9623716008ec50b3fa698b18aadb52d124c8d9facb37b6c0268f629f8611f6e8667b0a08
 EBUILD selinux-tgtd-2.20180114-r1.ebuild 278 BLAKE2B 5cec03fb728eed3bc64cdc8eff4c5bdef14c4d5749ee8aa7d3c06256fd894b1ebf9b06879f6d96da9a95c179cca78646070cfa7c1431ad57246aa094e68124e3 SHA512 bf143364a8343d5fb8012092fb0b605b714b7d7a0de27851b2ef38b081bdad9d3835c47ed52aa77b5ebe2e703cf1ea6c4d8b327a2357dfe5bb2059e064330194
-EBUILD selinux-tgtd-9999.ebuild 280 BLAKE2B 3d3e333fff0733254742256773629671bed893b820a0da11175ced52fda7a2c2d03d314b3c2c9f34e99e91ed6215e3665196f1151090b3562c0b49e58ad4855c SHA512 f935c7ae309f2e80c007f871eacd875ece8d74767b3510ab89526d9d9623716008ec50b3fa698b18aadb52d124c8d9facb37b6c0268f629f8611f6e8667b0a08
+EBUILD selinux-tgtd-2.20180114-r2.ebuild 280 BLAKE2B 49d777f3f0ac9185d5ec51997b9b7030420607cfd7159f3a68249ded9a737629b147ac75d8e2792b771ae094c29827528472755e1b3737c6f81344ff150f3d1a SHA512 33a0e373697837325b242ea60e5abd10526059eb2448a92fd0da2de972dd9e6769f2a8789943ff54501c83b9922d2a04efc0911d8599fd42c70b8fc1ee0b4bcc
+EBUILD selinux-tgtd-9999.ebuild 280 BLAKE2B 49d777f3f0ac9185d5ec51997b9b7030420607cfd7159f3a68249ded9a737629b147ac75d8e2792b771ae094c29827528472755e1b3737c6f81344ff150f3d1a SHA512 33a0e373697837325b242ea60e5abd10526059eb2448a92fd0da2de972dd9e6769f2a8789943ff54501c83b9922d2a04efc0911d8599fd42c70b8fc1ee0b4bcc
 MISC metadata.xml 314 BLAKE2B fb88f2b1f35ccd416cb3580c0d9ef2607a0be750c0690a1697ef180bfc93fd20ee6c4675be91421f73041cedd56454dae3acd432b495fad491e3e8c55a75d3c0 SHA512 7ff6b603403c8ab2e2832738a2078a20d56226a35f70d61b9d067044d7a71d160965a93e76bf705456f8a61b268324d910d43d4dab11d84efc0455eb247db5a4
diff --git a/sec-policy/selinux-tgtd/selinux-tgtd-2.20180114-r2.ebuild b/sec-policy/selinux-tgtd/selinux-tgtd-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..6df710db4630
--- /dev/null
+++ b/sec-policy/selinux-tgtd/selinux-tgtd-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 ebb8910a0195..6df710db4630 100644
--- a/sec-policy/selinux-tgtd/selinux-tgtd-9999.ebuild
+++ b/sec-policy/selinux-tgtd/selinux-tgtd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-thunderbird/Manifest b/sec-policy/selinux-thunderbird/Manifest
index ff9fe6e9cfaa..16d9a9f1754c 100644
--- a/sec-policy/selinux-thunderbird/Manifest
+++ b/sec-policy/selinux-thunderbird/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-thunderbird-2.20170805-r2.ebuild 390 BLAKE2B d44b2a181a6905fc8438
 EBUILD selinux-thunderbird-2.20170805-r3.ebuild 390 BLAKE2B d44b2a181a6905fc843817df2c08370696f4d314e8df2eddc02f1fbf731b136be390f1ffe5fa3d247f237b4652aa8b140010cc0d1bfbf4b457e98624d45f7aaa SHA512 6f977f8d183a7832daf3a4790dc340da97f292b6b6e24387817b57251f2d6e53cb1e6fc7596bfd95e67a79cda36a82e8aca01f9b9e4c8d71a3b4ca92c48a6ae1
 EBUILD selinux-thunderbird-2.20170805-r4.ebuild 392 BLAKE2B 2069532cadc41cbeef39dbacd359481d82483dba95250a241cd18a338ffedc5fd70b00c50030cb476dd6b50f0a68ebd7d31d9d7d8d2fe3a39e775650bd66ef28 SHA512 5bc301cfc155ff736bef4b0456d4ba50f04cbbdc09311d6a0786667cd77688c6eb06d0d90bb4fc54bc5d7329c2f15e3677205c7634c1dd021db84390b995edf0
 EBUILD selinux-thunderbird-2.20180114-r1.ebuild 390 BLAKE2B 510ce2af64dfdbb58247adcb95534540ab6a23a3a45bc8cd4fd683314233ccc393d0375cc56febc7f59850d8bf12518cdc732f30932ab58e71021bbffe196432 SHA512 0fb2721321e8b378eea559e2605691e2101b6095f3fbc6332c58d462679feea19b2320279041c2e2b7fb3724e5dd913fb9a2f20bd77acb3b6394dde94ca3113c
-EBUILD selinux-thunderbird-9999.ebuild 392 BLAKE2B 2069532cadc41cbeef39dbacd359481d82483dba95250a241cd18a338ffedc5fd70b00c50030cb476dd6b50f0a68ebd7d31d9d7d8d2fe3a39e775650bd66ef28 SHA512 5bc301cfc155ff736bef4b0456d4ba50f04cbbdc09311d6a0786667cd77688c6eb06d0d90bb4fc54bc5d7329c2f15e3677205c7634c1dd021db84390b995edf0
+EBUILD selinux-thunderbird-2.20180114-r2.ebuild 392 BLAKE2B 4edde12b5b0519a3923e2c037e1167009270c0bd54b710d01c58f6b25760e761f9882c765ccda12e0f4c69087840c45fae835155ff15e3b3bd1a3043f2c1da1b SHA512 f8ea22df554fa6d7e0733c025bdea23ef155bb0fbc439d90f4cf51daa494c054f916dea0e68469af41fa151f4a294530c9c7b03f21b3f556794421415c9cdc86
+EBUILD selinux-thunderbird-9999.ebuild 392 BLAKE2B 4edde12b5b0519a3923e2c037e1167009270c0bd54b710d01c58f6b25760e761f9882c765ccda12e0f4c69087840c45fae835155ff15e3b3bd1a3043f2c1da1b SHA512 f8ea22df554fa6d7e0733c025bdea23ef155bb0fbc439d90f4cf51daa494c054f916dea0e68469af41fa151f4a294530c9c7b03f21b3f556794421415c9cdc86
 MISC metadata.xml 321 BLAKE2B 803c387bb4a8c829e856e92c76897b4af3d810ca56a257d12b08d29adcb779add9821927c6c20fc14adeb3c3638042b043cf58630635f6f3ee8aa906c3aea8c4 SHA512 883b02eb500849986493b7ef57241788991bbb266076583b5d5436b31c841ca789eda0d04e74e3ff7b1bff87270a409352f077d62d4b8bf280c12f36da01856e
diff --git a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20180114-r2.ebuild b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..fe691d8cd407
--- /dev/null
+++ b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20180114-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 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 07d2fda0570c..fe691d8cd407 100644
--- a/sec-policy/selinux-thunderbird/selinux-thunderbird-9999.ebuild
+++ b/sec-policy/selinux-thunderbird/selinux-thunderbird-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-timidity/Manifest b/sec-policy/selinux-timidity/Manifest
index 9d702bad7261..021cb28b60d5 100644
--- a/sec-policy/selinux-timidity/Manifest
+++ b/sec-policy/selinux-timidity/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-timidity-2.20170805-r2.ebuild 286 BLAKE2B 6e39e0f79ea18885c30f52f
 EBUILD selinux-timidity-2.20170805-r3.ebuild 286 BLAKE2B 6e39e0f79ea18885c30f52f7e1d151a612ab4f8f6d518ba1eaa7ad457d4f089c5cfff2e3d58088d0a1805f1f4da734ae0055ba9d264bb0b88d44db946ec11cec SHA512 a4fc8f01b28711ddd96d8c55e4b86a833677f8d1ca9d9786e54db172f647cca78e9ab332010861338c10410f0ec471aa8a12eb63d2d2cb9e31df70044bd5720e
 EBUILD selinux-timidity-2.20170805-r4.ebuild 288 BLAKE2B 7bf49f36c78d7f6576aa4558081d5fcdb2888823fad860c1867370c002c92272360b4ec49d1356229ddee6ed7c855ce78287f100dbd0ba5803ad55dc4985cf42 SHA512 82240ca68e2cbf22996232ffc8145c669ba516fa5e41234baedea25e1a1153bbfb91035aa8e563a87e7b93762ba470774c34068460b8a5432d0c1546495e8c0d
 EBUILD selinux-timidity-2.20180114-r1.ebuild 286 BLAKE2B d50cdfb1074490a66e7bdefb29906a0e4c7a9eb3a8917c484a05450f4f4976802074210ea7edac20b52a4555bf8261597217cafdcdaefcf78279747de0120e07 SHA512 95fee436cc9588f1e5ac0e7c60c5e2e0224d5bf42b28e1309539d122f1de9fc3e0ae9866e994aa3ef995a17ff3e8bbdc350438a710d055f9ae356fe1b50e9c94
-EBUILD selinux-timidity-9999.ebuild 288 BLAKE2B 7bf49f36c78d7f6576aa4558081d5fcdb2888823fad860c1867370c002c92272360b4ec49d1356229ddee6ed7c855ce78287f100dbd0ba5803ad55dc4985cf42 SHA512 82240ca68e2cbf22996232ffc8145c669ba516fa5e41234baedea25e1a1153bbfb91035aa8e563a87e7b93762ba470774c34068460b8a5432d0c1546495e8c0d
+EBUILD selinux-timidity-2.20180114-r2.ebuild 288 BLAKE2B b0a98e55a1b6f3afbee3a385e271043a9584d4f4e8433ac130fd8ee3c96f7b13ba283213b45c1c77ab9305bd25e2e2aa88ad7b8b74ed5cafdd3780013e142ede SHA512 c640370807519cc241074798ccc3193a9ac90fb7f6761e46ff901d6989c3b75a9b5fc66848a7f5c884ebe67a232cd12514867f30d9664f7c6cef285d21a363e1
+EBUILD selinux-timidity-9999.ebuild 288 BLAKE2B b0a98e55a1b6f3afbee3a385e271043a9584d4f4e8433ac130fd8ee3c96f7b13ba283213b45c1c77ab9305bd25e2e2aa88ad7b8b74ed5cafdd3780013e142ede SHA512 c640370807519cc241074798ccc3193a9ac90fb7f6761e46ff901d6989c3b75a9b5fc66848a7f5c884ebe67a232cd12514867f30d9664f7c6cef285d21a363e1
 MISC metadata.xml 318 BLAKE2B 1b053789156ce3b2dbd11a7c0640cb00539bd706d6f69ceffcc71c3c0449b75c37d2ad4eeda684df5ae541044d43495ce6e362df89c25f73eb5c85755ef5f34c SHA512 60ed41e8c07067ddc123bcf078ffa3448facf9eb0bdd79f59031bc75ad1f46ee6fdd512a542f5240752bd3ce548e1dd782c027fa9e3f42375cff6e89fa46dc8b
diff --git a/sec-policy/selinux-timidity/selinux-timidity-2.20180114-r2.ebuild b/sec-policy/selinux-timidity/selinux-timidity-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..4be6efafc96c
--- /dev/null
+++ b/sec-policy/selinux-timidity/selinux-timidity-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 087a9e76ffa7..4be6efafc96c 100644
--- a/sec-policy/selinux-timidity/selinux-timidity-9999.ebuild
+++ b/sec-policy/selinux-timidity/selinux-timidity-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-tmpreaper/Manifest b/sec-policy/selinux-tmpreaper/Manifest
index 2fb9546eca71..9b638b827bf9 100644
--- a/sec-policy/selinux-tmpreaper/Manifest
+++ b/sec-policy/selinux-tmpreaper/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-tmpreaper-2.20170805-r2.ebuild 288 BLAKE2B dad452a94ececde170d030
 EBUILD selinux-tmpreaper-2.20170805-r3.ebuild 288 BLAKE2B dad452a94ececde170d03032b01ee5a72eabca65931620f9d951771bb510033d866076e10d362582d99f4d3b27ce834d6fe28b9a70ce0543ba9fa20478b1e8d4 SHA512 49f6cfd39c6a1f93e35bb87cd916e0a5a13df4844cc891967e6cb5387728906b8cddc3f9aafc85d04800ef1846fe1e1ec6a25d706b6aee8312daab14e4da7ad8
 EBUILD selinux-tmpreaper-2.20170805-r4.ebuild 290 BLAKE2B 56921a949b657693d8af4e88720e091221892552902b445e05951ddc874f007f4ac7a2006a5751e01c94fe13e86b31ad5d057a75e2ecd0f67c40bddfaf0fc969 SHA512 5afd9ac9c7cb97240ea82e5f171f32c491cb1c5c6398434eb51a7524b7f69fdcd6d51c9275cb97f1078802909b756650d1d2e605c080af4f9643406bfdbf0c30
 EBUILD selinux-tmpreaper-2.20180114-r1.ebuild 288 BLAKE2B 26116c16c3217215d50c831e8d89536b99647d499d08f7824a2e2272a867eeb9022673c92aabbf92d4e5909179691c095736ef9bce9a047da7d1ef847f7d3981 SHA512 97e4941595414d6903cc63ce4c4668ab12f553ecc31c8cee38340ef55f120240766b07ed1096a1809a916bf4193477ced144583460cefb9a4f0169ed40fdd4be
-EBUILD selinux-tmpreaper-9999.ebuild 290 BLAKE2B 56921a949b657693d8af4e88720e091221892552902b445e05951ddc874f007f4ac7a2006a5751e01c94fe13e86b31ad5d057a75e2ecd0f67c40bddfaf0fc969 SHA512 5afd9ac9c7cb97240ea82e5f171f32c491cb1c5c6398434eb51a7524b7f69fdcd6d51c9275cb97f1078802909b756650d1d2e605c080af4f9643406bfdbf0c30
+EBUILD selinux-tmpreaper-2.20180114-r2.ebuild 290 BLAKE2B 2527649cf5a2ad0d5605c95c96cbaddefc09e0d5e3a8badaee01c93f607e47845d98925637f941cdd1ed50abb68b7647904f3fcbc9055b37b66c56b57f0c47d4 SHA512 c4a045e537c99a55553d4f0dcaaed5d9eb12050e1898ca9192b929663bded2d65c1b0201bbfa4f241df979eb827556e3366053368155b89a2bf7a571fc977fa9
+EBUILD selinux-tmpreaper-9999.ebuild 290 BLAKE2B 2527649cf5a2ad0d5605c95c96cbaddefc09e0d5e3a8badaee01c93f607e47845d98925637f941cdd1ed50abb68b7647904f3fcbc9055b37b66c56b57f0c47d4 SHA512 c4a045e537c99a55553d4f0dcaaed5d9eb12050e1898ca9192b929663bded2d65c1b0201bbfa4f241df979eb827556e3366053368155b89a2bf7a571fc977fa9
 MISC metadata.xml 319 BLAKE2B ea0ed6217581afe0a106bb750288395d119c9b49aff567208af66f8eec7ea9a9b33aab1f8e267ea7a06b47cdbbed49e8c5718f6f342784c7fac7068785655416 SHA512 1968fd2f682e983d15fb072d2dab31a3aa7e7a25a6fc29d0e66639719c4de662d664864541e5533dc968d7a34551658db31a485a291e3c7dc7f59d649b1f7c34
diff --git a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20180114-r2.ebuild b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..49add2559ade
--- /dev/null
+++ b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 8db99f896b5e..49add2559ade 100644
--- a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-9999.ebuild
+++ b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-tor/Manifest b/sec-policy/selinux-tor/Manifest
index ffd95068de4f..d8151dd8be8a 100644
--- a/sec-policy/selinux-tor/Manifest
+++ b/sec-policy/selinux-tor/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-tor-2.20170805-r2.ebuild 276 BLAKE2B c3e4e4b21e92ef0d6061f5ff393e
 EBUILD selinux-tor-2.20170805-r3.ebuild 276 BLAKE2B c3e4e4b21e92ef0d6061f5ff393ecdfb42de44afcd6164564c30973d2388cf3815bad793d534b504c7debcfcd4f5a7b594d71b4f7c8f2994b24e389467778a1b SHA512 0bf82fb9c60437e9c3bce0b6d9f90e1f2282416911379c25dd43c6c9e313029718eaf2800e11f7ecc114d82d69a033a5b13666ffeb39f857e682548dc72c2d22
 EBUILD selinux-tor-2.20170805-r4.ebuild 278 BLAKE2B df8a2d4cd86861bd373ea420e1d706df752400d9bfdba1910145a1a9d8bd828dcdf12aafa83796aa11c3a2e4bb765d0606572e15ef2b3d2f19d5c44f4f32813b SHA512 c481337bbf2245cdacdd9d3e73b9d97380c0d8e591e3f2208a0559624aac3a1ff43ac7da355968fee73257fc11aa26177aa1a019ec9a847c734c44b88ae0fb24
 EBUILD selinux-tor-2.20180114-r1.ebuild 276 BLAKE2B d2ce311c09328d953af9560aa97943188c13e8bd6bfc809f390c8a03a1b574e2a6e1e2fd66ba0e4ac1b54ce3221919bd4bef1c4e10e87b86161c6fb19fd1e78d SHA512 db5af08c64c0a0fa846341fa61a59ddddae8b5ede19297a1d96a14f4bebb2c4079075f134d298e2058261a564531efc18bb13ccf8a0c79fee12d44012f6d2cc1
-EBUILD selinux-tor-9999.ebuild 278 BLAKE2B df8a2d4cd86861bd373ea420e1d706df752400d9bfdba1910145a1a9d8bd828dcdf12aafa83796aa11c3a2e4bb765d0606572e15ef2b3d2f19d5c44f4f32813b SHA512 c481337bbf2245cdacdd9d3e73b9d97380c0d8e591e3f2208a0559624aac3a1ff43ac7da355968fee73257fc11aa26177aa1a019ec9a847c734c44b88ae0fb24
+EBUILD selinux-tor-2.20180114-r2.ebuild 278 BLAKE2B 0a70e42a3a9c2e297ed165915dd240d27942e9893109f97f058bbef207532794460cff8282c8949d94a4829f1b83f4d71e0723f1fe31e6f191690ee86c481caa SHA512 5a62f313dee2a3cbfae56d56047abb1e36213fb80dfdad25c9939156f641cfd5516bb8e580cf1ebcb72106c48dc8ae8a66857f59d4cccd684092c08e0dc46423
+EBUILD selinux-tor-9999.ebuild 278 BLAKE2B 0a70e42a3a9c2e297ed165915dd240d27942e9893109f97f058bbef207532794460cff8282c8949d94a4829f1b83f4d71e0723f1fe31e6f191690ee86c481caa SHA512 5a62f313dee2a3cbfae56d56047abb1e36213fb80dfdad25c9939156f641cfd5516bb8e580cf1ebcb72106c48dc8ae8a66857f59d4cccd684092c08e0dc46423
 MISC metadata.xml 313 BLAKE2B 15b3197ed234755ff54a8faef2fc30b62a520e485d33eb6848a86ec7204409a69791313d94fada955ead14545009f5a8f15f8caafa4e6326e096d3dc53ce77d8 SHA512 812fc17e450c14ed18f79425f4db05719e57e9baa896dde3775434e6e59c93148b95ca466b4aa8113066c442a577bc526ef52037adbf2c54468645c4055c87be
diff --git a/sec-policy/selinux-tor/selinux-tor-2.20180114-r2.ebuild b/sec-policy/selinux-tor/selinux-tor-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..5aa55ea732f0
--- /dev/null
+++ b/sec-policy/selinux-tor/selinux-tor-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 a35c78a3000b..5aa55ea732f0 100644
--- a/sec-policy/selinux-tor/selinux-tor-9999.ebuild
+++ b/sec-policy/selinux-tor/selinux-tor-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-tripwire/Manifest b/sec-policy/selinux-tripwire/Manifest
index 3b58fa157428..53c8917b2b5a 100644
--- a/sec-policy/selinux-tripwire/Manifest
+++ b/sec-policy/selinux-tripwire/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-tripwire-2.20170805-r2.ebuild 286 BLAKE2B 8b517ce0d632256f34762b0
 EBUILD selinux-tripwire-2.20170805-r3.ebuild 286 BLAKE2B 8b517ce0d632256f34762b06b3023f0a83ef7e3c37e8e0757f31025992016cd3483c6e32a10918de339843bf96cd99f6f2131965b683405577f5314b43508e60 SHA512 561dc8b5350abb44cfce8fd91f334adf5fe6c466086548fb3ebe17247ea495492e39b28523c310781e13fba30566a6182048978af4c9d5d39ff51de1947d10cc
 EBUILD selinux-tripwire-2.20170805-r4.ebuild 288 BLAKE2B ab5e624d8cb3185cd58ba25a81c99dc2951ea0672acda39ead50076b377a3b5c00b1ea807998157d8f9c6f45353bc22075f5518e340a3e5af5e10d42973dc68a SHA512 311e9920ea49a99401733a5a13073a60195fde6782853866a4e06d5a5e17deee17e30063f41c13e2f3bc0b52b079df0a323b976301a0d701260506fd7da6e173
 EBUILD selinux-tripwire-2.20180114-r1.ebuild 286 BLAKE2B 07652a857c30bb9dca904f31c7875ea9b7c8ae53cddc2c812b10dc06f28e95ede803533a22237fba9d117f2dc9d8bf5d3035fa0cdc2ee35c26c0a2cb71360646 SHA512 7fd1e64afeec50861992eba325a9fcdd8162def157ffdcec212ad2b24112cb038ae722757d4dbceb2e7035492eb7f9770daea90ba26035ac84b23574478a7eab
-EBUILD selinux-tripwire-9999.ebuild 288 BLAKE2B ab5e624d8cb3185cd58ba25a81c99dc2951ea0672acda39ead50076b377a3b5c00b1ea807998157d8f9c6f45353bc22075f5518e340a3e5af5e10d42973dc68a SHA512 311e9920ea49a99401733a5a13073a60195fde6782853866a4e06d5a5e17deee17e30063f41c13e2f3bc0b52b079df0a323b976301a0d701260506fd7da6e173
+EBUILD selinux-tripwire-2.20180114-r2.ebuild 288 BLAKE2B dc176e63b144a1745cc89da3b2cb7b3f0a32088fc57c24d5f0450bab59b241586fb3a660a3a86a43132466d1139858b609a7667da81d20d04584acffaa073e27 SHA512 3c6bdb088be56830df7815cdb56f0b4ae95bf1d97a7c937ee310c71957b41bfd903c85d6c112029d5075aaf7ec6bbe935a14984707f0b82661b5de88eba40774
+EBUILD selinux-tripwire-9999.ebuild 288 BLAKE2B dc176e63b144a1745cc89da3b2cb7b3f0a32088fc57c24d5f0450bab59b241586fb3a660a3a86a43132466d1139858b609a7667da81d20d04584acffaa073e27 SHA512 3c6bdb088be56830df7815cdb56f0b4ae95bf1d97a7c937ee310c71957b41bfd903c85d6c112029d5075aaf7ec6bbe935a14984707f0b82661b5de88eba40774
 MISC metadata.xml 318 BLAKE2B 744c496ac8614aaa78beda534dc43782a35574148fd25e41bb49fcba13438d0f0ab15b7d579d055f2e18cc3f950e808e87ee91c5310c7631778c0f6943da2da4 SHA512 10c01fcc08c2dbc4367fb8e5f2e5c336794d5d15fef2511047d12e45c2fc88c3456d57022aecc5a131d7d267841e9123a84dcd6d06c87f2967cdc52651d9dd2c
diff --git a/sec-policy/selinux-tripwire/selinux-tripwire-2.20180114-r2.ebuild b/sec-policy/selinux-tripwire/selinux-tripwire-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..748273d6d53f
--- /dev/null
+++ b/sec-policy/selinux-tripwire/selinux-tripwire-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 074454b60692..748273d6d53f 100644
--- a/sec-policy/selinux-tripwire/selinux-tripwire-9999.ebuild
+++ b/sec-policy/selinux-tripwire/selinux-tripwire-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-ucspitcp/Manifest b/sec-policy/selinux-ucspitcp/Manifest
index 0aec767bfcbd..cf7b4efbe5b4 100644
--- a/sec-policy/selinux-ucspitcp/Manifest
+++ b/sec-policy/selinux-ucspitcp/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-ucspitcp-2.20170805-r2.ebuild 286 BLAKE2B c163478f66be047b26d3dd1
 EBUILD selinux-ucspitcp-2.20170805-r3.ebuild 286 BLAKE2B c163478f66be047b26d3dd1cfba1bcbb72f6fb4b82d3abd11d9e4ba2f6099f86991a691fcf0364312d5d7315bd5f4e144e10384a293ae36b7e0948a122b0112d SHA512 6d9dcc64dd19a6304fe199d5e62c35514e3f6e7f1b5294f396b12e17aa38232eb9bc6923d346bae26c08f219d73a3a64edc4563fad9c453c12e36b4d1a67b706
 EBUILD selinux-ucspitcp-2.20170805-r4.ebuild 288 BLAKE2B b662efe6003d7613e17712d7a8f7220aea43b35457784e9d1d56a98253857c40b389e2836d15dd1fc41c973031493fe7cc74cea68bb9930eb0ab91683b378bda SHA512 ed8c8ebe92d1e8fe14ecb3486a3a90a5a8767b48ad2be3e9121a18be0051f397c4652cb70016a5accfc7fcbfdf393b6da7ee2e3e863ca1157e0f4673cea3dcfe
 EBUILD selinux-ucspitcp-2.20180114-r1.ebuild 286 BLAKE2B 9e02eebf767e31a069a3c7c80a48b89e332a402482d79639e99e4962555e73a79860e9bdddc7b35cd85ac0e008198b0041e4090255c06f692657d79c03c18c63 SHA512 b189955b5d84f2da72f90fbf3c8ffe7ad6245bacdd25c46d977c05fde4d9524acb6b42721f097ec975b0b0aada795515e3fcb5d21250a0d33f494b251f37dfa5
-EBUILD selinux-ucspitcp-9999.ebuild 288 BLAKE2B b662efe6003d7613e17712d7a8f7220aea43b35457784e9d1d56a98253857c40b389e2836d15dd1fc41c973031493fe7cc74cea68bb9930eb0ab91683b378bda SHA512 ed8c8ebe92d1e8fe14ecb3486a3a90a5a8767b48ad2be3e9121a18be0051f397c4652cb70016a5accfc7fcbfdf393b6da7ee2e3e863ca1157e0f4673cea3dcfe
+EBUILD selinux-ucspitcp-2.20180114-r2.ebuild 288 BLAKE2B a3803a5442460e2e3e8c0237f2aabf5250b41a484bd2711310b219203c03bec1b0a5278cb6a450d341ef83c9499369420b91728ac4319d4a9c92f1179e9ae7ff SHA512 78ba3554ee13bae7ccef94063bf137c9bb54f4caaacea99385a7a1d99468f0aedef4b688d3523df16dbd761cd9f2ef0056e1ab660519160b62a9bb9333e38d4a
+EBUILD selinux-ucspitcp-9999.ebuild 288 BLAKE2B a3803a5442460e2e3e8c0237f2aabf5250b41a484bd2711310b219203c03bec1b0a5278cb6a450d341ef83c9499369420b91728ac4319d4a9c92f1179e9ae7ff SHA512 78ba3554ee13bae7ccef94063bf137c9bb54f4caaacea99385a7a1d99468f0aedef4b688d3523df16dbd761cd9f2ef0056e1ab660519160b62a9bb9333e38d4a
 MISC metadata.xml 318 BLAKE2B 03d0271ee0ea320497095125a6b94d19a79b952375d2514b3fa3cdfeebf88cc1d1c5b0927f4f3fa30216005a6a7b3c53e14b30f5d40d0287e380c10ecdb555e4 SHA512 bc88dff90d9f7ef337ce73f739422a0a0463980c87836abcd07beff56a122d7c9a7503007fe8bfd9a93cc86d61ee27a766c3d72b5562e7d7d52599c12228c41a
diff --git a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20180114-r2.ebuild b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..a8d12b4fad56
--- /dev/null
+++ b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 4f0acd849293..a8d12b4fad56 100644
--- a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-9999.ebuild
+++ b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-ulogd/Manifest b/sec-policy/selinux-ulogd/Manifest
index 05f5ca1e7eb3..d38cc881a87c 100644
--- a/sec-policy/selinux-ulogd/Manifest
+++ b/sec-policy/selinux-ulogd/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-ulogd-2.20170805-r2.ebuild 280 BLAKE2B 36ccde1987f0c37ff1c01375aa
 EBUILD selinux-ulogd-2.20170805-r3.ebuild 280 BLAKE2B 36ccde1987f0c37ff1c01375aaf465ff628ca736d402a2924c3bc1b37ba2d448f381537e821ceadc42f16eb123af9934de974527e567d55380d7992b423e3dea SHA512 04076908cd60f3aa43250ef5108c3faaa25e8107579aab71a31c2d2730d56dca2a77f703f93e864dde02ac5f5da9a619eab44a12405b253be78150536a6e31cb
 EBUILD selinux-ulogd-2.20170805-r4.ebuild 282 BLAKE2B b5ff66cc3d27754a8b7405dbd0634c45b1ca18c730e8384f25dfd25780b1b22a2c7b65dc8aab9da226908c281b024b15c93167a556183936f96c9f02f6eb65c6 SHA512 91ec1489c4c0059d72a8e468053d48f33f1e68b8114606784f3bb01e106fd042019dc589c65c455ae86b6e86d4b2e8bf0fca0e260882e9291bf71ab1031fd787
 EBUILD selinux-ulogd-2.20180114-r1.ebuild 280 BLAKE2B 5b9b0db1fd19a4b65bf0a58316352719907f06787be1dc306b4c1a2aa4f6f0c31f1d62fb37a321f2a95ead31c0ed478eadada0dec7a76dbabd922a2ceff4a03a SHA512 f8d4f17fde015bffd696615295c2f19c0798c9413b8e1fb20400b98ff8b83f489d6c1b21a69795e6d4e69c5d5bbb0a3253342f9c0b73fa5380504d80ef730c7a
-EBUILD selinux-ulogd-9999.ebuild 282 BLAKE2B b5ff66cc3d27754a8b7405dbd0634c45b1ca18c730e8384f25dfd25780b1b22a2c7b65dc8aab9da226908c281b024b15c93167a556183936f96c9f02f6eb65c6 SHA512 91ec1489c4c0059d72a8e468053d48f33f1e68b8114606784f3bb01e106fd042019dc589c65c455ae86b6e86d4b2e8bf0fca0e260882e9291bf71ab1031fd787
+EBUILD selinux-ulogd-2.20180114-r2.ebuild 282 BLAKE2B 271edd0a01d3d83716b0c49f60371d8e8ae30f0b99865225ae68fa4328b8938471c600d2ad62465c7d655fcc100f200da23c9efbc6d390e64cf5ae53424e5b21 SHA512 c7e5c24a84ea312fa348c75f8f382c1bed5cf919a3b43fe6f42e3a19ebee44457d57b3924b63e0c19fd60e0acb6fd66a7cac788a50c682ea193e6eec237f870c
+EBUILD selinux-ulogd-9999.ebuild 282 BLAKE2B 271edd0a01d3d83716b0c49f60371d8e8ae30f0b99865225ae68fa4328b8938471c600d2ad62465c7d655fcc100f200da23c9efbc6d390e64cf5ae53424e5b21 SHA512 c7e5c24a84ea312fa348c75f8f382c1bed5cf919a3b43fe6f42e3a19ebee44457d57b3924b63e0c19fd60e0acb6fd66a7cac788a50c682ea193e6eec237f870c
 MISC metadata.xml 315 BLAKE2B 67250dc62189c5174385ab19a3bc5d680e3d30aa2e0189fcfa9368489024c9feacb2a2bae5da5e9ef87b54a4b2804481604e773dcd6a1207206489f2300a5f4f SHA512 43d0ad46433208b51b68ed06a3529a2895e9cc835f233f69b38034ddb07addf44c66da5054c0cb87289aee78af243494af13cd6eeda89dc122baddb1bf0f2cc5
diff --git a/sec-policy/selinux-ulogd/selinux-ulogd-2.20180114-r2.ebuild b/sec-policy/selinux-ulogd/selinux-ulogd-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..8dd9622e1527
--- /dev/null
+++ b/sec-policy/selinux-ulogd/selinux-ulogd-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 000c027b33f6..8dd9622e1527 100644
--- a/sec-policy/selinux-ulogd/selinux-ulogd-9999.ebuild
+++ b/sec-policy/selinux-ulogd/selinux-ulogd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-uml/Manifest b/sec-policy/selinux-uml/Manifest
index e021587090b5..b14ede10c6d5 100644
--- a/sec-policy/selinux-uml/Manifest
+++ b/sec-policy/selinux-uml/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-uml-2.20170805-r2.ebuild 276 BLAKE2B e9c68a8a382a46a291a36f0c3574
 EBUILD selinux-uml-2.20170805-r3.ebuild 276 BLAKE2B e9c68a8a382a46a291a36f0c3574af94b25e70c68f6e8efc9967f03b5bbc6558297b9ed827bd6436985635ee383f68552a2688c9a929fafe1698f5448e78cc25 SHA512 942ebcc16866f3dd0eb7afd41ad396589c446ab2d9ffe68e6dfaeb650e366ee562b654174e4ab3ca6612f74e38a2a2a531603b19452a52bae0ff88944fabf2a2
 EBUILD selinux-uml-2.20170805-r4.ebuild 278 BLAKE2B dd522d6033cdb4b2f6df62bb894a07a02c734d21cc6cf6f26890940bc3c2c88fb84798779840ed57842e542e4255c48f0a5357f76d49639199253fd749969da7 SHA512 3660735270f80018260baf7243d6d61dc4daa9ce24eacd90c7cf53d51de6e6c1872df872eb660f08509d6706baf9ee6653becf80f8e1b1824b85773c988731fd
 EBUILD selinux-uml-2.20180114-r1.ebuild 276 BLAKE2B 74b27f2336c0d22a542f59ee583d829eac82184f2099981f91353efcdccaaf0a90bfb27b6760f60bc14369de34b4574714075fb6c2a1c8bc24b7c33cc61e086f SHA512 9a22161b350d341f258623d2c85b5f7fe5d096c5f33b6099d07d996fced3cf4fec021248ec9a725e40a0afd85aabb842ea950c1a40b0cfe5e089329fdfe3a5f7
-EBUILD selinux-uml-9999.ebuild 278 BLAKE2B dd522d6033cdb4b2f6df62bb894a07a02c734d21cc6cf6f26890940bc3c2c88fb84798779840ed57842e542e4255c48f0a5357f76d49639199253fd749969da7 SHA512 3660735270f80018260baf7243d6d61dc4daa9ce24eacd90c7cf53d51de6e6c1872df872eb660f08509d6706baf9ee6653becf80f8e1b1824b85773c988731fd
+EBUILD selinux-uml-2.20180114-r2.ebuild 278 BLAKE2B 67c22ffca537045af49ededac58b90af9c187073538db06db9c0989052a1cea018c13737185bc6c464e6096aceb2596ad1fc7c52651495b9aedbaf483be85bb7 SHA512 629e261652ad69cd0b879bc17abc6d39d3da4bc99100bf7db812c995e5853ab66d301b0b1d6c17e8020efde84d9f8100c568e32224fca2a1411af1ba45ffc230
+EBUILD selinux-uml-9999.ebuild 278 BLAKE2B 67c22ffca537045af49ededac58b90af9c187073538db06db9c0989052a1cea018c13737185bc6c464e6096aceb2596ad1fc7c52651495b9aedbaf483be85bb7 SHA512 629e261652ad69cd0b879bc17abc6d39d3da4bc99100bf7db812c995e5853ab66d301b0b1d6c17e8020efde84d9f8100c568e32224fca2a1411af1ba45ffc230
 MISC metadata.xml 313 BLAKE2B 5cfff015c6be184861283a7428c346b62c890bbbc860ab8dfef6cdbca1483b380167530a5d40bf3873c10499d6c889e883621f51f835947e1af61d14b271b763 SHA512 8baf21630b68613adafb49e007574ff1f62067c7f77ddacbf7bce11289e02b9a6c22fc89430ffac207615fbe28efb4384bd29abc36d10616b08c427a2cbd61db
diff --git a/sec-policy/selinux-uml/selinux-uml-2.20180114-r2.ebuild b/sec-policy/selinux-uml/selinux-uml-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..64e52e582f92
--- /dev/null
+++ b/sec-policy/selinux-uml/selinux-uml-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 b6515dea628a..64e52e582f92 100644
--- a/sec-policy/selinux-uml/selinux-uml-9999.ebuild
+++ b/sec-policy/selinux-uml/selinux-uml-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-unconfined/Manifest b/sec-policy/selinux-unconfined/Manifest
index 6019c37c0223..113dadc7596b 100644
--- a/sec-policy/selinux-unconfined/Manifest
+++ b/sec-policy/selinux-unconfined/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-unconfined-2.20170805-r2.ebuild 290 BLAKE2B 3848b3489bde7117a1132
 EBUILD selinux-unconfined-2.20170805-r3.ebuild 290 BLAKE2B 3848b3489bde7117a1132261c2ac7f09d367282afbec1150a2315f0de28e45d737c9ffc3c4178df9fd3b961eb2bd42e34119e97d25a8fedf4c9e3d793c015708 SHA512 8285596975ddb919612ed132de92db0c2b15fd4e31edb44c99cc60c2c0d25c0485d151cb88c6906bd4208cb85bb76cc59f775a2f90f1e679dc2140ac18d6a7f8
 EBUILD selinux-unconfined-2.20170805-r4.ebuild 292 BLAKE2B b23a44cf9d7c3fa3d77eaf44da007d28ca8ebc2c31b4502522d08b10ab36315b64e6f185115aa8f47918313b2b6baa27f80acc3784c3c03c811c8a997bac01b0 SHA512 8c12825359a1bafb9003732e3823264286eefc2c395196c14437104e4861235a29f6a9a35be9fd7daa776c748e9b9d337ec2948bc2b458079d1bbf3307d96a24
 EBUILD selinux-unconfined-2.20180114-r1.ebuild 290 BLAKE2B 8f2d50a8b216647271f45dbd2df2afaa9ab26362a110703a1964ecb377b3eaf5b26aa0d298dd1ff5a16b2524a518ea37b3738be1177c4c22b42141bf75708af7 SHA512 af02d7f63bbd4eb8316f597e7c5b55e9f6a04345853a115a8c76d6399a587bebf9cf036734328985a044e55e745432540c38fbc4456e0aa2baafdc2e24b210fb
-EBUILD selinux-unconfined-9999.ebuild 292 BLAKE2B b23a44cf9d7c3fa3d77eaf44da007d28ca8ebc2c31b4502522d08b10ab36315b64e6f185115aa8f47918313b2b6baa27f80acc3784c3c03c811c8a997bac01b0 SHA512 8c12825359a1bafb9003732e3823264286eefc2c395196c14437104e4861235a29f6a9a35be9fd7daa776c748e9b9d337ec2948bc2b458079d1bbf3307d96a24
+EBUILD selinux-unconfined-2.20180114-r2.ebuild 292 BLAKE2B 914fa1563758b053ff64220467e435a7a59ba0bfdcac5913b9609796ec6e678dc32efa6b0e247381404903db99dd3d79153e0bbacf57dc4e06c8e0d006160936 SHA512 4ca5def8ee8828cff09059b1474cd53a06b795353b15f5527f31e3a5e3efaab13adefed65367747fbda0cc8f07358a33e3400aa4e8ac82fa45948601692eef50
+EBUILD selinux-unconfined-9999.ebuild 292 BLAKE2B 914fa1563758b053ff64220467e435a7a59ba0bfdcac5913b9609796ec6e678dc32efa6b0e247381404903db99dd3d79153e0bbacf57dc4e06c8e0d006160936 SHA512 4ca5def8ee8828cff09059b1474cd53a06b795353b15f5527f31e3a5e3efaab13adefed65367747fbda0cc8f07358a33e3400aa4e8ac82fa45948601692eef50
 MISC metadata.xml 328 BLAKE2B 87e024bb413e0c65f34313030016af3ead498111d26844172eb61cfdc17c6605ea41975127ed67f33b5c905a4a7095b2661288ecd4e383a314425f3661602297 SHA512 dcf584f01f9b74b9e5196147219616837c1c46a73b258a37ddd8d183b9bd61d6c0819d92e27390d67b4d6d01b8b1a1447010d6437459a329c3eaa4a79f39b050
diff --git a/sec-policy/selinux-unconfined/selinux-unconfined-2.20180114-r2.ebuild b/sec-policy/selinux-unconfined/selinux-unconfined-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..43c9b7b8e9b3
--- /dev/null
+++ b/sec-policy/selinux-unconfined/selinux-unconfined-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 11d2e71947f3..43c9b7b8e9b3 100644
--- a/sec-policy/selinux-unconfined/selinux-unconfined-9999.ebuild
+++ b/sec-policy/selinux-unconfined/selinux-unconfined-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-uptime/Manifest b/sec-policy/selinux-uptime/Manifest
index 709b68ffe13a..af1672e362c3 100644
--- a/sec-policy/selinux-uptime/Manifest
+++ b/sec-policy/selinux-uptime/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-uptime-2.20170805-r2.ebuild 282 BLAKE2B d103c817448e27aedbeae7fcc
 EBUILD selinux-uptime-2.20170805-r3.ebuild 282 BLAKE2B d103c817448e27aedbeae7fcc467e1d35636e1c177eff597dcc97629e0f6ebb87a74e9590f3f27c9f5ac21a1b0a32f4dc73ce50f10a21a11327ca3b5cb3e39bd SHA512 6f164e8afd353091b8760c70a1f52e3d66e5c0ed0fcedcc9e15d95b89948c800d2a2008e890205841e9a090e6b68abd2bd60cf670e8b3abcf219cfae76e0d229
 EBUILD selinux-uptime-2.20170805-r4.ebuild 284 BLAKE2B def8d9552dce76000c4481cf2dfed87c67ad5cc6b58cb8bbec1b24fbebd89501644914fd24e96ee4c05283a1092649affeca656129c57c85b64cb483c842158e SHA512 0ded768478c416e640d9ec589aea705a51bfd4ebdc3476c8173e8b07f399fa3a55a9b4062e89b43d96fcc648bcd368298af7f7e59817d3eca412babaaa677549
 EBUILD selinux-uptime-2.20180114-r1.ebuild 282 BLAKE2B 4a587715bc8740e154285ffdffa1bed01e580ca467680340a1c9e44a4b7e6267b667ff47cfa2cadce789269fb811db5be13357af114287ab2c7be3bfb0f20861 SHA512 df876d308c800b59741f3ec39c12182f89d7553dc8d8f7f31742736b944bd197f00ccacba7375c275f98ec97980d271f9d31d703b31b92fd4ab9f58a22718e3a
-EBUILD selinux-uptime-9999.ebuild 284 BLAKE2B def8d9552dce76000c4481cf2dfed87c67ad5cc6b58cb8bbec1b24fbebd89501644914fd24e96ee4c05283a1092649affeca656129c57c85b64cb483c842158e SHA512 0ded768478c416e640d9ec589aea705a51bfd4ebdc3476c8173e8b07f399fa3a55a9b4062e89b43d96fcc648bcd368298af7f7e59817d3eca412babaaa677549
+EBUILD selinux-uptime-2.20180114-r2.ebuild 284 BLAKE2B 78cc257948b53ece40997fc64a4485f654edd36e5590a40be2e3a0f05761b72986e2a956d295dce808712d5112a557b745ec79e00f885e4592021442e761b217 SHA512 2b962f0e37309daaf3585d312c8b28a008ba8377df136028b6296561ac7eae07cfb6b0b1536aa6b05270043270e4f20d2e68130379e76025b0bda033ea784bd8
+EBUILD selinux-uptime-9999.ebuild 284 BLAKE2B 78cc257948b53ece40997fc64a4485f654edd36e5590a40be2e3a0f05761b72986e2a956d295dce808712d5112a557b745ec79e00f885e4592021442e761b217 SHA512 2b962f0e37309daaf3585d312c8b28a008ba8377df136028b6296561ac7eae07cfb6b0b1536aa6b05270043270e4f20d2e68130379e76025b0bda033ea784bd8
 MISC metadata.xml 316 BLAKE2B acf9ae252e00852dd1e33874f4fb0cde71272e94c531f5a3efc4075426b883ba36564d25b107b68277ec09bcad64bd36e5a20e6a248098f916ebe6ee690a2b6b SHA512 9ed46568e9691f16b8574be220647e054032aa60cee04ddd1d69c739a6f7afeadef8bfd95d81f238339a9a4b2276190328c49d57c99d0a57bb2c16d63d6777f2
diff --git a/sec-policy/selinux-uptime/selinux-uptime-2.20180114-r2.ebuild b/sec-policy/selinux-uptime/selinux-uptime-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..ebc62cef7c80
--- /dev/null
+++ b/sec-policy/selinux-uptime/selinux-uptime-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 7708280c3c98..ebc62cef7c80 100644
--- a/sec-policy/selinux-uptime/selinux-uptime-9999.ebuild
+++ b/sec-policy/selinux-uptime/selinux-uptime-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-usbmuxd/Manifest b/sec-policy/selinux-usbmuxd/Manifest
index 28ae4b861870..b72ebf3051b5 100644
--- a/sec-policy/selinux-usbmuxd/Manifest
+++ b/sec-policy/selinux-usbmuxd/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-usbmuxd-2.20170805-r2.ebuild 284 BLAKE2B 75c093f7f65a7c8246bcc758
 EBUILD selinux-usbmuxd-2.20170805-r3.ebuild 284 BLAKE2B 75c093f7f65a7c8246bcc7580afc133554390c34eb95954a96ac1e0ca56a602c2cb385bcbcaa098d41cdd6d3f11b816a118105ee740965b0d6e1dbfaa9fa5fd9 SHA512 1815119dad2cfedc732af4fe1e09c6a648e28491d99a1ae7ef5308bdcc9c4ad554a77c299e99aa724fb756c5f81f528944b360cc8d06bb959ad6f19a30c24630
 EBUILD selinux-usbmuxd-2.20170805-r4.ebuild 286 BLAKE2B 6bd754efce5366674c40837a03bfe20c999423e4aaf0ca63d9b569017d0b507485344a4bce4f082963799f74577f03bab2ba93b7ea9f109bb77c0a02bea8fa9e SHA512 bdca5e59fcd6d50a58b3b0bca8cb7bd3fc832487800e92e5849aaac7bb79b7c339cdbcd44a45f922d05347886a5c4434b9f013886d8af4f5d27f9ad81f5aee0d
 EBUILD selinux-usbmuxd-2.20180114-r1.ebuild 284 BLAKE2B bd43f1a8aa1980fb0f0c06136bc681325fb14f2e19c000383550b105d66dd32e2285e5db25a193530ff51e293407f61221cf694db455d31681eb6c1c014fd4ed SHA512 76c603b69f0e3be496ef012fece147642228dad86d4f1d7c08cf0a509ac46e704121d0dbd9e18fe6a9c98d1964775a1962a51c67005babedd924a31fbc7f653c
-EBUILD selinux-usbmuxd-9999.ebuild 286 BLAKE2B 6bd754efce5366674c40837a03bfe20c999423e4aaf0ca63d9b569017d0b507485344a4bce4f082963799f74577f03bab2ba93b7ea9f109bb77c0a02bea8fa9e SHA512 bdca5e59fcd6d50a58b3b0bca8cb7bd3fc832487800e92e5849aaac7bb79b7c339cdbcd44a45f922d05347886a5c4434b9f013886d8af4f5d27f9ad81f5aee0d
+EBUILD selinux-usbmuxd-2.20180114-r2.ebuild 286 BLAKE2B 225a7eaf0f8c48afc6cde18fa9ff347f7d8e3b59ae81de1c546a8f59c76ac472f8d3648b91c841ec093a86c9bea6b5b28a1fd69950888a180fc941c4a967b8c7 SHA512 1b1c2c723d4d7e372b7b260a3ee43b9c731edd53f0da3a7616785ce1f2c7af9be4089e3361471d3f60fd486967217e7b17d345da327f9f98777155d79f40aa11
+EBUILD selinux-usbmuxd-9999.ebuild 286 BLAKE2B 225a7eaf0f8c48afc6cde18fa9ff347f7d8e3b59ae81de1c546a8f59c76ac472f8d3648b91c841ec093a86c9bea6b5b28a1fd69950888a180fc941c4a967b8c7 SHA512 1b1c2c723d4d7e372b7b260a3ee43b9c731edd53f0da3a7616785ce1f2c7af9be4089e3361471d3f60fd486967217e7b17d345da327f9f98777155d79f40aa11
 MISC metadata.xml 317 BLAKE2B f5a31afd9b4f2c569006e7f7ab0368ff7cc392f05a9cb008c845a897f357824d78f7ee2d7e35699d4b0d7c3137af53eaeb68eb4247c7a7acd188ceff5f1bdad3 SHA512 665ff350330f9449152e4d72346e30788b685ec475ed56d90cfa6666b719c99fe1c26ed45281febe03d6104fd7a41d4cc0458b4f72bfce59d019c4dd43fe4bc1
diff --git a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20180114-r2.ebuild b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..5b87f855a57e
--- /dev/null
+++ b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 df10f9c69bd5..5b87f855a57e 100644
--- a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-9999.ebuild
+++ b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-uucp/Manifest b/sec-policy/selinux-uucp/Manifest
index 4bdf197ffe46..2b76c28e4930 100644
--- a/sec-policy/selinux-uucp/Manifest
+++ b/sec-policy/selinux-uucp/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-uucp-2.20170805-r2.ebuild 372 BLAKE2B 0f41f095bea303adec173330138
 EBUILD selinux-uucp-2.20170805-r3.ebuild 372 BLAKE2B 0f41f095bea303adec173330138626724644e30479992e0777bb748bcb9a39e65fb1c5f050782c1744a3336d9dcc004b2368eab07a763bc286958d2351ffed1a SHA512 f85e587c59fed5c5c69970b56121c6915a472aaacce5dca472b031abf6433a37bc054db7d94ef403b1087e1cfa6f512f1cbb04a56090a3ec9cc316aa30b74a93
 EBUILD selinux-uucp-2.20170805-r4.ebuild 374 BLAKE2B aa30f6701c2bd77355bb6ec7df7a7fb60c93625a44ba64ad8948216d79434adf329865f8cfdd566f3221d373b761b6e6fc964883b8f76a8a2aac8f8d0165733d SHA512 35b9d4d7c054653612cd2cfa9ddad25bce2a509275b2bd65873e6f6df1dd5060ab68a8c7d67f62d9f3ab6beb214075c8e43b23e434bc9c6ecd3c6f7e347cfb8f
 EBUILD selinux-uucp-2.20180114-r1.ebuild 372 BLAKE2B 829306d55c826225634344d409c89ca464d915819973b48c089433c4e34226b8d034cdba686bbf604a7fe8b4300e8612aaece467a6a47ba585107df559a16533 SHA512 053a408f95ff21aa4057a436a1fe73b4cb3588adba43ccbd7d176223eca06c7fd0f26a182b59b02aa6520bc1b45b8cbeb2bcac69dfcdf7163f5218b58d016453
-EBUILD selinux-uucp-9999.ebuild 374 BLAKE2B aa30f6701c2bd77355bb6ec7df7a7fb60c93625a44ba64ad8948216d79434adf329865f8cfdd566f3221d373b761b6e6fc964883b8f76a8a2aac8f8d0165733d SHA512 35b9d4d7c054653612cd2cfa9ddad25bce2a509275b2bd65873e6f6df1dd5060ab68a8c7d67f62d9f3ab6beb214075c8e43b23e434bc9c6ecd3c6f7e347cfb8f
+EBUILD selinux-uucp-2.20180114-r2.ebuild 374 BLAKE2B b43917fad3380f37c043dc102680c66841db1dc8695e65dbee1b0e40406184b394397bb4a73f24e2fe7671a942bd3ee06c3996331fecb4040aaba70978b07e3d SHA512 f40375d8f5c935aa4c1eb223ba7e878bd9ea6674351cdd8aff2169959713aee58be1147270f1693675fc80785e99b5de0b821d913329afe25057b75898aae0ec
+EBUILD selinux-uucp-9999.ebuild 374 BLAKE2B b43917fad3380f37c043dc102680c66841db1dc8695e65dbee1b0e40406184b394397bb4a73f24e2fe7671a942bd3ee06c3996331fecb4040aaba70978b07e3d SHA512 f40375d8f5c935aa4c1eb223ba7e878bd9ea6674351cdd8aff2169959713aee58be1147270f1693675fc80785e99b5de0b821d913329afe25057b75898aae0ec
 MISC metadata.xml 314 BLAKE2B 711a4df7837b6f37b01d35252b543c170ac51971121f7815136c9938708cd26dfc34bec50d5bff21afcf1afddf78043475db37aef1e12994b120403550ed04ef SHA512 aa9491ed1334875262b8071e567e17188fdbba3e6befe80fdcc42784848f2b843fba7cd1dbd9f6958f67a221fd838405859a946cbd487130348cf8ed922df174
diff --git a/sec-policy/selinux-uucp/selinux-uucp-2.20180114-r2.ebuild b/sec-policy/selinux-uucp/selinux-uucp-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..8c9d51902f24
--- /dev/null
+++ b/sec-policy/selinux-uucp/selinux-uucp-2.20180114-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 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 b52c5d01321a..8c9d51902f24 100644
--- a/sec-policy/selinux-uucp/selinux-uucp-9999.ebuild
+++ b/sec-policy/selinux-uucp/selinux-uucp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-uwimap/Manifest b/sec-policy/selinux-uwimap/Manifest
index b0ee219057e6..d0e96b59db43 100644
--- a/sec-policy/selinux-uwimap/Manifest
+++ b/sec-policy/selinux-uwimap/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-uwimap-2.20170805-r2.ebuild 282 BLAKE2B 32b942536c8f8aed1890a10be
 EBUILD selinux-uwimap-2.20170805-r3.ebuild 282 BLAKE2B 32b942536c8f8aed1890a10be671069f56271254b0fc9079ee7e7529b475fca99a5f364098ae5b432bc1fc9b9765ec77d386ba478f68a81d6fe27c51f9a56c1d SHA512 26a180cedda97c6a2b63f580e3d42b3d2617e54f6d2fc22ee37bb27b00a354c16f9d99bfeb9efae3e63ee137c8b707801642bce1a414724a92c2764b50e3df33
 EBUILD selinux-uwimap-2.20170805-r4.ebuild 284 BLAKE2B 0410d9cb9b22166b715cf866c1e628bac6b8785fa69b3d0cc24c4042161456e57fa693811f267187234cc55e18af213ce84482aa39aaa3becda0dc465219222d SHA512 ea0d57ddcc47bf7bcb03f8bef6be001159e64d07603066ff111011e79158070b4fd05101307df15d0b9977e1dfb01b57e41d81d0cc6537e19a8595a6b09a2191
 EBUILD selinux-uwimap-2.20180114-r1.ebuild 282 BLAKE2B bc36b21eda6e70b5842917c94e6b59120bfa09334d82dfa895919acfa4009f1276f4060b456b1e771c3cc7bd7ef7ff5dec1c1ce18e56212c67d46f90ca152c3b SHA512 0d0fac1daf81e01b62b3f58fc7d16773cb64db5af12c30df05b27e3b0d80db3599ede4a3b04a9cd10a41aaabb53c4e9fe23708fad97e1fcf041fc64fa5ce1ad4
-EBUILD selinux-uwimap-9999.ebuild 284 BLAKE2B 0410d9cb9b22166b715cf866c1e628bac6b8785fa69b3d0cc24c4042161456e57fa693811f267187234cc55e18af213ce84482aa39aaa3becda0dc465219222d SHA512 ea0d57ddcc47bf7bcb03f8bef6be001159e64d07603066ff111011e79158070b4fd05101307df15d0b9977e1dfb01b57e41d81d0cc6537e19a8595a6b09a2191
+EBUILD selinux-uwimap-2.20180114-r2.ebuild 284 BLAKE2B e6a617cdaaceadca1121513954c649500747428c27701619e7bf1e8d379dff8f0134eb25e6975c04eac61984d7ab19e40d2ef85a40a22b1452b6da4b0592c654 SHA512 cf20daef8204abad12f5fd44c7a56ec0b061a3485e578cc9f01dd1318363592e7f989646e5052509936661df51998a209b4c6704f9d567c533e55042952c0c54
+EBUILD selinux-uwimap-9999.ebuild 284 BLAKE2B e6a617cdaaceadca1121513954c649500747428c27701619e7bf1e8d379dff8f0134eb25e6975c04eac61984d7ab19e40d2ef85a40a22b1452b6da4b0592c654 SHA512 cf20daef8204abad12f5fd44c7a56ec0b061a3485e578cc9f01dd1318363592e7f989646e5052509936661df51998a209b4c6704f9d567c533e55042952c0c54
 MISC metadata.xml 316 BLAKE2B 25547926e63f1e897510bf7eabde2ebb5d7ad8643ef4225cf84e18d13f4652d3d194c501c617db3ba7c0a3f9afe63ddcc5a5b4b5367be18d3f016c7d7600e849 SHA512 687b16d372a27eb09ed8eadbd694b3ad9ff3ddcdee85aebc5cb685fe91767e6523bbd8db0a928d47bc3670a59966c474d6a761ba5d2f86bc44423693e52e6077
diff --git a/sec-policy/selinux-uwimap/selinux-uwimap-2.20180114-r2.ebuild b/sec-policy/selinux-uwimap/selinux-uwimap-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..51464c765d13
--- /dev/null
+++ b/sec-policy/selinux-uwimap/selinux-uwimap-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 8cb2b52fc63c..51464c765d13 100644
--- a/sec-policy/selinux-uwimap/selinux-uwimap-9999.ebuild
+++ b/sec-policy/selinux-uwimap/selinux-uwimap-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-uwsgi/Manifest b/sec-policy/selinux-uwsgi/Manifest
index bc16ebf12712..c9753a6f3718 100644
--- a/sec-policy/selinux-uwsgi/Manifest
+++ b/sec-policy/selinux-uwsgi/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-uwsgi-2.20170805-r2.ebuild 280 BLAKE2B 79615be4f169f9f358599a5fe5
 EBUILD selinux-uwsgi-2.20170805-r3.ebuild 280 BLAKE2B 79615be4f169f9f358599a5fe594ed6b70b74e24e6bc69f350483c2c639cd4622de51ca352f292fd651c19f44437a7a1d72e2604e18f1f130b766be63d989c34 SHA512 aa00a0db437f7be2e763f1f3d599cc806f0b8aeeb612c905c4c5f08e5cdd5957e0c29371c17e7b5b9a7bfe5109050475e03b90475f2352b466a9a20e29ee0b17
 EBUILD selinux-uwsgi-2.20170805-r4.ebuild 282 BLAKE2B 1a15a44986cb07125c7ed732c857352f5db782def08e9e21a9432475d395b3a6b67077b3806b7ffa818f9d4b72cabef6ef92ecad867ce833bb2a05e7d08e3b3f SHA512 6fb41475267d49f47b94baf66f6947a8b8c4c0d689b68cc228cdb4f6a5e52cdc96be9baba2abb7e92967dbfb61eb6c4c37f37d30705925a35bc6872c26ddcd68
 EBUILD selinux-uwsgi-2.20180114-r1.ebuild 280 BLAKE2B fce7c3b0ace16e9bef7322edf25d3b4624059002671195ebb32152005f4a6fea8b104316de17f2308b74b571071521ac07c22810ce12f9976aec7e009c683a88 SHA512 4ed7bc730e9a99d391c4c3081bb552f83b0d645904dd6b6ac82a0473492de9fa3f0221212551ba8ee555051386f71f3a699eaf40518259497bc2a60c286f0c63
-EBUILD selinux-uwsgi-9999.ebuild 282 BLAKE2B 1a15a44986cb07125c7ed732c857352f5db782def08e9e21a9432475d395b3a6b67077b3806b7ffa818f9d4b72cabef6ef92ecad867ce833bb2a05e7d08e3b3f SHA512 6fb41475267d49f47b94baf66f6947a8b8c4c0d689b68cc228cdb4f6a5e52cdc96be9baba2abb7e92967dbfb61eb6c4c37f37d30705925a35bc6872c26ddcd68
+EBUILD selinux-uwsgi-2.20180114-r2.ebuild 282 BLAKE2B 5dd0e9fb5d51973fcf59cf9c9e57ed6e5928c0085b2c37b1c9647f455d7aa9bb203c5d49cc9da554586baf130bde631eefceb2758a7ace82208fd22413d88574 SHA512 895532df4a13af9025d08e32904039bdd78fa647f36526c273077e88f6326e09c74ab2f6d48722a24911d62f5819a1f4f9a6fb0d907d5bde667d474c06b56668
+EBUILD selinux-uwsgi-9999.ebuild 282 BLAKE2B 5dd0e9fb5d51973fcf59cf9c9e57ed6e5928c0085b2c37b1c9647f455d7aa9bb203c5d49cc9da554586baf130bde631eefceb2758a7ace82208fd22413d88574 SHA512 895532df4a13af9025d08e32904039bdd78fa647f36526c273077e88f6326e09c74ab2f6d48722a24911d62f5819a1f4f9a6fb0d907d5bde667d474c06b56668
 MISC metadata.xml 315 BLAKE2B f7cf3dfb0a58fc7095e7c5dc17d33936021b6214f45265bca604f80752de8b2e75d35f4e742b44c21e10b2e8d86069767047e439f38089175b2ddeabfa89664c SHA512 14aeb44c80b9433064e670dd4f1036507965fead0068adc05311bd13eff263f7c177a20b30f4057d3e1af7fc708de09777d820f6a7ce7dee67d305a61d198e24
diff --git a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20180114-r2.ebuild b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..e25f57d05481
--- /dev/null
+++ b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 3f59203ab90f..e25f57d05481 100644
--- a/sec-policy/selinux-uwsgi/selinux-uwsgi-9999.ebuild
+++ b/sec-policy/selinux-uwsgi/selinux-uwsgi-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-varnishd/Manifest b/sec-policy/selinux-varnishd/Manifest
index cb63754caf06..1c4adcd2770a 100644
--- a/sec-policy/selinux-varnishd/Manifest
+++ b/sec-policy/selinux-varnishd/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-varnishd-2.20170805-r2.ebuild 286 BLAKE2B be653f4a3c8be3f1008002f
 EBUILD selinux-varnishd-2.20170805-r3.ebuild 286 BLAKE2B be653f4a3c8be3f1008002f32aa5bdab3c45172a314ea19df8a8ca39771215bd1613793f90ab58022c484501682f744d87b3932832b5a947268d84e44b3501c6 SHA512 116bc759c6f6659e923220480b3a74b641c02dbeff12ccddaa32c423fd10043cd3541fdf9353c77895aabc081b1634eb218e2e0abf5cf386b96f1ea79d3ea305
 EBUILD selinux-varnishd-2.20170805-r4.ebuild 288 BLAKE2B bda1e2a54291fb5025b6c8bd298f1d9a6d96d181980b8d594e9b7f743e70bd0fdc0eab988284d6d43cc96cd7aea807e529a1b1054bee949f65a6f74b15061ecf SHA512 a4a0d7a456054b9ee70127e62868110e0ce64708abc6edc2515e55572dca8b03d28dc6a00d5f409ded778b2b62d5da404962471f9af5cefca8c177ab1bfb81d7
 EBUILD selinux-varnishd-2.20180114-r1.ebuild 286 BLAKE2B a05ef9682e97179e502695fce0a5a32d377b39d0971f1681db38a5eaf3b3ac5637650537405d77df8edc6a637dacafd174dcb9947661998725f7d090852093ab SHA512 fd3d80286b324b920002f9b5167ba268603a10346ed88d7acd470a89ff328d4f79aa0d4d8e95363e072ec74530e6eaca605e41f15cbb3dbb4216f19bac6b73f8
-EBUILD selinux-varnishd-9999.ebuild 288 BLAKE2B bda1e2a54291fb5025b6c8bd298f1d9a6d96d181980b8d594e9b7f743e70bd0fdc0eab988284d6d43cc96cd7aea807e529a1b1054bee949f65a6f74b15061ecf SHA512 a4a0d7a456054b9ee70127e62868110e0ce64708abc6edc2515e55572dca8b03d28dc6a00d5f409ded778b2b62d5da404962471f9af5cefca8c177ab1bfb81d7
+EBUILD selinux-varnishd-2.20180114-r2.ebuild 288 BLAKE2B a15aaba55702f0ef50ddc015c097194182226a46cf2a86c4786d89c0f9ca208ee16b14f90f3181a4699ef6211128dc722a4af8e0add6c5819e6f21001571c7b8 SHA512 1f7377c1ae265ec01caa24a961cd3e65f0488e4acf49a5780be7d139209aa8617d6869c864052a049cbbe286466950f82c42e665ffd58679f3a6cf890061f026
+EBUILD selinux-varnishd-9999.ebuild 288 BLAKE2B a15aaba55702f0ef50ddc015c097194182226a46cf2a86c4786d89c0f9ca208ee16b14f90f3181a4699ef6211128dc722a4af8e0add6c5819e6f21001571c7b8 SHA512 1f7377c1ae265ec01caa24a961cd3e65f0488e4acf49a5780be7d139209aa8617d6869c864052a049cbbe286466950f82c42e665ffd58679f3a6cf890061f026
 MISC metadata.xml 318 BLAKE2B fb17ecb36c4fdba23d3b977a5b24b968b68c0d00fdec6762fcd0e99c6afa9f881a7e2b06035ecbb1ef4f025cdf770937c6c17aaba1a5bf1c20b274990166da06 SHA512 3385342c923b2616dd114a23706ae2094a384ced315787b9a47fe77a81c3ecf2effd26fb7faa403dabcf622b5893808950b0202eee80fee075c75e99c3f9a891
diff --git a/sec-policy/selinux-varnishd/selinux-varnishd-2.20180114-r2.ebuild b/sec-policy/selinux-varnishd/selinux-varnishd-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..32059274afa4
--- /dev/null
+++ b/sec-policy/selinux-varnishd/selinux-varnishd-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 8034483d39a7..32059274afa4 100644
--- a/sec-policy/selinux-varnishd/selinux-varnishd-9999.ebuild
+++ b/sec-policy/selinux-varnishd/selinux-varnishd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-vbetool/Manifest b/sec-policy/selinux-vbetool/Manifest
index 4f63f285fc0d..4135616c52bb 100644
--- a/sec-policy/selinux-vbetool/Manifest
+++ b/sec-policy/selinux-vbetool/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-vbetool-2.20170805-r2.ebuild 284 BLAKE2B 0618e232e6820d720f525050
 EBUILD selinux-vbetool-2.20170805-r3.ebuild 284 BLAKE2B 0618e232e6820d720f5250507484e9bb0435854c595bea4fbf6a2185c9b131abefa7543a04306a1ee223bfcd6906aa94a47850e39e671e117aa173537be292b4 SHA512 a9281530eaa8b2c1d0d8419cd041d05dd0e72ecc3875a529cf1f344e40fb6c258368f4c398c491ceb0c9e3732f2c293ce5e35548e8c63bfee242cd02dca6205b
 EBUILD selinux-vbetool-2.20170805-r4.ebuild 286 BLAKE2B f4ed17d58c1ed18a32015cc0ff6cb3ba2c99bde4951832a1c427be6f71d41d97d7a001a4c3d427e81cd4da8dfa3152818c3551ef50bec0af93e38f5c24a5dca6 SHA512 644c4347318ebdbee6f04cd5045eef145fb1291181e430d7c64a1e8f735778e18980747f8b12c5d476d430d80c3fa8f94063df711016899773a61aeba14a73cf
 EBUILD selinux-vbetool-2.20180114-r1.ebuild 284 BLAKE2B f266fc031065a2e52ab7e803f596d5d7b5f07add4e5ce3e15e5459b1f0c85efa5e1e34e0148a8b4e10b1677c99096fc4333c2faf4cd749397e1dc69272fa9552 SHA512 69b1bb4c56d72cc331f883115fb50b0ec64acd73e0fad742d08ad673958735ea653d4001ab8554382b263e411b158224858a78fcb203fe4394967a8c40a88977
-EBUILD selinux-vbetool-9999.ebuild 286 BLAKE2B f4ed17d58c1ed18a32015cc0ff6cb3ba2c99bde4951832a1c427be6f71d41d97d7a001a4c3d427e81cd4da8dfa3152818c3551ef50bec0af93e38f5c24a5dca6 SHA512 644c4347318ebdbee6f04cd5045eef145fb1291181e430d7c64a1e8f735778e18980747f8b12c5d476d430d80c3fa8f94063df711016899773a61aeba14a73cf
+EBUILD selinux-vbetool-2.20180114-r2.ebuild 286 BLAKE2B 48e76ef77370f7b83280bb8173399cccbd03c9427d11692536d224914ea1f0776c11997a4ca5a90f57593bb5004779a27b406b8bf2079d9c9e5f33a2e041b315 SHA512 eca9c21557c28284a42fa51e47abe441db5d297c8bdacb894907b6a97cad8d8324bd62262d118cb0aeb803d4082826904a886ee2ca3b57a5d8ac70eac1135d96
+EBUILD selinux-vbetool-9999.ebuild 286 BLAKE2B 48e76ef77370f7b83280bb8173399cccbd03c9427d11692536d224914ea1f0776c11997a4ca5a90f57593bb5004779a27b406b8bf2079d9c9e5f33a2e041b315 SHA512 eca9c21557c28284a42fa51e47abe441db5d297c8bdacb894907b6a97cad8d8324bd62262d118cb0aeb803d4082826904a886ee2ca3b57a5d8ac70eac1135d96
 MISC metadata.xml 317 BLAKE2B 085f433e29e9ea7829dbab4ee7c46a55235f4d37d19fc5ee2b662856eb4b730a9ccdecaf26b87b2b62f72fdf39d7cb14a686e3aa56b03fba7550a87d75b553c4 SHA512 4fee052e81194420528867acdb66be7ef51270f9d621773aec3da0ef33bafbdacb48cde9fe9da2cbac390b209eaac1579c3bb36cf999d2ff3bd00770913e1486
diff --git a/sec-policy/selinux-vbetool/selinux-vbetool-2.20180114-r2.ebuild b/sec-policy/selinux-vbetool/selinux-vbetool-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..9028867c2cf0
--- /dev/null
+++ b/sec-policy/selinux-vbetool/selinux-vbetool-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 97bea22ece75..9028867c2cf0 100644
--- a/sec-policy/selinux-vbetool/selinux-vbetool-9999.ebuild
+++ b/sec-policy/selinux-vbetool/selinux-vbetool-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-vdagent/Manifest b/sec-policy/selinux-vdagent/Manifest
index 13cb95541189..455d32078865 100644
--- a/sec-policy/selinux-vdagent/Manifest
+++ b/sec-policy/selinux-vdagent/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-vdagent-2.20170805-r2.ebuild 284 BLAKE2B 7de538be9081d1f531f9049d
 EBUILD selinux-vdagent-2.20170805-r3.ebuild 284 BLAKE2B 7de538be9081d1f531f9049dc961836f49b837697c4f38c173eda84d9b8bb32edfb35e8b905dd9951c7be90683463028ef041a87a647c7f2f06486f0679aca4a SHA512 add20e86d8af0524ff8831e872f712145ed160201b8653576eebc523e087b2f0d42702714dabc3b5ac2e87ec28ecb121347e1a0aa7e9763a8c887734fe465de3
 EBUILD selinux-vdagent-2.20170805-r4.ebuild 286 BLAKE2B 4b49b9a68e3a7d96982439f7d0467a8d508c47b44bfa5e6c9fbfae88a121d29d1d2ed3d65f9b8d70747627dfd961371ddb38682d18cbe1aca2adc28867d7ea20 SHA512 cbca3403930c09de1650762452a7946e375b010cf9c1116be629cb65682c882c8f7f9f2211bb8a19d815ef40a6f84b305a87003ed3fbf314ed0dfe76cb543513
 EBUILD selinux-vdagent-2.20180114-r1.ebuild 284 BLAKE2B 217098909f7f7b0322e239fe7d6d8a69ce2beb3d40eef3290cc00ae5dd2f33b52d4e0858b23f0dba27837cdefd7af1e6da280623359bfb5a70df34a47a7d5547 SHA512 37929d854e935c5118f55a8ed08a1192f86f3e453076300668fbf149fb2d502515c2b7b632d9bca1993225aef98abab983de40b98d3916f293e393fde8d3d51b
-EBUILD selinux-vdagent-9999.ebuild 286 BLAKE2B 4b49b9a68e3a7d96982439f7d0467a8d508c47b44bfa5e6c9fbfae88a121d29d1d2ed3d65f9b8d70747627dfd961371ddb38682d18cbe1aca2adc28867d7ea20 SHA512 cbca3403930c09de1650762452a7946e375b010cf9c1116be629cb65682c882c8f7f9f2211bb8a19d815ef40a6f84b305a87003ed3fbf314ed0dfe76cb543513
+EBUILD selinux-vdagent-2.20180114-r2.ebuild 286 BLAKE2B d4d4e81d18f67fcf8472892a7c1cad00a655d5740b5b25f5607112133d20e09e33da07041c57b43c62a12e38cbc939c6c351c2b5f0917b6f30c89b604626ce8e SHA512 a05c07a03d00370ddafc9c08c9d009e05db955bbcaaf6f282b69b10f89d7d20f1684ef656d78c7dba969354baabc398335bc0a6bb1203659ba8cd33db6bad0ab
+EBUILD selinux-vdagent-9999.ebuild 286 BLAKE2B d4d4e81d18f67fcf8472892a7c1cad00a655d5740b5b25f5607112133d20e09e33da07041c57b43c62a12e38cbc939c6c351c2b5f0917b6f30c89b604626ce8e SHA512 a05c07a03d00370ddafc9c08c9d009e05db955bbcaaf6f282b69b10f89d7d20f1684ef656d78c7dba969354baabc398335bc0a6bb1203659ba8cd33db6bad0ab
 MISC metadata.xml 317 BLAKE2B a98ed12a533b34c929c1cd90b51fed25bb7492e88a06976f8281dd024d9a0b2085b46096fb15500db5d7c5470dd4cb707fcd04d5c8643a98992d96cadbd627f0 SHA512 e9c10cc57616d2df0efd1fe633998fcdfcb91ca11333f24045a146f45d42eae8b9e70a846e000f3331d4c84c5fbbad6ac29ee30a51d4c347bab682f7b80f8adb
diff --git a/sec-policy/selinux-vdagent/selinux-vdagent-2.20180114-r2.ebuild b/sec-policy/selinux-vdagent/selinux-vdagent-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..cc7d763e03dd
--- /dev/null
+++ b/sec-policy/selinux-vdagent/selinux-vdagent-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 9fde11bddc8f..cc7d763e03dd 100644
--- a/sec-policy/selinux-vdagent/selinux-vdagent-9999.ebuild
+++ b/sec-policy/selinux-vdagent/selinux-vdagent-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-vde/Manifest b/sec-policy/selinux-vde/Manifest
index 08deda01a51f..2aafe6031b5d 100644
--- a/sec-policy/selinux-vde/Manifest
+++ b/sec-policy/selinux-vde/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-vde-2.20170805-r2.ebuild 276 BLAKE2B 63452844ee84bb1a96f3eee63f9d
 EBUILD selinux-vde-2.20170805-r3.ebuild 276 BLAKE2B 63452844ee84bb1a96f3eee63f9dd6a9ef8a7b79eb11d91d3b3b338531199a6f67683fb24494be527ecf6c243cb8f691257e9a81465ce56ccac3e7eddf55deb5 SHA512 1a9e2d0e65d2f69a492a44b61b19032e21be7137f943e07e9d1bf95c863d9ae3dcf3139cd66f3ce694d1c09d002f5c047a11fa23e3722be0dd32a07f52a9e4d5
 EBUILD selinux-vde-2.20170805-r4.ebuild 278 BLAKE2B 44adedcf8e8ccdff52e7b7842ab34ff187ecbb0279a6979d6a27e2a98b0917be0c14486b0642e3202abe77e587f80fa1039573e9289527496dc7dbd2e3835d2c SHA512 63a88bb13bd342f72336dab6bb01d06e3078ff292bf668a0c9e0211009c3361a70f24e29863a4563cde4beef02124a6021d905fd94e5439bd7ef18152625e089
 EBUILD selinux-vde-2.20180114-r1.ebuild 276 BLAKE2B 5094788a012a8958853f5221d8ade087c7ea9ff55d674fdf41e5f2e15010da3952271b7e225f53b72cd636b1afa139fefadddbd23d36ccdf35d941e5e1bf208b SHA512 10756d7160bba9b8caa80719dac4f35c898a204fe53b7c4249e383e64fe864f398224a268da901f902917300510922da686cda0a92fcda23ecf7e03032d42a9a
-EBUILD selinux-vde-9999.ebuild 278 BLAKE2B 44adedcf8e8ccdff52e7b7842ab34ff187ecbb0279a6979d6a27e2a98b0917be0c14486b0642e3202abe77e587f80fa1039573e9289527496dc7dbd2e3835d2c SHA512 63a88bb13bd342f72336dab6bb01d06e3078ff292bf668a0c9e0211009c3361a70f24e29863a4563cde4beef02124a6021d905fd94e5439bd7ef18152625e089
+EBUILD selinux-vde-2.20180114-r2.ebuild 278 BLAKE2B 46e6d278d18911c71de5f338a0874ee6e5622fdac5883688d7b61cce874d4e532b02108dcdfc069fcb493b4ea037fa8031384ce36ed00c39ab9909079db7a2d8 SHA512 976b560ddcc655e6b335dce354cf8b493c2c8b8719e4e75238405e250cecc635a19d28f2d4caaab64572270f66a35f520d97af1b785a41bdca61b35dc3c4149e
+EBUILD selinux-vde-9999.ebuild 278 BLAKE2B 46e6d278d18911c71de5f338a0874ee6e5622fdac5883688d7b61cce874d4e532b02108dcdfc069fcb493b4ea037fa8031384ce36ed00c39ab9909079db7a2d8 SHA512 976b560ddcc655e6b335dce354cf8b493c2c8b8719e4e75238405e250cecc635a19d28f2d4caaab64572270f66a35f520d97af1b785a41bdca61b35dc3c4149e
 MISC metadata.xml 313 BLAKE2B bcbb05e797b8776598699d30290f26e68f54b310410214a23181f1aa5f3eb265817eb4efcd29977bc09129c3b38a2844bb55e5344077915d4ace391d0ef8394c SHA512 40aca5ba39fd653e4c621b4a0eff2b9eaed17e78f92144fd561c32470b72e69e0e191976af1f3bf6152e3b19c8fcc017be3ddeca3a4b191cfa513f6f42549e1e
diff --git a/sec-policy/selinux-vde/selinux-vde-2.20180114-r2.ebuild b/sec-policy/selinux-vde/selinux-vde-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..69c143bd9777
--- /dev/null
+++ b/sec-policy/selinux-vde/selinux-vde-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 6b53aaf68e45..69c143bd9777 100644
--- a/sec-policy/selinux-vde/selinux-vde-9999.ebuild
+++ b/sec-policy/selinux-vde/selinux-vde-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-virt/Manifest b/sec-policy/selinux-virt/Manifest
index 92e683afd685..ad94bc11968c 100644
--- a/sec-policy/selinux-virt/Manifest
+++ b/sec-policy/selinux-virt/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-virt-2.20170805-r2.ebuild 278 BLAKE2B 306b0a61f279bfa7defa2988d0c
 EBUILD selinux-virt-2.20170805-r3.ebuild 278 BLAKE2B 306b0a61f279bfa7defa2988d0c60c3a66fe15240200c2d0f294e5c6b7f259a48e9c4db4fb033a8389ecf92b3eb710f6553a06d417b13e906f8ab60a83f56a91 SHA512 fe61f61f2c0d1af1ce896029ee5159f6fcf93368890565f77f2aa64c28d84313c3cd635104330ad610633ab37bdf16578617b846ab9831bcb842d6396e2a1330
 EBUILD selinux-virt-2.20170805-r4.ebuild 280 BLAKE2B 165c00867db4af8d38122bb325d82ece7b41c7289cdfcc33a5f94cbf359d3cfe59836ab27fc3ae96f0d1474338223ca2fc657cf7a9ea6c72410b3142577f41ac SHA512 5bf96dc492c14c5e49420e5f709039551ed5ac0684110913c98b9dad3bcc1bf4dc842f85a44f368592f3091eb67b97b9b42398451a7fb5a9cf649dd18f0ff69d
 EBUILD selinux-virt-2.20180114-r1.ebuild 278 BLAKE2B 005e5eb9c1ef5aff676a25dea35223f6799afe5198e8014c358db959b2202c0f5fa7a1b02a7fee4767d376dbbbeff97779fcfc4e968d02f810b1b7cb556eddb3 SHA512 b084320fe3be2f3253e93fa681e08a91040d8ef7f383b374b91207dc0e995c4e2d45f8306fb47b9cb7cc8fd1381188df7514aed1a7bacb8ca55f4f3f87f65fbb
-EBUILD selinux-virt-9999.ebuild 280 BLAKE2B 165c00867db4af8d38122bb325d82ece7b41c7289cdfcc33a5f94cbf359d3cfe59836ab27fc3ae96f0d1474338223ca2fc657cf7a9ea6c72410b3142577f41ac SHA512 5bf96dc492c14c5e49420e5f709039551ed5ac0684110913c98b9dad3bcc1bf4dc842f85a44f368592f3091eb67b97b9b42398451a7fb5a9cf649dd18f0ff69d
+EBUILD selinux-virt-2.20180114-r2.ebuild 280 BLAKE2B 14ba07355d3908297770fd5ae665d695d431d87eb44c970f0b49efc13fdc69da4af0930ca9f8e118200a26dc22100020289fce7a47bf88b4c17912738b1d77b6 SHA512 db70c6bc92fe8e5b50b0f798e8f5d90b54cbc2e7e1bcd29ac16ec5fee52b26f5a378164c61588c976c5fda880a6efff3e1f283a4fb712812ac505733129b023e
+EBUILD selinux-virt-9999.ebuild 280 BLAKE2B 14ba07355d3908297770fd5ae665d695d431d87eb44c970f0b49efc13fdc69da4af0930ca9f8e118200a26dc22100020289fce7a47bf88b4c17912738b1d77b6 SHA512 db70c6bc92fe8e5b50b0f798e8f5d90b54cbc2e7e1bcd29ac16ec5fee52b26f5a378164c61588c976c5fda880a6efff3e1f283a4fb712812ac505733129b023e
 MISC metadata.xml 314 BLAKE2B ddfe4853a8e46120ae40067c91e5aae0b9398391620fdead4a2bd05ecb7aab29e9125e287b86a08fd5c7c11c31f231b1c82a5cb98bbaddbdff638bc87a779eb3 SHA512 0a2c6884ff96c1bab8de52467afdba253e06c6d873d5e389ac2f84c485e4e4fa1bd5cb95a907b0ab49777755afcc1a26446f653ded9b3e3f64b576af14013296
diff --git a/sec-policy/selinux-virt/selinux-virt-2.20180114-r2.ebuild b/sec-policy/selinux-virt/selinux-virt-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..4c2b8e1ee3ad
--- /dev/null
+++ b/sec-policy/selinux-virt/selinux-virt-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 1e81f92d5cc7..4c2b8e1ee3ad 100644
--- a/sec-policy/selinux-virt/selinux-virt-9999.ebuild
+++ b/sec-policy/selinux-virt/selinux-virt-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-vlock/Manifest b/sec-policy/selinux-vlock/Manifest
index e1fb0edf0b89..ee9cdab37a81 100644
--- a/sec-policy/selinux-vlock/Manifest
+++ b/sec-policy/selinux-vlock/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-vlock-2.20170805-r2.ebuild 280 BLAKE2B e85bb8d3c2e0b4d2658f7be8ef
 EBUILD selinux-vlock-2.20170805-r3.ebuild 280 BLAKE2B e85bb8d3c2e0b4d2658f7be8efbc2a2592b827c744c163655e0b452d938ff6f25f532d9a481782eb92022d6392f51b3071721f7987faf17553ab43da905730f7 SHA512 49f5dd2962ce625a7a668708e6961276fd6c0eba312289d038d0bc6bd776ae1b78dc94b9fc965787ff96abc97480c81bc9e7dca8d51563c60e850a082f48336b
 EBUILD selinux-vlock-2.20170805-r4.ebuild 282 BLAKE2B 51120478dc8899818d8e61f25fbfcfbab1b79078a5bccccee7133072b1aa504c1b47b34f3819e275c1874f60490653a3a116e738b1b6a0ab1b94a7547fa9de7e SHA512 87a355509b1b4c003a48a600434ef805b18d69572674c58b1d022e99a58863fde715bc519386aa16413c2b5779692180f9716333a8e0b5dfdb2b9053d24ee163
 EBUILD selinux-vlock-2.20180114-r1.ebuild 280 BLAKE2B 89b7d29aeaa21f3a738e6620ae5a767ec7761c486877798a67143ed5c24c519620ecad6543345b6ee891d07ea04c814223e66a6f0c9c1b87b7eb3ea5955ccd1e SHA512 db6a4849319b5001ddac41ab71ea9126f758795d09992e1ce60efbbce9878581d09a575bcb0b66742493c0a39928647c6cd61fda441d657a0ec58d5edf7c9e96
-EBUILD selinux-vlock-9999.ebuild 282 BLAKE2B 51120478dc8899818d8e61f25fbfcfbab1b79078a5bccccee7133072b1aa504c1b47b34f3819e275c1874f60490653a3a116e738b1b6a0ab1b94a7547fa9de7e SHA512 87a355509b1b4c003a48a600434ef805b18d69572674c58b1d022e99a58863fde715bc519386aa16413c2b5779692180f9716333a8e0b5dfdb2b9053d24ee163
+EBUILD selinux-vlock-2.20180114-r2.ebuild 282 BLAKE2B d33da539ee99c0a6bae25dd5f2f9235ada16384f7045c86f7548a51ffc933dee1bd0d8acbca620d77d15ee8d1201887b8788e73678479f34883f64f82d3d03a1 SHA512 6b8760cf974d5d3e4885f6706a6e9cea7328167f4fe98cd84d9d8e17c281e45a3dc414d0687a8a7baa853665cd9d72a94ec846d1c4c7a0d71ce529c657af910d
+EBUILD selinux-vlock-9999.ebuild 282 BLAKE2B d33da539ee99c0a6bae25dd5f2f9235ada16384f7045c86f7548a51ffc933dee1bd0d8acbca620d77d15ee8d1201887b8788e73678479f34883f64f82d3d03a1 SHA512 6b8760cf974d5d3e4885f6706a6e9cea7328167f4fe98cd84d9d8e17c281e45a3dc414d0687a8a7baa853665cd9d72a94ec846d1c4c7a0d71ce529c657af910d
 MISC metadata.xml 315 BLAKE2B b864e9c08b6219c42e71fb64cd812a5583705c7bdc2383d6070600891e5747306a80604ab62e329e6dad082139792dc3bff0dc8d09d8594bb9b0b712b616f38c SHA512 5ded38e727d6a36ea133c0500a64212b193ff5935a53386bf4ca2286e4d18e9468ad18f5fb4c80e9d0cde1d4e1713f4a5fbfe7ede03ed17e3ee573dce1a094b1
diff --git a/sec-policy/selinux-vlock/selinux-vlock-2.20180114-r2.ebuild b/sec-policy/selinux-vlock/selinux-vlock-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..5ceb572ace30
--- /dev/null
+++ b/sec-policy/selinux-vlock/selinux-vlock-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 908b9dd52b8b..5ceb572ace30 100644
--- a/sec-policy/selinux-vlock/selinux-vlock-9999.ebuild
+++ b/sec-policy/selinux-vlock/selinux-vlock-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-vmware/Manifest b/sec-policy/selinux-vmware/Manifest
index a7f03754f970..f8d6884b5fa7 100644
--- a/sec-policy/selinux-vmware/Manifest
+++ b/sec-policy/selinux-vmware/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-vmware-2.20170805-r2.ebuild 380 BLAKE2B d35ab98c6dc3694904621e21a
 EBUILD selinux-vmware-2.20170805-r3.ebuild 380 BLAKE2B d35ab98c6dc3694904621e21a8c1ffa157f40b33945e39cfb57901f5abcf2e1da879900fa877cf14379a621bb2885c9a979506ecba1faaec01ee7b60e68ed113 SHA512 89217f6d0d04924235c8b557c528cb63006471381adcd83bfbedee2a60a1665f9d0b3901c99d1900db4ea5457ddc20218fbf5eab5e8ed4bdc0df95169d0ddb66
 EBUILD selinux-vmware-2.20170805-r4.ebuild 382 BLAKE2B 8e2a610152f138bf10ad73cb66e9c4810f8ca62a1dbc27bf4b73b5bf6d01311c63efc73fe4eb15fd13cb9e123796659542d3f34d31bb887d994fefe4cdb7a9cb SHA512 2e3e8d351d0d2f78220aff7a4b86bce74c00672375c4e55d72fe30479598e80cfae7cea6f8c53fce75a1e78512b9385ca1405058356bab835e7b8bee3e566f91
 EBUILD selinux-vmware-2.20180114-r1.ebuild 380 BLAKE2B eccf5ce9368768a2941cad5478ad72796c9086dbe4917e24782f636c2af98e13dc81fc3d57f19aaebe5b31755d96447f46a197172de5150b843edeafe88e4adc SHA512 c27de4732968a38b8a2220c5b36ff4126763bea7113fc26f5cae87c1dd3324de2c10fb75074d9c71a3cb8ff64063a1da831c9041dc774f72087fbd1f32fa7bcb
-EBUILD selinux-vmware-9999.ebuild 382 BLAKE2B 8e2a610152f138bf10ad73cb66e9c4810f8ca62a1dbc27bf4b73b5bf6d01311c63efc73fe4eb15fd13cb9e123796659542d3f34d31bb887d994fefe4cdb7a9cb SHA512 2e3e8d351d0d2f78220aff7a4b86bce74c00672375c4e55d72fe30479598e80cfae7cea6f8c53fce75a1e78512b9385ca1405058356bab835e7b8bee3e566f91
+EBUILD selinux-vmware-2.20180114-r2.ebuild 382 BLAKE2B 27f46ea2b411bce2c151110a30ee6f1c3bc54a1d738570cd2d36372f1e98ab61e522a31e88d2eca7fd65512c623bbbd7da1c803993bcc7c9a1339936f9d2ab00 SHA512 b6a1e2edb8097ee323dc4f478a236c76f295d3c40b884b3b25f44b14d86d7649ab6bb66913dfdee2434019d0643d467e27027605deea9f8a3125dbee84cf8697
+EBUILD selinux-vmware-9999.ebuild 382 BLAKE2B 27f46ea2b411bce2c151110a30ee6f1c3bc54a1d738570cd2d36372f1e98ab61e522a31e88d2eca7fd65512c623bbbd7da1c803993bcc7c9a1339936f9d2ab00 SHA512 b6a1e2edb8097ee323dc4f478a236c76f295d3c40b884b3b25f44b14d86d7649ab6bb66913dfdee2434019d0643d467e27027605deea9f8a3125dbee84cf8697
 MISC metadata.xml 316 BLAKE2B ede764cc96f6774fc982138cef45b3e8470e94c8bc8e25482d8b1934c4de5e35469e18bdddb60f3693a71f1ebbff9201f7c4d8456f709695eed7131e76a7d0d0 SHA512 6410be397d5216abf34e154e3d52de5bccddeceebe65bf886df5628c459cbc346c585debcc4d89ceac8302d9eb80acc1c7460c0a6327344850896aad2050d6fb
diff --git a/sec-policy/selinux-vmware/selinux-vmware-2.20180114-r2.ebuild b/sec-policy/selinux-vmware/selinux-vmware-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..85939ad36b26
--- /dev/null
+++ b/sec-policy/selinux-vmware/selinux-vmware-2.20180114-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 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 6845b4dbd1fd..85939ad36b26 100644
--- a/sec-policy/selinux-vmware/selinux-vmware-9999.ebuild
+++ b/sec-policy/selinux-vmware/selinux-vmware-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-vnstatd/Manifest b/sec-policy/selinux-vnstatd/Manifest
index 49b1360f6f8b..687de871a014 100644
--- a/sec-policy/selinux-vnstatd/Manifest
+++ b/sec-policy/selinux-vnstatd/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-vnstatd-2.20170805-r2.ebuild 284 BLAKE2B 3a48be71cae244802a35239e
 EBUILD selinux-vnstatd-2.20170805-r3.ebuild 284 BLAKE2B 3a48be71cae244802a35239e380c4435ddbc2fd01ea105beeb14b75b517ea0414a8dfc0e2f6877b5fddbd23e3c6c2de6222840d050e44ff093e136aa272d7592 SHA512 0970e5e49e611d78bca9544e2daba988fd4f5aa6bee376ec351bd5f02a95ce4a14c1cf679e5cac96ec95c2b63dd217ad99b285a5ebd616f735c880f5abaf21d7
 EBUILD selinux-vnstatd-2.20170805-r4.ebuild 286 BLAKE2B df2f1ec7db9726272a3b2b7b497c26f7a358ae6aa414747b95f85f7a914262c291dc461247329515dff738f8d4d942cc8ac338fa0299e063e4b85f18d08aee58 SHA512 a0d7f18d0e533c29b24019c7d8dc53cc0dd4f2f30c59a42eb2bfa292c53a8ce1104cced3db2ad0e5498349dd066b6518fbb184beb583d53d48c58ddf73c3d6c6
 EBUILD selinux-vnstatd-2.20180114-r1.ebuild 284 BLAKE2B b6c5c393b11075625bd94c5a853a3b80b145acfb28d328c5edd2c90af4b906278dc1a1b22e2dbac54520eb9e2d009f1e00374f4c6c6db703a5f89c6bcf972039 SHA512 8909a0d06b13429de400849ab141de67b7f4c75a9e10a5602b233e389e819acd9cf11e898877022f08d67a20d33f0323b2d5083b451815ed9614cb49c3db2cbf
-EBUILD selinux-vnstatd-9999.ebuild 286 BLAKE2B df2f1ec7db9726272a3b2b7b497c26f7a358ae6aa414747b95f85f7a914262c291dc461247329515dff738f8d4d942cc8ac338fa0299e063e4b85f18d08aee58 SHA512 a0d7f18d0e533c29b24019c7d8dc53cc0dd4f2f30c59a42eb2bfa292c53a8ce1104cced3db2ad0e5498349dd066b6518fbb184beb583d53d48c58ddf73c3d6c6
+EBUILD selinux-vnstatd-2.20180114-r2.ebuild 286 BLAKE2B 1e1055af6cf9c203eeb4c785fad03254332a9b231d81434bf7183986f7f58fc8e81339ceee3d201a3bdfafb4a64f1bef058b404edb369f6a41861767d8961a45 SHA512 e37618c5e85424c9a68b927c08f2b014209e48e965d749b8692703d914674fde0d915a632db9633f2beba509b2ee41e46dc9676e3cee052ed0a6c87ac878ebfd
+EBUILD selinux-vnstatd-9999.ebuild 286 BLAKE2B 1e1055af6cf9c203eeb4c785fad03254332a9b231d81434bf7183986f7f58fc8e81339ceee3d201a3bdfafb4a64f1bef058b404edb369f6a41861767d8961a45 SHA512 e37618c5e85424c9a68b927c08f2b014209e48e965d749b8692703d914674fde0d915a632db9633f2beba509b2ee41e46dc9676e3cee052ed0a6c87ac878ebfd
 MISC metadata.xml 317 BLAKE2B bcb38dd9c3df8e508df7129013547025ff8f9856a4032c1599f237d398e874228318ac515ccf1710233e40b4aaea1ddf02f044b58d69e5a35f51221da2ca5ee4 SHA512 0384e8de44653fbeffaa82186ce1b560fa1a1f9f7c5e5255cfa61988d4189cf698da7f17abfbc35d8f608735d609496fe53077d5d9e84f870e2e376cc728c072
diff --git a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20180114-r2.ebuild b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..a96ef5b2ccad
--- /dev/null
+++ b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 f4b210298df8..a96ef5b2ccad 100644
--- a/sec-policy/selinux-vnstatd/selinux-vnstatd-9999.ebuild
+++ b/sec-policy/selinux-vnstatd/selinux-vnstatd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-vpn/Manifest b/sec-policy/selinux-vpn/Manifest
index f5c7c2e3dea6..1b8f3a9a6ed2 100644
--- a/sec-policy/selinux-vpn/Manifest
+++ b/sec-policy/selinux-vpn/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-vpn-2.20170805-r2.ebuild 276 BLAKE2B 73d1a2fc9b6832a862807bffc29c
 EBUILD selinux-vpn-2.20170805-r3.ebuild 276 BLAKE2B 73d1a2fc9b6832a862807bffc29c47d56cf768c19f9d5c858aee751bb8a8ccc3d97ee85ab2fde067a35bbcfb8584a8f22c3cc4e74f40eecff000434633939ec1 SHA512 b731ce1e3926f4fa4e92528a453bcd1967800dc8bb708acefe49897acddaf52ecd6f796716cb7d1311feb4779c80f698dd9d2a2a97a50be1404af2fdba1c05d9
 EBUILD selinux-vpn-2.20170805-r4.ebuild 278 BLAKE2B d7633b1b380c736d18a928c5cb09d3935eee72c3fcc137d596505d5be93e5c50ad6cdc375ce6745793b7e36d868892e2d31ddcb02c559caecd07aed952e21dad SHA512 c32e36f7de207fc5cc25e083e85058f121929fd751b5d6ce291197c1e93180376ab0d82c6d6f77f3ccfac103527562f97e731614f0401e024607fa0a11f9f6a3
 EBUILD selinux-vpn-2.20180114-r1.ebuild 276 BLAKE2B 97e68bff55a22b4f136a7dd395eecd0bb80cde7c483ff58a6f0e1937f78ea92099bcd2b671970783c7a89a2c13377f4550622f9ed2ca7ffc830e32736038363d SHA512 c7a1f9ccaea4daa37b8f2aafc9494c568e494f0aec4abb582914d5576df403bb6625141426807ba00362f6fabcdf6b036f78cb4405916cc13ee819c1c42ae769
-EBUILD selinux-vpn-9999.ebuild 278 BLAKE2B d7633b1b380c736d18a928c5cb09d3935eee72c3fcc137d596505d5be93e5c50ad6cdc375ce6745793b7e36d868892e2d31ddcb02c559caecd07aed952e21dad SHA512 c32e36f7de207fc5cc25e083e85058f121929fd751b5d6ce291197c1e93180376ab0d82c6d6f77f3ccfac103527562f97e731614f0401e024607fa0a11f9f6a3
+EBUILD selinux-vpn-2.20180114-r2.ebuild 278 BLAKE2B 37f73ab0a4df98a52b6784c2a04323f90a36cfa8c088eeb7bcc61f002f4c5b03fa76c2a9cbec6559ee706fcd6138b9e27dd4269d6668d23ac85042d4d672c48b SHA512 24e11526d91702ed2f558ae580be630670bd9e28cb665e77dfd34979f7e83a84454f0e8382a2b6a232cf3c30cd892245b5c04749110f4d1f035631d89965ca6b
+EBUILD selinux-vpn-9999.ebuild 278 BLAKE2B 37f73ab0a4df98a52b6784c2a04323f90a36cfa8c088eeb7bcc61f002f4c5b03fa76c2a9cbec6559ee706fcd6138b9e27dd4269d6668d23ac85042d4d672c48b SHA512 24e11526d91702ed2f558ae580be630670bd9e28cb665e77dfd34979f7e83a84454f0e8382a2b6a232cf3c30cd892245b5c04749110f4d1f035631d89965ca6b
 MISC metadata.xml 313 BLAKE2B aa394352994b58b3af9cfa456bf4bbdcac364ac6fbb30c784122ab4482ae84f26fff0a3b568017d2aa8a4c053e4dcf55b44ea90a7b013da56896393817ab8db8 SHA512 5932c33a47a1c1a8a64b94fc174b8f284d4fbfec1852b6a971d5b72008bce6c5d532f3075ab5dbf61eca24e8f59e8723facf83c57b7d5a0d3ee490cf34abb302
diff --git a/sec-policy/selinux-vpn/selinux-vpn-2.20180114-r2.ebuild b/sec-policy/selinux-vpn/selinux-vpn-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..7132c9718995
--- /dev/null
+++ b/sec-policy/selinux-vpn/selinux-vpn-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 7c2d0498e818..7132c9718995 100644
--- a/sec-policy/selinux-vpn/selinux-vpn-9999.ebuild
+++ b/sec-policy/selinux-vpn/selinux-vpn-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-watchdog/Manifest b/sec-policy/selinux-watchdog/Manifest
index da63efd0d27d..0310dd03ed3b 100644
--- a/sec-policy/selinux-watchdog/Manifest
+++ b/sec-policy/selinux-watchdog/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-watchdog-2.20170805-r2.ebuild 286 BLAKE2B 9a9c26d59213ff626908b8b
 EBUILD selinux-watchdog-2.20170805-r3.ebuild 286 BLAKE2B 9a9c26d59213ff626908b8bf3c9e50e978ee2315397a8f5ac7bd2d1394a1676271b2270da87c6ffa856bf04e5e0c464f7941bec97dae55cc3914bdece219d352 SHA512 7eb82ea02e2daa9736e7bc166432a49b7103815186cb3fe43a243741b24137090ed94993048e4cc9cab23e05396d5540fcbd408bc3b4fc7bf4bc1447491d83dd
 EBUILD selinux-watchdog-2.20170805-r4.ebuild 288 BLAKE2B 16420194bc5f6524597624d4bd63e7c58432b90aebeece41c76ef9c2b6574f49c8440330fde929f302aa2e145c87cfcd40e31037dcc706f9d0b544434fb2f674 SHA512 999c7c3fea2ca8a1bd1a7eda3681bd2dd9d0746126fb5fe6d7dcb875cd20e58e65a9c3fb576fc5327f12d2970f1efc29e24bd372d8eb35f339f3c1544d5ef15b
 EBUILD selinux-watchdog-2.20180114-r1.ebuild 286 BLAKE2B c8be687a6675b575c9e0e0defac043bc5016b519c8b56c3f80fa51b0da504b82d0dcfe212d2ce7c78275d7097050e209fa7f7c1e48d91a7e64d0a102d142f540 SHA512 6f85669499407ff21e3d5785cb69b8c9017ed6903540160628e8bde81f51bff079f54f40eddd30f18239b6fef95e973440b7dec3ee86a1203a59f389aca531ca
-EBUILD selinux-watchdog-9999.ebuild 288 BLAKE2B 16420194bc5f6524597624d4bd63e7c58432b90aebeece41c76ef9c2b6574f49c8440330fde929f302aa2e145c87cfcd40e31037dcc706f9d0b544434fb2f674 SHA512 999c7c3fea2ca8a1bd1a7eda3681bd2dd9d0746126fb5fe6d7dcb875cd20e58e65a9c3fb576fc5327f12d2970f1efc29e24bd372d8eb35f339f3c1544d5ef15b
+EBUILD selinux-watchdog-2.20180114-r2.ebuild 288 BLAKE2B de80008069876fd138ec3e1a5a0aa91f238e142493c32efc6432c5d26b2af6b19bfff1e2de6fd63f1752cdb71bb690c978880deee8b046c28cbd596487966ef5 SHA512 c16cd886fa663552ab8e55b53c719b722fb4067549fad0951b176953b6d50465290aec20a1128e4a554980ad923b240417e890a1068d1812bf3045a7f034a4a1
+EBUILD selinux-watchdog-9999.ebuild 288 BLAKE2B de80008069876fd138ec3e1a5a0aa91f238e142493c32efc6432c5d26b2af6b19bfff1e2de6fd63f1752cdb71bb690c978880deee8b046c28cbd596487966ef5 SHA512 c16cd886fa663552ab8e55b53c719b722fb4067549fad0951b176953b6d50465290aec20a1128e4a554980ad923b240417e890a1068d1812bf3045a7f034a4a1
 MISC metadata.xml 318 BLAKE2B ffea2648ec00eff9dc1d23552633fee8cf1db446b8f7d110b613f9e2d40b5aac0ea80462754f72e70fa4e86ed42717c6ef1ecf1680ea771e497cd6349df0b283 SHA512 3c77f235f65bc644d316ec2bb0d859ee22c622049c4f406904a7c24a4c17156636d86f249f4dca2a15a90d0334da677df3038956991a256f591fe3c7c2284957
diff --git a/sec-policy/selinux-watchdog/selinux-watchdog-2.20180114-r2.ebuild b/sec-policy/selinux-watchdog/selinux-watchdog-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..3bf64e50b5ac
--- /dev/null
+++ b/sec-policy/selinux-watchdog/selinux-watchdog-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 8fe981a7e558..3bf64e50b5ac 100644
--- a/sec-policy/selinux-watchdog/selinux-watchdog-9999.ebuild
+++ b/sec-policy/selinux-watchdog/selinux-watchdog-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-webalizer/Manifest b/sec-policy/selinux-webalizer/Manifest
index 7fdb397d76f5..4ffa430fa30d 100644
--- a/sec-policy/selinux-webalizer/Manifest
+++ b/sec-policy/selinux-webalizer/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-webalizer-2.20170805-r2.ebuild 385 BLAKE2B 715680209d939667f1efdf
 EBUILD selinux-webalizer-2.20170805-r3.ebuild 385 BLAKE2B 715680209d939667f1efdf6346eb06360f692638017a3f849591a6f4b7758e0507547a23c8e95ceac349d80ea5abada20f3da9e898b2555c6441f0decf52eb95 SHA512 a7d31d0d99dca62ca98e7523f93df195100bbda351c94f1e2bda0fd23ed3fc922267f61dbba5d9c8799bbf0ad0322583c773953b407b09dd940ad0d08235e0f1
 EBUILD selinux-webalizer-2.20170805-r4.ebuild 387 BLAKE2B c9b93230dc3c2779f7607346e1508ebd63bc068e1cc47a09c111a25b0fb4060fad7c99d3f8d361405fe58cb843c14e71487dc305974e8539c655e5cd06c63f2b SHA512 8ce716769e63bb9d5e369f60d821684f537f98e745a57be4d3be134f6e501b4b1ff0f8478847e0801999cd2a1f578938e3f4d5d448cb38733ce0cef695a5155c
 EBUILD selinux-webalizer-2.20180114-r1.ebuild 385 BLAKE2B 7619dd5c99386ecd1dd2262fc0aabba54be543c2978fcf83507637ad53c60df53ab7fb896847ba4453d550816992e9b8ebf78660f470fd45a834b89df15c053f SHA512 d67717e516eee69a05453c427d4bfba176432a1d75df00f67bca97cbadd0098963b3f22cbe3a339517963da71f7ff6e52bafa3225b4d4287c2af390ca70a5ddb
-EBUILD selinux-webalizer-9999.ebuild 387 BLAKE2B c9b93230dc3c2779f7607346e1508ebd63bc068e1cc47a09c111a25b0fb4060fad7c99d3f8d361405fe58cb843c14e71487dc305974e8539c655e5cd06c63f2b SHA512 8ce716769e63bb9d5e369f60d821684f537f98e745a57be4d3be134f6e501b4b1ff0f8478847e0801999cd2a1f578938e3f4d5d448cb38733ce0cef695a5155c
+EBUILD selinux-webalizer-2.20180114-r2.ebuild 387 BLAKE2B 21f96e823977f2cca93b1593391d6a45fdc57e9d0042ba26c3ffd3895136b07fb539fb0f1c96f727c45e82ad0da0f3b0b5b46875e3f1ef7a9ecdf7c5918ed5d0 SHA512 e83af1779b75f4ea3d8be0d9527b8eb596785c75115e661556b627984811b146fbaff81b885a98a65f51c692afe06bd0afc1c115e714269f47d165a658bf0d61
+EBUILD selinux-webalizer-9999.ebuild 387 BLAKE2B 21f96e823977f2cca93b1593391d6a45fdc57e9d0042ba26c3ffd3895136b07fb539fb0f1c96f727c45e82ad0da0f3b0b5b46875e3f1ef7a9ecdf7c5918ed5d0 SHA512 e83af1779b75f4ea3d8be0d9527b8eb596785c75115e661556b627984811b146fbaff81b885a98a65f51c692afe06bd0afc1c115e714269f47d165a658bf0d61
 MISC metadata.xml 319 BLAKE2B 2a6a658da12d525a5781ff850e1c0c732e099ed2173eb82f985b7dd1ed6550911653e6f87c36be245aa1044b4e85f69be26f7318b3a262d05e1975fac7524d84 SHA512 6986d5695bb17f98f786b3639631f0a2571c91b2e90f33bc4b8e63b8390c70995b1b9010d22e9ce2ec23444342c246aa1e36f6da0675831c59534c0da6a0cb04
diff --git a/sec-policy/selinux-webalizer/selinux-webalizer-2.20180114-r2.ebuild b/sec-policy/selinux-webalizer/selinux-webalizer-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..1faf79c01338
--- /dev/null
+++ b/sec-policy/selinux-webalizer/selinux-webalizer-2.20180114-r2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 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 925130750022..1faf79c01338 100644
--- a/sec-policy/selinux-webalizer/selinux-webalizer-9999.ebuild
+++ b/sec-policy/selinux-webalizer/selinux-webalizer-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-wine/Manifest b/sec-policy/selinux-wine/Manifest
index b980c89f09fe..7f8eb916a295 100644
--- a/sec-policy/selinux-wine/Manifest
+++ b/sec-policy/selinux-wine/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-wine-2.20170805-r2.ebuild 278 BLAKE2B 3cde5441f834fcb2bc3cda5eefe
 EBUILD selinux-wine-2.20170805-r3.ebuild 278 BLAKE2B 3cde5441f834fcb2bc3cda5eefec787eab2e264feafbb87d4821cb8e78ae9d1efa9cf9b3becd8b87c7cbd3d2c2c0dab6a6b992cf6739f69135c4f1d87919e79c SHA512 cd0381670e4a95aff743e7c469fcccc927cbb2a5baf6b32ea70a07d46c51a3a078a267e9b6d2d45a169f3411ebb36399e0f343aea1fcf184916946b3c72e9f15
 EBUILD selinux-wine-2.20170805-r4.ebuild 280 BLAKE2B a3c899c1322227b1c7721c4427f88a8cc5ab0d1f952aeffbc3c8eb7a349d6ae0e886eaa59891f71f8742123d174532dc73ba5de313a6d782931068d8d363ac32 SHA512 f7999bee2cd65fc5f287858d8494808a374d2a3485085df71802fc05b8f5764f33794a1080a941986dc5aaf37ef24fd97196fce583a98386102592650439279c
 EBUILD selinux-wine-2.20180114-r1.ebuild 278 BLAKE2B 94afa0a4f935d584d67374584eef5d8d6500e0f31ba0b946e7495d593c778607cbae8536178ec60b66fddc2c2ee1026370fe0db049647e1e2c3f14bb2134738a SHA512 1cd810ae984811ae1aa37c7c2e67ca6e70c40b58e271844f1704b46547a137e67d840bc1f0a4038a58871d8d85ed5ff52d6958f3ca80b34c4d665e9f6cf58453
-EBUILD selinux-wine-9999.ebuild 280 BLAKE2B a3c899c1322227b1c7721c4427f88a8cc5ab0d1f952aeffbc3c8eb7a349d6ae0e886eaa59891f71f8742123d174532dc73ba5de313a6d782931068d8d363ac32 SHA512 f7999bee2cd65fc5f287858d8494808a374d2a3485085df71802fc05b8f5764f33794a1080a941986dc5aaf37ef24fd97196fce583a98386102592650439279c
+EBUILD selinux-wine-2.20180114-r2.ebuild 280 BLAKE2B 6ac8053a1d0135ad200352a52266ff4d32201dab255f015d5fac65984472ef78dd16da8f732da611cfa4b78db7f281fc122089894c09e1a6389336f8573cd116 SHA512 195e084c8d7c0d70444190146c90d0df9b2f44f5901c56c58da1908336bb36e92689eb03cd399663d06893902ada5c7f90055d45af52854405529e8def737e9e
+EBUILD selinux-wine-9999.ebuild 280 BLAKE2B 6ac8053a1d0135ad200352a52266ff4d32201dab255f015d5fac65984472ef78dd16da8f732da611cfa4b78db7f281fc122089894c09e1a6389336f8573cd116 SHA512 195e084c8d7c0d70444190146c90d0df9b2f44f5901c56c58da1908336bb36e92689eb03cd399663d06893902ada5c7f90055d45af52854405529e8def737e9e
 MISC metadata.xml 314 BLAKE2B 780bfce1351e4e91d04d338327f744c024f95f430bd756c235b7e198c24ef1af56f769ff4c7567be38c4e5e839afa03a1bc2ed8a56d6b7c0f4ce7b85bd95e1c7 SHA512 50bcf648ab54f3c7eb0a7027ccdf189eae0279672792f52cd52ac894a589154f9ca5feafb5d0eb646d666f1a0c1300c7403cd60efeda86087b44516ebca2da44
diff --git a/sec-policy/selinux-wine/selinux-wine-2.20180114-r2.ebuild b/sec-policy/selinux-wine/selinux-wine-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..2d14db60213d
--- /dev/null
+++ b/sec-policy/selinux-wine/selinux-wine-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 027c75dc915b..2d14db60213d 100644
--- a/sec-policy/selinux-wine/selinux-wine-9999.ebuild
+++ b/sec-policy/selinux-wine/selinux-wine-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-wireshark/Manifest b/sec-policy/selinux-wireshark/Manifest
index ccc0df9a593a..a2f309e0a3a1 100644
--- a/sec-policy/selinux-wireshark/Manifest
+++ b/sec-policy/selinux-wireshark/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-wireshark-2.20170805-r2.ebuild 288 BLAKE2B 0c2e584887f9fa0b98b96f
 EBUILD selinux-wireshark-2.20170805-r3.ebuild 288 BLAKE2B 0c2e584887f9fa0b98b96f7a0a97047de09c81dccaa1eac2dccb9ba5078f098760a15a795823c6b88317dca798742bb830fa76b3bd23a25b3c7e3b3ae1b86fbc SHA512 15b2100d575468fea73c61ae5b6edafe9dae9e24bc2ec54a92b1c2ffdbedf039c772a4c62724d6cd54dc9d1605b381ef3d643513f4f6ea59636752378b064b25
 EBUILD selinux-wireshark-2.20170805-r4.ebuild 290 BLAKE2B 491844e26a732d1caee47288ab5a2b75d191c66f17abe7f92e46f9179ddd92a606b7449bed7a454d70a132c5a6b4f60153e5bc672f16fa512d3a8626581c2ef7 SHA512 98a690ef6fc2adf79a6821018006a86eadb8fec6c6974a012ba0388f8bb75eb175bd69997039d6205aab386dfaee860b0c3941bd4779162a2c643a150d17ba8e
 EBUILD selinux-wireshark-2.20180114-r1.ebuild 288 BLAKE2B 77c61f431d6c1193ae90fba2313c32c1e29f9de4eebe152415c030a6e513ac8e0f5b086dea9092d82ce7f44d9410e2fb7634b1ba9680c89fefca3b4a02eae762 SHA512 581a8344984e78d04a005b007fd9edb95abb674dda99be463078b75b08fe173218de1c9b36a6078af2955c6a5dae84e2c26f6ce1b09ce34e207849b0d86ed870
-EBUILD selinux-wireshark-9999.ebuild 290 BLAKE2B 491844e26a732d1caee47288ab5a2b75d191c66f17abe7f92e46f9179ddd92a606b7449bed7a454d70a132c5a6b4f60153e5bc672f16fa512d3a8626581c2ef7 SHA512 98a690ef6fc2adf79a6821018006a86eadb8fec6c6974a012ba0388f8bb75eb175bd69997039d6205aab386dfaee860b0c3941bd4779162a2c643a150d17ba8e
+EBUILD selinux-wireshark-2.20180114-r2.ebuild 290 BLAKE2B 43780d094095c62f082a43d6e0e301348608aceee2c842dbe2430d29aff1233bd5cf28321b950d7dcc1fc2d7dbe4e493cbe788d46d000b781208f7d4d6ed278a SHA512 5c388e106f93efcb578efe9997e6c6032f8f0a1201fc3e59f81d468dcc2abe2f845ca2724519aac960ec69bb1ca1fe344405a583108b5159f0ed680da902f52a
+EBUILD selinux-wireshark-9999.ebuild 290 BLAKE2B 43780d094095c62f082a43d6e0e301348608aceee2c842dbe2430d29aff1233bd5cf28321b950d7dcc1fc2d7dbe4e493cbe788d46d000b781208f7d4d6ed278a SHA512 5c388e106f93efcb578efe9997e6c6032f8f0a1201fc3e59f81d468dcc2abe2f845ca2724519aac960ec69bb1ca1fe344405a583108b5159f0ed680da902f52a
 MISC metadata.xml 319 BLAKE2B bcf0d4e0124dcc45b99b5087c5433088fc85bd11cba9728e30d7171b0c88da21bb44e3c945f3a4bfa749281aeea68f4d0ee93d59fbe0af66093ac260bd48c3d9 SHA512 80924418148b0afd56b379bf7b8295dcc9544be8b78dc0716f5b0e692be198fcb5629a283e5cb42a9eeee6cb4af348232bb3538bc27929b8e58494c6859327a0
diff --git a/sec-policy/selinux-wireshark/selinux-wireshark-2.20180114-r2.ebuild b/sec-policy/selinux-wireshark/selinux-wireshark-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..a53c36b9a8b4
--- /dev/null
+++ b/sec-policy/selinux-wireshark/selinux-wireshark-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 c10051b4366f..a53c36b9a8b4 100644
--- a/sec-policy/selinux-wireshark/selinux-wireshark-9999.ebuild
+++ b/sec-policy/selinux-wireshark/selinux-wireshark-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-wm/Manifest b/sec-policy/selinux-wm/Manifest
index caff47c266f0..745ddb1d4a01 100644
--- a/sec-policy/selinux-wm/Manifest
+++ b/sec-policy/selinux-wm/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-wm-2.20170805-r2.ebuild 274 BLAKE2B 79f3a2ede46a0f86d45a0186903ce
 EBUILD selinux-wm-2.20170805-r3.ebuild 274 BLAKE2B 79f3a2ede46a0f86d45a0186903ce0413070a26919ae5be566ea70ccec8015a04163d375c3ad8213e2597d39ca323420090d9f1f4ff145354826ff593438b9fb SHA512 75189b300ee6adeeabda5c18eb6f43ce9b1bfba72c607ddf34f89970e7bf299037aad9c61408e00c16092d0bf76b3e3df240ad880f9f865f1f5dd8254e300dd2
 EBUILD selinux-wm-2.20170805-r4.ebuild 276 BLAKE2B 50bb5f0737d27d292fc1a7e5b6e8a4235557bdd6aed1bf43a408138b4d342176efa23356e058e360507646bf357e92b10c7408f1ac368a602caa70785c4c5dee SHA512 29d8195a7320143ea63eb49e7a032921fec7779f2c13c59b30cb6b86784e85fdd6e0a79997bf63195cca37886f72b07db6dbd2b39f560c6d1fe3bbcc51ef8488
 EBUILD selinux-wm-2.20180114-r1.ebuild 274 BLAKE2B 69b9ed374aa90ae1606fcf46b205e196af64ded879e4a612c02d642383cb85e0d655e12b07f0dc7c3ff5ee914424a8ace25c8014e7adc813a30594f4b7dda827 SHA512 912bcac95aaba7ca7c6a56059eece95ab44a83c4cd8501ba169992155c50fd605e8e2d145291a9f30bed39f0a6934dae3ed509353c3835e642ff552d42a7a904
-EBUILD selinux-wm-9999.ebuild 276 BLAKE2B 50bb5f0737d27d292fc1a7e5b6e8a4235557bdd6aed1bf43a408138b4d342176efa23356e058e360507646bf357e92b10c7408f1ac368a602caa70785c4c5dee SHA512 29d8195a7320143ea63eb49e7a032921fec7779f2c13c59b30cb6b86784e85fdd6e0a79997bf63195cca37886f72b07db6dbd2b39f560c6d1fe3bbcc51ef8488
+EBUILD selinux-wm-2.20180114-r2.ebuild 276 BLAKE2B ceb43c79d8a3c39acad10db42121226d1a7f6f3ed3d4cb58af558df9bfddcc31ff30360281f03144db1a42e811e0fa8ef91c43bb3465a1b0a62b4502e605fa1f SHA512 b3cc62de73af00aebe2ef7837873f2d70632107394280bd9bdc147de192fdec389e41d2bbf56dd962d38ab97f44aef19110a2570e6148f4fea38a7188353ffd4
+EBUILD selinux-wm-9999.ebuild 276 BLAKE2B ceb43c79d8a3c39acad10db42121226d1a7f6f3ed3d4cb58af558df9bfddcc31ff30360281f03144db1a42e811e0fa8ef91c43bb3465a1b0a62b4502e605fa1f SHA512 b3cc62de73af00aebe2ef7837873f2d70632107394280bd9bdc147de192fdec389e41d2bbf56dd962d38ab97f44aef19110a2570e6148f4fea38a7188353ffd4
 MISC metadata.xml 312 BLAKE2B 33d3910b761a83e4c2053db450c00b83dfa1bce1ac99a444a6b8ad247fddbb3bb23cac7fa5da9f29e2cbe52c4ef1e69323526ea1e2c1b2f537505c0584a672fa SHA512 af59f138e5a0a4e5cfc193cbffb4a43623325f89fd7241630fef628faede5bfe521f4d8309cc4eb93bd51b25e7e0a62134d3579f9dddaa68e42ac410e0e2f437
diff --git a/sec-policy/selinux-wm/selinux-wm-2.20180114-r2.ebuild b/sec-policy/selinux-wm/selinux-wm-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..356ec814381b
--- /dev/null
+++ b/sec-policy/selinux-wm/selinux-wm-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 c5f1f0e33b99..356ec814381b 100644
--- a/sec-policy/selinux-wm/selinux-wm-9999.ebuild
+++ b/sec-policy/selinux-wm/selinux-wm-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-xen/Manifest b/sec-policy/selinux-xen/Manifest
index 9f4bb91eaafd..f480007ede1f 100644
--- a/sec-policy/selinux-xen/Manifest
+++ b/sec-policy/selinux-xen/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-xen-2.20170805-r2.ebuild 276 BLAKE2B bee72d85224daae9224dd7b6da20
 EBUILD selinux-xen-2.20170805-r3.ebuild 276 BLAKE2B bee72d85224daae9224dd7b6da20c17143c42b30fec40cc52809d65a54accb65bf6951f4b3b6ab74c9ee83ddd796e5d1644e62da83423d50a0357817d76ab1bb SHA512 7772e6d69260029758f5035a8552802f84895cbf67d84afbbaa0ee3156a096e6507a64865541e23c9851ab9d97829081d92c327ebfc5d40235399d6314656aa9
 EBUILD selinux-xen-2.20170805-r4.ebuild 278 BLAKE2B 0a14e69debdc7884e688d019c823b2331fdd82d23bd24d2039554ea40db177b41e899f439fc32783104b33949a3009c0a83573bbb576f4051975e72c6d1179c7 SHA512 084266843378d6e8830157fed1903232d9390932ecbe8c5b28db366bcebeee7ef2f35c53af96d243474c355cfd52aafa68fe4b519faae6133e6d2f4e37b75c21
 EBUILD selinux-xen-2.20180114-r1.ebuild 276 BLAKE2B 0c71217578ee45452f0455b33cdd0b9aef68860852d1d8ad56ea9bb792b7315da5cf362778b2948284f34e2efd3ef3b3dc2794aca6fed5cad9f9c5c43e6c7158 SHA512 b291372923ada54cbe44b04191daea145a1447749df3209901d33bded7c03d35f47c104e2a2e70ce50f8f60b294bfc3331966bbb3662ee416f543139c2f1be3b
-EBUILD selinux-xen-9999.ebuild 278 BLAKE2B 0a14e69debdc7884e688d019c823b2331fdd82d23bd24d2039554ea40db177b41e899f439fc32783104b33949a3009c0a83573bbb576f4051975e72c6d1179c7 SHA512 084266843378d6e8830157fed1903232d9390932ecbe8c5b28db366bcebeee7ef2f35c53af96d243474c355cfd52aafa68fe4b519faae6133e6d2f4e37b75c21
+EBUILD selinux-xen-2.20180114-r2.ebuild 278 BLAKE2B 7f6d8695e84c14a0358193263925a62ffa2b5865ab2b62ec98f246ffffa5204dd6dc7da196525342b6ee84ba8ca28081b9cd492a0f907736d3e1933f9777a539 SHA512 3ce2dfa9c1136bfd76bbc8fe00788eef56a6258b834e336637258030229cc8c7b462596d8b85406c10b4e6ad0dbd6145ad68d937af1d94579e4519fb21e0a984
+EBUILD selinux-xen-9999.ebuild 278 BLAKE2B 7f6d8695e84c14a0358193263925a62ffa2b5865ab2b62ec98f246ffffa5204dd6dc7da196525342b6ee84ba8ca28081b9cd492a0f907736d3e1933f9777a539 SHA512 3ce2dfa9c1136bfd76bbc8fe00788eef56a6258b834e336637258030229cc8c7b462596d8b85406c10b4e6ad0dbd6145ad68d937af1d94579e4519fb21e0a984
 MISC metadata.xml 313 BLAKE2B 3d3cc15dc6bd1334114e59a81727a5bee2cd538013e7c438ba7d9df291daf38325683f8b5563cb11f644fb01c8c06915681ec8b5861c005c3550425712d24fa6 SHA512 9fcb80cf02e136d443c02877c738b8495f7ca07338d952e62e22a602ec39658117877871398b501700e31ab481a1566a04f6e30c797970191368b023e2bcb806
diff --git a/sec-policy/selinux-xen/selinux-xen-2.20180114-r2.ebuild b/sec-policy/selinux-xen/selinux-xen-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..a03e6da72146
--- /dev/null
+++ b/sec-policy/selinux-xen/selinux-xen-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 cb4b6a78f1ba..a03e6da72146 100644
--- a/sec-policy/selinux-xen/selinux-xen-9999.ebuild
+++ b/sec-policy/selinux-xen/selinux-xen-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-xfs/Manifest b/sec-policy/selinux-xfs/Manifest
index b9d16dfa0c7b..aa448573611c 100644
--- a/sec-policy/selinux-xfs/Manifest
+++ b/sec-policy/selinux-xfs/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-xfs-2.20170805-r2.ebuild 276 BLAKE2B 6cf982bcb8424f16451c5221fa39
 EBUILD selinux-xfs-2.20170805-r3.ebuild 276 BLAKE2B 6cf982bcb8424f16451c5221fa396f7dcaab2eaba50a3e4dca077b7b3b1a8272e4f0dc486a8d6a9845623313e0bf650e004a8d71b812ed7e1befa2d67a360ee0 SHA512 7ff8bbb9d24a6156b862742a6839718deb02c8ebbacfa914ec73614ef66325db560130a8d085a92632edf363010dea3670b2cee5421c4f624737503d2b80cdd2
 EBUILD selinux-xfs-2.20170805-r4.ebuild 278 BLAKE2B 766a46a9106ad4f2d1892e438707713a7f32256c08401dc06dd543a18a189a83b2333fc0be304024f05471e5528ef9e07202218928dbe8d401c0007d77c90c08 SHA512 b11264b2df58f1cbd634a65c27517a96263d181ef65f0780636aef4e7e15a51d1fcca8e16870af046fe066aad529bf4ad24b901491ffbeba169098f39d12a0bf
 EBUILD selinux-xfs-2.20180114-r1.ebuild 276 BLAKE2B 147f608ceedad91e7242b8e884102dddf9c53f4d8d3cc97b3f1d503fbc015f8abc6da47e5740f560c034ab35e6bcab9e178584d1efc488514e992a1f32da3db8 SHA512 3f8d552e14115d167756575b0f25cbae7bafa38bad79e320415a063f2197012776ed1fb8e686a1fcfad78c5e074ef31367d96806df49c7c235245ad6b6c2754c
-EBUILD selinux-xfs-9999.ebuild 278 BLAKE2B 766a46a9106ad4f2d1892e438707713a7f32256c08401dc06dd543a18a189a83b2333fc0be304024f05471e5528ef9e07202218928dbe8d401c0007d77c90c08 SHA512 b11264b2df58f1cbd634a65c27517a96263d181ef65f0780636aef4e7e15a51d1fcca8e16870af046fe066aad529bf4ad24b901491ffbeba169098f39d12a0bf
+EBUILD selinux-xfs-2.20180114-r2.ebuild 278 BLAKE2B bd8287f9a079da787d4b10326dcb67d9336d3db0abc61a3c9cbc98bf48867a7eabea293179f5b58bd5757a168c95eea4b1fbca955340c88473631c5f0de6e7aa SHA512 50e653079f6b8c04df322f07f9cde1172f902a46a3451f6ec8fc7a27f094481799fed3fa8688840c7fdb5fb492d989ad4b82fa398fec30503ecfa741e5439b29
+EBUILD selinux-xfs-9999.ebuild 278 BLAKE2B bd8287f9a079da787d4b10326dcb67d9336d3db0abc61a3c9cbc98bf48867a7eabea293179f5b58bd5757a168c95eea4b1fbca955340c88473631c5f0de6e7aa SHA512 50e653079f6b8c04df322f07f9cde1172f902a46a3451f6ec8fc7a27f094481799fed3fa8688840c7fdb5fb492d989ad4b82fa398fec30503ecfa741e5439b29
 MISC metadata.xml 313 BLAKE2B 04215c2d269e1175cde05c8e127fce9049b974992079c026d663d0415e8d76b988ee852e78291e6912453f4152a799b4b38cab4c97ac203fc6b76de00ccb78b4 SHA512 5e9759c65739b4c1392585addc79b9b430fbdc6a564d27836398d686e3e89b84b4213243b571022ee7703413b5212d212a92fbb3feb0134a14a8c31ab5e67bee
diff --git a/sec-policy/selinux-xfs/selinux-xfs-2.20180114-r2.ebuild b/sec-policy/selinux-xfs/selinux-xfs-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..cf06c723ddfd
--- /dev/null
+++ b/sec-policy/selinux-xfs/selinux-xfs-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 a2cc37d8b263..cf06c723ddfd 100644
--- a/sec-policy/selinux-xfs/selinux-xfs-9999.ebuild
+++ b/sec-policy/selinux-xfs/selinux-xfs-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-xprint/Manifest b/sec-policy/selinux-xprint/Manifest
index 2d1248f7d9b4..cf44009fb513 100644
--- a/sec-policy/selinux-xprint/Manifest
+++ b/sec-policy/selinux-xprint/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-xprint-2.20170805-r2.ebuild 282 BLAKE2B 9c9d6b90bdcb04a9114534d4c
 EBUILD selinux-xprint-2.20170805-r3.ebuild 282 BLAKE2B 9c9d6b90bdcb04a9114534d4c2e05b7af951d5036cc18f3876fec47051c7994270f3cdf96a294e02b9233db97c599ee4e41dc98ae9282ff489041f2ead19ceb4 SHA512 ecc2828c0f8c0f3653d388844a7011838abb4b5360650ce46eb520c172589f81b85f98151acf4a8f047b441e277aeeb6c45b8cbe2f830768757ed70d7879c3ec
 EBUILD selinux-xprint-2.20170805-r4.ebuild 284 BLAKE2B 4168014d49632138e2a5684b15e4286ac5172e7a15280ba4ae72df93a0e4ce2b8e4068ce5506d6284d54af88bf4423f52aaa51216f8bf7c9083950d4819b5d6a SHA512 50c5451066788ab806200ef14bebad8b33987cd18390b49eef01262751ea766704d32cbf75d0a9f3117b95ddee6815088bad44827d309af06da848a9d61312fd
 EBUILD selinux-xprint-2.20180114-r1.ebuild 282 BLAKE2B 7ea7fa849abc73f5bed4a71e40e1b2def5b2268d069074495bdab88fba4b0825513328fca6fcf88c9a3a21ddee52ab4bf1d467c5c3fa0e2f099930116f3addf7 SHA512 36f1bfa35cceff1195eb5191aab8c78a2a9d8dbb98682cff87fda61167ccb0e3800d6d7e08442112b05610629837dad4be78f3e87fc17670645a8b7572da1cd1
-EBUILD selinux-xprint-9999.ebuild 284 BLAKE2B 4168014d49632138e2a5684b15e4286ac5172e7a15280ba4ae72df93a0e4ce2b8e4068ce5506d6284d54af88bf4423f52aaa51216f8bf7c9083950d4819b5d6a SHA512 50c5451066788ab806200ef14bebad8b33987cd18390b49eef01262751ea766704d32cbf75d0a9f3117b95ddee6815088bad44827d309af06da848a9d61312fd
+EBUILD selinux-xprint-2.20180114-r2.ebuild 284 BLAKE2B b36fd23f6b2b642e7ef3faafb97be17679b2b852714e079126161ffd1eb6a4ee0b3bf9b2b0d5db4b040528ed5de9f47d3067e8439653d210421d0816d9d6a2bc SHA512 e350e1cd920159f0f990205d79205a6f816aab15c01850e8f602afce0c982d2321f7268e032c9b53bb13f9f36d2e1f1a96707797d4e540aa7ba3d47f56d3f1e0
+EBUILD selinux-xprint-9999.ebuild 284 BLAKE2B b36fd23f6b2b642e7ef3faafb97be17679b2b852714e079126161ffd1eb6a4ee0b3bf9b2b0d5db4b040528ed5de9f47d3067e8439653d210421d0816d9d6a2bc SHA512 e350e1cd920159f0f990205d79205a6f816aab15c01850e8f602afce0c982d2321f7268e032c9b53bb13f9f36d2e1f1a96707797d4e540aa7ba3d47f56d3f1e0
 MISC metadata.xml 316 BLAKE2B 3e42fb74e71432a997cb3b59f7e614b5466967486715d78d3a4d736a1c5e8e233da7da42939cb23621dc0963f76e7ddeffdc5c57ee01064575ed2eafeeba0c35 SHA512 6025b0050ab23d7f203102d346962ab4042058052e4bd2fad5b376b8d408fc266e252fee0b99f218f39adb538c22b8cf740bf628b3c6f1db586af3e9c1ef988e
diff --git a/sec-policy/selinux-xprint/selinux-xprint-2.20180114-r2.ebuild b/sec-policy/selinux-xprint/selinux-xprint-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..403d7b9730b2
--- /dev/null
+++ b/sec-policy/selinux-xprint/selinux-xprint-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 229b7c9dc101..403d7b9730b2 100644
--- a/sec-policy/selinux-xprint/selinux-xprint-9999.ebuild
+++ b/sec-policy/selinux-xprint/selinux-xprint-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-xscreensaver/Manifest b/sec-policy/selinux-xscreensaver/Manifest
index 3205cff19457..7aaa4cc44a74 100644
--- a/sec-policy/selinux-xscreensaver/Manifest
+++ b/sec-policy/selinux-xscreensaver/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-xscreensaver-2.20170805-r2.ebuild 392 BLAKE2B 04e1249ee0552b0366c
 EBUILD selinux-xscreensaver-2.20170805-r3.ebuild 392 BLAKE2B 04e1249ee0552b0366c9ee8413a9f96458e3d41865e3c352c02fadba492629b4aa8f3e13393b6697623a8600663ba91e5d405802eff1583821e58ad3ec311752 SHA512 31ab57bb35c3acc159371db9a32c71a99b3ba4c92aaa18c2c65ba4160af2a696fb9cb3b12ab0898a5ad92dbdb8db2cc84f14424053d4bf2f226a81b82840a7c2
 EBUILD selinux-xscreensaver-2.20170805-r4.ebuild 394 BLAKE2B 66fe074afc182667198d82d0199f798b759ff19a62f1b9d50afcf44b6a6f4e14576fd19c8cbe1bee1e950c702471ceee6bc5181dcc1c166f469160e4fec8216c SHA512 950c446f9e63773bf40fddec758842d2c82415a7886fd89b046bac0188ed02e26edb5350a6570bf04bd678cb7bf2065a5d462c23161ed16d353037129fa1c118
 EBUILD selinux-xscreensaver-2.20180114-r1.ebuild 392 BLAKE2B 7fadaa134d872d94b19256d1f2e284f43f32ef17ba7fbc645f54fcfd47f6bfc585d2c351fec7c6b92b246104f66a88119b65feb5d69daede2e1dafd55648abd1 SHA512 9c7e9c63bd3b001a9c1808f2b8d8d1c16478b95edeb8ffed4b08d43b96f350ca7e38f3c5620b43419f1e1aa13469d5433d2a98be286b21d60246b7ff05d22511
-EBUILD selinux-xscreensaver-9999.ebuild 394 BLAKE2B 66fe074afc182667198d82d0199f798b759ff19a62f1b9d50afcf44b6a6f4e14576fd19c8cbe1bee1e950c702471ceee6bc5181dcc1c166f469160e4fec8216c SHA512 950c446f9e63773bf40fddec758842d2c82415a7886fd89b046bac0188ed02e26edb5350a6570bf04bd678cb7bf2065a5d462c23161ed16d353037129fa1c118
+EBUILD selinux-xscreensaver-2.20180114-r2.ebuild 394 BLAKE2B c34608a56e05b40a32cfa3f9c528c20fc97209e34e0aa767fa778412d60cc3ba32c0c2f7ab9144c44c1b9dc240ada13e2f255b9d39a3b9691043facdb9cdc0ba SHA512 7679b59ce73e0810dcb06075b1714a70c8a3ded10483594653348e9df4e5407dc80c187d2a07bdc53631a0688b050be756ed70b1386e38ad9db48febd4a90352
+EBUILD selinux-xscreensaver-9999.ebuild 394 BLAKE2B c34608a56e05b40a32cfa3f9c528c20fc97209e34e0aa767fa778412d60cc3ba32c0c2f7ab9144c44c1b9dc240ada13e2f255b9d39a3b9691043facdb9cdc0ba SHA512 7679b59ce73e0810dcb06075b1714a70c8a3ded10483594653348e9df4e5407dc80c187d2a07bdc53631a0688b050be756ed70b1386e38ad9db48febd4a90352
 MISC metadata.xml 322 BLAKE2B 7d5ab233185dd0f086b0950d3316a9cc8e6d69ea3d18520b1da4c068ff1a2768791c908f2bbf07f82920ce02bb2e68300025dc013e3dbdd59e801c56f87f97f7 SHA512 405222d4ec4a70637897d7122cfb105c70ecb118237a3a614faf5af8f97789ce88820cb4455ffa6c661b17c9352d8d31eb3afc46e9b02bc338d3ee23f16aca07
diff --git a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20180114-r2.ebuild b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..2fde998e703d
--- /dev/null
+++ b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20180114-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 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 f333201746de..2fde998e703d 100644
--- a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-9999.ebuild
+++ b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-xserver/Manifest b/sec-policy/selinux-xserver/Manifest
index a00251953258..740ef24e22c3 100644
--- a/sec-policy/selinux-xserver/Manifest
+++ b/sec-policy/selinux-xserver/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-xserver-2.20170805-r2.ebuild 284 BLAKE2B 8b5fd19c06173c305328b179
 EBUILD selinux-xserver-2.20170805-r3.ebuild 284 BLAKE2B 8b5fd19c06173c305328b1790a21f9059e8767baf12853a045de182033b7e6b7f601a0ccf297218aadf6e6e3a3cb6cdf78604b20e0134609b10d59c19edacd9c SHA512 cd1e9f8f70b97aebbcf3c3c846181a89c5c06f0285c79b9c5cfaaaec7f85ac9c76b6db75aaf3b15d6e17cb3ab01966652f44d23c904e47fd1e05d516a8a39f55
 EBUILD selinux-xserver-2.20170805-r4.ebuild 286 BLAKE2B 5ef43b9963d1965d3fd8a6146ea7df8f06ad9799bbcde000ac357fb79e5c4cdf16b01783f81653722696d5ceddd2400c0c8b19899c445654311ccbe0ccf7234d SHA512 2a036e6b550e6442e0e5a245161b421e02f8eae9acab821af2fa064a6c4f55ff1e2f269a72defbc5ca399af7b0381c4e393b5b4c9248b41ca026cf0a776f8fa9
 EBUILD selinux-xserver-2.20180114-r1.ebuild 284 BLAKE2B 987357d4ab0e06349bbbe2d90d591959784dc4a5178cdcba9df2b51bdcb699a186810f1154b7e7ec95f396b776014dc02af11df65e5926bda6adec71a0e63385 SHA512 3bf40e47b900511ec1870b6a7832b36570c44aaa22acb39edc08e6531e748ec518bcca6a0a48c1a17647d6d20910696f6aefbed989c5b86af10f8725a4a5df3a
-EBUILD selinux-xserver-9999.ebuild 286 BLAKE2B 5ef43b9963d1965d3fd8a6146ea7df8f06ad9799bbcde000ac357fb79e5c4cdf16b01783f81653722696d5ceddd2400c0c8b19899c445654311ccbe0ccf7234d SHA512 2a036e6b550e6442e0e5a245161b421e02f8eae9acab821af2fa064a6c4f55ff1e2f269a72defbc5ca399af7b0381c4e393b5b4c9248b41ca026cf0a776f8fa9
+EBUILD selinux-xserver-2.20180114-r2.ebuild 286 BLAKE2B eea83d2520a5de9dec1cfab88adfb09b9df3238d1d515131e0b0f533bbfdb7925e8e64ef7ff1480cd1b5773ed3f527c1a7b055d13cd59a823acab8735aa7d116 SHA512 ecb2df0d6dc0411a68839802515b4e468c236352c1fabb465c9144ea2771728ab238d07ccee76c7fafd0db0a91e76a5c37d23d460d518ffeface9b1727cf61e1
+EBUILD selinux-xserver-9999.ebuild 286 BLAKE2B eea83d2520a5de9dec1cfab88adfb09b9df3238d1d515131e0b0f533bbfdb7925e8e64ef7ff1480cd1b5773ed3f527c1a7b055d13cd59a823acab8735aa7d116 SHA512 ecb2df0d6dc0411a68839802515b4e468c236352c1fabb465c9144ea2771728ab238d07ccee76c7fafd0db0a91e76a5c37d23d460d518ffeface9b1727cf61e1
 MISC metadata.xml 317 BLAKE2B 8283187fba1cffb267929f3370b79e9b3f363ce0a69cd687ef82824c577fc2dfe2b5790359f5f36b297ef290c483c850851c09d7ed8fe6aada33e085cbbe5559 SHA512 cdc8ee6cf27d1f6b67ab653cb4db301225fde367b52f0e37f31e15acb0ec0b9fc49be756b64a39188c8bf4e3e6ba417142659b98f1a5795b8cd350464b9fa359
diff --git a/sec-policy/selinux-xserver/selinux-xserver-2.20180114-r2.ebuild b/sec-policy/selinux-xserver/selinux-xserver-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..a32bb13fcdbb
--- /dev/null
+++ b/sec-policy/selinux-xserver/selinux-xserver-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 1238af8bff1c..a32bb13fcdbb 100644
--- a/sec-policy/selinux-xserver/selinux-xserver-9999.ebuild
+++ b/sec-policy/selinux-xserver/selinux-xserver-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sec-policy/selinux-zabbix/Manifest b/sec-policy/selinux-zabbix/Manifest
index a1c5e0ea5b0d..196fd14beeed 100644
--- a/sec-policy/selinux-zabbix/Manifest
+++ b/sec-policy/selinux-zabbix/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-zabbix-2.20170805-r2.ebuild 282 BLAKE2B 924a16811d3187732005da659
 EBUILD selinux-zabbix-2.20170805-r3.ebuild 282 BLAKE2B 924a16811d3187732005da659a611f767048cac2fdbc8f0cc7a1d88fb19d30b36e1a1932c0eebb2dd5e08c1e78471847751a0042f6d164f700f4ca6b389db896 SHA512 0f9106d524e52ffbf0a2c9f41856f84f5afb0848e6df7ef6a7581cb90da6d272f88180bd6599eb91180f2ad044b1b72cf440574cf97c643381e0e99cde1d2b05
 EBUILD selinux-zabbix-2.20170805-r4.ebuild 284 BLAKE2B b95c626daca6b72d9240214cd1c7d20ce6adb458e0a44d743925e41b43b1af4ed751dbf245de1e286a8b7eb320e2817a7ba3a757f86f36a02d3a794c0642d506 SHA512 45cb06bc6f20cc63597926930a2e455b5fccc5cd73a23a25408687eaa590b026d59238a8731e04a73b801c131c95b9485290722f84dd3aa6b6c7ab08fe9117c8
 EBUILD selinux-zabbix-2.20180114-r1.ebuild 282 BLAKE2B 853bb29c929da43388cb19be21687276d4f5a93938bba87031eab9f4fed008947c7801db3173146876666806ff3cc00799f758ddecc01cb33d56dbf8220a0a04 SHA512 b7978d976f070f2e5842b8b9a462c4b66a901826920387a57b911029a0f7fc51a8b219205cfa00f8be4cf39cbe7e9db52e7eb97f18b65fea4cdddcf0b3aca9d5
-EBUILD selinux-zabbix-9999.ebuild 284 BLAKE2B b95c626daca6b72d9240214cd1c7d20ce6adb458e0a44d743925e41b43b1af4ed751dbf245de1e286a8b7eb320e2817a7ba3a757f86f36a02d3a794c0642d506 SHA512 45cb06bc6f20cc63597926930a2e455b5fccc5cd73a23a25408687eaa590b026d59238a8731e04a73b801c131c95b9485290722f84dd3aa6b6c7ab08fe9117c8
+EBUILD selinux-zabbix-2.20180114-r2.ebuild 284 BLAKE2B d3796eeb7bb6f0ced760038fe5d3c6820b85fbfc3f2b03fd2cabff71a0fa2b5f999fa49fd95034f408b66ea93f36f49cabcc09aa95c973e0a94d742ae2f151d5 SHA512 45b2ce218a2c9ec3369cd5e545387df527d3a21269fe09cba05cecac4c06e84abbdded320f636d304561cec109d966ef2170e94d08c7b2ad710487cfddfb8d35
+EBUILD selinux-zabbix-9999.ebuild 284 BLAKE2B d3796eeb7bb6f0ced760038fe5d3c6820b85fbfc3f2b03fd2cabff71a0fa2b5f999fa49fd95034f408b66ea93f36f49cabcc09aa95c973e0a94d742ae2f151d5 SHA512 45b2ce218a2c9ec3369cd5e545387df527d3a21269fe09cba05cecac4c06e84abbdded320f636d304561cec109d966ef2170e94d08c7b2ad710487cfddfb8d35
 MISC metadata.xml 316 BLAKE2B adaaa83176d90d4c8b3ec542b1d471b62f69e49e450d31ee360bc4a73dde5af47db69f01f51fa344cf82eae338f4ab1d228eb75d3b24ce9fce43929ba89b1202 SHA512 723a790e3ec5cc0449a7d62d4f3d997a52de7c66238f0d8e6b4a1036e15df38b4aa1f57a559ef98747e85ab0208897aa5733a09bcfe498475bed45edea162b12
diff --git a/sec-policy/selinux-zabbix/selinux-zabbix-2.20180114-r2.ebuild b/sec-policy/selinux-zabbix/selinux-zabbix-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..60a2bf7d34cf
--- /dev/null
+++ b/sec-policy/selinux-zabbix/selinux-zabbix-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 3f47ff20c816..60a2bf7d34cf 100644
--- a/sec-policy/selinux-zabbix/selinux-zabbix-9999.ebuild
+++ b/sec-policy/selinux-zabbix/selinux-zabbix-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
author	V3n3RiX <venerix@redcorelinux.org>	2018-04-28 20:02:04 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-04-28 20:02:04 +0100
commit	a4e2a46beb5e4858ef27bdedbb0ff6d2ced430ad (patch)
tree	852c90a4bf354c30ea66504f70bfab5401fba18d /sec-policy
parent	5e8702bcbbed438e6c6cce023e7ef0cc9baa3e02 (diff)