gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-brctl/Manifest b/sec-policy/selinux-brctl/Manifest
index 8890581ffc24..9ee6cd835ec0 100644
--- a/sec-policy/selinux-brctl/Manifest
+++ b/sec-policy/selinux-brctl/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-brctl-2.20190201-r1.ebuild 277 BLAKE2B 9f5e14caade3681e3b0ffb8984d05f3dd59cff90ab1af66ae9f4a73ccf63833cbcccddc671864d22ea9e14f003ec300ad1654b3199aecb14760453e477d79b09 SHA512 94b230780355b21d7842fd486709011e6ce9e19b552f6d462e23c09aac51fe44db0609bee4046d46bb2bf2c5c8b0c7583dbb0dc47bdcb96bdbfb2515babb3e52
 EBUILD selinux-brctl-2.20190609-r1.ebuild 277 BLAKE2B 9f5e14caade3681e3b0ffb8984d05f3dd59cff90ab1af66ae9f4a73ccf63833cbcccddc671864d22ea9e14f003ec300ad1654b3199aecb14760453e477d79b09 SHA512 94b230780355b21d7842fd486709011e6ce9e19b552f6d462e23c09aac51fe44db0609bee4046d46bb2bf2c5c8b0c7583dbb0dc47bdcb96bdbfb2515babb3e52
-EBUILD selinux-brctl-2.20200818-r1.ebuild 279 BLAKE2B 18f0cdb4122ce10ae1bd676dfedf7395d9e8b7ab7fc239f2386e6d4b6a5555ccf2fa71a84d82945ce8aafde845e65095a9977d2304dd231bdd593376287a08f9 SHA512 36c3385c5455fd9677bdc0a7e839d49ad86240c563a646feaeb53bd7eebce4a729ef0281cc31c04bb8b7954a48818e2b044310a44a12b7ea093ad61dd47a7f25
-EBUILD selinux-brctl-9999.ebuild 282 BLAKE2B b900d7645a31a0d819c3a1b5c31796becaa634b60095b4a862b4d1911ff9313637bb992767a11c3a07bf682412a1f4861de1dedff0ff6e11eed095bc70e49746 SHA512 882a0fde367fa21bccbe7729f131aa2982b1c61d91da25e2a1ccd1212a1979d3e81cb882913e548b882b1486ec83dc5d1358e83443136856f9cacd17d4beb07c
+EBUILD selinux-brctl-2.20200818-r2.ebuild 277 BLAKE2B e4b86ecc5f464fa1bef12fc78595a6cb78e2adbf0e12d3727726ea18a8469ac2e282912659d61128228cf416ac978d381522c5e788243bc7e7d715f69b1340a4 SHA512 d4f1d665181d569339bfa48dd5be62452b8c92602936ef8f43fd99cdf968ae5b8e50f7ef086f0268a62bda478c0dba3d16b1d09d3eb42a2b0c5278c8bc904042
+EBUILD selinux-brctl-9999.ebuild 279 BLAKE2B 47e4466396b13d5c41d375256c0b6cd347f8eb3802218758a7b29a7a5279ff7b8a6e6244dbf6ded0e5bd9f64307bd20f387371303af91407e7a68e06941c2655 SHA512 a51d46bcff1067a68488b7781ffb8f46040a78bd98b0571bbd9780151aad3a8a467bbacee610eb8ca2f8ce6fa8f2c1477e0d871a04708967828f9b0c7ec0613d
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-brctl/selinux-brctl-2.20200818-r1.ebuild b/sec-policy/selinux-brctl/selinux-brctl-2.20200818-r1.ebuild
deleted file mode 100644
index dfcfa6c208f5..000000000000
--- a/sec-policy/selinux-brctl/selinux-brctl-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="brctl"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for brctl"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-brctl/selinux-brctl-2.20190201-r1.ebuild b/sec-policy/selinux-brctl/selinux-brctl-2.20200818-r2.ebuild
index 9e7406bdc317..275bbdeba921 100644
--- a/sec-policy/selinux-brctl/selinux-brctl-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-brctl/selinux-brctl-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="brctl"
diff --git a/sec-policy/selinux-brctl/selinux-brctl-9999.ebuild b/sec-policy/selinux-brctl/selinux-brctl-9999.ebuild
index e160f1e6735f..634ca5785b99 100644
--- a/sec-policy/selinux-brctl/selinux-brctl-9999.ebuild
+++ b/sec-policy/selinux-brctl/selinux-brctl-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="brctl"