gentoo resync : 28.04.2018

3 files changed, 19 insertions, 2 deletions

diff --git a/sec-policy/selinux-watchdog/Manifest b/sec-policy/selinux-watchdog/Manifest
index da63efd0d27d..0310dd03ed3b 100644
--- a/sec-policy/selinux-watchdog/Manifest
+++ b/sec-policy/selinux-watchdog/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-watchdog-2.20170805-r2.ebuild 286 BLAKE2B 9a9c26d59213ff626908b8b
 EBUILD selinux-watchdog-2.20170805-r3.ebuild 286 BLAKE2B 9a9c26d59213ff626908b8bf3c9e50e978ee2315397a8f5ac7bd2d1394a1676271b2270da87c6ffa856bf04e5e0c464f7941bec97dae55cc3914bdece219d352 SHA512 7eb82ea02e2daa9736e7bc166432a49b7103815186cb3fe43a243741b24137090ed94993048e4cc9cab23e05396d5540fcbd408bc3b4fc7bf4bc1447491d83dd
 EBUILD selinux-watchdog-2.20170805-r4.ebuild 288 BLAKE2B 16420194bc5f6524597624d4bd63e7c58432b90aebeece41c76ef9c2b6574f49c8440330fde929f302aa2e145c87cfcd40e31037dcc706f9d0b544434fb2f674 SHA512 999c7c3fea2ca8a1bd1a7eda3681bd2dd9d0746126fb5fe6d7dcb875cd20e58e65a9c3fb576fc5327f12d2970f1efc29e24bd372d8eb35f339f3c1544d5ef15b
 EBUILD selinux-watchdog-2.20180114-r1.ebuild 286 BLAKE2B c8be687a6675b575c9e0e0defac043bc5016b519c8b56c3f80fa51b0da504b82d0dcfe212d2ce7c78275d7097050e209fa7f7c1e48d91a7e64d0a102d142f540 SHA512 6f85669499407ff21e3d5785cb69b8c9017ed6903540160628e8bde81f51bff079f54f40eddd30f18239b6fef95e973440b7dec3ee86a1203a59f389aca531ca
-EBUILD selinux-watchdog-9999.ebuild 288 BLAKE2B 16420194bc5f6524597624d4bd63e7c58432b90aebeece41c76ef9c2b6574f49c8440330fde929f302aa2e145c87cfcd40e31037dcc706f9d0b544434fb2f674 SHA512 999c7c3fea2ca8a1bd1a7eda3681bd2dd9d0746126fb5fe6d7dcb875cd20e58e65a9c3fb576fc5327f12d2970f1efc29e24bd372d8eb35f339f3c1544d5ef15b
+EBUILD selinux-watchdog-2.20180114-r2.ebuild 288 BLAKE2B de80008069876fd138ec3e1a5a0aa91f238e142493c32efc6432c5d26b2af6b19bfff1e2de6fd63f1752cdb71bb690c978880deee8b046c28cbd596487966ef5 SHA512 c16cd886fa663552ab8e55b53c719b722fb4067549fad0951b176953b6d50465290aec20a1128e4a554980ad923b240417e890a1068d1812bf3045a7f034a4a1
+EBUILD selinux-watchdog-9999.ebuild 288 BLAKE2B de80008069876fd138ec3e1a5a0aa91f238e142493c32efc6432c5d26b2af6b19bfff1e2de6fd63f1752cdb71bb690c978880deee8b046c28cbd596487966ef5 SHA512 c16cd886fa663552ab8e55b53c719b722fb4067549fad0951b176953b6d50465290aec20a1128e4a554980ad923b240417e890a1068d1812bf3045a7f034a4a1
 MISC metadata.xml 318 BLAKE2B ffea2648ec00eff9dc1d23552633fee8cf1db446b8f7d110b613f9e2d40b5aac0ea80462754f72e70fa4e86ed42717c6ef1ecf1680ea771e497cd6349df0b283 SHA512 3c77f235f65bc644d316ec2bb0d859ee22c622049c4f406904a7c24a4c17156636d86f249f4dca2a15a90d0334da677df3038956991a256f591fe3c7c2284957
diff --git a/sec-policy/selinux-watchdog/selinux-watchdog-2.20180114-r2.ebuild b/sec-policy/selinux-watchdog/selinux-watchdog-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..3bf64e50b5ac
--- /dev/null
+++ b/sec-policy/selinux-watchdog/selinux-watchdog-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="watchdog"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for watchdog"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-watchdog/selinux-watchdog-9999.ebuild b/sec-policy/selinux-watchdog/selinux-watchdog-9999.ebuild
index 8fe981a7e558..3bf64e50b5ac 100644
--- a/sec-policy/selinux-watchdog/selinux-watchdog-9999.ebuild
+++ b/sec-policy/selinux-watchdog/selinux-watchdog-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"