gentoo resync : 28.04.2018

3 files changed, 25 insertions, 2 deletions

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"