gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-dpkg/Manifest b/sec-policy/selinux-dpkg/Manifest
index cc3dd5455bdf..737984832268 100644
--- a/sec-policy/selinux-dpkg/Manifest
+++ b/sec-policy/selinux-dpkg/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-dpkg-2.20190201-r1.ebuild 275 BLAKE2B c496001b4e478aa7a500d8269b7d2567a0742ffdeb38d24c7bb13fc18a70563a79cfeaaab9d251e4f2fda59bf66ef2a9a7e3b5d597bcec92f10d9f1296213a72 SHA512 7a8a1f242aa525cf8e79c66124172638a3a174d2fbd0d7c9703986f636eeef1313804c6ac82f2b9dbb20b71db4cc7753860039e146390df2e8408b324a3e02ec
 EBUILD selinux-dpkg-2.20190609-r1.ebuild 275 BLAKE2B c496001b4e478aa7a500d8269b7d2567a0742ffdeb38d24c7bb13fc18a70563a79cfeaaab9d251e4f2fda59bf66ef2a9a7e3b5d597bcec92f10d9f1296213a72 SHA512 7a8a1f242aa525cf8e79c66124172638a3a174d2fbd0d7c9703986f636eeef1313804c6ac82f2b9dbb20b71db4cc7753860039e146390df2e8408b324a3e02ec
-EBUILD selinux-dpkg-2.20200818-r1.ebuild 277 BLAKE2B 263b606cbd53cfc2fcfa3fbe1bcb2b37bbaa71496c1af475905ae4471a64b997b07e522c60457b301b1b56d5a10aec438c83dfbc6dc4e80c724bb6869e499c41 SHA512 9020799f26851ec094dd33daaab15ca77c05f6ffcc4c4e7462cd2cd08839c5da82b11c2fc148fb46ef4e0ac2660a42a050fcb8655cfe31dbf438e85b75d17a99
-EBUILD selinux-dpkg-9999.ebuild 280 BLAKE2B 3a8d566662c26dc656447089df6a28bf8e8ea4860ef76b1f2c01f7bebc73173f27856b2b61f90607cd3ab19748521f34d92ccb8ef05d6c69d7141f1c9710027c SHA512 0876cb2cd469995bc88989eb40166eccfb61b3478e9b80d5de82919081efa4df72b3d042f0aa29f741ecb81f63d886caa1051d9ee033d9bb5f71d090ff72747b
+EBUILD selinux-dpkg-2.20200818-r2.ebuild 275 BLAKE2B 10ae1de00f3ea0c464bc95df582306b7c7ae34e15f99288c952a526cf72c1d5de5af6734efa4b554cda4b026723a974e24437416b646c87e48cd9199d75a8b7b SHA512 05a12bdf136b34c173742b79c07a15242d45d66c4608e02c9d7b516edb75359b3e56c6ea72db0d1bbf292e5b625e65596f07232a0d92f9fd2cb867751b24672e
+EBUILD selinux-dpkg-9999.ebuild 277 BLAKE2B 5ff7042831fbdbb3d2ad6790dd55ea6b87682baa2faa5b06de0561676d840e0fe3599f46524992dc96846eec0db50b437700abe4889dac7475e832543b5af2e6 SHA512 5475fcb4c6ded8919a67d85078bcd5c706d5c8a0d007ad701cf926659743aca2a9eae518a9ffc4437a145d9e0d66b10bda83cad89f606b70b9e31585bd292fd0
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dpkg/selinux-dpkg-2.20200818-r1.ebuild b/sec-policy/selinux-dpkg/selinux-dpkg-2.20200818-r1.ebuild
deleted file mode 100644
index e6383a01db5d..000000000000
--- a/sec-policy/selinux-dpkg/selinux-dpkg-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="dpkg"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dpkg"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-dpkg/selinux-dpkg-2.20190201-r1.ebuild b/sec-policy/selinux-dpkg/selinux-dpkg-2.20200818-r2.ebuild
index 89cab8ca4b66..a7f4d12e8487 100644
--- a/sec-policy/selinux-dpkg/selinux-dpkg-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-dpkg/selinux-dpkg-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="dpkg"
diff --git a/sec-policy/selinux-dpkg/selinux-dpkg-9999.ebuild b/sec-policy/selinux-dpkg/selinux-dpkg-9999.ebuild
index 0458ecafbca5..0b7e42ea07c4 100644
--- a/sec-policy/selinux-dpkg/selinux-dpkg-9999.ebuild
+++ b/sec-policy/selinux-dpkg/selinux-dpkg-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="dpkg"