gentoo resync : 14.12.2020

4 files changed, 6 insertions, 30 deletions

diff --git a/sec-policy/selinux-apcupsd/Manifest b/sec-policy/selinux-apcupsd/Manifest
index bc64116edea5..edbfdee15aa0 100644
--- a/sec-policy/selinux-apcupsd/Manifest
+++ b/sec-policy/selinux-apcupsd/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-apcupsd-2.20190201-r1.ebuild 377 BLAKE2B bb5075b0fc2e5aded13dcb5b9dd1c514acf49e6213fd66ef184290daad54bc1100c9dfba4674c55b09338bed71a4e4d3c515ee5916fc09e224812fa5ff5fdb0e SHA512 2d7ce7bef91f9fe9db6a623127ac003e84de5c530dede9df7b70805fcde2e20f25be0d11be0fbf1ce180e6f0443d56b6dbda38f322099cdfcaf090916d751194
 EBUILD selinux-apcupsd-2.20190609-r1.ebuild 377 BLAKE2B bb5075b0fc2e5aded13dcb5b9dd1c514acf49e6213fd66ef184290daad54bc1100c9dfba4674c55b09338bed71a4e4d3c515ee5916fc09e224812fa5ff5fdb0e SHA512 2d7ce7bef91f9fe9db6a623127ac003e84de5c530dede9df7b70805fcde2e20f25be0d11be0fbf1ce180e6f0443d56b6dbda38f322099cdfcaf090916d751194
-EBUILD selinux-apcupsd-2.20200818-r1.ebuild 379 BLAKE2B a65f3a50738e296932dda5faf14cc4d4d5ab08f1a1d5dbf3df479a9a0d711c8d6def04a8de59fbfd859f901bb3cab9277fef9d76c1879270b8f0075f816c3584 SHA512 129b0d912e2db5050b138fe60c60b8d1331ba8ea6c06717f6ee0aa365a2332d5dc2ac6fb87372098c4dcfa975aad38ffa47397841df6141c019116b171be0d6c
-EBUILD selinux-apcupsd-9999.ebuild 382 BLAKE2B 78f29e8ae0186f95473521050a56c136b89a22ba462c8bff7d0d592484174588723ca6af4169662d27134a18205f23f6429037dd9ba7528d7a3450587f3f58f0 SHA512 a9090c93fa49e64393691c2599963d150e60566007836a68063cdc5b43ecc5d975935b971adda83f3afa4b29a2cd4628f83d4d2504aa4a04affb85d5834b674e
+EBUILD selinux-apcupsd-2.20200818-r2.ebuild 377 BLAKE2B 68673f24583f685febe0813d91642f2de7a6a1582279fce451f3bc1b6ee64457990883dffab8d39ac68b35851e83ca05c451f3824d0240ddca9633a41ec4487c SHA512 9c3986c8afa01b8f01c23502121347820954bc9a1eae56004022fa9bc886b64e4372a66a02d57ec64492d149cc2fb257a0bd43dc9f2bd1a52896b64a97f4b0cb
+EBUILD selinux-apcupsd-9999.ebuild 379 BLAKE2B 8bb56c2c58d4d96b6a1a632825c4478f37f670e3a0c9cfb62cd923b2e2ebfc1338c7b5fd7569d836661f0c6af92c698eabe0c32ff66f5d22a42caa393716686f SHA512 bea6eb0da3d989975fe20a9c597f2adc0baeb32cda837b0e4fc09f0c8e4291c3ce16cebd473a1c1bbb0bab7e939abb37acdf9cefe756f6f893a7177a7f55becd
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20200818-r1.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20200818-r1.ebuild
deleted file mode 100644
index d8703e580df6..000000000000
--- a/sec-policy/selinux-apcupsd/selinux-apcupsd-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="apcupsd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for apcupsd"
-
-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-apcupsd/selinux-apcupsd-2.20190201-r1.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20200818-r2.ebuild
index 70059826e9b7..8317d28cc7f1 100644
--- a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-apcupsd/selinux-apcupsd-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="apcupsd"
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-9999.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-9999.ebuild
index 67784a4a30c6..0fa672fcf499 100644
--- a/sec-policy/selinux-apcupsd/selinux-apcupsd-9999.ebuild
+++ b/sec-policy/selinux-apcupsd/selinux-apcupsd-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="apcupsd"