gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-logrotate/Manifest b/sec-policy/selinux-logrotate/Manifest
index 67995a9e60d9..dea1958e9aba 100644
--- a/sec-policy/selinux-logrotate/Manifest
+++ b/sec-policy/selinux-logrotate/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-logrotate-2.20190201-r1.ebuild 285 BLAKE2B b82329427c598c7f05cfa390ff81cb150ab9c2f73ec550cb0d60f7a44a20cb6a573afeda058784a6147ee4435e6cfe502f0a64aea8094962945e3652a128c05e SHA512 c1102a97f3c1aecd94924c8559200f8bc419da5381f914c284616051c1a732c6320d5faa141e7c7a5d5772a3fc4d41dbfa385b82f7072955c27f1314dc98dcda
 EBUILD selinux-logrotate-2.20190609-r1.ebuild 285 BLAKE2B b82329427c598c7f05cfa390ff81cb150ab9c2f73ec550cb0d60f7a44a20cb6a573afeda058784a6147ee4435e6cfe502f0a64aea8094962945e3652a128c05e SHA512 c1102a97f3c1aecd94924c8559200f8bc419da5381f914c284616051c1a732c6320d5faa141e7c7a5d5772a3fc4d41dbfa385b82f7072955c27f1314dc98dcda
-EBUILD selinux-logrotate-2.20200818-r1.ebuild 287 BLAKE2B 2153e6bf5f5177a6990fa34849a5a739104e8ee7ab0b10f80b9afdc67b2a56a0b7685eb883ac0a2a2103b13c3204283861f076332b5fc6896f8cd84981ad9cb4 SHA512 a525fa1e017d52f8ac1e3cff848ce21e4fadc4d0e8629a650b699bb33c8a4221c39ff34ba21aed63a3d5ed7ff872cc3b0a229d461c831b396585416340725f1b
-EBUILD selinux-logrotate-9999.ebuild 290 BLAKE2B abdb8e1883eb7715bfe0dff8df18fb8cf8baa98562bea08192344ff9387e551d69cff904683146afcb98a5afda075262cf50933235cb5a69cb891c83d0bf18df SHA512 2e8ce5f999210e39bcd93e38ad8c15f41979119eb6ed0d3055e5c43d153298d67c39bb655400faaa2ae08cef5dcca3e3bc092fdee57889075c8e19c9b9f0110a
+EBUILD selinux-logrotate-2.20200818-r2.ebuild 285 BLAKE2B 50da7bbbd3c21edb0c55b0a35ba6d50b6a3c107cdae4a8ac51e7a2f0b45e0f2ca74a48f6389cea0276598cf3996566761521a5a0dd270b04b17646d0c8c4bbbf SHA512 01be468a7b3ec2f658d7244a9e70301bd7aa1334f771f2b8473c019a23d7cb2587fe0cd482433ac5f40fc9b78ec8bb329ce04c85270342cd0a9b8447cfbc2a6c
+EBUILD selinux-logrotate-9999.ebuild 287 BLAKE2B 7016bc5050cec24dba3e79c5c15936572f6920c3630d8c3d936881b470abf96b5f94279480718f8b0d6422b40a080f5c6fc2519ce1d0678931fc8381b84f040e SHA512 d7d8bb06b67c34722eeb6075d8b5f170e71a01d1589101b111c79bba7ae60a1cf311a65a42301cbc68a84d19e85e91c63bf0a740685909a9374030f065dcc40d
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-logrotate/selinux-logrotate-2.20200818-r1.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-2.20200818-r1.ebuild
deleted file mode 100644
index 43ce10056850..000000000000
--- a/sec-policy/selinux-logrotate/selinux-logrotate-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="logrotate"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for logrotate"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-logrotate/selinux-logrotate-2.20190201-r1.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-2.20200818-r2.ebuild
index 49f652b1d083..553957558399 100644
--- a/sec-policy/selinux-logrotate/selinux-logrotate-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-logrotate/selinux-logrotate-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="logrotate"
diff --git a/sec-policy/selinux-logrotate/selinux-logrotate-9999.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-9999.ebuild
index 844b28f1c301..a0a8ef93fc90 100644
--- a/sec-policy/selinux-logrotate/selinux-logrotate-9999.ebuild
+++ b/sec-policy/selinux-logrotate/selinux-logrotate-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="logrotate"