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-jabber/ChangeLog b/sec-policy/selinux-jabber/ChangeLog
index 65c63f3744e4..4aed51a58f30 100644
--- a/sec-policy/selinux-jabber/ChangeLog
+++ b/sec-policy/selinux-jabber/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-jabber
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-jabber/ChangeLog,v 1.39 2014/08/08 18:49:43 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-jabber/ChangeLog,v 1.40 2014/08/09 19:34:25 swift Exp $
+
+*selinux-jabber-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-jabber-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-jabber-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-jabber/Manifest b/sec-policy/selinux-jabber/Manifest
index bf4805c2c2d4..54d3083b3a9f 100644
--- a/sec-policy/selinux-jabber/Manifest
+++ b/sec-policy/selinux-jabber/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-jabber-2.20140311-r1.ebuild 387 SHA256 606828a53acf63841fae94a6dd08fc33fbcc3fe575afd830d2ffeb87b756743c SHA512 0742fb9c9169ec09e97e4182353c2ca5c9f73b9fd38cdc09440706a6aae6e8a6dd77d17b5ca236f5ccd2e33ed837fdf69750433f9661a64aa1d246f90ffb9a70 WHIRLPOOL c4cf1b39e3b38b763e18ab7c2203e5b6d19ada513f15c26fe28b36f398550be603a570d4a4385e47b2e55e02202e7f51a898b02403b32e9d7c7d866b1cc5e7b1
 EBUILD selinux-jabber-2.20140311-r2.ebuild 387 SHA256 f7df94260d24dd97a3b07c68ee6185a365acb154d77736793a4b803d169590ea SHA512 53255eff03832e4b154cd8fbc59a72c7ae90ed56baf1fe92bb3f42dc5afe407682e41bcf583fafe629c82ecc1c6372f1d7fdca4ce6c5d266ee4557f9a11c99b6 WHIRLPOOL 2da8aae01e854db4df570dfd50e71540129d3ebc1d3486dd97378efa56f772b97c804c21f95172eac8d1af287104a54fe00342c4de8bb2c984935022695b4f2d
 EBUILD selinux-jabber-2.20140311-r3.ebuild 387 SHA256 ed06b75dbd9c7f1d2b9c0187398c4e715534c30175ff7b58b81e8c880928e855 SHA512 a4638567ab27b6a8c71406c57ed65525aee80ce076af412f92259ac244cdcd758ef2e9ee2cdd066640268795cbfc47a21c45b19d413b80a6a72ca574802c6bc0 WHIRLPOOL a1cae1b6b484b9ed24eccf116fef8f9ce1da640b922f8af890a4aa4e4e60bdd32b0fe82c73064f35c0383ffb0af64b5c97c10ef9ff377b5d22b59cdb969c6feb
 EBUILD selinux-jabber-2.20140311-r4.ebuild 389 SHA256 3a126eb89980e4aa53802f7bc1c2735d387daa88f41c7986789d1342ce810598 SHA512 e264527f333e51443cd94d0725ffaef0d96db42716fffbf98f6bd08389c245df7f00eba5fd0f26bfa5457a5c738e4f09f30bc7db4f6673a87c575bbe48da6998 WHIRLPOOL 3cb547c8420e0642620f4d45bd75cb5165b0c52a160ccc13c064968b18dd3294bd08f6a89131add94586898dddbd18798974c8f975657089ca95ab4b7270ca01
+EBUILD selinux-jabber-2.20140311-r5.ebuild 365 SHA256 5ed49aa0f97d0a74a18e660f8219a50aa7ccc31668f5005520dcca719ef21b90 SHA512 e0823bb2f44ec8f766ea3cdcde4c4824adcbd171ce58d93bad700af90e248b6d321e647afb0d90e34cc7943cb27d7ed14e2e4f38478108c50aeeadec4f41e76c WHIRLPOOL c141cbd748c2862f60ef2678eb4cffed6a159e519f99aea3e38971d00dcbf7d14a622276ab66a9c6aa05cc60c70f9e1b3e5ee25c81ef2817914200b3bb20eba3
 EBUILD selinux-jabber-9999.ebuild 345 SHA256 c4917b6b47cc303b116813f1c0fded3256eea7b97bd9caf85b53a57055f87934 SHA512 0edddaadfff08ee38701f09b68bc6fd0aac884caec204c9893a76e9182ee72061c2500f4b66a62f2eedf5a1597758f1105d051eef137c2e950e41084a77ac92e WHIRLPOOL 67d1b4f580db9c64b3ab43caee6b400933aa455d5d109d0870ecb476856fbf683120677fb8984c793fd09beae8211eaa0855856dcae9e65b566ed60afc8e8afc
