gentoo resync : 14.12.2020

4 files changed, 6 insertions, 30 deletions

diff --git a/sec-policy/selinux-amanda/Manifest b/sec-policy/selinux-amanda/Manifest
index be206d459286..2b16d1fa97ec 100644
--- a/sec-policy/selinux-amanda/Manifest
+++ b/sec-policy/selinux-amanda/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-amanda-2.20190201-r1.ebuild 373 BLAKE2B 8c4925318ab8e00a4130eca1a18024e94f79f830dfbb387f9733e0b51b6a155cd7c8b888dc580d61457128a1846d177684acfcc09b46595295e46227d18c5f1d SHA512 f99979c7a58c93d45951b9eb669c87256e0ba471377b2d7f2dc225084e4718368a84e2fbf0805482252342591c2933ad6daa1198cc64e676468a097fe737e743
 EBUILD selinux-amanda-2.20190609-r1.ebuild 373 BLAKE2B 8c4925318ab8e00a4130eca1a18024e94f79f830dfbb387f9733e0b51b6a155cd7c8b888dc580d61457128a1846d177684acfcc09b46595295e46227d18c5f1d SHA512 f99979c7a58c93d45951b9eb669c87256e0ba471377b2d7f2dc225084e4718368a84e2fbf0805482252342591c2933ad6daa1198cc64e676468a097fe737e743
-EBUILD selinux-amanda-2.20200818-r1.ebuild 375 BLAKE2B 5e8d232c92be185dcf5c6626dedb52ba087bf5befcf98fd523cce2d6edab4e8c80b4c7e64448c58ade50bf1c803281f9e75dcbae22a4d8aae81efe228b0a76fb SHA512 70b53c5de35c693fd7ea28e57239676d7b5b9f6f7d9b8ec4806df6fcf865010f89ea3fcf0cef1eb4f78b0ee4d8f36397d6a0b8d0727dfd30b76a0dfcb59e7e68
-EBUILD selinux-amanda-9999.ebuild 378 BLAKE2B f05d3e24e87efa85390431108c5ea318c5aeee59777eb08337052c6e5cc076acbca28d3aadbc28770b87a704bb8d8017bfa460da675eda36f79ae40a139f00ca SHA512 bdc94e45001a2fd5f9ba987704584f51445282589fa682aac6938cad1aef9c43032714043fc9c2c1206417353660bfc277fada5842124b3de15a4875498d098d
+EBUILD selinux-amanda-2.20200818-r2.ebuild 373 BLAKE2B 56076b1f8cbbbac6f25fa7ace34a9664836c56dc3226a0fc7321efe44cd87fbd783c635fd36923200eee9a5e5e1889ca445d9da7fbdcfd9fdb83f1a2223bf8d3 SHA512 e1a5f132d1baf60ddfedafa3311cc8e54e40ad0521a516f7e8f86a64d14ff8ee5eeca816a7e6b18252dce1aa07f33a32192fe9fd47a93e97548a9116ba384de2
+EBUILD selinux-amanda-9999.ebuild 375 BLAKE2B b21fd970b1c6f41928f6827041a89b79459e0fad907b8411e28dece589a985802534545cdaef006d19882a2099fbf4b0db2f8abff79a2505d8e28eb0806cad16 SHA512 4ecc380cc4bc90d87115bcb993d3e64041cf540a4be2f2667b66e2811cf1c32fd295bdaa92620c56cafc60cc7d4ec35d17d672968b36c3866fb6d058b3e01788
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-amanda/selinux-amanda-2.20200818-r1.ebuild b/sec-policy/selinux-amanda/selinux-amanda-2.20200818-r1.ebuild
deleted file mode 100644
index f31158bebca3..000000000000
--- a/sec-policy/selinux-amanda/selinux-amanda-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="amanda"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for amanda"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-amanda/selinux-amanda-2.20190201-r1.ebuild b/sec-policy/selinux-amanda/selinux-amanda-2.20200818-r2.ebuild
index 4e0a659ca088..774f3831b93e 100644
--- a/sec-policy/selinux-amanda/selinux-amanda-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-amanda/selinux-amanda-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="amanda"
diff --git a/sec-policy/selinux-amanda/selinux-amanda-9999.ebuild b/sec-policy/selinux-amanda/selinux-amanda-9999.ebuild
index 6cce4fee502d..ea4d87c07053 100644
--- a/sec-policy/selinux-amanda/selinux-amanda-9999.ebuild
+++ b/sec-policy/selinux-amanda/selinux-amanda-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="amanda"