gentoo resync : 14.12.2020

4 files changed, 6 insertions, 30 deletions

diff --git a/sec-policy/selinux-cups/Manifest b/sec-policy/selinux-cups/Manifest
index a8aa448647eb..bad24228a9e8 100644
--- a/sec-policy/selinux-cups/Manifest
+++ b/sec-policy/selinux-cups/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-cups-2.20190201-r1.ebuild 365 BLAKE2B 4f29ef848b343bd3c6e68c8ecd4193ff17cd3614820431aedf25f48997a1604e2635ba94dc5bc58bf8c567ae4e478b294932ac20f314a0285ffcb7a102b87f0b SHA512 201adc81cb9346b8642da2fa3e5df8504d68fb4a42514ccd0f1537c43c4f8543cb9ac891aabd687e6e2e3bea47b8ad37feddb763228581397fa0e0aff6757471
 EBUILD selinux-cups-2.20190609-r1.ebuild 365 BLAKE2B 4f29ef848b343bd3c6e68c8ecd4193ff17cd3614820431aedf25f48997a1604e2635ba94dc5bc58bf8c567ae4e478b294932ac20f314a0285ffcb7a102b87f0b SHA512 201adc81cb9346b8642da2fa3e5df8504d68fb4a42514ccd0f1537c43c4f8543cb9ac891aabd687e6e2e3bea47b8ad37feddb763228581397fa0e0aff6757471
-EBUILD selinux-cups-2.20200818-r1.ebuild 367 BLAKE2B 1a809a243e9af7132a53388d58480299fbc3e4b7484726867e74aa3d9470f25b823c944e61538f2f7851e49d755b2f0fbb47df06a2a24c0d6e0b987408eada4d SHA512 9abbe9c488f09c657a3fe9b28c9c678992e77ea829fe621a44f2fc9b18aee44f49f54b4d5915eab6e71bdfa496fcb529e3d06e3a79829e45aeacbfc9e69de801
-EBUILD selinux-cups-9999.ebuild 370 BLAKE2B 1a6a21abea290681f8ff0c44c4478241a3d055a1eb40a6e357d94fd942edfcf006baac29aa5952b43f687bf0c1f1a0611bddb613297727d8019da7efac23328f SHA512 16dbe034c5e538f40b4f67bc68e96e5d0169fe82d9016e97f1e88fd32c57fae743e79cfab051cf4802d118eae11c3917d581f4ac98f42efc7a8806ba7e2bc27f
+EBUILD selinux-cups-2.20200818-r2.ebuild 365 BLAKE2B a0b453cf2bcd2b963a839e4f4fa8926347efc12603d19192b50d18883cf47807dcedb214876e64a8fdff70bf962e6cab94a8a747d2bcc37c687e5d326973a313 SHA512 ec8f5ca272f6fde1a0819886e2c4411af851bc60183371209c750e0fc8cb397cf1c000b940ffd7f0d1228f0c6cace2337284ad3beeff12cbdda389604d636bdc
+EBUILD selinux-cups-9999.ebuild 367 BLAKE2B 5b06649b8e59b11f3e42f0eb1ca7ab62719e89b34381006898d0cc1765edcb7744c0931b8ce961ab378b041d21aa05e91380d67a804862cd826c60644540c01d SHA512 7d49edb167010339c717725bd4758c3a1a87f6a9dbe63e9b83204f40bb62e55e797df6852e26c8baacff2b5c79af407ce6b0aa03b4c2fec6d848cc02d6812161
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-cups/selinux-cups-2.20200818-r1.ebuild b/sec-policy/selinux-cups/selinux-cups-2.20200818-r1.ebuild
deleted file mode 100644
index ef76549f7e20..000000000000
--- a/sec-policy/selinux-cups/selinux-cups-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="cups"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cups"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-lpd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-lpd
-"
diff --git a/sec-policy/selinux-cups/selinux-cups-2.20190201-r1.ebuild b/sec-policy/selinux-cups/selinux-cups-2.20200818-r2.ebuild
index 7df0fe175dde..e940e669fe9c 100644
--- a/sec-policy/selinux-cups/selinux-cups-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-cups/selinux-cups-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="cups"
diff --git a/sec-policy/selinux-cups/selinux-cups-9999.ebuild b/sec-policy/selinux-cups/selinux-cups-9999.ebuild
index 45dc986ba8b0..6a824d4c173d 100644
--- a/sec-policy/selinux-cups/selinux-cups-9999.ebuild
+++ b/sec-policy/selinux-cups/selinux-cups-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="cups"