3 files changed, 22 insertions, 18 deletions
diff --git a/sec-policy/selinux-nagios/ChangeLog b/sec-policy/selinux-nagios/ChangeLog
index 5d42a9cb17f4..4974a2ed052e 100644
--- a/sec-policy/selinux-nagios/ChangeLog
+++ b/sec-policy/selinux-nagios/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sec-policy/selinux-nagios
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nagios/ChangeLog,v 1.48 2014/08/21 19:31:06 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nagios/ChangeLog,v 1.49 2014/08/22 17:40:02 swift Exp $
+
+  22 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  selinux-nagios-2.20140311-r5.ebuild:
+  Stabilize r5 policies
 
 *selinux-nagios-2.20140311-r6 (21 Aug 2014)
 
diff --git a/sec-policy/selinux-nagios/Manifest b/sec-policy/selinux-nagios/Manifest
index a12127808749..a1026c7fb53a 100644
--- a/sec-policy/selinux-nagios/Manifest
+++ b/sec-policy/selinux-nagios/Manifest
@@ -12,25 +12,25 @@ EBUILD selinux-nagios-2.20140311-r1.ebuild 454 SHA256 1068a9ecf8e644b95c0995e6f3
 EBUILD selinux-nagios-2.20140311-r2.ebuild 454 SHA256 95d666bbbccae56f17f0b90c110d6797c80f8ba28d13735d20f745a50909fa42 SHA512 d46ddbc7e21d96b8fb61763a0b4a268cdee053d0db969ab79207d380cd2b20fd61ffa9c4b93ece6705a5b9a626711bcc8cb9510afdad4dee3dd5d8801b0efbbb WHIRLPOOL f66aeb577eb7f4fe0050cf4d9216ef6d37734012c01f5bb141348c59af4c169e41ebf8de480c32a554e0069d9fba968905c9b6e9355d700c5a86acd6b7afee3a
 EBUILD selinux-nagios-2.20140311-r3.ebuild 454 SHA256 de3f4149ff30d0e074f188fb19cf266624b29e83252d1c9e174025afa2bc8e08 SHA512 758d7b21d3d4251eae6a242eb81550cb17c956c7c50d8e1d68487b16645344c6a7f661bc19ff5120fd9a66dce0a462d2b6417d5a95383eb69c46ceec6de675e1 WHIRLPOOL de4748e4bc326290234a95c21cc75bf836331127e1d4c4c446912966f5640ad922f5165acadbe74d927824d6cf4ddee365321a9e0aef20f42e774a98c00f97d0
 EBUILD selinux-nagios-2.20140311-r4.ebuild 456 SHA256 dd0b62ed7cae6fb34a978b02cf11a34cdb572140c7b029b75dad649da546dcb3 SHA512 b7c9bea6884050d97c6cc68a0668a5e71ae10b41a785f5776051e7d0c7effb89614bfe495645b039d627ffbf6fec4f409ce1b4e63361879a162ae2396685a14e WHIRLPOOL 8543ceb607b769003625ec16e460a47e049d536f5fe5557d3f896b0cc0396dc83449fba5154a8e55bc0a47824e26dfec880f03da93f2aeeee6cd3d98ee5f8765
