gentoo resync : 14.12.2020

4 files changed, 6 insertions, 24 deletions

diff --git a/sec-policy/selinux-tripwire/Manifest b/sec-policy/selinux-tripwire/Manifest
index 4e31efaef6f3..8a7facf548f7 100644
--- a/sec-policy/selinux-tripwire/Manifest
+++ b/sec-policy/selinux-tripwire/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-tripwire-2.20190201-r1.ebuild 283 BLAKE2B ccd98ca72969d8949fe63ae594dcb74d4290089e94e93d63222e88577e2327caf55937c8a612f96035d5dbfa2c4e901159600733a16b77e836ce9ac3607642c3 SHA512 704d837b2534be4397ce92c4bd1a776b17047f77e82daec9540c2bd422fdf7d9529e9a4c3a9fb487fe63d4a5807ec41a9b65bcf03621fbb2ac78ff8a123f3605
 EBUILD selinux-tripwire-2.20190609-r1.ebuild 283 BLAKE2B ccd98ca72969d8949fe63ae594dcb74d4290089e94e93d63222e88577e2327caf55937c8a612f96035d5dbfa2c4e901159600733a16b77e836ce9ac3607642c3 SHA512 704d837b2534be4397ce92c4bd1a776b17047f77e82daec9540c2bd422fdf7d9529e9a4c3a9fb487fe63d4a5807ec41a9b65bcf03621fbb2ac78ff8a123f3605
-EBUILD selinux-tripwire-2.20200818-r1.ebuild 285 BLAKE2B e5c8aee4403594ce1b287c26b6cba68b0a5348ca1d094dfb295c16354df4664ecdcfa90aee112368cad2be2c5ea48186dc3cded3adf7b29347f6ec6613a92e57 SHA512 a685a8b3e9cfefdf1844486bbe47f5eacce78be48d069007d18f310f040a9fae7a4e6baa05b3ebcc31b1e5eaea2391b2418ea57a715bde3fd0c9673291da65b3
-EBUILD selinux-tripwire-9999.ebuild 288 BLAKE2B dc176e63b144a1745cc89da3b2cb7b3f0a32088fc57c24d5f0450bab59b241586fb3a660a3a86a43132466d1139858b609a7667da81d20d04584acffaa073e27 SHA512 3c6bdb088be56830df7815cdb56f0b4ae95bf1d97a7c937ee310c71957b41bfd903c85d6c112029d5075aaf7ec6bbe935a14984707f0b82661b5de88eba40774
+EBUILD selinux-tripwire-2.20200818-r2.ebuild 283 BLAKE2B eba09247e9d331a7f26f45d8140d4e7e2afcbb85538d32b0dccd4dfdc09bca17ea150fbd4ba9e7b3e8a3c910817ec4367b3ab1581767f5c01518d343dce3f154 SHA512 eb7436c2650a0bf6fd49067ddf78394302ec53b4dda90a6dfd8469a1c6750fd4f9b24845d8ec6b3c903e298febf1e8bfeab38b76b34111a44d4a921114c4badd
+EBUILD selinux-tripwire-9999.ebuild 285 BLAKE2B bb140ece7d86a7d90dfd7c94cfb94c02babc2aea4d5d044370612204cc68d8cb3fcf44cf55eb62e4a6446e05d735adc2667c761c5bf429cad10f3171dad136a1 SHA512 a094e1894812dbe4d0a6c88c7182cb100876dd96cee27248a8bc1c79ab7878e3b8f083597b99f46f006bef37c541651778ae9771085585410e428d883e4866dc
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-tripwire/selinux-tripwire-2.20200818-r1.ebuild b/sec-policy/selinux-tripwire/selinux-tripwire-2.20200818-r1.ebuild
deleted file mode 100644
index 4186fe2f7c8e..000000000000
--- a/sec-policy/selinux-tripwire/selinux-tripwire-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="tripwire"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tripwire"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-tripwire/selinux-tripwire-2.20190201-r1.ebuild b/sec-policy/selinux-tripwire/selinux-tripwire-2.20200818-r2.ebuild
index 87ec997968ea..849109b7156d 100644
--- a/sec-policy/selinux-tripwire/selinux-tripwire-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-tripwire/selinux-tripwire-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="tripwire"
diff --git a/sec-policy/selinux-tripwire/selinux-tripwire-9999.ebuild b/sec-policy/selinux-tripwire/selinux-tripwire-9999.ebuild
index 748273d6d53f..ce4895afdc4a 100644
--- a/sec-policy/selinux-tripwire/selinux-tripwire-9999.ebuild
+++ b/sec-policy/selinux-tripwire/selinux-tripwire-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="tripwire"