gentoo resync : 17.02.2020

3 files changed, 21 insertions, 3 deletions

diff --git a/sec-policy/selinux-canna/Manifest b/sec-policy/selinux-canna/Manifest
index dd0b73aebac8..5fab59f6b9df 100644
--- a/sec-policy/selinux-canna/Manifest
+++ b/sec-policy/selinux-canna/Manifest
@@ -4,14 +4,17 @@ DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5
 DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST patchbundle-selinux-base-policy-2.20180701-r2.tar.bz2 320881 BLAKE2B 12382c64ff8d2acef97ae50b0285061b7f018df0d94034670696b6f19003ee9c9c4f66c711e744696e47145857fcbd577a7762fa807921b40a5366e473901687 SHA512 29453f9deb90b7f982d5a6a3161d79a8171d58d20c0e0de523347d4f1296ad3d4ed970ada0823692e8def4f21756d727628bd919802ec2b1c39087ce5d0811b0
 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 refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
 DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
+DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-canna-2.20180114-r1.ebuild 280 BLAKE2B ad564675d7be4f22a700e406a43048dbb0f9d5f781f0adcd965b1c93abc64c639d816bfd9a2c10ef7c27a78d60b8a514bb1c5b59f2e666c5c0c1465a2e1dca7d SHA512 7311537e732176504ed77322c3c95dd68deaa6edfc44cc9465a592b802fa6dba238ccd3c887c6687af9c51c89950b27c3d183a36f07d50d8d18f81b60b334502
 EBUILD selinux-canna-2.20180114-r2.ebuild 280 BLAKE2B ad564675d7be4f22a700e406a43048dbb0f9d5f781f0adcd965b1c93abc64c639d816bfd9a2c10ef7c27a78d60b8a514bb1c5b59f2e666c5c0c1465a2e1dca7d SHA512 7311537e732176504ed77322c3c95dd68deaa6edfc44cc9465a592b802fa6dba238ccd3c887c6687af9c51c89950b27c3d183a36f07d50d8d18f81b60b334502
 EBUILD selinux-canna-2.20180114-r3.ebuild 282 BLAKE2B cd6c33c5d85f105506462f16f427bff4f23a36bb6c7a42f4450c6e6dd93cb4fdf0e8e10e1b4ff9afe3556575c94af075b390dd12a4a4651b541a36d83a825a61 SHA512 3611c6a33c1bbbcfea8aeaa63e43e0dff5c39409fcbac66b33cff84ffd95a75078416de12c2c383b0b57a7c927dc4d77c5481105b8c9c35e5b3613e86aaa5df8
 EBUILD selinux-canna-2.20180701-r1.ebuild 280 BLAKE2B ad564675d7be4f22a700e406a43048dbb0f9d5f781f0adcd965b1c93abc64c639d816bfd9a2c10ef7c27a78d60b8a514bb1c5b59f2e666c5c0c1465a2e1dca7d SHA512 7311537e732176504ed77322c3c95dd68deaa6edfc44cc9465a592b802fa6dba238ccd3c887c6687af9c51c89950b27c3d183a36f07d50d8d18f81b60b334502
 EBUILD selinux-canna-2.20180701-r2.ebuild 279 BLAKE2B 6b0c677589995732543e6fd1e7c589c111eaa1260cae1d1abacd68f4abd0dfc34d1347a39f1f5458f917ec93763299060361af7910052e6baed88ca3ac799de2 SHA512 5045aee1c1687cda0b5c4ae3e33f2d772472465a10fa15c2dff0de1bfa03466e125c3bcfaffea75aa7560b66c2bd025bf00c72065d3ca186d7215216987e843b
-EBUILD selinux-canna-2.20190201-r1.ebuild 279 BLAKE2B 4307fd1baa9a8357778f4b290851ce55cb71c7ed36d5cc6851a6ce860ee39711f5ff71982378521f4f09427a89933d01d78c31e3df3240220d3b439ec634bbdf SHA512 18eb9d8284f78765dfb443177a2897c4dfd68b10dbffd80250abaf2a24da5e4743797c88133cd6b59304a2a5ddb5ff725f9c1853651a1c5bfc27a0699da9454b
+EBUILD selinux-canna-2.20190201-r1.ebuild 277 BLAKE2B ba4a0f5feca81ff65396644d0768a2a1570f82d4b5efe266b730ac55b3638576cfe82578795a523731f624f844d99a8e474e1760aee8a63854fda6a240d88db7 SHA512 f6d5540280fae2b93df3ca211b4e540adadaea14e9ba100c6e35cd67bc8e1d85cfbc0e18ec60c84bf1f550740a2db514c8a0183185f26133ce3b51e53c09704b
+EBUILD selinux-canna-2.20190609-r1.ebuild 279 BLAKE2B ab9709d1b40b37490866e5944cb4c2cea7854d2176268ef6f2376546a8c98159f33492879badf5cc1f6e3630ba6ac0c4791f7041f78011bad6c439ab0d5f2224 SHA512 de3e4dcb62ea8f81862e2333a9f9c7af8e2a43051e813d459969818c9390a5e2c87e133d881ee2f139a265f927166893988994f725b2a30d253dadcc0bfb5928
 EBUILD selinux-canna-9999.ebuild 282 BLAKE2B cd6c33c5d85f105506462f16f427bff4f23a36bb6c7a42f4450c6e6dd93cb4fdf0e8e10e1b4ff9afe3556575c94af075b390dd12a4a4651b541a36d83a825a61 SHA512 3611c6a33c1bbbcfea8aeaa63e43e0dff5c39409fcbac66b33cff84ffd95a75078416de12c2c383b0b57a7c927dc4d77c5481105b8c9c35e5b3613e86aaa5df8
 MISC metadata.xml 315 BLAKE2B 675fbadeb697d9af143ccec9b334e5f7f44effe1a0f6a05e1f05b9a5f6d763e13930c294169a8ff912f324ff463d218a0737a49b36facace2fdb4b8b07f388c5 SHA512 e769ff18487231316820a744d1567208e4ed3d329e1eb7ddabdaece562292189ac0486732261c737339d40687019319baccc52ddfa2a99b2a75cde4a4b450ee9
diff --git a/sec-policy/selinux-canna/selinux-canna-2.20190201-r1.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20190201-r1.ebuild
index 01199a47c3aa..52fa0b1fa258 100644
--- a/sec-policy/selinux-canna/selinux-canna-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-canna/selinux-canna-2.20190201-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for canna"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-canna/selinux-canna-2.20190609-r1.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20190609-r1.ebuild
new file mode 100644
index 000000000000..ccadae58f655
--- /dev/null
+++ b/sec-policy/selinux-canna/selinux-canna-2.20190609-r1.ebuild
@@ -0,0 +1,15 @@
+# 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