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, 40 insertions, 15 deletions

diff --git a/sec-policy/selinux-mozilla/ChangeLog b/sec-policy/selinux-mozilla/ChangeLog
index 352d5fa987ac..eb4680f36998 100644
--- a/sec-policy/selinux-mozilla/ChangeLog
+++ b/sec-policy/selinux-mozilla/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-mozilla
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mozilla/ChangeLog,v 1.60 2014/08/08 18:49:35 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mozilla/ChangeLog,v 1.61 2014/08/09 19:34:48 swift Exp $
+
+*selinux-mozilla-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-mozilla-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-mozilla-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-mozilla/Manifest b/sec-policy/selinux-mozilla/Manifest
index 1330c636e86a..2448eb953b51 100644
--- a/sec-policy/selinux-mozilla/Manifest
+++ b/sec-policy/selinux-mozilla/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-mozilla-2.20140311-r1.ebuild 459 SHA256 fb32fe394f532eeebcbd40935764b714bfc8f3757e1102d0605b86365b054e5a SHA512 a89ad20f8f93ff489b99ae5d599403daa59b2d615ba679bb0c5540a45a2a84d9ed77478d2a98023098ae7a213dfb45ade89e00a5d8978b0b7817528ca7541736 WHIRLPOOL 9cfd86932a5102e8841ab492f4ebb5ee26ac1fc3f9e97e1bff9ea3824bc18c47d796c0bfc4b0bc496d367ebd3ade963338cb82ec29fb410bdbcc061eea419669
 EBUILD selinux-mozilla-2.20140311-r2.ebuild 463 SHA256 adb3801328172c8d6346dc0c105b7989ba089b881b9ed3f666dd881dc62b896a SHA512 afab3dbb991aa8bb1c3149c2ec67df475f200128c113f136a22f922453d0f93469a996a93ee6342411c647b419a9a19199a2bed250ff198343e6ea3bc471f1e4 WHIRLPOOL 8f0f42b9c3f627755daa284eb731d35ddb2ef57d883e8f81206be11b13384202951dc2c024f74996e9d90b2d0ef3b5de4c1cc9ff1c64e2cb2787f1755b1bf195
 EBUILD selinux-mozilla-2.20140311-r3.ebuild 463 SHA256 9841121ab89dcfc70a4d3331fb09d0a3f66d023bbe6d2bbbd526935a45ed86cc SHA512 9d7872259a24c3fbe67b0de39b5c89176e7595a1e344e55abeb5c60a4d715708e7a0b93c555b63302a781888d57130541405a4287178ef5adfa0d886f4438a9d WHIRLPOOL c01a86018be01dfe2a5a3039f27365b09df73ed2af97261d85e809cb91fdd7c4ff7ed2a31ccd157a5493a8310e72ff103da960db595e1ecb0208d62b40b7c4e2
 EBUILD selinux-mozilla-2.20140311-r4.ebuild 465 SHA256 d558288cdb563a15817b82d634d59af49e2915264e6df2a2b49c43491626be8c SHA512 2b3ea36e02057816e8a9d45e3ade52439991a6f7cd415f543787bee1b59564c39d24118c718426040fcb4ff6c3c91c824f77ef491af29a95d3d7e8425d082d43 WHIRLPOOL 168820793ddb345322605707ed15716b2028fabf8d6c2257594440ee58d17afed1082d33c5d861f7d7978f2fb55b5ad3edf200fb656981f702a5493e7426ba7b
+EBUILD selinux-mozilla-2.20140311-r5.ebuild 441 SHA256 eab39b0a5d33dd0e2538c1051bd2264868c9d5c9e982c2ba97101c4682c3d1a8 SHA512 9357aed6a4f6845e4249722b67fa6537f017cbb7ec293b38d866c99f17a4bcb8a964debcdd57083129ce62224f89677a990ee83de0e36c4b3d2e0fc378f02be4 WHIRLPOOL c1bd497ea99a4e3a6ce2aff4f817065867c634142ffc063754f6f9217f9b8cb415793a32f0cf97d385156c6dc62a35ef623601e294500a814fbede94269c24ff
 EBUILD selinux-mozilla-9999.ebuild 421 SHA256 2087d197824f8d07d9f1968d15ab266872ec47049a76016f81d586a94e1524f9 SHA512 b2c78ceb9393c71ed1484a8d95f4925bb39010b34df26a0b25e6072fc938367e1ea1facc36fa13ea3293c36cce42affd9ed44a72858facef884892016a3ea162 WHIRLPOOL b66f27ff8bfbbdc32363f11426006df138ecdfb2608bdc233e9705604b5dc9e4030b20afdaf6c04be6100d5e15c5cf3b805e6df35f634146146f81206675fda7
