gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-couchdb/Manifest b/sec-policy/selinux-couchdb/Manifest
index e55fd4941b53..b81b0b7dd9f0 100644
--- a/sec-policy/selinux-couchdb/Manifest
+++ b/sec-policy/selinux-couchdb/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-couchdb-2.20190201-r1.ebuild 281 BLAKE2B d513c992867bc074159e5527a9283d624c33515c95e2a45941ae2141f6c0cedd24499dd656bbf5d8fd7af5c09d683d092ab8abc7a9834583200ba3ca28670c4a SHA512 3dcb4fe88cd1dc914e3825353dc86deefbfdcbd2910e539587c7facfc665f54395d98ac6a2432ad24bab092bff1044533da6608b78e85d59b708e9e5260037e8
 EBUILD selinux-couchdb-2.20190609-r1.ebuild 281 BLAKE2B d513c992867bc074159e5527a9283d624c33515c95e2a45941ae2141f6c0cedd24499dd656bbf5d8fd7af5c09d683d092ab8abc7a9834583200ba3ca28670c4a SHA512 3dcb4fe88cd1dc914e3825353dc86deefbfdcbd2910e539587c7facfc665f54395d98ac6a2432ad24bab092bff1044533da6608b78e85d59b708e9e5260037e8
-EBUILD selinux-couchdb-2.20200818-r1.ebuild 283 BLAKE2B f37dfb9039e9ca48ce9c02429ffd26e5ce4af6256363b8d12d6caa3fcb20bdbf8e006586bb8fc69e50d6f9f8d5e50ecc0dff46ad7efebc015f3633cc5d42d68d SHA512 df1942c430e90e5d523d2c273e5439080bbf1cc9f5d8b5e42155bb7717f54f966384d766ad7d0bdb7c9a8c77679d4116903970dd9a3dd1afe9aced15add75f68
-EBUILD selinux-couchdb-9999.ebuild 286 BLAKE2B 054274d8a44593f280c9c49236c5190fd6e321f088f8bfe00210904cc624cc64fea0c18a8f3db4a656f41c9e27453eab984db6e5b0d90f0dc63893a1b6758134 SHA512 faa851337eac4c43f3f449ae03b545ea6669ed1e7cb974855876ab8f54adf845fb7146d5b8ebe86f2efd1d9c71197edc27c058b1de6e710b9624d07df32f8a68
+EBUILD selinux-couchdb-2.20200818-r2.ebuild 281 BLAKE2B dfdb882db42a455a5cb89fc9f5951328bf66f2f17ba9324d775fbc9f16df2532597cb54d994cdbdb170621936bc0acbc4b4ca0b5dce3003cb226a1f3d12439a2 SHA512 bfd204f33b2a12f16b561aa1b1446b25a05e240040388450c497198315c3a94f8b101b6d72bc1cdf6d121a0cc3e30a33d91b10abd223decd4c20a6e94e5466cf
+EBUILD selinux-couchdb-9999.ebuild 283 BLAKE2B 9ed40c6db3bd6a174dbcb3d8ef1e6b6972572e366556336119cfc353c33bdc6f6d904336cb6710854467401a19d61ca63635a55a0119534dc94b0795385c3c17 SHA512 c5ec6c2f70e89e65c67902cf1961a35f447e51957a396ce4bb402f1c7331651cb4520bbd8dc131f2e050cd628499e2c192521387b1ce3ce94331fb74d687317d
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-couchdb/selinux-couchdb-2.20200818-r1.ebuild b/sec-policy/selinux-couchdb/selinux-couchdb-2.20200818-r1.ebuild
deleted file mode 100644
index 1eea9a03560d..000000000000
--- a/sec-policy/selinux-couchdb/selinux-couchdb-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="couchdb"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for couchdb"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-couchdb/selinux-couchdb-2.20190201-r1.ebuild b/sec-policy/selinux-couchdb/selinux-couchdb-2.20200818-r2.ebuild
index a0c751186b13..e848fe36fa0a 100644
--- a/sec-policy/selinux-couchdb/selinux-couchdb-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-couchdb/selinux-couchdb-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="couchdb"
diff --git a/sec-policy/selinux-couchdb/selinux-couchdb-9999.ebuild b/sec-policy/selinux-couchdb/selinux-couchdb-9999.ebuild
index 941f36368fcd..836da67be746 100644
--- a/sec-policy/selinux-couchdb/selinux-couchdb-9999.ebuild
+++ b/sec-policy/selinux-couchdb/selinux-couchdb-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="couchdb"