gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-automount/Manifest b/sec-policy/selinux-automount/Manifest
index d332b846e29f..7fe43f2b9c46 100644
--- a/sec-policy/selinux-automount/Manifest
+++ b/sec-policy/selinux-automount/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-automount-2.20190201-r1.ebuild 285 BLAKE2B 3d1c9921d4bedd2489f52b85588ed5d8767eec537c194c1cff37e4b2ae6e601024108d6871f6f844a2920cc15626f76532c67ac4a8122f876cc3db4ea3efc1cf SHA512 2c3e5576601740933d185f51c4fb12e06666412ef86c1f9b453b4e9d62bce18e193b1b851214b2cdf949d558bfdc60b89c098268140758b4ad68456c3d447021
 EBUILD selinux-automount-2.20190609-r1.ebuild 285 BLAKE2B 3d1c9921d4bedd2489f52b85588ed5d8767eec537c194c1cff37e4b2ae6e601024108d6871f6f844a2920cc15626f76532c67ac4a8122f876cc3db4ea3efc1cf SHA512 2c3e5576601740933d185f51c4fb12e06666412ef86c1f9b453b4e9d62bce18e193b1b851214b2cdf949d558bfdc60b89c098268140758b4ad68456c3d447021
-EBUILD selinux-automount-2.20200818-r1.ebuild 287 BLAKE2B 55c1a4bfcff3009adc170b000b38dcf32bc0c300b419495134bf7ebc0ebf2f7388d59eaa18f208a1cd4117fa9844be78cec1e7f53d12f60852c66851d9a2f811 SHA512 19a3c301506685196794930314ce7cd5bb3fd148079fe938f3797105e87adf1328d69464ec3a332536a4c112503c8ec38cd8e6c1cdc264479b7ccd31082263d5
-EBUILD selinux-automount-9999.ebuild 290 BLAKE2B 8e0ca09e38d11531a12ec539f63f3c7f97d2a78cb2b34a9ca9e9274ba6cb4ea30e8fa374a3b92ef7cc68e4eda88db37f7447dbb8ab5f75325a2c38625e11a122 SHA512 e6698bdd64c90c4417a036aad361611231bcbcdb556a3f3b09e14a8ba5568fd03fb7972e47e9057ba1d9e2fd701696bb22d5042ec836b68e6853cf176ffa1a36
+EBUILD selinux-automount-2.20200818-r2.ebuild 285 BLAKE2B 38815054c843a7022636ab33752d2f246e818f4c05f96f33ffe4fa4002bd1c5786294295c0f08fa82e3b12b5eac3fac9c74f865610ce36272116e009c673de3a SHA512 75c82e3eb48abc3ace7a3b73c95a8713c6e3bd9eb980ce3314e7aa487db3b633c6414745cec478cce63dd885aecbd73599b8c77c65b4dcc7debd57a402c27f9e
+EBUILD selinux-automount-9999.ebuild 287 BLAKE2B 9ccd6ec738f97fd66c8a81e0ea10ec86b96644b3cc189371f65b12e9c999bf43f1888ec505649c73ccf819233006aee8e1d56a6e767f6666aa87ce92d42a2dad SHA512 f50413591613a691a69b3f6ae644f736885baee72466985281c62533039f59bc2aa44efec32035b5f748fa502cee373ff7e9c00dfdeda9ca9a63882b4d39e32c
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-automount/selinux-automount-2.20200818-r1.ebuild b/sec-policy/selinux-automount/selinux-automount-2.20200818-r1.ebuild
deleted file mode 100644
index 567a4b107d17..000000000000
--- a/sec-policy/selinux-automount/selinux-automount-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="automount"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for automount"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-automount/selinux-automount-2.20190201-r1.ebuild b/sec-policy/selinux-automount/selinux-automount-2.20200818-r2.ebuild
index d7aaf7012db4..a58e42de1d95 100644
--- a/sec-policy/selinux-automount/selinux-automount-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-automount/selinux-automount-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="automount"
diff --git a/sec-policy/selinux-automount/selinux-automount-9999.ebuild b/sec-policy/selinux-automount/selinux-automount-9999.ebuild
index 98c74562e3e3..85956635625d 100644
--- a/sec-policy/selinux-automount/selinux-automount-9999.ebuild
+++ b/sec-policy/selinux-automount/selinux-automount-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="automount"