gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-loadkeys/Manifest b/sec-policy/selinux-loadkeys/Manifest
index e79cf4e8eb65..14cd493cba0a 100644
--- a/sec-policy/selinux-loadkeys/Manifest
+++ b/sec-policy/selinux-loadkeys/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-loadkeys-2.20190201-r1.ebuild 283 BLAKE2B 829a2f0ab38b02e4935f132a26fdf56a630b40b2c18563e129638fa755c35733b21d44826295f853645622004d6c33d93c6b9563b30a77d958ad8f733b2fe85e SHA512 4fd82ffad4f23c2abe5e710c4c555971a0e61e6a5cf8a6f2127c75f7741bcda31736ae328a94b412339ffa57974acc1a53a647c1622d8dfbb7c57c62e8ebcd74
 EBUILD selinux-loadkeys-2.20190609-r1.ebuild 283 BLAKE2B 829a2f0ab38b02e4935f132a26fdf56a630b40b2c18563e129638fa755c35733b21d44826295f853645622004d6c33d93c6b9563b30a77d958ad8f733b2fe85e SHA512 4fd82ffad4f23c2abe5e710c4c555971a0e61e6a5cf8a6f2127c75f7741bcda31736ae328a94b412339ffa57974acc1a53a647c1622d8dfbb7c57c62e8ebcd74
-EBUILD selinux-loadkeys-2.20200818-r1.ebuild 285 BLAKE2B 1c227d184468750d717e51ef0402064c6bc4acd71fb0317cbdfb3ded745c8868f6f531df8ed3921a9d0e58c142e07230d222a43042757a928a177e553a4f0f0d SHA512 15c6933a4f26cf12651fe2e499d2d30a9e3c957a1183f6bdfdd99cba89a332c7b86f0187fa563050c8794b2eae0cc7d3bbb552cc9c790079cd6e5827156d3737
-EBUILD selinux-loadkeys-9999.ebuild 288 BLAKE2B 7eeab48b2f1c030540e20a6ca88584bd5382bb7b80a2dac76c8ca9d9a66feb645a544eb565b73a5be4fb9d9a02ef43d52ff03aaad257826650b2761d01d8d857 SHA512 be8ae78be2d5a542ae4d94c49c4697eda87bfafa1c242845a5835b6dd17a184dd482d3ba80314ba7776db5193696ee316927340f370cc11da99d5968f7d7209d
+EBUILD selinux-loadkeys-2.20200818-r2.ebuild 283 BLAKE2B 0bf4218f1af21579f58c49a9cf958a60aec1de27fed96d68317950bda36407155740054be03fe0c3de71cc9ed4d4f18f457b178ce15da08febd276be5f292d5f SHA512 f79a070678e8f28be3fd8cd3a386dceeaf17f16cc5db0437406017b286aad6c1c3170813df6cbbe7f6fb4b64a6c894de3ac131a681c4aee7f777232175cd0a1e
+EBUILD selinux-loadkeys-9999.ebuild 285 BLAKE2B 23a023328242d074409649d8a35755afe8e63d1359aa1b3f941d8de68ad5796e12f056b453554e9e0b753dddcbc3a3666e7104ea3a1b49ec06eb395e4e1854f7 SHA512 802a3e5ccfbed5ab4d175d37f6eb8bf9fe45dfa948adaf30be6f3fdf5d7dfbb1d76399d360059b27536d4b0b8f6412370b23f153954fe29a6762c95ea137e1bc
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20200818-r1.ebuild b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20200818-r1.ebuild
deleted file mode 100644
index 9a77439097ba..000000000000
--- a/sec-policy/selinux-loadkeys/selinux-loadkeys-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="loadkeys"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for loadkeys"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20190201-r1.ebuild b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20200818-r2.ebuild
index 4560a75336fa..082eed5d54f2 100644
--- a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-loadkeys/selinux-loadkeys-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="loadkeys"
diff --git a/sec-policy/selinux-loadkeys/selinux-loadkeys-9999.ebuild b/sec-policy/selinux-loadkeys/selinux-loadkeys-9999.ebuild
index f47cbc382bd5..7e44118e8d94 100644
--- a/sec-policy/selinux-loadkeys/selinux-loadkeys-9999.ebuild
+++ b/sec-policy/selinux-loadkeys/selinux-loadkeys-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="loadkeys"