gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-oident/Manifest b/sec-policy/selinux-oident/Manifest
index 4c0953d07c32..cc19867e3ddd 100644
--- a/sec-policy/selinux-oident/Manifest
+++ b/sec-policy/selinux-oident/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-oident-2.20190201-r1.ebuild 279 BLAKE2B 759f3ad4d9b574d8b64804bbacfe5ed30a63fdce5b20a6ce99a1f0dd85d2bc797e817f351fcebcdabeb81814b1444d5d8f088dd32c8ee6b2cf98875da84d2a5c SHA512 10d21b8bdfedb7fbf38edd74e11e4b6fa6e7a7a6cf4355587a643a902f6d7636d319262f25b4cfded41a4771f5059e82858889a43eabb4c1097a5f30e457fe6e
 EBUILD selinux-oident-2.20190609-r1.ebuild 279 BLAKE2B 759f3ad4d9b574d8b64804bbacfe5ed30a63fdce5b20a6ce99a1f0dd85d2bc797e817f351fcebcdabeb81814b1444d5d8f088dd32c8ee6b2cf98875da84d2a5c SHA512 10d21b8bdfedb7fbf38edd74e11e4b6fa6e7a7a6cf4355587a643a902f6d7636d319262f25b4cfded41a4771f5059e82858889a43eabb4c1097a5f30e457fe6e
-EBUILD selinux-oident-2.20200818-r1.ebuild 281 BLAKE2B 727502457342c051bc476f233fcaec61ecb3a5310d267e0f1ada56a8c06fdb96723458211afe68939a244a55aa90ee52c0c4a8440f5d0c28c90da3bf24aa2845 SHA512 594b8dbb17725dec1b5111729687823f7c3995534a3a34356b7aa4dc46d976797289afaa1b98faf693fa8a37be576d846078b550101477ed627ef61fbcdfc9c8
-EBUILD selinux-oident-9999.ebuild 284 BLAKE2B 442348f25d861e4e5f31e9b4c13efc4cec2f4a65ea87ebe3920299030ac02aa79a7ff4792c0eb1653fa16daa5b276c8645063f434cfba4ce1838811b9c409185 SHA512 ecc1190e8c53f85a39c31ffb5161f13ba84cc5fd693e5dc082e24215504e1d43b52da295fffc938c386a1a5d441a05d0b850eab09fc262f2ae476b33e1246f03
+EBUILD selinux-oident-2.20200818-r2.ebuild 279 BLAKE2B 32ec04da59ebd16b9c385827ddb8e0ab2f9e959bec6766f4002ceac68c5588192644dca9601e4e879c3754e7d16adb0a525c481169ee3b71f8f062dffe68abdb SHA512 b94c867632e7efded41643ce3130bc241b60a8b9741dd093375f1a7ddc75099ccff0e7265c9cad337ed4dc11f4e3789812fba90f88e74402f91b63b45863d81e
+EBUILD selinux-oident-9999.ebuild 281 BLAKE2B 3f38477320f0b1bb82ec0b49a1214f078689be316a387cf6dd51d5f7c72558f089ed88fc29d79fe6a177d0646a971ca1c3995caef7fe4642aac39ab61afd5c47 SHA512 aca6d7fce9e283381b4109018091f4cecc92e4aa8916a0f50c37dec918dadf9c43c2065f58188da4289c67b6c3503b57f46148a28fa2ab95351a48104e1ecff0
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-oident/selinux-oident-2.20200818-r1.ebuild b/sec-policy/selinux-oident/selinux-oident-2.20200818-r1.ebuild
deleted file mode 100644
index b90e9ee9776f..000000000000
--- a/sec-policy/selinux-oident/selinux-oident-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="oident"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for oident"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-oident/selinux-oident-2.20190201-r1.ebuild b/sec-policy/selinux-oident/selinux-oident-2.20200818-r2.ebuild
index 863e0f5420bf..7c3a67501658 100644
--- a/sec-policy/selinux-oident/selinux-oident-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-oident/selinux-oident-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="oident"
diff --git a/sec-policy/selinux-oident/selinux-oident-9999.ebuild b/sec-policy/selinux-oident/selinux-oident-9999.ebuild
index 931c5f14889c..bd7abceb87bb 100644
--- a/sec-policy/selinux-oident/selinux-oident-9999.ebuild
+++ b/sec-policy/selinux-oident/selinux-oident-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="oident"