gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-hddtemp/Manifest b/sec-policy/selinux-hddtemp/Manifest
index 0fc9586cfa85..ec0111c3ee71 100644
--- a/sec-policy/selinux-hddtemp/Manifest
+++ b/sec-policy/selinux-hddtemp/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-hddtemp-2.20190201-r1.ebuild 281 BLAKE2B a8d481dd3dfbc365f485b2019b62574184b914f1672e2c76a7a085a75074ee62a45bb1bc0d134ae41c2fd955fb095df558525fe93b8528d8d19ff429ae416271 SHA512 5dc9b72547cf47c8d5c2b7f1ecdfcafd3097a07954d103fc2f7a79901b93979c0d65786b44b387ef9607c2cd91413b8018a647e85e9d1b5e21f95d013d3736eb
 EBUILD selinux-hddtemp-2.20190609-r1.ebuild 281 BLAKE2B a8d481dd3dfbc365f485b2019b62574184b914f1672e2c76a7a085a75074ee62a45bb1bc0d134ae41c2fd955fb095df558525fe93b8528d8d19ff429ae416271 SHA512 5dc9b72547cf47c8d5c2b7f1ecdfcafd3097a07954d103fc2f7a79901b93979c0d65786b44b387ef9607c2cd91413b8018a647e85e9d1b5e21f95d013d3736eb
-EBUILD selinux-hddtemp-2.20200818-r1.ebuild 283 BLAKE2B 8e432f21cf62aec8989cbd32128e51ab54651915e994a807e6b5b7f4fc045ad875807ebe3166473d313a9dc4d8c457172a1f33a19f962a05ce27b1b0895f7f7b SHA512 dcc44f2090f01b38188e54e34f519bafb961499efb2771255113cdde931f202c1a9c651b8d628af7490be159a65331110927ef4ef5fdc70d0c0e4f6f2a02d93f
-EBUILD selinux-hddtemp-9999.ebuild 286 BLAKE2B 47728d56bd4fb51cde0c2dce236d5cc62d75d585260a7f7ecb312946730cad012797bbc9312409e062e3e25cfe901862925a1d11378afb16e2b06514b5eb40f7 SHA512 215a747fb3f0787acf0ef0757f26210052631cafc7d7ebbad631e090f897e605906aaf5d428c6adc345259dec79ac50773ed50df7cb128b44a8ac0b29d9094fb
+EBUILD selinux-hddtemp-2.20200818-r2.ebuild 281 BLAKE2B bb718bee7ab9eb495066aeca5ad3b9aea9c0f2b807272a9a140d4d7287f0852be4e2a087824c6266b91dd5144bca6b893f5427032464d50192fe5eb1feb1133c SHA512 3f4335852ad4ad8797978d18a00e74f17cb57ace7d6f7c15d7a6a1b21b575493cec95da68b774744ffec4f335eca6ff9e663f2ea0ad4b18bff822a04974ea049
+EBUILD selinux-hddtemp-9999.ebuild 283 BLAKE2B 307d0d4b1871f968d08eae1cd7df7c66974ef27a1108d05b09c2c30959cabd3049af598481c19d921e7da3033766c6b0ff825a45d629e9f2ede807e3db2a064a SHA512 0893a590a6d5bf524213d2714761eb4eff05acdfafc90a70844b11c4c0b6c4b1e928bb00c233725ad6d2281f1b355440d0d6e5951dfdd397df4f5e2dba07944e
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20200818-r1.ebuild b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20200818-r1.ebuild
deleted file mode 100644
index 5be1701c8c9d..000000000000
--- a/sec-policy/selinux-hddtemp/selinux-hddtemp-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="hddtemp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for hddtemp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20190201-r1.ebuild b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20200818-r2.ebuild
index b677c4b786b0..9e5345aeaf67 100644
--- a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-hddtemp/selinux-hddtemp-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="hddtemp"
diff --git a/sec-policy/selinux-hddtemp/selinux-hddtemp-9999.ebuild b/sec-policy/selinux-hddtemp/selinux-hddtemp-9999.ebuild
index 9cadc59e8777..354d73492c0e 100644
--- a/sec-policy/selinux-hddtemp/selinux-hddtemp-9999.ebuild
+++ b/sec-policy/selinux-hddtemp/selinux-hddtemp-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="hddtemp"