gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-cpucontrol/Manifest b/sec-policy/selinux-cpucontrol/Manifest
index d1299a22f2e8..5b6e89c52078 100644
--- a/sec-policy/selinux-cpucontrol/Manifest
+++ b/sec-policy/selinux-cpucontrol/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-cpucontrol-2.20190201-r1.ebuild 287 BLAKE2B 0a8439d581fd71bfadcb0796bf8b9f5cf77e8c0bd90cd2ac43d03d4c82916f27229d57c31b4acc6febd9873a8c2770515e3356441f7e485e5ad5873709f8d2f9 SHA512 c6be951c5208174d18a425e9fecd53e2cb0fccdf69cc88a395933e16e8fcb5bf0d80af7d55807856e140ac38641689e8ed7c47dae4f9779238df7ed29d635c9a
 EBUILD selinux-cpucontrol-2.20190609-r1.ebuild 287 BLAKE2B 0a8439d581fd71bfadcb0796bf8b9f5cf77e8c0bd90cd2ac43d03d4c82916f27229d57c31b4acc6febd9873a8c2770515e3356441f7e485e5ad5873709f8d2f9 SHA512 c6be951c5208174d18a425e9fecd53e2cb0fccdf69cc88a395933e16e8fcb5bf0d80af7d55807856e140ac38641689e8ed7c47dae4f9779238df7ed29d635c9a
-EBUILD selinux-cpucontrol-2.20200818-r1.ebuild 289 BLAKE2B fbd731b00268b790bc980e24fda334ce4fe147ecc235af9ed105d3ae4bbcc26171bb957c97f98c3d045637c8e28bf7945c6e968b06bcdbf5896176d5fe611d40 SHA512 0307bcec416da26b2e82e069405cdfb76ccad9eca9e5cc29c191d1637e019629c80d90565816201ca607a82e91ece8e00689fa1a31c7562c4389e2b404e34501
-EBUILD selinux-cpucontrol-9999.ebuild 292 BLAKE2B 90f101dc18eb2221d278302d4317645747206e0a44142bcc09b292771e076a2c627d750458852476628768021618ba146105dd3b43cc14b7a47f6895b9999cc2 SHA512 f65c7a525b4e1e9e65e40ef971747924dbff6f69a9f163dfbdeab57706f906c33fd9db1f5ca431d5f01fd4c9e67a6012b4390458f276e2ff5fbe8c99fbf3853b
+EBUILD selinux-cpucontrol-2.20200818-r2.ebuild 287 BLAKE2B fe0a5f84c50242dd35aaa9ef8316e110323fbf2bdbff2f9a5168856ab31deeafb0f06055d93f2657d2ebd59d6a8fa4bf0cde233bc244c44167e2d35bd30636d3 SHA512 9b45a08a551668be2717ee1878c05e7b2b32c1e22361aed06ee1275ac460abfe9a0d8b662502acb2983044589c63a98a4861ece9e168225c9feae44b3976b1de
+EBUILD selinux-cpucontrol-9999.ebuild 289 BLAKE2B a5369450443129fbb1e163637e1012fecc8f96636fe278143797ab2482be3d3a58cffa9651d7822e5941be33412af1367dd8f878aefa8ce46b64b3b19fccfc60 SHA512 3dde3f0252e44e83ffc206cbcd1d6bed489b0ff37634b563e177582dd116073ed9a5bff68e260f0007b2a42a0b1e96f40c6cb986f5f2ee1a5a3badffbae91b49
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20200818-r1.ebuild b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20200818-r1.ebuild
deleted file mode 100644
index 87539bb0578d..000000000000
--- a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-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="cpucontrol"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cpucontrol"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20190201-r1.ebuild b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20200818-r2.ebuild
index e052c5e46053..6c5b9f7ef11f 100644
--- a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-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="cpucontrol"
diff --git a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-9999.ebuild b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-9999.ebuild
index 5c59da7db4eb..5631964e6187 100644
--- a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-9999.ebuild
+++ b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-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="cpucontrol"