gentoo resync : 28.04.2018

3 files changed, 19 insertions, 2 deletions

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"