gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-tgtd/Manifest b/sec-policy/selinux-tgtd/Manifest
index 63baf34db920..592440fa2819 100644
--- a/sec-policy/selinux-tgtd/Manifest
+++ b/sec-policy/selinux-tgtd/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-tgtd-2.20190201-r1.ebuild 275 BLAKE2B 440b48c8d6a7ff6532d1d7436dca9d5de3a9f1e2e6641bc31b54e5dd74088dad4c9f1671eba952e82114a01af09fc02dd7d76766184ecfe9c4f82140ab0b8d9e SHA512 b5e30f711a2a7102ad0a27c68c76d15fb74f96062f4a200527fdd74fba0ff732737c34f4a3a11261965f1a894c616c829b6c8f2af2ff0a3a89549095efdde49c
 EBUILD selinux-tgtd-2.20190609-r1.ebuild 275 BLAKE2B 440b48c8d6a7ff6532d1d7436dca9d5de3a9f1e2e6641bc31b54e5dd74088dad4c9f1671eba952e82114a01af09fc02dd7d76766184ecfe9c4f82140ab0b8d9e SHA512 b5e30f711a2a7102ad0a27c68c76d15fb74f96062f4a200527fdd74fba0ff732737c34f4a3a11261965f1a894c616c829b6c8f2af2ff0a3a89549095efdde49c
-EBUILD selinux-tgtd-2.20200818-r1.ebuild 277 BLAKE2B 8c351a5b1c804b4c19fd95d8583c52e6a1a4bbecff4479627c6cf0b14c1962efb220968d25a1b057e3bde91ca004c6a57b68cdee00dff6929cf26f2ee65c2755 SHA512 6fd39446213a35b9285765ac399999f46d8bcfbcbf1d9f3d7f50e9db34b4ee787db853daff4e2faf36a66073895dbc9a3b1dbb6ccf2353154b82b4c44edc072b
-EBUILD selinux-tgtd-9999.ebuild 280 BLAKE2B 49d777f3f0ac9185d5ec51997b9b7030420607cfd7159f3a68249ded9a737629b147ac75d8e2792b771ae094c29827528472755e1b3737c6f81344ff150f3d1a SHA512 33a0e373697837325b242ea60e5abd10526059eb2448a92fd0da2de972dd9e6769f2a8789943ff54501c83b9922d2a04efc0911d8599fd42c70b8fc1ee0b4bcc
+EBUILD selinux-tgtd-2.20200818-r2.ebuild 275 BLAKE2B e6108d7a7ded30378777b0677fc43ee0cd85a2328c3f02273e771731cf44ae1a41fdbb04d699afe3bcd9046d001765eed71519b16c2927f13ec6c7b15636f960 SHA512 e9f479a86089d12f2dc32eaf172a6961358df7ac7fb946169fbeb8011a4a6a5f7d0978b6b3e9bc7f4561b8c3806b782855049ac48d073e1ddfe1d40975b9bb38
+EBUILD selinux-tgtd-9999.ebuild 277 BLAKE2B 655cf9bd7e68722402a3a192fe2bee1d8553f069a117363db0a83097bb77838d22c4439010cfd2674499d8cbbcb2901995b2c02c4211c3ae63fec917cd541501 SHA512 655634558bf1dade15572046cfc226c897911c6f0325758890f1eb0038d8e92e5cdbc8a153174d9b0935fef6dd263205ea31102c1f6aab9165b0edaaa68b2a7f
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-tgtd/selinux-tgtd-2.20200818-r1.ebuild b/sec-policy/selinux-tgtd/selinux-tgtd-2.20200818-r1.ebuild
deleted file mode 100644
index 1e67a6ac9115..000000000000
--- a/sec-policy/selinux-tgtd/selinux-tgtd-2.20200818-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tgtd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tgtd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-tgtd/selinux-tgtd-2.20190201-r1.ebuild b/sec-policy/selinux-tgtd/selinux-tgtd-2.20200818-r2.ebuild
index 57e01c6743b4..d22971365234 100644
--- a/sec-policy/selinux-tgtd/selinux-tgtd-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-tgtd/selinux-tgtd-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="tgtd"
diff --git a/sec-policy/selinux-tgtd/selinux-tgtd-9999.ebuild b/sec-policy/selinux-tgtd/selinux-tgtd-9999.ebuild
index 6df710db4630..0d7645c9cc54 100644
--- a/sec-policy/selinux-tgtd/selinux-tgtd-9999.ebuild
+++ b/sec-policy/selinux-tgtd/selinux-tgtd-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="tgtd"