gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-ipsec/Manifest b/sec-policy/selinux-ipsec/Manifest
index 5492ac15a4d3..b5b514eb2fad 100644
--- a/sec-policy/selinux-ipsec/Manifest
+++ b/sec-policy/selinux-ipsec/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-ipsec-2.20190201-r1.ebuild 277 BLAKE2B d948c18dc4e3f96307c79918ca3cff77317087120a703a2440b5c457506880e76a51bfb33b25b08c4d86c7edeee9116fb8b58f8017669ac3e1f282bea034ac3e SHA512 36fe0a15e27ab22b1ea410e8eae5e46137b4a145a70e500cd798706dbdd08cf88f80522754866267c778b352f861258a6518e2f6a0c38f9076e5f1fbcd9aa5e1
 EBUILD selinux-ipsec-2.20190609-r1.ebuild 277 BLAKE2B d948c18dc4e3f96307c79918ca3cff77317087120a703a2440b5c457506880e76a51bfb33b25b08c4d86c7edeee9116fb8b58f8017669ac3e1f282bea034ac3e SHA512 36fe0a15e27ab22b1ea410e8eae5e46137b4a145a70e500cd798706dbdd08cf88f80522754866267c778b352f861258a6518e2f6a0c38f9076e5f1fbcd9aa5e1
-EBUILD selinux-ipsec-2.20200818-r1.ebuild 279 BLAKE2B 69f69d5321e5db91a1745ef5ca51a26a6be44a206fd5031455c98514174339376a8caaca0db96144bb971f3324387f983b10a53f7d9d04f738308dc0ae846d34 SHA512 1dbd8f4f0df77b9eb0e585fcfa613976de32bdc8329e00339107b188acad9f6678b6b11ff0bf608b3757539ddc656b8dc542ed16ce98e3f5baf0b74478c04524
-EBUILD selinux-ipsec-9999.ebuild 282 BLAKE2B 404bf2524a77692ef78785a5a75fe734a806b2e52513156149d25e2c8add33f63523f53ed5a0143ff9795d3601a94bb9d4cffe712c77c36a27b600b77907621f SHA512 a9f67a25f8dfb841c95bc89df4131a62e4c85a85c6dad63f85255c26f54d792e71c28a4e1f5dce46a276209e8b0329356b662803f3c7e0a39eed70e8de9ef2fc
+EBUILD selinux-ipsec-2.20200818-r2.ebuild 277 BLAKE2B 2e07217ac1d32f168cd51ed102bbbacd993b2be65f4c9f50bf1e5228e99bad6dcdfc3cbd0ed16efa576694ff63a7a07fec3f8b06fa566671f051ec7390a59228 SHA512 8b44090b7e160db83d66e5b10fd65aae7bf8a67c244e847a2b97f69fbf9319ed14edf56789a941b92fc8cd868397e2572b1fa0866126aa7eb4670a611b74b912
+EBUILD selinux-ipsec-9999.ebuild 279 BLAKE2B 2dfc3d1a3b4b0ece6756590c2feaf05344c2b823769b85938d1502ed031ed3f8a3c3be5bb42761cd4eb794e2bda78c7d14162db9c072d4bfbaf2a795e0f4268f SHA512 da296353bba89d675879b99fe2c8612695e8874a0ce125768a3bdb936a352efd069dc3dd5e6cb6c7de307bea63da4f3e1bc0e1a554d63d80e83c3377a2abde4f
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ipsec/selinux-ipsec-2.20200818-r1.ebuild b/sec-policy/selinux-ipsec/selinux-ipsec-2.20200818-r1.ebuild
deleted file mode 100644
index 16183a95d5ab..000000000000
--- a/sec-policy/selinux-ipsec/selinux-ipsec-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="ipsec"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ipsec"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-ipsec/selinux-ipsec-2.20190201-r1.ebuild b/sec-policy/selinux-ipsec/selinux-ipsec-2.20200818-r2.ebuild
index 5c90d6ed4a0c..ba3b529e3d79 100644
--- a/sec-policy/selinux-ipsec/selinux-ipsec-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-ipsec/selinux-ipsec-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="ipsec"
diff --git a/sec-policy/selinux-ipsec/selinux-ipsec-9999.ebuild b/sec-policy/selinux-ipsec/selinux-ipsec-9999.ebuild
index afe4efc9a73b..08627bc93fb2 100644
--- a/sec-policy/selinux-ipsec/selinux-ipsec-9999.ebuild
+++ b/sec-policy/selinux-ipsec/selinux-ipsec-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="ipsec"