gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-sxid/Manifest b/sec-policy/selinux-sxid/Manifest
index d283c2faf914..9e3a873c622c 100644
--- a/sec-policy/selinux-sxid/Manifest
+++ b/sec-policy/selinux-sxid/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-sxid-2.20190201-r1.ebuild 275 BLAKE2B 68ecbc21cc4f297e1d3aebd753c1e42dd5baa06e6d759ce184f9455693593276eea223d559607af1bf5a534be2c3d307b622f2cf4e64cd31070c019db6545340 SHA512 f3068b1b9ec3413f298139d0f74c03034c903410cb093e994873c1cf6329c3035ae3b27624174fe4386c808a223cd3623fd3e342b2e104768bc22c3a94215de2
 EBUILD selinux-sxid-2.20190609-r1.ebuild 275 BLAKE2B 68ecbc21cc4f297e1d3aebd753c1e42dd5baa06e6d759ce184f9455693593276eea223d559607af1bf5a534be2c3d307b622f2cf4e64cd31070c019db6545340 SHA512 f3068b1b9ec3413f298139d0f74c03034c903410cb093e994873c1cf6329c3035ae3b27624174fe4386c808a223cd3623fd3e342b2e104768bc22c3a94215de2
-EBUILD selinux-sxid-2.20200818-r1.ebuild 277 BLAKE2B a896bcb37a4e5f8a90e058c41773541b32882b7192e14f72b11c2fb21894201b6269ffafbce3ddbb8920ceab03c352da9bd8cc060eb477ed9c3665f2adad859a SHA512 f6b2595554cdb3f5a71190342eab3e22e833f6ce4de63cef82061c041684d7303dc01602d005fc348a5815825804e27a91dca56f85dc7a6aa412e627123acb87
-EBUILD selinux-sxid-9999.ebuild 280 BLAKE2B a50df38fa8d78d9cd6c1678494b9cdbcd316405460fdb9a560923da0e7f9c5c2c4f8475c2ba95b513cf7c5eb144674c632e309ce73918b7487ede92e12814c2d SHA512 2f1bffd455c63d9392d795d50fecee3136ff9a80c2cb19d8a97d1ac2bbbe1d779f967bab6b99be838434dadb5cb996c43da80257c7a82852d31301e7fffd49bb
+EBUILD selinux-sxid-2.20200818-r2.ebuild 275 BLAKE2B f723c5fa92839dc07c022b63792c85f77f65b3e90e738062712e81c682a678db5e587774b2e11964e04f7fff78eb73457d716d3e049d81a97dada8006420f413 SHA512 85d6869a8430f8989c2774be3382a779b451abbef0dc4ea8592027f1691482c9bf848a1e7d1c9ad0a34139d81ba1afb3f2090ec1864d28253204c43ad499641c
+EBUILD selinux-sxid-9999.ebuild 277 BLAKE2B 1f9056abe8030f43b085ac1dbdf9abadb403f9a4e008a6c9a3573421ab6d2d541fe54ffba5a78807a62839394fc839ab6fa51a9fcd7a870a064eecdc36e7cd13 SHA512 aaadca31718589e0b1cd21d6951b0ae633ace044f3ac8b356f1aa01da1d0f53a01b65b24d6385ae25830f01afe4e02ed52a298f9517be8b359da45a6f2699c14
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-sxid/selinux-sxid-2.20200818-r1.ebuild b/sec-policy/selinux-sxid/selinux-sxid-2.20200818-r1.ebuild
deleted file mode 100644
index c5b9e3a423d2..000000000000
--- a/sec-policy/selinux-sxid/selinux-sxid-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="sxid"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sxid"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-sxid/selinux-sxid-2.20190201-r1.ebuild b/sec-policy/selinux-sxid/selinux-sxid-2.20200818-r2.ebuild
index 9a268614e7a5..f35d5c8b4eef 100644
--- a/sec-policy/selinux-sxid/selinux-sxid-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-sxid/selinux-sxid-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="sxid"
diff --git a/sec-policy/selinux-sxid/selinux-sxid-9999.ebuild b/sec-policy/selinux-sxid/selinux-sxid-9999.ebuild
index 73566a466c1a..985609e03795 100644
--- a/sec-policy/selinux-sxid/selinux-sxid-9999.ebuild
+++ b/sec-policy/selinux-sxid/selinux-sxid-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="sxid"