gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-lircd/Manifest b/sec-policy/selinux-lircd/Manifest
index 26769a8c0035..da145c5c5dc6 100644
--- a/sec-policy/selinux-lircd/Manifest
+++ b/sec-policy/selinux-lircd/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-lircd-2.20190201-r1.ebuild 277 BLAKE2B 852848ab60d1bad38c4fb2e0747e2e964fcf7a96dfcbf648b7c509f817bf5cdfa6794297abbc2896a104eb7034314c302520e081428bf97b7b8a9e447a0311a8 SHA512 126f27e675494be8dd61f06ecf7e0e4ddb95aee4b0878030d6858ea69e59e247abafda271d1a1cfeaf400025ba24596131d4dfd7e916c160e3c76465289c0756
 EBUILD selinux-lircd-2.20190609-r1.ebuild 277 BLAKE2B 852848ab60d1bad38c4fb2e0747e2e964fcf7a96dfcbf648b7c509f817bf5cdfa6794297abbc2896a104eb7034314c302520e081428bf97b7b8a9e447a0311a8 SHA512 126f27e675494be8dd61f06ecf7e0e4ddb95aee4b0878030d6858ea69e59e247abafda271d1a1cfeaf400025ba24596131d4dfd7e916c160e3c76465289c0756
-EBUILD selinux-lircd-2.20200818-r1.ebuild 279 BLAKE2B a8cc6f8e0a86e33d407e7aed8e407d85be8bcf41a0a3b4d78f48bbc9aef6fc0865afa8fdf97bdc577844bdc4f26d1f0a4ba5064950abd095e5d3b5a87396f5e9 SHA512 1f0279b656ee66ee79eab21c6145e21d8a19a3d449f1a5c3e268f61630c3fefa198c3afd926ed45aaf86dd44fc8e7a3dc61d8b9a026f7b8676a8c811c61370ff
-EBUILD selinux-lircd-9999.ebuild 282 BLAKE2B 5799854e7055f7c7b2a99a48da449846a9f4dcc41feff7680ca73ef94506ba2049faaf7607117acb5cce27304dad3013b121c0589d621f8fe8ffea6c09475503 SHA512 20a0b3a22c3e3e7f80c28cde0d65690122281058f6abe4d87b35b03aa9da8ed5ee63c6b728f93f17549214867a29d0f86b877c4029d7c935c6cde1d280e10c84
+EBUILD selinux-lircd-2.20200818-r2.ebuild 277 BLAKE2B 932acb515ce33edc1bf698e32d1b1363445f4f540d6119a96393abb7b749a3fff3a081a5ba38ba5b03ad2630fec22cce0c1be2f95e2c200ab8181878555d6b8d SHA512 e120eb52f9e43f503409ac0ab38dd3c3d98d32a83665b9b457ad6a12c9260934d7613538a6a126786d29086022e49580dbe65a5a30a597ca599ff105d98ee948
+EBUILD selinux-lircd-9999.ebuild 279 BLAKE2B 695411eb852dfa55a1fe57d53b3ff638f19623ebde04ef1fc761f8e9a4ea9505e3c915ab67fdfd2623e97aa7bff01a8a062242e1cfd42b6e30d7a0de3925737b SHA512 b2c8ac56f7501968de85af913fe91026872705d6920df06ca26ee072ae820ba35f4f60ae4c5085103ef90ccb448f85f104e55ed89e760bcf23484e48b6e9860c
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-lircd/selinux-lircd-2.20200818-r1.ebuild b/sec-policy/selinux-lircd/selinux-lircd-2.20200818-r1.ebuild
deleted file mode 100644
index 7f812628b7ce..000000000000
--- a/sec-policy/selinux-lircd/selinux-lircd-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="lircd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for lircd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-lircd/selinux-lircd-2.20190201-r1.ebuild b/sec-policy/selinux-lircd/selinux-lircd-2.20200818-r2.ebuild
index 18448d3ac07f..a9a2ea3b23e8 100644
--- a/sec-policy/selinux-lircd/selinux-lircd-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-lircd/selinux-lircd-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="lircd"
diff --git a/sec-policy/selinux-lircd/selinux-lircd-9999.ebuild b/sec-policy/selinux-lircd/selinux-lircd-9999.ebuild
index b4d38f9204f1..3764549e538e 100644
--- a/sec-policy/selinux-lircd/selinux-lircd-9999.ebuild
+++ b/sec-policy/selinux-lircd/selinux-lircd-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="lircd"