gentoo resync : 28.04.2018

3 files changed, 19 insertions, 2 deletions

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"