gentoo resync : 14.12.2020

4 files changed, 6 insertions, 30 deletions

diff --git a/sec-policy/selinux-smokeping/Manifest b/sec-policy/selinux-smokeping/Manifest
index da600ab1035c..dbbee26eff09 100644
--- a/sec-policy/selinux-smokeping/Manifest
+++ b/sec-policy/selinux-smokeping/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-smokeping-2.20190201-r1.ebuild 381 BLAKE2B 1fc869074042b5950ec3c4cca989a3ad665c249c08375dea164d4d5ceb3d2571339dccfbc960d18f479f29a027dd542149627605dea3e569618e9d539e53bc8c SHA512 0a0143271b44f88d8cd0bc87fc5de704d9902e35bc29d8d3a76b94c5a04ab27b4e8db5393face34d2f0436db16fc57606ea9fb1da3afb52ab13e17e07f66f6f3
 EBUILD selinux-smokeping-2.20190609-r1.ebuild 381 BLAKE2B 1fc869074042b5950ec3c4cca989a3ad665c249c08375dea164d4d5ceb3d2571339dccfbc960d18f479f29a027dd542149627605dea3e569618e9d539e53bc8c SHA512 0a0143271b44f88d8cd0bc87fc5de704d9902e35bc29d8d3a76b94c5a04ab27b4e8db5393face34d2f0436db16fc57606ea9fb1da3afb52ab13e17e07f66f6f3
-EBUILD selinux-smokeping-2.20200818-r1.ebuild 383 BLAKE2B a996962d6a9873552b68e4e0b0a2ee029170fe0447e9291faa981a5bb72a0085906256de239e55bb07c516a559fd6004162e9f88fc5ad115d4fad5d670874a5b SHA512 752a0616a133f3074c2dfeed8aa3f2c26c5a6279acf31447fc6acd898e87bb759e8ab34ff587d5e25a5214c06cfbab09ad8f23e4f60379073395b6a64a2606cc
-EBUILD selinux-smokeping-9999.ebuild 386 BLAKE2B 4fb7a6321172bae15450a494b7d2356f3be87d0e8a65b3b8683d8d1f07b33e15b56b8e0b7d9473e2b2b7553d2462f33c5fda8036a912f9e1f9a8011fac9d9d1e SHA512 5b33fc3d4ee6ea7128a1e1f7f40b95d35590935a7514c6a6d2b4a6678dd7ff14725ec68ceb6401e675e723fb4a9533f2f8fe42c31b7634cbc2a553fa72d92eab
+EBUILD selinux-smokeping-2.20200818-r2.ebuild 381 BLAKE2B 2811c8b003aa8fb18e97fd01783fc7d60d1593359fdd7d9313b046626c855206ca32301ec5940b07578cb8b25ef3726ff3620f93108ddb19653c8c974c9b01b1 SHA512 da2e1b3e192f555e12cbeb3001e86e4ff8b708f7681706dc52452e5999efaf23867710d49bd8eaa7258e715d93292caf1a72ab7f336bcf069163f13602944b2a
+EBUILD selinux-smokeping-9999.ebuild 383 BLAKE2B 015f454b59937e967026d1ab7b67c889dde29f30eb04e4324e0cb18c8dc2df00df4f8bd40598e3225679ffd338bfb76515f478b32b5c646a2436ce685a60d3ef SHA512 67a832cf238f9f277e6485a1d7d97a37251ed766d76f71e19a9366483d4b63827f4370ee19f9834e0000e956be9d9d89c7af965fae25f9525cf02370674bf1d0
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-smokeping/selinux-smokeping-2.20200818-r1.ebuild b/sec-policy/selinux-smokeping/selinux-smokeping-2.20200818-r1.ebuild
deleted file mode 100644
index 002a2c336c83..000000000000
--- a/sec-policy/selinux-smokeping/selinux-smokeping-2.20200818-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="smokeping"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for smokeping"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-smokeping/selinux-smokeping-2.20190201-r1.ebuild b/sec-policy/selinux-smokeping/selinux-smokeping-2.20200818-r2.ebuild
index 72e224ffccae..ec1fc0192220 100644
--- a/sec-policy/selinux-smokeping/selinux-smokeping-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-smokeping/selinux-smokeping-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="smokeping"
diff --git a/sec-policy/selinux-smokeping/selinux-smokeping-9999.ebuild b/sec-policy/selinux-smokeping/selinux-smokeping-9999.ebuild
index 764fbe3b4119..c47a989f1d54 100644
--- a/sec-policy/selinux-smokeping/selinux-smokeping-9999.ebuild
+++ b/sec-policy/selinux-smokeping/selinux-smokeping-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="smokeping"