gentoo resync : 14.12.2020

4 files changed, 6 insertions, 30 deletions

diff --git a/sec-policy/selinux-nagios/Manifest b/sec-policy/selinux-nagios/Manifest
index 68c6bc3c811c..71e5a6d1b19a 100644
--- a/sec-policy/selinux-nagios/Manifest
+++ b/sec-policy/selinux-nagios/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-nagios-2.20190201-r1.ebuild 375 BLAKE2B e260921af3335c61ac0a3bcf637a2d8adba7f1be487fbf4e0fec5450db4d08c56658c94a79430d533a5a7cc52c0ef58702e0fb6a78327ebdd2c6cf6916b19eb1 SHA512 fd1994ff7418b42223556f506660982d081bef928d1e34d3271af67b310d14383588f4afcb1d157b4417d96333c2c6ced88c0127f6405039677dc2733c699ecf
 EBUILD selinux-nagios-2.20190609-r1.ebuild 375 BLAKE2B e260921af3335c61ac0a3bcf637a2d8adba7f1be487fbf4e0fec5450db4d08c56658c94a79430d533a5a7cc52c0ef58702e0fb6a78327ebdd2c6cf6916b19eb1 SHA512 fd1994ff7418b42223556f506660982d081bef928d1e34d3271af67b310d14383588f4afcb1d157b4417d96333c2c6ced88c0127f6405039677dc2733c699ecf
-EBUILD selinux-nagios-2.20200818-r1.ebuild 377 BLAKE2B 9e29c8c1c46c276489afb89243d3faa105513fcca272eae5c8d043fb0a8f73da082a3a2eca957788e95673bcaf65ea7751be0d0b506d85c9cb71647e9bfc3e15 SHA512 1175271c167a97675506393413597c0044dc8980d926fd03f9edf9a666e0da984597714efb422552b4ce681bcd1fb11d4e863f4252f8ff634353aa65f27a8036
-EBUILD selinux-nagios-9999.ebuild 380 BLAKE2B ce2fdc7a1acb4930ac92d88a46367e2ad14442979c04a66ed29fedbb0c5fcfbdaeaed9915df1d061a6082285173a475d5829eab59b7bb4fac01b86f3536b220a SHA512 087555cdd22fa69d09ef4ecf40d231619ef505f825892d08acc02e8e03351e670876a1046ccc6768bef744de86e789770f07075251817845fb2ce6688a8a8ba0
+EBUILD selinux-nagios-2.20200818-r2.ebuild 375 BLAKE2B 048800cb45cd6ba6aad04346bbaca7dbb2b3f209c2f7ea2c5cf401513d1fb66aae0ea7be9661c5b097ffc29e2547bfeefa6d35cb143eff7957a163a9c42cb1f0 SHA512 1cc805eb8dee6074ed2007c8acbb784af9fa0187556613bd6a2a9e4a57489f8b71a46c38f21ba6cf0d53a790b9fa0b116021ca65329c0623c9d6d0cc93fd5b33
+EBUILD selinux-nagios-9999.ebuild 377 BLAKE2B 427888e6204852597792c8b25c363ccb94c2a843b939d7517e774eef9914d0f14e9aa08f8b795126bba38d64b783e54ac032be2afe0659409b56611620a311e7 SHA512 c35d6c3b591dcc9a1e41ae82858149c99916638a689bdd253ac1d7f4b87ee84065d79381447e2a00d8986c09dfcb919f22dd5d613b9bba4c924eebb489158edd
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20200818-r1.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20200818-r1.ebuild
deleted file mode 100644
index 81cda8601135..000000000000
--- a/sec-policy/selinux-nagios/selinux-nagios-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="nagios"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nagios"
-
-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-nagios/selinux-nagios-2.20190201-r1.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20200818-r2.ebuild
index f4bf6669fef0..cfbb58e43985 100644
--- a/sec-policy/selinux-nagios/selinux-nagios-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-nagios/selinux-nagios-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="nagios"
diff --git a/sec-policy/selinux-nagios/selinux-nagios-9999.ebuild b/sec-policy/selinux-nagios/selinux-nagios-9999.ebuild
index 5bf419cc42d4..1af84735585c 100644
--- a/sec-policy/selinux-nagios/selinux-nagios-9999.ebuild
+++ b/sec-policy/selinux-nagios/selinux-nagios-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="nagios"