gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-radius/Manifest b/sec-policy/selinux-radius/Manifest
index d5914995af75..96ea77cdc471 100644
--- a/sec-policy/selinux-radius/Manifest
+++ b/sec-policy/selinux-radius/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-radius-2.20190201-r1.ebuild 279 BLAKE2B 3c7682615146b94e09fc7e90bca1eaa79fd5691da16b65fb0669a20284cd233bbc509f4d38837a1aeed9a873eee5559c7c8fcb9e223e8b015ceb86be284651e0 SHA512 3ff39216cd13c56573d97be8b777af1e915df22eab4f071bba11c4897b76ddb696e74e44cb724c993962dd3cceeb013c07ead234932db76981cf6ad4d26575f0
 EBUILD selinux-radius-2.20190609-r1.ebuild 279 BLAKE2B 3c7682615146b94e09fc7e90bca1eaa79fd5691da16b65fb0669a20284cd233bbc509f4d38837a1aeed9a873eee5559c7c8fcb9e223e8b015ceb86be284651e0 SHA512 3ff39216cd13c56573d97be8b777af1e915df22eab4f071bba11c4897b76ddb696e74e44cb724c993962dd3cceeb013c07ead234932db76981cf6ad4d26575f0
-EBUILD selinux-radius-2.20200818-r1.ebuild 281 BLAKE2B 471673a6e3653af4b80f5c5a08faed75007a39d174c536f4e001a3ef4e01e05ab889f960a8a400ef30c29221f48280d53462239c085bfb429cbc4e9fe75d83d1 SHA512 46d46324bb59b82e6a051f96fa792aff39023c422357f4ae7241d2e1a1226adafe2741a8c57703fcc11652a8bcf7198f2ddda6e337f4d6d29b891ef8252f5082
-EBUILD selinux-radius-9999.ebuild 284 BLAKE2B 52ad7967d96d4cfc6a03cc2af39ebe04a10589be7189672d249c9912fcfc6ad4b0e2e0796d8a5cd5dc8ffc4f071b3cc619b255e57249574d9744ee1cfa0247b0 SHA512 cb0df168e59b9d8488f2da4c114966bd5d85372441cbe5120ddd2077c58b9adace99ca3fabc672f20d81b275fe61b49dd775a5e52c411d2b3f93f8d4d07b26de
+EBUILD selinux-radius-2.20200818-r2.ebuild 279 BLAKE2B 5d3218340ad75e281fddf91bb72e9ad02015e4398317773b87d8400ff41fd563afc9f0c1669cdf46cda6ab8f03f0fbacd7ba62c2cf6375012f33397c722a705d SHA512 d5f08a1709f06eaa258e2b801e38845f83caa4d32c696a4047b06daeff9f6bc28a6ee01f090e2be448ebf546399248888f452e4aa5cb164f720d55186a76ebb1
+EBUILD selinux-radius-9999.ebuild 281 BLAKE2B 1ef2c9176705b434492ad0d01bef43c8c688ace59f817390d1bd872a94d1c053277cca9df28869467dc4e536ead955b5d3bddd6fb4dacfcfef8b70348670f38f SHA512 c955a02642648602789e4d9e9b6e808c7a65eb17cf9830afdf4bf5acc2c01570ef025fde4ab2b7eea51824ee9dfff8a272dddeda167284884c5cfedc513a2273
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-radius/selinux-radius-2.20200818-r1.ebuild b/sec-policy/selinux-radius/selinux-radius-2.20200818-r1.ebuild
deleted file mode 100644
index e13d36641ca7..000000000000
--- a/sec-policy/selinux-radius/selinux-radius-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="radius"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for radius"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-radius/selinux-radius-2.20190201-r1.ebuild b/sec-policy/selinux-radius/selinux-radius-2.20200818-r2.ebuild
index 38c3e54263ce..5f864eef11fc 100644
--- a/sec-policy/selinux-radius/selinux-radius-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-radius/selinux-radius-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="radius"
diff --git a/sec-policy/selinux-radius/selinux-radius-9999.ebuild b/sec-policy/selinux-radius/selinux-radius-9999.ebuild
index 5d61679de48d..db6afa344ed4 100644
--- a/sec-policy/selinux-radius/selinux-radius-9999.ebuild
+++ b/sec-policy/selinux-radius/selinux-radius-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="radius"