gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-cpufreqselector/Manifest b/sec-policy/selinux-cpufreqselector/Manifest
index 59f33da0da0f..3b96b0c08795 100644
--- a/sec-policy/selinux-cpufreqselector/Manifest
+++ b/sec-policy/selinux-cpufreqselector/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-cpufreqselector-2.20190201-r1.ebuild 297 BLAKE2B be345972d93d700482d355cdee230c9ed9d1c1a41b14dcad74009a741d38cd036600889feb68701f87485aa2e8ef751efad82e8b0eb183f1046cde5efb2f2c8f SHA512 50ab8d4b3c8f2ee4eb2de411f1d514e7aaaef0497957da1b9e928d9925f29400d8ad2f79092efc6064a0b1b45ea5a1b7cf15e6fbd1dc8c901191178bbc7721d8
 EBUILD selinux-cpufreqselector-2.20190609-r1.ebuild 297 BLAKE2B be345972d93d700482d355cdee230c9ed9d1c1a41b14dcad74009a741d38cd036600889feb68701f87485aa2e8ef751efad82e8b0eb183f1046cde5efb2f2c8f SHA512 50ab8d4b3c8f2ee4eb2de411f1d514e7aaaef0497957da1b9e928d9925f29400d8ad2f79092efc6064a0b1b45ea5a1b7cf15e6fbd1dc8c901191178bbc7721d8
-EBUILD selinux-cpufreqselector-2.20200818-r1.ebuild 299 BLAKE2B e3ab8851a8d0ab7e24d81328e6821936ff6e1ca9ec71c8f58d5182d3c5387e22b3904f58d24a3591ac8ff687c42d5049cecdcb2b4332b86e6a8dc850399d1bbc SHA512 9228ffc15c708ee3eb34b4ade9c2deac281cf0c9c5ab5ca5de6c553cc121829f136101902427676ca0a524d5558ca90571815f08e3363a6ac3dc32679a2c30d8
-EBUILD selinux-cpufreqselector-9999.ebuild 302 BLAKE2B 304cbb5e443532c0081439410070203d0b1da972bbdab59d409d6e2d83ee1dd0a747319ad6041bb5fbd03d6626c5b4c134e950e54eec05c23430558bdb606ef7 SHA512 38544db23220e3f9dd281b3f250adf5cb83754df1109c1de1a4aa87be5a9d4d51519006f38ea7f6143bc18971e2857dae215c8a6944b160f38b4097a2906b046
+EBUILD selinux-cpufreqselector-2.20200818-r2.ebuild 297 BLAKE2B adbed823b16bbe82d6d37c70a08e94eebe100d962c43feafea6cc20af19572ac9000ae91012a6531aa883376191136b558448e6eee97e3bce3d460a63eaaed71 SHA512 ef14f2ec10a112f485f9148b2ab92ee0e37805ed3a9ef43a152cc24f1d9bfd8ac285d138541510a8dc744e238d4c58d09a329c987f129d5b5162417651dfc634
+EBUILD selinux-cpufreqselector-9999.ebuild 299 BLAKE2B cf1e149e285aeb80d7beb21f592c30f4828275c720c60d4dcfd7c360cefc2fca9f20eef035610a0e1a539906663bac9b3742ead4623df6c8afde4cf662d807c4 SHA512 9cd369f287da50033d8b424046b53c89d4725aa4acc156c14ada8035347966a2d595037adcfb8b1ed899d02178f8cff326b5490b1c00acba35a4272770e47547
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20200818-r1.ebuild b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20200818-r1.ebuild
deleted file mode 100644
index 40d818f6fdff..000000000000
--- a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-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="cpufreqselector"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cpufreqselector"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20190201-r1.ebuild b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20200818-r2.ebuild
index 4406aa586813..45d811704442 100644
--- a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-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="cpufreqselector"
diff --git a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-9999.ebuild b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-9999.ebuild
index 4644b016b922..dd01543ba1ff 100644
--- a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-9999.ebuild
+++ b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-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="cpufreqselector"