gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-plymouthd/Manifest b/sec-policy/selinux-plymouthd/Manifest
index 4b2f556d5e84..6897e40c37dd 100644
--- a/sec-policy/selinux-plymouthd/Manifest
+++ b/sec-policy/selinux-plymouthd/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-plymouthd-2.20190201-r1.ebuild 285 BLAKE2B 58282aa8ea562e0d1bdc510a3cc5f80bb218d7d6b06e9c917ce282ca89cd9cfc1d7a1c45aac10913dbccf79c4d61b0848c75514a5730aee9d24233030a51b504 SHA512 f81ed583586eea182fc97f99f170e5d6534b9dc029e388dbb9c610fe178ff18d2c5cca8e944ebd9b06f8e53fdbfd9bbdbfa40c565be3b29028087b89e43e3fe5
 EBUILD selinux-plymouthd-2.20190609-r1.ebuild 285 BLAKE2B 58282aa8ea562e0d1bdc510a3cc5f80bb218d7d6b06e9c917ce282ca89cd9cfc1d7a1c45aac10913dbccf79c4d61b0848c75514a5730aee9d24233030a51b504 SHA512 f81ed583586eea182fc97f99f170e5d6534b9dc029e388dbb9c610fe178ff18d2c5cca8e944ebd9b06f8e53fdbfd9bbdbfa40c565be3b29028087b89e43e3fe5
-EBUILD selinux-plymouthd-2.20200818-r1.ebuild 287 BLAKE2B 34eae1fa3e449c554a4411e5df4e3efb6fc64d344b60930f46d7d7ffa17764c55def0312dc15acb8d7f5aa03ef67d338b7a732fa0e31ea90a21a45cc43ab7830 SHA512 893cef17e3703eb9c6aa89735eaff0facf6fbbbcb2a7bda2a972ca354a8c3a471b38215fb751bc5be3239996527c745e1312db88138bebb503276fe291563eb3
-EBUILD selinux-plymouthd-9999.ebuild 290 BLAKE2B df4dcdeb44641d9d2a139c82074bb9cc100d9c84d43a3ca3b1a4ce11be7109a3291e695b4a5e7a8a0e03d469e7870c7e6155f25da25e9e49dbd63df008edc9b8 SHA512 8054bb24381253a5edcabc539c3fe020417749c741c214e22a40cf0215632f1ec213a55b842582ab4bda38b35039c0748615cb4d9f44225ff5e2164d50d37e85
+EBUILD selinux-plymouthd-2.20200818-r2.ebuild 285 BLAKE2B 746652c9d5443c8f808c0789550d9f1e7d0361f3d1153c2bc416a0c7711d111b5f93f98e5da9c39f6273dd272a30f77cccf6aed1214682ae91fde0ad41516af5 SHA512 dabe5a014e6ef65fa22260c7abff524269b7a290143840d9f23df06e1899c6383079275ce0a22bf800a49b02bf4406a48c73169be953969a07759c17cc5bbd58
+EBUILD selinux-plymouthd-9999.ebuild 287 BLAKE2B 9ba71fb3b53f95cf1df2bd1aee6e4ba4094a7a8805286403f15c3e25fa3804c5a23ff90ecde0bf5b499c5e2700c97e7fdf06f74cef50b3e4e12e8d08bc4d5008 SHA512 7e6f7383ed0e2f37b1d9c2b0d707e5466b847c9195f75516acca973432b1aad6665e5f98ebbce97c4017fc7ee460ef17aa25d27c140037e845b1048c79f90a07
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20200818-r1.ebuild b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20200818-r1.ebuild
deleted file mode 100644
index aeb8a9ab00a4..000000000000
--- a/sec-policy/selinux-plymouthd/selinux-plymouthd-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="plymouthd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for plymouthd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20190201-r1.ebuild b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20200818-r2.ebuild
index 4d55cda939ad..38a8927a1dcb 100644
--- a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-plymouthd/selinux-plymouthd-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="plymouthd"
diff --git a/sec-policy/selinux-plymouthd/selinux-plymouthd-9999.ebuild b/sec-policy/selinux-plymouthd/selinux-plymouthd-9999.ebuild
index 241f5416f25e..72e87b241312 100644
--- a/sec-policy/selinux-plymouthd/selinux-plymouthd-9999.ebuild
+++ b/sec-policy/selinux-plymouthd/selinux-plymouthd-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="plymouthd"