gentoo resync : 14.12.2020

4 files changed, 6 insertions, 31 deletions

diff --git a/sec-policy/selinux-webalizer/Manifest b/sec-policy/selinux-webalizer/Manifest
index 8f227eaa3563..725e4a6b0a63 100644
--- a/sec-policy/selinux-webalizer/Manifest
+++ b/sec-policy/selinux-webalizer/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-webalizer-2.20190201-r1.ebuild 382 BLAKE2B 150c2707998435fe0966a2d90b56af04938f0ab272aa09dbe893d3744e11b6686c6504a8b3fff126e734f746050d0cd085ea6d839808a0b3ae0a70005c62bdcb SHA512 c5b8df3032eac57687a95cce16a82ef15b729786f1a5a9661f1797b30bdabe45ea4c5ebb6ca8248423fae13348a05376a8fd3f361bd62ca2f743c63e0d9cf8de
 EBUILD selinux-webalizer-2.20190609-r1.ebuild 382 BLAKE2B 150c2707998435fe0966a2d90b56af04938f0ab272aa09dbe893d3744e11b6686c6504a8b3fff126e734f746050d0cd085ea6d839808a0b3ae0a70005c62bdcb SHA512 c5b8df3032eac57687a95cce16a82ef15b729786f1a5a9661f1797b30bdabe45ea4c5ebb6ca8248423fae13348a05376a8fd3f361bd62ca2f743c63e0d9cf8de
-EBUILD selinux-webalizer-2.20200818-r1.ebuild 384 BLAKE2B f526dfe16148db5e8151c865135fef0b83aa2576aa2d1152565ed65c048a836edfe5da19d4e69127d0badebeb8574c144d3fe4496dbed473a3613d86cf6ea2fc SHA512 703052e00a2ca9de8a4bc35dce91e92e9c3cd608b7b47e9bca52a58e0cba34fa94ab1203457a714705605518ec071d2280b580bab922783cfff5808927fb3ed7
-EBUILD selinux-webalizer-9999.ebuild 387 BLAKE2B 21f96e823977f2cca93b1593391d6a45fdc57e9d0042ba26c3ffd3895136b07fb539fb0f1c96f727c45e82ad0da0f3b0b5b46875e3f1ef7a9ecdf7c5918ed5d0 SHA512 e83af1779b75f4ea3d8be0d9527b8eb596785c75115e661556b627984811b146fbaff81b885a98a65f51c692afe06bd0afc1c115e714269f47d165a658bf0d61
+EBUILD selinux-webalizer-2.20200818-r2.ebuild 382 BLAKE2B 972e2f5280af1462fbb02ae68b3c05fae1936ddbe8a7087015c54a21b54adb5687147392d9d8b85383c2e38037b7f66fc935acff51c5c4e4d2077d027031dd4f SHA512 6d3e837a0faea1d31ecd57079c723e9fb3d0c435fa0345fea70e1c462dee274655c6f258cec967105911942ce3588f735c6151f90766a2e2ce610ab6aead0463
+EBUILD selinux-webalizer-9999.ebuild 384 BLAKE2B a667575f6cd7a08b2f80e74210b076402051eb328594197cc2cc0cc70f198bb545110d9a0934c4c17f1abdf8070587186caa0368e123cc7888bcea0314a2e1fb SHA512 52e634a4fe49d4b9bd9fbaef015a3e9801bd0f6bbe411e4a79b6439739ab32b9dfcf77bb829d189bfaf4eb97d5803405baeb2e259e763a683f057a20430bff03
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-webalizer/selinux-webalizer-2.20200818-r1.ebuild b/sec-policy/selinux-webalizer/selinux-webalizer-2.20200818-r1.ebuild
deleted file mode 100644
index 25f964560135..000000000000
--- a/sec-policy/selinux-webalizer/selinux-webalizer-2.20200818-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="webalizer"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for webalizer"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-webalizer/selinux-webalizer-2.20190201-r1.ebuild b/sec-policy/selinux-webalizer/selinux-webalizer-2.20200818-r2.ebuild
index 6f7462b40d55..05fb2862345d 100644
--- a/sec-policy/selinux-webalizer/selinux-webalizer-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-webalizer/selinux-webalizer-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="webalizer"
diff --git a/sec-policy/selinux-webalizer/selinux-webalizer-9999.ebuild b/sec-policy/selinux-webalizer/selinux-webalizer-9999.ebuild
index 1faf79c01338..2eb0924d8a03 100644
--- a/sec-policy/selinux-webalizer/selinux-webalizer-9999.ebuild
+++ b/sec-policy/selinux-webalizer/selinux-webalizer-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="webalizer"