gentoo resync : 28.04.2018

3 files changed, 19 insertions, 2 deletions

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"