gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-avahi/Manifest b/sec-policy/selinux-avahi/Manifest
index 06360cf4aec1..8031e7ba1fba 100644
--- a/sec-policy/selinux-avahi/Manifest
+++ b/sec-policy/selinux-avahi/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-avahi-2.20190201-r1.ebuild 277 BLAKE2B d48491fb1fd3ada5a956c422de2f2ee96356c771da92dc7ff1b2c3b26b5761a6bea25b558c5dc6714a265f17fd5551429421480cd7bb38ecb19a08d931ef5380 SHA512 2c36ce70351544e3ec3b411d165240004425a1d1415607208091558fbb5ec0a9ab3e9292f5c6d173c7c33059a29b14433f3d1f6ffcddab7a2ff178068f1a5fa8
 EBUILD selinux-avahi-2.20190609-r1.ebuild 277 BLAKE2B d48491fb1fd3ada5a956c422de2f2ee96356c771da92dc7ff1b2c3b26b5761a6bea25b558c5dc6714a265f17fd5551429421480cd7bb38ecb19a08d931ef5380 SHA512 2c36ce70351544e3ec3b411d165240004425a1d1415607208091558fbb5ec0a9ab3e9292f5c6d173c7c33059a29b14433f3d1f6ffcddab7a2ff178068f1a5fa8
-EBUILD selinux-avahi-2.20200818-r1.ebuild 279 BLAKE2B e9bfbb8642a5d051af7cf64d66fc027e9e1cfbb84212f2fb1cf2d4e65ee47285c5b4b983c81bd1fb1273cde2f4df3af62c47c8d1c5609d06a6a0b83c0f1438a5 SHA512 986b5846239b1ed30f35e1c30a01ff8be2b0a5fa35d837be2f6275aa931e5edc98d76f3f0e390ba8a156f79c59f82eeebd7241eff5754d01df1e199dd88f529d
-EBUILD selinux-avahi-9999.ebuild 282 BLAKE2B 15fde30d17dae5d6ed03fa84410888197fca1fa8f5a9f7671b3d8ef9164b0153b70c0e87158536c27385def6817b822db73b5433ec5f2165f20d263a2b400b7e SHA512 fc4760a095c7c5b46854b73c8f188d195683baa75f6d479392cb4f954e73bd20a53999d88ed0a0142b26ad28fd7fef4990b8569bb8b9840c1916f708cba616a5
+EBUILD selinux-avahi-2.20200818-r2.ebuild 277 BLAKE2B 9f72d37eabac0a5fec451dfbadeb81a51454e2d61afbc5783378eccbd79d1ff9f6d866d34e79220bfd451301395d9244b99003dbe73423d8fa4a2ee27ae37c94 SHA512 a3812a4b01f800254bb609e8cc0aebe4e38a88cf1cf161a906d71713cd3a3e6b230f7b3b55f168f0bf01b28ef2793dca51371ad9b5ac0623a516b4a093b02ac5
+EBUILD selinux-avahi-9999.ebuild 279 BLAKE2B 9bb8d85cdb5baa325e0ad95d840fcd7d3643de64e3e9fab70dfe6c9fbfc6c36b74e72a818cddea73f4c62098b187039ab3bab28daabae87c7eed1b924fb026bd SHA512 c05291fc289f1737abcca32b4437947c689a7440b68b34ca9a64aab6c6b0133241166fda950bbf0327c762d06631ea1279f3c559fc295c28fcb49e41a540d0f6
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-avahi/selinux-avahi-2.20200818-r1.ebuild b/sec-policy/selinux-avahi/selinux-avahi-2.20200818-r1.ebuild
deleted file mode 100644
index e4ef6f2e6953..000000000000
--- a/sec-policy/selinux-avahi/selinux-avahi-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="avahi"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for avahi"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-avahi/selinux-avahi-2.20190201-r1.ebuild b/sec-policy/selinux-avahi/selinux-avahi-2.20200818-r2.ebuild
index 603ed81d8360..ce350361b2e5 100644
--- a/sec-policy/selinux-avahi/selinux-avahi-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-avahi/selinux-avahi-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="avahi"
diff --git a/sec-policy/selinux-avahi/selinux-avahi-9999.ebuild b/sec-policy/selinux-avahi/selinux-avahi-9999.ebuild
index ff1e5370ad15..c0da7c305098 100644
--- a/sec-policy/selinux-avahi/selinux-avahi-9999.ebuild
+++ b/sec-policy/selinux-avahi/selinux-avahi-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="avahi"