gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-zabbix/Manifest b/sec-policy/selinux-zabbix/Manifest
index 63aa729b7da8..5f35ae6bb23d 100644
--- a/sec-policy/selinux-zabbix/Manifest
+++ b/sec-policy/selinux-zabbix/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-zabbix-2.20190201-r1.ebuild 279 BLAKE2B 9b7bd2f98af01553301ebc6e03534644be7f5941496ae97fa42e083480113fc808f10d347ee8f8aa16b2ebbcbd00956694d702866977ee19caaead0b11e74bec SHA512 0fde234a371633521694b64cb91f3cab8f4eb16bddf8dd45c1181780eaa21ea04bd8589357c6fd404715a1603579ca4cd1139d72581e57cd09fc7f35e4e65b26
 EBUILD selinux-zabbix-2.20190609-r1.ebuild 279 BLAKE2B 9b7bd2f98af01553301ebc6e03534644be7f5941496ae97fa42e083480113fc808f10d347ee8f8aa16b2ebbcbd00956694d702866977ee19caaead0b11e74bec SHA512 0fde234a371633521694b64cb91f3cab8f4eb16bddf8dd45c1181780eaa21ea04bd8589357c6fd404715a1603579ca4cd1139d72581e57cd09fc7f35e4e65b26
-EBUILD selinux-zabbix-2.20200818-r1.ebuild 281 BLAKE2B 9f15a08fcbfca1721435adf35b60557268aab9d4ba373a57315d778280f02b1d43fc520d8b951da3715a126480369b170c66d7384794b2a4c34d5293da421782 SHA512 0e6c6285603b7962aed402d4b9ca04f8f2321cf906a05148f6eb975f5f13ce6570312e882ac36b06795949ddd217d65485c3344838f6d970992d7a33fe13e190
-EBUILD selinux-zabbix-9999.ebuild 284 BLAKE2B d3796eeb7bb6f0ced760038fe5d3c6820b85fbfc3f2b03fd2cabff71a0fa2b5f999fa49fd95034f408b66ea93f36f49cabcc09aa95c973e0a94d742ae2f151d5 SHA512 45b2ce218a2c9ec3369cd5e545387df527d3a21269fe09cba05cecac4c06e84abbdded320f636d304561cec109d966ef2170e94d08c7b2ad710487cfddfb8d35
+EBUILD selinux-zabbix-2.20200818-r2.ebuild 279 BLAKE2B 733bb1edf6d7b08dc8a6210e66f0ece2b7b305e29c8d49cb8a560da4b2d0d0ba392dab879d6668373e960c3510073c87441a8b3b017ae57a7dda7e4ee128370d SHA512 67b33739b2026aa0d0abb48dabf7324d9a6130c1129a37ce7e6263562d470f18fb0dd06e93b546b1fadf540575014a6ad973a55d093355fafa9a19f593171243
+EBUILD selinux-zabbix-9999.ebuild 281 BLAKE2B cfe7c2b0d92755068bba1d4f34844eddedbcbbfd098910dadc0b66040a3ce4ad18b3b8822f7f6afee2d4a6e6ce39d421e4efad94448611aa542bf90140b73158 SHA512 726a0debb9b22c1b22c5ac9c3dd6ba4e2079124bbb4ae1b0ad144dc98c326428585a6c676d1874c3cd2d7d1576007c58e437e8314b2deb7332abf5b51051894b
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-zabbix/selinux-zabbix-2.20200818-r1.ebuild b/sec-policy/selinux-zabbix/selinux-zabbix-2.20200818-r1.ebuild
deleted file mode 100644
index 67821ef053af..000000000000
--- a/sec-policy/selinux-zabbix/selinux-zabbix-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="zabbix"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for zabbix"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-zabbix/selinux-zabbix-2.20190201-r1.ebuild b/sec-policy/selinux-zabbix/selinux-zabbix-2.20200818-r2.ebuild
index 42c39935e146..6338b2390fca 100644
--- a/sec-policy/selinux-zabbix/selinux-zabbix-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-zabbix/selinux-zabbix-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="zabbix"
diff --git a/sec-policy/selinux-zabbix/selinux-zabbix-9999.ebuild b/sec-policy/selinux-zabbix/selinux-zabbix-9999.ebuild
index 60a2bf7d34cf..166beccd9bdb 100644
--- a/sec-policy/selinux-zabbix/selinux-zabbix-9999.ebuild
+++ b/sec-policy/selinux-zabbix/selinux-zabbix-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="zabbix"