Bump towards r5 (fixes duplicate context for hiawatha)

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x2EDD52403B68AF47

3 files changed, 36 insertions, 15 deletions

diff --git a/sec-policy/selinux-puppet/ChangeLog b/sec-policy/selinux-puppet/ChangeLog
index 6ec5df9ffdb4..ccee96f54ec8 100644
--- a/sec-policy/selinux-puppet/ChangeLog
+++ b/sec-policy/selinux-puppet/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-puppet
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-puppet/ChangeLog,v 1.45 2014/08/08 18:49:50 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-puppet/ChangeLog,v 1.46 2014/08/09 19:34:16 swift Exp $
+
+*selinux-puppet-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-puppet-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-puppet-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-puppet/Manifest b/sec-policy/selinux-puppet/Manifest
index 063eefe1634e..562033dff668 100644
--- a/sec-policy/selinux-puppet/Manifest
+++ b/sec-policy/selinux-puppet/Manifest
@@ -5,28 +5,30 @@ DIST patchbundle-selinux-base-policy-2.20140311-r1.tar.bz2 259943 SHA256 0444ad5
 DIST patchbundle-selinux-base-policy-2.20140311-r2.tar.bz2 265878 SHA256 344e9c6c9f4466cbe39c067f4af902c25bb17d20431e0e19521490a92f41d80f SHA512 54b5092791038f97f7fd7dfe0d6becc3070171b2b114ecaff38c904c1392885756ce201663004bf4e6621236a77045828229fe2c5de317ba63da59786a99f312 WHIRLPOOL 27cd3eb4a15098d156af22c9f61ba02f0784a2eab49992b3a27777b5d60a76b6bc04e2cca81729176b779628886ca1ce13d89f865de3aa7380f1c9ef7682d3ce
 DIST patchbundle-selinux-base-policy-2.20140311-r3.tar.bz2 268783 SHA256 1d2f1d090a61e96ee26c63ebc0d37d1aa7f7c826b2885fd28bde2d0c81a500b0 SHA512 ef3eb5143f4343675c6e5219c6bad1b5cbc3c885088c0389974d7106e8da949843e1504edcea39888d14a20a8d6cf4032e24fa5891e7fa678abf7d9c7cef3762 WHIRLPOOL 5c875dfb043c0076bde48a2f7f1051e3475316578c46688e2e94bd79e0130bdc9cc5719e9fb2e5c3bca52e97e5d4773546cec1ae21bd0a0d37b5a57ac4adf483
 DIST patchbundle-selinux-base-policy-2.20140311-r4.tar.bz2 272598 SHA256 86c4e0aae81adf76054bbb74dd19a19022dbc2139a6adfcb3710dd679e5aecd1 SHA512 81b4ee890baf01f1b55a70f46454b3f77a7dbbcd3e860e309162389a34be056bfe82d3fb9f7b843a8476b2b1fb5919d534402c2f06eeb9390b33b3e6745ca444 WHIRLPOOL 8a4503d201d465b049757764ca0c209b03b66ba2af8cb7e979354c2d35e1c5b428d9a1876a606a765702c50bb725fe4f53a9384bbb205f9f51ca28d59aaa9416
