gentoo resync : 14.12.2020

4 files changed, 6 insertions, 31 deletions

diff --git a/sec-policy/selinux-devicekit/Manifest b/sec-policy/selinux-devicekit/Manifest
index bfbbce39da32..76219f876ae0 100644
--- a/sec-policy/selinux-devicekit/Manifest
+++ b/sec-policy/selinux-devicekit/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-devicekit-2.20190201-r1.ebuild 378 BLAKE2B 392c872538fc605ad613f424e9cd9577a89511764b7c29f6c1b5369d72c98320ecc274abb7b9dfacd6756b5554753e0e3bb2bc7a18597e49cde457dc8b5126dc SHA512 6c5b0cca97b084d82f4f17a43a9598d70da5bd92f9545348ad13cdbca136243c04652e233f5e50d5a1f9f838640e345a80efcf556ae2733c6fb3ea69f193324d
 EBUILD selinux-devicekit-2.20190609-r1.ebuild 378 BLAKE2B 392c872538fc605ad613f424e9cd9577a89511764b7c29f6c1b5369d72c98320ecc274abb7b9dfacd6756b5554753e0e3bb2bc7a18597e49cde457dc8b5126dc SHA512 6c5b0cca97b084d82f4f17a43a9598d70da5bd92f9545348ad13cdbca136243c04652e233f5e50d5a1f9f838640e345a80efcf556ae2733c6fb3ea69f193324d
-EBUILD selinux-devicekit-2.20200818-r1.ebuild 380 BLAKE2B fafa0f31b7638e0d05b5151bf26c4802eaf430a4a299d473e4f89c8dbfd4f0c9b02039616a315a295039535cfa2f137842a5bc2add545e7af9b3c4ac3ef38d3b SHA512 5dcbaaf4bc24894cd3514ed4ef7fd9a14a854de656572d468650f57578888c6db038fb1e3514718d8bb25b45d00e68cf0ef2fe9be5fbcdb0efddba257c4ee010
-EBUILD selinux-devicekit-9999.ebuild 383 BLAKE2B 33eb2481cef9fa92b2e9e8dfdb4765b83f3e3e8ac849224427c0fa13f14d27a1b6f96090a5ab4ee0fc6fe76fe8d373b5428b1c96b010d1df8c6172be25bb955f SHA512 bf74814b616c938a0d8379a33425e7ba81586d8f9226119a8d6f8fc93537aeec72d3539530221f886ddf16215f0d95a4f5b44ef7cecbb0a39a6938c3df79b7c6
+EBUILD selinux-devicekit-2.20200818-r2.ebuild 378 BLAKE2B f04f3e05c50667cdc5127fc8d86510cd84b6b4443d06b36b7080196e5874eb3c54095869b34ded07547502aafdaade079d53a60d2ba5cc52aa916411dc183499 SHA512 8208e3d931bc655ce9c9bdc72bccf747b77b57e77425e9ca3c3a77aa6ec67e1b873fe228ab33e57f6e7e35a54a05fc6b2ba2e00b9811c9bb31176fad22bf25b7
+EBUILD selinux-devicekit-9999.ebuild 380 BLAKE2B 26041390419ee905df3c32874f34a9782398ee38b025f694d245dde8fa91b4e006fee4d5b95423fc71b0f4cbade424e17e7ec86bfeaf1a1e1f048f8c314edb49 SHA512 af77ba4613fbbd287e76e37d9a92bb5f700208d1035f484043878f1a7d0cc46c0d3228e8d2c67a920eacabb96258866a712b8a20d8cec21269485c55a5514bee
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-devicekit/selinux-devicekit-2.20200818-r1.ebuild b/sec-policy/selinux-devicekit/selinux-devicekit-2.20200818-r1.ebuild
deleted file mode 100644
index abbb06ff13da..000000000000
--- a/sec-policy/selinux-devicekit/selinux-devicekit-2.20200818-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="devicekit"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for devicekit"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-devicekit/selinux-devicekit-2.20190201-r1.ebuild b/sec-policy/selinux-devicekit/selinux-devicekit-2.20200818-r2.ebuild
index ac130b34a23d..55ea8443ad1e 100644
--- a/sec-policy/selinux-devicekit/selinux-devicekit-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-devicekit/selinux-devicekit-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="devicekit"
diff --git a/sec-policy/selinux-devicekit/selinux-devicekit-9999.ebuild b/sec-policy/selinux-devicekit/selinux-devicekit-9999.ebuild
index 8635987d27c4..77f1cc072a64 100644
--- a/sec-policy/selinux-devicekit/selinux-devicekit-9999.ebuild
+++ b/sec-policy/selinux-devicekit/selinux-devicekit-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="devicekit"