gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-xserver/Manifest b/sec-policy/selinux-xserver/Manifest
index e158a451d7d6..6cd56c082f7e 100644
--- a/sec-policy/selinux-xserver/Manifest
+++ b/sec-policy/selinux-xserver/Manifest
@@ -1,11 +1,8 @@
-DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
 DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
-DIST patchbundle-selinux-base-policy-2.20200818-r1.tar.bz2 278147 BLAKE2B 1e63517f15ed297c3cc1ed068db30ef60c0ebb11790abb89a80cde44da882b9381a8eccc66378576d84c106af7e9f7fd9e65b76b8e6f5134b34a2b517f5bb7f1 SHA512 d688e3f9d5dceb8a8747025adeddcfdd923e39757ab5ad7b92be00b544e47f0aa0c47aaf5a71eb4d3f616743d3291b8a8babdedfa238913371d58be3fccd4812
-DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
+DIST patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2 433623 BLAKE2B f0655c45c50347faf1217e5861298dce822e4b726c0b4489d4c70c4815842f7c17ac1b0a302ae5482a3ad25d1d5b6c4c3b6395194e79005f31560d103ad0fce6 SHA512 9fd22683ecd602a429b2d489f7b8c2936409fa060046255b72a4b95c9fdefa2455ba7655945278dc972c22f3ade6617898ed169e22001aaaaded4b47ca51b0c3
 DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
-EBUILD selinux-xserver-2.20190201-r1.ebuild 281 BLAKE2B 28195b2ea31c6f9b091990a183c4f69faffa0c4d5f633edda8fcffeaff320c7f886065d474b05012d070a0c87f762421bfd4ef45f3b67d0a981c844ae6824b62 SHA512 17d01cf4a01c0530cfeca8228cef603f3811cfe068a09004525d8ca43c04c862f6e57d99b7229bb57b218eb2b3c85a8cf10f6821464c9259cd564df968978674
 EBUILD selinux-xserver-2.20190609-r1.ebuild 281 BLAKE2B 28195b2ea31c6f9b091990a183c4f69faffa0c4d5f633edda8fcffeaff320c7f886065d474b05012d070a0c87f762421bfd4ef45f3b67d0a981c844ae6824b62 SHA512 17d01cf4a01c0530cfeca8228cef603f3811cfe068a09004525d8ca43c04c862f6e57d99b7229bb57b218eb2b3c85a8cf10f6821464c9259cd564df968978674
-EBUILD selinux-xserver-2.20200818-r1.ebuild 283 BLAKE2B 39da47b56979c493e7f724086a741df5ca1a29ea899061680813813a2ecf24b50ca6e5f486de6406333f02a4776110e97de070f7286e20d470570a68594a11e4 SHA512 20fa0c6186d526c13ad4a2663d186ba344e575477d8cc57ac1c98f3d54cb46f3739be3eda7d78fc3bd45a745250a341bc356f4635100a362f4f94a34269fea07
-EBUILD selinux-xserver-9999.ebuild 286 BLAKE2B eea83d2520a5de9dec1cfab88adfb09b9df3238d1d515131e0b0f533bbfdb7925e8e64ef7ff1480cd1b5773ed3f527c1a7b055d13cd59a823acab8735aa7d116 SHA512 ecb2df0d6dc0411a68839802515b4e468c236352c1fabb465c9144ea2771728ab238d07ccee76c7fafd0db0a91e76a5c37d23d460d518ffeface9b1727cf61e1
+EBUILD selinux-xserver-2.20200818-r2.ebuild 281 BLAKE2B 1fcf4f906db0c884e057fbea642095f34392725c2fe611c47860b9192ae50959267f706957a4344b05cc8a9859e7d4a752970edbed0ed3a7554239ff4da6a819 SHA512 9c2624bee5c97b1ae49a51577030647a48b3334102d62fe3b201aa4848de4cd057ec69e851917877d8263c0dd57518b83f277deedcb8384ad1f4f1b71344cec9
+EBUILD selinux-xserver-9999.ebuild 283 BLAKE2B d90646458e2c993343da4ff76f54a64e64e8e7209bfa274a10ceffcea5e2a412ecd1d9828163b426bab935e3a102183fea862571e835729ce0f4612988d3da63 SHA512 9ff754e4b5d74de7c24876d91a079df2edd7f97f7c1f48fa3e94f4d128d1714645554839696db4f213131343b774142b8a6c90c1f9ab8aee9760afba267c4448
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-xserver/selinux-xserver-2.20200818-r1.ebuild b/sec-policy/selinux-xserver/selinux-xserver-2.20200818-r1.ebuild
deleted file mode 100644
index 8521fba28180..000000000000
--- a/sec-policy/selinux-xserver/selinux-xserver-2.20200818-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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.20190201-r1.ebuild b/sec-policy/selinux-xserver/selinux-xserver-2.20200818-r2.ebuild
index aa953c3b87cf..5a355b2c4060 100644
--- a/sec-policy/selinux-xserver/selinux-xserver-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-xserver/selinux-xserver-2.20200818-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 IUSE=""
 MODS="xserver"
diff --git a/sec-policy/selinux-xserver/selinux-xserver-9999.ebuild b/sec-policy/selinux-xserver/selinux-xserver-9999.ebuild
index a32bb13fcdbb..e8a1d11290e7 100644
--- a/sec-policy/selinux-xserver/selinux-xserver-9999.ebuild
+++ b/sec-policy/selinux-xserver/selinux-xserver-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 IUSE=""
 MODS="xserver"