gentoo resync : 28.04.2018

3 files changed, 19 insertions, 2 deletions

diff --git a/sec-policy/selinux-spamassassin/Manifest b/sec-policy/selinux-spamassassin/Manifest
index be8274d25971..9ba82cec1dd0 100644
--- a/sec-policy/selinux-spamassassin/Manifest
+++ b/sec-policy/selinux-spamassassin/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 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 refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-spamassassin-2.20170805-r2.ebuild 294 BLAKE2B 39b2ba39d1c50e7ef62
 EBUILD selinux-spamassassin-2.20170805-r3.ebuild 294 BLAKE2B 39b2ba39d1c50e7ef62ce7b86f9c88f82d45e6037caf65a33b999700884c3e50ba980e1026e5bdff30fe7ddfa3ffb7849273dabfa8e89d7d80151ee80d17c173 SHA512 3f8ee61539a1c9cd22e2a41f2185c53b0243f118697ab22a56857af22035ea925810e04eb4557724181a490bec7e1c0b00824eb48259fdc4289ada7e168ef5ad
 EBUILD selinux-spamassassin-2.20170805-r4.ebuild 296 BLAKE2B 0182c93de87b40770c32f01b7ee96593bc9ad25742489134c535e87e82c286bd688b250d430368a0a38172e27735e281e91f47ab626f3c9c256cb3fc3c31244e SHA512 511f8d4899c73226f32b049581e42a953628ca71e57f4c36c63d6fcfbfc87d2216c77d77430db6992cdafac84b2c0701fe1f9091d803004c7ea1fc3c179983c1
 EBUILD selinux-spamassassin-2.20180114-r1.ebuild 294 BLAKE2B 50c51c85763893ec673adb9ec074767830d4563b174cd3bba6bcfba06662d211f1c77ecb4a94d4caf9b465e0069f50d9b7c0fc2d5a31c4d86217d016970b2641 SHA512 be97ccc40035e67ad39be6f218139e344f90e0f665a714f83e681a86da969dc53f3777a8ebefeceba897c2c35edaf633d76e121ee841c8a0054d0ab39cc84a8a
-EBUILD selinux-spamassassin-9999.ebuild 296 BLAKE2B 0182c93de87b40770c32f01b7ee96593bc9ad25742489134c535e87e82c286bd688b250d430368a0a38172e27735e281e91f47ab626f3c9c256cb3fc3c31244e SHA512 511f8d4899c73226f32b049581e42a953628ca71e57f4c36c63d6fcfbfc87d2216c77d77430db6992cdafac84b2c0701fe1f9091d803004c7ea1fc3c179983c1
+EBUILD selinux-spamassassin-2.20180114-r2.ebuild 296 BLAKE2B 0adc2b5ac7277839776df66bcafc6b5d323c1eecee8c7147385864f4e8d2b76808e07a5ca66c03a84d6af2f1b8ce0d185e6bc2fe2b242cc0f6c5f2de8c9bcefd SHA512 abdf74bf6c3e288386658a9736c5ee51bed1f4a49c4f8b930d7495d787daab9629cc60ace2a6f981a54aa28cb63b4f33843252a892da309cd1ee05e43b44f375
+EBUILD selinux-spamassassin-9999.ebuild 296 BLAKE2B 0adc2b5ac7277839776df66bcafc6b5d323c1eecee8c7147385864f4e8d2b76808e07a5ca66c03a84d6af2f1b8ce0d185e6bc2fe2b242cc0f6c5f2de8c9bcefd SHA512 abdf74bf6c3e288386658a9736c5ee51bed1f4a49c4f8b930d7495d787daab9629cc60ace2a6f981a54aa28cb63b4f33843252a892da309cd1ee05e43b44f375
 MISC metadata.xml 322 BLAKE2B 3b45dfb6f0b204b42d1854faefd6a817d4f6433d5ce76b10838ad703dbc4ea86af21a23bbbaffdb61bffd7c41c8c1031afeb6315b3c3e06c155554fbe43d7389 SHA512 345132094265e24dad21ecc976e75750a363d6773ef83fd63c53ea744b8d3afcd9504d1e63f6758ed54e85cb8e3461e65dfb72bc67f5a63c21c50d9e71dc90ef
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20180114-r2.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..909e42792205
--- /dev/null
+++ b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="spamassassin"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for spamassassin"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-9999.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-9999.ebuild
index bcd8854a85b4..909e42792205 100644
--- a/sec-policy/selinux-spamassassin/selinux-spamassassin-9999.ebuild
+++ b/sec-policy/selinux-spamassassin/selinux-spamassassin-9999.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"