-MISC ChangeLog 6367 SHA256 4c129afe252a7193b972ef7f3a4e3d148744d4ccd6eaf5038bc2da17a403adf3 SHA512 f7bfbdc8530beb7069ca72e20b12518cfacd9d745d7a1f01bb6c6952ce927b53268557fafaaa55424a261dfddea36929db2555708d1ff9ff15a4d826856e282c WHIRLPOOL 5af6598f98ab3ed2ccd3e7514e2dc9edee7a940cf87cce234e8cb1332221615023a8f0556cbbb19a95ddbb64e8a026e6d797315fd119683c52222cc34c056588
+MISC ChangeLog 6559 SHA256 48a838cf9693de197730820db9c392b9af54b042131911977df8fda9fe69a3a5 SHA512 72565aadac3f9b53c9ac7f507ec0dd4f79181bab2ec0a25cf5f2d8a39143356f9702723ba8e11b8ac2a7ed8a11a4e5cf772b4ae9da3e29bc30509c7874ad0201 WHIRLPOOL 8b97e4396a44afe44ddfc89f8ce7ec87489126b70cdd590fa8083025ba225dbf2ae13dd8447445e6f9bb54945123cdfab5a1be5c272d3b157adce7a3062b1b74
 MISC metadata.xml 230 SHA256 9a8b2e766f7f99f97d797f448fed1c65c72eea67696972ebff8b16420dce58b8 SHA512 ed5ed5427d9ade5696615fc962a15a0c0bde137221b8c3a2e16540ea69fb7b090460c6fce5a67a0d568b2b41f34a1b9ea08e33214ce83e12287d2ce7fcb0aa11 WHIRLPOOL 27157aed4ab064f42f933edd1520fe6f9cea7fb798528c882b5f62159d174b105124bb6922f36f0beef1c0418c0afe099221bf886d2912fa2768c8b2ce8a1577
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5Rx4AAoJEC7dUkA7aK9H4BoP/AtbIFeGa6t7cfPYqvPnwvtQ
-0Zk3UKHLgh8uIAjbVK2kRoRZCkft+fh1OJDdSAR8vKlW1cC89RSkhL1XjVLPI2KT
-bBucUVI9zCagG+3HuacZTUqtsbRdflw267DhzW6lJwwFZEb2ITwtOtG1piCGBahu
-A6EKKqcovBC9Befm/4D/qFOd21CAoSSiFLOCIG+Eeo8RFXCDXCABL4xEDVWDoImS
-BkRttbL5oNKd3pUb988v5DG7Wt64gF5C3+M9w7FxzhyQzDxDoKnCiO2yO/qVkRW3
-tAlp9J6RJ1PV8Kiypm6NMsHkSz9jXNlZNleT6+n4vgiuYyJyWTxR6c78Q6lDoiY7
-tRPHsfPGDRgsly5ygW+Fp/KXyu2hulwzD5R5crVdXGhO4rVtkH25hcJxKbf5u1dB
-Zmjq8Qxezy8QTKuyl0xgam+KAg9ZCZr6ai9GRgqg/CrRlFy25ewT8pFeTf45R18v
-Ac3bMmg+2hnrJSuQQwRkPbVjIF1ERh9qhSpcBjXvzdk6NT4fZCclxiWogOc/bSIm
-TdxMCuWcmrVtYhZsxPRFqKeJ+CWGOA6fPKyX6w8Q2lsbj/TbZGw0gfMbGZcCK7tQ
-1iCkUy0B9Tk4qR+sQMWUIgO5pb1NqpQwrz1y5NdgrjUhhpW3kUxegHo/HFmnGDiq
-ToKKoosNYreEx3OeqgjQ
-=grN9
+iQIcBAEBCAAGBQJT5nhMAAoJEC7dUkA7aK9H++MP/347NzvBzzr1HiFaPEgPWvqM
+q5ahtk+svv4mNN6Yq4o1imdDkFx7hZswVfhV89jakiGUXBCFPRABltZXIn9htyH6
+FFBvS7tNcOgRH0fMlABwsJX76oJIvEAmjiCNV1kVKuXrMqg9WvyrEzc3WJiC/3Eh
+MeVkYPsfVhqGeBzX4Z5VYeZnXT8UKvB5GFOmNEbxNMDvtwi6NDDqDzlOgcp3k93O
+pa9KmM8bGRvd/3tZbf+iTOmXZXTh0CjuhLLcslVLTUJubHq6cSkRZ0yEy+8ZB9vb
+T675xud0GC8HBBrzV68lYRHkLWeG8RRcVEIRDoEKGv1U9VYsmCjYTBxVDmZI4Qqt
+K+Jxx+6biEx9Qiu0kKDK4fAcGNtCTOh5Dlu1DStVo2f4ePxX9LLUmlqCT+C1uuit
+xODNjxd+AjAesmWfEMGIzfB61K2iyOWfBhYYqosnvGcne7xWAoi/OK6HEIeQjvI1
+rDVOypKuwgy4pp7ZW79azgEoSrHwDartFMrZW/fU/yvVKlGRYjih9ZNOIdww4yPG
+E2XcYtPd2fXZNhFpPH0qQXXcBbo7DuoRLEP8GFUMFsPOk6+IptPn5rsjwZeZdYue
+/OmcRKi7hQlhKSpzCv1LJxbB+QA3dJ8kTVocM0VR9fzv61JoZPfnlc9vfqYfXfXI
+W5KgtXdHsZ7LpCGtzOL2
+=Ljyk
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-jabber/selinux-jabber-2.20140311-r5.ebuild b/sec-policy/selinux-jabber/selinux-jabber-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..91971d93f930
--- /dev/null
+++ b/sec-policy/selinux-jabber/selinux-jabber-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-jabber/selinux-jabber-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:25 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="jabber"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for jabber"
+
+KEYWORDS="~amd64 ~x86"