gentoo resync : 28.04.2018

3 files changed, 25 insertions, 2 deletions

diff --git a/sec-policy/selinux-nagios/Manifest b/sec-policy/selinux-nagios/Manifest
index debd21826d9d..cb77f87079fd 100644
--- a/sec-policy/selinux-nagios/Manifest
+++ b/sec-policy/selinux-nagios/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-nagios-2.20170805-r2.ebuild 378 BLAKE2B ebd99bb11d4fb3420de5a5c6e
 EBUILD selinux-nagios-2.20170805-r3.ebuild 378 BLAKE2B ebd99bb11d4fb3420de5a5c6e9ed7173aae11e8b6c17baeaec1f05646bef4a1154b715ddf7386762da090a62aa2431ca804fde9007965b5b75a608684a801f3c SHA512 585b34ef2cb0cb77a2a2840b6c0ae944e27bf70d725e81fffc833b1e8a2976fbba853dc0a783d7f987c1fae144f7b5ade908223e50c07cd1e3da35751c2ccab8
 EBUILD selinux-nagios-2.20170805-r4.ebuild 380 BLAKE2B 3f07aeec380a2590d04968a8c48c1f1b58995e9e95a416b9fb4fe92ed6fb4727d2beb01d0ba8cec192a57c0b0d604f1ba0878c2088fe1c1caca2e3479f4873ee SHA512 38f297aee1e79711a0fc7443ced989e0f44a89f1be14ad206db920a2469cca4dc96051befa3a52b4bf988e8580975573b52d9a8539543033becd2adec8894ed9
 EBUILD selinux-nagios-2.20180114-r1.ebuild 378 BLAKE2B 32ad3d8cdef590cb43a54ef3137932ba1a61a1a614944fe6c99beeadb2be608f50c3c8d3d67a14d7fe6aebedfb59cae2916258ad2c121187e374737358601a9e SHA512 e7566bfcb434de97cdc577f82920296859c8e2e1ac9d173e1b1c226e0638faf95cf82ba9c2c2f2fe01c06bd94d91b89aa7626fb6b753a30ef5b52d4ccb0af411
-EBUILD selinux-nagios-9999.ebuild 380 BLAKE2B 3f07aeec380a2590d04968a8c48c1f1b58995e9e95a416b9fb4fe92ed6fb4727d2beb01d0ba8cec192a57c0b0d604f1ba0878c2088fe1c1caca2e3479f4873ee SHA512 38f297aee1e79711a0fc7443ced989e0f44a89f1be14ad206db920a2469cca4dc96051befa3a52b4bf988e8580975573b52d9a8539543033becd2adec8894ed9
+EBUILD selinux-nagios-2.20180114-r2.ebuild 380 BLAKE2B ce2fdc7a1acb4930ac92d88a46367e2ad14442979c04a66ed29fedbb0c5fcfbdaeaed9915df1d061a6082285173a475d5829eab59b7bb4fac01b86f3536b220a SHA512 087555cdd22fa69d09ef4ecf40d231619ef505f825892d08acc02e8e03351e670876a1046ccc6768bef744de86e789770f07075251817845fb2ce6688a8a8ba0
+EBUILD selinux-nagios-9999.ebuild 380 BLAKE2B ce2fdc7a1acb4930ac92d88a46367e2ad14442979c04a66ed29fedbb0c5fcfbdaeaed9915df1d061a6082285173a475d5829eab59b7bb4fac01b86f3536b220a SHA512 087555cdd22fa69d09ef4ecf40d231619ef505f825892d08acc02e8e03351e670876a1046ccc6768bef744de86e789770f07075251817845fb2ce6688a8a8ba0
 MISC metadata.xml 316 BLAKE2B 73f32348443cb66f5d8274a05c1993b656d2be9d4c10ede6269793703d156ecf50259c73ff79b11af06aabd9c16c6d69ad875c38dab97c55072301748f8c6d61 SHA512 d41b531c5f7456da060d2d335d0f9e8ac94c307127b3124e9ce6e1c92a9ce6fa5cbfcc7fc2e62ec51d15e966b43f50b8006ee95422cc790a4c17a1a9000dc9f5
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20180114-r2.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..5bf419cc42d4
--- /dev/null
+++ b/sec-policy/selinux-nagios/selinux-nagios-2.20180114-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="nagios"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for nagios"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-nagios/selinux-nagios-9999.ebuild b/sec-policy/selinux-nagios/selinux-nagios-9999.ebuild
index 6390a69a57ce..5bf419cc42d4 100644
--- a/sec-policy/selinux-nagios/selinux-nagios-9999.ebuild
+++ b/sec-policy/selinux-nagios/selinux-nagios-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"