gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-dmidecode/Manifest b/sec-policy/selinux-dmidecode/Manifest
index bc5fbdbe6f79..b78a4109cf97 100644
--- a/sec-policy/selinux-dmidecode/Manifest
+++ b/sec-policy/selinux-dmidecode/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-dmidecode-2.20190201-r1.ebuild 285 BLAKE2B 0183609eca2dc0e65f761e7bea2a1e5f398b4177fbc3aeb588ac71d1170c0a5fd49a4d9e222bf35626278e3e5564852492e1f4b0ce73970c67a120d26eeae0c3 SHA512 a587e1552c2d3adb1cabc31bf9759bf43a6ba5c67e8cc69fc6840afe32d3f807825a49490e59fcda7f08b705990e151900b8312a8549f079cdd1d082c24d2026
 EBUILD selinux-dmidecode-2.20190609-r1.ebuild 285 BLAKE2B 0183609eca2dc0e65f761e7bea2a1e5f398b4177fbc3aeb588ac71d1170c0a5fd49a4d9e222bf35626278e3e5564852492e1f4b0ce73970c67a120d26eeae0c3 SHA512 a587e1552c2d3adb1cabc31bf9759bf43a6ba5c67e8cc69fc6840afe32d3f807825a49490e59fcda7f08b705990e151900b8312a8549f079cdd1d082c24d2026
-EBUILD selinux-dmidecode-2.20200818-r1.ebuild 287 BLAKE2B ae8bbd78975d43697124182829c374faefd2426df022bd8519c5916c32b0c87e2d992414be46366804bd6caf124b34c03ca8be410dae4d2b7fb4603f4380ee50 SHA512 d7f4f1600c67c4a99a6ce34355d38148729fb4fc7cc15e86ec56370c7dd7fe4c99b2d2208c48c0a9ca34622713a289a639f79b4d988e22d45882b8a60f789452
-EBUILD selinux-dmidecode-9999.ebuild 290 BLAKE2B 40fb04c58685f79ca71d56b35e4556649b9863954c3b72738522a014d9401115b4b78804965a2da3ac1b115754b99b8e8aa452d32b8a722a215c4cf18475f794 SHA512 232652b41d6c5818f55b2dcccfc94c758106c9be4c76e514c33eb8012d6fc39a6789f33645f032471f4b749f933367b0e469b7073fbaf81afaeedb6376bdddbe
+EBUILD selinux-dmidecode-2.20200818-r2.ebuild 285 BLAKE2B 5e189921cdd7ec1e53e2fe1410a1111e43c896368254735ffec2fd64c744f92ce1170dab6668d67ce30928cd3677feb6bb5a2da3e054f7a25284dd8935ede781 SHA512 87c0675c21521eecea58e60850e9b97d8480511225a0fb2c082ee7e844e308841f51375a18356f2e2f0f345293491cfe1f0947c01ec173f67722f66eea175423
+EBUILD selinux-dmidecode-9999.ebuild 287 BLAKE2B d9b54401e667a19a0a3a7b6769919a2aaa9771dd47f8b8106ef15385c813d43e2dc623b92dba34ee2f21f64628b594cfec1fa78b214c568d225aa1056bd84698 SHA512 21696406d4eb24aed6e861dff45da872f4006865c5dcc2f20e5dc0463ee33420b6fa6b8ec44b3f96a2e965624bca5f928923c8c205794a2ff59031b917bc08dd
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20200818-r1.ebuild b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20200818-r1.ebuild
deleted file mode 100644
index 6737d466d6d8..000000000000
--- a/sec-policy/selinux-dmidecode/selinux-dmidecode-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="dmidecode"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dmidecode"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20190201-r1.ebuild b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20200818-r2.ebuild
index 50fd2aa6b619..e38ba18ee926 100644
--- a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-dmidecode/selinux-dmidecode-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="dmidecode"
diff --git a/sec-policy/selinux-dmidecode/selinux-dmidecode-9999.ebuild b/sec-policy/selinux-dmidecode/selinux-dmidecode-9999.ebuild
index 8e615d71505e..b49f3d2e2c75 100644
--- a/sec-policy/selinux-dmidecode/selinux-dmidecode-9999.ebuild
+++ b/sec-policy/selinux-dmidecode/selinux-dmidecode-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="dmidecode"