gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-quota/Manifest b/sec-policy/selinux-quota/Manifest
index d0975c7433c6..539cb19ec594 100644
--- a/sec-policy/selinux-quota/Manifest
+++ b/sec-policy/selinux-quota/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-quota-2.20190201-r1.ebuild 277 BLAKE2B 4873435866ebf5a02df124aa213e5fc6cd0d8323cf85c4b579c8fc3e376befd2d0fdcec3b9b51e01a209fce1f4b23184e0a49c61bc722ae5978f99d30153efc0 SHA512 1bc30bf332cfdba0799a89116799794430615bc74cb9cb907924122b3f10ccb980035e513d933b5f7b6b8160968053fdbe2181b0fd9544b303c8f1de373a8138
 EBUILD selinux-quota-2.20190609-r1.ebuild 277 BLAKE2B 4873435866ebf5a02df124aa213e5fc6cd0d8323cf85c4b579c8fc3e376befd2d0fdcec3b9b51e01a209fce1f4b23184e0a49c61bc722ae5978f99d30153efc0 SHA512 1bc30bf332cfdba0799a89116799794430615bc74cb9cb907924122b3f10ccb980035e513d933b5f7b6b8160968053fdbe2181b0fd9544b303c8f1de373a8138
-EBUILD selinux-quota-2.20200818-r1.ebuild 279 BLAKE2B ff61f3aadb01380221699faa59f9107d0148bbea11eba06381eb201ec97734d02b670724b00ef56772fc4da8f6725c6c9d7506f4fd4da5368087813446610cb4 SHA512 a5594a4f893c7725002540de7751221064de4330549a49fd351bfcd0924cb0baca8badc4de87bf610bc61262c75e4d345993d6630f1fa006d8a4bba4791cd490
-EBUILD selinux-quota-9999.ebuild 282 BLAKE2B 9a3628c61a4eadbc4e231ea8f076420c3e60ebd0417209bd66fe7aab393a9957cc9b93d5e85aea5dac28b3ad923f2df09a6862ecfee5d479d9e00a46f49a8f73 SHA512 781b4988092c21e6d0d44aa1d53995bf41c2f05a3effee61e32184d78fffa63e7673a331b3b902e092dbf3a5df3cde8b9a8eb470c2e81f9e2f2335791d5bf20f
+EBUILD selinux-quota-2.20200818-r2.ebuild 277 BLAKE2B 6b6db48df1f0d69057053c33c73db261b3eca56ea891558c743028a073348aeb4949b05c5589d219429d91919ad483ee53a6952140f38c1f0ddae1f586346da8 SHA512 35d912e9bdfcde78e7634893833104b2663a67b40b97eb11ca33b73b0c0795009084076082edd10c6c42c3f2ccfacc83640ad446fca7101faa7d9ef5b5257f49
+EBUILD selinux-quota-9999.ebuild 279 BLAKE2B 9f70c206ce65a00e1ca80eca5bf4f777548e6e9315abf7bc87987527bec636be665dfdcbc4fc059f7606a4616387edf94d1e5ce5d21187c6317d0014eff3eecc SHA512 e7353f3be6275408de8a97c60371fdea6693da81f10d8586d8196243d0a06efc2e2bb72384ff053804c2e78e107851245cded8e31f95a66d9e1b44ee96fce5b4
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-quota/selinux-quota-2.20200818-r1.ebuild b/sec-policy/selinux-quota/selinux-quota-2.20200818-r1.ebuild
deleted file mode 100644
index 56a5c61ab164..000000000000
--- a/sec-policy/selinux-quota/selinux-quota-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="quota"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for quota"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-quota/selinux-quota-2.20190201-r1.ebuild b/sec-policy/selinux-quota/selinux-quota-2.20200818-r2.ebuild
index 3e205072b165..e2344979c664 100644
--- a/sec-policy/selinux-quota/selinux-quota-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-quota/selinux-quota-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="quota"
diff --git a/sec-policy/selinux-quota/selinux-quota-9999.ebuild b/sec-policy/selinux-quota/selinux-quota-9999.ebuild
index 36e2461e5a20..d43cc8a24601 100644
--- a/sec-policy/selinux-quota/selinux-quota-9999.ebuild
+++ b/sec-policy/selinux-quota/selinux-quota-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="quota"