gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-mutt/Manifest b/sec-policy/selinux-mutt/Manifest
index 37e553c02abf..a2f4ad27bf42 100644
--- a/sec-policy/selinux-mutt/Manifest
+++ b/sec-policy/selinux-mutt/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-mutt-2.20190201-r1.ebuild 275 BLAKE2B 4678e6495d0ad049d93bbdad6d1c8d31b981de0e7e47c392cc146c1254a3508b5880437699adda0952bc77ec4b3475158eba8f4a524179145d752a0e0f45e32a SHA512 8bf00cdce8a56da8d24a7fbda4368377e600e24689e1531777e4128f109b9057a392f978ddd435c9e9150816ac2b0007112b7ff422364e7a00db195314b61f22
 EBUILD selinux-mutt-2.20190609-r1.ebuild 275 BLAKE2B 4678e6495d0ad049d93bbdad6d1c8d31b981de0e7e47c392cc146c1254a3508b5880437699adda0952bc77ec4b3475158eba8f4a524179145d752a0e0f45e32a SHA512 8bf00cdce8a56da8d24a7fbda4368377e600e24689e1531777e4128f109b9057a392f978ddd435c9e9150816ac2b0007112b7ff422364e7a00db195314b61f22
-EBUILD selinux-mutt-2.20200818-r1.ebuild 277 BLAKE2B 284100e50cd9683a949d64c4c7805d7b04ffc9e33aad75265109bc769e6a3b2397333e00ca19a3d94a50a6c398105bbb21fca783a770351c56b378a4f3e4ce84 SHA512 0f0878bf8c9410baf499a6f3e73a6d5328d7bbbc3d6eba790de0c3a5104d51a6f25fbbb2a447024c22c1b37f78774d9d0f8b387677845ab629d218d9fdaa954b
-EBUILD selinux-mutt-9999.ebuild 280 BLAKE2B be593f9696e8366b7eeb8bdddf9b8602d730af3fc053171e9dd4ff45c7f113ac01ec218c5751fc6b015591a5ec74845b8c84dc0c4ccd16895f6977747a34affc SHA512 557c68371585154e36bf0701617856c5228e62d60ea9487c6ebc3f80dd94a14bf9c11f0131b1d6a87424359a76dfeac9ca4003afb839190e2359b466d50fae2c
+EBUILD selinux-mutt-2.20200818-r2.ebuild 275 BLAKE2B dae463841b29854789864ccabb3bc4df8afd54f85b628df24ed17fbdfb8a9c962a0706ccc2d12405ad44e8ba7e91defe2d7effaf44219fcc1b59ede7bbf3500a SHA512 e49c15d012ca841dabfab07958bec00f9a58a1b6611435e433ddbb3eb3938596f7f0d19b5da065eb4ca25f74d8332fcb736e3715f92207ce60c81470764fe6a3
+EBUILD selinux-mutt-9999.ebuild 277 BLAKE2B 3c86029dfd16a6224303790efbd5d5ad0c033c16d4045e78028a2f45c9feea6dbcf8cd4ef3f8d36290715d9273ca4e19b4a68c8fee6ad9bb186c8cd145aa3728 SHA512 f748fc531172a151b25e5941257e60700a42ca222af5f560f35a0576db377d1ec558aaefa3faaf075d511fc8beb1b4f4c46953128a0a04844ad37eed79315324
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-mutt/selinux-mutt-2.20200818-r1.ebuild b/sec-policy/selinux-mutt/selinux-mutt-2.20200818-r1.ebuild
deleted file mode 100644
index aa0b0e159f40..000000000000
--- a/sec-policy/selinux-mutt/selinux-mutt-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="mutt"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mutt"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-mutt/selinux-mutt-2.20190201-r1.ebuild b/sec-policy/selinux-mutt/selinux-mutt-2.20200818-r2.ebuild
index dc3b502a8751..a88e76d28b71 100644
--- a/sec-policy/selinux-mutt/selinux-mutt-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-mutt/selinux-mutt-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="mutt"
diff --git a/sec-policy/selinux-mutt/selinux-mutt-9999.ebuild b/sec-policy/selinux-mutt/selinux-mutt-9999.ebuild
index 2f811eb9e42e..6e98427d6b58 100644
--- a/sec-policy/selinux-mutt/selinux-mutt-9999.ebuild
+++ b/sec-policy/selinux-mutt/selinux-mutt-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="mutt"