gentoo resync : 14.07.2018

3 files changed, 5 insertions, 28 deletions

diff --git a/sec-policy/selinux-thunderbird/Manifest b/sec-policy/selinux-thunderbird/Manifest
index d4836d06a994..63d5184bcdcb 100644
--- a/sec-policy/selinux-thunderbird/Manifest
+++ b/sec-policy/selinux-thunderbird/Manifest
@@ -1,14 +1,12 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-thunderbird-2.20170805-r2.ebuild 390 BLAKE2B d44b2a181a6905fc843817df2c08370696f4d314e8df2eddc02f1fbf731b136be390f1ffe5fa3d247f237b4652aa8b140010cc0d1bfbf4b457e98624d45f7aaa SHA512 6f977f8d183a7832daf3a4790dc340da97f292b6b6e24387817b57251f2d6e53cb1e6fc7596bfd95e67a79cda36a82e8aca01f9b9e4c8d71a3b4ca92c48a6ae1
-EBUILD selinux-thunderbird-2.20170805-r3.ebuild 390 BLAKE2B d44b2a181a6905fc843817df2c08370696f4d314e8df2eddc02f1fbf731b136be390f1ffe5fa3d247f237b4652aa8b140010cc0d1bfbf4b457e98624d45f7aaa SHA512 6f977f8d183a7832daf3a4790dc340da97f292b6b6e24387817b57251f2d6e53cb1e6fc7596bfd95e67a79cda36a82e8aca01f9b9e4c8d71a3b4ca92c48a6ae1
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
 EBUILD selinux-thunderbird-2.20180114-r1.ebuild 390 BLAKE2B 510ce2af64dfdbb58247adcb95534540ab6a23a3a45bc8cd4fd683314233ccc393d0375cc56febc7f59850d8bf12518cdc732f30932ab58e71021bbffe196432 SHA512 0fb2721321e8b378eea559e2605691e2101b6095f3fbc6332c58d462679feea19b2320279041c2e2b7fb3724e5dd913fb9a2f20bd77acb3b6394dde94ca3113c
 EBUILD selinux-thunderbird-2.20180114-r2.ebuild 390 BLAKE2B 510ce2af64dfdbb58247adcb95534540ab6a23a3a45bc8cd4fd683314233ccc393d0375cc56febc7f59850d8bf12518cdc732f30932ab58e71021bbffe196432 SHA512 0fb2721321e8b378eea559e2605691e2101b6095f3fbc6332c58d462679feea19b2320279041c2e2b7fb3724e5dd913fb9a2f20bd77acb3b6394dde94ca3113c
 EBUILD selinux-thunderbird-2.20180114-r3.ebuild 392 BLAKE2B 4edde12b5b0519a3923e2c037e1167009270c0bd54b710d01c58f6b25760e761f9882c765ccda12e0f4c69087840c45fae835155ff15e3b3bd1a3043f2c1da1b SHA512 f8ea22df554fa6d7e0733c025bdea23ef155bb0fbc439d90f4cf51daa494c054f916dea0e68469af41fa151f4a294530c9c7b03f21b3f556794421415c9cdc86
+EBUILD selinux-thunderbird-2.20180701-r1.ebuild 392 BLAKE2B 4edde12b5b0519a3923e2c037e1167009270c0bd54b710d01c58f6b25760e761f9882c765ccda12e0f4c69087840c45fae835155ff15e3b3bd1a3043f2c1da1b SHA512 f8ea22df554fa6d7e0733c025bdea23ef155bb0fbc439d90f4cf51daa494c054f916dea0e68469af41fa151f4a294530c9c7b03f21b3f556794421415c9cdc86
 EBUILD selinux-thunderbird-9999.ebuild 392 BLAKE2B 4edde12b5b0519a3923e2c037e1167009270c0bd54b710d01c58f6b25760e761f9882c765ccda12e0f4c69087840c45fae835155ff15e3b3bd1a3043f2c1da1b SHA512 f8ea22df554fa6d7e0733c025bdea23ef155bb0fbc439d90f4cf51daa494c054f916dea0e68469af41fa151f4a294530c9c7b03f21b3f556794421415c9cdc86
 MISC metadata.xml 321 BLAKE2B 803c387bb4a8c829e856e92c76897b4af3d810ca56a257d12b08d29adcb779add9821927c6c20fc14adeb3c3638042b043cf58630635f6f3ee8aa906c3aea8c4 SHA512 883b02eb500849986493b7ef57241788991bbb266076583b5d5436b31c841ca789eda0d04e74e3ff7b1bff87270a409352f077d62d4b8bf280c12f36da01856e
diff --git a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170805-r3.ebuild b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170805-r3.ebuild
deleted file mode 100644
index 7ead7c22e75c..000000000000
--- a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="thunderbird"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for thunderbird"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170805-r2.ebuild b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20180701-r1.ebuild
index 7ead7c22e75c..fe691d8cd407 100644
--- a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20180701-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # 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 thunderbird"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver