gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-logwatch/Manifest b/sec-policy/selinux-logwatch/Manifest
index 1a1dde9bc278..3fb24b20ccce 100644
--- a/sec-policy/selinux-logwatch/Manifest
+++ b/sec-policy/selinux-logwatch/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-logwatch-2.20190201-r1.ebuild 283 BLAKE2B 0621c670e01655b2b1b6c34576e87947fbed3fc98702302875f33d6343a645c9618920f36fb9749c6720722eb531bd71e7a4c53b760f4763aff39416f4ab1fbf SHA512 d4c5a2755b2f28893818da317eeae60dea900819e08f8379f09131a57717de58eb8250cb198693fd4564b300ba16fc44b8156f0e36d5a76e48419fdc03de5bbb
 EBUILD selinux-logwatch-2.20190609-r1.ebuild 283 BLAKE2B 0621c670e01655b2b1b6c34576e87947fbed3fc98702302875f33d6343a645c9618920f36fb9749c6720722eb531bd71e7a4c53b760f4763aff39416f4ab1fbf SHA512 d4c5a2755b2f28893818da317eeae60dea900819e08f8379f09131a57717de58eb8250cb198693fd4564b300ba16fc44b8156f0e36d5a76e48419fdc03de5bbb
-EBUILD selinux-logwatch-2.20200818-r1.ebuild 285 BLAKE2B 4ba2af5acd5abf9627b4e7317d2e7d39dd755d037a88503eb56e2f935ecac72199924e292f39ccfbad7d15307e193e8240356c855067c01c30596ab11db2a7df SHA512 ac03b980263951465ac3417ea7a8c0158bf3d02992b9e8f47720e48237f522937d6f80d036d1bcde21437720b6ccee5f64fa71d32e06904bfc1986f43f960e50
-EBUILD selinux-logwatch-9999.ebuild 288 BLAKE2B 248713398dc92913c32cf45e80526bfed603494a233bb4c2561ea776ef84b43215a8a1fdc6305a888a922a87c3d8c42140c6cda0b1a121b2c70f4928db9dc379 SHA512 e1abc47a1dfe5b6342894f8c5a45cb718c687aa57414086069561ce86695061c72a8ee2f717ddbd895311f0a41398971be4fca5fef269774c27385374cabed3a
+EBUILD selinux-logwatch-2.20200818-r2.ebuild 283 BLAKE2B 5f4d0e3e2d70d58328aad2d7df68213fd4ac1a8c974b81c3b9d8a403b8135ee67a59a584a3d3a33064d4f2f38ae20680cb1f650421cafd6c6ad5440620545d79 SHA512 c74bc0b4eee2c7b0e30e56e8854b0f691231bd7ca5045543da4f1a50ce1b1bafeca1979ece0a132fc9e77bfe179f92c246f3171922d46fd380b582e055d025dc
+EBUILD selinux-logwatch-9999.ebuild 285 BLAKE2B 2c1b618a91a526cc6c3a8e5eb4d2d42af793caa64f70b71618e2002b458a5db09b059cd2fcd1364f3c6e5175bbce67fecf71b2432ca1dd264a6524fd9e9a74bd SHA512 47a34a6da1b49e82a7140b93bd60329c1cc51e7719a49bebbffa37d3878432030baf40bb7e031b0c5620f7c3151fe5e88488c423a0a4e4f751eca30bfa01419f
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-logwatch/selinux-logwatch-2.20200818-r1.ebuild b/sec-policy/selinux-logwatch/selinux-logwatch-2.20200818-r1.ebuild
deleted file mode 100644
index f9b53c2ebbab..000000000000
--- a/sec-policy/selinux-logwatch/selinux-logwatch-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="logwatch"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for logwatch"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-logwatch/selinux-logwatch-2.20190201-r1.ebuild b/sec-policy/selinux-logwatch/selinux-logwatch-2.20200818-r2.ebuild
index 3a234e51c806..38ac1a5b8d5d 100644
--- a/sec-policy/selinux-logwatch/selinux-logwatch-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-logwatch/selinux-logwatch-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="logwatch"
diff --git a/sec-policy/selinux-logwatch/selinux-logwatch-9999.ebuild b/sec-policy/selinux-logwatch/selinux-logwatch-9999.ebuild
index 5e3afa99aab0..fa424b8fbd94 100644
--- a/sec-policy/selinux-logwatch/selinux-logwatch-9999.ebuild
+++ b/sec-policy/selinux-logwatch/selinux-logwatch-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="logwatch"