gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-xfs/Manifest b/sec-policy/selinux-xfs/Manifest
index 9e64e3d31676..0563c80960fc 100644
--- a/sec-policy/selinux-xfs/Manifest
+++ b/sec-policy/selinux-xfs/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-xfs-2.20190201-r1.ebuild 273 BLAKE2B 00ed3ca31777de3c935aa226070ea7fca903949078434035569bd00303e3f7c7169d3ebab4bf8c4fca9a2ae97e6ab55be2bc98758eaa7bf8defd8d83457321eb SHA512 8eb4d58ab62da2310ec6f75d85c0e0a1a2390835c5ace4bac6b4ede130955cdca125c595f2a1e93779f930b28b7d63fae62dae52146a1ef845b620af8fba5de6
 EBUILD selinux-xfs-2.20190609-r1.ebuild 273 BLAKE2B 00ed3ca31777de3c935aa226070ea7fca903949078434035569bd00303e3f7c7169d3ebab4bf8c4fca9a2ae97e6ab55be2bc98758eaa7bf8defd8d83457321eb SHA512 8eb4d58ab62da2310ec6f75d85c0e0a1a2390835c5ace4bac6b4ede130955cdca125c595f2a1e93779f930b28b7d63fae62dae52146a1ef845b620af8fba5de6
-EBUILD selinux-xfs-2.20200818-r1.ebuild 275 BLAKE2B b8b9a4263c66629b8dee6bd89961ab20706fb41861fd7519cde29190ce42dbc270cc070c30e51603f2476ce9bb8aa3d4e9a35e6fb3815b4652e05b6591961a8b SHA512 0098d1a02bfa96756a35bf1ec09d2ce888bd1fbf1d246e96e1ec62b7aa645b42359300f53380483498b79c5ddc4b5f0e0fad454d47d015ec00d810eeba0d5718
-EBUILD selinux-xfs-9999.ebuild 278 BLAKE2B bd8287f9a079da787d4b10326dcb67d9336d3db0abc61a3c9cbc98bf48867a7eabea293179f5b58bd5757a168c95eea4b1fbca955340c88473631c5f0de6e7aa SHA512 50e653079f6b8c04df322f07f9cde1172f902a46a3451f6ec8fc7a27f094481799fed3fa8688840c7fdb5fb492d989ad4b82fa398fec30503ecfa741e5439b29
+EBUILD selinux-xfs-2.20200818-r2.ebuild 273 BLAKE2B 63e2d3ffd5bcd68c4800342829e12f662acb8c4e59e96615b706f7e9fe9f2e71d1b4d5e9ce542a21d3c4c812ca2b5836880d0a5cbe4f77e4a503487b8c1af20e SHA512 2813a75959774eb9ea35986d99ccdc49fd20a5b1994e7a625a5c58b29791438fda455b1b27abcb8b25d386646ceb1712d301c4a8a15336ec2c6a865254ea8a7e
+EBUILD selinux-xfs-9999.ebuild 275 BLAKE2B 97a4bc106ebe013142a56235304806452602c5621f6e8848a7359aa1e5c8872f2b974b070be6d2aa8266e2f7e75f720fdc28e4d30c2210509eff6cb53758c6f9 SHA512 401afd3dfa55c3c49a1ff8e82643b553b150e756807c616d9cb9da32e7e69d139c04d695537beb56c3fcaff61c644f95e5acdeaf4ff40350a78c1ca4208dcc57
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-xfs/selinux-xfs-2.20200818-r1.ebuild b/sec-policy/selinux-xfs/selinux-xfs-2.20200818-r1.ebuild
deleted file mode 100644
index 4321254c44fd..000000000000
--- a/sec-policy/selinux-xfs/selinux-xfs-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="xfs"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for xfs"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-xfs/selinux-xfs-2.20190201-r1.ebuild b/sec-policy/selinux-xfs/selinux-xfs-2.20200818-r2.ebuild
index aaf98f5fe9af..3ea0aeb1be5f 100644
--- a/sec-policy/selinux-xfs/selinux-xfs-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-xfs/selinux-xfs-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="xfs"
diff --git a/sec-policy/selinux-xfs/selinux-xfs-9999.ebuild b/sec-policy/selinux-xfs/selinux-xfs-9999.ebuild
index cf06c723ddfd..b8dea2e046ed 100644
--- a/sec-policy/selinux-xfs/selinux-xfs-9999.ebuild
+++ b/sec-policy/selinux-xfs/selinux-xfs-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="xfs"