gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-exim/Manifest b/sec-policy/selinux-exim/Manifest
index 7bd20482a3d6..94ea414903cf 100644
--- a/sec-policy/selinux-exim/Manifest
+++ b/sec-policy/selinux-exim/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-exim-2.20190201-r1.ebuild 275 BLAKE2B e271f3fece459bb5f79e6e9ca7b36f834c252fc54edc0a60540e58b7c58fcb11a9521295a023be23ca21bb2d3f141531a752c649b9da5f1ee26a4fb8602b45c2 SHA512 748ead7aa541ef6fbe1a337d9b98a1bbb9d1f3698d4624c2b210376d7dbae6ff6cb44c51ce2782353ae9eefc11f09d8b64ec56d355a0972918557115c07bcc75
 EBUILD selinux-exim-2.20190609-r1.ebuild 275 BLAKE2B e271f3fece459bb5f79e6e9ca7b36f834c252fc54edc0a60540e58b7c58fcb11a9521295a023be23ca21bb2d3f141531a752c649b9da5f1ee26a4fb8602b45c2 SHA512 748ead7aa541ef6fbe1a337d9b98a1bbb9d1f3698d4624c2b210376d7dbae6ff6cb44c51ce2782353ae9eefc11f09d8b64ec56d355a0972918557115c07bcc75
-EBUILD selinux-exim-2.20200818-r1.ebuild 277 BLAKE2B d3e00ee4abfe2b082b7038aa4099209979a6133cb19d832ddcf3051b9f6accb7922cfb94a5c5cd94d14e5626b2f0b5c50b424b8d15c5d1e14f99d92c360facbc SHA512 27cbc12b0e0dd8451c0d6635db490a68852a65b9d2a76fd1cf2c4e70ca1190e99c510c7b88efde3925165d4732fd72bcb4da79fc0b4abeb84404a6b464bd225b
-EBUILD selinux-exim-9999.ebuild 280 BLAKE2B 27c56aa9de7e12fddcf22d07a3889a5e4bf567643e42e9805443ea43491b5fcd4ab60fa4ec8b4b2a4aac39d1cfcb8c7106ed45620570c4da4e44663890422802 SHA512 5a4ef393f6365d4f74669d08e3802b220c077138d46cdd68d635aa65f17c9e580a5abc619aaffcd329482bb59b28a040071be35d737f1d8d925f943f69fe9aa2
+EBUILD selinux-exim-2.20200818-r2.ebuild 275 BLAKE2B 710bbaf8e5334ee5e559d925012a002f2185ba02c6e736d0f8804c16aec9c0e75a745b3950c41c9abaf09f007c8f270ce7d5d8125a50a433a79cd8f59f2e191f SHA512 2f7b66fae34ed18baee7f07553e7f65f512c99c01b3dafe0a028966eca45b2f1d88adc70aec68aa5e5396966305809e45fc0e659801b5d8031ba3b6d38bd7628
+EBUILD selinux-exim-9999.ebuild 277 BLAKE2B fd68b3bd92c7a74c202d68211b8ba898d7ec6fecfc699b82c325d7109e1a717c96b901eb36cd2bcc49f0bd70516c8639b60bde62761c4eb67586e5c46fac8088 SHA512 7e7f304f70a631cded7e8e7f3e7e654c38dd506d53dd058b3678242d63a00e0109556be20d6e0c6b9ce0bb1357f7eca704234b2372ac63ff29a95d7a8e6cc59e
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-exim/selinux-exim-2.20200818-r1.ebuild b/sec-policy/selinux-exim/selinux-exim-2.20200818-r1.ebuild
deleted file mode 100644
index 0ff65864f52f..000000000000
--- a/sec-policy/selinux-exim/selinux-exim-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="exim"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for exim"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-exim/selinux-exim-2.20190201-r1.ebuild b/sec-policy/selinux-exim/selinux-exim-2.20200818-r2.ebuild
index 724df83e9453..295cdd96cfe4 100644
--- a/sec-policy/selinux-exim/selinux-exim-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-exim/selinux-exim-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="exim"
diff --git a/sec-policy/selinux-exim/selinux-exim-9999.ebuild b/sec-policy/selinux-exim/selinux-exim-9999.ebuild
index 73ffc301d15c..b938d4d3e485 100644
--- a/sec-policy/selinux-exim/selinux-exim-9999.ebuild
+++ b/sec-policy/selinux-exim/selinux-exim-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="exim"