gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-gitosis/Manifest b/sec-policy/selinux-gitosis/Manifest
index d94459dca526..610129c22575 100644
--- a/sec-policy/selinux-gitosis/Manifest
+++ b/sec-policy/selinux-gitosis/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-gitosis-2.20190201-r1.ebuild 281 BLAKE2B 057decd4c858bbb378d875d8eab5448457e48b7c7d3118ced6e40038301c85e1440cbbbf38211e2f3a22a9d0a6e65de991f5bdc5e4a00cced56d8fc0aaa4f949 SHA512 6bd6d0a498b3505c1cc5ee22bf2fe0d86aa9e2f44287fc689ecb5658e88ac1b66026599379bfb7431af058d206e2daec9e7d14a84725091fe7829110be301dc4
 EBUILD selinux-gitosis-2.20190609-r1.ebuild 281 BLAKE2B 057decd4c858bbb378d875d8eab5448457e48b7c7d3118ced6e40038301c85e1440cbbbf38211e2f3a22a9d0a6e65de991f5bdc5e4a00cced56d8fc0aaa4f949 SHA512 6bd6d0a498b3505c1cc5ee22bf2fe0d86aa9e2f44287fc689ecb5658e88ac1b66026599379bfb7431af058d206e2daec9e7d14a84725091fe7829110be301dc4
-EBUILD selinux-gitosis-2.20200818-r1.ebuild 283 BLAKE2B 2ebffb45292df78772d900333a7d8c0f8447878e58ae2f7917ee16715c1f80d397c9ef8a40f96df3d52f91e55a989e9b09f06ed4f9f15ad81e3e93b11fac624d SHA512 83c12fcbceefa831c96c59fa5260e4b63018314488f877acc6938b818435b23d01cc95fe1663d76b506a2c09e8f49fe366322d242f0861e4b86caa95781866ab
-EBUILD selinux-gitosis-9999.ebuild 286 BLAKE2B e10d8157035d778398d843ad45efec06e2555db024498c0e78522b66ad0877231a569d3ed3eb4e469db967227a1d31d30b82ec7c09f03e226d99e3a2a32a8018 SHA512 53654112606cd53dbf1c1feb67279e7d39558aff834d74c852e20da7ee0d762db7449b835e1b7776ce27dfaa09702594e842c41242d7b076f3d003a9b18d8094
+EBUILD selinux-gitosis-2.20200818-r2.ebuild 281 BLAKE2B 14772488ad558ed32f7c9099a1b5821188c9377095dbbfd0462b4d46cc75d1689c8f6e3e39cd2a7cf1a33617182c3a05e8d1e9690397ce62adf849bcdbd11f98 SHA512 50ecea1d34b2e0949d5ecb5fb543e2aef882f45470547e36cc299db3791ac1838474a0c0f6cb6cbfc10bbeb579d8604e382ed6745c8a7efb3c99dd7e50f13ce7
+EBUILD selinux-gitosis-9999.ebuild 283 BLAKE2B 53ced8f9cfabdef650099faf52e4d21466e8fb0c6e21778b9ed338cd079d14d417e41f0e0d64fa56f9279e094d0797dadcac4eb3cd9f70cefaa2dad63aabafb5 SHA512 0939e10d082d17e289993090c4665059461235beba401f7a620ae08eeca46b7adf22670b99427f4deb560c13e19a8830efd9455a32bb4c7130461adbf1418570
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-gitosis/selinux-gitosis-2.20200818-r1.ebuild b/sec-policy/selinux-gitosis/selinux-gitosis-2.20200818-r1.ebuild
deleted file mode 100644
index 55bdf28d1f45..000000000000
--- a/sec-policy/selinux-gitosis/selinux-gitosis-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="gitosis"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gitosis"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-gitosis/selinux-gitosis-2.20190201-r1.ebuild b/sec-policy/selinux-gitosis/selinux-gitosis-2.20200818-r2.ebuild
index d4f730fe9c1e..a6d12409641b 100644
--- a/sec-policy/selinux-gitosis/selinux-gitosis-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-gitosis/selinux-gitosis-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="gitosis"
diff --git a/sec-policy/selinux-gitosis/selinux-gitosis-9999.ebuild b/sec-policy/selinux-gitosis/selinux-gitosis-9999.ebuild
index 0f2fb118b3e1..3164d02d2c99 100644
--- a/sec-policy/selinux-gitosis/selinux-gitosis-9999.ebuild
+++ b/sec-policy/selinux-gitosis/selinux-gitosis-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="gitosis"