gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-mcelog/Manifest b/sec-policy/selinux-mcelog/Manifest
index 52534f1141d1..5866cff99706 100644
--- a/sec-policy/selinux-mcelog/Manifest
+++ b/sec-policy/selinux-mcelog/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-mcelog-2.20190201-r1.ebuild 279 BLAKE2B f1c280daab33ad1c8292d465eef836b78429813ee18502630f878d330e7bc7d000a36397b4269f51eca4bfd7934674c916c6a05af50a2a3ffed81472f08a728d SHA512 e12e2570dfd3d400b57116ef349d3905588f111ec694fa1b53f1b2123da7b31e44bd321d42ed14d9238aa08dd9c5a94c62757b85296982b9bf5611f9e8d9b840
 EBUILD selinux-mcelog-2.20190609-r1.ebuild 279 BLAKE2B f1c280daab33ad1c8292d465eef836b78429813ee18502630f878d330e7bc7d000a36397b4269f51eca4bfd7934674c916c6a05af50a2a3ffed81472f08a728d SHA512 e12e2570dfd3d400b57116ef349d3905588f111ec694fa1b53f1b2123da7b31e44bd321d42ed14d9238aa08dd9c5a94c62757b85296982b9bf5611f9e8d9b840
-EBUILD selinux-mcelog-2.20200818-r1.ebuild 281 BLAKE2B fd7942a06738211e7ba92f809cc119a982e3e61574be0383faa55bd77dfc1f14be55429ac79f0d6217c5f92cfcee7f4ef5236de67eed37d6a90338b5a9ea56e7 SHA512 61b9aaca7f19b5dc25fae2790fc48b70b7eb7bfc1abd2fd76291451204d188813ff6afb3817a48454e9add28d08f464c4a05b73da600850188c39e1b6630b511
-EBUILD selinux-mcelog-9999.ebuild 284 BLAKE2B 668c86d7f1cbfdd3ed92ba81da5a1fcfdd5c232aed055a1af451f54c6f0183958cc816570e3ddc1298c0b505cb7d5bd26098fd91dd37b26c49affb665e805891 SHA512 a73f4f43fe17ba9590925c24dbba1ec20e44ea27a4fbe443ea943265a9e0f88cd7540ec9b9e6a45e93525599c84bb86ac6f4f64c175ffa977c740f95b135875e
+EBUILD selinux-mcelog-2.20200818-r2.ebuild 279 BLAKE2B 3b09fb8ca34ccc3adbd3bf3ac59962df400518434074a5145e97e5e6ca5372465371198c8979ab9c96ce107af264d3011e5e447a16c6ab445edc06951899e367 SHA512 b41f8001a0a8ce41d09efcf9644a6b5ec23f61283fb47222bea267f1dfe85916493fb573652333d048a487f5e399a6ab15d1f0b23854b2315d76e126df26a0ef
+EBUILD selinux-mcelog-9999.ebuild 281 BLAKE2B 46e83fc47f39f7d8f620ff7ccd29ecd3d95204ea991a98078485d594406a14ace7de3362a87379adc7f16eb67fc0865c7106e1117fedc79bbcd2b020febebeba SHA512 6b46f4e0d0700daeefc6bd72ca29285c91c3b3e268d92a55261177b4384b798b481360a373396bcbe82f2b98c15d726ea7ee5464472bfe50dbdacc8351a2f081
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-mcelog/selinux-mcelog-2.20200818-r1.ebuild b/sec-policy/selinux-mcelog/selinux-mcelog-2.20200818-r1.ebuild
deleted file mode 100644
index 6e326645dc79..000000000000
--- a/sec-policy/selinux-mcelog/selinux-mcelog-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="mcelog"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mcelog"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-mcelog/selinux-mcelog-2.20190201-r1.ebuild b/sec-policy/selinux-mcelog/selinux-mcelog-2.20200818-r2.ebuild
index ae3029b3bb01..38c788ec2705 100644
--- a/sec-policy/selinux-mcelog/selinux-mcelog-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-mcelog/selinux-mcelog-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="mcelog"
diff --git a/sec-policy/selinux-mcelog/selinux-mcelog-9999.ebuild b/sec-policy/selinux-mcelog/selinux-mcelog-9999.ebuild
index 8ad129985e68..5e311635597d 100644
--- a/sec-policy/selinux-mcelog/selinux-mcelog-9999.ebuild
+++ b/sec-policy/selinux-mcelog/selinux-mcelog-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="mcelog"