gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-qmail/Manifest b/sec-policy/selinux-qmail/Manifest
index 374ed3be95e6..6bf9eed5fb4a 100644
--- a/sec-policy/selinux-qmail/Manifest
+++ b/sec-policy/selinux-qmail/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-qmail-2.20190201-r1.ebuild 277 BLAKE2B df1eefd6d3cad3d2fbf9f359a85c90bed4478b559de742a498161ee008cdba9f7729e1293dd7de2aaff09acf4a57569fb65bc918bdeffe78a14258a400857d4c SHA512 556e1801db80acfd7ce13174d924eb1fcd5086978a8e4a03df0f1816a5b038d0edeaf03ca62b9057edd755380c9cd40c6a2db9e11a8c32092836a1150bcaf8d9
 EBUILD selinux-qmail-2.20190609-r1.ebuild 277 BLAKE2B df1eefd6d3cad3d2fbf9f359a85c90bed4478b559de742a498161ee008cdba9f7729e1293dd7de2aaff09acf4a57569fb65bc918bdeffe78a14258a400857d4c SHA512 556e1801db80acfd7ce13174d924eb1fcd5086978a8e4a03df0f1816a5b038d0edeaf03ca62b9057edd755380c9cd40c6a2db9e11a8c32092836a1150bcaf8d9
-EBUILD selinux-qmail-2.20200818-r1.ebuild 279 BLAKE2B 602a476c140452db26705d8d43842e1dc73b2de7d53ca196100820aab5f2a0d054697a022e5f3908a49a31c8b9e855f0af84e60f2bb9cd9f25348d67890d30b5 SHA512 a0eb1cd2cd0e7f349f13f6fbc58ae96a6c87370892ccb89815b0317f3ecb460352f4c79ba0b32290622f25d2ffbb246720012ab8cb6c1c76b296854795418aaa
-EBUILD selinux-qmail-9999.ebuild 282 BLAKE2B 53e932a141d0cba182d61ffda6c760909a027455a7372b1c9230fd87f1e8b56f816b9c6c0ef91a8534d8853ee3463f0df9e8fd162aa307a85dc511687dadd96f SHA512 f677790238f3a5c17b30970d720c29d314bca4909787235d9dcde5c41179832fdb9773cf078fa208f5ccd63b51c1668e66a9b65a39193e51af139af91b919cf7
+EBUILD selinux-qmail-2.20200818-r2.ebuild 277 BLAKE2B d63766924f1aba016e1ba18c2ac71e35962eee931a7c5d77ba0af6a981b66a4f4c2c1cb68c060e66abfa8221452eb13a09f48043565c85617a7788e3a33c0f2d SHA512 8b97bcf524ad68dd3e31242989c4dc56d1611825ab9692adf5bc8ed5f04e7901a5f0934285e7edb68586cb93afa41d0ef587e33857f9df15ca1016a1a2120f45
+EBUILD selinux-qmail-9999.ebuild 279 BLAKE2B 148a4574023309817c392220f2466649f6a790875ec0e72dada18b6e6ed3dc43102d937b1eb37ab43ed57334cef9ff72182f544b29dbad4219b42714c729cdb6 SHA512 3a8f969f93cdfbac6c70e26bba107315ae0227429658ba7c74541ae2a43a51df174a52f584655b1626a421dffd3c8a28efe8c4bf281b4cdb369219271e650827
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-qmail/selinux-qmail-2.20200818-r1.ebuild b/sec-policy/selinux-qmail/selinux-qmail-2.20200818-r1.ebuild
deleted file mode 100644
index a59316fe4e81..000000000000
--- a/sec-policy/selinux-qmail/selinux-qmail-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="qmail"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for qmail"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-qmail/selinux-qmail-2.20190201-r1.ebuild b/sec-policy/selinux-qmail/selinux-qmail-2.20200818-r2.ebuild
index 0cdd4b610587..089c1f7c9188 100644
--- a/sec-policy/selinux-qmail/selinux-qmail-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-qmail/selinux-qmail-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="qmail"
diff --git a/sec-policy/selinux-qmail/selinux-qmail-9999.ebuild b/sec-policy/selinux-qmail/selinux-qmail-9999.ebuild
index 91f8c6d5ea57..8f30b5e28ed6 100644
--- a/sec-policy/selinux-qmail/selinux-qmail-9999.ebuild
+++ b/sec-policy/selinux-qmail/selinux-qmail-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="qmail"