gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-procmail/Manifest b/sec-policy/selinux-procmail/Manifest
index e0daa9247d29..ad0ec4bf9743 100644
--- a/sec-policy/selinux-procmail/Manifest
+++ b/sec-policy/selinux-procmail/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-procmail-2.20190201-r1.ebuild 283 BLAKE2B 0ba492443995f6715a520ceba5d1cf9052dc1e669dafe591b4934d8474a15299ab12a3384fa5b6f32dfdb871de8dfe4682a6676728ee2170430566d16f6129b2 SHA512 963b7045b67b20631949acb81886648ba02bfbb0001c04f17f0ed8d7758668a9f134461612dcdac0bf0f54bd6f944139d10df9474a56df0b86675c2b31f95b57
 EBUILD selinux-procmail-2.20190609-r1.ebuild 283 BLAKE2B 0ba492443995f6715a520ceba5d1cf9052dc1e669dafe591b4934d8474a15299ab12a3384fa5b6f32dfdb871de8dfe4682a6676728ee2170430566d16f6129b2 SHA512 963b7045b67b20631949acb81886648ba02bfbb0001c04f17f0ed8d7758668a9f134461612dcdac0bf0f54bd6f944139d10df9474a56df0b86675c2b31f95b57
-EBUILD selinux-procmail-2.20200818-r1.ebuild 285 BLAKE2B 69aee55525fe54dd2fc47117db418cdeac0fe2eb30f20ebbc1107bf42917ab5d7cd483263f827a45642da4c4069f430940197e5dbb0babd386d6f0f2dec59d23 SHA512 f16d65714726ddc3111cc13758ddd481369e5cc8dbe3a49fae3ad514c97d3af1bd0a34049fbf42e5e7feabf2bd90344c4c3fef9d2b589adad3cadbc1b9e37238
-EBUILD selinux-procmail-9999.ebuild 288 BLAKE2B 3d44034286fe53005b6ed83fdd160dad3da3aeac506d0de42356be15b7541e0ea6a645c77d67b67795c1b12e67f4e6f9ad27b92ac882e8d1b6db2432f7897b93 SHA512 8396d257dc8c819da4a6ab6957c539790325e38f4aa1949f57c900d9f7b7aa98f494a611916ab68419e748464383146589f2dcbcde95ccdac788dc37bc3d59fe
+EBUILD selinux-procmail-2.20200818-r2.ebuild 283 BLAKE2B ad25dac61e556baadd3e261aaf7ed55b29bc8e6b309c060326d733144b71c62cdde33cc856976c93530033c1081ebd6d8095ceab574f729fb3658c0b47cd0167 SHA512 b4035fd6280fdd0c4e08f97e4ae3c50bf4098072f8b52224352350d3ec09c406ef2c2668288a32d469b96e807abdd581f2f579933d01ad083dd57309bb95b654
+EBUILD selinux-procmail-9999.ebuild 285 BLAKE2B 8fc5fd56921f88b460d78d157313d7696609c2539ee23f8deec56b9930391021e0c2f48432f4a910613a1b3ddc7a9d61e3fbf276dec7c77757a313833b9d0e09 SHA512 5d1854acf8018b0f825629b4510d6e41e29741fb66eaf80ace1b388e5333b61ea05324cf0925ae2483e651a898ffdb057af95307fdb697409d2c4ebc1c13805b
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-procmail/selinux-procmail-2.20200818-r1.ebuild b/sec-policy/selinux-procmail/selinux-procmail-2.20200818-r1.ebuild
deleted file mode 100644
index 194e7ef28eab..000000000000
--- a/sec-policy/selinux-procmail/selinux-procmail-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="procmail"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for procmail"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-procmail/selinux-procmail-2.20190201-r1.ebuild b/sec-policy/selinux-procmail/selinux-procmail-2.20200818-r2.ebuild
index 2cd5310e4d4c..3706be61731e 100644
--- a/sec-policy/selinux-procmail/selinux-procmail-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-procmail/selinux-procmail-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="procmail"
diff --git a/sec-policy/selinux-procmail/selinux-procmail-9999.ebuild b/sec-policy/selinux-procmail/selinux-procmail-9999.ebuild
index a898ad1b5e30..1f8175689db8 100644
--- a/sec-policy/selinux-procmail/selinux-procmail-9999.ebuild
+++ b/sec-policy/selinux-procmail/selinux-procmail-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="procmail"