gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-openvpn/Manifest b/sec-policy/selinux-openvpn/Manifest
index a6561b35c8f6..bd130af7a46a 100644
--- a/sec-policy/selinux-openvpn/Manifest
+++ b/sec-policy/selinux-openvpn/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-openvpn-2.20190201-r1.ebuild 281 BLAKE2B 3901343914a202fc70b486f548eac099cce66db5f4d311fbdcae92864619588fa98e86da01c22b710ee97e85228e769db497686c56a673992392626165f138b1 SHA512 91ef7e7ab0d229f1d345e2ca3849341518ce02d46a9b4e31f1b477a08454c1d5f57adb34e7fbe0ac71e9af11649a231eb15c5901dfe5bbf7a9603b38d14db23a
 EBUILD selinux-openvpn-2.20190609-r1.ebuild 281 BLAKE2B 3901343914a202fc70b486f548eac099cce66db5f4d311fbdcae92864619588fa98e86da01c22b710ee97e85228e769db497686c56a673992392626165f138b1 SHA512 91ef7e7ab0d229f1d345e2ca3849341518ce02d46a9b4e31f1b477a08454c1d5f57adb34e7fbe0ac71e9af11649a231eb15c5901dfe5bbf7a9603b38d14db23a
-EBUILD selinux-openvpn-2.20200818-r1.ebuild 283 BLAKE2B e24fb6409fe7004584d3076bc79ed70595755950792556c46ef8a6694649e23825b8cdd4a2f40fce41c3473da9f02de9ddbeba30e5a78f888eacd8bfd312ca9c SHA512 507fd6c149240bd099bd50febcde48756e60e53bb50b5b6cf1b3aabec5414e5b6c1913c839acb0ef6b1c1f4d84a1fd65e4ff4f5b142c1ba5e477c514b9686f35
-EBUILD selinux-openvpn-9999.ebuild 286 BLAKE2B 9870b13ff62577402f2bf741e8cfc541f882e7996087e2de920b53c761ec45308e971506c7c0f1ef7abd174e99f5ac38cf6e343fc77c01112436d62d9c6b52a9 SHA512 5fb9eef8e6f7ddf9a2235a2a041bf0dcd92fba3ba96c78ec4885aa9b47670740dfa632f5bc85469e83ec7e1a02ed0bff9dd041bbed076b89a5e9cf2885472269
+EBUILD selinux-openvpn-2.20200818-r2.ebuild 281 BLAKE2B 3b47a3210de8fbddd6e73ed8d39952095e004c7a0e90746504e7cc586e7fa2e9f113c465b1025d8678cab0971c00d345c820140599760bcc04b1bacafe1299fb SHA512 e44f691e46a92aa17fc0ad0b9bc6b7613136ca3792c0a907ba787acf6f573c608f067ba6e4f336ba06010b82651567d95d42d242cce9b6615f17ea3fc87f122f
+EBUILD selinux-openvpn-9999.ebuild 283 BLAKE2B ac0a6d1f23a9cb0006aca419a9a2938035a01ce95ba40f18e5c330f5150a1e3240e7176b6accb2dd734dfd92c788050b84e3e54b61939e1e3f2eb66b7e14d0fb SHA512 88548765a8f9b91595255d11a31801d03a205cd3121b1de461592bef8b2c43a8abb6e3b0310ec68f9bb223e0974b07714a33aed88dbd18c84803ff30525e1b13
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-openvpn/selinux-openvpn-2.20200818-r1.ebuild b/sec-policy/selinux-openvpn/selinux-openvpn-2.20200818-r1.ebuild
deleted file mode 100644
index f7dcbc5e398c..000000000000
--- a/sec-policy/selinux-openvpn/selinux-openvpn-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="openvpn"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for openvpn"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-openvpn/selinux-openvpn-2.20190201-r1.ebuild b/sec-policy/selinux-openvpn/selinux-openvpn-2.20200818-r2.ebuild
index ef1d67bb9881..11e9234b109c 100644
--- a/sec-policy/selinux-openvpn/selinux-openvpn-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-openvpn/selinux-openvpn-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="openvpn"
diff --git a/sec-policy/selinux-openvpn/selinux-openvpn-9999.ebuild b/sec-policy/selinux-openvpn/selinux-openvpn-9999.ebuild
index 5814dd787ebf..a25b8e1ca22c 100644
--- a/sec-policy/selinux-openvpn/selinux-openvpn-9999.ebuild
+++ b/sec-policy/selinux-openvpn/selinux-openvpn-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="openvpn"