gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-resolvconf/Manifest b/sec-policy/selinux-resolvconf/Manifest
index 4c4434ef1d12..5771230c4c58 100644
--- a/sec-policy/selinux-resolvconf/Manifest
+++ b/sec-policy/selinux-resolvconf/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-resolvconf-2.20190201-r1.ebuild 287 BLAKE2B 8c02f6f0b9051decf2f7d568a9416034367635b033622a2720ea9ad82de3de67e2d29d49453da993a165d992807c0e099301449050f4e59a349edce1e1dc6ed6 SHA512 340bab104b54af8b8ca3a0ce6dd8fc5c3ec2b30e6481fc82cd51c8b44868ce7aa175bb5716cd40e85734e780e03cb56ca00069ef0ae14e0c9db9937231c79b9b
 EBUILD selinux-resolvconf-2.20190609-r1.ebuild 287 BLAKE2B 8c02f6f0b9051decf2f7d568a9416034367635b033622a2720ea9ad82de3de67e2d29d49453da993a165d992807c0e099301449050f4e59a349edce1e1dc6ed6 SHA512 340bab104b54af8b8ca3a0ce6dd8fc5c3ec2b30e6481fc82cd51c8b44868ce7aa175bb5716cd40e85734e780e03cb56ca00069ef0ae14e0c9db9937231c79b9b
-EBUILD selinux-resolvconf-2.20200818-r1.ebuild 289 BLAKE2B 6f460f4bb4ec75a74f071e19ca670a11d4a2a36c7f918972b03e3cb375ca6236c5a8345ac63b2820ccf3703d1a865ce127e8416ed944a7f3a330bca64b6e381a SHA512 180da0b1ad85ae93d3a52ca0e6fe846e57f34473b91834b046bb473f4815a5322aff2d0c56e8e3cda980bc1209ba61ca48b54f2f9c2fc8578c944eba416e1b22
-EBUILD selinux-resolvconf-9999.ebuild 292 BLAKE2B e9255dfa570f0170534214ad71ab6d958e04b4486e38e1868b3a4f20ffcf1ad6b85a87faf71bf16b2916f88baa29f9d14d974a07f8348c34a33295dec6a88e32 SHA512 0d9703c493d70dc67bc268951856ffa8d441aa71176197725682b1e144554bffb8b138d9c7aeb92b5487e1500accef287b11fff38228109227d933af0f52b8c2
+EBUILD selinux-resolvconf-2.20200818-r2.ebuild 287 BLAKE2B 13702d52eb448e94ed7c83dd71d1be3c8b8e7cabcdfef4aacd16a47f4202dba160b76050a1f99426a9223a850163b6a6c9e364cb7fa1b281c6d2c75fdbeff4df SHA512 39dcff854cebc3350a1c319698478c2a387fdccf0b9a77b8756cc37affd58affb0630dd3e9949bed0f781c8ad3f5b6c5c1ea23b3ee7e8573d2344e6a6ff2bee9
+EBUILD selinux-resolvconf-9999.ebuild 289 BLAKE2B 1c56293418c0721eeb26d42e406bb25d5555d8fed040416d78e64079190cec5fb255ada94debb554a6f7ef236adf3b9380e247ea4052be4586d58dfebf162d44 SHA512 bb7e44e8a401944f942d62c206ac22d99f7c15ab5c614e01983e0834604344ae7ede05401e8278f44cbeaa95e8167f2640956d76b86537dcac7f29aaccbdd084
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20200818-r1.ebuild b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20200818-r1.ebuild
deleted file mode 100644
index b730467be8a2..000000000000
--- a/sec-policy/selinux-resolvconf/selinux-resolvconf-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="resolvconf"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for resolvconf"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20190201-r1.ebuild b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20200818-r2.ebuild
index 0f62bf940870..1c67b0466605 100644
--- a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-resolvconf/selinux-resolvconf-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="resolvconf"
diff --git a/sec-policy/selinux-resolvconf/selinux-resolvconf-9999.ebuild b/sec-policy/selinux-resolvconf/selinux-resolvconf-9999.ebuild
index e1fbd450a3b6..3e3eada434b4 100644
--- a/sec-policy/selinux-resolvconf/selinux-resolvconf-9999.ebuild
+++ b/sec-policy/selinux-resolvconf/selinux-resolvconf-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="resolvconf"