gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-memcached/Manifest b/sec-policy/selinux-memcached/Manifest
index 70ed9cd18cb0..7c121aac6ff9 100644
--- a/sec-policy/selinux-memcached/Manifest
+++ b/sec-policy/selinux-memcached/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-memcached-2.20190201-r1.ebuild 285 BLAKE2B 185d4e6bf092abbc62ed965536bbda42b64660861e372f5774992c811d101bf6e14119e88ad32699743545a564f3de0492ea989e9366be3912c5fa480dbc0c83 SHA512 3b29fe6cd048cd8a27c78205324cd212c616f862508514ec22a8a3065a161a3fd179efcd5f7d707b52049d73d3c0208a7f59d7a402f666da32af723564c23a58
 EBUILD selinux-memcached-2.20190609-r1.ebuild 285 BLAKE2B 185d4e6bf092abbc62ed965536bbda42b64660861e372f5774992c811d101bf6e14119e88ad32699743545a564f3de0492ea989e9366be3912c5fa480dbc0c83 SHA512 3b29fe6cd048cd8a27c78205324cd212c616f862508514ec22a8a3065a161a3fd179efcd5f7d707b52049d73d3c0208a7f59d7a402f666da32af723564c23a58
-EBUILD selinux-memcached-2.20200818-r1.ebuild 287 BLAKE2B aaa0805fb0f3dcbb43adbc279c17f2f73ff0f4b74bea8b50d1d13d74387374b558b30f9fdf27d9e0449baa4e4ceb3ad8e0776d015b9e04665c75031d3ef21708 SHA512 2355845c2ae7fd5a9a0e80739191b64d33fdeb05414a2033ff767d0be708b2d8c4e627bc67d051d6c9b12cee4699854aa62282b2f610e28cca14873a2e0cf103
-EBUILD selinux-memcached-9999.ebuild 290 BLAKE2B aff4daa07ce4e211b54249025f1fcdf858be87112fea8dde3960084600f1246c523f17545f184a7e4a5c978d359cce13fabe0576f8a941863bfacd03fe010ce6 SHA512 bc1cad12775a97ac9192fefadff1fee103055200f1c187f590e4ea7f312923212f159e836979e72978bc07e65ffce2b7a6e045da29858677d824676cf111ba17
+EBUILD selinux-memcached-2.20200818-r2.ebuild 285 BLAKE2B 2fa50d91a00fcafd566a356b79ba8c9753766f5a1c6d23f2212030d9ecdc470bd8e1ebdebc5979a9b386a31a9b5e131a3c97f5a9441af5580578c131f1f2be6d SHA512 9d5e06f98afe942a4c584f7f7db14c22b233ebdb9d3451232c9d4056345edd65313a6a6aefc73a4298e13d2dea3d2c5b43f8b200a199e26b0147ee249f792d53
+EBUILD selinux-memcached-9999.ebuild 287 BLAKE2B 81bfb6e9284f25c3ab4b4c60cb5a7f956a62f24fb2ad83cfc95358f0689f4bf6fe74e2d7343ebefcdc72ecc19cd180998295ecfae85dde48b7c4a0a99bdccd46 SHA512 af240ffe19dbd60a93c8b923d39cc13efed240955407ad1a7b6865abbd07f7cb3dfb57a989797cbd2bee566e0a7be438cfb26e9a408830e367e3f19862bc4d6a
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-memcached/selinux-memcached-2.20200818-r1.ebuild b/sec-policy/selinux-memcached/selinux-memcached-2.20200818-r1.ebuild
deleted file mode 100644
index 80f5971b8908..000000000000
--- a/sec-policy/selinux-memcached/selinux-memcached-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="memcached"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for memcached"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-memcached/selinux-memcached-2.20190201-r1.ebuild b/sec-policy/selinux-memcached/selinux-memcached-2.20200818-r2.ebuild
index d24673999f84..38088e1f3caf 100644
--- a/sec-policy/selinux-memcached/selinux-memcached-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-memcached/selinux-memcached-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="memcached"
diff --git a/sec-policy/selinux-memcached/selinux-memcached-9999.ebuild b/sec-policy/selinux-memcached/selinux-memcached-9999.ebuild
index a835ef04fc2d..8ff826aaf483 100644
--- a/sec-policy/selinux-memcached/selinux-memcached-9999.ebuild
+++ b/sec-policy/selinux-memcached/selinux-memcached-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="memcached"