gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-sysstat/Manifest b/sec-policy/selinux-sysstat/Manifest
index bb7e7a4f052b..6553b5e26f7c 100644
--- a/sec-policy/selinux-sysstat/Manifest
+++ b/sec-policy/selinux-sysstat/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-sysstat-2.20190201-r1.ebuild 281 BLAKE2B a29ff809198c6e5eda129fa9b0a7faafcc77e165b116f1249bfd5fabc47c6e5f81adf06fc20ecbc646757fe29ec8eba2a4b232689169b79ae54db482bb11e201 SHA512 944f82805f5892f3b1e683a35c8c868d48366e89be517cad423dc4d539478350fb2eb7caa5fda1ccdb04a9a57db6e5a395eb8a941c3cd0d842b0d1170d4e1c3f
 EBUILD selinux-sysstat-2.20190609-r1.ebuild 281 BLAKE2B a29ff809198c6e5eda129fa9b0a7faafcc77e165b116f1249bfd5fabc47c6e5f81adf06fc20ecbc646757fe29ec8eba2a4b232689169b79ae54db482bb11e201 SHA512 944f82805f5892f3b1e683a35c8c868d48366e89be517cad423dc4d539478350fb2eb7caa5fda1ccdb04a9a57db6e5a395eb8a941c3cd0d842b0d1170d4e1c3f
-EBUILD selinux-sysstat-2.20200818-r1.ebuild 283 BLAKE2B 8e1a01a2b1e26da8bdc3c90dde92c44a3f6080aa509017750550f97613793eb05b991c3ca1d9872f226bc1d12b82395aa2f288f2be0dbad5d0c5f0609e298c8b SHA512 d04d21f568d0cd1310b4554e4bc3386e91dc99278d5553ca2e7618a7ccb9d55b6a1792a0a28a05d29cb92667c1fdce8d9521f643a9501665c6b369e609949bf9
-EBUILD selinux-sysstat-9999.ebuild 286 BLAKE2B 6dd55e5775ce70df80155c2f64cee20daca058005c70722e82801002212f6118abbdc2ead26c2bd1fc4579087c20d8d1b08275cab41bba375c34068730226466 SHA512 a0260f6c8a809c9516c778ad5707fdc485a12fc004e55bc8320a64b9bcb1278bc09dfaafe2f7cc7346e1c04966d1e4377a715b01a57258424ed0bf6fa2a6d4a2
+EBUILD selinux-sysstat-2.20200818-r2.ebuild 281 BLAKE2B 8e3571a1a91ef3e41888e6f325bbe328aa839fafae5ef7eb0e7332890335b17bb9d79f2e4fc4e237c2d079313dbea49e46fa0459d248c5d78a3fb089766b476d SHA512 7fac0536409183722359158c81152cbb5d946b841a92da88dd85b3e7bfe4ed7415055b113bbdff7d4c16951189c6658eb9e724ae03405041b8ef53d39aae571e
+EBUILD selinux-sysstat-9999.ebuild 283 BLAKE2B 334a1be93aef8c408b973a2fc04add142f3377d64f8ba1ab0c9dcc4663ffe79effb828bf7b459a66a6853311503a09dec36c53d1fc7c0efac66ced7d74dc1e3f SHA512 f1596d9f6e96c4cbad383d5dcf7073c972abdbc09b3559088eaf834dff4ab29d9efc24be6ba648e2d35cbc8beba49743c792f5d8d9dd0cc3159602e98405fe38
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-sysstat/selinux-sysstat-2.20200818-r1.ebuild b/sec-policy/selinux-sysstat/selinux-sysstat-2.20200818-r1.ebuild
deleted file mode 100644
index a32fcfb19c6b..000000000000
--- a/sec-policy/selinux-sysstat/selinux-sysstat-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="sysstat"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sysstat"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-sysstat/selinux-sysstat-2.20190201-r1.ebuild b/sec-policy/selinux-sysstat/selinux-sysstat-2.20200818-r2.ebuild
index a13125cf8b01..8af23de457d5 100644
--- a/sec-policy/selinux-sysstat/selinux-sysstat-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-sysstat/selinux-sysstat-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="sysstat"
diff --git a/sec-policy/selinux-sysstat/selinux-sysstat-9999.ebuild b/sec-policy/selinux-sysstat/selinux-sysstat-9999.ebuild
index 1551a51a365a..63bf31748ffc 100644
--- a/sec-policy/selinux-sysstat/selinux-sysstat-9999.ebuild
+++ b/sec-policy/selinux-sysstat/selinux-sysstat-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="sysstat"