gentoo resync : 14.12.2020

4 files changed, 6 insertions, 30 deletions

diff --git a/sec-policy/selinux-apache/Manifest b/sec-policy/selinux-apache/Manifest
index 6aeef6386062..4cbd28bfcf6f 100644
--- a/sec-policy/selinux-apache/Manifest
+++ b/sec-policy/selinux-apache/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-apache-2.20190201-r1.ebuild 379 BLAKE2B 36558ca470930505a64bcfa6c6235bf17d6cf438f359ca5ddd4a08722348dcb27850f124d25192a6038c06c4944b1de14994a744119bc07ed30318f0b7ab0cca SHA512 eb33fac406e22f4c5849b6c87562d8f6e30ad45c3a33c7f878f5df229510912d388dfa79342182764660fb4b7b3acf911c04887330a6cad4f0c97431db16d97f
 EBUILD selinux-apache-2.20190609-r1.ebuild 379 BLAKE2B 36558ca470930505a64bcfa6c6235bf17d6cf438f359ca5ddd4a08722348dcb27850f124d25192a6038c06c4944b1de14994a744119bc07ed30318f0b7ab0cca SHA512 eb33fac406e22f4c5849b6c87562d8f6e30ad45c3a33c7f878f5df229510912d388dfa79342182764660fb4b7b3acf911c04887330a6cad4f0c97431db16d97f
-EBUILD selinux-apache-2.20200818-r1.ebuild 381 BLAKE2B f183cfb7d7edc44c9e8f08acea7a03b40c2bb838bf9013893f98cc86daba955fae6b0feb460c7aecdf011cec2e7bab852538d20b42bf8c241edfe383eccd1f76 SHA512 134f153c2d30c23e4a03c2e74cf314f10d8041e9cb8a2dbf43d3a9cffcda7671a866a944a092a464617f4f22f5b9f80c7b34269a3798ab9799f68a66ab04f927
-EBUILD selinux-apache-9999.ebuild 384 BLAKE2B 3816bd97bbe6c21a2b931bd2434be9ff9e0e2e18a0f86460a9565018126cb174529496efedf793a21471462f51d875e0dff669c688516aa1547dbe87265f49df SHA512 7edaadb7c90f786051749b6f7823f692dbe4f2e29a763c49b10f80caf840a0af8a8d277fb5041a0510257332ff977850c736de1427ceb3717b1132f45ff53ef8
+EBUILD selinux-apache-2.20200818-r2.ebuild 379 BLAKE2B c9f778b694267fcb8afb58887c85fd6a7f0bab23b8cb1736b21012ee4d8b8fb960305b5b0856523c2f853e86523e6ecdaa4117065f3838639df8a6a882b5608f SHA512 55ec492705bd99a54d0bf100422e406d077a06f894877f83e7767880fe146cb6346c5d5d94f77aef64cc307e820523303996be5c69cb118820523af61dcbc7b4
+EBUILD selinux-apache-9999.ebuild 381 BLAKE2B b1f40c075a62fcf2b6eb92a77e2c8d749d6f75b3a91d2fcadc9b57d01c6ccfb3fecd23118eb6bd6ca190afda35e66d9c32c8c15cdffd260101ead19b8accc4a9 SHA512 943b54e0d61676c7651d8ec078370350e0542d1cf08231961ee80cd6d98798cb27820317085c16173b925facca4e52f77f90c88126a0a03ade35583fa0770130
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-apache/selinux-apache-2.20200818-r1.ebuild b/sec-policy/selinux-apache/selinux-apache-2.20200818-r1.ebuild
deleted file mode 100644
index 757a65498659..000000000000
--- a/sec-policy/selinux-apache/selinux-apache-2.20200818-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="apache"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for apache"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-kerberos
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-kerberos
-"
diff --git a/sec-policy/selinux-apache/selinux-apache-2.20190201-r1.ebuild b/sec-policy/selinux-apache/selinux-apache-2.20200818-r2.ebuild
index a181b10df320..72dceb47052f 100644
--- a/sec-policy/selinux-apache/selinux-apache-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-apache/selinux-apache-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="apache"
diff --git a/sec-policy/selinux-apache/selinux-apache-9999.ebuild b/sec-policy/selinux-apache/selinux-apache-9999.ebuild
index 077ce01d6342..b3a15415745e 100644
--- a/sec-policy/selinux-apache/selinux-apache-9999.ebuild
+++ b/sec-policy/selinux-apache/selinux-apache-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="apache"