gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-canna/Manifest b/sec-policy/selinux-canna/Manifest
index 375cc6197d04..5e65a9c36791 100644
--- a/sec-policy/selinux-canna/Manifest
+++ b/sec-policy/selinux-canna/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-canna-2.20190201-r1.ebuild 277 BLAKE2B ba4a0f5feca81ff65396644d0768a2a1570f82d4b5efe266b730ac55b3638576cfe82578795a523731f624f844d99a8e474e1760aee8a63854fda6a240d88db7 SHA512 f6d5540280fae2b93df3ca211b4e540adadaea14e9ba100c6e35cd67bc8e1d85cfbc0e18ec60c84bf1f550740a2db514c8a0183185f26133ce3b51e53c09704b
 EBUILD selinux-canna-2.20190609-r1.ebuild 277 BLAKE2B ba4a0f5feca81ff65396644d0768a2a1570f82d4b5efe266b730ac55b3638576cfe82578795a523731f624f844d99a8e474e1760aee8a63854fda6a240d88db7 SHA512 f6d5540280fae2b93df3ca211b4e540adadaea14e9ba100c6e35cd67bc8e1d85cfbc0e18ec60c84bf1f550740a2db514c8a0183185f26133ce3b51e53c09704b
-EBUILD selinux-canna-2.20200818-r1.ebuild 279 BLAKE2B ab9709d1b40b37490866e5944cb4c2cea7854d2176268ef6f2376546a8c98159f33492879badf5cc1f6e3630ba6ac0c4791f7041f78011bad6c439ab0d5f2224 SHA512 de3e4dcb62ea8f81862e2333a9f9c7af8e2a43051e813d459969818c9390a5e2c87e133d881ee2f139a265f927166893988994f725b2a30d253dadcc0bfb5928
-EBUILD selinux-canna-9999.ebuild 282 BLAKE2B cd6c33c5d85f105506462f16f427bff4f23a36bb6c7a42f4450c6e6dd93cb4fdf0e8e10e1b4ff9afe3556575c94af075b390dd12a4a4651b541a36d83a825a61 SHA512 3611c6a33c1bbbcfea8aeaa63e43e0dff5c39409fcbac66b33cff84ffd95a75078416de12c2c383b0b57a7c927dc4d77c5481105b8c9c35e5b3613e86aaa5df8
+EBUILD selinux-canna-2.20200818-r2.ebuild 277 BLAKE2B 0047b94d9a6f864af1b369bc89f65f231a3082c2c9271510f84036f403669f589aa82a83ad6943e32841537f8b411d3467b47902b1fb89ceb3043685d35b5e9c SHA512 3ecac05039e83fdf95dee58f266d86749fcfded69b2e8abecd48477140f66d65e10a95b4498b09e79751718c9ca339ca5529f0f9fcd15fd0ed7feae7c363c6f2
+EBUILD selinux-canna-9999.ebuild 279 BLAKE2B c0edd018de1cf7554e6b9d3718fb2770559fa1208525f661d9de4a8a7b2a1301e900d80dc10b238a6d813b4528fe039d99f4aa4ca5d5b076d3081c84d717b10b SHA512 29a69d5b7daae0d35c2271cdfedf402b7d2da5731689acf57db031ba17f7c7ff1f5e571bb15cf7ded6a45c520d468791b2fc2c378e7a50f9fafb0456d2ae47c6
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-canna/selinux-canna-2.20200818-r1.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20200818-r1.ebuild
deleted file mode 100644
index ccadae58f655..000000000000
--- a/sec-policy/selinux-canna/selinux-canna-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="canna"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for canna"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-canna/selinux-canna-2.20190201-r1.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20200818-r2.ebuild
index 52fa0b1fa258..979e0754ce93 100644
--- a/sec-policy/selinux-canna/selinux-canna-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-canna/selinux-canna-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="canna"
diff --git a/sec-policy/selinux-canna/selinux-canna-9999.ebuild b/sec-policy/selinux-canna/selinux-canna-9999.ebuild
index 33f018f5f6ce..24bbb521f96a 100644
--- a/sec-policy/selinux-canna/selinux-canna-9999.ebuild
+++ b/sec-policy/selinux-canna/selinux-canna-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="canna"