gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-tmpreaper/Manifest b/sec-policy/selinux-tmpreaper/Manifest
index 133a381f1be0..1fa5a60d6741 100644
--- a/sec-policy/selinux-tmpreaper/Manifest
+++ b/sec-policy/selinux-tmpreaper/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-tmpreaper-2.20190201-r1.ebuild 285 BLAKE2B b998e327d8e1f53f3fbce83c5ba041de9ab5f1cbcdde61a98d443cc1e6a21fe543091383d0c1dfd724119aa23c5e3a55e726a774ced10c2d9a64b7d26857dec8 SHA512 53b9bd46e7619c6988c3001ba03c098cd487b49cbbbf3df1d022fc0a48c88da5f6f33f5095b1f0cb6c80ef96e0145ef94e59983701b0d949e8e2623905540aff
 EBUILD selinux-tmpreaper-2.20190609-r1.ebuild 285 BLAKE2B b998e327d8e1f53f3fbce83c5ba041de9ab5f1cbcdde61a98d443cc1e6a21fe543091383d0c1dfd724119aa23c5e3a55e726a774ced10c2d9a64b7d26857dec8 SHA512 53b9bd46e7619c6988c3001ba03c098cd487b49cbbbf3df1d022fc0a48c88da5f6f33f5095b1f0cb6c80ef96e0145ef94e59983701b0d949e8e2623905540aff
-EBUILD selinux-tmpreaper-2.20200818-r1.ebuild 287 BLAKE2B b08a3b66ff4db3f7f3462ccaaf9734736c5ee55b645098190aaa8a9887431b909822a86d02293287f5e086a267162a8d8936b5e36841ec484ecb7e1fdaa172c6 SHA512 f61fe5b25af0603df4bc822061bfa4a57f8e76b0778945d65dba14a93fd4cf248327b69e49effbd89897d25937353c818abc3b727585328546c1724a59481270
-EBUILD selinux-tmpreaper-9999.ebuild 290 BLAKE2B 2527649cf5a2ad0d5605c95c96cbaddefc09e0d5e3a8badaee01c93f607e47845d98925637f941cdd1ed50abb68b7647904f3fcbc9055b37b66c56b57f0c47d4 SHA512 c4a045e537c99a55553d4f0dcaaed5d9eb12050e1898ca9192b929663bded2d65c1b0201bbfa4f241df979eb827556e3366053368155b89a2bf7a571fc977fa9
+EBUILD selinux-tmpreaper-2.20200818-r2.ebuild 285 BLAKE2B 8feea21f5a5b89dea886263ac59dab3b577d5e66bf6c6aeb7eed8123caab7103d455dfbeca9f15fe9a8e1ff13a3a41ee52b030e395f6d08653b9e417752758dc SHA512 198cfa8468af3539bd7f21c9f16112d7c900018bff46bc345bc0757850104e4221e39d5ee14e90ccd29c3ca3a2690c97815f8174493ca43a9ffef3a2e850e2b7
+EBUILD selinux-tmpreaper-9999.ebuild 287 BLAKE2B 7739b39729eda6e56928f6f3f9f951fa87984373a57dcd0931e889c64600d44d5c377426372f48fb50e56f34c368d9f1f3a40d8dc37e0abdeee0887bd04d058c SHA512 8c0c10c2b9ce53f234e8af142eb1ad1617d7d37216310096c46bde4ddc146a8b4493745e6704a3ec7e903b0ba8d326e045c86a888dcd0323a8c80707be34157b
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20200818-r1.ebuild b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20200818-r1.ebuild
deleted file mode 100644
index 5d7d6467c65c..000000000000
--- a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-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="tmpreaper"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tmpreaper"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20190201-r1.ebuild b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20200818-r2.ebuild
index e26c0cf53352..66151d0f5673 100644
--- a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-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="tmpreaper"
diff --git a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-9999.ebuild b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-9999.ebuild
index 49add2559ade..361bc61955ee 100644
--- a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-9999.ebuild
+++ b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-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="tmpreaper"