gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-flash/Manifest b/sec-policy/selinux-flash/Manifest
index 68f6ef63ce9d..7338105524de 100644
--- a/sec-policy/selinux-flash/Manifest
+++ b/sec-policy/selinux-flash/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-flash-2.20190201-r1.ebuild 277 BLAKE2B 398723a3a2564761a10a3cc7b9d967563794da966d3c2ed6bef8bc45af8af80a95e954b65c9034fcd502cba22192a153e510035b69ec2168193839519c538fe0 SHA512 a3ede68add9f474d9c544f5b00848595a382a6b3e2369730402e601d2494400ebf623b856f1c66222128c3afb141dfa867cf4c98aba4911d175df51be23d948c
 EBUILD selinux-flash-2.20190609-r1.ebuild 277 BLAKE2B 398723a3a2564761a10a3cc7b9d967563794da966d3c2ed6bef8bc45af8af80a95e954b65c9034fcd502cba22192a153e510035b69ec2168193839519c538fe0 SHA512 a3ede68add9f474d9c544f5b00848595a382a6b3e2369730402e601d2494400ebf623b856f1c66222128c3afb141dfa867cf4c98aba4911d175df51be23d948c
-EBUILD selinux-flash-2.20200818-r1.ebuild 279 BLAKE2B 21924c513eaabe4206bed0bfec29afeb36a2192f52db1b8d9c7487bee958fc3933b96a7f452045d27ec98550ca184aebe9f7a4ee9db4d7fa1f59f0366ea1f547 SHA512 213379f976e9e4a1d865ec0fd8f21d9e42b975960d653e3aad405e31a27c9461e861d4aa7d5cff32be7ea74a03f0ce921d4b6fa9e05f1414b9ad3cb3fc875256
-EBUILD selinux-flash-9999.ebuild 282 BLAKE2B 43f2ebf65c5f79b67426e9b8e3b736892283f82ed7abdd801800f7560cb8cf3a0ecacb6a78fbd176be8b355dfeedf8da77826a47d1213412f60785c71852c57c SHA512 d39d2fc8e0ebd4499573661e15dca2afb3737293131cf0a1d8626a3b78b3967497837d0344704fdbe17801c49b24f5f6cb4aad14d261c27c67acbad915bb51b1
+EBUILD selinux-flash-2.20200818-r2.ebuild 277 BLAKE2B 5026237b0f7a59c27540b1f72789798f21c669421ba82b6ca35b37d4098200b975c7a32d53674d412249402e55f21aed8799db1597efd84b53beb3ebaaf874dd SHA512 69e9243742129f5dc15c49c98517f2f9a6e2114042886bc38dbb548cff29da1aad1e6337309f594ddeb6211bec25e3f5683db942d6149b43a9c8a7f1261869e7
+EBUILD selinux-flash-9999.ebuild 279 BLAKE2B 0dd9f2d745f66c18e4adf8c7c8184444a89c00c5965f0584a5412f7cfa0f21efc55164c76c7b4384d297ae420f357ac1ea9bc5f903e5110b0b39a14840411dcd SHA512 3a7cbefdd5d02a6363fb5fd8cbacb5dded9b7a5649d6ed6613c57c6a91deaabe71442b8ea29117d86496ff10309300796e541350d4df15383223d786dac2bce6
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-flash/selinux-flash-2.20200818-r1.ebuild b/sec-policy/selinux-flash/selinux-flash-2.20200818-r1.ebuild
deleted file mode 100644
index c78504df8f10..000000000000
--- a/sec-policy/selinux-flash/selinux-flash-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="flash"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for flash"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-flash/selinux-flash-2.20190201-r1.ebuild b/sec-policy/selinux-flash/selinux-flash-2.20200818-r2.ebuild
index ff8ae6d5c295..ce78bc5d7a89 100644
--- a/sec-policy/selinux-flash/selinux-flash-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-flash/selinux-flash-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="flash"
diff --git a/sec-policy/selinux-flash/selinux-flash-9999.ebuild b/sec-policy/selinux-flash/selinux-flash-9999.ebuild
index 09267ae8a349..ea5aa15888d6 100644
--- a/sec-policy/selinux-flash/selinux-flash-9999.ebuild
+++ b/sec-policy/selinux-flash/selinux-flash-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="flash"