gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-slrnpull/Manifest b/sec-policy/selinux-slrnpull/Manifest
index 0320626e7565..7aa34e848b60 100644
--- a/sec-policy/selinux-slrnpull/Manifest
+++ b/sec-policy/selinux-slrnpull/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-slrnpull-2.20190201-r1.ebuild 283 BLAKE2B c99ef8bda57b644dd58a15f668eaef775abe36ded6dd70caef0eace559c25fa22c4c9b4413eda5e804cef80b71c1207689ddedf71247fba0ba25d472a994416d SHA512 3c884424eb7aeb832921e8f4bf33602c38a1384d0f6d75a56bacde41d2bce54b143b65d8cb025d988e2313b7cfee36ce69068747b4f43881dabef2848ee9fa59
 EBUILD selinux-slrnpull-2.20190609-r1.ebuild 283 BLAKE2B c99ef8bda57b644dd58a15f668eaef775abe36ded6dd70caef0eace559c25fa22c4c9b4413eda5e804cef80b71c1207689ddedf71247fba0ba25d472a994416d SHA512 3c884424eb7aeb832921e8f4bf33602c38a1384d0f6d75a56bacde41d2bce54b143b65d8cb025d988e2313b7cfee36ce69068747b4f43881dabef2848ee9fa59
-EBUILD selinux-slrnpull-2.20200818-r1.ebuild 285 BLAKE2B 9b998ce9feaa84354154f218f96f7bd3c17a149e0184943997b68d3bf4187439ed0ba763adb7f12ca8fd321a4c3e429abe9a0d63b5b283fa27cb9064bf515f91 SHA512 3974e3f4cb4652685fb218c6376537ed24a90832511d9052770186e5ced170c73932dfe35bd35c373150e78ebec8b92d8870ee90a0faeab0cad0a5ee2002998c
-EBUILD selinux-slrnpull-9999.ebuild 288 BLAKE2B 2ba1e2a4615ea74ad8578654deb6df4ba75fa8e7e1859d7be00c6690b8bef01dd708decb0df77e3d44ce41b8d43690f72be88ef41dec1c2bcf685545c86f2451 SHA512 c1fead069940fa12bf34425698ce9b387d46a5a95364c9ca4c1373e2dacef9e4cb1d6ee6c94f092afd14adf2abf481c557936e58bfc2d9a56b1234b219b8aee4
+EBUILD selinux-slrnpull-2.20200818-r2.ebuild 283 BLAKE2B a42dfe719b838570de3dcbc53105843d029ac8551979edb70001aa02ca780a734d18031a8ee41b8916de15cc5e40c266fee7a2d4ace6007ce7ff3789d7f9fc1e SHA512 db0c777c4cf96e73eacccfadf1bcca605f74ad523a1020ed6f29ce0e5252b62e0e6129a357da658a4a79c6c49078f3b52a3dacc2ff6b6b5fe4ed2dcdab5defcc
+EBUILD selinux-slrnpull-9999.ebuild 285 BLAKE2B f6227d5f61422e84cee50255b61231a1f0e6ce18340190bdb56b0f991a1bfd83dac1f95abe3004a9d290dcb825c7f2a6f0eeb948a45a484559448fa7a8d90220 SHA512 188c1ae3df38ed391d598d7a3199046fd2a734e32f597c4064b4ac73e8b525df5cf767b680d506f1696bdb6dee472760f0c3a61e64d34334a42876d8afe4a6ef
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20200818-r1.ebuild b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20200818-r1.ebuild
deleted file mode 100644
index 0a98f5586f6f..000000000000
--- a/sec-policy/selinux-slrnpull/selinux-slrnpull-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="slrnpull"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for slrnpull"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20190201-r1.ebuild b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20200818-r2.ebuild
index b35c57cb8e0e..fa5209d30480 100644
--- a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-slrnpull/selinux-slrnpull-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="slrnpull"
diff --git a/sec-policy/selinux-slrnpull/selinux-slrnpull-9999.ebuild b/sec-policy/selinux-slrnpull/selinux-slrnpull-9999.ebuild
index 3602a91bf185..cc993dc40df1 100644
--- a/sec-policy/selinux-slrnpull/selinux-slrnpull-9999.ebuild
+++ b/sec-policy/selinux-slrnpull/selinux-slrnpull-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="slrnpull"