gentoo resync : 14.07.2018

3 files changed, 5 insertions, 22 deletions

diff --git a/sec-policy/selinux-xserver/Manifest b/sec-policy/selinux-xserver/Manifest
index d5addfa33a7e..bc53d7b7e5bf 100644
--- a/sec-policy/selinux-xserver/Manifest
+++ b/sec-policy/selinux-xserver/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 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 patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-xserver-2.20170805-r2.ebuild 284 BLAKE2B 8b5fd19c06173c305328b1790a21f9059e8767baf12853a045de182033b7e6b7f601a0ccf297218aadf6e6e3a3cb6cdf78604b20e0134609b10d59c19edacd9c SHA512 cd1e9f8f70b97aebbcf3c3c846181a89c5c06f0285c79b9c5cfaaaec7f85ac9c76b6db75aaf3b15d6e17cb3ab01966652f44d23c904e47fd1e05d516a8a39f55
-EBUILD selinux-xserver-2.20170805-r3.ebuild 284 BLAKE2B 8b5fd19c06173c305328b1790a21f9059e8767baf12853a045de182033b7e6b7f601a0ccf297218aadf6e6e3a3cb6cdf78604b20e0134609b10d59c19edacd9c SHA512 cd1e9f8f70b97aebbcf3c3c846181a89c5c06f0285c79b9c5cfaaaec7f85ac9c76b6db75aaf3b15d6e17cb3ab01966652f44d23c904e47fd1e05d516a8a39f55
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
 EBUILD selinux-xserver-2.20180114-r1.ebuild 284 BLAKE2B 987357d4ab0e06349bbbe2d90d591959784dc4a5178cdcba9df2b51bdcb699a186810f1154b7e7ec95f396b776014dc02af11df65e5926bda6adec71a0e63385 SHA512 3bf40e47b900511ec1870b6a7832b36570c44aaa22acb39edc08e6531e748ec518bcca6a0a48c1a17647d6d20910696f6aefbed989c5b86af10f8725a4a5df3a
 EBUILD selinux-xserver-2.20180114-r2.ebuild 284 BLAKE2B 987357d4ab0e06349bbbe2d90d591959784dc4a5178cdcba9df2b51bdcb699a186810f1154b7e7ec95f396b776014dc02af11df65e5926bda6adec71a0e63385 SHA512 3bf40e47b900511ec1870b6a7832b36570c44aaa22acb39edc08e6531e748ec518bcca6a0a48c1a17647d6d20910696f6aefbed989c5b86af10f8725a4a5df3a
 EBUILD selinux-xserver-2.20180114-r3.ebuild 286 BLAKE2B eea83d2520a5de9dec1cfab88adfb09b9df3238d1d515131e0b0f533bbfdb7925e8e64ef7ff1480cd1b5773ed3f527c1a7b055d13cd59a823acab8735aa7d116 SHA512 ecb2df0d6dc0411a68839802515b4e468c236352c1fabb465c9144ea2771728ab238d07ccee76c7fafd0db0a91e76a5c37d23d460d518ffeface9b1727cf61e1
+EBUILD selinux-xserver-2.20180701-r1.ebuild 286 BLAKE2B eea83d2520a5de9dec1cfab88adfb09b9df3238d1d515131e0b0f533bbfdb7925e8e64ef7ff1480cd1b5773ed3f527c1a7b055d13cd59a823acab8735aa7d116 SHA512 ecb2df0d6dc0411a68839802515b4e468c236352c1fabb465c9144ea2771728ab238d07ccee76c7fafd0db0a91e76a5c37d23d460d518ffeface9b1727cf61e1
 EBUILD selinux-xserver-9999.ebuild 286 BLAKE2B eea83d2520a5de9dec1cfab88adfb09b9df3238d1d515131e0b0f533bbfdb7925e8e64ef7ff1480cd1b5773ed3f527c1a7b055d13cd59a823acab8735aa7d116 SHA512 ecb2df0d6dc0411a68839802515b4e468c236352c1fabb465c9144ea2771728ab238d07ccee76c7fafd0db0a91e76a5c37d23d460d518ffeface9b1727cf61e1
 MISC metadata.xml 317 BLAKE2B 8283187fba1cffb267929f3370b79e9b3f363ce0a69cd687ef82824c577fc2dfe2b5790359f5f36b297ef290c483c850851c09d7ed8fe6aada33e085cbbe5559 SHA512 cdc8ee6cf27d1f6b67ab653cb4db301225fde367b52f0e37f31e15acb0ec0b9fc49be756b64a39188c8bf4e3e6ba417142659b98f1a5795b8cd350464b9fa359
diff --git a/sec-policy/selinux-xserver/selinux-xserver-2.20170805-r3.ebuild b/sec-policy/selinux-xserver/selinux-xserver-2.20170805-r3.ebuild
deleted file mode 100644
index 9fdf569dc086..000000000000
--- a/sec-policy/selinux-xserver/selinux-xserver-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="xserver"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for xserver"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-xserver/selinux-xserver-2.20170805-r2.ebuild b/sec-policy/selinux-xserver/selinux-xserver-2.20180701-r1.ebuild
index 9fdf569dc086..a32bb13fcdbb 100644
--- a/sec-policy/selinux-xserver/selinux-xserver-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-xserver/selinux-xserver-2.20180701-r1.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"
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for xserver"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
 fi