gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-mrtg/Manifest b/sec-policy/selinux-mrtg/Manifest
index e91727b94d15..a019b5f48b41 100644
--- a/sec-policy/selinux-mrtg/Manifest
+++ b/sec-policy/selinux-mrtg/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-mrtg-2.20190201-r1.ebuild 275 BLAKE2B 82ec1eb20dd22049692b41b06d58f7d5e4c8e1a5f3a723e78ed4ba567f35b17738f87aade014ee73ad0d1c3dc58389ed54df66de64a1317de28b0fad08722591 SHA512 ebbd7531ae2a4ec415a30321d6b8536de9830d2515266e18fbb87944a0d16e34a942d9b4a12043a51ce5050ebea6408086b689725ff279209519ea0c6d8eff6c
 EBUILD selinux-mrtg-2.20190609-r1.ebuild 275 BLAKE2B 82ec1eb20dd22049692b41b06d58f7d5e4c8e1a5f3a723e78ed4ba567f35b17738f87aade014ee73ad0d1c3dc58389ed54df66de64a1317de28b0fad08722591 SHA512 ebbd7531ae2a4ec415a30321d6b8536de9830d2515266e18fbb87944a0d16e34a942d9b4a12043a51ce5050ebea6408086b689725ff279209519ea0c6d8eff6c
-EBUILD selinux-mrtg-2.20200818-r1.ebuild 277 BLAKE2B 140b1974e28d9c1ed03eff49c8ed7ce42d4034f1606b08ce18faa46071f04c0e167ff9faa62abbfe88a332f8589ad93644e71a7b7547ae5525de280cee2294fc SHA512 299eaeb05d048207e4c00097e068d448368c42df4324fa7918a08f3182ece9cbd48b7ff1d72132e08faa861f2a6d6e8296a3ea026897d7490c9dea4c989f5ad5
-EBUILD selinux-mrtg-9999.ebuild 280 BLAKE2B 4eaa7b0378340dd55517c96aaac58fd8d8a8ee0645aa28625295ac9223668ae18db75f778b29885f32fda030d2867f3c1f827b954067594d5e630c99af68810b SHA512 0ccddae75c754c173ff0ba837664fe6988dca32909cf37f66fbad33b102d90817e9aabb7a2c4c01f708872449f96c3ea76009575aedab974f0fb6c49faed248f
+EBUILD selinux-mrtg-2.20200818-r2.ebuild 275 BLAKE2B 2e9b2157e406e3d67f9487ffb7d4550a033800a835c24dd938c04f3efd451ff43e1afeed6679975fb9163e53a7eecec94dc619cca194d3a503f5a6af31c206a6 SHA512 e58f8cca2b422e0c5ee8efc04cd518e541266ef9ed637b77e98a6ead3721778475441ce94087f3b8f31e99ccb5535f568693ad969a51d2753946f22a6e300e39
+EBUILD selinux-mrtg-9999.ebuild 277 BLAKE2B 2d26420a0309dd7b2fe0421a698c9de50c7bfa0e9815f16b050283d25ccb7b81032c23d0067b2bbd1e0276f2108966b932193e04a6712f1d0d6bcfa44775c776 SHA512 703e0fc969cbf81320e124239f63624656baf005a7ee9855990084ef10ae1102fc78a1087b899eb2aaaa771270808042b7748ca5165452b534720fb97e46cfa1
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-mrtg/selinux-mrtg-2.20200818-r1.ebuild b/sec-policy/selinux-mrtg/selinux-mrtg-2.20200818-r1.ebuild
deleted file mode 100644
index 0135a93614be..000000000000
--- a/sec-policy/selinux-mrtg/selinux-mrtg-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="mrtg"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mrtg"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-mrtg/selinux-mrtg-2.20190201-r1.ebuild b/sec-policy/selinux-mrtg/selinux-mrtg-2.20200818-r2.ebuild
index fc9606ff5b50..e25d85f26beb 100644
--- a/sec-policy/selinux-mrtg/selinux-mrtg-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-mrtg/selinux-mrtg-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="mrtg"
diff --git a/sec-policy/selinux-mrtg/selinux-mrtg-9999.ebuild b/sec-policy/selinux-mrtg/selinux-mrtg-9999.ebuild
index 5a3b8257ed47..03cc2573ee36 100644
--- a/sec-policy/selinux-mrtg/selinux-mrtg-9999.ebuild
+++ b/sec-policy/selinux-mrtg/selinux-mrtg-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="mrtg"