gentoo resync : 17.02.2020

3 files changed, 29 insertions, 3 deletions

diff --git a/sec-policy/selinux-collectd/Manifest b/sec-policy/selinux-collectd/Manifest
index b5055377ba53..99c2e8b00545 100644
--- a/sec-policy/selinux-collectd/Manifest
+++ b/sec-policy/selinux-collectd/Manifest
@@ -4,14 +4,17 @@ DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5
 DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST patchbundle-selinux-base-policy-2.20180701-r2.tar.bz2 320881 BLAKE2B 12382c64ff8d2acef97ae50b0285061b7f018df0d94034670696b6f19003ee9c9c4f66c711e744696e47145857fcbd577a7762fa807921b40a5366e473901687 SHA512 29453f9deb90b7f982d5a6a3161d79a8171d58d20c0e0de523347d4f1296ad3d4ed970ada0823692e8def4f21756d727628bd919802ec2b1c39087ce5d0811b0
 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 refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
 DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
+DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-collectd-2.20180114-r1.ebuild 384 BLAKE2B e2faffda08dd86db36e5380f9799973b8f9aaf950ba789de2b65edaad2b1ba2bc9aabdfd6c6deee4ac2dfe62d9740a10d35f25696e1dbf7c9d51a50cbb5643db SHA512 e74afb7f2d640d0532696757224e7ba9fc6183820811faf57e77a59459f77a29742a46421feed1baacac68878c3fd00c446c80119e6d1d6613e4bfc0ce384f2e
 EBUILD selinux-collectd-2.20180114-r2.ebuild 384 BLAKE2B e2faffda08dd86db36e5380f9799973b8f9aaf950ba789de2b65edaad2b1ba2bc9aabdfd6c6deee4ac2dfe62d9740a10d35f25696e1dbf7c9d51a50cbb5643db SHA512 e74afb7f2d640d0532696757224e7ba9fc6183820811faf57e77a59459f77a29742a46421feed1baacac68878c3fd00c446c80119e6d1d6613e4bfc0ce384f2e
 EBUILD selinux-collectd-2.20180114-r3.ebuild 386 BLAKE2B a0ada1b380690f03e6630fcf9c77dd783ab14135bcae03cce604b112a917f795dae5bc017ef91b798408dcb5a6fc3fc6344e878e76306498ef68aec63e46e653 SHA512 31f4d90d4ab0b1c7c8a0ae8ad4dc7867d7d947c6d3f7ffd4cbddc1db15b92b5467f041ffef463ee74bd0347d6d5d7ce88c21356ea76b679bdfa4a5979a988e92
 EBUILD selinux-collectd-2.20180701-r1.ebuild 384 BLAKE2B e2faffda08dd86db36e5380f9799973b8f9aaf950ba789de2b65edaad2b1ba2bc9aabdfd6c6deee4ac2dfe62d9740a10d35f25696e1dbf7c9d51a50cbb5643db SHA512 e74afb7f2d640d0532696757224e7ba9fc6183820811faf57e77a59459f77a29742a46421feed1baacac68878c3fd00c446c80119e6d1d6613e4bfc0ce384f2e
 EBUILD selinux-collectd-2.20180701-r2.ebuild 383 BLAKE2B 8852ed7926ce1f63790b350798d023a8e38ebbfe7527e166855465945502b87871df7b0263916581f61ac015ac77ba0500e7793b9b97ac2f7fd2727929092468 SHA512 b4bfea235a769782ac7c11f62a67904128d63c09e290ae288808a6171d0d4e40394871f50078ee93b3afa357a80263b6df255655300a45b7f7066edd690a8899
-EBUILD selinux-collectd-2.20190201-r1.ebuild 383 BLAKE2B a0b6731640fdce8dab607e99cffbfa54aa006c555911c9362fa7f0c9ffaf56d5c6054459a524c363ae951081b2da4f00be331db344a5e6fa580485ad8aa6d2b1 SHA512 759dda334ee5ee3b8f61f18a7a1f256658d063fcdd673d7974a982a05318a11075d1acb46d2d1340bc7789ca525747b50c22172eb1238195d90c8dbc0b5b30c1
+EBUILD selinux-collectd-2.20190201-r1.ebuild 381 BLAKE2B 17a959cd1db858ee52adaf8020211354cd5c91145a07ff7c4bba7c333c7428a08b098ce1eaa98a5bbc66b33ab740dd76f9dbaed419b54199c696f4f31bd44c2b SHA512 32002c22388a3b6e79a2a39380f1270d73b3e91e47872b72bcb69cfc7ca8a9f2ce0e408b35c2b8446f2afb3c69dbc4821f22148ce778e2c708ebe4f742853cde
+EBUILD selinux-collectd-2.20190609-r1.ebuild 383 BLAKE2B cd94dc9ec044608768fb740cff2583d0232a6ca167719aab9caa374b9b503d9f86e33a72292f94509bcfaa3ef56fac0b453a9b8073336197685fed0e3b8a523e SHA512 6a79b8ccca6badafb7ea278f82fe5985d2290ae28e42b1aea4ae6ebdcb6d6fb0d19ec649794349ec0fc794320e311af5a7f2f2b4fefbff7e53aef9d9382b7fb6
 EBUILD selinux-collectd-9999.ebuild 386 BLAKE2B a0ada1b380690f03e6630fcf9c77dd783ab14135bcae03cce604b112a917f795dae5bc017ef91b798408dcb5a6fc3fc6344e878e76306498ef68aec63e46e653 SHA512 31f4d90d4ab0b1c7c8a0ae8ad4dc7867d7d947c6d3f7ffd4cbddc1db15b92b5467f041ffef463ee74bd0347d6d5d7ce88c21356ea76b679bdfa4a5979a988e92
 MISC metadata.xml 318 BLAKE2B be69d0693525604ac1c29e2fec3384e737f531ad9f94245b9cc65d8d2d5ac3c46079d7206565da1b5d5a89d1aa5be8f78eddc31fa158768dbfdb37f96826561b SHA512 6da5121253ae7018f81cc66a816a364e836e226e2e679f245acd61d6bdbe5fed013032bc4d3f38b917a4372a436ee08b53d0c379b9daa3f8ef6c7797fcd59b54
diff --git a/sec-policy/selinux-collectd/selinux-collectd-2.20190201-r1.ebuild b/sec-policy/selinux-collectd/selinux-collectd-2.20190201-r1.ebuild
index 1d7fb3364c0d..2eb2d32bcbb6 100644
--- a/sec-policy/selinux-collectd/selinux-collectd-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-collectd/selinux-collectd-2.20190201-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for collectd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-collectd/selinux-collectd-2.20190609-r1.ebuild b/sec-policy/selinux-collectd/selinux-collectd-2.20190609-r1.ebuild
new file mode 100644
index 000000000000..82578a806621
--- /dev/null
+++ b/sec-policy/selinux-collectd/selinux-collectd-2.20190609-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="collectd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for collectd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-apache
+"