gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-watchdog/Manifest b/sec-policy/selinux-watchdog/Manifest
index 4c91d029a0cd..40139477e6d7 100644
--- a/sec-policy/selinux-watchdog/Manifest
+++ b/sec-policy/selinux-watchdog/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-watchdog-2.20190201-r1.ebuild 283 BLAKE2B 1ec59d0cb22913024fcb6325490b989b79a293de1f563720d5191dcf0ad70823e59dee3296362a878f3f4b00dd2f24c805f5e07e2392018797996646f3448a9f SHA512 1312237f3a635a7fc0d2eb1553f000b7e3bdb2c485e486c308f7642ed0b609bd52ccbda5a4167faad82866fba3811e5b3ae3774b9fca1b79ba3c2e073ee40fbc
 EBUILD selinux-watchdog-2.20190609-r1.ebuild 283 BLAKE2B 1ec59d0cb22913024fcb6325490b989b79a293de1f563720d5191dcf0ad70823e59dee3296362a878f3f4b00dd2f24c805f5e07e2392018797996646f3448a9f SHA512 1312237f3a635a7fc0d2eb1553f000b7e3bdb2c485e486c308f7642ed0b609bd52ccbda5a4167faad82866fba3811e5b3ae3774b9fca1b79ba3c2e073ee40fbc
-EBUILD selinux-watchdog-2.20200818-r1.ebuild 285 BLAKE2B e5d8dc68d4f3b87779d0a5ed821c985c027c201de0f864b2293f7226f8fec60e78641cee9a34a7b5bcb727ca666b16f9460c95c650cd1e96cdac94dab72d278a SHA512 40821b8d2042523d109af8cd934d149e728bd0a7f83cd0a443ca4046172463aabdf99a2db73c28a2537882e686608821c3aff3402bc9e98a841e8561a03b1dc1
-EBUILD selinux-watchdog-9999.ebuild 288 BLAKE2B de80008069876fd138ec3e1a5a0aa91f238e142493c32efc6432c5d26b2af6b19bfff1e2de6fd63f1752cdb71bb690c978880deee8b046c28cbd596487966ef5 SHA512 c16cd886fa663552ab8e55b53c719b722fb4067549fad0951b176953b6d50465290aec20a1128e4a554980ad923b240417e890a1068d1812bf3045a7f034a4a1
+EBUILD selinux-watchdog-2.20200818-r2.ebuild 283 BLAKE2B d8ec0478e5492c5ba7e0bad61c1afeca29ff3dbd9472c8abfc154ad83c2b4aa6970cae7dc9b786ecc63fc874da5f25208e66481d629e1b186dd05b5d5c92b64b SHA512 594e6624f390f7e160a016be3133c3f3c81b9b345d6eca756b7f1a63b2dc00ff88359c89573209b2ca2ef36e5cdedd38469d15fdf236287da3309d11e60978b3
+EBUILD selinux-watchdog-9999.ebuild 285 BLAKE2B 57aeab4c284bf4cbbaf8f5fc951ab29e4c42aaf064d82661d63b2f47abb786b8b682b5eae2f3e8325781f135d2ae17d091b07083b1dd65ebffc5310a125e12b6 SHA512 078443d77bae3115599cb4d9a54666927d65ea1e14a122dd2407aeb35b105880f318853b3751ba684f8ab3e717010e9bcb52b8f4237ca196c8c27e03d2e0d44d
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-watchdog/selinux-watchdog-2.20200818-r1.ebuild b/sec-policy/selinux-watchdog/selinux-watchdog-2.20200818-r1.ebuild
deleted file mode 100644
index faf0a41094b2..000000000000
--- a/sec-policy/selinux-watchdog/selinux-watchdog-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="watchdog"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for watchdog"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-watchdog/selinux-watchdog-2.20190201-r1.ebuild b/sec-policy/selinux-watchdog/selinux-watchdog-2.20200818-r2.ebuild
index c86a01682697..91ac8b9818b6 100644
--- a/sec-policy/selinux-watchdog/selinux-watchdog-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-watchdog/selinux-watchdog-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="watchdog"
diff --git a/sec-policy/selinux-watchdog/selinux-watchdog-9999.ebuild b/sec-policy/selinux-watchdog/selinux-watchdog-9999.ebuild
index 3bf64e50b5ac..9b76517076a3 100644
--- a/sec-policy/selinux-watchdog/selinux-watchdog-9999.ebuild
+++ b/sec-policy/selinux-watchdog/selinux-watchdog-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="watchdog"