gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-pulseaudio/Manifest b/sec-policy/selinux-pulseaudio/Manifest
index bded367fe6c8..c31fc450cbaa 100644
--- a/sec-policy/selinux-pulseaudio/Manifest
+++ b/sec-policy/selinux-pulseaudio/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-pulseaudio-2.20190201-r1.ebuild 287 BLAKE2B edde62e62f4d325c67dd1e0a065402fc075645ae94b1a990c66cd9b3a4ce264c97ee8b6a801a6a3b0f712d867fb394da6747e8c85520348ad8cbd290dff4109e SHA512 3f65d0cc73ec4eaa4557cb899e6a136eb2b2fb7a07ae3308e045c95bce0e789791eb0eb870fc88dde507a2c296f45124816e7b55a0d53ffc40bff22fe1d61517
 EBUILD selinux-pulseaudio-2.20190609-r1.ebuild 287 BLAKE2B edde62e62f4d325c67dd1e0a065402fc075645ae94b1a990c66cd9b3a4ce264c97ee8b6a801a6a3b0f712d867fb394da6747e8c85520348ad8cbd290dff4109e SHA512 3f65d0cc73ec4eaa4557cb899e6a136eb2b2fb7a07ae3308e045c95bce0e789791eb0eb870fc88dde507a2c296f45124816e7b55a0d53ffc40bff22fe1d61517
-EBUILD selinux-pulseaudio-2.20200818-r1.ebuild 289 BLAKE2B c6a330d93461d2d242ca22ce89695dc2ef4c96ec1fa9d6fe0f560884d972d6a5083fff55de44a29a16ee853772418033b3d1fd55a1027fd19b9265f7c18d95bc SHA512 0f35c69b3b1ecc4c3d5ac93e86ac6240c1d1b469d3425942e7f5b91cd26a0ef55bcae47ccf91f0ba042a432f8955a03fbeb23609cb08caca94a6a3c38dc7f160
-EBUILD selinux-pulseaudio-9999.ebuild 292 BLAKE2B b6bf6d3ef5427df4767ac3705a0028c039a6af19799895cb5aeba474433354e199ea12edadb168bd5a9cf50f86eba7629ec0cec19c29e26093757e9e81eec630 SHA512 be4474160dbb460dfe45c167895b8d90aa18dae3a873284e5059f3758375c80c7587cd3d0a75c1cdc2d0c2cd7a39c1c0beb4a112d87034dfc704c333ef447df2
+EBUILD selinux-pulseaudio-2.20200818-r2.ebuild 287 BLAKE2B 2de0f3754c2c0e09ac01df36ba2862a62bc594011d7989aa849e44be0f7ef4a61e6cc673bccbfa040e3363649159f3f59f52d976ff3d5ba3f40b55a991bcf3de SHA512 d98381f598d65852886efd8fe80f921b018769005f0da13c0761f81be1892f7b9b6b4622e243b298e6e84dfddfbe4d02d37a517f1fa818f11afbc741efb87d78
+EBUILD selinux-pulseaudio-9999.ebuild 289 BLAKE2B addd5dbb8790d8b564469f5682af276fb79dee014dd96b810fd8206690079366996a0cd298433379d36b24758cdc5d7b7bfcfe5593085447849a9d1320bbb13e SHA512 273415910363b3810f7fda75f05ca01f020b56a512255b11a5b26613ee29d6cf32497255b87278237ba8fc44255ba372ac99d2f1eb84ceef371a14e62c69447d
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20200818-r1.ebuild b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20200818-r1.ebuild
deleted file mode 100644
index 77825e6794ee..000000000000
--- a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-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="pulseaudio"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pulseaudio"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20190201-r1.ebuild b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20200818-r2.ebuild
index c9a025aac615..21805e11fe7e 100644
--- a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-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="pulseaudio"
diff --git a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-9999.ebuild b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-9999.ebuild
index 21591c2d56ee..b08db9da9308 100644
--- a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-9999.ebuild
+++ b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-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="pulseaudio"