gentoo resync : 14.12.2020

4 files changed, 6 insertions, 30 deletions

diff --git a/sec-policy/selinux-pan/Manifest b/sec-policy/selinux-pan/Manifest
index 31cf35e088c8..c183b3a6faf0 100644
--- a/sec-policy/selinux-pan/Manifest
+++ b/sec-policy/selinux-pan/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-pan-2.20190201-r1.ebuild 371 BLAKE2B 02c3cfd92d4e428f1a938bf2eb48fb4b9bf2e9abe07e46a389bb0111d415877e5883d88cbb426f9bfd7ef221074fc1f541353f265704a6e33d06af3f023bf2cb SHA512 589774156f482267066ce616f33b69880a9ac44de8d881ad2bcde80c87e969912e09e4eaeb5b87611106d68a8b8f08c823f1c6e90820ad058b1f032ede3064fd
 EBUILD selinux-pan-2.20190609-r1.ebuild 371 BLAKE2B 02c3cfd92d4e428f1a938bf2eb48fb4b9bf2e9abe07e46a389bb0111d415877e5883d88cbb426f9bfd7ef221074fc1f541353f265704a6e33d06af3f023bf2cb SHA512 589774156f482267066ce616f33b69880a9ac44de8d881ad2bcde80c87e969912e09e4eaeb5b87611106d68a8b8f08c823f1c6e90820ad058b1f032ede3064fd
-EBUILD selinux-pan-2.20200818-r1.ebuild 373 BLAKE2B 56a7b1bb53f9d4d03aedc8140ab64523ffa34d9664d7d109645f3d2bb6e2d8d369a846270293b6a43356102084d3733855b06343e10b40e1a93e00020df2ed8a SHA512 90abb7eb1008b8ca96acc3d50b53157241c5151a492e316231994f6d538ba29aa5aa29f25547f4732b048723813a708c9ab24985befa819a21a0134623c058d5
-EBUILD selinux-pan-9999.ebuild 376 BLAKE2B e23435e0a3c0f4b938459b37600c2cb4ed1b3b9f47e7f77946c517f36d700ebd2dc3a3d0ac683f43b04c831b87cf0e96879d0e23f0abdeaca8cd4ed36ef762b6 SHA512 582e855b3f35d5d2a54c44c09bc6ddda6de6547473e6aba04d6d1f6852c1524d6ce3e8c381e843979d5d3a8feb0bb7cf5f63e5578df3f4cb24fc55d002a270c4
+EBUILD selinux-pan-2.20200818-r2.ebuild 371 BLAKE2B 30ec05241cc74a2360bb21a579d1b28bc7fcab44ece47b330d3260959b7ed48b5691678170a8b5dc9a1f80f44525d387016b8b60d756af526047c98444363c84 SHA512 506703f1861acdc25f9a1df1e3328d89f1c4aee96b0df181cfbeafecedae228c8d3c76a38c38a3ca34b9149398e8341a87b68e8051eb267c8a0eb8d21320c4f2
+EBUILD selinux-pan-9999.ebuild 373 BLAKE2B a2923b44179d22a9a5280b7a4903add6e43dc066fc812c398c25ed8f2bd404b8ced66397a764c7e6c0bc5b0a8b5d1add5ddb9c26afe6a720f0f2bebf4db8fb9d SHA512 58f2aefaa99d920fa1acb5f0b814023bbcf54c2c8f9efb1ae63e379571cd5cd7de6a421b747fd40aedd366b0081f68f2d8ef40c178aec2e5c1504777362e07d7
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-pan/selinux-pan-2.20200818-r1.ebuild b/sec-policy/selinux-pan/selinux-pan-2.20200818-r1.ebuild
deleted file mode 100644
index 1503c2593652..000000000000
--- a/sec-policy/selinux-pan/selinux-pan-2.20200818-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pan"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pan"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-pan/selinux-pan-2.20190201-r1.ebuild b/sec-policy/selinux-pan/selinux-pan-2.20200818-r2.ebuild
index 80eb12670a63..949af67d3749 100644
--- a/sec-policy/selinux-pan/selinux-pan-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-pan/selinux-pan-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="pan"
diff --git a/sec-policy/selinux-pan/selinux-pan-9999.ebuild b/sec-policy/selinux-pan/selinux-pan-9999.ebuild
index c9aa8c17ed05..57ca32e1c066 100644
--- a/sec-policy/selinux-pan/selinux-pan-9999.ebuild
+++ b/sec-policy/selinux-pan/selinux-pan-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="pan"