gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-soundserver/Manifest b/sec-policy/selinux-soundserver/Manifest
index 3aa0c1786c17..58aa8430998b 100644
--- a/sec-policy/selinux-soundserver/Manifest
+++ b/sec-policy/selinux-soundserver/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-soundserver-2.20190201-r1.ebuild 289 BLAKE2B 2c9808d59016984e3245f09f5404eedf4d68e8b52a8f295f4a57347aa27a1e791d5ddcbd3d0e6aa586ed63d4528a2f9ef58bf43754452e641f8d4a3bf96bb6fd SHA512 5856ffc33319933e8491a4a453a86cd3b9c50acc3060390492aab9873a62d19c386f9654c2598125d141a5c715ee6b43aef78a893929ae96570a9709b419be11
 EBUILD selinux-soundserver-2.20190609-r1.ebuild 289 BLAKE2B 2c9808d59016984e3245f09f5404eedf4d68e8b52a8f295f4a57347aa27a1e791d5ddcbd3d0e6aa586ed63d4528a2f9ef58bf43754452e641f8d4a3bf96bb6fd SHA512 5856ffc33319933e8491a4a453a86cd3b9c50acc3060390492aab9873a62d19c386f9654c2598125d141a5c715ee6b43aef78a893929ae96570a9709b419be11
-EBUILD selinux-soundserver-2.20200818-r1.ebuild 291 BLAKE2B f95a79b53ad72a60727d2592936e259e02557fe228afa299eee5170971e0dfbe3e8405bd1bcdb7774ac9669112ba86dfc2fed78da2825ef10455dfa75de69af0 SHA512 a3569de1bd7bd15c3175726a403b9156d112b894e72e6edba5e51b060b51f5315ce85e70fd18479be742ccbe7cad48a4cd34a2e4b94700fc4b186a2745a94e79
-EBUILD selinux-soundserver-9999.ebuild 294 BLAKE2B 89fb2e760276a729fc0f90956f05dbe69539876fa85e91a63001d84628147e6077cb93b8b4ea5a08e9d938a462fbdeb802b9b895cdb2c1a4e96571c60c8daebb SHA512 7d20be067ca82a2e6273756c93ee2ffd927fca285b921759d5112dc232fffde49804cfa081c9821b3f36f707f8802148fc330e3cc3da87ad7ef608e9fb87c662
+EBUILD selinux-soundserver-2.20200818-r2.ebuild 289 BLAKE2B 16715e01507d4ae560dc4b3a05e81308bd43cb9f6a47f92c847bea46b454c423ba867e6408f8f30af27b64ba92ac47e61b17ae09a0a82c6af7e5bab1c08b4995 SHA512 9d793b87edabbbabb17d3309ee25c690f7f7c1f855138ad59c0b35dcd204e1bc6372f97bef6fea8188232c1c0912636bb75deb550de113141686d2fb77ea00df
+EBUILD selinux-soundserver-9999.ebuild 291 BLAKE2B 421c0a85530d2faaeab63864e00a43f44f4955fedf2e344692745d13fbc467c4a8d8879fa9526acf4ea65d825a0ae28ffb4caf82022d78c20cfb8885c5530537 SHA512 59445b62f04d29dc3c5c68534a6a3e2c0cf6afc5dae59aecd49e2b04a2bc4b1b290ed40140ffccb6c86aa65c2f9612d62df940018eedfc50a895ce75df39f8af
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-soundserver/selinux-soundserver-2.20200818-r1.ebuild b/sec-policy/selinux-soundserver/selinux-soundserver-2.20200818-r1.ebuild
deleted file mode 100644
index a37829aa1e65..000000000000
--- a/sec-policy/selinux-soundserver/selinux-soundserver-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="soundserver"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for soundserver"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-soundserver/selinux-soundserver-2.20190201-r1.ebuild b/sec-policy/selinux-soundserver/selinux-soundserver-2.20200818-r2.ebuild
index 429a4df4015a..4ba11b7c535f 100644
--- a/sec-policy/selinux-soundserver/selinux-soundserver-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-soundserver/selinux-soundserver-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="soundserver"
diff --git a/sec-policy/selinux-soundserver/selinux-soundserver-9999.ebuild b/sec-policy/selinux-soundserver/selinux-soundserver-9999.ebuild
index 2ff6085dc186..3a884c045ea6 100644
--- a/sec-policy/selinux-soundserver/selinux-soundserver-9999.ebuild
+++ b/sec-policy/selinux-soundserver/selinux-soundserver-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="soundserver"