gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-ircd/Manifest b/sec-policy/selinux-ircd/Manifest
index 09ed0c3194f5..84f20ca3e211 100644
--- a/sec-policy/selinux-ircd/Manifest
+++ b/sec-policy/selinux-ircd/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-ircd-2.20190201-r1.ebuild 275 BLAKE2B f335e64c99275fef0725c372b4e90350ab8bdb2bfa52fe30a72e2f4d3c807338837d77a470e904311cda56ec8808e6252ee8a06391f227dce10c5697828d08db SHA512 5a1fc8777494f4fcb021c1e0ff844175c9068d1409dd94adf87620e44f6c8a832a637aa75164cf20aa554f3d386aac0233dd5a07b4eb405148e214a9c0279e44
 EBUILD selinux-ircd-2.20190609-r1.ebuild 275 BLAKE2B f335e64c99275fef0725c372b4e90350ab8bdb2bfa52fe30a72e2f4d3c807338837d77a470e904311cda56ec8808e6252ee8a06391f227dce10c5697828d08db SHA512 5a1fc8777494f4fcb021c1e0ff844175c9068d1409dd94adf87620e44f6c8a832a637aa75164cf20aa554f3d386aac0233dd5a07b4eb405148e214a9c0279e44
-EBUILD selinux-ircd-2.20200818-r1.ebuild 277 BLAKE2B 1d9465b1cc1c59a9070d47938467e409e78bd6b5db45090195eabd9c538471b5a473b8994ab76cc1eefb99f753a1986c24a07f01ffdbd671049d12d1ce13d2bd SHA512 7fdc775e664cecb066d4434962b55a1e646596830d7f4525c3104e3dcbfbb3bb0355413b3ea5dfd52721b10f8030f6e0d750e06257ed74984e83fa68b310aa3a
-EBUILD selinux-ircd-9999.ebuild 280 BLAKE2B cf7f4d5b7138cf936a61079de60ebcd2fc0d0aa2ca96907f6ec86e652c2b93096fd33f5997dd45e39020c142e992eba4ca2f311e6ed87273a59f79aac6448c38 SHA512 67f6d19ef77ef464d85c5ecb78f5e6e94805ed78b37d9e77818735406d9e7a29382c5a933848ba549acc5a435af1a0ac68068d34547f1e245e06b2362c994268
+EBUILD selinux-ircd-2.20200818-r2.ebuild 275 BLAKE2B 758dd9053b89cdda1fefed05b6b3eb091e2c392d3ea3791db6e4c5ab0aabe0ec4aae4d0960a281421971a13c8f7794ba822442327b17e656930439c0160cd2bf SHA512 04cd17dd5c71ea25d7150573e0af48a30240300d48d87dd770dfd5c69272ab1adfbc699c87db0262eb392473867e5013f698565f87c9fcd154253b722594e2b6
+EBUILD selinux-ircd-9999.ebuild 277 BLAKE2B 9e3a0ad19cf6e73b1f17ddc1ae7e2512a98ba22b985e8562d59ff017439ca857ce54d1b4b306e4842d3e127dcf12a0a8b4061560df3bb0af8a5d3e8fcdf08dde SHA512 def9e90a5298f360f96113ebfb54f1d554ebf03daf02ea97f3b4095a0a60bc662d83736b7f2eb6f2080d44bb0dcb8d23aee1ce8fc86e86d6ed7d9d5971f32edc
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ircd/selinux-ircd-2.20200818-r1.ebuild b/sec-policy/selinux-ircd/selinux-ircd-2.20200818-r1.ebuild
deleted file mode 100644
index 385bb8893073..000000000000
--- a/sec-policy/selinux-ircd/selinux-ircd-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="ircd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ircd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-ircd/selinux-ircd-2.20190201-r1.ebuild b/sec-policy/selinux-ircd/selinux-ircd-2.20200818-r2.ebuild
index 99d5126c869e..d9a2206bb6d9 100644
--- a/sec-policy/selinux-ircd/selinux-ircd-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-ircd/selinux-ircd-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="ircd"
diff --git a/sec-policy/selinux-ircd/selinux-ircd-9999.ebuild b/sec-policy/selinux-ircd/selinux-ircd-9999.ebuild
index 1b5dc73ec5b9..aed8e3618371 100644
--- a/sec-policy/selinux-ircd/selinux-ircd-9999.ebuild
+++ b/sec-policy/selinux-ircd/selinux-ircd-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="ircd"