gentoo resync : 14.12.2020

4 files changed, 6 insertions, 30 deletions

diff --git a/sec-policy/selinux-nut/Manifest b/sec-policy/selinux-nut/Manifest
index d57b1966f71e..3021633220e1 100644
--- a/sec-policy/selinux-nut/Manifest
+++ b/sec-policy/selinux-nut/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-nut-2.20190201-r1.ebuild 369 BLAKE2B 0550f096ac246525412f676b7ecffce720ccaa75434d71ec06aa14ada19816711c7f3aeb87fa7704701ea13bb66717078a82b5f31ab72f731d2406ff502e7778 SHA512 3402b4a8ed58b61fc25f91068b044736dbbe533addcd2f0e24cef2be3223644490c0bad1e589eed38813f74224b1ad5c742d0f04c79065b680113d2b6a16f411
 EBUILD selinux-nut-2.20190609-r1.ebuild 369 BLAKE2B 0550f096ac246525412f676b7ecffce720ccaa75434d71ec06aa14ada19816711c7f3aeb87fa7704701ea13bb66717078a82b5f31ab72f731d2406ff502e7778 SHA512 3402b4a8ed58b61fc25f91068b044736dbbe533addcd2f0e24cef2be3223644490c0bad1e589eed38813f74224b1ad5c742d0f04c79065b680113d2b6a16f411
-EBUILD selinux-nut-2.20200818-r1.ebuild 371 BLAKE2B b24f869f29bf9c56f12e55858ba6a9dde12ec5358d84d7e6177e426ae00499a53a3a54451f8a74c94fb704bd56ba1a276ccd4b2ef0d448b0e11736b4370ad715 SHA512 b6f15f7f037408ce4373a71011cf9434210ad0723071ac83a61c94934dd099bce30363402c8ed0f1153a873a46af13dbc4f29a4855f841cac0422da640c7253f
-EBUILD selinux-nut-9999.ebuild 374 BLAKE2B 3ff37d650df15b2749a33e87ac97571238d86f5076af69d88b997cf36d04a2274249456a3d17b086c25a70f9b90fffc2e1f66fa160e5c81898d5f1db220806b6 SHA512 469184b594ae885b86caa1b1fe45748ddbbba4abbd4d377389216ac51c50f124db4a21157fc4b769ef61e6b17aa7fb1e825f9411643cf20098f2b424231557e9
+EBUILD selinux-nut-2.20200818-r2.ebuild 369 BLAKE2B ce5335fbc51ee22980bf7bce39d22c7dcd16b174355171527177af19fa81ec55725940da631606ca8cd5a0317eb6044142358bd0237f9111fced2efaccd0cc28 SHA512 96f7049d4c21fe7e6df004f90e9c2aac045e110c9e659a5ebbb8b06eb498b695c1383ec8200b26ef3fd7219730a6b226619fd1fcfcb0cc304f62a3ad72df34ce
+EBUILD selinux-nut-9999.ebuild 371 BLAKE2B 399042f8ba5aefda743bf4a388fd7918a250f1811c0276f3558d41316c9c29371314cd0bfa347c4cd5ace027d0d31d4859ab7e3a1046d067949152a5e4d363cc SHA512 05ea4746218145c5119c6382247e17f6f7452701a393e5d1ab5b375afd35854a22267892ad77f4b140f39b47c94a1e2e12b2060a97705341dea67641bdc506fa
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-nut/selinux-nut-2.20200818-r1.ebuild b/sec-policy/selinux-nut/selinux-nut-2.20200818-r1.ebuild
deleted file mode 100644
index 1c39e6a4afa8..000000000000
--- a/sec-policy/selinux-nut/selinux-nut-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="nut"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nut"
-
-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-nut/selinux-nut-2.20190201-r1.ebuild b/sec-policy/selinux-nut/selinux-nut-2.20200818-r2.ebuild
index 83b6df01523b..a9dcdae9d32c 100644
--- a/sec-policy/selinux-nut/selinux-nut-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-nut/selinux-nut-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="nut"
diff --git a/sec-policy/selinux-nut/selinux-nut-9999.ebuild b/sec-policy/selinux-nut/selinux-nut-9999.ebuild
index a4fb8098acf4..a761f0f14327 100644
--- a/sec-policy/selinux-nut/selinux-nut-9999.ebuild
+++ b/sec-policy/selinux-nut/selinux-nut-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="nut"