gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-syncthing/Manifest b/sec-policy/selinux-syncthing/Manifest
index d0579abe81f7..1c375f89f42d 100644
--- a/sec-policy/selinux-syncthing/Manifest
+++ b/sec-policy/selinux-syncthing/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-syncthing-2.20190201-r1.ebuild 285 BLAKE2B 334255c6b081e0a00ca143276d5458dbbfac617cfbbc586d38ef46ee61169bbe873b18c8bc2575a60970fc5f2a0a2c8614403b2c82fcf8a3e5aa4f2def185676 SHA512 4e4e77d1515b6f2c283482ad4f93881b78017e40a143f9b8be36e8be4caa7faa7a80c9434c70d0fb87496ce5c41e94444d282603b8219566caf602f4941d7e46
 EBUILD selinux-syncthing-2.20190609-r1.ebuild 285 BLAKE2B 334255c6b081e0a00ca143276d5458dbbfac617cfbbc586d38ef46ee61169bbe873b18c8bc2575a60970fc5f2a0a2c8614403b2c82fcf8a3e5aa4f2def185676 SHA512 4e4e77d1515b6f2c283482ad4f93881b78017e40a143f9b8be36e8be4caa7faa7a80c9434c70d0fb87496ce5c41e94444d282603b8219566caf602f4941d7e46
-EBUILD selinux-syncthing-2.20200818-r1.ebuild 287 BLAKE2B 94eb55f5d290047ea1c25958e5a5887314adff2674803464d81c87fb3728dc405a92e6b8c0f601b00790f918a667eaadf4dbc8fa9ac3d603ccadbaa13892af7b SHA512 89e0206923c6d4c1de630ab3298f643eec90232bd4e7ee78e1963a96d5c0123ccb827755b00a7ef32b46c3d588bf62e9277692e50324f2af20eb4a7219fbdda2
-EBUILD selinux-syncthing-9999.ebuild 290 BLAKE2B cbfcf886b65bad83e3c5b8dba3ad7fe64f80e097d145789b592ec4689e7bb0e46d7137adc2d83b74208a60afc1531ac50d594681eea4af1a6caaa75e47c3d1e1 SHA512 1ce639a1418c999346e461f1ece9f17b441ea0785aeb93c0b4292b56a26f763eaa17f061e56ff3d38da9aede4d4c48421a9843ba930cfc8194fad7eafb8765f1
+EBUILD selinux-syncthing-2.20200818-r2.ebuild 285 BLAKE2B 4dffb0e40ef042bea4f236be5fc87c3ec871d9d3d3e444f60315140fec314b6963adb8775a24716d7571675235851b0e9f4175c5953f2cdd34d9610a0c0a3bc6 SHA512 b8f511627b9b78a55c5a4cef8677c2a428844baea76690ef46d933f9d59e4e89befd8d78b0ca7f82f8762e5ca7e0a8493860e111e811475d9e9ce8149f6fb9a7
+EBUILD selinux-syncthing-9999.ebuild 287 BLAKE2B db01c93176aca739bfcc7bf2a740191cdf42d2e38e73e621aae4e020f6a2535fc1aa94c1208c88d094330994bec3a7a26025cd1619680765d098ceb013fecc34 SHA512 8f6e7a6b129347bfa355e5a719bcbac23aed0b1d9325aff20abffc084751a180033b67c0993715955ca835df1230058485337d0cc7b0ebe5b7c17f25eee9b039
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-syncthing/selinux-syncthing-2.20200818-r1.ebuild b/sec-policy/selinux-syncthing/selinux-syncthing-2.20200818-r1.ebuild
deleted file mode 100644
index b9d7a0a287bb..000000000000
--- a/sec-policy/selinux-syncthing/selinux-syncthing-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="syncthing"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for syncthing"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-syncthing/selinux-syncthing-2.20190201-r1.ebuild b/sec-policy/selinux-syncthing/selinux-syncthing-2.20200818-r2.ebuild
index 7ab1c868aaf4..10b661b7be1c 100644
--- a/sec-policy/selinux-syncthing/selinux-syncthing-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-syncthing/selinux-syncthing-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="syncthing"
diff --git a/sec-policy/selinux-syncthing/selinux-syncthing-9999.ebuild b/sec-policy/selinux-syncthing/selinux-syncthing-9999.ebuild
index fb45ab18b9ca..5bd0d132c1b9 100644
--- a/sec-policy/selinux-syncthing/selinux-syncthing-9999.ebuild
+++ b/sec-policy/selinux-syncthing/selinux-syncthing-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="syncthing"