gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-spamassassin/Manifest b/sec-policy/selinux-spamassassin/Manifest
index 3304f1759396..2da064d3eb5a 100644
--- a/sec-policy/selinux-spamassassin/Manifest
+++ b/sec-policy/selinux-spamassassin/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-spamassassin-2.20190201-r1.ebuild 291 BLAKE2B a338ea5a5672dce881eaf9e52dde1eb336db50f392767338f32a26bbffdb98ec12efba30946e259215dee21bc18b942bbaa1c45299918fcdd5f41ce6bdf17c16 SHA512 7bd54a5250064423207150241c5eaba746d6643e2388bbede7e653c69fe8126327c1cf0b0ee0e4f88d4bcb15ccf69602823f336265e2aec42f27f8c7f6077940
 EBUILD selinux-spamassassin-2.20190609-r1.ebuild 291 BLAKE2B a338ea5a5672dce881eaf9e52dde1eb336db50f392767338f32a26bbffdb98ec12efba30946e259215dee21bc18b942bbaa1c45299918fcdd5f41ce6bdf17c16 SHA512 7bd54a5250064423207150241c5eaba746d6643e2388bbede7e653c69fe8126327c1cf0b0ee0e4f88d4bcb15ccf69602823f336265e2aec42f27f8c7f6077940
-EBUILD selinux-spamassassin-2.20200818-r1.ebuild 293 BLAKE2B 698905fd4396a05f2e8043ab1bd51d64a58f901a8ae5ff3d22fd771941c2127f54678e8c5881df86c38ae5aac1247151aab802fa217c11f3a391f478aa6540e1 SHA512 93fe7f50bcdacd599963d3e0e6772e2c1a6e49a71ef00c963be66b32e263f3b813feda4928d97aa123cd7022cfd807bba4c93247914c4b9055dc98fbd186dc16
-EBUILD selinux-spamassassin-9999.ebuild 296 BLAKE2B 0adc2b5ac7277839776df66bcafc6b5d323c1eecee8c7147385864f4e8d2b76808e07a5ca66c03a84d6af2f1b8ce0d185e6bc2fe2b242cc0f6c5f2de8c9bcefd SHA512 abdf74bf6c3e288386658a9736c5ee51bed1f4a49c4f8b930d7495d787daab9629cc60ace2a6f981a54aa28cb63b4f33843252a892da309cd1ee05e43b44f375
+EBUILD selinux-spamassassin-2.20200818-r2.ebuild 291 BLAKE2B b42ff8311f3f21e3ce2593f26a69fc720ecbdc6bee59f85f1b6084f9115810aa7b1280d52aac4edb16a70f63a3d7176de6e178d01c1f0ce1125b5d1ed1385fa7 SHA512 a0b214f1584fa94803b03e7ffd6072746f9d3cb5c67399ac8c5a984a449255ef39bfeef10e1801d589f8a9835761d901d8f0f8b7c6df71e02c165fdc022d8411
+EBUILD selinux-spamassassin-9999.ebuild 293 BLAKE2B b10ed0afa23de8c00552b305ef84dfcf00217be3b06fbaa82c13ca84b9d60d580d702c6c99ea552993b1adc5439f1124d750d50b61ebc8215353da9fe54d6a23 SHA512 daf23f414504bc989f69b49dc603104962256e71f428b4195549245669161eb0ed4f89c65181f18b6b1dbe00d182f7bf8d07b9420052f05ca57dcab24b72fc56
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20200818-r1.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20200818-r1.ebuild
deleted file mode 100644
index 68e71ebad35f..000000000000
--- a/sec-policy/selinux-spamassassin/selinux-spamassassin-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="spamassassin"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for spamassassin"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20190201-r1.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20200818-r2.ebuild
index 70e5162f3498..1fae4c634cc4 100644
--- a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-spamassassin/selinux-spamassassin-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="spamassassin"
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-9999.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-9999.ebuild
index 909e42792205..0d3c64ff976f 100644
--- a/sec-policy/selinux-spamassassin/selinux-spamassassin-9999.ebuild
+++ b/sec-policy/selinux-spamassassin/selinux-spamassassin-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="spamassassin"