gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-samba/Manifest b/sec-policy/selinux-samba/Manifest
index 7b2ac3fea048..9e718532b22b 100644
--- a/sec-policy/selinux-samba/Manifest
+++ b/sec-policy/selinux-samba/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-samba-2.20190201-r1.ebuild 277 BLAKE2B 88cb059e3026443d8403aecaff9ee2f6a7de5955215f690e1bb33ee625bda84728120565c119a6f95a1568d32c08f5cdcf45ceb35c68236293a516340e6ea0bf SHA512 c03c9efec2e6ec01a3875f0d1e4cd82fecc2d816504b6f440aada9c060118d8ec4ace7a432fbd7272fcdc5afecdabe1a2af19dee78618ff259bd2f6a823191f5
 EBUILD selinux-samba-2.20190609-r1.ebuild 277 BLAKE2B 88cb059e3026443d8403aecaff9ee2f6a7de5955215f690e1bb33ee625bda84728120565c119a6f95a1568d32c08f5cdcf45ceb35c68236293a516340e6ea0bf SHA512 c03c9efec2e6ec01a3875f0d1e4cd82fecc2d816504b6f440aada9c060118d8ec4ace7a432fbd7272fcdc5afecdabe1a2af19dee78618ff259bd2f6a823191f5
-EBUILD selinux-samba-2.20200818-r1.ebuild 279 BLAKE2B e0b9ef24123c6191a12c3270383bcdeb90e6357c3744db79f58a15a5e70a02e3de3c35ef79268fb10b30dd6c2bf21e1b820065fac6e50bc5f55d30eab451028e SHA512 bfdf6d8a31d0de1037ef8aedb6d68d32e7928bc9006e1d804590bf72d2b941abb477cff9611dc0eab6895205ef569e5d91511687e00c792139a9e6efaebf7806
-EBUILD selinux-samba-9999.ebuild 282 BLAKE2B 3a7ab80a82719f320747810475b6eab63e1929215dbb7e95ef0a939de8c96a75fff45d61ebc0ef07f30a5c7ef75d994a60336bc369e62695e792b42189c887a6 SHA512 138863489e7fbe35ea4d2ae523e871786e0376ea7349453ee6d630e37f11b6a0e564a1fe50a5c620bcb57ae08bbdf584ce48101facb1d0b4942d5a286ff4fb3e
+EBUILD selinux-samba-2.20200818-r2.ebuild 277 BLAKE2B 412f5d0441f1998d4fa5cfab9d104abd3731a4187aa5f24742cbce55fa664de2cfd6abb6cd237859fa0726dae37e13bb93f23423c0e981ad43cf4dacb845f482 SHA512 6f681d2b1f8163450cb8c1aa7be74cda16ca3f9e388f2c59e8cf31bfa45b2b6500ad53b205b09fdd7b9d9451c9418eae136612d42f08cd167586da116cb0c9da
+EBUILD selinux-samba-9999.ebuild 279 BLAKE2B f23c8083af072087c0f4ffccd69da914dfc2c7ea3200e5852666f54b6250c09dc547ae9af0db57d054e06f720c9a0c09094ecce6114433dba6d5a3c6f3e809ec SHA512 39a87253f4454079cbef14b255c52701e645a120fd9253cd5ec900e11f7aa98612abd3c8ca0ec8d61c7c47b8a151b719fb01f30743be63fc04a949a6b54a7f81
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-samba/selinux-samba-2.20200818-r1.ebuild b/sec-policy/selinux-samba/selinux-samba-2.20200818-r1.ebuild
deleted file mode 100644
index 813642665e2c..000000000000
--- a/sec-policy/selinux-samba/selinux-samba-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="samba"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for samba"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-samba/selinux-samba-2.20190201-r1.ebuild b/sec-policy/selinux-samba/selinux-samba-2.20200818-r2.ebuild
index 618fd14b6b47..f342cba497eb 100644
--- a/sec-policy/selinux-samba/selinux-samba-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-samba/selinux-samba-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="samba"
diff --git a/sec-policy/selinux-samba/selinux-samba-9999.ebuild b/sec-policy/selinux-samba/selinux-samba-9999.ebuild
index 3ab5f4c3c662..de6aa52f30be 100644
--- a/sec-policy/selinux-samba/selinux-samba-9999.ebuild
+++ b/sec-policy/selinux-samba/selinux-samba-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="samba"