gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-vnstatd/Manifest b/sec-policy/selinux-vnstatd/Manifest
index 0d742fb61ab4..080429654f8e 100644
--- a/sec-policy/selinux-vnstatd/Manifest
+++ b/sec-policy/selinux-vnstatd/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-vnstatd-2.20190201-r1.ebuild 281 BLAKE2B 27d9cf45e247792a8bb5447b8e7721a67c964b742e5c088166649e187407d80e139726efca62780e5b079187b411fa74a9c551cf1a907dd063824c6af6d9e3f9 SHA512 0cf2c85b7c6a0580a7cfdb58a76a459e4d2cc2c922a18bba56666f0b32444963704d0124e5f9bd90c2ee5f13099ed071a47218626e851a987791a3cfdd830633
 EBUILD selinux-vnstatd-2.20190609-r1.ebuild 281 BLAKE2B 27d9cf45e247792a8bb5447b8e7721a67c964b742e5c088166649e187407d80e139726efca62780e5b079187b411fa74a9c551cf1a907dd063824c6af6d9e3f9 SHA512 0cf2c85b7c6a0580a7cfdb58a76a459e4d2cc2c922a18bba56666f0b32444963704d0124e5f9bd90c2ee5f13099ed071a47218626e851a987791a3cfdd830633
-EBUILD selinux-vnstatd-2.20200818-r1.ebuild 283 BLAKE2B 5227d011c8c9848dce64ac6b32e4e6c2984af1dcefc43068941a16fd29545d880c4b3674bb42707c6ab2c55c9321af0f33d5f97c4f1d96c17a1898dd816c162b SHA512 450f3dec70dc66a01bea2685a1648915e02fc17e32a1094a7830c2d633ae6fb8d5493e80a71d813ecb10789c70f58d2650d3dc69f424deb132e402f54f1a6ba9
-EBUILD selinux-vnstatd-9999.ebuild 286 BLAKE2B 1e1055af6cf9c203eeb4c785fad03254332a9b231d81434bf7183986f7f58fc8e81339ceee3d201a3bdfafb4a64f1bef058b404edb369f6a41861767d8961a45 SHA512 e37618c5e85424c9a68b927c08f2b014209e48e965d749b8692703d914674fde0d915a632db9633f2beba509b2ee41e46dc9676e3cee052ed0a6c87ac878ebfd
+EBUILD selinux-vnstatd-2.20200818-r2.ebuild 281 BLAKE2B 301a1dd9ccfd5dba1b425a1e9024ddf2d129992b4d5c98e4e260d9871efcc6ce381f3a8d367f24415f778db408d75d5c2c675b203436b245faf7ee5c820ba531 SHA512 073e6a021a2e87e4d8028c1abd2b300c27501fd49ed68987bba70a9ed717495d6c43190df436783fbcccc4ed904712b7e9b2d7bf624ad88df655636037aad2a1
+EBUILD selinux-vnstatd-9999.ebuild 283 BLAKE2B 348e2d0b234c6aee258347147aef3b36f9343d755f20819b6450ac6e54d5350507b8e2f300da0d0c88fd5020f0d66c79bd3435c6552bb3b1489f9b3b0f5c36c8 SHA512 014e5b5524ef0ad2d110c57409c5ba6e23a6cee9ce8b2fcb2ae744489ad0b099f4d49eb0d810838e737effcc230752cb6b5dccf574ca1de1e979f915b20ad8f9
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20200818-r1.ebuild b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20200818-r1.ebuild
deleted file mode 100644
index a5e52bf160e9..000000000000
--- a/sec-policy/selinux-vnstatd/selinux-vnstatd-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="vnstatd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vnstatd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20190201-r1.ebuild b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20200818-r2.ebuild
index 8177e6533ae0..76761a09f5ca 100644
--- a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-vnstatd/selinux-vnstatd-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="vnstatd"
diff --git a/sec-policy/selinux-vnstatd/selinux-vnstatd-9999.ebuild b/sec-policy/selinux-vnstatd/selinux-vnstatd-9999.ebuild
index a96ef5b2ccad..29b6c095a650 100644
--- a/sec-policy/selinux-vnstatd/selinux-vnstatd-9999.ebuild
+++ b/sec-policy/selinux-vnstatd/selinux-vnstatd-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="vnstatd"