-EBUILD selinux-nagios-2.20140311-r5.ebuild 432 SHA256 6ed9dfaa0fb99254f42ff5b9e56a90ec46920b7632ff254be2c90fbd052aa37d SHA512 3030238e95cbe7850f31779b9710c6b1b65ffd1179c1c029e31dca2aa5ed294c593138660d9d8e06c6723cae9e087db1176e0c8f889794f8d7a19cea4ebde662 WHIRLPOOL 9cad7252b9400cc5a323bfbea64bf29428520e74a86894c06bb814e93e19411ef53c22b06d1252dffb0a119a0673e43fecd0612da216b48bf86e2c766b0cec41
+EBUILD selinux-nagios-2.20140311-r5.ebuild 430 SHA256 9926054c7a1480e21c4ace7547b65be971fb9cb3fc2b10f99baac0f6e7e83751 SHA512 409b9180cd0426c6a2ec29170594bdc614a89b13ef76368ba07259b54fb604822f8bcb3409dd02c7f8961f42b5a7c47bf9c06bac61cdb2c6a1ecad52c8fce9eb WHIRLPOOL c81fdc586b1e13af32623c6b0bb290581ec58de14c9b6da5537741fb67ed28165852c6ffbca12aa2418b170ea1fcef9f29ee6353cf317f15dadb243972906320
 EBUILD selinux-nagios-2.20140311-r6.ebuild 432 SHA256 0fab34a297f2e49b580c2f24d141b49c8fbbf1e98bb774457d78ad8708ae2832 SHA512 89c50a5a0e1561ed345888b4734de86956cc925177c70002a089129c80fc00f8b1880d26d9f57d45dfd8533d2882d7d8efc9fcb7ece51ee27b250936d6571464 WHIRLPOOL cf367174a41052da6bd2239fefe08f8b639d3eb8a049ab8247bc5c45cff2aecc7c973f1a7b09afa4e7476a32198fdec34ad4a941f049349f6b43e67df0ef25d3
 EBUILD selinux-nagios-9999.ebuild 412 SHA256 ac701fbe13983e32ba4522faa1f84c147b91b6dbc814c00c01f7bbbe2dc1e3e3 SHA512 3a3bca90ff53c0ff760eeb9c2624e8a9b9237ed6ad7bfca362237159c83e118b530ad39c370cc138bcb9fbebf9fbfd55d7a7ee22bcc1986de2b5535e9d8e8bdf WHIRLPOOL 2b864001695842b609bafbd9260bd0cf2c61b32c476e76bec2a04c5e75e084a361efc6fa18603cf32e8f9cfa6ef7ec2684c46df064e343c4a7a9867429ceee78
-MISC ChangeLog 7505 SHA256 7561c36fcf23fcd6736f2700bac1a6052797f01e6421a2f56abbcb129ed29fa3 SHA512 ff5b36b9b37f58c71508e0d1d06e16bc0e74ae1783141bf641abfc4b135f2217080bde9dd12ace2d358655090aa6d1efa77ecd0584340fc42a8ce5f2ef99082a WHIRLPOOL 701577767ebee9d85758bc3e12a4778a7d4fca9498996eca1965411b7508cefe81384c36ac71722210e348ade98b211487f2fe64cb10ce5fb69c862cb859b7cb
+MISC ChangeLog 7618 SHA256 8a605e019396f2e11aefbbefff5a0ef77ab17eff14d5671f2415c164ae197c92 SHA512 ae9bd8bd133d7ed46cf745908021b3ae127a12dfa2b51140d81202b661e78a4d09f5d63148631114d3577976a2d6a68b26339fa0bae5cddcd3c4269b3e1c450e WHIRLPOOL 3c84e4a3899e8958cad0729b9cbe89e4818585b8dc019124489cadfb08dd98acc72f1626889ab99d15bff02d94c16889c135504256b0da5623b0c745788e3335
 MISC metadata.xml 230 SHA256 4b2780b5258cf4a9bf47d433f6e923644c503d89d1cc15ea6bea154a9bcd7723 SHA512 9c7a08f69c5f630a8115c4618f9d29b2c7325b8f58543b29bace84443a01ca25b34dcb863d8856fb4571dd79d690dabcdb50a0c08ae5f0511e9895043b300d68 WHIRLPOOL 4ce4fc473a3d12f082713389ecf12cb0106d90201b978f8060a56121ed18d521679b39f45b44c1a708263b27eba01ba86a6808f039a1b81f2f10f1055488e6a6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT9kk/AAoJEC7dUkA7aK9H9kIP/19Cz1CnzFk5kuL41QSPdmsh
-QK07uaGZtDddx8/dswhXQCiP8HrpY08qkUTV9I1LDal0RhLP/jiKeKMgONCxpgV4
-mm5ZJgUsc17n+scBmkDwpItAninLleIyv2SSFNEFaG2dwOwHGkOgIRm63OGgxsSd
-eh4InJxLnlUL1ETxbi5+VMY4GBglcAfVMYIg16zBUiNEM7Jsp0bSQZdDD7MoklMI
-zdksLTxG5O2CM7p6zE9RKohHtwR5ed+I/mgBvyiP9V++UNqEQ0Uj5cq2IR+KlqM9
-yoapCI7WgQDW8Ayxvnranr865ry1A2CtkriY3hla7rCnlQ8d9Bx/2GFqdMM8Ny36
-mzXPH8RI5U0amGAybM4RnGmYT5CnYX1d7ou+jfCsg8P5W5VEXdQkuIxzqgKXBvzc
-k4gKyWT4gaHJF7sMz2lrROyB/NmgZ+0W03k9G8R7dhCUS12saKvjM/9/di0SHFv4
-WkP6Fdv5CG5SNAGwHqR+4XvKgiuo+rHnbNkqGi3RLpee4vFRLvd0j+wXM997NrAv
-0dCI83WnvgPZWSedjzSuPkh3Re72X2EyDHCCY+1Mpj4yskulPW4WzQd8NdwEctAm
-yyhcZbpOtI1OFl0ywYX8nqEjhIhomCOHD0bBMfWmkvH5yN1/EHBVYn5N+6XeQf+Y
-s5Y26shkueCJ9y3a3itA
-=EJC3
+iQIcBAEBCAAGBQJT94C9AAoJEC7dUkA7aK9H+hAQAI6IVV7TubC14aPBChod5PTW
+G1us8A1U27GsxPUWNUkukd5nLSipTSqcgAtK+aOFbr+dhHwzluqv33aDYTmIUa9x
+ryvA4D7ZIzWbLWMoAO52KejciVl2YSy1Ka7z2IUCBEMj9f3ZHGJSWkia7Vg7QrSf
+d6MenjX2SE5O8GroRcJ8VSxRCYaByziXl8M9f8vmZG3fvxUGb5aec2wMJLj+1fT6
+jFnup/MkU9ynKE23KVfceFM2AiP/bJjH3kA4df6fd/24slHsLiOfOmYtXeoyvoSt
+FzuO8x7+XnQBiFxJlK8SoTlxkMRyBR4GN1xLCScGMtQkw5ZaFvrcGOBzs4p2Rfu+
+NsNuZsvtTlInN/+d1gkjokkcvrAWR02A3TOONom35D7SN+FS9sEF1RJNOzQoeBO6
+PnNg0Wo1b3NcyX7mpEe+UqsSrsZLDsme928UxcOyTLZWi+NdwW6BAUoMLjXYSpCN
+1BXVqUuAqpjNKRyejeabnkvWkIDOkLk3sdHDxoT4z63mtqboyr+8bBOsrS9MvPLw
+GTZkm5795XAmtZoKN9t98PzqsCHBQODyPOrE88YK3/vgKSJcwnZPHi+gaueds50g
+0yK9i/PVX//87oh10e2x87DFA+xrMMdXjzoWnU4CUn5ojSrbM79Zqp1OM+3XO6/b
+ijAwGjRC8uHn5R2vlamD
+=86KR
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20140311-r5.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20140311-r5.ebuild
index 63aaf2a5e06e..69e5d66748ad 100644
--- a/sec-policy/selinux-nagios/selinux-nagios-2.20140311-r5.ebuild
+++ b/sec-policy/selinux-nagios/selinux-nagios-2.20140311-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nagios/selinux-nagios-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:11 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nagios/selinux-nagios-2.20140311-r5.ebuild,v 1.2 2014/08/22 17:40:02 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nagios"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
 "