gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-postfix/Manifest b/sec-policy/selinux-postfix/Manifest
index cefd9e331d2b..015976fe42ab 100644
--- a/sec-policy/selinux-postfix/Manifest
+++ b/sec-policy/selinux-postfix/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-postfix-2.20190201-r1.ebuild 281 BLAKE2B 9bf98b6e6c89ffca92aa7336763741d66c6b49c1b19eea75a1975e1208a467dd220efa854586ae32808e005d4cdda4482910a5fb2dddebc71508e42ad631e4d0 SHA512 d4807f6291021980087697022b12ef3cf57c857aa271388622a845cdff7f5c9065b0ef5a68e2203646c6b74d10ba980b17f23ca397cb04ac6f96debeeb83fdfd
 EBUILD selinux-postfix-2.20190609-r1.ebuild 281 BLAKE2B 9bf98b6e6c89ffca92aa7336763741d66c6b49c1b19eea75a1975e1208a467dd220efa854586ae32808e005d4cdda4482910a5fb2dddebc71508e42ad631e4d0 SHA512 d4807f6291021980087697022b12ef3cf57c857aa271388622a845cdff7f5c9065b0ef5a68e2203646c6b74d10ba980b17f23ca397cb04ac6f96debeeb83fdfd
-EBUILD selinux-postfix-2.20200818-r1.ebuild 283 BLAKE2B c272a75a594e3800a78cd0d86e8192a6093d06a76436a0437d161809dd4a56d235b61b84aa506cc2f04edbb797e250cdebe9c9a32f83dc751ca00274fb5f4a58 SHA512 9c16c22d9935b7ac9d4377c18f50fc6c9b18fd60dc5376f2536299bd1abe9175ffafd03478c2eac18574f3fb5e8d3c5fd6fe888ca9b0f2f6e75e5a33f127306f
-EBUILD selinux-postfix-9999.ebuild 286 BLAKE2B f239731c6d6f3236a955a03ef8d7ca60a27415dbcdd78eb1c2bc20b744242ec02d82d08272cfeb4ae02478a187bb5ca676e9f40656339425927aa76866c01417 SHA512 de91b37db28205a960ad1d9aff1cbe139e31ff5a62aec56527e4ec31a9dc2b067acc5c14059a019c32b0c13f48ad4f4b5dc8dc5259e00cc8f93f8bed4cd56708
+EBUILD selinux-postfix-2.20200818-r2.ebuild 281 BLAKE2B 789005134ef3aea40294e1c233bb9c5a0cfa35d8c3b873829ce2c25f8fa991e152d28d29d5c1b0cf62164cad144246188f20f233f6d4039e0248623a0cc4b639 SHA512 baea6b52bca21649257efb6a70e50124778b6237229bae41fc5da2be52f46e85b825e86a06dbe853f301fd468effb84f814e260f19e7391b41c4232ea3414508
+EBUILD selinux-postfix-9999.ebuild 283 BLAKE2B 318d68a538d6a1cabb0073b9039e000516f0338ea262cf921fdf665a7b011b8f46423413a562c9ec67b30cf5f369fe6dd742a9fbb98557f7681bace6482d6f52 SHA512 5c50b99b39174d71980137e19b41293f3f0d923d4b12555bbfb91914db059b0edd90d709657d46029870837a919174c5dfb165db0f3c60636c97f8a90a09dc20
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-postfix/selinux-postfix-2.20200818-r1.ebuild b/sec-policy/selinux-postfix/selinux-postfix-2.20200818-r1.ebuild
deleted file mode 100644
index 1810a1f46fe0..000000000000
--- a/sec-policy/selinux-postfix/selinux-postfix-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="postfix"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for postfix"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-postfix/selinux-postfix-2.20190201-r1.ebuild b/sec-policy/selinux-postfix/selinux-postfix-2.20200818-r2.ebuild
index 7fece8996395..0c596ecdfa28 100644
--- a/sec-policy/selinux-postfix/selinux-postfix-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-postfix/selinux-postfix-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="postfix"
diff --git a/sec-policy/selinux-postfix/selinux-postfix-9999.ebuild b/sec-policy/selinux-postfix/selinux-postfix-9999.ebuild
index c921b4c1e505..f7511221fac4 100644
--- a/sec-policy/selinux-postfix/selinux-postfix-9999.ebuild
+++ b/sec-policy/selinux-postfix/selinux-postfix-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="postfix"