gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-inetd/Manifest b/sec-policy/selinux-inetd/Manifest
index bcf310fdca82..f06e416742d9 100644
--- a/sec-policy/selinux-inetd/Manifest
+++ b/sec-policy/selinux-inetd/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-inetd-2.20190201-r1.ebuild 277 BLAKE2B c3a2adc0b3a054b2a248d8c7156ad615c033d1f4b7264cec586e98bd0a720e2038b036e006e34d6e622bf1368281a329c47246b8dd9c877387dfbdb1f734b7b1 SHA512 f4bb5849085748d632257dc52ca1d5d760c8d4b5c6d271cd363f50ce7fd54394fd18bcb90e668218ab952f5a601979fa802ae18cb72dd0c9c601df900385a64c
 EBUILD selinux-inetd-2.20190609-r1.ebuild 277 BLAKE2B c3a2adc0b3a054b2a248d8c7156ad615c033d1f4b7264cec586e98bd0a720e2038b036e006e34d6e622bf1368281a329c47246b8dd9c877387dfbdb1f734b7b1 SHA512 f4bb5849085748d632257dc52ca1d5d760c8d4b5c6d271cd363f50ce7fd54394fd18bcb90e668218ab952f5a601979fa802ae18cb72dd0c9c601df900385a64c
-EBUILD selinux-inetd-2.20200818-r1.ebuild 279 BLAKE2B da49bfcee3136f48f2cd58f80d9f3f23fa9b47e2a9b57207ec5fe1b82cdf623711e1d0d5806c18922e4d5550bbba73b0a232ca97cca1fd61981a5fb5b454561e SHA512 65e170bdaf9f9f9fe68f4455bf96cd8e0508bbc165b9848e0a77b44c58978fc3be4465582cfdab013481604b26d16c54afcfe42e67d98c10dcf556a10781db49
-EBUILD selinux-inetd-9999.ebuild 282 BLAKE2B 82cb6096721da5d856d55449aad6fab0a4f7b2b6440effdff732562ad6e389b2d327abf5152b8ce645dc12396135e5b427f174f04e95b08824c731e4166a592b SHA512 1a6e0f73edf567dc316f7342e45b294d8103e5e3a64df8d17ba3bbe87948963f3521e5d70b5693f6da328dc097d46f578fa7fbe7cb093fd9e1a338e9f7fa84dc
+EBUILD selinux-inetd-2.20200818-r2.ebuild 277 BLAKE2B ebab356e28650f19791436ea1874b1fd608580986741cb8ad13a08b991bf8494748c762e3f8c996862ca7fb3f9f7b3de0badd78c665b8c239e4299103fd0bb0b SHA512 5922949f0415342a3f55eb7d56684a49f44806d647ed888bf1cc5c642f18848aa31dea3a7ff1339591e847951291ae3932a063b33f6b8e2e5d4acb714809eeb0
+EBUILD selinux-inetd-9999.ebuild 279 BLAKE2B 0f9e566a647902796ae0576222cc880832d62351725aa4b94a9c7860a05ba884e68371810ccb2fb0e70bd840a7377f0278181d6551194f99b96c10e4d9bbe4c6 SHA512 a51d8075640ebfda9d00616ef06acf98f3367cc12f692a1c9ae21f830cc42c05138bb3a7160062792746c9adcc40ee3cda5165e7d0540fefae1801f57554ff7f
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-inetd/selinux-inetd-2.20200818-r1.ebuild b/sec-policy/selinux-inetd/selinux-inetd-2.20200818-r1.ebuild
deleted file mode 100644
index ec96842d35b6..000000000000
--- a/sec-policy/selinux-inetd/selinux-inetd-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="inetd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for inetd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-inetd/selinux-inetd-2.20190201-r1.ebuild b/sec-policy/selinux-inetd/selinux-inetd-2.20200818-r2.ebuild
index fede958e81a4..62ffe4b33aa0 100644
--- a/sec-policy/selinux-inetd/selinux-inetd-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-inetd/selinux-inetd-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="inetd"
diff --git a/sec-policy/selinux-inetd/selinux-inetd-9999.ebuild b/sec-policy/selinux-inetd/selinux-inetd-9999.ebuild
index 9330c3d1d3ae..894083a71254 100644
--- a/sec-policy/selinux-inetd/selinux-inetd-9999.ebuild
+++ b/sec-policy/selinux-inetd/selinux-inetd-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="inetd"