gentoo resync : 17.02.2020

3 files changed, 30 insertions, 3 deletions

diff --git a/sec-policy/selinux-android/Manifest b/sec-policy/selinux-android/Manifest
index 3753f8dce5d7..9f695f035169 100644
--- a/sec-policy/selinux-android/Manifest
+++ b/sec-policy/selinux-android/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-android-2.20180114-r1.ebuild 433 BLAKE2B c9e514389ca165a5116ca9010b59b83952981b54d32a078e15f56fdf21a98f5629775ef24dd9b870da57b205c130ddb0dc15f6d687a69e272d70ccee62bd799e SHA512 7045846caadde5d99b5e2b2049be011b771f28a34b541a36bb50c7a9995e13e72d43dfeff43a9ab1ee81013a85dd0e2d8c92d429557c4989c49df3473f29645b
 EBUILD selinux-android-2.20180114-r2.ebuild 433 BLAKE2B c9e514389ca165a5116ca9010b59b83952981b54d32a078e15f56fdf21a98f5629775ef24dd9b870da57b205c130ddb0dc15f6d687a69e272d70ccee62bd799e SHA512 7045846caadde5d99b5e2b2049be011b771f28a34b541a36bb50c7a9995e13e72d43dfeff43a9ab1ee81013a85dd0e2d8c92d429557c4989c49df3473f29645b
 EBUILD selinux-android-2.20180114-r3.ebuild 435 BLAKE2B 25d20cfddb37edb18b743c7a8365e2190edb996a87f9e5b2c49b7082cfc0456a0bf651d181f1c36cb1cfd457ecb449732d4612f19eaa51d179a007cd2171db62 SHA512 dd9773515c7f8566f403f9e28817e634a4b9a560da71e3f1af8e498160b858bdccc948737a124a2598f1664f4eda4124f3f5969c16340aa01e0c65f370b97ee2
 EBUILD selinux-android-2.20180701-r1.ebuild 433 BLAKE2B c9e514389ca165a5116ca9010b59b83952981b54d32a078e15f56fdf21a98f5629775ef24dd9b870da57b205c130ddb0dc15f6d687a69e272d70ccee62bd799e SHA512 7045846caadde5d99b5e2b2049be011b771f28a34b541a36bb50c7a9995e13e72d43dfeff43a9ab1ee81013a85dd0e2d8c92d429557c4989c49df3473f29645b
 EBUILD selinux-android-2.20180701-r2.ebuild 432 BLAKE2B 86db5245e4865e62afec0da20318c339285644578e56a0378be025bb54f2c4b720f9cebe6b918bfba48d709c9a37e957de55063afefb748aac78e367c3ce65b4 SHA512 b5076148968c18971b453c326392385efae705a218e2a622786af977406875e2160c0407115f3d4376ee87d9ad46756b0d31546ba99623565c1443f0e0c3e322
-EBUILD selinux-android-2.20190201-r1.ebuild 432 BLAKE2B 00d835d1ab2fe49b9862053932f622fc65606382f4a7c6491d9a6eeaa3d918cd62099826018e2ef8862c8058a34602b7996b0b1a85842a107bbe46cdee5055e0 SHA512 3904eda16a981e1146cd4a51149bda8f5bae5bc5f9fdb91a66839bb38d9b46e163bdaa056a09989f4a54ef296705974ed4871f3cd1b724aed54550f69ed9273c
+EBUILD selinux-android-2.20190201-r1.ebuild 430 BLAKE2B 39a1aab1387201c32d9892ab93ff2d887e3afaf85420e66014879e824fc05d53b2f37257c31137a3d358a4de560b35db616d22c991d574dce4abed48579ada74 SHA512 3106f5a1a336e2dc1e455e5f6c0456678bb3ac398072f0f118684db3a87958bd56736309866b2d3e7ebd8f752dc9923990249b1568d816477a6932632cbddbe5
+EBUILD selinux-android-2.20190609-r1.ebuild 432 BLAKE2B efdc02a739dd8dc2a7ae232709e4b816a1858ce74ad00630049f6eec6c94e2d64939f1f1f83f51b338e44defdaa766e0dadd6b9ec01c0b4a013a815299905789 SHA512 7518408c5591ced1e373795062897d27e1dbc514216cf8ef342b6d29e91418966b9f9ddbc6afe08aad4f2369d588f0e7df62fca27c5a85be7faf75a8e587b458
 EBUILD selinux-android-9999.ebuild 435 BLAKE2B 25d20cfddb37edb18b743c7a8365e2190edb996a87f9e5b2c49b7082cfc0456a0bf651d181f1c36cb1cfd457ecb449732d4612f19eaa51d179a007cd2171db62 SHA512 dd9773515c7f8566f403f9e28817e634a4b9a560da71e3f1af8e498160b858bdccc948737a124a2598f1664f4eda4124f3f5969c16340aa01e0c65f370b97ee2
 MISC metadata.xml 317 BLAKE2B 0eb943554a2dce9c3ddd27c1599d70bf3023fa16142d335ba27922287a8201002822ce6b396551cae6b1ee47c686de96638c1aa44906c14a673cbdea181775c2 SHA512 fdaad87814ab78792c7bb30ba017e2f7ae7e25dd11701b2cca62c6847f5f79a59d453865aee812ce0c1d6842f9ba1867ac0206fecfd2edbc40da6ee45f56a428
diff --git a/sec-policy/selinux-android/selinux-android-2.20190201-r1.ebuild b/sec-policy/selinux-android/selinux-android-2.20190201-r1.ebuild
index 54deff7b2938..031c3d821d9c 100644
--- a/sec-policy/selinux-android/selinux-android-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-android/selinux-android-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 android"
 
 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-android/selinux-android-2.20190609-r1.ebuild b/sec-policy/selinux-android/selinux-android-2.20190609-r1.ebuild
new file mode 100644
index 000000000000..8096d1741803
--- /dev/null
+++ b/sec-policy/selinux-android/selinux-android-2.20190609-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="android"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for android"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+
+DEPEND="${DEPEND}
+	sec-policy/selinux-java
+	sec-policy/selinux-xserver
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-java
+	sec-policy/selinux-xserver
+"