gentoo resync : 10.11.2017

8 files changed, 35 insertions, 6 deletions

diff --git a/sec-policy/selinux-nagios/Manifest b/sec-policy/selinux-nagios/Manifest
index 5ac1e83c65bd..b36b90e192ea 100644
--- a/sec-policy/selinux-nagios/Manifest
+++ b/sec-policy/selinux-nagios/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-nagios-2.20170204-r1.ebuild 379 SHA256 a17631af9d470b83fde0085a352b2ec91c296a12e07eb3a70f3567d293cc5728 SHA512 c455b29697c45d6c6f64d2213f2b3a0f03a195e8c8ede2ab486476926b865a75836587daa679582792e03b974761424065ee33365a2cacdb41060a8c51ba3431 WHIRLPOOL a760f9b8416dc23794d51ce1b4f0d5b3fd696a966992a8c0e6998e30555c0b88beb7ba59d9f53ed2825fa88421bf131a7449d6989596c6a02a5defcf3f062777
-EBUILD selinux-nagios-2.20170204-r2.ebuild 377 SHA256 b8ddadb37149c714f660ff771fcead08c43f408774c6140aba6ff5b51fc7eb1c SHA512 73d0838fdff50a409c84db310d9aa1cb7e4b7de961960b15b5ad3ce7ed1c0f872b608c4a958d03e7a9c707d6b25d584078b35c39a3d08a2029d8b5f3e283d390 WHIRLPOOL 7ecb7c7aadc0b82379494c63f0f9efcb778d4c83eb48be03f3c7e1b4a2aad418d9973b99706d8afa81b6683e98f2e89c8af29eec58ee9eed5df0be20aeadabed
-EBUILD selinux-nagios-2.20170204-r3.ebuild 377 SHA256 b8ddadb37149c714f660ff771fcead08c43f408774c6140aba6ff5b51fc7eb1c SHA512 73d0838fdff50a409c84db310d9aa1cb7e4b7de961960b15b5ad3ce7ed1c0f872b608c4a958d03e7a9c707d6b25d584078b35c39a3d08a2029d8b5f3e283d390 WHIRLPOOL 7ecb7c7aadc0b82379494c63f0f9efcb778d4c83eb48be03f3c7e1b4a2aad418d9973b99706d8afa81b6683e98f2e89c8af29eec58ee9eed5df0be20aeadabed
-EBUILD selinux-nagios-2.20170204-r4.ebuild 377 SHA256 b8ddadb37149c714f660ff771fcead08c43f408774c6140aba6ff5b51fc7eb1c SHA512 73d0838fdff50a409c84db310d9aa1cb7e4b7de961960b15b5ad3ce7ed1c0f872b608c4a958d03e7a9c707d6b25d584078b35c39a3d08a2029d8b5f3e283d390 WHIRLPOOL 7ecb7c7aadc0b82379494c63f0f9efcb778d4c83eb48be03f3c7e1b4a2aad418d9973b99706d8afa81b6683e98f2e89c8af29eec58ee9eed5df0be20aeadabed
-EBUILD selinux-nagios-2.20170805-r2.ebuild 377 SHA256 b8ddadb37149c714f660ff771fcead08c43f408774c6140aba6ff5b51fc7eb1c SHA512 73d0838fdff50a409c84db310d9aa1cb7e4b7de961960b15b5ad3ce7ed1c0f872b608c4a958d03e7a9c707d6b25d584078b35c39a3d08a2029d8b5f3e283d390 WHIRLPOOL 7ecb7c7aadc0b82379494c63f0f9efcb778d4c83eb48be03f3c7e1b4a2aad418d9973b99706d8afa81b6683e98f2e89c8af29eec58ee9eed5df0be20aeadabed
-EBUILD selinux-nagios-9999.ebuild 379 SHA256 a17631af9d470b83fde0085a352b2ec91c296a12e07eb3a70f3567d293cc5728 SHA512 c455b29697c45d6c6f64d2213f2b3a0f03a195e8c8ede2ab486476926b865a75836587daa679582792e03b974761424065ee33365a2cacdb41060a8c51ba3431 WHIRLPOOL a760f9b8416dc23794d51ce1b4f0d5b3fd696a966992a8c0e6998e30555c0b88beb7ba59d9f53ed2825fa88421bf131a7449d6989596c6a02a5defcf3f062777
+EBUILD selinux-nagios-2.20170204-r1.ebuild 380 SHA256 eb8801496a5613f6af70efbcfbd01c0d6546a13db89478c156b16adca5ac0bef SHA512 38f297aee1e79711a0fc7443ced989e0f44a89f1be14ad206db920a2469cca4dc96051befa3a52b4bf988e8580975573b52d9a8539543033becd2adec8894ed9 WHIRLPOOL a8eafd69adf8045b686ba38edf1336f2e665e4c37d498dd203272b3168d94fce26028f57c57e30d30ba6945eb70856dcec690027489f9cebfd0180d94ee8dd8b
+EBUILD selinux-nagios-2.20170204-r2.ebuild 378 SHA256 65b19cdfd7097c86cc93ea90172d179c73afa0169d9930319e81a70df56b26f5 SHA512 585b34ef2cb0cb77a2a2840b6c0ae944e27bf70d725e81fffc833b1e8a2976fbba853dc0a783d7f987c1fae144f7b5ade908223e50c07cd1e3da35751c2ccab8 WHIRLPOOL 545e6d6c8ebdaa9e08c42368ce303aaf1b823d52c19e538eb0bdfd99adf954c60ba20213cd8fda937614e2c907353baddfa8f91760d57d6cd9774ea3b4702e5b
+EBUILD selinux-nagios-2.20170204-r3.ebuild 378 SHA256 65b19cdfd7097c86cc93ea90172d179c73afa0169d9930319e81a70df56b26f5 SHA512 585b34ef2cb0cb77a2a2840b6c0ae944e27bf70d725e81fffc833b1e8a2976fbba853dc0a783d7f987c1fae144f7b5ade908223e50c07cd1e3da35751c2ccab8 WHIRLPOOL 545e6d6c8ebdaa9e08c42368ce303aaf1b823d52c19e538eb0bdfd99adf954c60ba20213cd8fda937614e2c907353baddfa8f91760d57d6cd9774ea3b4702e5b
+EBUILD selinux-nagios-2.20170204-r4.ebuild 378 SHA256 65b19cdfd7097c86cc93ea90172d179c73afa0169d9930319e81a70df56b26f5 SHA512 585b34ef2cb0cb77a2a2840b6c0ae944e27bf70d725e81fffc833b1e8a2976fbba853dc0a783d7f987c1fae144f7b5ade908223e50c07cd1e3da35751c2ccab8 WHIRLPOOL 545e6d6c8ebdaa9e08c42368ce303aaf1b823d52c19e538eb0bdfd99adf954c60ba20213cd8fda937614e2c907353baddfa8f91760d57d6cd9774ea3b4702e5b
+EBUILD selinux-nagios-2.20170805-r2.ebuild 378 SHA256 65b19cdfd7097c86cc93ea90172d179c73afa0169d9930319e81a70df56b26f5 SHA512 585b34ef2cb0cb77a2a2840b6c0ae944e27bf70d725e81fffc833b1e8a2976fbba853dc0a783d7f987c1fae144f7b5ade908223e50c07cd1e3da35751c2ccab8 WHIRLPOOL 545e6d6c8ebdaa9e08c42368ce303aaf1b823d52c19e538eb0bdfd99adf954c60ba20213cd8fda937614e2c907353baddfa8f91760d57d6cd9774ea3b4702e5b
+EBUILD selinux-nagios-2.20170805-r3.ebuild 380 SHA256 eb8801496a5613f6af70efbcfbd01c0d6546a13db89478c156b16adca5ac0bef SHA512 38f297aee1e79711a0fc7443ced989e0f44a89f1be14ad206db920a2469cca4dc96051befa3a52b4bf988e8580975573b52d9a8539543033becd2adec8894ed9 WHIRLPOOL a8eafd69adf8045b686ba38edf1336f2e665e4c37d498dd203272b3168d94fce26028f57c57e30d30ba6945eb70856dcec690027489f9cebfd0180d94ee8dd8b
+EBUILD selinux-nagios-9999.ebuild 380 SHA256 eb8801496a5613f6af70efbcfbd01c0d6546a13db89478c156b16adca5ac0bef SHA512 38f297aee1e79711a0fc7443ced989e0f44a89f1be14ad206db920a2469cca4dc96051befa3a52b4bf988e8580975573b52d9a8539543033becd2adec8894ed9 WHIRLPOOL a8eafd69adf8045b686ba38edf1336f2e665e4c37d498dd203272b3168d94fce26028f57c57e30d30ba6945eb70856dcec690027489f9cebfd0180d94ee8dd8b
 MISC ChangeLog 10571 SHA256 799c927d41db6f0db8306822c521f9a2d1cb8bea08055112a1823497bb8bfd6c SHA512 9dd676b8bbac15d7612c6264468a59ea5b555cb6bcd7af7daa55bbe38bbf9a555fa8428efd045d00d85429b4d9b96a2ad9844f2586b6b716ca5c39f5392cd749 WHIRLPOOL df9f1549e8f7564b7a3df90f713b3f4e0875e4d8249555215e79a358c552b5f575ae5842ff3a2e3ee11033955bdd12a578751d9705e38483af837fc2ce2b0ce4
 MISC ChangeLog-2015 10627 SHA256 e36ad37f78e0443081d7270a0bd3725925d19341d1b542e3585f31e179a60e04 SHA512 5a2b00407c451a7c4a95aef28c95948725dffc54989a4335de3d1f56c7e11fca07e958ba291f4b1113343bb5480fa1af39cd231bb5b0332e0e1058a766ed0cbc WHIRLPOOL a97f1ad4c09a7cb585bc4921e8a0ece5a35967001a2a61b1ceee8987c65b7be9779ed84a35320115b05fa6d9ee2e8a5edf7b06bc3d7e505bc103afcbd541790c
 MISC metadata.xml 316 SHA256 a18049e3f123635303c1d0f6e33a75155768c38224e65ca6a87253a289936421 SHA512 d41b531c5f7456da060d2d335d0f9e8ac94c307127b3124e9ce6e1c92a9ce6fa5cbfcc7fc2e62ec51d15e966b43f50b8006ee95422cc790a4c17a1a9000dc9f5 WHIRLPOOL f818be5521a192e0b8b3dc14a78c2a73e2507891c427ff62a0a432796ecb385054d06be01f9507126cb21600d696d31037d2d1c483e28e77c15b4c2b0e2aa33b
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20170204-r1.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20170204-r1.ebuild
index 7d3e8af7dfd5..6390a69a57ce 100644
--- a/sec-policy/selinux-nagios/selinux-nagios-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-nagios/selinux-nagios-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20170204-r2.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20170204-r2.ebuild
index 8f4a008020ad..5cc4a9ef62eb 100644
--- a/sec-policy/selinux-nagios/selinux-nagios-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-nagios/selinux-nagios-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20170204-r3.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20170204-r3.ebuild
index 8f4a008020ad..5cc4a9ef62eb 100644
--- a/sec-policy/selinux-nagios/selinux-nagios-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-nagios/selinux-nagios-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20170204-r4.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20170204-r4.ebuild
index 8f4a008020ad..5cc4a9ef62eb 100644
--- a/sec-policy/selinux-nagios/selinux-nagios-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-nagios/selinux-nagios-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20170805-r2.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20170805-r2.ebuild
index 8f4a008020ad..5cc4a9ef62eb 100644
--- a/sec-policy/selinux-nagios/selinux-nagios-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-nagios/selinux-nagios-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20170805-r3.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..6390a69a57ce
--- /dev/null
+++ b/sec-policy/selinux-nagios/selinux-nagios-2.20170805-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 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 7d3e8af7dfd5..6390a69a57ce 100644
--- a/sec-policy/selinux-nagios/selinux-nagios-9999.ebuild
+++ b/sec-policy/selinux-nagios/selinux-nagios-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""