+DIST patchbundle-selinux-base-policy-2.20140311-r5.tar.bz2 274187 SHA256 5ce76d59d12a7dfc02352eb2a77971d76c5ff0fa3c66cced6318919571f04839 SHA512 7a9da3ab23ce6217739f4548cc5365f64def11fe19b6f3b2a304685bb54246d12856388043870e0f061f71fb2c8c45da72bf3db28ad6e70f397f5dfffe2206c6 WHIRLPOOL a4729aaeed88f7485fbf112de91161bf4e75fb996f5123133c22fcb008966acc7db98c7849dc4b076cb633d00c81deae85cf6b5f8c48f8c3c72c90bcaff26d71
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 EBUILD selinux-puppet-2.20140311-r1.ebuild 387 SHA256 0f194e0760dba6a829b3ce0d36c2f689e79b3bb1a2c7fea4d310ce9e06be3160 SHA512 7291fc6f0865769a47cecc77dec756f96cb33dc64d4edbaebefe6b8f7407dab86fe46ec410657c01692690edfe05afa33f5e39311165fb14291a88b87483a5f5 WHIRLPOOL e8637c43858d7d9161c588ab0f086630f6b97cd6cc8f08c782a5fa689cbeaff64dd246f3fb577f288706e1f9cdfca598e7823631793f77d06323be21e8945154
 EBUILD selinux-puppet-2.20140311-r2.ebuild 387 SHA256 b700e075e906076dcaea12fe1297542713b6189691e21a42510c6a219df51c7c SHA512 21151d4db931dbf34e5d42974a9927f5787fea4292ff7c4d41fc43246b21c74471f455947a5ad3fd7876a58297901bb9f5b7f0670c2254226fc0e8e4b43424a1 WHIRLPOOL f923281dc7a6d90d214ec9c99447901c3157e61f6e734dbc4c1467bdad520dbe0b2de907dcceb18e69e58d49f75cad829a398f53dd33d3008dee5cc630b38f02
 EBUILD selinux-puppet-2.20140311-r3.ebuild 387 SHA256 8f50a049915a493fff8ef42066c29f724eb347aeb5b17a08a4ecc5b94591e391 SHA512 7f6f99a6e093670ee105e9002a626db906746aa39ca7ee20130f609472d0c32d7a00868f0cc0ace2e6e567e501728e014f83307f9c583038a1a829a0751db4b6 WHIRLPOOL b146fc3ab96c2c5b38209abd1852549356e8e2d749d98dcc1a831fba08a4da886f5626e1f19d205d3c19cdb376a7a01946d158f37db0e3c2e60b22da7cd71c74
 EBUILD selinux-puppet-2.20140311-r4.ebuild 389 SHA256 8031ee11904b16736943a30b3d9786c3f9bcda0ffa7e1ee67dd1de80d2a754dc SHA512 bb12c6c89315ce76c9b1216137b788c2b18d3d2b22292fe5f1d132867ba17c73c15234a5aff47b48ce880fffe74dc8cf47a02321dfa7971cecca10d9ca7de3b1 WHIRLPOOL 1e0723442d69aeab2f119f1db960a83336164f9380f04bd91c3b9e2c76076ab1a31d40e33827059b70f44ce0f9d15a07bb26ce1f7df78602a60a56705d40c1c7
+EBUILD selinux-puppet-2.20140311-r5.ebuild 365 SHA256 f0169ee8a5978cf5e03736cbfe47888ebaec2188ca8f8a079f57b0c087bcbbc6 SHA512 59933abfe83f4cc3bc0eaa89a525c2f58216d4f6de8cc718c61b7ca7dd0dfc16677dfef93bda87eb423ff806882bf53e77da5a0095c9be36cbb3d921655f677b WHIRLPOOL b4bc961e1a7a76eeeb80780837724e8e98d212df456363bd4f0ae8abacd07f823f11183c246c120a4410874d1394008201f901dfdd2c17cd5a6fa2518735e1b8
 EBUILD selinux-puppet-9999.ebuild 345 SHA256 4084f6f3d6332ccdf94ddd96f4f323ea49474bb56bb1cf82569a2e0a5345d9b7 SHA512 899347202fe5aad7f4ef84490c294806ab869a47b50be6bf5f336d27a625a817d55df14f7dce4fc4bf06c4dfac11afdf261b94962b9927cbdd7f1e59f472fd5b WHIRLPOOL 554a7447009a2d1aa3aaf7bc7331d62c6499d40c7ea3d1533d0eabb067eb51aefdb7e55aa325ff7da231e17d3a136f6e7dc75cef2e8626b6f2b5cc7c7287c35d
