gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-remotelogin/Manifest b/sec-policy/selinux-remotelogin/Manifest
index c5900ab0c47b..035bce7d757c 100644
--- a/sec-policy/selinux-remotelogin/Manifest
+++ b/sec-policy/selinux-remotelogin/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-remotelogin-2.20190201-r1.ebuild 289 BLAKE2B 5343f05e29cf8408593a5da41114de863230f9475de497d99dd3a959389ee73ecac77d2480c5c4e42c56cd90a4e96ab16386fb96c882563c49079483345d1b13 SHA512 800949a67ea9aa632331e28e49b1d21ee1289361328c9a4f913a652bbadc3fc4f4f6e13766c99e6a1e7fd626be933dd75aa2b516a01e329110a6788f109b8689
 EBUILD selinux-remotelogin-2.20190609-r1.ebuild 289 BLAKE2B 5343f05e29cf8408593a5da41114de863230f9475de497d99dd3a959389ee73ecac77d2480c5c4e42c56cd90a4e96ab16386fb96c882563c49079483345d1b13 SHA512 800949a67ea9aa632331e28e49b1d21ee1289361328c9a4f913a652bbadc3fc4f4f6e13766c99e6a1e7fd626be933dd75aa2b516a01e329110a6788f109b8689
-EBUILD selinux-remotelogin-2.20200818-r1.ebuild 291 BLAKE2B 30a5ad39aada322b91ba595ef05522d4d7810ae418162de97f42035f5a0e350383245aaa7a82a3456042f55d357ad3265bc92db84fc009d2ee2d402987ca3036 SHA512 9edbcb1b1e899a15e367efa052405139efc1ef0335b76c2cba2bb1205fdf2af5091a1e39370c319d61d3ab573d66722e0e194cfb843e1436000cefb76346a120
-EBUILD selinux-remotelogin-9999.ebuild 294 BLAKE2B 63b287371033938240f0783f929e1005d9d413f31191faf92e097f7edf392b471199e05aad85a6b49bfa894fd9a48265a980be04528e58873a96d5267c4ff1c5 SHA512 d5415954e07c14040b19179c98b4b74b439eec621e8dcca9445f774ad97a6b84ba766c5c40883a27c100bfc6fe2fd4625f3a9358babb7061bbeda46608865e0e
+EBUILD selinux-remotelogin-2.20200818-r2.ebuild 289 BLAKE2B 51e18325b32fb63bce9371c8223319984345f2393a3fb95ec391efb42cd027e46ab753aabebda08caf24f989ac8ed3bbb81609fd416b797cdb11b5105812181f SHA512 b21b5b26c0bc4be350ca88f08b4385aade0f5cfafeb41126b50a5c4d8c555f3b82ebcd69f7685a9ff5627f6a400fe861dd01aa454ef8cae4200a4c0d4e71c28d
+EBUILD selinux-remotelogin-9999.ebuild 291 BLAKE2B d043a5308b943b017a022eb01b7f0364af8020b17c76fb5815e5c98609260e7690f89cc8b180eb19f6b7912fe01f140ffd932ba09242979aa4cd1a164bd571f0 SHA512 dce86ba610b245ec242c6719b483fe6eda4ba953fca9f0c525a36df52feb2383b2a0ebd574643eb004fd6fdcd2738c0d0be357f355bcfb59f2ab382a328f746b
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20200818-r1.ebuild b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20200818-r1.ebuild
deleted file mode 100644
index 4517b0a770b5..000000000000
--- a/sec-policy/selinux-remotelogin/selinux-remotelogin-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="remotelogin"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for remotelogin"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20190201-r1.ebuild b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20200818-r2.ebuild
index 241229603230..ac6720eadf7f 100644
--- a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-remotelogin/selinux-remotelogin-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="remotelogin"
diff --git a/sec-policy/selinux-remotelogin/selinux-remotelogin-9999.ebuild b/sec-policy/selinux-remotelogin/selinux-remotelogin-9999.ebuild
index 8b28c4fbe3c5..9e5d198ddf60 100644
--- a/sec-policy/selinux-remotelogin/selinux-remotelogin-9999.ebuild
+++ b/sec-policy/selinux-remotelogin/selinux-remotelogin-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="remotelogin"