gentoo resync : 14.12.2020

4 files changed, 6 insertions, 30 deletions

diff --git a/sec-policy/selinux-tcpd/Manifest b/sec-policy/selinux-tcpd/Manifest
index 4c866a4fc56f..3fb32cd2fe7c 100644
--- a/sec-policy/selinux-tcpd/Manifest
+++ b/sec-policy/selinux-tcpd/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-tcpd-2.20190201-r1.ebuild 369 BLAKE2B aa2e7b1295709250a9ec4d3410b57c196114779c003752eaaff276507fefe7149f732bfc911918ff5415cead5e5da52c22c64b7f2d064c76d5c8d7db6ec545e1 SHA512 3bc6615fbf7d0e364dd00af18a1d9262967383917dee55f334aca02096705e7d9726ad00cc162664883cd78b48dcf3111efef25ebf0d045977895582e468aeda
 EBUILD selinux-tcpd-2.20190609-r1.ebuild 369 BLAKE2B aa2e7b1295709250a9ec4d3410b57c196114779c003752eaaff276507fefe7149f732bfc911918ff5415cead5e5da52c22c64b7f2d064c76d5c8d7db6ec545e1 SHA512 3bc6615fbf7d0e364dd00af18a1d9262967383917dee55f334aca02096705e7d9726ad00cc162664883cd78b48dcf3111efef25ebf0d045977895582e468aeda
-EBUILD selinux-tcpd-2.20200818-r1.ebuild 371 BLAKE2B 45c75342f53bd64d59db96ecd618016c5a1e329432bb2b2f4043ca9e71623ae96b6470aaccbdaaafb7b48a3c1ea9eba4d18a8df40a1692d476b3772ee6c04333 SHA512 f49219c1f05cac03b56c440e05fb2e350dfc2b7f6995b89f5ec668d948fe34336f231b654c68f93200752e429616bc6269e97dcdcca412ddc4b0b24375049fc0
-EBUILD selinux-tcpd-9999.ebuild 374 BLAKE2B a28daa3dcbdcf008410b559ca759dcad5c749383e92d46f8ab75f4d19aeb7133012e8e563896ba202d103cef167ffc0e84e8bfa568814e42c900dc5ae95ba270 SHA512 a55dc5ff1872639822ae44f6e67d85d807b47030fcc3ff3f3798ae6867bb830fdb6d07873eddb4f98c3fad419c6d5b26e250bb34440c8eb434c230d8204fdc2a
+EBUILD selinux-tcpd-2.20200818-r2.ebuild 369 BLAKE2B 3b6fa706268892351f17064e8daffff7b62994a1e3e86d2b9f33fb98d3d39b9c64c9fb2c381b9e3f71aea374714cee559d1fcbbde53d19777f0550f4149f81a1 SHA512 ed543952b02c10c52f4c41ad753494ac2db648488ef356e9587c6c9ab24ed76952c6a4212aaea2f7de779564a0c04a7fee2041d2a57cbb310347f22cb7d96ef7
+EBUILD selinux-tcpd-9999.ebuild 371 BLAKE2B b65d6cbbeb83b8d9cbbc48b6015f86f52147c88dab0cfde802c75a0a3d29565195ceee60553982ccbd2c3d2fe9c9a21457641e9d304886299b5bfee09e3b5d05 SHA512 44d598dc69a091c1a86d14308c8b178db878e84e79b933ecfff3b3b312c5f444a9ab1bb7228329cc57d6c417f28e5af08dbae3f3d8f55a47a54f48738fb761e8
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-tcpd/selinux-tcpd-2.20200818-r1.ebuild b/sec-policy/selinux-tcpd/selinux-tcpd-2.20200818-r1.ebuild
deleted file mode 100644
index 6c5547717f19..000000000000
--- a/sec-policy/selinux-tcpd/selinux-tcpd-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="tcpd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tcpd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-tcpd/selinux-tcpd-2.20190201-r1.ebuild b/sec-policy/selinux-tcpd/selinux-tcpd-2.20200818-r2.ebuild
index 2e55abea5766..b1222e12aa03 100644
--- a/sec-policy/selinux-tcpd/selinux-tcpd-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-tcpd/selinux-tcpd-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="tcpd"
diff --git a/sec-policy/selinux-tcpd/selinux-tcpd-9999.ebuild b/sec-policy/selinux-tcpd/selinux-tcpd-9999.ebuild
index dbaebf94c9a4..74bed79dbd35 100644
--- a/sec-policy/selinux-tcpd/selinux-tcpd-9999.ebuild
+++ b/sec-policy/selinux-tcpd/selinux-tcpd-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="tcpd"