gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-postgrey/Manifest b/sec-policy/selinux-postgrey/Manifest
index 3d99866c492c..ddc3329244a3 100644
--- a/sec-policy/selinux-postgrey/Manifest
+++ b/sec-policy/selinux-postgrey/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-postgrey-2.20190201-r1.ebuild 283 BLAKE2B 23e8a3848d40accaf9135e87e3e01418d4a745ac264cb7ad2ccd764a72e8dae31a5c4d71c66c3a710498818ec229ac0e7ac0f0a234cc550d7d60cecf60269146 SHA512 1303580290d65a85135b1e4522dd5a803f40e598c175f29d3f25a6fe309f9db47ed023ebf20367db7d4086b2f53997a5923ddac63b146a9772765c0bab7e883c
 EBUILD selinux-postgrey-2.20190609-r1.ebuild 283 BLAKE2B 23e8a3848d40accaf9135e87e3e01418d4a745ac264cb7ad2ccd764a72e8dae31a5c4d71c66c3a710498818ec229ac0e7ac0f0a234cc550d7d60cecf60269146 SHA512 1303580290d65a85135b1e4522dd5a803f40e598c175f29d3f25a6fe309f9db47ed023ebf20367db7d4086b2f53997a5923ddac63b146a9772765c0bab7e883c
-EBUILD selinux-postgrey-2.20200818-r1.ebuild 285 BLAKE2B 09ec7807fb2405b19b69e3a95777478bc7f679f162697f0148f12c0be557c4f64b49aa053572b1ea3fe1509a2d8d37fd78bcde46b083479b1fc25cadd555accb SHA512 7a9dbfb1f58286488ca130c35c4596c12ee57adade2b230afeffc5d2eabbfe72cfa25f908fb7dc9d90528596e8590514a6aea5e0079dd4e4da73e08829501fa0
-EBUILD selinux-postgrey-9999.ebuild 288 BLAKE2B 2d4ea4a66369f520ec7cae9e95725ee4874794f402a831caa3c94b1de10471a54e07a9d7ded3159851d0cd2cabf6e059ea2055b34f37590d7028df54d1dcf0f0 SHA512 654da8d40986edd4788f329e8cd2455d60ed1e6e5839ae49505447e3dff3cd3a5d4df74b8147d90a2ed7daa62869a050c367ce6fd333679432e7b72ac719c3af
+EBUILD selinux-postgrey-2.20200818-r2.ebuild 283 BLAKE2B a4a4857c0531c97e4083e760831f0081659025e525fa5ad77d440f665e6b4ef66a75032dde7f7d168a7ef5745e759e71cc708f8335b2ac32093126999deec842 SHA512 f70fbc02801eb07cb6414aaf597e6bdd4f34f1763d568cf82b86c24d344aefd5e60a98aa1d55fb425d8ede571bdfdcbd24f0bf780c7716f1e29bd8322edd0500
+EBUILD selinux-postgrey-9999.ebuild 285 BLAKE2B 009abd0f6cdb8ea77e8c7b50aca3b3341b5e3c50cca741b7872d51752915994b988bf5c76c6e5ee90debb896d7def892c6bb0af3816eebd5b301054e1d90e2b8 SHA512 8a68e615dbe3b2602aad013546b000496d20ff665aee5e2fa16a5d3e1f86961e6c7861e6d68f89a419aef767b72d3ea87cde61079eb12c215caa3db27970f8bf
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-postgrey/selinux-postgrey-2.20200818-r1.ebuild b/sec-policy/selinux-postgrey/selinux-postgrey-2.20200818-r1.ebuild
deleted file mode 100644
index a3f0489332c7..000000000000
--- a/sec-policy/selinux-postgrey/selinux-postgrey-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="postgrey"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for postgrey"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-postgrey/selinux-postgrey-2.20190201-r1.ebuild b/sec-policy/selinux-postgrey/selinux-postgrey-2.20200818-r2.ebuild
index 26bbd1343017..b9decd1c1e0b 100644
--- a/sec-policy/selinux-postgrey/selinux-postgrey-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-postgrey/selinux-postgrey-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="postgrey"
diff --git a/sec-policy/selinux-postgrey/selinux-postgrey-9999.ebuild b/sec-policy/selinux-postgrey/selinux-postgrey-9999.ebuild
index a5da0c400ac3..77d8a543302a 100644
--- a/sec-policy/selinux-postgrey/selinux-postgrey-9999.ebuild
+++ b/sec-policy/selinux-postgrey/selinux-postgrey-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="postgrey"