gentoo resync : 14.12.2020

4 files changed, 6 insertions, 32 deletions

diff --git a/sec-policy/selinux-dropbox/Manifest b/sec-policy/selinux-dropbox/Manifest
index 1ef64453c4cc..0a42e3f54a84 100644
--- a/sec-policy/selinux-dropbox/Manifest
+++ b/sec-policy/selinux-dropbox/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-dropbox-2.20190201-r1.ebuild 429 BLAKE2B 59e515efb38914a1c85766d381ec4e5d99edf3a98cd74117562504b509a558e38abd79d023f871bc066bef72cb0bb2e9a0dddc557469634b15d5c6375b7bbfae SHA512 b5eba1054c0c2036988c002f3dc959dda7ffb9a95f38ca5ee774858e1e7034761c84ab5075b2653802d4868ddc977e58fa8fb0e41aa92f484cc0d3eda9e0515b
 EBUILD selinux-dropbox-2.20190609-r1.ebuild 429 BLAKE2B 59e515efb38914a1c85766d381ec4e5d99edf3a98cd74117562504b509a558e38abd79d023f871bc066bef72cb0bb2e9a0dddc557469634b15d5c6375b7bbfae SHA512 b5eba1054c0c2036988c002f3dc959dda7ffb9a95f38ca5ee774858e1e7034761c84ab5075b2653802d4868ddc977e58fa8fb0e41aa92f484cc0d3eda9e0515b
-EBUILD selinux-dropbox-2.20200818-r1.ebuild 431 BLAKE2B 858c0e3d771c589dd056e287759dd58170751e9af8d2df4b8abf2d1198ba8fbc41bd5b5af678101e77d32fae28cb0ca857f17c502769bb53ae32c82e079f4581 SHA512 aba919083e2524ce70bdafd139e3a24c2e86ebc4190ef942b3a173dc2faaf9eb1633caf1dc41cd88eb4fba063b90aff20baa50e6a2871588d8f7ba9c8d6ef29f
-EBUILD selinux-dropbox-9999.ebuild 434 BLAKE2B baf516b36d9fe954e5918e47d30425c491f093d8d08fa28208b46adc78a2dc2c12959e22dc5bbed2634c87acd8dd92ae03d2379d1dacb404230f21b28a200319 SHA512 b0036ba75bb8b360199b7e83abf1cc60a9c47505dda8fcf10b4a181cc14107c285e5dd7e67ee76a223b4c94dfe42af05f8b1dd9580dd2494bc51f51794207a3e
+EBUILD selinux-dropbox-2.20200818-r2.ebuild 429 BLAKE2B 74e0368f68a4811c0fe0bb6868b2eaea52fa7e8ab4c16a12f53f139325c5d9ee106fd5bc05a430d9511c153e5a8c31c1cc0b72c1f7d46ece76b32075af695142 SHA512 00ef100623571799eda64f26d1cdfaf36dfa243c0f1e172d0887c2841df62ae37dff86a0fd926dc693ee4608f6f0b6f5978f1a5b831a6ebb1b382fdf19266419
+EBUILD selinux-dropbox-9999.ebuild 431 BLAKE2B adf030fa61db09b66d01f018e316362ac888f574cd8b1f3dce2db5b8f83063871199e9a601448587ead6061cc887e4e6ba9065c3be32c1c1b0a59e95ca28b6c1 SHA512 85745e032f8ffca8391d066a80d2a74a3663b70f06495a05b745b7e754700d57b7c07e3abffb3cad1286c3e053d8e961daed50ed83ed24f1d839ab289b7e3e53
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dropbox/selinux-dropbox-2.20200818-r1.ebuild b/sec-policy/selinux-dropbox/selinux-dropbox-2.20200818-r1.ebuild
deleted file mode 100644
index a1ff5fb57a42..000000000000
--- a/sec-policy/selinux-dropbox/selinux-dropbox-2.20200818-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dropbox"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dropbox"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-	sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-	sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-dropbox/selinux-dropbox-2.20190201-r1.ebuild b/sec-policy/selinux-dropbox/selinux-dropbox-2.20200818-r2.ebuild
index 62d5dc077a97..877381e6787a 100644
--- a/sec-policy/selinux-dropbox/selinux-dropbox-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-dropbox/selinux-dropbox-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="dropbox"
diff --git a/sec-policy/selinux-dropbox/selinux-dropbox-9999.ebuild b/sec-policy/selinux-dropbox/selinux-dropbox-9999.ebuild
index d25d2723627f..195a29a9c760 100644
--- a/sec-policy/selinux-dropbox/selinux-dropbox-9999.ebuild
+++ b/sec-policy/selinux-dropbox/selinux-dropbox-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="dropbox"