gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-rpc/Manifest b/sec-policy/selinux-rpc/Manifest
index b37171dd9108..8b71aa1f666b 100644
--- a/sec-policy/selinux-rpc/Manifest
+++ b/sec-policy/selinux-rpc/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-rpc-2.20190201-r1.ebuild 273 BLAKE2B 8c205be1b6dff8d32ff74ee6c3327e2aef789a20542674ef09b72f5e0bb4bf81555c42d0fa1ed337f832c837ba462512369909ba4d08103fa0e0cf527624cf4a SHA512 4ddbf2c541995cedf12039b952e172d7f18c4c05e9e135741127d6f8ceb888269eea56ca015e4230d35fcc11634e9a2c7276a814240cb4d78bf4f9fb21ec0571
 EBUILD selinux-rpc-2.20190609-r1.ebuild 273 BLAKE2B 8c205be1b6dff8d32ff74ee6c3327e2aef789a20542674ef09b72f5e0bb4bf81555c42d0fa1ed337f832c837ba462512369909ba4d08103fa0e0cf527624cf4a SHA512 4ddbf2c541995cedf12039b952e172d7f18c4c05e9e135741127d6f8ceb888269eea56ca015e4230d35fcc11634e9a2c7276a814240cb4d78bf4f9fb21ec0571
-EBUILD selinux-rpc-2.20200818-r1.ebuild 275 BLAKE2B 1d7fca0a859b357b2115e5374816e183fceea729960eea9ef589ab3f4eb86c03bf988af1ddcbbce510222bbc3a54b33e671b6fa768fdfa6263a83241e692ee44 SHA512 b4a3a224b819129ac724d469c6cf949dae8d2a99aaa7c47027127a5dd48fb0ad1637c036ce847f892d83573a31065e7a7c41d70796468e1577df55d20d1f812f
-EBUILD selinux-rpc-9999.ebuild 278 BLAKE2B 1a4e5d6f1fde92a09772151a9a92ff8f6bcfd6244eeb386c964cafa414a713e9d21ecfdf9592c08806d3e40094f7af833c3180f5e3ba88ba2ee8c3bc98b9155b SHA512 c8eb5bf9ee5d19e0c6c45a496de656d5585ab661d8e9af823d9e5e03c952672b0b4da10b088f31188c0ec265e9d9810b7e2ca327d17084ee0ffd46cb4fa84889
+EBUILD selinux-rpc-2.20200818-r2.ebuild 273 BLAKE2B d7b8a7e5289a984388f723a7505fa04c35ea1c3956669e586bff980f687b80268ef93ece8b77c0afc80f9f9b53240a6ff49b602357cae7ccfff317528abce9e4 SHA512 c4267a4051672bf17d5f9a1fcf3acbaa301bd977024f0605329499c4d749a711ea888743f1dbcfb36b256cb6c7a78b098b3f87b4a85e9ee85d420c54a91bf929
+EBUILD selinux-rpc-9999.ebuild 275 BLAKE2B 44bd3ff40b8f8b3cef5e512e0c2d51be7c682b546226048e7c0c4f28926d2f051d93c6b905b55a9ad3fffa41586e97b8bebe0dfdd95b5bf5248a0548e2b503f8 SHA512 8e470f9bbc0f9ffea9f18974d553069d76a35a50dfdd9e4bc57b2dbd29d9bbdf3ec0cabe4ad8a0aca36189e70a3a915b39af0006846f736d9f75d21244ad7454
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-rpc/selinux-rpc-2.20200818-r1.ebuild b/sec-policy/selinux-rpc/selinux-rpc-2.20200818-r1.ebuild
deleted file mode 100644
index c86a0f6c5dd3..000000000000
--- a/sec-policy/selinux-rpc/selinux-rpc-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="rpc"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rpc"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-rpc/selinux-rpc-2.20190201-r1.ebuild b/sec-policy/selinux-rpc/selinux-rpc-2.20200818-r2.ebuild
index 2aed48d48a79..2bbd8e684bdc 100644
--- a/sec-policy/selinux-rpc/selinux-rpc-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-rpc/selinux-rpc-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="rpc"
diff --git a/sec-policy/selinux-rpc/selinux-rpc-9999.ebuild b/sec-policy/selinux-rpc/selinux-rpc-9999.ebuild
index dd191f5c475e..31ff2c711dd9 100644
--- a/sec-policy/selinux-rpc/selinux-rpc-9999.ebuild
+++ b/sec-policy/selinux-rpc/selinux-rpc-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="rpc"