gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-cyphesis/Manifest b/sec-policy/selinux-cyphesis/Manifest
index 6a93964fd000..a0ad9d2180be 100644
--- a/sec-policy/selinux-cyphesis/Manifest
+++ b/sec-policy/selinux-cyphesis/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-cyphesis-2.20190201-r1.ebuild 283 BLAKE2B 14ba4a4d0ece648f0a550a0941472fd4d2d9a29d1293b6b510f264a4113881242353920f5aa95555487650043e52cdc32ff31f42e4f41dc583c7fa1bcf927782 SHA512 92a586f376ab93f8f8ab0c6893eeafedcf6ccb5ef3609ca4bd5a63dadd143dd8315453cc19371c4e69edeb9e1daab2955231dc93ba353d1f9552426b5e5065c2
 EBUILD selinux-cyphesis-2.20190609-r1.ebuild 283 BLAKE2B 14ba4a4d0ece648f0a550a0941472fd4d2d9a29d1293b6b510f264a4113881242353920f5aa95555487650043e52cdc32ff31f42e4f41dc583c7fa1bcf927782 SHA512 92a586f376ab93f8f8ab0c6893eeafedcf6ccb5ef3609ca4bd5a63dadd143dd8315453cc19371c4e69edeb9e1daab2955231dc93ba353d1f9552426b5e5065c2
-EBUILD selinux-cyphesis-2.20200818-r1.ebuild 285 BLAKE2B 2baba8f35087be47a337145d10d4159b5d448fac503f732952bd6ff9221c296db92a10f0835e979a2e17a1c3359b427fe9b02a2448c0440b4b77b3c69d71fc2d SHA512 22caaa32cc1579b9e63dcb2808511a8022b841827d47ad754899799503218e52da1b0939fabdfc4d130690970d66ab59db02f298efaa8f5901180a27bb63ee80
-EBUILD selinux-cyphesis-9999.ebuild 288 BLAKE2B 91c08b7a60d429256421706584cbe90aa9ebe0d71f23dafbb377a15281a4134b714a4a0a23274f48b09fa51135e490e89ee8e4cecd240f9646c14275847fe52f SHA512 78c064946a2f2c4f5a5235b0ddc78060163dae164a8205ba5adfec1e1c5c742ec9bbbbd81d27be86c963c0f1c5942049e14d3d6707f578959a906d00183825da
+EBUILD selinux-cyphesis-2.20200818-r2.ebuild 283 BLAKE2B 113ea5abe5f44d27382ca93067066dfbdcb4453b0ac12d0c83c4d7726aef4bb0b14f77f92b88ef57e4fee05467ef7119a3972e7316260ee3cabd716141a3649f SHA512 a7095e195de2eab48683c4b53170af1989f2d8938557f8df4ef70e332411e479bb9464ade216cb0e74e43c3217bd73050b6b90ed7541545d394469fd0b5e9f3f
+EBUILD selinux-cyphesis-9999.ebuild 285 BLAKE2B b163dcd35b595a2ede86277d9e8394bcac5dc45203d06636fb06f0e2dc831c6fdad7a9cfc18036a5a58f919ea01b480b61439858bf46e7b86a3662e792539f2e SHA512 8bb8132cf9b0eb7c211eef3c3d9f6d03ddbeade6294da2d4740a021b401864c2900415432f1f6579dfc54804f9121e59f76fd015b54ce59c230828519e1c5a99
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20200818-r1.ebuild b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20200818-r1.ebuild
deleted file mode 100644
index e14b4aacd141..000000000000
--- a/sec-policy/selinux-cyphesis/selinux-cyphesis-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="cyphesis"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cyphesis"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20190201-r1.ebuild b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20200818-r2.ebuild
index aace0ba91fa1..a469b664393e 100644
--- a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-cyphesis/selinux-cyphesis-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="cyphesis"
diff --git a/sec-policy/selinux-cyphesis/selinux-cyphesis-9999.ebuild b/sec-policy/selinux-cyphesis/selinux-cyphesis-9999.ebuild
index 4bbdb67ee7e1..f2de782a24bf 100644
--- a/sec-policy/selinux-cyphesis/selinux-cyphesis-9999.ebuild
+++ b/sec-policy/selinux-cyphesis/selinux-cyphesis-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="cyphesis"