gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-publicfile/Manifest b/sec-policy/selinux-publicfile/Manifest
index 75b4a80bc520..016ae2158e9d 100644
--- a/sec-policy/selinux-publicfile/Manifest
+++ b/sec-policy/selinux-publicfile/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-publicfile-2.20190201-r1.ebuild 287 BLAKE2B f59014bbd52702c4476ad8c0750f722fdeacd2cf4db91f78e998032c6237bd3b43ef8cd22010150ff359fcb5d46b42391f4e1d5f1c6f289caa9359cb54960211 SHA512 f5d7ac2b6e92a91ca3372a39cb751e16a7f93a813d198b2ce53e905d2fd8e37e44b685e881deb265af4f4ca859a91cee41d5ac3915500f4a7433ad243a82c5ff
 EBUILD selinux-publicfile-2.20190609-r1.ebuild 287 BLAKE2B f59014bbd52702c4476ad8c0750f722fdeacd2cf4db91f78e998032c6237bd3b43ef8cd22010150ff359fcb5d46b42391f4e1d5f1c6f289caa9359cb54960211 SHA512 f5d7ac2b6e92a91ca3372a39cb751e16a7f93a813d198b2ce53e905d2fd8e37e44b685e881deb265af4f4ca859a91cee41d5ac3915500f4a7433ad243a82c5ff
-EBUILD selinux-publicfile-2.20200818-r1.ebuild 289 BLAKE2B 32816713f4a336c67e7529944372f1d3b7f5ef3548a646b28618609d0726f9efb367b67a7ee41881f70a6bf7afae7d2c3e3ad9029d6baa3b547455631d0cd656 SHA512 a4b4777cd18b211a5f862684ad0d82d8bd982d70afde65aff4c8beaedbc91925137c83f894d360385be98d6530caf7a535563c84b5c1fb52b8d157d5603f126d
-EBUILD selinux-publicfile-9999.ebuild 292 BLAKE2B 36b5fd272dd908229e230da571e13ac67aa5854c34b08392d32d5f3998f5d373b3eb834b45236cd01f5dcc688d6478fc2b3b3efb8f3c7499da14944ddc16188f SHA512 d2344359a6118563b25c2130579ba461272d8ae94e7d36c0f7e1ceb90167338eeac317fe13850422a3e77d18fa1c7de53f999c7086bfe7f27286c9b94d87da26
+EBUILD selinux-publicfile-2.20200818-r2.ebuild 287 BLAKE2B 22b8769758d6013b9be014bf577b8b66badfea1c7b86a584c4a060fd48021a79419d3dca2f7b9141268857d52f50e6980e7660659ef8fc118f614ff3f4f9e7fd SHA512 6d1ed426a7c00cad7625cf260401046c6ec653aec2e3c35c590a83a1f78c5fb2580f22f2848b98cf3df272f0034ed086bf0b36db3d57903e5519e2c8931033e2
+EBUILD selinux-publicfile-9999.ebuild 289 BLAKE2B 648818f8699db6b4fa865f527db6419f4dcf347058243d17b5e928ebeda881027faffb8a85577f5b2b53c8fcd99e22eb46f99ee5f153aa03f3d21edc89869e41 SHA512 5a192581a23bb06180dd1321bd9ab025d7a9ae1fd16335d012341ee8cb58f8e25a1ba61e240ae13b6e023ed149415a0487b74f1e965988d455b5e47a258caef8
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-publicfile/selinux-publicfile-2.20200818-r1.ebuild b/sec-policy/selinux-publicfile/selinux-publicfile-2.20200818-r1.ebuild
deleted file mode 100644
index d50fe7ef35f9..000000000000
--- a/sec-policy/selinux-publicfile/selinux-publicfile-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="publicfile"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for publicfile"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-publicfile/selinux-publicfile-2.20190201-r1.ebuild b/sec-policy/selinux-publicfile/selinux-publicfile-2.20200818-r2.ebuild
index fd7141671496..3440de28cc24 100644
--- a/sec-policy/selinux-publicfile/selinux-publicfile-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-publicfile/selinux-publicfile-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="publicfile"
diff --git a/sec-policy/selinux-publicfile/selinux-publicfile-9999.ebuild b/sec-policy/selinux-publicfile/selinux-publicfile-9999.ebuild
index 1c14791a6816..49a6a90273fa 100644
--- a/sec-policy/selinux-publicfile/selinux-publicfile-9999.ebuild
+++ b/sec-policy/selinux-publicfile/selinux-publicfile-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="publicfile"