gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-timidity/Manifest b/sec-policy/selinux-timidity/Manifest
index 556d33590765..8fe5f7331a9e 100644
--- a/sec-policy/selinux-timidity/Manifest
+++ b/sec-policy/selinux-timidity/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-timidity-2.20190201-r1.ebuild 283 BLAKE2B 2d9649f5543cac5a900a4a1e4191bc1c05f22118a97e52192791cad747162ca50d0682f687240109ec6ea0787e14990aa563e33294116a678677aba71a7d2b38 SHA512 17f798f3d4504fa7b89a6e950c2d60edde74ae74227c9cccc3a2e0ddde43818c98b69794c8ca8f4475822080a0b858e30e9f478125d446b07f32e440c49a8973
 EBUILD selinux-timidity-2.20190609-r1.ebuild 283 BLAKE2B 2d9649f5543cac5a900a4a1e4191bc1c05f22118a97e52192791cad747162ca50d0682f687240109ec6ea0787e14990aa563e33294116a678677aba71a7d2b38 SHA512 17f798f3d4504fa7b89a6e950c2d60edde74ae74227c9cccc3a2e0ddde43818c98b69794c8ca8f4475822080a0b858e30e9f478125d446b07f32e440c49a8973
-EBUILD selinux-timidity-2.20200818-r1.ebuild 285 BLAKE2B 4b8f9cf32752001090de2bd7328812acf93cab4dc43d2b66457a671426eef0a3a3d221ea9a10a1e33ecc770a797919746b895e2b3d543cd4c84e66aa09a86082 SHA512 312dcc1be0b66d6abc8c5a08a84f8c51b137b3b4265a1a2af431be90086e0ad558d74e9083dac2535ffdf6f5f613039c4fc34e2c031c18932dd17dcde6725dfe
-EBUILD selinux-timidity-9999.ebuild 288 BLAKE2B b0a98e55a1b6f3afbee3a385e271043a9584d4f4e8433ac130fd8ee3c96f7b13ba283213b45c1c77ab9305bd25e2e2aa88ad7b8b74ed5cafdd3780013e142ede SHA512 c640370807519cc241074798ccc3193a9ac90fb7f6761e46ff901d6989c3b75a9b5fc66848a7f5c884ebe67a232cd12514867f30d9664f7c6cef285d21a363e1
+EBUILD selinux-timidity-2.20200818-r2.ebuild 283 BLAKE2B b0632c96a5008ca4f85b9734b3b26c02ee793a13ecb2d1ac9d3d5cc536644e893d29740df6d1e29cd321690cc6f4ef692abb635406621ca6042f357914d0661f SHA512 a42b6acf77635ad86ed61c9ff821eee2cb5f8771b1178a2e40606be09a19e9d16827a93da74c71a230ee8f4e07767f7be4108c1b3e5724c0ab9fea7cc58fb05b
+EBUILD selinux-timidity-9999.ebuild 285 BLAKE2B 9af670c3d4c17c5f431875e14ed97905ea6a04279a17ebfe8ae86d92ff046ce345c4fb9439f22bf4280e8360560d8b9c20b1072ab66080f96e2c31187567f83d SHA512 c7a4e3af18cdea160705b7d8f63565cc5118af374424d138223685b89dab13a6817bfb991b733bcf3f78bca5559a51d8610b29daa65b6d29739226c706a247d8
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-timidity/selinux-timidity-2.20200818-r1.ebuild b/sec-policy/selinux-timidity/selinux-timidity-2.20200818-r1.ebuild
deleted file mode 100644
index 6373d459afa1..000000000000
--- a/sec-policy/selinux-timidity/selinux-timidity-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="timidity"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for timidity"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-timidity/selinux-timidity-2.20190201-r1.ebuild b/sec-policy/selinux-timidity/selinux-timidity-2.20200818-r2.ebuild
index bb061deee85e..737dac98c618 100644
--- a/sec-policy/selinux-timidity/selinux-timidity-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-timidity/selinux-timidity-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="timidity"
diff --git a/sec-policy/selinux-timidity/selinux-timidity-9999.ebuild b/sec-policy/selinux-timidity/selinux-timidity-9999.ebuild
index 4be6efafc96c..5ca52844bacf 100644
--- a/sec-policy/selinux-timidity/selinux-timidity-9999.ebuild
+++ b/sec-policy/selinux-timidity/selinux-timidity-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="timidity"