gentoo resync : 17.02.2020

3 files changed, 28 insertions, 3 deletions

diff --git a/sec-policy/selinux-gpg/Manifest b/sec-policy/selinux-gpg/Manifest
index 53d693b5aac0..040e6fac5886 100644
--- a/sec-policy/selinux-gpg/Manifest
+++ b/sec-policy/selinux-gpg/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-gpg-2.20180114-r1.ebuild 375 BLAKE2B 8f82301056fd5b042dde285220f4eab3478ee7feb530323a6ddffe408b3f1b86d666c07161c19215a8bb2b311a57a837cd94ff302e589386875cb3bebac1612a SHA512 35b8edef3d506aa496b5746911227d93384ff3af629374ba97a488a549879edfc57bdf12924f97e3906c63fcdf31f05a224d1fccd336e6cca348b9f123c87ac7
 EBUILD selinux-gpg-2.20180114-r2.ebuild 375 BLAKE2B 8f82301056fd5b042dde285220f4eab3478ee7feb530323a6ddffe408b3f1b86d666c07161c19215a8bb2b311a57a837cd94ff302e589386875cb3bebac1612a SHA512 35b8edef3d506aa496b5746911227d93384ff3af629374ba97a488a549879edfc57bdf12924f97e3906c63fcdf31f05a224d1fccd336e6cca348b9f123c87ac7
 EBUILD selinux-gpg-2.20180114-r3.ebuild 377 BLAKE2B 77d92a948b3f1efbdfea3e400ef57cbe0c26b0ce728964cf8dd1e25225e3f4a74356edaeaf7ad4c3284462f48c005570239bdd01c0d3716c853077db2dabed4c SHA512 6b07e76281819406a5d6bfc8d668ca9816bf25383891a0119c01e67d54398cc447cec135b6dc1a97427f6dfe39a7af0e5039434bec31805399e26c17a3b88da7
 EBUILD selinux-gpg-2.20180701-r1.ebuild 375 BLAKE2B 8f82301056fd5b042dde285220f4eab3478ee7feb530323a6ddffe408b3f1b86d666c07161c19215a8bb2b311a57a837cd94ff302e589386875cb3bebac1612a SHA512 35b8edef3d506aa496b5746911227d93384ff3af629374ba97a488a549879edfc57bdf12924f97e3906c63fcdf31f05a224d1fccd336e6cca348b9f123c87ac7
 EBUILD selinux-gpg-2.20180701-r2.ebuild 374 BLAKE2B 0bf7c857e3f92a0c93e3c67bccc7aab352bb352aab8d6b512d6e0bc7c0048a067c7abebccfe4afba1d1eb84628941cffe6d865ce6216a2a4ddc4ca0263f8b161 SHA512 383ec4f5314aab857e70b1e00eaa0a9c9e85d16291df57e47fc5668103b36f6b958012b417b1ade017f17b91f5482d56cf5d117dbcfecce094a0958ed354f6ce
-EBUILD selinux-gpg-2.20190201-r1.ebuild 374 BLAKE2B 0b4cf32f16703f65521ef1703616be724d186afbe82c1352853fe1cc578a9c6c9e4ea15c13284557cfe1f8dfbdfd6b382c2db22efce0fa0e654d3310636674b2 SHA512 698a09d787e3a065c94fe79ea8f5d3363010e05443cc8231d0d02128a999cf5c08f7a35e1aa8416441f0ddb7239a33d1e00eb0964823d0a5220ffe53798f8421
+EBUILD selinux-gpg-2.20190201-r1.ebuild 372 BLAKE2B d0312cb72123770bb0d864418d00048b8d2e5cd3b900912872d39f35052c320dca941949c1b8b4d1d61d044e65499ac4ca4d286a83762ef151cc0a197b9d4391 SHA512 5195867c53a06a1f8077047b1bcb587c85efed7103fc12ea8cb724ada7c812182dc0cf1456cb847989d3c62834a48d0d5d5a113a1fc482336e98a6dae1b259b9
+EBUILD selinux-gpg-2.20190609-r1.ebuild 374 BLAKE2B cd6319f3a4fab473fe1a34443e16d7d6b39dafe11f518ceb71985ac2f12f138c1fc144358ef0ad2d25d8a5dadbb514c1dbb2c35ccf79d3ed4f603dd8c20f31f3 SHA512 512a4431a59699884e91ec9fb2f6fdd453770d1009c50f29a2bce7a66e8f370be93c85e6f115dc686248aefbce5f36367a15d2d7aeca5193326b85cbf11f19b3
 EBUILD selinux-gpg-9999.ebuild 377 BLAKE2B 77d92a948b3f1efbdfea3e400ef57cbe0c26b0ce728964cf8dd1e25225e3f4a74356edaeaf7ad4c3284462f48c005570239bdd01c0d3716c853077db2dabed4c SHA512 6b07e76281819406a5d6bfc8d668ca9816bf25383891a0119c01e67d54398cc447cec135b6dc1a97427f6dfe39a7af0e5039434bec31805399e26c17a3b88da7
 MISC metadata.xml 315 BLAKE2B f1ad4327dbf000875d21f426a15d4e8acd3f1f6c0a4934697f805d5a3f9a304ddfac85e5563119d39f40ce78adb9869208ef0e54f580a34e7649c7a1c8edeba3 SHA512 5d35232f8849235b089f2f8b7e4eb1b1692e805a196605e51d78ac960613ba9116b25ddeb4bc3141a043af41454ad653bd4cd44ab8bf386c0d89075b75028f35
diff --git a/sec-policy/selinux-gpg/selinux-gpg-2.20190201-r1.ebuild b/sec-policy/selinux-gpg/selinux-gpg-2.20190201-r1.ebuild
index 22b09ad8a634..5cf174af34fd 100644
--- a/sec-policy/selinux-gpg/selinux-gpg-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-gpg/selinux-gpg-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 gpg"
 
 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-gpg/selinux-gpg-2.20190609-r1.ebuild b/sec-policy/selinux-gpg/selinux-gpg-2.20190609-r1.ebuild
new file mode 100644
index 000000000000..60cf29e2355f
--- /dev/null
+++ b/sec-policy/selinux-gpg/selinux-gpg-2.20190609-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="gpg"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gpg"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+
+DEPEND="${DEPEND}
+	sec-policy/selinux-dirmngr
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-dirmngr
+"