gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-entropyd/Manifest b/sec-policy/selinux-entropyd/Manifest
index 06f640ddfce0..f4b03e1f0d2f 100644
--- a/sec-policy/selinux-entropyd/Manifest
+++ b/sec-policy/selinux-entropyd/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-entropyd-2.20190201-r1.ebuild 283 BLAKE2B ddfaa596e04a2d4ec80e33a85f0be70f6b9fb52ff815769b80c67a09d18a85fbab4be9968d0e35194c05dc7cda86d217141c60552e9f31f52c60cf7c13db79f5 SHA512 9efe15f325bdec93833e2c532bb4fade3026c62e4121c46ee1a13014c565614fd8c459c56493734bcc05e456cb4fa81c5e1b9955c9be1f9eeb9b8d9ca0e3540f
 EBUILD selinux-entropyd-2.20190609-r1.ebuild 283 BLAKE2B ddfaa596e04a2d4ec80e33a85f0be70f6b9fb52ff815769b80c67a09d18a85fbab4be9968d0e35194c05dc7cda86d217141c60552e9f31f52c60cf7c13db79f5 SHA512 9efe15f325bdec93833e2c532bb4fade3026c62e4121c46ee1a13014c565614fd8c459c56493734bcc05e456cb4fa81c5e1b9955c9be1f9eeb9b8d9ca0e3540f
-EBUILD selinux-entropyd-2.20200818-r1.ebuild 285 BLAKE2B e580a645c4b19a136da6021f8fddc6b9b58957ed3fb9753f85897fa3b3bad6989434baa02ce6dd0a6cdffaf45cb8fab8f4c9c03f606052a8d584b2af2001e1dd SHA512 91c136cbd6bf39a1b4b8f580df811349d38a1a1124b30a759e8c455ccf3f630ba17f3cd5ddd4882878d291d99b04633384b6eeabe080ea2ab4f9cb9b69d75706
-EBUILD selinux-entropyd-9999.ebuild 288 BLAKE2B 9aa5ee3cc94ee1adfa1cc457627f6a5a367f4bb5558d4355a1e8d474d584f1c3243d238243e24f6bedc3f142ffea7d655215309696df1260c5cfc0f26143900c SHA512 e3430f2ac62898d882db2cd83bb143ba2bc942a6d0a3c4413301b01e3b2069556af7fa2bbd5808295b5cc23f68190481e3bae94b7e3f7ad29e9873b159c25564
+EBUILD selinux-entropyd-2.20200818-r2.ebuild 283 BLAKE2B dac68ea949ab1730e381dc1f1bb9c9b2f284f43aceec34e000700f03170247caf4efcec288f6c620c61f499249acdf5e0b5579f7faa62a978bcf5e4b70da85c3 SHA512 041308a4afc83c5184e050fb8559aa74fdcadb9b63fae09aa1d6b787e270c38e66d31a2261c3bd6d7c44b4e51fe854880d18609e455f13ee4a16f027ed726f65
+EBUILD selinux-entropyd-9999.ebuild 285 BLAKE2B 3f2bd1d69506dfb81df025523a6903239054c918879aac9ba6e16c639c387427d907e9309e8d8eb2968f8e2110cbdedf74eaaac062dc495729cbf5e4dcf5edca SHA512 18a3fd4af537620cb87a637dae97e9e030fec8073158f4e54d69216ace3ab68c301e4f8908b6697b59b29e67510b40b00248d11ec09819aa1754ef2d682f6508
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-entropyd/selinux-entropyd-2.20200818-r1.ebuild b/sec-policy/selinux-entropyd/selinux-entropyd-2.20200818-r1.ebuild
deleted file mode 100644
index 12207da05f25..000000000000
--- a/sec-policy/selinux-entropyd/selinux-entropyd-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="entropyd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for entropyd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-entropyd/selinux-entropyd-2.20190201-r1.ebuild b/sec-policy/selinux-entropyd/selinux-entropyd-2.20200818-r2.ebuild
index bd0339fd2955..08769b5f480a 100644
--- a/sec-policy/selinux-entropyd/selinux-entropyd-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-entropyd/selinux-entropyd-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="entropyd"
diff --git a/sec-policy/selinux-entropyd/selinux-entropyd-9999.ebuild b/sec-policy/selinux-entropyd/selinux-entropyd-9999.ebuild
index d58341e4fc36..0b8195c4c22b 100644
--- a/sec-policy/selinux-entropyd/selinux-entropyd-9999.ebuild
+++ b/sec-policy/selinux-entropyd/selinux-entropyd-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="entropyd"