gentoo resync : 28.04.2018

3 files changed, 19 insertions, 2 deletions

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"