gentoo resync : 14.12.2020

4 files changed, 6 insertions, 32 deletions

diff --git a/sec-policy/selinux-djbdns/Manifest b/sec-policy/selinux-djbdns/Manifest
index 075d0040c39b..759b36a84296 100644
--- a/sec-policy/selinux-djbdns/Manifest
+++ b/sec-policy/selinux-djbdns/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-djbdns-2.20190201-r1.ebuild 443 BLAKE2B d518ce7c5f327ad18b9e9b6a2b9b8ae4d2aabefc1c2fc85fd1568dd64ddfdfc9cda3cc37b0f3bf443ddab275fd11adcbf3a5bb2720450ca6e21ab3e3617555cd SHA512 96c710ba8fff53d7052b61d4419c59b89892edca136604590eb3ecd1cf50dfc1ff71fbd11df5b92a89b5beec097bc78f282c7b6bc1509d0370edf889178b5b2d
 EBUILD selinux-djbdns-2.20190609-r1.ebuild 443 BLAKE2B d518ce7c5f327ad18b9e9b6a2b9b8ae4d2aabefc1c2fc85fd1568dd64ddfdfc9cda3cc37b0f3bf443ddab275fd11adcbf3a5bb2720450ca6e21ab3e3617555cd SHA512 96c710ba8fff53d7052b61d4419c59b89892edca136604590eb3ecd1cf50dfc1ff71fbd11df5b92a89b5beec097bc78f282c7b6bc1509d0370edf889178b5b2d
-EBUILD selinux-djbdns-2.20200818-r1.ebuild 445 BLAKE2B 4cb1611aaede38b7634dbb1e8f87df264eb570dc30db3b7ce230b0326ee9116ec20703788748bcc59d18a548aab0fd21ffdc6cb6214e719ebabe57c123ea3d36 SHA512 ad73f4171327e794aed1887fc41deabf89cdbd53eda5dcd65e518f243ba957ab59bdb8b9b19a12d5353e8a2e6d544506c39ddb8fcac7498dd5a33612548875db
-EBUILD selinux-djbdns-9999.ebuild 448 BLAKE2B eb06001eb69da903bb9b5978da4aca9e29b30b0df5a1dff6a09f81e3ccaab73067c2f3fdb0de6b7c4696f45d54f1cf4132fc69e7fbde69af70428707dbe3cf32 SHA512 4f69a6e5a84a55cace93beb6c0ade83a58ce2007893546701d7132d610ac767e5f2f099c72709d160e98f2d748fed13bbf922ae30aeaefb74ab6dc36878da42c
+EBUILD selinux-djbdns-2.20200818-r2.ebuild 443 BLAKE2B c2222e8210f5d4c8859fcad81d2bcc1011e7cd7d6a53f639a726bd682816274a8cad6d04f09310c7c7c70f5fdf3448bd5d454e16a972882169a6300f50d0d0fb SHA512 e75f6f87ba6f4dc30aa6d0217edbaa494e0e59297fcda6d7d4f9a7bde038e71162e494e26e04001baa3f4c451996be76e04f28fbe75721cce700bbfcc7e0ab69
+EBUILD selinux-djbdns-9999.ebuild 445 BLAKE2B b94961d2e6424a1d1aec5ae1b6dbbc2cc8576cd97884d8cfe2d69b7d3cf3cefa9dbfa064f3a1741b2372cb5e0f20e665f0aa01ea7d6f9215af245539ea000160 SHA512 ab060097001ac7bc34650c0a9229726312fba18e4584c19d6870425bf0bdd7514c771ad02277676e27149a22e54e8482d26254bc7a113529424a2a6be1404d02
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-djbdns/selinux-djbdns-2.20200818-r1.ebuild b/sec-policy/selinux-djbdns/selinux-djbdns-2.20200818-r1.ebuild
deleted file mode 100644
index 4fd14768c9de..000000000000
--- a/sec-policy/selinux-djbdns/selinux-djbdns-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="djbdns"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for djbdns"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-daemontools
-	sec-policy/selinux-ucspitcp
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-daemontools
-	sec-policy/selinux-ucspitcp
-"
diff --git a/sec-policy/selinux-djbdns/selinux-djbdns-2.20190201-r1.ebuild b/sec-policy/selinux-djbdns/selinux-djbdns-2.20200818-r2.ebuild
index 99eb073c70e1..8b44739905d7 100644
--- a/sec-policy/selinux-djbdns/selinux-djbdns-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-djbdns/selinux-djbdns-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="djbdns"
diff --git a/sec-policy/selinux-djbdns/selinux-djbdns-9999.ebuild b/sec-policy/selinux-djbdns/selinux-djbdns-9999.ebuild
index 6d03e0a05302..35e9afc97a35 100644
--- a/sec-policy/selinux-djbdns/selinux-djbdns-9999.ebuild
+++ b/sec-policy/selinux-djbdns/selinux-djbdns-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="djbdns"