gentoo resync : 28.04.2018

3 files changed, 19 insertions, 2 deletions

diff --git a/sec-policy/selinux-prelink/Manifest b/sec-policy/selinux-prelink/Manifest
index 706f2084e2ff..ca66458849fc 100644
--- a/sec-policy/selinux-prelink/Manifest
+++ b/sec-policy/selinux-prelink/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-prelink-2.20170805-r2.ebuild 284 BLAKE2B f18d884e34b2ec1165a36739
 EBUILD selinux-prelink-2.20170805-r3.ebuild 284 BLAKE2B f18d884e34b2ec1165a3673974162322e5f98b6590dc2a58c18bc3832541d0464e300ef59ad2d11ede47ccf4c83619820191df6350f8fabf7495c7a5ba2e395c SHA512 f1f96a000d7bcadb3dd82671515869257b3a665c596af4e4b77cd66b861f21dc7167a61b3acd036a6221add588cff235d32023a965d2d008fdb96a54e3fbca79
 EBUILD selinux-prelink-2.20170805-r4.ebuild 286 BLAKE2B d5ff481b6d93873b4c21947b26b8575ebe2dd7d2f08d44b7f540fe8a524bbc26d148d28a949b709b34ed9712f9f0250511e454ca8a3488233a01121a5cf98415 SHA512 a3e006f1f1451a0d1a4604821bbfe36cba6815da539dd468c0f6db5b89aeb22ac6b1bba379f5b9262b6c51dead5aac96d0445514ad12a037924e15da4abedad6
 EBUILD selinux-prelink-2.20180114-r1.ebuild 284 BLAKE2B ae8839f864d62249f8769eed890e7ac0ec83a3723b58a7aacaf4d565093a4fd2962284d6af3ae4e22f15dc2b85ac590accf57cdbb5e836f97db738b626519246 SHA512 44ce8cc56110c03a7420b32ef7fe3aa3ed27b88616bbc89bcc3bfdad3cf77dcd8fcd8648ae8dcb6e7823ca56e59384ee213abeaf40ad457500542e3971ef1cbb
-EBUILD selinux-prelink-9999.ebuild 286 BLAKE2B d5ff481b6d93873b4c21947b26b8575ebe2dd7d2f08d44b7f540fe8a524bbc26d148d28a949b709b34ed9712f9f0250511e454ca8a3488233a01121a5cf98415 SHA512 a3e006f1f1451a0d1a4604821bbfe36cba6815da539dd468c0f6db5b89aeb22ac6b1bba379f5b9262b6c51dead5aac96d0445514ad12a037924e15da4abedad6
+EBUILD selinux-prelink-2.20180114-r2.ebuild 286 BLAKE2B 5c56a88a0a74444bd24c5b50c631720af4e8d0920e5e0a3b40602f16a443cda67a1448efc8a9462943d0187d913b879784dcf25f100e09f781f3da64c593fe2e SHA512 55179e49f2fb5f194a7846460b71038544b7b2af3727b463fa3a9e15e18f2bf4981d102d3833a9fe7ca5adeeeefa8e42aba82b8374056571cce19b3db4f96d0a
+EBUILD selinux-prelink-9999.ebuild 286 BLAKE2B 5c56a88a0a74444bd24c5b50c631720af4e8d0920e5e0a3b40602f16a443cda67a1448efc8a9462943d0187d913b879784dcf25f100e09f781f3da64c593fe2e SHA512 55179e49f2fb5f194a7846460b71038544b7b2af3727b463fa3a9e15e18f2bf4981d102d3833a9fe7ca5adeeeefa8e42aba82b8374056571cce19b3db4f96d0a
 MISC metadata.xml 317 BLAKE2B 13304bdab3d7cf89c48d3feb1b7893a4c4014cd799a40eecf6e07adf2fd31320a75c7e4e6555f01b23148992ebceadf2da32623b2918a5885ae2a61c3ba44e31 SHA512 858d2c01c7dfe3f73a2293cb15ff34bcaeb3f92c5736a09da4eaaedb341a52e32289525a07cbac480add98386016d07b1b705aead1b9992a7541d5bdd3126c42
diff --git a/sec-policy/selinux-prelink/selinux-prelink-2.20180114-r2.ebuild b/sec-policy/selinux-prelink/selinux-prelink-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..8dc9cf31cd90
--- /dev/null
+++ b/sec-policy/selinux-prelink/selinux-prelink-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="prelink"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for prelink"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-prelink/selinux-prelink-9999.ebuild b/sec-policy/selinux-prelink/selinux-prelink-9999.ebuild
index 57e11bb1b330..8dc9cf31cd90 100644
--- a/sec-policy/selinux-prelink/selinux-prelink-9999.ebuild
+++ b/sec-policy/selinux-prelink/selinux-prelink-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"