gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-sasl/Manifest b/sec-policy/selinux-sasl/Manifest
index 4f1529569bf7..e1c2cf32ee50 100644
--- a/sec-policy/selinux-sasl/Manifest
+++ b/sec-policy/selinux-sasl/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-sasl-2.20190201-r1.ebuild 275 BLAKE2B 9b00429d7622ae32bff528f572a1daf593d92141b9ddaf92e9724f7f673ee8695cb5fae8eb6cb96efa2c7fa66f72fa59fbc7719a006a64d7a4345963bcdbbff4 SHA512 0a5e2cd1c277f53b4d933043b6e07d22036357188a37c7643bf61b766078ca0424fb29b03c27d0e10a7c6322f0e1875b6d2c0b40e9520472f978454e584da8d9
 EBUILD selinux-sasl-2.20190609-r1.ebuild 275 BLAKE2B 9b00429d7622ae32bff528f572a1daf593d92141b9ddaf92e9724f7f673ee8695cb5fae8eb6cb96efa2c7fa66f72fa59fbc7719a006a64d7a4345963bcdbbff4 SHA512 0a5e2cd1c277f53b4d933043b6e07d22036357188a37c7643bf61b766078ca0424fb29b03c27d0e10a7c6322f0e1875b6d2c0b40e9520472f978454e584da8d9
-EBUILD selinux-sasl-2.20200818-r1.ebuild 277 BLAKE2B 214a7c392dcc3641a6a9021e357b7e3bcf412db78a6f7c2fb4a1dfb2ee83717dc2ec9d682540b6e7b7505ade463b06cdef55bf674aa53befa10902db8a298bce SHA512 ba4b8481052c981fe7610fe9c4c32b5350bbd937691a41be15bef7d09d4d83199b78b3dd85af76d8de3465511cade7936c7e6544422b499cd9204b64427194cf
-EBUILD selinux-sasl-9999.ebuild 280 BLAKE2B 31589652b5685c731873da4b72f2a853ccd29c9ab6ddd55380a07025b97121b20879dded6683e2c56a4f0fadf9c9ca6980d8e2c5ede2b42c1f66969ee44e0f1e SHA512 d21d7a904257464cd9b5f4d5891764639b403610ff6b39ae550ca2150131ad1e004341a04b723b644b5ff029deaa2f638441b4510d18de89c0cfb5833213a374
+EBUILD selinux-sasl-2.20200818-r2.ebuild 275 BLAKE2B ec0d830f71150c1f7c0e399b57043630eef1b99f154d2cfed0bf8a1d053252db4581fe8857d35d711370bfb87aadfd936fc8537716e533cbdb81e9783abd19f5 SHA512 3deb6a0e77a03c9a1699a922d249d19d79ed0f9db223c46d0d740fed99b6a1e526c5b8d661bc796b531109903a0080a8e17970769a8592126837934410105433
+EBUILD selinux-sasl-9999.ebuild 277 BLAKE2B 20f54b1b60d4aa2c90f012cb9024abbf3b184dacfcf6dd0423822da6a8c16a82c85ad8cb0966444d3ec47982329979c65a1ffe715a0425f374ff3af45b275b56 SHA512 b676fd29edf60906921ef54afba5d8aaa1e3f176a8f4e556ef0dacd8d470bf1581af6e9ea3a29e14ee02ea16efef9543fc0343d99fe2e37076cbde03fc6d286f
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-sasl/selinux-sasl-2.20200818-r1.ebuild b/sec-policy/selinux-sasl/selinux-sasl-2.20200818-r1.ebuild
deleted file mode 100644
index 3bf62b5455c0..000000000000
--- a/sec-policy/selinux-sasl/selinux-sasl-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="sasl"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sasl"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-sasl/selinux-sasl-2.20190201-r1.ebuild b/sec-policy/selinux-sasl/selinux-sasl-2.20200818-r2.ebuild
index 52cd1ae23351..24d77636a0eb 100644
--- a/sec-policy/selinux-sasl/selinux-sasl-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-sasl/selinux-sasl-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="sasl"
diff --git a/sec-policy/selinux-sasl/selinux-sasl-9999.ebuild b/sec-policy/selinux-sasl/selinux-sasl-9999.ebuild
index 5798ce3dd1bd..9d06fc56d14b 100644
--- a/sec-policy/selinux-sasl/selinux-sasl-9999.ebuild
+++ b/sec-policy/selinux-sasl/selinux-sasl-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="sasl"