gentoo resync : 14.12.2020

4 files changed, 6 insertions, 30 deletions

diff --git a/sec-policy/selinux-munin/Manifest b/sec-policy/selinux-munin/Manifest
index 8764dea00961..8b68e1c3bf9c 100644
--- a/sec-policy/selinux-munin/Manifest
+++ b/sec-policy/selinux-munin/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-munin-2.20190201-r1.ebuild 373 BLAKE2B 18894fa79e099fbab5f7a992a27cad6fa0c426fc21cc5a0c32c00c2bdc1ed5ed052ab3c33b11f854ea5884c90c4654e1e1dde37fa741783db387cadf41061f85 SHA512 4e6e5221456bad0cc842f21e404d4ab569b3a5d4574fff1e3d230eea556e6655d54b5520446695fbe71f508ab35f805bb183ffe96757cd0c199aa549cad5ea1f
 EBUILD selinux-munin-2.20190609-r1.ebuild 373 BLAKE2B 18894fa79e099fbab5f7a992a27cad6fa0c426fc21cc5a0c32c00c2bdc1ed5ed052ab3c33b11f854ea5884c90c4654e1e1dde37fa741783db387cadf41061f85 SHA512 4e6e5221456bad0cc842f21e404d4ab569b3a5d4574fff1e3d230eea556e6655d54b5520446695fbe71f508ab35f805bb183ffe96757cd0c199aa549cad5ea1f
-EBUILD selinux-munin-2.20200818-r1.ebuild 375 BLAKE2B 0d06726d0b39ad69f7b8145b5215dd790cdb3becfc810a5f5bf62a368e06db2c4e14642d87e650f6ed1b1ac1b853bf843572068838d94caa4fd965b986246c08 SHA512 a2009d2ac4162ee773ab08a577908952542b83714f744229c3edc747b82999d6fb33ed2ceb22c6ff1f64c5904d3931581fd05d2262b7570e5b713e14607d1b17
-EBUILD selinux-munin-9999.ebuild 378 BLAKE2B 84ec865cd89b81a185ea307cb5755cf9fe2e7751c37647fe53a403acda3c53650b280b8bcd02f393aa65cddf1849549b8434d15310f46c21124ed17ccee499fd SHA512 14f4a31bc763fba316ff87aa0c4cb42625d82720bd31d89cb4d7022e48f587ca34090cdb005bceb58c0da906b9093da557678addfb0f1e8fe16654cc242bf595
+EBUILD selinux-munin-2.20200818-r2.ebuild 373 BLAKE2B 38ced17ffc9fa9f4d57f88c0fcab4c06aadf131ae173fa61fd3899584378d9dc71d861047db2e288849d77ac009c12a53f0a80b3d458ec4bd4b0f16718c8331e SHA512 86c4e8537d7d46b900dcd2ed46c3068071b40a3cd3957f743198a9d3902765f4df693af27dd4d7381c482193bb613cf0bd69e4011864dcf663f0979a7db84419
+EBUILD selinux-munin-9999.ebuild 375 BLAKE2B 8c4096ed2a7f4229c550f92735309080ce2de36c2da877139a07d3468206d9ac8f61e2387b92cc4e760b90e2a6b1b247cce52b979091de2c87af3348e60617af SHA512 4cce2cdda96652a459c0dbb754980cdeae6c38164ced268d57e3af2217fef69b1686940e2389e544519ef6ff230463c5b598611f343dd4dfe750417e23f4c512
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-munin/selinux-munin-2.20200818-r1.ebuild b/sec-policy/selinux-munin/selinux-munin-2.20200818-r1.ebuild
deleted file mode 100644
index aa0755e10cbd..000000000000
--- a/sec-policy/selinux-munin/selinux-munin-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="munin"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for munin"
-
-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-munin/selinux-munin-2.20190201-r1.ebuild b/sec-policy/selinux-munin/selinux-munin-2.20200818-r2.ebuild
index ca842c4104b2..41fe78d9bee3 100644
--- a/sec-policy/selinux-munin/selinux-munin-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-munin/selinux-munin-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="munin"
diff --git a/sec-policy/selinux-munin/selinux-munin-9999.ebuild b/sec-policy/selinux-munin/selinux-munin-9999.ebuild
index fd86c50e8c82..55798620ad2d 100644
--- a/sec-policy/selinux-munin/selinux-munin-9999.ebuild
+++ b/sec-policy/selinux-munin/selinux-munin-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="munin"