gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-asterisk/Manifest b/sec-policy/selinux-asterisk/Manifest
index f6eabe61eb96..d72ce66f580b 100644
--- a/sec-policy/selinux-asterisk/Manifest
+++ b/sec-policy/selinux-asterisk/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-asterisk-2.20190201-r1.ebuild 283 BLAKE2B 93b625c04e045d6b0e5abb4936ec00dcc712ecfa744cf08c98b4212a0d0076a1af05525d7aea7c98da6f51372e5f8475f92b91b45a6e9e9ff6da8b9b5acac819 SHA512 b4b7915b3b0061b73c0a7873502a9ba7157473073a4efe98e74314f17fe28d5a623a31ecafa2bac7affdf0ea178518e5583f93bb62a743c2ce065e42f810fd16
 EBUILD selinux-asterisk-2.20190609-r1.ebuild 283 BLAKE2B 93b625c04e045d6b0e5abb4936ec00dcc712ecfa744cf08c98b4212a0d0076a1af05525d7aea7c98da6f51372e5f8475f92b91b45a6e9e9ff6da8b9b5acac819 SHA512 b4b7915b3b0061b73c0a7873502a9ba7157473073a4efe98e74314f17fe28d5a623a31ecafa2bac7affdf0ea178518e5583f93bb62a743c2ce065e42f810fd16
-EBUILD selinux-asterisk-2.20200818-r1.ebuild 285 BLAKE2B 11e4887af431c55b4d50378eba5fb3e1655483c317b5bb83839b985f7040cfc8d729db5b06db223518327e47dd3cea745b1dc52866ed57c8def03813db41f1e5 SHA512 1a8913b206060f0e01d128d9d697f93ee27aed8756a026c58c61784702d3e59c8e0b8edde82d5ba3e16a145a05e44308c9924aac23f4c770ff4cef63d11ae693
-EBUILD selinux-asterisk-9999.ebuild 288 BLAKE2B 9ed889d209f1abc2d1881758fbae06b1f57b01e16437fa485f0ea4f0c0d4e56a15820b4f17bccd7fd39457ccf14a37ad6257ec59f8eabeb1d8c9a7d6bd8ef23c SHA512 f4390b053bd01a1473fc37d1d191140ccc798bac910994b45f8b35c51a6b99510b6014b21706f2cf65fe8c5dcd1c32e5f39f96bbe05b724cdc4c4c560a0c8a57
+EBUILD selinux-asterisk-2.20200818-r2.ebuild 283 BLAKE2B 1f2cf709407b8285455dfe11ad16b9a8dee6c56568e85ef81e34ed90b17ea4a8822d94ce62079e0852f4f21ce78c9af0c30b3287c2d600e973c1f3206c7316bd SHA512 6704ac87620d1a49fe287c73e9ed8c53f8a4ac6e0e8ba33028343c6b6d7b51e8dadd17a54541580bc8c50014957b221bf4e42facd9346106ddfc81c56cf8b423
+EBUILD selinux-asterisk-9999.ebuild 285 BLAKE2B 226f209fd69a2ef47636a3d7b434ad8960e1cafc91c85b86007ceb8cefb77dba48924cbba0212c4ebb0e8d03314c61398e93ea230e6d246d2ccd69287ce650c5 SHA512 f32e0a30c6046939a2292ea5d49f17cdc31d937c0f17aff73c53cacfb6e99dcf75106a2dcf9c8e1e620c1b1f18d9d9ff246e05efc7588f489b9605e55a67b3cd
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-asterisk/selinux-asterisk-2.20200818-r1.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-2.20200818-r1.ebuild
deleted file mode 100644
index 21768ddff004..000000000000
--- a/sec-policy/selinux-asterisk/selinux-asterisk-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="asterisk"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for asterisk"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-asterisk/selinux-asterisk-2.20190201-r1.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-2.20200818-r2.ebuild
index cf9c32649ff8..fc00e375615a 100644
--- a/sec-policy/selinux-asterisk/selinux-asterisk-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-asterisk/selinux-asterisk-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="asterisk"
diff --git a/sec-policy/selinux-asterisk/selinux-asterisk-9999.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-9999.ebuild
index 76ca59655949..ce10eada2117 100644
--- a/sec-policy/selinux-asterisk/selinux-asterisk-9999.ebuild
+++ b/sec-policy/selinux-asterisk/selinux-asterisk-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="asterisk"