gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-imaze/Manifest b/sec-policy/selinux-imaze/Manifest
index ca2fe16f4d84..b40c319741c8 100644
--- a/sec-policy/selinux-imaze/Manifest
+++ b/sec-policy/selinux-imaze/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-imaze-2.20190201-r1.ebuild 277 BLAKE2B 7dc82ed9d231fb6f5afb19dfa77c051719729809121f752176c814634b9f138d56081c1043222b34ab6034e6a43bb94fb293435821de2faf33d4c87eb93a273d SHA512 f0fa13de0b73d546b8facb83cffac195eef84e9de9b2544b86dfec3afdb44b869a64e16d9fc2ca8ce7f97de15218f4e1de8955a88d4a88942d6a35a7c4cdefb5
 EBUILD selinux-imaze-2.20190609-r1.ebuild 277 BLAKE2B 7dc82ed9d231fb6f5afb19dfa77c051719729809121f752176c814634b9f138d56081c1043222b34ab6034e6a43bb94fb293435821de2faf33d4c87eb93a273d SHA512 f0fa13de0b73d546b8facb83cffac195eef84e9de9b2544b86dfec3afdb44b869a64e16d9fc2ca8ce7f97de15218f4e1de8955a88d4a88942d6a35a7c4cdefb5
-EBUILD selinux-imaze-2.20200818-r1.ebuild 279 BLAKE2B e1f868acc088670d6893d39eb3b1a4f1e93ab83acb59ec1ba7face0059e60b798e3b407f42c8bb59341296063224d35ffc34d0302325850125a0206bfb8b2fdc SHA512 2c1a9570034daf4c4e287984d3299ac5b744057cfd1fde21b7a9cd4db3e3a799a51a2d154e49244433b3438ca2531d7e699a87219c836fd701245bc7b61d4c6a
-EBUILD selinux-imaze-9999.ebuild 282 BLAKE2B e769ffc3484d2fb8db26b107535570a377b29458bf13eb69fcf6fa6203164b9a174c44741f0d61522fc74f0713bd23d689d2bdc7640f431415b341cab59a53bf SHA512 522efc3487450d59b5e71bb4da7d471ac9621a54609a9c11aa55942db0c3a42d718021b3f2d15dcad8583028c4130706ab2867c2d539bfb878f59cce96b8cdd1
+EBUILD selinux-imaze-2.20200818-r2.ebuild 277 BLAKE2B bbfe29f2a1505003b20bfc644e6d37bfafd5f2e87ac22b53620128f70eb19d876a4a77053bcd0b3d36fe206fede54f80626d3b9b6c2587e7c2a36d9b52cb1c47 SHA512 b8f603a0595420a3d38880f0f8a59946e02b2e6f50283a4677d73bb2847b4e16d0ddef91ccc056241c76b8e9613785f2add39bc62d8987ee72b56e71d6444b35
+EBUILD selinux-imaze-9999.ebuild 279 BLAKE2B f4162a94d6fe437ce7939b5fb8a8da2270cdadfaeb41de430cf5bb4e07aed2614b5ecd7d5d39cc5b9baf743f2cd8617474c827e8db4046194eb7246289831a57 SHA512 e17ab983062152aaf952bfe5f1bfdba576a50b9b9a55f7a1bd7c816945883a1f835bd1dfea161203db206ded343b0a596af882a480813cc5e6051ea152978116
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-imaze/selinux-imaze-2.20200818-r1.ebuild b/sec-policy/selinux-imaze/selinux-imaze-2.20200818-r1.ebuild
deleted file mode 100644
index 8433c4916828..000000000000
--- a/sec-policy/selinux-imaze/selinux-imaze-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="imaze"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for imaze"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-imaze/selinux-imaze-2.20190201-r1.ebuild b/sec-policy/selinux-imaze/selinux-imaze-2.20200818-r2.ebuild
index 489648ba6142..2755f22ebae7 100644
--- a/sec-policy/selinux-imaze/selinux-imaze-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-imaze/selinux-imaze-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="imaze"
diff --git a/sec-policy/selinux-imaze/selinux-imaze-9999.ebuild b/sec-policy/selinux-imaze/selinux-imaze-9999.ebuild
index 934faa978982..5986df0b9ce0 100644
--- a/sec-policy/selinux-imaze/selinux-imaze-9999.ebuild
+++ b/sec-policy/selinux-imaze/selinux-imaze-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="imaze"