-MISC ChangeLog 7811 SHA256 f0ff6c5a3c2f210c2dede4e61ac819a3c4d8ff4c50e02b308839eb45b0f70c59 SHA512 3b8f15c0739805c1d7efa32a97c4589021e64a17650fa9e515669c023905a538582ac48fe2c5241471302adcf9dd24318f21cb51eecd71c115836708d0ae35d2 WHIRLPOOL 88b0d76d34a2b43e415f3e661fc2d0ff8242b5d08e53398fc2048d6e9a5b5c69012d55fcdfa2226ff0ded1a29aa35885ac38b41f15d19064662cc6ac0866c18e
+MISC ChangeLog 8003 SHA256 2893333fc9a24682e5a1a4aaa48ec0152e772eae74b24302d6d1750ef2baaecd SHA512 a2370e2faa4f64cf92243b827800d0bc3c4505288af648c6f580b32aca201770e8b52d36554b84769b8899a9671870674cea386b9bc8397d70deb7497d26d796 WHIRLPOOL 6c8d8ebf3fcee06cd99998449d279cadfd3fb008b1611c41633d8242d82f7e83616d0f56a8e38ff3233ab12aa95edebcf7bef5d0cf013b8dcced4b5818ae6c0c
 MISC metadata.xml 230 SHA256 29b1c0521994399dc36bdc4fac4b4b7d1169b537602be0486896018c744d96cf SHA512 7f539797f766ec2e8f04676a0470fcf1a72d33de48adda24f5124defc662c99be9db95f69db098e4c37e051ffee1b49c05e0fcefdf63f08d5681a3bd57a2cea4 WHIRLPOOL 1b81c5ac92e328970a6a3057422d63f7650a81ecd4af8b5e90775e8ea07c0eb4dc9a81464b1ab23614ceef9aaeeed8b90360f8d9754675f3800adc6a15fa58ed
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyQAAoJEC7dUkA7aK9HvesP/1rFfke4rMvKxJSbOIceFpDY
-Ycy/oXvXA0KWr8x7qA/sWavXAbh8zwPxmQ18YJkIbM3kKimClQH7viDBB5fomWc7
-lCZx8eU895/CQMXSjrNZLHS1NGPgNu+I4BF93/0znEfzPD1QA4GEne1+0efH4P42
-CHVlrCC8HbY7iEbchhbiwKWKDqc5w8llyz9PTNB/0O8FRwc6B6T/YNHtBRcvfTfG
-Fuh/TNMcAKGQiBy8iastOiA3d9B7J0ESnAn13mDMjHI9K6WMBvippaqVm11juSIE
-F9p46mv850Vui1PcW63f/M4EbTiFASvHLoSF2Z1GNmGIPw+MT1bFvhv4r4M6Gogj
-DbAXs0roGBzka1rXZn8o0tlNhYYLqxlivMzEcuQhsHwLm03eHfyCpDbfcFC15FUG
-bSTsLMXxJU2T4BFXrLHCZeo9vObkJNN00W0asK6Q4uDoRgt9M+nHU1GjEX8jYqcM
-x4D94IMx15lR+4I/RdfVeeJzDkurVdEKR5J0duCSDXn93yCUA34CMWmfD9y01T6N
-TzP0zKb87l3TUM1NTrW3dz2EvDQYXL9mrX3y7IAnS/ghxaIT4nvE5mv47tMzNa55
-RmaXEyPw72Z45EwkskZUOZAN6nchMOP3P/kuP8C5upCODk389MPu0po9hdGBuN3e
-2SdHqc+TQQHeXXB9iGjs
-=jBl3
+iQIcBAEBCAAGBQJT5nhlAAoJEC7dUkA7aK9HR38P/i6/bd6C23/8UE637RoLr5M7
+TdWq1dKJA1n0RFdCS5nuWcgpVyqMvPPkon9T1WPTQAJjMMZlx7imBMw0oEz34M41
+5/hK8YukyDzCh1htpYHR3IPbJm9se6aPGa55gP5zHySgo4fm9rXOkFKwq5Aon++o
+y6r+CWk2+5eR9tyPfAeLjLT/6bkSZW0ZNF6gzcNC1ksbPAf3TlrSSxH+VRYUu+qc
+bix7uAurD2H+doAY0aWy9Y5lPDT0Zd47y49QPIGiR6B4JgrQnaWuiTpqK9QMHbVs
+zy0umLoPNtITp1xgbQu3ufPBPW2ViWa8Mge2+Of5kpsES5XRTHTU5D7rwr3piKlu
++78/m25pzm8769/QE9EmX6uT3oNKHfdXWpAM4ZCq/TSfaqwNLw+zig2xhzqXOY6E
+wB7SDsJL/XS9PFsicgrcmJ1qmmw98abFBuTp76tYjWCmI7rH2v6LhCR/fJrowuOI
+UIQ+FF42DLjqJv/qRu86hr0/9XH/WmGRhDaUO+ZNcFNBbcB8t1BSBsYtZDbuUbMe
+r7hnPxLrplrooRwyXNZWtfD/IZlhdQC6xL73937J71eQ0UuL/Q5AWMLWSztR9+9j
+EgCnkIjQ5VaC4u+OWcBlEtt9jWashG8Z8/m6mIyEsoNWyJm2rvz10clZ9KGs8A0j
+wYmcRp5Jpam0CCsJZl/j
+=SrNE
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-puppet/selinux-puppet-2.20140311-r5.ebuild b/sec-policy/selinux-puppet/selinux-puppet-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..7f3d0a6b561b
--- /dev/null
+++ b/sec-policy/selinux-puppet/selinux-puppet-2.20140311-r5.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-puppet/selinux-puppet-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:16 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="puppet"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for puppet"
+
+KEYWORDS="~amd64 ~x86"