-MISC ChangeLog 9980 SHA256 209ee15b186c27380d0fbcdfbbbc7824f80746ae3a1bd547e7bb671466d22b66 SHA512 48988a9488c4b845c64b540dbe203aa2c49c71af528ed80d03a8ca18247b1db93fe3b8c57b5ff7586ba3d5ee033963411a127ec028ac087e9b52e53152758517 WHIRLPOOL 0832510887738bb6ce11bcff1acb9b554a916a6615af76c2dd4758d9bd6c8c3b25d56a00548ac50b960cb87406d6fb68084f9d2dea7251f592b8f5dc3c76041c
+MISC ChangeLog 10174 SHA256 52851740f14efb4c8c3c70311f3b8ff922a8f02c33c6f2155685bf12d224ce91 SHA512 86629157ab8fa5882ff9b59d06046fd8ffcc657b85bb4c8748109536f2cc1432591a75c5cce5e81ef1dfca1bfd9041203b7c7b914bb0eb2a48bdf97c25d9cb2e WHIRLPOOL 077bb28eebc4d158fcc4846439fa80f2a1c586d49354869d27c8df18c1c2c871776ce6f7e4b468a1e34d40b8162667c97f47ea3a0ced744a6f6fec495c6948e9
 MISC metadata.xml 231 SHA256 273d289d0f0b50f0a43bac2d1f9f62bbee4850d6c0cd873ac5d371df049abffa SHA512 2aef48002ca727d271789cf83fac907280ab47610deb7f59189cdc3c5466784cf39f24588020d4448e10774c1e670a0356dbac6306d55edfffd2ee153c891ed9 WHIRLPOOL 40b1427aa880f88c1511ddaddf6b64e2cb215b1c02e47073766f8ae6bef5bea85ba84a3195ba94e3b8f799c2bc3ff7a52e46b8bb7ae4c727f8314850e60f0295
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyBAAoJEC7dUkA7aK9HgAUP+wWKPwW6Cr8GHsWiGmqQvsT5
-lJwPW9FqMlGQF8rFaB5C7KDC1rZCUg4UC/RPP87Sq1Gv/i98lywhjVFy74mDsvhf
-3WCaSEll67ALzCrjaR58ChpSaNrt5KiOLqKDjDh5gW3Ba6d1MU5FuSI6DJlb6MoK
-yPVmvMgt8IETSGm8Z9sAapj+r+vB1VLH3WOnYraXIsAFS7GQZJEZUea0p2tZfhoO
-o+e1MVySD/4lQobYaMio+hDP6cucJ9Eg2PA8ni4DgVwZhqfARFBX65cjx4qEad6k
-cIe7WMtl61bqcLHw6DbAFNjlF10I/n4PPW1WB6OaSPmjSBQO50R/A0b/CNGOT3PX
-Xv+kRaTnYlJtWts4OeSQCJ0ehTwHBr3Z/t53FD0MWXlT3bCJY2AwpMtLKU5DiljV
-I1yCTf5saOAaLwOjDLOCR8mGFYTKhIrCgevZUueHun8tEI34XIo3Ibb6d3aXUvC4
-pXoiD5/F8sMld1yKiLF4qY8N7gCCZB5MbZnSlExWrczCi4/iZA5n7HHKfHc6prow
-63U0A4BFe5fEyGDt1il9PRiWAlHIgoDOiJHvctD8lIJAZ3JVgpOatuMYD2YFrrVh
-AgKcXrFA0XzR2WoHgM/XKUXe5f1sffTI6FEzqe5j2PgZjk3xMOaw2SsWwOSLSYli
-en3jHkKQOWhAK6sJ/5uH
-=HqjE
+iQIcBAEBCAAGBQJT5nhVAAoJEC7dUkA7aK9HFLQP+QE3dH0Il3ZKtCVOEY+zqi1e
+bpdr7kDw7sd9qHjLjaKds6OM+PfikM3W/tOFOc4KE96NtDXEZSFTAJd9X8XSmspj
+lpIWqDHi7rhDwXkr39iDKbmSrxBun7EQDfno8NSosx9oSQi6cJyGzYiOMQ1UZ04P
+Ho8l1lyjTZMQCwKbn/lkfe3UiET984io7MP4dW7Atr5F8Hm0VuiBh10JcR1bsozr
+oS0TcvlqrWKyX4QPd2D0ZlA2Sqq5xxdLjDd+TQ53IkF9lloZ+Bki4tC0xQ2jKPZw
+3fdeuk7zvUU+PlOUyCLJ2ZLGHb+7ouLuAbeBsu7yPgr0xU8fznVbqUhd4tsX/Eip
+Pz5UcKd9Gb1z+WsEnwblJvDVC8Bp9MJ8qMAKwdo9UOJb2LGWsOpg1jh3rw9JTPgR
+tWl+D6C9S6B291Wyr9mFcWmZjehACb0uWPGiWwnIeynkh9Gdv7K0LeHsMAIaNfW2
+YpFuH3UNd67mMSuEZVnwL2PB1SgVWCcHYqGh4ye/yaVwCV7GtPwj9PzVlQUBPTXJ
+Qu0Bs7b0ja8l19KyyIV89ijhObHHjJn7LueAa/wQtWNvBRdQnOn+9Av2AdrpRNz+
+xj4BLCf/Jp+T9rB7x3iBPAgYJIMqdGAy8ZNCaZYnfsUhZ/I2kMOQc9vNzWGrJ+tv
+Ms9ltlidCEIL3fRKM0zA
+=834r
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-mozilla/selinux-mozilla-2.20140311-r5.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..7db247789441
--- /dev/null
+++ b/sec-policy/selinux-mozilla/selinux-mozilla-2.20140311-r5.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mozilla/selinux-mozilla-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:48 swift Exp $
+EAPI="5"
+
+IUSE="alsa"
+MODS="mozilla"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mozilla"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+"
+RDEPEND="${DEPEND}"