gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-speedtouch/Manifest b/sec-policy/selinux-speedtouch/Manifest
index 8f960f8a410d..9eb21695b0e3 100644
--- a/sec-policy/selinux-speedtouch/Manifest
+++ b/sec-policy/selinux-speedtouch/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-speedtouch-2.20190201-r1.ebuild 287 BLAKE2B 91b7c9d71e494f8abcdf6bbb23a4043eba586839998cbb51baea2167d938f9d26194938f58ab08dae530a7ee746370aca56fc4ab3116012e980be73db5ae9f3a SHA512 2bd3a369f45d26502c3f343200ea9295b2941998f625119b9f7988044b237251422f3492fb85a3582646f702ca08eda6b63574baa1d9ea2b09a8d009ae4459c2
 EBUILD selinux-speedtouch-2.20190609-r1.ebuild 287 BLAKE2B 91b7c9d71e494f8abcdf6bbb23a4043eba586839998cbb51baea2167d938f9d26194938f58ab08dae530a7ee746370aca56fc4ab3116012e980be73db5ae9f3a SHA512 2bd3a369f45d26502c3f343200ea9295b2941998f625119b9f7988044b237251422f3492fb85a3582646f702ca08eda6b63574baa1d9ea2b09a8d009ae4459c2
-EBUILD selinux-speedtouch-2.20200818-r1.ebuild 289 BLAKE2B 5c5de5f25a744c21c3cc278b8ee19812fc81fed8d108ff2782fce002856fe651307235d8665dbe0deeb8d426b5c6e6005052d2c56d97df1145bda066ca42416a SHA512 cf9531ffbeb95768eb0d6bb6534de1f974908b8c6f78622e6288c994bd30eae221dd90fdedc2c411bf99b496c4d8a46a24a78630247830134e8b53b914af5424
-EBUILD selinux-speedtouch-9999.ebuild 292 BLAKE2B f4a23b71c2311427d68e1ac946d80ccb1f12d888066d3e50f1ab43460b775f3a390e0e00ede50c6e1fb46691b1ad4f9c05638190f97aae33187f5f102f8aace7 SHA512 d92cfa1d0c8f557f7aed34c39cc0e15c74f304516f72285f36bcb0f24ffe5e3ad37123c19ed837b0e1cca5c9f673830afc4b08d4f4e8a6dbe1b27ec0bbeabf3e
+EBUILD selinux-speedtouch-2.20200818-r2.ebuild 287 BLAKE2B 4cddfa8b833982ae1602700620127e4a8917f93ac4be9ee8026fad6655e9e3bb64690f8cfb67f814532a17d1bc140afee7b2813a2e01877a1f1d284e13ae72a4 SHA512 ed71eec4ebc4cc1ab8768669ef9398fd7fdfe16486440fd5c108e4735ef21ffad8f63b8218dbd2e76b30f27981c94a0c212847f5b79b1991555a843fcec6400e
+EBUILD selinux-speedtouch-9999.ebuild 289 BLAKE2B 6cc84fee788a4694505241209d437f19cb4e660a942bfb6414a7bbb45a09025c903ce316821d39b36d27d07c23ea4f031595aef45f7f128bb0d64f531c710406 SHA512 170d4cb8cd1b0c3e06eb42ab681e3f0021f459c64b953568f8e47eea1240a472df884c77b835498627af9ac7afa6d8c2c9943102e0103174ea44f35f9a965043
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20200818-r1.ebuild b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20200818-r1.ebuild
deleted file mode 100644
index b20a7621ba4b..000000000000
--- a/sec-policy/selinux-speedtouch/selinux-speedtouch-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="speedtouch"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for speedtouch"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20190201-r1.ebuild b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20200818-r2.ebuild
index 829da81326bd..dee0f824f601 100644
--- a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-speedtouch/selinux-speedtouch-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="speedtouch"
diff --git a/sec-policy/selinux-speedtouch/selinux-speedtouch-9999.ebuild b/sec-policy/selinux-speedtouch/selinux-speedtouch-9999.ebuild
index c9c31f9b77ac..90ae1ab45797 100644
--- a/sec-policy/selinux-speedtouch/selinux-speedtouch-9999.ebuild
+++ b/sec-policy/selinux-speedtouch/selinux-speedtouch-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="speedtouch"